[MERGE] merged with trunk development branch: lp:~openobject-addons

bzr revid: hmo@tinyerp.com-20111202084648-mhvwmmu2k83fg2vd
2011-12-02 14:16:48 +05:30 · 2011-12-02 14:16:48 +05:30 · 4e99a743b3
parent 0a28852979 49be766d10
commit 4e99a743b3
1365 changed files with 239828 additions and 14057 deletions
--- a/addons/account/init.py
+++ b/addons/account/init.py
@ -35,5 +35,5 @@ import product
 import ir_sequence
 import company
 import res_currency
-
+import edi
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
--- a/addons/account/openerp.py
+++ b/addons/account/openerp.py
@ -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',
@ -123,7 +123,9 @@ module named account_voucher.
        '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',
@ -139,16 +141,15 @@ module named account_voucher.
        'test/account_change_currency.yml',
        'test/chart_of_account.yml',
        'test/account_period_close.yml',
-        'test/account_fiscalyear_close_state.yml',
        'test/account_use_model.yml',
        'test/account_validate_account_move.yml',
        'test/account_fiscalyear_close.yml',
        'test/account_bank_statement.yml',
        'test/account_cash_statement.yml',
+        'test/test_edi_invoice.yml',
        'test/account_report.yml',
-
-
-            ],
+        'test/account_fiscalyear_close_state.yml', #last test, as it will definitively close the demo fiscalyear
+    ],
    'installable': True,
    'active': False,
    'certificate': '0080331923549',
--- a/addons/account/account.py
+++ b/addons/account/account.py
@ -404,7 +404,7 @@ class account_account(osv.osv):
        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([
@ -431,9 +431,9 @@ class account_account(osv.osv):
        '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', 
+        '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', 
+        '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)),
@ -461,7 +461,7 @@ class account_account(osv.osv):
    }

    _defaults = {
-        'type': 'view',
+        'type': 'other',
        'reconcile': False,
        'active': True,
        'currency_mode': 'current',
@ -716,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:
@ -846,21 +859,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)
@ -869,8 +869,7 @@ class account_fiscalyear(osv.osv):
        return True

    _constraints = [
-        (_check_duration, 'Error! The start date of the fiscal year must be before his end date.', ['date_start','date_stop']),
-        (_check_fiscal_year, 'Error! You can not define overlapping fiscal years for the same company.',['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):
@ -881,7 +880,7 @@ class account_fiscalyear(osv.osv):
        for fy in self.browse(cr, uid, ids, context=context):
            ds = datetime.strptime(fy.date_start, '%Y-%m-%d')
            period_obj.create(cr, uid, {
-                    'name': _('Opening Period'),
+                    'name':  "%s %s" % (_('Opening Period'), ds.strftime('%Y')),
                    'code': ds.strftime('00/%Y'),
                    'date_start': ds,
                    'date_stop': ds,
@ -905,6 +904,10 @@ 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')
@ -919,8 +922,8 @@ class account_fiscalyear(osv.osv):
            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:
@ -1683,13 +1686,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)
@ -2001,8 +2006,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
@ -2014,10 +2022,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)
@ -2183,6 +2191,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 = {}
@ -2190,14 +2199,14 @@ 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):
+            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:
@ -2246,9 +2255,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

@ -2395,7 +2402,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([
@ -2803,7 +2810,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
        res['value']["sale_tax"] = False
        res['value']["purchase_tax"] = False
        if chart_template_id:
-            # default tax is given by the lowesst sequence. For same sequence we will take the latest created as it will be the case for tax created while isntalling the generic chart of account
+            # default tax is given by the lowest sequence. For same sequence we will take the latest created as it will be the case for tax created while installing the generic chart of accounts
            sale_tax_ids = self.pool.get('account.tax.template').search(cr, uid, [("chart_template_id"
                                          , "=", chart_template_id), ('type_tax_use', 'in', ('sale','all'))], order="sequence, id desc")
            purchase_tax_ids = self.pool.get('account.tax.template').search(cr, uid, [("chart_template_id"
@ -3120,7 +3127,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
            tmp = line.acc_name
            dig = obj_multi.code_digits
            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(dig-len(str(current_num)), '0')) + str(current_num)
                ids = obj_acc.search(cr, uid, [('code', '=', new_code), ('company_id', '=', company_id)])
--- a/addons/account/account_bank.py
+++ b/addons/account/account_bank.py
@ -42,8 +42,12 @@ class bank(osv.osv):
        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
@ -104,3 +108,5 @@ 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:
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@ -30,10 +30,12 @@ class account_bank_statement(osv.osv):
    def create(self, cr, uid, vals, context=None):
        seq = 0
        if 'line_ids' in vals:
+            new_line_ids = []
            for line in vals['line_ids']:
                seq += 1
                line[2]['sequence'] = seq
-                vals[seq - 1] = line
+                new_line_ids += tuple(line)
+            vals['line_ids'] = new_line_ids
        return super(account_bank_statement, self).create(cr, uid, vals, context=context)

    def write(self, cr, uid, ids, vals, context=None):
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@ -57,7 +57,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"/>
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@ -207,7 +207,7 @@ class account_invoice(osv.osv):
            help=' * The \'Draft\' state is used when a user is encoding a new and unconfirmed Invoice. \
            \n* The \'Pro-forma\' when invoice is in Pro-forma state,invoice does not have an invoice number. \
            \n* The \'Open\' state is used when user create invoice,a invoice number is generated.Its in open state till user does not pay invoice. \
-            \n* The \'Paid\' state is set automatically when invoice is paid.\
+            \n* The \'Paid\' state is set automatically when the invoice is paid. Its related journal entries may or may not be reconciled. \
            \n* The \'Cancelled\' state is used when user cancel invoice.'),
        '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,
@ -251,13 +251,13 @@ 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 ?
                'account.move.line': (_get_invoice_from_line, None, 50),
                'account.move.reconcile': (_get_invoice_from_reconcile, None, 50),
-            }, help="The Journal Entry of the invoice have been totally reconciled with one or several Journal Entries of payment."),
+            }, help="It indicates that the invoice has been paid and the journal entry of the invoice has been reconciled with one or several journal entries of payment."),
        'partner_bank_id': fields.many2one('res.partner.bank', 'Bank Account',
            help='Bank Account Number, Company bank account if Invoice is customer or supplier refund, otherwise Partner bank account number.', readonly=True, states={'draft':[('readonly',False)]}),
        'move_lines':fields.function(_get_lines, type='many2many', relation='account.move.line', string='Entry Lines'),
@ -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')
@ -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:
@ -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:
@ -1323,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
@ -1353,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:
@ -1367,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:
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@ -153,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"/>
@ -264,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"/>
@ -432,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>
@ -460,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>
@ -473,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>
@ -499,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>
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@ -559,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)
@ -1082,8 +1084,6 @@ class account_move_line(osv.osv):
                f.set("invisible", "context.get('journal_id', False)")
            elif field in ('period_id',):
                f.set("invisible", "context.get('period_id', False)")
-            else:
-                f.set('invisible', "context.get('visible_id') not in %s" % (fields.get(field)))

            orm.setup_modifiers(f, fields_get[field], context=context,
                                in_tree_view=True)
@ -1243,6 +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)
@ -1324,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]:
@ -1336,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),
@ -1354,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),
--- a/addons/account/account_pre_install.yml
+++ 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)
--- a/addons/account/account_report.xml
+++ b/addons/account/account_report.xml
@ -19,6 +19,7 @@
            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"/>
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@ -1235,8 +1235,8 @@
                    </group>
                    <newline/>
                    <group>
