Browse Source

Merge branch 'master' into develop

version-14
mbauskar 8 years ago
parent
commit
73e4bb5662
2 changed files with 7 additions and 1 deletions
  1. +1
    -1
      frappe/__init__.py
  2. +6
    -0
      frappe/public/js/frappe/misc/datetime.js

+ 1
- 1
frappe/__init__.py View File

@@ -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()


+ 6
- 0
frappe/public/js/frappe/misc/datetime.js View File

@@ -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…
Cancel
Save