[13.0][IMP] intrastat*: brexit support #179

victoralmau · 2022-06-14T08:24:34Z

Backport from 14.0: #163

Please @pedrobaeza can you review it?

luc-demeyer · 2022-06-14T10:30:40Z

@victoralmau
I had placed this action on my todo list but now it's done already, top !.

But there is something wrong with this PR:
Stack trace when I test it;:

File "/opt/odoo13/OCA/intrastat-extrastat/intrastat_product/models/intrastat_product_declaration.py", line 762, in action_gather
lines = self._gather_invoices()
File "/opt/odoo13/OCA/intrastat-extrastat/intrastat_product/models/intrastat_product_declaration.py", line 625, in _gather_invoices
partner_country = self._get_partner_country(inv_line, eu_countries)
File "/opt/odoo13/OCA/intrastat-extrastat/intrastat_product/models/intrastat_product_declaration.py", line 288, in _get_partner_country
self._format_line_note(inv_line, line_notes)
TypeError: _format_line_note() missing 1 required positional argument: 'line_notes'

The signature of the _format_line_note in 13.0 is:
def _format_line_note(self, line, line_nbr, line_notes):
In 14.0 this signature has changed to:
def _format_line_note(self, line, notedict, line_notes):

Backporting also the unit tests that we have in 14.0 would be great so that we detect such issues automatically.

intrastat_product/models/intrastat_product_declaration.py

victoralmau · 2022-06-15T06:55:54Z

Changes done and tests solved.

pedrobaeza

Squash commits

pedrobaeza · 2022-06-15T17:11:52Z

intrastat_product/models/account_move.py

