[ADD] analytic_contract_hr_expense: split of features of account_analytic_analysis...
[odoo/odoo.git] / addons / account_analytic_analysis / account_analytic_analysis.py
index 4350f0a..76aba53 100644 (file)
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution  
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
+#    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 General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
+#    GNU Affero General Public License for more details.
 #
-#    You should have received a copy of the GNU General Public License
+#    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 operator
+
 from osv import osv, fields
-from osv.orm import intersect
-import tools.sql 
+from osv.orm import intersect, except_orm
+import tools.sql
 from tools.translate import _
+from decimal_precision import decimal_precision as dp
 
 
 class account_analytic_account(osv.osv):
     _name = "account.analytic.account"
     _inherit = "account.analytic.account"
 
-    def _ca_invoiced_calc(self, cr, uid, ids, name, arg, context={}):
-        res = {}
-        ids2 = self.search(cr, uid, [('parent_id', 'child_of', ids)])
-        if ids2:
-            acc_set = ",".join(map(str, ids2))
-            cr.execute("select account_analytic_line.account_id, sum(amount) \
-                    from account_analytic_line \
-                    join account_analytic_journal \
-                        on account_analytic_line.journal_id = account_analytic_journal.id  \
-                    where account_analytic_line.account_id IN (%s) \
-                        and account_analytic_journal.type = 'sale' \
-                    group by account_analytic_line.account_id" % acc_set)
-            for account_id, sum in cr.fetchall():
-                res[account_id] = round(sum,2)
-        for obj_id in ids:
-            res.setdefault(obj_id, 0.0)
-            for child_id in self.search(cr, uid,
-                    [('parent_id', 'child_of', [obj_id])]):
-                if child_id != obj_id:
-                    res[obj_id] += res.get(child_id, 0.0)
-        for id in ids:
-            res[id] = round(res.get(id, 0.0),2)
+    def _analysis_all(self, cr, uid, ids, fields, arg, context=None):
+        dp = 2
+        res = dict([(i, {}) for i in ids])
+        parent_ids = tuple(ids) #We don't want consolidation for each of these fields because those complex computation is resource-greedy.
+        accounts = self.browse(cr, uid, ids, context=context)
+
+        for f in fields:
+            if f == 'user_ids':
+                cr.execute('SELECT MAX(id) FROM res_users')
+                max_user = cr.fetchone()[0]
+                if parent_ids:
+                    cr.execute('SELECT DISTINCT("user") FROM account_analytic_analysis_summary_user ' \
+                               'WHERE account_id IN %s AND unit_amount <> 0.0', (parent_ids,))
+                    result = cr.fetchall()
+                else:
+                    result = []
+                for id in ids:
+                    res[id][f] = [int((id * max_user) + x[0]) for x in result]
+            elif f == 'month_ids':
+                if parent_ids:
+                    cr.execute('SELECT DISTINCT(month_id) FROM account_analytic_analysis_summary_month ' \
+                               'WHERE account_id IN %s AND unit_amount <> 0.0', (parent_ids,))
+                    result = cr.fetchall()
+                else:
+                    result = []
+                for id in ids:
+                    res[id][f] = [int(id * 1000000 + int(x[0])) for x in result]
+            elif f == 'last_worked_invoiced_date':
+                for id in ids:
+                    res[id][f] = False
+                if parent_ids:
+                    cr.execute("SELECT account_analytic_line.account_id, MAX(date) \
+                            FROM account_analytic_line \
+                            WHERE account_id IN %s \
+                                AND invoice_id IS NOT NULL \
+                            GROUP BY account_analytic_line.account_id;", (parent_ids,))
+                    for account_id, sum in cr.fetchall():
+                        if account_id not in res:
+                            res[account_id] = {}
+                        res[account_id][f] = sum
+            elif f == 'ca_to_invoice':
+                for id in ids:
+                    res[id][f] = 0.0
+                res2 = {}
+                if parent_ids:
+                    # Amount uninvoiced hours to invoice at sale price
+                    # Warning
+                    # This computation doesn't take care of pricelist !
+                    # Just consider list_price
+                    cr.execute("""SELECT account_analytic_account.id, \
+                                COALESCE(SUM (product_template.list_price * \
+                                    account_analytic_line.unit_amount * \
+                                    ((100-hr_timesheet_invoice_factor.factor)/100)), 0.0) \
+                                    AS ca_to_invoice \
+                            FROM product_template \
+                            JOIN product_product \
+                                ON product_template.id = product_product.product_tmpl_id \
+                            JOIN account_analytic_line \
+                                ON account_analytic_line.product_id = product_product.id \
+                            JOIN account_analytic_journal \
+                                ON account_analytic_line.journal_id = account_analytic_journal.id \
+                            JOIN account_analytic_account \
+                                ON account_analytic_account.id = account_analytic_line.account_id \
+                            JOIN hr_timesheet_invoice_factor \
+                                ON hr_timesheet_invoice_factor.id = account_analytic_account.to_invoice \
+                            WHERE account_analytic_account.id IN %s \
+                                AND account_analytic_line.invoice_id IS NULL \
+                                AND account_analytic_line.to_invoice IS NOT NULL \
+                                AND account_analytic_journal.type IN ('purchase', 'general') \
+                            GROUP BY account_analytic_account.id;""", (parent_ids,))
+                    for account_id, sum in cr.fetchall():
+                        if account_id not in res:
+                            res[account_id] = {}
+                        res[account_id][f] = round(sum, dp)
+
+                # sum both result on account_id
+                for id in ids:
+                    res[id][f] = round(res.get(id, {}).get(f, 0.0), dp) + round(res2.get(id, 0.0), 2)
+            elif f == 'last_invoice_date':
+                for id in ids:
+                    res[id][f] = False
+                if parent_ids:
+                    cr.execute ("SELECT account_analytic_line.account_id, \
+                                DATE(MAX(account_invoice.date_invoice)) \
+                            FROM account_analytic_line \
+                            JOIN account_invoice \
+                                ON account_analytic_line.invoice_id = account_invoice.id \
+                            WHERE account_analytic_line.account_id IN %s \
+                                AND account_analytic_line.invoice_id IS NOT NULL \
+                            GROUP BY account_analytic_line.account_id",(parent_ids,))
+                    for account_id, lid in cr.fetchall():
+                        res[account_id][f] = lid
+            elif f == 'last_worked_date':
+                for id in ids:
+                    res[id][f] = False
+                if parent_ids:
+                    cr.execute("SELECT account_analytic_line.account_id, MAX(date) \
+                            FROM account_analytic_line \
+                            WHERE account_id IN %s \
+                                AND invoice_id IS NULL \
+                            GROUP BY account_analytic_line.account_id",(parent_ids,))
+                    for account_id, lwd in cr.fetchall():
+                        if account_id not in res:
+                            res[account_id] = {}
+                        res[account_id][f] = lwd
+            elif f == 'hours_qtt_non_invoiced':
+                for id in ids:
+                    res[id][f] = 0.0
+                if parent_ids:
+                    cr.execute("SELECT account_analytic_line.account_id, COALESCE(SUM(unit_amount), 0.0) \
+                            FROM account_analytic_line \
+                            JOIN account_analytic_journal \
+                                ON account_analytic_line.journal_id = account_analytic_journal.id \
+                            WHERE account_analytic_line.account_id IN %s \
+                                AND account_analytic_journal.type='general' \
+                                AND invoice_id IS NULL \
+                                AND to_invoice IS NOT NULL \
+                            GROUP BY account_analytic_line.account_id;",(parent_ids,))
+                    for account_id, sua in cr.fetchall():
+                        if account_id not in res:
+                            res[account_id] = {}
+                        res[account_id][f] = round(sua, dp)
+                for id in ids:
+                    res[id][f] = round(res[id][f], dp)
+            elif f == 'hours_quantity':
+                for id in ids:
+                    res[id][f] = 0.0
+                if parent_ids:
+                    cr.execute("SELECT account_analytic_line.account_id, COALESCE(SUM(unit_amount), 0.0) \
+                            FROM account_analytic_line \
+                            JOIN account_analytic_journal \
+                                ON account_analytic_line.journal_id = account_analytic_journal.id \
+                            WHERE account_analytic_line.account_id IN %s \
+                                AND account_analytic_journal.type='general' \
+                            GROUP BY account_analytic_line.account_id",(parent_ids,))
+                    ff =  cr.fetchall()
+                    for account_id, hq in ff:
+                        if account_id not in res:
+                            res[account_id] = {}
+                        res[account_id][f] = round(hq, dp)
+                for id in ids:
+                    res[id][f] = round(res[id][f], dp)
+            elif f == 'ca_theorical':
+                # TODO Take care of pricelist and purchase !
+                for id in ids:
+                    res[id][f] = 0.0
+                # Warning
+                # This computation doesn't take care of pricelist !
+                # Just consider list_price
+                if parent_ids:
+                    cr.execute("""SELECT account_analytic_line.account_id AS account_id, \
+                                COALESCE(SUM((account_analytic_line.unit_amount * pt.list_price) \
+                                    - (account_analytic_line.unit_amount * pt.list_price \
+                                        * hr.factor)), 0.0) AS somme
+                            FROM account_analytic_line \
+                            LEFT JOIN account_analytic_journal \
+                                ON (account_analytic_line.journal_id = account_analytic_journal.id) \
+                            JOIN product_product pp \
+                                ON (account_analytic_line.product_id = pp.id) \
+                            JOIN product_template pt \
+                                ON (pp.product_tmpl_id = pt.id) \
+                            JOIN account_analytic_account a \
+                                ON (a.id=account_analytic_line.account_id) \
+                            JOIN hr_timesheet_invoice_factor hr \
+                                ON (hr.id=a.to_invoice) \
+                        WHERE account_analytic_line.account_id IN %s \
+                            AND a.to_invoice IS NOT NULL \
+                            AND account_analytic_journal.type IN ('purchase', 'general')
+                        GROUP BY account_analytic_line.account_id""",(parent_ids,))
+                    for account_id, sum in cr.fetchall():
+                        res[account_id][f] = round(sum, dp)
         return res
 
