[16.0][IMP] l10n_be_cooperator: tax shelter report #112

victor-champonnois · 2024-02-09T16:19:32Z

Makes tax shelter attestation consistent with administration templates

internal task : https://gestion.coopiteasy.be/web#id=11176&action=475&active_id=524&model=project.task&view_type=form&menu_id=536

@huguesdk

victor-champonnois · 2024-02-09T17:13:17Z

@huguesdk not ready yet : I need to fix the tests

victor-champonnois · 2024-02-13T09:14:29Z

@huguesdk now ready for review.
Note : I was first tempted to remove the table with a recap of the shares in the certificates, since it is not legally required, and would greatly simplify the module.
But I wasn't sure if we wanted to do that, since this functionality may still be interesting. So I reverted the commit.
I leave you to decide :)
If we do it, I would have to remove some tests.

huguesdk

thanks @victor-champonnois for these useful improvements!

l10n_be_cooperator/models/tax_shelter_declaration.py

huguesdk · 2024-02-21T14:58:45Z

l10n_be_cooperator/models/tax_shelter_declaration.py

@@ -17,22 +17,23 @@ class TaxShelterDeclaration(models.Model):
    _description = "Tax Shelter Declaration"

    name = fields.Char(string="Declaration year", required=True)
-    fiscal_year = fields.Char(string="Fiscal year", required=True)


i agree with the changes that remove the string when it corresponds to the field name, but keep in mind that this will capitalize each word. this is what we want (standard odoo practice), but the translations need to be updated.

OK, the translations should be done after the merge with weblate I think.

as discussed, it is better that minor changes (capitalization, language mistakes) are dealt with by the developer directly, to avoid useless work for translators.

l10n_be_cooperator/README.rst

l10n_be_cooperator/models/tax_shelter_declaration.py

huguesdk · 2024-02-21T15:07:49Z

l10n_be_cooperator/models/tax_shelter_declaration.py