-                        <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}"/>
+                        <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...">
@ -1306,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
@ -1584,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"/>


        <!--
@ -1626,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"/>
@ -1645,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>
@ -2017,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>


@ -2039,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"/>

--- 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','in',('draft','proforma2')), ('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>
--- 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',
--- a/addons/account/company_view.xml
+++ b/addons/account/company_view.xml
@ -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>
--- 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>
--- a/addons/account/demo/account_minimal.xml
+++ b/addons/account/demo/account_minimal.xml
@ -60,7 +60,7 @@
        </record>

        <!--
-        Chart of Account
+        Chart of Accounts
        -->

        <record id="chart0" model="account.account">
--- a/addons/account/edi/init.py
+++ 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:
--- a/addons/account/edi/invoice.py
+++ 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:
--- a/addons/account/edi/invoice_action_data.xml
+++ 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>
--- a/addons/account/i18n/account.pot
+++ b/addons/account/i18n/account.pot
@ -1928,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
@ -6200,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
@ -7144,6 +7144,20 @@ msgstr ""
 msgid "Company Currency"
 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 "Chart of Accounts"
+msgstr ""
+
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_reconcilepaid0
@ -7321,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 ""

@ -8069,7 +8085,7 @@ msgstr ""

 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr ""

 #. module: account
@ -8116,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
@ -9247,3 +9263,15 @@ msgstr ""
 #: 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 ""
--- a/addons/account/i18n/ar.po
+++ b/addons/account/i18n/ar.po
--- a/addons/account/i18n/bg.po
+++ b/addons/account/i18n/bg.po
@ -2065,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
@ -6627,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) "
@ -8672,7 +8672,7 @@ msgstr "Юли"

 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr "Диаграма на сметки"

 #. module: account
@ -8719,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
@ -10579,7 +10579,7 @@ msgstr ""
 #~ msgid "is validated."
 #~ msgstr "е валидирано."

-#~ msgid "Chart of Account"
+#~ msgid "Chart of Accounts"
 #~ msgstr "Сметкоплан"

 #~ msgid "JNRL"
--- a/addons/account/i18n/br.po
+++ b/addons/account/i18n/br.po
@ -2019,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
@ -6511,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) "
@ -8523,7 +8523,7 @@ msgstr ""

 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr ""

 #. module: account
@ -8570,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
--- a/addons/account/i18n/bs.po
+++ b/addons/account/i18n/bs.po
@ -2028,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
@ -6550,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) "
@ -8582,7 +8582,7 @@ msgstr ""

 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr "Kontni plan"

 #. module: account
@ -8629,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
--- a/addons/account/i18n/ca.po
+++ b/addons/account/i18n/ca.po
@ -2121,7 +2121,7 @@ msgstr ""

 #. module: account
 #: view:account.chart.template:0
-msgid "Search Chart of Account Templates"
+msgid "Search Chart of Accounts Templates"
 msgstr "Cerca plantilles de pla comptable"

 #. module: account
@ -6890,7 +6890,7 @@ 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) "
@ -9087,7 +9087,7 @@ msgstr "Juliol"

 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr "Pla comptable"

 #. module: account
