Commit Graph
130 Commits
Author SHA1 Message Date
Christophe Simonis 1fa8680286 [MERGE] forward port branch saas-17 up to 48b2ce60ed 2017-08-10 18:07:47 +02:00
Richard Mathot 310e3dadd0 [FIX] delivery: adapt weight computation to new stock 2017-08-03 16:01:07 +02:00
Richard Mathot ea0127000d [FIX] delivery: package_ids computation should not ignore packages with no packagings
Since shippers than handle multipackaging always have a fallback default
packaging
2017-08-03 14:09:19 +02:00
Christophe Simonis fcfb4782b6 [MERGE] forward port branch saas-17 up to a445548f07 2017-08-02 12:31:05 +02:00
Richard Mathot e449291f28 [FIX] delivery: don't crash ecommerce when no grid has been found
(+ improve a bit the error message)
2017-08-01 09:35:46 +02:00
Richard Mathot b8f574a464 [FIX] delivery: wording 2017-08-01 09:35:46 +02:00
Richard Mathot 4c6c16a382 [IMP] delivery: mechanism to log XML requests
This will help future debugging of integrated shipping providers by
enabling the logging of XML requests in ir.logging table.
2017-07-25 10:42:27 +02:00
Xavier Morel 44304b7e24 [FIX] P3: reintroduced issues
* can't compare a function and a float in Python 3 (it works in
  Python 2, though it makes no sense and was just hiding a bug)
* no iteritems method on dict in Python 3 (use compat helper)
* P3-invalid "except" syntax (sadly pylint apparently does not have a
  standard lint for that, though it's easy to catch... if you can run
  the code under P3)
2017-07-24 15:13:03 +02:00
Richard Mathot afc5c0709a [FIX] delivery: missing parenthesis
Thanks to @xmo-odoo and its Python3 virtual machine for spotting this
one (and shame on Python2 that does not crash when comparing a method to
a float because voilà).
2017-07-24 14:11:55 +02:00
Richard Mathot 45ca8f41d6 [REF] delivery: remove inherits with product.product
(Actually, a good old m2o is enough.)

We also clean a bit the delivery.carrier view.
2017-07-20 15:32:21 +02:00
Jaykishan Solanki 6999d054fc [ADD] delivery: delivery.carrier must follow the same multi-company rules than the products they reference 2017-07-20 15:32:20 +02:00
Christophe Simonis 9185eb4b79 [MERGE] forward port branch saas-17 up to f830f14d98 2017-07-20 13:26:09 +02:00
Dhawal Limbuwala ee9b3e0d0c [IMP] delivery: notification email for shippings
When an order is shipped, a notification email is sent to the customer.
If there is a tracking URL, it is included in the email.

(and also a bit of refactoring)
2017-07-19 15:02:16 +02:00
Richard Mathot e297a7d541 [FIX] delivery: wrong variable returned 2017-07-19 12:27:50 +02:00
Richard Mathot 861343821d [FIX] delivery: typo in method names 2017-07-18 17:14:04 +02:00
Richard Mathot 760cffe8e6 [FIX] delivery: sale_id may not be set for a picking 2017-07-18 11:18:18 +02:00
Simon Lejeune ddf2b21bdf [REF] stock: adapt to rename of stock.pack.operation into stock.mode.line 2017-07-14 17:08:22 +02:00
Pierre Masereel 809605bb8f [REF] stock, delivery: adapt packages to new implementation 2017-07-14 17:08:21 +02:00
Richard Mathot f963500a9f [IMP] delivery,website_sale_delivery: refactoring and cleaning 2017-07-13 12:32:22 +02:00
Richard Mathot f2c9b519a7 [REF] delivery: linting and cleaning of delivery.price.rule 2017-07-13 12:32:22 +02:00
Richard Mathot 121a94204d [IMP] delivery: the initial bad decision
Having price and availability as computed fields of a delivery.carrier
may sound handy.

Actually, it comes with is batch of lame hacks, poor performances and
terrifying heisenbugs.

We will try to make something better. It has to start with a breaking.
2017-07-13 12:32:22 +02:00
Richard Mathot 01196030a5 [REM] delivery: dead onchange
Since this field is not in any view from a long time
2017-07-13 12:32:22 +02:00
Richard Mathot c923b39f6b [REM] delivery: unused name_get hack 2017-07-13 12:32:22 +02:00
Christophe Simonis ab02bf34b0 [MERGE] forward port branch saas-16 up to cc38b93ab2 2017-06-09 17:11:47 +02:00
Christophe Simonis cc38b93ab2 [MERGE] forward port branch saas-15 up to 49f819a7a7 2017-06-09 16:43:27 +02:00
Christophe Simonis b6c7d71899 [MERGE] forward port branch 10.0 up to cd1a8f6252 2017-06-09 13:28:06 +02:00
Christophe Simonis cd1a8f6252 [MERGE] forward port branch saas-11 up to 1d7260cbcb 2017-06-09 13:08:51 +02:00
Christophe Simonis 1d7260cbcb [MERGE] forward port branch 9.0 up to 77be3d8b39 2017-06-09 12:51:31 +02:00
nafex 8052869b19 [FIX] delivery: create_price_rules won't create unnecessary rules anymore
When updating a carrier that is not "fixed" or "base_on_rule", this
method was creating unnecessary delivery.price.rule at each write.
This patch fixes this issue.

