Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor!: Remove non-profit domain from ERPNext #29151

Merged
merged 20 commits into from
Feb 28, 2022

Conversation

ChillarAnand
Copy link
Contributor

@ChillarAnand ChillarAnand commented Jan 5, 2022

We are moving Non Profit domain in to a separate app. New app is available at https://github.com/frappe/non_profit.

Please raise new issues/PRs related to non-profit at the new repo.

@codecov
Copy link

codecov bot commented Jan 24, 2022

Codecov Report

Merging #29151 (a891c42) into develop (955d5af) will increase coverage by 7.99%.
The diff coverage is 100.00%.

@@             Coverage Diff             @@
##           develop   #29151      +/-   ##
===========================================
+ Coverage    41.62%   49.62%   +7.99%     
===========================================
  Files         1109     1083      -26     
  Lines        69188    68324     -864     
===========================================
+ Hits         28802    33906    +5104     
+ Misses       40386    34418    -5968     
Impacted Files Coverage Δ
erpnext/__init__.py 70.51% <ø> (-0.22%) ⬇️
erpnext/hooks.py 100.00% <ø> (ø)
erpnext/regional/india/setup.py 95.28% <ø> (ø)
.../setup/setup_wizard/operations/install_fixtures.py 87.89% <ø> (ø)
...xt/accounts/doctype/payment_entry/payment_entry.py 54.86% <100.00%> (-4.88%) ⬇️
erpnext/hr/doctype/skill/skill.py 0.00% <0.00%> (-100.00%) ⬇️
...rpnext/hr/doctype/interview_type/interview_type.py 0.00% <0.00%> (-100.00%) ⬇️
...xt/hr/doctype/interview_detail/interview_detail.py 0.00% <0.00%> (-100.00%) ⬇️
.../e_commerce/doctype/wishlist_item/wishlist_item.py 0.00% <0.00%> (-100.00%) ⬇️
...r/doctype/expected_skill_set/expected_skill_set.py 0.00% <0.00%> (-100.00%) ⬇️
... and 267 more

@ChillarAnand
Copy link
Contributor Author

In ERPNext, Regional is a module by itself. Regional setup is taking caring of all relevant doctypes and their setup.

For Non profit, if we create Regional setup it will create conflicts with Regional setup in any other module/domain. May be we have to rename it is Non Profit Regional? @ruchamahabal

cc @gavindsouza

@ruchamahabal
Copy link
Member

ruchamahabal commented Jan 25, 2022

@ChillarAnand

Just move Tax Exemption 80G Certificate to Non-Profit module. No need to create a separate module.

@ruchamahabal
Copy link
Member

ruchamahabal commented Jan 25, 2022

The handling required during separation for things added in this PR: https://github.com/frappe/erpnext/pull/24657/files

  • payment_entry.js - Move donor-specific scripts to doctype_js hooks in the non-profit app
  • payment_entry.py - Move donation scripts to doc_events hook in the non-profit app
  • Move Tax Exemption 80G Certificate doctype to Non-Profit module, remove from regional.
  • Move custom field setup in company to non-profit app, remove
    dict(fieldname='non_profit_section', label='Non Profit Settings',
    fieldtype='Section Break', insert_after='arrear_component', collapsible=1),
    dict(fieldname='company_80g_number', label='80G Number',
    fieldtype='Data', insert_after='non_profit_section'),
    dict(fieldname='with_effect_from', label='80G With Effect From',
    fieldtype='Date', insert_after='company_80g_number'),
    dict(fieldname='non_profit_column_break', fieldtype='Column Break', insert_after='with_effect_from'),
    dict(fieldname='pan_details', label='PAN Number',
    fieldtype='Data', insert_after='non_profit_column_break')
  • Move pan number setup to non-profit app
    'Member': [
    {
    'fieldname': 'pan_number',
    'label': 'PAN Details',
    'fieldtype': 'Data',
    'insert_after': 'email_id'
    }
    ],
    'Donor': [
    {
    'fieldname': 'pan_number',
    'label': 'PAN Details',
    'fieldtype': 'Data',
    'insert_after': 'email'
    }
  • Move Print Format for 80G certificate to non-profit module

@ChillarAnand ChillarAnand force-pushed the remove-nonprofit branch 4 times, most recently from b447cdc to d1c7341 Compare February 3, 2022 05:10
@ChillarAnand ChillarAnand marked this pull request as ready for review February 4, 2022 04:47
@ruchamahabal ruchamahabal self-assigned this Feb 5, 2022
@ChillarAnand ChillarAnand force-pushed the remove-nonprofit branch 2 times, most recently from 246bb1b to 98f6f98 Compare February 17, 2022 07:05
@ruchamahabal
Copy link
Member

ruchamahabal commented Feb 24, 2022

frappe/non_profit#1

Rest, LGTM

@ruchamahabal ruchamahabal merged commit 85aad52 into frappe:develop Feb 28, 2022
@ruchamahabal ruchamahabal changed the title refactor: Remove non-profit domain from ERPNext refactor!: Remove non-profit domain from ERPNext Jun 10, 2022
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Oct 30, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants