Merge lp:~openerp-dev/openobject-client-web/6.0-opw-584287-xal into lp:openobject-client-web

[Samus CTO (OpenERP)]

Unmerged revisions

4907. By Xavier ALT on 2013-01-16

[FIX] when coping parent parent on One2Many popup initialization - keep input 'format' attribute

4906. By Xavier ALT on 2013-01-16

[FIX] add format attribute for hidden date/datetime field otherwise convertion will not happen at all

4905. By Xavier ALT on 2013-01-16

[FIX] get_datetime_format: fix call to _to_posix_format() - courtesy of Jean-Francois BOUR

4904. By jftempo on 2013-01-16

[FIX] babel format_dateime should be called with precise locale

4903. By Xavier ALT on 2013-01-11

[FIX] web: fix UnicodeEncodeError when calling format_datetime() with value as 'datetime' object

4902. By Xavier ALT on 2013-01-11

[FIX] fix jscal Date.parseDate implementation to correctly split date with accentuated chars

4901. By Xavier ALT on 2013-01-11

[FIX] web: Calendar picker 'fr' localisation should use lowercase value - not capitalized one

4900. By Xavier ALT on 2013-01-11

[FIX] web: better support of month name/week day name in date (posix %a, %b, %A, %B)

=== modified file 'addons/openerp/static/javascript/form.js'
--- addons/openerp/static/javascript/form.js	2012-10-15 13:19:24 +0000
+++ addons/openerp/static/javascript/form.js	2013-04-09 14:55:26 +0000
@@ -26,6 +26,26 @@
     return openobject.http.getURL(act, params);
 }
 
+function datetime_get_server_value(elem, format) {
+    var $elem = jQuery(elem);
+    var field_date_format = $elem.attr('format') || '';
+    if (!field_date_format.match(/(%a|%b|%A|%B)/)) {
+        return elem.value;
+    }
+    // convert it back to str and compare to original value to determine
+    // if this a value set by jscal Calendar - or server/user input. In
+    // last case - keep the original value intact - in all other case
+    // we change the input value to match the server-format because depending
+    // on the language we might not be able to parse month or day of week names
+    var field_date = Date.parseDate(elem.value, field_date_format);
+    var field_date_str = field_date.print(field_date_format);
+    if (field_date_str == elem.value) {
+        var server_date_format = $elem.attr('kind') == 'date' ? '%Y-%m-%d' : '%Y-%m-%d %H:%M:%S';
+        return field_date.print(server_date_format);
+    }
+    return elem.value;
+}
+
 function openRecord(id, src, target, readonly){
 
     var kind = getNodeAttribute(src + '_set', 'kind');
@@ -232,6 +252,16 @@
         return;
     }
 
+    $form.find('input[kind^="date"]').each(function(i, f) {
+        if (!this.value ||
+                !(this.getAttribute('kind') == 'date'
+                  || this.getAttribute('kind') == 'datetime')) {
+             return; // skip input having no    
+        }
+        // make sure date/datetime value is parseable by server
+        this.value = datetime_get_server_value(this);
+    });
+
     // Cant use $form.attr due to http://dev.jquery.com/ticket/3113 as there is a form with a field called
     // action when creating an activity
     $form[0].setAttribute('action', action);
@@ -384,10 +414,16 @@
             return;
         }
 
+        // sure value is server-parseable in case of translated date/datetime fields
+        var this_value = this.value;
+        if ($this.attr('kind') == 'date' || $this.attr('kind') == 'datetime') {
+            this_value = datetime_get_server_value(this);
+        }
+
         if (extended && name.indexOf('/__id') == -1) {
             var attrs = {};
 
-            value = (is_editable ? this.value : $this.attr('value')) || "";
+            value = (is_editable ? this_value : $this.attr('value')) || "";
             var kind = $this.attr('kind') || "char";
 
             //take care of _terp_id
@@ -440,7 +476,7 @@
 
         }
         else {
-            frm[name] = this.value;
+            frm[name] = this_value;
         }
     });
 
