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.

Sign up for GitHub

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

Jump to bottom

[15.0][MIG] sale_fixed_discount #2485

Closed
wants to merge 33 commits into from
Closed

[15.0][MIG] sale_fixed_discount #2485

wants to merge 33 commits into from

Conversation

ps-tubtim
Copy link
Member

From #2269

@Rad0van Rad0van mentioned this pull request Apr 20, 2023
Closed
@rousseldenis
Copy link
Sponsor Contributor

/ocabot migration sale_fixed_discount

@OCA-git-bot OCA-git-bot added this to the 15.0 milestone Apr 25, 2023
@OCA-git-bot OCA-git-bot mentioned this pull request Apr 25, 2023
Open
@OCA-git-bot
Copy link
Contributor

The migration issue (#1741) has been updated to reference the current pull request.
however, a previous pull request was referenced : #2086.
Perhaps you should check that there is no duplicate work.
CC : @xhnilic3

@CRogos
Copy link
Contributor

CRogos commented May 26, 2023

@ps-tubtim could you review the v14 PR #2507 first, and than we use this (cleaned) version as base of the v15 migration?

MohamedOsman7
MohamedOsman7 approved these changes Jun 7, 2023
View reviewed changes
Copy link

@MohamedOsman7 MohamedOsman7 left a comment

Choose a reason for hiding this comment

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

Code & functionality LGTM

LoisRForgeFlow and others added 21 commits June 8, 2023 09:21
@LoisRForgeFlow @ps-tubtim
[9.0][ADD] sale_fixed_discount
5e329b4
@LoisRForgeFlow @ps-tubtim
[10.0][MIG] sale_fixed_discount
bad83c5
@oca-travis @ps-tubtim
[UPD] Update sale_fixed_discount.pot
3bb2494
@JordiBForgeFlow @ps-tubtim
[11.0][mig] sale_fixed_discount
532a490
@OCA-git-bot @ps-tubtim
[UPD] README.rst
b15bca6
@oca-travis @ps-tubtim
[UPD] Update sale_fixed_discount.pot
c65858e
@MiquelRForgeFlow @ps-tubtim
[MIG] sale_fixed_discount: Migration to 12.0
8c4b3c8
@MiquelRForgeFlow @ps-tubtim
[IMP] Simplify code
8c68c35
@oca-travis @ps-tubtim
[UPD] Update sale_fixed_discount.pot
7839497
@OCA-git-bot @ps-tubtim
[UPD] README.rst
18fca5a
@HviorForgeFlow @ps-tubtim
[IMP] sale_fixed_discount: black, isort, prettier
2902243
@HviorForgeFlow @ps-tubtim
[MIG] sale_fixed_discount: Migration to 13.0
05f4dfe
@HviorForgeFlow @ps-tubtim
Not update lines when SO is locked
ce9bbf2
@oca-travis @ps-tubtim
[UPD] Update sale_fixed_discount.pot
b8b74f3
@OCA-git-bot @ps-tubtim
[UPD] README.rst
d28c120
@danimv5 @ps-tubtim
Added translation using Weblate (Spanish)
d2268d8
@danimv5 @ps-tubtim
Translated using Weblate (Spanish)
aad93c0 
Currently translated at 100.0% (5 of 5 strings)

Translation: sale-workflow-13.0/sale-workflow-13.0-sale_fixed_discount
Translate-URL: https://translation.odoo-community.org/projects/sale-workflow-13-0/sale-workflow-13-0-sale_fixed_discount/es/
@MiquelRForgeFlow @ps-tubtim
[UPD] Eficent -> ForgeFlow
e706aad
@OCA-git-bot @ps-tubtim
[UPD] README.rst
2290403
@dennybiasiolli @ps-tubtim
[FIX] sale_fixed_discount: using product.group_discount_per_so_line
8dba73f 
instead of `sale.group_discount_per_so_line`
@OCA-git-bot @ps-tubtim
sale_fixed_discount 13.0.1.0.1
6d58bca
skeller1 and others added 11 commits June 8, 2023 09:21
@skeller1 @ps-tubtim
[FIX] sale_fixed_discount: remove obsolete colspan calculation
210b22b
@OCA-git-bot @ps-tubtim
sale_fixed_discount 13.0.1.1.0
ad18271
@JordiBForgeFlow @ps-tubtim
[13.0][sale_fixed_discount] fix sale portal view
2fe119f 
The sale order view in the portal was not displaying the fixed discount.
@oca-travis @ps-tubtim
[UPD] Update sale_fixed_discount.pot
e465fe2
@OCA-git-bot @ps-tubtim
sale_fixed_discount 13.0.1.1.1
a68a724
@oca-transbot @ps-tubtim
Update translation files
45204b4 
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: sale-workflow-13.0/sale-workflow-13.0-sale_fixed_discount
Translate-URL: https://translation.odoo-community.org/projects/sale-workflow-13-0/sale-workflow-13-0-sale_fixed_discount/
@vincent-hatakeyama @ps-tubtim
Added translation using Weblate (French)
47047b2
@vincent-hatakeyama @ps-tubtim
Translated using Weblate (French)
c536382 
Currently translated at 100.0% (5 of 5 strings)

Translation: sale-workflow-13.0/sale-workflow-13.0-sale_fixed_discount
Translate-URL: https://translation.odoo-community.org/projects/sale-workflow-13-0/sale-workflow-13-0-sale_fixed_discount/fr/
@Rad0van @ps-tubtim
[IMP] sale_fixed_discount: black, isort, prettier
b815ef5
@Rad0van @ps-tubtim
[MIG] sale_fixed_discount: Migration to 15.0
3928f72
@ps-tubtim
[FIX] sale_fixed_discount: edit view
38909f1
@ps-tubtim ps-tubtim force-pushed the 15.0-mig-sale_fixed_discount-merge branch from c2ed71b to 38909f1 Compare June 8, 2023 02:21
@ps-tubtim
Copy link
Member Author

@ps-tubtim could you review the v14 PR #2507 first, and than we use this (cleaned) version as base of the v15 migration?

@CRogos I already update the code following PR #2507. Could you review it again?

@CRogos
Copy link
Contributor

CRogos commented Jun 12, 2023

I am wondering why the v15 MIG contains 33 commits, while the v14 only contains 21 commits. I assume some commits have been squashed/cleanup in the v14 migration. I think it would be better to base the v15 MIG on v14 containing also the improvements from v14 without doing the changes manually again.
image

Also you should merge these commits, in case they are needed in a migration based on v14.
image

@CRogos CRogos mentioned this pull request Jun 19, 2023
Merged
@pedrobaeza
Copy link
Member

Superseded by #2574

@pedrobaeza pedrobaeza closed this Jul 20, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MohamedOsman7 MohamedOsman7 MohamedOsman7 approved these changes

Assignees
No one assigned
Labels
migration needs review
Projects
None yet
Milestone
15.0
Development

Successfully merging this pull request may close these issues.