[MERGE]: merge with lp:openobject-addons

bzr revid: atp@tinyerp.co.in-20100628094343-mtaonac5365ftezs

addons/account/__init__.py

@@ -25,6 +25,7 @@ import project
 import partner
 import invoice
 import account_bank_statement
+import account_cash_statement
 import account_move_line
 import account_analytic_line
 import wizard
@@ -33,4 +34,4 @@ import product
 import sequence
 import company
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account/__openerp__.py

@@ -18,8 +18,6 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
-
 {
     "name" : "Accounting and Financial Management",
     "version" : "1.1",
@@ -119,6 +117,8 @@ module named account_vouchers
         'report/account_account_report_view.xml',
         'report/account_analytic_entries_report_view.xml',
         'board_account_view.xml',
+        "wizard/account_pl_report_view.xml",
+        "wizard/account_bs_report_view.xml"
     ],
     'demo_xml': [
         #'demo/price_accuracy00.yml',
@@ -145,4 +145,4 @@ module named account_vouchers
     'active': False,
     'certificate': '0080331923549',
 }
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account/account.py

@@ -584,6 +584,9 @@ class account_journal_column(osv.osv):
         result = []
         cols = self.pool.get('account.move.line')._columns
         for col in cols:
+            if col in ('period_id', 'journal_id'):
+                continue
+                
             result.append( (col, cols[col].string) )
         result.sort()
         return result
@@ -657,11 +660,9 @@ class account_journal(osv.osv):
 #           })
         return journal_id
 
-    def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=100):
+    def name_search(self, cr, user, name, args=None, operator='ilike', context={}, limit=100):
         if not args:
             args = []
-        if context is None:
-            context = {}
         ids = []
         if name:
             ids = self.search(cr, user, [('code','ilike',name)]+ args, limit=limit, context=context)
@@ -832,7 +833,7 @@ class account_period(osv.osv):
                     cr.execute('update account_period set state=%s where id=%s', (mode, id))
         return True
 
-    def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=80):
+    def name_search(self, cr, user, name, args=None, operator='ilike', context={}, limit=80):
         if args is None:
             args = []
         if context is None:
@@ -844,7 +845,7 @@ class account_period(osv.osv):
             ids = self.search(cr, user, [('name',operator,name)]+ args, limit=limit)
         return self.name_get(cr, user, ids, context=context)
 
-    def write(self, cr, uid, ids, vals, context=None):
+    def write(self, cr, uid, ids, vals, context={}):
         obj=[]
         if 'company_id' in vals:
             move_lines = self.pool.get('account.move.line').search(cr, uid, [('period_id', 'in', ids)])
@@ -1143,6 +1144,7 @@ class account_move(osv.osv):
         return amount
 
     def _centralise(self, cr, uid, move, mode, context=None):
+        assert(mode in ('debit', 'credit'), 'Invalid Mode') #to prevent sql injection
         if context is None:
             context = {}
 
@@ -1190,10 +1192,7 @@ class account_move(osv.osv):
         else:
             line_id2 = 0
 
-        cr.execute('SELECT SUM(%s) '\
-                   'FROM account_move_line '\
-                   'WHERE move_id=%s AND id<>%s',
-                   (mode, move.id, line_id2))
+        cr.execute('SELECT SUM(%s) FROM account_move_line WHERE move_id=%%s AND id!=%%s' % (mode,), (move.id, line_id2))
         result = cr.fetchone()[0] or 0.0
         cr.execute('update account_move_line set '+mode2+'=%s where id=%s', (result, line_id))
         return True

addons/account/account_bank_statement.py

@@ -45,7 +45,7 @@ class account_bank_statement(osv.osv):
             'type': 'ir.actions.act_window',
             'target': 'new',
             'nodestroy': True
-                }
+        }
 
     def _default_journal_id(self, cr, uid, context={}):
         if context.get('journal_id', False):
@@ -303,6 +303,13 @@ class account_bank_statement(osv.osv):
                                 _('Ledger Posting line "%s" is not valid') % line.name)
 
                 if move.reconcile_id and move.reconcile_id.line_ids:
+                    ## Search if move has already a partial reconciliation
+                    previous_partial = False
+                    for line_reconcile_move in move.reconcile_id.line_ids:
+                        if line_reconcile_move.reconcile_partial_id:
+                            previous_partial = True
+                            break
+                    ##
                     torec += map(lambda x: x.id, move.reconcile_id.line_ids)
                     #try:
                     if abs(move.reconcile_amount-move.amount)<0.0001:
@@ -312,8 +319,14 @@ class account_bank_statement(osv.osv):
                         for entry in move.reconcile_id.line_new_ids:
                             writeoff_acc_id = entry.account_id.id
                             break
-
-                        account_move_line_obj.reconcile(cr, uid, torec, 'statement', writeoff_acc_id=writeoff_acc_id, writeoff_period_id=st.period_id.id, writeoff_journal_id=st.journal_id.id, context=context)
+                        ## If we have already a partial reconciliation
+                        ## We need to make a partial reconciliation
+                        ## To add this amount to previous paid amount
+                        if previous_partial:
+                            account_move_line_obj.reconcile_partial(cr, uid, torec, 'statement', context)
+                        ## If it's the first reconciliation, we do a full reconciliation as regular
+                        else:
+                            account_move_line_obj.reconcile(cr, uid, torec, 'statement', writeoff_acc_id=writeoff_acc_id, writeoff_period_id=st.period_id.id, writeoff_journal_id=st.journal_id.id, context=context)
                     else:
                         account_move_line_obj.reconcile_partial(cr, uid, torec, 'statement', context)
                     #except:
@@ -556,9 +569,9 @@ account_bank_statement_reconcile_line()
 
 class account_bank_statement_line(osv.osv):
 
-    def onchange_partner_id(self, cursor, user, line_id, partner_id, type, currency_id,
-            context={}):
+    def onchange_partner_id(self, cursor, user, line_id, partner_id, type, currency_id, context={}):
         res = {'value': {}}
+        
         if not partner_id:
             return res
         line = self.browse(cursor, user, line_id)
@@ -591,6 +604,10 @@ class account_bank_statement_line(osv.osv):
             balance = res_currency_obj.compute(cursor, user, company_currency_id,
                 currency_id, balance, context=context)
             res['value']['amount'] = balance
+        
+        if context.get('amount', 0) > 0:
+            res['value']['amount'] = context.get('amount')
+            
         return res
 
     def _reconcile_amount(self, cursor, user, ids, name, args, context=None):

addons/account/account_cash_statement.py

@@ -0,0 +1,448 @@
+# encoding: utf-8
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2008 PC Solutions (<http://pcsol.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv, fields
+import time
+from mx import DateTime
+from decimal import Decimal
+from tools.translate import _
+
+class singer_statement(osv.osv):
+    
+    """ Singer Statements """
+    
+    _name = 'singer.statement'
+    _description = 'Statement'
+
+    def _sub_total(self, cr, uid, ids, name, arg, context=None):
+       
+        """ Calculates Sub total"
+        @param name: Names of fields.
+        @param arg: User defined arguments
+        @return: Dictionary of values.
+        """
+        res = {}
+        for obj in self.browse(cr, uid, ids):
+            res[obj.id] = obj.pieces * obj.number
+        return res
+
+    def on_change_sub(self, cr, uid, ids, pieces, number,*a):
+
+        """ Calculates Sub total on change of number
+        @param pieces: Names of fields.
+        @param number:
+        """           
+        sub=pieces*number
+        return {'value':{'subtotal': sub or 0.0}}
+
+    _columns = {
+        'pieces': fields.float('Values', digits=(16,2)),
+        'number': fields.integer('Number'),
+        'subtotal': fields.function(_sub_total, method=True, string='Sub Total', type='float',digits=(16,2)),
+        'starting_id': fields.many2one('account.bank.statement',ondelete='cascade'),
+        'ending_id': fields.many2one('account.bank.statement',ondelete='cascade'),
+     }
+singer_statement()
+
+class account_cash_statement(osv.osv):
+    
+    _inherit = 'account.bank.statement'
+    
+    def _get_starting_balance(self, cr, uid, ids, name, arg, context=None):
+
+        """ Find starting balance  "
+        @param name: Names of fields.
+        @param arg: User defined arguments
+        @return: Dictionary of values.
+        """          
+        res ={}
+        for statement in self.browse(cr, uid, ids):
+            amount_total=0.0
+            for line in statement.starting_details_ids:
+                amount_total+= line.pieces * line.number
+            res[statement.id]=amount_total
+        return res
+    
+    def _balance_end_cash(self, cr, uid, ids, name, arg, context=None):
+        """ Find ending balance  "
+        @param name: Names of fields.
+        @param arg: User defined arguments
+        @return: Dictionary of values.
+        """          
+        res ={}
+        for statement in self.browse(cr, uid, ids):
+            amount_total=0.0
+            for line in statement.ending_details_ids:
+                amount_total+= line.pieces * line.number
+            res[statement.id]=amount_total
+        return res
+        
+    def _get_sum_entry_encoding(self, cr, uid, ids, name, arg, context=None):
+
+        """ Find encoding total of statements "
+        @param name: Names of fields.
+        @param arg: User defined arguments
+        @return: Dictionary of values.
+        """
+        res2={}
+        for statement in self.browse(cr, uid, ids):
+            encoding_total=0.0
+            for line in statement.line_ids:
+               encoding_total+= line.amount
+            res2[statement.id]=encoding_total
+        return res2
+
+    def _default_journal_id(self, cr, uid, context={}):
+
+        """ To get default journal for the object" 
+        @param name: Names of fields.
+        @return: journal 
+        """  
+        company_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.id
+        journal = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'cash'), ('company_id', '=', company_id)])
+        if journal:
+            return journal[0]
+        else:
+            return False
+    
+    def _end_balance(self, cursor, user, ids, name, attr, context=None):
+        res_currency_obj = self.pool.get('res.currency')
+        res_users_obj = self.pool.get('res.users')
+
+        res = {}
+
+        company_currency_id = res_users_obj.browse(cursor, user, user,
+                context=context).company_id.currency_id.id
+
+        statements = self.browse(cursor, user, ids, context=context)
+        for statement in statements:
+            res[statement.id] = statement.balance_start
+            currency_id = statement.currency.id
+            for line in statement.move_line_ids:
+                if line.debit > 0:
+                    if line.account_id.id == \
+                            statement.journal_id.default_debit_account_id.id:
+                        res[statement.id] += res_currency_obj.compute(cursor,
+                                user, company_currency_id, currency_id,
+                                line.debit, context=context)
+                else:
+                    if line.account_id.id == \
+                            statement.journal_id.default_credit_account_id.id:
+                        res[statement.id] -= res_currency_obj.compute(cursor,
+                                user, company_currency_id, currency_id,
+                                line.credit, context=context)
+            if statement.state in ('draft', 'open'):
+                for line in statement.line_ids:
+                    res[statement.id] += line.amount
+        for r in res:
+            res[r] = round(res[r], 2)
+        return res
+    
+    _columns = {
+        'company_id':fields.many2one('res.company', 'Company', required=False),
+        'journal_id': fields.many2one('account.journal', 'Journal', required=True),
+        'balance_start': fields.function(_get_starting_balance, method=True, string='Opening Balance', type='float',digits=(16,2), help="Opening balance based on cashBox"),
+        'balance_end_real': fields.float('Closing Balance', digits=(16,2), states={'confirm':[('readonly', True)]}, help="closing balance entered by the cashbox verifier"),
+        'state': fields.selection(
+            [('draft', 'Draft'),
+            ('confirm', 'Confirm'),
+            ('open','Open')], 'State', required=True, states={'confirm': [('readonly', True)]}, readonly="1"),
+        'total_entry_encoding':fields.function(_get_sum_entry_encoding, method=True, string="Cash Transaction", help="Total cash transactions"),
+        'date':fields.datetime("Open On"),
+        'closing_date':fields.datetime("Closed On"),
+        'balance_end': fields.function(_end_balance, method=True, string='Balance', help="Closing balance based on transactions"),
+        'balance_end_cash': fields.function(_balance_end_cash, method=True, string='Balance', help="Closing balance based on cashBox"),
+        'starting_details_ids': fields.one2many('singer.statement', 'starting_id', string='Opening Cashbox'),
+        'ending_details_ids': fields.one2many('singer.statement', 'ending_id', string='Closing Cashbox'),
+        'name': fields.char('Name', size=64, required=True, readonly=True),
+        'user_id':fields.many2one('res.users', 'Responsible', required=False),
+    }
+    _defaults = {
+        'state': lambda *a: 'draft',
+        'name': lambda *a: '/',
+        'date': lambda *a:time.strftime("%Y-%m-%d %H:%M:%S"),
+        'journal_id': _default_journal_id,
+        'user_id': lambda self, cr, uid, context=None: uid
+     }
+
+    def create(self, cr, uid, vals, context=None):
+        company_id = vals and vals.get('company_id',False)
+        if company_id:
+            open_jrnl = self.search(cr, uid, [('company_id', '=', vals['company_id']), ('journal_id', '=', vals['journal_id']), ('state', '=', 'open')])
+            if open_jrnl:
+                raise osv.except_osv('Error', u'Une caisse de type espèce est déjà ouverte')
+            if 'starting_details_ids' in vals:
+                vals['starting_details_ids'] = starting_details_ids = map(list, vals['starting_details_ids'])
+                for i in starting_details_ids:
+                    if i and i[0] and i[1]:
+                        i[0], i[1] = 0, 0
+        res = super(account_cash_statement, self).create(cr, uid, vals, context=context)
+        return res
+    
+    def onchange_journal_id(self, cr, uid, statement_id, journal_id, context={}):
+        """ Changes balance start and starting details if journal_id changes" 
+        @param statement_id: Changed statement_id
+        @param journal_id: Changed journal_id
+        @return:  Dictionary of changed values
+        """
+        
+        cash_pool = self.pool.get('singer.statement')
+        statement_pool = self.pool.get('account.bank.statement')
+
+        res = {}
+        balance_start = 0.0
+        
+        if not journal_id:
+            res.update({
+                'balance_start': balance_start
+            })
+            return res
+        
+        
+        res = super(account_cash_statement, self).onchange_journal_id(cr, uid, statement_id, journal_id, context)
+        return res
+
+    def button_open(self, cr, uid, ids, context=None):
+        
+        """ Changes statement state to Running.
+        @return: True 
+        """
+        cash_pool = self.pool.get('singer.statement')
+        statement_pool = self.pool.get('account.bank.statement')
+
+        statement = statement_pool.browse(cr, uid, ids[0])
+        number = self.pool.get('ir.sequence').get(cr, uid, 'account.bank.statement')
+        
+        if len(statement.starting_details_ids) > 0:
+            sid = []
+            for line in statement.starting_details_ids:
+                sid.append(line.id)
+            
+            cash_pool.unlink(cr, uid, sid)
+        
+        cr.execute("select id from account_bank_statement where journal_id=%s and user_id=%s and state=%s order by id desc limit 1", (statement.journal_id.id, uid, 'confirm'))
+        rs = cr.fetchone()
+        rs = rs and rs[0] or None
+        if rs:
+            statement = statement_pool.browse(cr, uid, rs)
+            balance_start = statement.balance_end_real or 0.0
+            open_ids = cash_pool.search(cr, uid, [('ending_id','=',statement.id)])
+            for sid in open_ids:
+                default = {
+                    'ending_id': False,
+                    'starting_id':ids[0]
+                }
+                cash_pool.copy(cr, uid, sid, default)
+            
+        vals = {
+            'date':time.strftime("%Y-%m-%d %H:%M:%S"), 
+            'state':'open',
+            'name':number
+        }
+        
+        self.write(cr, uid, ids, vals)
+        return True
+
+    def button_confirm(self, cr, uid, ids, context={}):
+        
+        """ Check the starting and ending detail of  statement 
+        @return: True 
+        """
+        done = []
+        res_currency_obj = self.pool.get('res.currency')
+        res_users_obj = self.pool.get('res.users')
+        account_move_obj = self.pool.get('account.move')
+        account_move_line_obj = self.pool.get('account.move.line')
+        account_bank_statement_line_obj = self.pool.get('account.bank.statement.line')
+
+        company_currency_id = res_users_obj.browse(cr, uid, uid, context=context).company_id.currency_id.id
+
+        for st in self.browse(cr, uid, ids, context):
+            if not st.state == 'open':
+                continue
+                
+            if st.balance_end != st.balance_end_cash:
+                raise osv.except_osv(_('Error !'), _('Cash balance is not matching with closing balance !'))
+                
+            if not (abs((st.balance_end or 0.0) - st.balance_end_real) < 0.0001):
+                raise osv.except_osv(_('Error !'),
+                        _('The statement balance is incorrect !\n') +
+                        _('The expected balance (%.2f) is different than the computed one. (%.2f)') % (st.balance_end_real, st.balance_end))
+            if (not st.journal_id.default_credit_account_id) \
+                    or (not st.journal_id.default_debit_account_id):
+                raise osv.except_osv(_('Configuration Error !'),
+                        _('Please verify that an account is defined in the journal.'))
+
+            for line in st.move_line_ids:
+                if line.state <> 'valid':
+                    raise osv.except_osv(_('Error !'),
+                            _('The account entries lines are not in valid state.'))
+            # for bank.statement.lines
+            # In line we get reconcile_id on bank.ste.rec.
+            # in bank stat.rec we get line_new_ids on bank.stat.rec.line
+            for move in st.line_ids:
+                context.update({'date':move.date})
+                move_id = account_move_obj.create(cr, uid, {
+                    'journal_id': st.journal_id.id,
+                    'period_id': st.period_id.id,
+                    'date': move.date,
+                }, context=context)
+                account_bank_statement_line_obj.write(cr, uid, [move.id], {
+                    'move_ids': [(4,move_id, False)]
+                })
+                if not move.amount:
+                    continue
+
+                torec = []
+                if move.amount >= 0:
+                    account_id = st.journal_id.default_credit_account_id.id
+                else:
+                    account_id = st.journal_id.default_debit_account_id.id
+                acc_cur = ((move.amount<=0) and st.journal_id.default_debit_account_id) or move.account_id
+                amount = res_currency_obj.compute(cr, uid, st.currency.id,
+                        company_currency_id, move.amount, context=context,
+                        account=acc_cur)
+                if move.reconcile_id and move.reconcile_id.line_new_ids:
+                    for newline in move.reconcile_id.line_new_ids:
+                        amount += newline.amount
+
+                val = {
+                    'name': move.name,
+                    'date': move.date,
+                    'ref': move.ref,
+                    'move_id': move_id,
+                    'partner_id': ((move.partner_id) and move.partner_id.id) or False,
+                    'account_id': (move.account_id) and move.account_id.id,
+                    'credit': ((amount>0) and amount) or 0.0,
+                    'debit': ((amount<0) and -amount) or 0.0,
+                    'statement_id': st.id,
+                    'journal_id': st.journal_id.id,
+                    'period_id': st.period_id.id,
+                    'currency_id': st.currency.id,
+                }
+
+                amount = res_currency_obj.compute(cr, uid, st.currency.id,
+                        company_currency_id, move.amount, context=context,
+                        account=acc_cur)
+                if st.currency.id <> company_currency_id:
+                    amount_cur = res_currency_obj.compute(cr, uid, company_currency_id,
+                                st.currency.id, amount, context=context,
+                                account=acc_cur)
+                    val['amount_currency'] = -amount_cur
+
+                if move.account_id and move.account_id.currency_id and move.account_id.currency_id.id <> company_currency_id:
+                    val['currency_id'] = move.account_id.currency_id.id
+                    if company_currency_id==move.account_id.currency_id.id:
+                        amount_cur = move.amount
+                    else:
+                        amount_cur = res_currency_obj.compute(cr, uid, company_currency_id,
+                                move.account_id.currency_id.id, amount, context=context,
+                                account=acc_cur)
+                    val['amount_currency'] = amount_cur
+
+                torec.append(account_move_line_obj.create(cr, uid, val , context=context))
+
+                if move.reconcile_id and move.reconcile_id.line_new_ids:
+                    for newline in move.reconcile_id.line_new_ids:
+                        account_move_line_obj.create(cr, uid, {
+                            'name': newline.name or move.name,
+                            'date': move.date,
+                            'ref': move.ref,
+                            'move_id': move_id,
+                            'partner_id': ((move.partner_id) and move.partner_id.id) or False,
+                            'account_id': (newline.account_id) and newline.account_id.id,
+                            'debit': newline.amount>0 and newline.amount or 0.0,
+                            'credit': newline.amount<0 and -newline.amount or 0.0,
+                            'statement_id': st.id,
+                            'journal_id': st.journal_id.id,
+                            'period_id': st.period_id.id,
+                            'analytic_account_id':newline.analytic_id and newline.analytic_id.id or False,
+
+                        }, context=context)
+
+                # Fill the secondary amount/currency
+                # if currency is not the same than the company
+                amount_currency = False
+                currency_id = False
+                if st.currency.id <> company_currency_id:
+                    amount_currency = move.amount
+                    currency_id = st.currency.id
+                account_move_line_obj.create(cr, uid, {
+                    'name': move.name,
+                    'date': move.date,
+                    'ref': move.ref,
+                    'move_id': move_id,
+                    'partner_id': ((move.partner_id) and move.partner_id.id) or False,
+                    'account_id': account_id,
+                    'credit': ((amount < 0) and -amount) or 0.0,
+                    'debit': ((amount > 0) and amount) or 0.0,
+                    'statement_id': st.id,
+                    'journal_id': st.journal_id.id,
+                    'period_id': st.period_id.id,
+                    'amount_currency': amount_currency,
+                    'currency_id': currency_id,
+                    }, context=context)
+
+                for line in account_move_line_obj.browse(cr, uid, [x.id for x in
+                        account_move_obj.browse(cr, uid, move_id,
+                            context=context).line_id],
+                        context=context):
+                    if line.state <> 'valid':
+                        raise osv.except_osv(_('Error !'),
+                                _('Ledger Posting line "%s" is not valid') % line.name)
+
+                if move.reconcile_id and move.reconcile_id.line_ids:
+                    torec += map(lambda x: x.id, move.reconcile_id.line_ids)
+                    #try:
+                    if abs(move.reconcile_amount-move.amount)<0.0001:
+
+                        writeoff_acc_id = False
+                        #There should only be one write-off account!
+                        for entry in move.reconcile_id.line_new_ids:
+                            writeoff_acc_id = entry.account_id.id
+                            break
+
+                        account_move_line_obj.reconcile(cr, uid, torec, 'statement', writeoff_acc_id=writeoff_acc_id, writeoff_period_id=st.period_id.id, writeoff_journal_id=st.journal_id.id, context=context)
+                    else:
+                        account_move_line_obj.reconcile_partial(cr, uid, torec, 'statement', context)
+                    #except:
+                    #    raise osv.except_osv(_('Error !'), _('Unable to reconcile entry "%s": %.2f') % (move.name, move.amount))
+
+                if st.journal_id.entry_posted:
+                    account_move_obj.write(cr, uid, [move_id], {'state':'posted'})
+            done.append(st.id)
+        self.write(cr, uid, done, {'state':'confirm'}, context=context)
+        return True
+
+    def button_cancel(self, cr, uid, ids, context={}):
+        done = []
+        for st in self.browse(cr, uid, ids, context):
+            ids = []
+            for line in st.line_ids:
+                ids += [x.id for x in line.move_ids]
+            self.pool.get('account.move').unlink(cr, uid, ids, context)
+            done.append(st.id)
+        self.write(cr, uid, done, {'state':'draft'}, context=context)
+        return True
+
+account_cash_statement()
+

