Merge PR #50 into 16.0

Signed-off-by simahawk
OCA · Jan 12, 2024 · 1ff7d8d · 1ff7d8d
2 parents 7d2ceba + 39faa6b
commit 1ff7d8d
Show file tree

Hide file tree

Showing 8 changed files with 72 additions and 22 deletions.
diff --git a/edi_product_oca/README.rst b/edi_product_oca/README.rst
@@ -7,7 +7,7 @@ EDI Product
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:9eb0e9359e040d5f63d6af40d6aeaaa5f9f04450c7fa6cc4a65b8000ba2c1057
+   !! source digest: sha256:ac1b0384c346db1efe7365072abc11e64481bb1e90fdb936d157bc108539052c
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
@@ -28,7 +28,7 @@ EDI Product
 
 |badge1| |badge2| |badge3| |badge4| |badge5|
 
-Provide basic configuration for products with EDI framework.
+Provide basic configuration for products and product packaging with EDI framework.
 
 **Table of contents**
 
@@ -57,6 +57,7 @@ Contributors
 ~~~~~~~~~~~~
 
 * Oriol Miranda <[email protected]>
+* Duong (Tran Quoc) <[email protected]>
 
 Maintainers
 ~~~~~~~~~~~

diff --git a/edi_product_oca/__manifest__.py b/edi_product_oca/__manifest__.py
@@ -4,7 +4,7 @@
 {
     "name": "EDI Product",
     "summary": """
-       EDI framework configuration and base logic for products""",
+       EDI framework configuration and base logic for products and products packaging""",
     "version": "16.0.1.0.0",
     "license": "AGPL-3",
     "author": "ForgeFlow, Odoo Community Association (OCA)",
@@ -13,5 +13,8 @@
         "product",
         "edi_oca",
     ],
-    "data": ["views/product_views.xml"],
+    "data": [
+        "views/product_views.xml",
+        "views/product_packaging_views.xml",
+    ],
 }
diff --git a/edi_product_oca/models/__init__.py b/edi_product_oca/models/__init__.py
@@ -1,2 +1,3 @@
 from . import product_product
 from . import product_template
+from . import product_packaging
diff --git a/edi_product_oca/models/product_packaging.py b/edi_product_oca/models/product_packaging.py
@@ -0,0 +1,9 @@
+# Copyright 2024 Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import models
+
+
+class ProductPackaging(models.Model):
+    _name = "product.packaging"
+    _inherit = ["product.packaging", "edi.exchange.consumer.mixin"]
diff --git a/edi_product_oca/readme/CONTRIBUTORS.rst b/edi_product_oca/readme/CONTRIBUTORS.rst
@@ -1 +1,2 @@
 * Oriol Miranda <[email protected]>
+* Duong (Tran Quoc) <[email protected]>
diff --git a/edi_product_oca/readme/DESCRIPTION.rst b/edi_product_oca/readme/DESCRIPTION.rst
@@ -1 +1 @@
-Provide basic configuration for products with EDI framework.
+Provide basic configuration for products and product packaging with EDI framework.
diff --git a/edi_product_oca/static/description/index.html b/edi_product_oca/static/description/index.html
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?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/" />
+<meta name="generator" content="Docutils: http://docutils.sourceforge.net/" />
 <title>EDI Product</title>
 <style type="text/css">
 
 /*
 :Author: David Goodger ([email protected])
-:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Id: $Id: html4css1.css 7952 2016-07-26 18:15:59Z 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
+See http://docutils.sf.net/docs/howto/html-stylesheets.html for how to
 customize this style sheet.
 */
 
@@ -367,46 +367,47 @@ <h1 class="title">EDI Product</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:9eb0e9359e040d5f63d6af40d6aeaaa5f9f04450c7fa6cc4a65b8000ba2c1057
+!! source digest: sha256:ac1b0384c346db1efe7365072abc11e64481bb1e90fdb936d157bc108539052c
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<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/edi-framework/tree/16.0/edi_product_oca"><img alt="OCA/edi-framework" src="https://img.shields.io/badge/github-OCA%2Fedi--framework-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/edi-framework-16-0/edi-framework-16-0-edi_product_oca"><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/edi-framework&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>Provide basic configuration for products with EDI framework.</p>
+<p><a class="reference external" 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" 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" href="https://github.com/OCA/edi-framework/tree/16.0/edi_product_oca"><img alt="OCA/edi-framework" src="https://img.shields.io/badge/github-OCA%2Fedi--framework-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/edi-framework-16-0/edi-framework-16-0-edi_product_oca"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runboat.odoo-community.org/builds?repo=OCA/edi-framework&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>Provide basic configuration for products and product packaging with EDI framework.</p>
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">
 <ul class="simple">
-<li><a class="reference internal" href="#bug-tracker" id="toc-entry-1">Bug Tracker</a></li>
-<li><a class="reference internal" href="#credits" id="toc-entry-2">Credits</a><ul>
-<li><a class="reference internal" href="#authors" id="toc-entry-3">Authors</a></li>
-<li><a class="reference internal" href="#contributors" id="toc-entry-4">Contributors</a></li>
-<li><a class="reference internal" href="#maintainers" id="toc-entry-5">Maintainers</a></li>
+<li><a class="reference internal" href="#bug-tracker" id="id1">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="id2">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="id3">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="id4">Contributors</a></li>
+<li><a class="reference internal" href="#maintainers" id="id5">Maintainers</a></li>
 </ul>
 </li>
 </ul>
 </div>
 <div class="section" id="bug-tracker">
-<h1><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h1>
+<h1><a class="toc-backref" href="#id1">Bug Tracker</a></h1>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/edi-framework/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/edi-framework/issues/new?body=module:%20edi_product_oca%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-2">Credits</a></h1>
+<h1><a class="toc-backref" href="#id2">Credits</a></h1>
 <div class="section" id="authors">
-<h2><a class="toc-backref" href="#toc-entry-3">Authors</a></h2>
+<h2><a class="toc-backref" href="#id3">Authors</a></h2>
 <ul class="simple">
 <li>ForgeFlow</li>
 </ul>
 </div>
 <div class="section" id="contributors">
-<h2><a class="toc-backref" href="#toc-entry-4">Contributors</a></h2>
+<h2><a class="toc-backref" href="#id4">Contributors</a></h2>
 <ul class="simple">
 <li>Oriol Miranda &lt;<a class="reference external" href="mailto:oriol.miranda&#64;forgeflow.com">oriol.miranda&#64;forgeflow.com</a>&gt;</li>
+<li>Duong (Tran Quoc) &lt;<a class="reference external" href="mailto:duongtq&#64;trobz.com">duongtq&#64;trobz.com</a>&gt;</li>
 </ul>
 </div>
 <div class="section" id="maintainers">
-<h2><a class="toc-backref" href="#toc-entry-5">Maintainers</a></h2>
+<h2><a class="toc-backref" href="#id5">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

diff --git a/edi_product_oca/views/product_packaging_views.xml b/edi_product_oca/views/product_packaging_views.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record id="product_packaging_form_view" model="ir.ui.view">
+        <field name="name">product.packaging.form.view - edi_product_oca</field>
+        <field name="model">product.packaging</field>
+        <field name="inherit_id" ref="product.product_packaging_form_view" />
+        <field name="arch" type="xml">
+            <group name="qty" position="after">
+                    <group name="edi" string="EDI">
+                        <group name="edi_main">
+                            <field name="edi_disable_auto" />
+                        </group>
+                    </group>
+            </group>
+            <xpath expr="//label[@for='name']" position="before">
+                <div name="button_box" class="oe_button_box">
+                    <button
+                        type="object"
+                        class="oe_stat_button"
+                        icon="fa-retweet"
+                        attrs="{'invisible': [('exchange_record_count', '=', 0)]}"
+                        name="action_view_edi_records"
+                    >
+                        <field
+                            string="EDI"
+                            name="exchange_record_count"
+                            widget="statinfo"
+                        />
+                    </button>
+                </div>
+            </xpath>
+       </field>
+   </record>
+</odoo>
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		* Oriol Miranda <[email protected]>
		* Duong (Tran Quoc) <[email protected]>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Provide basic configuration for products with EDI framework.
		Provide basic configuration for products and product packaging with EDI framework.