pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed line duplication bug

Browse Source 
bzr revid: nicolas.vanhoren@openerp.com-20121002121103-wyvshcyky324nc6r
This commit is contained in:
niv-openerp
2012-10-02 14:11:03 +02:00
parent 822f6bbe7b
commit 6679892393
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+1 -1
View File
@@ -351,7 +351,7 @@ class hr_timesheet_line(osv.osv):
_columns = {
'sheet_id': fields.function(_sheet, string='Sheet',
type='many2one', relation='hr_timesheet_sheet.sheet',
type='many2one', relation='hr_timesheet_sheet.sheet', ondelete="cascade",
store={
'hr_timesheet_sheet.sheet': (_get_hr_timesheet_sheet, ['employee_id', 'date_from', 'date_to'], 10),
'account.analytic.line': (_get_account_analytic_line, ['user_id', 'date'], 10),
addons/hr_timesheet_sheet/static/src/js/timesheet.js
+12 -1
View File
@@ -68,10 +68,11 @@ openerp.hr_timesheet_sheet = function(instance) {
var dates;
var accounts;
var account_names;
var default_get;
return this.render_drop.add(new instance.web.Model("hr.analytic.timesheet").call("default_get", [
['account_id','general_account_id', 'journal_id','date','name','user_id','product_id','product_uom_id','to_invoice','amount','unit_amount'],
new instance.web.CompoundContext({'user_id': self.get('user_id')})]).pipe(function(result) {
var default_get = result;
default_get = result;
// calculating dates
dates = [];
var start = self.get("date_from");
@@ -128,6 +129,7 @@ openerp.hr_timesheet_sheet = function(instance) {
self.dates = dates;
self.accounts = accounts;
self.account_names = account_names;
self.default_get = default_get;
//real rendering
self.display_data();
});
@@ -176,6 +178,10 @@ openerp.hr_timesheet_sheet = function(instance) {
sync: function() {
var self = this;
var ops = [];
var auth_keys = _.extend(_.clone(self.default_get), {
name: true, unit_amount: true, date: true, account_id:true,
});
_.each(self.accounts, function(account) {
_.each(account.days, function(day) {
_.each(day.lines, function(line) {
@@ -187,6 +193,11 @@ openerp.hr_timesheet_sheet = function(instance) {
tmp[k] = v[0];
}
});
_.each(_.keys(tmp), function(key) {
if (auth_keys[key] === undefined) {
tmp[key] = undefined;
}
});
ops.push(tmp);
}
});