Commit Graph

5759 Commits

Author SHA1 Message Date
Nabin Hait
9a2dff6675 packing slip refactored 2013-04-17 17:21:31 +05:30
Anand Doshi
311a243bdc Merge branch 'master' into edge
Conflicts:
	website/doctype/website_settings/website_settings.txt
2013-04-17 15:50:20 +05:30
Anand Doshi
58b8d6fdf3 [website settings] [cleanup] removed mandatory check on Home Page 2013-04-17 15:22:06 +05:30
Anand Doshi
2b349d38d9 Merge branch 'master' into edge 2013-04-17 15:10:47 +05:30
Anand Doshi
d484b380ad [email digest] [sender] sender should be the automail id specified in Email Settings 2013-04-17 15:10:08 +05:30
Anand Doshi
96dae29144 [item] [fixes] don't validate for active boms for new items 2013-04-17 13:39:55 +05:30
Anand Doshi
e776742f5d [company] [cleanup] on_rename method 2013-04-17 13:19:35 +05:30
Anand Doshi
c6aecb3f97 Merge branch 'master' into edge
Conflicts:
	home/page/latest_updates/latest_updates.js
	hr/doctype/employee/employee.txt
2013-04-16 21:32:06 +05:30
Anand Doshi
aa7a386db9 Merge branch 'master' of github.com:webnotes/erpnext 2013-04-16 20:58:41 +05:30
Anand Doshi
09480e2241 [sitemap] [fixes] 2013-04-16 20:57:09 +05:30
Nabin Hait
8f148249ac reload doctype mapper patch 2013-04-16 12:36:59 +05:30
Nabin Hait
1ef27296f4 fixes in packing slip 2013-04-16 12:29:27 +05:30
Nabin Hait
69b410a2ed fixes in sales personwise transaction summary report 2013-04-15 12:34:42 +05:30
Rushabh Mehta
edfeade5a6 Merge branch 'edge' of github.com:webnotes/erpnext into edge 2013-04-15 10:54:29 +05:30
Rushabh Mehta
5ed6676193 [editor] [stylefix] 2013-04-15 10:49:17 +05:30
Anand Doshi
3b2fd6e334 [sql] [fix] fixed item.py injections 2013-04-13 15:54:38 +05:30
Anand Doshi
0c85975839 Merge branch 'master' of github.com:webnotes/erpnext 2013-04-12 22:01:01 +05:30
Anand Doshi
13760a1d74 [employee leave approvers] updated latest_updates.js 2013-04-12 21:59:22 +05:30
Anand Doshi
60666a278f [Leave Application] [fixes] Validate Leave Approver based on a list specified in Employee 2013-04-12 20:19:53 +05:30
Anand Doshi
b094ae7f23 [general ledger] [fix] renamed function 2013-04-12 20:19:10 +05:30
Nabin Hait
1bcd551db2 fixes in item 2013-04-12 16:51:07 +05:30
Anand Doshi
36ecbbd9e8 Merge branch 'master' of github.com:webnotes/erpnext into edge 2013-04-12 15:41:31 +05:30
Nabin Hait
6ce8af3b67 item search by item_name by default 2013-04-11 16:57:01 +05:30
Nabin Hait
bab018b759 fixes in item 2013-04-11 16:36:26 +05:30
Nabin Hait
4147f02659 fixe sin patch 2013-04-11 16:02:06 +05:30
Nabin Hait
d246de8417 [fixes][account][packing slip] 2013-04-11 15:31:41 +05:30
Rushabh Mehta
1cfab4e21d [patch] [fix] 2013-04-11 09:36:20 +05:30
Anand Doshi
93b638af4d Merge branch 'master' into edge
Conflicts:
	patches/patch_list.py
2013-04-10 19:47:46 +05:30
Anand Doshi
e33f827e32 [modules] [fix] patch for storing only hidden modules 2013-04-10 19:33:57 +05:30
Rushabh Mehta
1b35b1aa62 [file] [patch fix] 2013-04-10 16:16:59 +05:30
Nabin Hait
e878ddc084 Merge branch 'master' of github.com:webnotes/erpnext 2013-04-10 16:05:23 +05:30
Nabin Hait
54cab9cded [fixes] fixes in general ledger grid report 2013-04-10 16:04:18 +05:30
Anand Doshi
cad5c3414f [serial no] [fix] removed transaction date passed for creating stock ledger entry 2013-04-10 15:28:42 +05:30
Anand Doshi
0b80883088 [lead] [permission] cleanup of permission 2013-04-10 15:28:23 +05:30
Rushabh Mehta
7c179bd00c [files] [cleanup/redesign] removed the old file_list structure and also added file listing in setup 2013-04-10 14:22:06 +05:30
Rushabh Mehta
cc887a8320 [files] [cleanup/redesign] removed the old file_list structure and also added file listing in setup 2013-04-10 14:20:56 +05:30
Rushabh Mehta
9e93037119 [files] [cleanup/redesign] removed the old file_list structure and also added file listing in setup 2013-04-10 14:17:45 +05:30
Rushabh Mehta
753ae05ba9 [files] [cleanup/redesign] removed the old file_list structure and also added file listing in setup 2013-04-10 14:14:48 +05:30
Rushabh Mehta
04a1916bbd [files] [cleanup/redesign] removed the old file_list structure and also added file listing in setup 2013-04-10 13:57:08 +05:30
Rushabh Mehta
44323693f4 [files] [cleanup/redesign] removed the old file_list structure and also added file listing in setup 2013-04-10 13:54:44 +05:30
Rushabh Mehta
0c1611219e [files] [cleanup/redesign] removed the old file_list structure and also added file listing in setup 2013-04-10 13:54:13 +05:30
Nabin Hait
1175227c08 [fixes] commented a patch as it is not needed 2013-04-10 11:48:27 +05:30
Rushabh Mehta
33075e1f69 [files] [patch] dropped file_list property and moved links to 2013-04-10 11:08:50 +05:30
Nabin Hait
97f6843b1c removed print statements 2013-04-09 17:43:36 +05:30
Nabin Hait
5639035268 [patch] create chart of accounts if not created 2013-04-09 14:56:30 +05:30
Nabin Hait
3594873a63 [patch] create chart of accounts if not created 2013-04-09 14:49:00 +05:30
Nabin Hait
ead385e8a4 [patch] create chart of accounts if not created 2013-04-09 14:48:31 +05:30
Nabin Hait
29f3ecd6b1 [patch] create chart of accounts if not created 2013-04-09 14:46:12 +05:30
Nabin Hait
807e4788d5 fixes in patches 2013-04-09 14:31:14 +05:30
Nabin Hait
6de5eb466c role added in some pages 2013-04-09 11:52:18 +05:30