Commit Graph

221 Commits

Author SHA1 Message Date
Anand Doshi
bbc6cfac25 Merge branch 'master' of github.com:webnotes/erpnext
Conflicts:
	patches/patch_list.py
2013-04-29 15:23:30 +05:30
Anand Doshi
eda17eb20a [patch] [fiel data] new patch p07_update_file_data_2 2013-04-29 15:21:30 +05:30
Nabin Hait
7b596d8d88 fixed conflict 2013-04-29 14:37:38 +05:30
Nabin Hait
345c8fbfa2 [patch] rebuild sales browser 2013-04-29 14:35:11 +05:30
Anand Doshi
e5a36a287f [patch] [file data] patch for custom fields with name file_list 2013-04-29 14:12:27 +05:30
Rushabh Mehta
cdc9e2cd6f [patch] [file data] reset permissions 2013-04-25 11:06:17 +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
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
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
Nabin Hait
5639035268 [patch] create chart of accounts if not created 2013-04-09 14:56:30 +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
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
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
1e3fc88940 [quotation][improvement] when made from lead 2013-04-02 18:13:20 +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
2f20a7ac96 [patch][serial no] for striped serial nos 2013-04-01 17:23:43 +05:30
Nabin Hait
787c02ee42 aii fixes 2013-03-29 16:42:33 +05:30
Nabin Hait
acecb94a0f patch: update item tax rate in json format 2013-03-29 10:48:41 +05:30
Rushabh Mehta
2fe802c81e [website] [cleanup] selectable images will now be relative urls (files/..) or full urls (http:..) 2013-03-28 16:26:11 +05:30
Nabin Hait
41fe3567bb fixed conflict and aii check in global defaults 2013-03-28 15:54:11 +05:30
Nabin Hait
e2fe8de637 patch: update against expense_account in purchase invoice 2013-03-28 15:30:41 +05:30
Anand Doshi
e35073157c set fiscal year in stock entry and stock reconciliation 2013-03-27 17:35:23 +05:30
Anand Doshi
9f91053201 patch to set user type as System User if user has a role and if previous user type is Partner 2013-03-26 12:25:11 +05:30
Rushabh Mehta
74506e96d3 [profile/email] [feature] added option not to send print as email body. fix in profile delete 2013-03-25 17:52:14 +05:30
Rushabh Mehta
06d186ba98 [stock] [feature] added project to stock ledger entry and updated stock balance report 2013-03-25 17:03:52 +05:30
Anand Doshi
e31d64ffe1 save global defaults 2013-03-19 18:42:29 +05:30
Anand Doshi
080f9098c0 deprecated sales and purchase return tool 2013-03-18 17:57:59 +05:30
Anand Doshi
f11e2f8f6f Merge branch 'master' of github.com:webnotes/erpnext into sales_purchase_return
Conflicts:
	patches/patch_list.py
2013-03-18 17:42:08 +05:30
Anand Doshi
1cf7391562 patch to fix incorrect gl entries due to payment reconciliation between 2013-03-11 and 2013-03-15 2013-03-15 13:42:31 +05:30
Anand Doshi
0a1ac4090c Merge branch 'master' into sales_purchase_return 2013-03-14 12:07:39 +05:30