Caisse Avec fermeture et historique #132

Open

dnova wants to merge 10 commits from caisse into main

pull from: caisse

merge into: bottin:main

bottin:main

bottin:stoqueUIX

bottin:easteregg

bottin:membre_cache

bottin:New_Bottin

bottin:List_Location_Membre

Conversation 0 Commits 10 Files changed 37 +1729 -12

dnova commented 2026-04-27 15:47:38 -04:00

Member

Copy link

Il faudrais voir si on veux le simplifier ou si on le garde comme cela
Closes #122

Il faudrais voir si on veux le simplifier ou si on le garde comme cela Closes #122

dnova added 3 commits 2026-04-27 15:47:38 -04:00

feat: Ajout du CRUD pour les tables caisse et historique caisse 152b04dd5a

feat: Ajout du CRUD de la table caisse dans l'api c19d80a73e

feat: Ajout du CRUD de la table caisse dans le UI f988cceca3

dnova added 1 commit 2026-04-28 10:35:50 -04:00

fix: Ajout du double modal de verification de pour la fermeture de la caisse ba1ca37796

dnova added 3 commits 2026-05-07 12:54:25 -04:00

refactor(db): Ajout de status de caisse soit ouverture ou fermeture a3ad636076

refactor(api): Ajout de la categorie du coté back ff6da425df

refactor(UI): Ajout de la categorie du coté front f22452cb20

dnova added 1 commit 2026-05-07 13:35:35 -04:00

fix merge main d4a31e1368

dnova added 2 commits 2026-05-07 16:47:51 -04:00

fix: refactor des uuid manquants pour les tables caisse et FKs 221ce80f37

fix: refactor des uuid verifications dans les test 3a32dd44f1

dnova changed title from WIP: Caisse Avec fermeture et historique to Caisse Avec fermeture et historique 2026-05-07 16:48:17 -04:00

This pull request has changes conflicting with the target branch.

• handler.go
• queries/update.go

View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Merge commit title Merge pull request 'Caisse Avec fermeture et historique' (#132) from caisse into main

Merge commit body Reviewed-on: https://git.agecem.com/bottin/cms/pulls/132

Merge pull request 'Caisse Avec fermeture et historique' (#132) from caisse into main Reviewed-on: https://git.agecem.com/bottin/cms/pulls/132 Copy merge commit message

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin caisse:caisse

git switch caisse

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main

git merge --no-ff caisse

git switch caisse

git rebase main

git switch main

git merge --ff-only caisse

git switch caisse

git rebase main

git switch main

git merge --no-ff caisse

git switch main

git merge --squash caisse

git switch main

git merge --ff-only caisse

git switch main

git merge caisse

git push origin main

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels   

bug

Something is not working

  

duplicate

This issue or pull request already exists

  

enhancement

New feature

  

help wanted

Need some help

  

Important

  

invalid

Something is wrong

  

MVP

  

nice to have

  

optional

  

question

More information is needed

  

wontfix

This won't be fixed

No labels

bug

duplicate

enhancement

help wanted

Important

invalid

MVP

nice to have

optional

question

wontfix

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

1 participant

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

bottin/cms!132

No description provided.