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

[ch33354] Unicef cash unfunded #3472

Open
wants to merge 39 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 32 commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
30d6fa8
UNICEF Cash Unfunded - model changes
emaciupe Mar 28, 2023
69c51c0
(wip)
emaciupe Mar 28, 2023
f7ab263
models changes and migrations
emaciupe Apr 11, 2023
5590153
fix tests
emaciupe Apr 11, 2023
1b044c4
Merge branch '32722-amp-changes-and-fixes' of github.com:unicef/etool…
emaciupe Apr 11, 2023
41a2c9d
updated translations
emaciupe Apr 11, 2023
ab4ef1b
wip
emaciupe Apr 19, 2023
d7782f2
Merge branch 'develop' of github.com:unicef/etools into 33354-unicef-…
emaciupe Jun 7, 2023
a2dd41f
update migrations
emaciupe Jun 7, 2023
2950de3
validation and tests for unfunded toggle and capacity strenghtening u…
emaciupe Jun 7, 2023
6685a33
Merge branch '33354-unicef-cash-unfunded' of github.com:unicef/etools…
emaciupe Jun 7, 2023
459907c
translations
emaciupe Jun 7, 2023
6079ea1
remove duplicated migrations and field
emaciupe Jun 7, 2023
3a7ae30
add total_unfunded, serializer changes
emaciupe Jun 7, 2023
341a68a
serializer and calculations changes
emaciupe Jun 8, 2023
fb1d589
update translations
emaciupe Jun 8, 2023
2a8e961
serializers validation and tests
emaciupe Jun 9, 2023
7d3fb23
added validation on EEPM activity items for unfunded cash
emaciupe Jun 12, 2023
689b8d4
Merge branch 'develop' of github.com:unicef/etools into ch33354-UNICE…
emaciupe Jun 12, 2023
922ba69
added validation on EEPM activity items for unfunded cash
emaciupe Jun 12, 2023
2f8f89b
unfunded_cash changes and tests
emaciupe Jun 12, 2023
4d9323d
added toggle validation on has_unfunded_cash flag
emaciupe Jun 12, 2023
4376485
added PD permissions in matrix for has_unfunded_cash
emaciupe Jun 12, 2023
e046aa3
new validation message in translations
emaciupe Jun 12, 2023
d7a6929
fix tests
emaciupe Jun 12, 2023
f5768a2
added unfunded cash to activities in ll_results
emaciupe Jun 13, 2023
6256166
add unfunded_cash to activities total
emaciupe Jun 13, 2023
539b40a
tests
emaciupe Jun 13, 2023
fe1c296
fix: unfunded_cash is added to ll_results total
emaciupe Jun 14, 2023
ef76cc1
Translations for toast messages
emaciupe Jun 14, 2023
665077f
rename unfunded_cash_local to unfunded_hq_cash
emaciupe Jun 14, 2023
7d27a6d
Merge branch 'develop' of github.com:unicef/etools into ch33354-UNICE…
emaciupe Jun 14, 2023
f97012e
Permissions matrix: has_unfunded_cash has same permissions as planned…
emaciupe Jun 22, 2023
3b0397d
admin: add has_unfunded_cash, total_unfunded fields
emaciupe Jun 22, 2023
984c43b
circle-ci temporary: build image for ch33354-UNICEF-cash-unfunded branch
emaciupe Jun 22, 2023
35586a0
fix amendment merge for total_unfunded; tests
emaciupe Jun 23, 2023
7d7273c
Merge branch 'develop' of github.com:unicef/etools into ch33354-UNICE…
emaciupe Jan 16, 2024
0f0e51e
merge migrations and update translation files
emaciupe Jan 16, 2024
2eda78b
translations fix
emaciupe Jan 16, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified src/etools/applications/partners/locale/ar/LC_MESSAGES/django.mo
Binary file not shown.
39 changes: 38 additions & 1 deletion src/etools/applications/partners/locale/ar/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-05-18 09:35+0000\n"
"POT-Creation-Date: 2023-06-14 12:13+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand Down Expand Up @@ -1188,6 +1188,9 @@ msgstr "يونيسيف كاش"
msgid "UNICEF Supplies"
msgstr "لوازم اليونيسف"

msgid "Total Unfunded"
msgstr ""

msgid "Partner Contribution Local"
msgstr "مساهمة الشريك بالعملة المحلية"

Expand All @@ -1200,12 +1203,18 @@ msgstr "إجمالي مساهمة الشريك"
msgid "Total HQ Cash Local"
msgstr "إجمالي النقد المحلي للمقر الرئيسي"