-    def _ca_to_invoice_calc(self, cr, uid, ids, name, arg, context={}):
+    def _ca_invoiced_calc(self, cr, uid, ids, name, arg, context=None):
         res = {}
-        res2 = {}
-        ids2 = self.search(cr, uid, [('parent_id', 'child_of', ids)])
-        if ids2:
-            # Amount uninvoiced hours to invoice at sale price
-            acc_set = ",".join(map(str, ids2))
-            cr.execute("""SELECT account_analytic_account.id, \
-                        sum (product_template.list_price * \
-                            account_analytic_line.unit_amount * \
-                            ((100-hr_timesheet_invoice_factor.factor)/100)) \
-                            AS ca_to_invoice \
-                    FROM product_template \
-                    join product_product \
-                        on product_template.id = product_product.product_tmpl_id \
-                    JOIN account_analytic_line \
-                        on account_analytic_line.product_id = product_product.id \
+        res_final = {}
+        child_ids = tuple(ids) #We don't want consolidation for each of these fields because those complex computation is resource-greedy.
+        for i in child_ids:
+            res[i] =  0.0
+        if not child_ids:
+            return res
+
+        if child_ids:
+            cr.execute("SELECT account_analytic_line.account_id, COALESCE(SUM(amount), 0.0) \
+                    FROM account_analytic_line \
                     JOIN account_analytic_journal \
-                        on account_analytic_line.journal_id = account_analytic_journal.id \
-                    JOIN account_analytic_account \
-                        on account_analytic_account.id = account_analytic_line.account_id \
-                    JOIN hr_timesheet_invoice_factor \
-                        on hr_timesheet_invoice_factor.id = account_analytic_account.to_invoice \
-                    WHERE account_analytic_account.id IN (%s) \
-                        AND account_analytic_line.invoice_id is null \
-                        AND account_analytic_line.to_invoice IS NOT NULL \
-                        and account_analytic_journal.type in ('purchase','general') \
-                    GROUP BY account_analytic_account.id;"""%acc_set)
-            for account_id, sum in cr.fetchall():
-                res[account_id] = round(sum,2)
-
-            # Expense amount and purchase invoice
-            #acc_set = ",".join(map(str, ids2))
-            #cr.execute ("select account_analytic_line.account_id, sum(amount) \
-            #        from account_analytic_line \
-            #        join account_analytic_journal \
-            #            on account_analytic_line.journal_id = account_analytic_journal.id \
-            #        where account_analytic_line.account_id IN (%s) \
-            #            and account_analytic_journal.type = 'purchase' \
-            #        GROUP BY account_analytic_line.account_id;"%acc_set)
-            #for account_id, sum in cr.fetchall():
-            #    res2[account_id] = round(sum,2)
-        for obj_id in ids:
-            res.setdefault(obj_id, 0.0)
-            res2.setdefault(obj_id, 0.0)
-            for child_id in self.search(cr, uid,
-                    [('parent_id', 'child_of', [obj_id])]):
-                if child_id != obj_id:
-                    res[obj_id] += res.get(child_id, 0.0)
-                    res2[obj_id] += res2.get(child_id, 0.0)
-        # sum both result on account_id
-        for id in ids:
-            res[id] = round(res.get(id, 0.0),2) + round(res2.get(id, 0.0),2)
-        return res
-
-    def _hours_qtt_non_invoiced_calc (self, cr, uid, ids, name, arg, context={}):
-        res = {}
-        ids2 = self.search(cr, uid, [('parent_id', 'child_of', ids)])
-        if ids2:
-            acc_set = ",".join(map(str, ids2))
-            cr.execute("select account_analytic_line.account_id, sum(unit_amount) \
-                    from account_analytic_line \
-                    join account_analytic_journal \
-                        on account_analytic_line.journal_id = account_analytic_journal.id \
-                    where account_analytic_line.account_id IN (%s) \
-                        and account_analytic_journal.type='general' \
-                        and invoice_id is null \
-                        AND to_invoice IS NOT NULL \
-                    GROUP BY account_analytic_line.account_id;"%acc_set)
+                        ON account_analytic_line.journal_id = account_analytic_journal.id  \
+                    WHERE account_analytic_line.account_id IN %s \
+                        AND account_analytic_journal.type = 'sale' \
+                    GROUP BY account_analytic_line.account_id", (child_ids,))
             for account_id, sum in cr.fetchall():
                 res[account_id] = round(sum,2)
