From 11bf57f1bf45f308ad76c35fd0f42560298a86f4 Mon Sep 17 00:00:00 2001 From: "Sanjay Gohel (Open ERP)" Date: Wed, 30 May 2012 18:26:41 +0530 Subject: [PATCH] [IMP]add expense line and add depend expense of hr in contract for calculation bzr revid: sgo@tinyerp.com-20120530125641-w27mjp97b981yrpd --- .../account_analytic_analysis/__openerp__.py | 2 +- .../account_analytic_analysis.py | 56 ++++++++++++++++++- .../account_analytic_analysis_view.xml | 48 ++++++++-------- addons/hr_expense/hr_expense_view.xml | 4 +- 4 files changed, 80 insertions(+), 30 deletions(-) diff --git a/addons/account_analytic_analysis/__openerp__.py b/addons/account_analytic_analysis/__openerp__.py index 0a8fbb10e9c..febc4126822 100644 --- a/addons/account_analytic_analysis/__openerp__.py +++ b/addons/account_analytic_analysis/__openerp__.py @@ -35,7 +35,7 @@ user-wise as well as month wise. "author": "Camptocamp", "website": "http://www.camptocamp.com/", "images": ["images/bill_tasks_works.jpeg","images/overpassed_accounts.jpeg"], - "depends": ["hr_timesheet_invoice", "sale"], #although sale is technically not required to install this module, all menuitems are located under 'Sales' application + "depends": ["hr_expense","hr_timesheet_invoice", "sale"], #although sale is technically not required to install this module, all menuitems are located under 'Sales' application "init_xml": [], "update_xml": [ "security/ir.model.access.csv", diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py index 4af2733f0f6..fcda8a2606c 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis.py +++ b/addons/account_analytic_analysis/account_analytic_analysis.py @@ -98,7 +98,7 @@ class account_analytic_account(osv.osv): 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') \ + AND account_analytic_journal.type = 'sale' \ GROUP BY account_analytic_account.id;""", (parent_ids,)) for account_id, sum in cr.fetchall(): if account_id not in res: @@ -224,7 +224,45 @@ class account_analytic_account(osv.osv): res[account_id] = round(sum,2) res_final = res return res_final + + def _expense_invoiced_calc(self, cr, uid, ids, name, arg, context=None): + res = {} + 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 hel.analytic_account,SUM(hel.unit_amount*hel.unit_quantity) from hr_expense_line as hel\ + LEFT JOIN hr_expense_expense as he ON he.id = hel.expense_id\ + where he.state = 'paid' and hel.analytic_account IN %s \ + GROUP BY hel.analytic_account",(child_ids,)) + for account_id, sum in cr.fetchall(): + res[account_id] = sum + res_final = res + return res_final + + def _expense_to_invoice_calc(self, cr, uid, ids, name, arg, context=None): + res = {} + 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 hel.analytic_account, SUM(hel.unit_amount*hel.unit_quantity) from hr_expense_line as hel\ + LEFT JOIN hr_expense_expense as he ON he.id = hel.expense_id\ + where he.state = 'invoiced' and hel.analytic_account IN %s \ + GROUP BY hel.analytic_account",(child_ids,)) + for account_id, sum in cr.fetchall(): + res[account_id] = sum + res_final = res + return res_final + def _total_cost_calc(self, cr, uid, ids, name, arg, context=None): res = {} res_final = {} @@ -301,6 +339,17 @@ class account_analytic_account(osv.osv): for id in ids: res[id] = round(res.get(id, 0.0),2) return res + + def _remaining_expnse_calc(self, cr, uid, ids, name, arg, context=None): + res = {} + for account in self.browse(cr, uid, ids, context=context): + if account.expense_max != 0: + res[account.id] = account.expense_max - account.expense_invoiced + else: + res[account.id]=0.0 + for id in ids: + res[id] = round(res.get(id, 0.0),2) + return res def _real_margin_calc(self, cr, uid, ids, name, arg, context=None): res = {} @@ -385,9 +434,12 @@ class account_analytic_account(osv.osv): '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'), + 'expense_invoiced' : fields.function(_expense_invoiced_calc, type="float"), + 'expense_to_invoice' : fields.function(_expense_to_invoice_calc, type='float'), + 'remaining_expense' : fields.function(_remaining_expnse_calc, type="float"), #'fix_exp_max' : fields.float('Max. amt'), #'timesheet_max': fields.float('max_timesheet'), - #'expense_max': fields.float('expenses'), + 'expense_max': fields.float('expenses'), } def on_change_template(self, cr, uid, id, template_id): if not template_id: diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml index 065a0b4009b..139a2f5ef17 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml +++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml @@ -58,7 +58,7 @@ - + - - - + diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml index d82f89930ef..0cb860b3b2d 100644 --- a/addons/hr_expense/hr_expense_view.xml +++ b/addons/hr_expense/hr_expense_view.xml @@ -14,7 +14,7 @@ - + @@ -102,7 +102,7 @@ - +