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.

Sign up for GitHub

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

Jump to bottom

[ch33354] Unicef cash unfunded #3472

Open
wants to merge 39 commits into
base: develop
Choose a base branch
from
Open

[ch33354] Unicef cash unfunded #3472

wants to merge 39 commits into from

Commits on Mar 28, 2023

  1. UNICEF Cash Unfunded - model changes

    @emaciupe
    emaciupe committed Mar 28, 2023
    Configuration menu
    Copy the full SHA
    30d6fa8 View commit details
    Browse the repository at this point in the history

  2. (wip)

    @emaciupe
    emaciupe committed Mar 28, 2023
    Configuration menu
    Copy the full SHA
    69c51c0 View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2023

  1. models changes and migrations

    @emaciupe
    emaciupe committed Apr 11, 2023
    Configuration menu
    Copy the full SHA
    f7ab263 View commit details
    Browse the repository at this point in the history

  2. fix tests

    @emaciupe
    emaciupe committed Apr 11, 2023
    Configuration menu
    Copy the full SHA
    5590153 View commit details
    Browse the repository at this point in the history

  3. Merge branch '32722-amp-changes-and-fixes' of github.com:unicef/etool… 

    …s into ch33354-UNICEF-cash-unfunded
    @emaciupe
    emaciupe committed Apr 11, 2023
    Configuration menu
    Copy the full SHA
    1b044c4 View commit details
    Browse the repository at this point in the history

  4. updated translations

    @emaciupe
    emaciupe committed Apr 11, 2023
    Configuration menu
    Copy the full SHA
    41a2c9d View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2023

  1. wip

    @emaciupe
    emaciupe committed Apr 19, 2023
    Configuration menu
    Copy the full SHA
    ab4ef1b View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2023

  1. Merge branch 'develop' of github.com:unicef/etools into 33354-unicef-… 

    …cash-unfunded
    @emaciupe
    emaciupe committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    d7782f2 View commit details
    Browse the repository at this point in the history

  2. update migrations

    @emaciupe
    emaciupe committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    a2dd41f View commit details
    Browse the repository at this point in the history

  3. validation and tests for unfunded toggle and capacity strenghtening u… 

    …nfunded cash
    @emaciupe
    emaciupe committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    2950de3 View commit details
    Browse the repository at this point in the history

  4. Merge branch '33354-unicef-cash-unfunded' of github.com:unicef/etools… 

    … into ch33354-UNICEF-cash-unfunded

