Merge PR #1076 into 16.0

Signed-off-by feketemihai

l10n_ro_account_anaf_sync/security/ir.model.access.csv

@@ -4,3 +4,6 @@ access_l10n_ro_account_anaf_sync_invoice,l10n.ro.account.anaf.sync.invoice,model
 access_l10n_ro_account_anaf_sync_manager,l10n.ro.account.anaf.sync.manager,model_l10n_ro_account_anaf_sync,account.group_account_manager,1,1,1,1
 access_l10n_ro_account_anaf_sync_scope_user,l10n.ro.account.anaf.sync.scope.invoice,model_l10n_ro_account_anaf_sync_scope,account.group_account_invoice,1,0,0,0
 access_l10n_ro_account_anaf_sync_scope_manager,l10n.ro.account.anaf.sync.scope.manager,model_l10n_ro_account_anaf_sync_scope,account.group_account_manager,1,1,1,1
+access_l10n_ro_account_anaf_sync_scope_users,l10n.ro.account.anaf.sync.scope.invoice,model_l10n_ro_account_anaf_sync_scope,account.group_account_user,1,0,0,0
+access_l10n_ro_account_anaf_sync_scope_readonly,l10n.ro.account.anaf.sync.scope.invoice,model_l10n_ro_account_anaf_sync_scope,account.group_account_readonly,1,0,0,0
+access_l10n_ro_account_anaf_sync_readonly,l10n.ro.account.anaf.sync,model_l10n_ro_account_anaf_sync,account.group_account_readonly,1,0,0,0

l10n_ro_account_edi_ubl/__manifest__.py

@@ -21,7 +21,7 @@
         "views/cius_template.xml",
     ],
     "license": "AGPL-3",
-    "version": "16.0.1.66.0",
+    "version": "16.0.1.67.0",
     "author": "Terrabit," "NextERP Romania," "Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/l10n-romania",
     "installable": True,

l10n_ro_account_edi_ubl/models/account_edi_format.py

@@ -255,8 +255,6 @@ def _get_invoice_edi_content(self, move):
     def _l10n_ro_post_invoice_step_1(self, invoice, attachment):
         anaf_config = invoice.company_id._l10n_ro_get_anaf_sync(scope="e-factura")
         standard = "UBL"
-        if invoice.move_type in ("out_refund", "in_refund"):
-            standard = "CN"
         params = {
             "standard": standard,
             "cif": invoice.company_id.partner_id.vat.replace("RO", ""),

l10n_ro_account_edi_ubl/models/account_edi_xml_cius_ro.py

@@ -209,12 +209,22 @@ def _export_invoice_vals(self, invoice):
                 "accounting_supplier_party_vals"
             ]
             vals_list["vals"]["accounting_supplier_party_vals"] = customer_vals
-        if invoice.move_type in ("out_invoice", "in_invoice"):
-            vals_list["main_template"] = "account_edi_ubl_cii.ubl_20_Invoice"
-            vals_list["vals"]["invoice_type_code"] = 380
-        else:
-            vals_list["main_template"] = "account_edi_ubl_cii.ubl_20_CreditNote"
-            vals_list["vals"]["credit_note_type_code"] = 381
+
+        vals_list["main_template"] = "account_edi_ubl_cii.ubl_20_Invoice"
+        vals_list["vals"]["invoice_type_code"] = 380
+        if vals_list["vals"].get("credit_note_type_code"):
+            vals_list["vals"].pop("credit_note_type_code")
+        if (
+            invoice.move_type in ("in_invoice", "in_refund")
+            and invoice.journal_id.l10n_ro_sequence_type == "autoinv2"
+        ):
+            vals_list["vals"]["invoice_type_code"] = 389
+        point_of_sale = self.env["ir.module.module"].search(
+            [("name", "=", "point_of_sale"), ("state", "=", "installed")], limit=1
+        )
+        if point_of_sale:
+            if invoice.pos_order_ids:
+                vals_list["vals"]["invoice_type_code"] = 751
         return vals_list
 
     def _export_invoice_constraints(self, invoice, vals):

l10n_ro_account_edi_ubl/static/description/index.html