-        for obj_id in ids:
-            res.setdefault(obj_id, 0.0)
-            for child_id in self.search(cr, uid,
-                    [('parent_id', 'child_of', [obj_id])]):
-                if child_id != obj_id:
-                    res[obj_id] += res.get(child_id, 0.0)
-        for id in ids:
-            res[id] = round(res.get(id, 0.0),2)
-        return res
+        res_final = res
+        return res_final
 
-    def _hours_quantity_calc(self, cr, uid, ids, name, arg, context={}):
+    def _total_cost_calc(self, cr, uid, ids, name, arg, context=None):
         res = {}
-        ids2 = self.search(cr, uid, [('parent_id', 'child_of', ids)])
-        if ids2:
-            acc_set = ",".join(map(str, ids2))
-            cr.execute("select account_analytic_line.account_id,sum(unit_amount) \
-                    from account_analytic_line \
-                    join account_analytic_journal \
-                        on account_analytic_line.journal_id = account_analytic_journal.id \
-                    where account_analytic_line.account_id IN (%s) \
-                        and account_analytic_journal.type='general' \
-                    GROUP BY account_analytic_line.account_id"%acc_set)
-            for account_id, sum in cr.fetchall():
-                res[account_id] = round(sum,2)
-        for obj_id in ids:
-            res.setdefault(obj_id, 0.0)
-            for child_id in self.search(cr, uid,
-                    [('parent_id', 'child_of', [obj_id])]):
-                if child_id != obj_id:
-                    res[obj_id] += res.get(child_id, 0.0)
-        for id in ids:
-            res[id] = round(res.get(id, 0.0),2)
-        return res
-
-    def _total_cost_calc(self, cr, uid, ids, name, arg, context={}):
-        res = {}
-        ids2 = self.search(cr, uid, [('parent_id', 'child_of', ids)])
-        if ids2:
-            acc_set = ",".join(map(str, ids2))
-            cr.execute("""select account_analytic_line.account_id,sum(amount) \
-                    from account_analytic_line \
-                    join account_analytic_journal \
-                        on account_analytic_line.journal_id = account_analytic_journal.id \
-                    where account_analytic_line.account_id IN (%s) \
-                        and amount<0 \
-                    GROUP BY account_analytic_line.account_id"""%acc_set)
+        res_final = {}
+        child_ids = tuple(ids) #We don't want consolidation for each of these fields because those complex computation is resource-greedy.
+        for i in child_ids:
+            res[i] =  0.0
+        if not child_ids:
+            return res
+        if child_ids:
+            cr.execute("""SELECT account_analytic_line.account_id, COALESCE(SUM(amount), 0.0) \
+                    FROM account_analytic_line \
+                    JOIN account_analytic_journal \
+                        ON account_analytic_line.journal_id = account_analytic_journal.id \
+                    WHERE account_analytic_line.account_id IN %s \
+                        AND amount<0 \
+                    GROUP BY account_analytic_line.account_id""",(child_ids,))
             for account_id, sum in cr.fetchall():
                 res[account_id] = round(sum,2)
-        for obj_id in ids:
-            res.setdefault(obj_id, 0.0)
-            for child_id in self.search(cr, uid,
-                    [('parent_id', 'child_of', [obj_id])]):
-                if child_id != obj_id:
-                    res[obj_id] += res.get(child_id, 0.0)
-        for id in ids:
-            res[id] = round(res.get(id, 0.0),2)
-        return res
-
-    def _ca_theorical_calc(self, cr, uid, ids, name, arg, context={}):
-        res = {}
-        res2 = {}
-        ids2 = self.search(cr, uid, [('parent_id', 'child_of', ids)])
-        if ids2:
-            acc_set = ",".join(map(str, ids2))
-            cr.execute("""select account_analytic_line.account_id as account_id, \
-                        sum((account_analytic_line.unit_amount * pt.list_price) \
-                            - (account_analytic_line.unit_amount * pt.list_price \
-                                * hr.factor)) as somme
-                    from account_analytic_line \
-                    left join account_analytic_journal \
-                        on (account_analytic_line.journal_id = account_analytic_journal.id) \
-                    join product_product pp \
-                        on (account_analytic_line.product_id = pp.id) \
-                    join product_template pt \
-                        on (pp.product_tmpl_id = pt.id) \
-                    join account_analytic_account a \
-                        on (a.id=account_analytic_line.account_id) \
-                    join hr_timesheet_invoice_factor hr \
-                        on (hr.id=a.to_invoice) \
-                where account_analytic_line.account_id IN (%s) \
-                    and a.to_invoice IS NOT NULL \
-                    and account_analytic_journal.type in ('purchase','general')
-                GROUP BY account_analytic_line.account_id"""%acc_set)
-            for account_id, sum in cr.fetchall():
-                res2[account_id] = round(sum,2)
-
-        for obj_id in ids:
-            res.setdefault(obj_id, 0.0)
-            res2.setdefault(obj_id, 0.0)
-            for child_id in self.search(cr, uid,
-                    [('parent_id', 'child_of', [obj_id])]):
-                if child_id != obj_id:
-                    res[obj_id] += res.get(child_id, 0.0)
-                    res[obj_id] += res2.get(child_id, 0.0)
-
-        # sum both result on account_id
-        for id in ids:
-            res[id] = round(res.get(id, 0.0),2) + round(res2.get(id, 0.0),2)
-        return res
+        res_final = res
+        return res_final
 
-    def _last_worked_date_calc (self, cr, uid, ids, name, arg, context={}):
+    def _remaining_hours_calc(self, cr, uid, ids, name, arg, context=None):
         res = {}
