Merge PR #254 into 16.0

Signed-off-by pedrobaeza

intrastat_delivery/README.rst

@@ -0,0 +1,91 @@
+================================================
+Propagate incoterm from sale delivery to invoice
+================================================
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:8d15cc57390a3af06ebc7dff9c2a29b07535e778c24999e8eb5b082b5a58e670
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |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%2Fintrastat--extrastat-lightgray.png?logo=github
+    :target: https://github.com/OCA/intrastat-extrastat/tree/16.0/intrastat_delivery
+    :alt: OCA/intrastat-extrastat
+.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
+    :target: https://translation.odoo-community.org/projects/intrastat-extrastat-16-0/intrastat-extrastat-16-0-intrastat_delivery
+    :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/intrastat-extrastat&target_branch=16.0
+    :alt: Try me on Runboat
+
+|badge1| |badge2| |badge3| |badge4| |badge5|
+
+This addon allows you to define an "Incoterm" and an "Intrastat Transport Mode" at the
+"Shipping Methods" of sales. When these values are established, they will be the ones
+that prevail in the sales orders, if they are not defined, the default values that were
+established in "Settings" will apply.
+
+The mode of transport and incoterm are assigned to the sales order when it goes from
+"Quotation" to "Order". Additionally, the values will be dragged to the invoices created
+from that sales order.
+
+It is recommended to set TRUE the "Show incoterms in orders and invoices" value at
+"Settings / Sales".
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Usage
+=====
+
+Este módulo no requiere de ninguna consideración especial para su uso.
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/OCA/intrastat-extrastat/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/intrastat-extrastat/issues/new?body=module:%20intrastat_delivery%0Aversion:%2016.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
+~~~~~~~
+
+* FactorLibre
+
+Contributors
+~~~~~~~~~~~~
+
+* Aritz Olea <aritz.olea@factorlibre.com>
+
+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/intrastat-extrastat <https://github.com/OCA/intrastat-extrastat/tree/16.0/intrastat_delivery>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

intrastat_delivery/__init__.py

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

intrastat_delivery/__manifest__.py

@@ -0,0 +1,18 @@
+{
+    "name": "Propagate incoterm from sale delivery to invoice",
+    "version": "16.0.1.0.0",
+    "category": "Accounting",
+    "author": "FactorLibre, Odoo Community Association (OCA)",
+    "website": "https://github.com/OCA/intrastat-extrastat",
+    "license": "AGPL-3",
+    "summary": "Propagates the value of the incoterm fields from the order shipping "
+    "method to the invoices",
+    "depends": [
+        "sale_stock",
+        "delivery",
+        "intrastat_product",
+    ],
+    "data": ["views/delivery_carrier_view.xml"],
+    "installable": True,
+    "application": False,
+}

intrastat_delivery/i18n/es.po

@@ -0,0 +1,47 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* intrastat_delivery
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 16.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-12-26 08:14+0000\n"
+"PO-Revision-Date: 2023-12-26 09:15+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: \n"
+"X-Generator: Poedit 3.0.1\n"
+
+#. module: intrastat_delivery
+#: model:ir.model.fields,field_description:intrastat_delivery.field_delivery_carrier__incoterm
+msgid "Incoterm"
+msgstr ""
+
+#. module: intrastat_delivery
+#: model:ir.model.fields,help:intrastat_delivery.field_delivery_carrier__incoterm
+msgid ""
+"International Commercial Terms are a series of predefined commercial terms "
+"used in international transactions."
+msgstr ""
+"Los términos de comercio internacional son una serie de condiciones "
+"comerciales usadas en las transacciones internacionales."
+
+#. module: intrastat_delivery
+#: model:ir.model.fields,field_description:intrastat_delivery.field_delivery_carrier__intrastat_transport_id
+msgid "Intrastat Transport Mode"
+msgstr "Modo de transporte Intrastat"
+
+#. module: intrastat_delivery
+#: model:ir.model,name:intrastat_delivery.model_sale_order
+msgid "Sales Order"
+msgstr "Pedido de venta"
+
+#. module: intrastat_delivery
+#: model:ir.model,name:intrastat_delivery.model_delivery_carrier
+msgid "Shipping Methods"
+msgstr "Métodos de envío"

intrastat_delivery/i18n/intrastat_delivery.pot

@@ -0,0 +1,43 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* intrastat_delivery
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 16.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-12-26 08:14+0000\n"
+"PO-Revision-Date: 2023-12-26 08:14+0000\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: intrastat_delivery
+#: model:ir.model.fields,field_description:intrastat_delivery.field_delivery_carrier__incoterm
+msgid "Incoterm"
+msgstr ""
+
+#. module: intrastat_delivery
+#: model:ir.model.fields,help:intrastat_delivery.field_delivery_carrier__incoterm
+msgid ""
+"International Commercial Terms are a series of predefined commercial terms "
+"used in international transactions."
+msgstr ""
+
+#. module: intrastat_delivery
+#: model:ir.model.fields,field_description:intrastat_delivery.field_delivery_carrier__intrastat_transport_id
+msgid "Intrastat Transport Mode"
+msgstr ""
+
+#. module: intrastat_delivery
+#: model:ir.model,name:intrastat_delivery.model_sale_order
+msgid "Sales Order"
+msgstr ""
+
+#. module: intrastat_delivery
+#: model:ir.model,name:intrastat_delivery.model_delivery_carrier
+msgid "Shipping Methods"
+msgstr ""

