Commit Graph

4953 Commits

Author SHA1 Message Date
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
Anand Doshi
eb92b52817 fixes in employee form 2013-02-13 18:30:53 +05:30
Anand Doshi
86af352bf3 fixes in parentfield of userrole 2013-02-13 18:04:21 +05:30
Rushabh Mehta
6685fbd348 Merge branch 'master' of github.com:webnotes/erpnext into edge 2013-02-13 13:22:05 +01:00
Nabin Hait
362455e749 fix outstanding and floating point issue in gl entry 2013-02-13 15:50:39 +05:30
Rushabh Mehta
a9545794aa number format fix, permission fix in listview 2013-02-13 12:33:02 +05:30
Rushabh Mehta
1c9e96f3a1 Merge branch 'edge' 2013-02-13 12:00:27 +05:30
Rushabh Mehta
eaf3de4605 added test runner 2013-02-13 11:59:17 +05:30
Nabin Hait
bcbc2f6ce5 c-form fixes 2013-02-13 11:30:14 +05:30
Rushabh Mehta
c2e478556d Merge branch 'edge' of github.com:webnotes/erpnext into edge 2013-02-13 05:18:47 +01:00
Rushabh Mehta
51709b7eb3 Merge branch 'master' into edge 2013-02-12 19:23:48 +05:30
Rushabh Mehta
4b9827a5fc upgraded test_runner, now can run multiple tests 2013-02-12 19:20:39 +05:30
Nabin Hait
4860754407 call calc_adjustment_amount function only if docstatus is zero 2013-02-12 18:49:55 +05:30
Nabin Hait
cd50c2513f removed wrong validation 2013-02-12 15:46:24 +05:30
Nabin Hait
945b39f984 fixes in payemnt reconciliation 2013-02-12 15:17:25 +05:30
Rushabh Mehta
17fc0fe2d2 Merge branch 'edge' of github.com:webnotes/erpnext into edge 2013-02-12 08:40:01 +01:00
Anand Doshi
9b051db7d6 show page name in web page list view 2013-02-12 13:04:25 +05:30
Anand Doshi
3422bdfec5 added Website Manager role in install 2013-02-12 13:03:25 +05:30
Anand Doshi
c9629a481d fetch favicon from website settings 2013-02-12 12:54:58 +05:30
Rushabh Mehta
af7ae5a5d4 Merge branch 'edge' of github.com:webnotes/erpnext into edge 2013-02-12 07:20:49 +01:00
Anand Doshi
c5377e2583 Merge branch 'edge' of github.com:webnotes/erpnext into edge 2013-02-12 11:38:56 +05:30
Anand Doshi
e1ad443c91 re-adding description as it is distorting list 2013-02-11 20:28:56 +05:30
Rushabh Mehta
dd1c63e9ef Merge branch 'edge' of github.com:webnotes/erpnext into edge 2013-02-11 15:56:34 +01:00
Anand Doshi
d8c3aa22a0 removed product param in get_product_list 2013-02-11 19:33:33 +05:30
Anand Doshi
ca73b90a0d raw material supplied in purchase receipt should be a no copy field 2013-02-11 19:32:18 +05:30
Rushabh Mehta
9a8319dd0b added date in pop3 mails 2013-02-11 16:40:01 +05:30
Rushabh Mehta
03118462aa Merge branch 'edge' of github.com:webnotes/erpnext into edge 2013-02-11 11:55:24 +01:00
Rushabh Mehta
629c196606 added date in pop3 mails 2013-02-11 16:21:14 +05:30
Rushabh Mehta
429d911b81 Merge branch 'master' of github.com:webnotes/erpnext 2013-02-11 15:56:17 +05:30
Anand Doshi
120b92e5e6 Merge branch 'master' of github.com:webnotes/erpnext into edge 2013-02-11 15:55:58 +05:30
Anand Doshi
954f897572 in product listing, don't truncate description 2013-02-11 15:55:30 +05:30
Rushabh Mehta
e38d783aff removed session timeout for getting emails 2013-02-11 15:55:20 +05:30
Nabin Hait
ef85cfc05c Merge branch 'master' of github.com:webnotes/erpnext 2013-02-11 15:22:40 +05:30
Rushabh Mehta
bf5c7b9db1 Merge branch 'edge' of github.com:webnotes/erpnext into edge 2013-02-11 10:43:59 +01:00
Rushabh Mehta
0a11554f74 Merge branch 'edge' of github.com:webnotes/erpnext into edge 2013-02-11 10:41:37 +01:00
Rushabh Mehta
d015dfce92 sales communication fix for status 2013-02-11 15:10:53 +05:30