From 52faee0664837b530be53565bb0c0eb1e9b4aca1 Mon Sep 17 00:00:00 2001 From: Florian da Costa Date: Mon, 26 Apr 2021 19:24:04 +0200 Subject: [PATCH 01/13] Add purchase edi file --- purchase_edi_file/__init__.py | 1 + purchase_edi_file/__manifest__.py | 22 ++++ purchase_edi_file/demo/ir_exports_config.xml | 61 +++++++++++ purchase_edi_file/demo/product.xml | 12 +++ purchase_edi_file/demo/purchase_order.xml | 26 +++++ purchase_edi_file/demo/res_partner.xml | 13 +++ purchase_edi_file/models/__init__.py | 4 + .../models/product_supplierinfo.py | 13 +++ purchase_edi_file/models/purchase_order.py | 40 +++++++ .../models/purchase_order_line.py | 33 ++++++ purchase_edi_file/models/res_partner.py | 102 ++++++++++++++++++ purchase_edi_file/readme/DESCRIPTION.rst | 6 ++ purchase_edi_file/tests/__init__.py | 1 + .../tests/test_purchase_edi_file.py | 51 +++++++++ purchase_edi_file/views/ir_exports_config.xml | 26 +++++ .../views/product_supplierinfo_view.xml | 14 +++ purchase_edi_file/views/res_partner_view.xml | 32 ++++++ 17 files changed, 457 insertions(+) create mode 100644 purchase_edi_file/__init__.py create mode 100644 purchase_edi_file/__manifest__.py create mode 100644 purchase_edi_file/demo/ir_exports_config.xml create mode 100644 purchase_edi_file/demo/product.xml create mode 100644 purchase_edi_file/demo/purchase_order.xml create mode 100644 purchase_edi_file/demo/res_partner.xml create mode 100644 purchase_edi_file/models/__init__.py create mode 100644 purchase_edi_file/models/product_supplierinfo.py create mode 100644 purchase_edi_file/models/purchase_order.py create mode 100644 purchase_edi_file/models/purchase_order_line.py create mode 100644 purchase_edi_file/models/res_partner.py create mode 100644 purchase_edi_file/readme/DESCRIPTION.rst create mode 100644 purchase_edi_file/tests/__init__.py create mode 100644 purchase_edi_file/tests/test_purchase_edi_file.py create mode 100644 purchase_edi_file/views/ir_exports_config.xml create mode 100644 purchase_edi_file/views/product_supplierinfo_view.xml create mode 100644 purchase_edi_file/views/res_partner_view.xml diff --git a/purchase_edi_file/__init__.py b/purchase_edi_file/__init__.py new file mode 100644 index 000000000..0650744f6 --- /dev/null +++ b/purchase_edi_file/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/purchase_edi_file/__manifest__.py b/purchase_edi_file/__manifest__.py new file mode 100644 index 000000000..36a9e1c52 --- /dev/null +++ b/purchase_edi_file/__manifest__.py @@ -0,0 +1,22 @@ +{ + "name": "Purchase EDI file", + "version": "14.0.1.0.0", + "author": "Akretion, Odoo Community Association (OCA)", + "website": "https://github.com/akretion/ak-odoo-incubator", + "category": "Purchase", + "depends": ["base_custom_export", "purchase", "attachment_synchronize"], + "data": [ + "views/product_supplierinfo_view.xml", + "views/res_partner_view.xml", + "views/ir_exports_config.xml", + ], + "demo": [ + "demo/ir_exports_config.xml", + "demo/res_partner.xml", + "demo/purchase_order.xml", + "demo/product.xml", + ], + "maintainer": "florian-dacosta", + "license": "AGPL-3", + "installable": True, +} diff --git a/purchase_edi_file/demo/ir_exports_config.xml b/purchase_edi_file/demo/ir_exports_config.xml new file mode 100644 index 000000000..672d0ffe2 --- /dev/null +++ b/purchase_edi_file/demo/ir_exports_config.xml @@ -0,0 +1,61 @@ + + + + + Test Export po line product + + + + + product_id/name + Product + + + + + Test Export po line product + csv + + + + + Test Export po line Quantity + + + + + product_qty + Quantity + + + + + Test Export po line Quantity + + csv + + + + Test Export po line Product and Quantity + + + + + product_id/name + Product + + + + + product_qty + Quantity + + + + + Test Export po line Product and Quantity + + csv + + + diff --git a/purchase_edi_file/demo/product.xml b/purchase_edi_file/demo/product.xml new file mode 100644 index 000000000..f4baf1323 --- /dev/null +++ b/purchase_edi_file/demo/product.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/purchase_edi_file/demo/purchase_order.xml b/purchase_edi_file/demo/purchase_order.xml new file mode 100644 index 000000000..f1f26aa94 --- /dev/null +++ b/purchase_edi_file/demo/purchase_order.xml @@ -0,0 +1,26 @@ + + + + + + + + + + Pedal Bin + 1.0 + 10.0 + + + + + + + Large Desk + 2.0 + 50.0 + + + + + diff --git a/purchase_edi_file/demo/res_partner.xml b/purchase_edi_file/demo/res_partner.xml new file mode 100644 index 000000000..494a42604 --- /dev/null +++ b/purchase_edi_file/demo/res_partner.xml @@ -0,0 +1,13 @@ + + + + + + external_location + + + + diff --git a/purchase_edi_file/models/__init__.py b/purchase_edi_file/models/__init__.py new file mode 100644 index 000000000..db9a6d7d6 --- /dev/null +++ b/purchase_edi_file/models/__init__.py @@ -0,0 +1,4 @@ +from . import res_partner +from . import product_supplierinfo +from . import purchase_order +from . import purchase_order_line diff --git a/purchase_edi_file/models/product_supplierinfo.py b/purchase_edi_file/models/product_supplierinfo.py new file mode 100644 index 000000000..4f228a151 --- /dev/null +++ b/purchase_edi_file/models/product_supplierinfo.py @@ -0,0 +1,13 @@ +# Copyright (C) 2021 Akretion (http://www.akretion.com). + +from odoo import fields, models + + +class ProductSupplierinfo(models.Model): + _inherit = "product.supplierinfo" + + purchase_edi_id = fields.Many2one( + "ir.exports.config", + "Edi Profile", + domain=[("model", "=", "purchase.order.line")], + ) diff --git a/purchase_edi_file/models/purchase_order.py b/purchase_edi_file/models/purchase_order.py new file mode 100644 index 000000000..25f59272a --- /dev/null +++ b/purchase_edi_file/models/purchase_order.py @@ -0,0 +1,40 @@ +# Copyright (C) 2021 Akretion (http://www.akretion.com). + +from odoo import models + + +class PurchaseOrder(models.Model): + _inherit = "purchase.order" + + def button_approve(self, force=False): + res = super().button_approve(force=force) + self.generate_and_send_edi_files() + return res + + def _should_send_edi_file(self): + self.ensure_one() + partner = self.partner_id + edi_transfer = ( + partner.edi_storage_backend_id + or partner.edi_mail_template_id + or partner.edi_transfer_method == "manual" + and "manual" + or False + ) + return edi_transfer and True or False + + def generate_and_send_edi_files(self): + for purchase in self: + if not purchase._should_send_edi_file(): + continue + partner = purchase.partner_id + profiles_lines = purchase.order_line._get_lines_by_profiles(partner) + attachments = self.env["ir.attachment"] + for profile, records in profiles_lines.items(): + if not records and not partner.edi_empty_file: + continue + attachments |= profile.get_attachment( + records, res_id=purchase.id, res_model=self._name + ) + if attachments: + partner.send_supplier_edi_attachments(attachments, purchase=purchase) diff --git a/purchase_edi_file/models/purchase_order_line.py b/purchase_edi_file/models/purchase_order_line.py new file mode 100644 index 000000000..44b4be198 --- /dev/null +++ b/purchase_edi_file/models/purchase_order_line.py @@ -0,0 +1,33 @@ +# Copyright (C) 2021 Akretion (http://www.akretion.com). + +from odoo import _, exceptions, models + + +class PurchaseOrderLine(models.Model): + _inherit = "purchase.order.line" + + def _get_lines_by_profiles(self, partner): + profile_lines = { + key: self.env["purchase.order.line"] + for key in partner.edi_purchase_profile_ids + } + for line in self: + product = line.product_id + seller = product._select_seller(partner_id=partner) + purchase_edi = seller.purchase_edi_id + # Services should not appear in EDI file unless an EDI profile + # is specifically on the supplier info. This way, we avoid + # adding transport of potential discount or anything else + # in the EDI file. + if product.type == "service" and not purchase_edi: + continue + if purchase_edi: + profile_lines[purchase_edi] |= line + elif partner.default_purchase_profile_id: + profile_lines[partner.default_purchase_profile_id] |= line + else: + raise exceptions.UserError( + _("Some products don't have edi profile configured : %s") + % (product.default_code,) + ) + return profile_lines diff --git a/purchase_edi_file/models/res_partner.py b/purchase_edi_file/models/res_partner.py new file mode 100644 index 000000000..b92eb3562 --- /dev/null +++ b/purchase_edi_file/models/res_partner.py @@ -0,0 +1,102 @@ +# Copyright (C) 2021 Akretion (http://www.akretion.com). + +from odoo import _, exceptions, fields, models + + +class ResPartner(models.Model): + _inherit = "res.partner" + + def _compute_edi_purchase_profile_ids(self): + for partner in self: + self.env["product.supplierinfo"].flush(["name", "purchase_edi_id"]) + self.env.cr.execute( + """ + SELECT DISTINCT purchase_edi_id + FROM product_supplierinfo + WHERE name = %s + """, + (partner.id,), + ) + ids_sql = self.env.cr.fetchall() + profile_ids = [profile[0] for profile in ids_sql if profile[0]] + if ( + partner.default_purchase_profile_id + and partner.default_purchase_profile_id.id not in profile_ids + ): + profile_ids.append(partner.default_purchase_profile_id.id) + partner.edi_purchase_profile_ids = profile_ids + + edi_purchase_profile_ids = fields.One2many( + "ir.exports.config", + compute="_compute_edi_purchase_profile_ids", + string="Edi Purchase Profiles", + ) + default_purchase_profile_id = fields.Many2one( + "ir.exports.config", + string="Default Purchase Profile", + domain=[("model_id.model", "=", "purchase.order.line")], + help="If no profile is configured on product, this default " + "profile will be used.", + ) + edi_transfer_method = fields.Selection( + selection=[ + ("mail", "E-mail"), + ("external_location", "Remote server"), + ("manual", "Manual"), + ], + string="Edi Transfer Method", + help="The remote server transfer depends on which module are " + "available/installed. It could be sftp, ftp, aws, etc...", + ) + edi_storage_backend_id = fields.Many2one( + "storage.backend", string="FTP/SFTP Location" + ) + edi_mail_template_id = fields.Many2one( + "mail.template", + domain=[("model_id.model", "in", ("purchase.order", "res.partner"))], + string="Edi Mail Template", + ) + edi_empty_file = fields.Boolean( + "Send EDI empty file", + help="It may be usefull if the supplier always want to receive one file per " + "profile", + ) + + def send_attachments_edi_by_mail(self, attachments, purchase=False): + self.ensure_one() + template = self.edi_mail_template_id + if template.model_id.model == "res.partner": + record = self.id + elif template.model_id.model == "purchase.order": + record = purchase + else: + raise exceptions.UserError( + _("The mail template should be linked to partner or " "purchase order.") + ) + mail_vals = {"attachment_ids": [(4, attach.id) for attach in attachments]} + template.send_mail(record.id, email_values=mail_vals) + + def send_attachment_remote_server(self, attachments): + storage_backend = self.edi_storage_backend_id + exporting_tasks = storage_backend.synchronize_task_ids.filtered( + lambda t: t.method_type == "export" + ) + # do not manage multiple location for one partner for now. + exporting_task = exporting_tasks and exporting_tasks[0] + for attachment in attachments: + self.env["attachment.queue"].create( + { + "file_type": "export", + "task_id": exporting_task.id, + "attachment_id": attachment.id, + } + ) + + def send_supplier_edi_attachments(self, attachments, purchase=False): + self.ensure_one() + if not attachments: + return + if self.edi_transfer_method == "mail": + self.send_attachments_edi_by_mail(attachments, purchase=purchase) + elif self.self.edi_transfer_method == "external_location": + self.send_attachment_remote_server(attachments) diff --git a/purchase_edi_file/readme/DESCRIPTION.rst b/purchase_edi_file/readme/DESCRIPTION.rst new file mode 100644 index 000000000..2cef522c1 --- /dev/null +++ b/purchase_edi_file/readme/DESCRIPTION.rst @@ -0,0 +1,6 @@ +This module allows to send file to supplier on purchase order's validation. +The file may be sent by mail or using a backend storage (aws, sftp, ...) +The file comes from native Odoo exports but other format could be implemented + +The format of the file may depend on the product and the supplier or on the supplier only +(meaning we may have multiple files for a same PO, depending on the products) diff --git a/purchase_edi_file/tests/__init__.py b/purchase_edi_file/tests/__init__.py new file mode 100644 index 000000000..b211cc4d8 --- /dev/null +++ b/purchase_edi_file/tests/__init__.py @@ -0,0 +1 @@ +from . import test_purchase_edi_file diff --git a/purchase_edi_file/tests/test_purchase_edi_file.py b/purchase_edi_file/tests/test_purchase_edi_file.py new file mode 100644 index 000000000..34d31fb2d --- /dev/null +++ b/purchase_edi_file/tests/test_purchase_edi_file.py @@ -0,0 +1,51 @@ +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + + +from odoo.tests.common import SavepointCase + + +class TestPurchaseEdiFile(SavepointCase): + @classmethod + def setUpClass(cls): + super().setUpClass() + cls.supplier = cls.env.ref("base.res_partner_12") + cls.po = cls.env.ref("purchase_edi_file.demo_edi_po") + + def test_partner_edi_profiles(self): + self.assertEqual(len(self.supplier.edi_purchase_profile_ids), 3) + + def test_export_external_location(self): + self.po.button_approve() + attachments = self.env["attachment.queue"].search( + [("res_id", "=", self.po.id), ("res_model", "=", "purchase.order")] + ) + self.assertEqual(len(attachments), 2) + self.assertEqual(attachments[0].file_type, "export") + + def test_export_by_mail(self): + template = self.env["mail.template"].create( + { + "name": "test EDI template", + "model_id": self.env.ref("purchase.model_purchase_order").id, + "subject": "EDI files", + "email_from": "dummy@dummy.com", + "email_to": "dummyto@dummy.com", + } + ) + self.supplier.write( + {"edi_transfer_method": "mail", "edi_mail_template_id": template.id} + ) + self.po.button_approve() + mail = self.env["mail.mail"].search( + [("res_id", "=", self.po.id), ("model", "=", "purchase.order")] + ) + self.assertEqual(len(mail), 1) + self.assertEqual(len(mail.attachment_ids), 2) + + def test_export_with_empty_files(self): + self.supplier.write({"edi_empty_file": True}) + self.po.button_approve() + attachments = self.env["attachment.queue"].search( + [("res_id", "=", self.po.id), ("res_model", "=", "purchase.order")] + ) + self.assertEqual(len(attachments), 3) diff --git a/purchase_edi_file/views/ir_exports_config.xml b/purchase_edi_file/views/ir_exports_config.xml new file mode 100644 index 000000000..a86f5b562 --- /dev/null +++ b/purchase_edi_file/views/ir_exports_config.xml @@ -0,0 +1,26 @@ + + + + + + + Purchase Export Profiles + ir.exports.config + tree,form + [('resource', '=', 'purchase.order.line')] + + + + + diff --git a/purchase_edi_file/views/product_supplierinfo_view.xml b/purchase_edi_file/views/product_supplierinfo_view.xml new file mode 100644 index 000000000..80aa52ee7 --- /dev/null +++ b/purchase_edi_file/views/product_supplierinfo_view.xml @@ -0,0 +1,14 @@ + + + + + product.supplierinfo + + + + + + + + + diff --git a/purchase_edi_file/views/res_partner_view.xml b/purchase_edi_file/views/res_partner_view.xml new file mode 100644 index 000000000..dde5f341f --- /dev/null +++ b/purchase_edi_file/views/res_partner_view.xml @@ -0,0 +1,32 @@ + + + + + res.partner + + + + + + + + + + + + + + + From df3ce7ab094b1bf0fa8dc099be5d6d6abad9ec34 Mon Sep 17 00:00:00 2001 From: Florian da Costa Date: Fri, 18 Feb 2022 18:43:09 +0100 Subject: [PATCH 02/13] Add qty when searching seller because even if not passed a verification is made by default in _select_seller --- purchase_edi_file/models/purchase_order_line.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/purchase_edi_file/models/purchase_order_line.py b/purchase_edi_file/models/purchase_order_line.py index 44b4be198..bd279da6c 100644 --- a/purchase_edi_file/models/purchase_order_line.py +++ b/purchase_edi_file/models/purchase_order_line.py @@ -13,7 +13,9 @@ def _get_lines_by_profiles(self, partner): } for line in self: product = line.product_id - seller = product._select_seller(partner_id=partner) + seller = product._select_seller( + partner_id=partner, quantity=line.product_uom_qty + ) purchase_edi = seller.purchase_edi_id # Services should not appear in EDI file unless an EDI profile # is specifically on the supplier info. This way, we avoid From beeb55ed00e5d729706e23ec7d4abd7bdd5b890a Mon Sep 17 00:00:00 2001 From: Florian da Costa Date: Thu, 28 Apr 2022 18:02:49 +0200 Subject: [PATCH 03/13] Manage multiple transport edi for 1 supplier --- purchase_edi_file/__manifest__.py | 3 ++ .../demo/edi_transport_config.xml | 13 ++++++ purchase_edi_file/demo/res_partner.xml | 5 +-- purchase_edi_file/models/__init__.py | 3 ++ .../models/edi_transport_config.py | 26 ++++++++++++ purchase_edi_file/models/ir_exports_config.py | 14 +++++++ .../models/partner_export_edi.py | 19 +++++++++ purchase_edi_file/models/purchase_order.py | 36 +++++++++++----- purchase_edi_file/models/res_partner.py | 41 +++++++------------ .../security/ir.model.access.csv | 3 ++ .../tests/test_purchase_edi_file.py | 17 ++++---- .../views/edi_transport_config.xml | 25 +++++++++++ purchase_edi_file/views/ir_exports_config.xml | 30 +++++++++++++- purchase_edi_file/views/res_partner_view.xml | 16 +------- 14 files changed, 186 insertions(+), 65 deletions(-) create mode 100644 purchase_edi_file/demo/edi_transport_config.xml create mode 100644 purchase_edi_file/models/edi_transport_config.py create mode 100644 purchase_edi_file/models/ir_exports_config.py create mode 100644 purchase_edi_file/models/partner_export_edi.py create mode 100644 purchase_edi_file/security/ir.model.access.csv create mode 100644 purchase_edi_file/views/edi_transport_config.xml diff --git a/purchase_edi_file/__manifest__.py b/purchase_edi_file/__manifest__.py index 36a9e1c52..655088872 100644 --- a/purchase_edi_file/__manifest__.py +++ b/purchase_edi_file/__manifest__.py @@ -6,12 +6,15 @@ "category": "Purchase", "depends": ["base_custom_export", "purchase", "attachment_synchronize"], "data": [ + "security/ir.model.access.csv", "views/product_supplierinfo_view.xml", "views/res_partner_view.xml", "views/ir_exports_config.xml", + "views/edi_transport_config.xml", ], "demo": [ "demo/ir_exports_config.xml", + "demo/edi_transport_config.xml", "demo/res_partner.xml", "demo/purchase_order.xml", "demo/product.xml", diff --git a/purchase_edi_file/demo/edi_transport_config.xml b/purchase_edi_file/demo/edi_transport_config.xml new file mode 100644 index 000000000..8f287b768 --- /dev/null +++ b/purchase_edi_file/demo/edi_transport_config.xml @@ -0,0 +1,13 @@ + + + + + Demo config + external_location + + + + diff --git a/purchase_edi_file/demo/res_partner.xml b/purchase_edi_file/demo/res_partner.xml index 494a42604..dc07b155a 100644 --- a/purchase_edi_file/demo/res_partner.xml +++ b/purchase_edi_file/demo/res_partner.xml @@ -3,10 +3,9 @@ - external_location diff --git a/purchase_edi_file/models/__init__.py b/purchase_edi_file/models/__init__.py index db9a6d7d6..3546e04aa 100644 --- a/purchase_edi_file/models/__init__.py +++ b/purchase_edi_file/models/__init__.py @@ -2,3 +2,6 @@ from . import product_supplierinfo from . import purchase_order from . import purchase_order_line +from . import edi_transport_config +from . import partner_export_edi +from . import ir_exports_config diff --git a/purchase_edi_file/models/edi_transport_config.py b/purchase_edi_file/models/edi_transport_config.py new file mode 100644 index 000000000..c027d1808 --- /dev/null +++ b/purchase_edi_file/models/edi_transport_config.py @@ -0,0 +1,26 @@ +# Copyright (C) 2021 Akretion (http://www.akretion.com). + +from odoo import fields, models + + +class EdiTransportConfig(models.Model): + _name = "edi.transport.config" + _description = "edi.transport.config" + + name = fields.Char(required=True) + edi_transfer_method = fields.Selection( + selection=[ + ("mail", "E-mail"), + ("external_location", "SFTP/FTP"), + ("manual", "Manual"), + ], + string="Edi Transfer Method", + ) + edi_storage_backend_id = fields.Many2one( + "storage.backend", string="FTP/SFTP Location" + ) + edi_mail_template_id = fields.Many2one( + "mail.template", + domain=[("model_id.model", "in", ("purchase.order", "res.partner"))], + string="Edi Mail Template", + ) diff --git a/purchase_edi_file/models/ir_exports_config.py b/purchase_edi_file/models/ir_exports_config.py new file mode 100644 index 000000000..4e529cb7b --- /dev/null +++ b/purchase_edi_file/models/ir_exports_config.py @@ -0,0 +1,14 @@ +# Copyright (C) 2021 Akretion (http://www.akretion.com). + +from odoo import fields, models + + +class IrExportsConfig(models.Model): + _inherit = "ir.exports.config" + + partner_edi_transport_config_ids = fields.One2many( + "partner.export.edi", + "edi_export_id", + string="Partner Transport Configuration", + help="Choose a method to send EDI files if different from the one on the supplier", + ) diff --git a/purchase_edi_file/models/partner_export_edi.py b/purchase_edi_file/models/partner_export_edi.py new file mode 100644 index 000000000..f7f795faf --- /dev/null +++ b/purchase_edi_file/models/partner_export_edi.py @@ -0,0 +1,19 @@ +# Copyright (C) 2021 Akretion (http://www.akretion.com). + +from odoo import fields, models + + +class PartnerExportEdi(models.Model): + _name = "partner.export.edi" + _description = "Link between EDI exports config partner and transport edi config" + + partner_id = fields.Many2one( + "res.partner", + string="Supplier", + required=True, + domain="[('edi_transport_config_id', '!=', False)]", + ) + edi_transport_config_id = fields.Many2one( + "edi.transport.config", required=True, string="EDI Transport Configuration" + ) + edi_export_id = fields.Many2one("ir.exports.config", required=True) diff --git a/purchase_edi_file/models/purchase_order.py b/purchase_edi_file/models/purchase_order.py index 25f59272a..ac8832995 100644 --- a/purchase_edi_file/models/purchase_order.py +++ b/purchase_edi_file/models/purchase_order.py @@ -14,14 +14,7 @@ def button_approve(self, force=False): def _should_send_edi_file(self): self.ensure_one() partner = self.partner_id - edi_transfer = ( - partner.edi_storage_backend_id - or partner.edi_mail_template_id - or partner.edi_transfer_method == "manual" - and "manual" - or False - ) - return edi_transfer and True or False + return partner.edi_transport_config_id and True or False def generate_and_send_edi_files(self): for purchase in self: @@ -30,11 +23,32 @@ def generate_and_send_edi_files(self): partner = purchase.partner_id profiles_lines = purchase.order_line._get_lines_by_profiles(partner) attachments = self.env["ir.attachment"] + attachment_profiles = {} for profile, records in profiles_lines.items(): - if not records and not partner.edi_empty_file: + if not records: continue attachments |= profile.get_attachment( records, res_id=purchase.id, res_model=self._name ) - if attachments: - partner.send_supplier_edi_attachments(attachments, purchase=purchase) + attachment_profiles[profile] = attachments + if not attachment_profiles: + continue + attachment_by_transfer = {} + # attachment could be send at different location depending on the profile + # group all attachment per transfer method and then send it (the goal beeing + # to send only one email if multiple file must be sent per mail) + for profile, attachments in attachment_profiles.items(): + transfer_config = ( + profile.partner_edi_transport_config_ids.filtered( + lambda x: x.partner_id == self.partner_id + ).edi_transport_config_id + or partner.edi_transport_config_id + ) + if transfer_config not in attachment_by_transfer: + attachment_by_transfer[transfer_config] = self.env["ir.attachment"] + attachment_by_transfer[transfer_config] |= attachments + + for transfer_config, attachments in attachment_by_transfer.items(): + partner.send_supplier_edi_attachments( + attachments, config=transfer_config, purchase=purchase + ) diff --git a/purchase_edi_file/models/res_partner.py b/purchase_edi_file/models/res_partner.py index b92eb3562..4f3e13467 100644 --- a/purchase_edi_file/models/res_partner.py +++ b/purchase_edi_file/models/res_partner.py @@ -38,23 +38,8 @@ def _compute_edi_purchase_profile_ids(self): help="If no profile is configured on product, this default " "profile will be used.", ) - edi_transfer_method = fields.Selection( - selection=[ - ("mail", "E-mail"), - ("external_location", "Remote server"), - ("manual", "Manual"), - ], - string="Edi Transfer Method", - help="The remote server transfer depends on which module are " - "available/installed. It could be sftp, ftp, aws, etc...", - ) - edi_storage_backend_id = fields.Many2one( - "storage.backend", string="FTP/SFTP Location" - ) - edi_mail_template_id = fields.Many2one( - "mail.template", - domain=[("model_id.model", "in", ("purchase.order", "res.partner"))], - string="Edi Mail Template", + edi_transport_config_id = fields.Many2one( + "edi.transport.config", string="EDI Transport Configuration" ) edi_empty_file = fields.Boolean( "Send EDI empty file", @@ -62,9 +47,9 @@ def _compute_edi_purchase_profile_ids(self): "profile", ) - def send_attachments_edi_by_mail(self, attachments, purchase=False): + def send_attachments_edi_by_mail(self, attachments, config, purchase=False): self.ensure_one() - template = self.edi_mail_template_id + template = config.edi_mail_template_id if template.model_id.model == "res.partner": record = self.id elif template.model_id.model == "purchase.order": @@ -76,8 +61,8 @@ def send_attachments_edi_by_mail(self, attachments, purchase=False): mail_vals = {"attachment_ids": [(4, attach.id) for attach in attachments]} template.send_mail(record.id, email_values=mail_vals) - def send_attachment_remote_server(self, attachments): - storage_backend = self.edi_storage_backend_id + def send_attachment_remote_server(self, attachments, config): + storage_backend = config.edi_storage_backend_id exporting_tasks = storage_backend.synchronize_task_ids.filtered( lambda t: t.method_type == "export" ) @@ -92,11 +77,13 @@ def send_attachment_remote_server(self, attachments): } ) - def send_supplier_edi_attachments(self, attachments, purchase=False): + def send_supplier_edi_attachments(self, attachments, config=False, purchase=False): self.ensure_one() - if not attachments: + if not config: + config = self.edi_transport_config_id + if not attachments or not config: return - if self.edi_transfer_method == "mail": - self.send_attachments_edi_by_mail(attachments, purchase=purchase) - elif self.self.edi_transfer_method == "external_location": - self.send_attachment_remote_server(attachments) + if config.edi_transfer_method == "mail": + self.send_attachments_edi_by_mail(attachments, config, purchase=purchase) + elif config.edi_transfer_method == "external_location": + self.send_attachment_remote_server(attachments, config) diff --git a/purchase_edi_file/security/ir.model.access.csv b/purchase_edi_file/security/ir.model.access.csv new file mode 100644 index 000000000..49c6ea99b --- /dev/null +++ b/purchase_edi_file/security/ir.model.access.csv @@ -0,0 +1,3 @@ +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +access_edi_transport_config,Full access on edi.transport.config to Purchase Manager,model_edi_transport_config,purchase.group_purchase_manager,1,1,1,1 +access_partner_edi_config,Full access on partner.export.edi to Purchase Manager,model_partner_export_edi,purchase.group_purchase_manager,1,1,1,1 diff --git a/purchase_edi_file/tests/test_purchase_edi_file.py b/purchase_edi_file/tests/test_purchase_edi_file.py index 34d31fb2d..dca497c35 100644 --- a/purchase_edi_file/tests/test_purchase_edi_file.py +++ b/purchase_edi_file/tests/test_purchase_edi_file.py @@ -32,7 +32,7 @@ def test_export_by_mail(self): "email_to": "dummyto@dummy.com", } ) - self.supplier.write( + self.supplier.edi_transport_config_id.write( {"edi_transfer_method": "mail", "edi_mail_template_id": template.id} ) self.po.button_approve() @@ -42,10 +42,11 @@ def test_export_by_mail(self): self.assertEqual(len(mail), 1) self.assertEqual(len(mail.attachment_ids), 2) - def test_export_with_empty_files(self): - self.supplier.write({"edi_empty_file": True}) - self.po.button_approve() - attachments = self.env["attachment.queue"].search( - [("res_id", "=", self.po.id), ("res_model", "=", "purchase.order")] - ) - self.assertEqual(len(attachments), 3) + +# def test_export_with_empty_files(self): +# self.supplier.write({"edi_empty_file": True}) +# self.po.button_approve() +# attachments = self.env["attachment.queue"].search( +# [("res_id", "=", self.po.id), ("res_model", "=", "purchase.order")] +# ) +# self.assertEqual(len(attachments), 3) diff --git a/purchase_edi_file/views/edi_transport_config.xml b/purchase_edi_file/views/edi_transport_config.xml new file mode 100644 index 000000000..251b81cdf --- /dev/null +++ b/purchase_edi_file/views/edi_transport_config.xml @@ -0,0 +1,25 @@ + + + + + edi.transport.config.form + edi.transport.config + +
+ + + + + + +
+ + + + diff --git a/purchase_edi_file/views/ir_exports_config.xml b/purchase_edi_file/views/ir_exports_config.xml index a86f5b562..ae13df448 100644 --- a/purchase_edi_file/views/ir_exports_config.xml +++ b/purchase_edi_file/views/ir_exports_config.xml @@ -1,7 +1,30 @@ - + + ir.exports.config + + + + + + + + + + + + + + + + + Purchase Export Profiles ir.exports.config tree,form - [('resource', '=', 'purchase.order.line')] + ['|', ('resource', '=', 'purchase.order.line'), ('resource', '=', False)] - - - - + From d0e9b4e020652ed6154cff354929f5917a996c36 Mon Sep 17 00:00:00 2001 From: Github GRAP Bot Date: Fri, 3 Jun 2022 13:25:14 +0000 Subject: [PATCH 04/13] [UPD] README.rst --- purchase_edi_file/README.rst | 57 ++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 purchase_edi_file/README.rst diff --git a/purchase_edi_file/README.rst b/purchase_edi_file/README.rst new file mode 100644 index 000000000..969b507b0 --- /dev/null +++ b/purchase_edi_file/README.rst @@ -0,0 +1,57 @@ +================= +Purchase EDI file +================= + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |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-akretion%2Fak--odoo--incubator-lightgray.png?logo=github + :target: https://github.com/akretion/ak-odoo-incubator/tree/14.0/purchase_edi_file + :alt: akretion/ak-odoo-incubator + +|badge1| |badge2| |badge3| + +This module allows to send file to supplier on purchase order's validation. +The file may be sent by mail or using a backend storage (aws, sftp, ...) +The file comes from native Odoo exports but other format could be implemented + +The format of the file may depend on the product and the supplier or on the supplier only +(meaning we may have multiple files for a same PO, depending on the products) + +**Table of contents** + +.. contents:: + :local: + +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 +~~~~~~~ + +* Akretion + +Maintainers +~~~~~~~~~~~ + +This module is part of the `akretion/ak-odoo-incubator `_ project on GitHub. + +You are welcome to contribute. From 32d202a2e0da07a22ed7a2859796d2fcc1a768e6 Mon Sep 17 00:00:00 2001 From: Florian da Costa Date: Tue, 28 Jun 2022 18:06:03 +0200 Subject: [PATCH 05/13] Fix edi profile fields domain --- purchase_edi_file/models/product_supplierinfo.py | 2 +- purchase_edi_file/models/res_partner.py | 2 +- purchase_edi_file/views/product_supplierinfo_view.xml | 10 ++++++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/purchase_edi_file/models/product_supplierinfo.py b/purchase_edi_file/models/product_supplierinfo.py index 4f228a151..762c6e099 100644 --- a/purchase_edi_file/models/product_supplierinfo.py +++ b/purchase_edi_file/models/product_supplierinfo.py @@ -9,5 +9,5 @@ class ProductSupplierinfo(models.Model): purchase_edi_id = fields.Many2one( "ir.exports.config", "Edi Profile", - domain=[("model", "=", "purchase.order.line")], + domain=[("resource", "=", "purchase.order.line")], ) diff --git a/purchase_edi_file/models/res_partner.py b/purchase_edi_file/models/res_partner.py index 4f3e13467..3a00f8110 100644 --- a/purchase_edi_file/models/res_partner.py +++ b/purchase_edi_file/models/res_partner.py @@ -34,7 +34,7 @@ def _compute_edi_purchase_profile_ids(self): default_purchase_profile_id = fields.Many2one( "ir.exports.config", string="Default Purchase Profile", - domain=[("model_id.model", "=", "purchase.order.line")], + domain=[("resource", "=", "purchase.order.line")], help="If no profile is configured on product, this default " "profile will be used.", ) diff --git a/purchase_edi_file/views/product_supplierinfo_view.xml b/purchase_edi_file/views/product_supplierinfo_view.xml index 80aa52ee7..79cdd9710 100644 --- a/purchase_edi_file/views/product_supplierinfo_view.xml +++ b/purchase_edi_file/views/product_supplierinfo_view.xml @@ -11,4 +11,14 @@ + + product.supplierinfo + + + + + + + + From cb6ca9c8c24d0a44fddb2991c7bcf105d8acd313 Mon Sep 17 00:00:00 2001 From: Florian da Costa Date: Fri, 1 Jul 2022 09:20:13 +0200 Subject: [PATCH 06/13] Fix purchase edi profile domain --- purchase_edi_file/models/product_supplierinfo.py | 6 +++++- purchase_edi_file/models/res_partner.py | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/purchase_edi_file/models/product_supplierinfo.py b/purchase_edi_file/models/product_supplierinfo.py index 762c6e099..720e9b2ea 100644 --- a/purchase_edi_file/models/product_supplierinfo.py +++ b/purchase_edi_file/models/product_supplierinfo.py @@ -9,5 +9,9 @@ class ProductSupplierinfo(models.Model): purchase_edi_id = fields.Many2one( "ir.exports.config", "Edi Profile", - domain=[("resource", "=", "purchase.order.line")], + domain=[ + "|", + ("resource", "=", "purchase.order.line"), + ("resource", "=", False), + ], ) diff --git a/purchase_edi_file/models/res_partner.py b/purchase_edi_file/models/res_partner.py index 3a00f8110..f99fdf332 100644 --- a/purchase_edi_file/models/res_partner.py +++ b/purchase_edi_file/models/res_partner.py @@ -34,7 +34,11 @@ def _compute_edi_purchase_profile_ids(self): default_purchase_profile_id = fields.Many2one( "ir.exports.config", string="Default Purchase Profile", - domain=[("resource", "=", "purchase.order.line")], + domain=[ + "|", + ("resource", "=", "purchase.order.line"), + ("resource", "=", False), + ], help="If no profile is configured on product, this default " "profile will be used.", ) From 2499691c4364d08ac115e3ec3af8b151139da948 Mon Sep 17 00:00:00 2001 From: Florian da Costa Date: Mon, 5 Dec 2022 10:51:24 +0100 Subject: [PATCH 07/13] [IMP] purchase_edi_file: black, isort, prettier --- setup/purchase_edi_file/odoo/addons/purchase_edi_file | 1 + setup/purchase_edi_file/setup.py | 6 ++++++ 2 files changed, 7 insertions(+) create mode 120000 setup/purchase_edi_file/odoo/addons/purchase_edi_file create mode 100644 setup/purchase_edi_file/setup.py diff --git a/setup/purchase_edi_file/odoo/addons/purchase_edi_file b/setup/purchase_edi_file/odoo/addons/purchase_edi_file new file mode 120000 index 000000000..5f310245d --- /dev/null +++ b/setup/purchase_edi_file/odoo/addons/purchase_edi_file @@ -0,0 +1 @@ +../../../../purchase_edi_file \ No newline at end of file diff --git a/setup/purchase_edi_file/setup.py b/setup/purchase_edi_file/setup.py new file mode 100644 index 000000000..28c57bb64 --- /dev/null +++ b/setup/purchase_edi_file/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) From 090da0b211013dac72e9f44566ad66f903e1bc98 Mon Sep 17 00:00:00 2001 From: Florian da Costa Date: Mon, 5 Dec 2022 16:08:07 +0100 Subject: [PATCH 08/13] [16][MIG] Migrate purchase_edi_file to 16 --- purchase_edi_file/__manifest__.py | 4 +++- purchase_edi_file/demo/ir_exports_config.xml | 8 ++++---- purchase_edi_file/demo/product.xml | 4 ++-- purchase_edi_file/demo/res_partner.xml | 2 +- purchase_edi_file/models/purchase_order.py | 4 +++- purchase_edi_file/models/res_partner.py | 6 ++++-- purchase_edi_file/views/ir_exports_config.xml | 2 +- .../views/product_supplierinfo_view.xml | 2 +- purchase_edi_file/views/purchase_order.xml | 14 ++++++++++++++ purchase_edi_file/views/purchase_order_line.xml | 14 ++++++++++++++ 10 files changed, 47 insertions(+), 13 deletions(-) create mode 100644 purchase_edi_file/views/purchase_order.xml create mode 100644 purchase_edi_file/views/purchase_order_line.xml diff --git a/purchase_edi_file/__manifest__.py b/purchase_edi_file/__manifest__.py index 655088872..82fd37b59 100644 --- a/purchase_edi_file/__manifest__.py +++ b/purchase_edi_file/__manifest__.py @@ -1,6 +1,6 @@ { "name": "Purchase EDI file", - "version": "14.0.1.0.0", + "version": "16.0.1.0.0", "author": "Akretion, Odoo Community Association (OCA)", "website": "https://github.com/akretion/ak-odoo-incubator", "category": "Purchase", @@ -11,6 +11,8 @@ "views/res_partner_view.xml", "views/ir_exports_config.xml", "views/edi_transport_config.xml", + "views/purchase_order_line.xml", + "views/purchase_order.xml", ], "demo": [ "demo/ir_exports_config.xml", diff --git a/purchase_edi_file/demo/ir_exports_config.xml b/purchase_edi_file/demo/ir_exports_config.xml index 672d0ffe2..b9a8cc00c 100644 --- a/purchase_edi_file/demo/ir_exports_config.xml +++ b/purchase_edi_file/demo/ir_exports_config.xml @@ -8,7 +8,7 @@ product_id/name - Product + Product @@ -25,7 +25,7 @@ product_qty - Quantity + Quantity @@ -42,13 +42,13 @@ product_id/name - Product + Product product_qty - Quantity + Quantity diff --git a/purchase_edi_file/demo/product.xml b/purchase_edi_file/demo/product.xml index f4baf1323..2ba9e9d40 100644 --- a/purchase_edi_file/demo/product.xml +++ b/purchase_edi_file/demo/product.xml @@ -2,11 +2,11 @@ - + - + diff --git a/purchase_edi_file/demo/res_partner.xml b/purchase_edi_file/demo/res_partner.xml index dc07b155a..4bb0d081d 100644 --- a/purchase_edi_file/demo/res_partner.xml +++ b/purchase_edi_file/demo/res_partner.xml @@ -2,7 +2,7 @@ - + diff --git a/purchase_edi_file/views/product_supplierinfo_view.xml b/purchase_edi_file/views/product_supplierinfo_view.xml index 79cdd9710..e40f7cfe7 100644 --- a/purchase_edi_file/views/product_supplierinfo_view.xml +++ b/purchase_edi_file/views/product_supplierinfo_view.xml @@ -15,7 +15,7 @@ product.supplierinfo - + diff --git a/purchase_edi_file/views/purchase_order.xml b/purchase_edi_file/views/purchase_order.xml new file mode 100644 index 000000000..33e8f99f2 --- /dev/null +++ b/purchase_edi_file/views/purchase_order.xml @@ -0,0 +1,14 @@ + + + + + purchase.order + + + + + + + diff --git a/purchase_edi_file/views/purchase_order_line.xml b/purchase_edi_file/views/purchase_order_line.xml new file mode 100644 index 000000000..ba8958122 --- /dev/null +++ b/purchase_edi_file/views/purchase_order_line.xml @@ -0,0 +1,14 @@ + + + + + Purchase Line Export + purchase.order.line + tree + + + + + From 06e320cf8b80f37fe842d63eee204262fbee4cac Mon Sep 17 00:00:00 2001 From: Florian da Costa Date: Thu, 6 Jul 2023 11:03:39 +0200 Subject: [PATCH 09/13] [FIX] Avoid weird no profile found error in case we order less products than the supplier info min qty --- purchase_edi_file/models/purchase_order_line.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/purchase_edi_file/models/purchase_order_line.py b/purchase_edi_file/models/purchase_order_line.py index bd279da6c..6f469093f 100644 --- a/purchase_edi_file/models/purchase_order_line.py +++ b/purchase_edi_file/models/purchase_order_line.py @@ -13,9 +13,11 @@ def _get_lines_by_profiles(self, partner): } for line in self: product = line.product_id - seller = product._select_seller( - partner_id=partner, quantity=line.product_uom_qty - ) + # the goal of finding the supplierinfo is to get the edi profile + # so we don't need to put the right line quantity, just any supplierinfo + # for this supplier should be enough. (We avoid error in case purchased + # qty is forced to less than the min of supplierinfo + seller = product._select_seller(partner_id=partner, quantity=None) purchase_edi = seller.purchase_edi_id # Services should not appear in EDI file unless an EDI profile # is specifically on the supplier info. This way, we avoid From 76f0dfc8eacc8b705e18e064be617dfe789853e7 Mon Sep 17 00:00:00 2001 From: Florian da Costa Date: Thu, 28 Sep 2023 17:41:35 +0200 Subject: [PATCH 10/13] [FIX] pre-commit stuff --- purchase_edi_file/models/edi_transport_config.py | 1 - purchase_edi_file/views/purchase_order.xml | 7 ++++++- purchase_edi_file/views/purchase_order_line.xml | 8 ++++++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/purchase_edi_file/models/edi_transport_config.py b/purchase_edi_file/models/edi_transport_config.py index c027d1808..65b8c5720 100644 --- a/purchase_edi_file/models/edi_transport_config.py +++ b/purchase_edi_file/models/edi_transport_config.py @@ -14,7 +14,6 @@ class EdiTransportConfig(models.Model): ("external_location", "SFTP/FTP"), ("manual", "Manual"), ], - string="Edi Transfer Method", ) edi_storage_backend_id = fields.Many2one( "storage.backend", string="FTP/SFTP Location" diff --git a/purchase_edi_file/views/purchase_order.xml b/purchase_edi_file/views/purchase_order.xml index 33e8f99f2..8b5c1a690 100644 --- a/purchase_edi_file/views/purchase_order.xml +++ b/purchase_edi_file/views/purchase_order.xml @@ -6,7 +6,12 @@ diff --git a/purchase_edi_file/views/purchase_order_line.xml b/purchase_edi_file/views/purchase_order_line.xml index ba8958122..23a70895a 100644 --- a/purchase_edi_file/views/purchase_order_line.xml +++ b/purchase_edi_file/views/purchase_order_line.xml @@ -7,8 +7,12 @@ tree - + action="purchase_line_export_action" + sequence="5" + /> From a6bdabfbf62d4337c433cb9359d166aabc5917b9 Mon Sep 17 00:00:00 2001 From: Florian da Costa Date: Tue, 10 Oct 2023 14:06:38 +0200 Subject: [PATCH 11/13] [IMP] Migrate to fs_storage --- purchase_edi_file/demo/edi_transport_config.xml | 5 +---- purchase_edi_file/models/edi_transport_config.py | 4 +--- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/purchase_edi_file/demo/edi_transport_config.xml b/purchase_edi_file/demo/edi_transport_config.xml index 8f287b768..d65a9adfd 100644 --- a/purchase_edi_file/demo/edi_transport_config.xml +++ b/purchase_edi_file/demo/edi_transport_config.xml @@ -4,10 +4,7 @@ Demo config external_location - + diff --git a/purchase_edi_file/models/edi_transport_config.py b/purchase_edi_file/models/edi_transport_config.py index 65b8c5720..1231830d9 100644 --- a/purchase_edi_file/models/edi_transport_config.py +++ b/purchase_edi_file/models/edi_transport_config.py @@ -15,9 +15,7 @@ class EdiTransportConfig(models.Model): ("manual", "Manual"), ], ) - edi_storage_backend_id = fields.Many2one( - "storage.backend", string="FTP/SFTP Location" - ) + edi_storage_backend_id = fields.Many2one("fs.storage", string="FTP/SFTP Location") edi_mail_template_id = fields.Many2one( "mail.template", domain=[("model_id.model", "in", ("purchase.order", "res.partner"))], From 261a9338bd5499738eee75dceb9ce1045a7f6452 Mon Sep 17 00:00:00 2001 From: Florian da Costa Date: Wed, 31 Jan 2024 13:09:51 +0100 Subject: [PATCH 12/13] [FIX] flake 8 --- account_move_dalenys_import/parser/danelys_file_parser.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/account_move_dalenys_import/parser/danelys_file_parser.py b/account_move_dalenys_import/parser/danelys_file_parser.py index a431685ee..070814af5 100644 --- a/account_move_dalenys_import/parser/danelys_file_parser.py +++ b/account_move_dalenys_import/parser/danelys_file_parser.py @@ -1,9 +1,7 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) import codecs -from csv import Dialect - -from _csv import QUOTE_MINIMAL, register_dialect +from csv import QUOTE_MINIMAL, Dialect, register_dialect from odoo.addons.account_move_base_import.parser.file_parser import ( FileParser, From ea55c1b0e07b07a91c17de875bde6c3b8cf79539 Mon Sep 17 00:00:00 2001 From: Florian da Costa Date: Wed, 31 Jan 2024 13:28:06 +0100 Subject: [PATCH 13/13] Copier update --- .copier-answers.yml | 9 +- .eslintrc.yml | 1 + .github/workflows/pre-commit.yml | 13 +- .github/workflows/test.yml | 8 +- .gitignore | 1 + .pre-commit-config.yaml | 21 +- .pylintrc | 12 +- .pylintrc-mandatory | 12 +- account_move_dalenys_import/README.rst | 39 +- .../static/description/index.html | 42 +- account_refund_no_business_field/README.rst | 48 +- .../static/description/index.html | 51 +-- base_custom_export/README.rst | 15 +- .../static/description/index.html | 423 ++++++++++++++++++ module_analysis_price/README.rst | 5 +- .../static/description/index.html | 27 +- mrp_raw_material_from_config/README.rst | 39 +- .../static/description/index.html | 42 +- proxy_action/README.rst | 15 +- proxy_action/static/description/index.html | 51 +-- purchase_edi_file/README.rst | 15 +- .../static/description/index.html | 412 +++++++++++++++++ sale_lot_config/README.rst | 41 +- sale_lot_config/static/description/index.html | 46 +- 24 files changed, 1104 insertions(+), 284 deletions(-) create mode 100644 base_custom_export/static/description/index.html create mode 100644 purchase_edi_file/static/description/index.html diff --git a/.copier-answers.yml b/.copier-answers.yml index 011ed3ded..90e1665cc 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,8 +1,8 @@ # Do NOT update manually; changes here will be overwritten by Copier -_commit: v1.14.2 +_commit: v1.20 _src_path: https://github.com/OCA/oca-addons-repo-template.git ci: GitHub -dependency_installation_mode: PIP +convert_readme_fragments_to_markdown: false generate_requirements_txt: true github_check_license: true github_ci_extra_env: {} @@ -11,6 +11,7 @@ github_enable_makepot: false github_enable_stale_action: false github_enforce_dev_status_compatibility: false include_wkhtmltopdf: false +odoo_test_flavor: OCB odoo_version: 16.0 org_name: Akretion org_slug: akretion @@ -19,6 +20,6 @@ repo_description: Misc Odoo modules maturing before going to a specific repo repo_name: Akretion Odoo Module Incubator repo_slug: ak-odoo-incubator repo_website: https://github.com/akretion/ak-odoo-incubator -travis_apt_packages: [] -travis_apt_sources: [] +use_pyproject_toml: false +use_ruff: false diff --git a/.eslintrc.yml b/.eslintrc.yml index 9429bc688..fed88d70d 100644 --- a/.eslintrc.yml +++ b/.eslintrc.yml @@ -22,6 +22,7 @@ globals: odoo: readonly openerp: readonly owl: readonly + luxon: readonly # Styling is handled by Prettier, so we only need to enable AST rules; # see https://github.com/OCA/maintainer-quality-tools/pull/618#issuecomment-558576890 diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 23e6e58d6..38b0ba110 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -13,8 +13,10 @@ jobs: pre-commit: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: actions/setup-python@v2 + with: + python-version: "3.11" - name: Get python version run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV - uses: actions/cache@v1 @@ -25,6 +27,15 @@ jobs: run: pip install pre-commit - name: Run pre-commit run: pre-commit run --all-files --show-diff-on-failure --color=always + env: + # Consider valid a PR that changes README fragments but doesn't + # change the README.rst file itself. It's not really a problem + # because the bot will update it anyway after merge. This way, we + # lower the barrier for functional contributors that want to fix the + # readme fragments, while still letting developers get README + # auto-generated (which also helps functionals when using runboat). + # DOCS https://pre-commit.com/#temporarily-disabling-hooks + SKIP: oca-gen-addon-readme - name: Check that all files generated by pre-commit are in git run: | newfiles="$(git ls-files --others --exclude-from=.gitignore)" diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7f2255609..6ae6a24cc 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest name: Detect unreleased dependencies steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - run: | for reqfile in requirements.txt test-requirements.txt ; do if [ -f ${reqfile} ] ; then @@ -35,11 +35,9 @@ jobs: fail-fast: false matrix: include: - - container: ghcr.io/oca/oca-ci/py3.10-odoo16.0:latest - makepot: "false" - name: test with Odoo - container: ghcr.io/oca/oca-ci/py3.10-ocb16.0:latest name: test with OCB + makepot: "false" services: postgres: image: postgres:12.0 @@ -50,7 +48,7 @@ jobs: ports: - 5432:5432 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: persist-credentials: false - name: Install addons and dependencies diff --git a/.gitignore b/.gitignore index 9c283fd41..0090721f5 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ __pycache__/ *.py[cod] /.venv /.pytest_cache +/.ruff_cache # C extensions *.so diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index d8f15fb8c..28713b266 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -12,6 +12,10 @@ exclude: | /static/(src/)?lib/| # Repos using Sphinx to generate docs don't need prettying ^docs/_templates/.*\.html$| + # Don't bother non-technical authors with formatting issues in docs + readme/.*\.(rst|md)$| + # Ignore build and dist directories in addons + /build/|/dist/| # You don't usually want a bot to modify your legal texts (LICENSE.*|COPYING.*) default_language_version: @@ -33,12 +37,25 @@ repos: language: fail files: '[a-zA-Z0-9_]*/i18n/en\.po$' - repo: https://github.com/oca/maintainer-tools - rev: 4cd2b852214dead80822e93e6749b16f2785b2fe + rev: 9a170331575a265c092ee6b24b845ec508e8ef75 hooks: # update the NOT INSTALLABLE ADDONS section above - id: oca-update-pre-commit-excluded-addons - id: oca-fix-manifest-website args: ["https://github.com/akretion/ak-odoo-incubator"] + - id: oca-gen-addon-readme + args: + - --addons-dir=. + - --branch=16.0 + - --org-name=akretion + - --repo-name=ak-odoo-incubator + - --if-source-changed + - --keep-source-digest + - repo: https://github.com/OCA/odoo-pre-commit-hooks + rev: v0.0.25 + hooks: + - id: oca-checks-odoo-module + - id: oca-checks-po - repo: https://github.com/myint/autoflake rev: v1.6.1 hooks: @@ -125,7 +142,7 @@ repos: name: flake8 additional_dependencies: ["flake8-bugbear==21.9.2"] - repo: https://github.com/OCA/pylint-odoo - rev: 7.0.2 + rev: v8.0.19 hooks: - id: pylint_odoo name: pylint with optional checks diff --git a/.pylintrc b/.pylintrc index f1eb3f675..b8bdae0e9 100644 --- a/.pylintrc +++ b/.pylintrc @@ -5,12 +5,12 @@ load-plugins=pylint_odoo score=n [ODOOLINT] -readme_template_url="https://github.com/OCA/maintainer-tools/blob/master/template/module/README.rst" -manifest_required_authors=Akretion -manifest_required_keys=license -manifest_deprecated_keys=description,active -license_allowed=AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3 -valid_odoo_versions=16.0 +readme-template-url="https://github.com/OCA/maintainer-tools/blob/master/template/module/README.rst" +manifest-required-authors=Akretion +manifest-required-keys=license +manifest-deprecated-keys=description,active +license-allowed=AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3 +valid-odoo-versions=16.0 [MESSAGES CONTROL] disable=all diff --git a/.pylintrc-mandatory b/.pylintrc-mandatory index c5a488c6f..4a7d901cb 100644 --- a/.pylintrc-mandatory +++ b/.pylintrc-mandatory @@ -4,12 +4,12 @@ load-plugins=pylint_odoo score=n [ODOOLINT] -readme_template_url="https://github.com/OCA/maintainer-tools/blob/master/template/module/README.rst" -manifest_required_authors=Akretion -manifest_required_keys=license -manifest_deprecated_keys=description,active -license_allowed=AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3 -valid_odoo_versions=16.0 +readme-template-url="https://github.com/OCA/maintainer-tools/blob/master/template/module/README.rst" +manifest-required-authors=Akretion +manifest-required-keys=license +manifest-deprecated-keys=description,active +license-allowed=AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3 +valid-odoo-versions=16.0 [MESSAGES CONTROL] disable=all diff --git a/account_move_dalenys_import/README.rst b/account_move_dalenys_import/README.rst index b9c5e0af9..4687d0c62 100644 --- a/account_move_dalenys_import/README.rst +++ b/account_move_dalenys_import/README.rst @@ -2,10 +2,13 @@ Journal Entry Danelys import ============================ -.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:c51de8a7e48679e6304737fa5c987223979f7dc57d5b53b4fd6ce6e0136ae2dd + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png :target: https://odoo-community.org/page/development-status @@ -13,17 +16,11 @@ Journal Entry Danelys import .. |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%2Fak--odoo--incubator-lightgray.png?logo=github - :target: https://github.com/OCA/ak-odoo-incubator/tree/16.0/account_move_dalenys_import - :alt: OCA/ak-odoo-incubator -.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/ak-odoo-incubator-16-0/ak-odoo-incubator-16-0-account_move_dalenys_import - :alt: Translate me on Weblate -.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png - :target: https://runboat.odoo-community.org/webui/builds.html?repo=OCA/ak-odoo-incubator&target_branch=16.0 - :alt: Try me on Runboat +.. |badge3| image:: https://img.shields.io/badge/github-akretion%2Fak--odoo--incubator-lightgray.png?logo=github + :target: https://github.com/akretion/ak-odoo-incubator/tree/16.0/account_move_dalenys_import + :alt: akretion/ak-odoo-incubator -|badge1| |badge2| |badge3| |badge4| |badge5| +|badge1| |badge2| |badge3| This module extends the functionality of account_move_base_import, in order to handle the file format used for @@ -37,10 +34,10 @@ Danelys (ex be2bill) card remitance Bug Tracker =========== -Bugs are tracked on `GitHub Issues `_. +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. @@ -55,16 +52,6 @@ Authors 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/ak-odoo-incubator `_ project on GitHub. +This module is part of the `akretion/ak-odoo-incubator `_ project on GitHub. -You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. +You are welcome to contribute. diff --git a/account_move_dalenys_import/static/description/index.html b/account_move_dalenys_import/static/description/index.html index 1aee570fc..b4a018aa6 100644 --- a/account_move_dalenys_import/static/description/index.html +++ b/account_move_dalenys_import/static/description/index.html @@ -1,20 +1,19 @@ - - + Journal Entry Danelys import + + +
+

Base Customer Export

+ + +

Beta License: AGPL-3 akretion/ak-odoo-incubator

+

This module allow easily export data into an attachment, using Odoo native exporting tool. +Its meant to be used by submodules needing to export data and add the following features : +- Easily re-order the fields to export (actually comes from base_export_manager module) +- Allow to customize the fields label to have a fully customizable header +- Allow to customize the filename +- Allow to add more data (not from fields), this module implement the possibility to add static data +but it can easily be extended to add more complex logic to get some advanced custom data

+

It supports csv and xlsx format but other one could easily be added

+

Table of contents

+ +
+

Known issues / Roadmap

+

I believe this module could be refactored a bit along with pattern_import_export, to become a dependency of pattern_import_export. (https://github.com/akretion/pattern-import-export/) +Including the missing feature (customizable field name and file name) and possibility to add more info in export (static value…) could be done directly in pattern_import_export, but it is a big module with a lot of features to install for this small need. +Actually all the helpers to get configurable data from export may or not be usefull for other formats. If you want to implement a very specific xml for instance (to be used with purchase_edi) you may want to by pass all that. That is why export field and additional data fields are invisible in case file_format is not csv and xls. +In case of a new format implementation, one should manage if this is export tools is usefull or not.

+
+
+

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 to smash it by providing a detailed and welcomed +feedback.

+

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

+
+
+

Credits

+
+

Authors

+
    +
  • Akretion
    • +
+
+
+

Maintainers

+

This module is part of the akretion/ak-odoo-incubator project on GitHub.

+

You are welcome to contribute.

+
+
+
+ + diff --git a/module_analysis_price/README.rst b/module_analysis_price/README.rst index 5ea458b58..404994c88 100644 --- a/module_analysis_price/README.rst +++ b/module_analysis_price/README.rst @@ -2,10 +2,13 @@ Module Analysis Price ===================== -.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:8b10634c795d46bab28059928fff3f5c17a55a3349ba289d36c488a17772ee30 + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png :target: https://odoo-community.org/page/development-status diff --git a/module_analysis_price/static/description/index.html b/module_analysis_price/static/description/index.html index 1f91b5cb7..c8c0fbdb2 100644 --- a/module_analysis_price/static/description/index.html +++ b/module_analysis_price/static/description/index.html @@ -1,20 +1,19 @@ - - + Module Analysis Price + + +
+

Purchase EDI file

+ + +

Beta License: AGPL-3 akretion/ak-odoo-incubator

+

This module allows to send file to supplier on purchase order’s validation. +The file may be sent by mail or using a backend storage (aws, sftp, …) +The file comes from native Odoo exports but other format could be implemented

+

The format of the file may depend on the product and the supplier or on the supplier only +(meaning we may have multiple files for a same PO, depending on the products)

+

Table of contents

+ +
+

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 to smash it by providing a detailed and welcomed +feedback.

+

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

+
+
+

Credits

+
+

Authors

+
    +
  • Akretion
    • +
+
+
+

Maintainers

+

This module is part of the akretion/ak-odoo-incubator project on GitHub.

+

You are welcome to contribute.

+
+
+
+ + diff --git a/sale_lot_config/README.rst b/sale_lot_config/README.rst index 1f9b19587..2538d17fd 100644 --- a/sale_lot_config/README.rst +++ b/sale_lot_config/README.rst @@ -2,10 +2,13 @@ Sale Lot Config =============== -.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:13f5cce3bbfe28711777d4847ed1a885171306fabc7c34730d113497b7c65b71 + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png :target: https://odoo-community.org/page/development-status @@ -13,17 +16,11 @@ Sale Lot Config .. |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%2Fak--odoo--incubator-lightgray.png?logo=github - :target: https://github.com/OCA/ak-odoo-incubator/tree/16.0/sale_lot_config - :alt: OCA/ak-odoo-incubator -.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/ak-odoo-incubator-16-0/ak-odoo-incubator-16-0-sale_lot_config - :alt: Translate me on Weblate -.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png - :target: https://runboat.odoo-community.org/webui/builds.html?repo=OCA/ak-odoo-incubator&target_branch=16.0 - :alt: Try me on Runboat - -|badge1| |badge2| |badge3| |badge4| |badge5| +.. |badge3| image:: https://img.shields.io/badge/github-akretion%2Fak--odoo--incubator-lightgray.png?logo=github + :target: https://github.com/akretion/ak-odoo-incubator/tree/16.0/sale_lot_config + :alt: akretion/ak-odoo-incubator + +|badge1| |badge2| |badge3| Add commercial and technical config fields on sale order line and on the generated lot. These fields are usfull for fully customizable products when we can't have a variant for each possibile configuration (which is infinite or almost) @@ -36,10 +33,10 @@ These fields are usfull for fully customizable products when we can't have a var Bug Tracker =========== -Bugs are tracked on `GitHub Issues `_. +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. @@ -59,16 +56,6 @@ Contributors 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/ak-odoo-incubator `_ project on GitHub. +This module is part of the `akretion/ak-odoo-incubator `_ project on GitHub. -You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. +You are welcome to contribute. diff --git a/sale_lot_config/static/description/index.html b/sale_lot_config/static/description/index.html index 1f32722dc..fe0fec666 100644 --- a/sale_lot_config/static/description/index.html +++ b/sale_lot_config/static/description/index.html @@ -1,20 +1,19 @@ - - + Sale Lot Config