[IMP] delivery_cbl: add option to configure cbl_freight_type. Prepaid (P) or Collect (D)

Author: Tisho99

delivery_cbl/README.rst

@@ -1,7 +1,3 @@
-.. image:: https://odoo-community.org/readme-banner-image
-   :target: https://odoo-community.org/get-involved?utm_source=readme
-   :alt: Odoo Community Association
-
 ============
 Delivery CBL
 ============
@@ -17,7 +13,7 @@ Delivery CBL
 .. |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/license-AGPL--3-blue.png
+.. |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
@@ -37,12 +33,12 @@ available carriers.
 
 The following operations are supported:
 
-- Register shippings
-- Generate shipping labels when shippings are registered. The PDF is
-  generated using the labelary API (http://api.labelary.com/).
-- Validate shippings (both manually and automatically)
-- Cancel shippings
-- Generate de CBL Manifest
+-  Register shippings
+-  Generate shipping labels when shippings are registered. The PDF is
+   generated using the labelary API (http://api.labelary.com/).
+-  Validate shippings (both manually and automatically)
+-  Cancel shippings
+-  Generate the CBL Manifest
 
 **Table of contents**
 
@@ -56,9 +52,12 @@ To configure this module, you need to:
 
 1. Add a Shipping Method with Provider ``CBL`` and introduce the User,
    Password, Client Code and Client Token.
-2. Activate the "Cash On Delivery" option if shippings are paid by cash,
+2. Choose the "Collect" "Freight Type" if the delivery needs to be paid
+   by the receiver, or the "Prepaid" type if it needs to be paid by the
+   shipper.
+3. Activate the "Cash On Delivery" option if shippings are paid by cash,
    assuming that the picking has a related sales order.
-3. Activate the "Needs Confirmation" option if shippings need to be
+4. Activate the "Needs Confirmation" option if shippings need to be
    confirmed after the tracking number is created in order to be
    oficially included in the CBL pending shippings database. It is
    crucial to have the same configuration both in Odoo and in your CBL
@@ -73,55 +72,56 @@ Usage
 To carry out the shipment, the shipping method previously created must
 be set on the delivery order:
 
-- Once the outgoing delivery is “Validated (Done)", the shipping
-  information is automatically transmitted to CBL. If everything is
-  correct, a tracking number and the corresponding labels are generated.
-- Shipments can be cancelled by clicking the "Cancel" button located
-  next to the picking's tracking number. Keep in mind that using a
-  carrier with the "Needs Confirmation" option unchecked, while having
-  the opposite configuration set in CBL, may cause issues when
-  attempting to cancel a shipment. In such cases, contact CBL so they
-  can adjust the confirmation policy accordingly.
-- If a shipment could not be generated or has been cancelled, a new one
-  can be created by clicking the "Send to Shipper" button at the top of
-  the stock picking.
-- Shipments that require confirmation after the tracking number has been
-  assigned can be confirmed as follows:
-
-  - Individually: By clicking the "Confirm" button in the "Tracking
-    Number" field, located under the "Additional Info" tab within the
-    "Shipping Information" section.
-  - [Improved] Bulk method: In the list view of outgoing deliveries,
-    select all deliveries for the carrier whose status is “Validated
-    (Done)", click the "Actions" gear icon → "Confirm CBL pickings". A
-    wizard will appear listing the deliveries to be confirmed. Verify
-    that all required pickings are included, then click the "Confirm
-    Shipments" button.
-  - Additionally, there is a scheduled action ("CBL: Confirm Shipments")
-    that automatically validates pending CBL shipments once per day by
-    default.
-
-- To generate the manifest, you need to Inventory > Operation >
-  Manifest, select a CBL carrier and set the date range to select the
-  picking.
+-  Once the outgoing delivery is “Validated (Done)", the shipping
+   information is automatically transmitted to CBL. If everything is
+   correct, a tracking number and the corresponding labels are
+   generated.
+-  Shipments can be cancelled by clicking the "Cancel" button located
+   next to the picking's tracking number. Keep in mind that using a
+   carrier with the "Needs Confirmation" option unchecked, while having
+   the opposite configuration set in CBL, may cause issues when
+   attempting to cancel a shipment. In such cases, contact CBL so they
+   can adjust the confirmation policy accordingly.
+-  If a shipment could not be generated or has been cancelled, a new one
+   can be created by clicking the "Send to Shipper" button at the top of
+   the stock picking.
+-  Shipments that require confirmation after the tracking number has
+   been assigned can be confirmed as follows:
+
+   -  Individually: By clicking the "Confirm" button in the "Tracking
+      Number" field, located under the "Additional Info" tab within the
+      "Shipping Information" section.
+   -  [Improved] Bulk method: In the list view of outgoing deliveries,
+      select all deliveries for the carrier whose status is “Validated
+      (Done)", click the "Actions" gear icon → "Confirm CBL pickings". A
+      wizard will appear listing the deliveries to be confirmed. Verify
+      that all required pickings are included, then click the "Confirm
+      Shipments" button.
+   -  Additionally, there is a scheduled action ("CBL: Confirm
+      Shipments") that automatically validates pending CBL shipments
+      once per day by default.
+
+-  To generate the manifest, you need to Inventory > Operation >
+   Manifest, select a CBL carrier and set the date range to select the
+   picking.
 
 Known issues / Roadmap
 ======================
 
-- During the development of the shipping label generation feature, we
-  initially evaluated the use of the Zebrafy library to convert ZPL
-  labels into PDF format. However, Zebrafy is based on the presence of
-  graphic fields (^GF) in the ZPL source, which are not always included
-  in the labels generated by CBL.
-- To ensure broader compatibility, it's opted to use the external
-  service Labelary.com, returns the corresponding label in PDF format
-  via an HTTP request.
-- To provide flexibility, a new field cbl_label_format has been added to
-  the delivery.carrier model, allowing the user to select between ZPL
-  (default) and PDF formats. The method cdl_generate_labels will only
-  invoke the external Labelary service if the selected format is PDF.
-  Otherwise, the label is stored directly in ZPL format without any
-  transformation.
+-  During the development of the shipping label generation feature, we
+   initially evaluated the use of the Zebrafy library to convert ZPL
+   labels into PDF format. However, Zebrafy is based on the presence of
+   graphic fields (^GF) in the ZPL source, which are not always included
+   in the labels generated by CBL.
+-  To ensure broader compatibility, it's opted to use the external
+   service Labelary.com, returns the corresponding label in PDF format
+   via an HTTP request.
+-  To provide flexibility, a new field cbl_label_format has been added
+   to the delivery.carrier model, allowing the user to select between
+   ZPL (default) and PDF formats. The method cdl_generate_labels will
+   only invoke the external Labelary service if the selected format is
+   PDF. Otherwise, the label is stored directly in ZPL format without
+   any transformation.
 
 Bug Tracker
 ===========
@@ -144,9 +144,9 @@ Authors
 Contributors
 ------------
 
-- Manuel Regidor manuel.regidor@sygel.es
-- Valentín Vinagre valentin.vinagre@sygel.es
-- Ángel Rivas angel.rivas@sygel.es
+-  Manuel Regidor manuel.regidor@sygel.es
+-  Valentín Vinagre valentin.vinagre@sygel.es
+-  Ángel Rivas angel.rivas@sygel.es
 
 Maintainers
 -----------

delivery_cbl/i18n/delivery_cbl.pot

@@ -6,6 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 17.0\n"
 "Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-10-27 15:02+0000\n"
+"PO-Revision-Date: 2025-10-27 15:02+0000\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -188,6 +190,21 @@ msgid ""
 "If PDF is selected, labels will be generated using an external service (labelary.com)."
 msgstr ""
 
+#. module: delivery_cbl
+#: model:ir.model.fields.selection,name:delivery_cbl.selection__delivery_carrier__cbl_freight_type__d
+msgid "Freight Collect"
+msgstr ""
+
+#. module: delivery_cbl
+#: model:ir.model.fields.selection,name:delivery_cbl.selection__delivery_carrier__cbl_freight_type__p
+msgid "Freight Prepaid"
+msgstr ""
+
+#. module: delivery_cbl
+#: model:ir.model.fields,field_description:delivery_cbl.field_delivery_carrier__cbl_freight_type
+msgid "Freight Type"
+msgstr ""
+
 #. module: delivery_cbl
 #: model:ir.model.fields,field_description:delivery_cbl.field_wizard_confirm_cbl_pickings__id
 msgid "ID"

delivery_cbl/i18n/es.po

@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 17.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-07-01 13:21+0000\n"
-"PO-Revision-Date: 2025-07-01 15:23+0200\n"
+"POT-Creation-Date: 2025-10-27 15:03+0000\n"
+"PO-Revision-Date: 2025-10-27 16:04+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 3.6\n"
+"Plural-Forms: \n"
+"X-Generator: Poedit 3.0.1\n"
 
 #. module: delivery_cbl
 #: model_terms:ir.ui.view,arch_db:delivery_cbl.report_cbl_manifest
@@ -102,11 +102,8 @@ msgstr "Se ha cancelado la expedición de CBL con referencia %(tracking)s."
 #. odoo-python
 #: code:addons/delivery_cbl/models/cbl_request.py:0
 #, python-format
-msgid ""
-"CBL Shipping for picking %(picking)s could not be created. Reason: %(reason)s"
-msgstr ""
-"El envío de CBL para el albarán %(picking)s no se pudo crear. Razón: "
-"%(reason)s"
+msgid "CBL Shipping for picking %(picking)s could not be created. Reason: %(reason)s"
+msgstr "El envío de CBL para el albarán %(picking)s no se pudo crear. Razón: %(reason)s"
 
 #. module: delivery_cbl
 #. odoo-python
@@ -158,13 +155,11 @@ msgstr ""
 
 #. module: delivery_cbl
 #: model_terms:ir.ui.view,arch_db:delivery_cbl.wizard_confirm_cbl_pickings
-#, fuzzy
 msgid "Confirm Shipments"
 msgstr "CBL: Confirmar envíos"
 
 #. module: delivery_cbl
 #: model:ir.actions.act_window,name:delivery_cbl.action_wizard_confirm_cbl_pickings
-#, fuzzy
 msgid "Confirm pickings"
 msgstr "Confirmar"
 
@@ -192,12 +187,25 @@ msgstr ""
 #: model:ir.model.fields,help:delivery_cbl.field_delivery_carrier__cbl_label_format
 msgid ""
 "Format to generate shipping labels.\n"
-"If PDF is selected, labels will be generated using an external service "
-"(labelary.com)."
+"If PDF is selected, labels will be generated using an external service (labelary.com)."
 msgstr ""
 "Formato para generar etiquetas de envío.\n"
-"Si se selecciona PDF, las etiquetas se generarán utilizando un servicio "
-"externo (labelary.com)."
+"Si se selecciona PDF, las etiquetas se generarán utilizando un servicio externo (labelary.com)."
+
+#. module: delivery_cbl
+#: model:ir.model.fields.selection,name:delivery_cbl.selection__delivery_carrier__cbl_freight_type__d
+msgid "Freight Collect"
+msgstr "Portes debidos"
+
+#. module: delivery_cbl
+#: model:ir.model.fields.selection,name:delivery_cbl.selection__delivery_carrier__cbl_freight_type__p
+msgid "Freight Prepaid"
+msgstr "Portes pagados"
+
+#. module: delivery_cbl
+#: model:ir.model.fields,field_description:delivery_cbl.field_delivery_carrier__cbl_freight_type
+msgid "Freight Type"
+msgstr "Tipo de portes"
 
 #. module: delivery_cbl
 #: model:ir.model.fields,field_description:delivery_cbl.field_wizard_confirm_cbl_pickings__id
@@ -207,22 +215,20 @@ msgstr ""
 #. module: delivery_cbl
 #: model:ir.model.fields,help:delivery_cbl.field_delivery_carrier__cbl_needs_confirmation
 msgid ""
-"If checked, expeditions need to be confirmed after the tracking number is "
-"generated to be officially introduced in CBL pending shipments database."
+"If checked, expeditions need to be confirmed after the tracking number is generated to be "
+"officially introduced in CBL pending shipments database."
 msgstr ""
-"Si está marcado, las expediciones necesitan confirmarse tras la creación de "
-"su número de seguimiento para que se introduzcan oficialmente en la base de "
-"datos de CBL."
+"Si está marcado, las expediciones necesitan confirmarse tras la creación de su número de "
+"seguimiento para que se introduzcan oficialmente en la base de datos de CBL."
 
 #. module: delivery_cbl
 #: model:ir.model.fields,help:delivery_cbl.field_delivery_carrier__cbl_cash_on_delivery
 msgid ""
-"If checked, it means that the carrier is paid with cash. It assumes there is "
-"a sale order linked and it will use that total amount as the value to be paid"
+"If checked, it means that the carrier is paid with cash. It assumes there is a sale order "
+"linked and it will use that total amount as the value to be paid"
 msgstr ""
-"Si está marcado, significa que al transportista se le paga en cash. Se asuma "
-"que hay un pedido de venta relacionado y se utilizará su cantidad total como "
-"la cantidad que tiene que pagarse."
+"Si está marcado, significa que al transportista se le paga en cash. Se asuma que hay un pedido "
+"de venta relacionado y se utilizará su cantidad total como la cantidad que tiene que pagarse."
 
 #. module: delivery_cbl
 #: model:ir.model.fields,field_description:delivery_cbl.field_delivery_carrier__cbl_label_format
@@ -286,20 +292,18 @@ msgstr "No hay albaranes para procesar"
 #. module: delivery_cbl
 #: model:ir.model,name:delivery_cbl.model_stock_picking
 msgid "Transfer"
-msgstr "Traslado"
+msgstr "Transferencia"
 
 #. module: delivery_cbl
 #. odoo-python
 #: code:addons/delivery_cbl/models/delivery_carrier.py:0
 #, python-format
 msgid ""
-"Unable to cancel CBL Expedition with reference %(tracking)s. Please, make "
-"sure that the reference is correct and the expedition has not been already "
-"canceled."
+"Unable to cancel CBL Expedition with reference %(tracking)s. Please, make sure that the "
+"reference is correct and the expedition has not been already canceled."
 msgstr ""
-"No se ha podido cancelar la expedición de CBL con referencia %(tracking)s. "
-"Por favor, asegúrate de que la referencia es correcta y que la expedición no "
-"se ha cancelado previamente."
+"No se ha podido cancelar la expedición de CBL con referencia %(tracking)s. Por favor, "
+"asegúrate de que la referencia es correcta y que la expedición no se ha cancelado previamente."
 
 #. module: delivery_cbl
 #: model:ir.model.fields,field_description:delivery_cbl.field_delivery_carrier__cbl_user

delivery_cbl/models/cbl_request.py

@@ -105,13 +105,10 @@ def _generate_shipping_json(self, picking, daily_token):
             "numPackages": len(packages),
             "weight": picking.shipping_weight,
             "packages": packages,
+            "freight": picking.carrier_id.cbl_freight_type,
         }
         if picking.carrier_id.cbl_cash_on_delivery and picking.sale_id:
-            vals.update(
-                {"cashOnDelivery": picking.sale_id.amount_total, "freight": "P"}
-            )
-        else:
-            vals.update({"freight": "D"})
+            vals.update({"cashOnDelivery": picking.sale_id.amount_total})
         return vals
 
     def _send_shipping(self, picking):

delivery_cbl/models/delivery_carrier.py

@@ -26,6 +26,15 @@ class DeliveryCarrier(models.Model):
             "total amount as the value to be paid"
         ),
     )