addons/account/account_installer.xml

@@ -17,7 +17,7 @@
           </separator>
           <xpath expr="//label[@string='description']"
                  position="attributes">
-            <attribute name="string">You can enhance OpenERP's basic accounting support with a few additional OpenERP applications.</attribute>
+            <attribute name="string">From this screen, you can configure your accounting system. Choose a Chart of Account matched to your accounting system or the Generic Chart of Account which allows you to configure which suit your needs.</attribute>
           </xpath>
           <xpath expr="//button[@string='Install Modules']" position="attributes">
                 <attribute name="string">Configure</attribute>

addons/account/account_invoice_view.xml

@@ -349,11 +349,15 @@
                    <group col="10" colspan="4">
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Invoices"/>
                         <filter icon="terp-check" string="Proforma" domain="[('state','=','proforma2')]" help="Proforma Invoices"/>
+                        <filter icon="terp-check" string="Invoices" domain="[('state','not in',['draft','cancel','cancel'])]" help="Invoices"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-dolar_ok!" string="Unpaid" domain="[('state','=','open')]" help="Unpaid Invoices"/>
                         <separator orientation="vertical"/>
                         <field name="number"/>
                         <field name="partner_id"/>
-                        <field name="user_id" default="uid"/>
+                        <field name="user_id" select="1" default="uid" widget="selection" string="Responsible">
+                            <filter domain="[('user_id','=',uid)]" help="Responsible" icon="terp-partner" separator="1"/>
+                        </field>
                         <field name="origin"/>
                         <field name="amount_total"/>
                     </group>
@@ -363,7 +367,7 @@
                         <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <filter string="Salesman" icon="terp-personal" domain="[]"  context="{'group_by':'user_id'}"/>
+                        <filter string="Responsible" icon="terp-personal" domain="[]"  context="{'group_by':'user_id'}"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]"  context="{'group_by':'state'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Invoice Date" icon="terp-go-month" domain="[]"  context="{'group_by':'date_invoice'}"/>

addons/account/account_menuitem.xml

@@ -2,31 +2,30 @@
 <openerp>
     <data>
 
-    	<menuitem icon="terp-account" id="menu_finance" name="Financial Management" sequence="1"/>
-        <menuitem id="menu_finance_receivables" name="Receivables" parent="menu_finance" sequence="2"/>
-        <menuitem id="menu_finance_payables" name="Payables" parent="menu_finance" sequence="3"/>
-        <menuitem id="menu_finance_bank_and_cash" name="Bank and Cash" parent="menu_finance" sequence="4"/>
+        <menuitem icon="terp-account" id="menu_finance" name="Accounting" sequence="13"/>
+        <menuitem id="menu_finance_receivables" name="Receivables" parent="menu_finance" sequence="1"/>
+        <menuitem id="menu_finance_payables" name="Payables" parent="menu_finance" sequence="2"/>
+        <menuitem id="menu_finance_bank_and_cash" name="Bank and Cash" parent="menu_finance" sequence="3"/>
 <!--        <menuitem id="menu_accounting" name="Accounting" parent="menu_finance" sequence="5"/>-->
         <menuitem id="menu_finance_periodical_processing" name="Periodical Processing" parent="menu_finance" sequence="8" groups="group_account_user"/>
-        	<menuitem id="periodical_processing_journal_entries_validation" name="Journal Entries Validation" parent="menu_finance_periodical_processing"/>
-        	<menuitem id="periodical_processing_reconciliation" name="Reconciliation" parent="menu_finance_periodical_processing"/>
-<!--        	<menuitem id="periodical_processing_recurrent_entries" name="Recurrent Entries" parent="menu_finance_periodical_processing"/>-->
-        	<menuitem id="periodical_processing_invoicing" name="Invoicing" parent="menu_finance_periodical_processing"/>
-<!--        	<menuitem id="periodical_processing_end_of_period" name="End of Period" parent="menu_finance_periodical_processing"/>-->
-        <menuitem id="menu_finance_charts" name="Charts" parent="menu_finance" sequence="10"/>
+            <menuitem id="periodical_processing_journal_entries_validation" name="Journal Entries Validation" parent="menu_finance_periodical_processing"/>
+            <menuitem id="periodical_processing_reconciliation" name="Reconciliation" parent="menu_finance_periodical_processing"/>
+<!--            <menuitem id="periodical_processing_recurrent_entries" name="Recurrent Entries" parent="menu_finance_periodical_processing"/>-->
+            <menuitem id="periodical_processing_invoicing" name="Invoicing" parent="menu_finance_periodical_processing"/>
+<!--            <menuitem id="periodical_processing_end_of_period" name="End of Period" parent="menu_finance_periodical_processing"/>-->
+        <menuitem id="menu_finance_charts" name="Charts" parent="menu_finance" sequence="5"/>
         <menuitem id="menu_finance_reporting" name="Reporting" parent="account.menu_finance" sequence="12"/>
-        	<menuitem id="menu_finance_reporting_budgets" name="Budgets" parent="menu_finance_reporting"/>
-        	<menuitem id="menu_generic_report" name="Management Reports" parent="menu_finance_reporting"/>
-        	<menuitem id="menu_finance_legal_statement" name="Legal Reports" parent="menu_finance_reporting"/>
-        	<menuitem id="menu_finance_management_belgian_reports" name="Belgian Reports" parent="menu_finance_reporting"/>
+            <menuitem id="menu_finance_reporting_budgets" name="Budgets" parent="menu_finance_reporting"/>
+            <menuitem id="menu_generic_report" name="Management Reports" parent="menu_finance_reporting"/>
+            <menuitem id="menu_finance_legal_statement" name="Legal Reports" parent="menu_finance_reporting"/>
+            <menuitem id="menu_finance_management_belgian_reports" name="Belgian Reports" parent="menu_finance_reporting"/>
         <menuitem id="menu_finance_configuration" name="Configuration" parent="menu_finance" sequence="13"/>
-        	<menuitem id="menu_finance_accounting" name="Financial Accounting" parent="menu_finance_configuration"/>
-        	<menuitem id="menu_analytic_accounting" name="Analytic Accounting" parent="menu_finance_configuration"/>
-        		<menuitem id="menu_analytic" parent="menu_analytic_accounting" name="Accounts"/>
-        		<menuitem id="menu_low_level" name="Low Level" parent="menu_finance_accounting"/>
-        	<menuitem id="menu_configuration_misc" name="Miscelleanous" parent="menu_finance_configuration"/>
-				<menuitem id="base.menu_action_currency_form" parent="menu_configuration_misc" sequence="20"/>
-        <menuitem icon="terp-account" id="menu_finance" name="Financial Management" sequence="5"/>
+            <menuitem id="menu_finance_accounting" name="Financial Accounting" parent="menu_finance_configuration"/>
+            <menuitem id="menu_analytic_accounting" name="Analytic Accounting" parent="menu_finance_configuration"/>
+                <menuitem id="menu_analytic" parent="menu_analytic_accounting" name="Accounts"/>
+                <menuitem id="menu_low_level" name="Low Level" parent="menu_finance_accounting"/>
+            <menuitem id="menu_configuration_misc" name="Miscelleanous" parent="menu_finance_configuration"/>
+                <menuitem id="base.menu_action_currency_form" parent="menu_configuration_misc" sequence="20"/>
 <!--        <menuitem id="menu_finance_configuration1" name="Configuration" parent="menu_finance" sequence="80"/>-->
 <!--        <menuitem id="base.menu_action_currency_form" parent="menu_finance_configuration" sequence="20"/>-->
 <!--        <menuitem id="menu_finance_accounting1" name="Financial Accounting" parent="menu_finance_configuration" sequence="80"/>-->
@@ -37,9 +36,9 @@
 <!--        <menuitem id="menu_finance_legal_statement1" name="Legal Statements" parent="account.menu_finance_reporting" sequence="200"/>-->
 <!--        <menuitem id="menu_generic_report" name="Generic Reports" parent="account.menu_finance_legal_statement" sequence="8"/>-->
 
-        <menuitem id="menu_finance_entries" name="Accounting" parent="menu_finance" sequence="1"
+        <menuitem id="menu_finance_entries" name="Accounting" parent="menu_finance" sequence="4"
             groups="group_account_user"/>
-        <menuitem id="account.menu_finance_recurrent_entries" name="Recurrent Entries" parent="menu_finance_periodical_processing" sequence="15"/>
+        <menuitem id="account.menu_finance_recurrent_entries" name="Recurring Entries" parent="menu_finance_periodical_processing" sequence="15"/>
 
 <!--        <menuitem id="menu_finance_periodical_processing11" name="Periodical Processing" parent="account.menu_finance"-->
 <!--            sequence="3"-->

addons/account/account_move_line.py

@@ -788,57 +788,89 @@ class account_move_line(osv.osv):
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context={}, toolbar=False, submenu=False):
         result = super(osv.osv, self).fields_view_get(cr, uid, view_id,view_type,context,toolbar=toolbar, submenu=submenu)
-        if view_type=='tree' and 'journal_id' in context:
-            title = self.view_header_get(cr, uid, view_id, view_type, context)
-            journal = self.pool.get('account.journal').browse(cr, uid, context['journal_id'])
+        if view_type != 'tree':
+            return result
 
-            # if the journal view has a state field, color lines depending on
-            # its value
-            state = ''
+        fld = []
+        fields = {}
+        flds = []
+        title = self.view_header_get(cr, uid, view_id, view_type, context)
+        xml = '''<?xml version="1.0"?>\n<tree string="%s" editable="top" refresh="5" on_write="on_create_write">\n\t''' % (title)
+        journal_pool = self.pool.get('account.journal')
+        
+        ids = journal_pool.search(cr, uid, [])
+        journals = journal_pool.browse(cr, uid, ids)
+        all_journal = [None]
+        common_fields = {}
+        total = len(journals)
+        for journal in journals:
+            all_journal.append(journal.id)
             for field in journal.view_id.columns_id:
-                if field.field=='state':
-                    state = ' colors="red:state==\'draft\'"'
-
-            #xml = '''<?xml version="1.0"?>\n<tree string="%s" editable="top" refresh="5"%s>\n\t''' % (title, state)
-            xml = '''<?xml version="1.0"?>\n<tree string="%s" editable="top" refresh="5" on_write="on_create_write"%s>\n\t''' % (title, state)
-            fields = []
-
-            widths = {
-                'ref': 50,
-                'statement_id': 50,
-                'state': 60,
-                'tax_code_id': 50,
-                'move_id': 40,
-            }
-            for field in journal.view_id.columns_id:
-                fields.append(field.field)
-                attrs = []
-                if field.field=='debit':
-                    attrs.append('sum="Total debit"')
-                elif field.field=='credit':
-                    attrs.append('sum="Total credit"')
-                elif field.field=='account_tax_id':
-                    attrs.append('domain="[(\'parent_id\',\'=\',False)]"')
-                elif field.field=='account_id' and journal.id:
-                    attrs.append('domain="[(\'journal_id\', \'=\', '+str(journal.id)+'),(\'type\',\'&lt;&gt;\',\'view\'), (\'type\',\'&lt;&gt;\',\'closed\')]" on_change="onchange_account_id(account_id, partner_id)"')
-                elif field.field == 'partner_id':
-                    attrs.append('on_change="onchange_partner_id(move_id,partner_id,account_id,debit,credit,date,((\'journal_id\' in context) and context[\'journal_id\']) or {})"')
-                if field.readonly:
-                    attrs.append('readonly="1"')
-                if field.required:
-                    attrs.append('required="1"')
+                if not field.field in fields:
+                    fields[field.field] = [journal.id]
+                    fld.append((field.field, field.sequence))
+                    flds.append(field.field)
+                    common_fields[field.field] = 1
                 else:
-                    attrs.append('required="0"')
-                if field.field in ('amount_currency','currency_id'):
-                    attrs.append('on_change="onchange_currency(account_id,amount_currency,currency_id,date,((\'journal_id\' in context) and context[\'journal_id\']) or {})"')
+                    fields.get(field.field).append(journal.id)
+                    common_fields[field.field] = common_fields[field.field] + 1
+        
+        fld.append(('period_id', 3))
+        fld.append(('journal_id', 10))
+        flds.append('period_id')
+        flds.append('journal_id')
+        fields['period_id'] = all_journal
+        fields['journal_id'] = all_journal
+        
+        from operator import itemgetter
+        fld = sorted(fld, key=itemgetter(1))
 
-                if field.field in widths:
-                    attrs.append('width="'+str(widths[field.field])+'"')
-                xml += '''<field name="%s" %s/>\n''' % (field.field,' '.join(attrs))
+        widths = {
+            'ref': 50,
+            'statement_id': 50,
+            'state': 60,
+            'tax_code_id': 50,
+            'move_id': 40,
+        }
 
-            xml += '''</tree>'''
-            result['arch'] = xml
-            result['fields'] = self.fields_get(cr, uid, fields, context)
+        for field_it in fld:
+            field = field_it[0]
+            
+            if common_fields.get(field) == total:
+                fields.get(field).append(None)
+            
+            if field=='state':
+                state = 'colors="red:state==\'draft\'"'
+            
+            attrs = []
+            if field == 'debit':
+                attrs.append('sum="Total debit"')
+            elif field == 'credit':
+                attrs.append('sum="Total credit"')
+            elif field == 'account_tax_id':
+                attrs.append('domain="[(\'parent_id\',\'=\',False)]"')
+            elif field == 'account_id' and journal.id:
+                attrs.append('domain="[(\'journal_id\', \'=\', '+str(journal.id)+'),(\'type\',\'&lt;&gt;\',\'view\'), (\'type\',\'&lt;&gt;\',\'closed\')]" on_change="onchange_account_id(account_id, partner_id)"')
+            elif field == 'partner_id':
+                attrs.append('on_change="onchange_partner_id(move_id, partner_id, account_id, debit, credit, date, journal_id)"')
+#            if field.readonly:
+#                attrs.append('readonly="1"')
+#            if field.required:
+#                attrs.append('required="1"')
+#            else:
+#                attrs.append('required="0"')
+            if field in ('amount_currency','currency_id'):
+                attrs.append('on_change="onchange_currency(account_id, amount_currency,currency_id, date, journal_id)"')
+
+            if field in widths:
+                attrs.append('width="'+str(widths[field])+'"')
+            
+            attrs.append("invisible=\"context.get('visible_id') not in %s\"" % (fields.get(field)))
+            xml += '''<field name="%s" %s/>\n''' % (field,' '.join(attrs))
+
+        xml += '''</tree>'''
+        result['arch'] = xml
+        result['fields'] = self.fields_get(cr, uid, flds, context)
         return result
 
     def _check_moves(self, cr, uid, context):

addons/account/account_report.xml

@@ -34,7 +34,7 @@
             string="Taxes Report"/>
 
         <report id="report_account_voucher_new"
-            string="Voucher"
+            string="Print Voucher"
             model="account.move"
             name="account.move.voucher"
             rml="account/report/voucher_print.rml"
@@ -61,21 +61,6 @@
             parent="menu_tax_report"
             type="wizard"/> -->
 
-
-        <record id="action_tax_code_tree" model="ir.actions.act_window">
-            <field name="name">Chart of Taxes</field>
-            <field name="res_model">account.tax.code</field>
-            <field name="domain">[('parent_id','=',False)]</field>
-            <field name="view_type">tree</field>
-            <field name="view_id" ref="view_tax_code_tree"/>
-        </record>
-        <menuitem
-            action="action_tax_code_tree"
-            id="menu_action_tax_code_tree"
-            parent="menu_tax_report"
-            sequence="12"/>
-
-
         <report id="account_account_balance_compare"
             string="Account balance"
             model="account.account"

addons/account/account_unit_test.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data noupdate="1">
+    <data>
         <!-- This file must be loaded  _after_  account_demo.xml ! --> 
         <record id="test_invoice_1" model="account.invoice">
             <field name="currency_id" ref="base.EUR"/>
@@ -44,14 +44,14 @@
             <test expr="state">open</test>
         </assert>
         <function model="account.invoice" name="pay_and_reconcile">
-			<!-- ids = -->					<value eval="[ref('test_invoice_1')]"/>
-			<!-- pay_amount = -->			<value eval="1850"/>
-			<!-- pay_account_id = -->		<value eval="ref('cash')"/>
-			<!-- period_id = -->			<value eval="ref('account.period_' + str(int(time.strftime('%m'))))"/>
-			<!-- pay_journal_id = -->		<value eval="ref('bank_journal')"/>
-			<!-- writeoff_acc_id = -->		<value eval="ref('cash')"/>
-			<!-- writeoff_period_id = -->	<value eval="ref('account.period_' + str(int(time.strftime('%m'))))"/>
-			<!-- writeoff_journal_id = -->	<value eval="ref('bank_journal')"/>
+            <!-- ids = -->                    <value eval="[ref('test_invoice_1')]"/>
+            <!-- pay_amount = -->            <value eval="1850"/>
+            <!-- pay_account_id = -->        <value eval="ref('cash')"/>
+            <!-- period_id = -->            <value eval="ref('account.period_' + str(int(time.strftime('%m'))))"/>
+            <!-- pay_journal_id = -->        <value eval="ref('bank_journal')"/>
+            <!-- writeoff_acc_id = -->        <value eval="ref('cash')"/>
+            <!-- writeoff_period_id = -->    <value eval="ref('account.period_' + str(int(time.strftime('%m'))))"/>
+            <!-- writeoff_journal_id = -->    <value eval="ref('bank_journal')"/>
         </function>
         
         <assert id="test_invoice_1" model="account.invoice" string="Test invoice 1 is now paid">

addons/account/account_view.xml

@@ -270,12 +270,12 @@
             <field name="arch" type="xml">
                 <form string="Account Journal">
                     <group colspan="4" col="6">
-                        <field name="name" select="1"/>
+                        <field name="name" select="1" colspan="4"/>
                         <field name="code" select="1"/>
                         <field name="type" on_change="onchange_type(type)"/>
                         <field name="refund_journal" attrs="{'readonly':[('type','=','general'),('type','=','cash'),('type','=','situation')]}"/>
                     </group>
-					    <notebook colspan="4">
+                    <notebook colspan="4">
                         <page string="General Information">
                             <group colspan="2" col="2">
                                 <separator string="Journal View" colspan="4"/>
