From 51fb41b487ca3370926545ff72c7164bc5fbcf95 Mon Sep 17 00:00:00 2001 From: AlexPForgeFlow Date: Tue, 20 Feb 2024 09:30:20 +0100 Subject: [PATCH 1/2] [FIX] purchase_manual_delivery: fix return on button_confirm_manual --- purchase_manual_delivery/models/purchase_order.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/purchase_manual_delivery/models/purchase_order.py b/purchase_manual_delivery/models/purchase_order.py index 999872d68a1..5a763197c6c 100644 --- a/purchase_manual_delivery/models/purchase_order.py +++ b/purchase_manual_delivery/models/purchase_order.py @@ -23,8 +23,9 @@ def _compute_pending_to_receive(self): order.pending_to_receive = False def button_confirm_manual(self): - super(PurchaseOrder, self.with_context(manual_delivery=True)).button_confirm() - return + return super( + PurchaseOrder, self.with_context(manual_delivery=True) + ).button_confirm() def _create_picking(self): if self.env.context.get("manual_delivery", False) and self.manual_delivery: From db868d1867ea576bd87ee86545ce92985e743b71 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Thu, 22 Feb 2024 08:01:22 +0000 Subject: [PATCH 2/2] [BOT] post-merge updates --- README.md | 2 +- purchase_manual_delivery/README.rst | 2 +- purchase_manual_delivery/__manifest__.py | 2 +- purchase_manual_delivery/static/description/index.html | 3 +-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 1b7bbc4f26f..abe73b04831 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ addon | version | maintainers | summary [purchase_line_procurement_group](purchase_line_procurement_group/) | 16.0.1.0.0 | | Group purchase order line according to procurement group [purchase_location_by_line](purchase_location_by_line/) | 16.0.1.0.0 | | Allows to define a specific destination location on each PO line [purchase_lot](purchase_lot/) | 16.0.1.0.0 | [![florian-dacosta](https://github.com/florian-dacosta.png?size=30px)](https://github.com/florian-dacosta) | Purchase Lot -[purchase_manual_delivery](purchase_manual_delivery/) | 16.0.1.1.0 | | Prevents pickings to be auto generated upon Purchase Order confirmation and adds the ability to manually generate them as the supplier confirms the different purchase order lines. +[purchase_manual_delivery](purchase_manual_delivery/) | 16.0.1.1.1 | | Prevents pickings to be auto generated upon Purchase Order confirmation and adds the ability to manually generate them as the supplier confirms the different purchase order lines. [purchase_merge](purchase_merge/) | 16.0.1.0.1 | | Wizard to merge purchase with required conditions [purchase_no_rfq](purchase_no_rfq/) | 16.0.1.0.0 | [![legalsylvain](https://github.com/legalsylvain.png?size=30px)](https://github.com/legalsylvain) | Purchase Order - No Request For Quotation [purchase_only_by_packaging](purchase_only_by_packaging/) | 16.0.1.0.0 | | Manage purchase of packaging diff --git a/purchase_manual_delivery/README.rst b/purchase_manual_delivery/README.rst index 9fd5f835e37..6f08a07ffdb 100644 --- a/purchase_manual_delivery/README.rst +++ b/purchase_manual_delivery/README.rst @@ -7,7 +7,7 @@ Purchase Manual Delivery !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - !! source digest: sha256:1977c36b45704fecaa12431fae0390324a44c1528a47da37da8089a769c45036 + !! source digest: sha256:8047ec82b4b9e631868f92fc323a79bf0b600c84ae5efada49283f279387f837 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png diff --git a/purchase_manual_delivery/__manifest__.py b/purchase_manual_delivery/__manifest__.py index 58e66655806..002916023b8 100644 --- a/purchase_manual_delivery/__manifest__.py +++ b/purchase_manual_delivery/__manifest__.py @@ -8,7 +8,7 @@ and adds the ability to manually generate them as the supplier confirms the different purchase order lines. """, - "version": "16.0.1.1.0", + "version": "16.0.1.1.1", "license": "AGPL-3", "author": "ForgeFlow S.L.," "Odoo Community Association (OCA)", "website": "https://github.com/OCA/purchase-workflow", diff --git a/purchase_manual_delivery/static/description/index.html b/purchase_manual_delivery/static/description/index.html index 7c3effa03df..51e64844238 100644 --- a/purchase_manual_delivery/static/description/index.html +++ b/purchase_manual_delivery/static/description/index.html @@ -1,4 +1,3 @@ - @@ -367,7 +366,7 @@

Purchase Manual Delivery

!! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -!! source digest: sha256:1977c36b45704fecaa12431fae0390324a44c1528a47da37da8089a769c45036 +!! source digest: sha256:8047ec82b4b9e631868f92fc323a79bf0b600c84ae5efada49283f279387f837 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->

Beta License: AGPL-3 OCA/purchase-workflow Translate me on Weblate Try me on Runboat

The goal of this module is to allow the manual creation of incoming shipments. When installed,