@ -9134,7 +9134,7 @@ msgstr "Període 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 "Pla comptable"

 #. module: account
@ -11769,7 +11769,7 @@ msgstr "Passiu"
 #~ msgid "is validated."
 #~ msgstr "està validada."

-#~ msgid "Chart of Account"
+#~ msgid "Chart of Accounts"
 #~ msgstr "Pla comptable"

 #~ msgid "Balance:"
--- a/addons/account/i18n/cs.po
+++ b/addons/account/i18n/cs.po
@ -2087,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
@ -6639,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) "
@ -8691,7 +8691,7 @@ msgstr "Červenec"

 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr "Grafy účtů"

 #. module: account
@ -8738,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
@ -10153,5 +10153,5 @@ msgstr ""
 #~ msgid "Balance Sheet (Assets Accounts)"
 #~ msgstr "Rozvaha (Majetkové účty)"

-#~ msgid "Chart of Account"
+#~ msgid "Chart of Accounts"
 #~ msgstr "Účtový rozvrh"
--- a/addons/account/i18n/da.po
+++ b/addons/account/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-11-08 11:58+0000\n"
-"Last-Translator: OpenERP Danmark / Mikhael Saxtorph <Unknown>\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-11-10 04:57+0000\n"
-"X-Generator: Launchpad (build 14263)\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
@ -3267,7 +3267,7 @@ msgstr ""
 #: report:pl.account:0
 #: report:pl.account.horizontal:0
 msgid "Chart of Accounts"
-msgstr ""
+msgstr "Kontoplan"

 #. module: account
 #: view:account.tax.chart:0
@ -8548,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
--- a/addons/account/i18n/de.po
+++ b/addons/account/i18n/de.po
@ -2139,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
@ -6937,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) "
@ -9146,7 +9146,7 @@ msgstr "Juli"

 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr "Kontenplan Finanzkonten"

 #. module: account
@ -9193,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
@ -11748,7 +11748,7 @@ msgstr "Verbindlichkeiten"
 #~ msgid "Error! You can not create recursive analytic accounts."
 #~ msgstr "Fehler! Sie können keine rekursiven Konten definieren."

-#~ msgid "Chart of Account"
+#~ msgid "Chart of Accounts"
 #~ msgstr "Kontenplan"

 #~ msgid ""
--- a/addons/account/i18n/el.po
+++ b/addons/account/i18n/el.po
@ -2070,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
@ -6617,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) "
@ -8658,7 +8658,7 @@ msgstr ""

 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr "Λογιστικό Σχέδιο"

 #. module: account
@ -8705,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
--- a/addons/account/i18n/en_GB.po
+++ b/addons/account/i18n/en_GB.po
@ -2056,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
@ -6548,7 +6548,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) "
@ -8560,7 +8560,7 @@ msgstr ""

 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr ""

 #. module: account
@ -8607,7 +8607,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
--- a/addons/account/i18n/en_US.po
+++ b/addons/account/i18n/en_US.po
@ -2021,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
@ -6515,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) "
@ -8527,7 +8527,7 @@ msgstr ""

 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr ""

 #. module: account
@ -8574,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
--- a/addons/account/i18n/es.po
+++ b/addons/account/i18n/es.po
@ -2126,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
@ -6894,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) "
@ -9091,7 +9091,7 @@ msgstr "Julio"

 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr "Plan contable"

 #. module: account
@ -9138,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
@ -11773,7 +11773,7 @@ msgstr "Pasivos"
 #~ msgid "is validated."
 #~ msgstr "está validada."

-#~ msgid "Chart of Account"
+#~ msgid "Chart of Accounts"
 #~ msgstr "Plan contable"

 #~ msgid "Balance:"
--- a/addons/account/i18n/es_AR.po
+++ b/addons/account/i18n/es_AR.po
@ -2034,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
@ -6582,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) "
@ -8623,7 +8623,7 @@ msgstr ""

 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr "Plan de cuentas"

 #. module: account
@ -8670,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
--- a/addons/account/i18n/es_CL.po
+++ b/addons/account/i18n/es_CL.po
@ -2022,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
@ -6514,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) "
@ -8526,7 +8526,7 @@ msgstr ""

 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr ""

 #. module: account
@ -8573,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
--- a/addons/account/i18n/es_EC.po
+++ b/addons/account/i18n/es_EC.po
@ -2119,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
@ -6864,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) "
@ -9045,7 +9045,7 @@ msgstr "Julio"

 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr "Plan contable"

 #. module: account
@ -9092,7 +9092,7 @@ msgstr "Período 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 de Cuentas"

 #. module: account
@ -11613,7 +11613,7 @@ msgstr "Pasivos"
 #~ msgid "Balance Sheet (Assets Accounts)"
 #~ msgstr "Hoja de Balance (Cuentas de Activo)"

-#~ msgid "Chart of Account"
+#~ msgid "Chart of Accounts"
 #~ msgstr "Plan de Cuentas"

 #~ msgid "Balance:"
--- a/addons/account/i18n/es_MX.po
+++ b/addons/account/i18n/es_MX.po
--- a/addons/account/i18n/es_MX.po.moved
+++ b/addons/account/i18n/es_MX.po.moved
--- a/addons/account/i18n/es_PY.po
+++ b/addons/account/i18n/es_PY.po
@ -2126,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
@ -6892,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) "
@ -9089,7 +9089,7 @@ msgstr "Julio"

 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr "Plan contable"

 #. module: account
