Merge PR #3118 into 14.0

Signed-off-by eLBati

Author: OCA-git-bot

l10n_it_fatturapa/__manifest__.py

@@ -32,6 +32,7 @@
         "views/account_view.xml",
         "views/company_view.xml",
         "views/partner_view.xml",
+        "views/fatturapa_attachment_views.xml",
         "views/related_document_type_views.xml",
         "security/ir.model.access.csv",
     ],

l10n_it_fatturapa/controllers/main.py

@@ -12,7 +12,8 @@ class FatturaElettronicaController(Controller):
     )
     def pdf_preview(self, attachment_id, **data):
         attach = request.env["ir.attachment"].browse(int(attachment_id))
-        html = attach.get_fattura_elettronica_preview()
+        fatturapa_attachment_model = request.env["fatturapa.attachment"]
+        html = fatturapa_attachment_model.get_fattura_elettronica_preview(attach)
         pdf = request.env["ir.actions.report"]._run_wkhtmltopdf([html])
 
         pdfhttpheaders = [

l10n_it_fatturapa/models/ir_attachment.py

@@ -1,3 +1,6 @@
+#  Copyright 2022 Simone Rubino - TAKOBI
+#  License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
 import base64
 import binascii
 import logging
@@ -6,9 +9,9 @@
 
 import lxml.etree as ET
 
-from odoo import fields, models
+from odoo import api, fields, models
 from odoo.exceptions import UserError
-from odoo.modules import get_resource_path
+from odoo.modules import get_module_resource
 from odoo.tools.translate import _
 
 _logger = logging.getLogger(__name__)
@@ -28,17 +31,36 @@ def is_base64(s):
     return re_base64.match(s)
 
 
-class Attachment(models.Model):
-    _inherit = "ir.attachment"
-
+class FatturaPAAttachment(models.AbstractModel):
+    _name = "fatturapa.attachment"
+    _description = "SdI file"
+    _inherits = {
+        "ir.attachment": "ir_attachment_id",
+    }
+    _inherit = [
+        "mail.thread",
+    ]
+    _order = "id desc"
+
+    ir_attachment_id = fields.Many2one(
+        comodel_name="ir.attachment",
+        string="Attachment",
+        required=True,
+        ondelete="cascade",
+    )
+    att_name = fields.Char(
+        string="SdI file name",
+        related="ir_attachment_id.name",
+        store=True,
+    )
     ftpa_preview_link = fields.Char(
         "Preview link", readonly=True, compute="_compute_ftpa_preview_link"
     )
 
     def _compute_ftpa_preview_link(self):
         for att in self:
             att.ftpa_preview_link = (
-                att.get_base_url() + "/fatturapa/preview/%s" % att.id
+                att.get_base_url() + "/fatturapa/preview/%s" % att.ir_attachment_id.id
             )
 
     @staticmethod
@@ -50,6 +72,7 @@ def ftpa_preview(self):
             "target": "new",
         }
 
+    @api.model
     def remove_xades_sign(self, xml):
         # Recovering parser is needed for files where strings like
         # xmlns:ds="http://www.w3.org/2000/09/xmldsig#""
@@ -65,6 +88,7 @@ def remove_xades_sign(self, xml):
                 break
         return ET.tostring(root)
 
+    @api.model
     def strip_xml_content(self, xml):
         recovering_parser = ET.XMLParser(recover=True)
         root = ET.XML(xml, parser=recovering_parser)
@@ -75,14 +99,18 @@ def extract_cades(data):
         info = cms.ContentInfo.load(data)
         return info["content"]["encap_content_info"]["content"].native
 
+    @api.model
     def cleanup_xml(self, xml_string):
         xml_string = self.remove_xades_sign(xml_string)
         xml_string = self.strip_xml_content(xml_string)
         return xml_string
 
-    def get_xml_string(self):
+    def get_xml_string(self, attachment=None):
+        if not attachment:
+            self.ensure_one()
+            attachment = self.ir_attachment_id
         try:
-            data = base64.b64decode(self.datas)
+            data = base64.b64decode(attachment.datas)
         except binascii.Error as e:
             raise UserError(_("Corrupted attachment %s.") % e.args)
 
@@ -112,14 +140,14 @@ def get_xml_string(self):
         except AttributeError as e:
             raise UserError(_("Invalid xml %s.") % e.args)
 
-    def get_fattura_elettronica_preview(self):
-        xsl_path = get_resource_path(
-            "l10n_it_fatturapa",
-            "data",
-            self.env.company.fatturapa_preview_style,
+    @api.model
+    def get_fattura_elettronica_preview(self, attachment):
+        company = self.env.user.company_id
+        xsl_path = get_module_resource(
+            "l10n_it_fatturapa", "data", company.fatturapa_preview_style
         )
         xslt = ET.parse(xsl_path)
-        xml_string = self.get_xml_string()
+        xml_string = self.get_xml_string(attachment)
         xml_file = BytesIO(xml_string)
         recovering_parser = ET.XMLParser(recover=True)
         dom = ET.parse(xml_file, parser=recovering_parser)

l10n_it_fatturapa/security/ir.model.access.csv

@@ -22,3 +22,4 @@ access_fatturapa_summary_data_manager,access_fatturapa_summary_data_manager,mode
 access_fatturapa_summary_data,access_fatturapa_summary_data,model_fatturapa_summary_data,account.group_account_invoice,1,0,0,0
 access_withholding_data_line_manager,access_withholding_data_line_manager,model_withholding_data_line,account.group_account_manager,1,1,1,1
 access_withholding_data_line,access_withholding_data_line,model_withholding_data_line,account.group_account_invoice,1,0,0,0
+access_fatturapa_attachment,access_fatturapa_attachment,model_fatturapa_attachment,account.group_account_invoice,1,1,1,1

l10n_it_fatturapa/views/fatturapa_attachment_views.xml

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+  ~ Copyright 2022 Simone Rubino - TAKOBI
+  ~ License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+  -->
+<odoo>
+    <record id="fatturapa_attachment_view_form" model="ir.ui.view">
+        <field name="name">Form view for SdI file</field>
+        <field name="model">fatturapa.attachment</field>
+        <field name="arch" type="xml">
+            <form string="SdI file">
+                <sheet>
+                    <group>
+                        <group name="preview">
+                            <field name='id' invisible="1" />
+                            <label for="datas" />
+                            <div>
+                                <div>
+                                    <field name="datas" filename="name" />
+                                </div>
+                                <div>
+                                    <button
+                                        type="object"
+                                        name="ftpa_preview"
+                                        string="Show preview"
+                                        style="margin-bottom:10px;"
+                                        attrs="{'invisible': [('id', '=', False)]}"
+                                    />
+                                </div>
+                            </div>
+                            <field name="name" invisible="True" />
+                        </group>
+                    </group>
+                    <notebook>
+                        <page name="history" string="History">
+                            <label for="create_uid" string="Created by" />
+                            <div name="creation_div">
+                                <field
+                                    name="create_uid"
+                                    readonly="1"
+                                    class="oe_inline"
+                                /> on
+                                <field
+                                    name="create_date"
+                                    readonly="1"
+                                    class="oe_inline"
+                                />
+                            </div>
+                        </page>
+                    </notebook>
+                </sheet>
+                <div class="oe_chatter">
+                    <field name="message_follower_ids" widget="mail_followers" />
+                    <field name="message_ids" widget="mail_thread" />
+                </div>
+            </form>
+        </field>
+    </record>
+</odoo>

l10n_it_fatturapa_in/models/attachment.py

@@ -5,18 +5,10 @@
 
 
 class FatturaPAAttachmentIn(models.Model):
+    _inherit = "fatturapa.attachment"
     _name = "fatturapa.attachment.in"
-    _description = "E-bill import file"
-    _inherits = {"ir.attachment": "ir_attachment_id"}
-    _inherit = ["mail.thread"]
-    _order = "id desc"
+    _description = "Electronic Invoice"
 
-    ir_attachment_id = fields.Many2one(
-        "ir.attachment", "Attachment", required=True, ondelete="cascade"
-    )
-    att_name = fields.Char(
-        string="E-bill file name", related="ir_attachment_id.name", store=True
-    )
     in_invoice_ids = fields.One2many(
         "account.move",
         "fatturapa_attachment_in_id",
@@ -91,9 +83,6 @@ def _compute_e_invoice_validation_error(self):
                 )
             att.e_invoice_validation_message = "\n\n".join(error_messages)
 
-    def get_xml_string(self):
-        return self.ir_attachment_id.get_xml_string()
-
     def recompute_xml_fields(self):
         self._compute_xml_data()
         self._compute_registered()
@@ -179,6 +168,3 @@ def _compute_linked_invoice_id_xml(self):
                                     0
                                 ].IdDocumento
                             )
-
-    def ftpa_preview(self):
-        return self.env["ir.attachment"].ftpa_preview(self)