-        ids2 = self.search(cr, uid, [('parent_id', 'child_of', ids)])
-        if ids2:
-            acc_set = ",".join(map(str, ids2))
-            cr.execute("select account_analytic_line.account_id, max(date) \
-                    from account_analytic_line \
-                    where account_id IN (%s) \
-                        and invoice_id is null \
-                    GROUP BY account_analytic_line.account_id" % acc_set)
-            for account_id, sum in cr.fetchall():
-                res[account_id] = sum
-        for obj_id in ids:
-            res.setdefault(obj_id, '')
-            for child_id in self.search(cr, uid,
-                    [('parent_id', 'child_of', [obj_id])]):
-                if res[obj_id] < res.get(child_id, ''):
-                    res[obj_id] = res.get(child_id, '')
-        for id in ids:
-            res[id] = res.get(id, '')
-        return res
-
-    def _last_invoice_date_calc (self, cr, uid, ids, name, arg, context={}):
-        res = {}
-        ids2 = self.search(cr, uid, [('parent_id', 'child_of', ids)])
-        if ids2:
-            acc_set = ",".join(map(str, ids2))
-            cr.execute ("select account_analytic_line.account_id, \
-                        date(max(account_invoice.date_invoice)) \
-                    from account_analytic_line \
-                    join account_invoice \
-                        on account_analytic_line.invoice_id = account_invoice.id \
-                    where account_analytic_line.account_id IN (%s) \
-                        and account_analytic_line.invoice_id is not null \
-                    GROUP BY account_analytic_line.account_id"%acc_set)
-            for account_id, sum in cr.fetchall():
-                res[account_id] = sum
-        for obj_id in ids:
-            res.setdefault(obj_id, '')
-            for child_id in self.search(cr, uid,
-                    [('parent_id', 'child_of', [obj_id])]):
-                if res[obj_id] < res.get(child_id, ''):
-                    res[obj_id] = res.get(child_id, '')
-        for id in ids:
-            res[id] = res.get(id, '')
-        return res
-
-    def _last_worked_invoiced_date_calc (self, cr, uid, ids, name, arg, context={}):
-        res = {}
-        ids2 = self.search(cr, uid, [('parent_id', 'child_of', ids)])
-        if ids2:
-            acc_set = ",".join(map(str, ids2))
-            cr.execute("select account_analytic_line.account_id, max(date) \
-                    from account_analytic_line \
-                    where account_id IN (%s) \
-                        and invoice_id is not null \
-                    GROUP BY account_analytic_line.account_id;"%acc_set)
-            for account_id, sum in cr.fetchall():
-                res[account_id] = sum
-        for obj_id in ids:
-            res.setdefault(obj_id, '')
-            for child_id in self.search(cr, uid,
-                    [('parent_id', 'child_of', [obj_id])]):
-                if res[obj_id] < res.get(child_id, ''):
-                    res[obj_id] = res.get(child_id, '')
-        for id in ids:
-            res[id] = res.get(id, '')
-        return res
-
-    def _remaining_hours_calc(self, cr, uid, ids, name, arg, context={}):
-        res = {}
-        for account in self.browse(cr, uid, ids):
-            if account.quantity_max <> 0:
-                res[account.id] = account.quantity_max - account.hours_quantity
+        for account in self.browse(cr, uid, ids, context=context):
+            if account.quantity_max != 0:
+                res[account.id] = account.quantity_max - account.hours_qtt_invoiced
             else:
-                res[account.id]=0.0
+                res[account.id] = 0.0
         for id in ids:
             res[id] = round(res.get(id, 0.0),2)
         return res
 
-    def _hours_qtt_invoiced_calc(self, cr, uid, ids, name, arg, context={}):
+    def _hours_qtt_invoiced_calc(self, cr, uid, ids, name, arg, context=None):
         res = {}
-        for account in self.browse(cr, uid, ids):
+        for account in self.browse(cr, uid, ids, context=context):
             res[account.id] = account.hours_quantity - account.hours_qtt_non_invoiced
             if res[account.id] < 0:
-                res[account.id]=0.0
+                res[account.id] = 0.0
         for id in ids:
             res[id] = round(res.get(id, 0.0),2)
         return res
 
-    def _revenue_per_hour_calc(self, cr, uid, ids, name, arg, context={}):
+    def _revenue_per_hour_calc(self, cr, uid, ids, name, arg, context=None):
         res = {}
-        for account in self.browse(cr, uid, ids):
+        for account in self.browse(cr, uid, ids, context=context):
             if account.hours_qtt_invoiced == 0:
                 res[account.id]=0.0
             else:
@@ -326,12 +278,12 @@ class account_analytic_account(osv.osv):
             res[id] = round(res.get(id, 0.0),2)
         return res
 
-    def _real_margin_rate_calc(self, cr, uid, ids, name, arg, context={}):
+    def _real_margin_rate_calc(self, cr, uid, ids, name, arg, context=None):
         res = {}
-        for account in self.browse(cr, uid, ids):
+        for account in self.browse(cr, uid, ids, context=context):
             if account.ca_invoiced == 0:
                 res[account.id]=0.0
-            elif account.total_cost <> 0.0:
+            elif account.total_cost != 0.0:
                 res[account.id] = -(account.real_margin / account.total_cost) * 100
             else:
                 res[account.id] = 0.0
@@ -339,10 +291,10 @@ class account_analytic_account(osv.osv):
             res[id] = round(res.get(id, 0.0),2)
         return res
 
-    def _remaining_ca_calc(self, cr, uid, ids, name, arg, context={}):
+    def _remaining_ca_calc(self, cr, uid, ids, name, arg, context=None):
         res = {}
-        for account in self.browse(cr, uid, ids):
-            if account.amount_max <> 0:
+        for account in self.browse(cr, uid, ids, context=context):
+            if account.amount_max != 0:
                 res[account.id] = account.amount_max - account.ca_invoiced
             else:
                 res[account.id]=0.0
@@ -350,69 +302,162 @@ class account_analytic_account(osv.osv):
             res[id] = round(res.get(id, 0.0),2)
         return res
 
-    def _real_margin_calc(self, cr, uid, ids, name, arg, context={}):
+    def _real_margin_calc(self, cr, uid, ids, name, arg, context=None):
         res = {}
-        for account in self.browse(cr, uid, ids):
+        for account in self.browse(cr, uid, ids, context=context):
             res[account.id] = account.ca_invoiced + account.total_cost
         for id in ids:
             res[id] = round(res.get(id, 0.0),2)
         return res
 
-    def _theorical_margin_calc(self, cr, uid, ids, name, arg, context={}):
+    def _theorical_margin_calc(self, cr, uid, ids, name, arg, context=None):
         res = {}
-        for account in self.browse(cr, uid, ids):
+        for account in self.browse(cr, uid, ids, context=context):
             res[account.id] = account.ca_theorical + account.total_cost
         for id in ids:
             res[id] = round(res.get(id, 0.0),2)
         return res
 