+    product_origin_country_code = fields.Char(
+        string="Country of Origin of the Product",
+        size=2,
+        required=True,


What happen with existing lines not having this filled?

I think it is a strange behavior, but it is what was added in v14. In my opinion, this should be a compute store field. What do you think about this?

We should keep the changes at minimum to comply with the Brexit requirement

The product_origin_country_code field was added by the v14 PR to add the Brexit requirement (it is not country-related because it depends on the state).

You can change that field and make it a compute store, although it would be necessary to add a product_origin_state_id field as well (this would avoid overwriting the create() and write() of the account.move).
In any case, migration scripts will be necessary. Which way do you think is better?

pedrobaeza · 2022-06-15T17:12:49Z

intrastat_product/models/account_move.py

+        return super().write(vals)
+
+    def _format_vals(self, vals):
+        if "product_origin_country_code" in vals:


Why is this needed?

pedrobaeza · 2022-06-15T17:13:41Z

intrastat_product/models/intrastat_product_declaration.py

+        string="Country Code",
+        compute="_compute_src_dest_country_code",
+        store=True,
+        required=True,


The same for this.

pedrobaeza · 2022-06-15T17:13:54Z

intrastat_product/models/intrastat_product_declaration.py

+    product_origin_country_code = fields.Char(
+        string="Country of Origin of the Product",
+        size=2,
+        required=True,


I don't continue saying, but there's a lot of new required fields with the same problem.

intrastat_product/tests/common.py

[14.0]intrastat_product - Intrastat Brexit support fix unit tests - keep product_origin_country_id on top of new product_origin_country_code to avoid breaking the localisation modules [14.0]intrastat - improved brexit support [14.0]improved brexit support - keep backwards compatibility with localisation modules [14.0]brexit support - increase test coverage [14.0]brexit support - DeprecationWarning [14.0]brexit support - size=2 on product_origin_country_code

TT37486

luc-demeyer · 2022-06-17T13:48:20Z

Product Origin country code is XI, XU for brexit support.
This is a required field for the declaration.

victoralmau · 2022-07-21T16:08:16Z

Product Origin country code is XI, XU for brexit support. This is a required field for the declaration.

Ping @pedrobaeza

pedrobaeza · 2022-07-22T15:37:05Z

I don't remember what I have to check here, but please go on in the best way you think. There is also a "Requested changes" from @luc-demeyer. Is it attended?

victoralmau · 2022-08-09T06:48:32Z

I don't remember what I have to check here, but please go on in the best way you think. There is also a "Requested changes" from @luc-demeyer. Is it attended?

There was really nothing to validate (you asked if everything added since v14 was necessary). The changes proposed by @luc-demeyer have already been made so it would be ready to merge.

pedrobaeza · 2022-08-09T07:26:44Z

OK, let's merge it then:

/ocabot merge major

OCA-git-bot · 2022-08-09T07:27:00Z

Hey, thanks for contributing! Proceeding to merge this for you.
Prepared branch 13.0-ocabot-merge-pr-179-by-pedrobaeza-bump-major, awaiting test results.

OCA-git-bot · 2022-08-09T07:33:04Z

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

JordiBForgeFlow · 2022-08-09T09:02:52Z

@victoralmau @pedrobaeza buddies, where is the method '_compute_src_dest_country_code' https://github.com/OCA/intrastat-extrastat/pull/179/files#diff-74e1197466e3c9a2c08b006d373e86cca69ac389f34c9e4ed38dc24b84018d80R1000 defined??

JordiMForgeFlow · 2022-08-09T09:05:18Z

@victoralmau @pedrobaeza buddies, where is the method '_compute_src_dest_country_code' https://github.com/OCA/intrastat-extrastat/pull/179/files#diff-74e1197466e3c9a2c08b006d373e86cca69ac389f34c9e4ed38dc24b84018d80R1000 defined??

In V14 I don't see it being a computed field

intrastat-extrastat/intrastat_product/models/intrastat_product_declaration.py

Line 1086 in 5b43621

src_dest_country_code = fields.Char(

I think we need to BP this fix: 3d4e311

JordiBForgeFlow · 2022-08-09T09:08:38Z

@victoralmau please backport #174 ASAP

JordiBForgeFlow · 2022-08-09T09:09:33Z

@victoralmau please make sure that you review and backport all commits from 14.0

victoralmau · 2022-08-09T10:04:41Z

The missing change is now merged #188

JordiBForgeFlow · 2022-08-09T13:06:21Z

@victoralmau thanks!!

victoralmau force-pushed the 13.0-intrastat-brexit-support branch from 329803a to 2c4e69f Compare June 14, 2022 08:26

victoralmau changed the title ~~[13.0] intrastat*: brexit support~~ [13.0][IMP] intrastat*: brexit support Jun 14, 2022

luc-demeyer requested changes Jun 14, 2022

View reviewed changes

victoralmau force-pushed the 13.0-intrastat-brexit-support branch from bb4ec2c to 1977ab8 Compare June 15, 2022 06:51

pedrobaeza added this to the 13.0 milestone Jun 15, 2022

pedrobaeza reviewed Jun 15, 2022

View reviewed changes

luc-demeyer and others added 2 commits June 16, 2022 09:29

[FIX] intrastat_product: Adapt to 13.0

446dcb3

TT37486

victoralmau force-pushed the 13.0-intrastat-brexit-support branch from 1977ab8 to 446dcb3 Compare June 16, 2022 07:31

victoralmau requested a review from luc-demeyer August 9, 2022 06:48

OCA-git-bot added the bot is merging ⏳ label Aug 9, 2022

OCA-git-bot merged commit 0efb503 into OCA:13.0 Aug 9, 2022

OCA-git-bot added merged 🎉 and removed bot is merging ⏳ labels Aug 9, 2022

victoralmau mentioned this pull request Aug 9, 2022

[13.0][FIX] intrastat_product: Intrastat brexit support #188

Merged

jdidderen-be mentioned this pull request Dec 17, 2022

[13.0][IMP] intrastat_product - add notedict to some methods #206

Closed

This was referenced Dec 27, 2022

[13.0][IMP] l10n_fr_intrastat_product - replace _note logic with notedict one OCA/l10n-france#401

Closed

[13.0][IMP] l10n_es_intrastat_report - replace _note logic with notedict one OCA/l10n-spain#2711

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[13.0][IMP] intrastat*: brexit support #179

[13.0][IMP] intrastat*: brexit support #179

victoralmau commented Jun 14, 2022 •

edited

Loading

luc-demeyer commented Jun 14, 2022

victoralmau commented Jun 15, 2022

pedrobaeza left a comment

pedrobaeza Jun 15, 2022

victoralmau Jun 16, 2022

pedrobaeza Jun 17, 2022

victoralmau Jun 17, 2022

pedrobaeza Jun 15, 2022

pedrobaeza Jun 15, 2022

pedrobaeza Jun 15, 2022

luc-demeyer commented Jun 17, 2022

victoralmau commented Jul 21, 2022

pedrobaeza commented Jul 22, 2022

victoralmau commented Aug 9, 2022

pedrobaeza commented Aug 9, 2022

OCA-git-bot commented Aug 9, 2022

OCA-git-bot commented Aug 9, 2022

JordiBForgeFlow commented Aug 9, 2022 •

edited

Loading

JordiMForgeFlow commented Aug 9, 2022 •

edited

Loading

JordiBForgeFlow commented Aug 9, 2022

JordiBForgeFlow commented Aug 9, 2022 •

edited

Loading

victoralmau commented Aug 9, 2022

JordiBForgeFlow commented Aug 9, 2022

[13.0][IMP] intrastat*: brexit support #179

[13.0][IMP] intrastat*: brexit support #179

Conversation

victoralmau commented Jun 14, 2022 • edited Loading

luc-demeyer commented Jun 14, 2022

victoralmau commented Jun 15, 2022

pedrobaeza left a comment

Choose a reason for hiding this comment

pedrobaeza Jun 15, 2022

Choose a reason for hiding this comment

victoralmau Jun 16, 2022

Choose a reason for hiding this comment

pedrobaeza Jun 17, 2022

Choose a reason for hiding this comment

victoralmau Jun 17, 2022

Choose a reason for hiding this comment

pedrobaeza Jun 15, 2022

Choose a reason for hiding this comment

pedrobaeza Jun 15, 2022

Choose a reason for hiding this comment

pedrobaeza Jun 15, 2022

Choose a reason for hiding this comment

luc-demeyer commented Jun 17, 2022

victoralmau commented Jul 21, 2022

pedrobaeza commented Jul 22, 2022

victoralmau commented Aug 9, 2022

pedrobaeza commented Aug 9, 2022

OCA-git-bot commented Aug 9, 2022

OCA-git-bot commented Aug 9, 2022

JordiBForgeFlow commented Aug 9, 2022 • edited Loading

JordiMForgeFlow commented Aug 9, 2022 • edited Loading

JordiBForgeFlow commented Aug 9, 2022

JordiBForgeFlow commented Aug 9, 2022 • edited Loading

victoralmau commented Aug 9, 2022

JordiBForgeFlow commented Aug 9, 2022

victoralmau commented Jun 14, 2022 •

edited

Loading

JordiBForgeFlow commented Aug 9, 2022 •

edited

Loading

JordiMForgeFlow commented Aug 9, 2022 •

edited

Loading

JordiBForgeFlow commented Aug 9, 2022 •

edited

Loading