msgid "Unfunded Capacity Strengthening Cash Local"
msgstr "تكاليف تعزيز القدرات غير ممول"

msgid "Unicef Cash Local"
msgstr "منظمة اليونيسف النقدية المحلية"

msgid "UNICEF Supplies Local"
msgstr "مستلزمات اليونيسف محلية"

msgid "Unfunded Cash"
msgstr ""

msgid "Currency"
msgstr "عملة"

Expand Down Expand Up @@ -1407,6 +1416,12 @@ msgstr ""
"مساهمة الشريك في الإدارة الداخلية وموظفي الدعم مقسمة إلى مساهماتهم في "
"البرنامج (التمثيل ، التخطيط ، التنسيق ، اللوجستيات ، الإدارة ، المالية)"

msgid ""
"Unfunded amount for In-country management and support staff prorated to "
"their contribution to the programme (representation, planning, coordination, "
"logistics, administration, finance)"
msgstr ""

msgid ""
"UNICEF contribution for Operational costs prorated to their contribution to "
"the programme (office space, equipment, office supplies, maintenance)"
Expand All @@ -1421,6 +1436,11 @@ msgstr ""
"مساهمة الشركاء في التكاليف التشغيلية مقسمة بالتناسب مع مساهمتهم في البرنامج "
"(مساحة مكتبية ، معدات ، لوازم مكتبية ، صيانة)"

msgid ""
"Unfunded amount for Operational costs prorated to their contribution to the "
"programme (office space, equipment, office supplies, maintenance)"
msgstr ""

msgid ""
"UNICEF contribution for Planning, monitoring, evaluation and communication, "
"prorated to their contribution to the programme (venue, travels, etc.)"
Expand All @@ -1435,6 +1455,11 @@ msgstr ""
"مساهمة الشريك في التخطيط والمراقبة والتقييم والاتصال ، مُتناسبة مع مساهمتهم "
"في البرنامج (المكان ، والسفر ، وما إلى ذلك)"

msgid ""
"Unfunded amount for Planning, monitoring, evaluation and communication, "
"prorated to their contribution to the programme (venue, travels, etc.)"
msgstr ""

msgid "Unit Number"
msgstr "رقم الوحدة"

Expand Down Expand Up @@ -1481,6 +1506,9 @@ msgstr "منظمة اليونيسف النقدية المحلية"
msgid "CSO Cash Local"
msgstr "مساهمة منظمة المجتمع المدني النقدية"

msgid "Unfunded Cash Local"
msgstr ""

msgid "Accessing this item is not allowed."
msgstr "الوصول إلى هذا العنصر غير مسموح به."

Expand Down Expand Up @@ -1568,6 +1596,15 @@ msgstr "تصنيف مخاطر الإستغلال و الإنتهاك الجنس
msgid "HACT"
msgstr "اطار النهج المنسق للتحويلات النقدية"

msgid ""
"This programme document has unfunded amounts. Please fix them before "
"deactivating."
msgstr ""
".تحتوي وثيقة البرنامج هذه على مبالغ غير ممولة. يرجى إصلاحها قبل التعطيل"

msgid "This programme document does not include unfunded amounts."
msgstr ".لا تتضمن وثيقة البرنامج هذه المبالغ غير الممولة"

msgid ""
"Cannot add a new amendment while another amendment of same kind is in "
"progress."
Expand Down
Binary file modified src/etools/applications/partners/locale/es/LC_MESSAGES/django.mo
Binary file not shown.
56 changes: 43 additions & 13 deletions src/etools/applications/partners/locale/es/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: et-partners2-bk\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-05-18 09:35+0000\n"
"POT-Creation-Date: 2023-06-14 12:13+0000\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down Expand Up @@ -915,21 +915,17 @@ msgstr "Suspendido"
msgid "Terminated"
msgstr "Terminado"

#, fuzzy
#| msgid "Partner Authorized Officer"
msgid "(old)Partner Authorized Officer"
msgstr "Socio Funcionario autorizado"
msgstr "(old)Socio Funcionario autorizado"

msgid "Attached Agreement"
msgstr "Acuerdo adjunto"

msgid "Termination document for PCAs"
msgstr "Documento de cese de los AAC"

#, fuzzy
#| msgid "Signed by partner"
msgid "(old)Signed by partner"
msgstr "Firmado por el socio"
msgstr "(old)Firmado por el socio"