-    def _month(self, cr, uid, ids, name, arg, context=None):
-        res = {}
-        for id in ids:
-            ids2 = self.search(cr, uid, [('parent_id', 'child_of', [id])])
-            cr.execute('SELECT DISTINCT(month_id) FROM account_analytic_analysis_summary_month ' \
-                    'WHERE account_id in (' + ','.join([str(x) for x in ids2]) + ') ' \
-                        'AND unit_amount <> 0.0')
-            res[id] = [int(id * 1000000 + int(x[0])) for x in cr.fetchall()]
-        return res
+    def _is_overdue_quantity(self, cr, uid, ids, fieldnames, args, context=None):
+        result = dict.fromkeys(ids, 0)
+        for record in self.browse(cr, uid, ids, context=context):
+            if record.quantity_max > 0.0:
+                result[record.id] = int(record.hours_quantity >= record.quantity_max)
+            else:
+                result[record.id] = 0
+        return result
+
+    def _get_analytic_account(self, cr, uid, ids, context=None):
+        result = set()
+        for line in self.pool.get('account.analytic.line').browse(cr, uid, ids, context=context):
+            result.add(line.account_id.id)
+        return list(result)
+
+    def _get_total_estimation(self, account):
+        tot_est = 0.0
+        if account.fix_price_invoices:
+            total_est += account.amount_max 
+        if account.invoice_on_timesheets:
+            tot_est += account.hours_qtt_est
+        return tot_est
+
+    def _get_total_invoiced(self, account):
+        total_invoiced = 0.0
+        if account.fix_price_invoices:
+            total_invoiced += account.ca_invoiced
+        if account.invoice_on_timesheets:
+            total_invoiced += account.hours_qtt_invoiced
+        return total_invoiced
+
+    def _get_total_remaining(self, account):
+        total_remaining = 0.0
+        if account.fix_price_invoices:
+            total_remaining += account.remaining_ca
+        if account.invoice_on_timesheets:
+            total_remaining += account.remaining_hours
+        return total_remaining
+
+    def _get_total_toinvoice(self, account):
+        total_toinvoice = 0.0
+        if account.fix_price_invoices:
+            total_toinvoice += account.ca_to_invoice
+        if account.invoice_on_timesheets:
+            total_toinvoice += account.hours_qtt_non_invoiced
+        return total_toinvoice
+
+    def _sum_of_fields(self, cr, uid, ids, name, arg, context=None):
+         res = dict([(i, {}) for i in ids])
+         for account in self.browse(cr, uid, ids, context=context):
+            res[account.id]['est_total'] = self._get_total_estimation(account)
+            res[account.id]['invoiced_total'] =  self._get_total_invoiced(account)
+            res[account.id]['remaining_total'] = self._get_total_remaining(account)
+            res[account.id]['toinvoice_total'] =  self._get_total_toinvoice(account)
+         return res
 
-    def _user(self, cr, uid, ids, name, arg, context=None):
-        res = {}
-        cr.execute('SELECT MAX(id) FROM res_users')
-        max_user = cr.fetchone()[0]
-        for id in ids:
-            ids2 = self.search(cr, uid, [('parent_id', 'child_of', [id])])
-            cr.execute('SELECT DISTINCT("user") FROM account_analytic_analysis_summary_user ' \
-                    'WHERE account_id in (' + ','.join([str(x) for x in ids2]) + ') ' \
-                        'AND unit_amount <> 0.0')
-            res[id] = [int((id * max_user) + x[0]) for x in cr.fetchall()]
+    _columns = {
+        'is_overdue_quantity' : fields.function(_is_overdue_quantity, method=True, type='boolean', string='Overdue Quantity',
+                                                store={
+                                                    'account.analytic.line' : (_get_analytic_account, None, 20),
+                                                }),
+        'ca_invoiced': fields.function(_ca_invoiced_calc, type='float', string='Invoiced Amount',
+            help="Total customer invoiced amount for this account.",
+            digits_compute=dp.get_precision('Account')),
+        'total_cost': fields.function(_total_cost_calc, type='float', string='Total Costs',
+            help="Total of costs for this account. It includes real costs (from invoices) and indirect costs, like time spent on timesheets.",
+            digits_compute=dp.get_precision('Account')),
+        'ca_to_invoice': fields.function(_analysis_all, multi='analytic_analysis', type='float', string='Uninvoiced Amount',
+            help="If invoice from analytic account, the remaining amount you can invoice to the customer based on the total costs.",
+            digits_compute=dp.get_precision('Account')),
+        'ca_theorical': fields.function(_analysis_all, multi='analytic_analysis', type='float', string='Theoretical Revenue',
+            help="Based on the costs you had on the project, what would have been the revenue if all these costs have been invoiced at the normal sale price provided by the pricelist.",
+            digits_compute=dp.get_precision('Account')),
+        'hours_quantity': fields.function(_analysis_all, multi='analytic_analysis', type='float', string='Total Time',
+            help="Number of time you spent on the analytic account (from timesheet). It computes quantities on all journal of type 'general'."),
+        'last_invoice_date': fields.function(_analysis_all, multi='analytic_analysis', type='date', string='Last Invoice Date',
+            help="If invoice from the costs, this is the date of the latest invoiced."),
+        'last_worked_invoiced_date': fields.function(_analysis_all, multi='analytic_analysis', type='date', string='Date of Last Invoiced Cost',
+            help="If invoice from the costs, this is the date of the latest work or cost that have been invoiced."),
+        'last_worked_date': fields.function(_analysis_all, multi='analytic_analysis', type='date', string='Date of Last Cost/Work',
+            help="Date of the latest work done on this account."),
+        'hours_qtt_non_invoiced': fields.function(_analysis_all, multi='analytic_analysis', type='float', string='Uninvoiced Time',
+            help="Number of time (hours/days) (from journal of type 'general') that can be invoiced if you invoice based on analytic account."),
+        'hours_qtt_invoiced': fields.function(_hours_qtt_invoiced_calc, type='float', string='Invoiced Time',
+            help="Number of time (hours/days) that can be invoiced plus those that already have been invoiced."),
+        'remaining_hours': fields.function(_remaining_hours_calc, type='float', string='Remaining Time',
+            help="Computed using the formula: Maximum Time - Total Time"),
+        'remaining_ca': fields.function(_remaining_ca_calc, type='float', string='Remaining Revenue',
+            help="Computed using the formula: Max Invoice Price - Invoiced Amount.",
+            digits_compute=dp.get_precision('Account')),
+        'revenue_per_hour': fields.function(_revenue_per_hour_calc, type='float', string='Revenue per Time (real)',
+            help="Computed using the formula: Invoiced Amount / Total Time",
+            digits_compute=dp.get_precision('Account')),
+        'real_margin': fields.function(_real_margin_calc, type='float', string='Real Margin',
+            help="Computed using the formula: Invoiced Amount - Total Costs.",
+            digits_compute=dp.get_precision('Account')),
+        'theorical_margin': fields.function(_theorical_margin_calc, type='float', string='Theoretical Margin',
+            help="Computed using the formula: Theorial Revenue - Total Costs",
+            digits_compute=dp.get_precision('Account')),
+        'real_margin_rate': fields.function(_real_margin_rate_calc, type='float', string='Real Margin Rate (%)',
+            help="Computes using the formula: (Real Margin / Total Costs) * 100.",
+            digits_compute=dp.get_precision('Account')),
+        'fix_price_invoices' : fields.boolean('Fix Price Invoices'),
+        'invoice_on_timesheets' : fields.boolean("Invoice On Timesheets"),
+        'month_ids': fields.function(_analysis_all, multi='analytic_analysis', type='many2many', relation='account_analytic_analysis.summary.month', string='Month'),
+        'user_ids': fields.function(_analysis_all, multi='analytic_analysis', type="many2many", relation='account_analytic_analysis.summary.user', string='User'),
+        'template_id':fields.many2one('account.analytic.account', 'Template of Contract'),
+        'hours_qtt_est': fields.float('Estimation of Hours to Invoice'),
+        'est_total' : fields.function(_sum_of_fields, type="float",multi="sum_of_all"),
+        'invoiced_total' : fields.function(_sum_of_fields, type="float",multi="sum_of_all"),
+        'remaining_total' : fields.function(_sum_of_fields, type="float",multi="sum_of_all"),
+        'toinvoice_total' : fields.function(_sum_of_fields, type="float",multi="sum_of_all"),
+    }
+
+    def on_change_template(self, cr, uid, id, template_id):
+        if not template_id:
+            return {}
+        res = {'value':{}}
+        template = self.browse(cr, uid, template_id)
+        if template.date_start:
+            res['value']['date_start'] = str(template.date_start)
+        if template.date:
+            res['value']['date'] = str(template.date)
+        res['value']['fix_price_invoices'] = template.fix_price_invoices
+        res['value']['invoice_on_timesheets'] = template.invoice_on_timesheets
+        res['value']['charge_expenses'] = template.charge_expenses
+        res['value']['quantity_max'] = template.quantity_max
+        res['value']['remaining_hours'] = template.remaining_hours
+        res['value']['amount_max'] = template.amount_max
+        res['value']['expense_max'] = template.expense_max
+        res['value']['to_invoice'] = template.to_invoice.id
+        res['value']['pricelist_id'] = template.pricelist_id.id
+        res['value']['description'] = template.description
         return res
 
