Commit Graph

51 Commits

Author SHA1 Message Date
Rushabh Mehta
e67d1fbcdf [license] [minor] Updated License Text in all js and py files 2013-08-05 14:59:54 +05:30
Anand Doshi
61a2f68bc6 [webshop] territories in price list, taxes, updates in shopping cart settings 2013-06-21 17:55:31 +05:30
Nabin Hait
90202aec2b [merge conflict] 2013-06-05 12:37:10 +05:30
Anand Doshi
74a62b17f4 [update file data 2 patch] [fix] auto commit on many writes for the duration of the patch 2013-05-30 23:49:00 +05:30
Anand Doshi
b68fbf0532 [update file size patch] [fix] auto commit on many writes for the duration of the patch 2013-05-30 23:39:24 +05:30
Anand Doshi
48787e944e Merge branch 'edge' of github.com:webnotes/erpnext into webshop
Conflicts:
	patches/april_2013/p05_update_file_data.py
2013-05-17 15:10:57 +05:30
Anand Doshi
44a01faff9 [patches] [fix] fixed an old patch 2013-05-16 16:17:15 +05:30
Anand Doshi
27ff675a07 [patches] [fix] fixed an old patch 2013-05-16 16:15:19 +05:30
Anand Doshi
9a22e3f1db [patches] [fix] fixed an old patch 2013-05-16 16:13:16 +05:30
Anand Doshi
3f9366bb6c Merge branch 'edge' of github.com:webnotes/erpnext into webshop
Conflicts:
	stock/doctype/item/item.txt
2013-05-06 12:07:30 +05:30
Anand Doshi
ff1e155a77 [price list] country-wise price list 2013-05-02 16:25:59 +05:30
Anand Doshi
447008b045 Merge branch 'edge' of github.com:webnotes/erpnext into webshop
Conflicts:
	patches/april_2013/p05_update_file_data.py
2013-05-01 14:48:16 +05:30
Anand Doshi
d7ad13a8a7 [price list] [country] specify country for a price list 2013-04-29 19:38:34 +05:30
Anand Doshi
fe5fb33cc2 [patch] [file data] fix 2013-04-29 15:27:57 +05:30
Anand Doshi
28eae6e9ff [patch] [file data] fix 2013-04-29 15:25:52 +05:30
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
7bd7c8769e [patch] [file data] files in update file data patch 2013-04-29 14:22:04 +05:30
Anand Doshi
123f59dc89 [patches] [file data] fixes in file data patch 2013-04-29 14:21:42 +05:30
Anand Doshi
e5a36a287f [patch] [file data] patch for custom fields with name file_list 2013-04-29 14:12:27 +05:30
Anand Doshi
4cbeda1ec7 [patch] [fix] commented out export_to_files call in p05_update_file_data patch 2013-04-29 10:48:45 +05:30
Rushabh Mehta
4c3419bee0 Merge branch 'master' into edge 2013-04-22 14:03:31 +05:30
Anand Doshi
9b826a7cb2 [patches] removed export file from update file data patch 2013-04-19 16:30:32 +05:30
Anand Doshi
aeef7bd910 [sales taxes and charges] renamed field cost_center_other_charges to cost_center 2013-04-19 16:21:55 +05:30
Anand Doshi
90dad5c5b5 Merge branch 'master' into edge 2013-04-19 11:43:16 +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
Anand Doshi
36ecbbd9e8 Merge branch 'master' of github.com:webnotes/erpnext into edge 2013-04-12 15:41:31 +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
Rushabh Mehta
33075e1f69 [files] [patch] dropped file_list property and moved links to 2013-04-10 11:08:50 +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
8022a439a8 role added in some pages 2013-04-09 11:49:42 +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
Rushabh Mehta
27c4079ff9 [framework] [cleanup] desktop, todo, messages, modules setup moved to framework 2013-04-03 15:21:44 +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
Nabin Hait
996e469562 added country Aruba and currency AWG 2013-04-02 14:26:26 +05:30
Nabin Hait
2a8b2c1356 [patch][serial no] for striped serial nos 2013-04-01 17:49:15 +05:30