intrastat_delivery/models/__init__.py

@@ -0,0 +1,3 @@
+# © 2023 FactorLibre - Aritz Olea <aritz.olea@factorlibre.com>
+from . import delivery_carrier
+from . import sale_order

intrastat_delivery/models/delivery_carrier.py

@@ -0,0 +1,16 @@
+# © 2023 FactorLibre - Aritz Olea <aritz.olea@factorlibre.com>
+from odoo import fields, models
+
+
+class DeliveryCarrier(models.Model):
+    _inherit = "delivery.carrier"
+
+    incoterm = fields.Many2one(
+        comodel_name="account.incoterms",
+        help="International Commercial Terms are a series of predefined "
+        "commercial terms used in international transactions.",
+    )
+    intrastat_transport_id = fields.Many2one(
+        comodel_name="intrastat.transport_mode",
+        string="Intrastat Transport Mode",
+    )

intrastat_delivery/models/sale_order.py

@@ -0,0 +1,27 @@
+# © 2023 FactorLibre - Aritz Olea <aritz.olea@factorlibre.com>
+from odoo import models
+
+
+class SaleOrder(models.Model):
+    _inherit = "sale.order"
+
+    def _action_confirm(self):
+        ret = super()._action_confirm()
+        for order in self:
+            order.write(
+                {
+                    "incoterm": order.carrier_id.incoterm.id,
+                    "intrastat_transport_id": order.carrier_id.intrastat_transport_id.id,
+                }
+            )
+        return ret
+
+    def _prepare_invoice(self):
+        ret = super()._prepare_invoice()
+        ret.update(
+            {
+                "invoice_incoterm_id": self.incoterm.id,
+                "intrastat_transport_id": self.intrastat_transport_id.id,
+            }
+        )
+        return ret

intrastat_delivery/readme/CONTRIBUTORS.rst

@@ -0,0 +1 @@
+* Aritz Olea <aritz.olea@factorlibre.com>

intrastat_delivery/readme/DESCRIPTION.rst

@@ -0,0 +1,11 @@
+This addon allows you to define an "Incoterm" and an "Intrastat Transport Mode" at the
+"Shipping Methods" of sales. When these values are established, they will be the ones
+that prevail in the sales orders, if they are not defined, the default values that were
+established in "Settings" will apply.
+
+The mode of transport and incoterm are assigned to the sales order when it goes from
+"Quotation" to "Order". Additionally, the values will be dragged to the invoices created
+from that sales order.
+
+It is recommended to set TRUE the "Show incoterms in orders and invoices" value at
+"Settings / Sales".

intrastat_delivery/readme/USAGE.rst

@@ -0,0 +1 @@
+Este módulo no requiere de ninguna consideración especial para su uso.

intrastat_delivery/static/description/index.html

@@ -0,0 +1,434 @@
+<?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>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
+<title>Propagate incoterm from sale delivery to invoice</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="propagate-incoterm-from-sale-delivery-to-invoice">
+<h1 class="title">Propagate incoterm from sale delivery to invoice</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:8d15cc57390a3af06ebc7dff9c2a29b07535e778c24999e8eb5b082b5a58e670
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<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/intrastat-extrastat/tree/16.0/intrastat_delivery"><img alt="OCA/intrastat-extrastat" src="https://img.shields.io/badge/github-OCA%2Fintrastat--extrastat-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/intrastat-extrastat-16-0/intrastat-extrastat-16-0-intrastat_delivery"><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/intrastat-extrastat&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<p>This addon allows you to define an “Incoterm” and an “Intrastat Transport Mode” at the
+“Shipping Methods” of sales. When these values are established, they will be the ones
+that prevail in the sales orders, if they are not defined, the default values that were
+established in “Settings” will apply.</p>
+<p>The mode of transport and incoterm are assigned to the sales order when it goes from
+“Quotation” to “Order”. Additionally, the values will be dragged to the invoices created
+from that sales order.</p>
+<p>It is recommended to set TRUE the “Show incoterms in orders and invoices” value at
+“Settings / Sales”.</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#usage" id="toc-entry-1">Usage</a></li>
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-2">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-3">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-4">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="toc-entry-5">Contributors</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-6">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="usage">
+<h1><a class="toc-backref" href="#toc-entry-1">Usage</a></h1>
+<p>Este módulo no requiere de ninguna consideración especial para su uso.</p>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#toc-entry-2">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/intrastat-extrastat/issues">GitHub Issues</a>.
+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
+<a class="reference external" href="https://github.com/OCA/intrastat-extrastat/issues/new?body=module:%20intrastat_delivery%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<p>Do not contact contributors directly about support or help with technical issues.</p>
+</div>
+<div class="section" id="credits">
+<h1><a class="toc-backref" href="#toc-entry-3">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#toc-entry-4">Authors</a></h2>
+<ul class="simple">
+<li>FactorLibre</li>
+</ul>
+</div>
+<div class="section" id="contributors">
+<h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
+<ul class="simple">
+<li>Aritz Olea &lt;<a class="reference external" href="mailto:aritz.olea&#64;factorlibre.com">aritz.olea&#64;factorlibre.com</a>&gt;</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h2>
+<p>This module is maintained by the OCA.</p>
+<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
+<p>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.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/intrastat-extrastat/tree/16.0/intrastat_delivery">OCA/intrastat-extrastat</a> project on GitHub.</p>
+<p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
+</div>
+</div>
+</div>
+</body>
+</html>