-    _columns ={
-        'ca_invoiced': fields.function(_ca_invoiced_calc, method=True, type='float', string='Invoiced Amount', help="Total customer invoiced amount for this account."),
-        'total_cost': fields.function(_total_cost_calc, method=True, type='float', string='Total Costs', help="Total of costs for this account. It includes real costs (from invoices) and indirect costs, like time spent on timesheets."),
-        'ca_to_invoice': fields.function(_ca_to_invoice_calc, method=True, type='float', string='Uninvoiced Amount', help="If invoice from analytic account, the remaining amount you can invoice to the customer based on the total costs."),
-        'ca_theorical': fields.function(_ca_theorical_calc, method=True, type='float', string='Theorical Revenue', help="Based on the costs you had on the project, what would have been the revenue if all these costs have been invoiced at the normal sale price provided by the pricelist."),
-        'hours_quantity': fields.function(_hours_quantity_calc, method=True, type='float', string='Hours Tot', help="Number of hours you spent on the analytic account (from timesheet). It computes on all journal of type 'general'."),
-        'last_invoice_date': fields.function(_last_invoice_date_calc, method=True, type='date', string='Last Invoice Date', help="Date of the last invoice created for this analytic account."),
-        'last_worked_invoiced_date': fields.function(_last_worked_invoiced_date_calc, method=True, type='date', string='Date of Last Invoiced Cost', help="If invoice from the costs, this is the date of the latest work or cost that have been invoiced."),
-        'last_worked_date': fields.function(_last_worked_date_calc, method=True, type='date', string='Date of Last Cost/Work', help="Date of the latest work done on this account."),
-        'hours_qtt_non_invoiced': fields.function(_hours_qtt_non_invoiced_calc, method=True, type='float', string='Uninvoiced Hours', help="Number of hours (from journal of type 'general') that can be invoiced if you invoice based on analytic account."),
-        'hours_qtt_invoiced': fields.function(_hours_qtt_invoiced_calc, method=True, type='float', string='Invoiced Hours', help="Number of hours that can be invoiced plus those that already have been invoiced."),
-        'remaining_hours': fields.function(_remaining_hours_calc, method=True, type='float', string='Remaining Hours', help="Computed using the formula: Maximum Quantity - Hours Tot."),
-        'remaining_ca': fields.function(_remaining_ca_calc, method=True, type='float', string='Remaining Revenue', help="Computed using the formula: Max Invoice Price - Invoiced Amount."),
-        'revenue_per_hour': fields.function(_revenue_per_hour_calc, method=True, type='float', string='Revenue per Hours (real)', help="Computed using the formula: Invoiced Amount / Hours Tot."),
-        'real_margin': fields.function(_real_margin_calc, method=True, type='float', string='Real Margin', help="Computed using the formula: Invoiced Amount - Total Costs."),
-        'theorical_margin': fields.function(_theorical_margin_calc, method=True, type='float', string='Theorical Margin', help="Computed using the formula: Theorial Revenue - Total Costs"),
-        'real_margin_rate': fields.function(_real_margin_rate_calc, method=True, type='float', string='Real Margin Rate (%)', help="Computes using the formula: (Real Margin / Total Costs) * 100."),
-        'month_ids': fields.function(_month, method=True, type='many2many', relation='account_analytic_analysis.summary.month', string='Month'),
-        'user_ids': fields.function(_user, method=True, type="many2many", relation='account_analytic_analysis.summary.user', string='User'),
-    }
 account_analytic_account()
 
 class account_analytic_account_summary_user(osv.osv):
     _name = "account_analytic_analysis.summary.user"
-    _description = "Hours summary by user"
+    _description = "Hours Summary by User"
     _order='user'
     _auto = False
     _rec_name = 'user'
@@ -424,32 +469,24 @@ class account_analytic_account_summary_user(osv.osv):
         max_user = cr.fetchone()[0]
         account_ids = [int(str(x/max_user - (x%max_user == 0 and 1 or 0))) for x in ids]
         user_ids = [int(str(x-((x/max_user - (x%max_user == 0 and 1 or 0)) *max_user))) for x in ids]