@@ -292,28 +292,31 @@
                                 <field name="default_debit_account_id" attrs="{'required':[('type','=','cash')]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                                 <field name="default_credit_account_id" attrs="{'required':[('type','=','cash')]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                             </group>
-
-							<group colspan="2" col="2">
-                                <separator string="Validations" colspan="4"/>
-                                <field name="allow_date" groups="base.group_extended"/>
+                            
+                            <group colspan="2" col="2">
+                                <separator string="Invoicing Data" colspan="4"/>
+                                <field name="invoice_sequence_id"/>
+                                <field name="group_invoice_lines"/>
                             </group>
-
+                            
                             <group colspan="2" col="2">
                                 <separator string="Company" colspan="4"/>
                                 <field name="company_id" groups="base.group_multi_company"/>
                                 <field name="user_id" groups="base.group_extended"/>
                                 <field name="currency"/>
                             </group>
+                            <group col="2" colspan="2">
+                                <group colspan="2" col="2">
+                                    <separator string="Validations" colspan="4"/>
+                                    <field name="allow_date" groups="base.group_extended"/>
+                                </group>
 
-                            <group colspan="2" col="2">
-                                <separator string="Other Configuration" colspan="4"/>
-                                <field name="centralisation" groups="base.group_extended"/>
-                                <field name="entry_posted"/>
-	                            <group colspan="2" col="2">
-	                                <separator string="Invoicing Data" colspan="4"/>
-	                                <field name="invoice_sequence_id"/>
-	                                <field name="group_invoice_lines"/>
-	                            </group>
+                                <group colspan="2" col="2">
+                                    <separator string="Other Configuration" colspan="4"/>
+                                    <field name="centralisation" groups="base.group_extended"/>
+                                    <field name="entry_posted"/>
+                                    <field name="update_posted"/>
+                                </group>
                             </group>
                         </page>
                         <page string="Entry Controls" groups="base.group_extended">
@@ -333,7 +336,25 @@
             <field name="view_mode">tree,form</field>
         </record>
         <menuitem action="action_account_journal_form" id="menu_action_account_journal_form" parent="account_account_menu"/>
-
+        
+        <record id="view_account_bank_statement_filter" model="ir.ui.view">
+            <field name="name">account.bank.statement.select</field>
+            <field name="model">account.bank.statement</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Statement">
+                   <group col="10" colspan="4">
+                        <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Statement"/>
+                        <filter icon="terp-check" string="Poster" domain="[('state','=','confirm')]" help="Confirm confirm"/>
+                        <separator orientation="vertical"/>
+                        <field name="name"/>
+                        <field name="date"/>
+                        <field name="journal_id"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+        
         <record id="view_bank_statement_tree" model="ir.ui.view">
             <field name="name">account.bank.statement.tree</field>
             <field name="model">account.bank.statement</field>
@@ -357,22 +378,23 @@
             <field name="model">account.bank.statement</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Statement">
-                    <field name="name" select="1"/>
-                    <field name="date" select="1"/>
-                    <field name="journal_id" on_change="onchange_journal_id(journal_id)" select="1"/>
-                    <field name="currency"/>
-                    <field name="period_id"/>
-                    <group colspan="2" col="3">
-<!--                        <button name="%(action_view_account_statement_from_invoice)d"-->
-<!--                            string="Import Invoice" type="action" attrs="{'invisible':[('state','=','confirm')]}" icon="gtk-open"/>-->
-                        <button name="button_import_invoice" string="Import Invoice" attrs="{'invisible':[('state','=','confirm')]}" type="object" icon="gtk-apply"/>
-                    </group>
-                    <newline/>
-                    <field name="balance_start"/>
+                <form string="Bank Statement">
+                    <group col="6" colspan="4">
+                        <field name="name" select="1"/>
+                        <field name="date" select="1"/>
+                        <field name="journal_id" on_change="onchange_journal_id(journal_id)" select="1"/>
+<!--                        <field name="currency"/>-->
+                        <field name="period_id"/>
+<!--                        <group colspan="2" col="3">-->
+    <!--                        <button name="%(action_view_account_statement_from_invoice)d"-->
+    <!--                            string="Import Invoice" type="action" attrs="{'invisible':[('state','=','confirm')]}" icon="gtk-open"/>-->
+<!--                            <button name="button_import_invoice" string="Import Invoice" attrs="{'invisible':[('state','=','confirm')]}" type="object" icon="gtk-apply"/>-->
+<!--                        </group>-->
+                        <field name="balance_start"/>
                     <field name="balance_end_real"/>
+                    </group>                    
                     <notebook colspan="4">
-                        <page string="Entry encoding">
+                        <page string="Transaction">
                             <field colspan="4" name="line_ids" nolabel="1">
                                 <tree editable="bottom" string="Statement lines">
                                     <field name="sequence" invisible="1"/>
@@ -380,7 +402,7 @@
                                     <field name="ref"/>
                                     <field name="name"/>
                                     <field name="type"/>
-                                    <field name="partner_id" on_change="onchange_partner_id(partner_id, type, parent.currency)"/>
+                                    <field name="partner_id" on_change="onchange_partner_id(partner_id, type, parent.currency, {'amount': amount})"/>
                                     <field domain="[('journal_id','=',parent.journal_id)]" name="account_id"/>
                                     <field name="amount"/>
                                     <field context="{'partner_id': partner_id, 'amount': amount, 'account_id': account_id, 'currency_id': parent.currency, 'journal_id': parent.journal_id, 'date':date}" name="reconcile_id"/>
@@ -401,7 +423,7 @@
                                 </form>
                             </field>
                         </page>
-                        <page string="Real Entries">
+                        <page string="Accounting Entries">
                             <field colspan="4" name="move_line_ids" nolabel="1"/>
                         </page>
                     </notebook>
@@ -420,6 +442,7 @@
             <field name="res_model">account.bank.statement</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="domain">[('journal_id.type', '=', 'bank')]</field>
         </record>
         <menuitem string="Bank Statements" action="action_bank_statement_tree" id="menu_bank_statement_tree" parent="menu_finance_bank_and_cash" sequence="7"/>
 
@@ -610,7 +633,7 @@
             <field name="view_id" ref="view_tax_code_tree"/>
         </record>
        <menuitem id="next_id_27" name="Taxes" parent="account.menu_finance_accounting"/>
-        <menuitem action="action_tax_code_list" id="menu_action_tax_code_list" parent="menu_low_level" sequence="12"/>
+       <menuitem action="action_tax_code_list" id="menu_action_tax_code_list" parent="menu_low_level" sequence="12"/>
 
 
         <!--
@@ -692,10 +715,21 @@
             <field name="domain">[('parent_id','=',False)]</field>
         </record>
         <menuitem action="action_tax_form" id="menu_action_tax_form" parent="next_id_27"/>
-
-<!--       <wizard id="action_move_journal_line_form" menu="False" model="account.move.line" name="account.move.journal" string="Entries by Line"/>
-        <menuitem icon="STOCK_JUSTIFY_FILL" action="action_move_journal_line_form" id="menu_action_move_journal_line_form" parent="account.menu_finance_entries" type="wizard" sequence="5"/>
--->
+        
+        <record id="action_tax_code_tree" model="ir.actions.act_window">
+            <field name="name">Chart of Taxes</field>
+            <field name="res_model">account.tax.code</field>
+            <field name="domain">[('parent_id','=',False)]</field>
+            <field name="view_type">tree</field>
+            <field name="view_id" ref="view_tax_code_tree"/>
+        </record>
+        <menuitem
+            action="action_tax_code_tree"
+            id="menu_action_tax_code_tree"
+            parent="menu_finance_charts"
+            sequence="12"/>
+<!--       <wizard id="action_move_journal_line_form" menu="False" model="account.move.line" name="account.move.journal" string="Entries by Line"/-->
+        
         <!--
     Entries lines
     -->
@@ -713,7 +747,7 @@
                     <field name="ref"/>
                     <field name="invoice"/>
                     <field name="name"/>
-                    <field name="partner_id"/>
+                    <field name="partner_id" on_change="onchange_partner_id(move_id, partner_id, account_id, debit, credit, date, journal_id)"/>
                     <field name="account_id" domain="[('journal_id','=',journal_id)]"/>
                     <field name="journal_id"/>
                     <field name="debit" sum="Total debit"/>
@@ -843,10 +877,15 @@
                         <field name="date" select='1'/>
                         <field name="account_id" select='1'/>
                         <field name="partner_id" select='1'>
-                        	<filter help="Next Partner Entries to reconcile" name="next_partner" string="Next Partner to reconcile" context="{'next_partner_only': 1}" icon="terp-partner" domain="[('account_id.reconcile','=',True),('reconcile_id','=',False)]"/>
+                            <filter help="Next Partner Entries to reconcile" name="next_partner" string="Next Partner to reconcile" context="{'next_partner_only': 1}" icon="terp-partner" domain="[('account_id.reconcile','=',True),('reconcile_id','=',False)]"/>
                         </field>
                         <field name="balance" string="Debit/Credit" select='1'/>
                     </group>
+                    <newline/>
+                    <group col="10" colspan="4">
+                        <field name="journal_id" widget="selection" context="{'journal_id':self, 'visible_id':self or 0, 'normal_view':False}"/>
+                        <field name="period_id" widget="selection" context="{'period_id':self}"/>
+                    </group>
                 </search>
             </field>
         </record>
@@ -892,10 +931,10 @@
                     <field name="to_check" groups="base.group_extended"/>
                     <field name="amount"/>
                     <field name="state"/>
+                    <button name="button_validate" states="draft" string="Validate" type="object" icon="terp-camera_test"/>
                 </tree>
             </field>
         </record>
-
         <record id="view_move_form" model="ir.ui.view">
             <field name="name">account.move.form</field>
             <field name="model">account.move</field>
@@ -903,11 +942,12 @@
             <field name="arch" type="xml">
                 <form string="Journal Entries">
                     <group colspan="4" col="6">
-                        <field name="name" select="1" colspan="4" readonly="True"/>
+                        <field name="name" select="1" readonly="True"/>
                         <field name="journal_id" select="1"/>
                         <field name="period_id"/>
                         <field name="type"/>
                         <field name="ref" select="1"/>
+                        <field name="date" select="1"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Journal Entries Lines">
@@ -982,15 +1022,20 @@
             <field name="arch" type="xml">
                 <search string="Search Move">
                     <group col='8' colspan='4'>
-                        <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Move Lines"/>
-                        <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Move Lines"/>
+                        <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Entries"/>
+                        <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Entries"/>
                         <separator orientation="vertical"/>
+                        <filter icon="terp-camera_test" string="To Review" domain="[('to_check','=',True)]" groups="base.group_extended" help="To Review"/>
                         <field name="date" select='1'/>
                         <field name="name" select='1'/>
                         <field name="journal_id" select='1'/>
                         <field name="partner_id" select='1'/>
                     </group>
                     <newline/>
+                    <group col="10" colspan="4">
+                        <field name="journal_id" widget="selection" context="{'journal_id':self, 'visible_id':self or 0, 'normal_view':False}"/>
+                        <field name="period_id" widget="selection" context="{'period_id':self}"/>
+                    </group>
                     <group expand="0" string="Group By..." colspan="12" col="10">
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
                         <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id'}"/>
@@ -1009,7 +1054,15 @@
             <field name="view_id" ref="view_move_tree"/>
             <field name="search_view_id" ref="view_account_move_filter"/>
         </record>
-
+        
+        <act_window
+            domain="[('move_id','=',active_id)]"
+            id="act_account_move_to_account_move_line_open"
+            name="Journal Items"
+            context="{'move_id':active_id}"
+            res_model="account.move.line"
+            src_model="account.move"/>
+            
         <record id="action_move_to_review" model="ir.actions.act_window">
             <field name="name">Journal Entries to Review</field>
             <field name="type">ir.actions.act_window</field>
@@ -1020,8 +1073,8 @@
             <field name="domain">[('to_check','=',True)]</field>
         </record>
         <menuitem action="action_move_to_review" id="menu_action_move_to_review" parent="periodical_processing_journal_entries_validation"/>
-        <menuitem id="next_id_29" name="Search Entries" parent="account.menu_finance_entries" sequence="40"/>
-        <menuitem action="action_move_line_form" id="menu_action_move_line_form" parent="next_id_29"/>
+<!--        <menuitem id="next_id_29" name="Search Entries" parent="account.menu_finance_entries" sequence="40"/>-->
+<!--        <menuitem action="action_move_line_form" id="menu_action_move_line_form" parent="next_id_29"/>-->
 
         <record id="action_move_line_form_encode_by_move" model="ir.actions.act_window">
             <field name="name">Journal Vouchers</field>
@@ -1032,28 +1085,29 @@
             <field name="search_view_id" ref="view_account_move_filter"/>
         </record>
 
-        <menuitem action="action_move_line_form_encode_by_move" id="menu_encode_entries_by_move" parent="menu_finance_entries"/>
-
+<!--        <menuitem action="action_move_line_form_encode_by_move" id="menu_encode_entries_by_move" parent="menu_finance_entries"/>-->
+        
         <record id="action_account_moves_sale" model="ir.actions.act_window">
-            <field name="name">Receivable Entries</field>
-            <field name="res_model">account.move</field>
+            <field name="name">Journal Items</field>
+            <field name="res_model">account.move.line</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="view_move_tree"/>
-            <field name="search_view_id" ref="view_account_move_filter"/>
-            <field name="domain">[('journal_id.type', '=', 'sale')]</field>
+            <field name="view_id" ref="view_move_line_tree"/>
+            <field name="search_view_id" ref="view_account_move_line_filter"/>
+            <field name="domain">[('journal_id.type', 'in', ['sale', 'sale_refund'])]</field>
         </record>
 
         <menuitem action="action_account_moves_sale" id="menu_eaction_account_moves_sale" parent="menu_finance_receivables"/>
 
         <record id="action_account_moves_purchase" model="ir.actions.act_window">
-            <field name="name">Payable Entries</field>
-            <field name="res_model">account.move</field>
+            <field name="name">Journal Items</field>
+            <field name="res_model">account.move.line</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="view_move_tree"/>
-            <field name="search_view_id" ref="view_account_move_filter"/>
-            <field name="domain">[('journal_id.type', '=', 'purchase')]</field>
+            <field name="view_id" ref="view_move_line_tree"/>
+            <field name="search_view_id" ref="view_account_move_line_filter"/>
+            <field name="domain">[('journal_id.type', 'in', ['purchase', 'purchase_refund'])]</field>
+            <field name="context">{'journal_id':1}</field>
         </record>
 
         <menuitem action="action_account_moves_purchase" id="menu_eaction_account_moves_purchase" parent="menu_finance_payables"/>
@@ -1078,16 +1132,6 @@
             <field name="view_mode">form</field>
             <field name="act_window_id" ref="action_move_line_search"/>
         </record>
-        <record id="action_move_line_search_view3" model="ir.actions.act_window">
-            <field name="name">Cash Register</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">account.move.line</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="view_move_line_tree"/>
-            <field name="search_view_id" ref="view_account_move_line_filter"/>
-            <field name="domain">[('journal_id.type', '=', 'cash')]</field>
-        </record>
         <record id="action_move_line_search_view4" model="ir.actions.act_window">
             <field name="name">Checks Register</field>
             <field name="type">ir.actions.act_window</field>
@@ -1098,17 +1142,17 @@
             <field name="search_view_id" ref="view_account_move_line_filter"/>
             <field name="domain">[('journal_id.type', '=', 'bank')]</field>
         </record>
-        <menuitem action="action_move_line_search_view3" id="journal_cash_move_lines" parent="menu_finance_bank_and_cash"/>
+        
         <menuitem action="action_move_line_search_view4" id="journal_bank_move_lines" parent="menu_finance_bank_and_cash"/>
 
-        <menuitem action="action_move_line_search" id="menu_action_move_line_search" parent="account.next_id_29"/>
+<!--        <menuitem action="action_move_line_search" id="menu_action_move_line_search" parent="account.next_id_29"/>-->
 
         <menuitem id="menu_finance_charts" name="Charts" parent="account.menu_finance" sequence="4"/>
     <!--    <wizard id="wizard_account_chart" menu="False" model="account.account" name="account.chart" string="Chart of Accounts"/>
         <menuitem icon="STOCK_INDENT" action="wizard_account_chart" id="menu_action_account_tree2" parent="account.menu_finance_charts" type="wizard"/>
  -->
 
-
+        
         <record id="view_bank_statement_reconcile_form" model="ir.ui.view">
             <field name="name">account.bank.statement.reconcile.form</field>
             <field name="model">account.bank.statement</field>
@@ -1116,13 +1160,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Statement">
-                    <field name="name" select="1"/>
-                    <field name="date" select="1"/>
-                    <field name="journal_id" on_change="onchange_journal_id(journal_id)" select="1"/>
-                    <field name="currency"/>
-                    <newline/>
-                    <field name="balance_start"/>
-                    <field name="balance_end_real"/>
+                    <group col="6" colspan="4">
+                        <field name="name" select="1"/>
+                        <field name="date" select="1"/>
+                        <field name="journal_id" on_change="onchange_journal_id(journal_id)" select="1"/>
+                        <field name="currency"/>
+                        <field name="balance_start"/>
+                        <field name="balance_end_real"/>
+                    </group>
                     <notebook colspan="4">
                         <page string="Select entries">
                             <field colspan="4" domain="[('statement_id', '=', False), ('journal_id', '=', journal_id)]" name="move_line_ids" nolabel="1" widget="many2many"/>
@@ -1184,17 +1229,17 @@
             id="menu_action_account_bank_reconcile_check_tree"
             parent="periodical_processing_reconciliation" groups="group_account_user" />
 
-		<act_window
-			context="{'search_default_next_partner':1}"
+        <act_window
+            context="{'search_default_next_partner':1}"
             id="action_account_manual_reconcile" name="Entry Lines"
             res_model="account.move.line"
             />
 
- 	   <menuitem
- 	   		name="Manual Reconcilication" icon="STOCK_EXECUTE"
- 	   		action="action_account_manual_reconcile"
- 			id="menu_manual_reconcile"
- 			parent="account.periodical_processing_reconciliation"/>
+        <menuitem
+                name="Manual Reconcilication" icon="STOCK_EXECUTE"
+                action="action_account_manual_reconcile"
+             id="menu_manual_reconcile"
+             parent="account.periodical_processing_reconciliation"/>
 
 
         <act_window
@@ -1253,7 +1298,7 @@
             <field name="model">account.model.line</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Entry Model Line">
+                <tree string="Entry Model Line" editable="bottom">
                     <field name="sequence"/>
                     <field name="ref"/>
                     <field name="name"/>
@@ -1261,6 +1306,8 @@
                     <field name="partner_id"/>
                     <field name="debit"/>
                     <field name="credit"/>
+                    <field name="date"/>
+                    <field name="date_maturity"/>
                 </tree>
             </field>
         </record>
@@ -1296,10 +1343,10 @@
                     <field name="name" select="1"/>
                     <field name="ref" select="1"/>
                     <field name="journal_id" select="1"/>
-                    <field colspan="4" name="lines_id" widget="one2many_list"/>
+                    <field colspan="4" nolabel="1" name="lines_id" height="250" widget="one2many_list"/>
                     <separator string="Legend" colspan="4"/>
                     <field name="legend" colspan="4" nolabel="1"/>
-                    <group col="1" colspan="4">
+                    <group col="1" colspan="4"> 
                         <button name="%(action_account_use_model_create_entry)d" string="Create entries" type="action" icon="gtk-execute"/>
                     </group>
                 </form>
@@ -1317,17 +1364,16 @@
             </field>
         </record>
         <record id="action_model_form" model="ir.actions.act_window">
-            <field name="name">Define Models</field>
+            <field name="name">Define Recurring</field>
             <field name="res_model">account.model</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem action="action_model_form" id="menu_action_model_form" parent="account.menu_finance_recurrent_entries"/>
-
+        <menuitem action="action_model_form" id="menu_action_model_form" parent="account.menu_configuration_misc"/>
 
         <!--
-    # Payment Terms
--->
+            # Payment Terms
+        -->
 
         <record id="view_payment_term_line_tree" model="ir.ui.view">
             <field name="name">account.payment.term.line.tree</field>
@@ -1565,8 +1611,6 @@
 
         <act_window domain="[('journal_id', '=', active_id)]" id="act_account_journal_2_account_move_line" name="Entry lines" res_model="account.move.line" src_model="account.journal"/>
 
-        <act_window domain="[('partner_id', '=', active_id), ('account_id.type', 'in', ['receivable', 'payable']), ('reconcile_id','=',False)]" id="act_account_partner_account_move_unreconciled" name="Unreconciled Receivables &amp; Payables" res_model="account.move.line" src_model="res.partner"/>
-
         <act_window domain="[('partner_id', '=', active_id), ('account_id.type', 'in', ['receivable', 'payable'])]" id="act_account_partner_account_move_all" name="Receivables &amp; Payables" res_model="account.move.line" src_model="res.partner"/>
 
         <act_window domain="[('partner_id', '=', active_id)]" id="act_account_partner_account_move" name="All Account Entries" res_model="account.move.line" src_model="res.partner"/>
@@ -1951,5 +1995,177 @@
             id="menu_action_account_fiscal_position_form_template"
             parent="account_template_folder" sequence="20"/>
 
+        <record id="action_move_journal_line" model="ir.actions.act_window">
+            <field name="name">Journal Entries</field>
+            <field name="res_model">account.move</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_move_tree"/>
+            <field name="search_view_id" ref="view_account_move_filter"/>
+        </record>
+        
+        <menuitem
+            icon="STOCK_JUSTIFY_FILL" 
+            action="action_move_journal_line" 
+            id="menu_action_move_journal_line_form" 
+            parent="account.menu_finance_entries" 
+            sequence="5"/>
+        
+        <record id="action_account_moves_all" model="ir.actions.act_window">
+            <field name="name">Journal Items</field>
+            <field name="res_model">account.move.line</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_move_line_tree"/>
+            <field name="search_view_id" ref="view_account_move_line_filter"/>
+        </record>
+
+        <menuitem 
+            action="action_account_moves_all" 
+            icon="STOCK_JUSTIFY_FILL" 
+            id="menu_eaction_account_moves_all" 
+            parent="account.menu_finance_entries"
+            sequence="4"
+        />
+
+        <!-- Cash Statement -->
+        <record id="view_bank_statement_tree" model="ir.ui.view">
+            <field name="name">account.bank.statement.tree</field>
+            <field name="model">account.bank.statement</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree colors="red:balance_end_real!=balance_end;blue:state=='draft' and (balance_end_real==balance_end);black:state in ('open');blue:state in ('draft')" string="Statement">
+                    <field name="date"/>
+                    <field name="name"/>
+                    <field name="journal_id"/>
+                    <field name="period_id"/>
+                    <field name="balance_start"/>
+                    <field name="balance_end_real"/>
+                    <field name="balance_end"/>
+                        <field name="user_id" select="1"/>
+                    <field name="state"/>
+                    <button type="object" string="Open" name="button_open" states="draft" icon="terp-camera_test"/>
+                    <button type="object" string="Confirm" name="button_confirm" states="open" icon="terp-gtk-go-back-rtl"/>
+                    <button type="object" string="Cancel" name="button_cancel" states="confirm" icon="terp-gtk-stop"/>
+                </tree>
+            </field>
+        </record>
+        
+        <record id="view_bank_statement_form2" model="ir.ui.view">
+            <field name="name">account.bank.statement.form</field>
+            <field name="model">account.bank.statement</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Statement">
+                    <group col="6" colspan="4">
+                        <field name="name" select="1"/>
+                        <field name="company_id" select="1" groups="base.group_multi_company"/>
+                        <field name="journal_id" on_change="onchange_journal_id(journal_id)" domain="[('type','=','cash')]" select="1" />
+                        <field name="user_id" select="1" readonly="1"/>
+                        <field name="period_id" select="1"/>
+                        <field name="balance_end_real"/>
+                    </group>
+                    
+                    <notebook colspan="4">
+                        <page string="Cash Transactions" attrs="{'invisible': [('state','=','draft')]}">
+                            <field colspan="4" name="line_ids" nolabel="1">
+                                <tree editable="bottom" string="Statement lines">
+                                    <field name="sequence" invisible="1"/>
+                                    <field name="date"/>
+                                    <field name="ref"/>
+                                    <field name="name"/>
+                                    <field name="type"/>
+                                    <field name="partner_id" on_change="onchange_partner_id(partner_id, type, parent.currency, {'amount': amount})"/>
+                                    <field domain="[('journal_id','=',parent.journal_id)]" name="account_id"/>
+                                    <field name="amount"/>
+                                    <field context="{'partner_id': partner_id, 'amount': amount, 'account_id': account_id, 'currency_id': parent.currency, 'journal_id': parent.journal_id, 'date':date}" name="reconcile_id"/>
+                                    <field invisible="1" name="reconcile_amount"/>
+                                </tree>
+                            </field>
+                        </page>
+                        <page string="Cash Box">
+                            <group col="2" colspan="2" expand="1">
+                                <field name="starting_details_ids" nolabel="1" colspan="2" attrs="{'readonly':[('state','=','draft')]}">
+                                    <tree string = "Opening Balance" editable="bottom">
+                                        <field name="pieces"/>
+                                        <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/>
+                                        <field name="subtotal" sum="Total"/>
+                                    </tree>
+                                    <form string = "Opening Balance">
+                                        <field name="pieces"/>
+                                        <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/>
+                                        <field name="subtotal"/>
+                                    </form>
+                                </field>
+                            </group>
+                            <group col="2" colspan="2" expand="1">
+                                <field name="ending_details_ids" nolabel="1" colspan="2" attrs="{'readonly':[('state','=','draft')]}">
+                                    <tree string = "Closing Balance" editable="bottom">
+                                        <field name="pieces"/>
+                                        <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/>
+                                        <field name="subtotal" sum="Total"/>
+                                    </tree>
+                                    <form string = "Closing Balance">
+                                        <field name="pieces"/>
+                                        <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/>
+                                        <field name="subtotal"/>
+                                    </form>
+                                </field>
+                            </group>
+                        </page>
+                        <page string="Accounting Entries" attrs="{'invisible': [('state','!=','confirm')]}">
+                            <field colspan="4" name="move_line_ids" nolabel="1"/>
+                        </page>
+                    </notebook>
+                    <group col="6" colspan="4">
+                        <group col="2" colspan="2">
+                            <separator string="Dates" colspan="4"/>
+                            <field name="date" select="1" attrs="{'readonly':[('state','!=','draft')]}"/>
+                            <field name="closing_date" select="1" attrs="{'readonly':[('state','=','confirm')]}"/>
+                        </group>
+                        <group col="2" colspan="2">
+                            <separator string="Opening Balance" colspan="4"/>
+                            <field name="balance_start"/>
+                            <field name="total_entry_encoding"/>
+                        </group>
+                        <group col="2" colspan="2">
+                            <separator string="Closing Balance" colspan="4"/>
+                            <field name="balance_end" string="Approx"/>
+                            <field name="balance_end_cash" string="Cash Balance"/>
+                        </group>
+                    </group>
+                    <group col="8" colspan="4">
+                        <field name="state" colspan="4"/>
+                        <button name="button_confirm" states="open" string="Close CashBox" icon="terp-check" type="object"/>
+                        <button name="button_open" states="draft" string="Open CashBox" icon="terp-document-new" type="object"/>
+                        <button name="button_cancel" states="confirm,open" string="Cancel" icon="terp-gtk-stop" type="object" groups="base.group_extended"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+        <record id="action_view_bank_statement_tree" model="ir.actions.act_window">
+            <field name="name">Cash Register</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.bank.statement</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_bank_statement_tree"/>
+            <field name="search_view_id" ref="view_account_bank_statement_filter"/>
+            <field name="domain">[('journal_id.type', '=', 'cash')]</field>
+        </record>
+        <record model="ir.actions.act_window.view" id="act_cash_statement1_all">
+            <field name="sequence" eval="1"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_bank_statement_tree"/>
+            <field name="act_window_id" ref="action_view_bank_statement_tree"/>
+        </record>
+        <record model="ir.actions.act_window.view" id="act_cash_statement2_all">
+            <field name="sequence" eval="1"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_bank_statement_form2"/>
+            <field name="act_window_id" ref="action_view_bank_statement_tree"/>
+        </record>
+        <menuitem action="action_view_bank_statement_tree" id="journal_cash_move_lines" parent="menu_finance_bank_and_cash"/>
+        
     </data>
 </openerp>

addons/account/account_wizard.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-<!--		<wizard-->
-<!--			string="Account balance-Compare Years"-->
-<!--			model="account.account"-->
-<!--			name="account.balance.account.balance.report"-->
-<!--			keyword="client_print_multi"-->
-<!--			id="wizard_account_balance_compare_report"/>-->
+<!--        <wizard-->
+<!--            string="Account balance-Compare Years"-->
+<!--            model="account.account"-->
+<!--            name="account.balance.account.balance.report"-->
+<!--            keyword="client_print_multi"-->
+<!--            id="wizard_account_balance_compare_report"/>-->
 
      <!--     <wizard id="wizard_invoice_refund" model="account.invoice" name="account.invoice.refund" string="Credit Note" groups="base.group_user"/>   -->
 
@@ -75,7 +75,7 @@
         <!-- report-related wizards -->
 <!--        <wizard id="wizard_partner_balance_report" menu="False" model="res.partner" name="account.partner.balance.report" string="Partner Balance"/>
         <menuitem icon="STOCK_PRINT" action="wizard_partner_balance_report" id="menu_partner_balance" parent="account.next_id_22" type="wizard"/> -->
-		<menuitem id="next_id_22" name="Partner Accounts" parent="menu_finance_generic_reporting" sequence="1"/>
+        <menuitem id="next_id_22" name="Partner Accounts" parent="menu_finance_generic_reporting" sequence="1"/>
         <!--<wizard id="wizard_third_party_ledger" menu="False" model="res.partner" name="account.third_party_ledger.report" string="Partner Ledger"/>
         <menuitem icon="STOCK_PRINT" action="wizard_third_party_ledger" id="menu_third_party_ledger" parent="account.next_id_22" type="wizard"/> -->
 
@@ -94,30 +94,30 @@
 
         <wizard id="wizard_validate_account_moves_line" menu="True" model="account.move.line" name="account.move_line.validate" string="Validate Ledger Postings"/>-->
 
-		<!-- Use Models -->
+        <!-- Use Models -->
 <!--        <wizard string="Create Entries From Models" model="account.model" name="account_use_models" menu="False" id="wizard_account_use_model"/>-->
 <!--        <menuitem action="wizard_account_use_model" type="wizard" parent="account.menu_finance_recurrent_entries" id="menu_account_use_model"/>-->
 
 <!--        <wizard string="Create Entries From Models" model="account.move.line" name="account_use_models" menu="True" id="wizard_line_account_use_model"/>-->
 
-		<!-- account.invoice -->
+        <!-- account.invoice -->
 <!--    <wizard string="Open State" model="account.invoice" name="account.wizard_paid_open" menu="False" id="wizard_paid_open" groups="base.group_user"/> -->
 
-	    <!-- generic report wizard -->
-<!--	    <wizard id="wizard_account_balance_report" menu="False" model="account.account" name="account.account.balance.report" string="Account Balance"/>-->
+        <!-- generic report wizard -->
+<!--        <wizard id="wizard_account_balance_report" menu="False" model="account.account" name="account.account.balance.report" string="Account Balance"/>-->
 <!--        <menuitem icon="STOCK_PRINT" action="wizard_account_balance_report" id="menu_account_balance_report" parent="account.menu_generic_report" type="wizard"/>-->
 
-<!--		<wizard id="wizard_general_ledger" menu="False" model="account.account" name="account.general.ledger.report" string="General Ledger"/>
+<!--        <wizard id="wizard_general_ledger" menu="False" model="account.account" name="account.general.ledger.report" string="General Ledger"/>
         <menuitem icon="STOCK_PRINT" action="wizard_general_ledger" id="menu_general_ledger" parent="account.menu_generic_report" type="wizard"/>-->
 
 <!--        <wizard id="wizard_print_journal" menu="False" model="account.journal.period" name="account.print.journal.report" string="Print Journal" />
-		<menuitem icon="STOCK_PRINT" action="wizard_print_journal" id="menu_print_journal" parent="account.menu_generic_report" type="wizard" />
+        <menuitem icon="STOCK_PRINT" action="wizard_print_journal" id="menu_print_journal" parent="account.menu_generic_report" type="wizard" />
 
         <wizard id="wizard_central_journal" menu="False" model="account.journal.period" name="account.central.journal.report" string="Print Central Journal" />
-		<menuitem icon="STOCK_PRINT" action="wizard_central_journal" id="menu_central_journal" parent="account.menu_generic_report" type="wizard" />
+        <menuitem icon="STOCK_PRINT" action="wizard_central_journal" id="menu_central_journal" parent="account.menu_generic_report" type="wizard" />
 
         <wizard id="wizard_general_journal" menu="False" model="account.journal.period" name="account.general.journal.report" string="Print General Journal" />
-		<menuitem icon="STOCK_PRINT" action="wizard_general_journal" id="menu_general_journal" parent="account.menu_generic_report" type="wizard" />-->
+        <menuitem icon="STOCK_PRINT" action="wizard_general_journal" id="menu_general_journal" parent="account.menu_generic_report" type="wizard" />-->
 
 <!--        <wizard id="wizard_invoice_currency_change" model="account.invoice" name="account.invoice.currency_change" string="Change Currency" groups="base.group_user"/>-->
     </data>

addons/account/board_account_demo.xml

@@ -5,16 +5,16 @@
 			Administrator shortcut
 			Demo user startup menu
 		-->
-        <record id="sc_account_dash" model="ir.ui.view_sc">
+        <!-- <record id="sc_account_dash" model="ir.ui.view_sc">
             <field name="name">Accounting dashboard</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="resource">ir.ui.menu</field>
             <field name="sequence">0</field>
             <field name="res_id" ref="menu_board_account"/>
-        </record>
+        </record> -->
         <record id="base.user_root" model="res.users">
             <field name="action_id" ref="open_board_account"/>
         </record>
-        
+
     </data>
 </openerp>

addons/account/configurable_account_chart.xml

@@ -1,72 +1,72 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data noupdate="1">
+    <data>
 
-		 <!-- Types -->
-	 <record model="account.account.type" id="conf_account_type_receivable" >
-	      <field name="name">Receivable</field>
-	      <field name="code">receivable</field>
-	      <field name="close_method">unreconciled</field>
-	    </record>
+         <!-- Types -->
+     <record model="account.account.type" id="conf_account_type_receivable" >
+          <field name="name">Receivable</field>
+          <field name="code">receivable</field>
+          <field name="close_method">unreconciled</field>
+        </record>
 
-	    <record model="account.account.type" id="conf_account_type_payable" >
-	      <field name="name">Payable</field>
-	      <field name="code">payable</field>
-	      <field name="close_method">unreconciled</field>
-	    </record>
+        <record model="account.account.type" id="conf_account_type_payable" >
+          <field name="name">Payable</field>
+          <field name="code">payable</field>
+          <field name="close_method">unreconciled</field>
+        </record>
 
-	    <record model="account.account.type" id="conf_account_type_view">
-	      <field name="name">View</field>
-	      <field name="code">view</field>
-	      <field name="close_method">none</field>
-	    </record>
+        <record model="account.account.type" id="conf_account_type_view">
+          <field name="name">View</field>
+          <field name="code">view</field>
+          <field name="close_method">none</field>
+        </record>
 
-	    <record model="account.account.type" id="conf_account_type_income" >
-	      <field name="name">Income</field>
-	      <field name="code">income</field>
-	      <field name="close_method">none</field>
-	    </record>
+        <record model="account.account.type" id="conf_account_type_income" >
+          <field name="name">Income</field>
+          <field name="code">income</field>
+          <field name="close_method">none</field>
+        </record>
 
-	    <record model="account.account.type" id="conf_account_type_expense">
-	      <field name="name">Expense</field>
-	      <field name="code">expense</field>
-	      <field name="close_method">none</field>
-	    </record>
+        <record model="account.account.type" id="conf_account_type_expense">
+          <field name="name">Expense</field>
+          <field name="code">expense</field>
+          <field name="close_method">none</field>
+        </record>
 
-	    <record model="account.account.type" id="conf_account_type_tax">
-	      <field name="name">Tax</field>
-	      <field name="code">tax</field>
-	      <field name="close_method">unreconciled</field>
-	    </record>
+        <record model="account.account.type" id="conf_account_type_tax">
+          <field name="name">Tax</field>
+          <field name="code">tax</field>
+          <field name="close_method">unreconciled</field>
+        </record>
 
-	    <record model="account.account.type" id="conf_account_type_cash">
-	      <field name="name">Cash</field>
-	      <field name="code">cash</field>
-	      <field name="close_method">balance</field>
-	    </record>
+        <record model="account.account.type" id="conf_account_type_cash">
+          <field name="name">Cash</field>
+          <field name="code">cash</field>
+          <field name="close_method">balance</field>
+        </record>
 
-	    <record model="account.account.type" id="conf_account_type_asset">
-	      <field name="name">Asset</field>
-	      <field name="code">asset</field>
-	      <field name="close_method">balance</field>
-	    </record>
+        <record model="account.account.type" id="conf_account_type_asset">
+          <field name="name">Asset</field>
+          <field name="code">asset</field>
+          <field name="close_method">balance</field>
+        </record>
 
-	    <record model="account.account.type" id="conf_account_type_equity">
-	      <field name="name">Equity</field>
-	      <field name="code">equity</field>
-	      <field name="close_method">balance</field>
-	    </record>
+        <record model="account.account.type" id="conf_account_type_equity">
+          <field name="name">Equity</field>
+          <field name="code">equity</field>
+          <field name="close_method">balance</field>
+        </record>
 
-	     <record model="account.account.type" id="conf_account_type_bnk">
-	      <field name="name">Bank</field>
-	      <field name="code">bank</field>
-	      <field name="close_method">balance</field>
-	    </record>
-	     <record model="account.account.type" id="conf_account_type_chk">
-	      <field name="name">Check</field>
-	      <field name="code">check</field>
-	      <field name="close_method">balance</field>
-	    </record>
+         <record model="account.account.type" id="conf_account_type_bnk">
+          <field name="name">Bank</field>
+          <field name="code">bank</field>
+          <field name="close_method">balance</field>
+        </record>
+         <record model="account.account.type" id="conf_account_type_chk">
+          <field name="name">Check</field>
+          <field name="code">check</field>
+          <field name="close_method">balance</field>
+        </record>
 
 
 
@@ -82,7 +82,7 @@
         <!-- Balance Sheet -->
 
         <record id="conf_bal" model="account.account.template">
-        	<field name="code">1</field>
+            <field name="code">1</field>
             <field name="name">Balance Sheet</field>
             <field ref="conf_chart0" name="parent_id"/>
             <field name="type">view</field>
@@ -90,7 +90,7 @@
         </record>
 
         <record id="conf_fas" model="account.account.template">
-        	<field name="code">10</field>
+            <field name="code">10</field>
             <field name="name">Fixed Assets</field>
             <field ref="conf_bal" name="parent_id"/>
             <field name="type">view</field>
@@ -98,7 +98,7 @@
         </record>
 
         <record id="conf_xfa" model="account.account.template">
-        	<field name="code">100</field>
+            <field name="code">100</field>
             <field name="name">Fixed Asset Account</field>
             <field ref="conf_fas" name="parent_id"/>
             <field name="type">other</field>
@@ -106,7 +106,7 @@
         </record>
 
         <record id="conf_nca" model="account.account.template">
-        	<field name="code">11</field>
+            <field name="code">11</field>
             <field name="name">Net Current Assets</field>
             <field ref="conf_bal" name="parent_id"/>
             <field name="type">view</field>
@@ -114,9 +114,9 @@
         </record>
 
         <record id="conf_cas" model="account.account.template">
-        	<field name="code">110</field>
+            <field name="code">110</field>
             <field name="name">Current Assets</field>
-	        <field ref="conf_nca" name="parent_id"/>
+            <field ref="conf_nca" name="parent_id"/>
             <field name="type">view</field>
             <field name="user_type" ref="conf_account_type_view"/>
         </record>
@@ -143,7 +143,7 @@
         </record> -->
 
         <record id="conf_ova" model="account.account.template">
-        	<field name="code">1103</field>
+            <field name="code">1103</field>
             <field name="name">Output VAT</field>
             <field ref="conf_cas" name="parent_id"/>
             <field name="type">other</field>
@@ -151,7 +151,7 @@
         </record>
 
         <record id="conf_bnk" model="account.account.template">
-        	<field name="code">1104</field>
+            <field name="code">1104</field>
             <field name="name">Bank Current Account</field>
             <field ref="conf_cas" name="parent_id"/>
             <field name="type">view</field>
@@ -167,7 +167,7 @@
         </record>
 
         <record id="conf_cli" model="account.account.template">
-        	<field name="code">111</field>
+            <field name="code">111</field>
             <field name="name">Current Liabilities</field>
             <field ref="conf_nca" name="parent_id"/>
             <field name="type">view</field>
@@ -188,7 +188,7 @@
         </record>-->
 
         <record id="conf_iva" model="account.account.template">
-        	<field name="code">1112</field>
+            <field name="code">1112</field>
             <field name="name">Input VAT</field>
             <field ref="conf_cli" name="parent_id"/>
             <field name="type">other</field>
@@ -198,7 +198,7 @@
         <!-- Profit and Loss -->
 
         <record id="conf_gpf" model="account.account.template">
-        	<field name="code">2</field>
+            <field name="code">2</field>
             <field name="name">Profit and Loss</field>
             <field ref="conf_chart0" name="parent_id"/>
             <field name="type">view</field>
@@ -206,7 +206,7 @@
         </record>
 
         <record id="conf_rev" model="account.account.template">
-			<field name="code">20</field>
+            <field name="code">20</field>
             <field name="name">Revenue</field>
             <field ref="conf_gpf" name="parent_id"/>
             <field name="type">view</field>
@@ -226,7 +226,7 @@
         </record> -->
 
         <record id="conf_cos" model="account.account.template">
-        	<field name="code">21</field>
+            <field name="code">21</field>
             <field name="name">Cost of Sales</field>
             <field ref="conf_gpf" name="parent_id"/>
             <field name="type">view</field>
@@ -242,7 +242,7 @@
         </record>
 
         <record id="conf_ovr" model="account.account.template">
-        	<field name="code">22</field>
+            <field name="code">22</field>
             <field name="name">Overheads</field>
             <field ref="conf_gpf" name="parent_id"/>
             <field name="type">view</field>
@@ -381,22 +381,22 @@
             <field name="parent_id" ref="vat_code_base_sales"/>
         </record>
 
-	    <record id="configurable_chart_template" model="account.chart.template">
+        <record id="configurable_chart_template" model="account.chart.template">
             <field name="name">Configurable Account Chart Template</field>
             <field name="account_root_id" ref="conf_chart0"/>
             <field name="tax_code_root_id" ref="vat_code_chart_root"/>
-          	<field name="bank_account_view_id" ref="conf_bnk"/>
+              <field name="bank_account_view_id" ref="conf_bnk"/>
             <field name="property_account_receivable" ref="conf_a_recv"/>
             <field name="property_account_payable" ref="conf_a_pay"/>
             <field name="property_account_expense_categ" ref="conf_a_expense"/>
             <field name="property_account_income_categ" ref="conf_a_sale"/>
         </record>
 
-	 <!-- VAT Codes -->
+     <!-- VAT Codes -->
         <!-- Purchases + Input VAT -->
 
         <record id="ivats" model="account.tax.template">
-       	 	<field name="chart_template_id" ref="configurable_chart_template"/>
+                <field name="chart_template_id" ref="configurable_chart_template"/>
             <field name="name">IVAT S</field>
             <field eval="0.15" name="amount"/>
             <field name="type">percent</field>
@@ -410,7 +410,7 @@
         </record>
 
         <record id="ivatr" model="account.tax.template">
-       		<field name="chart_template_id" ref="configurable_chart_template"/>
+               <field name="chart_template_id" ref="configurable_chart_template"/>
             <field name="name">IVAT R</field>
             <field eval="0.005" name="amount"/>
             <field name="type">percent</field>
@@ -424,7 +424,7 @@
         </record>
 
         <record id="ivatz" model="account.tax.template">
-        	<field name="chart_template_id" ref="configurable_chart_template"/>
+            <field name="chart_template_id" ref="configurable_chart_template"/>
             <field name="name">IVAT Z</field>
             <field eval="0.0" name="amount"/>
             <field name="type">percent</field>
@@ -434,7 +434,7 @@
         </record>
 
         <record id="ivatx" model="account.tax.template">
-        	<field name="chart_template_id" ref="configurable_chart_template"/>
+            <field name="chart_template_id" ref="configurable_chart_template"/>
             <field name="name">IVAT X</field>
             <field eval="0.0" name="amount"/>
             <field name="type">percent</field>
@@ -444,7 +444,7 @@
         </record>
 
         <record id="ivato" model="account.tax.template">
-        	<field name="chart_template_id" ref="configurable_chart_template"/>
+            <field name="chart_template_id" ref="configurable_chart_template"/>
             <field name="name">IVAT O</field>
             <field eval="0.0" name="amount"/>
             <field name="type">percent</field>
@@ -456,7 +456,7 @@
         <!-- Sales + Output VAT -->
 
         <record id="ovats" model="account.tax.template">
-        	<field name="chart_template_id" ref="configurable_chart_template"/>
+            <field name="chart_template_id" ref="configurable_chart_template"/>
             <field name="name">OVAT S</field>
             <field eval="0.15" name="amount"/>
             <field name="type">percent</field>
@@ -470,7 +470,7 @@
         </record>
 
         <record id="ovatr" model="account.tax.template">
-        	<field name="chart_template_id" ref="configurable_chart_template"/>
+            <field name="chart_template_id" ref="configurable_chart_template"/>
             <field name="name">OVAT R</field>
             <field eval="0.005" name="amount"/>
             <field name="type">percent</field>
@@ -484,7 +484,7 @@
         </record>
 
         <record id="ovatz" model="account.tax.template">
-        	<field name="chart_template_id" ref="configurable_chart_template"/>
+            <field name="chart_template_id" ref="configurable_chart_template"/>
             <field name="name">OVAT Z</field>
             <field eval="0.0" name="amount"/>
             <field name="type">percent</field>
@@ -494,7 +494,7 @@
         </record>
 
         <record id="ovatx" model="account.tax.template">
-        	<field name="chart_template_id" ref="configurable_chart_template"/>
+            <field name="chart_template_id" ref="configurable_chart_template"/>
             <field name="name">OVAT X</field>
             <field eval="0.0" name="amount"/>
             <field name="type">percent</field>
@@ -504,7 +504,7 @@
         </record>
 
         <record id="ovato" model="account.tax.template">
-        	<field name="chart_template_id" ref="configurable_chart_template"/>
+            <field name="chart_template_id" ref="configurable_chart_template"/>
             <field name="name">OVAT O</field>
             <field eval="0.0" name="amount"/>
             <field name="type">percent</field>

addons/account/i18n/ar.po

@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-06-22 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -805,7 +805,6 @@ msgstr ""
 msgid "Move Lines"
 msgstr ""
 
-
 #. module: account
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.report_account_analytic_journal_print
@@ -2133,7 +2132,8 @@ msgid "Analytic Entry"
 msgstr ""
 
 #. module: account
-#: view:res.company:0 field:res.company,overdue_msg:0
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr ""
 

addons/account/i18n/bg.po

@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-17 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-06-22 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account

addons/account/i18n/bs.po

@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-06-22 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -2148,7 +2148,8 @@ msgid "Analytic Entry"
 msgstr "Stavka analitike"
 
 #. module: account
-#: view:res.company:0 field:res.company,overdue_msg:0
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr ""
 

addons/account/i18n/ca.po

@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-11 03:42+0000\n"
+"X-Launchpad-Export-Date: 2010-06-22 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account

addons/account/i18n/cs.po

@@ -7,17 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-04-01 22:39+0000\n"
+"PO-Revision-Date: 2010-04-08 18:06+0000\n"
 "Last-Translator: mitev.dmitry <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-<<<<<<< TREE
-"X-Launchpad-Export-Date: 2010-04-03 03:54+0000\n"
-=======
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
->>>>>>> MERGE-SOURCE
+"X-Launchpad-Export-Date: 2010-06-22 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -119,7 +115,7 @@ msgstr "Rodič"
 #. module: account
 #: selection:account.move,type:0
 msgid "Journal Voucher"
-msgstr ""
+msgstr "Rada"
 
 #. module: account
 #: field:account.invoice,residual:0
@@ -138,7 +134,7 @@ msgstr "Základní kódová značka"
 #: model:ir.actions.wizard,name:account.wizard_unreconcile_select
 #: model:ir.ui.menu,name:account.menu_unreconcile_select
 msgid "Unreconcile entries"
-msgstr ""
+msgstr "Nepotvrzené záznamy"
 
 #. module: account
 #: constraint:account.period:0
@@ -163,7 +159,7 @@ msgstr "Debetní Centralizace"
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_invoice_state_confirm
 msgid "Confirm draft invoices"
-msgstr ""
+msgstr "Potvrdit návrh faktury"
 
 #. module: account
 #: help:account.payment.term.line,days2:0
@@ -186,7 +182,7 @@ msgstr "Grafy účtu"
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_move_line_select
 msgid "Move line select"
-msgstr ""
+msgstr "Přesun řádku vyberte"
 
 #. module: account
 #: rml:account.journal.period.print:0
@@ -314,7 +310,7 @@ msgstr "Původ"
 #. module: account
 #: rml:account.analytic.account.journal:0
 msgid "Move Name"
-msgstr ""
+msgstr "Název Pohybu"
 
 #. module: account
 #: xsl:account.transfer:0
@@ -329,7 +325,7 @@ msgstr "Vypočítat předpaltné(Subscription Compute)"
 #. module: account
 #: rml:account.central.journal:0
 msgid "Account Num."
-msgstr ""
+msgstr "Číslo účtu"
 
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
@@ -341,12 +337,12 @@ msgstr ""
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
 msgid "Tax"
-msgstr ""
+msgstr "Daň"
 
 #. module: account
 #: rml:account.general.journal:0
 msgid "Debit Trans."
-msgstr ""
+msgstr "Debetní transakce"
 
 #. module: account
 #: field:account.analytic.line,account_id:0
@@ -360,24 +356,24 @@ msgstr "Analytický účet"
 #: field:account.tax,child_depend:0
 #: field:account.tax.template,child_depend:0
 msgid "Tax on Children"
-msgstr ""
+msgstr "Daň z dětí"
 
 #. module: account
 #: rml:account.central.journal:0
 #: rml:account.general.journal:0
 #: field:account.journal,name:0
 msgid "Journal Name"
-msgstr ""
+msgstr "Název časopisu"
 
 #. module: account
 #: view:account.payment.term:0
 msgid "Description on invoices"
-msgstr ""
+msgstr "Popis na fakturách"
 
 #. module: account
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "Chyba! Nemůžete vytvářet rekurzivní analytické účty."
 
 #. module: account
 #: field:account.bank.statement.reconcile,total_entry:0
@@ -393,13 +389,13 @@ msgstr "Zdroj účtu"
 #. module: account
 #: field:account.journal,update_posted:0
 msgid "Allow Cancelling Entries"
-msgstr ""
+msgstr "Povolit Zrušení Příspěvky"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_paymentorderbank0
 #: model:process.transition,name:account.process_transition_paymentorderreconcilation0
 msgid "Payment Reconcilation"
-msgstr ""
+msgstr "Platba usmíření"
 
 #. module: account
 #: model:account.journal,name:account.expenses_journal
@@ -429,7 +425,7 @@ msgstr "(Účet / Partner) Název"
 #. module: account
 #: selection:account.move,type:0
 msgid "Contra"
-msgstr ""
+msgstr "Kontraindikace"
 
 #. module: account
 #: field:account.analytic.account,state:0
@@ -451,7 +447,7 @@ msgstr ""
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Special Computation"
-msgstr ""
+msgstr "Speciální výpočetní"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_confirmstatementfromdraft0
@@ -510,7 +506,7 @@ msgstr ""
 #. module: account
 #: view:account.invoice:0
 msgid "Supplier invoice"
-msgstr ""
+msgstr "Dodavatele uvedený na faktuře"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_reconcilepaid0
@@ -537,7 +533,7 @@ msgstr ""
 #. module: account
 #: field:account.account.type,close_method:0
 msgid "Deferral Method"
-msgstr ""
+msgstr "Metoda zpoždění"
 
 #. module: account
 #: field:account.tax.template,include_base_amount:0
@@ -564,7 +560,7 @@ msgstr ""
 #: selection:account.tax,applicable_type:0
 #: selection:account.tax.template,applicable_type:0
 msgid "True"
-msgstr ""
+msgstr "Pravda"
 
 #. module: account
 #: help:account.payment.term.line,days:0
@@ -581,7 +577,7 @@ msgstr ""
 #. module: account
 #: rml:account.central.journal:0
 msgid "Printing Date"
-msgstr ""
+msgstr "Datum vydání"
 
 #. module: account
 #: rml:account.general.ledger:0
@@ -597,7 +593,7 @@ msgstr ""
 #. module: account
 #: view:account.journal:0
 msgid "Entry Controls"
-msgstr ""
+msgstr "Vstupní kontrolou"
 
 #. module: account
 #: help:account.model.line,sequence:0
@@ -620,13 +616,13 @@ msgstr ""
 #. module: account
 #: field:account.analytic.account,contact_id:0
 msgid "Contact"
-msgstr ""
+msgstr "Kontakt"
 
 #. module: account
 #: selection:account.model.line,date:0
 #: selection:account.model.line,date_maturity:0
 msgid "Partner Payment Term"
-msgstr ""
+msgstr "Partner splatnosti"
 
 #. module: account
 #: view:account.move.reconcile:0
@@ -641,13 +637,13 @@ msgstr "Otevřeno pro bankovní vyrovnání(Open for bank reconciliation)"
 #. module: account
 #: field:account.invoice.line,discount:0
 msgid "Discount (%)"
-msgstr ""
+msgstr "Sleva (%)"
 
 #. module: account
 #: wizard_field:account.move.line.reconcile,init_full,writeoff:0
 #: wizard_field:account.move.line.reconcile,init_partial,writeoff:0
 msgid "Write-Off amount"
-msgstr ""
+msgstr "Odpis části"
 
 #. module: account
 #: help:account.fiscalyear,company_id:0
@@ -657,7 +653,7 @@ msgstr ""
 #. module: account
 #: model:ir.ui.menu,name:account.menu_analytic_accounting
 msgid "Analytic Accounting"
-msgstr ""
+msgstr "Analytické účetnictví"
 
 #. module: account
 #: rml:account.overdue:0
@@ -670,22 +666,22 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_form
 #: model:ir.ui.menu,name:account.next_id_41
 msgid "Analytic Entries"
-msgstr ""
+msgstr "Analytická Příspěvky"
 
 #. module: account
 #: selection:account.subscription,period_type:0
 msgid "month"
-msgstr ""
+msgstr "měsíc"
 
 #. module: account
 #: field:account.analytic.account,partner_id:0
 msgid "Associated Partner"
-msgstr ""
+msgstr "Přidruženého partnera"
 
 #. module: account
 #: field:account.invoice,comment:0
 msgid "Additional Information"
-msgstr ""
+msgstr "Další informace"
 
 #. module: account
 #: selection:account.invoice,type:0
@@ -723,18 +719,18 @@ msgstr ""
 #. module: account
 #: model:process.transition,name:account.process_transition_supplieranalyticcost0
 msgid "Analytic Invoice"
-msgstr ""
+msgstr "Analytická faktury"
 
 #. module: account
 #: field:account.journal.column,field:0
 msgid "Field Name"
-msgstr ""
+msgstr "Název pole"
 
 #. module: account
 #: field:account.tax.code,sign:0
 #: field:account.tax.code.template,sign:0
 msgid "Sign for parent"
-msgstr ""
+msgstr "Přihlaste se na mateřské"
 
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
@@ -745,7 +741,7 @@ msgstr ""
 #: view:product.product:0
 #: view:product.template:0
 msgid "Purchase Properties"
-msgstr ""
+msgstr "Nákup Nemovitosti"
 
 #. module: account
 #: model:process.node,note:account.process_node_paymententries0
@@ -755,12 +751,12 @@ msgstr ""
 #. module: account
 #: wizard_button:account.invoice.pay,init,reconcile:0
 msgid "Partial Payment"
-msgstr ""
+msgstr "Částečná platba"
 
 #. module: account
 #: wizard_view:account_use_models,create:0
 msgid "Move Lines Created."
-msgstr ""
+msgstr "Přesun vytvořených linek."
 
 #. module: account
 #: field:account.fiscalyear,state:0
@@ -770,18 +766,18 @@ msgstr ""
 #: field:account.period,state:0
 #: field:account.subscription,state:0
 msgid "Status"
-msgstr ""
+msgstr "Stav"
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
 msgid "Period to"
-msgstr ""
+msgstr "Období do"
 
 #. module: account
 #: field:account.account.type,partner_account:0
 msgid "Partner account"
-msgstr ""
+msgstr "Partner účet"
 
 #. module: account
 #: wizard_view:account.subscription.generate,init:0
@@ -807,7 +803,7 @@ msgstr ""
 #. module: account
 #: field:account.invoice,move_lines:0
 msgid "Move Lines"
-msgstr ""
+msgstr "Přesun Linky"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
@@ -830,26 +826,26 @@ msgstr ""
 #. module: account
 #: model:ir.ui.menu,name:account.next_id_30
 msgid "Bank Reconciliation"
-msgstr ""
+msgstr "Bankovní usmíření"
 
 #. module: account
 #: model:ir.model,name:account.model_account_account_template
 msgid "Templates for Accounts"
-msgstr ""
+msgstr "Šablony pro účty"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_account_form
 #: model:ir.model,name:account.model_account_analytic_account
 #: model:ir.ui.menu,name:account.account_analytic_def_account
 msgid "Analytic Accounts"
-msgstr ""
+msgstr "Analytické účty"
 
 #. module: account
 #: wizard_view:account.print.journal.report,init:0
 #: model:ir.actions.wizard,name:account.wizard_print_journal
 #: model:ir.ui.menu,name:account.menu_print_journal
 msgid "Print Journal"
-msgstr ""
+msgstr "Tisk věstníku"
 
 #. module: account
 #: model:ir.model,name:account.model_account_bank_accounts_wizard
@@ -860,39 +856,39 @@ msgstr ""
 #: field:account.move.line,date_created:0
 #: field:account.move.reconcile,create_date:0
 msgid "Creation date"
-msgstr ""
+msgstr "Datum vytvoření"
 
 #. module: account
 #: wizard_button:account.invoice.refund,init,cancel_invoice:0
 msgid "Cancel Invoice"
-msgstr ""
+msgstr "Zrušit účet"
 
 #. module: account
 #: field:account.journal.column,required:0
 msgid "Required"
-msgstr ""
+msgstr "Požadované"
 
 #. module: account
 #: field:product.category,property_account_expense_categ:0
 #: field:product.template,property_account_expense:0
 msgid "Expense Account"
-msgstr ""
+msgstr "Cestovní účet"
 
 #. module: account
 #: wizard_field:account.move.line.reconcile,addendum,journal_id:0
 msgid "Write-Off Journal"
-msgstr ""
+msgstr "Odpis věstníku"
 
 #. module: account
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
 msgid "Amount Currency"
-msgstr ""
+msgstr "Částka měny"
 
 #. module: account
 #: field:account.chart.template,property_account_expense_categ:0
 msgid "Expense Category Account"
-msgstr ""
+msgstr "Kategorie výdajů účtu"
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,fy2_id:0
@@ -909,7 +905,7 @@ msgstr ""
 #. module: account
 #: wizard_field:account.open_closed_fiscalyear,init,fyear_id:0
 msgid "Fiscal Year to Open"
-msgstr ""
+msgstr "Fiskální rok otevřena"
 
 #. module: account
 #: view:account.config.wizard:0
@@ -927,7 +923,7 @@ msgstr ""
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
 msgid "Quantity"
-msgstr ""
+msgstr "Množství"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,date_to:0
@@ -935,7 +931,7 @@ msgstr ""
 #: wizard_field:account.partner.balance.report,init,date2:0
 #: wizard_field:account.third_party_ledger.report,init,date2:0
 msgid "End date"
-msgstr ""
+msgstr "Datum ukončení"
 
 #. module: account
 #: field:account.invoice.tax,base_amount:0
@@ -956,12 +952,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_bank_statement_tree
 #: model:ir.ui.menu,name:account.menu_bank_statement_tree
 msgid "Entries by Statements"
-msgstr ""
+msgstr "Příspěvky výroky"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_analyticinvoice0
 msgid "analytic Invoice"
-msgstr ""
+msgstr "analytické faktury"
 
 #. module: account
 #: wizard_field:account.automatic.reconcile,init,period_id:0
@@ -980,22 +976,22 @@ msgstr ""
 #: wizard_field:account.print.journal.report,init,period_id:0
 #: field:account.subscription,period_nbr:0
 msgid "Period"
-msgstr ""
+msgstr "Perioda"
 
 #. module: account
 #: rml:account.partner.balance:0
 msgid "Grand total"
-msgstr ""
+msgstr "Úhrn"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_accounting
 msgid "Financial Accounting"
-msgstr ""
+msgstr "Finanční účetnictví"
 
 #. module: account
 #: rml:account.invoice:0
 msgid "Net Total:"
-msgstr ""
+msgstr "Čistá celkem:"
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -1009,7 +1005,7 @@ msgstr ""
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
 msgid "Fiscal Position"
-msgstr ""
+msgstr "Fiskální pozice"
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
@@ -1026,7 +1022,7 @@ msgstr ""
 #: field:account.account,child_parent_ids:0
 #: field:account.account.template,child_parent_ids:0
 msgid "Children"
-msgstr ""
+msgstr "Děti"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
@@ -1037,35 +1033,35 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_invoice_tree2_new
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree2_new
 msgid "New Supplier Invoice"
-msgstr ""
+msgstr "Nového dodavatele faktury"
 
 #. module: account
 #: wizard_field:account.invoice.pay,init,amount:0
 msgid "Amount paid"
-msgstr ""
+msgstr "Zaplacené částky"
 
 #. module: account
 #: selection:account.invoice,type:0
 #: model:process.transition,name:account.process_transition_customerinvoice0
 #: model:process.transition,name:account.process_transition_suppliercustomerinvoice0
 msgid "Customer Invoice"
-msgstr ""
+msgstr "Zákazník faktury"
 
 #. module: account
 #: wizard_view:account.open_closed_fiscalyear,init:0
 msgid "Choose Fiscal Year"
-msgstr ""
+msgstr "Vyberte si fiskální rok"
 
 #. module: account
 #: field:account.sequence.fiscalyear,sequence_main_id:0
 msgid "Main Sequence"
-msgstr ""
+msgstr "Hlavní posloupnosti"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.account_analytic_journal_print
 msgid "Print Analytic Journals"
-msgstr ""
+msgstr "Tisk Analytické Časopisy"
 
 #. module: account
 #: rml:account.tax.code.entries:0
@@ -1082,7 +1078,7 @@ msgstr ""
 #. module: account
 #: field:account.bank.statement.reconcile,total_new:0
 msgid "Total write-off"
-msgstr ""
+msgstr "Celkem odpis"
 
 #. module: account
 #: view:account.tax.template:0
@@ -1094,14 +1090,14 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_tax_code_list
 #: model:ir.ui.menu,name:account.menu_action_tax_code_list
 msgid "Tax codes"
-msgstr ""
+msgstr "Daňové kódy"
 
 #. module: account
 #: field:account.fiscal.position.template,chart_template_id:0
 #: field:account.tax.template,chart_template_id:0
 #: field:wizard.multi.charts.accounts,chart_template_id:0
 msgid "Chart Template"
-msgstr ""
+msgstr "Graf šablony"
 
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
@@ -1112,24 +1108,24 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.analytic_account_form
 #: model:ir.ui.menu,name:account.account_analytic_form
 msgid "New Analytic Account"
-msgstr ""
+msgstr "Nový analitickiý účet"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
 msgid "Fiscal Position Templates"
-msgstr ""
+msgstr "Fiskální pozice Šablony"
 
 #. module: account
 #: rml:account.invoice:0
 #: field:account.invoice.line,price_unit:0
 msgid "Unit Price"
-msgstr ""
+msgstr "Cena za kus"
 
 #. module: account
 #: rml:account.analytic.account.journal:0
 msgid "Period from :"
-msgstr ""
+msgstr "Období od:"
 
 #. module: account
 #: model:ir.model,name:account.model_wizard_multi_charts_accounts
@@ -1139,7 +1135,7 @@ msgstr ""
 #. module: account
 #: model:account.journal,name:account.sales_journal
 msgid "Journal de vente"
-msgstr ""
+msgstr "Prodej věstníku"
 
 #. module: account
 #: help:account.model.line,amount_currency:0
@@ -1150,23 +1146,23 @@ msgstr ""
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
 msgid "Fiscal Position Template"
-msgstr ""
+msgstr "Fiskální pozice šablony"
 
 #. module: account
 #: field:account.payment.term,line_ids:0
 msgid "Terms"
-msgstr ""
+msgstr "Podmínky"
 
 #. module: account
 #: rml:account.vat.declaration:0
 msgid "Tax Report"
-msgstr ""
+msgstr "Daňové Report"
 
 #. module: account
 #: wizard_button:account.analytic.account.chart,init,open:0
 #: wizard_button:account.chart,init,open:0
 msgid "Open Charts"
-msgstr ""
+msgstr "Zobrazit Grafy"
 
 #. module: account
 #: wizard_view:account.fiscalyear.close.state,init:0
@@ -1176,7 +1172,7 @@ msgstr ""
 #. module: account
 #: selection:account.move,type:0
 msgid "Bank Receipt"
-msgstr ""
+msgstr "Bankovní Příjem"
 
 #. module: account
 #: view:res.partner:0
@@ -1186,17 +1182,17 @@ msgstr "Bankovní účet"
 #. module: account
 #: field:account.chart.template,tax_template_ids:0
 msgid "Tax Template List"
-msgstr ""
+msgstr "Daňové seznamu šablon"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_invoiceimport0
 msgid "Invoice import"
-msgstr ""
+msgstr "Faktura import"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.action_move_journal_line_form_select
 msgid "Standard entry"
-msgstr ""
+msgstr "Standardní vstupní"
 
 #. module: account
 #: help:account.account,currency_mode:0
@@ -1211,7 +1207,7 @@ msgstr ""
 #. module: account
 #: field:account.account,company_currency_id:0
 msgid "Company Currency"
-msgstr ""
+msgstr "Společnost měny"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
@@ -1221,7 +1217,7 @@ msgstr ""
 #. module: account
 #: field:account.analytic.account,parent_id:0
 msgid "Parent Analytic Account"
-msgstr ""
+msgstr "Parent Analytická účtu"
 
 #. module: account
 #: wizard_button:account.move.line.reconcile,init_partial,addendum:0
@@ -1241,22 +1237,22 @@ msgstr ""
 #. module: account
 #: field:account.bank.statement,balance_end_real:0
 msgid "Ending Balance"
-msgstr ""
+msgstr "Konečný zůstatek"
 
 #. module: account
 #: view:product.product:0
 msgid "Purchase Taxes"
-msgstr ""
+msgstr "Nákup Daně"
 
 #. module: account
 #: field:account.payment.term.line,name:0
 msgid "Line Name"
-msgstr ""
+msgstr "Název řádku"
 
 #. module: account
 #: selection:account.payment.term.line,value:0
 msgid "Fixed Amount"
-msgstr ""
+msgstr "Pevná částka"
 
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
@@ -1284,24 +1280,24 @@ msgstr ""
 #. module: account
 #: view:account.config.wizard:0
 msgid "Continue"
-msgstr ""
+msgstr "Pokračovat"
 
 #. module: account
 #: field:account.payment.term.line,value:0
 msgid "Value"
-msgstr ""
+msgstr "Hodnota"
 
 #. module: account
 #: wizard_field:account.invoice.pay,addendum,writeoff_acc_id:0
 #: wizard_field:account.move.line.reconcile,addendum,writeoff_acc_id:0
 msgid "Write-Off account"
-msgstr ""
+msgstr "Odpis účet"
 
 #. module: account
 #: field:account.model.line,model_id:0
 #: field:account.subscription,model_id:0
 msgid "Model"
-msgstr ""
+msgstr "Vzor"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_fiscalyear_close_state
@@ -1312,12 +1308,12 @@ msgstr ""
 #. module: account
 #: field:account.journal,centralisation:0
 msgid "Centralised counterpart"
-msgstr ""
+msgstr "Centralizované protějšek"
 
 #. module: account
 #: view:wizard.company.setup:0
 msgid "Message"
-msgstr ""
+msgstr "Zpráva"
 
 #. module: account
 #: model:process.node,note:account.process_node_supplierpaymentorder0
@@ -1331,7 +1327,7 @@ msgstr ""
 #: selection:account.analytic.account,type:0
 #: field:account.journal,view_id:0
 msgid "View"
-msgstr ""
+msgstr "Pohled"
 
 #. module: account
 #: selection:account.account.balance.report,checktype,display_account:0
@@ -1339,13 +1335,13 @@ msgstr ""
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "All"
-msgstr ""
+msgstr "Vše"
 
 #. module: account
 #: field:account.move.line,analytic_lines:0
 #: model:ir.model,name:account.model_account_analytic_line
 msgid "Analytic lines"
-msgstr ""
+msgstr "Analytická linky"
 
 #. module: account
 #: help:account.tax,type:0
@@ -1369,28 +1365,28 @@ msgstr ""
 #. module: account
 #: model:process.node,name:account.process_node_electronicfile0
 msgid "Electronic File"
-msgstr ""
+msgstr "Elektronický soubor"
 
 #. module: account
 #: view:res.partner:0
 msgid "Customer Credit"
-msgstr ""
+msgstr "Odběratelský úvěr"
 
 #. module: account
 #: field:account.invoice,tax_line:0
 msgid "Tax Lines"
-msgstr ""
+msgstr "Daňové Linky"
 
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
-msgstr ""
+msgstr "Posloupnosti"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_type_form
 #: model:ir.ui.menu,name:account.menu_action_account_type_form
 msgid "Account Types"
-msgstr ""
+msgstr "Typy účtů"
 
 #. module: account
 #: wizard_field:account.automatic.reconcile,init,journal_id:0
@@ -1412,18 +1408,18 @@ msgstr ""
 #: wizard_field:populate_statement_from_inv,init,journal_id:0
 #: field:report.hr.timesheet.invoice.journal,journal_id:0
 msgid "Journal"
-msgstr ""
+msgstr "Časopis"
 
 #. module: account
 #: field:account.account,child_id:0
 #: field:account.analytic.account,child_ids:0
 msgid "Child Accounts"
-msgstr ""
+msgstr "Dětská konta"
 
 #. module: account
 #: field:account.account,check_history:0
 msgid "Display History"
-msgstr ""
+msgstr "Zobrazení historie"
 
 #. module: account
 #: wizard_field:account.third_party_ledger.report,init,date1:0
@@ -1453,7 +1449,7 @@ msgstr ""
 #: wizard_view:account.move.line.reconcile,init_full:0
 #: wizard_view:account.move.line.reconcile,init_partial:0
 msgid "Write-Off"
-msgstr ""
+msgstr "Odpis"
 
 #. module: account
 #: help:account.invoice,partner_bank:0
@@ -1465,12 +1461,12 @@ msgstr ""
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
-msgstr ""
+msgstr "Celkem za poplatek"
 
 #. module: account
 #: wizard_button:account.fiscalyear.close.state,init,close:0
 msgid "Close states"
-msgstr ""
+msgstr "Zavřít státy"
 
 #. module: account
 #: model:ir.model,name:account.model_wizard_company_setup
@@ -1485,22 +1481,22 @@ msgstr ""
 #. module: account
 #: field:account.journal,refund_journal:0
 msgid "Refund Journal"
-msgstr ""
+msgstr "Refundace věstníku"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_income
 msgid "Income"
-msgstr ""
+msgstr "Příjem"
 
 #. module: account
 #: selection:account.bank.statement.line,type:0
 msgid "Supplier"
-msgstr ""
+msgstr "Dodavatel"
 
 #. module: account
 #: rml:account.invoice:0
 msgid "Tel. :"
-msgstr ""
+msgstr "Telefonní číslo:"
 
 #. module: account
 #: field:account.invoice.tax,tax_amount:0
@@ -2136,7 +2132,8 @@ msgid "Analytic Entry"
 msgstr ""
 
 #. module: account
-#: view:res.company:0 field:res.company,overdue_msg:0
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr ""
 

addons/account/i18n/da.po

@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-06-22 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -2146,7 +2146,8 @@ msgid "Analytic Entry"
 msgstr ""
 
 #. module: account
-#: view:res.company:0 field:res.company,overdue_msg:0
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr ""
 

addons/account/i18n/de.po

@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-11 03:42+0000\n"
+"X-Launchpad-Export-Date: 2010-06-22 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account

addons/account/i18n/el.po

@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-06-22 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -2181,7 +2181,8 @@ msgid "Analytic Entry"
 msgstr "Αναλυτική Εγγραφή"
 
 #. module: account
-#: view:res.company:0 field:res.company,overdue_msg:0
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr "Μήνυμα καθυστερημένων πληρωμών"
 
@@ -6259,6 +6260,9 @@ msgstr "Υπολογισμός Ημερομηνιών Εγγραφής"
 #~ msgid "Can not %s draft/proforma/cancel invoice."
 #~ msgstr "Αδύνατη η %s προσωρινού/προφόρμα/ακυρωμένου τιμολογίου"
 
+#~ msgid "account.config.wizard"
+#~ msgstr "account.config.wizard"
+
 #, python-format
 #~ msgid "No sequence defined in the journal !"
 #~ msgstr "Καμία Ιεράρχηση δεν έχει καθοριστεί σε αυτό το ημερολόγιο!"

addons/account/i18n/es.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-04-11 21:46+0000\n"
-"Last-Translator: Juan Eduardo Riva <juaneduardoriva@gmail.com>\n"
+"PO-Revision-Date: 2010-06-24 10:03+0000\n"
+"Last-Translator: Borja López Soilán (Pexego) <borjals@pexego.es>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-06-26 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -60,7 +60,7 @@ msgstr "Nombre de modelo inválido en la definición de acción."
 #. module: account
 #: help:account.journal,currency:0
 msgid "The currency used to enter statement"
-msgstr "La moneda utilizada para introducir asientos"
+msgstr "La divisa utilizada para introducir asientos."
 
 #. module: account
 #: wizard_view:account_use_models,init_form:0
@@ -456,7 +456,7 @@ msgstr "Estado"
 #: model:ir.actions.act_window,name:account.action_invoice_tree13
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree13
 msgid "Unpaid Supplier Refunds"
-msgstr "Facturas de abono de proveedor sin pagar"
+msgstr "Facturas rectificativas (abono) de proveedor sin pagar"
 
 #. module: account
 #: view:account.tax:0
@@ -805,7 +805,7 @@ msgstr "Cuenta de la empresa"
 #. module: account
 #: wizard_view:account.subscription.generate,init:0
 msgid "Generate entries before:"
-msgstr "Generar asientos antes:"
+msgstr "Generar asientos hasta:"
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
@@ -1232,10 +1232,10 @@ msgid ""
 "software system you may have to use the rate at date. Incoming transactions "
 "always use the rate at date."
 msgstr ""
-"Permite seleccionar la forma en que la tasa de la moneda actual de las "
-"transacciones de salida se calcula. En la mayoría de los países el método "
-"legal es \"Promedio\", pero sólo unos pocos sistemas de software son capaces "
-"de gestionarlo. Por lo tanto, si la importación procede de otro sistema de "
+"Permite seleccionar la forma en que se calcula la tasa de la divisa actual "
+"en las transacciones de salida. En la mayoría de los países el método legal "
+"es \"Promedio\", pero sólo unos pocos sistemas de software son capaces de "
+"gestionarlo. Por lo tanto, si la importación procede de otro sistema de "
 "software, es posible que tenga que utilizar la tasa \"En fecha\". Las "
 "transacciones de entrada siempre utilizan la tasa \"En fecha\"."
 
@@ -1887,7 +1887,7 @@ msgstr "Fecha inicial"
 #. module: account
 #: model:account.journal,name:account.refund_expenses_journal
 msgid "x Expenses Credit Notes Journal"
-msgstr "x Diario facturas de abono de gastos"
+msgstr "x Diario facturas rectificativas (abono) de gastos"
 
 #. module: account
 #: field:account.analytic.journal,type:0
@@ -1914,7 +1914,7 @@ msgstr "Base imponible"
 #: field:account.tax,account_collected_id:0
 #: field:account.tax.template,account_collected_id:0
 msgid "Invoice Tax Account"
-msgstr "Cuenta impuestos de factura"
+msgstr "Cuenta impuestos de facturas"
 
 #. module: account
 #: view:account.move.line:0
@@ -2026,7 +2026,7 @@ msgstr "Informe analítico de diario"
 #: model:ir.actions.act_window,name:account.action_invoice_tree3
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree3
 msgid "Customer Refunds"
-msgstr "Facturas de abono de cliente"
+msgstr "Facturas rectificativas (abono) de cliente"
 
 #. module: account
 #: rml:account.vat.declaration:0
@@ -2047,7 +2047,7 @@ msgstr "Nombre diario-período"
 #: field:account.tax.code,name:0
 #: field:account.tax.code.template,name:0
 msgid "Tax Case Name"
-msgstr "Nombre impuesto del caso"
+msgstr "Nombre código de impuesto"
 
 #. module: account
 #: help:account.journal,entry_posted:0
@@ -2114,7 +2114,7 @@ msgstr "Comentario situacion fiscal"
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,period_id:0
 msgid "Opening Entries Period"
-msgstr "Periodo asientos de apertura"
+msgstr "Período asientos de apertura"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_validate_account_moves
@@ -2145,7 +2145,7 @@ msgstr "Anterior"
 #: field:account.model.line,currency_id:0
 #: field:account.move.line,currency_id:0
 msgid "Currency"
-msgstr "Moneda"
+msgstr "Divisa"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_invoice_opened
@@ -2180,7 +2180,8 @@ msgid "Analytic Entry"
 msgstr "Asiento analítico"
 
 #. module: account
-#: view:res.company:0 field:res.company,overdue_msg:0
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr "Mensaje pagos vencidos"
 
@@ -2224,7 +2225,7 @@ msgstr "Facturas de proveedor en borrador"
 #. module: account
 #: wizard_field:account.invoice.refund,init,period:0
 msgid "Force period"
-msgstr "Forzar periodo"
+msgstr "Forzar período"
 
 #. module: account
 #: selection:account.account.type,close_method:0
@@ -2305,7 +2306,7 @@ msgstr "Fecha factura"
 #: help:account.third_party_ledger.report,init,periods:0
 #: help:account.vat.declaration,init,periods:0
 msgid "All periods if empty"
-msgstr "Todos los periodos si está vacío"
+msgstr "Todos los períodos si está vacío."
 
 #. module: account
 #: model:account.account.type,name:account.account_type_liability
@@ -2529,7 +2530,7 @@ msgstr "Asientos conciliados"
 #. module: account
 #: help:account.bank.statement.reconcile,total_second_amount:0
 msgid "The amount in the currency of the journal"
-msgstr "La cantidad en la moneda del diario"
+msgstr "El importe en la divisa del diario."
 
 #. module: account
 #: wizard_field:account.general.ledger.report,checktype,landscape:0
@@ -2927,7 +2928,7 @@ msgstr "Estado abierto"
 #. module: account
 #: field:account.journal,entry_posted:0
 msgid "Skip 'Draft' State for Created Entries"
-msgstr "Omitir el estado 'Borrador ' para los asientos creados"
+msgstr "Omitir estado 'Borrador ' al crear asientos"
 
 #. module: account
 #: field:account.invoice.tax,account_id:0
@@ -2963,7 +2964,7 @@ msgstr "1cm 27.7cm 20cm 27.7cm"
 #: model:ir.actions.act_window,name:account.action_invoice_tree12
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree12
 msgid "Draft Supplier Refunds"
-msgstr "Facturas de abono de proveedor en borrador"
+msgstr "Facturas rectificativas (abono) de proveedor en borrador"
 
 #. module: account
 #: model:process.node,name:account.process_node_accountingstatemententries0
@@ -3050,7 +3051,7 @@ msgstr "Tasa de divisas de salida"
 #: model:ir.actions.act_window,name:account.action_invoice_tree10
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree10
 msgid "Draft Customer Refunds"
-msgstr "Facturas de abono de cliente en borrador"
+msgstr "Facturas rectificativas (abono) de cliente en borrador"
 
 #. module: account
 #: field:account.journal.column,readonly:0
@@ -3083,7 +3084,7 @@ msgstr "Documento"
 #. module: account
 #: help:account.move.line,move_id:0
 msgid "The move of this entry line."
-msgstr "El movimiento de esta línea del asiento."
+msgstr "El asiento de este apunte."
 
 #. module: account
 #: field:account.invoice.line,uos_id:0
@@ -3233,7 +3234,7 @@ msgstr "Diario de banco"
 #: selection:account.partner.balance.report,init,state:0
 #: selection:account.third_party_ledger.report,init,state:0
 msgid "By Date and Period"
-msgstr "Por fecha y periodo"
+msgstr "Por fecha y período"
 
 #. module: account
 #: view:account.account:0
@@ -3342,7 +3343,7 @@ msgstr "Nombre impuesto"
 #. module: account
 #: wizard_view:account.fiscalyear.close.state,init:0
 msgid " Close states of Fiscal year and periods"
-msgstr " Cerrar estados de ejercicio fiscal y periodos"
+msgstr " Cerrar estados de ejercicio fiscal y períodos"
 
 #. module: account
 #: model:account.payment.term,name:account.account_payment_term
@@ -3539,7 +3540,7 @@ msgstr "Titular de la cuenta bancaria"
 #: wizard_view:account.partner.balance.report,init:0
 #: wizard_view:account.third_party_ledger.report,init:0
 msgid "Filter on Periods"
-msgstr "Filtrar por periodos"
+msgstr "Filtrar por períodos"
 
 #. module: account
 #: field:res.partner,property_account_receivable:0
@@ -3607,7 +3608,7 @@ msgstr "Impreso"
 #: model:ir.actions.act_window,name:account.action_invoice_tree4_new
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree4_new
 msgid "New Supplier Refund"
-msgstr "Nueva factura de abono de proveedor"
+msgstr "Nueva factura rectificativa (abono) de proveedor"
 
 #. module: account
 #: view:account.model:0
@@ -3617,7 +3618,7 @@ msgstr "Modelo de asiento"
 #. module: account
 #: wizard_field:account.general.ledger.report,checktype,amount_currency:0
 msgid "With Currency"
-msgstr "Con moneda"
+msgstr "Con divisa"
 
 #. module: account
 #: view:account.account:0
@@ -3678,7 +3679,7 @@ msgstr ""
 #: wizard_field:account.invoice.pay,addendum,comment:0
 #: wizard_field:account.invoice.pay,init,name:0
 msgid "Entry Name"
-msgstr "Núm. asiento"
+msgstr "Descripción"
 
 #. module: account
 #: help:account.invoice,account_id:0
@@ -3722,7 +3723,7 @@ msgstr "Codificación asiento"
 #: wizard_view:account.invoice.refund,init:0
 #: model:ir.actions.wizard,name:account.wizard_invoice_refund
 msgid "Credit Note"
-msgstr "Factura de abono"
+msgstr "Factura rectificativa (abono)"
 
 #. module: account
 #: model:ir.actions.todo,note:account.config_fiscalyear
@@ -3737,7 +3738,7 @@ msgstr "Período de desajuste"
 #. module: account
 #: selection:account.config.wizard,period:0
 msgid "3 Months"
-msgstr "3 meses"
+msgstr "Trimestral"
 
 #. module: account
 #: wizard_view:account.move.journal,init:0
@@ -3868,7 +3869,7 @@ msgstr "Secuencia del asiento"
 #: selection:account.account,type:0
 #: selection:account.account.template,type:0
 msgid "Closed"
-msgstr "Cerrado"
+msgstr "Cierre"
 
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
@@ -3924,7 +3925,7 @@ msgstr "Movimiento"
 #. module: account
 #: help:account.period,special:0
 msgid "These periods can overlap."
-msgstr "Estos periodos se pueden solapar."
+msgstr "Estos períodos se pueden solapar."
 
 #. module: account
 #: help:product.template,property_account_expense:0
@@ -3952,7 +3953,7 @@ msgstr "Diarios financieros"
 #: selection:account.partner.balance.report,init,state:0
 #: selection:account.third_party_ledger.report,init,state:0
 msgid "By Period"
-msgstr "Por periodo"
+msgstr "Por período"
 
 #. module: account
 #: help:account.invoice,date_invoice:0
@@ -4050,7 +4051,7 @@ msgstr "Cuenta a pagar"
 #: field:account.account,currency_id:0
 #: field:account.account.template,currency_id:0
 msgid "Secondary Currency"
-msgstr "Moneda secundaria"
+msgstr "Divisa secundaria"
 
 #. module: account
 #: field:account.account,credit:0
@@ -4085,7 +4086,7 @@ msgstr ""
 #: field:account.tax,account_paid_id:0
 #: field:account.tax.template,account_paid_id:0
 msgid "Refund Tax Account"
-msgstr "Cuenta impuestos de devoluciones"
+msgstr "Cuenta impuestos de reintegros"
 
 #. module: account
 #: field:account.tax.code,child_ids:0
@@ -4165,7 +4166,7 @@ msgstr "Límite a pagar"
 #: wizard_field:account.partner.balance.report,init,state:0
 #: wizard_field:account.third_party_ledger.report,init,state:0
 msgid "Date/Period Filter"
-msgstr "Filtrar fecha/periodo"
+msgstr "Filtrar por fecha/período"
 
 #. module: account
 #: rml:account.analytic.account.journal:0
@@ -4188,7 +4189,7 @@ msgstr "Secuencias de diarios separadas"
 #. module: account
 #: help:account.bank.statement.reconcile,total_second_currency:0
 msgid "The currency of the journal"
-msgstr "La moneda del diario"
+msgstr "La divisa del diario"
 
 #. module: account
 #: view:account.journal.column:0
@@ -4431,7 +4432,7 @@ msgstr "Fijado"
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Credit Notes"
-msgstr "Facturas de abono"
+msgstr "Facturas rectificativas (abono)"
 
 #. module: account
 #: field:account.config.wizard,date2:0
@@ -4501,7 +4502,7 @@ msgstr "Línea del modelo de asiento"
 #. module: account
 #: view:account.tax.template:0
 msgid "Account Tax Template"
-msgstr "Plantilla de impuesto"
+msgstr "Plantilla de impuestos"
 
 #. module: account
 #: help:account.model,name:0
@@ -4623,7 +4624,7 @@ msgstr "Por fecha"
 #: model:ir.actions.act_window,name:account.action_invoice_tree4
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree4
 msgid "Supplier Refunds"
-msgstr "Facturas de abono de proveedor"
+msgstr "Facturas rectificativas (abono) de proveedor"
 
 #. module: account
 #: help:account.model.line,date:0
@@ -5128,7 +5129,7 @@ msgstr "Cuenta de ingresos en plantilla producto"
 #: help:account.account.template,currency_id:0
 msgid "Force all moves for this account to have this secondary currency."
 msgstr ""
-"Fuerza a todos los movimientos de esta cuenta que tengan esta moneda "
+"Fuerza a todos los movimientos de esta cuenta que tengan esta divisa "
 "secundaria."
 
 #. module: account
@@ -5142,7 +5143,7 @@ msgstr "_Cancelar"
 #: wizard_view:account.partner.balance.report,init:0
 #: wizard_view:account.third_party_ledger.report,init:0
 msgid "Select Date-Period"
-msgstr "Seleccionar fecha-periodo"
+msgstr "Seleccionar fecha-período"
 
 #. module: account
 #: rml:account.analytic.account.inverted.balance:0
@@ -5171,7 +5172,7 @@ msgstr "Grupo de Impuestos"
 #: model:ir.actions.act_window,name:account.action_invoice_tree3_new
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree3_new
 msgid "New Customer Refund"
-msgstr "Nueva factura de abono de cliente"
+msgstr "Nueva factura rectificativa (abono) de cliente"
 
 #. module: account
 #: help:wizard.multi.charts.accounts,seq_journal:0
@@ -5369,7 +5370,7 @@ msgstr "Pagado"
 #: model:ir.actions.act_window,name:account.action_invoice_tree11
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree11
 msgid "Unpaid Customer Refunds"
-msgstr "Facturas de abono de cliente sin pagar"
+msgstr "Facturas rectificativas (abono) de cliente sin pagar"
 
 #. module: account
 #: help:account.invoice,residual:0
@@ -5557,7 +5558,7 @@ msgstr "Saldo pendiente"
 #. module: account
 #: rml:account.invoice:0
 msgid "Refund"
-msgstr "Factura de abono"
+msgstr "Factura rectificativa (abono)"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_tax
@@ -5794,7 +5795,7 @@ msgstr ""
 #: field:account.tax.code,code:0
 #: field:account.tax.code.template,code:0
 msgid "Case Code"
-msgstr "Código caso"
+msgstr "Código"
 
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
@@ -5810,7 +5811,7 @@ msgstr "Cuenta de ingresos"
 #. module: account
 #: field:account.period,special:0
 msgid "Opening/Closing Period"
-msgstr "Periodo de apertura/cierre"
+msgstr "Período de apertura/cierre"
 
 #. module: account
 #: rml:account.analytic.account.balance:0
@@ -5918,7 +5919,7 @@ msgstr "Dejarlo vacío para todos los ejercicios fiscales abiertos"
 #: rml:account.invoice:0
 #: selection:account.invoice,type:0
 msgid "Supplier Refund"
-msgstr "Factura de abono de proveedor"
+msgstr "Factura rectificativa (abono) de proveedor"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_entriesreconcile0
@@ -6074,3 +6075,6 @@ msgstr ""
 #: wizard_button:account.subscription.generate,init,generate:0
 msgid "Compute Entry Dates"
 msgstr "Calcular fechas asiento"
+
+#~ msgid "account.config.wizard"
+#~ msgstr "account.config.asistente"

addons/account/i18n/es_AR.po

@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-06-22 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -2178,7 +2178,8 @@ msgid "Analytic Entry"
 msgstr "Asiento analítico"
 
 #. module: account
-#: view:res.company:0 field:res.company,overdue_msg:0
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr "Mensaje de Pagos Vencidos"
 
@@ -6136,6 +6137,9 @@ msgstr "Calcular fechas del asiento"
 #~ msgid "You must first select a partner !"
 #~ msgstr "Primero debe seleccionar un partner !"
 
+#~ msgid "account.config.wizard"
+#~ msgstr "asistente.configuracion.contable"
+
 #, python-format
 #~ msgid "The opening journal must not have any entry in the new fiscal year !"
 #~ msgstr ""

addons/account/i18n/es_EC.po

@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-06-22 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -2171,7 +2171,8 @@ msgid "Analytic Entry"
 msgstr ""
 
 #. module: account
-#: view:res.company:0 field:res.company,overdue_msg:0
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr ""
 

addons/account/i18n/et.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-05-09 18:34+0000\n"
+"PO-Revision-Date: 2010-06-25 18:22+0000\n"
 "Last-Translator: lyyser <logard.1961@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-10 04:17+0000\n"
+"X-Launchpad-Export-Date: 2010-06-26 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -290,7 +290,7 @@ msgstr "Fikseeritud"
 #: model:ir.actions.report.xml,name:account.account_overdue
 #: view:res.company:0
 msgid "Overdue Payments"
-msgstr "Tasumatta Maksed"
+msgstr "Tasumata Maksed"
 
 #. module: account
 #: wizard_view:account.account.balance.report,checktype:0
@@ -466,7 +466,7 @@ msgstr "Panga võrdlus"
 #. module: account
 #: rml:account.invoice:0
 msgid "Disc.(%)"
-msgstr ""
+msgstr "Allah. (%)"
 
 #. module: account
 #: rml:account.general.ledger:0
@@ -732,7 +732,7 @@ msgstr "Välja nimi"
 #: field:account.tax.code,sign:0
 #: field:account.tax.code.template,sign:0
 msgid "Sign for parent"
-msgstr ""
+msgstr "Logi vanemana"
 
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
@@ -1463,7 +1463,7 @@ msgstr ""
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
-msgstr ""
+msgstr "Võlg kokku"
 
 #. module: account
 #: wizard_button:account.fiscalyear.close.state,init,close:0
@@ -2134,7 +2134,8 @@ msgid "Analytic Entry"
 msgstr "Analüütiline kirje"
 
 #. module: account
-#: view:res.company:0 field:res.company,overdue_msg:0
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr ""
 
@@ -2167,7 +2168,7 @@ msgstr "Loo 3 kuupikkused perioodid"
 #. module: account
 #: view:account.invoice:0
 msgid "(keep empty to use the current period)"
-msgstr "(jätke tühjaks, et kasutada praegusel perioodil)"
+msgstr "(jätke tühjaks, et kasutada käesolevat perioodi)"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree8
@@ -2915,7 +2916,7 @@ msgstr ""
 #: view:product.template:0
 #: view:res.partner:0
 msgid "Accounting"
-msgstr ""
+msgstr "Raamatupidamine"
 
 #. module: account
 #: view:account.fiscal.position.template:0
@@ -4047,7 +4048,7 @@ msgstr "Kliendi arved"
 #. module: account
 #: field:res.partner,debit_limit:0
 msgid "Payable Limit"
-msgstr ""
+msgstr "Võla limiit"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,state:0
@@ -5195,7 +5196,7 @@ msgstr "Ei"
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_partner_account_move
 msgid "All account entries"
-msgstr ""
+msgstr "Kõik kontokirjed"
 
 #. module: account
 #: help:account.invoice.tax,tax_code_id:0
@@ -5519,7 +5520,7 @@ msgstr ""
 #. module: account
 #: wizard_view:account.move.validate,init:0
 msgid "Validate Account Entries"
-msgstr "Kinnita konokirjed"
+msgstr "Kinnita kontokirjed"
 
 #. module: account
 #: selection:account.print.journal.report,init,sort_selection:0

addons/account/i18n/eu.po

@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-24 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-06-22 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account

addons/account/i18n/fa.po

@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-06-22 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -2133,7 +2133,8 @@ msgid "Analytic Entry"
 msgstr ""
 
 #. module: account
-#: view:res.company:0 field:res.company,overdue_msg:0
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr ""
 

addons/account/i18n/fi.po

@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-06-22 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -2170,7 +2170,8 @@ msgid "Analytic Entry"
 msgstr "Analyyttinen merkintä"
 
 #. module: account
-#: view:res.company:0 field:res.company,overdue_msg:0
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr "Myöhässä olevien maksujen viesti"
 

addons/account/i18n/fr.po

@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-22 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-06-22 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account

addons/account/i18n/gl.po

@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-05-14 17:04+0000\n"
+"PO-Revision-Date: 2010-06-24 09:57+0000\n"
 "Last-Translator: Borja López Soilán (Pexego) <borjals@pexego.es>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-15 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-06-26 03:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -2047,7 +2047,7 @@ msgstr ""
 #. module: account
 #: field:account.journal,invoice_sequence_id:0
 msgid "Invoice Sequence"
-msgstr ""
+msgstr "Secuencia de factura"
 
 #. module: account
 #: wizard_view:account.automatic.reconcile,init:0
@@ -3597,7 +3597,7 @@ msgstr ""
 #: wizard_field:account.invoice.pay,addendum,comment:0
 #: wizard_field:account.invoice.pay,init,name:0
 msgid "Entry Name"
-msgstr ""
+msgstr "Descripción"
 
 #. module: account
 #: help:account.invoice,account_id:0
@@ -5064,7 +5064,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_fiscalyear_seq
 msgid "Maintains Invoice sequences with Fiscal Year"
-msgstr ""
+msgstr "Mantén secuencias de facturas con exercicio fiscal"
 
 #. module: account
 #: selection:account.account.balance.report,checktype,display_account:0

addons/account/i18n/gu.po

@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-06-22 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -2133,7 +2133,8 @@ msgid "Analytic Entry"
 msgstr ""
 
 #. module: account
-#: view:res.company:0 field:res.company,overdue_msg:0
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr ""
 

addons/account/i18n/hr.po

@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-06-22 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -2132,7 +2132,8 @@ msgid "Analytic Entry"
 msgstr ""
 
 #. module: account
-#: view:res.company:0 field:res.company,overdue_msg:0
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr ""
 

addons/account/i18n/hu.po

@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-06-22 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -2132,7 +2132,8 @@ msgid "Analytic Entry"
 msgstr ""
 
 #. module: account
-#: view:res.company:0 field:res.company,overdue_msg:0
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr ""
 

addons/account/i18n/id.po

@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-06-22 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -2133,7 +2133,8 @@ msgid "Analytic Entry"
 msgstr ""
 
 #. module: account
-#: view:res.company:0 field:res.company,overdue_msg:0
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr ""
 

addons/account/i18n/it.po

@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-18 03:32+0000\n"
+"X-Launchpad-Export-Date: 2010-06-22 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account

addons/account/i18n/kab.po

@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-06-22 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -806,8 +806,6 @@ msgstr ""
 msgid "Move Lines"
 msgstr ""
 
-
-
 #. module: account
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.report_account_analytic_journal_print
@@ -2135,7 +2133,8 @@ msgid "Analytic Entry"
 msgstr ""
 
 #. module: account
-#: view:res.company:0 field:res.company,overdue_msg:0
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr ""
 

addons/account/i18n/ko.po

@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-06-22 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -2133,7 +2133,8 @@ msgid "Analytic Entry"
 msgstr ""
 
 #. module: account
-#: view:res.company:0 field:res.company,overdue_msg:0
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr ""
 

addons/account/i18n/lt.po

@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-06-22 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -2147,7 +2147,8 @@ msgid "Analytic Entry"
 msgstr "Analitinis įrašas"
 
 #. module: account
-#: view:res.company:0 field:res.company,overdue_msg:0
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr ""
 

addons/account/i18n/lv.po

@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-17 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-06-22 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account

addons/account/i18n/mn.po

@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-06-22 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -2133,7 +2133,8 @@ msgid "Analytic Entry"
 msgstr ""
 
 #. module: account
-#: view:res.company:0 field:res.company,overdue_msg:0
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr ""
 

addons/account/i18n/nb.po

@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-06-22 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -2133,7 +2133,8 @@ msgid "Analytic Entry"
 msgstr ""
 
 #. module: account
-#: view:res.company:0 field:res.company,overdue_msg:0
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr ""
 

addons/account/i18n/nl.po

@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-06-22 04:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -2176,7 +2176,8 @@ msgid "Analytic Entry"
 msgstr "Kostenplaatsboeking"
 
 #. module: account
-#: view:res.company:0 field:res.company,overdue_msg:0
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr "Aanmaningsbericht"
 
@@ -6075,3 +6076,6 @@ msgstr ""
 #: wizard_button:account.subscription.generate,init,generate:0
 msgid "Compute Entry Dates"
 msgstr "Bereken mutatie data"
+
+#~ msgid "account.config.wizard"
+#~ msgstr "account.config.wizard"

addons/account/i18n/nl_BE.po

@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-03 03:33+0000\n"
+"X-Launchpad-Export-Date: 2010-06-22 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account

addons/account/i18n/oc.po

@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-25 03:42+0000\n"
+"X-Launchpad-Export-Date: 2010-06-22 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account

addons/account/i18n/pl.po

@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-31 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-06-22 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account

addons/account/i18n/pt.po

@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-06-22 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -2169,7 +2169,8 @@ msgid "Analytic Entry"
 msgstr "movimento analitico"
 
 #. module: account
-#: view:res.company:0 field:res.company,overdue_msg:0
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr "Mensagem de pagamentos em atraso"
 

addons/account/i18n/pt_BR.po

@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-06-22 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -2175,7 +2175,8 @@ msgid "Analytic Entry"
 msgstr "Lançamento analítico"
 
 #. module: account
-#: view:res.company:0 field:res.company,overdue_msg:0
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr "Mensagem para Pagamentos Atrasados"
 
@@ -6068,3 +6069,6 @@ msgstr ""
 #: wizard_button:account.subscription.generate,init,generate:0
 msgid "Compute Entry Dates"
 msgstr "Processar Datas de Lançamento"
+
+#~ msgid "account.config.wizard"
+#~ msgstr "account.config.wizard"

addons/account/i18n/ro.po

@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-06-22 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -2175,7 +2175,8 @@ msgid "Analytic Entry"
 msgstr "Înregistrare analitică"
 
 #. module: account
-#: view:res.company:0 field:res.company,overdue_msg:0
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr "Mesaj plăţi restante"
 
@@ -6063,3 +6064,6 @@ msgstr ""
 #: wizard_button:account.subscription.generate,init,generate:0
 msgid "Compute Entry Dates"
 msgstr "Calculează datele înregistrării"
+
+#~ msgid "account.config.wizard"
+#~ msgstr "account.config.wizard"

addons/account/i18n/ru.po

@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-06-22 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -2154,7 +2154,8 @@ msgid "Analytic Entry"
 msgstr "Проводка аналитики"
 
 #. module: account
-#: view:res.company:0 field:res.company,overdue_msg:0
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr ""
 

addons/account/i18n/si.po

@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-06-22 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -2133,7 +2133,8 @@ msgid "Analytic Entry"
 msgstr ""
 
 #. module: account
-#: view:res.company:0 field:res.company,overdue_msg:0
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr ""
 

addons/account/i18n/sk.po

@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-06-22 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -2136,7 +2136,8 @@ msgid "Analytic Entry"
 msgstr ""
 
 #. module: account
-#: view:res.company:0 field:res.company,overdue_msg:0
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr ""
 

addons/account/i18n/sl.po

@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-06-22 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -2159,7 +2159,8 @@ msgid "Analytic Entry"
 msgstr "Analitičen vnos"
 
 #. module: account
-#: view:res.company:0 field:res.company,overdue_msg:0
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr "Sporočilo za opomin za zapadle postavke"
 
@@ -5960,3 +5961,6 @@ msgstr ""
 #: wizard_button:account.subscription.generate,init,generate:0
 msgid "Compute Entry Dates"
 msgstr "Izračunaj datume vknjižb"
+
+#~ msgid "account.config.wizard"
+#~ msgstr "account.config.wizard"

addons/account/i18n/sq.po

@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-06-22 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -2159,7 +2159,8 @@ msgid "Analytic Entry"
 msgstr ""
 
 #. module: account
-#: view:res.company:0 field:res.company,overdue_msg:0
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr ""
 

addons/account/i18n/sr.po

@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-26 03:42+0000\n"
+"X-Launchpad-Export-Date: 2010-06-22 04:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -2136,7 +2136,8 @@ msgid "Analytic Entry"
 msgstr ""
 
 #. module: account
-#: view:res.company:0 field:res.company,overdue_msg:0
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr ""
 

addons/account/i18n/sv.po

@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-22 03:43+0000\n"
+"X-Launchpad-Export-Date: 2010-06-22 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -2151,7 +2151,8 @@ msgid "Analytic Entry"
 msgstr "Objektpost"
 
 #. module: account
-#: view:res.company:0 field:res.company,overdue_msg:0
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr "Förfallna fakturor meddelande"
 

addons/account/i18n/te.po

@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-06-22 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -2133,7 +2133,8 @@ msgid "Analytic Entry"
 msgstr ""
 
 #. module: account
-#: view:res.company:0 field:res.company,overdue_msg:0
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr ""
 

addons/account/i18n/th.po

@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-21 03:38+0000\n"
+"X-Launchpad-Export-Date: 2010-06-22 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account

addons/account/i18n/tlh.po

@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-06-22 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -2132,7 +2132,8 @@ msgid "Analytic Entry"
 msgstr ""
 
 #. module: account
-#: view:res.company:0 field:res.company,overdue_msg:0
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr ""
 

addons/account/i18n/tr.po

@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-06-22 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -2132,7 +2132,8 @@ msgid "Analytic Entry"
 msgstr ""
 
 #. module: account
-#: view:res.company:0 field:res.company,overdue_msg:0
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr "Vadesi Geçmiş Ödeme için Mesaj"
 

addons/account/i18n/ug.po

@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-12 04:20+0000\n"
+"X-Launchpad-Export-Date: 2010-06-22 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -806,11 +806,6 @@ msgstr ""
 msgid "Move Lines"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_config_wizard
-msgid "account.config.wizard"
-msgstr ""
-
 #. module: account
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.report_account_analytic_journal_print
@@ -2138,7 +2133,8 @@ msgid "Analytic Entry"
 msgstr ""
 
 #. module: account
-#: view:res.company:0 field:res.company,overdue_msg:0
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr ""
 

addons/account/i18n/uk.po

@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-06-22 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -2135,7 +2135,8 @@ msgid "Analytic Entry"
 msgstr "Проводка аналітики"
 
 #. module: account
-#: view:res.company:0 field:res.company,overdue_msg:0
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr ""
 

addons/account/i18n/vi.po

@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-06-22 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -2144,7 +2144,8 @@ msgid "Analytic Entry"
 msgstr ""
 
 #. module: account
-#: view:res.company:0 field:res.company,overdue_msg:0
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr ""
 

addons/account/i18n/zh_CN.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-06-09 16:41+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2010-06-22 22:56+0000\n"
+"Last-Translator: sagas <sagas@163.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-11 03:43+0000\n"
+"X-Launchpad-Export-Date: 2010-06-26 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -277,8 +277,8 @@ msgid ""
 "date empty, it means direct payment. The payment term may compute several "
 "due dates, for example 50% now, 50% in one month."
 msgstr ""
-"如果你使用付款条件，这到期日期将在生产会计分录时自动计算。如果付款条件和到期日\r\n"
-"期为空，则意味着直接付款。这种付款条件可能计算出几个到期日，例如现在先付50%然\r\n"
+"如果你使用付款条件，到期日期将在生成会计分录时自动计算。如果付款条件和到期日\r\n"
+"期为空，则意味着直接付款。使用付款条件可能计算出几个到期日，例如现在先付50%，然\r\n"
 "后在一个月内支付余下的50%。"
 
 #. module: account
@@ -302,7 +302,7 @@ msgstr "逾期付款"
 #: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
 #: wizard_view:account.vat.declaration,init:0
 msgid "Select period"
-msgstr "选择期间段"
+msgstr "选择会计期间"
 
 #. module: account
 #: field:account.invoice,origin:0
@@ -488,7 +488,7 @@ msgstr "税用在"
 msgid ""
 "Set if the amount of tax must be included in the base amount before "
 "computing the next taxes."
-msgstr "在下一个税额计算前，如果本税额必须包含在下一税基里，请设置"
+msgstr "在下一个税额计算前，如果本税额必须包含在税基里，请设置"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_periodical_processing

addons/account/i18n/zh_HK.po

@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-06-22 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -2133,7 +2133,8 @@ msgid "Analytic Entry"
 msgstr ""
 
 #. module: account
-#: view:res.company:0 field:res.company,overdue_msg:0
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr ""
 

addons/account/i18n/zh_TW.po

@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-23 03:45+0000\n"
+"X-Launchpad-Export-Date: 2010-06-22 04:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -2132,7 +2132,8 @@ msgid "Analytic Entry"
 msgstr ""
 
 #. module: account
-#: view:res.company:0 field:res.company,overdue_msg:0
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
 msgstr ""
 

addons/account/invoice.py

@@ -325,6 +325,19 @@ class account_invoice(osv.osv):
         'user_id': lambda s, cr, u, c: u,
     }
 
