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
  • !232

Merged
Opened Aug 02, 2023 by Yvon Kerdoncuff@Yvon 
  • Report abuse
Report abuse

make meal_voucher module compatible with old version of logiciel impression etiquettes produits

A supercafoutch, la version du logiciel d'impression étiquettes ne prend pas en charge l'ajout de la ligne meal_voucher_ok dans les labels déposés sur le dav.

×

Check out, review, and merge locally

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

git fetch origin
git checkout -b meal-voucher-and-label-printer-software-bug origin/meal-voucher-and-label-printer-software-bug

Step 2. Review the changes locally

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

git checkout dev_cooperatic
git merge --no-ff meal-voucher-and-label-printer-software-bug

Step 4. Push the result of the merge to GitLab

git push origin dev_cooperatic

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

    added 14 commits

    • 7d9d385a...de580bd6 - 13 commits from branch dev_cooperatic
    • 0c5db861 - Merge branch 'dev_cooperatic' into meal-voucher-and-label-printer-software-bug

    Compare with previous version

    Aug 14, 2023

    added 14 commits

    • 7d9d385a...de580bd6 - 13 commits from branch dev_cooperatic
    • 0c5db861 - Merge branch 'dev_cooperatic' into meal-voucher-and-label-printer-software-bug

    Compare with previous version

    added 14 commits <ul><li>7d9d385a...de580bd6 - 13 commits from branch <code>dev_cooperatic</code></li><li>0c5db861 - Merge branch &#39;dev_cooperatic&#39; into meal-voucher-and-label-printer-software-bug</li></ul> [Compare with previous version](https://gl.cooperatic.fr/cooperatic-foodcoops/third-party/merge_requests/232/diffs?diff_id=2353&start_sha=7d9d385ac69b25d11982f5edc82a73b96e71b376)
    Toggle commit list
  • Damien Moulard
    @DamienM started a discussion on an old version of the diff Aug 22, 2023
    Last updated by Yvon Kerdoncuff Aug 22, 2023
    coops_configurations/config_supercafoutch.py
    151 151 ALLOW_FOUR_DIGITS_IN_RECEPTION_PRICE = True
    152 152
    153 153 REMOVE_15_MINUTES_AT_SHIFT_END = False
    154
    155 # Fix incompatibility between meal voucher module and an old version of michel bibikoff product label printer software used in supercafoutch
    156 DO_NOT_SHOW_MEAL_VOUCHER_OK_LINE_IN_PRODUCT_INFO_FOR_LABEL = True
    • Damien Moulard @DamienM commented Aug 22, 2023
      Developer

      Par soucis de lisibilité et pour éviter de futures maladresses, je pense que c'est mieux d'éviter de nommer une variable avec une formulation négative.

      Concrètement, au lieu de DO_NOT_SHOW_MEAL_VOUCHER_OK_LINE_IN_PRODUCT_INFO_FOR_LABEL = True, mettre plutot SHOW_MEAL_VOUCHER_OK_LINE_IN_PRODUCT_INFO_FOR_LABEL = False (et du coup inverser la valeur par défaut dans le getattr).

      Après ça se discute, dis-moi si ça te semble cohérent ou pas !

      Par soucis de lisibilité et pour éviter de futures maladresses, je pense que c'est mieux d'éviter de nommer une variable avec une formulation négative. Concrètement, au lieu de `DO_NOT_SHOW_MEAL_VOUCHER_OK_LINE_IN_PRODUCT_INFO_FOR_LABEL = True`, mettre plutot `SHOW_MEAL_VOUCHER_OK_LINE_IN_PRODUCT_INFO_FOR_LABEL = False` (et du coup inverser la valeur par défaut dans le getattr). Après ça se discute, dis-moi si ça te semble cohérent ou pas !
    • Yvon Kerdoncuff @Yvon

      changed this line in version 3 of the diff

      Aug 22, 2023

      changed this line in version 3 of the diff

      changed this line in [version 3 of the diff](https://gl.cooperatic.fr/cooperatic-foodcoops/third-party/merge_requests/232/diffs?diff_id=2360&start_sha=0c5db861f85775dde1d167cb7c5e166c42595303#5b5d51d4f1971a30377bef42fe3199833829729b_156_156)
      Toggle commit list
    Please register or sign in to reply
  • Yvon Kerdoncuff @Yvon

    added 1 commit

    • bf8633b9 - name variable in a positive way

    Compare with previous version

    Aug 22, 2023

    added 1 commit

    • bf8633b9 - name variable in a positive way

    Compare with previous version

    added 1 commit <ul><li>bf8633b9 - name variable in a positive way</li></ul> [Compare with previous version](https://gl.cooperatic.fr/cooperatic-foodcoops/third-party/merge_requests/232/diffs?diff_id=2360&start_sha=0c5db861f85775dde1d167cb7c5e166c42595303)
    Toggle commit list
  • Yvon Kerdoncuff @Yvon

    merged

    Aug 22, 2023

    merged

    merged
    Toggle commit list
  • Yvon Kerdoncuff @Yvon

    mentioned in commit 273c7bbc

    Aug 22, 2023

    mentioned in commit 273c7bbc

    mentioned in commit 273c7bbcf98ab1caf347e28ef9aeeb8b4aaabd01
    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!232
×

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.