Skip to content

Commit

Permalink
Merge pull request #658 from OCA/15.0
Browse files Browse the repository at this point in the history
Syncing from upstream OCA/operating-unit (15.0)
  • Loading branch information
bt-admin authored Feb 15, 2025
2 parents 29b2144 + ed30f1a commit 126fb69
Show file tree
Hide file tree
Showing 7 changed files with 75 additions and 9 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ addon | version | maintainers | summary
[sale_stock_operating_unit](sale_stock_operating_unit/) | 15.0.1.0.0 | | An operating unit (OU) is an organizational entity part of a company
[sales_team_operating_unit](sales_team_operating_unit/) | 15.0.1.0.0 | | Sales Team Operating Unit
[stock_account_operating_unit](stock_account_operating_unit/) | 15.0.1.0.0 | | Create journal entries in moves between internal locations with different operating units.
[stock_operating_unit](stock_operating_unit/) | 15.0.1.3.1 | | Adds the concept of operating unit (OU) in stock management
[stock_operating_unit](stock_operating_unit/) | 15.0.1.3.2 | | Adds the concept of operating unit (OU) in stock management
[stock_operating_unit_access_all](stock_operating_unit_access_all/) | 15.0.1.1.0 | [![kittiu](https://github.com/kittiu.png?size=30px)](https://github.com/kittiu) | Access all OUs' Stock

[//]: # (end addons)
Expand Down
22 changes: 22 additions & 0 deletions purchase_operating_unit_access_all/i18n/es.po
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * purchase_operating_unit_access_all
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 15.0\n"
"Report-Msgid-Bugs-To: \n"
"PO-Revision-Date: 2025-02-14 13:06+0000\n"
"Last-Translator: Anna Martínez <[email protected]>\n"
"Language-Team: none\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 5.6.2\n"

#. module: purchase_operating_unit_access_all
#: model:res.groups,name:purchase_operating_unit_access_all.group_all_ou_purchase
msgid "Access all OUs' purchase orders"
msgstr "Acceso a los pedidos de compra de todas las UO"
37 changes: 37 additions & 0 deletions sales_team_operating_unit/i18n/es.po
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * sales_team_operating_unit
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 15.0\n"
"Report-Msgid-Bugs-To: \n"
"PO-Revision-Date: 2025-02-14 13:06+0000\n"
"Last-Translator: Anna Martínez <[email protected]>\n"
"Language-Team: none\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 5.6.2\n"

#. module: sales_team_operating_unit
#: code:addons/sales_team_operating_unit/models/crm_team.py:0
#, python-format
msgid ""
"Configuration error, The Company in the Sales Team and in the Operating Unit"
" must be the same."
msgstr ""
"Error de configuración, la compañía en el equipo de ventas y en la unidad "
"operativa han de ser la misma."

#. module: sales_team_operating_unit
#: model:ir.model.fields,field_description:sales_team_operating_unit.field_crm_team__operating_unit_id
msgid "Operating Unit"
msgstr "Unidad Operativa"

#. module: sales_team_operating_unit
#: model:ir.model,name:sales_team_operating_unit.model_crm_team
msgid "Sales Team"
msgstr "Equipo de venta"
2 changes: 1 addition & 1 deletion 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:cef7f83cf477bd84974b1cc124c326cfe1d0b5a36069871f7e1076f0ae0005c6
!! source digest: sha256:076485278ad7f0f8761ee7e49e88b9b576be992d854473d5daab20bc12418ee5
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
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": "15.0.1.3.1",
"version": "15.0.1.3.2",
"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 @@ -49,6 +49,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
14 changes: 8 additions & 6 deletions stock_operating_unit/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 All @@ -9,10 +8,11 @@

/*
:Author: David Goodger ([email protected])
:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
:Copyright: This stylesheet has been placed in the public domain.
Default cascading style sheet for the HTML output of Docutils.
Despite the name, some widely supported CSS2 features are used.
See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
customize this style sheet.
Expand Down Expand Up @@ -275,7 +275,7 @@
margin-left: 2em ;
margin-right: 2em }

pre.code .ln { color: grey; } /* line numbers */
pre.code .ln { color: gray; } /* line numbers */
pre.code, code { background-color: #eeeeee }
pre.code .comment, code .comment { color: #5C6576 }
pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
Expand All @@ -301,7 +301,7 @@
span.pre {
white-space: pre }

span.problematic {
span.problematic, pre.problematic {
color: red }

span.section-subtitle {
Expand Down 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:cef7f83cf477bd84974b1cc124c326cfe1d0b5a36069871f7e1076f0ae0005c6
!! source digest: sha256:076485278ad7f0f8761ee7e49e88b9b576be992d854473d5daab20bc12418ee5
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<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/15.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-15-0/operating-unit-15-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=15.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 Expand Up @@ -442,7 +442,9 @@ <h2><a class="toc-backref" href="#toc-entry-7">Contributors</a></h2>
<div class="section" id="maintainers">
<h2><a class="toc-backref" href="#toc-entry-8">Maintainers</a></h2>
<p>This module is maintained by the OCA.</p>
<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
<a class="reference external image-reference" href="https://odoo-community.org">
<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
</a>
<p>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.</p>
Expand Down

0 comments on commit 126fb69

Please sign in to comment.