@ -9136,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
@ -10408,7 +10408,7 @@ msgstr ""
 #~ msgid "is validated."
 #~ msgstr "está validada."

-#~ msgid "Chart of Account"
+#~ msgid "Chart of Accounts"
 #~ msgstr "Plan contable"

 #~ msgid "JNRL"
--- a/addons/account/i18n/es_VE.po
+++ b/addons/account/i18n/es_VE.po
--- a/addons/account/i18n/et.po
+++ b/addons/account/i18n/et.po
@ -2028,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
@ -6519,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) "
@ -8535,7 +8535,7 @@ msgstr ""

 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr "Kontoplaan"

 #. module: account
@ -8582,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
--- a/addons/account/i18n/eu.po
+++ b/addons/account/i18n/eu.po
@ -2019,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
@ -6511,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) "
@ -8523,7 +8523,7 @@ msgstr ""

 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr ""

 #. module: account
@ -8570,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
--- a/addons/account/i18n/fa.po
+++ b/addons/account/i18n/fa.po
@ -2019,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
@ -6511,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) "
@ -8523,7 +8523,7 @@ msgstr ""

 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr ""

 #. module: account
@ -8570,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
--- a/addons/account/i18n/fa_AF.po
+++ b/addons/account/i18n/fa_AF.po
@ -2019,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
@ -6511,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) "
@ -8523,7 +8523,7 @@ msgstr ""

 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr ""

 #. module: account
@ -8570,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
--- a/addons/account/i18n/fi.po
+++ b/addons/account/i18n/fi.po
@ -2056,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
@ -6590,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) "
@ -8623,7 +8623,7 @@ msgstr "Heinäkuu"

 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr "Tilikartta"

 #. module: account
@ -8670,7 +8670,7 @@ msgstr "Lopeta jaso"
 #: 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 "Tilikartta"

 #. module: account
@ -11153,7 +11153,7 @@ msgstr "Vastuut"
 #~ msgid "Invoice "
 #~ msgstr "Lasku "

-#~ msgid "Chart of Account"
+#~ msgid "Chart of Accounts"
 #~ msgstr "Tilikirja"

 #~ msgid "Balance:"
--- a/addons/account/i18n/fr.po
+++ b/addons/account/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-11-07 12:53+0000\n"
-"Last-Translator: OpenERP Administrators <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-11-08 05:42+0000\n"
-"X-Generator: Launchpad (build 14231)\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:1291
@ -5504,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
@ -6719,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
@ -8249,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
@ -8406,8 +8406,6 @@ 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:1131
@ -9445,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
@ -10194,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
--- a/addons/account/i18n/fr_BE.po
+++ b/addons/account/i18n/fr_BE.po
@ -2021,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
@ -6513,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) "
@ -8526,7 +8526,7 @@ msgstr ""

 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr ""

 #. module: account
@ -8573,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
--- a/addons/account/i18n/gl.po
+++ b/addons/account/i18n/gl.po
@ -2118,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
@ -6782,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) "
@ -8799,7 +8799,7 @@ msgstr ""

 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr ""

 #. module: account
@ -8846,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
--- a/addons/account/i18n/gu.po
+++ b/addons/account/i18n/gu.po
@ -2019,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
@ -6511,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) "
@ -8523,7 +8523,7 @@ msgstr ""

 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr ""

 #. module: account
@ -8570,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
--- a/addons/account/i18n/he.po
+++ b/addons/account/i18n/he.po
@ -2019,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
@ -6511,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) "
@ -8523,7 +8523,7 @@ msgstr ""

 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr ""

 #. module: account
@ -8570,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
--- a/addons/account/i18n/hi.po
+++ b/addons/account/i18n/hi.po
@ -2020,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
@ -6512,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) "
@ -8524,7 +8524,7 @@ msgstr ""

 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr ""

 #. module: account
@ -8571,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
--- a/addons/account/i18n/hr.po
+++ b/addons/account/i18n/hr.po
@ -2035,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
@ -6560,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) "
@ -8585,7 +8585,7 @@ msgstr "Srpanj"

 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr "Kontni plan"

 #. module: account
@ -8632,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
@ -10905,5 +10905,5 @@ msgstr ""
 #~ msgid "Balance Sheet (Assets Accounts)"
 #~ msgstr "Bilanca (konta imovine)"

-#~ msgid "Chart of Account"
+#~ msgid "Chart of Accounts"
 #~ msgstr "Kontni plan"
--- a/addons/account/i18n/hu.po
+++ b/addons/account/i18n/hu.po
@ -2115,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
@ -6832,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) "
@ -8998,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
@ -9045,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
@ -10622,7 +10622,7 @@ msgstr ""
 #~ msgid "is validated."
 #~ msgstr "jóváhagyásra került."

-#~ msgid "Chart of Account"
+#~ msgid "Chart of Accounts"
 #~ msgstr "Számlatükör"

 #~ msgid "JNRL"
--- a/addons/account/i18n/id.po
+++ b/addons/account/i18n/id.po
@ -2132,7 +2132,7 @@ msgstr ""

 #. module: account
 #: view:account.chart.template:0
-msgid "Search Chart of Account Templates"
+msgid "Search Chart of Accounts Templates"
 msgstr "Cari template grafik akun"

 #. module: account
@ -6696,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) "
@ -8745,7 +8745,7 @@ msgstr ""

 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr "Susunan akun-akun"

 #. module: account
@ -8792,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
--- a/addons/account/i18n/it.po
+++ b/addons/account/i18n/it.po
@ -2126,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
@ -6831,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) "
@ -8939,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
@ -8986,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
@ -11038,7 +11038,7 @@ msgstr ""
 #~ msgid "Statements reconciliation"
 #~ msgstr "Riconciliazione registrazioni"

-#~ msgid "Chart of Account"
+#~ msgid "Chart of Accounts"
 #~ msgstr "Piano dei conti"

 #~ msgid "Balance Sheet (Assets Accounts)"
--- a/addons/account/i18n/kab.po
+++ b/addons/account/i18n/kab.po
@ -2019,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
@ -6511,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) "
@ -8523,7 +8523,7 @@ msgstr ""

 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr ""

 #. module: account
@ -8570,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
--- a/addons/account/i18n/kk.po
+++ b/addons/account/i18n/kk.po
@ -2019,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
@ -6511,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) "
@ -8523,7 +8523,7 @@ msgstr ""

 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr ""

 #. module: account
@ -8570,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
--- a/addons/account/i18n/ko.po
+++ b/addons/account/i18n/ko.po
@ -2019,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
@ -6511,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) "
@ -8523,7 +8523,7 @@ msgstr ""

 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr ""

 #. module: account
@ -8570,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
--- a/addons/account/i18n/lo.po
+++ b/addons/account/i18n/lo.po
@ -2019,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
@ -6511,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) "
@ -8523,7 +8523,7 @@ msgstr ""

 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr ""

 #. module: account
@ -8570,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
--- a/addons/account/i18n/lt.po
+++ b/addons/account/i18n/lt.po
@ -2043,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
@ -6557,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) "
@ -8581,7 +8581,7 @@ msgstr ""

 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr "Sąskaitų planas"

 #. module: account
@ -8628,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
--- a/addons/account/i18n/lv.po
+++ b/addons/account/i18n/lv.po
@ -2087,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
@ -6598,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) "
@ -8613,7 +8613,7 @@ msgstr ""

 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr "Kontu plāns"

 #. module: account
@ -8660,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
--- a/addons/account/i18n/mk.po
+++ b/addons/account/i18n/mk.po
@ -2021,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
@ -6513,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) "
@ -8525,7 +8525,7 @@ msgstr ""

 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr ""

 #. module: account
@ -8572,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
--- a/addons/account/i18n/mn.po
+++ b/addons/account/i18n/mn.po
@ -2049,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
@ -6652,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) "
@ -8710,7 +8710,7 @@ msgstr "7 сар"

 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr "Дансны мод"

 #. module: account
@ -8757,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
@ -11174,7 +11174,7 @@ msgstr ""
 #~ msgid "</drawRightString>"
 #~ msgstr "</drawRightString>"

-#~ msgid "Chart of Account"
+#~ msgid "Chart of Accounts"
 #~ msgstr "Дансны төлөвлөгөө"

 #~ msgid "JNRL"
--- a/addons/account/i18n/nb.po
+++ b/addons/account/i18n/nb.po
@ -2052,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
@ -6573,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) "
@ -8597,7 +8597,7 @@ msgstr "Juli"

 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr "Kontoplan"

 #. module: account
@ -8644,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
@ -9846,7 +9846,7 @@ msgstr ""
 #~ msgid "Balance Sheet (Assets Accounts)"
 #~ msgstr "Balanse (Aktivakonti)"

-#~ msgid "Chart of Account"
+#~ msgid "Chart of Accounts"
 #~ msgstr "Kontoplan"

 #~ msgid "JNRL"
--- a/addons/account/i18n/nl.po
+++ b/addons/account/i18n/nl.po
@ -2126,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
@ -6745,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) "
@ -8788,7 +8788,7 @@ msgstr ""

 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr "Grootboekschema"

 #. module: account
@ -8835,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
--- a/addons/account/i18n/nl_BE.po
+++ b/addons/account/i18n/nl_BE.po
@ -2047,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
@ -6562,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) "
@ -8582,7 +8582,7 @@ msgstr ""

 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr ""

 #. module: account
@ -8629,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
--- a/addons/account/i18n/oc.po
+++ b/addons/account/i18n/oc.po
@ -2019,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
@ -6511,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) "
@ -8523,7 +8523,7 @@ msgstr ""

 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr "Plan comptable"

 #. module: account
@ -8570,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
--- a/addons/account/i18n/pl.po
+++ b/addons/account/i18n/pl.po
@ -2088,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
@ -6703,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) "
@ -8804,7 +8804,7 @@ msgstr "Lipiec"

 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr "Plan kont"

 #. module: account
@ -8851,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
@ -11362,5 +11362,5 @@ msgstr ""
 #~ msgid "is validated."
 #~ msgstr "zostało zatwierdzone."

-#~ msgid "Chart of Account"
+#~ msgid "Chart of Accounts"
 #~ msgstr "Plan kont"
--- a/addons/account/i18n/pt.po
+++ b/addons/account/i18n/pt.po
@ -2110,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
@ -6861,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) "
@ -9045,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
@ -9092,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
@ -11708,7 +11708,7 @@ msgstr ""
 #~ msgid "is validated."
 #~ msgstr "está validado"

-#~ msgid "Chart of Account"
+#~ msgid "Chart of Accounts"
 #~ msgstr "Plano de contas"

 #, python-format
