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][FIX] l10n_ar_account_withholding: Add title attribute to icon button #998

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

Conversation

fw-bot-adhoc
Copy link
Contributor

  • Adds a title attribute to a button that has an icon without text.
  • Remove trailing space at end of icon attribute.

Forward-Port-Of: #990

@roboadhoc
Copy link

@fw-bot-adhoc
Copy link
Contributor Author

@dal-adhoc @zaoral cherrypicking of pull request #990 failed.

stdout:

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

stderr:

13:23:48.077119 git.c:444               trace: built-in: git cherry-pick bc19ea61944babf56947307d5ed4b2469a0bb758
error: could not apply bc19ea61... [FIX] l10n_ar_account_withholding: Add title attribute to icon 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.

More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port

@zaoral zaoral force-pushed the 17.0-16.0-h-84775-dal-SKrZ-fw branch from 8e9fc99 to 8ee324a Compare January 24, 2025 13:54
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