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

[16.0][MIG] purchase_triple_discount: Migration to 16.0 #1601

Merged
merged 36 commits into from
Mar 23, 2023

Conversation

ramiadavid
Copy link
Contributor

@ramiadavid ramiadavid commented Oct 19, 2022

No description provided.

@ramiadavid ramiadavid mentioned this pull request Oct 19, 2022
52 tasks
@ramiadavid ramiadavid marked this pull request as ready for review October 19, 2022 21:46
@ramiadavid ramiadavid force-pushed the 16.0-mig-purchase_triple_discount branch 4 times, most recently from d6aa329 to 702566b Compare October 27, 2022 06:22
@ramiadavid ramiadavid force-pushed the 16.0-mig-purchase_triple_discount branch 2 times, most recently from 0b3a75f to b568d61 Compare January 2, 2023 22:18
@legalsylvain
Copy link
Contributor

Hi @ramiadavid : could you rebase once purchase_discount has been merged ?
(this should solve conflict and red CI.)
thanks !

Copy link
Contributor

@legalsylvain legalsylvain left a comment

Choose a reason for hiding this comment

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

Hi. could you check and cherry pick commits from pending PR that makes some fixes / improvment in previous versions ?

Thanks !
let me know if you want some help.

Note : also a rebase is needed as there are conflict.

chienandalu and others added 19 commits March 21, 2023 13:21
- remove dependency to obsolete module product_supplierinfo_discount
- rename procurement.rule into stock.rule
- Use new hook introduced in purchase_discount V12 to add discount2 and discount3
- Introduce discount2 and discount3 in purchase.report model
* Lighter algorithm when synchronizing PO line info to product.supplierinfo.
* Use new create multi method for performance.
* Better SQL expresion in purchase report for decreasing the number of operations.
* Add test for purchase report.
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: purchase-workflow-12.0/purchase-workflow-12.0-purchase_triple_discount
Translate-URL: https://translation.odoo-community.org/projects/purchase-workflow-12-0/purchase-workflow-12-0-purchase_triple_discount/
Currently translated at 100.0% (15 of 15 strings)

Translation: purchase-workflow-12.0/purchase-workflow-12.0-purchase_triple_discount
Translate-URL: https://translation.odoo-community.org/projects/purchase-workflow-12-0/purchase-workflow-12-0-purchase_triple_discount/zh_CN/
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: purchase-workflow-12.0/purchase-workflow-12.0-purchase_triple_discount
Translate-URL: https://translation.odoo-community.org/projects/purchase-workflow-12-0/purchase-workflow-12-0-purchase_triple_discount/
Currently translated at 100.0% (15 of 15 strings)

Translation: purchase-workflow-12.0/purchase-workflow-12.0-purchase_triple_discount
Translate-URL: https://translation.odoo-community.org/projects/purchase-workflow-12-0/purchase-workflow-12-0-purchase_triple_discount/it/
sysadminmatmoz and others added 17 commits March 21, 2023 13:21
Currently translated at 20.0% (3 of 15 strings)

Translation: purchase-workflow-12.0/purchase-workflow-12.0-purchase_triple_discount
Translate-URL: https://translation.odoo-community.org/projects/purchase-workflow-12-0/purchase-workflow-12-0-purchase_triple_discount/sl/
Currently translated at 20.0% (3 of 15 strings)

Translation: purchase-workflow-12.0/purchase-workflow-12.0-purchase_triple_discount
Translate-URL: https://translation.odoo-community.org/projects/purchase-workflow-12-0/purchase-workflow-12-0-purchase_triple_discount/pt_BR/
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: purchase-workflow-12.0/purchase-workflow-12.0-purchase_triple_discount
Translate-URL: https://translation.odoo-community.org/projects/purchase-workflow-12-0/purchase-workflow-12-0-purchase_triple_discount/
Currently translated at 100.0% (15 of 15 strings)

Translation: purchase-workflow-12.0/purchase-workflow-12.0-purchase_triple_discount
Translate-URL: https://translation.odoo-community.org/projects/purchase-workflow-12-0/purchase-workflow-12-0-purchase_triple_discount/sl/
@ramiadavid ramiadavid force-pushed the 16.0-mig-purchase_triple_discount branch from b568d61 to f545ee9 Compare March 21, 2023 12:22
Copy link
Contributor

@lehoangan lehoangan left a comment

Choose a reason for hiding this comment

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

LGTM

@gurneyalex
Copy link
Member

/ocabot merge nobump

@OCA-git-bot
Copy link
Contributor

Hey, thanks for contributing! Proceeding to merge this for you.
Prepared branch 16.0-ocabot-merge-pr-1601-by-gurneyalex-bump-nobump, awaiting test results.

@OCA-git-bot OCA-git-bot merged commit 889b121 into OCA:16.0 Mar 23, 2023
@OCA-git-bot
Copy link
Contributor

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

@ramiadavid ramiadavid deleted the 16.0-mig-purchase_triple_discount branch March 24, 2023 19:10
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.