If a TIMESTAMP contains a NULL value, show it when inserting or editing
Function forgot to return its result
Merge branch 'QA_4_0'