# Conflicts:
#	src/etools/applications/partners/locale/ar/LC_MESSAGES/django.po
#	src/etools/applications/partners/locale/es/LC_MESSAGES/django.mo
#	src/etools/applications/partners/locale/es/LC_MESSAGES/django.po
#	src/etools/applications/partners/locale/fr/LC_MESSAGES/django.mo
#	src/etools/applications/partners/locale/fr/LC_MESSAGES/django.po
#	src/etools/applications/partners/locale/pt/LC_MESSAGES/django.mo
#	src/etools/applications/partners/locale/pt/LC_MESSAGES/django.po
#	src/etools/applications/partners/locale/ru/LC_MESSAGES/django.mo
#	src/etools/applications/partners/locale/ru/LC_MESSAGES/django.po
#	src/etools/applications/partners/models.py
#	src/etools/applications/reports/models.py
    @emaciupe
    emaciupe committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    6685a33 View commit details
    Browse the repository at this point in the history

  5. translations

    @emaciupe
    emaciupe committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    459907c View commit details
    Browse the repository at this point in the history

  6. remove duplicated migrations and field

    @emaciupe
    emaciupe committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    6079ea1 View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2023

  1. add total_unfunded, serializer changes

    @emaciupe
    emaciupe committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    3a7ae30 View commit details
    Browse the repository at this point in the history

  2. serializer and calculations changes

    @emaciupe
    emaciupe committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    341a68a View commit details
    Browse the repository at this point in the history

  3. update translations

    @emaciupe
    emaciupe committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    fb1d589 View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2023

  1. serializers validation and tests

    @emaciupe
    emaciupe committed Jun 9, 2023
    Configuration menu
    Copy the full SHA
    2a8e961 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2023

  1. added validation on EEPM activity items for unfunded cash

    @emaciupe
    emaciupe committed Jun 12, 2023
    Configuration menu
    Copy the full SHA
    7d3fb23 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' of github.com:unicef/etools into ch33354-UNICE… 

    …F-cash-unfunded
    @emaciupe
    emaciupe committed Jun 12, 2023
    Configuration menu
    Copy the full SHA
    689b8d4 View commit details
    Browse the repository at this point in the history

  3. added validation on EEPM activity items for unfunded cash

    @emaciupe
    emaciupe committed Jun 12, 2023
    Configuration menu
    Copy the full SHA
    922ba69 View commit details
    Browse the repository at this point in the history

  4. unfunded_cash changes and tests

    @emaciupe
    emaciupe committed Jun 12, 2023
    Configuration menu
    Copy the full SHA
    2f8f89b View commit details
    Browse the repository at this point in the history

  5. added toggle validation on has_unfunded_cash flag

    @emaciupe
    emaciupe committed Jun 12, 2023
    Configuration menu
    Copy the full SHA
    4d9323d View commit details
    Browse the repository at this point in the history

  6. added PD permissions in matrix for has_unfunded_cash

    @emaciupe
    emaciupe committed Jun 12, 2023
    Configuration menu
    Copy the full SHA
    4376485 View commit details
    Browse the repository at this point in the history

  7. new validation message in translations

    @emaciupe
    emaciupe committed Jun 12, 2023
    Configuration menu
    Copy the full SHA
    e046aa3 View commit details
    Browse the repository at this point in the history

  8. fix tests

    @emaciupe
    emaciupe committed Jun 12, 2023
    Configuration menu
    Copy the full SHA
    d7a6929 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2023

  1. added unfunded cash to activities in ll_results

    @emaciupe
    emaciupe committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    f5768a2 View commit details
    Browse the repository at this point in the history

  2. add unfunded_cash to activities total

    @emaciupe
    emaciupe committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    6256166 View commit details
    Browse the repository at this point in the history

  3. tests

    @emaciupe
    emaciupe committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    539b40a View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2023

  1. fix: unfunded_cash is added to ll_results total

    @emaciupe
    emaciupe committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    fe1c296 View commit details
    Browse the repository at this point in the history

  2. Translations for toast messages

    @emaciupe
    emaciupe committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    ef76cc1 View commit details
    Browse the repository at this point in the history

  3. rename unfunded_cash_local to unfunded_hq_cash

    @emaciupe
    emaciupe committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    665077f View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' of github.com:unicef/etools into ch33354-UNICE… 

    …F-cash-unfunded
    @emaciupe
    emaciupe committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    7d27a6d View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2023

  1. Permissions matrix: has_unfunded_cash has same permissions as planned… 

    …_budget
    @emaciupe
    emaciupe committed Jun 22, 2023
    Configuration menu
    Copy the full SHA
    f97012e View commit details
    Browse the repository at this point in the history

  2. admin: add has_unfunded_cash, total_unfunded fields

    @emaciupe
    emaciupe committed Jun 22, 2023
    Configuration menu
    Copy the full SHA
    3b0397d View commit details
    Browse the repository at this point in the history

  3. circle-ci temporary: build image for ch33354-UNICEF-cash-unfunded branch

    @emaciupe
    emaciupe committed Jun 22, 2023
    Configuration menu
    Copy the full SHA
    984c43b View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2023

  1. fix amendment merge for total_unfunded; tests

    @emaciupe
    emaciupe committed Jun 23, 2023
    Configuration menu
    Copy the full SHA
    35586a0 View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2024

  1. Merge branch 'develop' of github.com:unicef/etools into ch33354-UNICE… 

    …F-cash-unfunded

# Conflicts:
#	src/etools/applications/partners/locale/ar/LC_MESSAGES/django.mo
#	src/etools/applications/partners/locale/ar/LC_MESSAGES/django.po
#	src/etools/applications/partners/locale/es/LC_MESSAGES/django.mo
#	src/etools/applications/partners/locale/es/LC_MESSAGES/django.po
#	src/etools/applications/partners/locale/fr/LC_MESSAGES/django.mo
#	src/etools/applications/partners/locale/fr/LC_MESSAGES/django.po
#	src/etools/applications/partners/locale/pt/LC_MESSAGES/django.mo
#	src/etools/applications/partners/locale/pt/LC_MESSAGES/django.po
#	src/etools/applications/partners/locale/ru/LC_MESSAGES/django.mo
#	src/etools/applications/partners/locale/ru/LC_MESSAGES/django.po
#	src/etools/applications/partners/serializers/interventions_v3.py
#	src/etools/applications/reports/serializers/v2.py
    @emaciupe
    emaciupe committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    7d7273c View commit details
    Browse the repository at this point in the history

  2. merge migrations and update translation files

    @emaciupe
    emaciupe committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    0f0e51e View commit details
    Browse the repository at this point in the history

  3. translations fix

    @emaciupe
    emaciupe committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    2eda78b View commit details
    Browse the repository at this point in the history