Merge PR #937 into 17.0

Signed-off-by pedrobaeza

delivery_carrier_manual_weight/README.rst

@@ -0,0 +1,86 @@
+==============================
+Delivery Carrier Manual Weight
+==============================
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:ebda64e7d4f91aed1f58e703f1305f3fca450004a002b7c0008b4b027aa4ab83
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |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%2Fdelivery--carrier-lightgray.png?logo=github
+    :target: https://github.com/OCA/delivery-carrier/tree/17.0/delivery_carrier_manual_weight
+    :alt: OCA/delivery-carrier
+.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
+    :target: https://translation.odoo-community.org/projects/delivery-carrier-17-0/delivery-carrier-17-0-delivery_carrier_manual_weight
+    :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/delivery-carrier&target_branch=17.0
+    :alt: Try me on Runboat
+
+|badge1| |badge2| |badge3| |badge4| |badge5|
+
+This module adds a flag in Shipping Methods to allow to set manually the
+weight and shipping weight in each transfer.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Usage
+=====
+
+In stock transfers, when using a 'Manual Weights' carrier, two new
+fields will be available to fill manually the weight and the shipping
+weight.
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/OCA/delivery-carrier/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/delivery-carrier/issues/new?body=module:%20delivery_carrier_manual_weight%0Aversion:%2017.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
+-------
+
+* ForgeFlow
+
+Contributors
+------------
+
+-  Jordi Masvidal <[email protected]>
+-  Marina Alapont <[email protected]>
+-  Manuel Regidor <[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/delivery-carrier <https://github.com/OCA/delivery-carrier/tree/17.0/delivery_carrier_manual_weight>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

delivery_carrier_manual_weight/__init__.py

@@ -0,0 +1,3 @@
+# Copyright 2024 ForgeFlow S.L. (https://www.forgeflow.com)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+from . import models

delivery_carrier_manual_weight/__manifest__.py

@@ -0,0 +1,22 @@
+# Copyright 2024 ForgeFlow S.L. (https://www.forgeflow.com)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+
+{
+    "name": "Delivery Carrier Manual Weight",
+    "summary": """
+        Allow setting weight and shipping weight in stock transfers manually
+        based on carrier.
+    """,
+    "version": "17.0.1.0.0",
+    "category": "Delivery",
+    "website": "https://github.com/OCA/delivery-carrier",
+    "author": "ForgeFlow,Odoo Community Association (OCA)",
+    "license": "AGPL-3",
+    "depends": [
+        "stock_delivery",
+    ],
+    "data": ["views/delivery_view.xml"],
+    "application": False,
+    "installable": True,
+}

delivery_carrier_manual_weight/i18n/delivery_carrier_manual_weight.pot

@@ -0,0 +1,40 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* delivery_carrier_manual_weight
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 16.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: delivery_carrier_manual_weight
+#: model:ir.model.fields,field_description:delivery_carrier_manual_weight.field_delivery_carrier__is_manual_weight
+#: model:ir.model.fields,field_description:delivery_carrier_manual_weight.field_stock_picking__is_manual_weight
+msgid "Manual Weights"
+msgstr ""
+
+#. module: delivery_carrier_manual_weight
+#: model:ir.model,name:delivery_carrier_manual_weight.model_delivery_carrier
+msgid "Shipping Methods"
+msgstr ""
+
+#. module: delivery_carrier_manual_weight
+#: model:ir.model,name:delivery_carrier_manual_weight.model_stock_picking
+msgid "Transfer"
+msgstr ""
+
+#. module: delivery_carrier_manual_weight
+#: model:ir.model.fields,field_description:delivery_carrier_manual_weight.field_stock_picking__weight_manual
+msgid "Weight (Manual)"
+msgstr ""
+
+#. module: delivery_carrier_manual_weight
+#: model:ir.model.fields,field_description:delivery_carrier_manual_weight.field_stock_picking__shipping_weight_manual
+msgid "Weight for Shipping (Manual)"
+msgstr ""

delivery_carrier_manual_weight/i18n/it.po

@@ -0,0 +1,43 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* delivery_carrier_manual_weight
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 16.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2024-10-03 11:06+0000\n"
+"Last-Translator: mymage <[email protected]>\n"
+"Language-Team: none\n"
+"Language: it\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: delivery_carrier_manual_weight
+#: model:ir.model.fields,field_description:delivery_carrier_manual_weight.field_delivery_carrier__is_manual_weight
+#: model:ir.model.fields,field_description:delivery_carrier_manual_weight.field_stock_picking__is_manual_weight
+msgid "Manual Weights"
+msgstr "Pesi manuali"
+
+#. module: delivery_carrier_manual_weight
+#: model:ir.model,name:delivery_carrier_manual_weight.model_delivery_carrier
+msgid "Shipping Methods"
+msgstr "Metodi di spedizione"
+
+#. module: delivery_carrier_manual_weight
+#: model:ir.model,name:delivery_carrier_manual_weight.model_stock_picking
+msgid "Transfer"
+msgstr "Trasferimento"
+
+#. module: delivery_carrier_manual_weight
+#: model:ir.model.fields,field_description:delivery_carrier_manual_weight.field_stock_picking__weight_manual
+msgid "Weight (Manual)"
+msgstr "Peso (manuale)"
+
+#. module: delivery_carrier_manual_weight
+#: model:ir.model.fields,field_description:delivery_carrier_manual_weight.field_stock_picking__shipping_weight_manual
+msgid "Weight for Shipping (Manual)"
+msgstr "Peso per spedizione (manuale)"

delivery_carrier_manual_weight/models/__init__.py

@@ -0,0 +1,4 @@
+# Copyright 2024 ForgeFlow S.L. (https://www.forgeflow.com)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+from . import delivery_carrier
+from . import stock_picking

delivery_carrier_manual_weight/models/delivery_carrier.py

@@ -0,0 +1,10 @@
+# Copyright 2024 ForgeFlow S.L. (https://www.forgeflow.com)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo import fields, models
+
+
+class DeliveryCarrier(models.Model):
+    _inherit = "delivery.carrier"
+
+    is_manual_weight = fields.Boolean(string="Manual Weights")

delivery_carrier_manual_weight/models/stock_picking.py

@@ -0,0 +1,32 @@
+# Copyright 2024 ForgeFlow S.L. (https://www.forgeflow.com)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo import api, fields, models
+
+
+class StockPicking(models.Model):
+    _inherit = "stock.picking"
+
+    is_manual_weight = fields.Boolean(related="carrier_id.is_manual_weight")
+    weight_manual = fields.Float(string="Weight (Manual)", digits="Stock Weight")
+    shipping_weight_manual = fields.Float(string="Weight for Shipping (Manual)")
+
+    @api.depends("move_ids", "carrier_id", "weight_manual")
+    def _cal_weight(self):
+        manual_weight = self.filtered(lambda p: p.carrier_id.is_manual_weight)
+        for rec in manual_weight:
+            rec.weight = rec.weight_manual
+        return super(StockPicking, self - manual_weight)._cal_weight()
+
+    @api.depends(
+        "move_line_ids.result_package_id",
+        "move_line_ids.result_package_id.shipping_weight",
+        "weight_bulk",
+        "carrier_id",
+        "shipping_weight_manual",
+    )
+    def _compute_shipping_weight(self):
+        manual_weight = self.filtered(lambda p: p.carrier_id.is_manual_weight)
+        for rec in manual_weight:
+            rec.shipping_weight = rec.shipping_weight_manual
+        return super(StockPicking, self - manual_weight)._compute_shipping_weight()

delivery_carrier_manual_weight/pyproject.toml

@@ -0,0 +1,3 @@
+[build-system]
+requires = ["whool"]
+build-backend = "whool.buildapi"

delivery_carrier_manual_weight/readme/CONTRIBUTORS.md

@@ -0,0 +1,3 @@
+- Jordi Masvidal \<<[email protected]>\>
+- Marina Alapont \<<[email protected]>\>
+- Manuel Regidor \<<[email protected]>\>

delivery_carrier_manual_weight/readme/DESCRIPTION.md

@@ -0,0 +1,2 @@
+This module adds a flag in Shipping Methods to allow to set manually the
+weight and shipping weight in each transfer.

delivery_carrier_manual_weight/readme/USAGE.md

@@ -0,0 +1,3 @@
+In stock transfers, when using a 'Manual Weights' carrier, two new
+fields will be available to fill manually the weight and the shipping
+weight.