-        account_ids2 = account_obj.search(cr, uid, [('parent_id', 'child_of', account_ids)])
-        user_set = ','.join([str(x) for x in user_ids])
-        if account_ids2:
-            acc_set = ','.join([str(x) for x in account_ids2])
+        parent_ids = tuple(account_ids) #We don't want consolidation for each of these fields because those complex computation is resource-greedy.
+        if parent_ids:
             cr.execute('SELECT id, unit_amount ' \
                     'FROM account_analytic_analysis_summary_user ' \
-                    'WHERE account_id in (%s) ' \
-                        'AND "user" in (%s) ' % (acc_set, user_set))
+                    'WHERE account_id IN %s ' \
+                        'AND "user" IN %s',(parent_ids, tuple(user_ids),))
             for sum_id, unit_amount in cr.fetchall():
                 res[sum_id] = unit_amount
-        for obj_id in ids:
-            res.setdefault(obj_id, 0.0)
-            for child_id in account_obj.search(cr, uid,
-                    [('parent_id', 'child_of', [int(str(obj_id/max_user - (obj_id%max_user == 0 and 1 or 0)))])]):
-                if child_id != int(str(obj_id/max_user - (obj_id%max_user == 0 and 1 or 0))):
-                    res[obj_id] += res.get((child_id * max_user) + obj_id -((obj_id/max_user - (obj_id%max_user == 0 and 1 or 0)) * max_user), 0.0)
         for id in ids:
             res[id] = round(res.get(id, 0.0), 2)
         return res
 
     _columns = {
         'account_id': fields.many2one('account.analytic.account', 'Analytic Account', readonly=True),
-        'unit_amount': fields.function(_unit_amount, method=True, type='float',
-            string='Total Time'),
-        'user' : fields.many2one('res.users', 'User'),
+        'unit_amount': fields.float('Total Time'),
+        'user': fields.many2one('res.users', 'User'),
     }
+
     def init(self, cr):
         tools.sql.drop_view_if_exists(cr, 'account_analytic_analysis_summary_user')
         cr.execute('CREATE OR REPLACE VIEW account_analytic_analysis_summary_user AS (' \
@@ -486,97 +523,6 @@ class account_analytic_account_summary_user(osv.osv):
                 'GROUP BY u."user", u.account_id, u.max_user' \
                 ')')
 
-    def _read_flat(self, cr, user, ids, fields, context=None, load='_classic_read'):
-        if not context:
-            context={}
-        if not ids:
-            return []
-
-        if fields==None:
-            fields = self._columns.keys()
-
-        # construct a clause for the rules :
-        d1, d2 = self.pool.get('ir.rule').domain_get(cr, user, self._name)
-
-        # all inherited fields + all non inherited fields for which the attribute whose name is in load is True
-        fields_pre = filter(lambda x: x in self._columns and getattr(self._columns[x],'_classic_write'), fields) + self._inherits.values()
-
-        res = []
-        cr.execute('SELECT MAX(id) FROM res_users')
-        max_user = cr.fetchone()[0]
-        if len(fields_pre) :
-            fields_pre2 = map(lambda x: (x in ('create_date', 'write_date')) and ('date_trunc(\'second\', '+x+') as '+x) or '"'+x+'"', fields_pre)
-            for i in range(0, len(ids), cr.IN_MAX):
-                sub_ids = ids[i:i+cr.IN_MAX]
-                if d1:
-                    cr.execute('select %s from \"%s\" where id in (%s) ' \
-                            'and account_id in (%s) ' \
-                            'and "user" in (%s) and %s order by %s' % \
-                            (','.join(fields_pre2 + ['id']), self._table,
-                                ','.join([str(x) for x in sub_ids]),
-                                ','.join([str(x/max_user - (x%max_user == 0 and 1 or 0)) for x in sub_ids]),
-                                ','.join([str(x-((x/max_user - (x%max_user == 0 and 1 or 0)) *max_user)) for x in sub_ids]), d1,
-                                self._order),d2)
-                    if not cr.rowcount == len({}.fromkeys(sub_ids)):
-                        raise except_orm(_('AccessError'),
-                                _('You try to bypass an access rule (Document type: %s).') % self._description)
-                else:
-                    cr.execute('select %s from \"%s\" where id in (%s) ' \
-                            'and account_id in (%s) ' \
-                            'and "user" in (%s) order by %s' % \
-                            (','.join(fields_pre2 + ['id']), self._table,
-                                ','.join([str(x) for x in sub_ids]),
-                                ','.join([str(x/max_user - (x%max_user == 0 and 1 or 0)) for x in sub_ids]),
-                                ','.join([str(x-((x/max_user - (x%max_user == 0 and 1 or 0)) *max_user)) for x in sub_ids]),
-                                self._order))
-                res.extend(cr.dictfetchall())
-        else:
-            res = map(lambda x: {'id': x}, ids)
-
-        for f in fields_pre:
-            if self._columns[f].translate:
-                ids = map(lambda x: x['id'], res)
-                res_trans = self.pool.get('ir.translation')._get_ids(cr, user, self._name+','+f, 'model', context.get('lang', False) or 'en_US', ids)
-                for r in res:
-                    r[f] = res_trans.get(r['id'], False) or r[f]
-
-        for table in self._inherits:
-            col = self._inherits[table]
-            cols = intersect(self._inherit_fields.keys(), fields)
-            if not cols:
-                continue
-            res2 = self.pool.get(table).read(cr, user, [x[col] for x in res], cols, context, load)
-
-            res3 = {}
-            for r in res2:
-                res3[r['id']] = r
-                del r['id']
-
-            for record in res:
-                record.update(res3[record[col]])
-                if col not in fields:
-                    del record[col]
-
-        # all fields which need to be post-processed by a simple function (symbol_get)
-        fields_post = filter(lambda x: x in self._columns and self._columns[x]._symbol_get, fields)
-        if fields_post:
-            # maybe it would be faster to iterate on the fields then on res, so that we wouldn't need
-            # to get the _symbol_get in each occurence
-            for r in res:
-                for f in fields_post:
-                    r[f] = self.columns[f]._symbol_get(r[f])
-        ids = map(lambda x: x['id'], res)
-
-        # all non inherited fields for which the attribute whose name is in load is False
-        fields_post = filter(lambda x: x in self._columns and not getattr(self._columns[x], load), fields)
-        for f in fields_post:
-            # get the value of that field for all records/ids
-            res2 = self._columns[f].get(cr, self, ids, f, user, context=context, values=res)
-            for record in res:
-                record[f] = res2[record['id']]
-
-        return res
-
 account_analytic_account_summary_user()
 
 class account_analytic_account_summary_month(osv.osv):
@@ -584,47 +530,18 @@ class account_analytic_account_summary_month(osv.osv):
     _description = "Hours summary by month"
     _auto = False
     _rec_name = 'month'
