Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions runtests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ app_dirs="${cwd}/src/etools/applications/field_monitoring/data_collection/
${cwd}/src/etools/applications/field_monitoring/fm_settings/
${cwd}/src/etools/applications/field_monitoring/planning/
${cwd}/src/etools/applications/comments/
${cwd}/src/etools/applications/governments/
${cwd}/src/etools/applications/organizations/
${cwd}/src/etools/applications/partners/"
for app_dir in ${app_dirs};
Expand Down
2 changes: 1 addition & 1 deletion src/etools/applications/governments/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ class GDDAdmin(
)
country_office_admin_editable = ('unicef_court', )
fieldsets = (
(_('GDD Details'), {
(_('GPD Details'), {
'fields':
(
'agreement',
Expand Down
20 changes: 10 additions & 10 deletions src/etools/applications/governments/exports.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class GDDCSVRenderer(r.CSVRenderer):
"budget_currency": _("Budget Currency"),
"unicef_budget": _("UNICEF Cash (USD)"),
"unicef_supply": _("UNICEF Supply (USD)"),
"total_planned_budget": _("Total GDD Budget (USD)"),
"total_planned_budget": _("Total GPD Budget (USD)"),
"fr_numbers": _("FR Number(s)"),
"fr_currency": _("FR Currency"),
"fr_posting_date": _("FR Posting Date"),
Expand Down Expand Up @@ -211,7 +211,7 @@ def sheet_header(self, worksheet, header_title):
_('End date'), self.gdd.end.strftime('%d-%b-%y') if self.gdd.end else ''
])
worksheet.append([
_('GDD Reference'),
_('GPD Reference'),
self.gdd.number,
_('Duration'),
self.td_format(self.gdd.end - self.gdd.start)
Expand All @@ -233,7 +233,7 @@ def budget_summary(self, worksheet):
supplies_p = budget.in_kind_amount_local / unicef_contribution * 100 \
if unicef_contribution else 0

worksheet.append([_('Total GDD Budget'), currency_format(budget.total_local), '%'])
worksheet.append([_('Total GPD Budget'), currency_format(budget.total_local), '%'])
self.apply_styles_to_cells(
worksheet, worksheet.max_row, 1, worksheet.max_row, 3, [self.fill_blue, self.font_white]
)
Expand Down Expand Up @@ -274,10 +274,10 @@ def budget_summary(self, worksheet):
def render_workplan_budget(self, worksheet):
worksheet.append([
'',
_('GDD Output/ GDD Activity'),
_('GPD Output/ GPD Activity'),
_('Total (%s)') % self.gdd.planned_budget.currency + '\n' + '(UNICEF)',
_('UNICEF') + '\n' + _('contribution'),
_('GDD Quarters')
_('GPD Quarters')
])
quarters = get_quarters_range(self.gdd.start, self.gdd.end)
start_column = 6
Expand Down Expand Up @@ -320,7 +320,7 @@ def render_workplan_budget(self, worksheet):
)
for ki in result_link.gdd_key_interventions.all():
worksheet.append([
_("GDD Output") + "\n" + ki.code + ":",
_("GPD Output") + "\n" + ki.code + ":",
ki.name,
currency_format(ki.total()),
currency_format(ki.total_unicef()),
Expand Down Expand Up @@ -478,7 +478,7 @@ def render_workplan_budget(self, worksheet):
# start_row=worksheet.max_row, start_column=6, end_row=worksheet.max_row, end_column=total_columns
# )
worksheet.append([
_('Total PD budget cash'), '',
_('Total GPD budget cash'), '',
currency_format(self.gdd.planned_budget.total_cash_local()),
currency_format(self.gdd.planned_budget.unicef_cash_local),
])
Expand All @@ -504,13 +504,13 @@ def render_detailed_workplan_budget(self, worksheet):
quarters = get_quarters_range(self.gdd.start, self.gdd.end)
worksheet.append([
_('No.'),
_('GDD Output/ GDD Activity / Item Description'),
_('GPD Output/ GPD Activity / Item Description'),
_('Unit Type'),
_('Number of Units'),
_('Price/Unit'),
_('UNICEF') + '\n' + _('contribution'),
_('Total'),
_('GDD Quarters'),
_('GPD Quarters'),
] + [''] * (len(quarters) - 1) + [_('Other Notes')])

start_column = 9
Expand Down Expand Up @@ -559,7 +559,7 @@ def render_detailed_workplan_budget(self, worksheet):
for ki in result_link.gdd_key_interventions.all():
worksheet.append([
ki.code,
_("GDD OUTPUT ") + ki.code + ": " + ki.name,
_("GPD OUTPUT ") + ki.code + ": " + ki.name,
'',
'',
'',
Expand Down
Binary file not shown.
Loading