Commit Graph
60 Commits
Author SHA1 Message Date
rap-odoo a5e7a4c8ae [IMP] Account,...: Change 'string' attribute on some fields to avoid repeated names
In odoo at many places the filter items are having repeated strings eventhough the
fiter works differently , so find all the places where this happens and give
proper string to each filter..
2016-06-08 14:02:23 +02:00
Thibault Delavallée e6d7261692 [FIX] stock, delivery: put_in_pack return
When called in new API it returns a record, not an ID. Update the override
in delivery accordingly.
2016-05-04 11:26:38 +02:00
Thibault Delavallée d45996c915 [MIGR] stock: stock_picking
Picking models are migrated to new API. No change is performed to code
structure or functional structure. Some code cleaning may be performed when
migrating to simplify the code. Other files may be updated due to the move
towards the new API.
2016-04-29 12:18:40 +02:00
Christophe Simonis 6c8141a1df [MERGE] forward port of branch saas-10 up to 2483327 2016-04-01 16:15:35 +02:00
Christophe Simonis ddb0fb2739 [MERGE] forward port of branch saas-9 up to 59d3f63 2016-03-24 16:53:45 +01:00
Martin Geubelle d32abe75b1 [IMP] delivery: usability
* Remove useless field `partner_id` (+ data)
* `delivery.carrier` form view
* 'Install more provider' button
* etc.
2016-03-10 13:41:10 +01:00
Christophe Simonis 1c7f5a45e5 [MERGE] forward port of branch saas-7 up to d016457 2016-02-29 12:30:27 +01:00
Olivier Dony 574eb71dfe [MERGE] Forward-port 9.0 up to 4c1c1ec4d4 2016-02-26 19:04:09 +01:00
Parth Mehta 9aa351a9db [IMP] delivery: margin on shipping price
Allow users to define a percentage on shipping price, in order to cover
up differences between rating and shipping actual price.

Authors:
	Barad Mahendra <mba@openerp.com>
	Parth Mehta <pme@odoo.com>
2016-02-26 11:37:35 +01:00
Nicolas Martinelli 16f698f6be [FIX] sale_margin, delivery: margin at creation
The `purchase_price` is filled in automatically thanks to the onchange
method `product_id_change_margin`. However, when a SO is created
programatically, it is necessary to call manually the method in order to
fill in the field. This is not convenient since the module sale_margin
might not be installed, and crappy workaround (such as the use of
`hasattr`) are necessary.

To avoid this, this fix automatically computes the purchase price at
creation if no value is provided.
2016-02-25 15:46:09 +01:00
Yannick Tivisse 76ed5965b7 [IMP] delivery: Do not open Put in Pack wizard if no related packaging_id
When clicking on the 'Put in Pack' button, do not open the wizard
to select the packaging_id if no packaging_id is available for this carrier
('package_carrier_type').

Example:
- If the carrier is Fedex, it makes sense to open the wizard
- If there are no packaging, it doesn't
2016-02-17 09:15:44 +01:00
Christophe Simonis 9a805c90ed [MERGE] forward port of branch saas-9 up to d70fde0 2016-02-10 18:40:56 +01:00
Christophe Simonis d70fde0330 [MERGE] forward port of branch saas-7 up to cab5c48 2016-02-10 18:37:01 +01:00
Denis Ledoux c2d230ad68 [MERGE] forward port of branch 9.0 up to 47bb1bd 2016-02-10 15:55:48 +01:00
Goffin Simon fbf6f2cd9b [FIX] delivery: Delivery method without redirect on courier provider's website
A UserError must be sent if the delivery method set on the delivery order
has no redirect on courier provider's website.

