Merge lp:~openerp-dev/openobject-addons/7.0-opw-598634-msh into lp:openobject-addons/7.0

[Mohammed Shekha(Open ERP)]

Hello,

Fixed the issue of timesheet, set_value of timesheet_ids remove some reference field value, as new entry is always created and old one is removed.

Demo: To reproduce this issue go through following bug report:
https://bugs.launchpad.net/openobject-addons/+bug/1229187

Thanks.

Unmerged revisions

9542. By Mohammed Shekha(OpenERP)<email address hidden> on 2013-10-24

[FIX]Fixed the issue of timesheet, set_value of timesheet_ids remove some reference field value, as new entry is always created and old one is removed.

=== modified file 'hr_timesheet_sheet/static/src/js/timesheet.js'
--- hr_timesheet_sheet/static/src/js/timesheet.js	2013-06-13 15:03:42 +0000
+++ hr_timesheet_sheet/static/src/js/timesheet.js	2013-11-06 05:28:55 +0000
@@ -114,6 +114,7 @@
                         account_defaults = _.extend({}, default_get, (accounts_defaults[account_id] || {}).value || {});
                         // group by days
                         account_id = account_id === "false" ? false :  Number(account_id);
+                        line_id = lines.id;
                         var index = _.groupBy(lines, "date");
                         var days = _.map(dates, function(date) {
                             var day = {day: date, lines: index[instance.web.date_to_str(date)] || []};
@@ -124,6 +125,7 @@
                                 day.lines.unshift(to_add);
                             } else {
                                 day.lines.unshift(_.extend(_.clone(account_defaults), {
+                                    id: line_id,
                                     name: self.description_line,
                                     unit_amount: 0,
                                     date: instance.web.date_to_str(date),
@@ -313,7 +315,7 @@
         generate_o2m_value: function() {
             var self = this;
             var ops = [];
-            
+
             _.each(self.accounts, function(account) {
                 var auth_keys = _.extend(_.clone(account.account_defaults), {
                     name: true, amount:true, unit_amount: true, date: true, account_id:true,
@@ -334,6 +336,15 @@
                                     tmp[key] = undefined;
                                 }
                             });
+                            //Call write if timesheet entry is already available, otherwise create
+                            //It not passed in array then one2many set_value will first remove all entry(delete_all)
+                            //and then create new all new entries this cause issue in some scenarios, may remove some reference data
+                            if(line.id) {
+                                delete tmp.id;
+                                tmp = [1, line.id, tmp]
+                            } else {
+                                tmp = [0, false, tmp]
+                            }
                             ops.push(tmp);
                         }
                     });