Merge PR #944 into 15.0

Signed-off-by dhongu
OCA · Apr 24, 2024 · 55f6aa3 · 55f6aa3
2 parents 72414be + cd78a0e
commit 55f6aa3
Show file tree

Hide file tree

Showing 29 changed files with 54 additions and 160 deletions.
diff --git a/l10n_ro_account_anaf_sync/i18n/ro.po b/l10n_ro_account_anaf_sync/i18n/ro.po
@@ -49,7 +49,7 @@ msgstr "Cont ANAF Sync"
 #. module: l10n_ro_account_anaf_sync
 #: model:ir.model,name:l10n_ro_account_anaf_sync.model_l10n_ro_account_anaf_sync_scope
 msgid "Account ANAF Sync Scope"
-msgstr ""
+msgstr "Cont ANAF Sync Scope"
 
 #. module: l10n_ro_account_anaf_sync
 #: model:ir.model.fields,field_description:l10n_ro_account_anaf_sync.field_l10n_ro_account_anaf_sync__message_needaction

diff --git a/l10n_ro_account_edi_ubl/README.rst b/l10n_ro_account_edi_ubl/README.rst
@@ -7,7 +7,7 @@ Romania - eFactura Account EDI UBL
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:0cb9a2d1b4ab4ffdf533d28f8ba9fd2f257966cf30b77412ee562eb9d3ad9bab
+   !! source digest: sha256:75dd668f5100ca5ece831aff89e7c3691ec7615dd9ece31dc80114a3d8d7d24f
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Mature-brightgreen.png

diff --git a/l10n_ro_account_edi_ubl/__init__.py b/l10n_ro_account_edi_ubl/__init__.py
@@ -2,4 +2,3 @@
 # See README.rst file on addons root folder for license details
 
 from . import models
-from .init_hook import pre_init_hook
diff --git a/l10n_ro_account_edi_ubl/__manifest__.py b/l10n_ro_account_edi_ubl/__manifest__.py
@@ -16,7 +16,6 @@
         "views/res_config_settings_views.xml",
         "views/account_invoice.xml",
         "views/product_view.xml",
-        "views/res_partner_view.xml",
         "views/cius_template.xml",
     ],
     "license": "AGPL-3",
@@ -25,6 +24,5 @@
     "website": "https://github.com/OCA/l10n-romania",
     "installable": True,
     "development_status": "Mature",
-    "pre_init_hook": "pre_init_hook",
     "maintainers": ["dhongu", "feketemihai"],
 }
diff --git a/l10n_ro_account_edi_ubl/i18n/l10n_ro_account_edi_ubl.pot b/l10n_ro_account_edi_ubl/i18n/l10n_ro_account_edi_ubl.pot
@@ -63,13 +63,7 @@ msgstr ""
 msgid "CIUS RO"
 msgstr ""
 
-#. module: l10n_ro_account_edi_ubl
-#: model:ir.model.fields,help:l10n_ro_account_edi_ubl.field_res_partner__l10n_ro_is_government_institution
-#: model:ir.model.fields,help:l10n_ro_account_edi_ubl.field_res_users__l10n_ro_is_government_institution
-msgid ""
-"Check this if the partner is a government institution.Will be used to "
-"calculate the sending of the invoice to the e-invoice system."
-msgstr ""
+
 
 #. module: l10n_ro_account_edi_ubl
 #: model:ir.model,name:l10n_ro_account_edi_ubl.model_res_company
@@ -307,11 +301,7 @@ msgstr ""
 msgid "Residence"
 msgstr ""
 
-#. module: l10n_ro_account_edi_ubl
-#: model:ir.model.fields,field_description:l10n_ro_account_edi_ubl.field_res_partner__l10n_ro_is_government_institution
-#: model:ir.model.fields,field_description:l10n_ro_account_edi_ubl.field_res_users__l10n_ro_is_government_institution
-msgid "Romania - Is government institution"
-msgstr ""
+
 
 #. module: l10n_ro_account_edi_ubl
 #: model:ir.model.fields,field_description:l10n_ro_account_edi_ubl.field_product_product__l10n_ro_nc_code

diff --git a/l10n_ro_account_edi_ubl/i18n/ro.po b/l10n_ro_account_edi_ubl/i18n/ro.po
@@ -62,15 +62,6 @@ msgstr ""
 msgid "CIUS RO"
 msgstr "CIUS RO"
 
-#. module: l10n_ro_account_edi_ubl
-#: model:ir.model.fields,help:l10n_ro_account_edi_ubl.field_res_partner__l10n_ro_is_government_institution
-#: model:ir.model.fields,help:l10n_ro_account_edi_ubl.field_res_users__l10n_ro_is_government_institution
-msgid ""
-"Check this if the partner is a government institution.Will be used to "
-"calculate the sending of the invoice to the e-invoice system."
-msgstr ""
-"Bifa dacă partenerul este o instituție guvernamentală. Va fi folosit pentru "
-"a calcula trimiterea facturii către sistemul de facturi electronice."
 
 #. module: l10n_ro_account_edi_ubl
 #: model:ir.model,name:l10n_ro_account_edi_ubl.model_res_company
