Commit Graph

569 Commits

Author SHA1 Message Date
Anand Doshi
dc0f2d2422 Merge branch 'master' into edge
Conflicts:
	accounts/doctype/sales_invoice/sales_invoice.txt
	stock/doctype/item/item.txt
2013-04-23 12:42:18 +05:30
Anand Doshi
978dc8b74d [patches] [fix] fix in update_account_property_patch 2013-04-22 14:25:06 +05:30
Rushabh Mehta
4c3419bee0 Merge branch 'master' into edge 2013-04-22 14:03:31 +05:30
Anand Doshi
c54bbc039f [patch] [fix] reload Delivery Note Item before default cost center patch 2013-04-19 16:41:57 +05:30
Anand Doshi
4d705590b7 [patch] [default cost center] defaults starting with colon like :Company should not be a part of database default spec 2013-04-18 16:21:42 +05:30
Nabin Hait
9a2dff6675 packing slip refactored 2013-04-17 17:21:31 +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
Nabin Hait
8f148249ac reload doctype mapper patch 2013-04-16 12:36:59 +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
4147f02659 fixe sin patch 2013-04-11 16:02:06 +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
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
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
8022a439a8 role added in some pages 2013-04-09 11:49:42 +05:30
Nabin Hait
832320dc15 fixed conflict 2013-04-09 11:43:03 +05:30
Nabin Hait
fda2ab1054 fixed conflict 2013-04-09 11:41:20 +05:30
Nabin Hait
d35293de17 updated all role in some pages 2013-04-09 11:39:16 +05:30
Nabin Hait
fdea83ef42 fixed conflict 2013-04-08 13:08:19 +05:30
Nabin Hait
2b61f6142a fixed conflict 2013-04-08 12:44:57 +05:30
Anand Doshi
30bd65a81b [patches] [fix] reload docperm 2013-04-07 10:19:18 +05:30
Rushabh Mehta
d8cf1d74ba Merge branch 'master' into edge 2013-04-03 16:39:02 +05:30
Rushabh Mehta
cc86ec8642 merge 2013-04-03 16:38:20 +05:30
Nabin Hait
5c1d3c5a8b [New Script Report] added report daily time log summary 2013-04-03 15:44:19 +05:30
Rushabh Mehta
27c4079ff9 [framework] [cleanup] desktop, todo, messages, modules setup moved to framework 2013-04-03 15:21:44 +05:30
Rushabh Mehta
e726448268 Merge branch 'edge' of github.com:webnotes/erpnext into edge 2013-04-03 10:42:37 +05:30
Rushabh Mehta
5bbe063222 Merge branch 'master' into edge 2013-04-03 10:42:12 +05:30
Rushabh Mehta
c5ddb85d39 [patch] [fix] added reload print format 2013-04-03 10:06:54 +05:30
Rushabh Mehta
c0ad4a2229 [patch] [fix] added reload print format 2013-04-03 09:58:04 +05:30
Nabin Hait
596ff91b3a [quotation][improvement] when made from lead 2013-04-02 18:24:06 +05:30
Nabin Hait
1e3fc88940 [quotation][improvement] when made from lead 2013-04-02 18:13:20 +05:30
Anand Doshi
234b8e3de3 Merge branch 'master' into edge
Conflicts:
	patches/march_2013/p07_update_valuation_rate.py
	patches/patch_list.py
2013-04-02 16:06:43 +05:30
Nabin Hait
996e469562 added country Aruba and currency AWG 2013-04-02 14:26:26 +05:30
Rushabh Mehta
5c12765313 [merge] 2013-04-02 10:51:11 +05:30
Nabin Hait
2a8b2c1356 [patch][serial no] for striped serial nos 2013-04-01 17:49:15 +05:30
Nabin Hait
2f20a7ac96 [patch][serial no] for striped serial nos 2013-04-01 17:23:43 +05:30