msgid "Signed by partner"
msgstr "Firmado por el socio"
Expand Down Expand Up @@ -1012,15 +1008,11 @@ msgstr "Fecha de la revisión final de la asociación"
msgid "Final Review Approved"
msgstr "Revisión final aprobada"

#, fuzzy
#| msgid "Signed by Partner"
msgid "(old)Signed by Partner"
msgstr "Firmado por el socio"
msgstr "(old)Firmado por el socio"

#, fuzzy
#| msgid "CSO Authorized Officials"
msgid "(old)CSO Authorized Officials"
msgstr "CSO Funcionarios autorizados"
msgstr "(old)CSO Funcionarios autorizados"

msgid "Contingency PD"
msgstr "Contingencia PD"
Expand Down Expand Up @@ -1193,6 +1185,9 @@ msgstr "UNICEF Efectivo"
msgid "UNICEF Supplies"
msgstr "Suministros UNICEF"

msgid "Total Unfunded"
msgstr ""

msgid "Partner Contribution Local"
msgstr "Socio Contribución Local"

Expand All @@ -1205,12 +1200,18 @@ msgstr "Contribución total de los socios"
msgid "Total HQ Cash Local"
msgstr "Total Sede Efectivo Local"

msgid "Unfunded Capacity Strengthening Cash Local"
msgstr "Costos de fortalecimiento de capacidades sin fondos"

msgid "Unicef Cash Local"
msgstr "Unicef Cash Local"

msgid "UNICEF Supplies Local"
msgstr "UNICEF Suministros locales"

msgid "Unfunded Cash"
msgstr ""

msgid "Currency"
msgstr "Moneda"

Expand Down Expand Up @@ -1415,6 +1416,12 @@ msgstr ""
"prorrateada en función de su contribución al programa (representación, "
"planificación, coordinación, logística, administración, finanzas)."

msgid ""
"Unfunded amount for In-country management and support staff prorated to "
"their contribution to the programme (representation, planning, coordination, "
"logistics, administration, finance)"
msgstr ""

msgid ""
"UNICEF contribution for Operational costs prorated to their contribution to "
"the programme (office space, equipment, office supplies, maintenance)"
Expand All @@ -1431,6 +1438,11 @@ msgstr ""
"su contribución al programa (espacio de oficinas, equipamiento, material de "
"oficina, mantenimiento)."

msgid ""
"Unfunded amount for Operational costs prorated to their contribution to the "
"programme (office space, equipment, office supplies, maintenance)"
msgstr ""

msgid ""
"UNICEF contribution for Planning, monitoring, evaluation and communication, "
"prorated to their contribution to the programme (venue, travels, etc.)"
Expand All @@ -1447,6 +1459,11 @@ msgstr ""
"comunicación, prorrateada en función de su contribución al programa (lugar "
"de celebración, viajes, etc.)"

msgid ""
"Unfunded amount for Planning, monitoring, evaluation and communication, "
"prorated to their contribution to the programme (venue, travels, etc.)"
msgstr ""

msgid "Unit Number"
msgstr "Número de unidad"

Expand Down Expand Up @@ -1494,6 +1511,9 @@ msgstr "Unicef Cash Local"
msgid "CSO Cash Local"
msgstr "CSO Efectivo Local"

msgid "Unfunded Cash Local"
msgstr ""

msgid "Accessing this item is not allowed."
msgstr "No está permitido acceder a este elemento."

Expand Down Expand Up @@ -1581,6 +1601,16 @@ msgstr "Clasificación de riesgo de la EAE"
msgid "HACT"
msgstr "Hact"

msgid ""
"This programme document has unfunded amounts. Please fix them before "
"deactivating."
msgstr ""
"Este documento de programa tiene montos no financiados. Corríjalos antes de "
"desactivarlos."

msgid "This programme document does not include unfunded amounts."
msgstr "Este documento de programa no incluye montos no financiados."

msgid ""
"Cannot add a new amendment while another amendment of same kind is in "
"progress."
Expand Down
Binary file modified src/etools/applications/partners/locale/fr/LC_MESSAGES/django.mo
Binary file not shown.
56 changes: 43 additions & 13 deletions src/etools/applications/partners/locale/fr/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-05-18 09:35+0000\n"
"POT-Creation-Date: 2023-06-14 12:13+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand Down Expand Up @@ -925,21 +925,17 @@ msgstr "Suspendu"
msgid "Terminated"
msgstr "Terminé"

#, fuzzy
#| msgid "Partner Authorized Officer"
msgid "(old)Partner Authorized Officer"
msgstr "Partenaire Agent autorisé"
msgstr "(old)Partenaire Agent autorisé"

