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

[12.0][MIG] sale_manual_delivery #987

Merged
merged 21 commits into from Feb 22, 2021

Conversation

AaronHForgeFlow
Copy link
Contributor

@AaronHForgeFlow AaronHForgeFlow commented Nov 8, 2019

Based on #983 + grindtildeath#2 at 8th November

Standard migration. Functional tests done from my side and working fine IMHO. Pending todo:

  • squash commits
  • Check if glue module sale_stock_picking_blocking_sale_manual_delivery between this and sale_stock_picking_blocking (proposed in [ADD][10.0] sale_manual_delivery #935) is really needed to be ported to v12. --> not needed

@oca-clabot
Copy link

Hey @aheficent, thank you for your Pull Request.

It looks like some users haven't signed our Contributor License Agreement, yet.
You can read and sign our full Contributor License Agreement here: http://odoo-community.org/page/cla
Here is a list of the users:

Appreciation of efforts,
OCA CLAbot

@AaronHForgeFlow
Copy link
Contributor Author

cc @grindtildeath

@AaronHForgeFlow AaronHForgeFlow force-pushed the 12.0-mig-sale_manual_delivery branch 2 times, most recently from 651413a to a8bd6da Compare November 8, 2019 09:59
@rousseldenis rousseldenis added this to the 12.0 milestone Nov 18, 2019
Copy link

@stevech091 stevech091 left a comment

Choose a reason for hiding this comment

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

functional ok

@oca-clabot
Copy link

Hey @AaronHForgeFlow, thank you for your Pull Request.

It looks like some users haven't signed our Contributor License Agreement, yet.
You can read and sign our full Contributor License Agreement here: http://odoo-community.org/page/cla
Here is a list of the users:

Appreciation of efforts,
OCA CLAbot

@AaronHForgeFlow
Copy link
Contributor Author

Added he possibility of changing the route when creating the delivery. This is useful when at the time of creating the order, we don't really know from warehouse and what location we are shipping.

In case no route is provided then the one in the sale order line will be taken.

@OCA-git-bot OCA-git-bot mentioned this pull request Dec 20, 2019
54 tasks
Copy link
Sponsor Contributor

@rousseldenis rousseldenis left a comment

Choose a reason for hiding this comment

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

Code review

@rousseldenis
Copy link
Sponsor Contributor

@AaronHForgeFlow If ready, could you squash ?

leemannd and others added 15 commits January 17, 2020 17:07
Add base for wizard

wizard for manual procurements

Update base computation

update to OCA guidelines
Add action_manual_procurement_wizard in view
[IMP] Update translation files

[IMP] lot's of functionnal improvments

Don't add already planned or shipped lines in wizard
Ensure you have one picking per manual delivery
Forbid to add lines or ship more than ordered
Planned date is required
Improve views, naming and buttons
Better Readme
Default Carrier set from SO

[FIX] Do not add product of type 'service' in manual delivery creation
…om SO

Add product name to manual delivery lines
[FIX] call super in case of standard delivery

[FIX] when multiple picking candidate available take the right one with date corresponding

[FIX] revert of renaming field

Add SO line description
[MIG][11] Update Readme + Manifest

[MIG][11] Adapt procurement for V11 + rm api.one
Fix view name and improve tests

IMP: Use a procurement group according to date planned

Fix manifest keys
@AaronHForgeFlow
Copy link
Contributor Author

Hi @leemannd, in the wizard I've seen so far the possibility of changing the carrier and the planned date, but not the delivery address. It is ok to me to add that feature. Could you point me to your repo/the repo where this feature is implemented? Thanks

Also, if I include the delivery_address in the wizard, Would be ok for you to continue with this Pull requests? (same in v10 and v11)

@leemannd
Copy link
Contributor

leemannd commented Jan 27, 2020

@AaronHForgeFlow Thanks for asking. You have been removing it while helping on the migration of the V11 module -> 1f394eb#diff-ff81e585e998789b0b224c322c8cc742L19

This is present also in the original PR in V10.0 -> https://github.com/OCA/sale-workflow/pull/404/files?file-filters%5B%5D=.xml#diff-ff81e585e998789b0b224c322c8cc742R19

This is for us a blocking point as we have clients using it and needing this possibility.

@AaronHForgeFlow
Copy link
Contributor Author

@leemannd I see. I tried to revert that removal but I missed that part.

I will add it back here, and in v10/v11

@leemannd
Copy link
Contributor

@AaronHForgeFlow Just ping me on them, I will update my reviews right away

@AaronHForgeFlow AaronHForgeFlow force-pushed the 12.0-mig-sale_manual_delivery branch 3 times, most recently from 46d3c5f to 63052bf Compare February 6, 2020 14:47
[IMP]sale_manual_delivery. Specify route at the time of the delivery
@AaronHForgeFlow
Copy link
Contributor Author

@leemannd Thanks to @mmequignon we have the delivery address back in the wizard 🎉 It would be nice if you check that everything is as expected.

Thanks.

@AaronHForgeFlow
Copy link
Contributor Author

Applied latest fixes in v11

class StockMove(models.Model):
_inherit = "stock.move"

carrier_id = fields.Many2one("delivery.carrier", string="Delivery Method")
Copy link
Contributor

Choose a reason for hiding this comment

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

@AaronHForgeFlow, why do we need to define the carrier at the stock.move level ?
cc @i-vyshnevska

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It is a requirement of the original authors of the module. #404 (comment)

Copy link
Contributor

Choose a reason for hiding this comment

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

@AaronHForgeFlow natively Odoo defines the carrier at stock picking level (in delivery module). It confuses us if we have multiple carriers in the same picking (stock.move level), but only one deliver provider defined in picking.

In actual usage, if a picking is delivered by different providers, the picking should be splitted (partial transfer + create back order).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Splits are not performed anymore with this module. In this case two separate manual deliveries will be created.

Copy link
Contributor

Choose a reason for hiding this comment

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

@i-vyshnevska, do you have any idea?

@AaronHForgeFlow
Copy link
Contributor Author

@rousseldenis is this fine to be merged?

@rousseldenis
Copy link
Sponsor Contributor

/ocabot merge patch

@OCA-git-bot
Copy link
Contributor

What a great day to merge this nice PR. Let's do it!
Prepared branch 12.0-ocabot-merge-pr-987-by-rousseldenis-bump-patch, awaiting test results.

@OCA-git-bot OCA-git-bot merged commit 5f29a79 into OCA:12.0 Feb 22, 2021
@OCA-git-bot
Copy link
Contributor

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

@MiquelRForgeFlow MiquelRForgeFlow deleted the 12.0-mig-sale_manual_delivery branch February 22, 2021 11:38
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.

None yet