-    _order = 'month'
-
-    def _unit_amount(self, cr, uid, ids, name, arg, context=None):
-        res = {}
-        account_obj = self.pool.get('account.analytic.account')
-        account_ids = [int(str(int(x))[:-6]) for x in ids]
-        month_ids = [int(str(int(x))[-6:]) for x in ids]
-        account_ids2 = account_obj.search(cr, uid, [('parent_id', 'child_of', account_ids)])
-        month_set = ','.join([str(x) for x in month_ids])
-        if account_ids2:
-            acc_set = ','.join([str(x) for x in account_ids2])
-            cr.execute('SELECT id, unit_amount ' \
-                    'FROM account_analytic_analysis_summary_month ' \
-                    'WHERE account_id in (%s) ' \
-                        'AND month_id in (%s) ' % \
-                        (acc_set, month_set))
-            for sum_id, unit_amount in cr.fetchall():
-                res[sum_id] = unit_amount
-        for obj_id in ids:
-            res.setdefault(obj_id, 0.0)
-            for child_id in account_obj.search(cr, uid,
-                    [('parent_id', 'child_of', [int(str(int(obj_id))[:-6])])]):
-                if child_id != int(str(int(obj_id))[:-6]):
-                    res[obj_id] += res.get(int(child_id * 1000000 + int(obj_id)), 0.0)
-        for id in ids:
-            res[id] = round(res.get(id, 0.0), 2)
-        return res
 
     _columns = {
-        'account_id': fields.many2one('account.analytic.account', 'Analytic Account',
-            readonly=True),
-        'unit_amount': fields.function(_unit_amount, method=True, type='float',
-            string='Total Time'),
-        'month': fields.char('Month', size=25, readonly=True),
+        'account_id': fields.many2one('account.analytic.account', 'Analytic Account', readonly=True),
+        'unit_amount': fields.float('Total Time'),
+        'month': fields.char('Month', size=32, readonly=True),
     }
 
     def init(self, cr):
         tools.sql.drop_view_if_exists(cr, 'account_analytic_analysis_summary_month')
         cr.execute('CREATE VIEW account_analytic_analysis_summary_month AS (' \
                 'SELECT ' \
-                    '(TO_NUMBER(TO_CHAR(d.month, \'YYYYMM\'), \'999999\') + (d.account_id  * 1000000))::integer AS id, ' \
+                    '(TO_NUMBER(TO_CHAR(d.month, \'YYYYMM\'), \'999999\') + (d.account_id  * 1000000::bigint))::bigint AS id, ' \
                     'd.account_id AS account_id, ' \
                     'TO_CHAR(d.month, \'Mon YYYY\') AS month, ' \
                     'TO_NUMBER(TO_CHAR(d.month, \'YYYYMM\'), \'999999\') AS month_id, ' \
@@ -667,97 +584,6 @@ class account_analytic_account_summary_month(osv.osv):
                 'GROUP BY d.month, d.account_id ' \
                 ')')
 
-    def _read_flat(self, cr, user, ids, fields, context=None, load='_classic_read'):
-        if not context:
-            context={}
-        if not ids:
-            return []
-
-        if fields==None:
-            fields = self._columns.keys()
-
-        # construct a clause for the rules :
-        d1, d2 = self.pool.get('ir.rule').domain_get(cr, user, self._name)
-
-        # all inherited fields + all non inherited fields for which the attribute whose name is in load is True
-        fields_pre = filter(lambda x: x in self._columns and getattr(self._columns[x],'_classic_write'), fields) + self._inherits.values()
-
-        res = []
-        if len(fields_pre) :
-            fields_pre2 = map(lambda x: (x in ('create_date', 'write_date')) and ('date_trunc(\'second\', '+x+') as '+x) or '"'+x+'"', fields_pre)
-            for i in range(0, len(ids), cr.IN_MAX):
-                sub_ids = ids[i:i+cr.IN_MAX]
-                if d1:
-                    cr.execute('select %s from \"%s\" where id in (%s) ' \
-                            'and account_id in (%s) ' \
-                            'and month_id in (%s) and %s order by %s' % \
-                            (','.join(fields_pre2 + ['id']), self._table,
-                                ','.join([str(x) for x in sub_ids]),
-                                ','.join([str(x)[:-6] for x in sub_ids]),
-                                ','.join([str(x)[-6:] for x in sub_ids]), d1,
-                                self._order),d2)
-                    if not cr.rowcount == len({}.fromkeys(sub_ids)):
-                        raise except_orm(_('AccessError'),
-                                _('You try to bypass an access rule (Document type: %s).') % self._description)
-                else:
-                    cr.execute('select %s from \"%s\" where id in (%s) ' \
-                            'and account_id in (%s) ' \
-                            'and month_id in (%s) order by %s' % \
-                            (','.join(fields_pre2 + ['id']), self._table,
-                                ','.join([str(x) for x in sub_ids]),
-                                ','.join([str(x)[:-6] for x in sub_ids]),
-                                ','.join([str(x)[-6:] for x in sub_ids]),
-                                self._order))
-                res.extend(cr.dictfetchall())
-        else:
-            res = map(lambda x: {'id': x}, ids)
-
-        for f in fields_pre:
-            if self._columns[f].translate:
-                ids = map(lambda x: x['id'], res)
-                res_trans = self.pool.get('ir.translation')._get_ids(cr, user, self._name+','+f, 'model', context.get('lang', False) or 'en_US', ids)
-                for r in res:
-                    r[f] = res_trans.get(r['id'], False) or r[f]
-
-        for table in self._inherits:
-            col = self._inherits[table]
-            cols = intersect(self._inherit_fields.keys(), fields)
-            if not cols:
-                continue
-            res2 = self.pool.get(table).read(cr, user, [x[col] for x in res], cols, context, load)
-
-            res3 = {}
-            for r in res2:
-                res3[r['id']] = r
-                del r['id']
-
-            for record in res:
-                record.update(res3[record[col]])
-                if col not in fields:
-                    del record[col]
-
-        # all fields which need to be post-processed by a simple function (symbol_get)
-        fields_post = filter(lambda x: x in self._columns and self._columns[x]._symbol_get, fields)
-        if fields_post:
-            # maybe it would be faster to iterate on the fields then on res, so that we wouldn't need
-            # to get the _symbol_get in each occurence
-            for r in res:
-                for f in fields_post:
-                    r[f] = self.columns[f]._symbol_get(r[f])
-        ids = map(lambda x: x['id'], res)
-
-        # all non inherited fields for which the attribute whose name is in load is False
-        fields_post = filter(lambda x: x in self._columns and not getattr(self._columns[x], load), fields)
-        for f in fields_post:
-            # get the value of that field for all records/ids
-            res2 = self._columns[f].get(cr, self, ids, f, user, context=context, values=res)
-            for record in res:
-                record[f] = res2[record['id']]
-
-        return res
 
 account_analytic_account_summary_month()
-
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-