Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:webnotes/erpnext

Browse Source
This commit is contained in:
Rushabh Mehta 2012-11-12 08:28:17 +01:00
commit ad17be8c62
4 changed files with 11 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
patches/before_jan_2012/employeewise_balance_leave_report.py
View File

@ -1,33 +0,0 @@
# ERPNext - web based ERP (http://erpnext.com)
# Copyright (C) 2012 Web Notes Technologies Pvt Ltd
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
from __future__ import unicode_literals
"""
This patch changes criteria name
of search criteria "employeewise_balance_leave_report"
from "Employeewise Balance Leave Report"
to "Employee Leave Balance Report"
This patch never worked!!!
"""
def execute():
from webnotes.model.doc import Document
from webnotes.modules import reload_doc
reload_doc('hr', 'search_criteria', 'employeewise_balance_leave_report')
d = Document('Search Criteria', 'employeewise_balance_leave_report')
d.criteria_name = 'Employee Leave Balance Report'
d.description = 'Employeewise Balance Leave Report'
d.save()

6
patches/november_2012/report_permissions.py Normal file
View File

@ -0,0 +1,6 @@
import webnotes
def execute():
webnotes.conn.sql("""update tabDocPerm set `write`=1 where
parent='Report'
and role in ('Administrator', 'Report Manager', 'System Manager')""")

4
patches/patch_list.py
View File

@ -659,4 +659,8 @@ patch_list = [
'patch_module': 'patches.november_2012', 'patch_module': 'patches.november_2012',
'patch_file': 'rename_employee_leave_balance_report', 'patch_file': 'rename_employee_leave_balance_report',
}, },
{
'patch_module': 'patches.november_2012',
'patch_file': 'report_permissions',
},
] ]

2
public/js/startup.js
View File

@ -61,7 +61,7 @@ erpnext.startup.start = function() {
erpnext.complete_setup.show(); erpnext.complete_setup.show();
} }
if(wn.boot.expires_on && in_list(user_roles, 'System Manager')) { if(wn.boot.expires_on && in_list(user_roles, 'System Manager')) {
var today = dateutil.str_to_obj(dateutil.get_today()); var today = dateutil.str_to_obj(wn.boot.server_date);
var expires_on = dateutil.str_to_obj(wn.boot.expires_on); var expires_on = dateutil.str_to_obj(wn.boot.expires_on);
var diff = dateutil.get_diff(expires_on, today); var diff = dateutil.get_diff(expires_on, today);
if (0 <= diff && diff <= 15) { if (0 <= diff && diff <= 15) {