Rushabh Mehta
|
9b5852a185
|
merged live
|
2011-08-30 16:12:33 +05:30 |
|
Rushabh Mehta
|
910d955779
|
fixed patch conflict
|
2011-08-30 16:09:01 +05:30 |
|
Rushabh Mehta
|
d8cae39a8b
|
Merge branch 'stable' of github.com:webnotes/erpnext into stable
|
2011-08-30 16:02:51 +05:30 |
|
Rushabh Mehta
|
fe5e8eb1b6
|
delete answer when question is deleted
|
2011-08-30 15:44:15 +05:30 |
|
Rushabh Mehta
|
e3393bead9
|
fix to kb, delete question, ans
|
2011-08-30 15:37:46 +05:30 |
|
Rushabh Mehta
|
385a3792e1
|
fixes to comment in my company
|
2011-08-30 14:17:33 +05:30 |
|
Rushabh Mehta
|
0b230d1165
|
fixes to dashboard
|
2011-08-30 13:55:55 +05:30 |
|
Rushabh Mehta
|
c7fbbbaeb0
|
fixes to dashboard
|
2011-08-30 13:45:57 +05:30 |
|
Rushabh Mehta
|
ae5cdeb472
|
fixes to dashboard and setup wizard
|
2011-08-30 13:24:49 +05:30 |
|
Brahma K
|
d1a2cea376
|
Feature Setup added
|
2011-08-30 09:33:29 +05:30 |
|
Brahma K
|
cc236198f7
|
Feature Setup merge with upstream
|
2011-08-30 09:32:41 +05:30 |
|
Brahma K
|
6ae1219956
|
Added new Feature List option to control front end based on companies broad requirements
|
2011-08-29 19:24:54 +05:30 |
|
Rushabh Mehta
|
96fde953bc
|
profile patch fix
|
2011-08-29 17:54:27 +05:30 |
|
Nabin Hait
|
109e848f81
|
Merge pull request #56 from nabinhait/master
patch
|
2011-08-29 03:54:07 -07:00 |
|
Nabin Hait
|
19818e2d28
|
updated patch_no
|
2011-08-29 16:23:17 +05:30 |
|
Rushabh Mehta
|
a5109b7441
|
added erpnext_version file
|
2011-08-29 15:22:29 +05:30 |
|
Nabin Hait
|
e00011ca11
|
Merge pull request #55 from nabinhait/master
dt mapper and set is_cancelled=no when serial no deleted
|
2011-08-29 02:15:05 -07:00 |
|
Nabin Hait
|
e0410da97f
|
deleted default custom script and moved them to py file
|
2011-08-29 14:24:19 +05:30 |
|
Nabin Hait
|
5b9b27d98c
|
update series server code shifted from custom script to py file
|
2011-08-29 14:23:14 +05:30 |
|
Nabin Hait
|
8e0f15a8b1
|
fixed repost function in warehouse
|
2011-08-29 13:17:19 +05:30 |
|
Nabin Hait
|
1d5cab8745
|
is_cancelled always no in sle if voucher type = serial no
|
2011-08-29 13:16:52 +05:30 |
|
Rushabh Mehta
|
dcaaea5041
|
merged from webnotes/erpnext
|
2011-08-29 10:47:58 +05:30 |
|
Brahma K
|
0b3bc9dcb9
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2011-08-29 09:18:58 +05:30 |
|
Nabin Hait
|
982763cbfa
|
set is_cancelled=no when serial no deleted
|
2011-08-26 18:53:27 +05:30 |
|
Nabin Hait
|
2c03015537
|
same from and to flds deleted from mapper
|
2011-08-25 19:41:24 +05:30 |
|
Rushabh Mehta
|
c91f88c5c5
|
dashboard fixes
|
2011-08-25 19:28:56 +05:30 |
|
Rushabh Mehta
|
0a187bece6
|
dashboard fixes
|
2011-08-25 19:28:02 +05:30 |
|
Rushabh Mehta
|
ac3aff5d29
|
dashboard fixes
|
2011-08-25 19:24:34 +05:30 |
|
Rushabh Mehta
|
0c9b1d4887
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2011-08-25 19:18:55 +05:30 |
|
Rushabh Mehta
|
29a75c4d7a
|
added dashboard
|
2011-08-25 19:17:44 +05:30 |
|
Nabin Hait
|
b4b9bb9c7d
|
Merge pull request #54 from nabinhait/master
patch
|
2011-08-25 04:25:47 -07:00 |
|
Nabin Hait
|
fc69354c7c
|
updated las_patch no
|
2011-08-25 16:55:05 +05:30 |
|
Nabin Hait
|
d04d7faf65
|
Merge pull request #53 from nabinhait/master
Sal manager email integration
|
2011-08-25 04:00:07 -07:00 |
|
Brahma K
|
f33e6746e5
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2011-08-25 16:25:28 +05:30 |
|
Nabin Hait
|
9292ac773e
|
Email will be sent on submit
|
2011-08-25 16:21:58 +05:30 |
|
Brahma K
|
29d5549bde
|
Features Setting
1. Features Setting DocType
2. Startup.js will be added with a function which binds with refresh of doc
3. Startup.js contains the Features dictionary
|
2011-08-25 16:20:16 +05:30 |
|
Rushabh Mehta
|
9e6e7fa0ef
|
bind an event to form refresh
|
2011-08-25 16:08:06 +05:30 |
|
Rushabh Mehta
|
33bce67234
|
fixes to my_company, added secrity settings to restrict by ip, timings
|
2011-08-25 15:15:25 +05:30 |
|
Nabin Hait
|
54fbc8e4e6
|
fixed test case
|
2011-08-25 14:12:17 +05:30 |
|
Nabin Hait
|
acfd84a4f6
|
Merge pull request #52 from nabinhait/master
Salary Manager Launched
|
2011-08-25 01:35:25 -07:00 |
|
Nabin Hait
|
cfe8ee89fe
|
Salary Manager Link in HR module and deleted salary slip control panel link
|
2011-08-25 14:02:01 +05:30 |
|
Nabin Hait
|
6d121b3faa
|
Error in loading JV fixed
|
2011-08-25 13:51:21 +05:30 |
|
Nabin Hait
|
781b3eeb81
|
Salary Manager rewriten for multiple sal slip generation.
Test case included.
|
2011-08-25 13:30:02 +05:30 |
|
Nabin Hait
|
da894640f3
|
deleted salary slip control panel
|
2011-08-25 13:26:54 +05:30 |
|
Nabin Hait
|
7003a70b55
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2011-08-24 14:07:49 +05:30 |
|
Nabin Hait
|
2a081c5cfa
|
loan document deleted from git
|
2011-08-24 14:06:56 +05:30 |
|
Nabin Hait
|
7b8f53c193
|
delete blank row in dn print format
|
2011-08-24 11:23:34 +05:30 |
|
Nabin Hait
|
247c3591ee
|
delete blank row in dn print format
|
2011-08-24 11:20:24 +05:30 |
|
Nabin Hait
|
db87672d47
|
Merge pull request #50 from tobrahma/master
patch corrected to add item_customer_detail
|
2011-08-23 06:14:31 -07:00 |
|
Brahma K
|
b25ed70775
|
patch merged
|
2011-08-23 18:41:25 +05:30 |
|