Merge lp:~openerp-community/openobject-addons/6.0-bug-907723 into lp:openobject-addons/6.0

[Niels Huylebroeck]

Bugfix for 907723 as already merged in trunk

Unmerged revisions

5110. By Yannick Vaucher@Camptocamp on 2012-03-06

[FIX]base_action_rule: complete date time if date_field contains only a date

=== modified file 'base_action_rule/base_action_rule.py'
--- base_action_rule/base_action_rule.py	2012-02-15 10:59:41 +0000
+++ base_action_rule/base_action_rule.py	2012-03-06 14:14:18 +0000
@@ -31,6 +31,12 @@
 
 
 def get_datetime(date_field):
+    '''Return a datetime from a date string or a datetime string'''
+    #complete date time if date_field contains only a date
+    date_split = date_field.split(' ')
+    if len(date_split) == 1:
+        date_field = date_split[0] + " 00:00:00"
+   
     return datetime.strptime(date_field[:19], '%Y-%m-%d %H:%M:%S')