Skip to content

[I18N] account_statement_import_sheet_file_ux: translate the reconcile on import setting - #517

Open
fw-bot-adhoc wants to merge 1 commit into
ingadhoc:20.0from
adhoc-dev:20.0-19.0-h-132715-i18n-cem-11463-fw
Open

fw-bot-adhoc wants to merge 1 commit into
ingadhoc:20.0from
adhoc-dev:20.0-19.0-h-132715-i18n-cem-11463-fw

Conversation

@fw-bot-adhoc

Copy link
Copy Markdown
Contributor

Traduce al español los textos del setting "Reconcile on Statement Import" que entró en #509.

Ticket: https://www.adhoc.inc/odoo/helpdesk.ticket/132715

Forward-Port-Of: #516

@roboadhoc

Copy link
Copy Markdown
Contributor

Pull request status dashboard

@fw-bot-adhoc

Copy link
Copy Markdown
Contributor Author

@cem-adhoc @rov-adhoc cherrypicking of pull request #516 failed.

stdout:

Auto-merging account_statement_import_sheet_file_ux/i18n/account_statement_import_sheet_file_ux.pot
CONFLICT (content): Merge conflict in account_statement_import_sheet_file_ux/i18n/account_statement_import_sheet_file_ux.pot
Auto-merging account_statement_import_sheet_file_ux/i18n/es.po
CONFLICT (content): Merge conflict in account_statement_import_sheet_file_ux/i18n/es.po

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

:shipit: you can use git-fw to re-do the forward-port for you locally.

⚠️ after resolving this conflict, you will need to merge it via @roboadhoc.

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

This branch has not been deployed

No deployments
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