-        string="Tax Shelter percentage",
+    date_from = fields.Date(required=True)
+    date_to = fields.Date(required=True)
+    tax_shelter_report_type = fields.Selection(


a migration script is needed to set the value of this field.

huguesdk · 2024-02-21T15:10:12Z

l10n_be_cooperator/report/tax_shelter_report_templates.xml

+                        <span t-if="report_type=='scale_up'">14527</span>
+                        , CIR 92 sur les revenus


the comma should be just after </span>, otherwise a (hideous) space appears before the comma.

fixed (indeed, what's more hideous than a misplaced space...^^)

l10n_be_cooperator/report/tax_shelter_report_templates.xml

huguesdk · 2024-02-21T15:20:32Z

l10n_be_cooperator/report/tax_shelter_report_templates.xml

+                                    les conditions prévues aux § 1er et 2 de l'article 14527, CIR 92, sont respectées
+                                </span>
+                                <span t-if="report_type=='scale_up'">
+                                    les conditions prévues au § 3, alinéa 1er, de l’article 14526, CIR 92, sont respectées


aren’t the article numbers swapped here?

yes, nice catch !

l10n_be_cooperator/report/tax_shelter_report_templates.xml

victor-champonnois · 2024-02-22T10:58:16Z

@huguesdk thank you for the extensive review!

I added your requests
I removed the commits that removed the table, since the table is necessary and useful
I added a commit to remove the "capital before" and "capital after". These columns are not legally necessary, and some companies might not like it.
made the table format less weird (according to my own personal taste)

huguesdk

thanks, we’re almost there!

huguesdk · 2024-02-23T09:37:34Z

l10n_be_cooperator/migrations/16.0.1.1.0/pre-migration.py

+    if not openupgrade.column_exists(
+        env.cr, "tax_shelter_declaration", "tax_shelter_type"
+    ):


this test is not needed, and in fact, the dependency on openupgradelib is not necessary. a normal odoo migration script should do.

removed the test. I think I still need openupgrade for openupgrade.logged_query, it doesn't seem to work otherwise

if you declare the migrate function (without the openupgrade decorator) as:

def migrate(cr, version):

you can do:

cr.execute("some query")

huguesdk · 2024-02-23T09:39:33Z

l10n_be_cooperator/models/tax_shelter_declaration.py

@@ -17,22 +17,23 @@ class TaxShelterDeclaration(models.Model):
    _description = "Tax Shelter Declaration"

    name = fields.Char(string="Declaration year", required=True)
-    fiscal_year = fields.Char(string="Fiscal year", required=True)


as discussed, it is better that minor changes (capitalization, language mistakes) are dealt with by the developer directly, to avoid useless work for translators.

l10n_be_cooperator/models/tax_shelter_declaration.py

huguesdk · 2024-02-23T09:47:04Z

l10n_be_cooperator/models/tax_shelter_declaration.py

-        string="Tax Shelter percentage",
-        required=True,
+        compute="_compute_tax_shelter_percentage",
+        readonly=True,


great! i first thought that it would be better to have it as a simple string and stored, but i changed my mind and it is good like that:

no need to store it, at it is derived from the type, and there is a pre-migration script to set the values

having the labels directly in the field allows to handle the localization (spacing, using the percentage sign or not,…) once in the translation files instead of handling each case separately in the email templates and the reports.

readonly=True should be removed, as it is the default for computed fields.

i eventually changed it to float, to avoid repetition of the different cases while ensuring correct localization in case there are decimals.

If it is not stored, I get the warning tax.shelter.declaration: inconsistent 'compute_sudo' for computed fields: tax_shelter_percentage, tax_shelter_capital_limit , So I've put the store back

l10n_be_cooperator/migrations/16.0.1.1.0/pre-migration.py

l10n_be_cooperator/report/tax_shelter_report_templates.xml

victor-champonnois · 2024-02-26T13:48:24Z

@huguesdk

updated the po and pot files
updated the migration script (but kept the openupgrade dependency)
added store on tax shelter percentages because of a warning

huguesdk · 2024-02-26T14:13:45Z

l10n_be_cooperator/migrations/16.0.1.1.0/pre-migration.py

+    if not openupgrade.column_exists(
+        env.cr, "tax_shelter_declaration", "tax_shelter_type"
+    ):


if you declare the migrate function (without the openupgrade decorator) as:

def migrate(cr, version):

you can do:

cr.execute("some query")

victor-champonnois · 2024-02-26T15:44:56Z

@huguesdk done (although I don't see the query in the log, which is a bit sad)

victor-champonnois · 2024-03-06T10:03:30Z

@huguesdk can we merge this PR ? It would be nice to to have it ready for the next tax shelter period

huguesdk · 2024-03-06T16:35:26Z

@victor-champonnois i checked the text of the certificates and noticed that the list of requirements did not change according to the report type and the tax shelter type. i fixed this and did also some improvements in the report (change some wording, use t tags instead of span tags for conditions, improve indentation). i also added and improved some translations. please test on your side and tell me if you think it is ready.

edit: if ready, in addition to squashing commits, adding news fragments would be nice.

victor-champonnois · 2024-03-07T15:18:50Z

@huguesdk thanks for the change, I've tested and it looks OK. I've squashed all the commits, keeping the detail of what has been done in the commit message.

victor-champonnois · 2024-03-07T15:31:31Z

and I added a small newsfragment. Ready to merge !

Improve reports based on the templates provided by the administration: https://finances.belgium.be/fr/entreprises/tax-shelter-petites-entreprises/debutantes-start-up https://finances.belgium.be/fr/entreprises/tax-shelter-petites-entreprises/en-croissance-scale-up * simplify the layout and the text and make it consistent with the type of company (start-up/scale-up). * remove month_from and month_to; these fields are no longer used in the report, so they are not necessary anymore. * add roadmap for scaleup tax shelter report. * prettify the tax shelter report table. * add tax_shelter_type field (and script to prefill it). * set default capital limit based on tax shelter type. * update and improve translations. Co-authored-by: hugues de keyzer <odoo@hugues.info>

huguesdk

🎉 many thanks, @victor-champonnois!

huguesdk · 2024-03-08T09:27:30Z

/ocabot merge nobump

OCA-git-bot · 2024-03-08T09:27:42Z

This PR looks fantastic, let's merge it!
Prepared branch 16.0-ocabot-merge-pr-112-by-huguesdk-bump-nobump, awaiting test results.

OCA-git-bot · 2024-03-08T09:35:57Z

Congratulations, your PR was merged at 45edc78. Thanks a lot for contributing to OCA. ❤️

victor-champonnois force-pushed the 16.0-improve-tax-shelter-report branch 2 times, most recently from e806f5c to 823b5ad Compare February 9, 2024 16:36

victor-champonnois changed the title ~~[16.0][IMP] l10n_be_cooperator: tax shelter report~~ [WIP][16.0][IMP] l10n_be_cooperator: tax shelter report Feb 9, 2024

victor-champonnois marked this pull request as draft February 9, 2024 17:12

victor-champonnois force-pushed the 16.0-improve-tax-shelter-report branch from 823b5ad to 86c73d7 Compare February 13, 2024 09:04

victor-champonnois marked this pull request as ready for review February 13, 2024 09:14

victor-champonnois changed the title ~~[WIP][16.0][IMP] l10n_be_cooperator: tax shelter report~~ [16.0][IMP] l10n_be_cooperator: tax shelter report Feb 19, 2024

huguesdk requested changes Feb 21, 2024

View reviewed changes

victor-champonnois force-pushed the 16.0-improve-tax-shelter-report branch 2 times, most recently from 80abe58 to df4a97e Compare February 22, 2024 10:58

victor-champonnois force-pushed the 16.0-improve-tax-shelter-report branch 2 times, most recently from 418ffac to 4a3097d Compare February 23, 2024 10:45

huguesdk requested changes Feb 23, 2024

View reviewed changes

huguesdk requested changes Feb 26, 2024

View reviewed changes

victor-champonnois force-pushed the 16.0-improve-tax-shelter-report branch from 3c76cc1 to 1fad881 Compare February 26, 2024 14:45

huguesdk force-pushed the 16.0-improve-tax-shelter-report branch 2 times, most recently from c427fc5 to 9b07ce9 Compare March 6, 2024 16:30

victor-champonnois force-pushed the 16.0-improve-tax-shelter-report branch from 9b07ce9 to 218e987 Compare March 7, 2024 15:18

victor-champonnois force-pushed the 16.0-improve-tax-shelter-report branch from 218e987 to 80abfb2 Compare March 7, 2024 15:31

huguesdk force-pushed the 16.0-improve-tax-shelter-report branch from 80abfb2 to cfcf8da Compare March 8, 2024 09:22

huguesdk approved these changes Mar 8, 2024

View reviewed changes

OCA-git-bot added the bot is merging ⏳ label Mar 8, 2024

OCA-git-bot merged commit 5991eb2 into OCA:16.0 Mar 8, 2024
7 checks passed

OCA-git-bot added merged 🎉 and removed bot is merging ⏳ labels Mar 8, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[16.0][IMP] l10n_be_cooperator: tax shelter report #112

[16.0][IMP] l10n_be_cooperator: tax shelter report #112

victor-champonnois commented Feb 9, 2024

victor-champonnois commented Feb 9, 2024

victor-champonnois commented Feb 13, 2024 •

edited

Loading

huguesdk left a comment

huguesdk Feb 21, 2024

victor-champonnois Feb 22, 2024

huguesdk Feb 23, 2024

huguesdk Feb 21, 2024

huguesdk Feb 21, 2024

victor-champonnois Feb 22, 2024 •

edited

Loading

huguesdk Feb 21, 2024

victor-champonnois Feb 22, 2024

victor-champonnois commented Feb 22, 2024

huguesdk left a comment

huguesdk Feb 23, 2024

victor-champonnois Feb 26, 2024

huguesdk Feb 26, 2024

huguesdk Feb 23, 2024

huguesdk Feb 23, 2024

huguesdk Feb 23, 2024

victor-champonnois Feb 26, 2024

victor-champonnois commented Feb 26, 2024

huguesdk Feb 26, 2024

victor-champonnois commented Feb 26, 2024

victor-champonnois commented Mar 6, 2024

huguesdk commented Mar 6, 2024 •

edited

Loading

victor-champonnois commented Mar 7, 2024

victor-champonnois commented Mar 7, 2024

huguesdk left a comment

huguesdk commented Mar 8, 2024

OCA-git-bot commented Mar 8, 2024

OCA-git-bot commented Mar 8, 2024

		<span t-if="report_type=='scale_up'">14527</span>
		, CIR 92 sur les revenus

[16.0][IMP] l10n_be_cooperator: tax shelter report #112

[16.0][IMP] l10n_be_cooperator: tax shelter report #112

Conversation

victor-champonnois commented Feb 9, 2024

victor-champonnois commented Feb 9, 2024

victor-champonnois commented Feb 13, 2024 • edited Loading

huguesdk left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

victor-champonnois Feb 22, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

victor-champonnois commented Feb 22, 2024

huguesdk left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

victor-champonnois commented Feb 26, 2024

Choose a reason for hiding this comment

victor-champonnois commented Feb 26, 2024

victor-champonnois commented Mar 6, 2024

huguesdk commented Mar 6, 2024 • edited Loading

victor-champonnois commented Mar 7, 2024

victor-champonnois commented Mar 7, 2024

huguesdk left a comment

Choose a reason for hiding this comment

huguesdk commented Mar 8, 2024

OCA-git-bot commented Mar 8, 2024

OCA-git-bot commented Mar 8, 2024

victor-champonnois commented Feb 13, 2024 •

edited

Loading

victor-champonnois Feb 22, 2024 •

edited

Loading

huguesdk commented Mar 6, 2024 •

edited

Loading