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.

Sign up for GitHub

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

Jump to bottom

[15.0][MIG] base_delivery_carrier_files: Migration to 15.0 #667

Closed
wants to merge 49 commits into from
Closed

[15.0][MIG] base_delivery_carrier_files: Migration to 15.0 #667

wants to merge 49 commits into from

Conversation

wytzejan
Copy link
Member

No description provided.

@wytzejan
Copy link
Member Author

wytzejan commented Jun 30, 2023 •
edited
Loading

@pedrobaeza @rousseldenis

Hi, this is my first full pull request for the OCA and I can not figure out how to reduce the commits. I followed the full technical process here: https://github.com/OCA/maintainer-tools/wiki/Migration-to-version-15.0 and tried to merge/squash commits like described here: https://github.com/OCA/maintainer-tools/wiki/Merge-commits-in-pull-requests but I do not know how to do it. Can you help me out here? I would appreciate!

@pedrobaeza
Copy link
Member

You don't know the procedure or which commits to squash/merge together?

@wytzejan
Copy link
Member Author

The procedure. I think all commits except the one I made (ed25998 and a900dbd) should be squased/merged.

@pedrobaeza
Copy link
Member

Then I think you are asking about what to merge. Check this image:

Selección_061

nbessi and others added 26 commits July 5, 2023 19:52
@nbessi @wytzejan
[MRG] 6.1
21c4e17 
(lp:c2c-addons/6.1  rev 28.1.5)
@nbessi @wytzejan
[MRG] from trunk
3da87fb 
(lp:c2c-addons/6.1  rev 28.1.7)
@wytzejan
[MRG] from upstream
d5c50f7 
(lp:c2c-addons/6.1  rev 45.1.4)
@wytzejan
[FIX] handle no str or unicode values
4f5a2de 
(lp:c2c-addons/6.1  rev 45.1.5)
@wytzejan
[FIX] license headers
b9a0c91 
(lp:c2c-addons/6.1  rev 48)
@wytzejan
[FIX] handle no str or unicode values
084e85d 
(lp:c2c-addons/6.1  rev 50)
@guewen @wytzejan
[MIGR] set installable to False on all the modules, the flag has to b…
c065c07 
…e reactivated when the modules are migrated
@wytzejan
Launchpad automatic translations update.
3ac06c7
@rdeheele @wytzejan
[UPD] base_delivery_carrier_files addon: port in v7
76622e1
@rdeheele @wytzejan
[FIX] small changes after functional test to generate a correctly fil…
13a29dc 
…led file
@rdeheele @wytzejan
[UPD] keeps country_code term: more logical and as 6.1
b375881
@rdeheele @wytzejan
[UPD] changes needed to fit with stock.picking/stock.picking.out chan…
6b04896 
…ges in v7
@rdeheele @wytzejan
[UPD] needed changes(bis) to fit with stock.picking/stock.picking.out…
966c1a6 
… changes in v7
@wytzejan
Launchpad automatic translations update.
98780b6
@rdeheele @wytzejan
[UPD] clean according flake8
a5799af
@rdeheele @wytzejan
[FIX] moves copy on stock.picking.out object, adds a test to check du…
ef46b59 
…plication
@rdeheele @wytzejan
[FIX] fix #1298300, need to add field state in tree description of pi…
5129bde 
…cking_ids field
@wytzejan
Launchpad automatic translations update.
f3b1bf5
@rdeheele @wytzejan
[UPD] pass picking_id in context in order to associate precisely atta…
9b193c6 
…chment and picking
@wytzejan
Launchpad automatic translations update.
c8b94a1
@albertofl @wytzejan
[ADD] Add es translation
e24ef22
@wytzejan
Launchpad automatic translations update.
790e2e9
@wytzejan
Launchpad automatic translations update.
080ef41
@albertofl @wytzejan
Update translations
1b93b85
@wytzejan
Launchpad automatic translations update.
34e7227
@wytzejan
Launchpad automatic translations update.
05c2062
Thomas Rehn and others added 14 commits July 5, 2023 19:52
@wytzejan
[REF] make selection function overwritable
e71ecef
@thomaspaulb @wytzejan
[FIX] linting and style issues base_delivery_carrier_files
b2c2e81
@thomaspaulb @wytzejan
[MIG] base_delivery_carrier_files: tests to Python tests
a4a3251
@mFlayyan @wytzejan
[MIG] base_delivery_carrier_files: Migration to 10.0
9eff345
@wytzejan
[MIG] base_delivery_carrier_files: Migration to V12.0
9a13f20
@StefanRijnhart @wytzejan
[IMP] base_delivery_carrier_files: black, isort, prettier
916f996
@StefanRijnhart @wytzejan
[MIG] base_delivery_carrier_files: Migration to 14.0
51fa69d
@StefanRijnhart @wytzejan
[IMP] base_delivery_carrier_files: pass pickings to _write_file
701fd0f 
_write_file was designed to be inheritable to implement other file storages,
but without access to the pickings it is not possible to implement attachment
or binary fields storage.
@francesco-ooops @wytzejan
Translated using Weblate (Italian)
26616f0 
Currently translated at 42.8% (18 of 42 strings)

