Merge lp:~jfb-tempo-consulting/unifield-web/US-8453 into lp:unifield-web

[jftempo]

=== modified file 'addons/openerp/static/jscal/calendar-setup.js'
--- addons/openerp/static/jscal/calendar-setup.js	2011-01-07 16:14:12 +0000
+++ addons/openerp/static/jscal/calendar-setup.js	2021-04-20 08:23:25 +0000
@@ -91,6 +91,7 @@
 	param_default("cache",           false);
 	param_default("showOthers",      false);
 	param_default("multiple",        null);
+	param_default("depends",         null);
 
 	var tmp = ["inputField", "displayArea", "button"];
 	for (var i in tmp) {
@@ -143,6 +144,7 @@
 		cal.setRange(params.range[0], params.range[1]);
 		cal.setDateStatusHandler(params.dateStatusFunc);
 		cal.getDateText = params.dateText;
+		cal.depends = params.depends;
 		if (params.ifFormat) {
 			cal.setDateFormat(params.ifFormat);
 		}
@@ -171,6 +173,7 @@
 			cal.showsTime = params.showsTime;
 			cal.time24 = (params.timeFormat == "24");
 			cal.weekNumbers = params.weekNumbers;
+			cal.depends = params.depends;
 			mustCreate = true;
 		} else {
 			if (params.date)
@@ -194,6 +197,13 @@
 		cal.setDateFormat(dateFmt);
 		if (mustCreate)
 			cal.create();
+		if (params.depends && !dateEl.value) {
+            var depends = document.getElementById(params.depends);
+            if (depends && depends.value) {
+                var depends_date = Date.parseDate(depends.value, dateFmt);
+                cal.setDate(depends_date);
+            }
+        }
 		cal.refresh();
 		if (!params.position)
 			cal.showAtElement(params.button || params.displayArea || params.inputField, params.align);

=== modified file 'addons/openerp/widgets/form/_form.py'
--- addons/openerp/widgets/form/_form.py	2020-12-10 14:49:27 +0000
+++ addons/openerp/widgets/form/_form.py	2021-04-20 08:23:25 +0000
@@ -627,10 +627,11 @@
 
     javascript = [DTLink("openerp", "jscal/lang/calendar-en.js", location=locations.bodytop)]
 
-    params = ["format", "picker_shows_time"]
+    params = ["format", "picker_shows_time", "depends"]
 
     format = '%Y-%m-%d %H:%M:%S'
     picker_shows_time = True
+    depends = False
 
     def __init__(self, **attrs):
         super(DateTime, self).__init__(**attrs)
@@ -638,6 +639,11 @@
 
         if attrs['type'] == 'date':
             self.picker_shows_time = False
+        if attrs.get('depends'):
+            if attrs.get('prefix'):
+                self.depends = '%s/%s' % (attrs['prefix'], attrs['depends'])
+            else:
+                self.depends = attrs['depends']
 
         self.validator = validators.DateTime(kind=attrs['type'])
 

=== modified file 'addons/openerp/widgets/form/templates/datetime.mako'
--- addons/openerp/widgets/form/templates/datetime.mako	2019-04-15 12:09:58 +0000
+++ addons/openerp/widgets/form/templates/datetime.mako	2021-04-20 08:23:25 +0000
@@ -29,6 +29,9 @@
                         cal.destroy();
                     },
                     electric: false,
+                % if depends:
+                    depends: '${depends}',
+                % endif
                 });
             });
         </script>

=== modified file 'addons/openerp/widgets/search.py'
--- addons/openerp/widgets/search.py	2021-01-29 11:19:08 +0000
+++ addons/openerp/widgets/search.py	2021-04-20 08:23:25 +0000
@@ -90,6 +90,8 @@
 
         from_attrs = dict(attrs, name=fname+'/from')
         to_attrs = dict(attrs, name=fname+'/to')
+        if kind in ('date', 'datetime'):
+            to_attrs['depends'] = fname+'/from'
 
         self.from_field = RANGE_WIDGETS[kind](**from_attrs)
         self.to_field = RANGE_WIDGETS[kind](**to_attrs)