Skip to content

Commit

Permalink
extract delivery_carrier_info from base_delivery_carrier_label
Browse files Browse the repository at this point in the history
  • Loading branch information
sebastienbeau committed Nov 5, 2020
1 parent 4da40f7 commit e7e58c2
Show file tree
Hide file tree
Showing 11 changed files with 89 additions and 22 deletions.
4 changes: 2 additions & 2 deletions base_delivery_carrier_label/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
{
"name": "Base module for carrier labels",
"version": "13.0.1.0.0",
"version": "13.0.2.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",
Expand Down
2 changes: 0 additions & 2 deletions base_delivery_carrier_label/models/delivery_carrier.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ class DeliveryCarrier(models.Model):
_inherit = "delivery.carrier"

delivery_type = fields.Selection()
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",
Expand Down
18 changes: 0 additions & 18 deletions base_delivery_carrier_label/views/delivery.xml
Original file line number Diff line number Diff line change
Expand Up @@ -72,29 +72,11 @@
<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 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>
1 change: 1 addition & 0 deletions delivery_carrier_info/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
from . import models
30 changes: 30 additions & 0 deletions delivery_carrier_info/__manifest__.py
Original file line number Diff line number Diff line change
@@ -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": [
]
}
1 change: 1 addition & 0 deletions delivery_carrier_info/models/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
from . import delivery_carrier
14 changes: 14 additions & 0 deletions delivery_carrier_info/models/delivery_carrier.py
Original file line number Diff line number Diff line change
@@ -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()
2 changes: 2 additions & 0 deletions delivery_carrier_info/readme/CONTRIBUTORS.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
* Sébastien BEAU <[email protected]>
* Guewen Baconnier <[email protected]>
1 change: 1 addition & 0 deletions delivery_carrier_info/readme/DESCRIPTION.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
This module add the field "code" and "description" on the delivery carrier.
1 change: 1 addition & 0 deletions delivery_carrier_info/readme/USAGE.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
In your delivery carrier you can fill the code and the description
37 changes: 37 additions & 0 deletions delivery_carrier_info/views/delivery_view.xml
Original file line number Diff line number Diff line change
@@ -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>

0 comments on commit e7e58c2

Please sign in to comment.