Commit Graph

408 Commits

Author SHA1 Message Date
Saurabh
2e3c06e66d [get_query]to server side 2013-07-09 18:20:49 +05:30
Saurabh
ab462d2000 [get_query]to server side 2013-07-09 16:18:52 +05:30
Rushabh Mehta
a2a1ec765b [mappers] cleanup, remove dt_map, map_doclist and other such functions 2013-07-08 11:08:27 +05:30
Nabin Hait
ed23cca9d3 [mapper] removed old mapper from files and database 2013-07-07 19:11:52 +05:30
Rushabh Mehta
11d688a536 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-05 15:14:15 +05:30
Rushabh Mehta
3a3c2710d1 [icon] added in doctype 2013-07-05 15:13:31 +05:30
Anand Doshi
ef8d3bcb77 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-05 12:57:41 +05:30
Anand Doshi
901773a139 [fresh install] [fix] replace allow roles with explicit has_permission checks for doctype py files 2013-07-05 12:57:03 +05:30
Rushabh Mehta
54352c7140 [form cleanup] 2013-07-05 12:43:59 +05:30
Rushabh Mehta
d420401ba3 [moduleview] added top bar 2013-07-01 17:15:23 +05:30
Rushabh Mehta
64c2764b56 [translations/build] deleted translation files (to be built on demand) 2013-06-17 11:56:41 +05:30
Anand Doshi
b53b9dcff4 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-06-11 16:23:45 +05:30
Anand Doshi
27e6f13b5d [cleanup] deprecated search criteria, amendment_date, cancel_reason 2013-06-11 16:23:18 +05:30
Anand Doshi
618edee8b7 [search criteria] [cleanup] removed search criteria folders and files 2013-06-11 15:04:37 +05:30
Rushabh Mehta
d9dfbae718 [docs] added readme for hr module 2013-06-11 15:03:41 +05:30
Rushabh Mehta
e93a2f6e8e [cleanup] removed Employee Training, Other Income 2013-06-11 15:03:25 +05:30
Rushabh Mehta
c4f08ef456 [views] cleaned up, added ganttview 2013-06-05 17:14:52 +05:30
Rushabh Mehta
8fefeaf1bd [ui] removed links to old search_criteria and Report2 is now Report 2013-06-04 11:23:42 +05:30
Rushabh Mehta
e05135c8c4 [fixes to wnf #127 2013-05-27 18:32:20 +05:30
Rushabh Mehta
126f2c62f2 [merge] merge with master 2013-05-24 16:09:13 +05:30
Nabin Hait
5e50ffa308 [fixes] employee query in leave application 2013-05-21 15:31:32 +05:30
Anand Doshi
4430c0d718 [upload attendance] [fix] fixed import issue for role restricted whitelist methods 2013-05-14 19:23:37 +05:30
Anand Doshi
6e3706d733 [employee] [fix] on user id, set Employee role to profile 2013-05-14 17:11:27 +05:30
Nabin Hait
da369d8eee [report] requested qty to be ordered 2013-05-13 16:29:28 +05:30
Nabin Hait
c518e8be12 [report] monthly attendance sheet 2013-05-13 15:59:50 +05:30
Nabin Hait
765383b3cf [report] monthly salary register 2013-05-10 18:41:58 +05:30
Anand Doshi
ef06a4b349 [autoname] [cleanup] strip blank spaces and remove autoname where naming_series: can be set in doctype 2013-05-09 15:13:47 +05:30
Rushabh Mehta
f514998011 merge 2013-05-09 11:42:35 +05:30
Nabin Hait
6754dda4a8 [report] employee information 2013-05-06 18:50:29 +05:30
Nabin Hait
35e7e8f58f [report] employee birthday 2013-05-06 18:37:57 +05:30
Nabin Hait
c51c0ce3e9 [fixes] salary slip 2013-05-03 15:40:26 +05:30
Rushabh Mehta
d3e00995db [conflicts] [merged] 2013-05-02 16:02:59 +05:30
Nabin Hait
81bbfba0cc [hr] allowed rename in earning and deduction type 2013-05-02 11:27:25 +05:30
Rushabh Mehta
f1cfbeaa5c [merge] fix 2013-04-24 10:03:56 +05:30
Anand Doshi
dc0f2d2422 Merge branch 'master' into edge
Conflicts:
	accounts/doctype/sales_invoice/sales_invoice.txt
	stock/doctype/item/item.txt
2013-04-23 12:42:18 +05:30
Anand Doshi
6f83e77010 [leave application] [employee query] fixes 2013-04-23 12:24:31 +05:30
Anand Doshi
f2785c9e61 Merge branch 'master' of github.com:webnotes/erpnext 2013-04-22 18:59:48 +05:30
Anand Doshi
a7b8f35539 [leave application] [employee query] allow employee lookup for which the current user is leave approver or thhe employee has no leave approvers mentioned or the user is the employee 2013-04-22 18:59:04 +05:30
Nabin Hait
d16cae113a [salary structure] added a validation 2013-04-22 15:15:47 +05:30
Nabin Hait
a305406267 [salary structure] added a validation 2013-04-22 14:30:30 +05:30
Nabin Hait
2f829ecbdf field label changed in salary structure 2013-04-22 14:10:36 +05:30
Rushabh Mehta
1615f2f46c [merge edge] 2013-04-18 10:38:02 +05:30
Rushabh Mehta
651ce05fcc [merge master
]
2013-04-18 10:37:16 +05:30
Anand Doshi
a1924eda90 [employee] [fix] removed erroneous break statement 2013-04-17 18:40:40 +05:30
Anand Doshi
c6aecb3f97 Merge branch 'master' into edge
Conflicts:
	home/page/latest_updates/latest_updates.js
	hr/doctype/employee/employee.txt
2013-04-16 21:32:06 +05:30
Rushabh Mehta
ac118c8822 [cleanup] started responsive layouts and removed tinymce 2013-04-15 17:02:20 +05:30
Anand Doshi
60666a278f [Leave Application] [fixes] Validate Leave Approver based on a list specified in Employee 2013-04-12 20:19:53 +05:30
Rushabh Mehta
0c1611219e [files] [cleanup/redesign] removed the old file_list structure and also added file listing in setup 2013-04-10 13:54:13 +05:30
Rushabh Mehta
33075e1f69 [files] [patch] dropped file_list property and moved links to 2013-04-10 11:08:50 +05:30
Rushabh Mehta
cfa663e337 [message] [fix] rewire to core 2013-04-04 10:02:08 +05:30
Nabin Hait
787c02ee42 aii fixes 2013-03-29 16:42:33 +05:30
Anand Doshi
96b189c118 fixes in test cases and buying amount function 2013-03-26 18:43:10 +05:30
Rushabh Mehta
4731fb999c [feature] [fix] utilities/rename tool upgraded to upload multiple items 2013-03-26 12:47:19 +05:30
Anand Doshi
a1e44e4202 Merge pull request #315 from mayur-patel/master
Added default for Employee doctype with help of Anand Doshi
2013-03-22 05:49:25 -07:00
mayur-patel
e635a45be9 Added new default value with help of Anand Doshi. 2013-03-21 21:30:34 +11:00
Nabin Hait
725173aca5 fixed monthly attendance report 2013-03-12 18:21:24 +05:30
Anand Doshi
df6ff1385f fixes in warehouse validation 2013-03-11 19:44:52 +05:30
Anand Doshi
80f7637ae6 added print width in txts of istable type doctypes 2013-03-07 11:37:33 +05:30
Anand Doshi
4244b3b267 fix in monthly salary register 2013-03-06 16:49:13 +05:30
Nabin Hait
7804401d03 attendance code cleanup 2013-03-06 11:32:33 +05:30
Rushabh Mehta
c9e32e6c8d fixed patches for new sync 2013-03-06 11:30:09 +05:30
Nabin Hait
a0accd9f67 fixed conflict 2013-03-05 15:58:04 +05:30
Nabin Hait
dae20d87dc refactored upload attendace tool 2013-03-05 15:52:07 +05:30
Rushabh Mehta
c4529ebb0d Merge pull request #300 from mayur-patel/master
Allow user to add leave application which may results in negative balance.
2013-03-05 01:27:26 -08:00
mayur-patel
c7e28c7e5d changed the logic to be more elegant. 2013-03-05 20:14:05 +11:00
Rushabh Mehta
07287e8b93 removed colour fields from txt files 2013-03-05 14:19:48 +05:30
mayur-patel
547604cf5a Added a new field called allow_negative. This field was added for allowing a negative balance for a particular leave type. 2013-03-05 19:11:53 +11:00
mayur-patel
f10f2513fa Added checks to see if the selected leave type allows negative balance. If it does then warn the user and continue with saving the form else just warn the user and don't save the form data. 2013-03-05 18:20:57 +11:00
mayur-patel
639392a0b1 Allowing user to add leaves which may results in negative leave balance. 2013-03-05 16:21:00 +11:00
Rushabh Mehta
213b180060 merge, update bean validations 2013-03-01 19:09:06 +05:30
Rushabh Mehta
fee642d547 completed Time Log / Time Log Batch 2013-03-01 18:24:52 +05:30
Nabin Hait
a139dc93f0 Merge branch 'master' of github.com:webnotes/erpnext 2013-03-01 14:40:59 +05:30
Nabin Hait
483731e06c fixes in attendance control panel 2013-03-01 14:40:40 +05:30
Anand Doshi
57f83ed36b show leave balance in leave balance report 2013-03-01 14:11:56 +05:30
Rushabh Mehta
b21eb9ac09 added time log batch 2013-02-28 18:42:46 +05:30
billyfordson
9b352309c6 Adding German translation 2013-02-27 17:36:23 +01:00
Anand Doshi
5c6fc62b9e added company filter in employee leave balance report 2013-02-27 19:08:01 +05:30
Anand Doshi
46d437e2ef fix in get previous fiscal year for leave allocation 2013-02-27 18:55:37 +05:30
Anand Doshi
89e70d77ca show leave application of other employees in deparment if user has Employee role, but also show leave applications based on permissions - show unique of both 2013-02-27 18:46:21 +05:30
Anand Doshi
b60aef5595 added report button in todo page 2013-02-25 15:22:20 +05:30
Rushabh Mehta
e4eb89b02a added new language and filters in query reports 2013-02-25 13:00:16 +05:30
Rushabh Mehta
9e02949821 updated language and separated slickgrid files 2013-02-25 11:05:27 +05:30
Rushabh Mehta
90098d2ebd new employee_leave_balance_report 2013-02-22 17:54:50 +05:30
Rushabh Mehta
96b91f49fa check toggle converted to true / false 2013-02-22 12:32:02 +05:30
Rushabh Mehta
25af38e509 show leave block day warning 2013-02-22 11:43:14 +05:30
Rushabh Mehta
f41dd39286 added language 2013-02-21 16:57:54 +05:30
Anand Doshi
59d8a76e60 Merge branch 'master' of github.com:webnotes/erpnext into edge
Conflicts:
	hr/doctype/leave_application/locale/_messages_py.json
	hr/doctype/leave_block_list/locale/_messages_doc.json
	public/js/locale/_messages_js.json
	setup/doctype/email_digest/locale/_messages_doc.json
	setup/doctype/global_defaults/global_defaults.txt
2013-02-21 11:09:43 +05:30
Rushabh Mehta
833b0f12d5 Merge branch 'master' of github.com:webnotes/erpnext 2013-02-21 09:48:35 +05:30
Anand Doshi
67160d48fd allow importing leave allocation 2013-02-20 19:11:54 +05:30
Anand Doshi
7ce7d7cad4 Merge branch 'master' of github.com:webnotes/erpnext into edge 2013-02-20 16:08:43 +05:30
Rushabh Mehta
87e4801946 website settings social icons 2013-02-20 15:02:21 +05:30
Anand Doshi
150d98d786 calculate total leave days on load 2013-02-19 18:52:20 +05:30
Anand Doshi
64e47afec1 calculate total leave days on load 2013-02-19 18:49:12 +05:30
Anand Doshi
f36a00bcbe changed description of allow users in Leave Block List 2013-02-19 18:43:20 +05:30
Anand Doshi
d70f7dec2b raise leave blocked error when status is saved as Approved 2013-02-19 18:37:51 +05:30
Anand Doshi
b05b1dacd5 added Follow Via Email 2013-02-19 16:54:49 +05:30
Rushabh Mehta
5c6216f0bd merge 2013-02-19 15:36:38 +05:30
Rushabh Mehta
5117d9c266 refactored defaults, bin material request wip 2013-02-19 15:27:31 +05:30
Anand Doshi
7621a94ed9 allow leave application to have attachments 2013-02-19 15:24:34 +05:30
Anand Doshi
04ae7b86ff Merge branch 'master' of github.com:webnotes/erpnext 2013-02-19 15:09:52 +05:30
Anand Doshi
a95e2db5b6 leave application calendar: add leaves based on permission; add holidays applicable to the employee 2013-02-19 15:09:21 +05:30
Nabin Hait
fe787259b6 removed observer function for employee 2013-02-19 12:56:12 +05:30
Anand Doshi
22d3a8b41b fetch docstatus in leave application for calendar view; fix in leave application test 2013-02-19 08:45:22 +05:30
Anand Doshi
6ad06f3210 fixes in employee helper 2013-02-18 19:57:16 +05:30
Anand Doshi
ac1985ff68 added observer for employee doctype to update salary structure 2013-02-18 19:42:02 +05:30
Anand Doshi
d19e2f56cc make sure employee name is a string 2013-02-18 19:15:56 +05:30
Anand Doshi
62ef71be57 added leave application to allow import list 2013-02-18 18:38:36 +05:30
Anand Doshi
b54b22734f fixed leave application error -- take employee name from employee record 2013-02-18 18:33:20 +05:30
Rushabh Mehta
c53231a841 model_wrapper is now bean, refactoring defaults 2013-02-18 18:24:28 +05:30
Anand Doshi
17bc54107f make leave application importable 2013-02-18 18:02:47 +05:30
Anand Doshi
78352d1e71 leave application permissions patch - removed permlevel 2 2013-02-18 17:09:11 +05:30
Rushabh Mehta
c06ce25470 updated translations 2013-02-18 14:24:05 +05:30
Rushabh Mehta
e51b5e3643 Merge branch 'master' of github.com:webnotes/erpnext 2013-02-15 19:28:41 +05:30
Rushabh Mehta
9249f354cd added view selector and calendar view for leave application 2013-02-15 19:28:05 +05:30
Anand Doshi
9cde1bbb0e Merge branch 'master' of github.com:webnotes/erpnext 2013-02-15 18:29:22 +05:30
Anand Doshi
0bf801af62 email to leave approver and employee 2013-02-15 18:27:05 +05:30
Rushabh Mehta
6227527cdb added leave applications and block lists to calendar 2013-02-14 20:42:33 +05:30
Rushabh Mehta
5eb37647cf added new calendar and renamed holiday block list 2013-02-14 17:34:51 +05:30
Anand Doshi
9c35b2897c raise holiday block list exception only when submitting 2013-02-13 20:26:45 +05:30
Anand Doshi
798c6b4fdb fixes in test runner and add role for profile 2013-02-13 19:57:58 +05:30
Anand Doshi
5070224079 select leave approver by fullname in leave application 2013-02-13 19:49:42 +05:30
Anand Doshi
223072be02 when saving employee add employee image to profile 2013-02-13 18:53:08 +05:30
Anand Doshi
c45630faf8 added add_role method in profile 2013-02-13 18:35:33 +05:30
Anand Doshi
eb92b52817 fixes in employee form 2013-02-13 18:30:53 +05:30
Rushabh Mehta
a9545794aa number format fix, permission fix in listview 2013-02-13 12:33:02 +05:30
Rushabh Mehta
4b9827a5fc upgraded test_runner, now can run multiple tests 2013-02-12 19:20:39 +05:30
Rushabh Mehta
629c196606 added date in pop3 mails 2013-02-11 16:21:14 +05:30
Rushabh Mehta
e38d783aff removed session timeout for getting emails 2013-02-11 15:55:20 +05:30
Rushabh Mehta
af222dc6b2 updated language 2013-02-11 11:49:18 +05:30
Rushabh Mehta
60135df6fd updated language 2013-02-11 11:44:12 +05:30
Anand Doshi
a11a21c6a9 changed _Test Fiscal Year to _Test Fiscal Year 2013 2013-02-08 19:27:38 +05:30
Anand Doshi
6fad5ab075 if total leave days is 0, do not allow leave application to be saved 2013-02-08 16:43:37 +05:30
Anand Doshi
e1ca5fdf4e Merge branch 'master' of github.com:webnotes/erpnext 2013-02-08 15:29:54 +05:30
Anand Doshi
8b5645d281 leave application overlap validation: consider both open and approved leave applications 2013-02-08 15:29:13 +05:30
Rushabh Mehta
66aa26546b fix 2013-02-08 15:06:05 +05:30
Nabin Hait
df35645e2a Update hr/doctype/employee/employee.txt
removed salary structure button
2013-02-08 13:09:18 +05:30
Nabin Hait
197861f576 Update hr/doctype/leave_application/leave_application.txt
changed permlevel for some fiedls in leave application
2013-02-08 11:28:40 +05:30
Anand Doshi
40ad7a7bbc Merge branch 'master' of github.com:webnotes/erpnext 2013-02-07 19:48:49 +05:30
Anand Doshi
6209046772 added some test records 2013-02-07 19:47:34 +05:30
Nabin Hait
b7084b8995 Update hr/doctype/appraisal/appraisal.py
fixed issue in appraisal
2013-02-07 18:15:04 +05:30
Rushabh Mehta
981577050c added company in leave application and global holiday block list 2013-02-07 09:09:14 +05:30
Rushabh Mehta
14464473da email receive bugfix 2013-02-06 20:31:08 +05:30
Rushabh Mehta
8c713e7f0c added holidy_block_list_allow 2013-02-06 16:10:48 +05:30
Rushabh Mehta
509f17c3a4 minor 2013-02-06 08:49:59 +05:30
Rushabh Mehta
c2563effbf added test case for leave_application 2013-02-05 23:25:37 +05:30
Rushabh Mehta
4e95bb59a0 added test_runner 2013-02-05 19:20:51 +05:30
Rushabh Mehta
cdc32d02b2 hide toolbar only hides std buttons 2013-02-05 15:04:09 +05:30
Rushabh Mehta
2e8d078adf adding block list, part 1 2013-02-05 11:31:27 +05:30
Rushabh Mehta
d39c55ae4b added explain to get_status in field for debugging 2013-02-04 10:24:43 +05:30
Nabin Hait
2bbb385acf fixes in salary register report 2013-02-01 18:13:54 +05:30