Translation: delivery-carrier-14.0/delivery-carrier-14.0-base_delivery_carrier_files
Translate-URL: https://translation.odoo-community.org/projects/delivery-carrier-14-0/delivery-carrier-14-0-base_delivery_carrier_files/it/
@mymage @wytzejan
Translated using Weblate (Italian)
55cc1c4 
Currently translated at 42.8% (18 of 42 strings)

Translation: delivery-carrier-14.0/delivery-carrier-14.0-base_delivery_carrier_files
Translate-URL: https://translation.odoo-community.org/projects/delivery-carrier-14-0/delivery-carrier-14-0-base_delivery_carrier_files/it/
@sysadminmatmoz @wytzejan
Translated using Weblate (Slovenian)
3c9c9a4 
Currently translated at 100.0% (42 of 42 strings)

Translation: delivery-carrier-14.0/delivery-carrier-14.0-base_delivery_carrier_files
Translate-URL: https://translation.odoo-community.org/projects/delivery-carrier-14-0/delivery-carrier-14-0-base_delivery_carrier_files/sl/
@francesco-ooops @wytzejan
Translated using Weblate (Italian)
e99254b 
Currently translated at 42.8% (18 of 42 strings)

Translation: delivery-carrier-14.0/delivery-carrier-14.0-base_delivery_carrier_files
Translate-URL: https://translation.odoo-community.org/projects/delivery-carrier-14-0/delivery-carrier-14-0-base_delivery_carrier_files/it/
@wytzejan
[IMP] base_delivery_carrier_files: black, isort, prettier
94e7d58
@wytzejan
[MIG] base_delivery_carrier_files: Migration to 15.0
e096d85
@wytzejan wytzejan force-pushed the 15.0-mig-base_delivery_carrier_files branch from 956747b to e096d85 Compare July 5, 2023 17:54
@wytzejan wytzejan force-pushed the 15.0-mig-base_delivery_carrier_files branch from e096d85 to 73b3a1a Compare July 5, 2023 18:17
@wytzejan wytzejan marked this pull request as ready for review July 5, 2023 18:25
@wytzejan
Copy link
Member Author

wytzejan commented Jul 5, 2023

Thanks @pedrobaeza, I understand. Fixed it now.

@wytzejan wytzejan mentioned this pull request Jul 5, 2023
Open
31 tasks
@pedrobaeza
Copy link
Member

/ocabot migration base_delivery_carrier_files

@OCA-git-bot OCA-git-bot added this to the 15.0 milestone Jul 5, 2023
@github-actions GitHub Actions
Copy link

github-actions bot commented Nov 5, 2023

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.

@github-actions github-actions bot added the stale PR/Issue without recent activity, it'll be soon closed automatically. label Nov 5, 2023
@wytzejan
Copy link
Member Author

@gurneyalex This pull request is still relevant. Can you (as PSC member) remove the stale label please? Thanks!

@github-actions github-actions bot removed the stale PR/Issue without recent activity, it'll be soon closed automatically. label Nov 26, 2023
@github-actions GitHub Actions
Copy link

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.

@github-actions github-actions bot added the stale PR/Issue without recent activity, it'll be soon closed automatically. label Mar 31, 2024
@github-actions github-actions bot closed this May 5, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
stale PR/Issue without recent activity, it'll be soon closed automatically.
Projects
None yet
Milestone
15.0
Development

Successfully merging this pull request may close these issues.