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.

Sign up for GitHub

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

Syncing from upstream OCA/purchase-workflow (16.0) #1339

Merged
merged 3 commits into from
Jan 22, 2024
Merged

Syncing from upstream OCA/purchase-workflow (16.0) #1339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8719deb
[16.0][FIX] purchase_order_no_zero_price: Resolve conflict between co…
aliciagaarzo Jan 11, 2024
a5ce810
Merge PR #2146 into 16.0
OCA-git-bot Jan 18, 2024
221caf0
[BOT] post-merge updates
OCA-git-bot Jan 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ addon | version | maintainers | summary
[purchase_order_general_discount](purchase_order_general_discount/) | 16.0.1.0.0 | | General discount per purchase order
[purchase_order_hide_receipt_status](purchase_order_hide_receipt_status/) | 16.0.1.0.1 | | Purchase Order Hide Receipt Status
[purchase_order_line_menu](purchase_order_line_menu/) | 16.0.2.1.0 | | Adds Purchase Order Lines Menu
[purchase_order_no_zero_price](purchase_order_no_zero_price/) | 16.0.1.0.0 | | Prevent zero price lines on Purchase Orders
[purchase_order_no_zero_price](purchase_order_no_zero_price/) | 16.0.1.0.1 | | Prevent zero price lines on Purchase Orders
[purchase_order_owner](purchase_order_owner/) | 16.0.1.0.0 | | Purchase Order Owner
[purchase_order_product_recommendation](purchase_order_product_recommendation/) | 16.0.1.1.0 | | Recommend products to buy to supplier based on history
[purchase_order_purchase_manager](purchase_order_purchase_manager/) | 16.0.1.0.1 | [![EmilioPascual](https://github.com/EmilioPascual.png?size=30px)](https://github.com/EmilioPascual) | Purchase Manager from Supplier in Purchase Order
Expand Down
2 changes: 1 addition & 1 deletion purchase_order_no_zero_price/README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Purchase Order No Zero Price
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:bf539f7dad4a7ab1807ec65eb5e55eaccb31bd91be5ad1daa4f55d9eede947a0
!! source digest: sha256:4eb4147526f4d1e11825c053c153ecdc24f5f1a06d0bec22c855af18dbf34bd9
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
Expand Down
2 changes: 1 addition & 1 deletion purchase_order_no_zero_price/__manifest__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

{
"name": "Purchase Order No Zero Price",
"version": "16.0.1.0.0",
"version": "16.0.1.0.1",
"author": "Open Source Integrators, Odoo Community Association (OCA)",
"summary": "Prevent zero price lines on Purchase Orders",
"website": "https://github.com/OCA/purchase-workflow",
Expand Down
2 changes: 1 addition & 1 deletion purchase_order_no_zero_price/models/purchase_order_line.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ def _check_price_unit_zero(self):
# Also supports `purchase_triple_discount` module
no_price_lines = self.filtered(
lambda x: not x.display_type
and x.state not in ["draft", "done", "cancel"]
and x.state not in ["draft", "cancel"]
and not x.price_unit
# Allow zero price for 100% discounts:
and getattr(x, "discount", 0.0) != 100.0
Expand Down
3 changes: 1 addition & 2 deletions purchase_order_no_zero_price/static/description/index.html
View file
Open in desktop
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 Order No Zero Price</h1>
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:bf539f7dad4a7ab1807ec65eb5e55eaccb31bd91be5ad1daa4f55d9eede947a0
!! source digest: sha256:4eb4147526f4d1e11825c053c153ecdc24f5f1a06d0bec22c855af18dbf34bd9
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<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_order_no_zero_price"><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_order_no_zero_price"><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>Prevent zero prices on confirmed POs to help ensure proper Stock Valuation
Expand Down
Loading