+    def fields_view_get(self, cr, uid, view_id=None, view_type=False, context=None, toolbar=False, submenu=False):
+        if context.get('active_model','') in ['res.partner']:
+            partner = self.pool.get(context['active_model']).read(cr,uid,context['active_ids'],['supplier','customer'])[0]
+            if not view_type:
+                view_id = self.pool.get('ir.ui.view').search(cr,uid,[('name','=','account.invoice.tree')])[0]
+                view_type = 'tree'
+            if view_type == 'form':
+                if partner['supplier'] and not partner['customer']:
+                    view_id = self.pool.get('ir.ui.view').search(cr,uid,[('name','=','account.invoice.supplier.form')])[0]
+                else:
+                    view_id = self.pool.get('ir.ui.view').search(cr,uid,[('name','=','account.invoice.form')])[0]
+        return super(account_invoice,self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=submenu)
+
     def create(self, cr, uid, vals, context={}):
         try:
             res = super(account_invoice, self).create(cr, uid, vals, context)
@@ -871,7 +884,7 @@ class account_invoice(osv.osv):
             # make the invoice point to that move
             self.write(cr, uid, [inv.id], {'move_id': move_id,'period_id':period_id, 'move_name':new_move_name})
             self.pool.get('account.move').post(cr, uid, [move_id])
