chore: merge '17.0-btl' into '17.0-btl-code_review' #29
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
closes ingadhoc#696 Signed-off-by: Matias Velazquez <mav@adhoc.com.ar>
closes ingadhoc#698 Signed-off-by: Juan Carreras <jc@adhoc.com.ar>
closes ingadhoc#699 Signed-off-by: Filoquin adhoc <maq@adhoc.com.ar>
closes ingadhoc#648 X-original-commit: f03cf42 Signed-off-by: ced-adhoc <ced@adhoc.com.ar> Signed-off-by: Matias Velazquez <mav@adhoc.com.ar>
stdout: Auto-merging stock_ux/models/stock_warehouse_orderpoint.py CONFLICT (content): Merge conflict in stock_ux/models/stock_warehouse_orderpoint.py stderr: 18:22:48.704541 git.c:444 trace: built-in: git cherry-pick c095b24 error: could not apply c095b24... [FIX]stock_ux: method hint: after resolving the conflicts, mark the corrected paths hint: with 'git add <paths>' or 'git rm <paths>' hint: and commit the result with 'git commit' ---------- status: closes ingadhoc#690 Signed-off-by: Matias Velazquez <mav@adhoc.com.ar>
Fork Sync Branch 17.0-btl
closes ingadhoc#704 Signed-off-by: Filoquin adhoc <maq@adhoc.com.ar>
closes ingadhoc#709 X-original-commit: ab969d3 Signed-off-by: Matias Velazquez <mav@adhoc.com.ar>
Fork Sync Branch 17.0-btl
closes ingadhoc#678 Signed-off-by: ced-adhoc <ced@adhoc.com.ar>
Fork Sync Branch 17.0-btl
…l number closes ingadhoc#716 Signed-off-by: ced-adhoc <ced@adhoc.com.ar>
Fork Sync Branch 17.0-btl
closes ingadhoc#691 X-original-commit: 9d6433f Signed-off-by: Matias Velazquez <mav@adhoc.com.ar>
Fork Sync Branch 17.0-btl
closes ingadhoc#733 Signed-off-by: Juan Carreras <jc@adhoc.com.ar>
closes ingadhoc#731 Signed-off-by: ced-adhoc <ced@adhoc.com.ar>
Fork Sync Branch 17.0-btl
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.