Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[14.0][MIG+IMP] intrastat_product: Migration to 14.0 #120

Merged
merged 38 commits into from
Feb 16, 2021
Merged

[14.0][MIG+IMP] intrastat_product: Migration to 14.0 #120

merged 38 commits into from
Feb 16, 2021

Conversation

joao-p-marques
Copy link
Member

Supersedes #116

Squash commits and add appropriate prefix. Also add [IMP] commit for pre-commit execution.

@Tecnativa
TT28130

ping @pedrobaeza

Alexis de Lattre and others added 27 commits February 8, 2021 14:27
Rename report.intrastat.product to l10n.fr.report.intrastat.product (same for service and for lines) + migration scripts

Rename field country_id to origin_country_id (TODO : write mig script) and move this field from l10n_fr_intrastat_product to intrastat_product

Move intrastat_code and uom_id of report.intrastat.code from l10n_fr_intrastat_product to intrastat_product, as discussed with Luc de Meyer

Use display_name instead of an inherit of name_get (better use of new API) Inherit write and create of intrastat codes to remove spaces (patch by Luc De Meyer from Noviat) Add O2M fields from intrastat code to products and product categs
…cant, for instance, import files with name_search
* Update README.rst and translation files
* Add index=True on some fields on which we often search, as suggested by Yannick
* Remove description in __openerp__.py
* Move ACL from l10n_fr_intrastat_product module to intrastat_product module
* Large code re-engineering following the Akretion-Noviat code sprint on intrastat
  This code has been written both by Luc de Meyer and myself.
* Add first draft of code to generate decl lines
* Add product_origin_country_id on declaration/computation lines

  Copy incoterms and destination country from SO to invoice when invoicing from SO
  We need weight even when supplementary units is used
  Small cleanups and enhancements

* Add support for accessory costs

  Add default values for intrastat transaction on company
  Code cleanup

* If rounded weight is 0, put 1

  Take into account the taxes for B2C
  Small code cleanup

* Remove field exclude_from_intrastat

  Re-organise view of intrastat.product.declaration

* Add option intrastat_accessory_costs on company

  Set more fields as invisible (localisation should put them visible if they need it)
  Fix handling of suppl. units when hs_code is empty on invoice line (but set on product)
  Small usability enhancements

* Include selection of type of invoice in search, for better perf

  Isolate domain in a _prepare method, for easier inheritance
  WARNING: I changed the default selection of invoice type ; adapt it in your localization m
  odule if necessary
  Add intrastat_transaction_in_refund for company (not needed for France, but may be needed elsewhere)
  Add a log when an invoice line is skipped

* Include product code in warning msg on weight

* Inspired by the PR akretion/account-financial-reporting#8 of Luc de Meyer
* Improve logs and messages
* total_amount is a sum of integers, so it should be an integer
* Add transport mode in computation tree view
* FIX intrastat_country for invoices without src_dest_country_id
* FIX wrong model for seach method
* Use stock_picking_invoice_link for a better identification of the intrastat region

  With this commit, we now support the following scenario: I order to my supplier a quantity of 50 kg and he delivers/invoices 52kg ; odoo will create an additional invoice line of 2kg which is linked to the stock move, but not to any PO line.
* Modularise a piece of code
* Add ACL on hs.code to financial manager (I can't do it in product_harmonized_system because it doesn't depend on account)
* Handle scenario where an invoice has products with 0 value (samples for example) and shipping costs (accessory costs) with value > 0.
Because we can have intrastat unit that will never be mapped to an odoo unit (will always be set manually)
intrastat_base: Move company view params to account config page
* Add readonly on some fields when state of declaration is done
* Division by zero in computation of accessory costs
* Add FR translation
* Fix strings
* Minor code updates
* Small fixes in intrastat_base
* account_tax_template
@joao-p-marques
Copy link
Member Author

Tests should not give the same error as before in the superseded PR as the latest release of python-stdnum already includes the Brexit support.

@joao-p-marques joao-p-marques changed the title [14.0][MIG] intrastat_product: Migration to 14.0 [14.0][MIG+IMP] intrastat_product: Migration to 14.0 Feb 8, 2021
@pedrobaeza pedrobaeza added this to the 14.0 milestone Feb 8, 2021
@joao-p-marques
Copy link
Member Author

Done @pedrobaeza

@pedrobaeza
Copy link
Member

pedrobaeza commented Feb 8, 2021

Why this commit dfc3227 contains translations?

I think you have squash them, when in fact it should be squashed with ee61d11. You can squash all together, coming from same author, and modifying the commit message for containing both messages.

@joao-p-marques
Copy link
Member Author

Yes, indeed I squashed these:
image

Am I supposed to squash the bot commits all in 1 also authored by the bot? I thought they should be squashed with the previous commit that triggered that change by the bot.

I will squash it with the previous one, as you said.

alexis-via and others added 7 commits February 8, 2021 15:24
intrastat_product: add mail.activity.mixin and widget in form view
product_harmonized_system: remove archive button (use Action menu)
All modules:
- use super() instead of super(class, self)
- Update domain_force in multi-company ir.rule to v13 standard
Rename field type to declaration_type
Use the new intrastat boolean of fiscal position, following issue #110

Co-authored-by: Alexis de Lattre <alexis.delattre@akretion.com>
@pedrobaeza
Copy link
Member

Yes, but you should see a bit the context. The order that you see is not always the sequential order. It can be due to several things:

  • A merge contains several commits, and one of them is the "generator" of the rest of the changes. This shouldn't be a problem if all comes from the same author, as in this context, you can do what you are going to do now: squash all together, mixing the commits messages.
  • The PR was done some time ago from the merge of it, and then in between other PRs/Weblate commits/etc may arrive in the main branch, provoking that disorder.

@joao-p-marques
Copy link
Member Author

Ok @pedrobaeza thanks for the explanation. In this case, I only squashed the commits referring to the v14.0 migration, the administrative commits, and the ones you pointed out. Do I need to do anything else or revert anything?

@pedrobaeza
Copy link
Member

Commit history seems good. Please check Travis

@joao-p-marques
Copy link
Member Author

joao-p-marques commented Feb 8, 2021

pre-commit is generating an incorrect requirements.txt file after I have added the >=1.16 constraint: https://github.com/OCA/intrastat-extrastat/pull/120/checks?check_run_id=1855987879#step:4:94. Am I doing it wrong? Where should that constraint go?

@pedrobaeza
Copy link
Member

I think you have to put that in external_dependencies in Odoo, with pip syntax.

@joao-p-marques
Copy link
Member Author

joao-p-marques commented Feb 8, 2021

Yes, I did that: ec3752d#diff-66b4fe70725cdf32dd709c35ce332f272cbf58b4e20ae98ad6ed59a3ed1d6763R24

Before that, pre-commit generated the correct requirements.txt with python-stdnum, but now generates stdnum>=1.16.

@pedrobaeza
Copy link
Member

@sbidoul @yajo can you help here?

@sbidoul
Copy link
Member

sbidoul commented Feb 8, 2021

Just put `python-stdum>=1.16" here. Since v13 it's highly recommended to use the PyPI project names in external dependencies.

@joao-p-marques
Copy link
Member Author

Ok, thanks @sbidoul!

…mprovement + remove universal hs_code constaint

Add support for post-Brexit VAT numbers with latest python-stdnum version
Remove use of country_id.intrastat
Add 'vat' field on computation and declaration lines with a simple validity check
Add 'partner_id' field on computation lines
Prevent back to draft when an XML export is present
Remove the universal constaint applied to the hs_codes for countries in the "Europe" list, as discussed in #116 (comment)

Co-authored-by: Alexis de Lattre <alexis.delattre@akretion.com>
@joao-p-marques
Copy link
Member Author

@pedrobaeza already applied the discussed changes in #116 (comment)

@pedrobaeza
Copy link
Member

Let's move with this:

/ocabot merge nobump

@OCA-git-bot
Copy link
Contributor

Hey, thanks for contributing! Proceeding to merge this for you.
Prepared branch 14.0-ocabot-merge-pr-120-by-pedrobaeza-bump-nobump, awaiting test results.

@pedrobaeza pedrobaeza mentioned this pull request Feb 16, 2021
6 tasks
@OCA-git-bot OCA-git-bot merged commit f2717de into OCA:14.0 Feb 16, 2021
@OCA-git-bot
Copy link
Contributor

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet