[MERGE] forward port of branch 7.0 up to e12cece
This commit is contained in:
commit
505e308cd6
|
@ -19,7 +19,8 @@
|
||||||
#
|
#
|
||||||
##############################################################################
|
##############################################################################
|
||||||
|
|
||||||
from datetime import datetime, timedelta
|
from datetime import datetime
|
||||||
|
from dateutil.relativedelta import relativedelta
|
||||||
import time
|
import time
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
|
@ -32,11 +33,11 @@ from openerp.tools.safe_eval import safe_eval as eval
|
||||||
_logger = logging.getLogger(__name__)
|
_logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
DATE_RANGE_FUNCTION = {
|
DATE_RANGE_FUNCTION = {
|
||||||
'minutes': lambda interval: timedelta(minutes=interval),
|
'minutes': lambda interval: relativedelta(minutes=interval),
|
||||||
'hour': lambda interval: timedelta(hours=interval),
|
'hour': lambda interval: relativedelta(hours=interval),
|
||||||
'day': lambda interval: timedelta(days=interval),
|
'day': lambda interval: relativedelta(days=interval),
|
||||||
'month': lambda interval: timedelta(months=interval),
|
'month': lambda interval: relativedelta(months=interval),
|
||||||
False: lambda interval: timedelta(0),
|
False: lambda interval: relativedelta(0),
|
||||||
}
|
}
|
||||||
|
|
||||||
def get_datetime(date_str):
|
def get_datetime(date_str):
|
||||||
|
|
|
@ -544,7 +544,9 @@ openerp.mail = function (session) {
|
||||||
context: context,
|
context: context,
|
||||||
};
|
};
|
||||||
|
|
||||||
self.do_action(action);
|
self.do_action(action, {
|
||||||
|
'on_close': function(){ self.parent_thread.message_fetch() }
|
||||||
|
});
|
||||||
self.on_cancel();
|
self.on_cancel();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -832,6 +832,8 @@ def trans_generate(lang, modules, cr):
|
||||||
display_path = "addons%s" % frelativepath
|
display_path = "addons%s" % frelativepath
|
||||||
module = get_module_from_path(fabsolutepath, mod_paths=mod_paths)
|
module = get_module_from_path(fabsolutepath, mod_paths=mod_paths)
|
||||||
if ('all' in modules or module in modules) and module in installed_modules:
|
if ('all' in modules or module in modules) and module in installed_modules:
|
||||||
|
if os.path.sep != '/':
|
||||||
|
display_path = display_path.replace(os.path.sep, '/')
|
||||||
return module, fabsolutepath, frelativepath, display_path
|
return module, fabsolutepath, frelativepath, display_path
|
||||||
return None, None, None, None
|
return None, None, None, None
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue