From fd17474f155f30688a01c084f92a6999a04e2454 Mon Sep 17 00:00:00 2001 From: Rafa Morant Date: Mon, 5 Jun 2023 18:01:27 +0200 Subject: [PATCH 01/13] [14.0][MIG] sale_order_import_edifact & base_edifact --- sale_order_import_edifact/README.rst | 154 ++++++ sale_order_import_edifact/__init__.py | 2 + sale_order_import_edifact/__manifest__.py | 31 ++ sale_order_import_edifact/demo/demo_data.xml | 81 +++ sale_order_import_edifact/models/__init__.py | 1 + .../models/business_document_import.py | 54 ++ .../readme/CONFIGURE.rst | 30 ++ .../readme/CONTRIBUTORS.rst | 2 + .../readme/DESCRIPTION.rst | 6 + sale_order_import_edifact/readme/HISTORY.rst | 15 + sale_order_import_edifact/readme/ROADMAP.rst | 5 + .../static/description/icon.png | Bin 0 -> 9455 bytes .../static/description/icon.svg | 79 +++ .../static/description/index.html | 495 ++++++++++++++++++ sale_order_import_edifact/tests/__init__.py | 1 + sale_order_import_edifact/tests/common.py | 42 ++ .../files/Retail_EDIFACT_ORDERS_sample1.txt | 26 + .../files/Retail_EDIFACT_ORDERS_sample2.txt | 29 + .../tests/test_edifact_order_import.py | 40 ++ sale_order_import_edifact/wizard/__init__.py | 1 + .../wizard/sale_order_import.py | 237 +++++++++ .../wizard/sale_order_import_view.xml | 25 + 22 files changed, 1356 insertions(+) create mode 100644 sale_order_import_edifact/README.rst create mode 100644 sale_order_import_edifact/__init__.py create mode 100644 sale_order_import_edifact/__manifest__.py create mode 100644 sale_order_import_edifact/demo/demo_data.xml create mode 100644 sale_order_import_edifact/models/__init__.py create mode 100644 sale_order_import_edifact/models/business_document_import.py create mode 100644 sale_order_import_edifact/readme/CONFIGURE.rst create mode 100644 sale_order_import_edifact/readme/CONTRIBUTORS.rst create mode 100644 sale_order_import_edifact/readme/DESCRIPTION.rst create mode 100644 sale_order_import_edifact/readme/HISTORY.rst create mode 100644 sale_order_import_edifact/readme/ROADMAP.rst create mode 100644 sale_order_import_edifact/static/description/icon.png create mode 100644 sale_order_import_edifact/static/description/icon.svg create mode 100644 sale_order_import_edifact/static/description/index.html create mode 100644 sale_order_import_edifact/tests/__init__.py create mode 100644 sale_order_import_edifact/tests/common.py create mode 100644 sale_order_import_edifact/tests/files/Retail_EDIFACT_ORDERS_sample1.txt create mode 100644 sale_order_import_edifact/tests/files/Retail_EDIFACT_ORDERS_sample2.txt create mode 100644 sale_order_import_edifact/tests/test_edifact_order_import.py create mode 100644 sale_order_import_edifact/wizard/__init__.py create mode 100644 sale_order_import_edifact/wizard/sale_order_import.py create mode 100644 sale_order_import_edifact/wizard/sale_order_import_view.xml diff --git a/sale_order_import_edifact/README.rst b/sale_order_import_edifact/README.rst new file mode 100644 index 0000000000..9d44702343 --- /dev/null +++ b/sale_order_import_edifact/README.rst @@ -0,0 +1,154 @@ +=========================================== +Import Business Document EDIFACT/D96A Order +=========================================== + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Alpha-red.png + :target: https://odoo-community.org/page/development-status + :alt: Alpha +.. |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%2Fedi-lightgray.png?logo=github + :target: https://github.com/OCA/edi/tree/14.0/sale_order_import_edifact + :alt: OCA/edi +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/edi-14-0/edi-14-0-sale_order_import_edifact + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/226/14.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +UN/EDIFACT + United Nations rules for Elec­tronic Data Interchange for Administration, Commerce and Transport + +This module plugs EDIFACT/D96A ORDER in sale_order_import process. + +https://www.stedi.com/edi/edifact/D96A/messages/ORDERS + +.. IMPORTANT:: + This is an alpha version, the data model and design can change at any time without warning. + Only for development or testing purpose, do not use in production. + `More details on development status `_ + +**Table of contents** + +.. contents:: + :local: + +Configuration +============= + + +EDI Exchange Type "Advanced Settings" + +.. code-block:: yaml + + components: + process: + usage: input.process.sale.order + + sale_order_import: + price_source: order + confirm_order: false + wiz_ctx: + file_ext: 'edi' + release: 'd96a' + doc_type: 'rfq' + + +- price_source. Can be 'order' or 'pricelist' +- confirm_order. False by default +- wiz_ctx. Wizard's context + - file_ext. File extensions supported. By default: 'txt,d96a' + - release. EDIFACT format release. + - doc_type. ('rfq', "Request for Quotation") | ('order', "Order"). Default 'order' + +This module struggles with EDIFACT format, if you need X12 format you will need something like sale_order_import_x12 module. + +Regardless format, a concret document should need a concret specification nammed release. For example Amazon uses "D96A" specification. + +See + +Known issues / Roadmap +====================== + +.. Enumerate known caveats and future potential improvements. + It is mostly intended for end-users, and can also help + potential new contributors discovering new features to implement. + +* Refactor import by release + +Changelog +========= + +.. The change log. The goal of this file is to help readers + understand changes between versions. The primary audience is + end users and integrators. Purely technical changes such as + code refactoring must not be mentioned here. + + This file may contain ONE level of section titles, underlined + with the ~ (tilde) character. Other section markers are + forbidden and will likely break the structure of the README.rst + or other documents where this fragment is included. + +14.0.1.0.0 (2023-06-07) +~~~~~~~~~~~~~~~~~~~~~~~ + +* [14.0][MIG] sale_order_import_edifact & base_edifact. + (`#779 `_) + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues `_. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* ALBA Software + +Contributors +~~~~~~~~~~~~ + +* Rafa Morant (https://www.albasoft.com) +* Marc Poch + +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. + +.. |maintainer-rmorant| image:: https://github.com/rmorant.png?size=40px + :target: https://github.com/rmorant + :alt: rmorant + +Current `maintainer `__: + +|maintainer-rmorant| + +This module is part of the `OCA/edi `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/sale_order_import_edifact/__init__.py b/sale_order_import_edifact/__init__.py new file mode 100644 index 0000000000..9b4296142f --- /dev/null +++ b/sale_order_import_edifact/__init__.py @@ -0,0 +1,2 @@ +from . import models +from . import wizard diff --git a/sale_order_import_edifact/__manifest__.py b/sale_order_import_edifact/__manifest__.py new file mode 100644 index 0000000000..eeea97e189 --- /dev/null +++ b/sale_order_import_edifact/__manifest__.py @@ -0,0 +1,31 @@ +# Copyright 2023 ALBA Software S.L. +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl-3.0) + +{ + "name": "Import Business Document EDIFACT/D96A Order", + "summary": "EDIFACT/D96A Order", + "version": "14.0.1.0.0", + "development_status": "Alpha", + "category": "Sales Management", + "website": "https://github.com/OCA/edi", + "author": "ALBA Software, Odoo Community Association (OCA)", + "maintainers": ["rmorant"], + "license": "AGPL-3", + "application": False, + "installable": True, + "external_dependencies": { + "python": [], + "bin": [], + }, + "depends": [ + "sale_management", + "partner_identification", + "partner_identification_gln", + "base_edifact", + "edi_sale_order_import", + ], + "data": [ + "wizard/sale_order_import_view.xml", + ], + "demo": ["demo/demo_data.xml"], +} diff --git a/sale_order_import_edifact/demo/demo_data.xml b/sale_order_import_edifact/demo/demo_data.xml new file mode 100644 index 0000000000..0e17c7abd5 --- /dev/null +++ b/sale_order_import_edifact/demo/demo_data.xml @@ -0,0 +1,81 @@ + + + + + AMATEST EU SARL + + + 38 Avenue J.F. Kennedy + 1234 + Luxembourg + + + + AMATEST EU (TST) + + 80 Bojsdoeisn + 4321 + Gliwice + + + delivery + + + AMATEST Invoice + + Accountant + + invoice + + + + + + + 5450534000017 + + + + + 5450534008617 + + + + + 5450534008143 + + + + EDIFACT Demo 1 + + consu + edifact1 + + 9783898307529 + + + EDIFACT Demo 2 + + consu + edifac2 + + 9783898307538 + + + EDIFACT Demo 3 + + consu + edifact + + 9783898307645 + + diff --git a/sale_order_import_edifact/models/__init__.py b/sale_order_import_edifact/models/__init__.py new file mode 100644 index 0000000000..d695bc5f59 --- /dev/null +++ b/sale_order_import_edifact/models/__init__.py @@ -0,0 +1 @@ +from . import business_document_import diff --git a/sale_order_import_edifact/models/business_document_import.py b/sale_order_import_edifact/models/business_document_import.py new file mode 100644 index 0000000000..f495f4f3f0 --- /dev/null +++ b/sale_order_import_edifact/models/business_document_import.py @@ -0,0 +1,54 @@ +# Copyright 2019 PlanetaTIC - Marc Poch +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import _, api, exceptions, models + + +class BusinessDocumentImport(models.AbstractModel): + _inherit = "business.document.import" + + @api.model + def _hook_match_partner(self, partner_dict, chatter_msg, domain, order): + """ + 2 types + partner_dict = {'gln':""} + partner_dict = {'partner': {'gln':""}, 'address':{'country_code':"ES",...}} + """ + partner = partner_dict.get("partner", partner_dict) + partner_dict.get("address", False) + if not partner.get("gln"): + return super()._hook_match_partner(partner_dict, chatter_msg, domain, order) + party_id = partner["gln"] + + partner_id_category = self.env.ref( + "partner_identification_gln.partner_identification_gln_number_category" + ) + if not partner_id_category: + raise exceptions.UserError( + _( + "partner_identification_gln module should be installed with a xmlid: " + "partner_identification_gln_number_category" + ) + ) + id_number = self.env["res.partner.id_number"].search( + [("category_id", "=", int(partner_id_category)), ("name", "=", party_id)], + limit=1, + ) + if not id_number: + ctx = partner.get( + "edi_ctx", {"order_filename": _("Unknown"), "rff_va": _("Unknown")} + ) + raise exceptions.UserError( + _( + "Partner GLN Code: %s not found in order file: '%s' " + "from VAT registration number '%s'." + ) + % (party_id, ctx.get("order_filename"), ctx.get("rff_va")) + ) + + return id_number.partner_id + + # @api.model + # def post_create_or_update(self, parsed_dict, record, doc_filename=None): + # if 'origin_exchange_record_id' in record.fields_get(): + # record.origin_exchange_record_id = diff --git a/sale_order_import_edifact/readme/CONFIGURE.rst b/sale_order_import_edifact/readme/CONFIGURE.rst new file mode 100644 index 0000000000..dfd1b95a6a --- /dev/null +++ b/sale_order_import_edifact/readme/CONFIGURE.rst @@ -0,0 +1,30 @@ + +EDI Exchange Type "Advanced Settings" + +.. code-block:: yaml + + components: + process: + usage: input.process.sale.order + + sale_order_import: + price_source: order + confirm_order: false + wiz_ctx: + file_ext: 'edi' + release: 'd96a' + doc_type: 'rfq' + + +- price_source. Can be 'order' or 'pricelist' +- confirm_order. False by default +- wiz_ctx. Wizard's context + - file_ext. File extensions supported. By default: 'txt,d96a' + - release. EDIFACT format release. + - doc_type. ('rfq', "Request for Quotation") | ('order', "Order"). Default 'order' + +This module struggles with EDIFACT format, if you need X12 format you will need something like sale_order_import_x12 module. + +Regardless format, a concret document should need a concret specification nammed release. For example Amazon uses "D96A" specification. + +See diff --git a/sale_order_import_edifact/readme/CONTRIBUTORS.rst b/sale_order_import_edifact/readme/CONTRIBUTORS.rst new file mode 100644 index 0000000000..a153b2ddd1 --- /dev/null +++ b/sale_order_import_edifact/readme/CONTRIBUTORS.rst @@ -0,0 +1,2 @@ +* Rafa Morant (https://www.albasoft.com) +* Marc Poch diff --git a/sale_order_import_edifact/readme/DESCRIPTION.rst b/sale_order_import_edifact/readme/DESCRIPTION.rst new file mode 100644 index 0000000000..0874269f06 --- /dev/null +++ b/sale_order_import_edifact/readme/DESCRIPTION.rst @@ -0,0 +1,6 @@ +UN/EDIFACT + United Nations rules for Elec­tronic Data Interchange for Administration, Commerce and Transport + +This module plugs EDIFACT/D96A ORDER in sale_order_import process. + +https://www.stedi.com/edi/edifact/D96A/messages/ORDERS diff --git a/sale_order_import_edifact/readme/HISTORY.rst b/sale_order_import_edifact/readme/HISTORY.rst new file mode 100644 index 0000000000..c57a493aa1 --- /dev/null +++ b/sale_order_import_edifact/readme/HISTORY.rst @@ -0,0 +1,15 @@ +.. The change log. The goal of this file is to help readers + understand changes between versions. The primary audience is + end users and integrators. Purely technical changes such as + code refactoring must not be mentioned here. + + This file may contain ONE level of section titles, underlined + with the ~ (tilde) character. Other section markers are + forbidden and will likely break the structure of the README.rst + or other documents where this fragment is included. + +14.0.1.0.0 (2023-06-07) +~~~~~~~~~~~~~~~~~~~~~~~ + +* [14.0][MIG] sale_order_import_edifact & base_edifact. + (`#779 `_) diff --git a/sale_order_import_edifact/readme/ROADMAP.rst b/sale_order_import_edifact/readme/ROADMAP.rst new file mode 100644 index 0000000000..e5c8273d15 --- /dev/null +++ b/sale_order_import_edifact/readme/ROADMAP.rst @@ -0,0 +1,5 @@ +.. Enumerate known caveats and future potential improvements. + It is mostly intended for end-users, and can also help + potential new contributors discovering new features to implement. + +* Refactor import by release diff --git a/sale_order_import_edifact/static/description/icon.png b/sale_order_import_edifact/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/sale_order_import_edifact/static/description/icon.svg b/sale_order_import_edifact/static/description/icon.svg new file mode 100644 index 0000000000..a7a26d0932 --- /dev/null +++ b/sale_order_import_edifact/static/description/icon.svg @@ -0,0 +1,79 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/sale_order_import_edifact/static/description/index.html b/sale_order_import_edifact/static/description/index.html new file mode 100644 index 0000000000..007ccd6242 --- /dev/null +++ b/sale_order_import_edifact/static/description/index.html @@ -0,0 +1,495 @@ + + + + + + +Import Business Document EDIFACT/D96A Order + + + +
+

Import Business Document EDIFACT/D96A Order

+ + +

Alpha License: AGPL-3 OCA/edi Translate me on Weblate Try me on Runbot

+
+
UN/EDIFACT
+
United Nations rules for Elec­tronic Data Interchange for Administration, Commerce and Transport
+
+

This module plugs EDIFACT/D96A ORDER in sale_order_import process.

+

https://www.stedi.com/edi/edifact/D96A/messages/ORDERS

+
+

Important

+

This is an alpha version, the data model and design can change at any time without warning. +Only for development or testing purpose, do not use in production. +More details on development status

+
+

Table of contents

+ +
+

Configuration

+

EDI Exchange Type “Advanced Settings”

+
+components:
+   process:
+      usage: input.process.sale.order
+
+sale_order_import:
+   price_source: order
+   confirm_order: false
+   wiz_ctx:
+      file_ext: 'edi'
+      release: 'd96a'
+      doc_type: 'rfq'
+
+
    +
  • price_source. Can be ‘order’ or ‘pricelist’
    • +
  • confirm_order. False by default
    • +
  • wiz_ctx. Wizard’s context +- file_ext. File extensions supported. By default: ‘txt,d96a’ +- release. EDIFACT format release. +- doc_type. (‘rfq’, “Request for Quotation”) | (‘order’, “Order”). Default ‘order’
    • +
+

This module struggles with EDIFACT format, if you need X12 format you will need something like sale_order_import_x12 module.

+

Regardless format, a concret document should need a concret specification nammed release. For example Amazon uses “D96A” specification.

+

See <https://www.stedi.com/edi/edifact>

+
+
+

Known issues / Roadmap

+ +
    +
  • Refactor import by release
    • +
+
+
+

Changelog

+ +
+

14.0.1.0.0 (2023-06-07)

+
    +
  • [14.0][MIG] sale_order_import_edifact & base_edifact. +(#779)
    • +
+
+
+
+

Bug Tracker

+

Bugs are tracked on GitHub Issues. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed +feedback.

+

Do not contact contributors directly about support or help with technical issues.

+
+
+

Credits

+
+

Authors

+
    +
  • ALBA Software
    • +
+
+ +
+

Maintainers

+

This module is maintained by the OCA.

+Odoo Community Association +

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.

+

Current maintainer:

+

rmorant

+

This module is part of the OCA/edi project on GitHub.

+

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

+
+
+
+ + diff --git a/sale_order_import_edifact/tests/__init__.py b/sale_order_import_edifact/tests/__init__.py new file mode 100644 index 0000000000..90d50ce03d --- /dev/null +++ b/sale_order_import_edifact/tests/__init__.py @@ -0,0 +1 @@ +from . import test_edifact_order_import diff --git a/sale_order_import_edifact/tests/common.py b/sale_order_import_edifact/tests/common.py new file mode 100644 index 0000000000..5a483c5e97 --- /dev/null +++ b/sale_order_import_edifact/tests/common.py @@ -0,0 +1,42 @@ +# Copyright 2016 Akretion +# @author: Alexis de Lattre ) +# Copyright 2022 Camptocamp +# @author: Simone Orsi +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from functools import partial + +from odoo.tools import DotDict, file_open + + +def _get_file_content(filename): + path = "sale_order_import_edifact/tests/files/" + filename + with file_open(path, "rb") as fd: + return fd.read() + + +def get_test_data(env): + ref = env.ref + return { + "Retail_EDIFACT_ORDERS_sample1.txt": DotDict( + { + "_get_content": partial( + _get_file_content, "Retail_EDIFACT_ORDERS_sample1.txt" + ), + "client_order_ref": "1AA1TEST", + "date_order": "2023-06-06", + "partner": ref("sale_order_import_edifact.partner_edi_invoiceto_dm"), + "shipping_partner": ref( + "sale_order_import_edifact.partner_edi_shipto_dm" + ), + # "invoicing_partner": ref( + # "sale_order_import_edifact.partner_edi_invoiceto_dm" + # ), + # "currency": ref("base.SEK"), + # "commitment_date": "", + "products": ref("sale_order_import_edifact.product_product_edifact1_dm") + + ref("sale_order_import_edifact.product_product_edifact2_dm") + + ref("sale_order_import_edifact.product_product_edifact3_dm"), + } + ) + } diff --git a/sale_order_import_edifact/tests/files/Retail_EDIFACT_ORDERS_sample1.txt b/sale_order_import_edifact/tests/files/Retail_EDIFACT_ORDERS_sample1.txt new file mode 100644 index 0000000000..59e6923fd8 --- /dev/null +++ b/sale_order_import_edifact/tests/files/Retail_EDIFACT_ORDERS_sample1.txt @@ -0,0 +1,26 @@ +UNB+UNOA:2+5450534000000:14+8450534000000:14+221117:0134+4234++++1+EANCOM' +UNH+1+ORDERS:D:96A:UN:EAN008' +BGM+220+1AA1TEST+9' +DTM+137:20230606:102' +DTM+63:20230606:102' +DTM+64:20230606:102' +RFF+CR:ABCD5' +NAD+BY+5450534000017::9' +NAD+SU+8450534000000::9' +NAD+DP+5450534008617::9+++++++GB' +NAD+IV+5450534008143::9++AMAZON EU SARL+38 Avenue J.F. Kennedy+Luxembourg++1855+LU' +RFF+VA:LU20260743' +CUX+2:EUR:9' +LIN+1++9783898307529:EN' +QTY+21:5' +PRI+AAA:27.5' +LIN+2++9783898307538:EN' +QTY+21:1' +PRI+AAA:10.87' +LIN+3++9783898307645:EN' +QTY+21:3' +PRI+AAA:3.85' +UNS+S' +CNT+2:3' +UNT+24+1' +UNZ+1+4234' diff --git a/sale_order_import_edifact/tests/files/Retail_EDIFACT_ORDERS_sample2.txt b/sale_order_import_edifact/tests/files/Retail_EDIFACT_ORDERS_sample2.txt new file mode 100644 index 0000000000..29bdb06d69 --- /dev/null +++ b/sale_order_import_edifact/tests/files/Retail_EDIFACT_ORDERS_sample2.txt @@ -0,0 +1,29 @@ +UNB+UNOA:2+5450534000000:14+:14+221117:0134+4234++++1+EANCOM' +UNH+1+ORDERS:D:96A:UN:EAN008' +BGM+220+1AA1TEST+9' +DTM+137:20221117:102' +DTM+63:20221127:102' +DTM+64:20221124:102' +RFF+CR:ABCD5' +NAD+BY+5450534000017::9' +NAD+SU+::9' +NAD+DP+5450534000086::9+++++++DE' +NAD+IV+5450534005838::9++AMAZON EU SARL:NIEDERLASSUNG DEUTSCHLAND+MARCEL-BREUER-STR. 12+MUENCHEN++80807+DE' +RFF+VA:DE814584193' +CUX+2:EUR:9' +LIN+1' +PIA+5+567123:SA' +QTY+21:5' +PRI+AAA:27.5' +LIN+2' +PIA+5+1234567:SA' +QTY+21:1' +PRI+AAA:10.87' +LIN+3' +PIA+5+765432:SA' +QTY+21:3' +PRI+AAA:3.85' +UNS+S' +CNT+2:3' +UNT+27+1' +UNZ+1+4234' diff --git a/sale_order_import_edifact/tests/test_edifact_order_import.py b/sale_order_import_edifact/tests/test_edifact_order_import.py new file mode 100644 index 0000000000..5bf0f57016 --- /dev/null +++ b/sale_order_import_edifact/tests/test_edifact_order_import.py @@ -0,0 +1,40 @@ +# Copyright 2023 ALBA Software S.L. +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl-3.0) + +import base64 + +from odoo.tests.common import TransactionCase +from odoo.tools import mute_logger + +from .common import get_test_data + + +class TestEdifactOrderImport(TransactionCase): + @mute_logger("odoo.addons.sale_order_import.wizard.sale_order_import") + def test_edifact_order_import(self): + tests = get_test_data(self.env) + for filename, expected in tests.items(): + edifact_file = expected._get_content() + wiz = self.env["sale.order.import"].create( + { + "order_file": base64.b64encode(edifact_file), + "order_filename": filename, + } + ) + action = wiz.import_order_button() + so = self.env["sale.order"].browse(action["res_id"]) + self.assertEqual(so.partner_id, expected["partner"]) + + if expected.get("client_order_ref"): + self.assertEqual(so.client_order_ref, expected["client_order_ref"]) + + if expected.get("shipping_partner"): + self.assertEqual(so.partner_shipping_id, expected["shipping_partner"]) + if expected.get("invoicing_partner"): + self.assertEqual(so.partner_invoice_id, expected["invoicing_partner"]) + + if expected.get("products"): + expected_ids = sorted(expected["products"].ids) + self.assertEqual( + sorted(so.order_line.mapped("product_id").ids), expected_ids + ) diff --git a/sale_order_import_edifact/wizard/__init__.py b/sale_order_import_edifact/wizard/__init__.py new file mode 100644 index 0000000000..e0ddf6156f --- /dev/null +++ b/sale_order_import_edifact/wizard/__init__.py @@ -0,0 +1 @@ +from . import sale_order_import diff --git a/sale_order_import_edifact/wizard/sale_order_import.py b/sale_order_import_edifact/wizard/sale_order_import.py new file mode 100644 index 0000000000..3b597525a7 --- /dev/null +++ b/sale_order_import_edifact/wizard/sale_order_import.py @@ -0,0 +1,237 @@ +import json +import logging +import os +from base64 import b64decode +from collections import defaultdict + +from odoo import _, api, fields, models +from odoo.exceptions import UserError + +logger = logging.getLogger(__name__) + + +class SaleOrderImportEdifact(models.TransientModel): + _name = "sale.order.import" + _inherit = ["sale.order.import", "base.edifact"] + + state = fields.Selection( + selection_add=[("tech", "Technical")], ondelete={"tech": "set default"} + ) + parsed_json = fields.Text() + + @property + def edifact_ok(self): + conf_ext = self.env.context.get("file_ext", "txt,d96a") + extensions = conf_ext.split(",") + ok = False + if self.order_filename: + path, ext = os.path.splitext(self.order_filename) + ok = ext and ext[1:] in extensions + if not ok and self.order_file: + ok = b64decode(self.order_file[:4]) == b"UNB" + return ok + + @api.onchange("order_file") + def order_file_change(self): + if self.edifact_ok: + self.csv_import = False + self.doc_type = self.env.context.get("doc_type", "rfq") + self.price_source = "order" + else: + res = super(SaleOrderImportEdifact, self).order_file_change() + if isinstance(res, dict): + return res + + def parse_order_button(self): + self.ensure_one() + order_file_decoded = b64decode(self.order_file) + parsed_obj = dict(edifact=None, order=None) + if self.edifact_ok: + parsed_obj["edifact"] = self.pydifact_obj(order_file_decoded) + + parsed_order = self.parse_order( + order_file_decoded, self.order_filename, self.partner_id + ) + del parsed_order["attachments"] + parsed_obj["order"] = parsed_order + self.write( + { + "parsed_json": json.dumps(parsed_obj, indent=4, default=str), + "state": "tech", + } + ) + action = self.env["ir.actions.act_window"]._for_xml_id( + "sale_order_import.sale_order_import_action" + ) + action["res_id"] = self.id + return action + + # Parser hook + def _parse_file(self, filename, filecontent, detect_doc_type=False): + "Called from parse_order()" + parsed_order = super(SaleOrderImportEdifact, self)._parse_file( + filename, filecontent, detect_doc_type + ) + if not parsed_order and self.edifact_ok: + self.env.context.get("release", "d96a") + interchange = self._loads_edifact(filecontent) + parsed_order = self.parse_edifact_sale_order(interchange) + return parsed_order + + @api.model + def parse_edifact_sale_order(self, interchange): + # https://github.com/nerdocs/pydifact/blob/master/pydifact/segmentcollection.py + header = interchange.get_header_segment() + # > UNB segment: [['UNOA', '2'], ['5450534000000', '14'], + # ['8435337000003', '14'], ['230306', '0435'], '5506'] + + msg_type, msg_type_release = self._get_msg_type(interchange) + supported = ["ORDERS"] + if msg_type not in supported: + raise UserError(_("%s document is not a Sale Order document")) + + doc_type = self.env.context.get("doc_type", "order") + + bgm = interchange.get_segment("BGM") + # Customer PO number + # BGM segment: ['220', '1LP6WZGF', '9'] + order_ref = bgm[1] + + rd = { + "doc_type": doc_type, + # Customer PO number + "order_ref": order_ref, + "edi_ctx": {"sender": header[1], "recipient": header[2]}, # header[1][0] + } + parties = self._prepare_edifact_parties(interchange) + order_dict = { + **rd, + **self._prepare_edifact_dates(interchange), + **self._prepare_edifact_currencies(interchange), + **parties, + } + lines = self._prepare_edifact_lines(interchange) + if lines: + order_dict["lines"] = lines + return order_dict + + @api.model + def _prepare_edifact_parties(self, interchange): + references = self._prepare_edifact_references(interchange) + parties = self._prepare_edifact_name_and_address(interchange) + if references.get("vat") and parties.get("invoice_to"): + # just for check vat + if parties["invoice_to"].get("partner"): + parties["invoice_to"]["partner"]["rff_va"] = references["vat"] + if parties.get("invoice_to") and parties["invoice_to"].get("partner"): + newpartner = parties["invoice_to"]["partner"].copy() + if parties.get("partner") and parties["partner"].get("gln"): + # To see if NAD_BY is different NAD_IV + newpartner["gln_by"] = parties["partner"]["gln"] + parties["partner"] = newpartner + # add context information + for pval in parties.values(): + partner_dict = pval.get("partner", pval) + partner_dict["edi_ctx"] = { + "order_filename": self.order_filename, + "rff_va": references["vat"], + } + if parties.get("company"): + parties["company"]["edi_ctx"]["vendor_code"] = references.get("vendor_code") + return parties + + @api.model + def _prepare_edifact_dates(self, interchange): + dates = defaultdict(dict) + for seg in interchange.get_segments("DTM"): + date_meaning_code = seg[0][0] + if date_meaning_code == "137": + dates["date"] = self.map2odoo_date(seg[0]) + elif date_meaning_code == "63": + # latest delivery date + # dates.setdefault("delivery_detail",{}) + dates["delivery_detail"]["validity_date"] = self.map2odoo_date(seg[0]) + elif date_meaning_code == "64": + # earliest delivery date + dates["delivery_detail"]["commitment_date"] = self.map2odoo_date(seg[0]) + + return dates + + @api.model + def _prepare_edifact_references(self, interchange): + """ + RFF segment: [['CR', 'IK142']] + """ + refs = {} + for seg in interchange.get_segments("RFF"): + reference = seg[0] + reference_code = reference[0] + if reference_code == "ADE": + # ['firstorder','backorder','advantage','nyp'] + refs["account_reference"] = reference[1] + elif reference_code == "CR": + # Customer reference Number + refs["vendor_code"] = reference[1] + elif reference_code == "PD": + # Promotion Deal Number + # Number assigned by a vendor to a special promotion activity + refs["promotion_number"] = reference[1] + elif reference_code == "VA": + # Unique number assigned by the relevant tax authority to identify a + # party for use in relation to Value Added Tax (VAT). + refs["vat"] = reference[1] + + return refs + + @api.model + def _prepare_edifact_name_and_address(self, interchange): + nads = {} + for seg in interchange.get_segments("NAD"): + reference_code = seg[0] + if reference_code == "BY": + # NAD segment: ['BY', ['5450534001649', '', '9']] + # Customer (Buyer's GLN) + nads["partner"] = self.map2odoo_partner(seg) + elif reference_code == "SU": + # Our number of Supplier's GLN + # Can be used to check that we are not importing the order + # in the wrong company by mistake + nads["company"] = self.map2odoo_partner(seg) + elif reference_code == "DP": + # Delivery Party + nads["ship_to"] = self.map2odoo_address(seg) + elif reference_code == "IV": + # Invoice Party + nads["invoice_to"] = self.map2odoo_address(seg) + return nads + + @api.model + def _prepare_edifact_currencies(self, interchange): + currencies = {} + for seg in interchange.get_segments("CUX"): + usage_code = seg[0] + if usage_code == "2": + currencies["currency"] = self.map2odoo_currency(seg) + return currencies + + @api.model + def _prepare_edifact_lines(self, interchange): + lines = [] + zipsegments = zip( + interchange.get_segments("LIN"), + interchange.get_segments("QTY"), + interchange.get_segments("PRI"), + ) + + for linseg, qtyseg, priseg in zipsegments: + lines.append( + { + "sequence": int(linseg[0]), + "product": self.map2odoo_product(linseg), + "qty": self.map2odoo_qty(qtyseg), + # price without taxes + "price_unit": self.map2odoo_unit_price(priseg), + } + ) + + return lines diff --git a/sale_order_import_edifact/wizard/sale_order_import_view.xml b/sale_order_import_edifact/wizard/sale_order_import_view.xml new file mode 100644 index 0000000000..967599d65a --- /dev/null +++ b/sale_order_import_edifact/wizard/sale_order_import_view.xml @@ -0,0 +1,25 @@ + + + + sale.order.import.form.dev + sale.order.import + + +
+ + + +
+
+
+ + + + From d62038bbf90d81bd9c74504c48dc1be9ee33f94f Mon Sep 17 00:00:00 2001 From: Rafa Morant Date: Thu, 29 Jun 2023 17:27:38 +0200 Subject: [PATCH 02/13] [FIX] base_edifact: test chore --- sale_order_import_edifact/tests/common.py | 2 +- .../files/Retail_EDIFACT_ORDERS_sample1.txt | 26 ----------------- .../files/Retail_EDIFACT_ORDERS_sample2.txt | 29 ------------------- 3 files changed, 1 insertion(+), 56 deletions(-) delete mode 100644 sale_order_import_edifact/tests/files/Retail_EDIFACT_ORDERS_sample1.txt delete mode 100644 sale_order_import_edifact/tests/files/Retail_EDIFACT_ORDERS_sample2.txt diff --git a/sale_order_import_edifact/tests/common.py b/sale_order_import_edifact/tests/common.py index 5a483c5e97..13beb601c9 100644 --- a/sale_order_import_edifact/tests/common.py +++ b/sale_order_import_edifact/tests/common.py @@ -10,7 +10,7 @@ def _get_file_content(filename): - path = "sale_order_import_edifact/tests/files/" + filename + path = "base_edifact/tests/files/" + filename with file_open(path, "rb") as fd: return fd.read() diff --git a/sale_order_import_edifact/tests/files/Retail_EDIFACT_ORDERS_sample1.txt b/sale_order_import_edifact/tests/files/Retail_EDIFACT_ORDERS_sample1.txt deleted file mode 100644 index 59e6923fd8..0000000000 --- a/sale_order_import_edifact/tests/files/Retail_EDIFACT_ORDERS_sample1.txt +++ /dev/null @@ -1,26 +0,0 @@ -UNB+UNOA:2+5450534000000:14+8450534000000:14+221117:0134+4234++++1+EANCOM' -UNH+1+ORDERS:D:96A:UN:EAN008' -BGM+220+1AA1TEST+9' -DTM+137:20230606:102' -DTM+63:20230606:102' -DTM+64:20230606:102' -RFF+CR:ABCD5' -NAD+BY+5450534000017::9' -NAD+SU+8450534000000::9' -NAD+DP+5450534008617::9+++++++GB' -NAD+IV+5450534008143::9++AMAZON EU SARL+38 Avenue J.F. Kennedy+Luxembourg++1855+LU' -RFF+VA:LU20260743' -CUX+2:EUR:9' -LIN+1++9783898307529:EN' -QTY+21:5' -PRI+AAA:27.5' -LIN+2++9783898307538:EN' -QTY+21:1' -PRI+AAA:10.87' -LIN+3++9783898307645:EN' -QTY+21:3' -PRI+AAA:3.85' -UNS+S' -CNT+2:3' -UNT+24+1' -UNZ+1+4234' diff --git a/sale_order_import_edifact/tests/files/Retail_EDIFACT_ORDERS_sample2.txt b/sale_order_import_edifact/tests/files/Retail_EDIFACT_ORDERS_sample2.txt deleted file mode 100644 index 29bdb06d69..0000000000 --- a/sale_order_import_edifact/tests/files/Retail_EDIFACT_ORDERS_sample2.txt +++ /dev/null @@ -1,29 +0,0 @@ -UNB+UNOA:2+5450534000000:14+:14+221117:0134+4234++++1+EANCOM' -UNH+1+ORDERS:D:96A:UN:EAN008' -BGM+220+1AA1TEST+9' -DTM+137:20221117:102' -DTM+63:20221127:102' -DTM+64:20221124:102' -RFF+CR:ABCD5' -NAD+BY+5450534000017::9' -NAD+SU+::9' -NAD+DP+5450534000086::9+++++++DE' -NAD+IV+5450534005838::9++AMAZON EU SARL:NIEDERLASSUNG DEUTSCHLAND+MARCEL-BREUER-STR. 12+MUENCHEN++80807+DE' -RFF+VA:DE814584193' -CUX+2:EUR:9' -LIN+1' -PIA+5+567123:SA' -QTY+21:5' -PRI+AAA:27.5' -LIN+2' -PIA+5+1234567:SA' -QTY+21:1' -PRI+AAA:10.87' -LIN+3' -PIA+5+765432:SA' -QTY+21:3' -PRI+AAA:3.85' -UNS+S' -CNT+2:3' -UNT+27+1' -UNZ+1+4234' From aa22ea300c894002f029892fc740968e5da61884 Mon Sep 17 00:00:00 2001 From: duongtq Date: Mon, 25 Sep 2023 15:34:18 +0700 Subject: [PATCH 03/13] [IMP] sale_order_import_edifact: pre-commit stuff --- .../odoo/addons/sale_order_import_edifact | 1 + setup/sale_order_import_edifact/setup.py | 6 ++++++ 2 files changed, 7 insertions(+) create mode 120000 setup/sale_order_import_edifact/odoo/addons/sale_order_import_edifact create mode 100644 setup/sale_order_import_edifact/setup.py diff --git a/setup/sale_order_import_edifact/odoo/addons/sale_order_import_edifact b/setup/sale_order_import_edifact/odoo/addons/sale_order_import_edifact new file mode 120000 index 0000000000..59ca90b132 --- /dev/null +++ b/setup/sale_order_import_edifact/odoo/addons/sale_order_import_edifact @@ -0,0 +1 @@ +../../../../sale_order_import_edifact \ No newline at end of file diff --git a/setup/sale_order_import_edifact/setup.py b/setup/sale_order_import_edifact/setup.py new file mode 100644 index 0000000000..28c57bb640 --- /dev/null +++ b/setup/sale_order_import_edifact/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) From 0d867a5f200ba30a64fc44ed48c2617de8d0a62c Mon Sep 17 00:00:00 2001 From: duongtq Date: Mon, 25 Sep 2023 15:40:59 +0700 Subject: [PATCH 04/13] [MIG] sale_order_import_edifact: Migration to 16.0 --- sale_order_import_edifact/README.rst | 63 ++++----- sale_order_import_edifact/__manifest__.py | 13 +- .../models/business_document_import.py | 9 +- .../readme/CONFIGURE.rst | 24 ---- .../readme/CONTRIBUTORS.rst | 2 + sale_order_import_edifact/readme/CREDITS.rst | 1 + sale_order_import_edifact/readme/HISTORY.rst | 2 +- sale_order_import_edifact/readme/ROADMAP.rst | 6 +- .../static/description/index.html | 51 +++---- .../tests/test_edifact_order_import.py | 6 + .../wizard/sale_order_import.py | 129 ++++++++++-------- .../wizard/sale_order_import_view.xml | 17 ++- 12 files changed, 146 insertions(+), 177 deletions(-) create mode 100644 sale_order_import_edifact/readme/CREDITS.rst diff --git a/sale_order_import_edifact/README.rst b/sale_order_import_edifact/README.rst index 9d44702343..e5eb5e217c 100644 --- a/sale_order_import_edifact/README.rst +++ b/sale_order_import_edifact/README.rst @@ -2,10 +2,13 @@ Import Business Document EDIFACT/D96A Order =========================================== -.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:46860173810e6f096acdc9b7aef8ddd3a5f7cbda5bde91f48aa52f65491a536d + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Alpha-red.png :target: https://odoo-community.org/page/development-status @@ -14,16 +17,16 @@ Import Business Document EDIFACT/D96A Order :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fedi-lightgray.png?logo=github - :target: https://github.com/OCA/edi/tree/14.0/sale_order_import_edifact + :target: https://github.com/OCA/edi/tree/16.0/sale_order_import_edifact :alt: OCA/edi .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/edi-14-0/edi-14-0-sale_order_import_edifact + :target: https://translation.odoo-community.org/projects/edi-16-0/edi-16-0-sale_order_import_edifact :alt: Translate me on Weblate -.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/226/14.0 - :alt: Try me on Runbot +.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png + :target: https://runboat.odoo-community.org/builds?repo=OCA/edi&target_branch=16.0 + :alt: Try me on Runboat -|badge1| |badge2| |badge3| |badge4| |badge5| +|badge1| |badge2| |badge3| |badge4| |badge5| UN/EDIFACT United Nations rules for Elec­tronic Data Interchange for Administration, Commerce and Transport @@ -46,30 +49,6 @@ Configuration ============= -EDI Exchange Type "Advanced Settings" - -.. code-block:: yaml - - components: - process: - usage: input.process.sale.order - - sale_order_import: - price_source: order - confirm_order: false - wiz_ctx: - file_ext: 'edi' - release: 'd96a' - doc_type: 'rfq' - - -- price_source. Can be 'order' or 'pricelist' -- confirm_order. False by default -- wiz_ctx. Wizard's context - - file_ext. File extensions supported. By default: 'txt,d96a' - - release. EDIFACT format release. - - doc_type. ('rfq', "Request for Quotation") | ('order', "Order"). Default 'order' - This module struggles with EDIFACT format, if you need X12 format you will need something like sale_order_import_x12 module. Regardless format, a concret document should need a concret specification nammed release. For example Amazon uses "D96A" specification. @@ -79,11 +58,7 @@ See Known issues / Roadmap ====================== -.. Enumerate known caveats and future potential improvements. - It is mostly intended for end-users, and can also help - potential new contributors discovering new features to implement. - -* Refactor import by release +* Move the previews button feature to the base module Changelog ========= @@ -101,7 +76,7 @@ Changelog 14.0.1.0.0 (2023-06-07) ~~~~~~~~~~~~~~~~~~~~~~~ -* [14.0][MIG] sale_order_import_edifact & base_edifact. +* [14.0][ADD] sale_order_import_edifact & base_edifact. (`#779 `_) Bug Tracker @@ -109,8 +84,8 @@ Bug Tracker Bugs are tracked on `GitHub Issues `_. In case of trouble, please check there if your issue has already been reported. -If you spotted it first, help us smashing it by providing a detailed and welcomed -`feedback `_. +If you spotted it first, help us to smash it by providing a detailed and welcomed +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -121,12 +96,20 @@ Authors ~~~~~~~ * ALBA Software +* Camptocamp Contributors ~~~~~~~~~~~~ * Rafa Morant (https://www.albasoft.com) * Marc Poch +* Duong (Tran Quoc) +* Simone Orsi + +Other credits +~~~~~~~~~~~~~ + +The migration of this module from 14.0 to 16.0 was financially supported by Camptocamp Maintainers ~~~~~~~~~~~ @@ -149,6 +132,6 @@ Current `maintainer `__: |maintainer-rmorant| -This module is part of the `OCA/edi `_ project on GitHub. +This module is part of the `OCA/edi `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/sale_order_import_edifact/__manifest__.py b/sale_order_import_edifact/__manifest__.py index eeea97e189..47ef2a812d 100644 --- a/sale_order_import_edifact/__manifest__.py +++ b/sale_order_import_edifact/__manifest__.py @@ -4,25 +4,18 @@ { "name": "Import Business Document EDIFACT/D96A Order", "summary": "EDIFACT/D96A Order", - "version": "14.0.1.0.0", + "version": "16.0.1.0.0", "development_status": "Alpha", "category": "Sales Management", "website": "https://github.com/OCA/edi", - "author": "ALBA Software, Odoo Community Association (OCA)", + "author": "ALBA Software, Camptocamp, Odoo Community Association (OCA)", "maintainers": ["rmorant"], "license": "AGPL-3", - "application": False, - "installable": True, - "external_dependencies": { - "python": [], - "bin": [], - }, "depends": [ "sale_management", - "partner_identification", "partner_identification_gln", "base_edifact", - "edi_sale_order_import", + "sale_order_import", ], "data": [ "wizard/sale_order_import_view.xml", diff --git a/sale_order_import_edifact/models/business_document_import.py b/sale_order_import_edifact/models/business_document_import.py index f495f4f3f0..d79ad3c4f6 100644 --- a/sale_order_import_edifact/models/business_document_import.py +++ b/sale_order_import_edifact/models/business_document_import.py @@ -7,6 +7,7 @@ class BusinessDocumentImport(models.AbstractModel): _inherit = "business.document.import" + # TODO: refactor code in partner_identification_import and drop this one @api.model def _hook_match_partner(self, partner_dict, chatter_msg, domain, order): """ @@ -40,10 +41,12 @@ def _hook_match_partner(self, partner_dict, chatter_msg, domain, order): ) raise exceptions.UserError( _( - "Partner GLN Code: %s not found in order file: '%s' " - "from VAT registration number '%s'." + "Partner GLN Code: %(party)s not found in order file: '%(file)s' " + "from VAT registration number '%(vat)s'.", + party=party_id, + file=ctx.get("order_filename"), + vat=ctx.get("rff_va"), ) - % (party_id, ctx.get("order_filename"), ctx.get("rff_va")) ) return id_number.partner_id diff --git a/sale_order_import_edifact/readme/CONFIGURE.rst b/sale_order_import_edifact/readme/CONFIGURE.rst index dfd1b95a6a..89cd9f6bde 100644 --- a/sale_order_import_edifact/readme/CONFIGURE.rst +++ b/sale_order_import_edifact/readme/CONFIGURE.rst @@ -1,28 +1,4 @@ -EDI Exchange Type "Advanced Settings" - -.. code-block:: yaml - - components: - process: - usage: input.process.sale.order - - sale_order_import: - price_source: order - confirm_order: false - wiz_ctx: - file_ext: 'edi' - release: 'd96a' - doc_type: 'rfq' - - -- price_source. Can be 'order' or 'pricelist' -- confirm_order. False by default -- wiz_ctx. Wizard's context - - file_ext. File extensions supported. By default: 'txt,d96a' - - release. EDIFACT format release. - - doc_type. ('rfq', "Request for Quotation") | ('order', "Order"). Default 'order' - This module struggles with EDIFACT format, if you need X12 format you will need something like sale_order_import_x12 module. Regardless format, a concret document should need a concret specification nammed release. For example Amazon uses "D96A" specification. diff --git a/sale_order_import_edifact/readme/CONTRIBUTORS.rst b/sale_order_import_edifact/readme/CONTRIBUTORS.rst index a153b2ddd1..ebb246915b 100644 --- a/sale_order_import_edifact/readme/CONTRIBUTORS.rst +++ b/sale_order_import_edifact/readme/CONTRIBUTORS.rst @@ -1,2 +1,4 @@ * Rafa Morant (https://www.albasoft.com) * Marc Poch +* Duong (Tran Quoc) +* Simone Orsi diff --git a/sale_order_import_edifact/readme/CREDITS.rst b/sale_order_import_edifact/readme/CREDITS.rst new file mode 100644 index 0000000000..a5c8f66b93 --- /dev/null +++ b/sale_order_import_edifact/readme/CREDITS.rst @@ -0,0 +1 @@ +The migration of this module from 14.0 to 16.0 was financially supported by Camptocamp diff --git a/sale_order_import_edifact/readme/HISTORY.rst b/sale_order_import_edifact/readme/HISTORY.rst index c57a493aa1..6d08184cf0 100644 --- a/sale_order_import_edifact/readme/HISTORY.rst +++ b/sale_order_import_edifact/readme/HISTORY.rst @@ -11,5 +11,5 @@ 14.0.1.0.0 (2023-06-07) ~~~~~~~~~~~~~~~~~~~~~~~ -* [14.0][MIG] sale_order_import_edifact & base_edifact. +* [14.0][ADD] sale_order_import_edifact & base_edifact. (`#779 `_) diff --git a/sale_order_import_edifact/readme/ROADMAP.rst b/sale_order_import_edifact/readme/ROADMAP.rst index e5c8273d15..41d2ef1401 100644 --- a/sale_order_import_edifact/readme/ROADMAP.rst +++ b/sale_order_import_edifact/readme/ROADMAP.rst @@ -1,5 +1 @@ -.. Enumerate known caveats and future potential improvements. - It is mostly intended for end-users, and can also help - potential new contributors discovering new features to implement. - -* Refactor import by release +* Move the previews button feature to the base module diff --git a/sale_order_import_edifact/static/description/index.html b/sale_order_import_edifact/static/description/index.html index 007ccd6242..070da90458 100644 --- a/sale_order_import_edifact/static/description/index.html +++ b/sale_order_import_edifact/static/description/index.html @@ -366,8 +366,10 @@

Import Business Document EDIFACT/D96A Order

-

Alpha License: AGPL-3 OCA/edi Translate me on Weblate Try me on Runbot

+

Alpha License: AGPL-3 OCA/edi Translate me on Weblate Try me on Runboat

UN/EDIFACT
United Nations rules for Elec­tronic Data Interchange for Administration, Commerce and Transport
@@ -393,46 +395,22 @@

Import Business Document EDIFACT/D96A Order

  • Credits

    • Configuration

    -

    EDI Exchange Type “Advanced Settings”

    -
    -components:
-   process:
-      usage: input.process.sale.order
-
-sale_order_import:
-   price_source: order
-   confirm_order: false
-   wiz_ctx:
-      file_ext: 'edi'
-      release: 'd96a'
-      doc_type: 'rfq'
-
    -
      -
    • price_source. Can be ‘order’ or ‘pricelist’
      • -
    • confirm_order. False by default
      • -
    • wiz_ctx. Wizard’s context -- file_ext. File extensions supported. By default: ‘txt,d96a’ -- release. EDIFACT format release. -- doc_type. (‘rfq’, “Request for Quotation”) | (‘order’, “Order”). Default ‘order’
      • -

    This module struggles with EDIFACT format, if you need X12 format you will need something like sale_order_import_x12 module.

    Regardless format, a concret document should need a concret specification nammed release. For example Amazon uses “D96A” specification.

    See <https://www.stedi.com/edi/edifact>

    Known issues / Roadmap

    -
      -
    • Refactor import by release
      • +
    • Move the previews button feature to the base module
    @@ -449,7 +427,7 @@

    Changelog

    14.0.1.0.0 (2023-06-07)

      -
    • [14.0][MIG] sale_order_import_edifact & base_edifact. +
    • [14.0][ADD] sale_order_import_edifact & base_edifact. (#779)
    @@ -458,8 +436,8 @@

    14.0.1.0.0 (2023-06-07)

    Bug Tracker

    Bugs are tracked on GitHub Issues. In case of trouble, please check there if your issue has already been reported. -If you spotted it first, help us smashing it by providing a detailed and welcomed -feedback.

    +If you spotted it first, help us to smash it by providing a detailed and welcomed +feedback.

    Do not contact contributors directly about support or help with technical issues.

    @@ -468,6 +446,7 @@

    Credits

    Authors

    • ALBA Software
      • +
    • Camptocamp
    @@ -475,10 +454,16 @@

    Contributors

    +
    +

    Other credits

    +

    The migration of this module from 14.0 to 16.0 was financially supported by Camptocamp

    +
    -

    Maintainers

    +

    Maintainers

    This module is maintained by the OCA.

    Odoo Community Association

    OCA, or the Odoo Community Association, is a nonprofit organization whose @@ -486,7 +471,7 @@

    Maintainers

    promote its widespread use.

    Current maintainer:

    rmorant

    -

    This module is part of the OCA/edi project on GitHub.

    +

    This module is part of the OCA/edi project on GitHub.

    You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

    diff --git a/sale_order_import_edifact/tests/test_edifact_order_import.py b/sale_order_import_edifact/tests/test_edifact_order_import.py index 5bf0f57016..ed3bad5832 100644 --- a/sale_order_import_edifact/tests/test_edifact_order_import.py +++ b/sale_order_import_edifact/tests/test_edifact_order_import.py @@ -10,6 +10,11 @@ class TestEdifactOrderImport(TransactionCase): + @classmethod + def setUpClass(cls): + super().setUpClass() + cls.env = cls.env(context=dict(cls.env.context, tracking_disable=True)) + @mute_logger("odoo.addons.sale_order_import.wizard.sale_order_import") def test_edifact_order_import(self): tests = get_test_data(self.env) @@ -17,6 +22,7 @@ def test_edifact_order_import(self): edifact_file = expected._get_content() wiz = self.env["sale.order.import"].create( { + "import_type": "edifact", "order_file": base64.b64encode(edifact_file), "order_filename": filename, } diff --git a/sale_order_import_edifact/wizard/sale_order_import.py b/sale_order_import_edifact/wizard/sale_order_import.py index 3b597525a7..f3eaaf0048 100644 --- a/sale_order_import_edifact/wizard/sale_order_import.py +++ b/sale_order_import_edifact/wizard/sale_order_import.py @@ -10,44 +10,53 @@ logger = logging.getLogger(__name__) -class SaleOrderImportEdifact(models.TransientModel): - _name = "sale.order.import" - _inherit = ["sale.order.import", "base.edifact"] +class SaleOrderImport(models.TransientModel): + _inherit = "sale.order.import" - state = fields.Selection( - selection_add=[("tech", "Technical")], ondelete={"tech": "set default"} + import_type = fields.Selection( + selection_add=[("edifact", "EDIFACT")], ondelete={"edifact": "cascade"} ) - parsed_json = fields.Text() - - @property - def edifact_ok(self): - conf_ext = self.env.context.get("file_ext", "txt,d96a") - extensions = conf_ext.split(",") - ok = False - if self.order_filename: + # Make doc_type field support for EDIFACT type + doc_type = fields.Selection(readonly=False) + # TODO: Move this feature to the base module or to an additional module. + json_data_preview = fields.Text( + help="Used by the btn `button_parse_order_preview` to preview data before importing" + ) + edifact_ok = fields.Boolean(compute="_compute_edifact_ok") + # Techincal fields used to get the extension part of files + file_ext = fields.Char(default="txt,d96a") + # EDIFACT format release + release = fields.Char(default="d96a") + + @api.depends("order_file", "order_filename") + def _compute_edifact_ok(self): + for rec in self: + if not (rec.order_file and rec.order_filename): + rec.edifact_ok = False + continue + extensions = rec.file_ext.split(",") path, ext = os.path.splitext(self.order_filename) ok = ext and ext[1:] in extensions - if not ok and self.order_file: + if not ok: ok = b64decode(self.order_file[:4]) == b"UNB" - return ok + rec.edifact_ok = ok + + # TODO: Move this feature to the base module or to an additional module. + def button_parse_order_preview(self): + """ + Generate a preview of the data before importing. + + This method is called by the button to take a quick look at the pydifact + structure ('edifact' type) and the parsed object ('order') from + the original document before importing the document. + """ - @api.onchange("order_file") - def order_file_change(self): - if self.edifact_ok: - self.csv_import = False - self.doc_type = self.env.context.get("doc_type", "rfq") - self.price_source = "order" - else: - res = super(SaleOrderImportEdifact, self).order_file_change() - if isinstance(res, dict): - return res - - def parse_order_button(self): self.ensure_one() + edifact_model = self.env["base.edifact"] order_file_decoded = b64decode(self.order_file) parsed_obj = dict(edifact=None, order=None) if self.edifact_ok: - parsed_obj["edifact"] = self.pydifact_obj(order_file_decoded) + parsed_obj["edifact"] = edifact_model.pydifact_obj(order_file_decoded) parsed_order = self.parse_order( order_file_decoded, self.order_filename, self.partner_id @@ -56,8 +65,7 @@ def parse_order_button(self): parsed_obj["order"] = parsed_order self.write( { - "parsed_json": json.dumps(parsed_obj, indent=4, default=str), - "state": "tech", + "json_data_preview": json.dumps(parsed_obj, indent=4, default=str), } ) action = self.env["ir.actions.act_window"]._for_xml_id( @@ -66,39 +74,38 @@ def parse_order_button(self): action["res_id"] = self.id return action - # Parser hook - def _parse_file(self, filename, filecontent, detect_doc_type=False): - "Called from parse_order()" - parsed_order = super(SaleOrderImportEdifact, self)._parse_file( - filename, filecontent, detect_doc_type - ) - if not parsed_order and self.edifact_ok: - self.env.context.get("release", "d96a") - interchange = self._loads_edifact(filecontent) - parsed_order = self.parse_edifact_sale_order(interchange) - return parsed_order + def _get_supported_types(self): + # Add more types for EDIFACT + res = super()._get_supported_types() + res.update({"edifact": ("text/plain")}) + return res @api.model - def parse_edifact_sale_order(self, interchange): + def parse_edifact_order(self, filecontent, detect_doc_type=False): # https://github.com/nerdocs/pydifact/blob/master/pydifact/segmentcollection.py + if detect_doc_type: + if not self.edifact_ok: + return None + return self.env.context.get("default_doc_type", "rfq") + + edifact_model = self.env["base.edifact"] + interchange = edifact_model._loads_edifact(filecontent) header = interchange.get_header_segment() # > UNB segment: [['UNOA', '2'], ['5450534000000', '14'], # ['8435337000003', '14'], ['230306', '0435'], '5506'] - msg_type, msg_type_release = self._get_msg_type(interchange) + msg_type, msg_type_release = edifact_model._get_msg_type(interchange) supported = ["ORDERS"] if msg_type not in supported: raise UserError(_("%s document is not a Sale Order document")) - doc_type = self.env.context.get("doc_type", "order") - bgm = interchange.get_segment("BGM") # Customer PO number # BGM segment: ['220', '1LP6WZGF', '9'] order_ref = bgm[1] rd = { - "doc_type": doc_type, + "doc_type": self.doc_type, # Customer PO number "order_ref": order_ref, "edi_ctx": {"sender": header[1], "recipient": header[2]}, # header[1][0] @@ -143,17 +150,22 @@ def _prepare_edifact_parties(self, interchange): @api.model def _prepare_edifact_dates(self, interchange): dates = defaultdict(dict) + edifact_model = self.env["base.edifact"] for seg in interchange.get_segments("DTM"): date_meaning_code = seg[0][0] if date_meaning_code == "137": - dates["date"] = self.map2odoo_date(seg[0]) + dates["date"] = edifact_model.map2odoo_date(seg[0]) elif date_meaning_code == "63": # latest delivery date # dates.setdefault("delivery_detail",{}) - dates["delivery_detail"]["validity_date"] = self.map2odoo_date(seg[0]) + dates["delivery_detail"]["validity_date"] = edifact_model.map2odoo_date( + seg[0] + ) elif date_meaning_code == "64": # earliest delivery date - dates["delivery_detail"]["commitment_date"] = self.map2odoo_date(seg[0]) + dates["delivery_detail"][ + "commitment_date" + ] = edifact_model.map2odoo_date(seg[0]) return dates @@ -186,36 +198,39 @@ def _prepare_edifact_references(self, interchange): @api.model def _prepare_edifact_name_and_address(self, interchange): nads = {} + edifact_model = self.env["base.edifact"] for seg in interchange.get_segments("NAD"): reference_code = seg[0] if reference_code == "BY": # NAD segment: ['BY', ['5450534001649', '', '9']] # Customer (Buyer's GLN) - nads["partner"] = self.map2odoo_partner(seg) + nads["partner"] = edifact_model.map2odoo_partner(seg) elif reference_code == "SU": # Our number of Supplier's GLN # Can be used to check that we are not importing the order # in the wrong company by mistake - nads["company"] = self.map2odoo_partner(seg) + nads["company"] = edifact_model.map2odoo_partner(seg) elif reference_code == "DP": # Delivery Party - nads["ship_to"] = self.map2odoo_address(seg) + nads["ship_to"] = edifact_model.map2odoo_address(seg) elif reference_code == "IV": # Invoice Party - nads["invoice_to"] = self.map2odoo_address(seg) + nads["invoice_to"] = edifact_model.map2odoo_address(seg) return nads @api.model def _prepare_edifact_currencies(self, interchange): currencies = {} + edifact_model = self.env["base.edifact"] for seg in interchange.get_segments("CUX"): usage_code = seg[0] if usage_code == "2": - currencies["currency"] = self.map2odoo_currency(seg) + currencies["currency"] = edifact_model.map2odoo_currency(seg) return currencies @api.model def _prepare_edifact_lines(self, interchange): + edifact_model = self.env["base.edifact"] lines = [] zipsegments = zip( interchange.get_segments("LIN"), @@ -227,10 +242,10 @@ def _prepare_edifact_lines(self, interchange): lines.append( { "sequence": int(linseg[0]), - "product": self.map2odoo_product(linseg), - "qty": self.map2odoo_qty(qtyseg), + "product": edifact_model.map2odoo_product(linseg), + "qty": edifact_model.map2odoo_qty(qtyseg), # price without taxes - "price_unit": self.map2odoo_unit_price(priseg), + "price_unit": edifact_model.map2odoo_unit_price(priseg), } ) diff --git a/sale_order_import_edifact/wizard/sale_order_import_view.xml b/sale_order_import_edifact/wizard/sale_order_import_view.xml index 967599d65a..a1d1bda221 100644 --- a/sale_order_import_edifact/wizard/sale_order_import_view.xml +++ b/sale_order_import_edifact/wizard/sale_order_import_view.xml @@ -5,17 +5,26 @@ sale.order.import + + + {'readonly': [('import_type','!=','edifact')]} +
    - - + +
    From 1ed75faf2884f84f7c12a62e8105a1bd7ca873c6 Mon Sep 17 00:00:00 2001 From: Vo Hong Thien Date: Mon, 23 Oct 2023 17:23:58 +0700 Subject: [PATCH 05/13] [FIX] sale_order_import_edifact: Allow files without vat --- sale_order_import_edifact/wizard/sale_order_import.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sale_order_import_edifact/wizard/sale_order_import.py b/sale_order_import_edifact/wizard/sale_order_import.py index f3eaaf0048..4e4c0089e3 100644 --- a/sale_order_import_edifact/wizard/sale_order_import.py +++ b/sale_order_import_edifact/wizard/sale_order_import.py @@ -141,8 +141,9 @@ def _prepare_edifact_parties(self, interchange): partner_dict = pval.get("partner", pval) partner_dict["edi_ctx"] = { "order_filename": self.order_filename, - "rff_va": references["vat"], } + if references.get("vat"): + partner_dict["edi_ctx"]["rff_va"] = references["vat"] if parties.get("company"): parties["company"]["edi_ctx"]["vendor_code"] = references.get("vendor_code") return parties From 9132a038a93e30c6d68d342b7a674561769f002e Mon Sep 17 00:00:00 2001 From: Vo Hong Thien Date: Mon, 23 Oct 2023 17:41:19 +0700 Subject: [PATCH 06/13] [FIX] sale_order_import_edifact: fix get quantity form QTY segment --- .../wizard/sale_order_import.py | 27 ++++++++++++------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/sale_order_import_edifact/wizard/sale_order_import.py b/sale_order_import_edifact/wizard/sale_order_import.py index 4e4c0089e3..e9b65456bc 100644 --- a/sale_order_import_edifact/wizard/sale_order_import.py +++ b/sale_order_import_edifact/wizard/sale_order_import.py @@ -233,21 +233,28 @@ def _prepare_edifact_currencies(self, interchange): def _prepare_edifact_lines(self, interchange): edifact_model = self.env["base.edifact"] lines = [] + qty_list = [] + + for i in interchange.get_segments("QTY"): + if i[0][0] == '21': + qty_list.append(i) + zipsegments = zip( interchange.get_segments("LIN"), - interchange.get_segments("QTY"), interchange.get_segments("PRI"), ) + for linseg, priseg in zipsegments: - for linseg, qtyseg, priseg in zipsegments: - lines.append( - { - "sequence": int(linseg[0]), - "product": edifact_model.map2odoo_product(linseg), - "qty": edifact_model.map2odoo_qty(qtyseg), - # price without taxes - "price_unit": edifact_model.map2odoo_unit_price(priseg), + qtyseg = qty_list.pop(0) if qty_list else None + + line = { + "sequence": int(linseg[0]), + "product": edifact_model.map2odoo_product(linseg), + "qty": edifact_model.map2odoo_qty(qtyseg), + # price without taxes + "price_unit": edifact_model.map2odoo_unit_price(priseg), } - ) + + lines.append(line) return lines From 69443bac4c7cc00ab80aa9f2515a42b2501b0a80 Mon Sep 17 00:00:00 2001 From: Vo Hong Thien Date: Mon, 23 Oct 2023 18:19:48 +0700 Subject: [PATCH 07/13] [FIX] sale_order_import_edifact: fix problem product price is not provided --- .../wizard/sale_order_import.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/sale_order_import_edifact/wizard/sale_order_import.py b/sale_order_import_edifact/wizard/sale_order_import.py index e9b65456bc..df5c545aa1 100644 --- a/sale_order_import_edifact/wizard/sale_order_import.py +++ b/sale_order_import_edifact/wizard/sale_order_import.py @@ -234,26 +234,29 @@ def _prepare_edifact_lines(self, interchange): edifact_model = self.env["base.edifact"] lines = [] qty_list = [] + pri_list = [] for i in interchange.get_segments("QTY"): if i[0][0] == '21': qty_list.append(i) + for i in interchange.get_segments("PRI"): + pri_list.append(i) - zipsegments = zip( - interchange.get_segments("LIN"), - interchange.get_segments("PRI"), - ) - for linseg, priseg in zipsegments: + for linseg in interchange.get_segments("LIN"): qtyseg = qty_list.pop(0) if qty_list else None + priseg = pri_list.pop(0) if pri_list else None line = { "sequence": int(linseg[0]), "product": edifact_model.map2odoo_product(linseg), "qty": edifact_model.map2odoo_qty(qtyseg), - # price without taxes - "price_unit": edifact_model.map2odoo_unit_price(priseg), } + + price_unit = edifact_model.map2odoo_unit_price(priseg) + # If the product price is not provided, the price will be taken from the system + if price_unit != 0.0: + line["price_unit"] = price_unit lines.append(line) From 116ffae33c5d80fd8560b7b38bcc379b2cd57687 Mon Sep 17 00:00:00 2001 From: Vo Hong Thien Date: Mon, 23 Oct 2023 18:24:39 +0700 Subject: [PATCH 08/13] [IMP] sale_order_import_edifact: Fallback on PIA (SA) when LIN is empty --- sale_order_import_edifact/wizard/sale_order_import.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sale_order_import_edifact/wizard/sale_order_import.py b/sale_order_import_edifact/wizard/sale_order_import.py index df5c545aa1..95ad1524ae 100644 --- a/sale_order_import_edifact/wizard/sale_order_import.py +++ b/sale_order_import_edifact/wizard/sale_order_import.py @@ -233,9 +233,13 @@ def _prepare_edifact_currencies(self, interchange): def _prepare_edifact_lines(self, interchange): edifact_model = self.env["base.edifact"] lines = [] + pia_list = [] qty_list = [] pri_list = [] + for i in interchange.get_segments("PIA"): + if i[1][1] == 'SA': + pia_list.append(i) for i in interchange.get_segments("QTY"): if i[0][0] == '21': qty_list.append(i) @@ -244,12 +248,13 @@ def _prepare_edifact_lines(self, interchange): for linseg in interchange.get_segments("LIN"): + piaseg = pia_list.pop(0) if pia_list else None qtyseg = qty_list.pop(0) if qty_list else None priseg = pri_list.pop(0) if pri_list else None line = { "sequence": int(linseg[0]), - "product": edifact_model.map2odoo_product(linseg), + "product": edifact_model.map2odoo_product(linseg, piaseg), "qty": edifact_model.map2odoo_qty(qtyseg), } From 880c4a11de76d8322f216397f2b83fb1fc20e8aa Mon Sep 17 00:00:00 2001 From: Vo Hong Thien Date: Mon, 23 Oct 2023 18:30:12 +0700 Subject: [PATCH 09/13] [IMP] sale_order_import_edifact: support get product desciption from IMD segment --- sale_order_import_edifact/wizard/sale_order_import.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sale_order_import_edifact/wizard/sale_order_import.py b/sale_order_import_edifact/wizard/sale_order_import.py index 95ad1524ae..d2e059e29e 100644 --- a/sale_order_import_edifact/wizard/sale_order_import.py +++ b/sale_order_import_edifact/wizard/sale_order_import.py @@ -236,6 +236,7 @@ def _prepare_edifact_lines(self, interchange): pia_list = [] qty_list = [] pri_list = [] + imd_list = [] for i in interchange.get_segments("PIA"): if i[1][1] == 'SA': @@ -245,12 +246,17 @@ def _prepare_edifact_lines(self, interchange): qty_list.append(i) for i in interchange.get_segments("PRI"): pri_list.append(i) + for i in interchange.get_segments("IMD"): + if i[1] == '79': + imd_list.append(i) + for linseg in interchange.get_segments("LIN"): piaseg = pia_list.pop(0) if pia_list else None qtyseg = qty_list.pop(0) if qty_list else None priseg = pri_list.pop(0) if pri_list else None + imdseg = imd_list.pop(0) if imd_list else None line = { "sequence": int(linseg[0]), @@ -262,6 +268,9 @@ def _prepare_edifact_lines(self, interchange): # If the product price is not provided, the price will be taken from the system if price_unit != 0.0: line["price_unit"] = price_unit + description = edifact_model.map2odoo_description(imdseg) + if description: + line["name"] = description lines.append(line) From 0facfa54cda35217c599d2a891cbcf8ca14bbd54 Mon Sep 17 00:00:00 2001 From: Vo Hong Thien Date: Tue, 24 Oct 2023 18:01:10 +0700 Subject: [PATCH 10/13] [IMP] sale_order_import_edifact: add new data demo --- sale_order_import_edifact/demo/demo_data.xml | 35 +++++++++++++++++++ .../wizard/sale_order_import.py | 11 +++--- 2 files changed, 40 insertions(+), 6 deletions(-) diff --git a/sale_order_import_edifact/demo/demo_data.xml b/sale_order_import_edifact/demo/demo_data.xml index 0e17c7abd5..54888b6a79 100644 --- a/sale_order_import_edifact/demo/demo_data.xml +++ b/sale_order_import_edifact/demo/demo_data.xml @@ -78,4 +78,39 @@ 9783898307645 + + Product1 + + consu + 1276 + + + + Product2 + + consu + 46630 + + + + Product3 + + consu + 98891 75 + + + + Product4 + + consu + 37230 + + + + Product5 + + consu + 1076 + + diff --git a/sale_order_import_edifact/wizard/sale_order_import.py b/sale_order_import_edifact/wizard/sale_order_import.py index d2e059e29e..1e0353d308 100644 --- a/sale_order_import_edifact/wizard/sale_order_import.py +++ b/sale_order_import_edifact/wizard/sale_order_import.py @@ -239,18 +239,17 @@ def _prepare_edifact_lines(self, interchange): imd_list = [] for i in interchange.get_segments("PIA"): - if i[1][1] == 'SA': + if i[1][1] == "SA": pia_list.append(i) for i in interchange.get_segments("QTY"): - if i[0][0] == '21': + if i[0][0] == "21": qty_list.append(i) for i in interchange.get_segments("PRI"): pri_list.append(i) for i in interchange.get_segments("IMD"): - if i[1] == '79': + if i[1] == "79": imd_list.append(i) - for linseg in interchange.get_segments("LIN"): piaseg = pia_list.pop(0) if pia_list else None @@ -262,8 +261,8 @@ def _prepare_edifact_lines(self, interchange): "sequence": int(linseg[0]), "product": edifact_model.map2odoo_product(linseg, piaseg), "qty": edifact_model.map2odoo_qty(qtyseg), - } - + } + price_unit = edifact_model.map2odoo_unit_price(priseg) # If the product price is not provided, the price will be taken from the system if price_unit != 0.0: From f796b06ff7aec84dfec895ec868aeb91761fc95f Mon Sep 17 00:00:00 2001 From: Vo Hong Thien Date: Tue, 24 Oct 2023 18:19:12 +0700 Subject: [PATCH 11/13] [IMP] sale_order_import_edifact: add testcase for no ean in LIN segment --- sale_order_import_edifact/tests/common.py | 25 +++++++++++++ .../tests/test_edifact_order_import.py | 36 ++++++++++++++++++- 2 files changed, 60 insertions(+), 1 deletion(-) diff --git a/sale_order_import_edifact/tests/common.py b/sale_order_import_edifact/tests/common.py index 13beb601c9..8fc923741a 100644 --- a/sale_order_import_edifact/tests/common.py +++ b/sale_order_import_edifact/tests/common.py @@ -40,3 +40,28 @@ def get_test_data(env): } ) } + + +def get_test_data_no_ean_in_lin(env): + ref = env.ref + return { + "test_orders_-_no_ean_in_LIN_segments.txt": DotDict( + { + "_get_content": partial( + _get_file_content, "test_orders_-_no_ean_in_LIN_segments.txt" + ), + "client_order_ref": "467819", + "date_order": "2023-03-20", + "partner": ref("sale_order_import_edifact.partner_edi_shipto_dm"), + "shipping_partner": ref( + "sale_order_import_edifact.partner_edi_shipto_dm" + ), + "products": ref("sale_order_import_edifact.product_product_edifact4_dm") + + ref("sale_order_import_edifact.product_product_edifact5_dm") + + ref("sale_order_import_edifact.product_product_edifact6_dm") + + ref("sale_order_import_edifact.product_product_edifact7_dm") + + ref("sale_order_import_edifact.product_product_edifact8_dm"), + "qty": [12.0, 24.0, 12.0, 24.0, 90.0], + } + ) + } diff --git a/sale_order_import_edifact/tests/test_edifact_order_import.py b/sale_order_import_edifact/tests/test_edifact_order_import.py index ed3bad5832..73dcb05271 100644 --- a/sale_order_import_edifact/tests/test_edifact_order_import.py +++ b/sale_order_import_edifact/tests/test_edifact_order_import.py @@ -6,7 +6,7 @@ from odoo.tests.common import TransactionCase from odoo.tools import mute_logger -from .common import get_test_data +from .common import get_test_data, get_test_data_no_ean_in_lin class TestEdifactOrderImport(TransactionCase): @@ -44,3 +44,37 @@ def test_edifact_order_import(self): self.assertEqual( sorted(so.order_line.mapped("product_id").ids), expected_ids ) + + @mute_logger("odoo.addons.sale_order_import.wizard.sale_order_import") + def test_edifact_order_import_no_ean_in_lin(self): + tests = get_test_data_no_ean_in_lin(self.env) + for filename, expected in tests.items(): + edifact_file = expected._get_content() + wiz = self.env["sale.order.import"].create( + { + "import_type": "edifact", + "order_file": base64.b64encode(edifact_file), + "order_filename": filename, + } + ) + action = wiz.import_order_button() + so = self.env["sale.order"].browse(action["res_id"]) + self.assertEqual(so.partner_id, expected["partner"]) + + if expected.get("client_order_ref"): + self.assertEqual(so.client_order_ref, expected["client_order_ref"]) + + if expected.get("shipping_partner"): + self.assertEqual(so.partner_shipping_id, expected["shipping_partner"]) + + if expected.get("products"): + expected_ids = sorted(expected["products"].ids) + self.assertEqual( + sorted(so.order_line.mapped("product_id").ids), expected_ids + ) + self.assertEqual( + so.order_line.mapped("product_uom_qty"), expected["qty"] + ) + self.assertEqual( + so.order_line.mapped("name")[0], "Product1 description" + ) From a5efa966c756c5d163025dca5227227cd81f283b Mon Sep 17 00:00:00 2001 From: Vo Hong Thien Date: Tue, 24 Oct 2023 18:28:05 +0700 Subject: [PATCH 12/13] [IMP] sale_order_import_edifact: add testcase for no PRI segment --- sale_order_import_edifact/tests/common.py | 23 ++++++++++++++ .../tests/test_edifact_order_import.py | 31 ++++++++++++++++++- 2 files changed, 53 insertions(+), 1 deletion(-) diff --git a/sale_order_import_edifact/tests/common.py b/sale_order_import_edifact/tests/common.py index 8fc923741a..3ac0916a85 100644 --- a/sale_order_import_edifact/tests/common.py +++ b/sale_order_import_edifact/tests/common.py @@ -65,3 +65,26 @@ def get_test_data_no_ean_in_lin(env): } ) } + + +def get_test_data_no_price(env): + ref = env.ref + return { + "test_orders_-_no_PRI_segments.txt": DotDict( + { + "_get_content": partial( + _get_file_content, "test_orders_-_no_PRI_segments.txt" + ), + "client_order_ref": "COM-004017", + "date_order": "2023-03-20", + "partner": ref("sale_order_import_edifact.partner_edi_invoiceto_dm"), + "shipping_partner": ref( + "sale_order_import_edifact.partner_edi_shipto_dm" + ), + "products": ref("sale_order_import_edifact.product_product_edifact1_dm") + + ref("sale_order_import_edifact.product_product_edifact2_dm") + + ref("sale_order_import_edifact.product_product_edifact3_dm"), + "price": [1.0, 1.0, 1.0], + } + ) + } diff --git a/sale_order_import_edifact/tests/test_edifact_order_import.py b/sale_order_import_edifact/tests/test_edifact_order_import.py index 73dcb05271..c9138b2252 100644 --- a/sale_order_import_edifact/tests/test_edifact_order_import.py +++ b/sale_order_import_edifact/tests/test_edifact_order_import.py @@ -6,7 +6,7 @@ from odoo.tests.common import TransactionCase from odoo.tools import mute_logger -from .common import get_test_data, get_test_data_no_ean_in_lin +from .common import get_test_data, get_test_data_no_ean_in_lin, get_test_data_no_price class TestEdifactOrderImport(TransactionCase): @@ -78,3 +78,32 @@ def test_edifact_order_import_no_ean_in_lin(self): self.assertEqual( so.order_line.mapped("name")[0], "Product1 description" ) + + @mute_logger("odoo.addons.sale_order_import.wizard.sale_order_import") + def test_edifact_order_import_no_price(self): + tests = get_test_data_no_price(self.env) + for filename, expected in tests.items(): + edifact_file = expected._get_content() + wiz = self.env["sale.order.import"].create( + { + "import_type": "edifact", + "order_file": base64.b64encode(edifact_file), + "order_filename": filename, + } + ) + action = wiz.import_order_button() + so = self.env["sale.order"].browse(action["res_id"]) + self.assertEqual(so.partner_id, expected["partner"]) + + if expected.get("client_order_ref"): + self.assertEqual(so.client_order_ref, expected["client_order_ref"]) + + if expected.get("shipping_partner"): + self.assertEqual(so.partner_shipping_id, expected["shipping_partner"]) + + if expected.get("products"): + expected_ids = sorted(expected["products"].ids) + self.assertEqual( + sorted(so.order_line.mapped("product_id").ids), expected_ids + ) + self.assertEqual(so.order_line.mapped("price_unit"), expected["price"]) From a22cf47b77734ace43fdcd2f63cce310009f4b82 Mon Sep 17 00:00:00 2001 From: Nils Hamerlinck Date: Thu, 26 Oct 2023 16:11:01 +0700 Subject: [PATCH 13/13] [IMP] sale_order_import_edifact: support EDI files with no extension --- sale_order_import_edifact/wizard/sale_order_import.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sale_order_import_edifact/wizard/sale_order_import.py b/sale_order_import_edifact/wizard/sale_order_import.py index 1e0353d308..d67a5c6574 100644 --- a/sale_order_import_edifact/wizard/sale_order_import.py +++ b/sale_order_import_edifact/wizard/sale_order_import.py @@ -38,7 +38,7 @@ def _compute_edifact_ok(self): path, ext = os.path.splitext(self.order_filename) ok = ext and ext[1:] in extensions if not ok: - ok = b64decode(self.order_file[:4]) == b"UNB" + ok = b64decode(self.order_file[:4]) in (b"UNA", b"UNB") rec.edifact_ok = ok # TODO: Move this feature to the base module or to an additional module. @@ -77,7 +77,7 @@ def button_parse_order_preview(self): def _get_supported_types(self): # Add more types for EDIFACT res = super()._get_supported_types() - res.update({"edifact": ("text/plain")}) + res.update({"edifact": ("text/plain", None)}) return res @api.model