From aa9e1d83aeeb85d93716b2daf945d4b45b7a0fa4 Mon Sep 17 00:00:00 2001 From: Rifakat Date: Wed, 20 Mar 2013 17:22:38 +0530 Subject: [PATCH] [FIX] hr_timesheet_sheet: analytic items created from timesheet line have amount as blank bzr revid: rha@tinyerp.com-20130320115238-ae1w2p6ae0mytmy8 --- .../hr_timesheet_sheet/static/src/js/timesheet.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/addons/hr_timesheet_sheet/static/src/js/timesheet.js b/addons/hr_timesheet_sheet/static/src/js/timesheet.js index fe7d0c82767..6bd1b26bd8a 100644 --- a/addons/hr_timesheet_sheet/static/src/js/timesheet.js +++ b/addons/hr_timesheet_sheet/static/src/js/timesheet.js @@ -175,8 +175,13 @@ openerp.hr_timesheet_sheet = function(instance) { $(this).val(self.sum_box(account, day_count)); } else { account.days[day_count].lines[0].unit_amount += num - self.sum_box(account, day_count); - self.display_totals(); - self.sync(); + var product = (account.days[day_count].lines[0].product_id instanceof Array) ? account.days[day_count].lines[0].product_id[0] : account.days[day_count].lines[0].product_id + var journal = (account.days[day_count].lines[0].journal_id instanceof Array) ? account.days[day_count].lines[0].journal_id[0] : account.days[day_count].lines[0].journal_id + new instance.web.Model("hr.analytic.timesheet").call("on_change_unit_amount", [[], product, account.days[day_count].lines[0].unit_amount, false, false, journal]).then(function(res) { + account.days[day_count].lines[0]['amount'] = res.value.amount || 0; + self.display_totals(); + self.sync(); + }); } }); } else { @@ -282,10 +287,10 @@ openerp.hr_timesheet_sheet = function(instance) { generate_o2m_value: function() { var self = this; var ops = []; - + _.each(self.accounts, function(account) { var auth_keys = _.extend(_.clone(account.account_defaults), { - name: true, unit_amount: true, date: true, account_id:true, + name: true, amount:true, unit_amount: true, date: true, account_id:true, }); _.each(account.days, function(day) { _.each(day.lines, function(line) {