-            self._log_event(cr, uid, ids)
+        self._log_event(cr, uid, ids)
         return True
 
     def line_get_convert(self, cr, uid, x, part, date, context=None):
@@ -961,7 +974,7 @@ class account_invoice(osv.osv):
         return taxes.values()
 
     def _log_event(self, cr, uid, ids, factor=1.0, name='Open Invoice'):
-        #TODO: implement messages system        
+        #TODO: implement messages system
         return True
 
     def name_get(self, cr, uid, ids, context=None):

addons/account/partner_view.xml

@@ -70,8 +70,8 @@
             <field name="priority">2</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
-                <notebook>
-                <page string="Accounting" position="inside">
+                <page string="Notes" position="before">
+                <page string="Accounting">
                     <group col="2" colspan="2">
                         <separator string="Customer Accounting Properties" colspan="2"/>
                         <field name="property_account_receivable" groups="account.group_account_user" />
@@ -119,7 +119,7 @@
                         </tree>
                     </field>
                 </page>
-                </notebook>
+                </page>
             </field>
         </record>
 

addons/account/process/customer_invoice_process.xml

@@ -50,7 +50,7 @@
         </record>
     
         <record id="process_node_accountingentries0" model="process.node">
-            <field name="menu_id" ref="account.menu_action_move_line_form"/>
+            <field name="menu_id" ref="account.menu_action_move_journal_line_form"/>
             <field name="model_id" ref="account.model_account_move"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Accounting&quot;&quot;&quot;" name="name"/>
@@ -72,7 +72,7 @@
   		</record>
     
         <record id="process_node_paymententries0" model="process.node">
-            <field name="menu_id" ref="account.menu_action_move_line_form"/>
+            <field name="menu_id" ref="account.menu_action_move_journal_line_form"/>
             <field name="model_id" ref="account.model_account_move_line"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Payment&quot;&quot;&quot;" name="name"/>
@@ -83,7 +83,7 @@
         </record>
     
         <record id="process_node_reconciliation0" model="process.node">
-            <field name="menu_id" ref="account.menu_action_move_line_search"/>
+            <field name="menu_id" ref="account.menu_eaction_account_moves_all"/>
             <field name="model_id" ref="account.model_account_move_reconcile"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Reconciliation&quot;&quot;&quot;" name="name"/>
@@ -105,7 +105,7 @@
         </record>
         
         <record id="process_node_accountingstatemententries0" model="process.node">
-            <field name="menu_id" ref="account.menu_action_move_line_search"/>
+            <field name="menu_id" ref="account.menu_eaction_account_moves_all"/>
             <field name="model_id" ref="account.model_account_move_line"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Bank Statement&quot;&quot;&quot;" name="name"/>

addons/account/process/supplier_invoice_process.xml

@@ -62,7 +62,7 @@
         </record>
         
         <record id="process_node_supplieraccountingentries0" model="process.node">
