Skip to content

Commit

Permalink
Merge pull request #3948 from GeotrekCE/fix_workforce_cost
Browse files Browse the repository at this point in the history 
🚑 [HOTFIX] Remove workforce cost (#3824)
  • Loading branch information
@juggler31
juggler31 authored Feb 20, 2024
2 parents 347061c + 5ac9280 commit 6d7db30
Show file tree
Hide file tree
Showing 17 changed files with 123 additions and 86 deletions.
4 changes: 4 additions & 0 deletions docs/changelog.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ CHANGELOG
2.102.0+dev (XXXX-XX-XX)
------------------------

**Hot fix**

- Remove workforce cost (#3824)

2.102.0 (2024-02-19)
--------------------

Expand Down
3 changes: 0 additions & 3 deletions docs/install/advanced-configuration.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1253,7 +1253,6 @@ A (nearly?) exhaustive list of attributes available for display and export as co
"max_elevation",
"heliport_cost",
"contractor_cost",
"workforce_cost",
"date_update",
"date_insert",
"description",
Expand Down Expand Up @@ -1730,7 +1729,6 @@ A (nearly?) exhaustive list of attributes available for display and export as co
"material_cost",
"heliport_cost",
"contractor_cost",
"workforce_cost",
"total_cost_mandays",
"total_cost",
"cities",
Expand Down Expand Up @@ -2169,7 +2167,6 @@ An exhaustive list of form fields hideable in each module.
"material_cost",
"heliport_cost",
"contractor_cost",
"workforce_cost",
],
HIDDEN_FORM_FIELDS["project"] = [
"type",
Expand Down
3 changes: 1 addition & 2 deletions geotrek/maintenance/forms.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ class InterventionForm(CommonForm):
'material_cost',
'heliport_cost',
'contractor_cost',
'workforce_cost',
Fieldset(_("Mandays")),
css_class="scrollable tab-pane active"
),
Expand All @@ -106,7 +105,7 @@ class Meta(CommonForm.Meta):
model = Intervention
fields = CommonForm.Meta.fields + \
['structure', 'name', 'begin_date', 'end_date', 'status', 'disorders', 'type', 'description', 'subcontracting', 'length', 'width',
'height', 'stake', 'project', 'contractors', 'access', 'material_cost', 'heliport_cost', 'contractor_cost', 'workforce_cost', 'topology']
'height', 'stake', 'project', 'contractors', 'access', 'material_cost', 'heliport_cost', 'contractor_cost', 'topology']

def __init__(self, *args, target_type=None, target_id=None, **kwargs):
super().__init__(*args, **kwargs)
Expand Down
27 changes: 15 additions & 12 deletions geotrek/maintenance/locale/de/LC_MESSAGES/django.po
View file
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: 2024-02-13 10:26+0000\n"
"POT-Creation-Date: 2024-02-20 08:42+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down Expand Up @@ -104,6 +104,9 @@ msgstr ""
msgid "Year of activity"
msgstr ""

msgid "Intervention contractors"
msgstr ""

msgid "Days"
msgstr ""

Expand All @@ -122,19 +125,19 @@ msgstr ""
msgid "On {}"
msgstr ""

msgid "Fundings"
msgid "Begin date is after end date"
msgstr ""

msgid "Name"
msgid "Fundings"
msgstr ""

msgid "Brief summary"
msgid "Start year is after end year"
msgstr ""

msgid "Date"
msgid "Name"
msgstr ""

msgid "When ?"
msgid "Brief summary"
msgstr ""

msgid "Begin date"
Expand Down Expand Up @@ -164,9 +167,6 @@ msgstr ""
msgid "Contractor cost"
msgstr ""

msgid "Workforce cost"
msgstr ""

msgid "Contractors"
msgstr ""

Expand Down Expand Up @@ -194,6 +194,9 @@ msgstr ""
msgid "Remarks and notes"
msgstr ""

msgid "Access mean"
msgstr ""

msgid "External id"
msgstr ""

Expand All @@ -203,6 +206,9 @@ msgstr ""
msgid "Interventions"
msgstr ""

msgid "Deleted"
msgstr ""

msgid "Mandays cost"
msgstr ""

Expand Down Expand Up @@ -287,9 +293,6 @@ msgstr ""
msgid "Projects"
msgstr ""

msgid "Intervention contractors"
msgstr ""

msgid "Period"
msgstr ""

Expand Down
26 changes: 16 additions & 10 deletions geotrek/maintenance/locale/en/LC_MESSAGES/django.po
View file
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: 2024-02-13 10:26+0000\n"
"POT-Creation-Date: 2024-02-20 08:42+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down Expand Up @@ -104,6 +104,9 @@ msgstr ""
msgid "Year of activity"
msgstr ""

msgid "Intervention contractors"
msgstr ""

msgid "Days"
msgstr ""

Expand All @@ -122,19 +125,19 @@ msgstr ""
msgid "On {}"
msgstr ""

msgid "Fundings"
msgid "Begin date is after end date"
msgstr ""

