Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
T
third-party
  • Overview
    • Overview
    • Details
    • Activity
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 0
    • Issues 0
    • List
    • Board
    • Labels
    • Milestones
  • Merge Requests 1
    • Merge Requests 1
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • cooperatic-foodcoops
  • third-party
  • Merge Requests
  • !54

Merged
Opened Aug 12, 2021 by Alexis AOUN@alexis 
  • Report abuse
Report abuse

Détection automatique du poids par l'appli reception

MR qui a pour but de permettre à l'application Réception de détecter automatiquement le poids d'un article lors du scan de son barcode, en mettant la valeur dans l'input field de la ligne d'édition.

Lors de la détection d'un article dont la quantité se quantifie en poids mais dont le prix est encodé sur le barcode, un popup sera afficher afin de confirmer le prix au kilos de l'article. Si celui-ci est incorrect un input field sera affiché afin de rentrer la bonne valeur. Cette valeur est utilisée que pour le calcule du poids et n'est pas envoyé à Odoo.

Ce MR se basant sur mon précédent MR !9 (merged) , vise à régler les issues coté cooperatic :

  • https://redmine.cooperatic.fr/issues/388
  • https://redmine.cooperatic.fr/issues/221
  • https://redmine.cooperatic.fr/issues/389

Côte LGDS :

  • https://gitlab.com/lgds/gestion-informatique/-/issues/29
×

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch https://gl.cooperatic.fr/alexis/third-party.git Reception_poids
git checkout -b alexis/third-party-Reception_poids FETCH_HEAD

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git checkout dev_principale
git merge --no-ff alexis/third-party-Reception_poids

Step 4. Push the result of the merge to GitLab

