Merge pull request #1864 from OCA/18.0

Syncing from upstream OCA/stock-logistics-warehouse (18.0)

Author: bt-admin

README.md

@@ -58,7 +58,7 @@ addon | version | maintainers | summary
 [stock_move_location](stock_move_location/) | 18.0.1.0.1 |  | This module allows to move all stock in a stock location to an other one.
 [stock_move_location_purchase_uom](stock_move_location_purchase_uom/) | 18.0.1.0.0 |  | This module 'glues' the modules stock_move_location and stock_move_purchase_uom.
 [stock_move_packaging_qty](stock_move_packaging_qty/) | 18.0.1.1.0 | <a href='https://github.com/yajo'><img src='https://github.com/yajo.png' width='32' height='32' style='border-radius:50%;' alt='yajo'/></a> <a href='https://github.com/EmilioPascual'><img src='https://github.com/EmilioPascual.png' width='32' height='32' style='border-radius:50%;' alt='EmilioPascual'/></a> <a href='https://github.com/Shide'><img src='https://github.com/Shide.png' width='32' height='32' style='border-radius:50%;' alt='Shide'/></a> | Add packaging fields in the stock moves
-[stock_move_purchase_uom](stock_move_purchase_uom/) | 18.0.1.1.0 |  | Allow to use the purchase UoM in a stock move
+[stock_move_purchase_uom](stock_move_purchase_uom/) | 18.0.1.1.1 |  | Allow to use the purchase UoM in a stock move
 [stock_move_reset_quantity](stock_move_reset_quantity/) | 18.0.1.0.0 |  | Reset quantity to zero
 [stock_package_type_volume](stock_package_type_volume/) | 18.0.1.0.0 |  | Compute volume of a package type
 [stock_packaging_calculator](stock_packaging_calculator/) | 18.0.2.0.0 |  | Compute product quantity to pick by packaging

stock_move_purchase_uom/README.rst

@@ -11,7 +11,7 @@ Stock Move Purchase UoM
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:553c8578d067ba2cfa733eeddbd6cd7dea4d91ae3aaf42730be3701e5feaee96
+   !! source digest: sha256:9994b9770d0c6252f3cd46b773aa4c437acbcfe9a2dfd345e9c57fdb1f4ddce3
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

stock_move_purchase_uom/__manifest__.py