@@ -311,11 +302,6 @@ msgstr ""
 msgid "Residence"
 msgstr ""
 
-#. module: l10n_ro_account_edi_ubl
-#: model:ir.model.fields,field_description:l10n_ro_account_edi_ubl.field_res_partner__l10n_ro_is_government_institution
-#: model:ir.model.fields,field_description:l10n_ro_account_edi_ubl.field_res_users__l10n_ro_is_government_institution
-msgid "Romania - Is government institution"
-msgstr "Este o instituție guvernamentală"
 
 #. module: l10n_ro_account_edi_ubl
 #: model:ir.model.fields,field_description:l10n_ro_account_edi_ubl.field_product_product__l10n_ro_nc_code

diff --git a/l10n_ro_account_edi_ubl/init_hook.py b/l10n_ro_account_edi_ubl/init_hook.py
diff --git a/l10n_ro_account_edi_ubl/models/__init__.py b/l10n_ro_account_edi_ubl/models/__init__.py
@@ -5,5 +5,4 @@
 from . import product
 from . import res_company
 from . import res_config_settings
-from . import res_partner
 from . import l10n_ro_account_anaf_sync_scope
diff --git a/l10n_ro_account_edi_ubl/models/res_partner.py b/l10n_ro_account_edi_ubl/models/res_partner.py
diff --git a/l10n_ro_account_edi_ubl/static/description/index.html b/l10n_ro_account_edi_ubl/static/description/index.html
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
@@ -8,10 +9,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 +276,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 +302,7 @@
 span.pre {
   white-space: pre }
 
-span.problematic {
+span.problematic, pre.problematic {
   color: red }
 
 span.section-subtitle {
@@ -366,7 +368,7 @@ <h1 class="title">Romania - eFactura Account EDI UBL</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:0cb9a2d1b4ab4ffdf533d28f8ba9fd2f257966cf30b77412ee562eb9d3ad9bab
+!! source digest: sha256:75dd668f5100ca5ece831aff89e7c3691ec7615dd9ece31dc80114a3d8d7d24f
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Mature" src="https://img.shields.io/badge/maturity-Mature-brightgreen.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/l10n-romania/tree/15.0/l10n_ro_account_edi_ubl"><img alt="OCA/l10n-romania" src="https://img.shields.io/badge/github-OCA%2Fl10n--romania-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/l10n-romania-15-0/l10n-romania-15-0-l10n_ro_account_edi_ubl"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/l10n-romania&amp;target_branch=15.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>The module will generate E-Invoice XML files according to ANAF E-Invoicing service.</p>
@@ -429,7 +431,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>

diff --git a/l10n_ro_account_edi_ubl/tests/common_data_setup.py b/l10n_ro_account_edi_ubl/tests/common_data_setup.py
@@ -73,16 +73,12 @@ def setUpClass(cls):
                 "state_id": cls.country_state.id,
                 "zip": "307175",
                 "phone": "0256413409",
-                "l10n_ro_e_invoice": True,
-                "l10n_ro_is_government_institution": False,
                 "is_company": True,
             }
         )
         if "street_name" in cls.partner._fields:
             cls.partner.write({"street_name": "Nr. 383", "street": "Foeni Nr. 383"})
 
