Commit Graph

610 Commits

Author SHA1 Message Date
Nabin Hait
da073e94e7 Merge pull request #72 from nabinhait/master
fixed error
2011-09-05 01:52:40 -07:00
Nabin Hait
e91fa64e58 fixed error in receivable voucher (fetching pos warehosue) 2011-09-05 14:21:46 +05:30
Nabin Hait
98f9e98068 Merge pull request #70 from nabinhait/master
salary
2011-09-02 05:53:51 -07:00
Nabin Hait
0275149074 resolved conflict in patch 2011-09-02 17:48:05 +05:30
Nabin Hait
343e10586b fixed sal slip email format 2011-09-02 17:45:13 +05:30
Nabin Hait
8c2618c27a delete salary control panel and reload salary slip 2011-09-02 17:43:32 +05:30
Brahma K
779cfafa41 modified general ledger to add opening balance 2011-09-02 16:55:03 +05:30
Nabin Hait
ce6a85f7dc Merge pull request #69 from nabinhait/master
reload salary manager
2011-09-02 02:15:18 -07:00
Nabin Hait
c63e62e883 reload salary manager 2011-09-02 14:44:15 +05:30
Nabin Hait
f5a1359303 Merge pull request #68 from nabinhait/master
rerun packing list patch
2011-09-02 00:46:08 -07:00
Nabin Hait
883604d368 resolved conflict in patch 2011-09-02 13:14:55 +05:30
Nabin Hait
ef75761c42 rerun packing list patch 2011-09-02 13:10:23 +05:30
Brahma K
e7eec96485 Merge branch 'master' of github.com:webnotes/erpnext 2011-09-01 16:09:16 +05:30
Nabin Hait
f67609b4f0 Merge pull request #65 from nabinhait/master
if source qty/amt zero, do not check for over delivery/bill
2011-08-31 04:57:00 -07:00
Nabin Hait
630f433741 if source qty/amt zero, do not check for over delivery/bill 2011-08-31 17:23:23 +05:30
Brahma K
83e783dcd4 Merge branch 'master' of github.com:webnotes/erpnext 2011-08-31 15:47:21 +05:30
Brahma K
8e8c4820cb Changes in patch of feature setup and added description against each feature 2011-08-31 15:46:29 +05:30
Nabin Hait
8aa15d0fec Merge pull request #63 from nabinhait/master
developer email id correction
2011-08-31 02:37:13 -07:00
Nabin Hait
30174d27dc sent bin qty vs serial no mail only if admin_email_notification 2011-08-31 15:03:01 +05:30
Brahma K
3c9a6a19e8 Feature Setup changes, related patch, Production Order 'produced_qty' label change, item->ref_rate_details->currency fills with defaut 2011-08-31 12:55:41 +05:30
Brahma K
369c7009ec Merge branch 'master' of github.com:webnotes/erpnext 2011-08-31 12:33:39 +05:30
Nabin Hait
d3b3eb2272 reload dashboard 2011-08-31 11:33:15 +05:30
Nabin Hait
cf7b2bbc98 Merge pull request #62 from nabinhait/master
reload dashboard
2011-08-30 22:59:08 -07:00
Nabin Hait
93592132b2 reload dashboard 2011-08-31 11:27:51 +05:30
Brahma K
3b575b5790 Merge branch 'master' of github.com:webnotes/erpnext 2011-08-31 09:02:31 +05:30
Brahma K
5ecb6933a8 added features to feature setup 2011-08-31 09:02:01 +05:30
Nabin Hait
f4bbbc7052 reload delivery note detail and item coustomer details 2011-08-30 17:40:48 +05:30
Nabin Hait
7cb1c57aeb reload delivery note detail and item coustomer details 2011-08-30 17:39:38 +05:30
Nabin Hait
7282fce711 reload delivery note detail and item coustomer details 2011-08-30 17:34:14 +05:30
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