Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,075 Commits 3 Branches 0 Tags 1 GiB
2d70887aaf
Commit Graph

220 Commits

Author SHA1 Message Date
Nabin Hait
d1d3237784 bumped to version 5.0.24 2015-06-15 11:05:39 +06:00
Nabin Hait
d72a24965b bumped to version 5.0.23 2015-06-14 22:34:51 +06:00
Nabin Hait
e37dd77923 bumped to version 5.0.22 2015-06-12 18:36:21 +06:00
Nabin Hait
9bdd1aa1ed bumped to version 5.0.21 2015-06-11 16:44:48 +06:00
Nabin Hait
17452a1695 bumped to version 5.0.20 2015-06-09 16:26:20 +06:00
Nabin Hait
dc76b3fa20 bumped to version 5.0.19 2015-06-08 15:15:13 +06:00
Pratik Vyas
4599467939 bumped to version 5.0.18 2015-06-05 16:26:49 +06:00
Pratik Vyas
cf89fa2253 bumped to version 5.0.17 2015-06-03 18:13:38 +06:00
Pratik Vyas
74b2116adb bumped to version 5.0.16 2015-06-02 11:15:28 +06:00
Rushabh Mehta
2204d0af94 Merge pull request #3397 from rmehta/portal-fixes 
Portal fixes
 2015-06-02 10:42:59 +05:30
Pratik Vyas
e5fa5e6111 bumped to version 5.0.15 2015-06-01 17:47:46 +06:00
Rushabh Mehta
a33d468d30 [fixes] portal, issues, addresses etc 2015-06-01 17:15:42 +05:30
Pratik Vyas
8f25402dce bumped to version 5.0.14 2015-06-01 15:21:17 +06:00
Pratik Vyas
587dde0044 bumped to version 5.0.13 2015-05-29 14:55:23 +06:00
Pratik Vyas
1749406514 bumped to version 5.0.12 2015-05-29 14:47:15 +06:00
Pratik Vyas
31d9d9f561 bumped to version 5.0.11 2015-05-28 14:44:58 +06:00
Anand Doshi
e440914327 [fix] allow slashes in variables of website route rules 2015-05-26 17:37:09 -04:00
Pratik Vyas
e1637c4cae bumped to version 5.0.10 2015-05-26 17:36:39 +06:00
Nabin Hait
b3a142f5ab [fix] email footer and signature 2015-05-26 12:15:39 +05:30
Rushabh Mehta
f29a618b69 [email] [website] footer cleanup 2015-05-26 12:15:39 +05:30
Pratik Vyas
ac9c2de8b9 bumped to version 5.0.9 2015-05-25 17:02:12 +06:00
Pratik Vyas
08e04ef01a bumped to version 5.0.8 2015-05-22 17:22:25 +06:00
Pratik Vyas
8c6ff9ddad bumped to version 5.0.7 2015-05-21 16:04:34 +06:00
Pratik Vyas
38937ecd3c bumped to version 5.0.6 2015-05-20 17:05:40 +06:00
Pratik Vyas
10e813b010 bumped to version 5.0.5 2015-05-20 13:24:52 +06:00
Pratik Vyas
8980ce6052 bumped to version 5.0.4 2015-05-20 12:57:47 +06:00
Pratik Vyas
07b3bf6417 bumped to version 5.0.3 2015-05-19 18:03:00 +06:00
Pratik Vyas
80a116ab19 bumped to version 5.0.2 2015-05-19 16:15:57 +06:00
Pratik Vyas
b8252bca00 bumped to version 5.0.1 2015-05-19 13:47:43 +06:00
Pratik Vyas
cc8f204b50 bumped to version v5.0.0 2015-05-19 12:33:57 +06:00
Rushabh Mehta
bcdea3ea51 [rename] Sales/Purchase Taxes and Charges Master > Sales/Purchase Taxes and Charges Template 2015-05-06 18:45:47 +05:30
Rushabh Mehta
5674c4f28c [splash] new image 2015-04-16 15:09:42 +05:30
Rushabh Mehta
2e7c36ec99 [favicon] light grey for erpnext 2015-04-16 12:41:42 +05:30
Rushabh Mehta
4c46687fb1 [incoming sales email] to opportunity 2015-04-02 22:00:34 +05:30
Rushabh Mehta
99a41952a4 [lead] [email] fixes 2015-04-02 15:53:11 +05:30
Anand Doshi
7b6daafbb9 [minor] left aligned email footer, raise duplicate entry error for common email id in Employee and Sales Person 2015-04-01 16:26:59 +05:30
Anand Doshi
adcf857c37 fixed newsletter unsubscribe and default footer 2015-03-27 17:42:18 +05:30
Rushabh Mehta
308e6ea21e [fixes] default_website and stock reco 2015-03-24 17:35:16 +05:30
Pratik Vyas
52c5121ecd change version to v5.0.0-beta 2015-03-17 11:22:16 +05:30
Anand Doshi
885e074697 Changed company name from Web Notes to Frappe Technologies 2015-03-03 14:56:43 +05:30
Anand Doshi
d35354cc06 Merge remote-tracking branch 'frappe/develop' into v5.0 
Conflicts:
	erpnext/__version__.py
	erpnext/accounts/doctype/budget_distribution/test_budget_distribution.py
	erpnext/accounts/doctype/chart_of_accounts/charts/account_properties.py
	erpnext/hooks.py
	erpnext/patches.txt
	erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
	erpnext/stock/get_item_details.py
	erpnext/translations/ar.csv
	erpnext/translations/bs.csv
	erpnext/translations/ca.csv
	erpnext/translations/el.csv
	erpnext/translations/es.csv
	erpnext/translations/fr.csv
	erpnext/translations/hr.csv
	erpnext/translations/id.csv
	erpnext/translations/is.csv
	erpnext/translations/ja.csv
	erpnext/translations/nl.csv
	erpnext/translations/pl.csv
	erpnext/translations/pt-BR.csv
	erpnext/translations/ru.csv
	erpnext/translations/tr.csv
	erpnext/translations/zh-cn.csv
	erpnext/translations/zh-tw.csv
	setup.py
 2015-02-24 18:12:17 +05:30
