"Applied fix from trunk for revision: 1618411" 
------------------------------------------------------------------------
r1618411 | apatel | 2014-08-16 22:40:20 +0200 (sam. 16 août 2014) | 1 ligne

[OFBIZ-4459] call to Quickshipdrop should be make on approved orders. Thanks to Kiran Gawde and ofbiz.us team for contributions.
------------------------------------------------------------------------
?\026

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1641062 13f79535-47bb-0310-9956-ffa450edef68
"Applied fix from trunk for revision: 1641066" - Conflicts handled by hand. Just formatting and I tolerated the 2 neutral changes from ?exists to ?? done by the automatic merge.*
------------------------------------------------------------------------
r1641066 | jleroux | 2014-11-22 15:15:54 +0100 (sam. 22 nov. 2014) | 8 lignes

A slightly modified patch from Gareth Carter for "<@htmlTemplate.renderDateTimeField does not parse date string based on input format" https://issues.apache.org/jira/browse/OFBIZ-5850

Commit 1626419 changed htmlFormMacroLibrary.ftl renderDateTimeField to use Date.parse instead of Date.parseExact.
https://code.google.com/p/datejs/wiki/APIDocumentation states Date.parse will use current CultureInfo for formats but for parsing ISO yyyy-MM-dd from hidden field, need to use parseExact.
I spotted this when CultureInfo was en-GB and selecting 2014-11-01 on any date field (i18n field displays 11/01/2014 instead of 01/11/2014)
For November all days after the 12th display correctly

jleroux: I simply removed the line added in the block which remove the dot and 000 ms in date/time string. I did not see any reason why this was needed. I modified the comment on this block for faster understanding.
------------------------------------------------------------------------

* Damned, I was sure I wrote the comment about conflicts handling somewhere, but lost it. Here it is finally!**
** What I love in Svn, and I miss in Git, is it forgives your sins, so you can rewrite the log :D. Life is fun!


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1641069 13f79535-47bb-0310-9956-ffa450edef68
"Applied fix from trunk for revision: 1641131" 
------------------------------------------------------------------------
r1641131 | jleroux | 2014-11-22 23:48:44 +0100 (sam. 22 nov. 2014) | 1 ligne

A patch from Gareth Carter for "jQuery datetimepicker popup time value is not set correctly from an existing value" https://issues.apache.org/jira/browse/OFBIZ-5883
------------------------------------------------------------------------
?\026

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1641133 13f79535-47bb-0310-9956-ffa450edef68
"Applied fix from trunk for revision: 1641165" 
------------------------------------------------------------------------
r1641165 | jleroux | 2014-11-23 09:49:48 +0100 (dim. 23 nov. 2014) | 1 ligne

It's not quite clear to me why Date.CultureInfo.formatPatterns.longTime from date.js returns ms (always .000 it seems). I don't know if this would not happen, but anyway I prefer to assign the value to the calendar out of the block which changes the value.
------------------------------------------------------------------------
?\026

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release12.04@1641169 13f79535-47bb-0310-9956-ffa450edef68