[16.0][mig] analytic_partner

[aktiv-heli-kantawala]

[rafaelbn]

/ocabot migration analytic_partner

[rafaelbn]

/ocabot rebase

[OCA-git-bot]

@rafaelbn The rebase process failed, because command git rebase origin/16.0 failed with output:

First, rewinding head to replay your work on top of it...
Applying: [ADD] analytic_partner
Applying: [FIX+IMP] analytic_partner:
Applying: OCA Transbot updated translations from Transifex
Applying: [MIG] analytic_account: Migrated to 10.0
Applying: OCA Transbot updated translations from Transifex
Applying: [11.0][MIG] analytic_partner: Migration to 11.0
Applying: [MIG] analytic_partner: Migration to 12.0
Applying: Translated using Weblate (Galician)
Applying: Translated using Weblate (Catalan)
Applying: Translated using Weblate (Portuguese (Brazil))
Applying: Translated using Weblate (Chinese (Simplified))
Applying: [IMP] analytic_partner: black, isort
Applying: [MIG] analytic_partner: Migration to 13.0
Applying: [IMP] analytic_partner: black, isort
Applying: [MIG] analytic_partner: Migration to v14.0
Applying: [UPD] Update analytic_partner.pot
Applying: [UPD] README.rst
Applying: Added translation using Weblate (French (France))
Applying: Translated using Weblate (French)
Applying: Translated using Weblate (French (France))
Applying: [IMP] analytic_partner: black, isort, prettier
Using index info to reconstruct a base tree...
M	.pre-commit-config.yaml
A	stock_analytic/models/stock.py
M	stock_analytic/tests/test_stock_picking.py
M	stock_analytic/tests/test_stock_scrap.py
Falling back to patching base and 3-way merge...
Auto-merging stock_analytic/tests/test_stock_scrap.py
Auto-merging stock_analytic/tests/test_stock_picking.py
CONFLICT (content): Merge conflict in stock_analytic/tests/test_stock_picking.py
Auto-merging stock_analytic/models/stock_move.py
Auto-merging .pre-commit-config.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0021 [IMP] analytic_partner: black, isort, prettier
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".

[rafaelbn]

@heliaktiv could you please rebase?

[rousseldenis]

@heliaktiv

[github-actions[bot]]

There hasn't been any activity on this pull request in the past 4 months, so it has been marked as stale and it will be closed automatically if no further activity occurs in the next 30 days. If you want this PR to never become stale, please ask a PSC member to apply the "no stale" label.

[maisim]

Ok just re-discovered this one was replaced by the #609 :roll_eyes: