Skip to content

Commit

Permalink
Merge pull request #1375 from OCA/16.0
Browse files Browse the repository at this point in the history
Syncing from upstream OCA/purchase-workflow (16.0)
  • Loading branch information
bt-admin authored Feb 23, 2024
2 parents b79ebfd + db868d1 commit bf95fa0
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion purchase_manual_delivery/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion purchase_manual_delivery/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
5 changes: 3 additions & 2 deletions purchase_manual_delivery/models/purchase_order.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 1 addition & 2 deletions purchase_manual_delivery/static/description/index.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
Expand Down Expand Up @@ -367,7 +366,7 @@ <h1 class="title">Purchase Manual Delivery</h1>
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:1977c36b45704fecaa12431fae0390324a44c1528a47da37da8089a769c45036
!! source digest: sha256:8047ec82b4b9e631868f92fc323a79bf0b600c84ae5efada49283f279387f837
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/purchase-workflow/tree/16.0/purchase_manual_delivery"><img alt="OCA/purchase-workflow" src="https://img.shields.io/badge/github-OCA%2Fpurchase--workflow-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/purchase-workflow-16-0/purchase-workflow-16-0-purchase_manual_delivery"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/purchase-workflow&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
<p>The goal of this module is to allow the manual creation of incoming shipments. When installed,
Expand Down

0 comments on commit bf95fa0

Please sign in to comment.