msgid "Attached Agreement"
msgstr "Accord ci-joint"

msgid "Termination document for PCAs"
msgstr "Document de fin de contrat pour les APC"

#, fuzzy
#| msgid "Signed by partner"
msgid "(old)Signed by partner"
msgstr "Signé par le partenaire"
msgstr "(old)Signé par le partenaire"

msgid "Signed by partner"
msgstr "Signé par le partenaire"
Expand Down Expand Up @@ -1022,15 +1018,11 @@ msgstr "Date de la révision finale du partenariat"
msgid "Final Review Approved"
msgstr "Révision finale approuvée"

#, fuzzy
#| msgid "Signed by Partner"
msgid "(old)Signed by Partner"
msgstr "Signé par le partenaire"
msgstr "(old)Signé par le partenaire"

#, fuzzy
#| msgid "CSO Authorized Officials"
msgid "(old)CSO Authorized Officials"
msgstr "Fonctionnaires autorisés de l'OSC"
msgstr "(old)Fonctionnaires autorisés de l'OSC"

msgid "Contingency PD"
msgstr "PD pour imprévus"
Expand Down Expand Up @@ -1203,6 +1195,9 @@ msgstr "Unicef Cash"
msgid "UNICEF Supplies"
msgstr "Fournitures de l'UNICEF"

msgid "Total Unfunded"
msgstr ""

msgid "Partner Contribution Local"
msgstr "Contribution du partenaire Local"

Expand All @@ -1215,12 +1210,18 @@ msgstr "Contribution totale des partenaires"
msgid "Total HQ Cash Local"
msgstr "Total HQ Cash Local"

msgid "Unfunded Capacity Strengthening Cash Local"
msgstr "Coûts de renforcement des capacités non financé"

msgid "Unicef Cash Local"
msgstr "Unicef Cash Local"

msgid "UNICEF Supplies Local"
msgstr "Fournitures UNICEF locales"

msgid "Unfunded Cash"
msgstr ""

msgid "Currency"
msgstr "Monnaie"

Expand Down Expand Up @@ -1426,6 +1427,12 @@ msgstr ""
"le pays au prorata de leur contribution au programme (représentation, "
"planification, coordination, logistique, administration, finances)."

msgid ""
"Unfunded amount for In-country management and support staff prorated to "
"their contribution to the programme (representation, planning, coordination, "
"logistics, administration, finance)"
msgstr ""

msgid ""
"UNICEF contribution for Operational costs prorated to their contribution to "
"the programme (office space, equipment, office supplies, maintenance)"
Expand All @@ -1442,6 +1449,11 @@ msgstr ""
"contribution au programme (espace de bureau, équipement, fournitures de "
"bureau, entretien)."

msgid ""
"Unfunded amount for Operational costs prorated to their contribution to the "
"programme (office space, equipment, office supplies, maintenance)"
msgstr ""

msgid ""
"UNICEF contribution for Planning, monitoring, evaluation and communication, "
"prorated to their contribution to the programme (venue, travels, etc.)"
Expand All @@ -1458,6 +1470,11 @@ msgstr ""
"et la communication, au prorata de leur contribution au programme (lieu, "
"voyages, etc.)."

msgid ""
"Unfunded amount for Planning, monitoring, evaluation and communication, "
"prorated to their contribution to the programme (venue, travels, etc.)"
msgstr ""

msgid "Unit Number"
msgstr "Numéro d'unité"

Expand Down Expand Up @@ -1505,6 +1522,9 @@ msgstr "Unicef Cash Local"
msgid "CSO Cash Local"
msgstr "CSO Cash Local"

msgid "Unfunded Cash Local"
msgstr ""

msgid "Accessing this item is not allowed."
msgstr "L'accès à cet élément n'est pas autorisé."

Expand Down Expand Up @@ -1592,6 +1612,16 @@ msgstr "Cote de risque SEA"
msgid "HACT"
msgstr "Hact"

msgid ""
"This programme document has unfunded amounts. Please fix them before "
"deactivating."
msgstr ""
"Ce document de programme comporte des montants non financés. Veuillez les "
"corriger avant de désactiver."

msgid "This programme document does not include unfunded amounts."
msgstr "Ce document de programme n'inclut pas les montants non financés."

msgid ""
"Cannot add a new amendment while another amendment of same kind is in "
"progress."
Expand Down
Binary file modified src/etools/applications/partners/locale/pt/LC_MESSAGES/django.mo
Binary file not shown.
Loading