Commit graph

70 commits

Author SHA1 Message Date
Anand Doshi
3968f66d5f Fixes for MySQL-python==1.2.5 2014-01-05 02:45:00 +05:30
Nabin Hait
15f0aa3740 Fixed conflict while merging with master 2013-12-31 16:14:42 +05:30
Anand Doshi
82298a2f26 [hotfix] Reportview Filters 2013-12-30 19:30:43 +05:30
Anand Doshi
2b0c2595c7 Reportview Filters null value fix 2013-12-30 18:55:51 +05:30
Nabin Hait
a701dd9472 Fixes in filter_conditions, null issue 2013-12-27 18:06:33 +05:30
Anand Doshi
24f2445065 Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions
Conflicts:
	webnotes/__init__.py
	webnotes/core/doctype/docfield/docfield.txt
	webnotes/core/page/data_import_tool/data_import_tool.js
	webnotes/defaults.py
	webnotes/install_lib/install.py
	webnotes/model/bean.py
	webnotes/model/code.py
	webnotes/sessions.py
	webnotes/tests/test_nested_set.py
	webnotes/widgets/page.py
2013-12-26 19:12:35 +05:30
Nabin Hait
3feaa9fd43 Fixes in Filter conditions in reportview to handle null values 2013-12-25 14:49:24 +05:30
Nabin Hait
df62a9fc1a Fixes in Filter conditions in reportview to handle null values 2013-12-25 14:49:24 +05:30
Anand Doshi
829cf981df Implemented use of report, import, export, email and print rights of DocPerm 2013-12-23 20:01:14 +05:30
Anand Doshi
97ea7f91e2 Added import, export, print, email and restrict permissions 2013-12-23 20:01:13 +05:30
Anand Doshi
d3a9c56744 [restrictions] user properties page 2013-12-23 20:01:12 +05:30
Rushabh Mehta
6c2922ddf0 [cleanup] [minor] added webnotes.model.delete_doc (module) 2013-12-23 20:01:09 +05:30
Rushabh Mehta
91f7de2dd5 [permissions] Added Test Cases 2013-12-23 20:01:09 +05:30
Rushabh Mehta
4f74d816b6 [permission model] Redesign 2013-12-23 20:01:09 +05:30
Rushabh Mehta
9b4a20d5ab [permissions] Added Test Cases 2013-12-23 20:01:09 +05:30
Rushabh Mehta
202cce4b34 [permission model] Redesign 2013-12-23 20:01:09 +05:30
Rushabh Mehta
22a83f327c Rewrote hooks for scheduler, notifications, boot, session, login, webpage webnotes/wnframework#351 2013-12-16 12:49:48 +05:30
Pratik Vyas
f520c4db73 [minor] remove print statement, booboo 2013-11-22 15:13:01 +05:30
Rushabh Mehta
96877c72c2 [comment] Added in list, and now searchable webnotes/erpnext#1055 2013-11-22 11:53:12 +05:30
Rushabh Mehta
325def77df [copyright] added Contributors 2013-11-20 12:58:35 +05:30
Anand Doshi
65771bd9a7 Merge remote-tracking branch 'origin/1310'
Conflicts:
	webnotes/model/code.py
	webnotes/widgets/query_builder.py
	webnotes/widgets/reportview.py
2013-10-28 19:34:22 +05:30
Nabin Hait
5fac634254 [fix] [minor] additional match condition specific to doctype 2013-10-28 14:37:38 +05:30
Rushabh Mehta
8731df68d5 [issues] [minor] fixed multiple minor issues 2013-10-03 14:50:55 +05:30
Rushabh Mehta
ad9638d5b3 [wsgi] [minor] fixed webnotes.local.form_dict 2013-10-02 14:34:25 +05:30
Pratik Vyas
f8c32bbd11 refactor report view to make it thread safe 2013-09-18 19:19:16 +05:30
Anand Doshi
3c527d2af2 [fix] [minor] profile query 2013-09-03 15:33:50 +05:30
Rushabh Mehta
a33299a6f5 [reportview] Editable 2013-08-08 15:59:04 +05:30
Rushabh Mehta
348db9c49b [salary structure] Cleanup, Fixed Monthly Register Report and other minor changes 2013-08-06 17:53:40 +05:30
Rushabh Mehta
7d1d825388 [minor] added webnotes.get_list, fixed webnotes/erpnext#663 2013-08-05 16:21:04 +05:30
Rushabh Mehta
2e95247b5f [minor] [license] Standardizied license string in py an js code files 2013-08-05 14:46:00 +05:30
Anand Doshi
94db64c112 [minor] reportview - extract table if fields exist 2013-07-30 14:39:10 +05:30
Anand Doshi
c939d87181 [cleanup] [minor] added build_match_conditions to webnotes 2013-07-26 13:00:42 +05:30
Rushabh Mehta
af42359692 [permission] [minor] moved 403 to handler.py 2013-07-16 15:35:23 +05:30
Saurabh
135246ca04 [qwt_query] to server side 2013-07-09 16:40:32 +05:30
Nabin Hait
db1e475ac8 [merge] report match condition 2013-07-09 12:57:01 +05:30
Rushabh Mehta
ce666c05be [notifications] added match permissions #552 2013-07-09 11:58:10 +05:30
Akhilesh Darjee
dca4e59e77 [Report]Added permission to reports for showing data according to the user properties 2013-07-09 11:55:25 +05:30
Saurabh
e487b1a37d changes to handle server side queries 2013-07-09 10:10:43 +05:30
Anand Doshi
e8e2c68124 Merge branch 'webshop' of github.com:webnotes/wnframework into responsive 2013-05-28 17:44:56 +05:30
Rushabh Mehta
b3cbabf0a2 [link selector] fixes 2013-05-09 13:33:53 +05:30
Anand Doshi
c80fb24ec3 [in import] shifted global variable to webnotes 2013-04-19 16:14:48 +05:30
Anand Doshi
8224c8727e [reportview] [fix] removed debug from reportview's query 2013-04-05 15:08:12 +05:30
Rushabh Mehta
46caedd078 [message] [fix] rewire to core 2013-04-04 10:02:07 +05:30
Anand Doshi
b978efcba1 [reportview] [fix] escape single quote 2013-04-02 16:26:46 +05:30
Rushabh Mehta
71f2f3a1b1 completed Time Log / Time Log Batch 2013-03-01 18:24:50 +05:30
Rushabh Mehta
1291a480aa added Time Log 2013-02-26 16:36:40 +05:30
Anand Doshi
e06b12b0ad report export - removed limit of 50 2013-02-26 11:16:12 +05:30
Anand Doshi
5a69318b6f fix in saving report via Build Report 2013-02-25 16:33:48 +05:30
Anand Doshi
562547c8dd new report: todo list, added create permission to administrator for Report 2013-02-25 15:21:34 +05:30
Rushabh Mehta
c253a8ee58 new employee_leave_balance_report 2013-02-22 17:54:49 +05:30