Commit Graph

2074 Commits

Author SHA1 Message Date
Nabin Hait
7fca9e617d fixes in global defaults 2012-04-13 12:18:06 +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
Rushabh Mehta
f7f7f63a77 form header refactor 2012-04-11 15:18:24 +05:30
Anand Doshi
ece64fa908 fixes 2012-04-10 19:18:00 +05:30
Anand Doshi
2424387651 fixes after sync testing 2012-04-10 19:14:37 +05:30
Anand Doshi
a9ccc7d6bd naming series changes now saved as property setter 2012-04-10 15:31:48 +05:30
Anand Doshi
71841df9ab fixes in sync patch 2012-04-10 12:40:18 +05:30
Anand Doshi
cfcaf38111 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-10 12:39:15 +05:30
Anand Doshi
966b6f1aa0 fix in patches 2012-04-10 12:38:17 +05:30
Rushabh Mehta
db05aacbc4 merge 2012-04-10 11:51:51 +05:30
Rushabh Mehta
d2cec5bd14 website style fixes 2012-04-10 11:51:08 +05:30
Anand Doshi
859cb72606 new favicon 2012-04-10 11:35:19 +05:30
Anand Doshi
9afb57ffb2 Syntax error fix in c_form.txt 2012-04-09 12:23:36 +05:30
Anand Doshi
87a2c5cc69 Merge branch 'master' of github.com:webnotes/erpnext into shf_rename
Conflicts:
	erpnext/accounts/doctype/c_form/c_form.txt
	erpnext/patches/patch_list.py
	erpnext/setup/doctype/permission_control/permission_control.py
2012-04-09 12:14:53 +05:30
Anand Doshi
85eb840ab4 fix in rename dt patch 2012-04-09 12:02:15 +05:30
Rushabh Mehta
b43f949e93 website smaller 2012-04-08 20:33:51 +05:30
Anand Doshi
82042f1cff fixes after sync 2012-04-06 17:54:17 +05:30
Nabin Hait
3525d92cfb c-form reload pach 2012-04-06 17:49:25 +05:30
Nabin Hait
c63a58d416 c-form reload pach 2012-04-06 17:42:02 +05:30
Nabin Hait
7da6ebc9af Attachment option and total invoiced amt added in c-form 2012-04-06 17:30:53 +05:30
Nabin Hait
1299dab010 Merge branch 'master' of github.com:webnotes/erpnext 2012-04-06 15:19:18 +05:30