Align ephemeral-1 with develop#5899
Merged
mmaciekk merged 360 commits intoephemeral-1from Apr 14, 2026
Merged
Conversation
…spam-on-merge fix: prevent adjust_program_size_task spam during RDI merge with coll…
# Conflicts: # src/hope/api/endpoints/rdi/lax.py # src/hope/apps/registration_data/tasks/rdi_xlsx_people_create.py # tests/unit/api/test_lax_households.py
* v4.12 (#5816) * tox fixes * tox -e tests * 301709_Admin_Programme_add_button_to_fetch_findings_from_dedup_engine * flaky tests * test * add ordering * test * 298132: Refactor CreateLaxHouseholds to use HouseholdUploadMixin and manage household ID collisions for RDI imports * Add tests for household collision detection in CreateLaxHouseholds Implemented two new test cases to verify the behavior of the CreateLaxHouseholds endpoint when handling household ID collisions. The tests ensure that existing household IDs are registered correctly in extra_hh_rdis and that no new PendingHousehold records are created when collisions occur. * Refactor CreateLaxHouseholds to streamline household collision handling and improve payload validation Updated the logic in the CreateLaxHouseholds class to enhance the management of household ID collisions and ensure valid payloads are processed correctly. The changes include consolidating error handling and adjusting the flow for adding extra household RDI IDs. * fixes * migrations * more fixes * lint * some fixes * deadlock detected * more fixes ⭐ * revert xfail back * Fix reference to RDI in CreateLaxHouseholds for adding extra household RDIs Updated the logic in the CreateLaxHouseholds class to correctly reference the selected RDI when adding extra household RDIs. This change ensures that the appropriate RDI instance is used, improving the accuracy of household data management. * Resolve tests * Enhance HouseholdUploadMixin to manage collision updates and exclude specific fields Updated the _manage_collision method to handle household data collisions by excluding certain fields from being overwritten. This ensures that critical household information remains intact during updates. Additionally, removed unnecessary assertions from the test suite related to collision detection. * fix api gender * add django_get_or_create * fix * flag False for migration, remove by aliases * test delete by alias * cleanup * IndividualRoleInHousehold ordering * improving tox * fixes to github ci * fix ci * more CI fixes * fix ci * more info * 4.12 * more fixes n+1 * clean up * revert debugging values * lint * 287473_Make_XLSX_entitlement_import_resilient_to_column_reordering (#5795) * part 1 * PeoplePaymentPlansTable, PaymentPlansTable merge * targeting tests * Payments Household Table / Payments People Table * remove payment module duplicated files, target population table * GRV is not closing: fix when only one distinct Ind (#5717) * fix when only one distinct ind * updates * update unit test * tests fixes ::star:: * rdi table * remove empty files * add missing imports targetpopulationspage * fixes labels pp table + feedback table * fix results for people * 166072 payment module possiblity to override unore rate (#5768) * accomodate excludeSection for people * clear cache button and role assigment (#5800) * External collectors in sw programs (#5790) * test fix * dev2stg (#5812) * tp filters cleanup, remove setup fsp related files (#5803) Co-authored-by: Pavlo Mokiichuk <pv.pasha.pv@gmail.com> * fix signals, update tests to test properly (#5809) Co-authored-by: Domenico <ddinicola@unicef.org> --------- Co-authored-by: Maciej Szewczyk <34482854+mmaciekk@users.noreply.github.com> Co-authored-by: Pavlo Mokiichuk <pv.pasha.pv@gmail.com> Co-authored-by: Paulina Kujawa <42150286+pkujawa@users.noreply.github.com> --------- Co-authored-by: Jan Romaniak <jan.romaniak@kellton.com> Co-authored-by: marekbiczysko <marek.biczysko@tivix.com> Co-authored-by: pavlo-mk <pv.pasha.pv@gmail.com> Co-authored-by: Marek Biczysko <34810846+MarekBiczysko@users.noreply.github.com> Co-authored-by: ArsenPidhoretskyi <arsen.pidhoretskyi@valor.com> Co-authored-by: Jan Romaniak <jan.romaniak@tivix.com> Co-authored-by: Sergey Misiuk <sergey.misuk@valor-software.com> Co-authored-by: Paulina Kujawa <p.kujawa2f@gmail.com> Co-authored-by: Maciej Szewczyk <maciej.szewczyk@kellton.com> Co-authored-by: Maciej Szewczyk <34482854+mmaciekk@users.noreply.github.com> Co-authored-by: Paulina Kujawa <42150286+pkujawa@users.noreply.github.com> * fix arg for report_false_positive_duplicate * fix arg for report_false_positive_duplicate * upd unit test * 305581_Western_Union_Invoice_RCF_QCF * use dedup_engine_api_report_false_positive_duplicate_mock in test * 305866_Add_new_Syria_Currency_Code (#5823) * 305866_Add_new_Syria_Currency_Code * migration * ut * ut --------- Co-authored-by: marekbiczysko <marek.biczysko@tivix.com> * lazy loading choices (#5825) * lazy loading choices * testing * removing falbback * fix: prevent adjust_program_size_task spam during RDI merge with collisions * adding more tests * fix currency display (#5838) --------- Co-authored-by: Jan Romaniak <jan.romaniak@kellton.com> Co-authored-by: marekbiczysko <marek.biczysko@tivix.com> Co-authored-by: pavlo-mk <pv.pasha.pv@gmail.com> Co-authored-by: Marek Biczysko <34810846+MarekBiczysko@users.noreply.github.com> Co-authored-by: ArsenPidhoretskyi <arsen.pidhoretskyi@valor.com> Co-authored-by: Jan Romaniak <jan.romaniak@tivix.com> Co-authored-by: Sergey Misiuk <sergey.misuk@valor-software.com> Co-authored-by: Paulina Kujawa <p.kujawa2f@gmail.com> Co-authored-by: Maciej Szewczyk <maciej.szewczyk@kellton.com> Co-authored-by: Maciej Szewczyk <34482854+mmaciekk@users.noreply.github.com> Co-authored-by: Paulina Kujawa <42150286+pkujawa@users.noreply.github.com> Co-authored-by: ntrncic <ntrncic@unicef.org>
* dev2stg (#5812) * tp filters cleanup, remove setup fsp related files (#5803) Co-authored-by: Pavlo Mokiichuk <pv.pasha.pv@gmail.com> * fix signals, update tests to test properly (#5809) Co-authored-by: Domenico <ddinicola@unicef.org> --------- Co-authored-by: Maciej Szewczyk <34482854+mmaciekk@users.noreply.github.com> Co-authored-by: Pavlo Mokiichuk <pv.pasha.pv@gmail.com> Co-authored-by: Paulina Kujawa <42150286+pkujawa@users.noreply.github.com> * Master back conflicts (#5828) * v4.12 (#5816) * tox fixes * tox -e tests * 301709_Admin_Programme_add_button_to_fetch_findings_from_dedup_engine * flaky tests * test * add ordering * test * 298132: Refactor CreateLaxHouseholds to use HouseholdUploadMixin and manage household ID collisions for RDI imports * Add tests for household collision detection in CreateLaxHouseholds Implemented two new test cases to verify the behavior of the CreateLaxHouseholds endpoint when handling household ID collisions. The tests ensure that existing household IDs are registered correctly in extra_hh_rdis and that no new PendingHousehold records are created when collisions occur. * Refactor CreateLaxHouseholds to streamline household collision handling and improve payload validation Updated the logic in the CreateLaxHouseholds class to enhance the management of household ID collisions and ensure valid payloads are processed correctly. The changes include consolidating error handling and adjusting the flow for adding extra household RDI IDs. * fixes * migrations * more fixes * lint * some fixes * deadlock detected * more fixes ⭐ * revert xfail back * Fix reference to RDI in CreateLaxHouseholds for adding extra household RDIs Updated the logic in the CreateLaxHouseholds class to correctly reference the selected RDI when adding extra household RDIs. This change ensures that the appropriate RDI instance is used, improving the accuracy of household data management. * Resolve tests * Enhance HouseholdUploadMixin to manage collision updates and exclude specific fields Updated the _manage_collision method to handle household data collisions by excluding certain fields from being overwritten. This ensures that critical household information remains intact during updates. Additionally, removed unnecessary assertions from the test suite related to collision detection. * fix api gender * add django_get_or_create * fix * flag False for migration, remove by aliases * test delete by alias * cleanup * IndividualRoleInHousehold ordering * improving tox * fixes to github ci * fix ci * more CI fixes * fix ci * more info * 4.12 * more fixes n+1 * clean up * revert debugging values * lint * 287473_Make_XLSX_entitlement_import_resilient_to_column_reordering (#5795) * part 1 * PeoplePaymentPlansTable, PaymentPlansTable merge * targeting tests * Payments Household Table / Payments People Table * remove payment module duplicated files, target population table * GRV is not closing: fix when only one distinct Ind (#5717) * fix when only one distinct ind * updates * update unit test * tests fixes ::star:: * rdi table * remove empty files * add missing imports targetpopulationspage * fixes labels pp table + feedback table * fix results for people * 166072 payment module possiblity to override unore rate (#5768) * accomodate excludeSection for people * clear cache button and role assigment (#5800) * External collectors in sw programs (#5790) * test fix * dev2stg (#5812) * tp filters cleanup, remove setup fsp related files (#5803) Co-authored-by: Pavlo Mokiichuk <pv.pasha.pv@gmail.com> * fix signals, update tests to test properly (#5809) Co-authored-by: Domenico <ddinicola@unicef.org> --------- Co-authored-by: Maciej Szewczyk <34482854+mmaciekk@users.noreply.github.com> Co-authored-by: Pavlo Mokiichuk <pv.pasha.pv@gmail.com> Co-authored-by: Paulina Kujawa <42150286+pkujawa@users.noreply.github.com> --------- Co-authored-by: Jan Romaniak <jan.romaniak@kellton.com> Co-authored-by: marekbiczysko <marek.biczysko@tivix.com> Co-authored-by: pavlo-mk <pv.pasha.pv@gmail.com> Co-authored-by: Marek Biczysko <34810846+MarekBiczysko@users.noreply.github.com> Co-authored-by: ArsenPidhoretskyi <arsen.pidhoretskyi@valor.com> Co-authored-by: Jan Romaniak <jan.romaniak@tivix.com> Co-authored-by: Sergey Misiuk <sergey.misuk@valor-software.com> Co-authored-by: Paulina Kujawa <p.kujawa2f@gmail.com> Co-authored-by: Maciej Szewczyk <maciej.szewczyk@kellton.com> Co-authored-by: Maciej Szewczyk <34482854+mmaciekk@users.noreply.github.com> Co-authored-by: Paulina Kujawa <42150286+pkujawa@users.noreply.github.com> * fix arg for report_false_positive_duplicate * fix arg for report_false_positive_duplicate * upd unit test * 305581_Western_Union_Invoice_RCF_QCF * use dedup_engine_api_report_false_positive_duplicate_mock in test * 305866_Add_new_Syria_Currency_Code (#5823) * 305866_Add_new_Syria_Currency_Code * migration * ut * ut --------- Co-authored-by: marekbiczysko <marek.biczysko@tivix.com> * lazy loading choices (#5825) * lazy loading choices * testing * removing falbback * conflicts --------- Co-authored-by: Domenico <ddinicola@unicef.org> Co-authored-by: Jan Romaniak <jan.romaniak@kellton.com> Co-authored-by: marekbiczysko <marek.biczysko@tivix.com> Co-authored-by: Marek Biczysko <34810846+MarekBiczysko@users.noreply.github.com> Co-authored-by: ArsenPidhoretskyi <arsen.pidhoretskyi@valor.com> Co-authored-by: Jan Romaniak <jan.romaniak@tivix.com> Co-authored-by: Sergey Misiuk <sergey.misuk@valor-software.com> Co-authored-by: Paulina Kujawa <p.kujawa2f@gmail.com> Co-authored-by: Maciej Szewczyk <maciej.szewczyk@kellton.com> Co-authored-by: Maciej Szewczyk <34482854+mmaciekk@users.noreply.github.com> Co-authored-by: Paulina Kujawa <42150286+pkujawa@users.noreply.github.com> Co-authored-by: ntrncic <ntrncic@unicef.org> * Master back (#5831) * v4.12 (#5816) * tox fixes * tox -e tests * 301709_Admin_Programme_add_button_to_fetch_findings_from_dedup_engine * flaky tests * test * add ordering * test * 298132: Refactor CreateLaxHouseholds to use HouseholdUploadMixin and manage household ID collisions for RDI imports * Add tests for household collision detection in CreateLaxHouseholds Implemented two new test cases to verify the behavior of the CreateLaxHouseholds endpoint when handling household ID collisions. The tests ensure that existing household IDs are registered correctly in extra_hh_rdis and that no new PendingHousehold records are created when collisions occur. * Refactor CreateLaxHouseholds to streamline household collision handling and improve payload validation Updated the logic in the CreateLaxHouseholds class to enhance the management of household ID collisions and ensure valid payloads are processed correctly. The changes include consolidating error handling and adjusting the flow for adding extra household RDI IDs. * fixes * migrations * more fixes * lint * some fixes * deadlock detected * more fixes ⭐ * revert xfail back * Fix reference to RDI in CreateLaxHouseholds for adding extra household RDIs Updated the logic in the CreateLaxHouseholds class to correctly reference the selected RDI when adding extra household RDIs. This change ensures that the appropriate RDI instance is used, improving the accuracy of household data management. * Resolve tests * Enhance HouseholdUploadMixin to manage collision updates and exclude specific fields Updated the _manage_collision method to handle household data collisions by excluding certain fields from being overwritten. This ensures that critical household information remains intact during updates. Additionally, removed unnecessary assertions from the test suite related to collision detection. * fix api gender * add django_get_or_create * fix * flag False for migration, remove by aliases * test delete by alias * cleanup * IndividualRoleInHousehold ordering * improving tox * fixes to github ci * fix ci * more CI fixes * fix ci * more info * 4.12 * more fixes n+1 * clean up * revert debugging values * lint * 287473_Make_XLSX_entitlement_import_resilient_to_column_reordering (#5795) * part 1 * PeoplePaymentPlansTable, PaymentPlansTable merge * targeting tests * Payments Household Table / Payments People Table * remove payment module duplicated files, target population table * GRV is not closing: fix when only one distinct Ind (#5717) * fix when only one distinct ind * updates * update unit test * tests fixes ::star:: * rdi table * remove empty files * add missing imports targetpopulationspage * fixes labels pp table + feedback table * fix results for people * 166072 payment module possiblity to override unore rate (#5768) * accomodate excludeSection for people * clear cache button and role assigment (#5800) * External collectors in sw programs (#5790) * test fix * dev2stg (#5812) * tp filters cleanup, remove setup fsp related files (#5803) Co-authored-by: Pavlo Mokiichuk <pv.pasha.pv@gmail.com> * fix signals, update tests to test properly (#5809) Co-authored-by: Domenico <ddinicola@unicef.org> --------- Co-authored-by: Maciej Szewczyk <34482854+mmaciekk@users.noreply.github.com> Co-authored-by: Pavlo Mokiichuk <pv.pasha.pv@gmail.com> Co-authored-by: Paulina Kujawa <42150286+pkujawa@users.noreply.github.com> --------- Co-authored-by: Jan Romaniak <jan.romaniak@kellton.com> Co-authored-by: marekbiczysko <marek.biczysko@tivix.com> Co-authored-by: pavlo-mk <pv.pasha.pv@gmail.com> Co-authored-by: Marek Biczysko <34810846+MarekBiczysko@users.noreply.github.com> Co-authored-by: ArsenPidhoretskyi <arsen.pidhoretskyi@valor.com> Co-authored-by: Jan Romaniak <jan.romaniak@tivix.com> Co-authored-by: Sergey Misiuk <sergey.misuk@valor-software.com> Co-authored-by: Paulina Kujawa <p.kujawa2f@gmail.com> Co-authored-by: Maciej Szewczyk <maciej.szewczyk@kellton.com> Co-authored-by: Maciej Szewczyk <34482854+mmaciekk@users.noreply.github.com> Co-authored-by: Paulina Kujawa <42150286+pkujawa@users.noreply.github.com> * fix arg for report_false_positive_duplicate * fix arg for report_false_positive_duplicate * upd unit test * 305581_Western_Union_Invoice_RCF_QCF * use dedup_engine_api_report_false_positive_duplicate_mock in test * 305866_Add_new_Syria_Currency_Code (#5823) * 305866_Add_new_Syria_Currency_Code * migration * ut * ut --------- Co-authored-by: marekbiczysko <marek.biczysko@tivix.com> * lazy loading choices (#5825) * lazy loading choices * testing * removing falbback --------- Co-authored-by: Jan Romaniak <jan.romaniak@kellton.com> Co-authored-by: marekbiczysko <marek.biczysko@tivix.com> Co-authored-by: pavlo-mk <pv.pasha.pv@gmail.com> Co-authored-by: Marek Biczysko <34810846+MarekBiczysko@users.noreply.github.com> Co-authored-by: ArsenPidhoretskyi <arsen.pidhoretskyi@valor.com> Co-authored-by: Jan Romaniak <jan.romaniak@tivix.com> Co-authored-by: Sergey Misiuk <sergey.misuk@valor-software.com> Co-authored-by: Paulina Kujawa <p.kujawa2f@gmail.com> Co-authored-by: Maciej Szewczyk <maciej.szewczyk@kellton.com> Co-authored-by: Maciej Szewczyk <34482854+mmaciekk@users.noreply.github.com> Co-authored-by: Paulina Kujawa <42150286+pkujawa@users.noreply.github.com> Co-authored-by: ntrncic <ntrncic@unicef.org> * Master back (#5839) * v4.12 (#5816) * tox fixes * tox -e tests * 301709_Admin_Programme_add_button_to_fetch_findings_from_dedup_engine * flaky tests * test * add ordering * test * 298132: Refactor CreateLaxHouseholds to use HouseholdUploadMixin and manage household ID collisions for RDI imports * Add tests for household collision detection in CreateLaxHouseholds Implemented two new test cases to verify the behavior of the CreateLaxHouseholds endpoint when handling household ID collisions. The tests ensure that existing household IDs are registered correctly in extra_hh_rdis and that no new PendingHousehold records are created when collisions occur. * Refactor CreateLaxHouseholds to streamline household collision handling and improve payload validation Updated the logic in the CreateLaxHouseholds class to enhance the management of household ID collisions and ensure valid payloads are processed correctly. The changes include consolidating error handling and adjusting the flow for adding extra household RDI IDs. * fixes * migrations * more fixes * lint * some fixes * deadlock detected * more fixes ⭐ * revert xfail back * Fix reference to RDI in CreateLaxHouseholds for adding extra household RDIs Updated the logic in the CreateLaxHouseholds class to correctly reference the selected RDI when adding extra household RDIs. This change ensures that the appropriate RDI instance is used, improving the accuracy of household data management. * Resolve tests * Enhance HouseholdUploadMixin to manage collision updates and exclude specific fields Updated the _manage_collision method to handle household data collisions by excluding certain fields from being overwritten. This ensures that critical household information remains intact during updates. Additionally, removed unnecessary assertions from the test suite related to collision detection. * fix api gender * add django_get_or_create * fix * flag False for migration, remove by aliases * test delete by alias * cleanup * IndividualRoleInHousehold ordering * improving tox * fixes to github ci * fix ci * more CI fixes * fix ci * more info * 4.12 * more fixes n+1 * clean up * revert debugging values * lint * 287473_Make_XLSX_entitlement_import_resilient_to_column_reordering (#5795) * part 1 * PeoplePaymentPlansTable, PaymentPlansTable merge * targeting tests * Payments Household Table / Payments People Table * remove payment module duplicated files, target population table * GRV is not closing: fix when only one distinct Ind (#5717) * fix when only one distinct ind * updates * update unit test * tests fixes ::star:: * rdi table * remove empty files * add missing imports targetpopulationspage * fixes labels pp table + feedback table * fix results for people * 166072 payment module possiblity to override unore rate (#5768) * accomodate excludeSection for people * clear cache button and role assigment (#5800) * External collectors in sw programs (#5790) * test fix * dev2stg (#5812) * tp filters cleanup, remove setup fsp related files (#5803) Co-authored-by: Pavlo Mokiichuk <pv.pasha.pv@gmail.com> * fix signals, update tests to test properly (#5809) Co-authored-by: Domenico <ddinicola@unicef.org> --------- Co-authored-by: Maciej Szewczyk <34482854+mmaciekk@users.noreply.github.com> Co-authored-by: Pavlo Mokiichuk <pv.pasha.pv@gmail.com> Co-authored-by: Paulina Kujawa <42150286+pkujawa@users.noreply.github.com> --------- Co-authored-by: Jan Romaniak <jan.romaniak@kellton.com> Co-authored-by: marekbiczysko <marek.biczysko@tivix.com> Co-authored-by: pavlo-mk <pv.pasha.pv@gmail.com> Co-authored-by: Marek Biczysko <34810846+MarekBiczysko@users.noreply.github.com> Co-authored-by: ArsenPidhoretskyi <arsen.pidhoretskyi@valor.com> Co-authored-by: Jan Romaniak <jan.romaniak@tivix.com> Co-authored-by: Sergey Misiuk <sergey.misuk@valor-software.com> Co-authored-by: Paulina Kujawa <p.kujawa2f@gmail.com> Co-authored-by: Maciej Szewczyk <maciej.szewczyk@kellton.com> Co-authored-by: Maciej Szewczyk <34482854+mmaciekk@users.noreply.github.com> Co-authored-by: Paulina Kujawa <42150286+pkujawa@users.noreply.github.com> * fix arg for report_false_positive_duplicate * fix arg for report_false_positive_duplicate * upd unit test * 305581_Western_Union_Invoice_RCF_QCF * use dedup_engine_api_report_false_positive_duplicate_mock in test * 305866_Add_new_Syria_Currency_Code (#5823) * 305866_Add_new_Syria_Currency_Code * migration * ut * ut --------- Co-authored-by: marekbiczysko <marek.biczysko@tivix.com> * lazy loading choices (#5825) * lazy loading choices * testing * removing falbback * fix: prevent adjust_program_size_task spam during RDI merge with collisions * adding more tests * fix currency display (#5838) --------- Co-authored-by: Jan Romaniak <jan.romaniak@kellton.com> Co-authored-by: marekbiczysko <marek.biczysko@tivix.com> Co-authored-by: pavlo-mk <pv.pasha.pv@gmail.com> Co-authored-by: Marek Biczysko <34810846+MarekBiczysko@users.noreply.github.com> Co-authored-by: ArsenPidhoretskyi <arsen.pidhoretskyi@valor.com> Co-authored-by: Jan Romaniak <jan.romaniak@tivix.com> Co-authored-by: Sergey Misiuk <sergey.misuk@valor-software.com> Co-authored-by: Paulina Kujawa <p.kujawa2f@gmail.com> Co-authored-by: Maciej Szewczyk <maciej.szewczyk@kellton.com> Co-authored-by: Maciej Szewczyk <34482854+mmaciekk@users.noreply.github.com> Co-authored-by: Paulina Kujawa <42150286+pkujawa@users.noreply.github.com> Co-authored-by: ntrncic <ntrncic@unicef.org> --------- Co-authored-by: Maciej Szewczyk <34482854+mmaciekk@users.noreply.github.com> Co-authored-by: Pavlo Mokiichuk <pv.pasha.pv@gmail.com> Co-authored-by: Paulina Kujawa <42150286+pkujawa@users.noreply.github.com> Co-authored-by: Jan Romaniak <jan.romaniak@kellton.com> Co-authored-by: marekbiczysko <marek.biczysko@tivix.com> Co-authored-by: Marek Biczysko <34810846+MarekBiczysko@users.noreply.github.com> Co-authored-by: ArsenPidhoretskyi <arsen.pidhoretskyi@valor.com> Co-authored-by: Jan Romaniak <jan.romaniak@tivix.com> Co-authored-by: Sergey Misiuk <sergey.misuk@valor-software.com> Co-authored-by: Paulina Kujawa <p.kujawa2f@gmail.com> Co-authored-by: Maciej Szewczyk <maciej.szewczyk@kellton.com> Co-authored-by: ntrncic <ntrncic@unicef.org>
Feat/reinstate mypy
azure cleaning
…-for-social-programmes Fix: Rendering list of admin areas in grievance ticket description
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## ephemeral-1 #5899 +/- ##
===============================================
+ Coverage 91.16% 92.25% +1.08%
===============================================
Files 499 494 -5
Lines 34325 34349 +24
Branches 3551 3602 +51
===============================================
+ Hits 31294 31689 +395
+ Misses 2247 1911 -336
+ Partials 784 749 -35
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
305861: Introducing currency model, migration and datamigration
initdemo - const area p_codes for faster local testing
Admin fix - UNICEF subpartners should see their role in dropdown
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
9 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
I would like to merge develop to ephemeral branch, so that I can merge django-unfold branch there, later, for testing.