--- a/addons/account/i18n/pt_BR.po
+++ b/addons/account/i18n/pt_BR.po
@ -2118,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
@ -6873,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) "
@ -9053,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
@ -9100,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
@ -11648,7 +11648,7 @@ msgstr ""
 #~ msgid "Statement encoding produces payment entries"
 #~ msgstr "Codificação de demonstrativos para lançamentos de pagamento"

-#~ msgid "Chart of Account"
+#~ msgid "Chart of Accounts"
 #~ msgstr "Plano de Conta"

 #, python-format
--- a/addons/account/i18n/ro.po
+++ b/addons/account/i18n/ro.po
@ -2045,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
@ -6583,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) "
@ -8619,7 +8619,7 @@ msgstr ""

 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr "Plan de conturi"

 #. module: account
@ -8666,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
--- a/addons/account/i18n/ru.po
+++ b/addons/account/i18n/ru.po
@ -2102,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
@ -6764,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) "
@ -8841,7 +8841,7 @@ msgstr "Июль"

 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr "План счетов"

 #. module: account
@ -8888,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
@ -10942,7 +10942,7 @@ msgstr "Обязательства"
 #~ msgid "Date/Period Filter"
 #~ msgstr "Фильтр даты/периода"

-#~ msgid "Chart of Account"
+#~ msgid "Chart of Accounts"
 #~ msgstr "План счетов"

 #, python-format
--- a/addons/account/i18n/si.po
+++ b/addons/account/i18n/si.po
@ -2019,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
@ -6511,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) "
@ -8523,7 +8523,7 @@ msgstr ""

 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr ""

 #. module: account
@ -8570,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
--- a/addons/account/i18n/sk.po
+++ b/addons/account/i18n/sk.po
@ -2019,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
@ -6511,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) "
@ -8526,7 +8526,7 @@ msgstr ""

 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr ""

 #. module: account
@ -8573,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
--- a/addons/account/i18n/sl.po
+++ b/addons/account/i18n/sl.po
@ -2026,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
@ -6526,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) "
@ -8546,7 +8546,7 @@ msgstr ""

 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr "Kontni načrt"

 #. module: account
@ -8593,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
--- a/addons/account/i18n/sq.po
+++ b/addons/account/i18n/sq.po
@ -2021,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
@ -6524,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) "
@ -8539,7 +8539,7 @@ msgstr ""

 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr ""

 #. module: account
@ -8586,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
--- a/addons/account/i18n/sr.po
+++ b/addons/account/i18n/sr.po
@ -2030,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
@ -6555,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) "
@ -8585,7 +8585,7 @@ msgstr ""

 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr "Kontni plan"

 #. module: account
@ -8632,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
--- a/addons/account/i18n/sr@latin.po
+++ b/addons/account/i18n/sr@latin.po
@ -2028,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
@ -6553,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) "
@ -8583,7 +8583,7 @@ msgstr ""

 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr "Kontni plan"

 #. module: account
@ -8630,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
--- a/addons/account/i18n/sv.po
+++ b/addons/account/i18n/sv.po
@ -2061,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
@ -6631,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) "
@ -8675,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
@ -8722,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
@ -11251,5 +11251,5 @@ msgstr ""
 #~ msgid "Invoice "
 #~ msgstr "Faktura "

-#~ msgid "Chart of Account"
+#~ msgid "Chart of Accounts"
 #~ msgstr "Kontoplan"
--- a/addons/account/i18n/ta.po
+++ b/addons/account/i18n/ta.po
@ -2019,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
@ -6511,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) "
@ -8523,7 +8523,7 @@ msgstr ""

 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr ""

 #. module: account
@ -8570,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
--- a/addons/account/i18n/te.po
+++ b/addons/account/i18n/te.po
@ -2019,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
@ -6511,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) "
@ -8523,7 +8523,7 @@ msgstr ""

 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr ""

 #. module: account
@ -8570,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
--- a/addons/account/i18n/th.po
+++ b/addons/account/i18n/th.po
@ -2021,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
@ -6513,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) "
@ -8525,7 +8525,7 @@ msgstr ""

 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr ""

 #. module: account
@ -8572,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
--- a/addons/account/i18n/tlh.po
+++ b/addons/account/i18n/tlh.po
@ -2018,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
@ -6510,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) "
@ -8522,7 +8522,7 @@ msgstr ""

 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr ""

 #. module: account
@ -8569,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
--- a/addons/account/i18n/tr.po
+++ b/addons/account/i18n/tr.po
@ -2109,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
@ -6834,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) "
@ -9002,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
@ -9049,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
@ -11092,8 +11092,8 @@ msgstr ""
 #~ msgid "</drawRightString>"
 #~ msgstr "</drawRightString>"

-#~ msgid "Chart of Account"
-#~ msgstr "Chart of Account"
+#~ msgid "Chart of Accounts"
+#~ msgstr "Chart of Accounts"

 #~ msgid "Partner Ref."
 #~ msgstr "Partner Ref."
--- a/addons/account/i18n/ug.po
+++ b/addons/account/i18n/ug.po
@ -2019,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
@ -6511,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) "
@ -8523,7 +8523,7 @@ msgstr ""

 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr ""

 #. module: account
@ -8570,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
--- a/addons/account/i18n/uk.po
+++ b/addons/account/i18n/uk.po
@ -2020,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
@ -6513,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) "
@ -8528,7 +8528,7 @@ msgstr ""

 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr "План Рахунків"

 #. module: account
