Commit Graph

20968 Commits

Author SHA1 Message Date
Vishal Dhayagude
b930dfa74c [fix] fix patch failed erpnext/patches/v7_2/make_all_assessment_group.py (#11864) 2017-12-06 18:03:21 +05:30
Vishal Dhayagude
d4e439906c [fix] Modification in Non Profit docs (#11862) 2017-12-06 18:02:31 +05:30
Prateeksha Singh
11e27b2990
Merge pull request #11865 from Zlash65/fix-setup
[Minor] Setup-wizard fix
2017-12-06 17:13:44 +05:30
Zlash65
5fc8923322 fix setup-wizard leftovers 2017-12-06 17:04:03 +05:30
Nabin Hait
c84476bd27 Fixed merge conflict 2017-12-06 14:17:51 +05:30
Nabin Hait
7ff6e378dd Merge branch 'hotfix' 2017-12-06 14:17:14 +05:30
Nabin Hait
7de5d3bb1d bumped to version 9.2.20 2017-12-06 14:47:13 +06:00
Manas Solanki
a160879159 set the reference document in the payment entry while creating from fees (#11861)
* set the reference document in the payment entry while creating from fees

* allocate the paid amount in the reference document
2017-12-06 14:05:39 +05:30
Prateeksha Singh
7351709980 [multicheck] Select multiple domains in setup (#11709)
* [multicheck] select multiple domains in setup

* use multiple domains in make_sample_data

* revert to setting in domains child table

* domains slide validation

* update setup wizard test
2017-12-06 13:28:06 +05:30
rohitwaghchaure
1b16bca843 [minor] Escape special characters (#11855) 2017-12-06 13:16:06 +05:30
tundebabzy
6a418f2a9b change Purchase Taxes and Charges default to 'Total' (#11857) 2017-12-06 13:15:33 +05:30
rohitwaghchaure
d52c64ff11 [fix] Show total for opening and closing dr/cr (#11860) 2017-12-06 13:14:28 +05:30
Nabin Hait
cd477fc187 Merge branch 'vishdha-non_profit2' into develop 2017-12-06 12:58:20 +05:30
Nabin Hait
51ce1027de non-profit module cleanups 2017-12-06 12:58:04 +05:30
Nabin Hait
419db49806 non-profit module cleanups 2017-12-06 12:57:53 +05:30
Vishal
54f5b115a7 [new] Role added 2017-12-05 17:51:15 +05:30
Vishal
474d58cecf [fix] minor changes 2017-12-05 17:19:02 +05:30
Vishal
5ffbd4f492 [fix] Reviewed Modification in Grant Application 2017-12-05 16:41:09 +05:30
Vishal
91236fa9d6 [fix] Reviewed modification on donor and volunteer 2017-12-05 16:41:09 +05:30
Vishal
139545a0f7 [fix] Minor changes in membership 2017-12-05 16:41:09 +05:30
Vishal
74116172b8 [fix] Reviewed Chapter Doctype Modification 2017-12-05 16:41:09 +05:30
Vishal
debc93c58a [new] Non Profit Domain patch added 2017-12-05 16:41:09 +05:30
Vishal
5ade836713 [new] Non Profit Documentation Modified 2017-12-05 16:41:09 +05:30
Vishal
7e50bf3674 [fix] Minor changes in patch set member as party type 2017-12-05 16:41:09 +05:30
Vishal
55480491bf [minor] changes added in member and membership doctype 2017-12-05 16:41:09 +05:30
Vishal
5a4611df95 [fix] fetch expiary date from membership to member doctype 2017-12-05 16:41:09 +05:30
Vishal
0dbf00a283 [fix] Minor changes in grant application 2017-12-05 16:41:09 +05:30
Vishal
344f5d9cd6 [fix] Minor changes in grant_application.html 2017-12-05 16:41:09 +05:30
Vishal
155ec4ba58 [new] Grant application doctype clean up after review 2017-12-05 16:41:09 +05:30
Vishal
74fb550a70 [new] sidebar added on chapter web page 2017-12-05 16:41:09 +05:30
Vishal
a72a3bd536 [new] Chapter Module clean up after review 2017-12-05 16:41:09 +05:30
Vishal
fe0c6c8e28 [fix] Non Profit Domain clean up after review 2017-12-05 16:41:09 +05:30
Vishal
a68234d345 [new] Fontawesome icon added 2017-12-05 16:41:09 +05:30
Vishal
fca5cfe986 [fixed] Codacy fixed 2017-12-05 16:41:09 +05:30
Vishal
397a8761f7 [new] Convert Non Profit Module into Non Profit Domain 2017-12-05 16:41:09 +05:30
Vishal
43977a1422 [fix] Minor Changes in grant_application.py 2017-12-05 16:41:09 +05:30
Vishal
fa8f762805 [fix] Grant Application Url added in message body on sendmail 2017-12-05 16:41:09 +05:30
Vishal
da05b3ce7f [fix] Modified Grant Application Test 2017-12-05 16:41:09 +05:30
Vishal
b4a8e11edc [new] Account table added in Grant Application 2017-12-05 16:41:09 +05:30
Vishal
1a88562ef9 [new] Assessment Manager for grant Review, web portal added 2017-12-05 16:41:09 +05:30
Vishal
7c7c3522cb [new] Codacy fixed 2017-12-05 16:41:09 +05:30
Vishal
a6a302f8a6 [new] Grant Application Web Form Added 2017-12-05 16:41:09 +05:30
Vishal
6a4fd7d89e [fix] UI Test 2017-12-05 16:41:09 +05:30
Vishal
788f41707e Chapter Message Link field added 2017-12-05 16:41:09 +05:30
Vishal
5cd70bed25 [new] Test Cases Added for Non Profit 2017-12-05 16:41:09 +05:30
Vishal
86140c8659 [fix] Codacy Issue 2017-12-05 16:41:09 +05:30
Vishal
f86984c785 [fix]travis build issue 2017-12-05 16:41:09 +05:30
Vishal
d051921ff8 [fix] Codacy issue 2017-12-05 16:41:09 +05:30
Vishal
722c06e819 [fix] travis 2017-12-05 16:41:09 +05:30
Vishal
1ebdeacee3 UI Test Added for Membership Type 2017-12-05 16:41:09 +05:30