Merge branch 'dev' into 'master'

Dev v. 1.2.5 See merge request di/budgetweb!20
unistra · Oct 10, 2019 · 63949ca · 63949ca
2 parents 9c0b72c + deb52ed
commit 63949ca
Show file tree

Hide file tree

Showing 6 changed files with 122 additions and 52 deletions.
diff --git a/budgetweb/__init__.py b/budgetweb/__init__.py
@@ -1,4 +1,4 @@
-VERSION = (1, 2, 4)
+VERSION = (1, 2, 5)
 
 
 def get_version():

diff --git a/budgetweb/apps/structure/admin.py b/budgetweb/apps/structure/admin.py
@@ -61,14 +61,16 @@ def get_str(self, obj):
 
 class PlanFinancementAdmin(admin.ModelAdmin):
     fields = ('structure', 'code', 'label', 'eotp', 'centrecoutderive',
-              'centreprofitderive', 'is_fleche', 'is_pluriannuel', 'is_active',
-              'date_debut', 'date_fin')
+              'centreprofitderive', 'groupe1', 'groupe2', 'is_fleche',
+              'is_pluriannuel', 'is_active', 'date_debut', 'date_fin')
     list_display = ('get_str', 'label', 'eotp', 'centrecoutderive',
                     'centreprofitderive', 'is_fleche', 'is_pluriannuel',
-                    'is_active', 'date_debut', 'date_fin')
+                    'is_active', 'date_debut', 'date_fin', 'groupe1',
+                    'groupe2')
     search_fields = ['structure__code', 'code', 'eotp', 'centrecoutderive',
                      'centreprofitderive', 'is_fleche', 'is_pluriannuel',
-                     'is_active', 'date_debut', 'date_fin']
+                     'is_active', 'date_debut', 'date_fin', 'groupe1',
+                     'groupe2']
 
     def get_str(self, obj):
         return str(obj)

diff --git a/budgetweb/apps/structure/migrations/0002_auto_20191003_1531.py b/budgetweb/apps/structure/migrations/0002_auto_20191003_1531.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.24 on 2019-10-03 13:31
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('structure', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='planfinancement',
+            name='centrecoutderive',
+            field=models.CharField(blank=True, max_length=100, null=True, verbose_name='Related cost center'),
+        ),
+        migrations.AlterField(
+            model_name='planfinancement',
+            name='centreprofitderive',
+            field=models.CharField(blank=True, max_length=100, null=True, verbose_name='Related profit center'),
+        ),
+    ]
diff --git a/budgetweb/apps/structure/models.py b/budgetweb/apps/structure/models.py
@@ -110,10 +110,10 @@ class PlanFinancement(models.Model):
     code = models.CharField(_('Code'), max_length=100, default='NA')
     label = models.CharField(_('Label'), max_length=255)
     eotp = models.CharField(_('EOTP short label'), max_length=100)