@@ -3,7 +3,7 @@
 {
     "name": "Stock Move Purchase UoM",
     "summary": "Allow to use the purchase UoM in a stock move",
-    "version": "18.0.1.1.0",
+    "version": "18.0.1.1.1",
     "author": "ForgeFlow, Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/stock-logistics-warehouse",
     "category": "Warehouse",

stock_move_purchase_uom/models/stock_move.py

@@ -16,7 +16,6 @@ def create(self, vals_list):
                 and move.picking_type_id
                 and move.picking_type_id.use_purchase_uom
                 and purchase_uom
-                and move.product_uom != purchase_uom
                 and not move.origin_returned_move_id
             ):
                 updated_product_uom_qty = move.product_uom._compute_quantity(

stock_move_purchase_uom/static/description/index.html

@@ -372,7 +372,7 @@ <h1>Stock Move Purchase UoM</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:553c8578d067ba2cfa733eeddbd6cd7dea4d91ae3aaf42730be3701e5feaee96
+!! source digest: sha256:9994b9770d0c6252f3cd46b773aa4c437acbcfe9a2dfd345e9c57fdb1f4ddce3
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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/license-LGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/stock-logistics-warehouse/tree/18.0/stock_move_purchase_uom"><img alt="OCA/stock-logistics-warehouse" src="https://img.shields.io/badge/github-OCA%2Fstock--logistics--warehouse-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/stock-logistics-warehouse-18-0/stock-logistics-warehouse-18-0-stock_move_purchase_uom"><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/stock-logistics-warehouse&amp;target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module adds a check in the operation types form that allows users

stock_move_purchase_uom/tests/test_stock_move.py

@@ -47,3 +47,55 @@ def test_create_move_rounding_method_up(self):
         picking = picking_form.save()
         move = picking.move_ids_without_package[0]
         self.assertEqual(move.product_uom_qty, 0.01)
+
+    def test_create_move_same_uom_rounding_up(self):
+        unit_uom = self.env.ref("uom.product_uom_unit")
+        unit_uom.rounding = 1.0
+        product_unit = self.env["product.product"].create(
+            {
+                "name": "Test product unit",
+                "is_storable": True,
+                "categ_id": self.env.ref("product.product_category_all").id,
+                "uom_id": unit_uom.id,
+                "uom_po_id": unit_uom.id,
+            }
+        )
+        self.stock_picking_type_2.purchase_uom_rounding_method = "UP"
+        move = self.env["stock.move"].create(
+            {
+                "name": product_unit.display_name,
+                "location_id": self.location.id,
+                "location_dest_id": self.location_dest.id,
+                "product_id": product_unit.id,
+                "product_uom_qty": 5.25,
+                "picking_type_id": self.stock_picking_type_2.id,
+                "product_uom": unit_uom.id,
+            }
+        )
+        self.assertEqual(move.product_uom_qty, 6.0)
+
+    def test_create_move_same_uom_rounding_half_up(self):
+        unit_uom = self.env.ref("uom.product_uom_unit")
+        unit_uom.rounding = 1.0
+        product_unit = self.env["product.product"].create(
+            {
+                "name": "Test product unit",
+                "is_storable": True,
+                "categ_id": self.env.ref("product.product_category_all").id,
+                "uom_id": unit_uom.id,
+                "uom_po_id": unit_uom.id,
+            }
+        )
+        self.stock_picking_type_2.purchase_uom_rounding_method = "HALF-UP"
+        move = self.env["stock.move"].create(
+            {
+                "name": product_unit.display_name,
+                "location_id": self.location.id,
+                "location_dest_id": self.location_dest.id,
+                "product_id": product_unit.id,
+                "product_uom_qty": 5.25,
+                "picking_type_id": self.stock_picking_type_2.id,
+                "product_uom": unit_uom.id,
+            }
+        )
+        self.assertEqual(move.product_uom_qty, 5.0)

stock_secondary_unit/i18n/tr.po

@@ -0,0 +1,104 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* stock_secondary_unit
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 18.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2026-02-13 15:09+0000\n"
+"Last-Translator: Betül Öğmen <betulo@eska.biz>\n"
+"Language-Team: none\n"
+"Language: tr\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.15.2\n"
+
+#. module: stock_secondary_unit
+#: model_terms:ir.ui.view,arch_db:stock_secondary_unit.product_form_view_procurement_button
+#: model_terms:ir.ui.view,arch_db:stock_secondary_unit.product_template_form_view_procurement_button
+msgid "<span class=\"o_stat_text\">Secondary Unit</span>"
+msgstr "<span class=\"o_stat_text\">İkincil Birim</span>"
+
+#. module: stock_secondary_unit
+#: model_terms:ir.ui.view,arch_db:stock_secondary_unit.report_delivery_document
+msgid "<strong>Secondary Qty</strong>"
+msgstr "<strong>İkincil Miktar</strong>"
+
+#. module: stock_secondary_unit
+#: model:ir.model.fields,field_description:stock_secondary_unit.field_stock_move__product_uom_qty
+msgid "Demand"
+msgstr "Talep"
+
+#. module: stock_secondary_unit
+#: model:ir.model,name:stock_secondary_unit.model_product_template
+msgid "Product"
+msgstr "Ürün"
+
+#. module: stock_secondary_unit
+#: model:ir.model,name:stock_secondary_unit.model_stock_move_line
+msgid "Product Moves (Stock Move Line)"
+msgstr "Ürün Hareketleri (Stok Hareket Satırları)"
+
+#. module: stock_secondary_unit
+#: model:ir.model,name:stock_secondary_unit.model_product_product
+msgid "Product Variant"
+msgstr "Ürün Varyantı"
+
+#. module: stock_secondary_unit
+#: model:ir.model.fields,field_description:stock_secondary_unit.field_stock_move_line__quantity
+msgid "Quantity"
+msgstr "Miktar"
+
+#. module: stock_secondary_unit
+#: model:ir.model.fields,field_description:stock_secondary_unit.field_product_product__secondary_unit_qty_available
+#: model:ir.model.fields,field_description:stock_secondary_unit.field_product_template__secondary_unit_qty_available
+#: model:ir.model.fields,field_description:stock_secondary_unit.field_stock_product_secondary_unit_mixin__secondary_unit_qty_available
+msgid "Quantity On Hand (2Unit)"
+msgstr "Stok Miktarı (2Birim)"
+
+#. module: stock_secondary_unit
+#: model:ir.model.fields,field_description:stock_secondary_unit.field_stock_move__secondary_uom_id
+#: model:ir.model.fields,field_description:stock_secondary_unit.field_stock_move_line__secondary_uom_id
+msgid "Second unit"
+msgstr "İkinci birim"
+
+#. module: stock_secondary_unit
+#: model:ir.model.fields,field_description:stock_secondary_unit.field_product_product__stock_secondary_uom_id
+#: model:ir.model.fields,field_description:stock_secondary_unit.field_product_template__stock_secondary_uom_id
+msgid "Second unit for inventory"
+msgstr "Envanter için ikinci birim"
+
+#. module: stock_secondary_unit
+#: model:ir.model.fields,field_description:stock_secondary_unit.field_stock_move__secondary_uom_qty
+#: model:ir.model.fields,field_description:stock_secondary_unit.field_stock_move_line__secondary_uom_qty
+msgid "Secondary Qty"
+msgstr "İkincil Miktar"
+
+#. module: stock_secondary_unit
+#: model_terms:ir.ui.view,arch_db:stock_secondary_unit.view_template_property_form
+msgid "Secondary unit"
+msgstr "İkincil birim"
+
+#. module: stock_secondary_unit
+#: model:ir.model,name:stock_secondary_unit.model_stock_move
+msgid "Stock Move"
+msgstr "Stok Hareketi"
+
+#. module: stock_secondary_unit
+#: model:ir.model,name:stock_secondary_unit.model_stock_product_secondary_unit_mixin
+msgid "Stock Product Secondary Unit Mixin"
+msgstr "Stok Ürün İkincil Birim Karışımı"
+
+#. module: stock_secondary_unit
+#: model:ir.model.fields,help:stock_secondary_unit.field_stock_move__product_uom_qty
+msgid ""
+"This is the quantity of product that is planned to be moved.Lowering this "
+"quantity does not generate a backorder.Changing this quantity on assigned "
+"moves affects the product reservation, and should be done with care."
+msgstr ""
+"Bu, taşınması planlanan ürün miktarıdır. Bu miktarın düşürülmesi bir sipariş "
+"geri dönüşü oluşturmaz. Atanmış taşımalarda bu miktarın değiştirilmesi ürün "
+"rezervasyonunu etkiler ve dikkatli yapılmalıdır."