+    cbl_freight_type = fields.Selection(
+        string="Freight Type",
+        selection=[
+            ("D", "Freight Collect"),
+            ("P", "Freight Prepaid"),
+        ],
+        required=True,
+        default="D",
+    )
     cbl_needs_confirmation = fields.Boolean(
         string="Needs Confirmation",
         help=(

delivery_cbl/readme/CONFIGURE.md

@@ -2,9 +2,11 @@ To configure this module, you need to:
 
 1.  Add a Shipping Method with Provider ``CBL`` and introduce the User,
     Password, Client Code and Client Token.
-2.  Activate the "Cash On Delivery" option if shippings are paid by cash,
+2.  Choose the "Collect" "Freight Type" if the delivery needs to be paid by the receiver,
+    or the "Prepaid" type if it needs to be paid by the shipper.
+3.  Activate the "Cash On Delivery" option if shippings are paid by cash,
     assuming that the picking has a related sales order.
-3.  Activate the "Needs Confirmation" option if shippings need to be
+4.  Activate the "Needs Confirmation" option if shippings need to be
     confirmed after the tracking number is created in order to be oficially
     included in the CBL pending shippings database. It is crucial to have
     the same configuration both in Odoo and in your CBL account. Contact

delivery_cbl/readme/DESCRIPTION.md

@@ -7,4 +7,4 @@ The following operations are supported:
   the labelary API (http://api.labelary.com/).
 - Validate shippings (both manually and automatically)
 - Cancel shippings
-- Generate de CBL Manifest
+- Generate the CBL Manifest