-        cls.partner.l10n_ro_is_government_institution = True
-
         # Set up products
         uom_id = cls.env.ref("uom.product_uom_unit").id
         cls.product_a = cls.env["product.product"].create(

diff --git a/l10n_ro_account_edi_ubl/views/account_invoice.xml b/l10n_ro_account_edi_ubl/views/account_invoice.xml
@@ -6,15 +6,7 @@
         <field name="type">form</field>
         <field name="inherit_id" ref="account.view_move_form" />
         <field name="arch" type="xml">
-            <button name="button_draft" position="after">
-                <button
-                    type="object"
-                    name="attach_ubl_xml_file_button"
-                    string="eFactura"
-                    help="Attach the UBL XML file to the invoice"
-                    states="posted"
-                />
-            </button>
+
             <xpath expr="//div[@name='journal_div']" position="after">
                 <label
                     for="l10n_ro_edi_transaction"
@@ -34,11 +26,11 @@
                 <label
                     for="l10n_ro_edi_download"
                     string="ID eFactura"
-                    attrs="{'invisible': ['|', ('l10n_ro_edi_download', '=', False), ('state', '=', 'draft'), ('move_type', 'in', ['out_invoice','out_refund'])]}"
+                    attrs="{'invisible': ['|', '&amp;',  ('state', '=', 'draft'), ('move_type', 'in', ['out_invoice','out_refund']), ('move_type', '=', 'entry') ]}"
                 />
                 <div
                     name="l10n_ro_edi_download"
-                    attrs="{'invisible': ['|', ('l10n_ro_edi_download', '=', False), ('state', '=', 'draft'), ('move_type', 'in', ['out_invoice','out_refund'])]}"
+                    attrs="{'invisible': ['|', '&amp;',  ('state', '=', 'draft'), ('move_type', 'in', ['out_invoice','out_refund']), ('move_type', '=', 'entry') ]}"
                     class="o_row"
                 >
                     <field
@@ -48,7 +40,7 @@
                     <field name="l10n_ro_show_anaf_download_edi_buton" invisible="1" />
                     <button
                         type="object"
-                        class="oe_link badge bg-primary"
+                        class="oe_link badge btn-primary"
                         icon="fa-cloud-download"
                         string="Download from ANAF"
                         name="l10n_ro_download_zip_anaf"

diff --git a/l10n_ro_account_edi_ubl/views/res_partner_view.xml b/l10n_ro_account_edi_ubl/views/res_partner_view.xml
diff --git a/l10n_ro_config/README.rst b/l10n_ro_config/README.rst
@@ -7,7 +7,7 @@ Romania - Localization Config
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:f99662d774634bdfef75adea060d0983ec9767b1957f562c37a9eafa0f61e27b
+   !! source digest: sha256:0517a1aab6992c5505b1af00abdf23ba0d111bfa43551cdef63051803433b74b
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Mature-brightgreen.png

diff --git a/l10n_ro_config/__manifest__.py b/l10n_ro_config/__manifest__.py
@@ -6,7 +6,7 @@
     "name": "Romania - Localization Config",
     "summary": "Romania - Localization Install and Config Applications",
     "license": "AGPL-3",
-    "version": "15.0.2.13.0",
+    "version": "15.0.2.13.1",
     "author": "NextERP Romania,"
     "Forest and Biomass Romania,"
     "Odoo Community Association (OCA)",

diff --git a/l10n_ro_config/i18n/l10n_ro_config.pot b/l10n_ro_config/i18n/l10n_ro_config.pot
@@ -456,11 +456,6 @@ msgstr ""
 msgid "Romania - Default Services Sale Tax"
 msgstr ""
 
-#. module: l10n_ro_config
-#: model:ir.model.fields,field_description:l10n_ro_config.field_res_partner__l10n_ro_e_invoice
-#: model:ir.model.fields,field_description:l10n_ro_config.field_res_users__l10n_ro_e_invoice
-msgid "Romania - E-Invoicing"
-msgstr ""
 
 #. module: l10n_ro_config
 #: model:ir.model.fields,field_description:l10n_ro_config.field_res_company__l10n_ro_property_inverse_taxation_position_id

diff --git a/l10n_ro_config/i18n/ro.po b/l10n_ro_config/i18n/ro.po
@@ -504,11 +504,7 @@ msgstr "Taxa implicită de achiziție pentru servicii"
 msgid "Romania - Default Services Sale Tax"
 msgstr "Taxa implicită de vânzare pentru servicii"
 
-#. module: l10n_ro_config
-#: model:ir.model.fields,field_description:l10n_ro_config.field_res_partner__l10n_ro_e_invoice
-#: model:ir.model.fields,field_description:l10n_ro_config.field_res_users__l10n_ro_e_invoice
-msgid "Romania - E-Invoicing"
-msgstr "E-Factura"
+
 
 #. module: l10n_ro_config
 #: model:ir.model.fields,field_description:l10n_ro_config.field_res_company__l10n_ro_property_inverse_taxation_position_id

diff --git a/l10n_ro_config/models/res_partner.py b/l10n_ro_config/models/res_partner.py
@@ -18,7 +18,6 @@ class ResPartner(models.Model):
         readonly=False,
     )
     l10n_ro_caen_code = fields.Char(string="Romania - CAEN Code", default="0000")
-    l10n_ro_e_invoice = fields.Boolean(string="Romania - E-Invoicing", copy=False)
 
     @api.depends("vat")
     def _compute_l10n_ro_vat_number(self):

diff --git a/l10n_ro_config/static/description/index.html b/l10n_ro_config/static/description/index.html
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
@@ -8,10 +9,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 +276,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 +302,7 @@
 span.pre {
   white-space: pre }
 
-span.problematic {
+span.problematic, pre.problematic {
   color: red }
 
 span.section-subtitle {
@@ -366,7 +368,7 @@ <h1 class="title">Romania - Localization Config</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:f99662d774634bdfef75adea060d0983ec9767b1957f562c37a9eafa0f61e27b
+!! source digest: sha256:0517a1aab6992c5505b1af00abdf23ba0d111bfa43551cdef63051803433b74b
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Mature" src="https://img.shields.io/badge/maturity-Mature-brightgreen.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/l10n-romania/tree/15.0/l10n_ro_config"><img alt="OCA/l10n-romania" src="https://img.shields.io/badge/github-OCA%2Fl10n--romania-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/l10n-romania-15-0/l10n-romania-15-0-l10n_ro_config"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/l10n-romania&amp;target_branch=15.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module allows you to install and configure all the localization modules related to Romania.
@@ -469,7 +471,9 @@ <h2><a class="toc-backref" href="#toc-entry-10">Contributors</a></h2>
 <div class="section" id="maintainers">
 <h2><a class="toc-backref" href="#toc-entry-11">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>