intrastat_delivery/tests/__init__.py

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

intrastat_delivery/tests/test_intrastat_delivery.py

@@ -0,0 +1,89 @@
+# © 2023 FactorLibre - Aritz Olea <aritz.olea@factorlibre.com>
+from odoo import Command
+from odoo.tests import tagged
+
+from odoo.addons.account.tests.common import AccountTestInvoicingCommon
+
+
+@tagged("post_install", "-at_install")
+class TestIntrastatDelivery(AccountTestInvoicingCommon):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.product_1 = cls.env["product.product"].create(
+            {"name": "Service", "type": "consu", "invoice_policy": "order"}
+        )
+        cls.product_delivery_1 = cls.env["product.product"].create(
+            {
+                "name": "Delivery Product 1",
+                "type": "service",
+                "list_price": 10.0,
+                "categ_id": cls.env.ref("delivery.product_category_deliveries").id,
+            }
+        )
+        cls.incoterm = cls.env["account.incoterms"].create(
+            {"name": "Incoterm", "code": "INC"}
+        )
+        cls.intrastat_transport_mode = cls.env["intrastat.transport_mode"].create(
+            {"name": "Incoterm", "code": "INC", "description": "DESC"}
+        )
+        cls.carrier = cls.env["delivery.carrier"].create(
+            {
+                "name": "Test carrier",
+                "delivery_type": "fixed",
+                "product_id": cls.product_delivery_1.id,
+                "incoterm": cls.incoterm.id,
+                "intrastat_transport_id": cls.intrastat_transport_mode.id,
+            }
+        )
+        cls.order = cls.env["sale.order"].create(
+            {
+                "partner_id": cls.partner_a.id,
+                "order_line": [
+                    Command.create(
+                        {
+                            "product_id": cls.product_1.id,
+                        }
+                    ),
+                ],
+            }
+        )
+        cls.journal_sale = cls.env["account.journal"].create(
+            {
+                "name": "Test journal sale",
+                "code": "TST-JRNL-S",
+                "type": "sale",
+                "company_id": cls.env.company.id,
+            }
+        )
+
+    def test_01_incoterms_intrastat_transport_propagation(self):
+        self.assertEqual(self.order.incoterm, self.env["account.incoterms"])
+        self.assertEqual(
+            self.order.intrastat_transport_id, self.env["intrastat.transport_mode"]
+        )
+        self.order.set_delivery_line(self.carrier, 0)
+        self.assertEqual(self.order.incoterm, self.env["account.incoterms"])
+        self.assertEqual(
+            self.order.intrastat_transport_id, self.env["intrastat.transport_mode"]
+        )
+        self.order.action_confirm()
+        self.assertEqual(self.order.incoterm, self.incoterm)
+        self.assertEqual(
+            self.order.intrastat_transport_id, self.intrastat_transport_mode
+        )
+        self.context = {
+            "active_model": "sale.order",
+            "active_ids": [self.order.id],
+            "active_id": self.order.id,
+            "default_journal_id": self.journal_sale.id,
+        }
+        payment = (
+            self.env["sale.advance.payment.inv"]
+            .with_context(**self.context)
+            .create({"advance_payment_method": "delivered"})
+        )
+        payment.create_invoices()
+        invoice = self.order.invoice_ids[0]
+        self.assertEqual(invoice.invoice_incoterm_id, self.incoterm)
+        self.assertEqual(invoice.intrastat_transport_id, self.intrastat_transport_mode)

intrastat_delivery/views/delivery_carrier_view.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- © 2023 - FactorLibre - Aritz Olea <aritz.olea@factorlibre.com>
+     License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -->
+<odoo>
+    <record id="delivery-carrier_form_inherit" model="ir.ui.view">
+        <field name="name">delivery.carrier.form.inherit</field>
+        <field name="model">delivery.carrier</field>
+        <field name="inherit_id" ref="delivery.view_delivery_carrier_form" />
+        <field name="arch" type="xml">
+            <xpath expr="//group[@name='delivery_details']" position="inside">
+                <field name="incoterm" />
+                <field name="intrastat_transport_id" />
+            </xpath>
+        </field>
+    </record>
+</odoo>

setup/intrastat_delivery/odoo/addons/intrastat_delivery

@@ -0,0 +1 @@
+../../../../intrastat_delivery

setup/intrastat_delivery/setup.py

@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)