Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,588 Commits 3 Branches 0 Tags 1 GiB
f7b203de2d
Commit Graph

83 Commits

Author SHA1 Message Date
Rushabh Mehta
f7b203de2d [cleanup] UI Fixes 2013-11-03 20:37:49 +05:30
Rushabh Mehta
ef5845589d [cleanup] [minor] finishing styles, labels, descriptions 2013-11-02 14:47:11 +05:30
Nabin Hait
ed3dc56da4 [minor] Ignore permission while updating profile from employee 2013-10-28 19:59:44 +05:30
Nabin Hait
ca8ad210d2 Merge branch 'i18n' of git://github.com/bperretti/erpnext into bperretti-i18n 2013-10-24 11:40:32 +05:30
Rushabh Mehta
70d7c481e9 [naming series] create, remove Property Setters to set naming fixes webnotes/erpnext#854 2013-10-18 17:27:45 +05:30
Bárbara Perretti
4b41e5f7f7 Merge branch 'wsgi' of https://github.com/webnotes/erpnext into i18n 
Conflicts:
	accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js
	accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js
	public/js/complete_setup.js
	selling/doctype/opportunity/opportunity.js
	selling/doctype/quotation/quotation.js
 2013-10-16 15:09:18 -03:00
Rushabh Mehta
915eda9c4a [minor] Added allow_rename in Employee webnotes/erpnetx#962 2013-10-11 10:57:13 +05:30
Anand Doshi
373680bbae Merged master into wsgi 2013-10-10 16:04:40 +05:30
Bárbara Perretti
63439ef7c7 fix translate hr/doctype/employee/employee.js 2013-10-07 15:33:56 -03:00
Anand Doshi
fa228e9c9b Merge branch 'master' of github.com:webnotes/erpnext into wsgi 
Conflicts:
	accounts/doctype/purchase_invoice/purchase_invoice.py
	accounts/doctype/sales_invoice/sales_invoice.txt
	selling/doctype/lead/lead.txt
	selling/doctype/opportunity/opportunity.txt
	stock/doctype/warehouse/warehouse.py
 2013-10-02 16:52:52 +05:30
Rushabh Mehta
ea9f845814 feature to set / unset birthday reminders webnotes/erpnext#851 2013-10-02 16:02:02 +05:30
Nabin Hait
250059097c [fix] [minor] set employee name blank while creating new employee 2013-09-26 18:36:35 +05:30
Pratik Vyas
e55fbfc090 remove sql = 2013-09-18 11:10:59 +05:30
Anand Doshi
36b63a44b9 [fix] [minor] profile query 2013-09-03 15:33:56 +05:30
Anand Doshi
0b6fa018d6 [fix] [minor] create birthday event only for active employees, else delete it 2013-08-14 10:54:16 +05:30
Anand Doshi
05a340e764 [fix] [minor] fixes after merging akhilesh's changes 2013-08-12 20:01:55 +05:30
Akhilesh Darjee
de7d944f5e [issue] webnotes/erpnext#647 - recurring event for employee birthdays 2013-08-09 12:28:50 +05:30
Rushabh Mehta
75c3171c04 [rename] Naming Series is now Document Numbering Series and updated translations 2013-08-08 16:00:40 +05:30
Anand Doshi
d5b06f78a5 [fix] leave approver selection 2013-08-06 15:21:43 +05:30
Rushabh Mehta
9a921f479b [employee] [fix] Employee naming fix 2013-08-06 12:53:09 +05:30
Rushabh Mehta
e67d1fbcdf [license] [minor] Updated License Text in all js and py files 2013-08-05 14:59:54 +05:30
Anand Doshi
1fac2a98cf [fix] [client script] call cur_frm.cscript.custom_ type functions in the callback of standard functions 2013-07-29 19:30:39 +05:30
Nabin Hait
a4f0240bfc [conflict] merged for get_query 2013-07-10 19:05:57 +05:30
Nabin Hait
749b37f4f5 [fix][hr] pull salary structure in salary slip 2013-07-10 14:16:59 +05:30
Saurabh
ab462d2000 [get_query]to server side 2013-07-09 16:18:52 +05:30
Rushabh Mehta
3a3c2710d1 [icon] added in doctype 2013-07-05 15:13:31 +05:30
Rushabh Mehta
54352c7140 [form cleanup] 2013-07-05 12:43:59 +05:30
Rushabh Mehta
64c2764b56 [translations/build] deleted translation files (to be built on demand) 2013-06-17 11:56:41 +05:30
Rushabh Mehta
d9dfbae718 [docs] added readme for hr module 2013-06-11 15:03:41 +05:30
Anand Doshi
6e3706d733 [employee] [fix] on user id, set Employee role to profile 2013-05-14 17:11:27 +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
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
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
mayur-patel
e635a45be9 Added new default value with help of Anand Doshi. 2013-03-21 21:30:34 +11:00
billyfordson
9b352309c6 Adding German translation 2013-02-27 17:36:23 +01:00
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
f41dd39286 added language 2013-02-21 16:57:54 +05:30
Rushabh Mehta
c53231a841 model_wrapper is now bean, refactoring defaults 2013-02-18 18:24:28 +05:30
Rushabh Mehta
6227527cdb added leave applications and block lists to calendar 2013-02-14 20:42:33 +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
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
4b9827a5fc upgraded test_runner, now can run multiple tests 2013-02-12 19:20:39 +05:30
Rushabh Mehta
60135df6fd updated language 2013-02-11 11:44:12 +05:30