Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
O
odoo
  • 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 0
    • Merge Requests 0
  • 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
  • odoo
  • Merge Requests
  • !5

Merged
Opened Jun 11, 2021 by François C.@fracolo 
  • Report abuse
Report abuse

Fix shifts creation bug if non-recurrent shift_template exist in database

Hot fix has been done directly in intercoop_addons/coop_shift/model/shift_template.py file

×

Check out, review, and merge locally

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

git fetch origin
git checkout -b dev_cooperatic origin/dev_cooperatic

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 dev_cooperatic

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 1
  • Commits 2
  • Changes 1
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • François C. @fracolo

    merged

    Jun 29, 2021

    merged

    merged
    Toggle commit list
  • François C. @fracolo

    mentioned in commit 2c0b3517

    Jun 29, 2021

    mentioned in commit 2c0b3517

    mentioned in commit 2c0b3517d765e6f1ae43973108c4c84bc936ca99
    Toggle commit list
  • Paul @paul_lgds commented Jun 29, 2021
    Developer

    Je suis surpris que ce bug n'ai jamais été vu dans AFC: cf https://github.com/AwesomeFoodCoops/odoo-production/blob/b435ad2d2c676f1fe38711dd1a9ac1f655936640/intercoop_addons/coop_shift/model/shift_template.py#L696

    Est-ce qu'on pourrait pas plutôt essayer de récupérer le module à jour et vérifier si le bug est toujours présent?

    Les changements comme cela créé d'autant plus de divergences avec le dépôt principal, c'est dommage :/

    Je suis surpris que ce bug n'ai jamais été vu dans AFC: cf https://github.com/AwesomeFoodCoops/odoo-production/blob/b435ad2d2c676f1fe38711dd1a9ac1f655936640/intercoop_addons/coop_shift/model/shift_template.py#L696 Est-ce qu'on pourrait pas plutôt essayer de récupérer le module à jour et vérifier si le bug est toujours présent? Les changements comme cela créé d'autant plus de divergences avec le dépôt principal, c'est dommage :/
  • 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/odoo!5
×

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.