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
|
9c880da381
|
removed old doctypes
|
2013-02-18 14:28:34 +05:30 |
|
Rushabh Mehta
|
c06ce25470
|
updated translations
|
2013-02-18 14:24:05 +05:30 |
|
Anand Doshi
|
fe62769078
|
reload search criteria in material request patch
|
2013-02-18 13:51:41 +05:30 |
|
Anand Doshi
|
10eeae067c
|
rename Purchase Request to Material Request
|
2013-02-18 13:49:22 +05:30 |
|
Anand Doshi
|
236cc173ad
|
rename Purchase Request to Material Request
|
2013-02-18 13:49:15 +05:30 |
|
Anand Doshi
|
de46f43dc1
|
Merge branch 'master' into edge
|
2013-02-18 12:09:47 +05:30 |
|
Anand Doshi
|
89869cf635
|
fixes in purchase invoice listing
|
2013-02-18 12:09:29 +05:30 |
|
Anand Doshi
|
696d6ea073
|
Merge branch 'master' into edge
|
2013-02-17 00:27:18 +05:30 |
|
Anand Doshi
|
19df1882fa
|
fix in startup init file
|
2013-02-17 00:26:59 +05:30 |
|
Anand Doshi
|
a0e2f51c2f
|
Merge branch 'master' into edge
|
2013-02-16 18:46:09 +05:30 |
|
Anand Doshi
|
a3acd57654
|
email digest patch
|
2013-02-16 18:45:09 +05:30 |
|
Anand Doshi
|
2794736d5d
|
email digest patch
|
2013-02-16 18:44:40 +05:30 |
|
Anand Doshi
|
2872b1b9bb
|
Merge branch 'master' into edge
|
2013-02-16 15:51:47 +05:30 |
|
Anand Doshi
|
d6f97c26e0
|
show todo and calendar as unorder list
|
2013-02-16 15:50:57 +05:30 |
|
Anand Doshi
|
b17f3d280b
|
Merge branch 'master' into edge
|
2013-02-16 15:09:38 +05:30 |
|
Anand Doshi
|
96bebb44b0
|
patch to enable calendar events and todo list in email digest if email digest is enabled
|
2013-02-16 15:09:34 +05:30 |
|
Anand Doshi
|
e81ff2bbdd
|
Merge branch 'master' into edge
|
2013-02-16 15:06:38 +05:30 |
|
Anand Doshi
|
03741698e4
|
added icons in modules drop down menu
|
2013-02-16 15:05:37 +05:30 |
|
Anand Doshi
|
d628916a2c
|
email digest for todo and calendar
|
2013-02-16 14:51:25 +05:30 |
|
Anand Doshi
|
c79cd76746
|
Merge branch 'master' into edge
|
2013-02-16 11:11:14 +05:30 |
|
Anand Doshi
|
32faa57692
|
Merge branch 'master' of github.com:webnotes/erpnext
Conflicts:
patches/patch_list.py
|
2013-02-16 11:09:37 +05:30 |
|
Anand Doshi
|
0cfdeec218
|
added event patch in patch list
|
2013-02-16 11:08:55 +05:30 |
|
Rushabh Mehta
|
bf4ef36341
|
removed calendar and fix
|
2013-02-16 10:44:51 +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
|
33839d9b8f
|
fix in patches
|
2013-02-15 18:27:12 +05:30 |
|
Anand Doshi
|
0bf801af62
|
email to leave approver and employee
|
2013-02-15 18:27:05 +05:30 |
|
Rushabh Mehta
|
aae45532f3
|
request: remove _type from form
|
2013-02-15 14:39:34 +05:30 |
|
Rushabh Mehta
|
1a9f0848b3
|
added calendar view
|
2013-02-15 12:09:05 +05:30 |
|
Rushabh Mehta
|
6227527cdb
|
added leave applications and block lists to calendar
|
2013-02-14 20:42:33 +05:30 |
|
Rushabh Mehta
|
b496756696
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-02-14 17:35:32 +05:30 |
|
Rushabh Mehta
|
5eb37647cf
|
added new calendar and renamed holiday block list
|
2013-02-14 17:34:51 +05:30 |
|
Anand Doshi
|
4b631947fc
|
Merge branch 'master' into edge
|
2013-02-14 16:48:26 +05:30 |
|
Anand Doshi
|
fb67605042
|
fix in trend analyzer - show currency only for amt field
|
2013-02-14 15:50:01 +05:30 |
|
Anand Doshi
|
5ea0133f97
|
Merge branch 'master' into edge
|
2013-02-14 13:39:10 +05:30 |
|
Anand Doshi
|
e74a1f2b85
|
fixes in outstanding amount calculation on cancellation of payment entry
|
2013-02-14 13:38:12 +05:30 |
|
Anand Doshi
|
13dc9f3b1f
|
shifted get_url to startup
|
2013-02-13 23:42:48 +05:30 |
|
Rushabh Mehta
|
ffb1e0c096
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-02-13 22:02:44 +05:30 |
|
Rushabh Mehta
|
8fbfbfbb78
|
number format fix
|
2013-02-13 22:02:09 +05:30 |
|
Anand Doshi
|
8da053a7f3
|
Merge branch 'master' into edge
|
2013-02-13 20:33:24 +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 |
|