Merge lp:~npg-team/openobject-addons/partner_address_validation__npg into lp:openobject-addons/extra-trunk

[Novapoint Group]

NovaPoint Group has developed this module to provide the ability to do address validation for US via UPS.

[Numérigraphe (numerigraphe)]

The number of conflicts make me think you submitted your proposal to the wrong branch.
Maybe you should bundle your module on a dedicated branch?
Lionel Sausin

[Numérigraphe (numerigraphe)]

review: Needs Resubmitting (wrong parent branch)

Unmerged revisions

5306. By Novapoint Group on 2011-10-06

[Add]: partner_address_validation to provide partner address validation via UPS

5305. By Xavier (Open ERP) on 2011-10-06

[ADD] modifiers setup on account.move.line override of fields_view_get

this way, the web clients correctly gets @required fields, and hides the columns which should be hidden

5304. By Stephane Wirtel (OpenERP) on 2011-10-06

[FIX] base_setup: Set the right xml_id for the hidden/link category

5303. By Stephane Wirtel (OpenERP) on 2011-10-06

[FIX] base_setup: Set the right modules of the category

5302. By Stephane Wirtel (OpenERP) on 2011-10-06

[FIX] base_setup: Fix a problem with categories to show

5301. By Olivier Dony (Odoo) on 2011-10-06

[IMP] account_invoice_layout: missing state field in list view (used for `states` modifiers)

5300. By Launchpad Translations on behalf of openerp on 2011-10-06

Launchpad automatic translations update.

5299. By Antony Lesuisse (OpenERP) on 2011-10-06

[FIX] packaging rename doc python rpm build does not tolerate spaces in files

5298. By Antony Lesuisse (OpenERP) on 2011-10-06

[FIX] packaging rename doc python rpm build does not tolerate spaces in files

5297. By Antony Lesuisse (OpenERP) on 2011-10-05

[FIX] crm tests, openid import

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2011-10-06 16:09:39 +0000
@@ -0,0 +1,1 @@
+.*

=== renamed file '.bzrignore' => '.bzrignore.moved'
=== added directory 'account'
=== added file 'account/__init__.py'
--- account/__init__.py	1970-01-01 00:00:00 +0000
+++ account/__init__.py	2011-10-06 16:09:39 +0000
@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import account
+import installer
+import project
+import partner
+import account_invoice
+import account_bank_statement
+import account_bank
+import account_cash_statement
+import account_move_line
+import account_analytic_line
+import wizard
+import report
+import product
+import ir_sequence
+import company
+import res_currency
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'account/__openerp__.py'
--- account/__openerp__.py	1970-01-01 00:00:00 +0000
+++ account/__openerp__.py	2011-10-06 16:09:39 +0000
@@ -0,0 +1,156 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+{
+    "name" : "Accounting and Financial Management",
+    "version" : "1.1",
+    "author" : "OpenERP SA",
+    "category": 'Accounting & Finance',
+    'complexity': "normal",
+    "description": """
+Accounting and Financial Management.
+====================================
+
+Financial and accounting module that covers:
+--------------------------------------------
+General accountings
+Cost / Analytic accounting
+Third party accounting
+Taxes management
+Budgets
+Customer and Supplier Invoices
+Bank statements
+Reconciliation process by partner
+
+Creates a dashboard for accountants that includes:
+--------------------------------------------------
+* List of Customer Invoice to Approve
+* Company Analysis
+* Graph of Aged Receivables
+* Graph of Treasury
+
+The processes like maintaining of general ledger is done through the defined financial Journals (entry move line or
+grouping is maintained through journal) for a particular financial year and for preparation of vouchers there is a
+module named account_voucher.
+    """,
+    'website': 'http://www.openerp.com',
+    'images' : ['images/accounts.jpeg','images/bank_statement.jpeg','images/cash_register.jpeg','images/chart_of_accounts.jpeg','images/customer_invoice.jpeg','images/journal_entries.jpeg'],
+    'init_xml': [],
+    "depends" : ["base_setup", "product", "analytic", "process","board"],
+    'update_xml': [
+        'security/account_security.xml',
+        'security/ir.model.access.csv',
+        'account_menuitem.xml',
+        'report/account_invoice_report_view.xml',
+        'report/account_entries_report_view.xml',
+        'report/account_treasury_report_view.xml',
+        'report/account_report_view.xml',
+        'report/account_analytic_entries_report_view.xml',
+        'wizard/account_move_bank_reconcile_view.xml',
+        'wizard/account_use_model_view.xml',
+        'account_installer.xml',
+        'wizard/account_period_close_view.xml',
+        'account_view.xml',
+        'account_report.xml',
+        'wizard/account_report_common_view.xml',
+        'wizard/account_invoice_refund_view.xml',
+        'wizard/account_fiscalyear_close_state.xml',
+        'wizard/account_chart_view.xml',
+        'wizard/account_tax_chart_view.xml',
+        'wizard/account_move_journal_view.xml',
+        'wizard/account_move_line_reconcile_select_view.xml',
+        'wizard/account_open_closed_fiscalyear_view.xml',
+        'wizard/account_move_line_unreconcile_select_view.xml',
+        'wizard/account_vat_view.xml',
+        'wizard/account_report_print_journal_view.xml',
+        'wizard/account_report_general_journal_view.xml',
+        'wizard/account_report_central_journal_view.xml',
+        'wizard/account_subscription_generate_view.xml',
+        'wizard/account_fiscalyear_close_view.xml',
+        'wizard/account_state_open_view.xml',
+        'wizard/account_journal_select_view.xml',
+        'wizard/account_change_currency_view.xml',
+        'wizard/account_validate_move_view.xml',
+        'wizard/account_unreconcile_view.xml',
+        'wizard/account_report_general_ledger_view.xml',
+        'wizard/account_invoice_state_view.xml',
+        'wizard/account_report_partner_balance_view.xml',
+        'wizard/account_report_account_balance_view.xml',
+        'wizard/account_report_aged_partner_balance_view.xml',
+        'wizard/account_report_partner_ledger_view.xml',
+        'wizard/account_reconcile_view.xml',
+        'wizard/account_reconcile_partner_process_view.xml',
+        'wizard/account_automatic_reconcile_view.xml',
+        'wizard/account_financial_report_view.xml',
+        'project/wizard/project_account_analytic_line_view.xml',
+        'account_end_fy.xml',
+        'account_invoice_view.xml',
+        'partner_view.xml',
+        'data/account_data.xml',
+        'account_invoice_workflow.xml',
+        'project/project_view.xml',
+        'project/project_report.xml',
+        'project/wizard/account_analytic_balance_report_view.xml',
+        'project/wizard/account_analytic_cost_ledger_view.xml',
+        'project/wizard/account_analytic_inverted_balance_report.xml',
+        'project/wizard/account_analytic_journal_report_view.xml',
+        'project/wizard/account_analytic_cost_ledger_for_journal_report_view.xml',
+        'project/wizard/account_analytic_chart_view.xml',
+        'product_view.xml',
+        'account_assert_test.xml',
+        'process/statement_process.xml',
+        'process/customer_invoice_process.xml',
+        'process/supplier_invoice_process.xml',
+        'ir_sequence_view.xml',
+        'company_view.xml',
+        'board_account_view.xml',
+        "wizard/account_report_profit_loss_view.xml",
+        "wizard/account_report_balance_sheet_view.xml",
+        "account_bank_view.xml"
+    ],
+    'demo_xml': [
+        'demo/account_demo.xml',
+        'project/project_demo.xml',
+        'project/analytic_account_demo.xml',
+        'demo/account_minimal.xml',
+        'demo/account_invoice_demo.xml',
+#        'account_unit_test.xml',
+    ],
+    'test': [
+        'test/account_customer_invoice.yml',
+        'test/account_supplier_invoice.yml',
+        'test/account_change_currency.yml',
+        'test/chart_of_account.yml',
+        'test/account_period_close.yml',
+        'test/account_fiscalyear_close_state.yml',
+        'test/account_use_model.yml',
+        'test/account_validate_account_move.yml',
+        'test/account_fiscalyear_close.yml',
+        'test/account_bank_statement.yml',
+        'test/account_cash_statement.yml',
+        'test/account_report.yml',
+
+
+            ],
+    'installable': True,
+    'active': False,
+    'certificate': '0080331923549',
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'account/account.py'
--- account/account.py	1970-01-01 00:00:00 +0000
+++ account/account.py	2011-10-06 16:09:39 +0000
@@ -0,0 +1,3221 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import time
+from datetime import datetime
+from dateutil.relativedelta import relativedelta
+from operator import itemgetter
+
+import netsvc
+import pooler
+from osv import fields, osv
+import decimal_precision as dp
+from tools.translate import _
+
+def check_cycle(self, cr, uid, ids, context=None):
+    """ climbs the ``self._table.parent_id`` chains for 100 levels or
+    until it can't find any more parent(s)
+
+    Returns true if it runs out of parents (no cycle), false if
+    it can recurse 100 times without ending all chains
+    """
+    level = 100
+    while len(ids):
+        cr.execute('SELECT DISTINCT parent_id '\
+                    'FROM '+self._table+' '\
+                    'WHERE id IN %s '\
+                    'AND parent_id IS NOT NULL',(tuple(ids),))
+        ids = map(itemgetter(0), cr.fetchall())
+        if not level:
+            return False
+        level -= 1
+    return True
+
+class account_payment_term(osv.osv):
+    _name = "account.payment.term"
+    _description = "Payment Term"
+    _columns = {
+        'name': fields.char('Payment Term', size=64, translate=True, required=True),
+        'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the payment term without removing it."),
+        'note': fields.text('Description', translate=True),
+        'line_ids': fields.one2many('account.payment.term.line', 'payment_id', 'Terms'),
+    }
+    _defaults = {
+        'active': 1,
+    }
+    _order = "name"
+
+    def compute(self, cr, uid, id, value, date_ref=False, context=None):
+        if not date_ref:
+            date_ref = datetime.now().strftime('%Y-%m-%d')
+        pt = self.browse(cr, uid, id, context=context)
+        amount = value
+        result = []
+        obj_precision = self.pool.get('decimal.precision')
+        for line in pt.line_ids:
+            prec = obj_precision.precision_get(cr, uid, 'Account')
+            if line.value == 'fixed':
+                amt = round(line.value_amount, prec)
+            elif line.value == 'procent':
+                amt = round(value * line.value_amount, prec)
+            elif line.value == 'balance':
+                amt = round(amount, prec)
+            if amt:
+                next_date = (datetime.strptime(date_ref, '%Y-%m-%d') + relativedelta(days=line.days))
+                if line.days2 < 0:
+                    next_first_date = next_date + relativedelta(day=1,months=1) #Getting 1st of next month
+                    next_date = next_first_date + relativedelta(days=line.days2)
+                if line.days2 > 0:
+                    next_date += relativedelta(day=line.days2, months=1)
+                result.append( (next_date.strftime('%Y-%m-%d'), amt) )
+                amount -= amt
+        return result
+
+account_payment_term()
+
+class account_payment_term_line(osv.osv):
+    _name = "account.payment.term.line"
+    _description = "Payment Term Line"
+    _columns = {
+        'name': fields.char('Line Name', size=32, required=True),
+        'sequence': fields.integer('Sequence', required=True, help="The sequence field is used to order the payment term lines from the lowest sequences to the higher ones"),
+        'value': fields.selection([('procent', 'Percent'),
+                                   ('balance', 'Balance'),
+                                   ('fixed', 'Fixed Amount')], 'Valuation',
+                                   required=True, help="""Select here the kind of valuation related to this payment term line. Note that you should have your last line with the type 'Balance' to ensure that the whole amount will be threated."""),
+
+        'value_amount': fields.float('Amount To Pay', digits_compute=dp.get_precision('Payment Term'), help="For percent enter a ratio between 0-1."),
+        'days': fields.integer('Number of Days', required=True, help="Number of days to add before computation of the day of month." \
+            "If Date=15/01, Number of Days=22, Day of Month=-1, then the due date is 28/02."),
+        'days2': fields.integer('Day of the Month', required=True, help="Day of the month, set -1 for the last day of the current month. If it's positive, it gives the day of the next month. Set 0 for net days (otherwise it's based on the beginning of the month)."),
+        'payment_id': fields.many2one('account.payment.term', 'Payment Term', required=True, select=True),
+    }
+    _defaults = {
+        'value': 'balance',
+        'sequence': 5,
+        'days2': 0,
+    }
+    _order = "sequence"
+
+    def _check_percent(self, cr, uid, ids, context=None):
+        obj = self.browse(cr, uid, ids[0], context=context)
+        if obj.value == 'procent' and ( obj.value_amount < 0.0 or obj.value_amount > 1.0):
+            return False
+        return True
+
+    _constraints = [
+        (_check_percent, 'Percentages for Payment Term Line must be between 0 and 1, Example: 0.02 for 2% ', ['value_amount']),
+    ]
+
+account_payment_term_line()
+
+class account_account_type(osv.osv):
+    _name = "account.account.type"
+    _description = "Account Type"
+    _columns = {
+        'name': fields.char('Account Type', size=64, required=True),
+        'code': fields.char('Code', size=32, required=True),
+        'close_method': fields.selection([('none', 'None'), ('balance', 'Balance'), ('detail', 'Detail'), ('unreconciled', 'Unreconciled')], 'Deferral Method', required=True, help="""Set here the method that will be used to generate the end of year journal entries for all the accounts of this type.
+
+ 'None' means that nothing will be done.
+ 'Balance' will generally be used for cash accounts.
+ 'Detail' will copy each existing journal item of the previous year, even the reconciled ones.
+ 'Unreconciled' will copy only the journal items that were unreconciled on the first day of the new fiscal year."""),
+        'sign': fields.selection([(-1, 'Reverse balance sign'), (1, 'Preserve balance sign')], 'Sign on Reports', required=True, help='For accounts that are typically more debited than credited and that you would like to print as negative amounts in your reports, you should reverse the sign of the balance; e.g.: Expense account. The same applies for  accounts that are typically more credited than debited and that you would like to print as positive amounts in your reports; e.g.: Income account.'),
+        'report_type':fields.selection([
+            ('none','/'),
+            ('income','Profit & Loss (Income Accounts)'),
+            ('expense','Profit & Loss (Expense Accounts)'),
+            ('asset','Balance Sheet (Assets Accounts)'),
+            ('liability','Balance Sheet (Liability Accounts)')
+        ],'P&L / BS Category', select=True, readonly=False, help="This field is used to generate legal reports: profit and loss, balance sheet.", required=True),
+        'note': fields.text('Description'),
+    }
+    _defaults = {
+        'close_method': 'none',
+        'sign': 1,
+        'report_type': 'none',
+    }
+    _order = "code"
+
+account_account_type()
+
+def _code_get(self, cr, uid, context=None):
+    acc_type_obj = self.pool.get('account.account.type')
+    ids = acc_type_obj.search(cr, uid, [])
+    res = acc_type_obj.read(cr, uid, ids, ['code', 'name'], context=context)
+    return [(r['code'], r['name']) for r in res]
+
+#----------------------------------------------------------
+# Accounts
+#----------------------------------------------------------
+
+class account_tax(osv.osv):
+    _name = 'account.tax'
+account_tax()
+
+class account_account(osv.osv):
+    _order = "parent_left"
+    _parent_order = "code"
+    _name = "account.account"
+    _description = "Account"
+    _parent_store = True
+    logger = netsvc.Logger()
+
+    def search(self, cr, uid, args, offset=0, limit=None, order=None,
+            context=None, count=False):
+        if context is None:
+            context = {}
+        pos = 0
+
+        while pos < len(args):
+
+            if args[pos][0] == 'code' and args[pos][1] in ('like', 'ilike') and args[pos][2]:
+                args[pos] = ('code', '=like', str(args[pos][2].replace('%', ''))+'%')
+            if args[pos][0] == 'journal_id':
+                if not args[pos][2]:
+                    del args[pos]
+                    continue
+                jour = self.pool.get('account.journal').browse(cr, uid, args[pos][2], context=context)
+                if (not (jour.account_control_ids or jour.type_control_ids)) or not args[pos][2]:
+                    args[pos] = ('type','not in',('consolidation','view'))
+                    continue
+                ids3 = map(lambda x: x.id, jour.type_control_ids)
+                ids1 = super(account_account, self).search(cr, uid, [('user_type', 'in', ids3)])
+                ids1 += map(lambda x: x.id, jour.account_control_ids)
+                args[pos] = ('id', 'in', ids1)
+            pos += 1
+
+        if context and context.has_key('consolidate_children'): #add consolidated children of accounts
+            ids = super(account_account, self).search(cr, uid, args, offset, limit,
+                order, context=context, count=count)
+            for consolidate_child in self.browse(cr, uid, context['account_id'], context=context).child_consol_ids:
+                ids.append(consolidate_child.id)
+            return ids
+
+        return super(account_account, self).search(cr, uid, args, offset, limit,
+                order, context=context, count=count)
+
+    def _get_children_and_consol(self, cr, uid, ids, context=None):
+        #this function search for all the children and all consolidated children (recursively) of the given account ids
+        ids2 = self.search(cr, uid, [('parent_id', 'child_of', ids)], context=context)
+        ids3 = []
+        for rec in self.browse(cr, uid, ids2, context=context):
+            for child in rec.child_consol_ids:
+                ids3.append(child.id)
+        if ids3:
+            ids3 = self._get_children_and_consol(cr, uid, ids3, context)
+        return ids2 + ids3
+
+    def __compute(self, cr, uid, ids, field_names, arg=None, context=None,
+                  query='', query_params=()):
+        """ compute the balance, debit and/or credit for the provided
+        account ids
+        Arguments:
+        `ids`: account ids
+        `field_names`: the fields to compute (a list of any of
+                       'balance', 'debit' and 'credit')
+        `arg`: unused fields.function stuff
+        `query`: additional query filter (as a string)
+        `query_params`: parameters for the provided query string
+                        (__compute will handle their escaping) as a
+                        tuple
+        """
+        mapping = {
+            'balance': "COALESCE(SUM(l.debit),0) " \
+                       "- COALESCE(SUM(l.credit), 0) as balance",
+            'debit': "COALESCE(SUM(l.debit), 0) as debit",
+            'credit': "COALESCE(SUM(l.credit), 0) as credit"
+        }
+        #get all the necessary accounts
+        children_and_consolidated = self._get_children_and_consol(cr, uid, ids, context=context)
+        #compute for each account the balance/debit/credit from the move lines
+        accounts = {}
+        res = {}
+        null_result = dict((fn, 0.0) for fn in field_names)
+        if children_and_consolidated:
+            aml_query = self.pool.get('account.move.line')._query_get(cr, uid, context=context)
+
+            wheres = [""]
+            if query.strip():
+                wheres.append(query.strip())
+            if aml_query.strip():
+                wheres.append(aml_query.strip())
+            filters = " AND ".join(wheres)
+            self.logger.notifyChannel('addons.'+self._name, netsvc.LOG_DEBUG,
+                                      'Filters: %s'%filters)
+            # IN might not work ideally in case there are too many
+            # children_and_consolidated, in that case join on a
+            # values() e.g.:
+            # SELECT l.account_id as id FROM account_move_line l
+            # INNER JOIN (VALUES (id1), (id2), (id3), ...) AS tmp (id)
+            # ON l.account_id = tmp.id
+            # or make _get_children_and_consol return a query and join on that
+            request = ("SELECT l.account_id as id, " +\
+                       ', '.join(map(mapping.__getitem__, field_names)) +
+                       " FROM account_move_line l" \
+                       " WHERE l.account_id IN %s " \
+                            + filters +
+                       " GROUP BY l.account_id")
+            params = (tuple(children_and_consolidated),) + query_params
+            cr.execute(request, params)
+            self.logger.notifyChannel('addons.'+self._name, netsvc.LOG_DEBUG,
+                                      'Status: %s'%cr.statusmessage)
+
+            for res in cr.dictfetchall():
+                accounts[res['id']] = res
+
+            # consolidate accounts with direct children
+            children_and_consolidated.reverse()
+            brs = list(self.browse(cr, uid, children_and_consolidated, context=context))
+            sums = {}
+            currency_obj = self.pool.get('res.currency')
+            while brs:
+                current = brs[0]
+#                can_compute = True
+#                for child in current.child_id:
+#                    if child.id not in sums:
+#                        can_compute = False
+#                        try:
+#                            brs.insert(0, brs.pop(brs.index(child)))
+#                        except ValueError:
+#                            brs.insert(0, child)
+#                if can_compute:
+                brs.pop(0)
+                for fn in field_names:
+                    sums.setdefault(current.id, {})[fn] = accounts.get(current.id, {}).get(fn, 0.0)
+                    for child in current.child_id:
+                        if child.company_id.currency_id.id == current.company_id.currency_id.id:
+                            sums[current.id][fn] += sums[child.id][fn]
+                        else:
+                            sums[current.id][fn] += currency_obj.compute(cr, uid, child.company_id.currency_id.id, current.company_id.currency_id.id, sums[child.id][fn], context=context)
+            for id in ids:
+                res[id] = sums.get(id, null_result)
+        else:
+            for id in ids:
+                res[id] = null_result
+        return res
+
+    def _get_company_currency(self, cr, uid, ids, field_name, arg, context=None):
+        result = {}
+        for rec in self.browse(cr, uid, ids, context=context):
+            result[rec.id] = (rec.company_id.currency_id.id,rec.company_id.currency_id.symbol)
+        return result
+
+    def _get_child_ids(self, cr, uid, ids, field_name, arg, context=None):
+        result = {}
+        for record in self.browse(cr, uid, ids, context=context):
+            if record.child_parent_ids:
+                result[record.id] = [x.id for x in record.child_parent_ids]
+            else:
+                result[record.id] = []
+
+            if record.child_consol_ids:
+                for acc in record.child_consol_ids:
+                    if acc.id not in result[record.id]:
+                        result[record.id].append(acc.id)
+
+        return result
+
+    def _get_level(self, cr, uid, ids, field_name, arg, context=None):
+        res = {}
+        accounts = self.browse(cr, uid, ids, context=context)
+        for account in accounts:
+            level = 0
+            if account.parent_id:
+                obj = self.browse(cr, uid, account.parent_id.id)
+                level = obj.level + 1
+            res[account.id] = level
+        return res
+
+    def _set_credit_debit(self, cr, uid, account_id, name, value, arg, context=None):
+        if context.get('config_invisible', True):
+            return True
+
+        account = self.browse(cr, uid, account_id, context=context)
+        diff = value - getattr(account,name)
+        if not diff:
+            return True
+
+        journal_obj = self.pool.get('account.journal')
+        jids = journal_obj.search(cr, uid, [('type','=','situation'),('centralisation','=',1),('company_id','=',account.company_id.id)], context=context)
+        if not jids:
+            raise osv.except_osv(_('Error!'),_("You need an Opening journal with centralisation checked to set the initial balance!"))
+
+        period_obj = self.pool.get('account.period')
+        pids = period_obj.search(cr, uid, [('special','=',True),('company_id','=',account.company_id.id)], context=context)
+        if not pids:
+            raise osv.except_osv(_('Error!'),_("No opening/closing period defined, please create one to set the initial balance!"))
+
+        move_obj = self.pool.get('account.move.line')
+        move_id = move_obj.search(cr, uid, [
+            ('journal_id','=',jids[0]), 
+            ('period_id','=',pids[0]), 
+            ('account_id','=', account_id),
+            (name,'>', 0.0),
+            ('name','=', _('Opening Balance'))
+        ], context=context)
+        if move_id:
+            move = move_obj.browse(cr, uid, move_id[0], context=context)
+            move_obj.write(cr, uid, move_id[0], {
+                name: diff+getattr(move,name)
+            }, context=context)
+        else:
+            if diff<0.0:
+                raise osv.except_osv(_('Error!'),_("Unable to adapt the initial balance (negative value)!"))
+            nameinv = (name=='credit' and 'debit') or 'credit'
+            move_id = move_obj.create(cr, uid, {
+                'name': _('Opening Balance'),
+                'account_id': account_id,
+                'journal_id': jids[0],
+                'period_id': pids[0],
+                name: diff,
+                nameinv: 0.0
+            }, context=context)
+        return True
+
+    _columns = {
+        'name': fields.char('Name', size=128, required=True, select=True),
+        'currency_id': fields.many2one('res.currency', 'Secondary Currency', help="Forces all moves for this account to have this secondary currency."),
+        'code': fields.char('Code', size=64, required=True, select=1),
+        'type': fields.selection([
+            ('view', 'View'),
+            ('other', 'Regular'),
+            ('receivable', 'Receivable'),
+            ('payable', 'Payable'),
+            ('liquidity','Liquidity'),
+            ('consolidation', 'Consolidation'),
+            ('closed', 'Closed'),
+        ], 'Internal Type', required=True, help="The 'Internal Type' is used for features available on "\
+            "different types of accounts: view can not have journal items, consolidation are accounts that "\
+            "can have children accounts for multi-company consolidations, payable/receivable are for "\
+            "partners accounts (for debit/credit computations), closed for depreciated accounts."),
+        'user_type': fields.many2one('account.account.type', 'Account Type', required=True,
+            help="Account Type is used for information purpose, to generate "
+              "country-specific legal reports, and set the rules to close a fiscal year and generate opening entries."),
+        'parent_id': fields.many2one('account.account', 'Parent', ondelete='cascade', domain=[('type','=','view')]),
+        'child_parent_ids': fields.one2many('account.account','parent_id','Children'),
+        'child_consol_ids': fields.many2many('account.account', 'account_account_consol_rel', 'child_id', 'parent_id', 'Consolidated Children'),
+        'child_id': fields.function(_get_child_ids, type='many2many', relation="account.account", string="Child Accounts"),
+        'balance': fields.function(__compute, digits_compute=dp.get_precision('Account'), string='Balance', multi='balance'),
+        'credit': fields.function(__compute, fnct_inv=_set_credit_debit, digits_compute=dp.get_precision('Account'), string='Credit', multi='balance'),
+        'debit': fields.function(__compute, fnct_inv=_set_credit_debit, digits_compute=dp.get_precision('Account'), string='Debit', multi='balance'),
+        'reconcile': fields.boolean('Allow Reconciliation', help="Check this box if this account allows reconciliation of journal items."),
+        'shortcut': fields.char('Shortcut', size=12),
+        'tax_ids': fields.many2many('account.tax', 'account_account_tax_default_rel',
+            'account_id', 'tax_id', 'Default Taxes'),
+        'note': fields.text('Note'),
+        'company_currency_id': fields.function(_get_company_currency, type='many2one', relation='res.currency', string='Company Currency'),
+        'company_id': fields.many2one('res.company', 'Company', required=True),
+        'active': fields.boolean('Active', select=2, help="If the active field is set to False, it will allow you to hide the account without removing it."),
+
+        'parent_left': fields.integer('Parent Left', select=1),
+        'parent_right': fields.integer('Parent Right', select=1),
+        'currency_mode': fields.selection([('current', 'At Date'), ('average', 'Average Rate')], 'Outgoing Currencies Rate',
+            help=
+            'This will select how the current currency rate for outgoing transactions is computed. '\
+            'In most countries the legal method is "average" but only a few software systems are able to '\
+            'manage this. So if you import from another software system you may have to use the rate at date. ' \
+            'Incoming transactions always use the rate at date.', \
+            required=True),
+        'level': fields.function(_get_level, string='Level', store=True, type='integer'),
+    }
+
+    _defaults = {
+        'type': 'view',
+        'reconcile': False,
+        'active': True,
+        'currency_mode': 'current',
+        'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'account.account', context=c),
+    }
+
+    def _check_recursion(self, cr, uid, ids, context=None):
+        obj_self = self.browse(cr, uid, ids[0], context=context)
+        p_id = obj_self.parent_id and obj_self.parent_id.id
+        if (obj_self in obj_self.child_consol_ids) or (p_id and (p_id is obj_self.id)):
+            return False
+        while(ids):
+            cr.execute('SELECT DISTINCT child_id '\
+                       'FROM account_account_consol_rel '\
+                       'WHERE parent_id IN %s', (tuple(ids),))
+            child_ids = map(itemgetter(0), cr.fetchall())
+            c_ids = child_ids
+            if (p_id and (p_id in c_ids)) or (obj_self.id in c_ids):
+                return False
+            while len(c_ids):
+                s_ids = self.search(cr, uid, [('parent_id', 'in', c_ids)])
+                if p_id and (p_id in s_ids):
+                    return False
+                c_ids = s_ids
+            ids = child_ids
+        return True
+
+    def _check_type(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        accounts = self.browse(cr, uid, ids, context=context)
+        for account in accounts:
+            if account.child_id and account.type not in ('view', 'consolidation'):
+                return False
+        return True
+
+    def _check_account_type(self, cr, uid, ids, context=None):
+        for account in self.browse(cr, uid, ids, context=context):
+            if account.type in ('receivable', 'payable') and account.user_type.close_method != 'unreconciled':
+                return False
+        return True
+
+    _constraints = [
+        (_check_recursion, 'Error ! You can not create recursive accounts.', ['parent_id']),
+        (_check_type, 'Configuration Error! \nYou can not define children to an account with internal type different of "View"! ', ['type']),
+        (_check_account_type, 'Configuration Error! \nYou can not select an account type with a deferral method different of "Unreconciled" for accounts with internal type "Payable/Receivable"! ', ['user_type','type']),
+    ]
+    _sql_constraints = [
+        ('code_company_uniq', 'unique (code,company_id)', 'The code of the account must be unique per company !')
+    ]
+    def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=100):
+        if not args:
+            args = []
+        args = args[:]
+        ids = []
+        try:
+            if name and str(name).startswith('partner:'):
+                part_id = int(name.split(':')[1])
+                part = self.pool.get('res.partner').browse(cr, user, part_id, context=context)
+                args += [('id', 'in', (part.property_account_payable.id, part.property_account_receivable.id))]
+                name = False
+            if name and str(name).startswith('type:'):
+                type = name.split(':')[1]
+                args += [('type', '=', type)]
+                name = False
+        except:
+            pass
+        if name:
+            ids = self.search(cr, user, [('code', '=like', name+"%")]+args, limit=limit)
+            if not ids:
+                ids = self.search(cr, user, [('shortcut', '=', name)]+ args, limit=limit)
+            if not ids:
+                ids = self.search(cr, user, [('name', operator, name)]+ args, limit=limit)
+            if not ids and len(name.split()) >= 2:
+                #Separating code and name of account for searching
+                operand1,operand2 = name.split(' ',1) #name can contain spaces e.g. OpenERP S.A.
+                ids = self.search(cr, user, [('code', operator, operand1), ('name', operator, operand2)]+ args, limit=limit)
+        else:
+            ids = self.search(cr, user, args, context=context, limit=limit)
+        return self.name_get(cr, user, ids, context=context)
+
+    def name_get(self, cr, uid, ids, context=None):
+        if not ids:
+            return []
+        reads = self.read(cr, uid, ids, ['name', 'code'], context=context)
+        res = []
+        for record in reads:
+            name = record['name']
+            if record['code']:
+                name = record['code'] + ' ' + name
+            res.append((record['id'], name))
+        return res
+
+    def copy(self, cr, uid, id, default={}, context=None, done_list=[], local=False):
+        account = self.browse(cr, uid, id, context=context)
+        new_child_ids = []
+        if not default:
+            default = {}
+        default = default.copy()
+        default['code'] = (account['code'] or '') + '(copy)'
+        if not local:
+            done_list = []
+        if account.id in done_list:
+            return False
+        done_list.append(account.id)
+        if account:
+            for child in account.child_id:
+                child_ids = self.copy(cr, uid, child.id, default, context=context, done_list=done_list, local=True)
+                if child_ids:
+                    new_child_ids.append(child_ids)
+            default['child_parent_ids'] = [(6, 0, new_child_ids)]
+        else:
+            default['child_parent_ids'] = False
+        return super(account_account, self).copy(cr, uid, id, default, context=context)
+
+    def _check_moves(self, cr, uid, ids, method, context=None):
+        line_obj = self.pool.get('account.move.line')
+        account_ids = self.search(cr, uid, [('id', 'child_of', ids)])
+
+        if line_obj.search(cr, uid, [('account_id', 'in', account_ids)]):
+            if method == 'write':
+                raise osv.except_osv(_('Error !'), _('You can not desactivate an account that contains some journal items.'))
+            elif method == 'unlink':
+                raise osv.except_osv(_('Error !'), _('You can not remove an account containing journal items!. '))
+        #Checking whether the account is set as a property to any Partner or not
+        value = 'account.account,' + str(ids[0])
+        partner_prop_acc = self.pool.get('ir.property').search(cr, uid, [('value_reference','=',value)], context=context)
+        if partner_prop_acc:
+            raise osv.except_osv(_('Warning !'), _('You can not remove/desactivate an account which is set on a customer or supplier.'))
+        return True
+
+    def _check_allow_type_change(self, cr, uid, ids, new_type, context=None):
+        group1 = ['payable', 'receivable', 'other']
+        group2 = ['consolidation','view']
+        line_obj = self.pool.get('account.move.line')
+        for account in self.browse(cr, uid, ids, context=context):
+            old_type = account.type
+            account_ids = self.search(cr, uid, [('id', 'child_of', [account.id])])
+            if line_obj.search(cr, uid, [('account_id', 'in', account_ids)]):
+                #Check for 'Closed' type
+                if old_type == 'closed' and new_type !='closed':
+                    raise osv.except_osv(_('Warning !'), _("You cannot change the type of account from 'Closed' to any other type which contains journal items!"))
+                #Check for change From group1 to group2 and vice versa
+                if (old_type in group1 and new_type in group2) or (old_type in group2 and new_type in group1):
+                    raise osv.except_osv(_('Warning !'), _("You cannot change the type of account from '%s' to '%s' type as it contains journal items!") % (old_type,new_type,))
+        return True
+
+    def write(self, cr, uid, ids, vals, context=None):
+
+        if context is None:
+            context = {}
+        if not ids:
+            return True
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        # Dont allow changing the company_id when account_move_line already exist
+        if 'company_id' in vals:
+            move_lines = self.pool.get('account.move.line').search(cr, uid, [('account_id', 'in', ids)])
+            if move_lines:
+                # Allow the write if the value is the same
+                for i in [i['company_id'][0] for i in self.read(cr,uid,ids,['company_id'])]:
+                    if vals['company_id']!=i:
+                        raise osv.except_osv(_('Warning !'), _('You cannot modify Company of account as its related record exist in Entry Lines'))
+        if 'active' in vals and not vals['active']:
+            self._check_moves(cr, uid, ids, "write", context=context)
+        if 'type' in vals.keys():
+            self._check_allow_type_change(cr, uid, ids, vals['type'], context=context)
+        return super(account_account, self).write(cr, uid, ids, vals, context=context)
+
+    def unlink(self, cr, uid, ids, context=None):
+        self._check_moves(cr, uid, ids, "unlink", context=context)
+        return super(account_account, self).unlink(cr, uid, ids, context=context)
+
+account_account()
+
+class account_journal_view(osv.osv):
+    _name = "account.journal.view"
+    _description = "Journal View"
+    _columns = {
+        'name': fields.char('Journal View', size=64, required=True),
+        'columns_id': fields.one2many('account.journal.column', 'view_id', 'Columns')
+    }
+    _order = "name"
+
+account_journal_view()
+
+
+class account_journal_column(osv.osv):
+
+    def _col_get(self, cr, user, context=None):
+        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
+
+    _name = "account.journal.column"
+    _description = "Journal Column"
+    _columns = {
+        'name': fields.char('Column Name', size=64, required=True),
+        'field': fields.selection(_col_get, 'Field Name', required=True, size=32),
+        'view_id': fields.many2one('account.journal.view', 'Journal View', select=True),
+        'sequence': fields.integer('Sequence', help="Gives the sequence order to journal column.", readonly=True),
+        'required': fields.boolean('Required'),
+        'readonly': fields.boolean('Readonly'),
+    }
+    _order = "view_id, sequence"
+
+account_journal_column()
+
+class account_journal(osv.osv):
+    _name = "account.journal"
+    _description = "Journal"
+    _columns = {
+        'name': fields.char('Journal Name', size=64, required=True),
+        'code': fields.char('Code', size=5, required=True, help="The code will be displayed on reports."),
+        'type': fields.selection([('sale', 'Sale'),('sale_refund','Sale Refund'), ('purchase', 'Purchase'), ('purchase_refund','Purchase Refund'), ('cash', 'Cash'), ('bank', 'Bank and Cheques'), ('general', 'General'), ('situation', 'Opening/Closing Situation')], 'Type', size=32, required=True,
+                                 help="Select 'Sale' for customer invoices journals."\
+                                 " Select 'Purchase' for supplier invoices journals."\
+                                 " Select 'Cash' or 'Bank' for journals that are used in customer or supplier payments."\
+                                 " Select 'General' for miscellaneous operations journals."\
+                                 " Select 'Opening/Closing Situation' for entries generated for new fiscal years."),
+        'type_control_ids': fields.many2many('account.account.type', 'account_journal_type_rel', 'journal_id','type_id', 'Type Controls', domain=[('code','<>','view'), ('code', '<>', 'closed')]),
+        'account_control_ids': fields.many2many('account.account', 'account_account_type_rel', 'journal_id','account_id', 'Account', domain=[('type','<>','view'), ('type', '<>', 'closed')]),
+        'view_id': fields.many2one('account.journal.view', 'Display Mode', required=True, help="Gives the view used when writing or browsing entries in this journal. The view tells OpenERP which fields should be visible, required or readonly and in which order. You can create your own view for a faster encoding in each journal."),
+        'default_credit_account_id': fields.many2one('account.account', 'Default Credit Account', domain="[('type','!=','view')]", help="It acts as a default account for credit amount"),
+        'default_debit_account_id': fields.many2one('account.account', 'Default Debit Account', domain="[('type','!=','view')]", help="It acts as a default account for debit amount"),
+        'centralisation': fields.boolean('Centralised counterpart', help="Check this box to determine that each entry of this journal won't create a new counterpart but will share the same counterpart. This is used in fiscal year closing."),
+        'update_posted': fields.boolean('Allow Cancelling Entries', help="Check this box if you want to allow the cancellation the entries related to this journal or of the invoice related to this journal"),
+        'group_invoice_lines': fields.boolean('Group Invoice Lines', help="If this box is checked, the system will try to group the accounting lines when generating them from invoices."),
+        'sequence_id': fields.many2one('ir.sequence', 'Entry Sequence', help="This field contains the informatin related to the numbering of the journal entries of this journal.", required=True),
+        'user_id': fields.many2one('res.users', 'User', help="The user responsible for this journal"),
+        'groups_id': fields.many2many('res.groups', 'account_journal_group_rel', 'journal_id', 'group_id', 'Groups'),
+        'currency': fields.many2one('res.currency', 'Currency', help='The currency used to enter statement'),
+        'entry_posted': fields.boolean('Skip \'Draft\' State for Manual Entries', help='Check this box if you don\'t want new journal entries to pass through the \'draft\' state and instead goes directly to the \'posted state\' without any manual validation. \nNote that journal entries that are automatically created by the system are always skipping that state.'),
+        'company_id': fields.many2one('res.company', 'Company', required=True, select=1, help="Company related to this journal"),
+        'allow_date':fields.boolean('Check Date in Period', help= 'If set to True then do not accept the entry if the entry date is not into the period dates'),
+    }
+
+    _defaults = {
+        'user_id': lambda self, cr, uid, context: uid,
+        'company_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
+    }
+    _sql_constraints = [
+        ('code_company_uniq', 'unique (code, company_id)', 'The code of the journal must be unique per company !'),
+        ('name_company_uniq', 'unique (name, company_id)', 'The name of the journal must be unique per company !'),
+    ]
+
+    _order = 'code'
+
+    def copy(self, cr, uid, id, default={}, context=None, done_list=[], local=False):
+        journal = self.browse(cr, uid, id, context=context)
+        if not default:
+            default = {}
+        default = default.copy()
+        default['code'] = (journal['code'] or '') + '(copy)'
+        default['name'] = (journal['name'] or '') + '(copy)'
+        default['sequence_id'] = False
+        return super(account_journal, self).copy(cr, uid, id, default, context=context)
+
+    def write(self, cr, uid, ids, vals, context=None):
+        if context is None:
+            context = {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        for journal in self.browse(cr, uid, ids, context=context):
+            if 'company_id' in vals and journal.company_id.id != vals['company_id']:
+                move_lines = self.pool.get('account.move.line').search(cr, uid, [('journal_id', 'in', ids)])
+                if move_lines:
+                    raise osv.except_osv(_('Warning !'), _('You can not modify the company of this journal as its related record exist in journal items'))
+        return super(account_journal, self).write(cr, uid, ids, vals, context=context)
+
+    def create_sequence(self, cr, uid, vals, context=None):
+        """ Create new no_gap entry sequence for every new Joural
+        """
+        # in account.journal code is actually the prefix of the sequence
+        # whereas ir.sequence code is a key to lookup global sequences.
+        prefix = vals['code'].upper()
+
+        seq = {
+            'name': vals['name'],
+            'implementation':'no_gap',
+            'prefix': prefix + "/%(year)s/",
+            'padding': 4,
+            'number_increment': 1
+        }
+        if 'company_id' in vals:
+            seq['company_id'] = vals['company_id']
+        return self.pool.get('ir.sequence').create(cr, uid, seq)
+
+    def create(self, cr, uid, vals, context=None):
+        if not 'sequence_id' in vals or not vals['sequence_id']:
+            vals.update({'sequence_id': self.create_sequence(cr, uid, vals, context)})
+        return super(account_journal, self).create(cr, uid, vals, context)
+
+    def name_get(self, cr, user, ids, context=None):
+        """
+        Returns a list of tupples containing id, name.
+        result format: {[(id, name), (id, name), ...]}
+
+        @param cr: A database cursor
+        @param user: ID of the user currently logged in
+        @param ids: list of ids for which name should be read
+        @param context: context arguments, like lang, time zone
+
+        @return: Returns a list of tupples containing id, name
+        """
+        result = self.browse(cr, user, ids, context=context)
+        res = []
+        for rs in result:
+            name = rs.name
+            if rs.currency:
+                name = "%s (%s)" % (rs.name, rs.currency.name)
+            res += [(rs.id, name)]
+        return res
+
+    def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=100):
+        if not args:
+            args = []
+        if context is None:
+            context = {}
+        ids = []
+        if context.get('journal_type', False):
+            args += [('type','=',context.get('journal_type'))]
+        if name:
+            ids = self.search(cr, user, [('code', 'ilike', name)]+ args, limit=limit, context=context)
+        if not ids:
+            ids = self.search(cr, user, [('name', 'ilike', name)]+ args, limit=limit, context=context)#fix it ilike should be replace with operator
+
+        return self.name_get(cr, user, ids, context=context)
+
+    def onchange_type(self, cr, uid, ids, type, currency, context=None):
+        obj_data = self.pool.get('ir.model.data')
+        user_pool = self.pool.get('res.users')
+
+        type_map = {
+            'sale':'account_sp_journal_view',
+            'sale_refund':'account_sp_refund_journal_view',
+            'purchase':'account_sp_journal_view',
+            'purchase_refund':'account_sp_refund_journal_view',
+            'cash':'account_journal_bank_view',
+            'bank':'account_journal_bank_view',
+            'general':'account_journal_view',
+            'situation':'account_journal_view'
+        }
+
+        res = {}
+        view_id = type_map.get(type, 'account_journal_view')
+        user = user_pool.browse(cr, uid, uid)
+        if type in ('cash', 'bank') and currency and user.company_id.currency_id.id != currency:
+            view_id = 'account_journal_bank_view_multi'
+        data_id = obj_data.search(cr, uid, [('model','=','account.journal.view'), ('name','=',view_id)])
+        data = obj_data.browse(cr, uid, data_id[0], context=context)
+
+        res.update({
+            'centralisation':type == 'situation',
+            'view_id':data.res_id,
+        })
+        return {
+            'value':res
+        }
+
+account_journal()
+
+class account_fiscalyear(osv.osv):
+    _name = "account.fiscalyear"
+    _description = "Fiscal Year"
+    _columns = {
+        'name': fields.char('Fiscal Year', size=64, required=True),
+        'code': fields.char('Code', size=6, required=True),
+        'company_id': fields.many2one('res.company', 'Company', required=True),
+        'date_start': fields.date('Start Date', required=True),
+        'date_stop': fields.date('End Date', required=True),
+        'period_ids': fields.one2many('account.period', 'fiscalyear_id', 'Periods'),
+        'state': fields.selection([('draft','Open'), ('done','Closed')], 'State', readonly=True),
+    }
+    _defaults = {
+        'state': 'draft',
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
+    }
+    _order = "date_start"
+
+    def _check_fiscal_year(self, cr, uid, ids, context=None):
+        current_fiscal_yr = self.browse(cr, uid, ids, context=context)[0]
+        obj_fiscal_ids = self.search(cr, uid, [('company_id', '=', current_fiscal_yr.company_id.id)], context=context)
+        obj_fiscal_ids.remove(ids[0])
+        data_fiscal_yr = self.browse(cr, uid, obj_fiscal_ids, context=context)
+
+        for old_fy in data_fiscal_yr:
+            if old_fy.company_id.id == current_fiscal_yr['company_id'].id:
+                # Condition to check if the current fiscal year falls in between any previously defined fiscal year
+                if old_fy.date_start <= current_fiscal_yr['date_start'] <= old_fy.date_stop or \
+                    old_fy.date_start <= current_fiscal_yr['date_stop'] <= old_fy.date_stop:
+                    return False
+        return True
+
+    def _check_duration(self, cr, uid, ids, context=None):
+        obj_fy = self.browse(cr, uid, ids[0], context=context)
+        if obj_fy.date_stop < obj_fy.date_start:
+            return False
+        return True
+
+    _constraints = [
+        (_check_duration, 'Error! The start date of the fiscal year must be before his end date.', ['date_start','date_stop']),
+        (_check_fiscal_year, 'Error! You can not define overlapping fiscal years for the same company.',['date_start', 'date_stop'])
+    ]
+
+    def create_period3(self, cr, uid, ids, context=None):
+        return self.create_period(cr, uid, ids, context, 3)
+
+    def create_period(self, cr, uid, ids, context=None, interval=1):
+        period_obj = self.pool.get('account.period')
+        for fy in self.browse(cr, uid, ids, context=context):
+            ds = datetime.strptime(fy.date_start, '%Y-%m-%d')
+            period_obj.create(cr, uid, {
+                    'name': _('Opening Period'),
+                    'code': ds.strftime('00/%Y'),
+                    'date_start': ds,
+                    'date_stop': ds,
+                    'special': True,
+                    'fiscalyear_id': fy.id,
+                })
+            while ds.strftime('%Y-%m-%d') < fy.date_stop:
+                de = ds + relativedelta(months=interval, days=-1)
+
+                if de.strftime('%Y-%m-%d') > fy.date_stop:
+                    de = datetime.strptime(fy.date_stop, '%Y-%m-%d')
+
+                period_obj.create(cr, uid, {
+                    'name': ds.strftime('%m/%Y'),
+                    'code': ds.strftime('%m/%Y'),
+                    'date_start': ds.strftime('%Y-%m-%d'),
+                    'date_stop': de.strftime('%Y-%m-%d'),
+                    'fiscalyear_id': fy.id,
+                })
+                ds = ds + relativedelta(months=interval)
+        return True
+
+    def find(self, cr, uid, dt=None, exception=True, context=None):
+        if not dt:
+            dt = time.strftime('%Y-%m-%d')
+        ids = self.search(cr, uid, [('date_start', '<=', dt), ('date_stop', '>=', dt)])
+        if not ids:
+            if exception:
+                raise osv.except_osv(_('Error !'), _('No fiscal year defined for this date !\nPlease create one.'))
+            else:
+                return False
+        return ids[0]
+
+    def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=80):
+        if args is None:
+            args = []
+        if context is None:
+            context = {}
+        ids = []
+        if name:
+            ids = self.search(cr, user, [('code', 'ilike', name)]+ args, limit=limit)
+        if not ids:
+            ids = self.search(cr, user, [('name', operator, name)]+ args, limit=limit)
+        return self.name_get(cr, user, ids, context=context)
+
+account_fiscalyear()
+
+class account_period(osv.osv):
+    _name = "account.period"
+    _description = "Account period"
+    _columns = {
+        'name': fields.char('Period Name', size=64, required=True),
+        'code': fields.char('Code', size=12),
+        'special': fields.boolean('Opening/Closing Period', size=12,
+            help="These periods can overlap."),
+        'date_start': fields.date('Start of Period', required=True, states={'done':[('readonly',True)]}),
+        'date_stop': fields.date('End of Period', required=True, states={'done':[('readonly',True)]}),
+        'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal Year', required=True, states={'done':[('readonly',True)]}, select=True),
+        'state': fields.selection([('draft','Open'), ('done','Closed')], 'State', readonly=True,
+                                  help='When monthly periods are created. The state is \'Draft\'. At the end of monthly period it is in \'Done\' state.'),
+        'company_id': fields.related('fiscalyear_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True)
+    }
+    _defaults = {
+        'state': 'draft',
+    }
+    _order = "date_start, special desc"
+    _sql_constraints = [
+        ('name_company_uniq', 'unique(name, company_id)', 'The name of the period must be unique per company!'),
+    ]
+    
+    def _check_duration(self,cr,uid,ids,context=None):
+        obj_period = self.browse(cr, uid, ids[0], context=context)
+        if obj_period.date_stop < obj_period.date_start:
+            return False
+        return True
+
+    def _check_year_limit(self,cr,uid,ids,context=None):
+        for obj_period in self.browse(cr, uid, ids, context=context):
+            if obj_period.special:
+                continue
+
+            if obj_period.fiscalyear_id.date_stop < obj_period.date_stop or \
+               obj_period.fiscalyear_id.date_stop < obj_period.date_start or \
+               obj_period.fiscalyear_id.date_start > obj_period.date_start or \
+               obj_period.fiscalyear_id.date_start > obj_period.date_stop:
+                return False
+
+            pids = self.search(cr, uid, [('date_stop','>=',obj_period.date_start),('date_start','<=',obj_period.date_stop),('special','=',False),('id','<>',obj_period.id)])
+            for period in self.browse(cr, uid, pids):
+                if period.fiscalyear_id.company_id.id==obj_period.fiscalyear_id.company_id.id:
+                    return False
+        return True
+
+    _constraints = [
+        (_check_duration, 'Error ! The duration of the Period(s) is/are invalid. ', ['date_stop']),
+        (_check_year_limit, 'Invalid period ! Some periods overlap or the date period is not in the scope of the fiscal year. ', ['date_stop'])
+    ]
+
+    def next(self, cr, uid, period, step, context=None):
+        ids = self.search(cr, uid, [('date_start','>',period.date_start)])
+        if len(ids)>=step:
+            return ids[step-1]
+        return False
+
+    def find(self, cr, uid, dt=None, context=None):
+        if not dt:
+            dt = time.strftime('%Y-%m-%d')
+#CHECKME: shouldn't we check the state of the period?
+        ids = self.search(cr, uid, [('date_start','<=',dt),('date_stop','>=',dt)])
+        if not ids:
+            raise osv.except_osv(_('Error !'), _('No period defined for this date: %s !\nPlease create one.')%dt)
+        return ids
+
+    def action_draft(self, cr, uid, ids, *args):
+        mode = 'draft'
+        cr.execute('update account_journal_period set state=%s where period_id in %s', (mode, tuple(ids),))
+        cr.execute('update account_period set state=%s where id in %s', (mode, tuple(ids),))
+        return True
+
+    def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=100):
+        if args is None:
+            args = []
+        if context is None:
+            context = {}
+        ids = []
+        if name:
+            ids = self.search(cr, user, [('code','ilike',name)]+ args, limit=limit)
+        if not ids:
+            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):
+        if 'company_id' in vals:
+            move_lines = self.pool.get('account.move.line').search(cr, uid, [('period_id', 'in', ids)])
+            if move_lines:
+                raise osv.except_osv(_('Warning !'), _('You can not modify company of this period as some journal items exists.'))
+        return super(account_period, self).write(cr, uid, ids, vals, context=context)
+
+    def build_ctx_periods(self, cr, uid, period_from_id, period_to_id):
+        period_from = self.browse(cr, uid, period_from_id)
+        period_date_start = period_from.date_start
+        company1_id = period_from.company_id.id
+        period_to = self.browse(cr, uid, period_to_id)
+        period_date_stop = period_to.date_stop
+        company2_id = period_to.company_id.id
+        if company1_id != company2_id:
+            raise osv.except_osv(_('Error'), _('You should have chosen periods that belongs to the same company'))
+        if period_date_start > period_date_stop:
+            raise osv.except_osv(_('Error'), _('Start period should be smaller then End period'))
+        #for period from = january, we want to exclude the opening period (but it has same date_from, so we have to check if period_from is special or not to include that clause or not in the search).
+        if period_from.special:
+            return self.search(cr, uid, [('date_start', '>=', period_date_start), ('date_stop', '<=', period_date_stop), ('company_id', '=', company1_id)])
+        return self.search(cr, uid, [('date_start', '>=', period_date_start), ('date_stop', '<=', period_date_stop), ('company_id', '=', company1_id), ('special', '=', False)])
+
+account_period()
+
+class account_journal_period(osv.osv):
+    _name = "account.journal.period"
+    _description = "Journal Period"
+
+    def _icon_get(self, cr, uid, ids, field_name, arg=None, context=None):
+        result = {}.fromkeys(ids, 'STOCK_NEW')
+        for r in self.read(cr, uid, ids, ['state']):
+            result[r['id']] = {
+                'draft': 'STOCK_NEW',
+                'printed': 'STOCK_PRINT_PREVIEW',
+                'done': 'STOCK_DIALOG_AUTHENTICATION',
+            }.get(r['state'], 'STOCK_NEW')
+        return result
+
+    _columns = {
+        'name': fields.char('Journal-Period Name', size=64, required=True),
+        'journal_id': fields.many2one('account.journal', 'Journal', required=True, ondelete="cascade"),
+        'period_id': fields.many2one('account.period', 'Period', required=True, ondelete="cascade"),
+        'icon': fields.function(_icon_get, string='Icon', type='char', size=32),
+        'active': fields.boolean('Active', required=True, help="If the active field is set to False, it will allow you to hide the journal period without removing it."),
+        'state': fields.selection([('draft','Draft'), ('printed','Printed'), ('done','Done')], 'State', required=True, readonly=True,
+                                  help='When journal period is created. The state is \'Draft\'. If a report is printed it comes to \'Printed\' state. When all transactions are done, it comes in \'Done\' state.'),
+        'fiscalyear_id': fields.related('period_id', 'fiscalyear_id', string='Fiscal Year', type='many2one', relation='account.fiscalyear'),
+        'company_id': fields.related('journal_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True)
+    }
+
+    def _check(self, cr, uid, ids, context=None):
+        for obj in self.browse(cr, uid, ids, context=context):
+            cr.execute('select * from account_move_line where journal_id=%s and period_id=%s limit 1', (obj.journal_id.id, obj.period_id.id))
+            res = cr.fetchall()
+            if res:
+                raise osv.except_osv(_('Error !'), _('You can not modify/delete a journal with entries for this period !'))
+        return True
+
+    def write(self, cr, uid, ids, vals, context=None):
+        self._check(cr, uid, ids, context=context)
+        return super(account_journal_period, self).write(cr, uid, ids, vals, context=context)
+
+    def create(self, cr, uid, vals, context=None):
+        period_id = vals.get('period_id',False)
+        if period_id:
+            period = self.pool.get('account.period').browse(cr, uid, period_id, context=context)
+            vals['state']=period.state
+        return super(account_journal_period, self).create(cr, uid, vals, context)
+
+    def unlink(self, cr, uid, ids, context=None):
+        self._check(cr, uid, ids, context=context)
+        return super(account_journal_period, self).unlink(cr, uid, ids, context=context)
+
+    _defaults = {
+        'state': 'draft',
+        'active': True,
+    }
+    _order = "period_id"
+
+account_journal_period()
+
+class account_fiscalyear(osv.osv):
+    _inherit = "account.fiscalyear"
+    _description = "Fiscal Year"
+    _columns = {
+        'end_journal_period_id':fields.many2one('account.journal.period','End of Year Entries Journal', readonly=True),
+    }
+
+    def copy(self, cr, uid, id, default={}, context=None):
+        default.update({
+            'period_ids': [],
+            'end_journal_period_id': False
+        })
+        return super(account_fiscalyear, self).copy(cr, uid, id, default=default, context=context)
+
+account_fiscalyear()
+#----------------------------------------------------------
+# Entries
+#----------------------------------------------------------
+class account_move(osv.osv):
+    _name = "account.move"
+    _description = "Account Entry"
+    _order = 'id desc'
+
+    def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=80):
+        """
+        Returns a list of tupples containing id, name, as internally it is called {def name_get}
+        result format: {[(id, name), (id, name), ...]}
+
+        @param cr: A database cursor
+        @param user: ID of the user currently logged in
+        @param name: name to search
+        @param args: other arguments
+        @param operator: default operator is 'ilike', it can be changed
+        @param context: context arguments, like lang, time zone
+        @param limit: Returns first 'n' ids of complete result, default is 80.
+
+        @return: Returns a list of tuples containing id and name
+        """
+
+        if not args:
+          args = []
+        ids = []
+        if name:
+            ids += self.search(cr, user, [('name','ilike',name)]+args, limit=limit, context=context)
+
+        if not ids and name and type(name) == int:
+            ids += self.search(cr, user, [('id','=',name)]+args, limit=limit, context=context)
+
+        if not ids:
+            ids += self.search(cr, user, args, limit=limit, context=context)
+
+        return self.name_get(cr, user, ids, context=context)
+
+    def name_get(self, cursor, user, ids, context=None):
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        if not ids:
+            return []
+        res = []
+        data_move = self.pool.get('account.move').browse(cursor, user, ids, context=context)
+        for move in data_move:
+            if move.state=='draft':
+                name = '*' + str(move.id)
+            else:
+                name = move.name
+            res.append((move.id, name))
+        return res
+
+    def _get_period(self, cr, uid, context=None):
+        periods = self.pool.get('account.period').find(cr, uid)
+        if periods:
+            return periods[0]
+        return False
+
+    def _amount_compute(self, cr, uid, ids, name, args, context, where =''):
+        if not ids: return {}
+        cr.execute( 'SELECT move_id, SUM(debit) '\
+                    'FROM account_move_line '\
+                    'WHERE move_id IN %s '\
+                    'GROUP BY move_id', (tuple(ids),))
+        result = dict(cr.fetchall())
+        for id in ids:
+            result.setdefault(id, 0.0)
+        return result
+
+    def _search_amount(self, cr, uid, obj, name, args, context):
+        ids = set()
+        for cond in args:
+            amount = cond[2]
+            if isinstance(cond[2],(list,tuple)):
+                if cond[1] in ['in','not in']:
+                    amount = tuple(cond[2])
+                else:
+                    continue
+            else:
+                if cond[1] in ['=like', 'like', 'not like', 'ilike', 'not ilike', 'in', 'not in', 'child_of']:
+                    continue
+
+            cr.execute("select move_id from account_move_line group by move_id having sum(debit) %s %%s" % (cond[1]),(amount,))
+            res_ids = set(id[0] for id in cr.fetchall())
+            ids = ids and (ids & res_ids) or res_ids
+        if ids:
+            return [('id', 'in', tuple(ids))]
+        return [('id', '=', '0')]
+
+    _columns = {
+        'name': fields.char('Number', size=64, required=True),
+        'ref': fields.char('Reference', size=64),
+        'period_id': fields.many2one('account.period', 'Period', required=True, states={'posted':[('readonly',True)]}),
+        'journal_id': fields.many2one('account.journal', 'Journal', required=True, states={'posted':[('readonly',True)]}),
+        'state': fields.selection([('draft','Unposted'), ('posted','Posted')], 'State', required=True, readonly=True,
+            help='All manually created new journal entry are usually in the state \'Unposted\', but you can set the option to skip that state on the related journal. In that case, they will be behave as journal entries automatically created by the system on document validation (invoices, bank statements...) and will be created in \'Posted\' state.'),
+        'line_id': fields.one2many('account.move.line', 'move_id', 'Entries', states={'posted':[('readonly',True)]}),
+        'to_check': fields.boolean('To Review', help='Check this box if you are unsure of that journal entry and if you want to note it as \'to be reviewed\' by an accounting expert.'),
+        'partner_id': fields.related('line_id', 'partner_id', type="many2one", relation="res.partner", string="Partner", store=True),
+        'amount': fields.function(_amount_compute, string='Amount', digits_compute=dp.get_precision('Account'), type='float', fnct_search=_search_amount),
+        'date': fields.date('Date', required=True, states={'posted':[('readonly',True)]}, select=True),
+        'narration':fields.text('Internal Note'),
+        'company_id': fields.related('journal_id','company_id',type='many2one',relation='res.company',string='Company', store=True, readonly=True),
+    }
+    _defaults = {
+        'name': '/',
+        'state': 'draft',
+        'period_id': _get_period,
+        'date': lambda *a: time.strftime('%Y-%m-%d'),
+        'company_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
+    }
+
+    def _check_centralisation(self, cursor, user, ids, context=None):
+        for move in self.browse(cursor, user, ids, context=context):
+            if move.journal_id.centralisation:
+                move_ids = self.search(cursor, user, [
+                    ('period_id', '=', move.period_id.id),
+                    ('journal_id', '=', move.journal_id.id),
+                    ])
+                if len(move_ids) > 1:
+                    return False
+        return True
+
+    def _check_period_journal(self, cursor, user, ids, context=None):
+        for move in self.browse(cursor, user, ids, context=context):
+            for line in move.line_id:
+                if line.period_id.id != move.period_id.id:
+                    return False
+                if line.journal_id.id != move.journal_id.id:
+                    return False
+        return True
+
+    _constraints = [
+        (_check_centralisation,
+            'You can not create more than one move per period on centralized journal',
+            ['journal_id']),
+        (_check_period_journal,
+            'You can not create journal items on different periods/journals in the same journal entry',
+            ['line_id']),
+    ]
+
+    def post(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        invoice = context.get('invoice', False)
+        valid_moves = self.validate(cr, uid, ids, context)
+
+        if not valid_moves:
+            raise osv.except_osv(_('Integrity Error !'), _('You can not validate a non-balanced entry !\nMake sure you have configured payment terms properly !\nThe latest payment term line should be of the type "Balance" !'))
+        obj_sequence = self.pool.get('ir.sequence')
+        for move in self.browse(cr, uid, valid_moves, context=context):
+            if move.name =='/':
+                new_name = False
+                journal = move.journal_id
+
+                if invoice and invoice.internal_number:
+                    new_name = invoice.internal_number
+                else:
+                    if journal.sequence_id:
+                        c = {'fiscalyear_id': move.period_id.fiscalyear_id.id}
+                        new_name = obj_sequence.next_by_id(cr, uid, journal.sequence_id.id, c)
+                    else:
+                        raise osv.except_osv(_('Error'), _('No sequence defined on the journal !'))
+
+                if new_name:
+                    self.write(cr, uid, [move.id], {'name':new_name})
+
+        cr.execute('UPDATE account_move '\
+                   'SET state=%s '\
+                   'WHERE id IN %s',
+                   ('posted', tuple(valid_moves),))
+        return True
+
+    def button_validate(self, cursor, user, ids, context=None):
+        for move in self.browse(cursor, user, ids, context=context):
+            top = None
+            for line in move.line_id:
+                account = line.account_id
+                while account:
+                    account2 = account
+                    account = account.parent_id
+                if not top:
+                    top = account2.id
+                elif top<>account2.id:
+                    raise osv.except_osv(_('Error !'), _('You can not validate a journal entry unless all journal items belongs to the same chart of accounts !'))
+        return self.post(cursor, user, ids, context=context)
+
+    def button_cancel(self, cr, uid, ids, context=None):
+        for line in self.browse(cr, uid, ids, context=context):
+            if not line.journal_id.update_posted:
+                raise osv.except_osv(_('Error !'), _('You can not modify a posted entry of this journal !\nYou should set the journal to allow cancelling entries if you want to do that.'))
+        if ids:
+            cr.execute('UPDATE account_move '\
+                       'SET state=%s '\
+                       'WHERE id IN %s', ('draft', tuple(ids),))
+        return True
+
+    def write(self, cr, uid, ids, vals, context=None):
+        if context is None:
+            context = {}
+        c = context.copy()
+        c['novalidate'] = True
+        result = super(account_move, self).write(cr, uid, ids, vals, c)
+        self.validate(cr, uid, ids, context=context)
+        return result
+
+    #
+    # TODO: Check if period is closed !
+    #
+    def create(self, cr, uid, vals, context=None):
+        if context is None:
+            context = {}
+        if 'line_id' in vals and context.get('copy'):
+            for l in vals['line_id']:
+                if not l[0]:
+                    l[2].update({
+                        'reconcile_id':False,
+                        'reconcil_partial_id':False,
+                        'analytic_lines':False,
+                        'invoice':False,
+                        'ref':False,
+                        'balance':False,
+                        'account_tax_id':False,
+                    })
+
+            if 'journal_id' in vals and vals.get('journal_id', False):
+                for l in vals['line_id']:
+                    if not l[0]:
+                        l[2]['journal_id'] = vals['journal_id']
+                context['journal_id'] = vals['journal_id']
+            if 'period_id' in vals:
+                for l in vals['line_id']:
+                    if not l[0]:
+                        l[2]['period_id'] = vals['period_id']
+                context['period_id'] = vals['period_id']
+            else:
+                default_period = self._get_period(cr, uid, context)
+                for l in vals['line_id']:
+                    if not l[0]:
+                        l[2]['period_id'] = default_period
+                context['period_id'] = default_period
+
+        if 'line_id' in vals:
+            c = context.copy()
+            c['novalidate'] = True
+            result = super(account_move, self).create(cr, uid, vals, c)
+            self.validate(cr, uid, [result], context)
+        else:
+            result = super(account_move, self).create(cr, uid, vals, context)
+        return result
+
+    def copy(self, cr, uid, id, default={}, context=None):
+        if context is None:
+            context = {}
+        default.update({
+            'state':'draft',
+            'name':'/',
+        })
+        context.update({
+            'copy':True
+        })
+        return super(account_move, self).copy(cr, uid, id, default, context)
+
+    def unlink(self, cr, uid, ids, context=None, check=True):
+        if context is None:
+            context = {}
+        toremove = []
+        obj_move_line = self.pool.get('account.move.line')
+        for move in self.browse(cr, uid, ids, context=context):
+            if move['state'] != 'draft':
+                raise osv.except_osv(_('UserError'),
+                        _('You can not delete a posted journal entry "%s"!') % \
+                                move['name'])
+            line_ids = map(lambda x: x.id, move.line_id)
+            context['journal_id'] = move.journal_id.id
+            context['period_id'] = move.period_id.id
+            obj_move_line._update_check(cr, uid, line_ids, context)
+            obj_move_line.unlink(cr, uid, line_ids, context=context)
+            toremove.append(move.id)
+        result = super(account_move, self).unlink(cr, uid, toremove, context)
+        return result
+
+    def _compute_balance(self, cr, uid, id, context=None):
+        move = self.browse(cr, uid, id, context=context)
+        amount = 0
+        for line in move.line_id:
+            amount+= (line.debit - line.credit)
+        return amount
+
+    def _centralise(self, cr, uid, move, mode, context=None):
+        assert mode in ('debit', 'credit'), 'Invalid Mode' #to prevent sql injection
+        currency_obj = self.pool.get('res.currency')
+        if context is None:
+            context = {}
+
+        if mode=='credit':
+            account_id = move.journal_id.default_debit_account_id.id
+            mode2 = 'debit'
+            if not account_id:
+                raise osv.except_osv(_('UserError'),
+                        _('There is no default default debit account defined \n' \
+                                'on journal "%s"') % move.journal_id.name)
+        else:
+            account_id = move.journal_id.default_credit_account_id.id
+            mode2 = 'credit'
+            if not account_id:
+                raise osv.except_osv(_('UserError'),
+                        _('There is no default default credit account defined \n' \
+                                'on journal "%s"') % move.journal_id.name)
+
+        # find the first line of this move with the current mode
+        # or create it if it doesn't exist
+        cr.execute('select id from account_move_line where move_id=%s and centralisation=%s limit 1', (move.id, mode))
+        res = cr.fetchone()
+        if res:
+            line_id = res[0]
+        else:
+            context.update({'journal_id': move.journal_id.id, 'period_id': move.period_id.id})
+            line_id = self.pool.get('account.move.line').create(cr, uid, {
+                'name': _(mode.capitalize()+' Centralisation'),
+                'centralisation': mode,
+                'account_id': account_id,
+                'move_id': move.id,
+                'journal_id': move.journal_id.id,
+                'period_id': move.period_id.id,
+                'date': move.period_id.date_stop,
+                'debit': 0.0,
+                'credit': 0.0,
+            }, context)
+
+        # find the first line of this move with the other mode
+        # so that we can exclude it from our calculation
+        cr.execute('select id from account_move_line where move_id=%s and centralisation=%s limit 1', (move.id, mode2))
+        res = cr.fetchone()
+        if res:
+            line_id2 = res[0]
+        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))
+        result = cr.fetchone()[0] or 0.0
+        cr.execute('update account_move_line set '+mode2+'=%s where id=%s', (result, line_id))
+
+        #adjust also the amount in currency if needed
+        cr.execute("select currency_id, sum(amount_currency) as amount_currency from account_move_line where move_id = %s and currency_id is not null group by currency_id", (move.id,))
+        for row in cr.dictfetchall():
+            currency_id = currency_obj.browse(cr, uid, row['currency_id'], context=context)
+            if not currency_obj.is_zero(cr, uid, currency_id, row['amount_currency']):
+                amount_currency = row['amount_currency'] * -1
+                account_id = amount_currency > 0 and move.journal_id.default_debit_account_id.id or move.journal_id.default_credit_account_id.id
+                cr.execute('select id from account_move_line where move_id=%s and centralisation=\'currency\' and currency_id = %slimit 1', (move.id, row['currency_id']))
+                res = cr.fetchone()
+                if res:
+                    cr.execute('update account_move_line set amount_currency=%s , account_id=%s where id=%s', (amount_currency, account_id, res[0]))
+                else:
+                    context.update({'journal_id': move.journal_id.id, 'period_id': move.period_id.id})
+                    line_id = self.pool.get('account.move.line').create(cr, uid, {
+                        'name': _('Currency Adjustment'),
+                        'centralisation': 'currency',
+                        'account_id': account_id,
+                        'move_id': move.id,
+                        'journal_id': move.journal_id.id,
+                        'period_id': move.period_id.id,
+                        'date': move.period_id.date_stop,
+                        'debit': 0.0,
+                        'credit': 0.0,
+                        'currency_id': row['currency_id'],
+                        'amount_currency': amount_currency,
+                    }, context)
+
+        return True
+
+    #
+    # Validate a balanced move. If it is a centralised journal, create a move.
+    #
+    def validate(self, cr, uid, ids, context=None):
+        if context and ('__last_update' in context):
+            del context['__last_update']
+
+        valid_moves = [] #Maintains a list of moves which can be responsible to create analytic entries
+        obj_analytic_line = self.pool.get('account.analytic.line')
+        obj_move_line = self.pool.get('account.move.line')
+        for move in self.browse(cr, uid, ids, context):
+            # Unlink old analytic lines on move_lines
+            for obj_line in move.line_id:
+                for obj in obj_line.analytic_lines:
+                    obj_analytic_line.unlink(cr,uid,obj.id)
+
+            journal = move.journal_id
+            amount = 0
+            line_ids = []
+            line_draft_ids = []
+            company_id = None
+            for line in move.line_id:
+                amount += line.debit - line.credit
+                line_ids.append(line.id)
+                if line.state=='draft':
+                    line_draft_ids.append(line.id)
+
+                if not company_id:
+                    company_id = line.account_id.company_id.id
+                if not company_id == line.account_id.company_id.id:
+                    raise osv.except_osv(_('Error'), _("Couldn't create move between different companies"))
+
+                if line.account_id.currency_id and line.currency_id:
+                    if line.account_id.currency_id.id != line.currency_id.id and (line.account_id.currency_id.id != line.account_id.company_id.currency_id.id):
+                        raise osv.except_osv(_('Error'), _("""Couldn't create move with currency different from the secondary currency of the account "%s - %s". Clear the secondary currency field of the account definition if you want to accept all currencies.""") % (line.account_id.code, line.account_id.name))
+
+            if abs(amount) < 10 ** -4:
+                # If the move is balanced
+                # Add to the list of valid moves
+                # (analytic lines will be created later for valid moves)
+                valid_moves.append(move)
+
+                # Check whether the move lines are confirmed
+
+                if not line_draft_ids:
+                    continue
+                # Update the move lines (set them as valid)
+
+                obj_move_line.write(cr, uid, line_draft_ids, {
+                    'journal_id': move.journal_id.id,
+                    'period_id': move.period_id.id,
+                    'state': 'valid'
+                }, context, check=False)
+
+                account = {}
+                account2 = {}
+
+                if journal.type in ('purchase','sale'):
+                    for line in move.line_id:
+                        code = amount = 0
+                        key = (line.account_id.id, line.tax_code_id.id)
+                        if key in account2:
+                            code = account2[key][0]
+                            amount = account2[key][1] * (line.debit + line.credit)
+                        elif line.account_id.id in account:
+                            code = account[line.account_id.id][0]
+                            amount = account[line.account_id.id][1] * (line.debit + line.credit)
+                        if (code or amount) and not (line.tax_code_id or line.tax_amount):
+                            obj_move_line.write(cr, uid, [line.id], {
+                                'tax_code_id': code,
+                                'tax_amount': amount
+                            }, context, check=False)
+            elif journal.centralisation:
+                # If the move is not balanced, it must be centralised...
+
+                # Add to the list of valid moves
+                # (analytic lines will be created later for valid moves)
+                valid_moves.append(move)
+
+                #
+                # Update the move lines (set them as valid)
+                #
+                self._centralise(cr, uid, move, 'debit', context=context)
+                self._centralise(cr, uid, move, 'credit', context=context)
+                obj_move_line.write(cr, uid, line_draft_ids, {
+                    'state': 'valid'
+                }, context, check=False)
+            else:
+                # We can't validate it (it's unbalanced)
+                # Setting the lines as draft
+                obj_move_line.write(cr, uid, line_ids, {
+                    'journal_id': move.journal_id.id,
+                    'period_id': move.period_id.id,
+                    'state': 'draft'
+                }, context, check=False)
+        # Create analytic lines for the valid moves
+        for record in valid_moves:
+            obj_move_line.create_analytic_lines(cr, uid, [line.id for line in record.line_id], context)
+
+        valid_moves = [move.id for move in valid_moves]
+        return len(valid_moves) > 0 and valid_moves or False
+
+account_move()
+
+class account_move_reconcile(osv.osv):
+    _name = "account.move.reconcile"
+    _description = "Account Reconciliation"
+    _columns = {
+        'name': fields.char('Name', size=64, required=True),
+        'type': fields.char('Type', size=16, required=True),
+        'line_id': fields.one2many('account.move.line', 'reconcile_id', 'Entry Lines'),
+        'line_partial_ids': fields.one2many('account.move.line', 'reconcile_partial_id', 'Partial Entry lines'),
+        'create_date': fields.date('Creation date', readonly=True),
+    }
+    _defaults = {
+        'name': lambda self,cr,uid,ctx={}: self.pool.get('ir.sequence').get(cr, uid, 'account.reconcile') or '/',
+    }
+    def reconcile_partial_check(self, cr, uid, ids, type='auto', context=None):
+        total = 0.0
+        for rec in self.browse(cr, uid, ids, context=context):
+            for line in rec.line_partial_ids:
+                total += (line.debit or 0.0) - (line.credit or 0.0)
+        if not total:
+            self.pool.get('account.move.line').write(cr, uid,
+                map(lambda x: x.id, rec.line_partial_ids),
+                {'reconcile_id': rec.id }
+            )
+        return True
+
+    def name_get(self, cr, uid, ids, context=None):
+        if not ids:
+            return []
+        result = []
+        for r in self.browse(cr, uid, ids, context=context):
+            total = reduce(lambda y,t: (t.debit or 0.0) - (t.credit or 0.0) + y, r.line_partial_ids, 0.0)
+            if total:
+                name = '%s (%.2f)' % (r.name, total)
+                result.append((r.id,name))
+            else:
+                result.append((r.id,r.name))
+        return result
+
+account_move_reconcile()
+
+#----------------------------------------------------------
+# Tax
+#----------------------------------------------------------
+"""
+a documenter
+child_depend: la taxe depend des taxes filles
+"""
+class account_tax_code(osv.osv):
+    """
+    A code for the tax object.
+
+    This code is used for some tax declarations.
+    """
+    def _sum(self, cr, uid, ids, name, args, context, where ='', where_params=()):
+        parent_ids = tuple(self.search(cr, uid, [('parent_id', 'child_of', ids)]))
+        if context.get('based_on', 'invoices') == 'payments':
+            cr.execute('SELECT line.tax_code_id, sum(line.tax_amount) \
+                    FROM account_move_line AS line, \
+                        account_move AS move \
+                        LEFT JOIN account_invoice invoice ON \
+                            (invoice.move_id = move.id) \
+                    WHERE line.tax_code_id IN %s '+where+' \
+                        AND move.id = line.move_id \
+                        AND ((invoice.state = \'paid\') \
+                            OR (invoice.id IS NULL)) \
+                            GROUP BY line.tax_code_id',
+                                (parent_ids,) + where_params)
+        else:
+            cr.execute('SELECT line.tax_code_id, sum(line.tax_amount) \
+                    FROM account_move_line AS line, \
+                    account_move AS move \
+                    WHERE line.tax_code_id IN %s '+where+' \
+                    AND move.id = line.move_id \
+                    GROUP BY line.tax_code_id',
+                       (parent_ids,) + where_params)
+        res=dict(cr.fetchall())
+        obj_precision = self.pool.get('decimal.precision')
+        res2 = {}
+        for record in self.browse(cr, uid, ids, context=context):
+            def _rec_get(record):
+                amount = res.get(record.id, 0.0)
+                for rec in record.child_ids:
+                    amount += _rec_get(rec) * rec.sign
+                return amount
+            res2[record.id] = round(_rec_get(record), obj_precision.precision_get(cr, uid, 'Account'))
+        return res2
+
+    def _sum_year(self, cr, uid, ids, name, args, context=None):
+        if context is None:
+            context = {}
+        move_state = ('posted', )
+        if context.get('state', 'all') == 'all':
+            move_state = ('draft', 'posted', )
+        if context.get('fiscalyear_id', False):
+            fiscalyear_id = context['fiscalyear_id']
+        else:
+            fiscalyear_id = self.pool.get('account.fiscalyear').find(cr, uid, exception=False)
+        where = ''
+        where_params = ()
+        if fiscalyear_id:
+            pids = map(lambda x: str(x.id), self.pool.get('account.fiscalyear').browse(cr, uid, fiscalyear_id).period_ids)
+            if pids:
+                where = ' AND line.period_id IN %s AND move.state IN %s '
+                where_params = (tuple(pids), move_state)
+        return self._sum(cr, uid, ids, name, args, context,
+                where=where, where_params=where_params)
+
+    def _sum_period(self, cr, uid, ids, name, args, context):
+        if context is None:
+            context = {}
+        move_state = ('posted', )
+        if context.get('state', False) == 'all':
+            move_state = ('draft', 'posted', )
+        if context.get('period_id', False):
+            period_id = context['period_id']
+        else:
+            period_id = self.pool.get('account.period').find(cr, uid)
+            if not period_id:
+                return dict.fromkeys(ids, 0.0)
+            period_id = period_id[0]
+        return self._sum(cr, uid, ids, name, args, context,
+                where=' AND line.period_id=%s AND move.state IN %s', where_params=(period_id, move_state))
+
+    _name = 'account.tax.code'
+    _description = 'Tax Code'
+    _rec_name = 'code'
+    _columns = {
+        'name': fields.char('Tax Case Name', size=64, required=True, translate=True),
+        'code': fields.char('Case Code', size=64),
+        'info': fields.text('Description'),
+        'sum': fields.function(_sum_year, string="Year Sum"),
+        'sum_period': fields.function(_sum_period, string="Period Sum"),
+        'parent_id': fields.many2one('account.tax.code', 'Parent Code', select=True),
+        'child_ids': fields.one2many('account.tax.code', 'parent_id', 'Child Codes'),
+        'line_ids': fields.one2many('account.move.line', 'tax_code_id', 'Lines'),
+        'company_id': fields.many2one('res.company', 'Company', required=True),
+        'sign': fields.float('Coefficent for parent', required=True, help='You can specify here the coefficient that will be used when consolidating the amount of this case into its parent. For example, set 1/-1 if you want to add/substract it.'),
+        'notprintable':fields.boolean("Not Printable in Invoice", help="Check this box if you don't want any VAT related to this Tax Code to appear on invoices"),
+    }
+
+    def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=80):
+        if not args:
+            args = []
+        if context is None:
+            context = {}
+        ids = self.search(cr, user, ['|',('name',operator,name),('code',operator,name)] + args, limit=limit, context=context)
+        return self.name_get(cr, user, ids, context)
+
+    def name_get(self, cr, uid, ids, context=None):
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        if not ids:
+            return []
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        reads = self.read(cr, uid, ids, ['name','code'], context, load='_classic_write')
+        return [(x['id'], (x['code'] and (x['code'] + ' - ') or '') + x['name']) \
+                for x in reads]
+
+    def _default_company(self, cr, uid, context=None):
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+        if user.company_id:
+            return user.company_id.id
+        return self.pool.get('res.company').search(cr, uid, [('parent_id', '=', False)])[0]
+    _defaults = {
+        'company_id': _default_company,
+        'sign': 1.0,
+        'notprintable': False,
+    }
+
+    def copy(self, cr, uid, id, default=None, context=None):
+        if default is None:
+            default = {}
+        default = default.copy()
+        default.update({'line_ids': []})
+        return super(account_tax_code, self).copy(cr, uid, id, default, context)
+
+    _check_recursion = check_cycle
+    _constraints = [
+        (_check_recursion, 'Error ! You can not create recursive accounts.', ['parent_id'])
+    ]
+    _order = 'code'
+
+account_tax_code()
+
+class account_tax(osv.osv):
+    """
+    A tax object.
+
+    Type: percent, fixed, none, code
+        PERCENT: tax = price * amount
+        FIXED: tax = price + amount
+        NONE: no tax line
+        CODE: execute python code. localcontext = {'price_unit':pu, 'address':address_object}
+            return result in the context
+            Ex: result=round(price_unit*0.21,4)
+    """
+
+    def get_precision_tax():
+        def change_digit_tax(cr):
+            res = pooler.get_pool(cr.dbname).get('decimal.precision').precision_get(cr, 1, 'Account')
+            return (16, res+2)
+        return change_digit_tax
+
+    _name = 'account.tax'
+    _description = 'Tax'
+    _columns = {
+        'name': fields.char('Tax Name', size=64, required=True, translate=True, help="This name will be displayed on reports"),
+        'sequence': fields.integer('Sequence', required=True, help="The sequence field is used to order the tax lines from the lowest sequences to the higher ones. The order is important if you have a tax with several tax children. In this case, the evaluation order is important."),
+        'amount': fields.float('Amount', required=True, digits_compute=get_precision_tax(), help="For taxes of type percentage, enter % ratio between 0-1."),
+        'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the tax without removing it."),
+        'type': fields.selection( [('percent','Percentage'), ('fixed','Fixed Amount'), ('none','None'), ('code','Python Code'), ('balance','Balance')], 'Tax Type', required=True,
+            help="The computation method for the tax amount."),
+        'applicable_type': fields.selection( [('true','Always'), ('code','Given by Python Code')], 'Applicability', required=True,
+            help="If not applicable (computed through a Python code), the tax won't appear on the invoice."),
+        'domain':fields.char('Domain', size=32, help="This field is only used if you develop your own module allowing developers to create specific taxes in a custom domain."),
+        'account_collected_id':fields.many2one('account.account', 'Invoice Tax Account'),
+        'account_paid_id':fields.many2one('account.account', 'Refund Tax Account'),
+        'parent_id':fields.many2one('account.tax', 'Parent Tax Account', select=True),
+        'child_ids':fields.one2many('account.tax', 'parent_id', 'Child Tax Accounts'),
+        'child_depend':fields.boolean('Tax on Children', help="Set if the tax computation is based on the computation of child taxes rather than on the total amount."),
+        'python_compute':fields.text('Python Code'),
+        'python_compute_inv':fields.text('Python Code (reverse)'),
+        'python_applicable':fields.text('Python Code'),
+
+        #
+        # Fields used for the VAT declaration
+        #
+        'base_code_id': fields.many2one('account.tax.code', 'Account Base Code', help="Use this code for the VAT declaration."),
+        'tax_code_id': fields.many2one('account.tax.code', 'Account Tax Code', help="Use this code for the VAT declaration."),
+        'base_sign': fields.float('Base Code Sign', help="Usually 1 or -1."),
+        'tax_sign': fields.float('Tax Code Sign', help="Usually 1 or -1."),
+
+        # Same fields for refund invoices
+
+        'ref_base_code_id': fields.many2one('account.tax.code', 'Refund Base Code', help="Use this code for the VAT declaration."),
+        'ref_tax_code_id': fields.many2one('account.tax.code', 'Refund Tax Code', help="Use this code for the VAT declaration."),
+        'ref_base_sign': fields.float('Base Code Sign', help="Usually 1 or -1."),
+        'ref_tax_sign': fields.float('Tax Code Sign', help="Usually 1 or -1."),
+        'include_base_amount': fields.boolean('Included in base amount', help="Indicates if the amount of tax must be included in the base amount for the computation of the next taxes"),
+        'company_id': fields.many2one('res.company', 'Company', required=True),
+        'description': fields.char('Tax Code',size=32),
+        'price_include': fields.boolean('Tax Included in Price', help="Check this if the price you use on the product and invoices includes this tax."),
+        'type_tax_use': fields.selection([('sale','Sale'),('purchase','Purchase'),('all','All')], 'Tax Application', required=True)
+
+    }
+    _sql_constraints = [
+        ('name_company_uniq', 'unique(name, company_id)', 'Tax Name must be unique per company!'),
+    ]
+
+    def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=80):
+        """
+        Returns a list of tupples containing id, name, as internally it is called {def name_get}
+        result format: {[(id, name), (id, name), ...]}
+
+        @param cr: A database cursor
+        @param user: ID of the user currently logged in
+        @param name: name to search
+        @param args: other arguments
+        @param operator: default operator is 'ilike', it can be changed
+        @param context: context arguments, like lang, time zone
+        @param limit: Returns first 'n' ids of complete result, default is 80.
+
+        @return: Returns a list of tupples containing id and name
+        """
+        if not args:
+            args = []
+        if context is None:
+            context = {}
+        ids = []
+        if name:
+            ids = self.search(cr, user, [('description', '=', name)] + args, limit=limit, context=context)
+            if not ids:
+                ids = self.search(cr, user, [('name', operator, name)] + args, limit=limit, context=context)
+        else:
+            ids = self.search(cr, user, args, limit=limit, context=context or {})
+        return self.name_get(cr, user, ids, context=context)
+
+    def write(self, cr, uid, ids, vals, context=None):
+        if vals.get('type', False) and vals['type'] in ('none', 'code'):
+            vals.update({'amount': 0.0})
+        return super(account_tax, self).write(cr, uid, ids, vals, context=context)
+
+    def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
+        journal_pool = self.pool.get('account.journal')
+
+        if context and context.has_key('type'):
+            if context.get('type') in ('out_invoice','out_refund'):
+                args += [('type_tax_use','in',['sale','all'])]
+            elif context.get('type') in ('in_invoice','in_refund'):
+                args += [('type_tax_use','in',['purchase','all'])]
+
+        if context and context.has_key('journal_id'):
+            journal = journal_pool.browse(cr, uid, context.get('journal_id'))
+            if journal.type in ('sale', 'purchase'):
+                args += [('type_tax_use','in',[journal.type,'all'])]
+
+        return super(account_tax, self).search(cr, uid, args, offset, limit, order, context, count)
+
+    def name_get(self, cr, uid, ids, context=None):
+        if not ids:
+            return []
+        res = []
+        for record in self.read(cr, uid, ids, ['description','name'], context=context):
+            name = record['description'] and record['description'] or record['name']
+            res.append((record['id'],name ))
+        return res
+
+    def _default_company(self, cr, uid, context=None):
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+        if user.company_id:
+            return user.company_id.id
+        return self.pool.get('res.company').search(cr, uid, [('parent_id', '=', False)])[0]
+
+    _defaults = {
+        'python_compute': '''# price_unit\n# address: res.partner.address object or False\n# product: product.product object or None\n# partner: res.partner object or None\n\nresult = price_unit * 0.10''',
+        'python_compute_inv': '''# price_unit\n# address: res.partner.address object or False\n# product: product.product object or False\n\nresult = price_unit * 0.10''',
+        'applicable_type': 'true',
+        'type': 'percent',
+        'amount': 0,
+        'price_include': 0,
+        'active': 1,
+        'type_tax_use': 'all',
+        'sequence': 1,
+        'ref_tax_sign': 1,
+        'ref_base_sign': 1,
+        'tax_sign': 1,
+        'base_sign': 1,
+        'include_base_amount': False,
+        'company_id': _default_company,
+    }
+    _order = 'sequence'
+
+    def _applicable(self, cr, uid, taxes, price_unit, address_id=None, product=None, partner=None):
+        res = []
+        obj_partener_address = self.pool.get('res.partner.address')
+        for tax in taxes:
+            if tax.applicable_type=='code':
+                localdict = {'price_unit':price_unit, 'address':obj_partener_address.browse(cr, uid, address_id), 'product':product, 'partner':partner}
+                exec tax.python_applicable in localdict
+                if localdict.get('result', False):
+                    res.append(tax)
+            else:
+                res.append(tax)
+        return res
+
+    def _unit_compute(self, cr, uid, taxes, price_unit, address_id=None, product=None, partner=None, quantity=0):
+        taxes = self._applicable(cr, uid, taxes, price_unit, address_id, product, partner)
+        res = []
+        cur_price_unit=price_unit
+        obj_partener_address = self.pool.get('res.partner.address')
+        for tax in taxes:
+            # we compute the amount for the current tax object and append it to the result
+            data = {'id':tax.id,
+                    'name':tax.description and tax.description + " - " + tax.name or tax.name,
+                    'account_collected_id':tax.account_collected_id.id,
+                    'account_paid_id':tax.account_paid_id.id,
+                    'base_code_id': tax.base_code_id.id,
+                    'ref_base_code_id': tax.ref_base_code_id.id,
+                    'sequence': tax.sequence,
+                    'base_sign': tax.base_sign,
+                    'tax_sign': tax.tax_sign,
+                    'ref_base_sign': tax.ref_base_sign,
+                    'ref_tax_sign': tax.ref_tax_sign,
+                    'price_unit': cur_price_unit,
+                    'tax_code_id': tax.tax_code_id.id,
+                    'ref_tax_code_id': tax.ref_tax_code_id.id,
+            }
+            res.append(data)
+            if tax.type=='percent':
+                amount = cur_price_unit * tax.amount
+                data['amount'] = amount
+
+            elif tax.type=='fixed':
+                data['amount'] = tax.amount
+                data['tax_amount']=quantity
+               # data['amount'] = quantity
+            elif tax.type=='code':
+                address = address_id and obj_partener_address.browse(cr, uid, address_id) or None
+                localdict = {'price_unit':cur_price_unit, 'address':address, 'product':product, 'partner':partner}
+                exec tax.python_compute in localdict
+                amount = localdict['result']
+                data['amount'] = amount
+            elif tax.type=='balance':
+                data['amount'] = cur_price_unit - reduce(lambda x,y: y.get('amount',0.0)+x, res, 0.0)
+                data['balance'] = cur_price_unit
+
+            amount2 = data.get('amount', 0.0)
+            if tax.child_ids:
+                if tax.child_depend:
+                    latest = res.pop()
+                amount = amount2
+                child_tax = self._unit_compute(cr, uid, tax.child_ids, amount, address_id, product, partner, quantity)
+                res.extend(child_tax)
+                if tax.child_depend:
+                    for r in res:
+                        for name in ('base','ref_base'):
+                            if latest[name+'_code_id'] and latest[name+'_sign'] and not r[name+'_code_id']:
+                                r[name+'_code_id'] = latest[name+'_code_id']
+                                r[name+'_sign'] = latest[name+'_sign']
+                                r['price_unit'] = latest['price_unit']
+                                latest[name+'_code_id'] = False
+                        for name in ('tax','ref_tax'):
+                            if latest[name+'_code_id'] and latest[name+'_sign'] and not r[name+'_code_id']:
+                                r[name+'_code_id'] = latest[name+'_code_id']
+                                r[name+'_sign'] = latest[name+'_sign']
+                                r['amount'] = data['amount']
+                                latest[name+'_code_id'] = False
+            if tax.include_base_amount:
+                cur_price_unit+=amount2
+        return res
+
+    def compute_all(self, cr, uid, taxes, price_unit, quantity, address_id=None, product=None, partner=None):
+        """
+        RETURN: {
+                'total': 0.0,                # Total without taxes
+                'total_included: 0.0,        # Total with taxes
+                'taxes': []                  # List of taxes, see compute for the format
+            }
+        """
+        precision = self.pool.get('decimal.precision').precision_get(cr, uid, 'Account')
+        totalin = totalex = round(price_unit * quantity, precision)
+        tin = []
+        tex = []
+        for tax in taxes:
+            if tax.price_include:
+                tin.append(tax)
+            else:
+                tex.append(tax)
+        tin = self.compute_inv(cr, uid, tin, price_unit, quantity, address_id=address_id, product=product, partner=partner)
+        for r in tin:
+            totalex -= r.get('amount', 0.0)
+        totlex_qty = 0.0
+        try:
+            totlex_qty = totalex/quantity
+        except:
+            pass
+        tex = self._compute(cr, uid, tex, totlex_qty, quantity, address_id=address_id, product=product, partner=partner)
+        for r in tex:
+            totalin += r.get('amount', 0.0)
+        return {
+            'total': totalex,
+            'total_included': totalin,
+            'taxes': tin + tex
+        }
+
+    def compute(self, cr, uid, taxes, price_unit, quantity, address_id=None, product=None, partner=None):
+        logger = netsvc.Logger()
+        logger.notifyChannel("warning", netsvc.LOG_WARNING,
+            "Deprecated, use compute_all(...)['taxes'] instead of compute(...) to manage prices with tax included")
+        return self._compute(cr, uid, taxes, price_unit, quantity, address_id, product, partner)
+
+    def _compute(self, cr, uid, taxes, price_unit, quantity, address_id=None, product=None, partner=None):
+        """
+        Compute tax values for given PRICE_UNIT, QUANTITY and a buyer/seller ADDRESS_ID.
+
+        RETURN:
+            [ tax ]
+            tax = {'name':'', 'amount':0.0, 'account_collected_id':1, 'account_paid_id':2}
+            one tax for each tax id in IDS and their children
+        """
+        res = self._unit_compute(cr, uid, taxes, price_unit, address_id, product, partner, quantity)
+        total = 0.0
+        precision_pool = self.pool.get('decimal.precision')
+        for r in res:
+            if r.get('balance',False):
+                r['amount'] = round(r.get('balance', 0.0) * quantity, precision_pool.precision_get(cr, uid, 'Account')) - total
+            else:
+                r['amount'] = round(r.get('amount', 0.0) * quantity, precision_pool.precision_get(cr, uid, 'Account'))
+                total += r['amount']
+        return res
+
+    def _unit_compute_inv(self, cr, uid, taxes, price_unit, address_id=None, product=None, partner=None):
+        taxes = self._applicable(cr, uid, taxes, price_unit, address_id, product, partner)
+        obj_partener_address = self.pool.get('res.partner.address')
+        res = []
+        taxes.reverse()
+        cur_price_unit = price_unit
+
+        tax_parent_tot = 0.0
+        for tax in taxes:
+            if (tax.type=='percent') and not tax.include_base_amount:
+                tax_parent_tot += tax.amount
+
+        for tax in taxes:
+            if (tax.type=='fixed') and not tax.include_base_amount:
+                cur_price_unit -= tax.amount
+
+        for tax in taxes:
+            if tax.type=='percent':
+                if tax.include_base_amount:
+                    amount = cur_price_unit - (cur_price_unit / (1 + tax.amount))
+                else:
+                    amount = (cur_price_unit / (1 + tax_parent_tot)) * tax.amount
+
+            elif tax.type=='fixed':
+                amount = tax.amount
+
+            elif tax.type=='code':
+                address = address_id and obj_partener_address.browse(cr, uid, address_id) or None
+                localdict = {'price_unit':cur_price_unit, 'address':address, 'product':product, 'partner':partner}
+                exec tax.python_compute_inv in localdict
+                amount = localdict['result']
+            elif tax.type=='balance':
+                amount = cur_price_unit - reduce(lambda x,y: y.get('amount',0.0)+x, res, 0.0)
+
+            if tax.include_base_amount:
+                cur_price_unit -= amount
+                todo = 0
+            else:
+                todo = 1
+            res.append({
+                'id': tax.id,
+                'todo': todo,
+                'name': tax.name,
+                'amount': amount,
+                'account_collected_id': tax.account_collected_id.id,
+                'account_paid_id': tax.account_paid_id.id,
+                'base_code_id': tax.base_code_id.id,
+                'ref_base_code_id': tax.ref_base_code_id.id,
+                'sequence': tax.sequence,
+                'base_sign': tax.base_sign,
+                'tax_sign': tax.tax_sign,
+                'ref_base_sign': tax.ref_base_sign,
+                'ref_tax_sign': tax.ref_tax_sign,
+                'price_unit': cur_price_unit,
+                'tax_code_id': tax.tax_code_id.id,
+                'ref_tax_code_id': tax.ref_tax_code_id.id,
+            })
+            if tax.child_ids:
+                if tax.child_depend:
+                    del res[-1]
+                    amount = price_unit
+
+            parent_tax = self._unit_compute_inv(cr, uid, tax.child_ids, amount, address_id, product, partner)
+            res.extend(parent_tax)
+
+        total = 0.0
+        for r in res:
+            if r['todo']:
+                total += r['amount']
+        for r in res:
+            r['price_unit'] -= total
+            r['todo'] = 0
+        return res
+
+    def compute_inv(self, cr, uid, taxes, price_unit, quantity, address_id=None, product=None, partner=None):
+        """
+        Compute tax values for given PRICE_UNIT, QUANTITY and a buyer/seller ADDRESS_ID.
+        Price Unit is a VAT included price
+
+        RETURN:
+            [ tax ]
+            tax = {'name':'', 'amount':0.0, 'account_collected_id':1, 'account_paid_id':2}
+            one tax for each tax id in IDS and their children
+        """
+        res = self._unit_compute_inv(cr, uid, taxes, price_unit, address_id, product, partner=None)
+        total = 0.0
+        obj_precision = self.pool.get('decimal.precision')
+        for r in res:
+            prec = obj_precision.precision_get(cr, uid, 'Account')
+            if r.get('balance',False):
+                r['amount'] = round(r['balance'] * quantity, prec) - total
+            else:
+                r['amount'] = round(r['amount'] * quantity, prec)
+                total += r['amount']
+        return res
+
+account_tax()
+
+# ---------------------------------------------------------
+# Account Entries Models
+# ---------------------------------------------------------
+
+class account_model(osv.osv):
+    _name = "account.model"
+    _description = "Account Model"
+    _columns = {
+        'name': fields.char('Model Name', size=64, required=True, help="This is a model for recurring accounting entries"),
+        'journal_id': fields.many2one('account.journal', 'Journal', required=True),
+        'company_id': fields.related('journal_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True),
+        'lines_id': fields.one2many('account.model.line', 'model_id', 'Model Entries'),
+        'legend': fields.text('Legend', readonly=True, size=100),
+    }
+
+    _defaults = {
+        'legend': lambda self, cr, uid, context:_('You can specify year, month and date in the name of the model using the following labels:\n\n%(year)s: To Specify Year \n%(month)s: To Specify Month \n%(date)s: Current Date\n\ne.g. My model on %(date)s'),
+    }
+    def generate(self, cr, uid, ids, datas={}, context=None):
+        move_ids = []
+        entry = {}
+        account_move_obj = self.pool.get('account.move')
+        account_move_line_obj = self.pool.get('account.move.line')
+        pt_obj = self.pool.get('account.payment.term')
+
+        if context is None:
+            context = {}
+
+        if datas.get('date', False):
+            context.update({'date': datas['date']})
+
+        period_id = self.pool.get('account.period').find(cr, uid, dt=context.get('date', False))
+        if not period_id:
+            raise osv.except_osv(_('No period found !'), _('Unable to find a valid period !'))
+        period_id = period_id[0]
+
+        for model in self.browse(cr, uid, ids, context=context):
+            try:
+                entry['name'] = model.name%{'year':time.strftime('%Y'), 'month':time.strftime('%m'), 'date':time.strftime('%Y-%m')}
+            except:
+                raise osv.except_osv(_('Wrong model !'), _('You have a wrong expression "%(...)s" in your model !'))
+                
+            move_id = account_move_obj.create(cr, uid, {
+                'ref': entry['name'],
+                'period_id': period_id,
+                'journal_id': model.journal_id.id,
+                'date': context.get('date',time.strftime('%Y-%m-%d'))
+            })
+            move_ids.append(move_id)
+            for line in model.lines_id:
+                analytic_account_id = False
+                if line.analytic_account_id:
+                    if not model.journal_id.analytic_journal_id:
+                        raise osv.except_osv(_('No Analytic Journal !'),_("You have to define an analytic journal on the '%s' journal!") % (model.journal_id.name,))
+                    analytic_account_id = line.analytic_account_id.id
+                val = {
+                    'move_id': move_id,
+                    'journal_id': model.journal_id.id,
+                    'period_id': period_id,
+                    'analytic_account_id': analytic_account_id
+                }
+
+                date_maturity = time.strftime('%Y-%m-%d')
+                if line.date_maturity == 'partner':
+                    if not line.partner_id:
+                        raise osv.except_osv(_('Error !'), _("Maturity date of entry line generated by model line '%s' of model '%s' is based on partner payment term!" \
+                                                                "\nPlease define partner on it!")%(line.name, model.name))
+                    if line.partner_id.property_payment_term:
+                        payment_term_id = line.partner_id.property_payment_term.id
+                        pterm_list = pt_obj.compute(cr, uid, payment_term_id, value=1, date_ref=date_maturity)
+                        if pterm_list:
+                            pterm_list = [l[0] for l in pterm_list]
+                            pterm_list.sort()
+                            date_maturity = pterm_list[-1]
+
+                val.update({
+                    'name': line.name,
+                    'quantity': line.quantity,
+                    'debit': line.debit,
+                    'credit': line.credit,
+                    'account_id': line.account_id.id,
+                    'move_id': move_id,
+                    'partner_id': line.partner_id.id,
+                    'date': context.get('date',time.strftime('%Y-%m-%d')),
+                    'date_maturity': date_maturity
+                })
+                c = context.copy()
+                c.update({'journal_id': model.journal_id.id,'period_id': period_id})
+                account_move_line_obj.create(cr, uid, val, context=c)
+
+        return move_ids
+
+account_model()
+
+class account_model_line(osv.osv):
+    _name = "account.model.line"
+    _description = "Account Model Entries"
+    _columns = {
+        'name': fields.char('Name', size=64, required=True),
+        'sequence': fields.integer('Sequence', required=True, help="The sequence field is used to order the resources from lower sequences to higher ones."),
+        'quantity': fields.float('Quantity', digits_compute=dp.get_precision('Account'), help="The optional quantity on entries."),
+        'debit': fields.float('Debit', digits_compute=dp.get_precision('Account')),
+        'credit': fields.float('Credit', digits_compute=dp.get_precision('Account')),
+        'account_id': fields.many2one('account.account', 'Account', required=True, ondelete="cascade"),
+        'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account', ondelete="cascade"),
+        'model_id': fields.many2one('account.model', 'Model', required=True, ondelete="cascade", select=True),
+        'amount_currency': fields.float('Amount Currency', help="The amount expressed in an optional other currency."),
+        'currency_id': fields.many2one('res.currency', 'Currency'),
+        'partner_id': fields.many2one('res.partner', 'Partner'),
+        'date_maturity': fields.selection([('today','Date of the day'), ('partner','Partner Payment Term')], 'Maturity Date', help="The maturity date of the generated entries for this model. You can choose between the creation date or the creation date of the entries plus the partner payment terms."),
+    }
+    _order = 'sequence'
+    _sql_constraints = [
+        ('credit_debit1', 'CHECK (credit*debit=0)',  'Wrong credit or debit value in model, they must be positive!'),
+        ('credit_debit2', 'CHECK (credit+debit>=0)', 'Wrong credit or debit value in model, they must be positive!'),
+    ]
+account_model_line()
+
+# ---------------------------------------------------------
+# Account Subscription
+# ---------------------------------------------------------
+
+
+class account_subscription(osv.osv):
+    _name = "account.subscription"
+    _description = "Account Subscription"
+    _columns = {
+        'name': fields.char('Name', size=64, required=True),
+        'ref': fields.char('Reference', size=16),
+        'model_id': fields.many2one('account.model', 'Model', required=True),
+        'date_start': fields.date('Start Date', required=True),
+        'period_total': fields.integer('Number of Periods', required=True),
+        'period_nbr': fields.integer('Period', required=True),
+        'period_type': fields.selection([('day','days'),('month','month'),('year','year')], 'Period Type', required=True),
+        'state': fields.selection([('draft','Draft'),('running','Running'),('done','Done')], 'State', required=True, readonly=True),
+        'lines_id': fields.one2many('account.subscription.line', 'subscription_id', 'Subscription Lines')
+    }
+    _defaults = {
+        'date_start': lambda *a: time.strftime('%Y-%m-%d'),
+        'period_type': 'month',
+        'period_total': 12,
+        'period_nbr': 1,
+        'state': 'draft',
+    }
+    def state_draft(self, cr, uid, ids, context=None):
+        self.write(cr, uid, ids, {'state':'draft'})
+        return False
+
+    def check(self, cr, uid, ids, context=None):
+        todone = []
+        for sub in self.browse(cr, uid, ids, context=context):
+            ok = True
+            for line in sub.lines_id:
+                if not line.move_id.id:
+                    ok = False
+                    break
+            if ok:
+                todone.append(sub.id)
+        if todone:
+            self.write(cr, uid, todone, {'state':'done'})
+        return False
+
+    def remove_line(self, cr, uid, ids, context=None):
+        toremove = []
+        for sub in self.browse(cr, uid, ids, context=context):
+            for line in sub.lines_id:
+                if not line.move_id.id:
+                    toremove.append(line.id)
+        if toremove:
+            self.pool.get('account.subscription.line').unlink(cr, uid, toremove)
+        self.write(cr, uid, ids, {'state':'draft'})
+        return False
+
+    def compute(self, cr, uid, ids, context=None):
+        for sub in self.browse(cr, uid, ids, context=context):
+            ds = sub.date_start
+            for i in range(sub.period_total):
+                self.pool.get('account.subscription.line').create(cr, uid, {
+                    'date': ds,
+                    'subscription_id': sub.id,
+                })
+                if sub.period_type=='day':
+                    ds = (datetime.strptime(ds, '%Y-%m-%d') + relativedelta(days=sub.period_nbr)).strftime('%Y-%m-%d')
+                if sub.period_type=='month':
+                    ds = (datetime.strptime(ds, '%Y-%m-%d') + relativedelta(months=sub.period_nbr)).strftime('%Y-%m-%d')
+                if sub.period_type=='year':
+                    ds = (datetime.strptime(ds, '%Y-%m-%d') + relativedelta(years=sub.period_nbr)).strftime('%Y-%m-%d')
+        self.write(cr, uid, ids, {'state':'running'})
+        return True
+
+account_subscription()
+
+class account_subscription_line(osv.osv):
+    _name = "account.subscription.line"
+    _description = "Account Subscription Line"
+    _columns = {
+        'subscription_id': fields.many2one('account.subscription', 'Subscription', required=True, select=True),
+        'date': fields.date('Date', required=True),
+        'move_id': fields.many2one('account.move', 'Entry'),
+    }
+
+    def move_create(self, cr, uid, ids, context=None):
+        tocheck = {}
+        all_moves = []
+        obj_model = self.pool.get('account.model')
+        for line in self.browse(cr, uid, ids, context=context):
+            datas = {
+                'date': line.date,
+            }
+            move_ids = obj_model.generate(cr, uid, [line.subscription_id.model_id.id], datas, context)
+            tocheck[line.subscription_id.id] = True
+            self.write(cr, uid, [line.id], {'move_id':move_ids[0]})
+            all_moves.extend(move_ids)
+        if tocheck:
+            self.pool.get('account.subscription').check(cr, uid, tocheck.keys(), context)
+        return all_moves
+
+    _rec_name = 'date'
+
+account_subscription_line()
+
+#  ---------------------------------------------------------------
+#   Account Templates: Account, Tax, Tax Code and chart. + Wizard
+#  ---------------------------------------------------------------
+
+class account_tax_template(osv.osv):
+    _name = 'account.tax.template'
+account_tax_template()
+
+class account_account_template(osv.osv):
+    _order = "code"
+    _name = "account.account.template"
+    _description ='Templates for Accounts'
+
+    _columns = {
+        'name': fields.char('Name', size=128, required=True, select=True),
+        'currency_id': fields.many2one('res.currency', 'Secondary Currency', help="Forces all moves for this account to have this secondary currency."),
+        'code': fields.char('Code', size=64, select=1),
+        'type': fields.selection([
+            ('receivable','Receivable'),
+            ('payable','Payable'),
+            ('view','View'),
+            ('consolidation','Consolidation'),
+            ('liquidity','Liquidity'),
+            ('other','Regular'),
+            ('closed','Closed'),
+            ], 'Internal Type', required=True,help="This type is used to differentiate types with "\
+            "special effects in OpenERP: view can not have entries, consolidation are accounts that "\
+            "can have children accounts for multi-company consolidations, payable/receivable are for "\
+            "partners accounts (for debit/credit computations), closed for depreciated accounts."),
+        'user_type': fields.many2one('account.account.type', 'Account Type', required=True,
+            help="These types are defined according to your country. The type contains more information "\
+            "about the account and its specificities."),
+        'reconcile': fields.boolean('Allow Reconciliation', help="Check this option if you want the user to reconcile entries in this account."),
+        'shortcut': fields.char('Shortcut', size=12),
+        'note': fields.text('Note'),
+        'parent_id': fields.many2one('account.account.template', 'Parent Account Template', ondelete='cascade'),
+        'child_parent_ids':fields.one2many('account.account.template', 'parent_id', 'Children'),
+        'tax_ids': fields.many2many('account.tax.template', 'account_account_template_tax_rel', 'account_id', 'tax_id', 'Default Taxes'),
+        'nocreate': fields.boolean('Optional create', help="If checked, the new chart of accounts will not contain this by default."),
+    }
+
+    _defaults = {
+        'reconcile': False,
+        'type': 'view',
+        'nocreate': False,
+    }
+
+    def _check_type(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        accounts = self.browse(cr, uid, ids, context=context)
+        for account in accounts:
+            if account.parent_id and account.parent_id.type != 'view':
+                return False
+        return True
+
+    _check_recursion = check_cycle
+    _constraints = [
+        (_check_recursion, 'Error ! You can not create recursive account templates.', ['parent_id']),
+        (_check_type, 'Configuration Error!\nYou can not define children to an account with internal type different of "View"! ', ['type']),
+
+    ]
+
+    def name_get(self, cr, uid, ids, context=None):
+        if not ids:
+            return []
+        reads = self.read(cr, uid, ids, ['name','code'], context=context)
+        res = []
+        for record in reads:
+            name = record['name']
+            if record['code']:
+                name = record['code']+' '+name
+            res.append((record['id'],name ))
+        return res
+
+account_account_template()
+
+class account_add_tmpl_wizard(osv.osv_memory):
+    """Add one more account from the template.
+
+    With the 'nocreate' option, some accounts may not be created. Use this to add them later."""
+    _name = 'account.addtmpl.wizard'
+
+    def _get_def_cparent(self, cr, uid, context=None):
+        acc_obj = self.pool.get('account.account')
+        tmpl_obj = self.pool.get('account.account.template')
+        tids = tmpl_obj.read(cr, uid, [context['tmpl_ids']], ['parent_id'])
+        if not tids or not tids[0]['parent_id']:
+            return False
+        ptids = tmpl_obj.read(cr, uid, [tids[0]['parent_id'][0]], ['code'])
+        res = None
+        if not ptids or not ptids[0]['code']:
+            raise osv.except_osv(_('Error !'), _('I can not locate a parent code for the template account!'))
+            res = acc_obj.search(cr, uid, [('code','=',ptids[0]['code'])])
+        return res and res[0] or False
+
+    _columns = {
+        'cparent_id':fields.many2one('account.account', 'Parent target', help="Creates an account with the selected template under this existing parent.", required=True),
+    }
+    _defaults = {
+        'cparent_id': _get_def_cparent,
+    }
+
+    def action_create(self,cr,uid,ids,context=None):
+        if context is None:
+            context = {}
+        acc_obj = self.pool.get('account.account')
+        tmpl_obj = self.pool.get('account.account.template')
+        data = self.read(cr, uid, ids)
+        company_id = acc_obj.read(cr, uid, [data[0]['cparent_id']], ['company_id'])[0]['company_id'][0]
+        account_template = tmpl_obj.browse(cr, uid, context['tmpl_ids'])
+        vals = {
+            'name': account_template.name,
+            'currency_id': account_template.currency_id and account_template.currency_id.id or False,
+            'code': account_template.code,
+            'type': account_template.type,
+            'user_type': account_template.user_type and account_template.user_type.id or False,
+            'reconcile': account_template.reconcile,
+            'shortcut': account_template.shortcut,
+            'note': account_template.note,
+            'parent_id': data[0]['cparent_id'],
+            'company_id': company_id,
+            }
+        acc_obj.create(cr, uid, vals)
+        return {'type':'state', 'state': 'end' }
+
+    def action_cancel(self, cr, uid, ids, context=None):
+        return { 'type': 'state', 'state': 'end' }
+
+account_add_tmpl_wizard()
+
+class account_tax_code_template(osv.osv):
+
+    _name = 'account.tax.code.template'
+    _description = 'Tax Code Template'
+    _order = 'code'
+    _rec_name = 'code'
+    _columns = {
+        'name': fields.char('Tax Case Name', size=64, required=True),
+        'code': fields.char('Case Code', size=64),
+        'info': fields.text('Description'),
+        'parent_id': fields.many2one('account.tax.code.template', 'Parent Code', select=True),
+        'child_ids': fields.one2many('account.tax.code.template', 'parent_id', 'Child Codes'),
+        'sign': fields.float('Sign For Parent', required=True),
+        'notprintable':fields.boolean("Not Printable in Invoice", help="Check this box if you don't want any VAT related to this Tax Code to appear on invoices"),
+    }
+
+    _defaults = {
+        'sign': 1.0,
+        'notprintable': False,
+    }
+
+    def name_get(self, cr, uid, ids, context=None):
+        if not ids:
+            return []
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        reads = self.read(cr, uid, ids, ['name','code'], context, load='_classic_write')
+        return [(x['id'], (x['code'] and x['code'] + ' - ' or '') + x['name']) \
+                for x in reads]
+
+    _check_recursion = check_cycle
+    _constraints = [
+        (_check_recursion, 'Error ! You can not create recursive Tax Codes.', ['parent_id'])
+    ]
+    _order = 'code,name'
+account_tax_code_template()
+
+
+class account_chart_template(osv.osv):
+    _name="account.chart.template"
+    _description= "Templates for Account Chart"
+
+    _columns={
+        'name': fields.char('Name', size=64, required=True),
+        'account_root_id': fields.many2one('account.account.template','Root Account',required=True,domain=[('parent_id','=',False)]),
+        'tax_code_root_id': fields.many2one('account.tax.code.template','Root Tax Code',required=True,domain=[('parent_id','=',False)]),
+        'tax_template_ids': fields.one2many('account.tax.template', 'chart_template_id', 'Tax Template List', help='List of all the taxes that have to be installed by the wizard'),
+        'bank_account_view_id': fields.many2one('account.account.template','Bank Account',required=True),
+        'property_account_receivable': fields.many2one('account.account.template','Receivable Account'),
+        'property_account_payable': fields.many2one('account.account.template','Payable Account'),
+        'property_account_expense_categ': fields.many2one('account.account.template','Expense Category Account'),
+        'property_account_income_categ': fields.many2one('account.account.template','Income Category Account'),
+        'property_account_expense': fields.many2one('account.account.template','Expense Account on Product Template'),
+        'property_account_income': fields.many2one('account.account.template','Income Account on Product Template'),
+        'property_reserve_and_surplus_account': fields.many2one('account.account.template', 'Reserve and Profit/Loss Account', domain=[('type', '=', 'payable')], help='This Account is used for transferring Profit/Loss(If It is Profit: Amount will be added, Loss: Amount will be deducted.), Which is calculated from Profilt & Loss Report'),
+        'property_account_income_opening': fields.many2one('account.account.template','Opening Entries Income Account'),
+        'property_account_expense_opening': fields.many2one('account.account.template','Opening Entries Expense Account'),
+    }
+
+account_chart_template()
+
+class account_tax_template(osv.osv):
+
+    _name = 'account.tax.template'
+    _description = 'Templates for Taxes'
+
+    _columns = {
+        'chart_template_id': fields.many2one('account.chart.template', 'Chart Template', required=True),
+        'name': fields.char('Tax Name', size=64, required=True),
+        'sequence': fields.integer('Sequence', required=True, help="The sequence field is used to order the taxes lines from lower sequences to higher ones. The order is important if you have a tax that has several tax children. In this case, the evaluation order is important."),
+        'amount': fields.float('Amount', required=True, digits=(14,4), help="For Tax Type percent enter % ratio between 0-1."),
+        'type': fields.selection( [('percent','Percent'), ('fixed','Fixed'), ('none','None'), ('code','Python Code'), ('balance','Balance')], 'Tax Type', required=True),
+        'applicable_type': fields.selection( [('true','True'), ('code','Python Code')], 'Applicable Type', required=True, help="If not applicable (computed through a Python code), the tax won't appear on the invoice."),
+        'domain':fields.char('Domain', size=32, help="This field is only used if you develop your own module allowing developers to create specific taxes in a custom domain."),
+        'account_collected_id':fields.many2one('account.account.template', 'Invoice Tax Account'),
+        'account_paid_id':fields.many2one('account.account.template', 'Refund Tax Account'),
+        'parent_id':fields.many2one('account.tax.template', 'Parent Tax Account', select=True),
+        'child_depend':fields.boolean('Tax on Children', help="Set if the tax computation is based on the computation of child taxes rather than on the total amount."),
+        'python_compute':fields.text('Python Code'),
+        'python_compute_inv':fields.text('Python Code (reverse)'),
+        'python_applicable':fields.text('Python Code'),
+
+        #
+        # Fields used for the VAT declaration
+        #
+        'base_code_id': fields.many2one('account.tax.code.template', 'Base Code', help="Use this code for the VAT declaration."),
+        'tax_code_id': fields.many2one('account.tax.code.template', 'Tax Code', help="Use this code for the VAT declaration."),
+        'base_sign': fields.float('Base Code Sign', help="Usually 1 or -1."),
+        'tax_sign': fields.float('Tax Code Sign', help="Usually 1 or -1."),
+
+        # Same fields for refund invoices
+
+        'ref_base_code_id': fields.many2one('account.tax.code.template', 'Refund Base Code', help="Use this code for the VAT declaration."),
+        'ref_tax_code_id': fields.many2one('account.tax.code.template', 'Refund Tax Code', help="Use this code for the VAT declaration."),
+        'ref_base_sign': fields.float('Base Code Sign', help="Usually 1 or -1."),
+        'ref_tax_sign': fields.float('Tax Code Sign', help="Usually 1 or -1."),
+        'include_base_amount': fields.boolean('Include in Base Amount', help="Set if the amount of tax must be included in the base amount before computing the next taxes."),
+        'description': fields.char('Internal Name', size=32),
+        'type_tax_use': fields.selection([('sale','Sale'),('purchase','Purchase'),('all','All')], 'Tax Use In', required=True,),
+        'price_include': fields.boolean('Tax Included in Price', help="Check this if the price you use on the product and invoices includes this tax."),
+    }
+
+    def name_get(self, cr, uid, ids, context=None):
+        if not ids:
+            return []
+        res = []
+        for record in self.read(cr, uid, ids, ['description','name'], context=context):
+            name = record['description'] and record['description'] or record['name']
+            res.append((record['id'],name ))
+        return res
+
+    def _default_company(self, cr, uid, context=None):
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+        if user.company_id:
+            return user.company_id.id
+        return self.pool.get('res.company').search(cr, uid, [('parent_id', '=', False)])[0]
+
+    _defaults = {
+        'python_compute': lambda *a: '''# price_unit\n# address: res.partner.address object or False\n# product: product.product object or None\n# partner: res.partner object or None\n\nresult = price_unit * 0.10''',
+        'python_compute_inv': lambda *a: '''# price_unit\n# address: res.partner.address object or False\n# product: product.product object or False\n\nresult = price_unit * 0.10''',
+        'applicable_type': 'true',
+        'type': 'percent',
+        'amount': 0,
+        'sequence': 1,
+        'ref_tax_sign': 1,
+        'ref_base_sign': 1,
+        'tax_sign': 1,
+        'base_sign': 1,
+        'include_base_amount': False,
+        'type_tax_use': 'all',
+        'price_include': 0,
+    }
+    _order = 'sequence'
+
+account_tax_template()
+
+# Fiscal Position Templates
+
+class account_fiscal_position_template(osv.osv):
+    _name = 'account.fiscal.position.template'
+    _description = 'Template for Fiscal Position'
+
+    _columns = {
+        'name': fields.char('Fiscal Position Template', size=64, required=True),
+        'chart_template_id': fields.many2one('account.chart.template', 'Chart Template', required=True),
+        'account_ids': fields.one2many('account.fiscal.position.account.template', 'position_id', 'Account Mapping'),
+        'tax_ids': fields.one2many('account.fiscal.position.tax.template', 'position_id', 'Tax Mapping')
+    }
+
+account_fiscal_position_template()
+
+class account_fiscal_position_tax_template(osv.osv):
+    _name = 'account.fiscal.position.tax.template'
+    _description = 'Template Tax Fiscal Position'
+    _rec_name = 'position_id'
+
+    _columns = {
+        'position_id': fields.many2one('account.fiscal.position.template', 'Fiscal Position', required=True, ondelete='cascade'),
+        'tax_src_id': fields.many2one('account.tax.template', 'Tax Source', required=True),
+        'tax_dest_id': fields.many2one('account.tax.template', 'Replacement Tax')
+    }
+
+account_fiscal_position_tax_template()
+
+class account_fiscal_position_account_template(osv.osv):
+    _name = 'account.fiscal.position.account.template'
+    _description = 'Template Account Fiscal Mapping'
+    _rec_name = 'position_id'
+    _columns = {
+        'position_id': fields.many2one('account.fiscal.position.template', 'Fiscal Mapping', required=True, ondelete='cascade'),
+        'account_src_id': fields.many2one('account.account.template', 'Account Source', domain=[('type','<>','view')], required=True),
+        'account_dest_id': fields.many2one('account.account.template', 'Account Destination', domain=[('type','<>','view')], required=True)
+    }
+
+account_fiscal_position_account_template()
+
+# ---------------------------------------------------------
+# Account Financial Report
+# ---------------------------------------------------------
+
+class account_financial_report(osv.osv):
+    _name = "account.financial.report"
+    _description = "Account Report"
+
+    def _get_level(self, cr, uid, ids, field_name, arg, context=None):
+        res = {}
+        for report in self.browse(cr, uid, ids, context=context):
+            level = 0
+            if report.parent_id:
+                level = report.parent_id.level + 1
+            res[report.id] = level
+        return res
+
+    def _get_children_by_order(self, cr, uid, ids, context=None):
+        res = []
+        for id in ids:
+            res.append(id)
+            ids2 = self.search(cr, uid, [('parent_id', '=', id)], order='sequence ASC', context=context)
+            res += self._get_children_by_order(cr, uid, ids2, context=context)
+        return res
+
+    def _get_balance(self, cr, uid, ids, name, args, context=None):
+        res = {}
+        res_all = {}
+        for report in self.browse(cr, uid, ids, context=context):
+            balance = 0.0
+            if report.id in res_all:
+                balance = res_all[report.id]
+            elif report.type == 'accounts':
+                # it's the sum of balance of the linked accounts
+                for a in report.account_ids:
+                    balance += a.balance
+            elif report.type == 'account_report' and report.account_report_id:
+                # it's the amount of the linked report
+                res2 = self._get_balance(cr, uid, [report.account_report_id.id], 'balance', False, context=context)
+                res_all.update(res2)
+                for key, value in res2.items():
+                    balance += value
+            elif report.type == 'sum':
+                # it's the sum of balance of the children of this account.report
+                #for child in report.children_ids:
+                res2 = self._get_balance(cr, uid, [rec.id for rec in report.children_ids], 'balance', False, context=context)
+                res_all.update(res2)
+                for key, value in res2.items():
+                    balance += value
+            res[report.id] = balance
+            res_all[report.id] = balance
+        return res
+
+    _columns = {
+        'name': fields.char('Report Name', size=128, required=True),
+        'parent_id': fields.many2one('account.financial.report', 'Parent'),
+        'children_ids':  fields.one2many('account.financial.report', 'parent_id', 'Account Report'),
+        'sequence': fields.integer('Sequence'),
+        'note': fields.text('Notes'),
+        'balance': fields.function(_get_balance, 'Balance'),
+        'level': fields.function(_get_level, string='Level', store=True, type='integer'),
+        'type': fields.selection([
+            ('sum','View'),
+            ('accounts','Accounts'),
+            ('account_type','Account Type'),
+            ('account_report','Report Value'),
+            ],'Type'),
+        'account_ids': fields.many2many('account.account', 'account_account_financial_report', 'report_line_id', 'account_id', 'Accounts'),
+        'display_detail': fields.boolean('Display details', help='Display every account with its balance instead of the sum.'),
+        'account_report_id':  fields.many2one('account.financial.report', 'Report Value'),
+        'account_type_ids': fields.many2many('account.account.type', 'account_account_financial_report_type', 'report_id', 'account_type_id', 'Account Types'),
+    }
+
+    _defaults = {
+        'type': 'sum',
+    }
+
+account_financial_report()
+
+# ---------------------------------------------------------
+# Account generation from template wizards
+# ---------------------------------------------------------
+
+class wizard_multi_charts_accounts(osv.osv_memory):
+    """
+    Create a new account chart for a company.
+    Wizards ask for:
+        * a company
+        * an account chart template
+        * a number of digits for formatting code of non-view accounts
+        * a list of bank accounts owned by the company
+    Then, the wizard:
+        * generates all accounts from the template and assigns them to the right company
+        * generates all taxes and tax codes, changing account assignations
+        * generates all accounting properties and assigns them correctly
+    """
+    _name='wizard.multi.charts.accounts'
+    _inherit = 'res.config'
+
+    _columns = {
+        'company_id':fields.many2one('res.company', 'Company', required=True),
+        'chart_template_id': fields.many2one('account.chart.template', 'Chart Template', required=True),
+        'bank_accounts_id': fields.one2many('account.bank.accounts.wizard', 'bank_account_id', 'Cash and Banks', required=True),
+        'code_digits':fields.integer('# of Digits', required=True, help="No. of Digits to use for account code"),
+        'seq_journal':fields.boolean('Separated Journal Sequences', help="Check this box if you want to use a different sequence for each created journal. Otherwise, all will use the same sequence."),
+        "sale_tax": fields.many2one("account.tax.template", "Default Sale Tax"),
+        "purchase_tax": fields.many2one("account.tax.template", "Default Purchase Tax"),
+    }
+    def onchange_chart_template_id(self, cr, uid, ids, chart_template_id=False, context=None):
+        res = {}
+        res['value'] = {}
+        res['value']["sale_tax"] = False
+        res['value']["purchase_tax"] = False
+        if chart_template_id:
+            # default tax is given by the lowesst sequence. For same sequence we will take the latest created as it will be the case for tax created while isntalling the generic chart of account
+            sale_tax_ids = self.pool.get('account.tax.template').search(cr, uid, [("chart_template_id"
+                                          , "=", chart_template_id), ('type_tax_use', 'in', ('sale','all'))], order="sequence, id desc")
+            purchase_tax_ids = self.pool.get('account.tax.template').search(cr, uid, [("chart_template_id"
+                                          , "=", chart_template_id), ('type_tax_use', 'in', ('purchase','all'))], order="sequence, id desc")
+
+            res['value']["sale_tax"] = sale_tax_ids and sale_tax_ids[0] or False
+            res['value']["purchase_tax"] = purchase_tax_ids and purchase_tax_ids[0] or False
+        return res
+
+    def _get_purchase_tax(self, cr, uid, context=None):
+        ids = self.pool.get('account.chart.template').search(cr, uid, [], context=context)
+        if ids:
+            chart_template_id = ids[0]
+            purchase_tax_ids = self.pool.get('account.tax.template').search(cr, uid, [("chart_template_id"
+                                          , "=", chart_template_id), ('type_tax_use', 'in', ('purchase','all'))], order="sequence")
+            return purchase_tax_ids and purchase_tax_ids[0] or False
+        return False
+
+    def _get_sale_tax(self, cr, uid, context=None):
+        ids = self.pool.get('account.chart.template').search(cr, uid, [], context=context)
+        if ids:
+            chart_template_id = ids[0]
+            sale_tax_ids = self.pool.get('account.tax.template').search(cr, uid, [("chart_template_id"
+                                          , "=", chart_template_id), ('type_tax_use', 'in', ('sale','all'))], order="sequence")
+            return sale_tax_ids and sale_tax_ids[0] or False
+        return False
+
+    def _get_chart(self, cr, uid, context=None):
+        ids = self.pool.get('account.chart.template').search(cr, uid, [], context=context)
+        if ids:
+            return ids[0]
+        return False
+
+    def _get_default_accounts(self, cr, uid, context=None):
+        return [
+            {'acc_name': _('Cash'),'account_type':'cash'}
+        ]
+
+    _defaults = {
+        'company_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, [uid], c)[0].company_id.id,
+        'chart_template_id': _get_chart,
+        'bank_accounts_id': _get_default_accounts,
+        'sale_tax': _get_sale_tax,
+        'purchase_tax': _get_purchase_tax,
+        'code_digits': 6,
+        'seq_journal': True
+    }
+
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
+        res = super(wizard_multi_charts_accounts, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
+        cmp_select = []
+        company_ids = self.pool.get('res.company').search(cr, uid, [], context=context)
+        #display in the widget selection of companies, only the companies that haven't been configured yet (but don't care about the demo chart of accounts)
+        cr.execute("SELECT company_id FROM account_account WHERE active = 't' AND account_account.parent_id IS NULL AND name != %s", ("Chart For Automated Tests",))
+        configured_cmp = [r[0] for r in cr.fetchall()]
+        unconfigured_cmp = list(set(company_ids)-set(configured_cmp))
+        for field in res['fields']:
+            if field == 'company_id':
+                res['fields'][field]['domain'] = [('id','in',unconfigured_cmp)]
+                res['fields'][field]['selection'] = [('', '')]
+                if unconfigured_cmp:
+                    cmp_select = [(line.id, line.name) for line in self.pool.get('res.company').browse(cr, uid, unconfigured_cmp)]
+                    res['fields'][field]['selection'] = cmp_select
+        return res
+
+    def execute(self, cr, uid, ids, context=None):
+        obj_multi = self.browse(cr, uid, ids[0])
+        obj_acc = self.pool.get('account.account')
+        obj_acc_tax = self.pool.get('account.tax')
+        obj_journal = self.pool.get('account.journal')
+        obj_acc_template = self.pool.get('account.account.template')
+        obj_fiscal_position_template = self.pool.get('account.fiscal.position.template')
+        obj_fiscal_position = self.pool.get('account.fiscal.position')
+        obj_data = self.pool.get('ir.model.data')
+        analytic_journal_obj = self.pool.get('account.analytic.journal')
+        obj_tax_code = self.pool.get('account.tax.code')
+        obj_tax_code_template = self.pool.get('account.tax.code.template')
+        ir_values_obj = self.pool.get('ir.values')
+        # Creating Account
+        obj_acc_root = obj_multi.chart_template_id.account_root_id
+        tax_code_root_id = obj_multi.chart_template_id.tax_code_root_id.id
+        company_id = obj_multi.company_id.id
+
+        #new code
+        acc_template_ref = {}
+        tax_template_ref = {}
+        tax_code_template_ref = {}
+        todo_dict = {}
+
+        #create all the tax code
+        children_tax_code_template = obj_tax_code_template.search(cr, uid, [('parent_id','child_of',[tax_code_root_id])], order='id')
+        children_tax_code_template.sort()
+        for tax_code_template in obj_tax_code_template.browse(cr, uid, children_tax_code_template, context=context):
+            vals = {
+                'name': (tax_code_root_id == tax_code_template.id) and obj_multi.company_id.name or tax_code_template.name,
+                'code': tax_code_template.code,
+                'info': tax_code_template.info,
+                'parent_id': tax_code_template.parent_id and ((tax_code_template.parent_id.id in tax_code_template_ref) and tax_code_template_ref[tax_code_template.parent_id.id]) or False,
+                'company_id': company_id,
+                'sign': tax_code_template.sign,
+            }
+            new_tax_code = obj_tax_code.create(cr, uid, vals)
+            #recording the new tax code to do the mapping
+            tax_code_template_ref[tax_code_template.id] = new_tax_code
+
+        #create all the tax
+        tax_template_to_tax = {}
+        for tax in obj_multi.chart_template_id.tax_template_ids:
+            #create it
+            vals_tax = {
+                'name':tax.name,
+                'sequence': tax.sequence,
+                'amount':tax.amount,
+                'type':tax.type,
+                'applicable_type': tax.applicable_type,
+                'domain':tax.domain,
+                'parent_id': tax.parent_id and ((tax.parent_id.id in tax_template_ref) and tax_template_ref[tax.parent_id.id]) or False,
+                'child_depend': tax.child_depend,
+                'python_compute': tax.python_compute,
+                'python_compute_inv': tax.python_compute_inv,
+                'python_applicable': tax.python_applicable,
+                'base_code_id': tax.base_code_id and ((tax.base_code_id.id in tax_code_template_ref) and tax_code_template_ref[tax.base_code_id.id]) or False,
+                'tax_code_id': tax.tax_code_id and ((tax.tax_code_id.id in tax_code_template_ref) and tax_code_template_ref[tax.tax_code_id.id]) or False,
+                'base_sign': tax.base_sign,
+                'tax_sign': tax.tax_sign,
+                'ref_base_code_id': tax.ref_base_code_id and ((tax.ref_base_code_id.id in tax_code_template_ref) and tax_code_template_ref[tax.ref_base_code_id.id]) or False,
+                'ref_tax_code_id': tax.ref_tax_code_id and ((tax.ref_tax_code_id.id in tax_code_template_ref) and tax_code_template_ref[tax.ref_tax_code_id.id]) or False,
+                'ref_base_sign': tax.ref_base_sign,
+                'ref_tax_sign': tax.ref_tax_sign,
+                'include_base_amount': tax.include_base_amount,
+                'description':tax.description,
+                'company_id': company_id,
+                'type_tax_use': tax.type_tax_use,
+                'price_include': tax.price_include
+            }
+            new_tax = obj_acc_tax.create(cr, uid, vals_tax)
+            tax_template_to_tax[tax.id] = new_tax
+            #as the accounts have not been created yet, we have to wait before filling these fields
+            todo_dict[new_tax] = {
+                'account_collected_id': tax.account_collected_id and tax.account_collected_id.id or False,
+                'account_paid_id': tax.account_paid_id and tax.account_paid_id.id or False,
+            }
+            tax_template_ref[tax.id] = new_tax
+        #deactivate the parent_store functionnality on account_account for rapidity purpose
+        ctx = context and context.copy() or {}
+        ctx['defer_parent_store_computation'] = True
+
+        children_acc_template = obj_acc_template.search(cr, uid, [('parent_id','child_of',[obj_acc_root.id]),('nocreate','!=',True)])
+        children_acc_template.sort()
+        for account_template in obj_acc_template.browse(cr, uid, children_acc_template, context=context):
+            tax_ids = []
+            for tax in account_template.tax_ids:
+                tax_ids.append(tax_template_ref[tax.id])
+            #create the account_account
+
+            dig = obj_multi.code_digits
+            code_main = account_template.code and len(account_template.code) or 0
+            code_acc = account_template.code or ''
+            if code_main>0 and code_main<=dig and account_template.type != 'view':
+                code_acc=str(code_acc) + (str('0'*(dig-code_main)))
+            vals={
+                'name': (obj_acc_root.id == account_template.id) and obj_multi.company_id.name or account_template.name,
+                'currency_id': account_template.currency_id and account_template.currency_id.id or False,
+                'code': code_acc,
+                'type': account_template.type,
+                'user_type': account_template.user_type and account_template.user_type.id or False,
+                'reconcile': account_template.reconcile,
+                'shortcut': account_template.shortcut,
+                'note': account_template.note,
+                'parent_id': account_template.parent_id and ((account_template.parent_id.id in acc_template_ref) and acc_template_ref[account_template.parent_id.id]) or False,
+                'tax_ids': [(6,0,tax_ids)],
+                'company_id': company_id,
+            }
+            new_account = obj_acc.create(cr, uid, vals, context=ctx)
+            acc_template_ref[account_template.id] = new_account
+
+
+        #reactivate the parent_store functionnality on account_account
+        obj_acc._parent_store_compute(cr)
+
+        for key,value in todo_dict.items():
+            if value['account_collected_id'] or value['account_paid_id']:
+                obj_acc_tax.write(cr, uid, [key], {
+                    'account_collected_id': acc_template_ref.get(value['account_collected_id'], False),
+                    'account_paid_id': acc_template_ref.get(value['account_paid_id'], False),
+                })
+
+        # Creating Journals
+        data_id = obj_data.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_sp_journal_view')])
+        data = obj_data.browse(cr, uid, data_id[0], context=context)
+        view_id = data.res_id
+
+        #Sales Journal
+        analytical_sale_ids = analytic_journal_obj.search(cr,uid,[('type','=','sale')])
+        analytical_journal_sale = analytical_sale_ids and analytical_sale_ids[0] or False
+
+        vals_journal = {
+            'name': _('Sales Journal'),
+            'type': 'sale',
+            'code': _('SAJ'),
+            'view_id': view_id,
+            'company_id': company_id,
+            'analytic_journal_id': analytical_journal_sale,
+        }
+
+        if obj_multi.chart_template_id.property_account_receivable:
+            vals_journal['default_credit_account_id'] = acc_template_ref[obj_multi.chart_template_id.property_account_income_categ.id]
+            vals_journal['default_debit_account_id'] = acc_template_ref[obj_multi.chart_template_id.property_account_income_categ.id]
+
+        obj_journal.create(cr,uid,vals_journal)
+
+        # Purchase Journal
+        analytical_purchase_ids = analytic_journal_obj.search(cr,uid,[('type','=','purchase')])
+        analytical_journal_purchase = analytical_purchase_ids and analytical_purchase_ids[0] or False
+
+        vals_journal = {
+            'name': _('Purchase Journal'),
+            'type': 'purchase',
+            'code': _('EXJ'),
+            'view_id': view_id,
+            'company_id':  company_id,
+            'analytic_journal_id': analytical_journal_purchase,
+        }
+
+        if obj_multi.chart_template_id.property_account_payable:
+            vals_journal['default_credit_account_id'] = acc_template_ref[obj_multi.chart_template_id.property_account_expense_categ.id]
+            vals_journal['default_debit_account_id'] = acc_template_ref[obj_multi.chart_template_id.property_account_expense_categ.id]
+        obj_journal.create(cr,uid,vals_journal)
+
+        # Creating Journals Sales Refund and Purchase Refund
+        data_id = obj_data.search(cr, uid, [('model', '=', 'account.journal.view'), ('name', '=', 'account_sp_refund_journal_view')], context=context)
+        data = obj_data.browse(cr, uid, data_id[0], context=context)
+        view_id = data.res_id
+
+        #Sales Refund Journal
+        vals_journal = {
+            'name': _('Sales Refund Journal'),
+            'type': 'sale_refund',
+            'code': _('SCNJ'),
+            'view_id': view_id,
+            'analytic_journal_id': analytical_journal_sale,
+            'company_id': company_id
+        }
+
+        if obj_multi.chart_template_id.property_account_receivable:
+            vals_journal['default_credit_account_id'] = acc_template_ref[obj_multi.chart_template_id.property_account_income_categ.id]
+            vals_journal['default_debit_account_id'] = acc_template_ref[obj_multi.chart_template_id.property_account_income_categ.id]
+
+        obj_journal.create(cr, uid, vals_journal, context=context)
+
+        # Purchase Refund Journal
+        vals_journal = {
+            'name': _('Purchase Refund Journal'),
+            'type': 'purchase_refund',
+            'code': _('ECNJ'),
+            'view_id': view_id,
+            'analytic_journal_id': analytical_journal_purchase,
+            'company_id': company_id
+        }
+
+        if obj_multi.chart_template_id.property_account_payable:
+            vals_journal['default_credit_account_id'] = acc_template_ref[obj_multi.chart_template_id.property_account_expense_categ.id]
+            vals_journal['default_debit_account_id'] = acc_template_ref[obj_multi.chart_template_id.property_account_expense_categ.id]
+
+        obj_journal.create(cr, uid, vals_journal, context=context)
+
+        # Miscellaneous Journal
+        data_id = obj_data.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_journal_view')])
+        data = obj_data.browse(cr, uid, data_id[0], context=context)
+        view_id = data.res_id
+
+        analytical_miscellaneous_ids = analytic_journal_obj.search(cr, uid, [('type', '=', 'situation')], context=context)
+        analytical_journal_miscellaneous = analytical_miscellaneous_ids and analytical_miscellaneous_ids[0] or False
+
+        vals_journal = {
+            'name': _('Miscellaneous Journal'),
+            'type': 'general',
+            'code': _('MISC'),
+            'view_id': view_id,
+            'analytic_journal_id': analytical_journal_miscellaneous,
+            'company_id': company_id
+        }
+
+        obj_journal.create(cr, uid, vals_journal, context=context)
+
+        # Opening Entries Journal
+        if obj_multi.chart_template_id.property_account_income_opening and obj_multi.chart_template_id.property_account_expense_opening:
+            vals_journal = {
+                'name': _('Opening Entries Journal'),
+                'type': 'situation',
+                'code': _('OPEJ'),
+                'view_id': view_id,
+                'company_id': company_id,
+                'centralisation': True,
+                'default_credit_account_id': acc_template_ref[obj_multi.chart_template_id.property_account_income_opening.id],
+                'default_debit_account_id': acc_template_ref[obj_multi.chart_template_id.property_account_expense_opening.id]
+                }
+            obj_journal.create(cr, uid, vals_journal, context=context)
+
+        # Bank Journals
+        data_id = obj_data.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_journal_bank_view')])
+        data = obj_data.browse(cr, uid, data_id[0], context=context)
+        view_id_cash = data.res_id
+
+        data_id = obj_data.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_journal_bank_view_multi')])
+        data = obj_data.browse(cr, uid, data_id[0], context=context)
+        view_id_cur = data.res_id
+        ref_acc_bank = obj_multi.chart_template_id.bank_account_view_id
+
+        current_num = 1
+        valid = True
+        for line in obj_multi.bank_accounts_id:
+            #create the account_account for this bank journal
+            tmp = line.acc_name
+            dig = obj_multi.code_digits
+            if not ref_acc_bank.code:
+                raise osv.except_osv(_('Configuration Error !'), _('The bank account defined on the selected chart of account hasn\'t a code.'))
+            while True:
+                new_code = str(ref_acc_bank.code.ljust(dig-len(str(current_num)), '0')) + str(current_num)
+                ids = obj_acc.search(cr, uid, [('code', '=', new_code), ('company_id', '=', company_id)])
+                if not ids:
+                    break
+                else:
+                    current_num += 1
+            vals = {
+                'name': tmp,
+                'currency_id': line.currency_id and line.currency_id.id or False,
+                'code': new_code,
+                'type': 'liquidity',
+                'user_type': account_template.user_type and account_template.user_type.id or False,
+                'reconcile': True,
+                'parent_id': acc_template_ref[ref_acc_bank.id] or False,
+                'company_id': company_id,
+            }
+            acc_cash_id  = obj_acc.create(cr,uid,vals)
+
+            #create the bank journal
+            vals_journal = {
+                'name': vals['name'],
+                'code': _('BNK') + str(current_num),
+                'type': line.account_type == 'cash' and 'cash' or 'bank',
+                'company_id': company_id,
+                'analytic_journal_id': False,
+                'currency_id': False,
+            }
+            if line.currency_id:
+                vals_journal['view_id'] = view_id_cur
+                vals_journal['currency'] = line.currency_id.id
+            else:
+                vals_journal['view_id'] = view_id_cash
+            vals_journal['default_credit_account_id'] = acc_cash_id
+            vals_journal['default_debit_account_id'] = acc_cash_id
+            obj_journal.create(cr, uid, vals_journal)
+            current_num += 1
+            valid = True
+
+        #create the properties
+        property_obj = self.pool.get('ir.property')
+        fields_obj = self.pool.get('ir.model.fields')
+
+        todo_list = [
+            ('property_account_receivable','res.partner','account.account'),
+            ('property_account_payable','res.partner','account.account'),
+            ('property_account_expense_categ','product.category','account.account'),
+            ('property_account_income_categ','product.category','account.account'),
+            ('property_account_expense','product.template','account.account'),
+            ('property_account_income','product.template','account.account'),
+            ('property_reserve_and_surplus_account','res.company','account.account')
+        ]
+        for record in todo_list:
+            r = []
+            r = property_obj.search(cr, uid, [('name','=', record[0] ),('company_id','=',company_id)])
+            account = getattr(obj_multi.chart_template_id, record[0])
+            field = fields_obj.search(cr, uid, [('name','=',record[0]),('model','=',record[1]),('relation','=',record[2])])
+            vals = {
+                'name': record[0],
+                'company_id': company_id,
+                'fields_id': field[0],
+                'value': account and 'account.account,' + str(acc_template_ref[account.id]) or False,
+            }
+
+            if r:
+                #the property exist: modify it
+                property_obj.write(cr, uid, r, vals)
+            else:
+                #create the property
+                property_obj.create(cr, uid, vals)
+
+        fp_ids = obj_fiscal_position_template.search(cr, uid, [('chart_template_id', '=', obj_multi.chart_template_id.id)])
+
+        if fp_ids:
+            obj_tax_fp = self.pool.get('account.fiscal.position.tax')
+            obj_ac_fp = self.pool.get('account.fiscal.position.account')
+
+            for position in obj_fiscal_position_template.browse(cr, uid, fp_ids, context=context):
+
+                vals_fp = {
+                    'company_id': company_id,
+                    'name': position.name,
+                }
+                new_fp = obj_fiscal_position.create(cr, uid, vals_fp)
+
+                for tax in position.tax_ids:
+                    vals_tax = {
+                        'tax_src_id': tax_template_ref[tax.tax_src_id.id],
+                        'tax_dest_id': tax.tax_dest_id and tax_template_ref[tax.tax_dest_id.id] or False,
+                        'position_id': new_fp,
+                    }
+                    obj_tax_fp.create(cr, uid, vals_tax)
+
+                for acc in position.account_ids:
+                    vals_acc = {
+                        'account_src_id': acc_template_ref[acc.account_src_id.id],
+                        'account_dest_id': acc_template_ref[acc.account_dest_id.id],
+                        'position_id': new_fp,
+                    }
+                    obj_ac_fp.create(cr, uid, vals_acc)
+
+        if obj_multi.sale_tax:
+            ir_values_obj.set(cr, uid, key='default', key2=False, name="taxes_id", company=obj_multi.company_id.id,
+                            models =[('product.product',False)], value=[tax_template_to_tax[obj_multi.sale_tax.id]])
+        if obj_multi.purchase_tax:
+            ir_values_obj.set(cr, uid, key='default', key2=False, name="supplier_taxes_id", company=obj_multi.company_id.id,
+                            models =[('product.product',False)], value=[tax_template_to_tax[obj_multi.purchase_tax.id]])
+
+wizard_multi_charts_accounts()
+
+class account_bank_accounts_wizard(osv.osv_memory):
+    _name='account.bank.accounts.wizard'
+
+    _columns = {
+        'acc_name': fields.char('Account Name.', size=64, required=True),
+        'bank_account_id': fields.many2one('wizard.multi.charts.accounts', 'Bank Account', required=True),
+        'currency_id': fields.many2one('res.currency', 'Secondary Currency', help="Forces all moves for this account to have this secondary currency."),
+        'account_type': fields.selection([('cash','Cash'), ('check','Check'), ('bank','Bank')], 'Account Type', size=32),
+    }
+
+account_bank_accounts_wizard()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'account/account_analytic_line.py'
--- account/account_analytic_line.py	1970-01-01 00:00:00 +0000
+++ account/account_analytic_line.py	2011-10-06 16:09:39 +0000
@@ -0,0 +1,162 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import time
+
+from osv import fields
+from osv import osv
+from tools.translate import _
+
+class account_analytic_line(osv.osv):
+    _inherit = 'account.analytic.line'
+    _description = 'Analytic Line'
+    _columns = {
+        'product_uom_id': fields.many2one('product.uom', 'UoM'),
+        'product_id': fields.many2one('product.product', 'Product'),
+        'general_account_id': fields.many2one('account.account', 'General Account', required=True, ondelete='restrict'),
+        'move_id': fields.many2one('account.move.line', 'Move Line', ondelete='cascade', select=True),
+        'journal_id': fields.many2one('account.analytic.journal', 'Analytic Journal', required=True, ondelete='restrict', select=True),
+        'code': fields.char('Code', size=8),
+        'ref': fields.char('Ref.', size=64),
+        'currency_id': fields.related('move_id', 'currency_id', type='many2one', relation='res.currency', string='Account currency', store=True, help="The related account currency if not equal to the company one.", readonly=True),
+        'amount_currency': fields.related('move_id', 'amount_currency', type='float', string='Amount currency', store=True, help="The amount expressed in the related account currency if not equal to the company one.", readonly=True),
+    }
+
+    _defaults = {
+        'date': lambda *a: time.strftime('%Y-%m-%d'),
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.analytic.line', context=c),
+    }
+    _order = 'date desc'
+
+    def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
+        if context is None:
+            context = {}
+        if context.get('from_date',False):
+            args.append(['date', '>=', context['from_date']])
+        if context.get('to_date',False):
+            args.append(['date','<=', context['to_date']])
+        return super(account_analytic_line, self).search(cr, uid, args, offset, limit,
+                order, context=context, count=count)
+
+    def _check_company(self, cr, uid, ids, context=None):
+        lines = self.browse(cr, uid, ids, context=context)
+        for l in lines:
+            if l.move_id and not l.account_id.company_id.id == l.move_id.account_id.company_id.id:
+                return False
+        return True
+
+    # Compute the cost based on the price type define into company
+    # property_valuation_price_type property
+    def on_change_unit_amount(self, cr, uid, id, prod_id, quantity, company_id,
+            unit=False, journal_id=False, context=None):
+        if context==None:
+            context={}
+        if not journal_id:
+            j_ids = self.pool.get('account.analytic.journal').search(cr, uid, [('type','=','purchase')])
+            journal_id = j_ids and j_ids[0] or False
+        if not journal_id or not prod_id:
+            return {}
+        product_obj = self.pool.get('product.product')
+        analytic_journal_obj =self.pool.get('account.analytic.journal')
+        product_price_type_obj = self.pool.get('product.price.type')
+        j_id = analytic_journal_obj.browse(cr, uid, journal_id, context=context)
+        prod = product_obj.browse(cr, uid, prod_id, context=context)
+        result = 0.0
+        if prod_id:
+            unit = prod.uom_id.id
+            if j_id.type == 'purchase':
+                unit = prod.uom_po_id.id
+        if j_id.type <> 'sale':
+            a = prod.product_tmpl_id.property_account_expense.id
+            if not a:
+                a = prod.categ_id.property_account_expense_categ.id
+            if not a:
+                raise osv.except_osv(_('Error !'),
+                        _('There is no expense account defined ' \
+                                'for this product: "%s" (id:%d)') % \
+                                (prod.name, prod.id,))
+        else:
+            a = prod.product_tmpl_id.property_account_income.id
+            if not a:
+                a = prod.categ_id.property_account_income_categ.id
+            if not a:
+                raise osv.except_osv(_('Error !'),
+                        _('There is no income account defined ' \
+                                'for this product: "%s" (id:%d)') % \
+                                (prod.name, prod_id,))
+
+        flag = False
+        # Compute based on pricetype
+        product_price_type_ids = product_price_type_obj.search(cr, uid, [('field','=','standard_price')], context=context)
+        pricetype = product_price_type_obj.browse(cr, uid, product_price_type_ids, context=context)[0]
+        if journal_id:
+            journal = analytic_journal_obj.browse(cr, uid, journal_id, context=context)
+            if journal.type == 'sale':
+                product_price_type_ids = product_price_type_obj.search(cr, uid, [('field','=','list_price')], context)
+                if product_price_type_ids:
+                    pricetype = product_price_type_obj.browse(cr, uid, product_price_type_ids, context=context)[0]
+        # Take the company currency as the reference one
+        if pricetype.field == 'list_price':
+            flag = True
+        ctx = context.copy()
+        if unit:
+            # price_get() will respect a 'uom' in its context, in order
+            # to return a default price for those units
+            ctx['uom'] = unit
+        amount_unit = prod.price_get(pricetype.field, context=ctx)[prod.id]
+        prec = self.pool.get('decimal.precision').precision_get(cr, uid, 'Account')
+        amount = amount_unit * quantity or 1.0
+        result = round(amount, prec)
+        if not flag:
+            result *= -1
+        return {'value': {
+            'amount': result,
+            'general_account_id': a,
+            'product_uom_id': unit
+            }
+        }
+
+    def view_header_get(self, cr, user, view_id, view_type, context=None):
+        if context is None:
+            context = {}
+        if context.get('account_id', False):
+            # account_id in context may also be pointing to an account.account.id
+            cr.execute('select name from account_analytic_account where id=%s', (context['account_id'],))
+            res = cr.fetchone()
+            if res:
+                res = _('Entries: ')+ (res[0] or '')
+            return res
+        return False
+
+account_analytic_line()
+
+class res_partner(osv.osv):
+    """ Inherits partner and adds contract information in the partner form """
+    _inherit = 'res.partner'
+
+    _columns = {
+        'contract_ids': fields.one2many('account.analytic.account', \
+                                                    'partner_id', 'Contracts', readonly=True),
+    }
+
+res_partner()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'account/account_assert_test.xml'
--- account/account_assert_test.xml	1970-01-01 00:00:00 +0000
+++ account/account_assert_test.xml	2011-10-06 16:09:39 +0000
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <assert model="account.move" search="[]" string="For all Journal Items, the state is valid implies that the sum of credits equals the sum of debits">
+            <test expr="not len(line_id) or line_id[0].state != 'valid' or (sum([l.debit - l.credit for l in line_id]) &lt;= 0.00001)"/>
+        </assert>
+    </data>
+</openerp>

=== added file 'account/account_bank.py'
--- account/account_bank.py	1970-01-01 00:00:00 +0000
+++ account/account_bank.py	2011-10-06 16:09:39 +0000
@@ -0,0 +1,103 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from tools.translate import _
+from osv import fields, osv
+
+class bank(osv.osv):
+    _inherit = "res.partner.bank"
+    _columns = {
+        'journal_id': fields.many2one('account.journal', 'Account Journal', help="This journal will be created automatically for this bank account when you save the record"),
+    }
+    def create(self, cr, uid, data, context={}):
+        result = super(bank, self).create(cr, uid, data, context=context)
+        self.post_write(cr, uid, [result], context=context)
+        return result
+
+    def write(self, cr, uid, ids, data, context={}):
+        result = super(bank, self).write(cr, uid, ids, data, context=context)
+        self.post_write(cr, uid, ids, context=context)
+        return result
+
+    def post_write(self, cr, uid, ids, context={}):
+        obj_acc = self.pool.get('account.account')
+        obj_data = self.pool.get('ir.model.data')
+        for bank in self.browse(cr, uid, ids, context):
+            if bank.company_id and not bank.journal_id:
+                # Find the code and parent of the bank account to create
+                dig = 6
+                current_num = 1
+                ids = obj_acc.search(cr, uid, [('type','=','liquidity')], context=context) 
+                # No liquidity account exists, no template available
+                if not ids: continue
+
+                ref_acc_bank_temp = obj_acc.browse(cr, uid, ids[0], context=context)
+                ref_acc_bank = ref_acc_bank_temp.parent_id
+                while True:
+                    new_code = str(ref_acc_bank.code.ljust(dig-len(str(current_num)), '0')) + str(current_num)
+                    ids = obj_acc.search(cr, uid, [('code', '=', new_code), ('company_id', '=', bank.company_id.id)])
+                    if not ids:
+                        break
+                    current_num += 1
+
+                acc = {
+                    'name': (bank.bank_name or '')+' '+bank.acc_number,
+                    'currency_id': bank.company_id.currency_id.id,
+                    'code': new_code,
+                    'type': 'liquidity',
+                    'user_type': ref_acc_bank_temp.user_type.id,
+                    'reconcile': False,
+                    'parent_id': ref_acc_bank.id,
+                    'company_id': bank.company_id.id,
+                }
+                acc_bank_id  = obj_acc.create(cr,uid,acc,context=context)
+
+                # Get the journal view id
+                data_id = obj_data.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_journal_bank_view')])
+                data = obj_data.browse(cr, uid, data_id[0], context=context)
+                view_id_cash = data.res_id
+                
+                jour_obj = self.pool.get('account.journal')
+                new_code = 1
+                while True:
+                    code = _('BNK')+str(new_code)
+                    ids = jour_obj.search(cr, uid, [('code','=',code)], context=context)
+                    if not ids:
+                        break
+                    new_code += 1
+
+                #create the bank journal
+                vals_journal = {
+                    'name':  (bank.bank_name or '')+' '+bank.acc_number,
+                    'code': code,
+                    'type': 'bank',
+                    'company_id': bank.company_id.id,
+                    'analytic_journal_id': False,
+                    'currency_id': False,
+                    'default_credit_account_id': acc_bank_id,
+                    'default_debit_account_id': acc_bank_id,
+                    'view_id': view_id_cash
+                }
+                journal_id = jour_obj.create(cr, uid, vals_journal, context=context)
+
+                self.write(cr, uid, [bank.id], {'journal_id': journal_id}, context=context)
+        return True
+

=== added file 'account/account_bank_statement.py'
--- account/account_bank_statement.py	1970-01-01 00:00:00 +0000
+++ account/account_bank_statement.py	2011-10-06 16:09:39 +0000
@@ -0,0 +1,484 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import time
+
+from osv import fields, osv
+from tools.translate import _
+import decimal_precision as dp
+
+class account_bank_statement(osv.osv):
+
+    def create(self, cr, uid, vals, context=None):
+        seq = 0
+        if 'line_ids' in vals:
+            for line in vals['line_ids']:
+                seq += 1
+                line[2]['sequence'] = seq
+                vals[seq - 1] = line
+        return super(account_bank_statement, self).create(cr, uid, vals, context=context)
+
+    def write(self, cr, uid, ids, vals, context=None):
+        res = super(account_bank_statement, self).write(cr, uid, ids, vals, context=context)
+        account_bank_statement_line_obj = self.pool.get('account.bank.statement.line')
+        for statement in self.browse(cr, uid, ids, context):
+            seq = 0
+            for line in statement.line_ids:
+                seq += 1
+                account_bank_statement_line_obj.write(cr, uid, [line.id], {'sequence': seq}, context=context)
+        return res
+
+    def _default_journal_id(self, cr, uid, context=None):
+        if context is None:
+            context = {}
+        journal_pool = self.pool.get('account.journal')
+        journal_type = context.get('journal_type', False)
+        journal_id = False
+        if journal_type:
+            ids = journal_pool.search(cr, uid, [('type', '=', journal_type)])
+            if ids:
+                journal_id = ids[0]
+        return journal_id
+
+    def _end_balance(self, cursor, user, ids, name, attr, context=None):
+        res_currency_obj = self.pool.get('res.currency')
+        res_users_obj = self.pool.get('res.users')
+        res = {}
+
+        company_currency_id = res_users_obj.browse(cursor, user, user,
+                context=context).company_id.currency_id.id
+
+        statements = self.browse(cursor, user, ids, context=context)
+        for statement in statements:
+            res[statement.id] = statement.balance_start
+            currency_id = statement.currency.id
+            for line in statement.move_line_ids:
+                if line.debit > 0:
+                    if line.account_id.id == \
+                            statement.journal_id.default_debit_account_id.id:
+                        res[statement.id] += res_currency_obj.compute(cursor,
+                                user, company_currency_id, currency_id,
+                                line.debit, context=context)
+                else:
+                    if line.account_id.id == \
+                            statement.journal_id.default_credit_account_id.id:
+                        res[statement.id] -= res_currency_obj.compute(cursor,
+                                user, company_currency_id, currency_id,
+                                line.credit, context=context)
+
+            if statement.state in ('draft', 'open'):
+                for line in statement.line_ids:
+                    res[statement.id] += line.amount
+        for r in res:
+            res[r] = round(res[r], 2)
+        return res
+
+    def _get_period(self, cr, uid, context=None):
+        periods = self.pool.get('account.period').find(cr, uid)
+        if periods:
+            return periods[0]
+        return False
+
+    def _currency(self, cursor, user, ids, name, args, context=None):
+        res = {}
+        res_currency_obj = self.pool.get('res.currency')
+        res_users_obj = self.pool.get('res.users')
+        default_currency = res_users_obj.browse(cursor, user,
+                user, context=context).company_id.currency_id
+        for statement in self.browse(cursor, user, ids, context=context):
+            currency = statement.journal_id.currency
+            if not currency:
+                currency = default_currency
+            res[statement.id] = currency.id
+        currency_names = {}
+        for currency_id, currency_name in res_currency_obj.name_get(cursor,
+                user, [x for x in res.values()], context=context):
+            currency_names[currency_id] = currency_name
+        for statement_id in res.keys():
+            currency_id = res[statement_id]
+            res[statement_id] = (currency_id, currency_names[currency_id])
+        return res
+
+    def _get_statement(self, cr, uid, ids, context=None):
+        result = {}
+        for line in self.pool.get('account.bank.statement.line').browse(cr, uid, ids, context=context):
+            result[line.statement_id.id] = True
+        return result.keys()
+
+    _order = "date desc, id desc"
+    _name = "account.bank.statement"
+    _description = "Bank Statement"
+    _columns = {
+        'name': fields.char('Name', size=64, required=True, states={'draft': [('readonly', False)]}, readonly=True, help='if you give the Name other then /, its created Accounting Entries Move will be with same name as statement name. This allows the statement entries to have the same references than the statement itself'), # readonly for account_cash_statement
+        'date': fields.date('Date', required=True, states={'confirm': [('readonly', True)]}),
+        'journal_id': fields.many2one('account.journal', 'Journal', required=True,
+            readonly=True, states={'draft':[('readonly',False)]}),
+        'period_id': fields.many2one('account.period', 'Period', required=True,
+            states={'confirm':[('readonly', True)]}),
+        'balance_start': fields.float('Starting Balance', digits_compute=dp.get_precision('Account'),
+            states={'confirm':[('readonly',True)]}),
+        'balance_end_real': fields.float('Ending Balance', digits_compute=dp.get_precision('Account'),
+            states={'confirm': [('readonly', True)]}),
+        'balance_end': fields.function(_end_balance, 
+            store = {
+                'account.bank.statement': (lambda self, cr, uid, ids, c={}: ids, ['line_ids','move_line_ids'], 10),
+                'account.bank.statement.line': (_get_statement, ['amount'], 10),
+            },
+            string="Computed Balance", help='Balance as calculated based on Starting Balance and transaction lines'),
+        'company_id': fields.related('journal_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True),
+        'line_ids': fields.one2many('account.bank.statement.line',
+            'statement_id', 'Statement lines',
+            states={'confirm':[('readonly', True)]}),
+        'move_line_ids': fields.one2many('account.move.line', 'statement_id',
+            'Entry lines', states={'confirm':[('readonly',True)]}),
+        'state': fields.selection([('draft', 'New'),
+                                   ('open','Open'), # used by cash statements
+                                   ('confirm', 'Closed')],
+                                   'State', required=True, readonly="1",
+                                   help='When new statement is created the state will be \'Draft\'.\n'
+                                        'And after getting confirmation from the bank it will be in \'Confirmed\' state.'),
+        'currency': fields.function(_currency, string='Currency',
+            type='many2one', relation='res.currency'),
+        'account_id': fields.related('journal_id', 'default_debit_account_id', type='many2one', relation='account.account', string='Account used in this journal', readonly=True, help='used in statement reconciliation domain, but shouldn\'t be used elswhere.'),
+    }
+
+    _defaults = {
+        'name': "/",
+        'date': lambda *a: time.strftime('%Y-%m-%d'),
+        'state': 'draft',
+        'journal_id': _default_journal_id,
+        'period_id': _get_period,
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.bank.statement',context=c),
+    }
+
+    def onchange_date(self, cr, user, ids, date, context=None):
+        """
+        Returns a dict that contains new values and context
+        @param cr: A database cursor
+        @param user: ID of the user currently logged in
+        @param date: latest value from user input for field date
+        @param args: other arguments
+        @param context: context arguments, like lang, time zone
+        @return: Returns a dict which contains new values, and context
+        """
+        res = {}
+        period_pool = self.pool.get('account.period')
+
+        if context is None:
+            context = {}
+
+        pids = period_pool.search(cr, user, [('date_start','<=',date), ('date_stop','>=',date)])
+        if pids:
+            res.update({
+                'period_id':pids[0]
+            })
+            context.update({
+                'period_id':pids[0]
+            })
+
+        return {
+            'value':res,
+            'context':context,
+        }
+
+    def button_dummy(self, cr, uid, ids, context=None):
+        return self.write(cr, uid, ids, {}, context=context)
+
+    def create_move_from_st_line(self, cr, uid, st_line_id, company_currency_id, st_line_number, context=None):
+        if context is None:
+            context = {}
+        res_currency_obj = self.pool.get('res.currency')
+        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')
+        st_line = account_bank_statement_line_obj.browse(cr, uid, st_line_id, context=context)
+        st = st_line.statement_id
+
+        context.update({'date': st_line.date})
+
+        move_id = account_move_obj.create(cr, uid, {
+            'journal_id': st.journal_id.id,
+            'period_id': st.period_id.id,
+            'date': st_line.date,
+            'name': st_line_number,
+        }, context=context)
+        account_bank_statement_line_obj.write(cr, uid, [st_line.id], {
+            'move_ids': [(4, move_id, False)]
+        })
+
+        torec = []
+        if st_line.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 = ((st_line.amount<=0) and st.journal_id.default_debit_account_id) or st_line.account_id
+        context.update({
+                'res.currency.compute.account': acc_cur,
+            })
+        amount = res_currency_obj.compute(cr, uid, st.currency.id,
+                company_currency_id, st_line.amount, context=context)
+
+        val = {
+            'name': st_line.name,
+            'date': st_line.date,
+            'ref': st_line.ref,
+            'move_id': move_id,
+            'partner_id': ((st_line.partner_id) and st_line.partner_id.id) or False,
+            'account_id': (st_line.account_id) and st_line.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,
+            'analytic_account_id': st_line.analytic_account_id and st_line.analytic_account_id.id or False
+        }
+
+        if st.currency.id <> company_currency_id:
+            amount_cur = res_currency_obj.compute(cr, uid, company_currency_id,
+                        st.currency.id, amount, context=context)
+            val['amount_currency'] = -amount_cur
+
+        if st_line.account_id and st_line.account_id.currency_id and st_line.account_id.currency_id.id <> company_currency_id:
+            val['currency_id'] = st_line.account_id.currency_id.id
+            amount_cur = res_currency_obj.compute(cr, uid, company_currency_id,
+                    st_line.account_id.currency_id.id, amount, context=context)
+            val['amount_currency'] = -amount_cur
+
+        move_line_id = account_move_line_obj.create(cr, uid, val, context=context)
+        torec.append(move_line_id)
+
+        # 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 = st_line.amount
+            currency_id = st.currency.id
+        account_move_line_obj.create(cr, uid, {
+            'name': st_line.name,
+            'date': st_line.date,
+            'ref': st_line.ref,
+            'move_id': move_id,
+            'partner_id': ((st_line.partner_id) and st_line.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 !'),
+                        _('Journal Item "%s" is not valid') % line.name)
+
+        # Bank statements will not consider boolean on journal entry_posted
+        account_move_obj.post(cr, uid, [move_id], context=context)
+        return move_id
+
+    def get_next_st_line_number(self, cr, uid, st_number, st_line, context=None):
+        return st_number + '/' + str(st_line.sequence)
+
+    def balance_check(self, cr, uid, st_id, journal_type='bank', context=None):
+        st = self.browse(cr, uid, st_id, context=context)
+        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 !\nThe expected balance (%.2f) is different than the computed one. (%.2f)') % (st.balance_end_real, st.balance_end))
+        return True
+
+    def statement_close(self, cr, uid, ids, journal_type='bank', context=None):
+        return self.write(cr, uid, ids, {'state':'confirm'}, context=context)
+
+    def check_status_condition(self, cr, uid, state, journal_type='bank'):
+        return state in ('draft','open')
+
+    def button_confirm_bank(self, cr, uid, ids, context=None):
+        obj_seq = self.pool.get('ir.sequence')
+        if context is None:
+            context = {}
+
+        for st in self.browse(cr, uid, ids, context=context):
+            j_type = st.journal_id.type
+            company_currency_id = st.journal_id.company_id.currency_id.id
+            if not self.check_status_condition(cr, uid, st.state, journal_type=j_type):
+                continue
+
+            self.balance_check(cr, uid, st.id, journal_type=j_type, context=context)
+            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.'))
+
+            if not st.name == '/':
+                st_number = st.name
+            else:
+                if st.journal_id.sequence_id:
+                    c = {'fiscalyear_id': st.period_id.fiscalyear_id.id}
+                    st_number = obj_seq.next_by_id(cr, uid, st.journal_id.sequence_id.id, context=c)
+                else:
+                    st_number = obj_seq.next_by_code(cr, uid, 'account.bank.statement')
+
+            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 st_line in st.line_ids:
+                if st_line.analytic_account_id:
+                    if not st.journal_id.analytic_journal_id:
+                        raise osv.except_osv(_('No Analytic Journal !'),_("You have to define an analytic journal on the '%s' journal!") % (st.journal_id.name,))
+                if not st_line.amount:
+                    continue
+                st_line_number = self.get_next_st_line_number(cr, uid, st_number, st_line, context)
+                self.create_move_from_st_line(cr, uid, st_line.id, company_currency_id, st_line_number, context)
+
+            self.write(cr, uid, [st.id], {'name': st_number}, context=context)
+            self.log(cr, uid, st.id, _('Statement %s is confirmed, journal items are created.') % (st_number,))
+        return self.write(cr, uid, ids, {'state':'confirm'}, context=context)
+
+    def button_cancel(self, cr, uid, ids, context=None):
+        done = []
+        account_move_obj = self.pool.get('account.move')
+        for st in self.browse(cr, uid, ids, context=context):
+            if st.state=='draft':
+                continue
+            ids = []
+            for line in st.line_ids:
+                ids += [x.id for x in line.move_ids]
+            account_move_obj.unlink(cr, uid, ids, context)
+            done.append(st.id)
+        return self.write(cr, uid, done, {'state':'draft'}, context=context)
+
+    def onchange_journal_id(self, cr, uid, statement_id, journal_id, context=None):
+        cr.execute('SELECT balance_end_real \
+                FROM account_bank_statement \
+                WHERE journal_id = %s AND NOT state = %s \
+                ORDER BY date DESC,id DESC LIMIT 1', (journal_id, 'draft'))
+        res = cr.fetchone()
+        balance_start = res and res[0] or 0.0
+        account_id = self.pool.get('account.journal').read(cr, uid, journal_id, ['default_debit_account_id'], context=context)['default_debit_account_id']
+        return {'value': {'balance_start': balance_start, 'account_id': account_id}}
+
+    def unlink(self, cr, uid, ids, context=None):
+        stat = self.read(cr, uid, ids, ['state'], context=context)
+        unlink_ids = []
+        for t in stat:
+            if t['state'] in ('draft'):
+                unlink_ids.append(t['id'])
+            else:
+                raise osv.except_osv(_('Invalid action !'), _('In order to delete a bank statement, you must first cancel it to delete related journal items.'))
+        osv.osv.unlink(self, cr, uid, unlink_ids, context=context)
+        return True
+
+    def copy(self, cr, uid, id, default=None, context=None):
+        if default is None:
+            default = {}
+        if context is None:
+            context = {}
+        default = default.copy()
+        default['move_line_ids'] = []
+        return super(account_bank_statement, self).copy(cr, uid, id, default, context=context)
+
+account_bank_statement()
+
+class account_bank_statement_line(osv.osv):
+
+    def onchange_partner_id(self, cr, uid, ids, partner_id, context=None):
+        obj_partner = self.pool.get('res.partner')
+        if context is None:
+            context = {}
+        if not partner_id:
+            return {}
+        part = obj_partner.browse(cr, uid, partner_id, context=context)
+        if not part.supplier and not part.customer:
+            type = 'general'
+        elif part.supplier and part.customer:
+            type = 'general'
+        else:
+            if part.supplier == True:
+                type = 'supplier'
+            if part.customer == True:
+                type = 'customer'
+        res_type = self.onchange_type(cr, uid, ids, partner_id=partner_id, type=type, context=context)
+        if res_type['value'] and res_type['value'].get('account_id', False):
+            return {'value': {'type': type, 'account_id': res_type['value']['account_id']}}
+        return {'value': {'type': type}}
+
+    def onchange_type(self, cr, uid, line_id, partner_id, type, context=None):
+        res = {'value': {}}
+        obj_partner = self.pool.get('res.partner')
+        if context is None:
+            context = {}
+        if not partner_id:
+            return res
+        account_id = False
+        line = self.browse(cr, uid, line_id, context=context)
+        if not line or (line and not line[0].account_id):
+            part = obj_partner.browse(cr, uid, partner_id, context=context)
+            if type == 'supplier':
+                account_id = part.property_account_payable.id
+            else:
+                account_id = part.property_account_receivable.id
+            res['value']['account_id'] = account_id
+        return res
+
+    _order = "statement_id desc, sequence"
+    _name = "account.bank.statement.line"
+    _description = "Bank Statement Line"
+    _columns = {
+        'name': fields.char('Communication', size=64, required=True),
+        'date': fields.date('Date', required=True),
+        'amount': fields.float('Amount', digits_compute=dp.get_precision('Account')),
+        'type': fields.selection([
+            ('supplier','Supplier'),
+            ('customer','Customer'),
+            ('general','General')
+            ], 'Type', required=True),
+        'partner_id': fields.many2one('res.partner', 'Partner'),
+        'account_id': fields.many2one('account.account','Account',
+            required=True),
+        'statement_id': fields.many2one('account.bank.statement', 'Statement',
+            select=True, required=True, ondelete='cascade'),
+        'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account'),
+        'move_ids': fields.many2many('account.move',
+            'account_bank_statement_line_move_rel', 'statement_line_id','move_id',
+            'Moves'),
+        'ref': fields.char('Reference', size=32),
+        'note': fields.text('Notes'),
+        'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of bank statement lines."),
+        'company_id': fields.related('statement_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True),
+    }
+    _defaults = {
+        'name': lambda self,cr,uid,context={}: self.pool.get('ir.sequence').get(cr, uid, 'account.bank.statement.line'),
+        'date': lambda self,cr,uid,context={}: context.get('date', time.strftime('%Y-%m-%d')),
+        'type': 'general',
+    }
+
+account_bank_statement_line()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'account/account_bank_view.xml'
--- account/account_bank_view.xml	1970-01-01 00:00:00 +0000
+++ account/account_bank_view.xml	2011-10-06 16:09:39 +0000
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+
+    <!--
+      Bank Accounts
+    -->
+
+    <record id="view_partner_bank_form_inherit" model="ir.ui.view">
+        <field name="name">Partner Bank Accounts - Journal</field>
+        <field name="model">res.partner.bank</field>
+        <field name="type">form</field>
+        <field name="inherit_id" ref="base.view_partner_bank_form"/>
+        <field name="arch" type="xml">
+            <group name="bank" position="after">
+                <group name="accounting" col="2" colspan="2" attrs="{'invisible': [('company_id','=', False)]}" groups="base.group_extended">
+                    <separator string="Accounting Information" colspan="2"/>
+                    <field name="journal_id"/>
+                </group>
+            </group>
+        </field>
+    </record>
+
+
+    <record id="action_bank_tree" model="ir.actions.act_window">
+        <field name="name">Setup your Bank Accounts</field>
+        <field name="res_model">res.partner.bank</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="context" eval="{'default_partner_id':ref('base.main_partner'), 'company_hide':False, 'default_company_id':ref('base.main_company'), 'search_default_my_bank':1}"/>
+        <field name="help">Configure your company's bank account and select those that must appear on the report footer. You can reorder banks in the list view. If you use the accounting application of OpenERP, journals and accounts will be created automatically based on these data.</field>
+    </record>
+    <menuitem
+        sequence="0"
+        parent="account.account_account_menu"
+        id="menu_action_bank_tree"
+        action="action_bank_tree"/>
+
+
+    <record id="account_configuration_bank_todo" model="ir.actions.todo">
+        <field name="action_id" ref="action_bank_tree"/>
+        <field name="category_id" ref="category_accounting_configuration"/>
+        <field name="sequence">4</field>
+    </record>
+
+
+</data>
+</openerp>

=== added file 'account/account_cash_statement.py'
--- account/account_cash_statement.py	1970-01-01 00:00:00 +0000
+++ account/account_cash_statement.py	2011-10-06 16:09:39 +0000
@@ -0,0 +1,345 @@
+# 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/>.
+#
+##############################################################################
+
+import time
+
+from osv import osv, fields
+from tools.translate import _
+import decimal_precision as dp
+
+class account_cashbox_line(osv.osv):
+
+    """ Cash Box Details """
+
+    _name = 'account.cashbox.line'
+    _description = 'CashBox Line'
+    _rec_name = 'number'
+
+    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, context=context):
+            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_compute=dp.get_precision('Account')),
+        'number': fields.integer('Number'),
+        'subtotal': fields.function(_sub_total, string='Sub Total', type='float', digits_compute=dp.get_precision('Account')),
+        'starting_id': fields.many2one('account.bank.statement', ondelete='cascade'),
+        'ending_id': fields.many2one('account.bank.statement', ondelete='cascade'),
+     }
+
+account_cashbox_line()
+
+class account_cash_statement(osv.osv):
+
+    _inherit = 'account.bank.statement'
+
+    def _get_starting_balance(self, cr, uid, ids, 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, context=context):
+            amount_total = 0.0
+
+            if statement.journal_id.type not in('cash'):
+                continue
+
+            for line in statement.starting_details_ids:
+                amount_total+= line.pieces * line.number
+            res[statement.id] = {
+                'balance_start': 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, context=context):
+            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, context=context):
+            encoding_total=0.0
+            for line in statement.line_ids:
+               encoding_total += line.amount
+            res2[statement.id] = encoding_total
+        return res2
+
+    def _get_company(self, cr, uid, context=None):
+        user_pool = self.pool.get('res.users')
+        company_pool = self.pool.get('res.company')
+        user = user_pool.browse(cr, uid, uid, context=context)
+        company_id = user.company_id
+        if not company_id:
+            company_id = company_pool.search(cr, uid, [])
+        return company_id and company_id[0] or False
+
+    def _get_cash_open_box_lines(self, cr, uid, context=None):
+        res = []
+        curr = [1, 2, 5, 10, 20, 50, 100, 500]
+        for rs in curr:
+            dct = {
+                'pieces': rs,
+                'number': 0
+            }
+            res.append(dct)
+        journal_ids = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'cash')], context=context)
+        if journal_ids:
+            results = self.search(cr, uid, [('journal_id', 'in', journal_ids),('state', '=', 'confirm')], context=context)
+            if results:
+                cash_st = self.browse(cr, uid, results, context=context)[0]
+                for cash_line in cash_st.ending_details_ids:
+                    for r in res:
+                        if cash_line.pieces == r['pieces']:
+                            r['number'] = cash_line.number
+        return res
+
+    def _get_default_cash_close_box_lines(self, cr, uid, context=None):
+        res = []
+        curr = [1, 2, 5, 10, 20, 50, 100, 500]
+        for rs in curr:
+            dct = {
+                'pieces': rs,
+                'number': 0
+            }
+            res.append(dct)
+        return res
+
+    def _get_cash_close_box_lines(self, cr, uid, context=None):
+        res = []
+        curr = [1, 2, 5, 10, 20, 50, 100, 500]
+        for rs in curr:
+            dct = {
+                'pieces': rs,
+                'number': 0
+            }
+            res.append((0, 0, dct))
+        return res
+
+    def _get_cash_open_close_box_lines(self, cr, uid, context=None):
+        res = {}
+        start_l = []
+        end_l = []
+        starting_details = self._get_cash_open_box_lines(cr, uid, context=context)
+        ending_details = self._get_default_cash_close_box_lines(cr, uid, context)
+        for start in starting_details:
+            start_l.append((0, 0, start))
+        for end in ending_details:
+            end_l.append((0, 0, end))
+        res['start'] = start_l
+        res['end'] = end_l
+        return res
+
+    def _get_statement(self, cr, uid, ids, context=None):
+        result = {}
+        for line in self.pool.get('account.bank.statement.line').browse(cr, uid, ids, context=context):
+            result[line.statement_id.id] = True
+        return result.keys()
+
+    _columns = {
+        'total_entry_encoding': fields.function(_get_sum_entry_encoding, string="Cash Transaction", help="Total cash transactions",
+            store = {
+                'account.bank.statement': (lambda self, cr, uid, ids, c={}: ids, ['line_ids','move_line_ids'], 10),
+                'account.bank.statement.line': (_get_statement, ['amount'], 10),
+            }),
+        'closing_date': fields.datetime("Closed On"),
+        'balance_end_cash': fields.function(_balance_end_cash, store=True, string='Closing Balance', help="Closing balance based on cashBox"),
+        'starting_details_ids': fields.one2many('account.cashbox.line', 'starting_id', string='Opening Cashbox'),
+        'ending_details_ids': fields.one2many('account.cashbox.line', 'ending_id', string='Closing Cashbox'),
+        'user_id': fields.many2one('res.users', 'Responsible', required=False),
+    }
+    _defaults = {
+        'state': 'draft',
+        'date': lambda self,cr,uid,context={}: context.get('date', time.strftime("%Y-%m-%d %H:%M:%S")),
+        'user_id': lambda self, cr, uid, context=None: uid,
+        'starting_details_ids': _get_cash_open_box_lines,
+        'ending_details_ids': _get_default_cash_close_box_lines
+     }
+
+    def create(self, cr, uid, vals, context=None):
+        if self.pool.get('account.journal').browse(cr, uid, vals['journal_id'], context=context).type == 'cash':
+            open_close = self._get_cash_open_close_box_lines(cr, uid, context)
+            if vals.get('starting_details_ids', False):
+                for start in vals.get('starting_details_ids'):
+                    dict_val = start[2]
+                    for end in open_close['end']:
+                       if end[2]['pieces'] == dict_val['pieces']:
+                           end[2]['number'] += dict_val['number']
+            vals.update({
+#                'ending_details_ids': open_close['start'],
+                'starting_details_ids': open_close['end']
+            })
+        else:
+            vals.update({
+                'ending_details_ids': False,
+                'starting_details_ids': False
+            })
+        res_id = super(account_cash_statement, self).create(cr, uid, vals, context=context)
+        self.write(cr, uid, [res_id], {})
+        return res_id
+
+    def write(self, cr, uid, ids, vals, context=None):
+        """
+        Update redord(s) comes in {ids}, with new value comes as {vals}
+        return True on success, False otherwise
+
+        @param cr: cursor to database
+        @param user: id of current user
+        @param ids: list of record ids to be update
+        @param vals: dict of new values to be set
+        @param context: context arguments, like lang, time zone
+
+        @return: True on success, False otherwise
+        """
+
+        super(account_cash_statement, self).write(cr, uid, ids, vals, context=context)
+        res = self._get_starting_balance(cr, uid, ids)
+        for rs in res:
+            super(account_cash_statement, self).write(cr, uid, [rs], res.get(rs))
+        return True
+
+    def onchange_journal_id(self, cr, uid, statement_id, journal_id, context=None):
+        """ Changes balance start and starting details if journal_id changes"
+        @param statement_id: Changed statement_id
+        @param journal_id: Changed journal_id
+        @return:  Dictionary of changed values
+        """
+        res = {}
+        balance_start = 0.0
+        if not journal_id:
+            res.update({
+                'balance_start': balance_start
+            })
+            return res
+        return super(account_cash_statement, self).onchange_journal_id(cr, uid, statement_id, journal_id, context=context)
+
+    def _equal_balance(self, cr, uid, cash_id, context=None):
+        statement = self.browse(cr, uid, cash_id, context=context)
+        self.write(cr, uid, [cash_id], {'balance_end_real': statement.balance_end})
+        statement.balance_end_real = statement.balance_end
+        if statement.balance_end != statement.balance_end_cash:
+            return False
+        return True
+
+    def _user_allow(self, cr, uid, statement_id, context=None):
+        return True
+
+    def button_open(self, cr, uid, ids, context=None):
+        """ Changes statement state to Running.
+        @return: True
+        """
+        obj_seq = self.pool.get('ir.sequence')
+        if context is None:
+            context = {}
+        statement_pool = self.pool.get('account.bank.statement')
+        for statement in statement_pool.browse(cr, uid, ids, context=context):
+            vals = {}
+            if not self._user_allow(cr, uid, statement.id, context=context):
+                raise osv.except_osv(_('Error !'), (_('User %s does not have rights to access %s journal !') % (statement.user_id.name, statement.journal_id.name)))
+
+            if statement.name and statement.name == '/':
+                if statement.journal_id.sequence_id:
+                    c = {'fiscalyear_id': statement.period_id.fiscalyear_id.id}
+                    st_number = obj_seq.next_by_id(cr, uid, statement.journal_id.sequence_id.id, context=c)
+                else:
+                    st_number = obj_seq.next_by_code(cr, uid, 'account.cash.statement')
+                vals.update({
+                    'name': st_number
+                })
+
+            vals.update({
+                'state': 'open',
+            })
+            self.write(cr, uid, [statement.id], vals, context=context)
+        return True
+
+    def balance_check(self, cr, uid, cash_id, journal_type='bank', context=None):
+        if journal_type == 'bank':
+            return super(account_cash_statement, self).balance_check(cr, uid, cash_id, journal_type, context)
+        if not self._equal_balance(cr, uid, cash_id, context):
+            raise osv.except_osv(_('Error !'), _('The closing balance should be the same than the computed balance !'))
+        return True
+
+    def statement_close(self, cr, uid, ids, journal_type='bank', context=None):
+        if journal_type == 'bank':
+            return super(account_cash_statement, self).statement_close(cr, uid, ids, journal_type, context)
+        vals = {
+            'state':'confirm',
+            'closing_date': time.strftime("%Y-%m-%d %H:%M:%S")
+        }
+        return self.write(cr, uid, ids, vals, context=context)
+
+    def check_status_condition(self, cr, uid, state, journal_type='bank'):
+        if journal_type == 'bank':
+            return super(account_cash_statement, self).check_status_condition(cr, uid, state, journal_type)
+        return state=='open'
+
+    def button_confirm_cash(self, cr, uid, ids, context=None):
+        super(account_cash_statement, self).button_confirm_bank(cr, uid, ids, context=context)
+        return self.write(cr, uid, ids, {'closing_date': time.strftime("%Y-%m-%d %H:%M:%S")}, context=context)
+
+    def button_cancel(self, cr, uid, ids, context=None):
+        cash_box_line_pool = self.pool.get('account.cashbox.line')
+        super(account_cash_statement, self).button_cancel(cr, uid, ids, context=context)
+        for st in self.browse(cr, uid, ids, context):
+            for end in st.ending_details_ids:
+                cash_box_line_pool.write(cr, uid, [end.id], {'number': 0})
+        return True
+
+account_cash_statement()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'account/account_end_fy.xml'
--- account/account_end_fy.xml	1970-01-01 00:00:00 +0000
+++ account/account_end_fy.xml	2011-10-06 16:09:39 +0000
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        
+        <record id="action_account_period_tree" model="ir.actions.act_window">
+            <field name="name">Close a Period</field>
+            <field name="res_model">account.period</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="view_account_period_tree"/>
+            <field name="context">{'search_default_draft': 1}</field>
+            <field name="help">A period is a fiscal period of time during which accounting entries should be recorded for accounting related activities. Monthly period is the norm but depending on your countries or company needs, you could also have quarterly periods. Closing a period will make it impossible to record new accounting entries, all new entries should then be made on the following open period. Close a period when you do not want to record new entries and want to lock this period for tax related calculation.</field>
+        </record>
+        <menuitem
+            action="action_account_period_tree"
+            id="menu_action_account_period_close_tree"
+            parent="account.menu_account_end_year_treatments"
+            sequence="0" groups="base.group_extended"/>
+        
+    </data>
+</openerp>

=== added file 'account/account_installer.xml'
--- account/account_installer.xml	1970-01-01 00:00:00 +0000
+++ account/account_installer.xml	2011-10-06 16:09:39 +0000
@@ -0,0 +1,112 @@
+<openerp>
+    <data>
+        <record id="view_account_configuration_installer" model="ir.ui.view">
+            <field name="name">account.installer.form</field>
+            <field name="model">account.installer</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.res_config_installer"/>
+            <field name="arch" type="xml">
+            <data>
+                <form position="attributes">
+                    <attribute name="string">Accounting Application Configuration</attribute>
+                </form>
+                <separator string="title" position="attributes">
+                    <attribute name="string">Configure Your Chart of Accounts</attribute>
+                </separator>
+                <xpath expr="//label[@string='description']" position="attributes">
+                    <attribute name="string">The default Chart of Accounts is matching your country selection. If no certified Chart of Accounts exists for your specified country, a generic one can be installed and will be selected by default.</attribute>
+                </xpath>
+                <xpath expr="//button[@string='Install Modules']" position="attributes">
+                    <attribute name="string">Configure</attribute>
+                </xpath>
+                <xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
+                    <attribute name="rowspan">23</attribute>
+                    <attribute name="string"/>
+                </xpath>
+                <group colspan="8" position="inside">
+                    <group colspan="4" width="600">
+                        <field name="charts"/>
+                            <group colspan="4" groups="account.group_account_user">
+                                <separator col="4" colspan="4" string="Configure Fiscal Year"/>
+                                <field name="company_id" colspan="4" widget="selection"/><!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
+                                <field name="date_start" on_change="on_change_start_date(date_start)"/>
+                                <field name="date_stop"/>
+                                <field name="period" colspan="4"/>
+                            </group>
+                            <group colspan="4" attrs="{'invisible':[('charts','!=','configurable')]}">
+                                <field name="sale_tax" on_change="on_change_tax(sale_tax)" attrs="{'required':[('charts','=','configurable')]}"/>
+                                <field name="purchase_tax" groups="base.group_extended"/>
+                            </group>
+                        </group>
+                    </group>
+                </data>
+            </field>
+        </record>
+
+        <record id="action_account_configuration_installer" model="ir.actions.act_window">
+            <field name="name">Install your Chart of Accounts</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.installer</field>
+            <field name="view_id" ref="view_account_configuration_installer"/>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
+        <record id="category_accounting_configuration" model="ir.actions.todo.category">
+            <field name="name">Accounting</field>
+            <field name="sequence">5</field>
+        </record>    
+
+        <record id="account_configuration_installer_todo" model="ir.actions.todo">
+            <field name="action_id" ref="action_account_configuration_installer"/>
+            <field name="category_id" ref="category_accounting_configuration"/>
+            <field name="sequence">3</field>
+            <field name="type">automatic</field>
+        </record>
+
+        <record id="action_view_financial_accounts_installer" model="ir.actions.act_window">
+            <field name="name">Review your Financial Accounts</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.account</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="context">{'config_invisible': False}</field>
+        </record>
+
+        <record id="view_financial_accounts_todo" model="ir.actions.todo">
+            <field name="action_id" ref="action_view_financial_accounts_installer" />
+            <field name="category_id" ref="category_accounting_configuration" />
+            <field name="groups_id" eval="[(6, 0, [ref('account.group_account_user')])]" />
+        </record>
+
+        <record id="action_review_financial_journals_installer" model="ir.actions.act_window">
+            <field name="name">Review your Financial Journals</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.journal</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="help">Setup your accounting journals. For bank accounts, it's better to use the 'Setup Your Bank Accounts' tool that will automatically create the accounts and journals for you.</field>
+        </record>
+
+        <record id="review_financial_journals_todo" model="ir.actions.todo">
+            <field name="action_id" ref="action_review_financial_journals_installer" />
+            <field name="category_id" ref="category_accounting_configuration" />
+            <field name="groups_id" eval="[(6, 0, [ref('account.group_account_user')])]" />
+        </record>
+        <record id="action_review_payment_terms_installer" model="ir.actions.act_window">
+            <field name="name">Review your Payment Terms</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.payment.term</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="help">Payment terms define the conditions to pay a customer or supplier invoice in one or several payments. Customers periodic reminders will use the payment terms for each letter. Each customer or supplier can be assigned to one of these payment terms.</field>
+        </record>
+
+        <record id="review_payment_terms_todo" model="ir.actions.todo">
+            <field name="action_id" ref="action_review_payment_terms_installer" />
+            <field name="category_id" ref="category_accounting_configuration" />
+            <field name="groups_id" eval="[(6, 0, [ref('account.group_account_user')])]" />
+        </record>
+    </data>
+</openerp>

