Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
erp5
erp5
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Merge Requests 108
    • Merge Requests 108
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Jobs
  • Commits
  • nexedi
  • erp5erp5
  • Merge Requests
  • !1127

Open
Opened May 19, 2020 by Cédric Le Ninivin@cedric.leninivin
  • Report abuse
Report abuse

Order builder merge order with fix consitency

  • Add Function to identify mergeable Order Built by Order Builder according to Movement Groups
  • Add Audit Constraint to list mergeable orders
  • Add fixit on said constraint to merge orders
Edited May 26, 2020 by Cédric Le Ninivin

Check out, review, and merge locally

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

git fetch https://lab.nexedi.com/cedric.leninivin/erp5.git order-builder-merger-order
git checkout -b cedric.leninivin/erp5-order-builder-merger-order FETCH_HEAD

Step 2. Review the changes locally

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

git fetch origin
git checkout origin/master
git merge --no-ff cedric.leninivin/erp5-order-builder-merger-order

Step 4. Push the result of the merge to GitLab

git push origin master

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

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

  • Discussion 25
  • Commits 2
  • Changes 10
Assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View project labels
Reference: nexedi/erp5!1127
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备14008524号