-            <field name="menu_id" ref="account.menu_action_move_line_form"/>
+            <field name="menu_id" ref="account.menu_action_move_journal_line_form"/>
             <field name="model_id" ref="account.model_account_move"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Accounting&quot;&quot;&quot;" name="name"/>
@@ -72,7 +72,7 @@
         </record>
         
         <record id="process_node_supplierpaymentorder0" model="process.node">
-            <field name="menu_id" ref="account.menu_action_move_line_search"/>
+            <field name="menu_id" ref="account.menu_eaction_account_moves_all"/>
             <field name="model_id" ref="account.model_account_move_line"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Payment Order&quot;&quot;&quot;" name="name"/>
@@ -83,7 +83,7 @@
         </record>
         
         <record id="process_node_supplierreconciliation0" model="process.node">
-            <field name="menu_id" ref="account.menu_action_move_line_search"/>
+            <field name="menu_id" ref="account.menu_eaction_account_moves_all"/>
             <field name="model_id" ref="account.model_account_move_reconcile"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Reconciliation&quot;&quot;&quot;" name="name"/>

addons/account/product_view.xml

@@ -35,8 +35,8 @@
                         <separator string="Purchase Properties" colspan="2"/>
                         <field name="property_account_income" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                         <field name="property_account_expense" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                        <field name="supplier_taxes_id"/>
                         <field name="taxes_id"/>
+                        <field name="supplier_taxes_id"/>
                     </page>
                 </notebook>
              </field>

addons/account/project/wizard/account_analytic_chart_view.xml

@@ -2,43 +2,43 @@
 <openerp>
     <data>
 
-		<record id="account_analytic_chart_view" model="ir.ui.view">
-			<field name="name">Account Analytic Chart</field>
-			<field name="model">account.analytic.chart</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="Analytic Account Charts">
-				    <separator string="Select the Period for Analysis" colspan="4"/>
-				    <field name="from_date"/>
-				    <newline/>
-				    <field name="to_date"/>
-				    <newline/>
-				    <label string="(Keep empty to open the current situation)" align="0.0" colspan="3"/>
-					<separator colspan="4"/>
-					<group colspan="4" col="6">
-						<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-						<button name="analytic_account_chart_open_window" string="Open Charts" type="object" icon="gtk-ok"/>
-					</group>
-				</form>
-			</field>
-		</record>
+        <record id="account_analytic_chart_view" model="ir.ui.view">
+            <field name="name">Chart of Analytic Accounts</field>
+            <field name="model">account.analytic.chart</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Analytic Account Charts">
+                    <separator string="Select the Period for Analysis" colspan="4"/>
+                    <field name="from_date"/>
+                    <newline/>
+                    <field name="to_date"/>
+                    <newline/>
+                    <label string="(Keep empty to open the current situation)" align="0.0" colspan="3"/>
+                    <separator colspan="4"/>
+                    <group colspan="4" col="6">
+                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                        <button name="analytic_account_chart_open_window" string="Open Charts" type="object" icon="gtk-ok"/>
+                    </group>
+                </form>
+            </field>
+        </record>
 
-		<record id="action_account_analytic_chart" model="ir.actions.act_window">
-			<field name="name">Analytic Chart of Accounts</field>
-			<field name="type">ir.actions.act_window</field>
-			<field name="res_model">account.analytic.chart</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">form</field>
-			<field name="view_id" ref="account_analytic_chart_view"/>
-			<field name="target">new</field>
-		</record>
+        <record id="action_account_analytic_chart" model="ir.actions.act_window">
+            <field name="name">Chart of Analytic Accounts</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.analytic.chart</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="account_analytic_chart_view"/>
+            <field name="target">new</field>
+        </record>
 
-		<menuitem
-	        name="Analytic Chart of Accounts"
-	        parent="account.menu_finance_charts"
-	        action="action_account_analytic_chart"
-	        id="menu_action_analytic_account_tree2"
-	        icon="STOCK_INDENT"/>
+        <menuitem
+            name="Chart of Analytic Accounts"
+            parent="account.menu_finance_charts"
+            action="action_account_analytic_chart"
+            id="menu_action_analytic_account_tree2"
+            icon="STOCK_INDENT"/>
 
     </data>
-</openerp>
+</openerp>

addons/account/report/__init__.py

@@ -40,5 +40,7 @@ import account_account_report
 import account_entries_report
 import account_analytic_entries_report
 import voucher_print
+import report_bs
+import report_pl
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

addons/account/report/account_invoice_report_view.xml

@@ -18,8 +18,6 @@
                 <field name="product_id" invisible="1"/>
                 <field name="uom_name" invisible="not context.get('set_visible',False)"/>
                 <field name="categ_id" invisible="1"/>
-                <field name="nbr" sum="# of Lines"/>
-                <field name="product_qty"/>
                 <field name="state" invisible="1"/>
                 <field name="period_id" invisible="1"/>
                 <field name="currency_id" invisible="1"/>
@@ -29,6 +27,8 @@
                 <field name="address_invoice_id" invisible="1"/>
                 <field name="partner_bank" invisible="1"/>
                 <field name="account_id" invisible="1"/>
+                <field name="nbr" sum="# of Lines"/>
+                <field name="product_qty"/>
                 <field name="reconciled"  sum="# Reconciled"/>
                 <field name="price_average" avg="Average Price"/>
                 <field name="price_total" sum="Total Price"/>
@@ -57,31 +57,31 @@
         <field name="arch" type="xml">
             <search string="Invoices Analysis">
               <group col="10" colspan="12">
-	            	<filter icon="terp-go-year" string="  365 Days  "
-		                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
-		                    help="Invoices of last 365 days"/>
-	                <filter icon="terp-go-month" string="   30 Days   "
-	                		name="month"
-	                		domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
-	                		help="Invoices of last 30 days"/>
-	                <filter icon="terp-go-week"
-	                        string="    7 Days    "
-	                        separator="1"
-	                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-	                        help="Invoices during last 7 days"/>
-	                <separator orientation="vertical"/>
+                    <filter icon="terp-go-year" string="  365 Days  "
+                            domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
+                            help="Invoices of last 365 days"/>
+                    <filter icon="terp-go-month" string="   30 Days   "
+                            name="month"
+                            domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
+                            help="Invoices of last 30 days"/>
+                    <filter icon="terp-go-week"
+                            string="    7 Days    "
+                            separator="1"
+                            domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
+                            help="Invoices during last 7 days"/>
+                    <separator orientation="vertical"/>
                     <filter string="Current"
