Skip to content

Commit

Permalink
Merge branch 'OCA:16.0' into migration/product_form_purchase_link
Browse files Browse the repository at this point in the history
  • Loading branch information
atularvind authored Mar 12, 2024
2 parents b963a60 + 6d38607 commit fec6a89
Show file tree
Hide file tree
Showing 247 changed files with 12,398 additions and 445 deletions.
2 changes: 1 addition & 1 deletion .copier-answers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ odoo_version: 16.0
org_name: Odoo Community Association (OCA)
org_slug: OCA
rebel_module_groups:
- purchase_security
- purchase_security,purchase_order_qty_change_no_recompute
repo_description: 'TODO: add repo description.'
repo_name: purchase-workflow
repo_slug: purchase-workflow
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,17 @@ jobs:
matrix:
include:
- container: ghcr.io/oca/oca-ci/py3.10-odoo16.0:latest
include: "purchase_security"
include: "purchase_security,purchase_order_qty_change_no_recompute"
name: test with Odoo
- container: ghcr.io/oca/oca-ci/py3.10-ocb16.0:latest
include: "purchase_security"
include: "purchase_security,purchase_order_qty_change_no_recompute"
name: test with OCB
makepot: "true"
- container: ghcr.io/oca/oca-ci/py3.10-odoo16.0:latest
exclude: "purchase_security"
exclude: "purchase_security,purchase_order_qty_change_no_recompute"
name: test with Odoo
- container: ghcr.io/oca/oca-ci/py3.10-ocb16.0:latest
exclude: "purchase_security"
exclude: "purchase_security,purchase_order_qty_change_no_recompute"
name: test with OCB
makepot: "true"
services:
Expand Down
12 changes: 9 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ Available addons
----------------
addon | version | maintainers | summary
--- | --- | --- | ---
[procurement_purchase_no_grouping](procurement_purchase_no_grouping/) | 16.0.1.0.0 | | Procurement Purchase No Grouping
[product_supplier_code_purchase](product_supplier_code_purchase/) | 16.0.1.0.0 | | This module adds to the purchase order line the supplier code defined in the product.
[product_supplierinfo_qty_multiplier](product_supplierinfo_qty_multiplier/) | 16.0.1.0.0 | [![victoralmau](https://github.com/victoralmau.png?size=30px)](https://github.com/victoralmau) [![legalsylvain](https://github.com/legalsylvain.png?size=30px)](https://github.com/legalsylvain) | Product supplierinfo qty multiplier
[purchase_advance_payment](purchase_advance_payment/) | 16.0.1.0.0 | | Allow to add advance payments on purchase orders
Expand All @@ -41,7 +42,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 All @@ -53,8 +54,11 @@ addon | version | maintainers | summary
[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.1 | | Prevent zero price lines on Purchase Orders
[purchase_order_owner](purchase_order_owner/) | 16.0.1.0.0 | | Purchase Order Owner
[purchase_order_price_recalculation](purchase_order_price_recalculation/) | 16.0.1.0.0 | [![victoralmau](https://github.com/victoralmau.png?size=30px)](https://github.com/victoralmau) | Price recalculation in purchases orders
[purchase_order_product_attachment_mgmt](purchase_order_product_attachment_mgmt/) | 16.0.1.0.0 | [![victoralmau](https://github.com/victoralmau.png?size=30px)](https://github.com/victoralmau) | Purchase Order Product Attachment Mgmt
[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
[purchase_order_qty_change_no_recompute](purchase_order_qty_change_no_recompute/) | 16.0.1.0.0 | [![victoralmau](https://github.com/victoralmau.png?size=30px)](https://github.com/victoralmau) | Prevent recompute if only quantity has changed in purchase order line
[purchase_order_supplierinfo_update](purchase_order_supplierinfo_update/) | 16.0.1.0.1 | [![ernestotejeda](https://github.com/ernestotejeda.png?size=30px)](https://github.com/ernestotejeda) | Update product supplierinfo with the last purchase price
[purchase_order_type](purchase_order_type/) | 16.0.1.0.1 | | Purchase Order Type
[purchase_order_type_dashboard](purchase_order_type_dashboard/) | 16.0.1.0.0 | [![dalonsod](https://github.com/dalonsod.png?size=30px)](https://github.com/dalonsod) | Purchase Order Type Dashboard
Expand All @@ -65,15 +69,17 @@ addon | version | maintainers | summary
[purchase_partner_selectable_option](purchase_partner_selectable_option/) | 16.0.1.0.3 | [![victoralmau](https://github.com/victoralmau.png?size=30px)](https://github.com/victoralmau) | Purchase Partner Selectable Option
[purchase_product_packaging_container_deposit](purchase_product_packaging_container_deposit/) | 16.0.1.0.0 | | Purchase Product Packaging Container Deposit
[purchase_reception_status](purchase_reception_status/) | 16.0.1.0.1 | [![alexis-via](https://github.com/alexis-via.png?size=30px)](https://github.com/alexis-via) | Add reception status on purchase orders
[purchase_request](purchase_request/) | 16.0.1.0.3 | | Use this module to have notification of requirements of materials and/or external services and keep track of such requirements.
[purchase_request](purchase_request/) | 16.0.1.0.4 | | Use this module to have notification of requirements of materials and/or external services and keep track of such requirements.
[purchase_request_tier_validation](purchase_request_tier_validation/) | 16.0.1.0.0 | | Extends the functionality of Purchase Requests to support a tier validation process.
[purchase_requisition_tier_validation](purchase_requisition_tier_validation/) | 16.0.1.0.0 | | Extends the functionality of Purchase Agreements to support a tier validation process.
[purchase_security](purchase_security/) | 16.0.1.0.0 | [![pilarvargas-tecnativa](https://github.com/pilarvargas-tecnativa.png?size=30px)](https://github.com/pilarvargas-tecnativa) | See only your purchase orders
[purchase_security](purchase_security/) | 16.0.2.0.0 | [![pilarvargas-tecnativa](https://github.com/pilarvargas-tecnativa.png?size=30px)](https://github.com/pilarvargas-tecnativa) | See only your purchase orders
[purchase_stock_packaging](purchase_stock_packaging/) | 16.0.1.0.0 | [![rousseldenis](https://github.com/rousseldenis.png?size=30px)](https://github.com/rousseldenis) | Allows to transmit the product packaging from the procurement values to the generated purchase order line
[purchase_stock_price_unit_sync](purchase_stock_price_unit_sync/) | 16.0.1.0.0 | | Update cost price in stock moves already done
[purchase_tag](purchase_tag/) | 16.0.1.1.0 | | Allows to add multiple tags to purchase orders
[purchase_tier_validation](purchase_tier_validation/) | 16.0.1.1.0 | | Extends the functionality of Purchase Orders to support a tier validation process.
[purchase_triple_discount](purchase_triple_discount/) | 16.0.1.0.0 | | Manage triple discount on purchase order lines
[purchase_warn_message](purchase_warn_message/) | 16.0.1.0.0 | | Add a popup warning on purchase to ensure warning is populated
[purchase_work_acceptance](purchase_work_acceptance/) | 16.0.1.0.0 | [![ps-tubtim](https://github.com/ps-tubtim.png?size=30px)](https://github.com/ps-tubtim) | Purchase Work Acceptance
[sale_purchase_force_vendor](sale_purchase_force_vendor/) | 16.0.1.0.0 | [![victoralmau](https://github.com/victoralmau.png?size=30px)](https://github.com/victoralmau) | Sale Purchase Force Vendor
[supplier_calendar](supplier_calendar/) | 16.0.1.0.0 | [![LoisRForgeFlow](https://github.com/LoisRForgeFlow.png?size=30px)](https://github.com/LoisRForgeFlow) | Supplier Calendar

Expand Down
120 changes: 120 additions & 0 deletions procurement_purchase_no_grouping/README.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
================================
Procurement Purchase No Grouping
================================

..
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:320e503a366f31483300d63b61168d29779c1266aebb61a4c752b20ed5a171ab
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
:target: https://odoo-community.org/page/development-status
:alt: Beta
.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
:alt: License: AGPL-3
.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fpurchase--workflow-lightgray.png?logo=github
:target: https://github.com/OCA/purchase-workflow/tree/16.0/procurement_purchase_no_grouping
:alt: OCA/purchase-workflow
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
:target: https://translation.odoo-community.org/projects/purchase-workflow-16-0/purchase-workflow-16-0-procurement_purchase_no_grouping
:alt: Translate me on Weblate
.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
:target: https://runboat.odoo-community.org/builds?repo=OCA/purchase-workflow&target_branch=16.0
:alt: Try me on Runboat

|badge1| |badge2| |badge3| |badge4| |badge5|

This module allows to not group generated purchase orders from procurements.
The grouping behaviour can be configurable at product category level or fall back
to system default.

**Table of contents**

.. contents::
:local:

Configuration
=============

Go to each product category, and select one of these values in the field
"Procured purchase grouping":

* *Standard grouping*: With this option, procurements will generate
purchase orders as always, grouping lines and orders when possible.
* *No line grouping*: With this value, if there are any open purchase order
for the same supplier, it will be reused, but lines won't be merged.
* *No order grouping*: This option will prevent any kind of grouping.
* *<empty>*: If you select nothing, default value set up in System
settings will be applied.
* *Product category grouping*: This option groups products in the same purchase order that belongs to the same product category.

System default behaviour can be set up in System settings / Purchase / Procurement
Purchase Grouping

Known issues / Roadmap
======================

- If you reuse the same procurement group between several sales orders, and
using "No line grouping", they will be grouped anyways, as the criteria for
grouping or not should be kept to the same procurement group, as it's the only
way to get proper quantities updates after confirming the sales order.

Bug Tracker
===========

Bugs are tracked on `GitHub Issues <https://github.com/OCA/purchase-workflow/issues>`_.
In case of trouble, please check there if your issue has already been reported.
If you spotted it first, help us to smash it by providing a detailed and welcomed
`feedback <https://github.com/OCA/purchase-workflow/issues/new?body=module:%20procurement_purchase_no_grouping%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.

Do not contact contributors directly about support or help with technical issues.

Credits
=======

Authors
~~~~~~~

* AvanzOSC
* Tecnativa

Contributors
~~~~~~~~~~~~

* `Tecnativa <https://www.tecnativa.com>`_:

* Pedro M. Baeza
* Sergio Teruel
* Carlos Dauden
* Alexandre Díaz
* Víctor Martínez
* César A. Sánchez

* Ana Juaristi <[email protected]>
* Alfredo de la Fuente <[email protected]>
* Radovan Skolnik <[email protected]>

* `Pesol <https://www.pesol.es>`__:

* Jonathan Oscategui Taza <[email protected]>

Maintainers
~~~~~~~~~~~

This module is maintained by the OCA.

.. image:: https://odoo-community.org/logo.png
:alt: Odoo Community Association
:target: https://odoo-community.org

OCA, or the Odoo Community Association, is a nonprofit organization whose
mission is to support the collaborative development of Odoo features and
promote its widespread use.

This module is part of the `OCA/purchase-workflow <https://github.com/OCA/purchase-workflow/tree/16.0/procurement_purchase_no_grouping>`_ project on GitHub.

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
1 change: 1 addition & 0 deletions procurement_purchase_no_grouping/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
from . import models
16 changes: 16 additions & 0 deletions procurement_purchase_no_grouping/__manifest__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Copyright 2015 AvanzOsc (http://www.avanzosc.es)
# Copyright 2015-2017 Tecnativa - Pedro M. Baeza
# Copyright 2018 Tecnativa - Carlos Dauden
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)

{
"name": "Procurement Purchase No Grouping",
"version": "16.0.1.0.0",
"author": "AvanzOSC, Tecnativa, Odoo Community Association (OCA)",
"website": "https://github.com/OCA/purchase-workflow",
"category": "Procurements",
"depends": ["purchase_stock"],
"data": ["views/product_category_view.xml", "views/res_config_settings_views.xml"],
"installable": True,
"license": "AGPL-3",
}
Loading

0 comments on commit fec6a89

Please sign in to comment.