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_cl: #164062

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

Conversation

fw-bot
Copy link
Contributor

@fw-bot fw-bot commented Apr 30, 2024

Methods from l10n_cl_edi has been moved from l10n_cl_edi (enterprise) as part of https://github.com/odoo/enterprise/pull/46593. This includes
_l10n_cl_get_amounts and _float_repr_float_round on the account move model, as well as the method _l10n_cl_get_line_amounts on the account move line model. They can therefore be removed in this commit.

The VAT section for the electronic ticket document is also being transferred in the same manner, and can thus be removed in the template here.

As part of the same refactor, methods _l10n_cl_get_invoice_totals_for_report and _l10n_cl_prices_and_taxes had been deprecated, and additionally there is a new exclusive qweb totals widget for chilean invoices. This will allow showing in PDF reports, invoices that had been generated in a foreign currencies or in UF index.

X-original-commit: 7d22eaa

[FIX] l10n_cl: replace t-esc with t-out

(cherry picked from commit 27f592e)

Description of the issue/feature this PR addresses:

Current behavior before PR:

Desired behavior after PR is merged:


I confirm I have signed the CLA and read the PR guidelines at www.odoo.com/submit-pr

Forward-Port-Of: #162147

Methods from l10n_cl_edi has been moved from l10n_cl_edi (enterprise)
as part of odoo/enterprise#46593.
This includes
_l10n_cl_get_amounts and _float_repr_float_round on the account move
model, as well as the method _l10n_cl_get_line_amounts on the account
move line model. They can therefore be removed in this commit.

The VAT section for the electronic ticket document is also being
transferred in the same manner, and can thus be removed in the template
here.

As part of the same refactor, methods _l10n_cl_get_invoice_totals_for_report
and _l10n_cl_prices_and_taxes had been deprecated, and additionally there is a
new exclusive qweb totals widget for chilean invoices. This will allow showing
in PDF reports, invoices that had been generated in a foreign currencies or
in UF index.

X-original-commit: 7d22eaa

[FIX] l10n_cl: replace t-esc with t-out

(cherry picked from commit 27f592e)

X-original-commit: 2cffba5
@robodoo
Copy link
Contributor

robodoo commented Apr 30, 2024

Pull request status dashboard.

@fw-bot
Copy link
Contributor Author

fw-bot commented Apr 30, 2024

@Danisan @jco-odoo cherrypicking of pull request #162147 failed.

stdout:

Auto-merging addons/l10n_cl/views/report_invoice.xml
CONFLICT (content): Merge conflict in addons/l10n_cl/views/report_invoice.xml

stderr:

19:03:16.415528 git.c:463               trace: built-in: git cherry-pick 29812337079b1d3323ad37bd8998cf31ab4b5d31
error: could not apply 29812337079b... [FIX] l10n_cl:
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
----------
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.

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

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

@robodoo robodoo added forwardport This PR was created by @fw-bot conflict There was an error while creating this forward-port PR labels Apr 30, 2024
@C3POdoo C3POdoo added the RD research & development, internal work label Apr 30, 2024
@fvz-odoo
Copy link
Contributor

fvz-odoo commented May 2, 2024

@jco-odoo same over here, let us know if you need anything from our side

cc @Danisan

@fw-bot fw-bot mentioned this pull request May 4, 2024
@fvz-odoo
Copy link
Contributor

Hello @jco-odoo

Remember to fix this FW-P, as well as https://github.com/odoo/enterprise/pull/61796, let us know if anything.

Cheers!

Fernando

@Danisan

@fvz-odoo
Copy link
Contributor

@jco-odoo ping

@fvz-odoo
Copy link
Contributor

fvz-odoo commented Jun 3, 2024

Hey @jco-odoo remember to fix this one, please... (as well as the enterprise PR https://github.com/odoo/enterprise/pull/61796)

Cheers!

Fernando

@masi-odoo @Danisan

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflict There was an error while creating this forward-port PR forwardport This PR was created by @fw-bot RD research & development, internal work
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants