Skip to content

Commit e75eea4

Browse files
authored
Merge pull request #1763 from OCA/18.0
Syncing from upstream OCA/stock-logistics-warehouse (18.0)
2 parents 4eec553 + 579a08b commit e75eea4

File tree

11 files changed

+71
-17
lines changed

11 files changed

+71
-17
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ addon | version | maintainers | summary
3030
[stock_archive_constraint](stock_archive_constraint/) | 18.0.1.0.0 | <a href='https://github.com/victoralmau'><img src='https://github.com/victoralmau.png' width='32' height='32' style='border-radius:50%;' alt='victoralmau'/></a> | Stock archive constraint
3131
[stock_demand_estimate](stock_demand_estimate/) | 18.0.1.0.0 | | Allows to create demand estimates.
3232
[stock_demand_estimate_matrix](stock_demand_estimate_matrix/) | 18.0.1.0.0 | | Allows to create demand estimates.
33-
[stock_inventory](stock_inventory/) | 18.0.1.0.0 | | Allows to do an easier follow up of the Inventory Adjustments
33+
[stock_inventory](stock_inventory/) | 18.0.1.1.0 | | Allows to do an easier follow up of the Inventory Adjustments
3434
[stock_inventory_count_to_zero](stock_inventory_count_to_zero/) | 18.0.1.0.0 | | Request an inventory count filling the quantities to zero as default
3535
[stock_inventory_discrepancy](stock_inventory_discrepancy/) | 18.0.1.0.0 | | Adds the capability to show the discrepancy of every line in an inventory and to block the inventory validation when the discrepancy is over a user defined threshold.
3636
[stock_inventory_lockdown](stock_inventory_lockdown/) | 18.0.1.0.0 | | Lock down stock locations during inventories.

stock_inventory/README.rst

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
.. image:: https://odoo-community.org/readme-banner-image
2+
:target: https://odoo-community.org/get-involved?utm_source=readme
3+
:alt: Odoo Community Association
4+
15
==========================
26
Stock Inventory Adjustment
37
==========================
@@ -7,13 +11,13 @@ Stock Inventory Adjustment
711
!! This file is generated by oca-gen-addon-readme !!
812
!! changes will be overwritten. !!
913
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
10-
!! source digest: sha256:54d0ec7cb6baa88d9540374848d6c46efdd181690a90706b8c7f346328c076f8
14+
!! source digest: sha256:11a6547e3975f699bcd9d51decf96ddad449ff63d3f38fbf6c2508766a5abb21
1115
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
1216
1317
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
1418
:target: https://odoo-community.org/page/development-status
1519
:alt: Beta
16-
.. |badge2| image:: https://img.shields.io/badge/licence-LGPL--3-blue.png
20+
.. |badge2| image:: https://img.shields.io/badge/license-LGPL--3-blue.png
1721
:target: http://www.gnu.org/licenses/lgpl-3.0-standalone.html
1822
:alt: License: LGPL-3
1923
.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fstock--logistics--warehouse-lightgray.png?logo=github

stock_inventory/__manifest__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "Stock Inventory Adjustment",
3-
"version": "18.0.1.0.0",
3+
"version": "18.0.1.1.0",
44
"license": "LGPL-3",
55
"maintainer": ["DavidJForgeFlow"],
66
"development_status": "Beta",

stock_inventory/i18n/es.po

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -434,6 +434,12 @@ msgstr ""
434434
"Cuando selecciona 'Selección de productos: Número de serie del lote' sólo "
435435
"puede añadir un producto."
436436

437+
#. module: stock_inventory
438+
#. odoo-python
439+
#: code:addons/stock_inventory/models/stock_inventory.py:0
440+
msgid "You can only delete inventory adjustments groups in draft state."
441+
msgstr ""
442+
437443
#. module: stock_inventory
438444
#. odoo-python
439445
#: code:addons/stock_inventory/models/stock_inventory.py:0

stock_inventory/i18n/fr.po

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -434,6 +434,12 @@ msgstr ""
434434
"Quand 'Sélection d'article : article unique' est sélectionné, vous n'êtes en "
435435
"mesure d'ajouter qu'un seul article."
436436

437+
#. module: stock_inventory
438+
#. odoo-python
439+
#: code:addons/stock_inventory/models/stock_inventory.py:0
440+
msgid "You can only delete inventory adjustments groups in draft state."
441+
msgstr ""
442+
437443
#. module: stock_inventory
438444
#. odoo-python
439445
#: code:addons/stock_inventory/models/stock_inventory.py:0

stock_inventory/i18n/it.po

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ msgid ""
66
msgstr ""
77
"Project-Id-Version: Odoo Server 16.0\n"
88
"Report-Msgid-Bugs-To: \n"
9-
"PO-Revision-Date: 2025-06-24 08:25+0000\n"
9+
"PO-Revision-Date: 2025-08-07 14:25+0000\n"
1010
"Last-Translator: mymage <stefano.consolaro@mymage.it>\n"
1111
"Language-Team: none\n"
1212
"Language: it\n"
@@ -444,6 +444,13 @@ msgstr ""
444444
"Quando è selezionata 'Selezione prodotto: n prodotto' è possibile aggiungere "
445445
"un solo prodotto."
446446

447+
#. module: stock_inventory
448+
#. odoo-python
449+
#: code:addons/stock_inventory/models/stock_inventory.py:0
450+
msgid "You can only delete inventory adjustments groups in draft state."
451+
msgstr ""
452+
"Si possono cancellare solo i gruppi di rettifica inventariale in stato bozza."
453+
447454
#. module: stock_inventory
448455
#. odoo-python
449456
#: code:addons/stock_inventory/models/stock_inventory.py:0

stock_inventory/i18n/stock_inventory.pot

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -427,6 +427,12 @@ msgid ""
427427
"one product."
428428
msgstr ""
429429

430+
#. module: stock_inventory
431+
#. odoo-python
432+
#: code:addons/stock_inventory/models/stock_inventory.py:0
433+
msgid "You can only delete inventory adjustments groups in draft state."
434+
msgstr ""
435+
430436
#. module: stock_inventory
431437
#. odoo-python
432438
#: code:addons/stock_inventory/models/stock_inventory.py:0

stock_inventory/i18n/tr.po

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -428,6 +428,12 @@ msgid ""
428428
"one product."
429429
msgstr ""
430430

431+
#. module: stock_inventory
432+
#. odoo-python
433+
#: code:addons/stock_inventory/models/stock_inventory.py:0
434+
msgid "You can only delete inventory adjustments groups in draft state."
435+
msgstr ""
436+
431437
#. module: stock_inventory
432438
#. odoo-python
433439
#: code:addons/stock_inventory/models/stock_inventory.py:0

stock_inventory/models/stock_inventory.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -471,3 +471,14 @@ def _check_one_product_in_product_selection(self):
471471
" you are only able to add one product."
472472
)
473473
)
474+
475+
def unlink(self):
476+
for adjustment in self:
477+
if adjustment.state != "draft":
478+
raise UserError(
479+
self.env._(
480+
"You can only delete inventory adjustments groups in"
481+
" draft state."
482+
)
483+
)
484+
return super().unlink()

stock_inventory/models/stock_move_line.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,6 @@
44
class StockMoveLine(models.Model):
55
_inherit = "stock.move.line"
66

7-
inventory_adjustment_id = fields.Many2one("stock.inventory")
7+
inventory_adjustment_id = fields.Many2one(
8+
"stock.inventory", ondelete="restrict", index=True
9+
)

0 commit comments

Comments
 (0)