diff --git a/l10n_fr_intrastat_service/README.rst b/l10n_fr_intrastat_service/README.rst index 9ed2dc9b7..7d83c0b7b 100644 --- a/l10n_fr_intrastat_service/README.rst +++ b/l10n_fr_intrastat_service/README.rst @@ -17,13 +17,13 @@ DES :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fl10n--france-lightgray.png?logo=github - :target: https://github.com/OCA/l10n-france/tree/17.0/l10n_fr_intrastat_service + :target: https://github.com/OCA/l10n-france/tree/18.0/l10n_fr_intrastat_service :alt: OCA/l10n-france .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/l10n-france-17-0/l10n-france-17-0-l10n_fr_intrastat_service + :target: https://translation.odoo-community.org/projects/l10n-france-18-0/l10n-france-18-0-l10n_fr_intrastat_service :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png - :target: https://runboat.odoo-community.org/builds?repo=OCA/l10n-france&target_branch=17.0 + :target: https://runboat.odoo-community.org/builds?repo=OCA/l10n-france&target_branch=18.0 :alt: Try me on Runboat |badge1| |badge2| |badge3| |badge4| |badge5| @@ -61,7 +61,7 @@ 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 `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -99,6 +99,6 @@ Current `maintainer `__: |maintainer-alexis-via| -This module is part of the `OCA/l10n-france `_ project on GitHub. +This module is part of the `OCA/l10n-france `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/l10n_fr_intrastat_service/data/mail_template.xml b/l10n_fr_intrastat_service/data/mail_template.xml index e0a587c95..a011cbfb6 100644 --- a/l10n_fr_intrastat_service/data/mail_template.xml +++ b/l10n_fr_intrastat_service/data/mail_template.xml @@ -5,7 +5,6 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). --> - DES Reminder DES {{object.year_month}} for {{object.company_id.name}} -
-

+

I would like to remind you that we are approaching the deadline for the DES declaration for month .

+ t-out="object.year_month" + />.

As there were no DES for that month in Odoo, a draft declaration has been generated automatically.

+ />
When trying to generate the DES lines, the following error was encountered:

@@ -36,38 +35,36 @@ When trying to generate the DES lines, the following error was encountered:


You should solve this error, then go to the menu Invoicing > Reporting > Intrastat > DES, open the declaration of month and click on the button Re-generate lines.

+ >Invoicing > Reporting > Intrastat > DES, open the declaration of month and click on the button Re-generate lines.

 This draft DES contains line(s) and the total amount is .

+ t-out="object.num_decl_lines" + /> line(s) and the total amount is .

 This draft DES generated automatically by Odoo doesn't contain any line.

 Go and check this declaration in the menu Invoicing > Reporting > Intrastat > DES.

+ >Invoicing > Reporting > Intrastat > DES.

-

--
Automatic e-mail sent by Odoo.

-
- - + + + diff --git a/l10n_fr_intrastat_service/models/intrastat_service.py b/l10n_fr_intrastat_service/models/intrastat_service.py index 15a184acb..7d9828ed1 100644 --- a/l10n_fr_intrastat_service/models/intrastat_service.py +++ b/l10n_fr_intrastat_service/models/intrastat_service.py @@ -138,7 +138,7 @@ def unlink(self): @api.depends("year_month") def _compute_display_name(self): for rec in self: - rec.display_name = "DES %s" % rec.year_month + rec.display_name = f"DES {rec.year_month}" def _prepare_domain(self): self.ensure_one() @@ -343,7 +343,7 @@ def generate_xml(self): def _attach_xml_file(self, xml_bytes): self.ensure_one() - filename = "%s_des.xml" % self.year_month + filename = f"{self.year_month}_des.xml" attach = self.env["ir.attachment"].create( { "name": filename, diff --git a/l10n_fr_intrastat_service/report/report.xml b/l10n_fr_intrastat_service/report/report.xml index fc6ee7a41..b212dba4b 100644 --- a/l10n_fr_intrastat_service/report/report.xml +++ b/l10n_fr_intrastat_service/report/report.xml @@ -5,16 +5,12 @@ License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). --> - - - - DES Excel - l10n.fr.intrastat.service.declaration - xlsx - l10n_fr_intrastat_service.xlsx - l10n_fr_intrastat_service.xlsx - 'DES-' + object.year_month - - - + + DES Excel + l10n.fr.intrastat.service.declaration + xlsx + l10n_fr_intrastat_service.xlsx + l10n_fr_intrastat_service.xlsx + 'DES-' + object.year_month + diff --git a/l10n_fr_intrastat_service/static/description/index.html b/l10n_fr_intrastat_service/static/description/index.html index c27fb7c59..9f7e1a0df 100644 --- a/l10n_fr_intrastat_service/static/description/index.html +++ b/l10n_fr_intrastat_service/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 { @@ -368,7 +369,7 @@

DES

!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !! source digest: sha256:88a020a10a39c54ad851bca7365306527a860f6286ad2c1c87c8807aa2eaa7cf !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

Beta License: AGPL-3 OCA/l10n-france Translate me on Weblate Try me on Runboat

+

Beta License: AGPL-3 OCA/l10n-france Translate me on Weblate Try me on Runboat

This module adds support for the Déclaration Européenne des Services (DES) for France.

The DES declaration has been introduced on January 1st 2010 in France. @@ -405,7 +406,7 @@

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.

+feedback.

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

@@ -425,13 +426,15 @@

Contributors

Maintainers

This module is maintained by the OCA.

-Odoo Community Association + +Odoo Community Association +

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.

Current maintainer:

alexis-via

-

This module is part of the OCA/l10n-france project on GitHub.

+

This module is part of the OCA/l10n-france project on GitHub.

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.