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

[17.0][MIG]sale_fixed_discount: Migrated module to v17.0 #2952

Merged
merged 27 commits into from
Mar 8, 2024

Conversation

fd-oerp
Copy link

@fd-oerp fd-oerp commented Feb 14, 2024

No description provided.

LoisRForgeFlow and others added 26 commits February 14, 2024 12:24
The sale order view in the portal was not displaying the fixed discount.
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: sale-workflow-16.0/sale-workflow-16.0-sale_fixed_discount
Translate-URL: https://translation.odoo-community.org/projects/sale-workflow-16-0/sale-workflow-16-0-sale_fixed_discount/
Currently translated at 100.0% (8 of 8 strings)

Translation: sale-workflow-16.0/sale-workflow-16.0-sale_fixed_discount
Translate-URL: https://translation.odoo-community.org/projects/sale-workflow-16-0/sale-workflow-16-0-sale_fixed_discount/pt_BR/
Currently translated at 100.0% (8 of 8 strings)

Translation: sale-workflow-16.0/sale-workflow-16.0-sale_fixed_discount
Translate-URL: https://translation.odoo-community.org/projects/sale-workflow-16-0/sale-workflow-16-0-sale_fixed_discount/pt_BR/
Currently translated at 100.0% (8 of 8 strings)

Translation: sale-workflow-16.0/sale-workflow-16.0-sale_fixed_discount
Translate-URL: https://translation.odoo-community.org/projects/sale-workflow-16-0/sale-workflow-16-0-sale_fixed_discount/es/
Currently translated at 100.0% (8 of 8 strings)

Translation: sale-workflow-16.0/sale-workflow-16.0-sale_fixed_discount
Translate-URL: https://translation.odoo-community.org/projects/sale-workflow-16-0/sale-workflow-16-0-sale_fixed_discount/it/
@fd-oerp
Copy link
Author

fd-oerp commented Feb 20, 2024

Hi @OCA-git-bot, can I have any update regarding this PR?

@fd-oerp
Copy link
Author

fd-oerp commented Mar 8, 2024

Hi @JordiBForgeFlow , could you please review this PR ?

* Jordi Ballester <jordi.ballester@forgeflow.com> (www.forgeflow.com)
* Pieter Paulussen <pieterpaulussen@code-source.be> (www.code-source.be)
- Lois Rilo <lois.rilo@forgeflow.com>
(`www.forgeflow.com <http://www.forgeflow.com>`__)
Copy link
Sponsor Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

change to https

Copy link
Author

@fd-oerp fd-oerp Mar 8, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @JordiBForgeFlow ,
if I chnage it to 'https' precommit fails and make it to 'http' by it self
I'm running precommit through : pre-commit run -a
would that be fine to commit it with 's' ?

Copy link
Sponsor Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does pre-commit give you any error message? which one is it?

Copy link
Author

@fd-oerp fd-oerp Mar 8, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @JordiBForgeFlow
Generate addons README files from fragments..............................Failed

  • hook id: oca-gen-addon-readme
  • files were modified by this hook

is this, and it update 'https' to 'http' by it self, still should I proceed with https ?

Copy link
Sponsor Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Leave it for now and attend to my other comments, please.

- Lois Rilo <lois.rilo@forgeflow.com>
(`www.forgeflow.com <http://www.forgeflow.com>`__)
- Jordi Ballester <jordi.ballester@forgeflow.com>
(`www.forgeflow.com <http://www.forgeflow.com>`__)
Copy link
Sponsor Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

change to https

- Jordi Ballester <jordi.ballester@forgeflow.com>
(`www.forgeflow.com <http://www.forgeflow.com>`__)
- Pieter Paulussen <pieterpaulussen@code-source.be>
(`www.code-source.be <http://www.code-source.be>`__)
Copy link
Sponsor Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

sale_fixed_discount/readme/INSTALL.md Outdated Show resolved Hide resolved
@JordiBForgeFlow
Copy link
Sponsor Member

Please merge your last two commits together using git rebase -i origin/17.0

[17.0][MIG]sale_fixed_discount: Migrated module to v17.0
[17.0][MIG]sale_fixed_discount: Migrated module to v17.0
[17.0][MIG]sale_fixed_discount: Migrated module to v17.0

[IMP]Improved for discount when discount_fixed being 0/false

[17.0][MIG]sale_fixed_discount: Migrated module to v17.0

[17.0][MIG]sale_fixed_discount: Migrated module to v17.0
@fd-oerp
Copy link
Author

fd-oerp commented Mar 8, 2024

Please merge your last two commits together using git rebase -i origin/17.0

@JordiBForgeFlow commits are merged now

@JordiBForgeFlow
Copy link
Sponsor Member

/ocabot migration sale_fixed_discount

@JordiBForgeFlow
Copy link
Sponsor Member

/ocabot merge nobump

@OCA-git-bot OCA-git-bot added this to the 17.0 milestone Mar 8, 2024
@OCA-git-bot OCA-git-bot mentioned this pull request Mar 8, 2024
67 tasks
@OCA-git-bot
Copy link
Contributor

On my way to merge this fine PR!
Prepared branch 17.0-ocabot-merge-pr-2952-by-JordiBForgeFlow-bump-nobump, awaiting test results.

@OCA-git-bot OCA-git-bot merged commit 9b33ae1 into OCA:17.0 Mar 8, 2024
6 of 7 checks passed
@OCA-git-bot
Copy link
Contributor

Congratulations, your PR was merged at 2dae613. Thanks a lot for contributing to OCA. ❤️

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