Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FW][ADD]sale_stock_ux: Mass cancellation of remaining quantities #626

Closed

Conversation

fw-bot-adhoc
Copy link
Contributor

Forward-Port-Of: #617

@roboadhoc
Copy link

@fw-bot-adhoc
Copy link
Contributor Author

@jok-adhoc @matiasperalta1 cherrypicking of pull request #617 failed.

stdout:

Auto-merging sale_stock_ux/wizards/__init__.py
Auto-merging sale_stock_ux/security/ir.model.access.csv
CONFLICT (content): Merge conflict in sale_stock_ux/security/ir.model.access.csv
Auto-merging sale_stock_ux/__manifest__.py
CONFLICT (content): Merge conflict in sale_stock_ux/__manifest__.py

stderr:

20:38:23.696868 git.c:444               trace: built-in: git cherry-pick 4c87075af14922159fec6fec83cc6690d33a068b
error: could not apply 4c87075a... [ADD]sale_stock_ux: Mass cancellation of remaining quantities
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:

Either perform the forward-port manually (and push to this branch, proceeding as usual) or close this PR (maybe?).

In the former case, you may want to edit this PR message as well.

@jok-adhoc
Copy link
Contributor

@matiasperalta1 mati, buenas! Este fw lo deberiamos corregir ahora o esperar que se quiera migrar a 16?

@matiasperalta1
Copy link
Contributor

@jok-adhoc Ahora porque sino despues nos vamos a olvidar

@jok-adhoc jok-adhoc force-pushed the 16.0-15.0-h-57798-jok-k0eU-fw branch from 6e28527 to 47af9d2 Compare April 10, 2023 10:53
@jok-adhoc
Copy link
Contributor

@matiasperalta1 acabo de ver que nunca se pusheo mi cambio jaja me lo anoto para cambiar cuando termine lo de suscripciones, total parece simple

@jok-adhoc jok-adhoc force-pushed the 16.0-15.0-h-57798-jok-k0eU-fw branch from 47af9d2 to a2f98e2 Compare January 10, 2024 11:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants