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: free_over management #31315

Closed
wants to merge 1 commit into
base: saas-12.2
from

Conversation

Projects
None yet
4 participants
@Whenrow
Copy link
Contributor

Whenrow commented Feb 21, 2019

The commit 9a9cb9e refactored the way
delivery carrier price are added on sale orders. The management of
free delivery price was not taken into account past then.
This commit put the free price message directly on the sale order line
and on the wizard. The carrier price is showed on the wizard but is 0 on
the SO.

Task : 1943480

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

@robodoo robodoo added the seen 🙂 label Feb 21, 2019

@C3POdoo C3POdoo added the RD label Feb 21, 2019

@Whenrow Whenrow force-pushed the odoo-dev:saas-12.2-not-delivery-whe branch 5 times, most recently Feb 21, 2019

@robodoo robodoo added the CI 🤖 label Feb 27, 2019

@Whenrow Whenrow force-pushed the odoo-dev:saas-12.2-not-delivery-whe branch Feb 28, 2019

@robodoo robodoo added CI 🤖 and removed CI 🤖 labels Feb 28, 2019

@Whenrow Whenrow force-pushed the odoo-dev:saas-12.2-not-delivery-whe branch Mar 7, 2019

@robodoo robodoo added CI 🤖 and removed CI 🤖 labels Mar 7, 2019

addons/delivery/models/sale_order.py Outdated
@@ -114,7 +114,8 @@ def _create_delivery_line(self, carrier, price_unit, price_unit_in_description=F
values['name'] += _(' (Estimated Cost: %s )') % self._format_currency_amount(price_unit)
else:
values['price_unit'] = price_unit

if additionnal_info:

This comment has been minimized.

@pimodoo

pimodoo Mar 11, 2019

Contributor

if carrier.free_over and self._compute_amount_total_without_delivery() >= carrier.amount:

(so you can remove all additional info stuff in signature)

Show resolved Hide resolved addons/delivery/wizard/choose_delivery_carrier.py
Show resolved Hide resolved addons/delivery/wizard/choose_delivery_carrier.py

@Whenrow Whenrow force-pushed the odoo-dev:saas-12.2-not-delivery-whe branch to 6fd4126 Mar 12, 2019

@robodoo robodoo added CI 🤖 and removed CI 🤖 labels Mar 12, 2019

@Whenrow Whenrow force-pushed the odoo-dev:saas-12.2-not-delivery-whe branch from 6fd4126 to 473d62f Mar 13, 2019

@robodoo robodoo added CI 🤖 and removed CI 🤖 labels Mar 13, 2019

@Whenrow Whenrow force-pushed the odoo-dev:saas-12.2-not-delivery-whe branch from 473d62f Mar 15, 2019

@robodoo robodoo added CI 🤖 and removed CI 🤖 labels Mar 15, 2019

@Whenrow Whenrow force-pushed the odoo-dev:saas-12.2-not-delivery-whe branch Mar 15, 2019

@robodoo robodoo removed the CI 🤖 label Mar 15, 2019

@Whenrow Whenrow force-pushed the odoo-dev:saas-12.2-not-delivery-whe branch to a301f88 Mar 15, 2019

[FIX] delivery: free_over management
The commit 9a9cb9e refactored the way delivery carrier price
are added on sale orders. The management of free delivery price
was not taken into account past then.
This commit put the free price message directly on the sale order line
and on the wizard. The carrier price is showed on the wizard but is 0 on
the SO.

Task : 1943480

@Whenrow Whenrow force-pushed the odoo-dev:saas-12.2-not-delivery-whe branch from a301f88 to 2db53be Mar 15, 2019

@robodoo robodoo added the CI 🤖 label Mar 15, 2019

@pimodoo

This comment has been minimized.

Copy link
Contributor

pimodoo commented Mar 19, 2019

robodoo r+

@robodoo robodoo added the r+ 👌 label Mar 19, 2019

robodoo pushed a commit that referenced this pull request Mar 19, 2019

[FIX] delivery: free_over management
The commit 9a9cb9e refactored the way delivery carrier price
are added on sale orders. The management of free delivery price
was not taken into account past then.
This commit put the free price message directly on the sale order line
and on the wizard. The carrier price is showed on the wizard but is 0 on
the SO.

Task : 1943480

closes #31315

Signed-off-by: pimodoo <pimodoo@users.noreply.github.com>
@robodoo

This comment has been minimized.

Copy link
Contributor

robodoo commented Mar 19, 2019

Merged, thanks!

@robodoo robodoo closed this Mar 19, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.