Anand Doshi
da858cc587 Website Product Image 2015-02-24 17:52:09 +05:30
Anand Doshi
d57e793bf3 [fix] Added unicode_literals if missing in py files 2015-02-24 12:24:53 +05:30
Anand Doshi
f9fc04ce8e Website Listing 2015-02-23 22:34:27 +05:30
Pratik Vyas
28777bf693 bumped to version 4.22.1 2015-02-17 16:32:58 +06:00
Pratik Vyas
2d916436c5 bumped to version 4.22.0 2015-02-16 12:50:19 +06:00
Anand Doshi
c82331bc19 [design] Setup Wizard 2015-02-12 20:02:17 +05:30
Pratik Vyas
a9eae0b424 bumped to version 4.21.4 2015-02-11 13:37:59 +06:00
Pratik Vyas
e0a8f2d859 bumped to version 4.21.3 2015-02-09 19:04:23 +06:00
Pratik Vyas
6203cf7f04 bumped to version 4.21.2 2015-02-06 17:02:00 +06:00
Pratik Vyas
43f627a83a bumped to version 4.21.1 2015-02-05 16:14:06 +06:00
Pratik Vyas
fd654a06e8 bumped to version 4.21.0 2015-02-05 14:55:13 +06:00
Pratik Vyas
276053b35f bumped to version 4.20.2 2015-01-28 17:31:56 +06:00
Pratik Vyas
408a8e804c bumped to version 4.20.1 2015-01-27 15:13:53 +06:00
Pratik Vyas
e4c2ebfc57 bumped to version 4.20.0 2015-01-23 16:46:53 +06:00
Rushabh Mehta
5bceebc6a1 [fix] fixes birthday reminders #2021 2015-01-23 15:22:30 +05:30
Pratik Vyas
d33a3a295f bumped to version 4.19.0 2015-01-21 17:35:29 +06:00
Pratik Vyas
d7ba759844 bumped to version 4.18.1 2015-01-17 02:12:05 +06:00
Pratik Vyas
991962b6fd bumped to version 4.18.0 2015-01-14 12:12:45 +06:00
Pratik Vyas
47a10f5a39 bumped to version 4.17.0 2015-01-12 12:44:35 +06:00
Pratik Vyas
bdfd0d1ff9 bumped to version 4.16.0 2015-01-07 12:07:22 +06:00
Pratik Vyas
b094ee45d7 bumped to version 4.15.4 2014-12-31 13:11:14 +06:00
Pratik Vyas
ecc3f312b9 bumped to version 4.15.3 2014-12-28 17:29:08 +06:00
Pratik Vyas
f64d11da3c bumped to version 4.15.2 2014-12-23 19:41:08 +06:00
Pratik Vyas
ff56566506 bumped to version 4.15.1 2014-12-22 11:47:45 +06:00
Pratik Vyas
5d1543f241 bumped to version 4.15.0 2014-12-19 18:43:55 +06:00
Pratik Vyas
13553c2bf0 bumped to version 4.14.0 2014-12-16 16:17:06 +06:00
Nabin Hait
606af96c9f minor fix 2014-12-15 11:57:19 +05:30
Pratik Vyas
a578f3e23a bumped to version 4.13.1 2014-12-12 17:22:09 +06:00
Pratik Vyas
c8f5c3cdbe bumped to version 4.13.0 2014-12-09 17:10:28 +06:00
Rushabh Mehta
bd9b62ff28 [rename] Support Ticket -> Issue 2014-11-28 11:46:10 +05:30
Pratik Vyas
f227379d2f bumped to version 4.12.0 2014-11-25 11:46:33 +06:00
Pratik Vyas
2277922313 bumped to version 4.11.2 2014-11-14 15:57:34 +06:00
Pratik Vyas
b5b821363d bumped to version 4.11.1 2014-11-10 13:08:45 +06:00
Pratik Vyas
4948d336c4 bumped to version 4.11.0 2014-11-06 15:06:51 +06:00
Pratik Vyas
e9b4686fec bumped to version 4.10.0 2014-11-05 14:45:47 +06:00
Nabin Hait
ae1dcabcb5 Fixed merge conflict 2014-11-05 12:41:02 +05:30
Nabin Hait
4acd431b92 Requested qty calculation logic 2014-11-04 15:34:03 +05:30
Pratik Vyas
b9ce1f590b bumped to version 4.9.3 2014-11-03 16:34:29 +06:00
Nabin Hait
0d421c1bf1 Minor fixes 2014-11-03 15:46:15 +05:30
Pratik Vyas
dda239fd49 bumped to version 4.9.2 2014-10-30 14:52:17 +06:00
Pratik Vyas
daed0b655a bumped to version 4.9.1 2014-10-27 09:56:36 +06:00
Pratik Vyas
16343683d9 bumped to version 4.9.0 2014-10-22 14:49:17 +06:00
Rushabh Mehta
3daa49ac1f [shopping-cart] i'm back 2014-10-21 16:16:30 +05:30
Rushabh Mehta
ab43942b35 Merge pull request #2231 from rmehta/item-variants 
Item variants
 2014-10-21 12:38:16 +05:30