msgid "Name"
msgid "Fundings"
msgstr ""

msgid "Brief summary"
msgid "Start year is after end year"
msgstr ""

msgid "Date"
msgid "Name"
msgstr ""

msgid "When ?"
msgid "Brief summary"
msgstr ""

msgid "Begin date"
Expand All @@ -161,7 +164,7 @@ msgstr ""
msgid "Heliport cost"
msgstr ""

msgid "Subcontract cost"
msgid "Contractor cost"
msgstr ""

msgid "Contractors"
Expand Down Expand Up @@ -191,6 +194,9 @@ msgstr ""
msgid "Remarks and notes"
msgstr ""

msgid "Access mean"
msgstr ""

msgid "External id"
msgstr ""

Expand All @@ -200,6 +206,9 @@ msgstr ""
msgid "Interventions"
msgstr ""

msgid "Deleted"
msgstr ""

msgid "Mandays cost"
msgstr ""

Expand Down Expand Up @@ -284,9 +293,6 @@ msgstr ""
msgid "Projects"
msgstr ""

msgid "Intervention contractors"
msgstr ""

msgid "Period"
msgstr ""

Expand Down
26 changes: 16 additions & 10 deletions geotrek/maintenance/locale/es/LC_MESSAGES/django.po
View file
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: 2024-02-13 10:26+0000\n"
"POT-Creation-Date: 2024-02-20 08:42+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down Expand Up @@ -104,6 +104,9 @@ msgstr ""
msgid "Year of activity"
msgstr ""

msgid "Intervention contractors"
msgstr ""

msgid "Days"
msgstr ""

Expand All @@ -122,19 +125,19 @@ msgstr ""
msgid "On {}"
msgstr ""

msgid "Fundings"
msgid "Begin date is after end date"
msgstr ""

msgid "Name"
msgid "Fundings"
msgstr ""

msgid "Brief summary"
msgid "Start year is after end year"
msgstr ""

msgid "Date"
msgid "Name"
msgstr ""

msgid "When ?"
msgid "Brief summary"
msgstr ""

msgid "Begin date"
Expand All @@ -161,7 +164,7 @@ msgstr ""
msgid "Heliport cost"
msgstr ""

msgid "Subcontract cost"
msgid "Contractor cost"
msgstr ""

msgid "Contractors"
Expand Down Expand Up @@ -191,6 +194,9 @@ msgstr ""
msgid "Remarks and notes"
msgstr ""

msgid "Access mean"
msgstr ""

msgid "External id"
msgstr ""

Expand All @@ -200,6 +206,9 @@ msgstr ""
msgid "Interventions"
msgstr ""

msgid "Deleted"
msgstr ""

msgid "Mandays cost"
msgstr ""

Expand Down Expand Up @@ -284,9 +293,6 @@ msgstr ""
msgid "Projects"
msgstr ""

msgid "Intervention contractors"
msgstr ""

msgid "Period"
msgstr ""

Expand Down
27 changes: 15 additions & 12 deletions geotrek/maintenance/locale/fr/LC_MESSAGES/django.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-02-13 10:26+0000\n"
"POT-Creation-Date: 2024-02-20 08:42+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down Expand Up @@ -103,6 +103,9 @@ msgstr ""
msgid "Year of activity"
msgstr "Année d'activité"

msgid "Intervention contractors"
msgstr "Prestataires des interventions"

msgid "Days"
msgstr "Jours"

Expand All @@ -127,18 +130,15 @@ msgstr "La date de début est après la date de fin"
msgid "Fundings"
msgstr "Financements"

msgid "Start year is after end year"
msgstr "La date de début est après la date de fin"

msgid "Name"
msgstr "Nom"

msgid "Brief summary"
msgstr "Bref résumé"

msgid "Date"
msgstr "Date"

msgid "When ?"
msgstr "Quand ?"

msgid "Begin date"
msgstr "Date de début"

Expand All @@ -163,8 +163,8 @@ msgstr "Coût matériel"
msgid "Heliport cost"
msgstr "Coût héliportage"

msgid "Subcontract cost"
msgstr "Coût sous-traitance"
msgid "Contractor cost"
msgstr "Coût prestataire"

msgid "Contractors"
msgstr "Prestataires"
Expand Down Expand Up @@ -193,6 +193,9 @@ msgstr "Descriptif"
msgid "Remarks and notes"
msgstr "Remarques et notes"

msgid "Access mean"
msgstr ""

msgid "External id"
msgstr "ID externe"

Expand All @@ -202,6 +205,9 @@ msgstr "Intervention"
msgid "Interventions"
msgstr "Interventions"

msgid "Deleted"
msgstr ""

msgid "Mandays cost"
msgstr "Coût jours-hommes"

Expand Down Expand Up @@ -286,9 +292,6 @@ msgstr "Financeurs"
msgid "Projects"
msgstr "Chantiers"

msgid "Intervention contractors"
msgstr "Prestataires des interventions"

msgid "Period"
msgstr "Période"

Expand Down
Loading

0 comments on commit 6d7db30

Please sign in to comment.