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

[FIX] delivery_auto_refresh: compatibility with sale_tier_validation #815

Conversation

yajo
Copy link
Member

@yajo yajo commented May 8, 2024

Fix OCA/server-ux#875 by actually implementing this sentence:

* If you change any line in your draft sales order (SO), when saving, the
delivery price will be adjusted without having to click on "→ Set price".

Now, auto-refreshing will be triggered only when modifying SO lines. Any other modifications will pass normally.

@moduon MT-5997

Fix OCA/server-ux#875 by actually implementing this sentence:

https://github.com/OCA/delivery-carrier/blob/3a93f81bf3038e6ccb7fba4ce49376fe4f1422ee/delivery_auto_refresh/readme/DESCRIPTION.rst?plain=1#L3-L4

Now, auto-refreshing will be triggered only when modifying SO lines. Any other modifications will pass normally.

@moduon MT-5997
@rousseldenis
Copy link
Contributor

And if delivery line depends on some sale order properties (other than lines)?

@yajo
Copy link
Member Author

yajo commented May 13, 2024

In that case, that other field could be added to this check, just like I do now with order_line.

Copy link
Member

@rafaelbn rafaelbn left a comment

Choose a reason for hiding this comment

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

This have been working in production for 3 weeks and functionally problem is solved. 👍🏼

@rousseldenis did you read @yajo 's answer? 😄

Thank you!

@OCA-git-bot
Copy link
Contributor

This PR has the approved label and has been created more than 5 days ago. It should therefore be ready to merge by a maintainer (or a PSC member if the concerned addon has no declared maintainer). 🤖

@rafaelbn
Copy link
Member

/ocabot rebase

@OCA-git-bot
Copy link
Contributor

@rafaelbn The rebase process failed, because command git rebase origin/16.0 failed with output:

First, rewinding head to replay your work on top of it...
Applying: [FIX] delivery_auto_refresh: compatibility with sale_tier_validation
Using index info to reconstruct a base tree...
M	delivery_auto_refresh/models/sale_order.py
Falling back to patching base and 3-way merge...
Auto-merging delivery_auto_refresh/models/sale_order.py
CONFLICT (content): Merge conflict in delivery_auto_refresh/models/sale_order.py
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 [FIX] delivery_auto_refresh: compatibility with sale_tier_validation
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".

@yajo
Copy link
Member Author

yajo commented Jun 17, 2024

It seems #799 fixes OCA/server-ux#875 as part of the refactor. I don't know if on purpose or by accident, but we can close this.

@yajo yajo closed this Jun 17, 2024
@yajo yajo deleted the 16.0-delivery_auto_refresh-fix_compat_tier_validation branch June 17, 2024 13:03
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.

base_tier_validation: blocking notifications cron, a.k.a. should it block sudo writes?
6 participants