opw:668960
2016-02-10 14:46:11 +01:00
Christophe Simonis 04416a5a6f [MERGE] forward port of branch saas-9 up to 469e04e 2016-02-02 14:55:52 +01:00
Christophe Simonis 469e04e97c [MERGE] forward port of branch saas-8 up to 2611a81 2016-02-02 14:52:15 +01:00
Christophe Simonis e765569d04 [MERGE] forward port of branch 9.0 up to f0a63e5 2016-02-02 14:44:39 +01:00
Christophe Simonis f0a63e5913 [FIX] delivery: avoid calling unknown method.
Only call `product_id_change_margin` method if exists. This method is
defined in `sale_margin` module, but as there is no dependency between
modules (nor a bridge module), the call have to be done here.
2016-02-02 14:31:30 +01:00
Richard Mathot 7e3d6e92b6 [IMP] delivery: hide real shipping cost on DO 2016-02-02 14:18:00 +01:00
Richard Mathot 36fbbc46e1 [ADD] delivery: environment field
This field is used in all delivery carriers to determine if they call
the test or the production API.
2016-02-02 14:01:35 +01:00
Christophe Simonis fbd5fab238 [MERGE] forward port of branch saas-6 up to 9ca7ad8 2016-02-02 13:18:33 +01:00
Martin Geubelle 2ff3749064 [ADD] delivery: package editable after put in pack
* It is sometime useful to be able to set the package type and the package weight during the delivery
* These fields can be edited during the 'put in pack' operation or after, with a button in the view
* As the weight is computed, a new field 'shipping_weight' has been added
* These fields (package type and weight) will be used in the delivery carrier for the shipping
* Packaging types are now handled in a centralized way for all shippers
2016-02-01 16:04:02 +01:00
Nicolas Martinelli a5c8846653 [IMP] delivery: add product_qty to SO line
Add the normalized quantity to the SO line. This field is useful for
delivery carriers, since the package price depends on the weight, which
is always defined as a function fo the product UoM.

opw-667594
2016-02-01 13:04:32 +01:00
Richard Mathot dc043cf1bb [IMP] delivery: allow to set delivery price from XML-RPC call
(a method that returns nothing is not callable through XML-RPC)
2016-01-27 14:55:51 +01:00
Christophe Simonis 4852d6033d [MERGE] forward port of branch saas-8 up to 99b6cd8 2016-01-07 18:21:13 +01:00
Christophe Simonis e502b3ea1f [MERGE] forward port of branch 9.0 up to 833fe49 2016-01-06 16:09:34 +01:00
Martin Trigaux 8b4f052a38 [MERGE] Forwardport of branch saas-6 up to c649bb0df 2016-01-05 18:28:06 +01:00
Richard Mathot 108f66d69e [IMP] delivery: HS codes for product
HS Code is a standardized code used to describe products categories, and
facilitate customs clearance.
(https://en.wikipedia.org/wiki/Harmonized_System)

Some international transporters require HS codes and use them. We allow
users to store them on product.template's.
2015-12-23 16:03:09 +01:00
Richard Mathot 48cdd1e77f [FIX] website_sale_delivery: unavailable carriers don't hide the other ones anymore
Backport of 48156efcd9 + 44f6409731 that fixed the problem in next versions
Revert of da563bcf5c that hid warning for users in backend

One day, we will have to refactor website_sale_delivery. But today, we are the dung beetles.
2015-12-11 16:16:27 +01:00
Denis Ledoux da563bcf5c [FIX] delivery: Ensure carrier availability iteration after a fail
With a UPS delivery type carrier,
`ups_get_shipping_price_from_so` can return a `ValidationError`,
making the carrier unavailable for this order.
Nevertheless, the iteration checking the availability of the remaining
carriers must be ensured.

opw-657161
2015-12-10 18:28:17 +01:00
Christophe Simonis 4022493c0b [MERGE] forward port of branch 9.0 up to da2b88b 2015-12-09 16:44:05 +01:00
Richard Mathot fe85d40831 [FIX] delivery: correct 3df1ff5a9b 2015-12-07 16:55:21 +01:00
Richard Mathot 3df1ff5a9b [FIX] delivery: improved version of 2394d267fe
Since a2b94b0b6d, we already push the cost
of deliveries on the DO (it may be a grid or a carrier).
So we simply harmonize the behavior: when a DO is transferred,
_add_delivery_cost_to_so() is always called (it will check whether the
delivery costs are to be added to the SO or not)
2015-12-07 16:51:11 +01:00
Richard Mathot 030ba411a2 [REV 2394d267fe.
Merged too fast. Sorry for the disturbance.
2015-12-07 16:31:41 +01:00
Martin Geubelle 2394d267fe [FIX] delivery: add delivery cost on SO on transfer
The delivery cost was only added if the delivery type was not fixed or base_on_rule. This distinction has not place in the code.
2015-12-07 16:29:08 +01:00
Martin Geubelle a2b94b0b6d [FIX] delivery: add carrier_price on picking
Carrier price is now copied to the picking from the sales order in all
cases. Before this commit, delivery grids were ignored.
2015-12-07 16:26:52 +01:00
Christophe Simonis d490630745 [MERGE] forward port of branch 9.0 up to b293953 2015-11-25 16:18:10 +01:00
Richard Mathot 9e35833672 [FIX] delivery: A return picking should not copy the carrier of its originating picking.
Furthermore, we do not support returns in our shipping providers integrations. Maybe one day...
2015-11-18 12:25:25 +01:00
Christophe Simonis 1ea583b0ec [MERGE] forward port of branch 9.0 up to 14799a9 2015-11-09 10:40:45 +01:00
Nicolas Martinelli f0ed54fc46 [FIX] delivery: shipping cost on delivery order
If the delivery method chosen is NOT an external provider (such as
Fedex, UPS...), the shipping cost is not set on the delivery order.

This fix will search for any shipping cost on the associated sale order
and will update the shipping cost accordingly on the delivery order.

opw-653328
2015-11-04 10:00:51 +01:00
Christophe Simonis 0a07be8190 [MERGE] forward port of branch 9.0 up to 87a8896 2015-11-03 13:14:23 +01:00
Nicolas Martinelli a1d3be1546 [FIX] delivery, hr_timesheet, lunch, product_uos, purchase, sale: unsupported digits_compute
The new API does not support the keyword `digits_compute`, `digits`
should be used instead.

opw-653092
2015-11-02 09:35:38 +01:00
Richard Mathot 09f8216314 [IMP] delivery,procurement,stock: terms disambiguation
Avoid confusion among Carriers/Delivery Methods/Delivery Types
2015-10-21 09:23:07 +02:00
qdp-odoo 827da65435 [REF] delivery: removed dead code 2015-10-08 08:50:22 +02:00
Richard Mathot 7ac04d409e [FIX] delivery: invoice actual shipping cost
Since commit 78cc0b95f4, there was no more
way to invoice the actual price of a shipping (after the transfer).

In order to make that available again, we introduce a new field on the
sale order. This field automatically detects whether a sale order
contains a "delivery" line or not, at sale order confirmation
(action_confirm).

When the delivery order is processed, the actual shipping cost is thus
repercuted on the sale order if and only if the shipping price was not
"forced" at the sale order confirmation.

(and a few refactoring to avoid copy-pasting code lines)
2015-09-28 17:25:44 +02:00
Christophe Simonis 57168a9e90 [MERGE] forward port of branch saas-6 up to a669433 2015-09-23 14:34:26 +02:00
Richard Mathot 8c8fee29ea [FIX] delivery: it is better when parameters are passed in the right order 2015-09-22 11:14:47 +02:00
Richard Mathot ec7fb80775 [REM] delivery: unused field for now, should not have been merged in a223111b92 2015-09-21 10:20:03 +02:00
Nicolas Martinelli 78cc0b95f4 [FIX] delivery: remove deprecated methods and field
Due to new Sale module
2015-09-11 15:42:28 +02:00