tryton-do/tryton
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Uses 30 days for month for Timedelta

Browse Source 
issue5282
review20041002
This commit is contained in:
Cédric Krier
2016-03-21 23:54:08 +01:00
parent 6f770b6c47
commit 3f381dac71
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG
+1
View File
@@ -1,3 +1,4 @@
* Timedelta uses 30 days for month
* Manage context model of ir.action.act_window
* Add Note
src/common.js
+1 -1
View File
@@ -275,7 +275,7 @@
Sao.common.timedelta.DEFAULT_CONVERTER.w =
Sao.common.timedelta.DEFAULT_CONVERTER.d * 7;
Sao.common.timedelta.DEFAULT_CONVERTER.M =
Sao.common.timedelta.DEFAULT_CONVERTER.w * 4;
Sao.common.timedelta.DEFAULT_CONVERTER.d * 30;
Sao.common.timedelta.DEFAULT_CONVERTER.Y =
Sao.common.timedelta.DEFAULT_CONVERTER.d * 365;
Sao.common.timedelta._get_separator = function() {
tests/sao.js
+6 -2
View File
@@ -843,9 +843,13 @@
var timedelta_tests = [
[null, ''],
[Sao.TimeDelta(3, 0, 0, 30, 5), '3d 05:30'],
[Sao.TimeDelta(0, 0, 0, 0, 0, 48), '12M'],
[Sao.TimeDelta(0, 0, 0, 0, 0, 50), '12M 2w'],
[Sao.TimeDelta(0, 0, 0, 0, 0, 48), '11M 6d'],
[Sao.TimeDelta(0, 0, 0, 0, 0, 50), '11M 2w 6d'],
[Sao.TimeDelta(0, 0, 0, 0, 0, 52), '12M 4d'],
[Sao.TimeDelta(360), '12M'],
[Sao.TimeDelta(364), '12M 4d'],
[Sao.TimeDelta(365), '1Y'],
[Sao.TimeDelta(366), '1Y 1d'],
[Sao.TimeDelta(0, 10, 0, 5, 2), '02:05:10'],
[Sao.TimeDelta(0, 0, 42, 15), '00:15:00.042000'],
[Sao.TimeDelta(1, 0, 42), '1d .042000'],