[MERGE][REF] delivery: extract stock logic in separate module by vava-odoo · Pull Request #110686 · odoo/odoo

vava-odoo · 2023-01-23T11:57:33Z

It's currently impossible to set fixed delivery costs in eCommerce without installing Inventory. This is a problem for one-app free instances on our SaaS, which would need to pay for a feature that should be part of the basic eCommerce features bundle.

Delivery is now split from inventory/stock module to allow for a soft free integration into website_sale. This PR makes it possible to define fixed-cost delivery methods in eCommerce without installing Inventory by adding a direct dependency of website_sale on delivery. The bridge between those two modules is therefore included in the former.

Steps are:

extract the Inventory logic from the delivery module into a new stock_delivery module;
move website_sale_delivery into website_sale;
adapt dependencies to delivery and website_sale_delivery;
remove bridge module with loyalty directly in website_sale_loyalty;
move website_sale_delivery_mondialrelay to website_sale_mondialrelay.

task-3074497
task-3203210

See also:

robodoo · 2023-01-23T11:58:05Z

vava-odoo

Thank you @Demesmaeker !
I mostly agree on your comments. Made a lot of changes.
Only the one about po files: since I remove the bridge, I remove the entire folder in github. Can't really do otherwise.

Demesmaeker

Hello there 🦆 , you have website_delivery_sendcloud that still depends on (and then import from) website_sale_delivery ;)

Also, in deliver_carrier from stock_delivery, it looks like you only made cosmetic changes to respect the max 100 chars line, but you missed some lines.

And finally: Internal Server Error on the runbot, couldn't test it yet

Still have a few files to check, but let's already post it =]

Feyensv

very quick look, didn't see anything big on the fly so only linting comments for now :D

Demesmaeker

Hello

I started testing this task, here are some problems that I encountered that should be solved:

Installing only ecommerce:

~~Not a single shipping method set as "published" on the website, yet I could select Standard Delivery~~
~~I tried to publish Standard Delivery, I couldn't. Nor any of the others, not even a newly created one.~~

I stopped testing there. You made a lot of changes since it was last thoroughly tested, it might be wise to do it again to avoid both obvious and tricky bugs. =]

edit: as these are known problems, I started again, sorry for that ;)

Demesmaeker

The bugs I found were all also presents in master, improvements I could think of are for moved and untouched lines, so... lgtm, as long as someone from the stock team can also confirm/test that, and @chevalierv confirms the express checkout part. =]

ticodoo

Overall, nice work! I only have nitpick comments (i.e. they can all be ignored). General flows look like they all still work fine. I only tested the sale + stock parts. I didn't touch the website stuff since I don't know their flows.

Feyensv

quick comm, will take a func look tomorrow 👌

Feyensv

@robodoo rebase-merge r+
@robodoo delegate+

robodoo · 2023-03-10T13:16:37Z

Merge method set to rebase and merge, using the PR as merge commit message.

robodoo · 2023-03-10T13:16:38Z

@Feyensv you may want to rebuild or fix this PR as it has failed CI.

AntoineVDV · 2023-03-10T13:25:38Z

@robodoo override=ci/security
Reason: The concerned code is moved from one module to another and left unchanged.
Link to ci/security build (master): https://runbot.odoo.com/runbot/build/24910293

robodoo · 2023-03-10T16:00:02Z

@vava-odoo @Feyensv linked pull request(s) odoo/upgrade#4362 not ready. Linked PRs are not staged until all of them are ready.

Extract the Inventory logic from the `delivery` module into a new `stock_delivery` module. This will allow to integrate the basic delivery features into the website_sale app in a one-app free database. task-3074497

It's currently impossible to set fixed delivery costs in eCommerce without installing Inventory. This is a problem for one-app free instances on our SaaS, which would need to pay for a feature that should be part of the basic eCommerce features bundle. This commit makes it possible to define fixed-cost delivery methods in eCommerce without installing Inventory by adding a direct dependency of `website_sale` on `delivery`. The bridge between those two modules is therefore included in the former.

*: mondialrelay, stock_picking_batch **: delivery_mondialrelay, loyalty_delivery, picking Adapt dependency to `website_sale` directly instead of `website_sale_delivery`.

In ecommerce, the form vue of shipping methods should be improved to easily set up fixed delivery costs. This commit improves the user-experience and solves bugs on the fields displayed. task-3203210

Feyensv · 2023-03-13T21:59:18Z

