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] account_tax_settlement: conditional button #130

Closed

Conversation

fw-bot-adhoc
Copy link
Contributor

ticket 52621

Now the New Payment button is showing if tax_settlement is set

Forward-Port-Of: #128

@roboadhoc
Copy link
Contributor

@fw-bot-adhoc
Copy link
Contributor Author

Ping @ica-adhoc, @zaoral cherrypicking of pull request #128 failed.

stdout:

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

stderr:

19:50:02.773008 git.c:439               trace: built-in: git cherry-pick 52a135d6504e79e2764db3aa2d407af502c84cf8
error: could not apply 52a135d... [IMP] account_tax_settlement: conditional button
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.

Now the New Payment button is showing if tax_settlement is set

X-original-commit: a39ce13
@zaoral zaoral force-pushed the 15.0-13.0-t-52621-ica-XllD-fw branch from 41395c0 to 0f3f773 Compare July 21, 2022 20:01
@zaoral
Copy link
Contributor

zaoral commented Jul 21, 2022

@roboadhoc r+

@roboadhoc roboadhoc closed this in 18c9ff4 Jul 21, 2022
@roboadhoc roboadhoc temporarily deployed to merge July 21, 2022 21:30 Inactive
@fw-bot-adhoc fw-bot-adhoc deleted the 15.0-13.0-t-52621-ica-XllD-fw branch August 4, 2022 21:37
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