Commit Graph

2116 Commits

Author SHA1 Message Date
Anand Doshi
24e18569d9 fixes in install docs for roles 2012-04-17 11:45:35 +05:30
Anand Doshi
acb3d56e02 fix in install docs 2012-04-17 11:39:18 +05:30
Anand Doshi
45a4edc9c9 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
Conflicts:
	css/all-app.css
	version.num
2012-04-17 11:19:15 +05:30
Nabin Hait
8c0dcd383b some more fixes in support 2012-04-16 18:47:20 +05:30
Rushabh Mehta
6910ec1946 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-16 18:37:33 +05:30
Rushabh Mehta
71085592a4 fixed account_browser 2012-04-16 18:36:46 +05:30
Nabin Hait
62842337e6 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-16 16:01:15 +05:30
Nabin Hait
fe127c216c fixed issue in stock 2012-04-16 16:01:02 +05:30
Rushabh Mehta
a2505d43b2 rename routing 2012-04-16 15:25:38 +05:30
Rushabh Mehta
6610d390e1 merge 2012-04-16 14:49:11 +05:30
Nabin Hait
6f89f1eb86 fixes in sales cycle 2012-04-16 14:44:47 +05:30
Rushabh Mehta
de457387c3 framework build 2012-04-16 13:36:08 +05:30
Rushabh Mehta
449f56db75 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-16 13:35:53 +05:30
Rushabh Mehta
6820dbf72d framework build 2012-04-16 13:33:14 +05:30
Nabin Hait
eaf8b91402 hr reports cleanup 2012-04-16 12:31:36 +05:30
Nabin Hait
dbffc2d8d0 fixed hr issues 2012-04-16 12:22:47 +05:30
Rushabh Mehta
0c18b18b84 new framework build 2012-04-16 11:18:45 +05:30
Rushabh Mehta
c8abe5b2ad style cleanups and new builds 2012-04-15 22:31:32 +05:30
Rushabh Mehta
f86f98c4c6 moved wnf.py to lib, where it should be 2012-04-14 16:28:11 +05:30
Rushabh Mehta
cabfc65fe0 lib/py/webnotes/defs.py -> conf.py (see sample in lib/conf/conf.py) 2012-04-14 16:08:45 +05:30
Rushabh Mehta
b47e56f7b6 removed version.num 2012-04-14 15:03:49 +05:30
Rushabh Mehta
03e8787cda removed version.num 2012-04-14 15:02:17 +05:30
Rushabh Mehta
f465b4fa76 merge 2012-04-13 19:06:05 +05:30
Rushabh Mehta
850c928a02 started rewrite of accounts browser 2012-04-13 19:04:55 +05:30
Anand Doshi
a202f00dc0 fixes in accounts 2012-04-13 16:03:27 +05:30
Anand Doshi
a0f6a3eab7 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-13 15:34:27 +05:30
Nabin Hait
f3348c5136 Merge branch 'master' into shf_rename 2012-04-13 14:41:56 +05:30
Nabin Hait
781a3c9b1f Merge branch 'master' of github.com:webnotes/erpnext 2012-04-13 14:41:45 +05:30
Nabin Hait
82c53871c7 fixes in se js 2012-04-13 14:39:04 +05:30
Nabin Hait
1c9061eff6 fixed conflict using theirs 2012-04-13 14:24:35 +05:30
Nabin Hait
6c615d9527 Merge branch 'master' of github.com:webnotes/erpnext 2012-04-13 14:14:39 +05:30
Nabin Hait
b09b3bc253 all fields visible if any other custom purpose in stock entry 2012-04-13 14:13:02 +05:30
Anand Doshi
6af47a8c37 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-13 13:13:54 +05:30
Anand Doshi
b3ab90a01a field changes in sp return tool 2012-04-13 12:38:34 +05:30
Anand Doshi
800b214ff3 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-13 12:37:23 +05:30
Anand Doshi
3abe9bd018 fixes in fieldnames and hide unnecessary fields in jv 2012-04-13 12:36:44 +05:30
Anand Doshi
b641ed2a1e Added doc_type to JV Print Formats 2012-04-13 12:27:56 +05:30
Nabin Hait
2a0d0213b0 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-13 12:18:26 +05:30
Nabin Hait
7fca9e617d fixes in global defaults 2012-04-13 12:18:06 +05:30
Anand Doshi
143291db5b merge with appframe changes 2012-04-13 12:04:13 +05:30
Rushabh Mehta
d76146372e merge 2012-04-13 12:01:23 +05:30
Nabin Hait
b176e94b92 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-13 11:53:35 +05:30
Nabin Hait
e77164955b removed repair fn, fixes in reports 2012-04-13 11:53:06 +05:30
Anand Doshi
7aafb7e19e Purchase Requisition to Purchase Request 2012-04-13 11:52:17 +05:30
Anand Doshi
1907ac69d7 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
Conflicts:
	version.num
2012-04-13 11:48:35 +05:30
Anand Doshi
79fe5a1542 fix in hide unhide fields error logging 2012-04-13 11:46:38 +05:30
Rushabh Mehta
97ae17eaf7 merge 2012-04-13 11:42:56 +05:30
Rushabh Mehta
f1264a7f76 listing, module pages in appframe 2012-04-13 11:41:43 +05:30
Anand Doshi
83808267d5 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-13 11:40:38 +05:30
Anand Doshi
1c2ac00a82 fixes in sales cycle 2012-04-13 11:38:01 +05:30