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

Syncing from upstream OCA/operating-unit (17.0) #660

Merged
merged 3 commits into from
Feb 15, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ addon | version | maintainers | summary
[sale_operating_unit](sale_operating_unit/) | 17.0.1.0.0 | | An operating unit (OU) is an organizational entity part of a company
[sale_stock_operating_unit](sale_stock_operating_unit/) | 17.0.1.0.0 | | An operating unit (OU) is an organizational entity part of a company
[sales_team_operating_unit](sales_team_operating_unit/) | 17.0.1.0.0 | | Sales Team Operating Unit
[stock_operating_unit](stock_operating_unit/) | 17.0.1.0.0 | | Adds the concept of operating unit (OU) in stock management
[stock_operating_unit](stock_operating_unit/) | 17.0.1.0.1 | | Adds the concept of operating unit (OU) in stock management
[stock_operating_unit_access_all](stock_operating_unit_access_all/) | 17.0.1.0.0 | [![kittiu](https://github.com/kittiu.png?size=30px)](https://github.com/kittiu) | Access all OUs' Stock

[//]: # (end addons)
Expand Down
26 changes: 13 additions & 13 deletions stock_operating_unit/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Stock with Operating Units
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:eb7e590c088d935a5c353f2bd97a92e82b2ac423297e34acb1ccf6289f5aab1a
!! source digest: sha256:6fbc2600f0d267281fcf7e8ca229e2cafed643015e2ba69414110af71fc09c49
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
Expand All @@ -30,10 +30,10 @@ Stock with Operating Units

This module introduces the following features:

- Adds the operating unit to the Warehouse.
- Adds the operating unit to the Stock Location.
- Adds the requesting operating unit to stock pickings.
- Implements user's security access rules.
- Adds the operating unit to the Warehouse.
- Adds the operating unit to the Stock Location.
- Adds the requesting operating unit to stock pickings.
- Implements user's security access rules.

**Table of contents**

Expand All @@ -45,8 +45,8 @@ Configuration

To configure this module, you need to:

- Assign Operating Unit to Warehouses.
- Assign Operating Unit to Stock Locations.
- Assign Operating Unit to Warehouses.
- Assign Operating Unit to Stock Locations.

Usage
=====
Expand Down Expand Up @@ -83,12 +83,12 @@ Authors
Contributors
------------

- Jordi Ballester Alomar <[email protected]>
- Aaron Henriquez <[email protected]>
- Sudhir Arya <[email protected]>
- Nicola Studer <[email protected]>
- Kitti U. <[email protected]>
- Alan Ramos <[email protected]>
- Jordi Ballester Alomar <[email protected]>
- Aaron Henriquez <[email protected]>
- Sudhir Arya <[email protected]>
- Nicola Studer <[email protected]>
- Kitti U. <[email protected]>
- Alan Ramos <[email protected]>

Maintainers
-----------
Expand Down
2 changes: 1 addition & 1 deletion stock_operating_unit/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
{
"name": "Stock with Operating Units",
"summary": "Adds the concept of operating unit (OU) in stock management",
"version": "17.0.1.0.0",
"version": "17.0.1.0.1",
"category": "Generic Modules/Sales & Purchases",
"author": "ForgeFlow, "
"Serpent Consulting Services Pvt. Ltd., "
Expand Down
5 changes: 5 additions & 0 deletions stock_operating_unit/model/stock_warehouse.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@ class StockWarehouseOrderPoint(models.Model):
)
def _check_location(self):
for rec in self:
# Fix: do not check OU on locations that do not have a warehouse at all
# Odoo's base `stock` module will still fill the `warehouse_id` field
# incorrectly with the company's default warehouse
if not rec.location_id.warehouse_id:
continue
if (
rec.warehouse_id.operating_unit_id
and rec.warehouse_id
Expand Down
2 changes: 1 addition & 1 deletion stock_operating_unit/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ <h1 class="title">Stock with Operating Units</h1>
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:eb7e590c088d935a5c353f2bd97a92e82b2ac423297e34acb1ccf6289f5aab1a
!! source digest: sha256:6fbc2600f0d267281fcf7e8ca229e2cafed643015e2ba69414110af71fc09c49
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<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/lgpl-3.0-standalone.html"><img alt="License: LGPL-3" src="https://img.shields.io/badge/licence-LGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/operating-unit/tree/17.0/stock_operating_unit"><img alt="OCA/operating-unit" src="https://img.shields.io/badge/github-OCA%2Foperating--unit-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/operating-unit-17-0/operating-unit-17-0-stock_operating_unit"><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/operating-unit&amp;target_branch=17.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
<p>This module introduces the following features:</p>
Expand Down