Merge PR #283 into 12.0

Signed-off-by sebastienbeau

base_delivery_carrier_label/__manifest__.py

@@ -1,11 +1,11 @@
 # Copyright 2013-2015 Yannick Vaucher (Camptocamp SA)
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
 {'name': 'Base module for carrier labels',
- 'version': '12.0.2.1.0',
+ 'version': '12.0.3.0.0',
  'author': "Camptocamp,Akretion,Odoo Community Association (OCA)",
  'maintainer': 'Camptocamp',
  'category': 'Delivery',
- 'depends': ['delivery'],
+ 'depends': ['delivery_carrier_info'],
  'website': 'https://github.com/OCA/delivery-carrier',
  'data': [
      'views/delivery.xml',

base_delivery_carrier_label/models/delivery_carrier.py

@@ -9,10 +9,6 @@ class DeliveryCarrier(models.Model):
     _inherit = 'delivery.carrier'
 
     delivery_type = fields.Selection(oldname='carrier_type')
-    code = fields.Char(
-        help="Delivery Method Code (according to carrier)",
-    )
-    description = fields.Text()
     available_option_ids = fields.One2many(
         comodel_name='delivery.carrier.option',
         inverse_name='carrier_id',

base_delivery_carrier_label/views/delivery.xml

@@ -68,33 +68,13 @@
     <field name="inherit_id" ref="delivery.view_delivery_carrier_form"/>
     <field name="arch" type="xml">
 
-      <xpath expr="//h1" position="after">
-        <group>
-          <field name="code"/>
-        </group>
-      </xpath>
-
       <xpath expr="//notebook" position="inside">
         <page string="Options">
           <field name="available_option_ids" nolabel="1" colspan="4"/>
         </page>
-        <page string="Description">
-          <field name="description" colspan="4" nolabel="1"/>
-        </page>
       </xpath>
 
     </field>
   </record>
 
-  <record id="view_delivery_carrier_tree" model="ir.ui.view">
-    <field name="name">delivery_carrier_base.tree</field>
-    <field name="model">delivery.carrier</field>
-    <field name="inherit_id" ref="delivery.view_delivery_carrier_tree"/>
-    <field name="arch" type="xml">
-      <field name="name" position="after">
-        <field name="code"/>
-      </field>
-    </field>
-  </record>
-
 </odoo>

delivery_carrier_info/__init__.py

@@ -0,0 +1 @@
+from . import models

delivery_carrier_info/__manifest__.py

@@ -0,0 +1,30 @@
+# Copyright 2020 Akretion (https://www.akretion.com).
+# @author Sébastien BEAU <[email protected]>
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+
+{
+    "name": "Delivery Carrier Info",
+    "summary": "Add code and description on carrier",
+    "version": "12.0.1.0.0",
+    "category": "Delivery",
+    "website": "www.akretion.com",
+    "author": "Akretion,Odoo Community Association (OCA)",
+    "license": "AGPL-3",
+    "application": False,
+    "installable": True,
+    "external_dependencies": {
+        "python": [],
+        "bin": [],
+    },
+    "depends": [
+        "delivery",
+    ],
+    "data": [
+        "views/delivery_view.xml"
+    ],
+    "demo": [
+    ],
+    "qweb": [
+    ]
+}

delivery_carrier_info/models/__init__.py

@@ -0,0 +1 @@
+from . import delivery_carrier

delivery_carrier_info/models/delivery_carrier.py

@@ -0,0 +1,14 @@
+# Copyright 2020 Akretion (https://www.akretion.com).
+# Copyright 2020 Camptocamp SA
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo import fields, models
+
+
+class DeliveryCarrier(models.Model):
+    _inherit = 'delivery.carrier'
+
+    code = fields.Char(
+        help="Delivery Method Code (according to carrier)",
+    )
+    description = fields.Text()

delivery_carrier_info/readme/CONTRIBUTORS.rst

@@ -0,0 +1,2 @@
+* Sébastien BEAU <[email protected]>
+* Guewen Baconnier <[email protected]>

delivery_carrier_info/readme/DESCRIPTION.rst

@@ -0,0 +1 @@
+This module add the field "code" and "description" on the delivery carrier.

delivery_carrier_info/readme/USAGE.rst

@@ -0,0 +1 @@
+In your delivery carrier you can fill the code and the description

delivery_carrier_info/views/delivery_view.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+
+  <record id="view_delivery_carrier_form" model="ir.ui.view">
+    <field name="name">delivery_base.delivery.carrier.view_form</field>
+    <field name="model">delivery.carrier</field>
+    <field name="inherit_id" ref="delivery.view_delivery_carrier_form"/>
+    <field name="arch" type="xml">
+
+      <xpath expr="//h1" position="after">
+        <group>
+          <field name="code"/>
+        </group>
+      </xpath>
+
+      <xpath expr="//notebook" position="inside">
+        <page name="description" string="Description">
+          <field name="description" colspan="4" nolabel="1"/>
+        </page>
+      </xpath>
+
+    </field>
+  </record>
+
+  <record id="view_delivery_carrier_tree" model="ir.ui.view">
+    <field name="name">delivery_carrier_base.tree</field>
+    <field name="model">delivery.carrier</field>
+    <field name="inherit_id" ref="delivery.view_delivery_carrier_tree"/>
+    <field name="arch" type="xml">
+      <field name="name" position="after">
+        <field name="code"/>
+      </field>
+    </field>
+  </record>
+
+
+</odoo>