git push origin dev_principale

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

  • Discussion 2
  • Commits 18
  • Pipelines 1
  • Changes 2
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Paul @paul_lgds commented Nov 17, 2021

    Ping @fracolo est-ce possible de vérifier ces changements et de les intégrer ?

    Ping @fracolo est-ce possible de vérifier ces changements et de les intégrer ?
  • Paul @paul_lgds commented Nov 18, 2021

    Je me permet de te pinguer @DamienM si tu peux jeter un coup d’œil à cette PR de notre chère Alexis qui a bossé cet été sur les applis foodcoops :)

    Je me permet de te pinguer @DamienM si tu peux jeter un coup d’œil à cette PR de notre chère Alexis qui a bossé cet été sur les applis foodcoops :)
  • Damien Moulard @DamienM

    merged

    Jan 17, 2022

    merged

    merged
    Toggle commit list
  • Damien Moulard @DamienM

    mentioned in commit 7606f015

    Jan 17, 2022

    mentioned in commit 7606f015

    mentioned in commit 7606f0156c889834616fddf0fb80fbfb8eab4439
    Toggle commit list
  • Damien Moulard @DamienM

    mentioned in commit 1835290c

    Jan 17, 2022

    mentioned in commit 1835290c

    mentioned in commit 1835290c2a6ff23629dd84d8d34ae2c61cb8406d
    Toggle commit list
  • Damien Moulard
    @DamienM started a discussion on commit b7186bd6 Jan 17, 2022
    Last updated by Damien Moulard Jan 17, 2022
    • Damien Moulard @DamienM

      mentioned in commit 1835290c

      Jan 17, 2022

      mentioned in commit 1835290c

      mentioned in commit 1835290c2a6ff23629dd84d8d34ae2c61cb8406d
      Toggle commit list
    • Damien Moulard @DamienM

      mentioned in merge request !105 (merged)

      Jan 17, 2022

      mentioned in merge request !105 (merged)

      mentioned in merge request !105
      Toggle commit list
    Please register or sign in to reply
  • Damien Moulard
    @DamienM started a discussion on commit 9bef85c5 Jan 17, 2022
    Last updated by Damien Moulard Jan 17, 2022
    • Damien Moulard @DamienM

      mentioned in commit 1835290c

      Jan 17, 2022

      mentioned in commit 1835290c

      mentioned in commit 1835290c2a6ff23629dd84d8d34ae2c61cb8406d
      Toggle commit list
    • Damien Moulard @DamienM

      mentioned in merge request !105 (merged)

      Jan 17, 2022

      mentioned in merge request !105 (merged)

      mentioned in merge request !105
      Toggle commit list
    Please register or sign in to reply
  • Damien Moulard
    @DamienM started a discussion on commit 18d6f8ba Jan 17, 2022
    Last updated by Damien Moulard Jan 17, 2022
    • Damien Moulard @DamienM

      mentioned in commit 1835290c

      Jan 17, 2022

      mentioned in commit 1835290c

      mentioned in commit 1835290c2a6ff23629dd84d8d34ae2c61cb8406d
      Toggle commit list
    • Damien Moulard @DamienM

      mentioned in merge request !105 (merged)

      Jan 17, 2022

      mentioned in merge request !105 (merged)

      mentioned in merge request !105
      Toggle commit list
    Please register or sign in to reply
  • Damien Moulard
    @DamienM started a discussion on commit 30088156 Jan 17, 2022
    Last updated by Damien Moulard Jan 17, 2022
    • Damien Moulard @DamienM

      mentioned in commit 1835290c

      Jan 17, 2022

      mentioned in commit 1835290c

      mentioned in commit 1835290c2a6ff23629dd84d8d34ae2c61cb8406d
      Toggle commit list
    • Damien Moulard @DamienM

      mentioned in merge request !105 (merged)

      Jan 17, 2022

      mentioned in merge request !105 (merged)

      mentioned in merge request !105
      Toggle commit list
    Please register or sign in to reply
  • Damien Moulard
    @DamienM started a discussion on commit dd9a4bf5 Jan 17, 2022
    Last updated by Damien Moulard Jan 17, 2022
    • Damien Moulard @DamienM

      mentioned in commit 1835290c

      Jan 17, 2022

      mentioned in commit 1835290c

      mentioned in commit 1835290c2a6ff23629dd84d8d34ae2c61cb8406d
      Toggle commit list
    • Damien Moulard @DamienM

      mentioned in merge request !105 (merged)

      Jan 17, 2022

      mentioned in merge request !105 (merged)

      mentioned in merge request !105
      Toggle commit list
    Please register or sign in to reply
  • Damien Moulard
    @DamienM started a discussion on commit ed8bb5be Jan 17, 2022
    Last updated by Damien Moulard Jan 17, 2022
    • Damien Moulard @DamienM

      mentioned in commit 1835290c

      Jan 17, 2022

      mentioned in commit 1835290c

      mentioned in commit 1835290c2a6ff23629dd84d8d34ae2c61cb8406d
      Toggle commit list
    • Damien Moulard @DamienM

      mentioned in merge request !105 (merged)

      Jan 17, 2022

      mentioned in merge request !105 (merged)

      mentioned in merge request !105
      Toggle commit list
    Please register or sign in to reply
  • Damien Moulard
    @DamienM started a discussion on commit 00edd610 Jan 17, 2022
    Last updated by Damien Moulard Jan 17, 2022
    • Damien Moulard @DamienM

      mentioned in commit 1835290c

      Jan 17, 2022

      mentioned in commit 1835290c

      mentioned in commit 1835290c2a6ff23629dd84d8d34ae2c61cb8406d
      Toggle commit list
    • Damien Moulard @DamienM

      mentioned in merge request !105 (merged)

      Jan 17, 2022

      mentioned in merge request !105 (merged)

      mentioned in merge request !105
      Toggle commit list
    Please register or sign in to reply
  • Damien Moulard
    @DamienM started a discussion on commit da42e4c6 Jan 17, 2022
    Last updated by Damien Moulard Jan 17, 2022
    • Damien Moulard @DamienM

      mentioned in commit 1835290c

      Jan 17, 2022

      mentioned in commit 1835290c

      mentioned in commit 1835290c2a6ff23629dd84d8d34ae2c61cb8406d
      Toggle commit list
    • Damien Moulard @DamienM

      mentioned in merge request !105 (merged)

      Jan 17, 2022

      mentioned in merge request !105 (merged)

      mentioned in merge request !105
      Toggle commit list
    Please register or sign in to reply
  • Damien Moulard
    @DamienM started a discussion on commit 1988c674 Jan 17, 2022
    Last updated by Damien Moulard Jan 17, 2022
    • Damien Moulard @DamienM

      mentioned in commit 1835290c

      Jan 17, 2022

      mentioned in commit 1835290c

      mentioned in commit 1835290c2a6ff23629dd84d8d34ae2c61cb8406d
      Toggle commit list
    • Damien Moulard @DamienM

      mentioned in merge request !105 (merged)

      Jan 17, 2022

      mentioned in merge request !105 (merged)

      mentioned in merge request !105
      Toggle commit list
    Please register or sign in to reply
  • Damien Moulard
    @DamienM started a discussion on commit 476540af Jan 17, 2022
    Last updated by Damien Moulard Jan 17, 2022
    • Damien Moulard @DamienM

      mentioned in commit 1835290c

      Jan 17, 2022

      mentioned in commit 1835290c

      mentioned in commit 1835290c2a6ff23629dd84d8d34ae2c61cb8406d
      Toggle commit list
    • Damien Moulard @DamienM

      mentioned in merge request !105 (merged)

      Jan 17, 2022

      mentioned in merge request !105 (merged)

      mentioned in merge request !105
      Toggle commit list
    Please register or sign in to reply
  • Damien Moulard
    @DamienM started a discussion on commit ae99c34c Jan 17, 2022
    Last updated by Damien Moulard Jan 17, 2022
    • Damien Moulard @DamienM

      mentioned in commit 1835290c

      Jan 17, 2022

      mentioned in commit 1835290c

      mentioned in commit 1835290c2a6ff23629dd84d8d34ae2c61cb8406d
      Toggle commit list
    • Damien Moulard @DamienM

      mentioned in merge request !105 (merged)

      Jan 17, 2022

      mentioned in merge request !105 (merged)

      mentioned in merge request !105
      Toggle commit list
    Please register or sign in to reply
  • Damien Moulard
    @DamienM started a discussion on commit 88bbcc8e Jan 17, 2022
    Last updated by Damien Moulard Jan 17, 2022
    • Damien Moulard @DamienM

      mentioned in commit 1835290c

      Jan 17, 2022

      mentioned in commit 1835290c

      mentioned in commit 1835290c2a6ff23629dd84d8d34ae2c61cb8406d
      Toggle commit list
    • Damien Moulard @DamienM

      mentioned in merge request !105 (merged)

      Jan 17, 2022

      mentioned in merge request !105 (merged)

      mentioned in merge request !105
      Toggle commit list
    Please register or sign in to reply
  • Damien Moulard
    @DamienM started a discussion on commit 1ac29a14 Jan 17, 2022
    Last updated by Damien Moulard Jan 17, 2022
    • Damien Moulard @DamienM

      mentioned in commit 1835290c

      Jan 17, 2022

      mentioned in commit 1835290c

      mentioned in commit 1835290c2a6ff23629dd84d8d34ae2c61cb8406d
      Toggle commit list
    • Damien Moulard @DamienM

      mentioned in merge request !105 (merged)

      Jan 17, 2022

      mentioned in merge request !105 (merged)

      mentioned in merge request !105
      Toggle commit list
    Please register or sign in to reply
  • Damien Moulard
    @DamienM started a discussion on commit 567c69d7 Jan 17, 2022
    Last updated by Damien Moulard Jan 17, 2022
    • Damien Moulard @DamienM

      mentioned in commit 1835290c

      Jan 17, 2022

      mentioned in commit 1835290c

      mentioned in commit 1835290c2a6ff23629dd84d8d34ae2c61cb8406d
      Toggle commit list
    • Damien Moulard @DamienM

      mentioned in merge request !105 (merged)

      Jan 17, 2022

      mentioned in merge request !105 (merged)

      mentioned in merge request !105
      Toggle commit list
    Please register or sign in to reply
  • Damien Moulard
    @DamienM started a discussion on commit 54954ebe Jan 17, 2022
    Last updated by Damien Moulard Jan 17, 2022
    • Damien Moulard @DamienM

      mentioned in commit 1835290c

      Jan 17, 2022

      mentioned in commit 1835290c

      mentioned in commit 1835290c2a6ff23629dd84d8d34ae2c61cb8406d
      Toggle commit list
    • Damien Moulard @DamienM

      mentioned in merge request !105 (merged)

      Jan 17, 2022

      mentioned in merge request !105 (merged)

      mentioned in merge request !105
      Toggle commit list
    Please register or sign in to reply
  • Damien Moulard
    @DamienM started a discussion on commit 9c74eac6 Jan 17, 2022
    Last updated by Damien Moulard Jan 17, 2022
    • Damien Moulard @DamienM

      mentioned in commit 1835290c

      Jan 17, 2022

      mentioned in commit 1835290c

      mentioned in commit 1835290c2a6ff23629dd84d8d34ae2c61cb8406d
      Toggle commit list
    • Damien Moulard @DamienM

      mentioned in merge request !105 (merged)

      Jan 17, 2022

      mentioned in merge request !105 (merged)

      mentioned in merge request !105
      Toggle commit list
    Please register or sign in to reply
  • Damien Moulard
    @DamienM started a discussion on commit a7a0adfb Jan 17, 2022
    Last updated by Damien Moulard Jan 17, 2022
    • Damien Moulard @DamienM

      mentioned in commit 1835290c

      Jan 17, 2022

      mentioned in commit 1835290c

      mentioned in commit 1835290c2a6ff23629dd84d8d34ae2c61cb8406d
      Toggle commit list
    • Damien Moulard @DamienM

      mentioned in merge request !105 (merged)

      Jan 17, 2022

      mentioned in merge request !105 (merged)

      mentioned in merge request !105
      Toggle commit list
    Please register or sign in to reply
  • Damien Moulard
    @DamienM started a discussion on commit 739f7028 Jan 17, 2022
    Last updated by Damien Moulard Jan 17, 2022
    • Damien Moulard @DamienM

      mentioned in commit 1835290c

      Jan 17, 2022

      mentioned in commit 1835290c

      mentioned in commit 1835290c2a6ff23629dd84d8d34ae2c61cb8406d
      Toggle commit list
    • Damien Moulard @DamienM

      mentioned in merge request !105 (merged)

      Jan 17, 2022

      mentioned in merge request !105 (merged)

      mentioned in merge request !105
      Toggle commit list
    Please register or sign in to reply
  • Damien Moulard @DamienM

    mentioned in merge request !105 (merged)

    Jan 17, 2022

    mentioned in merge request !105 (merged)

    mentioned in merge request !105
    Toggle commit list
  • Write
  • Preview
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
Reference: cooperatic-foodcoops/third-party!54
×

Revert this merge request

This will create a new commit in order to revert the existing changes.

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.
×

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.