Commit Graph

2246 Commits

Author SHA1 Message Date
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
Anand Doshi
f31fc22ef0 fixes in doctype 2012-04-13 11:37:19 +05:30
Nabin Hait
a73b2965aa cleanup and fixes 2012-04-13 11:02:26 +05:30
Anand Doshi
44e954f509 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-12 17:52:09 +05:30
Anand Doshi
09e8c4cd2d further fixes 2012-04-12 17:51:53 +05:30
Nabin Hait
3cb148e53b fixed conflict 2012-04-12 16:44:23 +05:30
Nabin Hait
de237e2bf7 error fixed 2012-04-12 16:36:01 +05:30
Anand Doshi
25bc68c7b2 fix in field names 2012-04-12 14:08:43 +05:30
Anand Doshi
db695ecbf4 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
Conflicts:
	version.num
2012-04-12 12:28:21 +05:30
Anand Doshi
654f6bfa85 fixes 2012-04-12 12:15:35 +05:30
Rushabh Mehta
af0ced2ba7 side shadow smaller 2012-04-12 10:43:39 +05:30
Rushabh Mehta
c2a08186ec side shadow smaller 2012-04-12 10:18:45 +05:30
Anand Doshi
9e6af24269 fixes in button function calling 2012-04-11 19:07:02 +05:30
Rushabh Mehta
cf241d968e Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-11 18:02:55 +05:30
Rushabh Mehta
49086492c3 dialog form fixes 2012-04-11 18:02:23 +05:30
Anand Doshi
5ed0b6971c Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-11 17:51:12 +05:30
Anand Doshi
e68fe505b9 custom fields creation patch - not to be executed automatically 2012-04-11 17:49:21 +05:30
Rushabh Mehta
97a0b3e9d6 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-11 17:26:32 +05:30
Rushabh Mehta
0f0b1f5235 added app frame 2012-04-11 17:26:03 +05:30
Nabin Hait
c594bbcae0 address html issue fixed 2012-04-11 17:14:45 +05:30
Rushabh Mehta
c6843484e5 form header refactor 2012-04-11 15:28:00 +05:30