Merge branch 'master' into develop
This commit is contained in:
commit
73e4bb5662
2 changed files with 7 additions and 1 deletions
|
|
@ -14,7 +14,7 @@ import os, sys, importlib, inspect, json
|
|||
from .exceptions import *
|
||||
from .utils.jinja import get_jenv, get_template, render_template
|
||||
|
||||
__version__ = '8.1.3'
|
||||
__version__ = '8.1.4'
|
||||
__title__ = "Frappe Framework"
|
||||
|
||||
local = Local()
|
||||
|
|
|
|||
|
|
@ -163,6 +163,12 @@ Object.defineProperties(window, {
|
|||
return frappe.datetime;
|
||||
}
|
||||
},
|
||||
'date': {
|
||||
get: function() {
|
||||
console.warn('Please use `frappe.datetime` instead of `date`. It will be deprecated soon.');
|
||||
return frappe.datetime;
|
||||
}
|
||||
},
|
||||
'get_today': {
|
||||
get: function() {
|
||||
console.warn('Please use `frappe.datetime.get_today` instead of `get_today`. It will be deprecated soon.');
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue