From c290a184588bf00f189f0a20feb2f5d4d15fc130 Mon Sep 17 00:00:00 2001 From: ggh-openerp Date: Fri, 15 Feb 2013 17:16:04 +0530 Subject: [PATCH 1/4] [IMP] hr.expense list view, there is not total under the list now add a total Expenses bzr revid: ggh@tinyerp.com-20130215114604-nlvk1x9rv8131rbd --- addons/hr_expense/hr_expense_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml index 0324388786f..d8ef5006f96 100644 --- a/addons/hr_expense/hr_expense_view.xml +++ b/addons/hr_expense/hr_expense_view.xml @@ -32,7 +32,7 @@ - + From b4a5c9a82066b20f55fe5263c23f2237be1c66a9 Mon Sep 17 00:00:00 2001 From: ggh-openerp Date: Mon, 18 Feb 2013 13:07:41 +0530 Subject: [PATCH 2/4] [IMP] improve the code not total under the list group_by now add a total Expenses bzr revid: ggh@tinyerp.com-20130218073741-wlc2ii9bx8hewcqt --- addons/hr_expense/hr_expense.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py index 0b6ec48974b..4d6b8830ebb 100644 --- a/addons/hr_expense/hr_expense.py +++ b/addons/hr_expense/hr_expense.py @@ -84,7 +84,7 @@ class hr_expense_expense(osv.osv): 'account_move_id': fields.many2one('account.move', 'Ledger Posting'), 'line_ids': fields.one2many('hr.expense.line', 'expense_id', 'Expense Lines', readonly=True, states={'draft':[('readonly',False)]} ), 'note': fields.text('Note'), - 'amount': fields.function(_amount, string='Total Amount', digits_compute=dp.get_precision('Account')), + 'amount': fields.function(_amount, string='Total Amount', digits_compute=dp.get_precision('Account'), store=True), 'voucher_id': fields.many2one('account.voucher', "Employee's Receipt"), 'currency_id': fields.many2one('res.currency', 'Currency', required=True, readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}), 'department_id':fields.many2one('hr.department','Department', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}), From b69f12c596b29c8b1d90fa10ac6546fdb262488b Mon Sep 17 00:00:00 2001 From: Vishmita Date: Mon, 25 Feb 2013 12:53:20 +0530 Subject: [PATCH 3/4] [IMP]Improve code bzr revid: vja@tinyerp.com-20130225072320-oee4rl1gq0xus18h --- addons/hr_expense/hr_expense.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py index 4d6b8830ebb..9211bed9ecc 100644 --- a/addons/hr_expense/hr_expense.py +++ b/addons/hr_expense/hr_expense.py @@ -52,6 +52,12 @@ class hr_expense_expense(osv.osv): res[expense.id] = total return res + def _get_expense_line(self, cr, uid, ids, context=None): + result = {} + for line in self.pool.get('hr.expense.line').browse(cr, uid, ids, context=context): + result[line.expense_id.id] = True + return result.keys() + def _get_currency(self, cr, uid, context=None): user = self.pool.get('res.users').browse(cr, uid, [uid], context=context)[0] if user.company_id: @@ -84,7 +90,7 @@ class hr_expense_expense(osv.osv): 'account_move_id': fields.many2one('account.move', 'Ledger Posting'), 'line_ids': fields.one2many('hr.expense.line', 'expense_id', 'Expense Lines', readonly=True, states={'draft':[('readonly',False)]} ), 'note': fields.text('Note'), - 'amount': fields.function(_amount, string='Total Amount', digits_compute=dp.get_precision('Account'), store=True), + 'amount': fields.function(_amount, string='Total Amount', digits_compute=dp.get_precision('Account'), store={'hr.expense.line': (_get_expense_line, None, 20)}), 'voucher_id': fields.many2one('account.voucher', "Employee's Receipt"), 'currency_id': fields.many2one('res.currency', 'Currency', required=True, readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}), 'department_id':fields.many2one('hr.department','Department', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}), From 96040bfd014fdba958e39a80a0cc3289c7257f53 Mon Sep 17 00:00:00 2001 From: "Vishmita Jadeja (openerp)" Date: Thu, 7 Mar 2013 14:15:30 +0530 Subject: [PATCH 4/4] [IMP]add related fields bzr revid: vja@tinyerp.com-20130307084530-bsvtnfd0bqgbj56u --- addons/hr_expense/hr_expense.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py index 9211bed9ecc..ae596b3f279 100644 --- a/addons/hr_expense/hr_expense.py +++ b/addons/hr_expense/hr_expense.py @@ -90,7 +90,7 @@ class hr_expense_expense(osv.osv): 'account_move_id': fields.many2one('account.move', 'Ledger Posting'), 'line_ids': fields.one2many('hr.expense.line', 'expense_id', 'Expense Lines', readonly=True, states={'draft':[('readonly',False)]} ), 'note': fields.text('Note'), - 'amount': fields.function(_amount, string='Total Amount', digits_compute=dp.get_precision('Account'), store={'hr.expense.line': (_get_expense_line, None, 20)}), + 'amount': fields.function(_amount, string='Total Amount', digits_compute=dp.get_precision('Account'), store={'hr.expense.line': (_get_expense_line, ['unit_amount','unit_quantity'], 10)}), 'voucher_id': fields.many2one('account.voucher', "Employee's Receipt"), 'currency_id': fields.many2one('res.currency', 'Currency', required=True, readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}), 'department_id':fields.many2one('hr.department','Department', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),