@@ -532,11 +568,17 @@
     	return;
     }
 
+    var caller_value = $caller.val();
+    if ($caller.attr('kind') == 'date' || $caller.attr('datetime')) {
+        // make sure date/dateime value is parseable by server
+        caller_value = datetime_get_server_value($caller[0]);
+    }
+
     openobject.http.postJSON(post_url, jQuery.extend({}, form_data, {
         _terp_callback: callback,
         _terp_change_default: change_default,
         _terp_caller: $caller.attr('id').slice(id_slice_offset),
-        _terp_value: $caller.val(),
+        _terp_value: caller_value,
         _terp_model: select('_terp_model').val(),
         _terp_context: select('_terp_context').val(),
         id: select('_terp_id').val()
 
=== modified file 'addons/openerp/static/javascript/o2m.js'
--- addons/openerp/static/javascript/o2m.js	2012-08-24 10:26:51 +0000
+++ addons/openerp/static/javascript/o2m.js	2013-04-09 14:55:26 +0000
@@ -333,6 +333,10 @@
                 if(!attr) { return; }
                 attrs[attribute] = attr;
             });
+            // copy special 'format' attribute for date/datetime fields
+            if ($this.attr('kind') == 'date' || $this.attr('kind') == 'datetime') {
+                attrs[format] = $this.attr('format');
+            }
             $form.append($('<input>', $.extend(attrs, {
                 type: 'hidden',
                 disabled: 'disabled',
 
=== modified file 'addons/openerp/static/jscal/calendar.js'
--- addons/openerp/static/jscal/calendar.js	2011-01-07 16:14:12 +0000
+++ addons/openerp/static/jscal/calendar.js	2013-04-09 14:55:26 +0000
@@ -1587,7 +1587,9 @@
 	var y = 0;
 	var m = -1;
 	var d = 0;
-	var a = str.split(/\W+/);
+	// FIXME: improve this to handle all language from 'data' folder
+	//        currently only work for french
+	var a = str.split(/[^A-Za-z0-9_éû]+/);
 	var b = fmt.match(/%./g);
 	var i = 0, j = 0;
 	var hr = 0;
 
=== modified file 'addons/openerp/static/jscal/lang/calendar-fr.js'
--- addons/openerp/static/jscal/lang/calendar-fr.js	2009-04-13 14:25:09 +0000
+++ addons/openerp/static/jscal/lang/calendar-fr.js	2013-04-09 14:55:26 +0000
@@ -8,25 +8,25 @@
 
 // full day names
 Calendar._DN = new Array
-("Dimanche",
- "Lundi",
- "Mardi",
- "Mercredi",
- "Jeudi",
- "Vendredi",
- "Samedi",
- "Dimanche");
+("dimanche",
+ "lundi",
+ "mardi",
+ "mercredi",
+ "jeudi",
+ "vendredi",
+ "samedi",
+ "dimanche");
 
 // short day names
 Calendar._SDN = new Array
-("Dim.",
- "Lun.",
- "Mar.",
- "Mer.",
- "Jeu.",
- "Ven.",
- "Sam.",
- "Dim.");
+("dim.",
+ "lun.",
+ "mar.",
+ "mer.",
+ "jeu.",
+ "ven.",
+ "sam.",
+ "dim.");
 
 // First day of the week. "0" means display Sunday first, "1" means display
 // Monday first, etc.
@@ -34,33 +34,33 @@
 
 // full month names
 Calendar._MN = new Array
-("Janvier",
- "Février",
- "Mars",
- "Avril",
- "Mai",
- "Juin",
- "Juillet",
- "Août",
- "Septembre",
- "Octobre",
- "Novembre",
- "Décembre");
+("janvier",
+ "février",
+ "mars",
+ "avril",
+ "mai",
+ "juin",
+ "juillet",
+ "août",
+ "septembre",
+ "octobre",
+ "novembre",
+ "décembre");
 
 // short month names
 Calendar._SMN = new Array
-("Janv.",
- "Févr.",
- "Mars",
- "Avril",
- "Mai",
- "Juin",
- "Juil.",
- "Août",
- "Sept.",
- "Oct.",
- "Nov.",
- "Déc.");
+("janv.",
+ "févr.",
+ "mars",
+ "avril",
+ "mai",
+ "juin",
+ "juil.",
+ "août",
+ "sept.",
+ "oct.",
+ "nov.",
+ "déc.");
 
 // tooltips
 Calendar._TT = {};
 
=== modified file 'addons/openerp/validators.py'
--- addons/openerp/validators.py	2012-07-30 08:07:39 +0000
+++ addons/openerp/validators.py	2013-04-09 14:55:26 +0000
@@ -116,14 +116,14 @@
         self.kind = kind
 
     def _to_python(self, value, state):
-        # do validation
-        try:
-            res = time.strptime(value, self.format)
-        except ValueError:
-            raise formencode.api.Invalid(_('Invalid datetime format'), value, state)
-        # return str instead of real datetime object
-        try:
-            return format.parse_datetime(value, kind=self.kind)
+        try:
+            if value:
+                value = value.strip()
+            # do validation and convert value
+            res = format.parse_datetime(value, kind=self.kind)
+            if value and not res:
+                raise ValueError() # validation failed
+            return res
         except ValueError:
             raise formencode.api.Invalid(_('Invalid datetime format'), value, state)
 
 
=== modified file 'addons/openerp/widgets/form/_form.py'
--- addons/openerp/widgets/form/_form.py	2012-02-29 07:24:24 +0000
+++ addons/openerp/widgets/form/_form.py	2013-04-09 14:55:26 +0000
@@ -597,7 +597,7 @@
 class Hidden(TinyInputWidget):
     template = "/openerp/widgets/form/templates/hidden.mako"
 
-    params = ['relation', 'field_id']
+    params = ['relation', 'field_id', 'date_format']
     member_widgets = ['widget']
 
     def __init__(self, **attrs):
@@ -607,6 +607,10 @@
         self.validator = self.widget.validator
         self.relation = attrs.get('relation') or None
         self.editable = self.readonly
+        self.date_format = None
+        if kind in ('date', 'datetime'):
+            self.date_format = format.get_datetime_format(kind)
+
         if 'field_id' not in attrs:
             self.field_id = self.name
 
 
=== modified file 'addons/openerp/widgets/form/templates/datetime.mako'
--- addons/openerp/widgets/form/templates/datetime.mako	2011-11-23 08:40:36 +0000
+++ addons/openerp/widgets/form/templates/datetime.mako	2013-04-09 14:55:26 +0000
@@ -1,6 +1,6 @@
 % if editable:
     <input type="text" id="${name}" name="${name}" autocomplete="OFF" size="3"
-    class="${css_class}" ${py.attrs(attrs, kind=kind, value=value)}/>
+    class="${css_class}" ${py.attrs(attrs, kind=kind, value=value, format=format)}/>
     % if error:
         <span class="fielderror">${error}</span>
     % endif
 
=== modified file 'addons/openerp/widgets/form/templates/hidden.mako'
--- addons/openerp/widgets/form/templates/hidden.mako	2010-12-13 06:03:56 +0000
+++ addons/openerp/widgets/form/templates/hidden.mako	2013-04-09 14:55:26 +0000
@@ -1,2 +1,2 @@
 <input type="hidden" name="${name}" class="${css_class}" value="${value}"
-    ${py.attrs(attrs, id=field_id, kind=kind, relation=relation, value=value)}/>
+    ${py.attrs(attrs, id=field_id, kind=kind, relation=relation, value=value, format=date_format)}/>
 
=== modified file 'addons/openerp/widgets/listgrid.py'
--- addons/openerp/widgets/listgrid.py	2012-11-15 12:41:38 +0000
+++ addons/openerp/widgets/listgrid.py	2013-04-09 14:55:26 +0000
@@ -707,7 +707,7 @@
 class Hidden(TinyInputWidget):
     template = "openerp/widgets/templates/listgrid/hidden.mako"
 
-    params = ['relation', 'field_id']
+    params = ['relation', 'field_id', 'date_format']
     member_widgets = ['widget']
 
     def __init__(self, **attrs):
@@ -718,6 +718,9 @@
         self.relation = attrs.get('relation') or None
         self.editable = self.readonly
         self.color = None
+        self.date_format = None
+        if kind in ('date', 'datetime'):
+            self.date_format = format.get_datetime_format(kind)
         if 'field_id' not in attrs:
             self.field_id = self.name
 
 
=== modified file 'addons/openerp/widgets/templates/listgrid/hidden.mako'
--- addons/openerp/widgets/templates/listgrid/hidden.mako	2010-12-31 09:49:30 +0000
+++ addons/openerp/widgets/templates/listgrid/hidden.mako	2013-04-09 14:55:26 +0000
@@ -1,2 +1,2 @@
 <input type="hidden" name="${name}" class="${css_class}" value="${value}" disabled="True"
-    ${py.attrs(attrs, id=field_id, kind=kind, relation=relation, value=value)}/>
+    ${py.attrs(attrs, id=field_id, kind=kind, relation=relation, value=value, format=date_format)}/>
 
=== modified file 'openobject/i18n/format.py'
--- openobject/i18n/format.py	2011-12-02 10:38:29 +0000
+++ openobject/i18n/format.py	2013-04-09 14:55:26 +0000
@@ -44,6 +44,15 @@
 
 __pat = re.compile("%\(([dMy]+)\)s")
 __sub = {'d': '%d', 'M': '%m', 'y': '%Y'}
+
+__mdname_format_regexp = re.compile('(%a|%b|%A|%B)')
+__mdname_format_ldml_map = {
+    '%a': 'ddd',
+    '%A': 'dddd',
+    '%b': 'MMM',
+    '%B': 'MMMM',
+}
+
 def _to_posix_format(format):
     """Convert LDML format string to posix format string.
     """
@@ -52,6 +61,14 @@
 def format_date_custom(dt, fmt="y-M-d"):
     return dates.format_date(dt, format=fmt, locale=get_locale())
 
+def format_date_localized(dt, local_format):
+    mdname_formats = set(__mdname_format_regexp.findall(local_format))
+    for format in mdname_formats:
+        format_local_value = dates.format_datetime(dt,
+                                    __mdname_format_ldml_map[format], locale=get_locale())
+        local_format = local_format.replace(format, format_local_value)
+    return unicode(dt.strftime(local_format.encode('utf-8')), 'utf-8')
+
 def get_datetime_format(kind="datetime"):
     """Get local datetime format.
 
@@ -72,7 +89,7 @@
     # TODO: correctly convert from LDML to POSIX datetime formatting
     # current converter is trivial and lame and probably very easy to break
     date_format = _to_posix_format(dates.get_date_format(
-            format='short', locale=get_locale())).format
+            format='short', locale=get_locale()).format)
     if kind == 'time':
         # Should use dates.get_time_format(locale=get_locale())
         return '%H:%M:%S'
@@ -129,7 +146,7 @@
         value = ustr(value)
         try:
             value = DT.datetime.strptime(value[:10], server_format)
-            return value.strftime(local_format)
+            return format_date_localized(value, local_format)
         except:
             return ''
 
@@ -157,7 +174,8 @@
     if as_timetuple:
         return value
 
-    return time.strftime(local_format, value)
+    value_dt = DT.datetime(*value[:6])
+    return format_date_localized(value_dt, local_format)
 
 def parse_datetime(value, kind="datetime", as_timetuple=False):
     """Convert date value to the server datetime considering timezone info.