Closes PR #17443
2017-06-08 11:16:17 +02:00
Xavier Morel b897dcde15 [FIX] P3: import pattern which doesn't seem to work right
``import odoo.addons.foo as bar`` doesn't seem to properly trigger the
import hook in Python 3 (it blows up on decimal_precision and
base). Thus convert *all* examples of that pattern to the more
sensible ``from odoo.addons import foo as bar``.
2017-05-22 13:30:50 +02:00
Yannick Tivisse 0a523a16cd [IMP] delivery: Define _get_shipping_price_from_so for a single order
These functions are always called with a single order. We don't need to make a big pâté in multi
2017-05-16 14:37:23 +02:00
Pierre Masereel 2c84ecc92f [IMP] delivery: put in pack wizard
If the picking has no carrier set, do not open the put in pack wizard
and keep the behavior of a classic picking. Also, filter the delivery
packages according to the carrier (note: this doesn't work at the moment
because of a bug in the new views, but it'll be fixed very soon, so we
merge anyway).

Also, remove an harmless typo in `manage_package_type` method.
2017-05-04 18:06:20 +02:00
xmo-odoo b4429c2a91 [FIX] Various P3-related import changes
* LDAP import: python-ldap is not python3-compatible, pyldap is

  Warning: only supported from debian Stretch (current testing)?
  https://packages.debian.org/search?searchon=names&keywords=pyldap

* implicitly relative imports
* imports of moved or removed stdlib modules

issue #8530
2017-04-28 09:06:53 +02:00
Olivier Dony 087ce98928 [MERGE] Forward-port 10.0 up to 2cffcfd860 2017-02-25 02:32:17 +01:00
Laurent Smet bf8b359b29 [FIX] delivery: fix bad Exception handling
When get_price() is called during tests, a ValidationError was returned but not catched
correctly due to the unavailability of delivery service.
Because this method is called during the creation of new sale order, it leads to some
operational error (broken cursor).
2017-02-24 17:57:36 +01:00
Christophe Simonis 6c4389df41 [MERGE] forward port branch 10.0 up to 6804085b8c 2017-01-23 14:33:53 +01:00
Christophe Simonis 44276dfdc3 [MERGE] forward port branch saas-11 up to a0aca47fef 2017-01-17 19:12:20 +01:00
Christophe Simonis 70f86ce4e8 [MERGE] forward port branch 9.0 up to 16fa61b34f 2017-01-17 18:04:57 +01:00
Nicolas Martinelli 3d857e4ca0 [FIX] delivery: default UoM for weight
On a picking, the UoM of the weight is the default UoM for the weight
category. However, weights in Odoo are always considered to be
kilograms.

This might lead to inconsistencies between what is displayed on the
picking and what is printed on a shipper label.

opw-702564
2017-01-16 11:58:28 +01:00
Pierre Masereel be58a61717 [IMP] delivery: send only new package with packaging_id to carrier
Because now the carrier id is set on all picking from the same
procurement group, we want to call the carrier API only when there are
some package with a packaging_id set on it.
2017-01-03 17:53:37 +01:00
Pierre Masereel d744f8d912 [IMP] delivery: put in pack wizard
We have moved the 'quant.package' view into a wizard, because it's
always used as a wizard, and and there was context trouble with the
'Save' button as a button with nale 'write' (the context was mixed with
the field, and there were two write action whan "Save button was
clicked.
2017-01-03 17:53:37 +01:00
Pierre Masereel 4689f59a25 [FIX] delivery: set carrier on all picking created by SO
When our warehouse is configured to work as 'pick -> pack -> ship'
only the last picking (ship) has the information of which carrier
is set for this delivery.

This is a problem, because we also need the information in the packing
zone, to put in a pack with the correct package type.

To fix this problem, instead of overriding the function 'action_confirm'
which put the 'carrier_id' only on the 'ship' location. We set the
'sale_order_id' on the procurement groups created from the sales
order, and propagate it to the picking through the stock moves
from the procurement group.
2017-01-03 17:53:36 +01:00
Kinjal Mehta b0185e15cc [FIX] all: fix some common typos
Sale Order --> Sales Order
Sale Report --> Sales Report
Sale Team -> Sales Team
Payment Term --> Payment Terms
2016-12-22 13:29:38 +01:00
Christophe Simonis e2fcace05e [MERGE] forward port branch 10.0 up to 13dc704 2016-11-17 15:27:29 +01:00
Christophe Simonis dece72d010 [MERGE] forward port branch saas-12 up to ca20038 2016-11-15 13:58:55 +01:00
Christophe Simonis ca2003839a [MERGE] forward port branch saas-11 up to 58f68cc 2016-11-15 13:19:55 +01:00
Fabrice Henrion b72bb97905 [IMP] delivery: wording
Closes #12546
2016-11-14 17:10:02 +01:00
Christophe Simonis f93bada93e [MERGE] forward port branch 9.0 up to fb763f3 2016-11-14 14:56:14 +01:00
Goffin Simon df34168177 [FIX] delivery: onchange_carrier with non integrated carrier
The price set for the non integrated carrier must be the same either when you
set it on the SO with button "set_price" or when you set it on the stock picking.

The field "carrier_price" must be in readonly when the state of the picking is done.

opw:691224
2016-11-09 13:33:37 +01:00
Christophe Simonis 3d085f632d [MERGE] forward port branch saas-12 up to 6386037 2016-11-08 15:01:20 +01:00