-	                		icon="terp-check"
-                    		domain="[('state','in',('draft','open'))]"
-                    		help = "Draft and Open Invoices"/>
-                   	<filter string="Pro-forma"
-                   			icon="terp-check"
-                   			domain="[('state','=','proforma'),('state','=','proforma2')]"
-                   			help = "Pro-forma Invoices"/>
-                   	<filter string="Current"
-	                		domain="[('state', '=' ,'open')]"
-	                		help = "open Invoices"/>
-	                <filter string="Done"
+                            icon="terp-check"
+                            domain="[('state','in',('draft','open'))]"
+                            help = "Draft and Open Invoices"/>
+                       <filter string="Pro-forma"
+                               icon="terp-check"
+                               domain="[('state','=','proforma'),('state','=','proforma2')]"
+                               help = "Pro-forma Invoices"/>
+                       <filter string="Current"
+                            domain="[('state', '=' ,'open')]"
+                            help = "open Invoices"/>
+                    <filter string="Done"
                             icon="terp-dialog-close"
                             domain="[('state','=','paid')]"
                             help = "Done Invoices"/>
@@ -89,14 +89,14 @@
                   <field name="partner_id"/>
                     <field name="user_id" widget="selection">
                     <filter icon="terp-dolar"
-                    		string="My Invoices"
-                    		help="My Invoices"
-                    		domain="[('user_id','=',uid)]"/>
+                            string="My Invoices"
+                            help="My Invoices"
+                            domain="[('user_id','=',uid)]"/>
                     </field>
-				</group>
-				<newline/>
+                </group>
+                <newline/>
                 <group expand="0" string="Group By...">
-                    <filter string="Salesman" name='User' icon="terp-personal" context="{'group_by':'user_id'}"/>
+                    <filter string="Salesman" name='user' icon="terp-personal" context="{'group_by':'user_id'}"/>
                     <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}"/>
                     <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id','set_visible':True}"/>
                     <separator orientation="vertical"/>
@@ -111,9 +111,9 @@
                     <separator orientation="vertical"/>
                     <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     <newline/>
-                    <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
-                    <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
-                    <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
+                    <filter string="Day" name="day" icon="terp-go-today" context="{'group_by':'day'}"/>
+                    <filter string="Month" name="month" icon="terp-go-month" context="{'group_by':'month'}"/>
+                    <filter string="Year" name="year" icon="terp-go-year" context="{'group_by':'year'}"/>
                 </group>
                 <newline/>
                 <group expand="0" string="Extended options..." groups="base.group_extended">
@@ -139,11 +139,19 @@
         <field name="res_model">account.invoice.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
-        <field name="context">{'search_default_month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}</field>
+        <field name="context">{'search_default_month':1,'search_default_product':1,'group_by_no_leaf':1,'group_by':[]}</field>
         <field name="search_view_id" ref="view_account_invoice_report_search"/>
     </record>
 
     <menuitem action="action_account_invoice_report_all" id="menu_action_account_invoice_report_all" parent="account.menu_finance_statistic_report_statement" sequence="0"/>
 
+    <act_window
+        domain="[('partner_id', '=', active_id)]"
+        id="act_account_invoice_partner_relation"
+        name="Monthly Turnover"
+        context="{'search_default_month':1,'search_default_user':1,'group_by_no_leaf':1,'group_by':[]}"
+        res_model="account.invoice.report"
+        src_model="res.partner"/>
+
 </data>
 </openerp>

addons/account/report/report_bs.py

@@ -24,7 +24,7 @@ import time
 import mx.DateTime
 import rml_parse
 from report import report_sxw
-from account_report_india.report import report_pl
+from account.report import report_pl
 
 class report_balancesheet_horizontal(rml_parse.rml_parse):
     def __init__(self, cr, uid, name, context):
@@ -195,9 +195,9 @@ class report_balancesheet_horizontal(rml_parse.rml_parse):
         return comp_obj.name 
 
 report_sxw.report_sxw('report.account.balancesheet.horizontal', 'account.account',
-    'addons/account_report_india/report/report_balance_sheet_horizontal.rml',parser=report_balancesheet_horizontal,
+    'addons/account/report/report_balance_sheet_horizontal.rml',parser=report_balancesheet_horizontal,
     header=False)
 
 report_sxw.report_sxw('report.account.balancesheet', 'account.account',
-    'addons/account_report_india/report/report_balance_sheet.rml',parser=report_balancesheet_horizontal,
+    'addons/account/report/report_balance_sheet.rml',parser=report_balancesheet_horizontal,
     header=False)

addons/account/report/report_pl.py

@@ -170,8 +170,8 @@ class report_pl_account_horizontal(rml_parse.rml_parse):
         return comp_obj.name
 
 report_sxw.report_sxw('report.pl.account.horizontal', 'account.account',
-    'addons/account_report_india/report/report_pl_account_horizontal.rml',parser=report_pl_account_horizontal, header=False)
+    'addons/account/report/report_pl_account_horizontal.rml',parser=report_pl_account_horizontal, header=False)
 
 report_sxw.report_sxw('report.pl.account', 'account.account',
-    'addons/account_report_india/report/report_pl_account.rml',parser=report_pl_account_horizontal, header=False)
+    'addons/account/report/report_pl_account.rml',parser=report_pl_account_horizontal, header=False)
 

addons/account/security/account_security.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><openerp><data noupdate="0">
+<?xml version="1.0" encoding="utf-8"?>
+<openerp><data>
 
     <record id="group_account_invoice" model="res.groups">
         <field name="name">Finance / Invoice</field>

addons/account/wizard/__init__.py

@@ -58,6 +58,8 @@ import account_central_journal
 import account_general_journal
 import account_change_currency
 
+import account_bs_report
+import account_pl_report
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
 

addons/account/wizard/account_fiscalyear_close.py

@@ -68,8 +68,10 @@ class account_fiscalyear_close(osv.osv_memory):
         fy_id = data[0]['fy_id']
 
 
-        period_ids = obj_acc_period.search(cr, uid, [('fiscalyear_id', '=', fy_id)])
-        periods_fy2 = obj_acc_period.search(cr, uid, [('fiscalyear_id', '=', data[0]['fy2_id'])])
+        cr.execute("SELECT id FROM account_period WHERE date_stop < (SELECT date_start FROM account_fiscalyear WHERE id = %s)" , (str(data[0]['fy2_id']),))
+        fy_period_set = ','.join(map(lambda id: str(id[0]), cr.fetchall()))
+        cr.execute("SELECT id FROM account_period WHERE date_start > (SELECT date_stop FROM account_fiscalyear WHERE id = %s)" , (str(fy_id),))
+        fy2_period_set = ','.join(map(lambda id: str(id[0]), cr.fetchall()))
 
         period = obj_acc_period.browse(cr, uid, data[0]['period_id'], context=context)
         new_fyear = obj_acc_fiscalyear.browse(cr, uid, data[0]['fy2_id'], context=context)
@@ -90,8 +92,7 @@ class account_fiscalyear_close(osv.osv_memory):
         if move_ids:
             raise osv.except_osv(_('UserError'),
                     _('The opening journal must not have any entry in the new fiscal year !'))
-        query = "SELECT id FROM account_fiscalyear WHERE date_stop < '" + str(new_fyear.date_start) + "'"
-        cr.execute(query)
+        cr.execute("SELECT id FROM account_fiscalyear WHERE date_stop < %s", (str(new_fyear.date_start),))
         result = cr.dictfetchall()
         fy_ids = ','.join([str(x['id']) for x in result])
         query_line = obj_acc_move_line._query_get(cr, uid,
@@ -151,19 +152,17 @@ class account_fiscalyear_close(osv.osv_memory):
                 offset = 0
                 limit = 100
                 while True:
-                    #TODO: this query could be improved in order to work if there is more than 2 open FY
-                    # a.period_id IN ('+fy2_period_set+') is the problematic clause
-                    cr.execute('SELECT b.id, b.name, b.quantity, b.debit, b.credit, b.account_id, b.ref, ' \
+                    cr.execute('SELECT  DISTINCT b.id, b.name, b.quantity, b.debit, b.credit, b.account_id, b.ref, ' \
                                 'b.amount_currency, b.currency_id, b.blocked, b.partner_id, ' \
                                 'b.date_maturity, b.date_created ' \
                             'FROM account_move_line a, account_move_line b ' \
                             'WHERE b.account_id = %s ' \
                                 'AND b.reconcile_id is NOT NULL ' \
                                 'AND a.reconcile_id = b.reconcile_id ' \
-                                'AND b.period_id IN %s'\
-                                'AND a.period_id IN %s' \
+                                'AND b.period_id IN ('+fy_period_set+') ' \
+                                'AND a.period_id IN ('+fy2_period_set+') ' \
                             'ORDER BY id ' \
-                            'LIMIT %s OFFSET %s', (account.id,tuple(period_ids),tuple(periods_fy2),limit, offset))
+                            'LIMIT %s OFFSET %s', (account.id, limit, offset))
                     result = cr.dictfetchall()
                     if not result:
                         break

addons/account/wizard/account_pl_report_view.xml

@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+     <data>
+
+        <record id="account_pl_report_view" model="ir.ui.view">
+             <field name="name">Select period</field>
+             <field name="model">account.pl.report</field>
+             <field name="type">form</field>
+             <field name="arch" type="xml">
+                  <form string="Select period">
+                    <field name="company_id"/>
+                    <field name="display_account" required = "True"/>
+                    <newline/>
+                    <field name="fiscalyear"/>
+                    <label colspan="2" string="(Keep empty for all open fiscal years)" align="0.0"/>
+                    <field name="display_type"/>
+                    <newline/>
+                    <separator string="Filters" colspan="4"/>
+                    <field name="state" required="True"/>
+                    <newline/>
+                    <group attrs="{'invisible':[('state','=','none')]}" colspan="4">
+                        <group attrs="{'invisible':[('state','=','byperiod')]}" colspan="4">
+                            <separator string="Date Filter" colspan="4"/>
+                            <field name="date_from"/>
+                            <field name="date_to"/>
+                        </group>
+                        <group attrs="{'invisible':[('state','=','bydate')]}" colspan="4">
+                            <separator string="Filter on Periods" colspan="4"/>
+                            <field name="periods" colspan="4" nolabel="1"/>
+                        </group>
+                    </group>
+                    <newline/>
+                     <group colspan="4" col="6">
+                           <label string ="" colspan="2"/>
+                         <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                           <button name="check_state" string="Print" type="object" icon="gtk-print" default_focus="1"/>
+                     </group>
+                </form>
+             </field>
+         </record>
+
+         <record id="action_account_pl_report" model="ir.actions.act_window">
+             <field name="name">Account Profit And Loss</field>
+             <field name="res_model">account.pl.report</field>
+             <field name="type">ir.actions.act_window</field>
+             <field name="view_type">form</field>
+             <field name="view_mode">form</field>
+             <field name="view_id" ref="account_pl_report_view"/>
+             <field name="target">new</field>
+       </record>
+
+        <record id="account_pl_report_account_view" model="ir.ui.view">
+            <field name="name">Account Chart</field>
+             <field name="model">account.pl.report</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Select Chart">
+                    <field name="Account_list"/>
+                    <separator colspan="4"/>
+                    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    <button name="next_view" string="Next" type="object" icon="gtk-go-forward" default_focus="1"/>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_pl_balance_account_report" model="ir.actions.act_window">
+             <field name="name">Select Account</field>
+             <field name="res_model">account.pl.report</field>
+             <field name="type">ir.actions.act_window</field>
+             <field name="view_type">form</field>
+             <field name="view_mode">tree,form</field>
+             <field name="view_id" ref="account_pl_report_account_view"/>
+             <field name="context">{'record_id':active_id}</field>
+             <field name="target">new</field>
+       </record>
+       
+       <menuitem 
+            parent="account.menu_finance_legal_statement" 
+            id="final_accounting_reports"
+            name="Accounting Reports"/>
+
+        <menuitem icon="STOCK_PRINT"
+                name="Profit And Loss"
+                action="action_pl_balance_account_report"
+             id="menu_account_pl_report"
+             parent="final_accounting_reports"/>
+
+    </data>
+</openerp>

addons/account/wizard/account_subscription_generate_view.xml

@@ -2,37 +2,37 @@
 <openerp>
     <data>
 
-  		<record id="view_account_subscription_generate" model="ir.ui.view">
+          <record id="view_account_subscription_generate" model="ir.ui.view">
             <field name="name">account.subscription.generate.form</field>
             <field name="model">account.subscription.generate</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Subscription Compute">
-                	<group colspan="4" >
-                		 <separator string="Generate entries before:" colspan="4"/>
-              			 <field name="date"/>
+                    <group colspan="4" >
+                         <separator string="Generate entries before:" colspan="4"/>
+                           <field name="date"/>
                     </group>
-                       	<separator string="" colspan="4" />
+                           <separator string="" colspan="4" />
                     <group colspan="4" col="6">
-                       	<label string ="" colspan="2"/>
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel" />
-                    	<button icon="gtk-execute" string="Compute Entry Dates"
-                    		name="action_generate" type="object" />
+                           <label string ="" colspan="2"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel" />
+                        <button icon="gtk-execute" string="Compute Entry Dates"
+                            name="action_generate" type="object" />
                     </group>
                </form>
             </field>
-  		</record>
+          </record>
 
         <record id="action_account_subscription_generate" model="ir.actions.act_window">
-            <field name="name">Create Subscription Entries</field>
+            <field name="name">Automatic Recurring</field>
             <field name="res_model">account.subscription.generate</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-           	<field name="view_id" ref="view_account_subscription_generate"/>
-           	<field name="target">new</field>
+               <field name="view_id" ref="view_account_subscription_generate"/>
+               <field name="target">new</field>
         </record>
 
-        <menuitem action="action_account_subscription_generate" id="menu_generate_subscription" parent="menu_finance_periodical_processing" />
+        <menuitem action="action_account_subscription_generate" id="menu_generate_subscription" parent="account.menu_finance_recurrent_entries" />
 
     </data>
 </openerp>

addons/account/wizard/account_use_model_view.xml

@@ -2,88 +2,88 @@
 <openerp>
     <data>
 
-    	<record id="view_account_use_model" model="ir.ui.view">
+        <record id="view_account_use_model" model="ir.ui.view">
             <field name="name">account.use.model.form</field>
             <field name="model">account.use.model</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-			<form string="Create Entries From Models">
-				<group height="240" width="510">
-					<separator string="This wizard will create entries from Models" colspan="4"/>
-					<field name="model"/>
-					<separator colspan="4"/>
-					<group colspan="4" col="2">
-						<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-						<button icon="gtk-execute" string="Create Entries" name="create_entries" type="object"/>
-					</group>
-				</group>
-			</form>
+            <form string="Create Entries From Models">
+                <group height="240" width="510">
+                    <separator string="This wizard will create recurring accounting entries" colspan="4"/>
+                    <field name="model"/>
+                    <separator colspan="4"/>
+                    <group colspan="4" col="2">
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button icon="gtk-execute" string="Create Entries" name="create_entries" type="object"/>
+                    </group>
+                </group>
+            </form>
             </field>
         </record>
 
-		<record id="action_view_account_use_model" model="ir.actions.act_window">
-        	<field name="name">Create Entries From Models</field>
+        <record id="action_view_account_use_model" model="ir.actions.act_window">
+            <field name="name">Manual Recurring</field>
             <field name="res_model">account.use.model</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-           	<field name="view_id" ref="view_account_use_model"/>
-           	<field name="target">new</field>
-           	<field name="context">{'model_line':'model_line'}</field>
+               <field name="view_id" ref="view_account_use_model"/>
+               <field name="target">new</field>
+               <field name="context">{'model_line':'model_line'}</field>
         </record>
 
         <record model="ir.values" id="action_account_use_model_values">
             <field name="model_id" ref="account.model_account_move_line" />
             <field name="object" eval="1" />
-            <field name="name">Create Entries From Models</field>
+            <field name="name">Manual Recurring</field>
             <field name="key2">client_action_multi</field>
             <field name="value" eval="'ir.actions.act_window,' +str(ref('action_view_account_use_model'))" />
             <field name="key">action</field>
             <field name="model">account.move.line</field>
-		</record>
+        </record>
 
-		<menuitem action="action_view_account_use_model" name="Create Entries From Models"
-					parent="account.menu_finance_recurrent_entries" id="menu_account_use_model"/>
+        <menuitem action="action_view_account_use_model"
+                    parent="account.menu_finance_recurrent_entries" id="menu_account_use_model"/>
 
-		<record id="view_account_use_model_open_entry" model="ir.ui.view">
+        <record id="view_account_use_model_open_entry" model="ir.ui.view">
             <field name="name">account.use.model.open.entry.form</field>
             <field name="model">account.use.model</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Use Model">
-                	<group colspan="4" col="6">
-                       	<label string = "Entry Lines Created." colspan="2"/>
-                       	<newline/>
-                    	<button icon="gtk-ok" special="cancel" string="Ok"/>
-                    	<button icon="terp-gtk-go-back-rtl" string="Open" name="open_moves" type="object" default_focus='1'/>
+                    <group colspan="4" col="6">
+                           <label string = "Entry Lines Created." colspan="2"/>
+                           <newline/>
+                        <button icon="gtk-ok" special="cancel" string="Ok"/>
+                        <button icon="terp-gtk-go-back-rtl" string="Open" name="open_moves" type="object" default_focus='1'/>
                    </group>
                </form>
             </field>
         </record>
 
-		<record id="view_account_use_model_create_entry" model="ir.ui.view">
+        <record id="view_account_use_model_create_entry" model="ir.ui.view">
             <field name="name">account.use.model.create.entry.form</field>
             <field name="model">account.use.model</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Use Model">
-                	<group colspan="4" col="6">
-                       	<label string = "Are you sure you want to create entries?" colspan="2"/>
-                       	<newline/>
-                    	<button icon="terp-gtk-stop" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-execute" string="Ok" name="create_entries" type="object" default_focus='1'/>
+                    <group colspan="4" col="6">
+                           <label string = "Are you sure you want to create entries?" colspan="2"/>
+                           <newline/>
+                        <button icon="terp-gtk-stop" special="cancel" string="Cancel"/>
+                        <button icon="gtk-execute" string="Ok" name="create_entries" type="object" default_focus='1'/>
                    </group>
                </form>
             </field>
         </record>
 
-		<record id="action_account_use_model_create_entry" model="ir.actions.act_window">
-        	<field name="name">Create Entries From Models</field>
+        <record id="action_account_use_model_create_entry" model="ir.actions.act_window">
+            <field name="name">Manual Recurring</field>
             <field name="res_model">account.use.model</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-           	<field name="view_id" ref="view_account_use_model_create_entry"/>
-           	<field name="target">new</field>
+            <field name="view_id" ref="view_account_use_model_create_entry"/>
+            <field name="target">new</field>
         </record>
 
-	</data>
+    </data>
 </openerp>

addons/account/wizard/account_validate_move_view.xml

@@ -2,23 +2,22 @@
 <openerp>
     <data>
 
-<!--Account Moves-->
+        <!--Account Moves-->
         <record id="validate_account_move_view" model="ir.ui.view">
             <field name="name">Validate Account Move</field>
             <field name="model">validate.account.move</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-			<form string="Validate Account Entries">
-			    <separator string="Select Period and Journal for Validation" colspan="4"/>
-				    <field name="journal_id"/>
-			    <newline/>
-				    <field name="period_id"/>
-			    <separator string="Information" colspan="4"/>
-				    <label string="All draft account entries in this journal and period will be validated. It means you won't be able to modify their accouting fields." colspan="4"/>
-                    <group colspan="4" col="6">
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="terp-camera_test" string="Validate" name="validate_move" type="object"/>
-                   </group>
+            <form string="Validate Account Entries">
+                <separator string="Validate Journal Entries of a Journal" colspan="4"/>
+                <label string="All draft account entries in this journal and period will be validated. It means you won't be able to modify their accouting fields." colspan="4"/>
+                <field name="journal_id"/>
+                <newline/>
+                <field name="period_id"/>
+                <group colspan="4" col="6">
+                    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    <button icon="terp-camera_test" string="Validate" name="validate_move" type="object"/>
+               </group>
                </form>
             </field>
         </record>
@@ -33,38 +32,38 @@
         </record>
 
         <menuitem
-	        name="Validate Ledger Postings"
-	        parent="periodical_processing_journal_entries_validation"
-	        action="action_validate_account_move"
-	        id="menu_validate_account_moves"
-	       />
+            name="Validate Ledger Postings"
+            parent="periodical_processing_journal_entries_validation"
+            action="action_validate_account_move"
+            id="menu_validate_account_moves"
+           />
 
 <!--Account Move lines-->
-    	<record id="validate_account_move_line_view" model="ir.ui.view">
+        <record id="validate_account_move_line_view" model="ir.ui.view">
             <field name="name">Validate Ledger Postings</field>
             <field name="model">validate.account.move.lines</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
               <form string="Validate Moves">
               <separator string="Validate Ledger Postings" colspan="4"/>
-              	<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-            	<button name="validate_move_lines" string="Validate" type="object" icon="gtk-go-forward" default_focus="1"/>
-			</form>
+                  <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                <button name="validate_move_lines" string="Validate" type="object" icon="gtk-go-forward" default_focus="1"/>
+            </form>
             </field>
-		</record>
+        </record>
 
-		<record id="action_validate_account_move_line" model="ir.actions.act_window">
+        <record id="action_validate_account_move_line" model="ir.actions.act_window">
             <field name="name">Validate Ledger Postings</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">validate.account.move.lines</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="view_id" ref="validate_account_move_line_view"/>
-	        <field name="context">{'record_id' : active_id}</field>
+            <field name="context">{'record_id' : active_id}</field>
             <field name="target">new</field>
-    	</record>
+        </record>
 
-		<record model="ir.values" id="validate_account_move_line_values">
+        <record model="ir.values" id="validate_account_move_line_values">
             <field name="model_id" ref="account.model_account_move_line" />
             <field name="object" eval="1" />
             <field name="name">Validate Ledger Postings</field>

addons/account_analytic_analysis/i18n/ar.po

@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-06-22 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis

addons/account_analytic_analysis/i18n/bg.po

@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-06-22 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis

addons/account_analytic_analysis/i18n/bs.po

@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-06-22 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis

addons/account_analytic_analysis/i18n/ca.po

@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
 "PO-Revision-Date: 2009-11-17 09:38+0000\n"
-"Last-Translator: Jordi Esteve - http://www.zikzakmedia.com "
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-06-22 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis

addons/account_analytic_analysis/i18n/cs.po

@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-06-22 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis