← Back to branch summary

~openerp-dev/openerp-web/7.0-timesheet-vme

« back to all changes in this revision

Viewing changes to addons/web/static/src/js/formats.js

  • Committer: Vidhin Mehta
  • Date: 2013-02-20 13:19:56 UTC
  • mfrom: (3708.1.60 7.0)
  • Revision ID: vme@tinyerp.com-20130220131956-hrnbak55i9qdpe4y
[MERGE]7.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
addons/web/static/src/js/formats.js
166
166
                value = Math.abs(value);
167
167
                pattern = '-' + pattern;
168
168
            }
169
 
            return _.str.sprintf(pattern,
170
 
                    Math.floor(value),
171
 
                    Math.round((value % 1) * 60));
 
169
            var hour = Math.floor(value);
 
170
            var min = Math.round((value % 1) * 60);
 
171
            if (min == 60){
 
172
                min = 0;
 
173
                hour = hour + 1;
 
174
            }
 
175
            return _.str.sprintf(pattern, hour, min);
172
176
        case 'many2one':
173
177
            // name_get value format
174
178
            return value[1] ? value[1].split("\n")[0] : value[1];