Merge branch 'refs/heads/develop' into feat/332-refonte-reception-terminee

# Conflicts: # .idea/workspace.xml # CHANGELOG.md # frontend/pages/reception/update/[[id]].vue
fix : bloque si bovin superieur a 52
2026-02-26 09:14:50 +01:00 · 2026-02-26 08:18:37 +01:00 · 2026-02-25 15:42:59 +01:00 · 2026-02-25 10:30:41 +01:00 · 2026-02-25 09:28:55 +01:00 · 2026-02-24 17:07:02 +01:00
3 changed files with 10 additions and 12 deletions
--- a/config/version.yaml
+++ b/config/version.yaml
@@ -1,2 +1,2 @@
 parameters:
-    app.version: '0.0.58'
+    app.version: '0.0.57'
--- a/frontend/components/reception/update-bovin.vue
+++ b/frontend/components/reception/update-bovin.vue
@@ -14,7 +14,6 @@
                    :min="0"
                    :max="10"
                    wrapperClass="w-44 flex-col"
                    inputClass="font-medium"
                />
            </div>
            <UiNumberInput
@@ -22,7 +21,6 @@
                v-model="localOtherQuantity"
                :disabled="!isAdmin"
                wrapperClass="w-44 flex-col"
                inputClass="font-medium"
            />
        </div>
    </form>
--- a/frontend/pages/reception/update/[[id]].vue
+++ b/frontend/pages/reception/update/[[id]].vue
@@ -185,15 +185,15 @@
                />
            </div>
                <div class="flex justify-center">
-                    <UiButton
+                <UiButton
-                        v-if="auth.isAdmin"
+                    v-if="auth.isAdmin"
-                        type="submit"
+                    type="submit"
-                        class="inline-flex mb-16 items-center justify-center text-xl text-white uppercase bg-primary-500 h-[50px] px-8 rounded hover:opacity-80 gap-2 justify-self-end"
+                    class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] mb-16"
-                    >
+
-                        <Icon name="mdi:check" size="28" />
+                >
-                        Valider
+                    Enregistrer
-                    </UiButton>
+                </UiButton>
-                </div>
+            </div>
            </div>
    </form>
 </template>
Author	SHA1	Message	Date
sroy	a4b48712fc	Merge branch 'refs/heads/develop' into feat/332-refonte-reception-terminee # Conflicts: # .idea/workspace.xml # CHANGELOG.md # frontend/pages/reception/update/[[id]].vue	2026-02-26 09:14:50 +01:00
sroy	e1f7d28f0d	fix : bloque si bovin superieur a 52	2026-02-26 08:18:37 +01:00
sroy	0bb8497871	fix : trie du code et reorganisation composant parent enfant	2026-02-25 15:42:59 +01:00
tristan	141f174d0a	fix : correction de l'enregistrement des pesées sur l'admin	2026-02-25 10:30:41 +01:00
tristan	586f122e3b	fix : correction du retour sur la liste des réceptions + suppression de la redirection après enregistrement	2026-02-25 09:28:55 +01:00
sroy	0a887a9347	fix : print affichage correctif	2026-02-24 17:07:02 +01:00
sroy	945ffc823a	Merge remote-tracking branch 'origin/develop' into feat/332-refonte-reception-terminee # Conflicts: # CHANGELOG.md	2026-02-24 14:10:57 +01:00
sroy	57551f2b4f	feat : changelog	2026-02-24 11:17:56 +01:00
sroy	6bd400d1a2	fix : correctif finalisation et correctif couleur de affichage reception finie	2026-02-24 10:30:35 +01:00
sroy	86299a18f3	feat : finalisation et correctif couleur de affichage reception finie	2026-02-24 08:59:25 +01:00
sroy	d47f237bac	feat : dernier push avant finalisation de affichage reception finie	2026-02-23 17:44:33 +01:00
`@@ -1,2 +1,2 @@`
	`parameters:`	`parameters:`
	`app.version: '0.0.58'`	`app.version: '0.0.57'`