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][IMP] l10n_ar_stock: add the possibility of force arba cuit and password #111

Open
wants to merge 1 commit into
base: 15.0
Choose a base branch
from

Conversation

fw-bot-adhoc
Copy link
Contributor

Forward-Port-Of: #107

@roboadhoc
Copy link

@fw-bot-adhoc
Copy link
Contributor Author

@JoelZilli @bruno-zanotti cherrypicking of pull request #107 failed.

stdout:

Auto-merging l10n_ar_stock/models/stock_picking.py
Auto-merging l10n_ar_stock/models/res_company.py
Auto-merging l10n_ar_stock/__manifest__.py
CONFLICT (content): Merge conflict in l10n_ar_stock/__manifest__.py

stderr:

12:24:24.745355 git.c:439               trace: built-in: git cherry-pick 7c01c57a26ff97367338179ece32344ff93aac2a
error: could not apply 7c01c57... [IMP] l10n_ar_stock: add the possibility of force arba cuit and password
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.

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.

3 participants