Anand Doshi
|
c64da278ca
|
fixed auto material request email
|
2013-02-21 12:04:42 +05:30 |
|
Anand Doshi
|
2c9103fc05
|
changed save to set value for observer of Material Request
|
2013-02-21 11:21:34 +05:30 |
|
Anand Doshi
|
135a4ccabd
|
changed modified of global defaults.txt after merge conflict
|
2013-02-21 11:10:36 +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 |
|
Anand Doshi
|
8867cc2381
|
fixes in material request - hide sales order fields, changed Purchase Requisition to Material Request in some places
|
2013-02-21 11:02:10 +05:30 |
|
Rushabh Mehta
|
1c36697556
|
updates to website footer
|
2013-02-21 10:54:04 +05:30 |
|
Rushabh Mehta
|
f2b17d91a1
|
updates to website footer
|
2013-02-21 10:49:37 +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
|
cf05580f8e
|
fixes related to Material Request; added button to make Stock Entry of type Material Transfer; calculate ordered_qty and per_ordered in Material Request using observer pattern when Stock Entry against it is submitted or cancelled
|
2013-02-20 18:44:10 +05:30 |
|
Nabin Hait
|
bd03b899b3
|
updated latest_updates page
|
2013-02-20 17:03:51 +05:30 |
|
Nabin Hait
|
4489c56b0c
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-02-20 16:25:46 +05:30 |
|
Nabin Hait
|
6f1a5ec209
|
Disable rounded total feature
|
2013-02-20 16:25:05 +05:30 |
|
Anand Doshi
|
7ce7d7cad4
|
Merge branch 'master' of github.com:webnotes/erpnext into edge
|
2013-02-20 16:08:43 +05:30 |
|
Anand Doshi
|
c1db0a6220
|
fixes in patches
|
2013-02-20 16:08:21 +05:30 |
|
Anand Doshi
|
a43b29e4b1
|
get label from doctype's doclist
|
2013-02-20 15:55:10 +05:30 |
|
Rushabh Mehta
|
87e4801946
|
website settings social icons
|
2013-02-20 15:02:21 +05:30 |
|
Rushabh Mehta
|
b0a76bdfe2
|
material receipt from bin
|
2013-02-20 11:16:47 +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
|
c25cf3f413
|
:erge branch 'master' of github.com:webnotes/erpnext
|
2013-02-19 16:55:42 +05:30 |
|
Anand Doshi
|
b05b1dacd5
|
added Follow Via Email
|
2013-02-19 16:54:49 +05:30 |
|
Nabin Hait
|
704d5f0f4a
|
delete service order/quotation doctype
|
2013-02-19 16:23:21 +05:30 |
|
Nabin Hait
|
452de98a6c
|
fixes in patch_list
|
2013-02-19 16:18:00 +05:30 |
|
Nabin Hait
|
0e5ea316cc
|
fixes in naming series
|
2013-02-19 16:14:27 +05:30 |
|
Nabin Hait
|
f2d68e2fd5
|
display customer name instead of customer id in quotation print format
|
2013-02-19 15:55:11 +05:30 |
|
Rushabh Mehta
|
2fe861fa71
|
defaults cleanup
|
2013-02-19 15:54:15 +05:30 |
|
Nabin Hait
|
3fdad97b74
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-02-19 15:48:15 +05:30 |
|
Nabin Hait
|
39fc5179f9
|
display customer name instead of customer id in quotation print format
|
2013-02-19 15:47:19 +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
|
63910e3f20
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-02-19 15:25:48 +05:30 |
|
Anand Doshi
|
7621a94ed9
|
allow leave application to have attachments
|
2013-02-19 15:24:34 +05:30 |
|
Nabin Hait
|
789af74891
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-02-19 15:15:11 +05:30 |
|
Nabin Hait
|
66ea0861ff
|
fixes in gle_floating_point_issue patch
|
2013-02-19 15:13:23 +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
|
9c880da381
|
removed old doctypes
|
2013-02-18 14:28:34 +05:30 |
|