Neil Trini Lasrado
1cdfbdb899 fiscal year auto-create added 2014-10-17 15:44:22 +05:30
Pratik Vyas
5eb373f7b5 bumped to version 4.8.0 2014-10-17 15:34:05 +06:00
Pratik Vyas
26d096aa87 bumped to version 4.7.2 2014-10-15 16:04:39 +06:00
Pratik Vyas
63914dd55b bumped to version 4.7.1 2014-10-15 15:14:35 +06:00
Pratik Vyas
5e46ce8a50 bumped to version 4.7.0 2014-10-15 15:05:47 +06:00
Pratik Vyas
663bfeacf4 bumped to version 4.6.2 2014-10-14 18:04:01 +06:00
Pratik Vyas
49365d0982 bumped to version 4.6.1 2014-10-14 16:46:29 +06:00
Pratik Vyas
78f86e9385 bumped to version 4.6.0 2014-10-14 13:07:07 +06:00
Rushabh Mehta
f850987db0 [fixes] tests and moved reorder_item to separate module 2014-10-08 12:03:19 +05:30
pdvyas
099ad0f5e1 bumped to version 4.5.2 2014-10-07 17:35:32 +06:00
Pratik Vyas
4e81e4065b bumped to version 4.5.1 2014-09-29 16:10:04 +06:00
Rushabh Mehta
1c91868755 [version] 5.0.0-alpha 2014-09-29 12:09:55 +05:30
Pratik Vyas
16edacebc7 bumped to version 4.5.0 2014-09-26 17:19:59 +06:00
Pratik Vyas
14ac8f71b7 bumped to version 4.4.2 2014-09-19 15:16:07 +06:00
Pratik Vyas
e539297e53 bumped to version 4.4.1 2014-09-18 14:49:14 +06:00
Rushabh Mehta
c786802124 [communication] covert-wip 2014-09-17 17:28:03 +05:30
Pratik Vyas
31c61e7eae bumped to version 4.4.0 2014-09-16 16:28:28 +06:00
Rushabh Mehta
5cdc8e560c [mailbox] removed separate email settings for jobs, sales, support 2014-09-16 15:12:18 +05:30
Rushabh Mehta
9786faa862 [refactor] hooks.py fixes 2014-09-16 15:10:54 +05:30
Rushabh Mehta
c0bb453b88 [refactor] [frappe 5.0] 2014-09-16 15:10:54 +05:30
Pratik Vyas
6675ce9036 bumped to version 4.3.0 2014-09-09 15:40:47 +06:00
Pratik Vyas
2cf75fcca2 change version in hooks.py 2014-09-09 15:10:18 +05:30
Anand Doshi
d42326bf43 [hotfix] hooks - recurring order 2014-09-05 11:20:29 +05:30
ankitjavalkarwork
aaac7c17b8 Fix minor errors, fix patch, call in hooks, move from account_controller to recurring_document 2014-09-01 16:22:56 +05:30
ankitjavalkarwork
ac085e0f59 Add manage_recurring_documents and path to hooks, fix minor issues 2014-09-01 16:20:59 +05:30
Anand Doshi
0c3bb75fd9 Added error_report_email in hooks 2014-07-09 12:59:56 +05:30
Anand Doshi
7f41ff26fa Fixes frappe/erpnext#1849 2014-06-26 12:02:55 +05:30
Rushabh Mehta
5df521bad5 updated generators for wip-4.2 2014-06-17 14:21:26 +05:30
Anand Doshi
85479bcbc0 Fixes for apply user permissions and momentjs 2014-06-04 18:15:43 +05:30
Anand Doshi
4985691617 Role and User Permissions 2014-06-04 17:48:54 +05:30
Anand Doshi
a8ce570635 Permission relogication continued 2014-06-04 17:48:53 +05:30
Pratik Vyas
8e0438bad4 keep version in separate file 2014-05-28 16:58:55 +05:30
Anand Doshi
648062d071 Fixes in test cases 2014-05-05 16:46:38 +05:30
Anand Doshi
75042fd502 Show Activity entries based on permissions. Completely fixes #1481 2014-05-02 19:44:28 +05:30
Rushabh Mehta
4ceb20e07f hooks.txt -> hooks.py 2014-05-02 12:15:11 +05:30