@ -8575,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
--- a/addons/account/i18n/ur.po
+++ b/addons/account/i18n/ur.po
@ -2019,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
@ -6511,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) "
@ -8523,7 +8523,7 @@ msgstr ""

 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr ""

 #. module: account
@ -8570,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
--- a/addons/account/i18n/vi.po
+++ b/addons/account/i18n/vi.po
@ -2111,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
@ -6845,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) "
@ -9025,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
@ -9072,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
@ -10553,7 +10553,7 @@ msgstr "Tài sản nợ"
 #~ msgid "Invoice "
 #~ msgstr "Hóa đơn "

-#~ msgid "Chart of Account"
+#~ msgid "Chart of Accounts"
 #~ msgstr "Hệ thống tài khoản"

 #~ msgid "Document"
--- a/addons/account/i18n/zh_CN.po
+++ b/addons/account/i18n/zh_CN.po
@ -2021,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
@ -6550,7 +6550,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) "
@ -8594,7 +8594,7 @@ msgstr "7"

 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr "科目一览表"

 #. module: account
@ -8641,7 +8641,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
@ -11133,7 +11133,7 @@ msgstr "负债"
 #~ msgid "Balance Sheet (Assets Accounts)"
 #~ msgstr "资产负债表（资产科目）"

-#~ msgid "Chart of Account"
+#~ msgid "Chart of Accounts"
 #~ msgstr "科目一览表"

 #, python-format
--- a/addons/account/i18n/zh_HK.po
+++ b/addons/account/i18n/zh_HK.po
@ -2019,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
@ -6511,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) "
@ -8523,7 +8523,7 @@ msgstr ""

 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr ""

 #. module: account
@ -8570,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
--- a/addons/account/i18n/zh_TW.po
+++ b/addons/account/i18n/zh_TW.po
@ -2018,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
@ -6510,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) "
@ -8522,7 +8522,7 @@ msgstr ""

 #. module: account
 #: view:account.account:0
-msgid "Chart of accounts"
+msgid "Chart of Accounts"
 msgstr ""

 #. module: account
@ -8569,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
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@ -45,7 +45,7 @@ class account_installer(osv.osv_memory):
            sorted(((m.name, m.shortdesc)
                    for m in modules.browse(cr, uid, ids, context=context)),
                   key=itemgetter(1)))
