From a68a36e7b0b22471f9fa1d690e27a76d56074682 Mon Sep 17 00:00:00 2001
From: Dorin Hongu <dhongu@gmail.com>
Date: Mon, 23 Dec 2024 18:12:37 +0200
Subject: [PATCH] Add second Declaration of Conformity report template

Updated module to include a second report template with associated XML, translations, and manifest entry. Fixed a minor XML closing tag issue in expenses report and adjusted logic for stock picking move lines from `move_lines` to `move_ids`.
---
 deltatech_dc/__manifest__.py                 |   3 +-
 deltatech_dc/i18n/ro.po                      | 171 ++++++++++++++++++-
 deltatech_dc/report/report_dc.py             |   2 +-
 deltatech_dc/views/deltatech_dc_report.xml   |  12 ++
 deltatech_dc/views/report_dc_second_form.xml | 156 +++++++++++++++++
 deltatech_expenses/views/report_expenses.xml |   4 +-
 6 files changed, 338 insertions(+), 10 deletions(-)
 create mode 100644 deltatech_dc/views/report_dc_second_form.xml

diff --git a/deltatech_dc/__manifest__.py b/deltatech_dc/__manifest__.py
index 2ac85722ab..7e70aa3588 100644
--- a/deltatech_dc/__manifest__.py
+++ b/deltatech_dc/__manifest__.py
@@ -5,7 +5,7 @@
 {
     "name": "Declaration of Conformity",
     "summary": "Print Declaration of Conformity",
-    "version": "17.0.1.0.4",
+    "version": "17.0.1.0.5",
     "author": "Terrabit, Dorin Hongu",
     "website": "https://www.terrabit.ro",
     "license": "OPL-1",
@@ -23,6 +23,7 @@
         "views/production_lot_view.xml",
         "views/deltatech_dc_view.xml",
         "views/deltatech_dc_report.xml",
+        "views/report_dc_second_form.xml",
         "views/report_dc.xml",
         "security/ir.model.access.csv",
         "security/security.xml",
diff --git a/deltatech_dc/i18n/ro.po b/deltatech_dc/i18n/ro.po
index b55abdac16..880ddcce81 100644
--- a/deltatech_dc/i18n/ro.po
+++ b/deltatech_dc/i18n/ro.po
@@ -15,6 +15,61 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
+#. module: deltatech_dc
+#: model_terms:ir.ui.view,arch_db:deltatech_dc.report_dc_form_2
+msgid ", NRC:"
+msgstr ", CIF:"
+
+#. module: deltatech_dc
+#: model_terms:ir.ui.view,arch_db:deltatech_dc.report_dc_form_2
+msgid ""
+", do not endanger the life, health and safety of consumers and comply with\n"
+"                    the\n"
+"                    internal technical specifications of the products and with the sanitary-veterinary legislation and\n"
+"                    for food safety in force. We guarantee the quality of the products provided that the storage and\n"
+"                    transport parameters specified in the table and on the packaging are respected."
+msgstr ""
+", nu pun în pericol viața, sănătatea și siguranța consumatorilor și respectă\n"
+"                    specificațiile tehnice interne ale produselor și cu legislația sanitar-veterinară și\n"
+"                    pentru siguranța alimentelor în vigoare. Garantăm calitatea produselor cu condiția respectării parametrilor de depozitare și\n"
+"                    transport specificați în tabel și pe ambalaj."
+
+#. module: deltatech_dc
+#: model_terms:ir.ui.view,arch_db:deltatech_dc.report_dc_form_2
+msgid ", with headquarters in"
+msgstr ", cu sediul în mun. "
+
+#. module: deltatech_dc
+#: model_terms:ir.ui.view,arch_db:deltatech_dc.report_dc_form_2
+msgid ""
+"; we declare, ensure and guarantee on our\n"
+"                    own\n"
+"                    responsibility that the products delivered to the customer, according to the invoice/notice no."
+msgstr ""
+"; declarăm, asigurăm și garantăm pe propria noastră\n"
+"                    răspundere că produsele livrate clientului, conform facturii/avizului nr."
+
+#. module: deltatech_dc
+#: model_terms:ir.ui.view,arch_db:deltatech_dc.report_dc_form_2
+msgid ""
+"<br/>\n"
+"                <br/>\n"
+"                <span>\n"
+"                    <strong>Responsible Person:</strong>\n"
+"                    <br/>\n"
+"                    <br/>\n"
+"                    <strong>Signature:</strong>\n"
+"                </span>"
+msgstr ""
+"<br/>\n"
+"                <br/>\n"
+"                <span>\n"
+"                    <strong>Responsabil calitate:</strong>\n"
+"                    <br/>\n"
+"                    <br/>\n"
+"                    <strong>Semnătură:</strong>\n"
+"                </span>"
+
 #. module: deltatech_dc
 #: model_terms:ir.ui.view,arch_db:deltatech_dc.report_dc
 msgid "<span>, declare that the product:</span>"
@@ -32,8 +87,9 @@ msgstr "<span>, cu sediul în localitatea</span>"
 
 #. module: deltatech_dc
 #: model_terms:ir.ui.view,arch_db:deltatech_dc.report_dc
+#: model_terms:ir.ui.view,arch_db:deltatech_dc.report_dc_form_2
 msgid "<span>Declaration of Conformity:</span>"
-msgstr "<span>Declarație de conformitate:</span"
+msgstr "<span>Declarație de conformitate:</span>"
 
 #. module: deltatech_dc
 #: model_terms:ir.ui.view,arch_db:deltatech_dc.report_dc
@@ -118,6 +174,7 @@ msgstr "Data Declarație"
 #: model:ir.actions.report,name:deltatech_dc.action_report_dc
 #: model:ir.actions.report,name:deltatech_dc.action_report_dc_invoice
 #: model:ir.actions.report,name:deltatech_dc.action_report_dc_lot
+#: model:ir.actions.report,name:deltatech_dc.action_report_dc_picking
 #: model:ir.model,name:deltatech_dc.model_deltatech_dc
 #: model:ir.ui.menu,name:deltatech_dc.menu_deltatech_dc
 #: model_terms:ir.ui.view,arch_db:deltatech_dc.view_deltatech_dc_type_form
@@ -125,11 +182,21 @@ msgstr "Data Declarație"
 msgid "Declaration of Conformity"
 msgstr "Declarație de conformitate"
 
+#. module: deltatech_dc
+#: model:ir.actions.report,name:deltatech_dc.action_report_dc_picking_form_2
+msgid "Declaration of Conformity 2"
+msgstr "Declarație de conformitate 2"
+
 #. module: deltatech_dc
 #: model:ir.model.fields,field_description:deltatech_dc.field_deltatech_dc__display_name
 msgid "Display Name"
 msgstr "Nume afișat"
 
+#. module: deltatech_dc
+#: model_terms:ir.ui.view,arch_db:deltatech_dc.report_dc_form_2
+msgid "Expiration Date"
+msgstr "Data expirarii"
+
 #. module: deltatech_dc
 #: model_terms:ir.ui.view,arch_db:deltatech_dc.report_dc
 msgid "F(PP 7.5/4.4.6-01)03"
@@ -155,34 +222,89 @@ msgstr "Ultima actualizare făcută de"
 msgid "Last Updated on"
 msgstr "Ultima actualizare pe"
 
+#. module: deltatech_dc
+#: model:ir.model.fields,field_description:deltatech_dc.field_deltatech_dc__lot_id
+msgid "Lot"
+msgstr ""
+
+#. module: deltatech_dc
+#: model_terms:ir.ui.view,arch_db:deltatech_dc.report_dc_form_2
+msgid "Lot Number"
+msgstr "Numar lot"
+
+#. module: deltatech_dc
+#: model:ir.model,name:deltatech_dc.model_stock_lot
+msgid "Lot/Serial"
+msgstr ""
+
+#. module: deltatech_dc
+#: model_terms:ir.ui.view,arch_db:deltatech_dc.report_dc_form_2
+msgid "Name of products and services"
+msgstr "Denumirea produselor si serviciilor"
+
+#. module: deltatech_dc
+#. odoo-python
+#: code:addons/deltatech_dc/models/deltatech_dc.py:0
+#: code:addons/deltatech_dc/models/deltatech_dc.py:0
+#: code:addons/deltatech_dc/models/deltatech_dc.py:0
+#, python-format
+msgid "New"
+msgstr "Nou"
+
+#. module: deltatech_dc
+#: model_terms:ir.ui.view,arch_db:deltatech_dc.report_dc_form_2
+msgid "Nr."
+msgstr "Nr. crt."
+
 #. module: deltatech_dc
 #: model:ir.model.fields,field_description:deltatech_dc.field_deltatech_dc__name
 msgid "Number"
 msgstr "Număr"
 
 #. module: deltatech_dc
-#: model:ir.model,name:deltatech_dc.model_product_product
+#: model:ir.model,name:deltatech_dc.model_product_template
 #: model:ir.model.fields,field_description:deltatech_dc.field_deltatech_dc__product_id
 msgid "Product"
 msgstr "Produs"
 
 #. module: deltatech_dc
-#: model:ir.model,name:deltatech_dc.model_product_template
-msgid "Product Template"
-msgstr "Șablon produs"
+#: model:ir.model,name:deltatech_dc.model_product_product
+msgid "Product Variant"
+msgstr "Produs"
+
+#. module: deltatech_dc
+#: model:ir.model.fields,field_description:deltatech_dc.field_stock_lot__production_date
+msgid "Production Date"
+msgstr "Data producere"
 
 #. module: deltatech_dc
 #: model_terms:ir.ui.view,arch_db:deltatech_dc.product_template_form_view
 msgid "Quality Control"
 msgstr "Control calitate"
 
+#. module: deltatech_dc
+#: model_terms:ir.ui.view,arch_db:deltatech_dc.report_dc_form_2
+msgid "Quantity"
+msgstr "Cantitate"
+
+#. module: deltatech_dc
+#: model_terms:ir.ui.view,arch_db:deltatech_dc.report_dc_form_2
+msgid "Registration Nr."
+msgstr "Nr. Inreg"
+
 #. module: deltatech_dc
 #: model:ir.model,name:deltatech_dc.model_report_deltatech_dc_report_dc
 #: model:ir.model,name:deltatech_dc.model_report_deltatech_dc_report_dc_invoice
 #: model:ir.model,name:deltatech_dc.model_report_deltatech_dc_report_dc_lot
+#: model:ir.model,name:deltatech_dc.model_report_deltatech_dc_report_dc_picking
 msgid "ReportDCPrint"
 msgstr ""
 
+#. module: deltatech_dc
+#: model_terms:ir.ui.view,arch_db:deltatech_dc.report_dc_form_2
+msgid "Sale Order:"
+msgstr "Comanda:"
+
 #. module: deltatech_dc
 #: model_terms:ir.ui.view,arch_db:deltatech_dc.report_dc
 msgid "Signature,"
@@ -202,6 +324,11 @@ msgstr "Standardul de firmă"
 msgid "Standards"
 msgstr "Standarde"
 
+#. module: deltatech_dc
+#: model_terms:ir.ui.view,arch_db:deltatech_dc.report_dc_form_2
+msgid "Storage Conditions"
+msgstr "Conditii de pastrare si transport"
+
 #. module: deltatech_dc
 #: model:ir.model.fields,field_description:deltatech_dc.field_deltatech_dc__technical_specification
 #: model:ir.model.fields,field_description:deltatech_dc.field_product_product__technical_specification
@@ -209,6 +336,11 @@ msgstr "Standarde"
 msgid "Technical Specification"
 msgstr "Specificație tehnică"
 
+#. module: deltatech_dc
+#: model_terms:ir.ui.view,arch_db:deltatech_dc.report_dc_form_2
+msgid "The document belongs to the"
+msgstr "Documentul apartine"
+
 #. module: deltatech_dc
 #: model_terms:ir.ui.view,arch_db:deltatech_dc.report_dc
 msgid ""
@@ -222,4 +354,31 @@ msgstr ""
 "sănătatea securitatea muncii utilizatorilor și nu este toxic pentru mediul "
 "înconjurător dacă este folosit în conformitate cu destinația pentru care a "
 "fost produs respectând depozitarea, manipularea din fișa cu date de "
-"securitate.  "
+"securitate."
+
+#. module: deltatech_dc
+#: model_terms:ir.ui.view,arch_db:deltatech_dc.report_dc_form_2
+msgid "We,"
+msgstr "Noi,"
+
+#. module: deltatech_dc
+#: model_terms:ir.ui.view,arch_db:deltatech_dc.report_dc_form_2
+msgid ""
+"and cannot be made\n"
+"                        public without the council's approval."
+msgstr "și nu poate fi făcut public fără acordul consiliului."
+
+#. module: deltatech_dc
+#: model_terms:ir.ui.view,arch_db:deltatech_dc.report_dc_form_2
+msgid "county, VAT:"
+msgstr "județ, CUI:"
+
+#. module: deltatech_dc
+#: model_terms:ir.ui.view,arch_db:deltatech_dc.report_dc_form_2
+msgid "county, work point located in"
+msgstr "județ, punct de lucru situat în"
+
+#. module: deltatech_dc
+#: model_terms:ir.ui.view,arch_db:deltatech_dc.report_dc_form_2
+msgid "from"
+msgstr "din"
diff --git a/deltatech_dc/report/report_dc.py b/deltatech_dc/report/report_dc.py
index 485a8be043..51ae929384 100644
--- a/deltatech_dc/report/report_dc.py
+++ b/deltatech_dc/report/report_dc.py
@@ -127,7 +127,7 @@ def _get_report_values(self, docids, data=None):
 
         product_with_lots = self.env["product.product"]
         for picking in pickings:
-            for move in picking.move_lines:
+            for move in picking.move_ids:
                 for move_line in move.move_line_ids:
                     lot = move_line.lot_id
                     if not lot:
diff --git a/deltatech_dc/views/deltatech_dc_report.xml b/deltatech_dc/views/deltatech_dc_report.xml
index d5bba6dbc2..04d349193d 100644
--- a/deltatech_dc/views/deltatech_dc_report.xml
+++ b/deltatech_dc/views/deltatech_dc_report.xml
@@ -54,6 +54,18 @@
 
         </record>
 
+        <record id="action_report_dc_picking_form_2" model="ir.actions.report">
+            <field name="name">Declaration of Conformity 2</field>
+            <field name="model">stock.picking</field>
+            <field name="report_type">qweb-pdf</field>
+            <field name="report_name">deltatech_dc.report_dc_form_2</field>
+            <field name="report_file">deltatech_dc.report_dc_form_2</field>
+            <field name="binding_type">report</field>
+             <field name="binding_view_types">form</field>
+           <field name="binding_model_id" ref="stock.model_stock_picking" />
+
+        </record>
+
 
 
 </odoo>
diff --git a/deltatech_dc/views/report_dc_second_form.xml b/deltatech_dc/views/report_dc_second_form.xml
new file mode 100644
index 0000000000..c944993a73
--- /dev/null
+++ b/deltatech_dc/views/report_dc_second_form.xml
@@ -0,0 +1,156 @@
+<?xml version="1.0" ?>
+<odoo>
+    <!-- Define the report template -->
+    <template id="report_dc_form_2">
+
+        <!-- Call the basic layout template -->
+        <t t-call="web.basic_layout">
+            <t t-foreach="docs" t-as="o">
+                <style>
+                    .small {
+                    font-size: 10px;
+                    line-height: 1.2; /* Adjust this value to make the space between lines smaller */
+                    }
+                </style>
+                <strong t-field="o.company_id.partner_id.name" />
+                <h4>
+                    <span>Declaration of Conformity:</span>
+                </h4>
+                <br />
+                <br />
+
+                <br />
+
+                <br />
+
+                <br />
+
+                <br />
+
+                <span>
+                    Registration Nr.
+                </span>
+                <br />
+                <br />
+                <span>
+                    We,&#160;<span t-field="o.company_id.partner_id.name" />, with headquarters in
+                    <span t-field="o.company_id.partner_id.city" />
+                    ,<span t-field="o.company_id.partner_id.street" />,
+                    <span t-field="o.company_id.state_id.name" />
+                    county, work point located in
+                    <span t-field="o.picking_type_id.warehouse_id.partner_id.street" />
+                    ,
+                    <span t-field="o.picking_type_id.warehouse_id.partner_id.city" />,
+                    <span t-field="o.picking_type_id.warehouse_id.partner_id.state_id.name" />
+                    county, VAT:&#160;<span t-field="o.picking_type_id.warehouse_id.partner_id.vat" />, NRC:&#160;<span
+                        t-field="o.picking_type_id.warehouse_id.partner_id.nrc"
+                    />; we declare, ensure and guarantee on our
+                    own
+                    responsibility that the products delivered to the customer, according to the invoice/notice no.
+                    <span t-field="o.name" />, do not endanger the life, health and safety of consumers and comply with
+                    the
+                    internal technical specifications of the products and with the sanitary-veterinary legislation and
+                    for food safety in force. We guarantee the quality of the products provided that the storage and
+                    transport parameters specified in the table and on the packaging are respected.
+                </span>
+
+                <br />
+                <br />
+                <strong>Sale Order:
+                    <span t-field="o.sale_id.client_order_ref" />
+                    from<span t-field="o.sale_id.date_order" t-options='{"widget": "date"}' />,
+                    <span t-field="o.sale_id.partner_id.display_name" />
+                </strong>
+                <table class="table-bordered" style="width: 100%;">
+                    <thead>
+                        <tr>
+                            <th
+                                style="background-color:#e0e0e0; font-weight:bold; text-align: center; vertical-align: middle;"
+                            >
+                                Nr.
+                            </th>
+                            <th
+                                style="background-color:#e0e0e0; font-weight:bold; text-align: center; vertical-align: middle;"
+                            >
+                                Name of products and services
+                            </th>
+                            <th
+                                style="background-color:#e0e0e0; font-weight:bold; text-align: center; vertical-align: middle;"
+                            >
+                                Quantity
+                            </th>
+                            <th
+                                style="background-color:#e0e0e0; font-weight:bold; text-align: center; vertical-align: middle;"
+                            >
+                                Lot Number
+                            </th>
+                            <th
+                                style="background-color:#e0e0e0; font-weight:bold; text-align: center; vertical-align: middle;"
+                            >
+                                Expiration Date
+                            </th>
+                            <th
+                                style="background-color:#e0e0e0; font-weight:bold; text-align: center; vertical-align: middle;"
+                            >
+                                Storage Conditions
+                            </th>
+                        </tr>
+                    </thead>
+                    <t t-set="counter" t-value="0" />
+
+                    <t t-foreach="o.move_ids" t-as="move">
+                        <t t-set="counter" t-value="counter + 1" />
+
+                        <tr>
+                            <td>
+                                <strong t-esc="counter" />
+                            </td>
+
+                            <td>
+                                <strong t-esc="move.product_id.name" />
+                            </td>
+                            <td>
+                                <strong t-esc="move.quantity_done" />
+                            </td>
+
+                            <td>
+                                <t t-foreach="move.lot_ids" t-as="lot">
+                                    <strong t-esc="lot.name" />
+                                    <br />
+                                </t>
+                            </td>
+                            <td>
+                                <t t-foreach="move.lot_ids" t-as="lot">
+                                    <strong t-esc="lot.use_date" t-options='{"widget": "date"}' />
+                                    <br />
+                                </t>
+                            </td>
+                            <td>
+                                <strong t-esc="move.product_id.standards" />
+
+                            </td>
+                        </tr>
+
+
+                    </t>
+                </table>
+                <br />
+                <br />
+                <span>
+                    <strong>Responsible Person:</strong>
+                    <br />
+                    <br />
+                    <strong>Signature:</strong>
+                </span>
+                <div class="footer">
+                    <span class="small">
+                        The document belongs to the
+                        <span t-field="o.company_id.partner_id.name" />
+                        and cannot be made
+                        public without the council's approval.
+                    </span>
+                </div>
+            </t>
+        </t>
+    </template>
+</odoo>
diff --git a/deltatech_expenses/views/report_expenses.xml b/deltatech_expenses/views/report_expenses.xml
index 4b54bb6456..537b889a0f 100644
--- a/deltatech_expenses/views/report_expenses.xml
+++ b/deltatech_expenses/views/report_expenses.xml
@@ -50,8 +50,8 @@
                             <t t-if="o.total_diem">
                                 <div>
                                     Din care diurna <span t-field="o.days" /> * <span t-field="o.diem" /> = <span
-                                        t-field="o.total_diem"
-                                    />
+                                    t-field="o.total_diem"
+                                />
                                 </div>
                             </t>
                             <br />