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

[11.0] Migrate base_delivery_carrier_label #150

Closed

Conversation

hugosantosred
Copy link
Member

No description provided.

@pedrobaeza pedrobaeza added this to the 11.0 milestone Jan 17, 2018
@pedrobaeza
Copy link
Member

Can you please squash a bit commit history, joining them by logical set/author?

@pedrobaeza pedrobaeza mentioned this pull request Jan 17, 2018
19 tasks
@hugosantosred hugosantosred force-pushed the 11.0-mig-base_delivery_carrier_label branch from 510a462 to 3a0b31b Compare January 17, 2018 12:49
@hugosantosred
Copy link
Member Author

Squash done, I've squashed the commit history grouping by author.

@pedrobaeza
Copy link
Member

I still see 70 commits and several together from same author...

@pedrobaeza
Copy link
Member

You can join also 3 that are:

OCA Transbot ...
Remove en.po ...
OCA Transbot ...

Because they are all about translations (one is an amend).

guewen and others added 22 commits January 19, 2018 12:38
… nesting, few typos

[ADD] access rights for the shipping.label model
[IMP] remove unused pdf_list variable and rename pdf variable to label as a label can have other printing format

[IMP] remove readonly on carrier_tracking_ref

[IMP] remove carrier_tracking_ref redefinition as already defined in delivery/stock.py

[ADD] stock users rights

[ADD] file type on shipping label

[ADD] pot file

[ADD] fr.po
…per pack (stock.tracking)

[IMP] set tracking_id as an optional key of dict returned by label generation and improve doc string

[IMP] rename generate_pack_labels in generate_shipping_labels as it can also generate a single label for a picking without pack notion

[IMP] set labels on stock.picking instead of stock.picking.out in order to let the creation of return labels to provide to the customer

[FIX] xml view and copy what is needed on stock.picking.out and stock.picking.in as it won't be inherited from stock.picking.out
[FIX] delivery.carrier has no access rights for stock users, hence remove it for delivery.carrier.option
…by raising a orm.except_orm

[FIX] trigger carrier_id on change when creating a stock.picking to set default options from sale.order

[IMP] change error message of unimplemented default to a more user friendly message
…te the label only for a selection of packs in a picking

the button call action_generate_carrier_label() without the 'context' keyword argument so the context ends in the tracking_ids argument. So the method now conforms to the cr, uid, ids, context signature and just forwards to a new generate_labels() method that should be used from within the code

do not overwrite the option_ids on create of stock.picking if already set in values, generalize the method to all types of picking (added in/out)

Set the default options of the delivery method when it is changed and the options are not set (typically a write from the code or a mass update)
[FIX] action name

[IMP] add descrption field to carrier option
[IMP] file_type field inheritance in shipping.label

[IMP] add field selection sort
[FIX] docstring

[FIX] _customize_sender_address return method
[FIX] method name to get sender address

[FIX] method comment
move modules in __unported__
[REF] port to v8 with old api

[MIG] to v8 base_deliv_label, deliv_carrier_deposit

[IMP] add parcel_tracking field

[IMP] add _get_packages_from_picking()

add carrier_id in tree view
guewen and others added 22 commits January 19, 2018 12:39
Take the destination package. If empty, the package is moved so take the source
one.

The options must be filtered by the selected carrier
In order to get visibility on https://www.odoo.com/apps the OCA board has
decided to add the OCA as author of all the addons maintained as part of the
association.
Because it will print several labels for the same package.
add operation.get_weight()
add tests

fix wrong name of class

refactor tests for a better readability

s/tracking/package in docstring of generate_labels
- Reactivate
- Move files in views and models
- Adapt XML views
- Update README.rst

Move settings menu in Inventory/Configuration

Remove test with Logistic units as it was removed from 9.0

Allow to give a filename to the created label if not defined use the attachment name

Fix weight calcul adding a field for total weight
This due to removed logistics units
If set this field will be used to define weight, otherwise we compute
weight even before quants have been created.

Fix stock picking view some labels were missing and the view was scrambled

Split files by model
[FIX] remove en.po that was erroneously created by transbot
Missing acl for stock user/manager
[MIG] Rename manifest files
MIG 10.0 base_delivery_carrier_label
* Remove manifest.wizard model access rules.
* Add an attribute for the carrier tracking URI at the `stock.quant.package` level
@hugosantosred hugosantosred force-pushed the 11.0-mig-base_delivery_carrier_label branch from 3a0b31b to ee133e3 Compare January 19, 2018 13:10
@hugosantosred hugosantosred force-pushed the 11.0-mig-base_delivery_carrier_label branch from ee133e3 to 84ea02a Compare January 31, 2018 10:39
@yvaucher
Copy link
Member

yvaucher commented Feb 2, 2018

This squashing is a bit to harsh, I think you should focus mainly on squashing the translation commits, all the rest can mainly stay.

If you want to squash more, please keep in mind the changesets.
Fixup can be part of a changeset and can be squashed.
The best way to identify it is if they were in the same pull request.

@asaunier
Copy link
Contributor

asaunier commented Apr 4, 2018

A minor remark: the first line # -*- coding: utf-8 -*- is no longer needed in Python 3 (see https://github.com/OCA/maintainer-tools/wiki/Migration-to-version-11.0#tasks-to-do-in-the-migration)

@asaunier
Copy link
Contributor

Suggested replacement PR squashing (a few) i18n commits and removing the utf-8 headers: #154

@pedrobaeza pedrobaeza closed this Apr 11, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet