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

Master imp sale stock pim #31347

Closed
wants to merge 6 commits into
base: master
from

Conversation

Projects
None yet
5 participants
@pimodoo
Copy link
Contributor

pimodoo commented Feb 22, 2019

Description of the issue/feature this PR addresses:

Current behavior before PR:

Desired behavior after PR is merged:

--
I confirm I have signed the CLA and read the PR guidelines at www.odoo.com/submit-pr

@robodoo robodoo added the seen 🙂 label Feb 22, 2019

@C3POdoo C3POdoo added the RD label Feb 22, 2019

@robodoo robodoo added the CI 🤖 label Feb 22, 2019

@pimodoo pimodoo force-pushed the odoo-dev:master-imp-sale_stock-pim branch Feb 25, 2019

@robodoo robodoo added CI 🤖 and removed CI 🤖 labels Feb 25, 2019

@pimodoo pimodoo force-pushed the odoo-dev:master-imp-sale_stock-pim branch Feb 25, 2019

@robodoo robodoo removed the CI 🤖 label Feb 25, 2019

@pimodoo pimodoo force-pushed the odoo-dev:master-imp-sale_stock-pim branch 2 times, most recently to 4e1e18a Feb 25, 2019

@robodoo robodoo added the CI 🤖 label Feb 25, 2019


def _compute_return_label(self):
for picking in self:
picking.return_label_ids = self.env['ir.attachment'].search([('res_model', '=', 'stock.picking'), ('res_id', '=', picking.id), ('name', 'ilike', 'ReturnLabel')])

This comment has been minimized.

@amoyaux

amoyaux Feb 26, 2019

Contributor

'ReturnLabel' + message_post in generic _get_return_label

This comment has been minimized.

@sle-odoo

sle-odoo Feb 26, 2019

Contributor

ilike and ReturnLabel is weird to me, ilike is case insensitive
can't you prepend a fixed word to these return label? this would make the lookup a little more robust (=like fixeprefix_%

free_over = fields.Boolean('Free if order amount is above', help="If the order total amount (shipping excluded) is above or equal to this value, the customer benefits from a free shipping", default=False, oldname='free_if_more_than')
amount = fields.Float(string='Amount', help="Amount of the order to benefit from a free shipping, expressed in the company currency")

can_generate_return = fields.Boolean(compute="_compute_can_generate_return")
return_label_on_delivery = fields.Boolean(string="Generate Return Label", required=True, default=False,
help="The return label is automatically generated at the delivery.")

This comment has been minimized.

@sle-odoo

sle-odoo Feb 26, 2019

Contributor

weird indent

This comment has been minimized.

@sle-odoo

sle-odoo Feb 26, 2019

Contributor

required?

This comment has been minimized.

@pimodoo

pimodoo Feb 26, 2019

Author Contributor

True Flase or Null?

This comment has been minimized.

@sle-odoo

sle-odoo Feb 26, 2019

Contributor

null will return false

This comment has been minimized.

@pimodoo

pimodoo Feb 26, 2019

Author Contributor

yes but there's a default value, and so it's more robust

@robodoo robodoo added CI 🤖 and removed CI 🤖 labels Mar 11, 2019

@pimodoo pimodoo force-pushed the odoo-dev:master-imp-sale_stock-pim branch from 76b2ebe to abf1a77 Mar 13, 2019

@robodoo robodoo added CI 🤖 and removed CI 🤖 labels Mar 13, 2019

pimodoo added some commits Feb 20, 2019

[IMP] sale,sale_stock,website_sale_delivery: SO portal
Change the design to let the delivery_tracking_ref beeing displayed
properly.
[REF] delivery, website_sale_delivery: portal template in delivery
The portal template that add the tracking number on the picking in the
sale order report in portal is still in website_sale_delivery, even if
the portal does not need the website anymore. More over, the inherited
template has been moved from website_sale_stock to sale_stock.

So to be consistent and not forcing having website for a feature that
doesn't need it, we move this template inheritance in delivery
[IMP] delivery: manage return label for all carrier
Until now, only fedex was providing return label printing, and as we
want to integrate it with other carriers, we have mande a generc
mecanism to easily implement it with new ones.

We've also added an option that allow to print return label from portal
if one has been generated on delivery.
[IMP] delivery: margin set on carrier from int to float
Some customers need to have a float instead of a in for the percentage
of the margin taken on the delivery. So we modified the integer value
into a float.

@pimodoo pimodoo force-pushed the odoo-dev:master-imp-sale_stock-pim branch from abf1a77 to 9781406 Mar 15, 2019

@robodoo robodoo removed the CI 🤖 label Mar 15, 2019

@pimodoo

This comment has been minimized.

Copy link
Contributor Author

pimodoo commented Mar 15, 2019

robodoo r+ rebase-ff

@robodoo robodoo added the r+ 👌 label Mar 15, 2019

@robodoo

This comment has been minimized.

Copy link
Contributor

robodoo commented Mar 15, 2019

Merge method set to rebase and fast-forward

@robodoo robodoo added the CI 🤖 label Mar 15, 2019

robodoo pushed a commit that referenced this pull request Mar 15, 2019

fixup! [IMP] delivery: manage return label for all carrier
closes #31347

Signed-off-by: pimodoo <pimodoo@users.noreply.github.com>
@robodoo

This comment has been minimized.

Copy link
Contributor

robodoo commented Mar 15, 2019

Merged, thanks!

@robodoo robodoo closed this Mar 15, 2019

@pimodoo pimodoo deleted the odoo-dev:master-imp-sale_stock-pim branch Mar 15, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.