-        charts.insert(0, ('configurable', 'Generic Chart Of Account'))
+        charts.insert(0, ('configurable', 'Generic Chart Of Accounts'))
        return charts

    _columns = {
@ -111,6 +111,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')
@ -219,7 +223,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(
--- a/addons/account/project/analytic_account_demo.xml
+++ b/addons/account/project/analytic_account_demo.xml
@ -103,6 +103,7 @@
            <field name="type">normal</field>
            <field name="state">open</field>
            <field name="partner_id" ref="base.res_partner_seagate"/>
+            <field name="contact_id" ref="base.res_partner_address_seagate"/>
        </record>
        <record id="analytic_seagate_p2" model="account.analytic.account">
            <field name="name">Seagate P2</field>
@ -111,6 +112,7 @@
            <field name="parent_id" ref="analytic_integration"/>
            <field name="state">open</field>
            <field name="partner_id" ref="base.res_partner_seagate"/>
+            <field name="contact_id" ref="base.res_partner_address_seagate"/>
        </record>
        <record id="analytic_magasin_bml_1" model="account.analytic.account">
            <field name="name">Magasin BML 1</field>
@ -118,6 +120,7 @@
            <field name="parent_id" ref="analytic_integration"/>
            <field name="type">normal</field>
            <field name="partner_id" ref="base.res_partner_15"/>
+            <field name="contact_id" ref="base.res_partner_address_14"/>
        </record>
        <record id="analytic_integration_c2c" model="account.analytic.account">
            <field name="name">CampToCamp</field>
@ -127,6 +130,7 @@
            <field eval="time.strftime('%Y-12-31')" name="date"/>
            <field name="parent_id" ref="analytic_integration"/>
            <field name="partner_id" ref="base.res_partner_c2c"/>
+            <field name="contact_id" ref="base.res_partner_address_Camptocamp"/>
            <field name="state">open</field>
        </record>
        <record id="analytic_agrolait" model="account.analytic.account">
@ -135,13 +139,15 @@
            <field name="parent_id" ref="analytic_customers"/>
            <field name="type">normal</field>
            <field name="partner_id" ref="base.res_partner_agrolait"/>
+            <field name="contact_id" ref="base.res_partner_address_8"/>
        </record>
        <record id="analytic_asustek" model="account.analytic.account">
            <field name="name">Asustek</field>
            <field name="code">4</field>
            <field name="type">normal</field>
-            <field name="parent_id" ref="analytic_customers"/>            
+            <field name="parent_id" ref="analytic_customers"/>
            <field name="partner_id" ref="base.res_partner_asus"/>
+            <field name="contact_id" ref="base.res_partner_address_tang"/>
        </record>
        <record id="analytic_distripc" model="account.analytic.account">
            <field name="name">DistriPC</field>
@ -149,6 +155,7 @@
            <field name="parent_id" ref="analytic_customers"/>
            <field name="type">normal</field>
            <field name="partner_id" ref="base.res_partner_4"/>
+            <field name="contact_id" ref="base.res_partner_address_7"/>
        </record>
        <record id="analytic_sednacom" model="account.analytic.account">
            <field name="name">Sednacom</field>
@ -158,6 +165,7 @@
            <field name="parent_id" ref="analytic_partners"/>
            <field name="type">normal</field>
            <field name="partner_id" ref="base.res_partner_sednacom"/>
+            <field name="contact_id" ref="base.res_partner_address_11"/>
            <field name="state">open</field>
        </record>
        <record id="analytic_thymbra" model="account.analytic.account">
@ -168,6 +176,7 @@
            <field name="type">normal</field>
            <field name="parent_id" ref="analytic_partners"/>
            <field name="partner_id" ref="base.res_partner_thymbra"/>
+            <field name="contact_id" ref="base.res_partner_address_thymbra"/>
            <field name="state">open</field>
        </record>
        <record id="analytic_leclerc" model="account.analytic.account">
@ -178,6 +187,7 @@
            <field name="type">normal</field>
            <field name="parent_id" ref="analytic_partners"/>
            <field name="partner_id" ref="base.res_partner_11"/>
+            <field name="contact_id" ref="base.res_partner_address_15"/>
        </record>
        <record id="analytic_desertic_hispafuentes" model="account.analytic.account">
            <field name="name">Desertic - Hispafuentes</field>
@ -187,6 +197,7 @@
            <field name="type">normal</field>
            <field name="parent_id" ref="analytic_partners"/>
            <field name="partner_id" ref="base.res_partner_desertic_hispafuentes"/>
+            <field name="contact_id" ref="base.res_partner_address_3000"/>
        </record>
        <record id="analytic_tiny_at_work" model="account.analytic.account">
            <field name="name">OpenERP SA AT Work</field>
@ -194,6 +205,7 @@
            <field name="type">normal</field>
            <field name="parent_id" ref="analytic_partners"/>
            <field name="partner_id" ref="base.res_partner_tinyatwork"/>
+            <field name="contact_id" ref="base.res_partner_address_tinyatwork"/>
        </record>
        <record id="analytic_partners_camp_to_camp" model="account.analytic.account">
            <field name="name">Camp to Camp</field>
@ -203,6 +215,7 @@
            <field name="type">normal</field>
            <field name="parent_id" ref="analytic_partners"/>
            <field name="partner_id" ref="base.res_partner_c2c"/>
+            <field name="contact_id" ref="base.res_partner_address_Camptocamp"/>
            <field name="state">open</field>
        </record>
        <record id="analytic_project_2_support" model="account.analytic.account">
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@ -8,11 +8,10 @@
            <field name="type">tree</field>
            <field eval="8" name="priority"/>
            <field name="arch" type="xml">
-                <tree toolbar="1" colors="red:(date&lt;current_date);black:(date&gt;=current_date);black:(date==False)" string="Analytic Accounts">
+                <tree toolbar="1" colors="red:state=='pending';grey:state=='done';blue:type=='view'" string="Analytic Accounts">
                    <field name="code"/>
                    <field name="complete_name"/>
                    <field name="quantity"/>
-                    <field name="quantity_max"/>
                    <field name="date"/>
                    <field name="user_id" invisible="1"/>
                    <field name="parent_id" invisible="1"/>
@ -57,11 +56,10 @@
            <field name="type">tree</field>
            <field name="field_parent">child_complete_ids</field>
            <field name="arch" type="xml">
-                <tree colors="blue:type == 'view';red:(date&lt;current_date);black:(date&gt;=current_date);black:(date==False)" string="Analytic account" toolbar="1">
+                <tree colors="red:state=='pending';grey:state=='done';blue:type=='view'" string="Analytic account" toolbar="1">
                    <field name="name"/>
                    <field name="code"/>
                    <field name="quantity"/>
-                    <field name="quantity_max"/>
                    <field name="debit"/>
                    <field name="credit"/>
                    <field name="balance"/>
@ -85,21 +83,24 @@
                    <group colspan="4" col="6">
                        <field name="name" select="1" colspan="4"/>
                        <field name="code" select="1"/>
-                        <field name="parent_id" on_change="on_change_parent(parent_id)" groups="base.group_extended" domain="[('type','=','view')]"/>
+                        <field name="parent_id" on_change="on_change_parent(parent_id)" groups="base.group_extended"/>
                        <field name="company_id" on_change="on_change_company(company_id)" select="2" widget="selection" groups="base.group_multi_company" attrs="{'required': [('type','&lt;&gt;','view')]}"/>
                        <field name="type" select="2"/>
                    </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"/>
@ -138,7 +139,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"
@ -191,7 +192,7 @@
                    <field name="journal_id" invisible="context.get('to_invoice', False)"/>
                    <field name="amount" sum="Total" invisible="context.get('to_invoice', False)"/>
                    <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id, journal_id)" invisible="not context.get('to_invoice', False)"/>
-                    <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)" sum="Total Quantity" invisible="not context.get('to_invoice', False)"/>
+                    <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)" sum="Total Quantity"/>
                    <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)" invisible="not context.get('to_invoice', False)"/>
                    <field domain="[('type','=','normal')]" name="account_id"/>
                    <field name="general_account_id" invisible="context.get('to_invoice', False)"/>
@ -255,7 +256,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">
--- 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'))" />
--- 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>
+</openerp>
--- 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>
+</openerp>
--- 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'))" />
--- 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'))" />
--- 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:
--- a/Show More
+++ b/Show More