Merge pull request #1338 from OCA/14.0

Syncing from upstream OCA/purchase-workflow (14.0)

README.md

@@ -33,7 +33,7 @@ addon | version | maintainers | summary
 [purchase_cancel_confirm](purchase_cancel_confirm/) | 14.0.1.0.1 | [![kittiu](https://github.com/kittiu.png?size=30px)](https://github.com/kittiu) | Purchase Cancel Confirm
 [purchase_cancel_reason](purchase_cancel_reason/) | 14.0.1.0.1 |  | Purchase Cancel Reason
 [purchase_commercial_partner](purchase_commercial_partner/) | 14.0.1.0.0 |  | Add stored related field 'Commercial Supplier' on POs
-[purchase_default_terms_conditions](purchase_default_terms_conditions/) | 14.0.1.0.0 |  | This module allows purchase default terms & conditions
+[purchase_default_terms_conditions](purchase_default_terms_conditions/) | 14.0.1.0.1 |  | This module allows purchase default terms & conditions
 [purchase_delivery_split_date](purchase_delivery_split_date/) | 14.0.1.1.2 |  | Allows Purchase Order you confirm to generate one Incoming Shipment for each expected date indicated in the Purchase Order Lines
 [purchase_deposit](purchase_deposit/) | 14.0.1.1.2 |  | Option to create deposit from purchase order
 [purchase_discount](purchase_discount/) | 14.0.1.2.1 |  | Purchase order lines with discounts

procurement_batch_generator/i18n/es.po

@@ -19,15 +19,16 @@ msgstr ""
 "Project-Id-Version: purchase-workflow (8.0)\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-01-07 05:29+0000\n"
-"PO-Revision-Date: 2017-01-11 15:36+0000\n"
-"Last-Translator: OCA Transbot <[email protected]>\n"
-"Language-Team: Spanish (http://www.transifex.com/oca/OCA-purchase-"
-"workflow-8-0/language/es/)\n"
+"PO-Revision-Date: 2024-01-17 21:35+0000\n"
+"Last-Translator: Gil Arasa Verge <[email protected]>\n"
+"Language-Team: Spanish (http://www.transifex.com/oca/"
+"OCA-purchase-workflow-8-0/language/es/)\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"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. module: procurement_batch_generator
 #: model_terms:ir.ui.view,arch_db:procurement_batch_generator.procurement_batch_generator_form
@@ -38,7 +39,7 @@ msgstr "Cancelar"
 #: model:ir.model.fields,field_description:procurement_batch_generator.field_procurement_batch_generator__company_id
 #: model:ir.model.fields,field_description:procurement_batch_generator.field_procurement_batch_generator_line__company_id
 msgid "Company"
-msgstr ""
+msgstr "Compañia"
 
 #. module: procurement_batch_generator
 #: model:ir.model.fields,field_description:procurement_batch_generator.field_procurement_batch_generator__create_uid
@@ -61,7 +62,7 @@ msgstr "Nombre mostrado"
 #. module: procurement_batch_generator
 #: model:ir.model.fields,field_description:procurement_batch_generator.field_procurement_batch_generator_line__product_has_variants
 msgid "Has variants"
-msgstr ""
+msgstr "Tiene variantes"
 
 #. module: procurement_batch_generator
 #: model:ir.model.fields,field_description:procurement_batch_generator.field_procurement_batch_generator__id
@@ -72,7 +73,7 @@ msgstr "ID"
 #. module: procurement_batch_generator
 #: model:ir.model.fields,field_description:procurement_batch_generator.field_procurement_batch_generator_line__incoming_qty
 msgid "Incoming Qty"
-msgstr ""
+msgstr "Ctd entrante"
 
 #. module: procurement_batch_generator
 #: model:ir.model.fields,field_description:procurement_batch_generator.field_procurement_batch_generator____last_update
@@ -95,33 +96,33 @@ msgstr "Última actualización el"
 #. module: procurement_batch_generator
 #: model:ir.model,name:procurement_batch_generator.model_procurement_batch_generator_line
 msgid "Lines of the wizard to request procurements"
-msgstr ""
+msgstr "Líneas del asistente para solicitar reabastecimientos"
 
 #. module: procurement_batch_generator
 #: code:addons/procurement_batch_generator/wizard/procurement_batch_generator.py:0
 #, python-format
 msgid "Manual Replenishment"
-msgstr ""
+msgstr "Reposición manual"
 
 #. module: procurement_batch_generator
 #: model:ir.model.fields,field_description:procurement_batch_generator.field_procurement_batch_generator_line__outgoing_qty
 msgid "Outgoing Qty"
-msgstr ""
+msgstr "Ctd saliente"
 
 #. module: procurement_batch_generator
 #: model:ir.model.fields,field_description:procurement_batch_generator.field_procurement_batch_generator_line__parent_id
 msgid "Parent"
-msgstr ""
+msgstr "Padre"
 
 #. module: procurement_batch_generator
 #: model:ir.model.fields,field_description:procurement_batch_generator.field_procurement_batch_generator_line__route_ids
 msgid "Preferred Routes"
-msgstr ""
+msgstr "Rutas preferidas"
 
 #. module: procurement_batch_generator
 #: model:ir.model.fields,field_description:procurement_batch_generator.field_procurement_batch_generator__line_ids
 msgid "Procurement Request Lines"
-msgstr ""
+msgstr "Líneas de solicitud de abastecimiento"
 
 #. module: procurement_batch_generator
 #: model:ir.model.fields,field_description:procurement_batch_generator.field_procurement_batch_generator_line__product_id
@@ -131,33 +132,33 @@ msgstr "Producto"
 #. module: procurement_batch_generator
 #: model:ir.model.fields,field_description:procurement_batch_generator.field_procurement_batch_generator_line__product_tmpl_id
 msgid "Product Template"
-msgstr ""
+msgstr "Plantilla de producto"
 
 #. module: procurement_batch_generator
 #: model:ir.model.fields,field_description:procurement_batch_generator.field_procurement_batch_generator_line__qty_available
 msgid "Qty Available"
-msgstr ""
+msgstr "Ctd disponible"
 
 #. module: procurement_batch_generator
 #: model_terms:ir.ui.view,arch_db:procurement_batch_generator.procurement_batch_generator_form
 msgid "Replanish"
-msgstr ""
+msgstr "Reabastecer"
 
 #. module: procurement_batch_generator
 #: model:ir.actions.act_window,name:procurement_batch_generator.procurement_batch_generator_product_product_tree_action
 #: model:ir.actions.act_window,name:procurement_batch_generator.procurement_batch_generator_product_template_tree_action
 msgid "Replenish"
-msgstr ""
+msgstr "Reabastecer"
 
 #. module: procurement_batch_generator
 #: model:ir.model.fields,field_description:procurement_batch_generator.field_procurement_batch_generator_line__procurement_qty
 msgid "Requested Qty"
-msgstr ""
+msgstr "Ctd pedida"
 
 #. module: procurement_batch_generator
 #: model:ir.model.fields,field_description:procurement_batch_generator.field_procurement_batch_generator_line__date_planned
 msgid "Scheduled Date"
-msgstr ""
+msgstr "Fecha planificada"
 
 #. module: procurement_batch_generator
 #: model:ir.model.fields,field_description:procurement_batch_generator.field_procurement_batch_generator_line__partner_id
@@ -168,13 +169,13 @@ msgstr "Proveedor"
 #: code:addons/procurement_batch_generator/wizard/procurement_batch_generator.py:0
 #, python-format
 msgid "The requested quantity cannot be negative for product '%s'."
-msgstr ""
+msgstr "La cantidad solicitada no puede ser negativa para el producto '%s'."
 
 #. module: procurement_batch_generator
 #: code:addons/procurement_batch_generator/wizard/procurement_batch_generator.py:0
 #, python-format
 msgid "There are no lines!"
-msgstr ""
+msgstr "No hay líneas!"
 
 #. module: procurement_batch_generator
 #: model:ir.model.fields,field_description:procurement_batch_generator.field_procurement_batch_generator_line__uom_id
@@ -184,12 +185,12 @@ msgstr "Unidad de medida"
 #. module: procurement_batch_generator
 #: model_terms:ir.ui.view,arch_db:procurement_batch_generator.procurement_batch_generator_form
 msgid "UoM"
-msgstr ""
+msgstr "UdM"
 
 #. module: procurement_batch_generator
 #: model_terms:ir.ui.view,arch_db:procurement_batch_generator.procurement_batch_generator_form
 msgid "Validate"
-msgstr ""
+msgstr "Validar"
 
 #. module: procurement_batch_generator
 #: model:ir.model.fields,field_description:procurement_batch_generator.field_procurement_batch_generator__warehouse_id
@@ -199,7 +200,7 @@ msgstr "Almacén"
 #. module: procurement_batch_generator
 #: model:ir.model,name:procurement_batch_generator.model_procurement_batch_generator
 msgid "Wizard to create procurements from product tree"
-msgstr ""
+msgstr "Asistente para crear abastecimientos desde el árbol de productos"
 
 #~ msgid "Planned Date"
 #~ msgstr "Fecha planificada"

purchase_default_terms_conditions/README.rst

@@ -7,7 +7,7 @@ Purchase Default Terms Conditions
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:0f7e366e043232aa85d7f37e8515935e6ff471c2d6e62d663cb282c76f300651
+   !! source digest: sha256:91b47a72a31215ec6ad3b5ff5a7d16e8366ac4ee65bf2cfc3704b54616e024de
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

purchase_default_terms_conditions/__manifest__.py

@@ -6,7 +6,7 @@
     "name": "Purchase Default Terms Conditions",
     "summary": """
         This module allows purchase default terms & conditions""",
-    "version": "14.0.1.0.0",
+    "version": "14.0.1.0.1",
     "license": "AGPL-3",
     "author": "Escodoo,Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/purchase-workflow",

purchase_default_terms_conditions/models/purchase.py

@@ -19,3 +19,20 @@ def onchange_partner_id(self):
         ):
             self.notes = self.company_id.purchase_note
         return super().onchange_partner_id()
+
+    @api.model
+    def create(self, vals):
+        order = super().create(vals)
+
+        if order.notes:
+            return order
+        elif order.partner_id.purchase_note:
+            order.notes = order.partner_id.purchase_note
+        elif (
+            self.env["ir.config_parameter"]
+            .sudo()
+            .get_param("purchase.use_purchase_note")
+        ):
+            order.notes = order.company_id.purchase_note
+
+        return order

purchase_default_terms_conditions/static/description/index.html

@@ -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>
@@ -367,7 +366,7 @@ <h1 class="title">Purchase Default Terms Conditions</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:0f7e366e043232aa85d7f37e8515935e6ff471c2d6e62d663cb282c76f300651
+!! source digest: sha256:91b47a72a31215ec6ad3b5ff5a7d16e8366ac4ee65bf2cfc3704b54616e024de
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/purchase-workflow/tree/14.0/purchase_default_terms_conditions"><img alt="OCA/purchase-workflow" src="https://img.shields.io/badge/github-OCA%2Fpurchase--workflow-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/purchase-workflow-14-0/purchase-workflow-14-0-purchase_default_terms_conditions"><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/purchase-workflow&amp;target_branch=14.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module allows purchase default terms &amp; conditions from Suppler or Company</p>

purchase_default_terms_conditions/tests/test_purchase_order.py

@@ -29,6 +29,7 @@ def setUpClass(cls):
         cls.partner_a.write(
             {"purchase_note": "Purchase Default Terms and Conditions Partner"}
         )
+        cls.company = cls.company_data["company"]
 
     def test_onchange_partner_id(self):
 
@@ -62,3 +63,46 @@ def test_onchange_partner_id(self):
         self.env["ir.config_parameter"].set_param("purchase.use_purchase_note", "Test")
 
         purchase_order.onchange_partner_id()
+
+    def test_create(self):
+        purchase_order1 = (
+            self.env["purchase.order"]
+            .with_context(tracking_disable=True)
+            .create({"partner_id": self.partner_a.id, "company_id": self.company.id})
+        )
+        self.assertEqual(
+            purchase_order1.notes, "Purchase Default Terms and Conditions Partner"
+        )
+
+        self.partner_a.write({"purchase_note": False})
+
+        company_notes = "Purchase Default Terms and Conditions Company"
+        self.env["ir.config_parameter"].set_param(
+            "purchase.use_purchase_note", company_notes
+        )
+        self.company.write({"purchase_note": company_notes})
+
+        purchase_order2 = (
+            self.env["purchase.order"]
+            .with_context(tracking_disable=True)
+            .create({"partner_id": self.partner_a.id, "company_id": self.company.id})
+        )
+        self.assertEqual(purchase_order2.notes, company_notes)
+
+        self.env["ir.config_parameter"].set_param("purchase.use_purchase_note", False)
+        self.company.write({"purchase_note": False})
+
+        po_notes = "Purchase Order Terms and Conditions"
+
+        purchase_order3 = (
+            self.env["purchase.order"]
+            .with_context(tracking_disable=True)
+            .create(
+                {
+                    "partner_id": self.partner_a.id,
+                    "company_id": self.company.id,
+                    "notes": po_notes,
+                }
+            )
+        )
+        self.assertEqual(purchase_order3.notes, po_notes)

purchase_order_line_packaging_qty/i18n/es.po

@@ -0,0 +1,73 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* purchase_order_line_packaging_qty
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2024-01-18 14:34+0000\n"
+"Last-Translator: Gil Arasa Verge <[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 4.17\n"
+
+#. module: purchase_order_line_packaging_qty
+#: model:ir.model.fields,field_description:purchase_order_line_packaging_qty.field_purchase_order_line__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: purchase_order_line_packaging_qty
+#: model:ir.model.fields,field_description:purchase_order_line_packaging_qty.field_purchase_order_line__id
+msgid "ID"
+msgstr ""
+
+#. module: purchase_order_line_packaging_qty
+#: model:ir.model.fields,field_description:purchase_order_line_packaging_qty.field_purchase_order_line____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: purchase_order_line_packaging_qty
+#: model:ir.model.fields,field_description:purchase_order_line_packaging_qty.field_purchase_order_line__product_packaging
+msgid "Package"
+msgstr "Empaquetado"
+
+#. module: purchase_order_line_packaging_qty
+#: model:ir.model.fields,field_description:purchase_order_line_packaging_qty.field_purchase_order_line__product_packaging_qty
+msgid "Package quantity"
+msgstr "Ctd empaquetado"
+
+#. module: purchase_order_line_packaging_qty
+#: code:addons/purchase_order_line_packaging_qty/models/purchase_order_line.py:0
+#, python-format
+msgid "Please select a packaging with a quantity bigger than 0"
+msgstr "Porfavor, seleccione un empaquetado con una cantidad mayor que 0"
+
+#. module: purchase_order_line_packaging_qty
+#: model:ir.model,name:purchase_order_line_packaging_qty.model_purchase_order_line
+msgid "Purchase Order Line"
+msgstr "Línea del pedido de compra"
+
+#. module: purchase_order_line_packaging_qty
+#: code:addons/purchase_order_line_packaging_qty/models/purchase_order_line.py:0
+#, python-format
+msgid "This product is packaged by %.2f %s. You should sell %.2f %s."
+msgstr "Este producto está empaquetado por %.2f %s. Deberías vender %.2f %s."
+
+#. module: purchase_order_line_packaging_qty
+#: code:addons/purchase_order_line_packaging_qty/models/purchase_order_line.py:0
+#, python-format
+msgid "Warning"
+msgstr "Advertencia"
+
+#. module: purchase_order_line_packaging_qty
+#: code:addons/purchase_order_line_packaging_qty/models/purchase_order_line.py:0
+#, python-format
+msgid "You must define a package before setting a quantity of said package."
+msgstr ""
+"Debes definir un empaquetado antes de establecer una cantidad de dicho "
+"empaquetado."