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.

Sign up for GitHub

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

Jump to bottom

[FW][IMP]l10n_ar_ux: Hide change rate button for non-argentinan companies #642

Closed
wants to merge 1 commit into from
Closed

[FW][IMP]l10n_ar_ux: Hide change rate button for non-argentinan companies #642

wants to merge 1 commit into from

Conversation

fw-bot-adhoc
Copy link
Contributor

Ticket:53397

Forward-Port-Of: #639

@roboadhoc
Copy link

Pull request status dashboard.

@fw-bot-adhoc
Copy link
Contributor Author

Ping @mem-adhoc, @zaoral cherrypicking of pull request #639 failed.

stdout:

Auto-merging l10n_ar_ux/views/account_move_view.xml
CONFLICT (content): Merge conflict in l10n_ar_ux/views/account_move_view.xml
Auto-merging l10n_ar_ux/__manifest__.py
CONFLICT (content): Merge conflict in l10n_ar_ux/__manifest__.py

stderr:

13:22:00.161295 git.c:439               trace: built-in: git cherry-pick 7c01b72d56851e88f564c710d4016125a9fdc429
error: could not apply 7c01b72d... [IMP]l10n_ar_ux: Hide change rate button for non-argentinan companies
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.

@fw-bot-adhoc fw-bot-adhoc mentioned this pull request Oct 21, 2022
Closed
@mem-adhoc mem-adhoc force-pushed the 15.0-13.0-h-53397-mem-qwdt-fw branch from 879be05 to ce7c9de Compare October 28, 2022 15:11
@mem-adhoc
Copy link
Contributor

@nicomacr Hola Nico buenos días, necesitamos mezclar este cambio pero seguimos con el problema en rojo de runbot nos puedes ayudar ?

@nicomacr
Copy link
Contributor

@roboadhoc p=0

@roboadhoc roboadhoc closed this in 914c05c Oct 28, 2022
@roboadhoc roboadhoc temporarily deployed to merge October 28, 2022 16:13 Inactive
@nicomacr nicomacr deleted the 15.0-13.0-h-53397-mem-qwdt-fw branch October 28, 2022 16:14
@fw-bot-adhoc fw-bot-adhoc mentioned this pull request Nov 16, 2022
Open
pablohmontenegro added a commit to adhoc-dev/odoo-argentina that referenced this pull request Jul 7, 2023
@pablohmontenegro
[FW][IMP]l10n_ar_ux: Hide change rate button for non-argentinan compa…
260ba66 
…nies

Ticket:53397

Forward-Port-Of: ingadhoc#642
Forward-Port-Of: ingadhoc#639
@pablohmontenegro pablohmontenegro mentioned this pull request Jul 7, 2023
Closed
roboadhoc pushed a commit that referenced this pull request Jul 7, 2023
@pablohmontenegro
[FW][IMP]l10n_ar_ux: Hide change rate button for non-argentinan compa…
8b0755a 
…nies

Ticket:53397

closes #712

Forward-port-of: #642
Forward-port-of: #639
Signed-off-by: mem-adhoc <mem@adhoc.com.ar>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
conflict forwardport
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@fw-bot-adhoc @roboadhoc @mem-adhoc @nicomacr