Commit Graph

4902 Commits

Author SHA1 Message Date
Rushabh Mehta
24599d0a7e Merge branch 'edge' of github.com:webnotes/erpnext into edge 2013-02-11 10:30:47 +01:00
Rushabh Mehta
176829e53c added status to Contact and fix bug in communication pull 2013-02-11 14:54:30 +05:30
Nabin Hait
b31c222c0e Merge branch 'master' of github.com:webnotes/erpnext 2013-02-11 13:57:48 +05:30
Nabin Hait
fdb4d49ae3 get_query 2013-02-11 13:56:47 +05:30
Rushabh Mehta
af222dc6b2 updated language 2013-02-11 11:49:18 +05:30
Rushabh Mehta
60135df6fd updated language 2013-02-11 11:44:12 +05:30
Rushabh Mehta
4050ffa409 Merge branch 'edge' of github.com:webnotes/erpnext into edge 2013-02-10 08:47:17 +01:00
Anand Doshi
18a0c58cee fix in blog comment 2013-02-10 13:10:53 +05:30
Anand Doshi
9e830ec711 show sub item group items only if show in website is checked for them 2013-02-08 20:08:46 +05:30
Rushabh Mehta
9d9e3e41bf Merge branch 'edge' of github.com:webnotes/erpnext into edge 2013-02-08 15:08:47 +01:00
Anand Doshi
872359c61c pass purchase invoice test cases 2013-02-08 19:34:18 +05:30
Anand Doshi
3576b18d97 disabled calculate taxes and totals for now -- should be enabled once client side script is in sync 2013-02-08 19:30:06 +05:30
Anand Doshi
3c1fee7c6e validate fiscal year reused from accounts.utils 2013-02-08 19:28:32 +05:30
Anand Doshi
8595fcf910 purchase invoice taxes and totals calculations with test cases 2013-02-08 19:28:14 +05:30
Anand Doshi
a11a21c6a9 changed _Test Fiscal Year to _Test Fiscal Year 2013 2013-02-08 19:27:38 +05:30
Anand Doshi
6fad5ab075 if total leave days is 0, do not allow leave application to be saved 2013-02-08 16:43:37 +05:30
Anand Doshi
e1ca5fdf4e Merge branch 'master' of github.com:webnotes/erpnext 2013-02-08 15:29:54 +05:30
Anand Doshi
8b5645d281 leave application overlap validation: consider both open and approved leave applications 2013-02-08 15:29:13 +05:30
Rushabh Mehta
66aa26546b fix 2013-02-08 15:06:05 +05:30
Anand Doshi
c5c48fd147 Merge branch 'master' of github.com:webnotes/erpnext 2013-02-08 14:48:14 +05:30
Anand Doshi
3470971016 fixes in bom and removed asset item check when fetching description 2013-02-08 14:46:09 +05:30
Rushabh Mehta
ce6d54869d Merge branch 'edge' of github.com:webnotes/erpnext into edge 2013-02-08 09:43:01 +01:00
Nabin Hait
2604a99072 Merge branch 'master' of github.com:webnotes/erpnext 2013-02-08 14:08:28 +05:30
Nabin Hait
0739e7f573 fixed conflict 2013-02-08 14:07:29 +05:30
Nabin Hait
a76a0687ef get_query continued 2013-02-08 14:04:13 +05:30
Anand Doshi
ed2554e8cc Merge branch 'master' of github.com:webnotes/erpnext 2013-02-08 13:57:48 +05:30
Anand Doshi
6a5efa972b added test record for purchase invoice test case 2013-02-08 13:57:05 +05:30
Nabin Hait
df35645e2a Update hr/doctype/employee/employee.txt
removed salary structure button
2013-02-08 13:09:18 +05:30
Nabin Hait
197861f576 Update hr/doctype/leave_application/leave_application.txt
changed permlevel for some fiedls in leave application
2013-02-08 11:28:40 +05:30
Rushabh Mehta
6660ef0355 Merge branch 'master' of github.com:webnotes/erpnext 2013-02-07 22:20:25 +05:30
Rushabh Mehta
677b4b4e79 dynamic loading of grid reports 2013-02-07 22:19:47 +05:30
Anand Doshi
40ad7a7bbc Merge branch 'master' of github.com:webnotes/erpnext 2013-02-07 19:48:49 +05:30
Anand Doshi
6209046772 added some test records 2013-02-07 19:47:34 +05:30
Nabin Hait
b7084b8995 Update hr/doctype/appraisal/appraisal.py
fixed issue in appraisal
2013-02-07 18:15:04 +05:30
Nabin Hait
dc95c15002 changed args to filters in get_query 2013-02-07 12:08:38 +05:30
Nabin Hait
c39d13b6a7 fixes in item: duplicate tax validation 2013-02-07 11:36:37 +05:30
Nabin Hait
7e0b9a4212 fixes in patch 2013-02-07 10:58:15 +05:30
Nabin Hait
79b8ca8f68 fixes in patch 2013-02-07 10:55:48 +05:30
Nabin Hait
9986ae8c6f stock_qty now editable in PO item and PR Item table 2013-02-07 10:51:40 +05:30
Rushabh Mehta
981577050c added company in leave application and global holiday block list 2013-02-07 09:09:14 +05:30
Rushabh Mehta
cc0df70e87 Merge branch 'edge' of github.com:webnotes/erpnext into edge 2013-02-06 16:06:03 +01:00
Rushabh Mehta
958f08e77d Merge branch 'master' of github.com:webnotes/erpnext 2013-02-06 20:32:20 +05:30
Rushabh Mehta
14464473da email receive bugfix 2013-02-06 20:31:08 +05:30
Nabin Hait
e343ac7173 fixes in voucher import tool 2013-02-06 18:42:26 +05:30
Rushabh Mehta
f16df487b9 Merge branch 'edge' of github.com:webnotes/erpnext into edge 2013-02-06 13:11:55 +01:00
Nabin Hait
b5bc99376e Merge branch 'master' of github.com:webnotes/erpnext 2013-02-06 17:40:46 +05:30
Nabin Hait
fa230e47f4 get_query shifted to server for account 2013-02-06 17:40:14 +05:30
Anand Doshi
9313992abb Merge branch 'master' of github.com:webnotes/erpnext 2013-02-06 17:35:40 +05:30
Anand Doshi
613cb6a9f9 bug fix in clear unallocated advances 2013-02-06 17:33:46 +05:30
Rushabh Mehta
856eb53b22 Merge branch 'master' into edge 2013-02-06 16:34:30 +05:30