=== added file 'account/account_invoice.py'
--- account/account_invoice.py	1970-01-01 00:00:00 +0000
+++ account/account_invoice.py	2011-10-06 16:09:39 +0000
@@ -0,0 +1,1641 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import time
+from lxml import etree
+import decimal_precision as dp
+
+import netsvc
+import pooler
+from osv import fields, osv, orm
+from tools.translate import _
+
+class account_invoice(osv.osv):
+    def _amount_all(self, cr, uid, ids, name, args, context=None):
+        res = {}
+        for invoice in self.browse(cr, uid, ids, context=context):
+            res[invoice.id] = {
+                'amount_untaxed': 0.0,
+                'amount_tax': 0.0,
+                'amount_total': 0.0
+            }
+            for line in invoice.invoice_line:
+                res[invoice.id]['amount_untaxed'] += line.price_subtotal
+            for line in invoice.tax_line:
+                res[invoice.id]['amount_tax'] += line.amount
+            res[invoice.id]['amount_total'] = res[invoice.id]['amount_tax'] + res[invoice.id]['amount_untaxed']
+        return res
+
+    def _get_journal(self, cr, uid, context=None):
+        if context is None:
+            context = {}
+        type_inv = context.get('type', 'out_invoice')
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+        company_id = context.get('company_id', user.company_id.id)
+        type2journal = {'out_invoice': 'sale', 'in_invoice': 'purchase', 'out_refund': 'sale_refund', 'in_refund': 'purchase_refund'}
+        journal_obj = self.pool.get('account.journal')
+        res = journal_obj.search(cr, uid, [('type', '=', type2journal.get(type_inv, 'sale')),
+                                            ('company_id', '=', company_id)],
+                                                limit=1)
+        return res and res[0] or False
+
+    def _get_currency(self, cr, uid, context=None):
+        user = pooler.get_pool(cr.dbname).get('res.users').browse(cr, uid, [uid], context=context)[0]
+        if user.company_id:
+            return user.company_id.currency_id.id
+        return pooler.get_pool(cr.dbname).get('res.currency').search(cr, uid, [('rate','=', 1.0)])[0]
+
+    def _get_journal_analytic(self, cr, uid, type_inv, context=None):
+        type2journal = {'out_invoice': 'sale', 'in_invoice': 'purchase', 'out_refund': 'sale', 'in_refund': 'purchase'}
+        tt = type2journal.get(type_inv, 'sale')
+        result = self.pool.get('account.analytic.journal').search(cr, uid, [('type','=',tt)], context=context)
+        if not result:
+            raise osv.except_osv(_('No Analytic Journal !'),_("You must define an analytic journal of type '%s' !") % (tt,))
+        return result[0]
+
+    def _get_type(self, cr, uid, context=None):
+        if context is None:
+            context = {}
+        return context.get('type', 'out_invoice')
+
+    def _reconciled(self, cr, uid, ids, name, args, context=None):
+        res = {}
+        for id in ids:
+            res[id] = self.test_paid(cr, uid, [id])
+        return res
+
+    def _get_reference_type(self, cr, uid, context=None):
+        return [('none', _('Free Reference'))]
+
+    def _amount_residual(self, cr, uid, ids, name, args, context=None):
+        result = {}
+        for invoice in self.browse(cr, uid, ids, context=context):
+            result[invoice.id] = 0.0
+            if invoice.move_id:
+                for m in invoice.move_id.line_id:
+                    if m.account_id.type in ('receivable','payable'):
+                        result[invoice.id] += m.amount_residual_currency
+        return result
+
+    # Give Journal Items related to the payment reconciled to this invoice
+    # Return ids of partial and total payments related to the selected invoices
+    def _get_lines(self, cr, uid, ids, name, arg, context=None):
+        res = {}
+        for invoice in self.browse(cr, uid, ids, context=context):
+            id = invoice.id
+            res[id] = []
+            if not invoice.move_id:
+                continue
+            data_lines = [x for x in invoice.move_id.line_id if x.account_id.id == invoice.account_id.id]
+            partial_ids = []
+            for line in data_lines:
+                ids_line = []
+                if line.reconcile_id:
+                    ids_line = line.reconcile_id.line_id
+                elif line.reconcile_partial_id:
+                    ids_line = line.reconcile_partial_id.line_partial_ids
+                l = map(lambda x: x.id, ids_line)
+                partial_ids.append(line.id)
+                res[id] =[x for x in l if x <> line.id and x not in partial_ids]
+        return res
+
+    def _get_invoice_line(self, cr, uid, ids, context=None):
+        result = {}
+        for line in self.pool.get('account.invoice.line').browse(cr, uid, ids, context=context):
+            result[line.invoice_id.id] = True
+        return result.keys()
+
+    def _get_invoice_tax(self, cr, uid, ids, context=None):
+        result = {}
+        for tax in self.pool.get('account.invoice.tax').browse(cr, uid, ids, context=context):
+            result[tax.invoice_id.id] = True
+        return result.keys()
+
+    def _compute_lines(self, cr, uid, ids, name, args, context=None):
+        result = {}
+        for invoice in self.browse(cr, uid, ids, context=context):
+            src = []
+            lines = []
+            if invoice.move_id:
+                for m in invoice.move_id.line_id:
+                    temp_lines = []
+                    if m.reconcile_id:
+                        temp_lines = map(lambda x: x.id, m.reconcile_id.line_id)
+                    elif m.reconcile_partial_id:
+                        temp_lines = map(lambda x: x.id, m.reconcile_partial_id.line_partial_ids)
+                    lines += [x for x in temp_lines if x not in lines]
+                    src.append(m.id)
+
+            lines = filter(lambda x: x not in src, lines)
+            result[invoice.id] = lines
+        return result
+
+    def _get_invoice_from_line(self, cr, uid, ids, context=None):
+        move = {}
+        for line in self.pool.get('account.move.line').browse(cr, uid, ids, context=context):
+            if line.reconcile_partial_id:
+                for line2 in line.reconcile_partial_id.line_partial_ids:
+                    move[line2.move_id.id] = True
+            if line.reconcile_id:
+                for line2 in line.reconcile_id.line_id:
+                    move[line2.move_id.id] = True
+        invoice_ids = []
+        if move:
+            invoice_ids = self.pool.get('account.invoice').search(cr, uid, [('move_id','in',move.keys())], context=context)
+        return invoice_ids
+
+    def _get_invoice_from_reconcile(self, cr, uid, ids, context=None):
+        move = {}
+        for r in self.pool.get('account.move.reconcile').browse(cr, uid, ids, context=context):
+            for line in r.line_partial_ids:
+                move[line.move_id.id] = True
+            for line in r.line_id:
+                move[line.move_id.id] = True
+
+        invoice_ids = []
+        if move:
+            invoice_ids = self.pool.get('account.invoice').search(cr, uid, [('move_id','in',move.keys())], context=context)
+        return invoice_ids
+
+    _name = "account.invoice"
+    _description = 'Invoice'
+    _order = "id desc"
+
+    _columns = {
+        'name': fields.char('Description', size=64, select=True, readonly=True, states={'draft':[('readonly',False)]}),
+        'origin': fields.char('Source Document', size=64, help="Reference of the document that produced this invoice.", readonly=True, states={'draft':[('readonly',False)]}),
+        'type': fields.selection([
+            ('out_invoice','Customer Invoice'),
+            ('in_invoice','Supplier Invoice'),
+            ('out_refund','Customer Refund'),
+            ('in_refund','Supplier Refund'),
+            ],'Type', readonly=True, select=True, change_default=True),
+
+        'number': fields.related('move_id','name', type='char', readonly=True, size=64, relation='account.move', store=True, string='Number'),
+        'internal_number': fields.char('Invoice Number', size=32, readonly=True, help="Unique number of the invoice, computed automatically when the invoice is created."),
+        'reference': fields.char('Invoice Reference', size=64, help="The partner reference of this invoice."),
+        'reference_type': fields.selection(_get_reference_type, 'Reference Type',
+            required=True, readonly=True, states={'draft':[('readonly',False)]}),
+        'comment': fields.text('Additional Information'),
+
+        'state': fields.selection([
+            ('draft','Draft'),
+            ('proforma','Pro-forma'),
+            ('proforma2','Pro-forma'),
+            ('open','Open'),
+            ('paid','Paid'),
+            ('cancel','Cancelled')
+            ],'State', select=True, readonly=True,
+            help=' * The \'Draft\' state is used when a user is encoding a new and unconfirmed Invoice. \
+            \n* The \'Pro-forma\' when invoice is in Pro-forma state,invoice does not have an invoice number. \
+            \n* The \'Open\' state is used when user create invoice,a invoice number is generated.Its in open state till user does not pay invoice. \
+            \n* The \'Paid\' state is set automatically when invoice is paid.\
+            \n* The \'Cancelled\' state is used when user cancel invoice.'),
+        'date_invoice': fields.date('Invoice Date', states={'paid':[('readonly',True)], 'open':[('readonly',True)], 'close':[('readonly',True)]}, select=True, help="Keep empty to use the current date"),
+        'date_due': fields.date('Due Date', states={'paid':[('readonly',True)], 'open':[('readonly',True)], 'close':[('readonly',True)]}, select=True,
+            help="If you use payment terms, the due date will be computed automatically at the generation "\
+                "of accounting entries. If you keep the payment term and the due date empty, it means direct payment. The payment term may compute several due dates, for example 50% now, 50% in one month."),
+        'partner_id': fields.many2one('res.partner', 'Partner', change_default=True, readonly=True, required=True, states={'draft':[('readonly',False)]}),
+        'address_contact_id': fields.many2one('res.partner.address', 'Contact Address', readonly=True, states={'draft':[('readonly',False)]}),
+        'address_invoice_id': fields.many2one('res.partner.address', 'Invoice Address', readonly=True, required=True, states={'draft':[('readonly',False)]}),
+        'payment_term': fields.many2one('account.payment.term', 'Payment Term',readonly=True, states={'draft':[('readonly',False)]},
+            help="If you use payment terms, the due date will be computed automatically at the generation "\
+                "of accounting entries. If you keep the payment term and the due date empty, it means direct payment. "\
+                "The payment term may compute several due dates, for example 50% now, 50% in one month."),
+        'period_id': fields.many2one('account.period', 'Force Period', domain=[('state','<>','done')], help="Keep empty to use the period of the validation(invoice) date.", readonly=True, states={'draft':[('readonly',False)]}),
+
+        'account_id': fields.many2one('account.account', 'Account', required=True, readonly=True, states={'draft':[('readonly',False)]}, help="The partner account used for this invoice."),
+        'invoice_line': fields.one2many('account.invoice.line', 'invoice_id', 'Invoice Lines', readonly=True, states={'draft':[('readonly',False)]}),
+        'tax_line': fields.one2many('account.invoice.tax', 'invoice_id', 'Tax Lines', readonly=True, states={'draft':[('readonly',False)]}),
+
+        'move_id': fields.many2one('account.move', 'Journal Entry', readonly=True, select=1, ondelete='restrict', help="Link to the automatically generated Journal Items."),
+        'amount_untaxed': fields.function(_amount_all, digits_compute=dp.get_precision('Account'), string='Untaxed',
+            store={
+                'account.invoice': (lambda self, cr, uid, ids, c={}: ids, ['invoice_line'], 20),
+                'account.invoice.tax': (_get_invoice_tax, None, 20),
+                'account.invoice.line': (_get_invoice_line, ['price_unit','invoice_line_tax_id','quantity','discount','invoice_id'], 20),
+            },