@@ -8,10 +8,11 @@
 
 /*
 :Author: David Goodger (goodger@python.org)
-:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
 :Copyright: This stylesheet has been placed in the public domain.
 
 Default cascading style sheet for the HTML output of Docutils.
+Despite the name, some widely supported CSS2 features are used.
 
 See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
 customize this style sheet.
@@ -274,7 +275,7 @@
   margin-left: 2em ;
   margin-right: 2em }
 
-pre.code .ln { color: grey; } /* line numbers */
+pre.code .ln { color: gray; } /* line numbers */
 pre.code, code { background-color: #eeeeee }
 pre.code .comment, code .comment { color: #5C6576 }
 pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
@@ -300,7 +301,7 @@
 span.pre {
   white-space: pre }
 
-span.problematic {
+span.problematic, pre.problematic {
   color: red }
 
 span.section-subtitle {
@@ -429,7 +430,9 @@ <h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
 <div class="section" id="maintainers">
 <h2><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h2>
 <p>This module is maintained by the OCA.</p>
-<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
+<a class="reference external image-reference" href="https://odoo-community.org">
+<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
+</a>
 <p>OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.</p>

l10n_ro_account_edi_ubl/tests/credit_note.xml

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8' ?>
-<CreditNote
-    xmlns="urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2"
+<Invoice
+    xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2"
     xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
     xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
 >
@@ -9,7 +9,7 @@
     <cbc:ProfileID>urn:fdc:peppol.eu:2017:poacc:billing:01:1.0</cbc:ProfileID>
     <cbc:ID>FBRAO2093</cbc:ID>
     <cbc:IssueDate>2022-09-01</cbc:IssueDate>
-    <cbc:CreditNoteTypeCode>381</cbc:CreditNoteTypeCode>
+    <cbc:InvoiceTypeCode>380</cbc:InvoiceTypeCode>
     <cbc:DocumentCurrencyCode>RON</cbc:DocumentCurrencyCode>
     <cbc:BuyerReference>SCOALA GIMNAZIALA COMUNA FOENI</cbc:BuyerReference>
     <cac:OrderReference>
@@ -111,9 +111,9 @@
         <cbc:PrepaidAmount currencyID="RON">0.00</cbc:PrepaidAmount>
         <cbc:PayableAmount currencyID="RON">11900.00</cbc:PayableAmount>
     </cac:LegalMonetaryTotal>
-    <cac:CreditNoteLine>
+    <cac:InvoiceLine>
         <cbc:ID>1</cbc:ID>
-        <cbc:CreditedQuantity unitCode="C62">5.0</cbc:CreditedQuantity>
+        <cbc:InvoicedQuantity unitCode="C62">5.0</cbc:InvoicedQuantity>
         <cbc:LineExtensionAmount currencyID="RON">5000.00</cbc:LineExtensionAmount>
         <cac:Item>
             <cbc:Description>[00000623] Bec P21/5W</cbc:Description>
@@ -133,10 +133,10 @@
             <cbc:PriceAmount currencyID="RON">1000.0</cbc:PriceAmount>
             <cbc:BaseQuantity unitCode="C62">1.0</cbc:BaseQuantity>
         </cac:Price>
-    </cac:CreditNoteLine>
-    <cac:CreditNoteLine>
+    </cac:InvoiceLine>
+    <cac:InvoiceLine>
         <cbc:ID>2</cbc:ID>
-        <cbc:CreditedQuantity unitCode="C62">5.0</cbc:CreditedQuantity>
+        <cbc:InvoicedQuantity unitCode="C62">5.0</cbc:InvoicedQuantity>
         <cbc:LineExtensionAmount currencyID="RON">5000.00</cbc:LineExtensionAmount>
         <cac:Item>
             <cbc:Description>[00000624] Bec P21/10W</cbc:Description>
@@ -156,5 +156,5 @@
             <cbc:PriceAmount currencyID="RON">1000.0</cbc:PriceAmount>
             <cbc:BaseQuantity unitCode="C62">1.0</cbc:BaseQuantity>
         </cac:Price>
-    </cac:CreditNoteLine>
-</CreditNote>
+    </cac:InvoiceLine>
+</Invoice>

l10n_ro_account_edi_ubl/tests/credit_note_in.xml

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8' ?>
-<CreditNote
-    xmlns="urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2"
+<Invoice
+    xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2"
     xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
     xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
 >
@@ -9,7 +9,7 @@
     <cbc:ProfileID>urn:fdc:peppol.eu:2017:poacc:billing:01:1.0</cbc:ProfileID>
     <cbc:ID>FBRAO2095</cbc:ID>
     <cbc:IssueDate>2022-09-01</cbc:IssueDate>
-    <cbc:CreditNoteTypeCode>381</cbc:CreditNoteTypeCode>
+    <cbc:InvoiceTypeCode>389</cbc:InvoiceTypeCode>
     <cbc:DocumentCurrencyCode>RON</cbc:DocumentCurrencyCode>
     <cbc:BuyerReference>SCOALA GIMNAZIALA COMUNA FOENI</cbc:BuyerReference>
     <cac:OrderReference>
@@ -111,9 +111,9 @@
         <cbc:PrepaidAmount currencyID="RON">0.00</cbc:PrepaidAmount>
         <cbc:PayableAmount currencyID="RON">11900.00</cbc:PayableAmount>
     </cac:LegalMonetaryTotal>
-    <cac:CreditNoteLine>
+    <cac:InvoiceLine>
         <cbc:ID>1</cbc:ID>
-        <cbc:CreditedQuantity unitCode="C62">5.0</cbc:CreditedQuantity>
+        <cbc:InvoicedQuantity unitCode="C62">5.0</cbc:InvoicedQuantity>
         <cbc:LineExtensionAmount currencyID="RON">5000.00</cbc:LineExtensionAmount>
         <cac:Item>
             <cbc:Description>[00000623] Bec P21/5W</cbc:Description>
@@ -133,10 +133,10 @@
             <cbc:PriceAmount currencyID="RON">1000.0</cbc:PriceAmount>
             <cbc:BaseQuantity unitCode="C62">1.0</cbc:BaseQuantity>
         </cac:Price>
-    </cac:CreditNoteLine>
-    <cac:CreditNoteLine>
+    </cac:InvoiceLine>
+    <cac:InvoiceLine>
         <cbc:ID>2</cbc:ID>
-        <cbc:CreditedQuantity unitCode="C62">5.0</cbc:CreditedQuantity>
+        <cbc:InvoicedQuantity unitCode="C62">5.0</cbc:InvoicedQuantity>
         <cbc:LineExtensionAmount currencyID="RON">5000.00</cbc:LineExtensionAmount>
         <cac:Item>
             <cbc:Description>[00000624] Bec P21/10W</cbc:Description>
@@ -156,5 +156,5 @@
             <cbc:PriceAmount currencyID="RON">1000.0</cbc:PriceAmount>
             <cbc:BaseQuantity unitCode="C62">1.0</cbc:BaseQuantity>
         </cac:Price>
-    </cac:CreditNoteLine>
-</CreditNote>
+    </cac:InvoiceLine>
+</Invoice>

l10n_ro_account_edi_ubl/tests/credit_note_in_option.xml

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8' ?>
-<CreditNote
-    xmlns="urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2"
+<Invoice
+    xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2"
     xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
     xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
 >
@@ -9,7 +9,7 @@
     <cbc:ProfileID>urn:fdc:peppol.eu:2017:poacc:billing:01:1.0</cbc:ProfileID>
     <cbc:ID>FBRAO2095</cbc:ID>
     <cbc:IssueDate>2022-09-01</cbc:IssueDate>
-    <cbc:CreditNoteTypeCode>381</cbc:CreditNoteTypeCode>
+    <cbc:InvoiceTypeCode>389</cbc:InvoiceTypeCode>
     <cbc:DocumentCurrencyCode>RON</cbc:DocumentCurrencyCode>
     <cbc:BuyerReference>SCOALA GIMNAZIALA COMUNA FOENI</cbc:BuyerReference>
     <cac:OrderReference>
@@ -111,9 +111,9 @@
         <cbc:PrepaidAmount currencyID="RON">0.00</cbc:PrepaidAmount>
         <cbc:PayableAmount currencyID="RON">-11900.00</cbc:PayableAmount>
     </cac:LegalMonetaryTotal>
-    <cac:CreditNoteLine>
+    <cac:InvoiceLine>
         <cbc:ID>1</cbc:ID>
-        <cbc:CreditedQuantity unitCode="C62">-5.0</cbc:CreditedQuantity>
+        <cbc:InvoicedQuantity unitCode="C62">-5.0</cbc:InvoicedQuantity>
         <cbc:LineExtensionAmount currencyID="RON">-5000.00</cbc:LineExtensionAmount>
         <cac:Item>
             <cbc:Description>[00000623] Bec P21/5W</cbc:Description>
@@ -133,10 +133,10 @@
             <cbc:PriceAmount currencyID="RON">1000.0</cbc:PriceAmount>
             <cbc:BaseQuantity unitCode="C62">1.0</cbc:BaseQuantity>
         </cac:Price>
-    </cac:CreditNoteLine>
-    <cac:CreditNoteLine>
+    </cac:InvoiceLine>
+    <cac:InvoiceLine>
         <cbc:ID>2</cbc:ID>
-        <cbc:CreditedQuantity unitCode="C62">-5.0</cbc:CreditedQuantity>
+        <cbc:InvoicedQuantity unitCode="C62">-5.0</cbc:InvoicedQuantity>
         <cbc:LineExtensionAmount currencyID="RON">-5000.00</cbc:LineExtensionAmount>
         <cac:Item>
             <cbc:Description>[00000624] Bec P21/10W</cbc:Description>
@@ -156,5 +156,5 @@
             <cbc:PriceAmount currencyID="RON">1000.0</cbc:PriceAmount>
             <cbc:BaseQuantity unitCode="C62">1.0</cbc:BaseQuantity>
         </cac:Price>
-    </cac:CreditNoteLine>
-</CreditNote>
+    </cac:InvoiceLine>
+</Invoice>

l10n_ro_account_edi_ubl/tests/credit_note_option.xml

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8' ?>
-<CreditNote
-    xmlns="urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2"
+<Invoice
+    xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2"
     xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
     xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
 >
@@ -9,7 +9,7 @@
     <cbc:ProfileID>urn:fdc:peppol.eu:2017:poacc:billing:01:1.0</cbc:ProfileID>
     <cbc:ID>FBRAO2093</cbc:ID>
     <cbc:IssueDate>2022-09-01</cbc:IssueDate>
-    <cbc:CreditNoteTypeCode>381</cbc:CreditNoteTypeCode>
+    <cbc:InvoiceTypeCode>380</cbc:InvoiceTypeCode>
     <cbc:DocumentCurrencyCode>RON</cbc:DocumentCurrencyCode>
     <cbc:BuyerReference>SCOALA GIMNAZIALA COMUNA FOENI</cbc:BuyerReference>
     <cac:OrderReference>
@@ -111,9 +111,9 @@
         <cbc:PrepaidAmount currencyID="RON">0.00</cbc:PrepaidAmount>
         <cbc:PayableAmount currencyID="RON">-11900.00</cbc:PayableAmount>
     </cac:LegalMonetaryTotal>
-    <cac:CreditNoteLine>
+    <cac:InvoiceLine>
         <cbc:ID>1</cbc:ID>
-        <cbc:CreditedQuantity unitCode="C62">-5.0</cbc:CreditedQuantity>
+        <cbc:InvoicedQuantity unitCode="C62">-5.0</cbc:InvoicedQuantity>
         <cbc:LineExtensionAmount currencyID="RON">-5000.00</cbc:LineExtensionAmount>
         <cac:Item>
             <cbc:Description>[00000623] Bec P21/5W</cbc:Description>
@@ -133,10 +133,10 @@
             <cbc:PriceAmount currencyID="RON">1000.0</cbc:PriceAmount>
             <cbc:BaseQuantity unitCode="C62">1.0</cbc:BaseQuantity>
         </cac:Price>
-    </cac:CreditNoteLine>
-    <cac:CreditNoteLine>
+    </cac:InvoiceLine>
+    <cac:InvoiceLine>
         <cbc:ID>2</cbc:ID>
-        <cbc:CreditedQuantity unitCode="C62">-5.0</cbc:CreditedQuantity>
+        <cbc:InvoicedQuantity unitCode="C62">-5.0</cbc:InvoicedQuantity>
         <cbc:LineExtensionAmount currencyID="RON">-5000.00</cbc:LineExtensionAmount>
         <cac:Item>
             <cbc:Description>[00000624] Bec P21/10W</cbc:Description>
@@ -156,5 +156,5 @@
             <cbc:PriceAmount currencyID="RON">1000.0</cbc:PriceAmount>
             <cbc:BaseQuantity unitCode="C62">1.0</cbc:BaseQuantity>
         </cac:Price>
-    </cac:CreditNoteLine>
-</CreditNote>
+    </cac:InvoiceLine>
+</Invoice>

l10n_ro_account_edi_ubl/tests/invoice_in.xml

@@ -10,7 +10,7 @@
     <cbc:ID>FBRAO2094</cbc:ID>
     <cbc:IssueDate>2022-09-01</cbc:IssueDate>
     <cbc:DueDate>2022-09-01</cbc:DueDate>
-    <cbc:InvoiceTypeCode>380</cbc:InvoiceTypeCode>
+    <cbc:InvoiceTypeCode>389</cbc:InvoiceTypeCode>
     <cbc:DocumentCurrencyCode>RON</cbc:DocumentCurrencyCode>
     <cbc:BuyerReference>SCOALA GIMNAZIALA COMUNA FOENI</cbc:BuyerReference>
     <cac:OrderReference>

l10n_ro_account_edi_ubl/views/cius_template.xml

@@ -8,37 +8,30 @@
                 xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2"
                 xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
                 xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
-                t-if="invoice.move_type in ('out_refund', 'in_invoice')"
+                t-if="invoice.move_type in ('out_refund', 'in_invoice', 'in_refund')"
                 t-att="vals.get('invoice_type_code_attrs', {})"
                 t-out="vals.get('invoice_type_code')"
             />
-            <cbc:CreditNoteTypeCode
-                xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2"
-                xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
-                xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
-                t-if="invoice.move_type == 'in_refund'"
-                t-att="vals.get('invoice_type_code_attrs', {})"
-                t-out="vals.get('credit_note_type_code')"
-            />
         </xpath>
         <xpath
             expr="//*[local-name()='LegalMonetaryTotal']"
             position="after"
             xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
         >
             <t t-foreach="vals.get('invoice_line_vals', [])" t-as="foreach_vals">
-                <cac:InvoiceLine t-if="invoice.move_type == 'in_invoice'">
+                <cac:InvoiceLine
+                    t-if="invoice.move_type in ('in_invoice', 'in_refund', 'out_refund')"
+                >
                     <t t-call="{{InvoiceLineType_template}}">
                         <t t-set="vals" t-value="foreach_vals" />
                     </t>
                 </cac:InvoiceLine>
-                <cac:CreditNoteLine t-if="invoice.move_type == 'in_refund'">
-                    <t t-call="{{InvoiceLineType_template}}">
-                        <t t-set="vals" t-value="foreach_vals" />
-                    </t>
-                </cac:CreditNoteLine>
             </t>
         </xpath>
+        <!-- suprasciere sa nu mai puna credit note line -->
+        <xpath expr="//*[local-name()='CreditNoteLine']" position="attributes">
+            <attribute name="t-if">False</attribute>
+        </xpath>
         <xpath expr="//*[local-name()='IssueDate']" position="after">
             <cbc:DueDate
                 xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2"
@@ -75,18 +68,13 @@
         <xpath expr="//*[local-name()='InvoicedQuantity']" position="after">
             <cbc:InvoicedQuantity
                 xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
-                t-if="invoice.move_type == 'in_invoice'"
+                t-if="invoice.move_type in ('out_refund', 'in_invoice', 'in_refund')"
                 t-att="vals.get('invoiced_quantity_attrs', {})"
                 t-out="vals.get('invoiced_quantity')"
             />
         </xpath>
-        <xpath expr="//*[local-name()='CreditedQuantity']" position="after">
-            <cbc:CreditedQuantity
-                xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
-                t-if="invoice.move_type == 'in_refund'"
-                t-att="vals.get('invoiced_quantity_attrs', {})"
-                t-out="vals.get('invoiced_quantity')"
-            />
+        <xpath expr="//*[local-name()='CreditedQuantity']" position="attributes">
+            <attribute name="t-if">False</attribute>
         </xpath>
     </template>
 </odoo>

l10n_ro_message_spv/security/ir.model.access.csv

@@ -1,2 +1,3 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_l10n_ro_message_spv,access_l10n_ro_message_spv,model_l10n_ro_message_spv,account.group_account_user,1,1,1,1
+access_l10n_ro_message_spv_user,access_l10n_ro_message_spv,model_l10n_ro_message_spv,account.group_account_readonly,1,0,0,0