-    centrecoutderive = models.CharField(_('Related cost center'),
-                                        max_length=100)
-    centreprofitderive = models.CharField('Related profit center',
-                                          max_length=100)
+    centrecoutderive = models.CharField(
+        _('Related cost center'), max_length=100, null=True, blank=True)
+    centreprofitderive = models.CharField(
+        _('Related profit center'), max_length=100, null=True, blank=True)
     groupe1 = models.CharField(_('BudgetWeb group 1'), max_length=255,
                                null=True, blank=True)
     groupe2 = models.CharField(_('BudgetWeb group 2'), max_length=255,

diff --git a/budgetweb/locale/fr_FR/LC_MESSAGES/django.po b/budgetweb/locale/fr_FR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-13 17:46+0200\n"
+"POT-Creation-Date: 2019-10-03 15:27+0200\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"
@@ -25,21 +25,26 @@ msgstr "Désactiver les périodes sélectionnées"
 msgid "Mark selected periods as activated"
 msgstr "Activer les périodes sélectionnées"
 
-#: budgetweb/apps/structure/admin.py:33 budgetweb/apps/structure/admin.py:53
+#: budgetweb/apps/structure/admin.py:35 budgetweb/apps/structure/admin.py:56
 msgid "accounting nature"
 msgstr "nature comptable"
 
+#: budgetweb/apps/structure/admin.py:75 budgetweb/apps/structure/models.py:56
+#: budgetweb/apps/structure/models.py:109 budgetweb/models.py:150
+msgid "structure"
+msgstr "structure"
+
 #: budgetweb/apps/structure/models.py:15 budgetweb/apps/structure/models.py:36
 #: budgetweb/apps/structure/models.py:110
 #: budgetweb/apps/structure/models.py:145
-#: budgetweb/apps/structure/models.py:181 budgetweb/models.py:76
+#: budgetweb/apps/structure/models.py:181 budgetweb/models.py:77
 msgid "Code"
 msgstr "Code"
 
 #: budgetweb/apps/structure/models.py:16 budgetweb/apps/structure/models.py:37
 #: budgetweb/apps/structure/models.py:111
 #: budgetweb/apps/structure/models.py:144
-#: budgetweb/apps/structure/models.py:182 budgetweb/models.py:77
+#: budgetweb/apps/structure/models.py:182 budgetweb/models.py:78
 msgid "Label"
 msgstr "Libellé"
 
@@ -62,13 +67,11 @@ msgstr "domaine fonctionnel"
 msgid "functional domains"
 msgstr "domaines fonctionnels"
 
-#: budgetweb/apps/structure/models.py:41
-#: budgetweb/apps/structure/models.py:117
+#: budgetweb/apps/structure/models.py:41 budgetweb/apps/structure/models.py:117
 msgid "BudgetWeb group 1"
 msgstr "Groupe BudgetWeb 1"
 
-#: budgetweb/apps/structure/models.py:43
-#: budgetweb/apps/structure/models.py:119
+#: budgetweb/apps/structure/models.py:43 budgetweb/apps/structure/models.py:119
 msgid "BudgetWeb group 2"
 msgstr "Groupe BudgetWeb 2"
 
@@ -80,23 +83,24 @@ msgstr "Profondeur"
 msgid "Path"
 msgstr "Chemin"
 
-#: budgetweb/apps/structure/models.py:56
-#: budgetweb/apps/structure/models.py:109 budgetweb/models.py:144
-msgid "structure"
-msgstr "structure"
-
-#: budgetweb/apps/structure/models.py:57 budgetweb/models.py:48
+#: budgetweb/apps/structure/models.py:57 budgetweb/models.py:49
 msgid "structures"
 msgstr "structures"
 
 #: budgetweb/apps/structure/models.py:112
 msgid "EOTP short label"
 msgstr "libellé court de l'EOTP"
 
-#: budgetweb/apps/structure/models.py:113
+#: budgetweb/apps/structure/models.py:114
 msgid "Related cost center"
 msgstr "Centre de coût associé"
 
+#: budgetweb/apps/structure/models.py:116
+#, fuzzy
+#| msgid "Related cost center"
+msgid "Related profit center"
+msgstr "Centre de coût associé"
+
 #: budgetweb/apps/structure/models.py:121
 #: budgetweb/apps/structure/models.py:151
 #: budgetweb/apps/structure/models.py:188
@@ -189,67 +193,67 @@ msgstr "nature comptable recette"
 msgid "receipts accounting natures"
 msgstr "natures comptables recettes"
 
-#: budgetweb/forms.py:334 budgetweb/tests/test_forms.py:859
+#: budgetweb/forms.py:334 budgetweb/tests/test_forms.py:857
 msgid "There are already entries which are not in the new period"
 msgstr "Il existe déjà des entrées qui ne sont pas dans la nouvelle période"
 
-#: budgetweb/models.py:45
+#: budgetweb/models.py:46
 msgid "User"
 msgstr "Utilisateur"
 
-#: budgetweb/models.py:51
+#: budgetweb/models.py:52
 msgid "structure authorizations"
 msgstr "Autorisations de la structure"
 
-#: budgetweb/models.py:52
+#: budgetweb/models.py:53
 msgid "structures authorizations"
 msgstr "Autorisations des structures"
 
-#: budgetweb/models.py:78
+#: budgetweb/models.py:79
 msgid "Order"
 msgstr "Ordre"
 
-#: budgetweb/models.py:91
+#: budgetweb/models.py:97
 msgid "Period"
 msgstr "Période"
 
-#: budgetweb/models.py:132 budgetweb/models.py:146
+#: budgetweb/models.py:138 budgetweb/models.py:152
 msgid "budget period"
 msgstr "période budgétaire"
 
-#: budgetweb/models.py:133
+#: budgetweb/models.py:139
 msgid "budget periods"
 msgstr "périodes budgétaires"
 
-#: budgetweb/models.py:168
+#: budgetweb/models.py:174
 msgid "structure amounts"
 msgstr "Montants de la structure"
 
-#: budgetweb/models.py:169
+#: budgetweb/models.py:175
 msgid "structures amounts"
 msgstr "Montants des structures"
 
-#: budgetweb/models.py:294
+#: budgetweb/models.py:300
 msgid "expense"
 msgstr "dépense"
 
-#: budgetweb/models.py:295
+#: budgetweb/models.py:301
 msgid "expenses"
 msgstr "dépenses"
 
-#: budgetweb/models.py:319
+#: budgetweb/models.py:325
 msgid "receipt"
 msgstr "recette"
 
-#: budgetweb/models.py:320
+#: budgetweb/models.py:326
 msgid "receipts"
 msgstr "recettes"
 
-#: budgetweb/models.py:348
+#: budgetweb/models.py:354
 msgid "transfer"
 msgstr "virement"
 
-#: budgetweb/models.py:349
+#: budgetweb/models.py:355
 msgid "transfers"
 msgstr "virements"
 
@@ -266,31 +270,31 @@ msgstr "Migration"
 msgid "Migrate pluriannual pfis for year %(year)s"
 msgstr "Migrer les pfis pluriannuelles pour l'année %(year)s"
 
-#: budgetweb/templates/base.html:34
+#: budgetweb/templates/base.html:35
 msgid "Home"
 msgstr "Accueil"
 
-#: budgetweb/templates/base.html:39
+#: budgetweb/templates/base.html:40
 msgid "GBCP Menu"
 msgstr "Menu GBCP"
 
-#: budgetweb/templates/base.html:40
+#: budgetweb/templates/base.html:41
 msgid "DC Menu"
 msgstr "Menu Droit Constaté"
 
-#: budgetweb/templates/base.html:44
+#: budgetweb/templates/base.html:45
 msgid "Year"
 msgstr "Année"
 
-#: budgetweb/templates/base.html:55
+#: budgetweb/templates/base.html:58
 msgid "Administration"
 msgstr "Administration"
 
-#: budgetweb/templates/base.html:58
+#: budgetweb/templates/base.html:61
 msgid "Logout"
 msgstr "Déconnexion"
 
-#: budgetweb/templates/base.html:60
+#: budgetweb/templates/base.html:63
 msgid "Login"
 msgstr "Connexion"
 
@@ -312,48 +316,61 @@ msgid "Save"
 msgstr "Enregistrer"
 
 #: budgetweb/templates/detailspfi.html:3
+#: budgetweb/templates/detailspfi.old.html:3
 msgid "Financial programs details"
 msgstr "Caractéristique du programme de financement"
 
 #: budgetweb/templates/detailspfi.html:3
+#: budgetweb/templates/detailspfi.old.html:3
 msgid "link to the fund center"
 msgstr "rattaché au centre financier"
 
 #: budgetweb/templates/detailspfi.html:7
+#: budgetweb/templates/detailspfi.old.html:7
 msgid "Structure link"
 msgstr "Structure de rattachement"
 
 #: budgetweb/templates/detailspfi.html:11
+#: budgetweb/templates/detailspfi.old.html:11
 msgid "Derivate cost center"
 msgstr "Centre de coût dérivé"
 
 #: budgetweb/templates/detailspfi.html:15
+#: budgetweb/templates/detailspfi.old.html:15
 msgid "Assigned PFI"
 msgstr "PFI fléché"
 
 #: budgetweb/templates/detailspfi.html:16
 #: budgetweb/templates/detailspfi.html:27
+#: budgetweb/templates/detailspfi.old.html:16
+#: budgetweb/templates/detailspfi.old.html:27
 msgid "Yes"
 msgstr "Oui"
 
 #: budgetweb/templates/detailspfi.html:16
 #: budgetweb/templates/detailspfi.html:27
+#: budgetweb/templates/detailspfi.old.html:16
+#: budgetweb/templates/detailspfi.old.html:27
 msgid "No"
 msgstr "Non"
 
 #: budgetweb/templates/detailspfi.html:21
+#: budgetweb/templates/detailspfi.old.html:21
 msgid "EOTP Code"
 msgstr "Code de l'EOTP"
 
 #: budgetweb/templates/detailspfi.html:24
+#: budgetweb/templates/detailspfi.old.html:24
 msgid "Derivate profit center"
 msgstr "Centre de profit dérivé"
 
 #: budgetweb/templates/detailspfi.html:27
+#: budgetweb/templates/detailspfi.old.html:27
 msgid "Multi-year PFI"
 msgstr "PFI pluriannuel"
 
 #: budgetweb/templates/detailspfi.html:33
+#: budgetweb/templates/detailspfi.old.html:33
 msgid "Show the resumed PFI"
 msgstr "Revenir sur la synthèse pluriannuelle du PFI"
 
@@ -378,24 +395,24 @@ msgstr "Fermer"
 msgid "Receipt forms"
 msgstr "Formulaire de saisie des recettes"
 
-#: budgetweb/views.py:121
+#: budgetweb/views.py:122
 msgid "The new value has been saved. This page will be reloaded"
 msgstr ""
 
-#: budgetweb/views.py:125
+#: budgetweb/views.py:126
 msgid "You are not allowed to do that"
 msgstr ""
 
-#: budgetweb/views.py:128
+#: budgetweb/views.py:129
 #, python-format
 msgid "Something wrong in api_set_dcfield_value_by_id %s"
 msgstr ""
 
-#: budgetweb/views.py:507
+#: budgetweb/views.py:532
 msgid "There are already pluriannual entries for this period"
 msgstr "Il existe déjà des entrées pluriannuelles pour cette période"
 
-#: budgetweb/views.py:512
+#: budgetweb/views.py:537
 msgid "Migration done"
 msgstr "Migration effectuée"
 

diff --git a/budgetweb/migrations/0010_auto_20191003_1531.py b/budgetweb/migrations/0010_auto_20191003_1531.py
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.24 on 2019-10-03 13:31
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('budgetweb', '0009_auto_20170518_0941'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='structureauthorizations',
+            name='structures',
+            field=models.ManyToManyField(related_name='authorized_structures', to='structure.Structure', verbose_name='structures'),
+        ),
+        migrations.AlterField(
+            model_name='structuremontant',
+            name='structure',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='structure.Structure', verbose_name='structure'),
+        ),
+    ]