@robodoo r+

robodoo · 2023-03-14T10:00:40Z

@vava-odoo @Feyensv linked pull request(s) odoo/enterprise#36609 not ready. Linked PRs are not staged until all of them are ready.

C3POdoo added the RD research & development, internal work label Jan 23, 2023

vava-odoo force-pushed the master-delivery_split_from_sale_and_stock-vava branch 12 times, most recently from 83d1956 to 771d608 Compare January 26, 2023 16:56

vava-odoo force-pushed the master-delivery_split_from_sale_and_stock-vava branch 16 times, most recently from 8d5d9a0 to 5fbadfa Compare February 6, 2023 10:54

vava-odoo force-pushed the master-delivery_split_from_sale_and_stock-vava branch from 6ddf05c to e2494de Compare March 1, 2023 17:30

vava-odoo commented Mar 1, 2023

View reviewed changes

vava-odoo force-pushed the master-delivery_split_from_sale_and_stock-vava branch 6 times, most recently from df9ed3e to f08cb5a Compare March 3, 2023 08:46

Demesmaeker reviewed Mar 6, 2023

View reviewed changes

Feyensv reviewed Mar 7, 2023

View reviewed changes

Demesmaeker reviewed Mar 8, 2023

View reviewed changes

Comment thread addons/delivery/models/delivery_carrier.py Outdated

Comment thread addons/website_sale/data/website_sale_delivery_demo.xml Outdated

Comment thread addons/stock_delivery/security/ir.model.access.csv Outdated

Comment thread addons/website_sale/models/sale_order.py Outdated

Demesmaeker approved these changes Mar 8, 2023

View reviewed changes

Comment thread addons/website_sale/models/sale_order.py Outdated

ticodoo approved these changes Mar 8, 2023

View reviewed changes

Comment thread addons/delivery/__manifest__.py Outdated

Comment thread addons/delivery/models/delivery_carrier.py Outdated

Comment thread addons/stock_delivery/views/delivery_view.xml Outdated

Feyensv reviewed Mar 9, 2023

View reviewed changes

Comment thread addons/website_sale/views/website_sale_delivery_views.xml Outdated

Feyensv approved these changes Mar 10, 2023

View reviewed changes

vava-odoo added 7 commits March 13, 2023 22:57

[REF] (stock_)delivery: split delivery from stock

b2541e6

Extract the Inventory logic from the `delivery` module into a new `stock_delivery` module. This will allow to integrate the basic delivery features into the website_sale app in a one-app free database. task-3074497

[REF] delivery_*, website_sale_**: dependency to delivery

cdb621f

*: mondialrelay, stock_picking_batch **: delivery_mondialrelay, loyalty_delivery, picking Adapt dependency to `website_sale` directly instead of `website_sale_delivery`.

[REF] website_sale_loyalty: remove bridge module with delivery

3d8c232

[REF] website_sale_mondialrelay: rename module

3587d42

[FIX] delivery, website_sale: fix UX issues in views

49f7fcc

In ecommerce, the form vue of shipping methods should be improved to easily set up fixed delivery costs. This commit improves the user-experience and solves bugs on the fields displayed. task-3203210

[FIX] website_sale(_loyalty): merge main controller methods

28799be

vava-odoo mentioned this pull request Jun 5, 2023

[FW][FIX] website_sale_delivery: invalid payment transaction state #123787

Closed

legalsylvain mentioned this pull request Sep 9, 2023

Migration to version 17.0 OCA/OpenUpgrade#4124

Open

Uh oh!

Conversation

vava-odoo commented Jan 23, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

robodoo commented Jan 23, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

vava-odoo left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Demesmaeker left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Feyensv left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Demesmaeker left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Demesmaeker left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

ticodoo left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Feyensv left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Feyensv left a comment

Choose a reason for hiding this comment

Uh oh!

robodoo commented Mar 10, 2023

Uh oh!

robodoo commented Mar 10, 2023

Uh oh!

AntoineVDV commented Mar 10, 2023

Uh oh!

robodoo commented Mar 10, 2023

Uh oh!

Feyensv commented Mar 13, 2023

Uh oh!

robodoo commented Mar 14, 2023

vava-odoo commented Jan 23, 2023 •

edited

Loading

robodoo commented Jan 23, 2023 •

edited

Loading

Demesmaeker left a comment •

edited

Loading

Demesmaeker left a comment •

edited

Loading