Commit Graph

920 Commits

Author SHA1 Message Date
Denis Ledoux cf4d14ce39 [MERGE] forward port of branch saas-3 up to 09b277c 2015-04-27 14:02:52 +02:00
Denis Ledoux d6ae7fb7db [MERGE] forward port of branch 7.0 up to 3e7d3c7 2015-04-27 12:19:43 +02:00
Martin Trigaux 316be12a3c [FIX] purchase: mark order as invoiced when fully invoiced only
Make sure the purchase order is marked as invoiced only when fully invoiced.
If the invoices are generated on delivery order (invoice_method picking), make
sure all products are delivered before setting it as invoiced.
opw 614256
2015-04-24 10:46:42 +02:00
Nicolas Martinelli 4a7159ca78 [FIX] purchase: merge RFQ if same currency and merge order lines in appropriate RFQ
- RFQ of same currency are merged (fixes #5901 and opw: 632594)
- Merge order lines in the appropriate RFQ
2015-04-15 14:10:27 +02:00
Martin Trigaux cbd396d3da [FIX] purchase: use order date to set the picking date
When creating a pickign from a purchase order, do not use the schedule date
('date_planned') to specify the creation date ('date') of a picking.
There is already field called Scheduled Date ('min_date') and Max Expected Date
('max_date') that can display this information, this is redundand.

Fixes #4352
2015-04-02 17:48:35 +02:00
Josse Colpaert 20312e2880 [IMP] Deleting PO lines should work the same way as Cancelling PO
Also the test is adapted.  When a product as treated as MTO, it should not
without notice change to an MTS.
2015-03-13 13:58:19 +01:00
Christophe Simonis c0496ed03a [MERGE] forward port of branch saas-3 up to f8a9405 2015-03-10 18:00:43 +01:00
Christophe Simonis f8a94057e5 [MERGE] forward port of branch 7.0 up to a5e3269 2015-03-10 17:51:16 +01:00
David Monjoie 6758b4cfc5 [FIX][REF] purchase: prevent confirming order if no stockable item
After discussing with jco, we decided to keep it simple and have a coherent behavior between different versions, we then changed the behavior from the one of jbefficient PR at 92adf673f7.
2015-03-10 14:22:32 +01:00
Christophe Simonis 416f0246ac [MERGE] forward port of branch saas-3 up to 4a3c471 2015-03-09 12:03:22 +01:00
Christophe Simonis 4a3c4713e9 [MERGE] forward port of branch 7.0 up to 209ce6f 2015-03-09 11:24:32 +01:00
jbeficent a81a7513b2 [FIX] purchase: prevent user to confirm a purchase order when there is a service product in it and invoicing is based on incoming shipments
Fix for issue 3492 and opw 628377
2015-03-04 11:37:54 +01:00
Goffin Simon 631d2f7146 [FIX] purchase: pricelist and related currency mismatch on purchase order (Bid received).
pricelist must be readonly when currency is readonly because there 's an onchange on currency which depends
on the pricelist.

opw:627009
Fixed #4598
2015-03-02 08:44:45 +01:00
Denis Ledoux 31527c9a36 [MERGE] forward port of branch saas-3 up to 4c7e078 2015-02-17 11:10:10 +01:00
Denis Ledoux 550910a8f6 [MERGE] forward port of branch 7.0 up to a87d60f 2015-02-16 18:26:45 +01:00
Denis Ledoux 11bd7a6774 [FIX] purchase: order line description being reset on qty change
The name must be changed when changing of product,
but not for other changes, quantity for instance.
The 'or not uom_id' is just for retro-compatibility concerns
uom_id being False actually means we just changed of product,
and the name must therefore be changed
name as been set as False in the onchange call in the view
for the product_id field, in this rev.,
so the name being False now means th change of product
Nevertheless, existing databases for which the view
is not up to date won't have this change
and we therefore have to rely on something else to know
when the product has been changed or not.

fixes #5295
opw-628138
2015-02-16 14:22:15 +01:00
Martin Trigaux 20e3f33ebd [FIX] purchase: get supplier from the procurement company
The seller_id field is a related that is read administrator so it would fetch
the first line, whatever the company specified.
Setting related_sudo=False would not be enough as creating purchase orders
through the scheduler makes the computation done as administrator.
Use the company of the procurement (required) to search for a supplier.
If no result, fallback on the first one as before.

Fixes #3833, opw 618809
2015-02-13 15:07:45 +05:30
Denis Ledoux 0b18a5afec [FIX] purchase: purchases button on product variants
This rev. is related to 8381d47543

The action action_purchase_line_product_tree is used in both
product templates and product variants forms.
Therefore, the default_product_id: active_id in the context
cannot be used,
As sometimes it will active_id will be a product template,
sometimes it will be a product variant.

I believe two different window actions should be used,
instead of sharing a common one and making hacks.
Nevertheless, as we avoid taking risks in stable releases
This should be done in master.
2015-01-27 10:37:49 +01:00
Martin Trigaux 8598231763 [FIX] purchase: maximum recursion when write on minimum_planned_date
Do not write on the function field when you are writing on the function field.

- Now you do know what orders is right?
- I think I know...
- Orders is orders.
- I guess no one ever taught you not to use the word you're defining in the definition.
   ~~Lucky Number Slevin
2015-01-22 14:37:53 +01:00
Jeremy Kersten 38f0e59d37 [FIX] Purchase: replace SQL by ORM because ORM replace date=False by date is null automatically. Fix #4691 2015-01-16 12:53:07 +01:00
Josse Colpaert 6ea0cc41b9 [FIX] Drop shipping invoice correction
When invoicing from dropshipping picking, choose the correct partner.
Also, change the partner on the picking to be the partner of the purchase.
Change the picking report to include the destination partner or the warehouse address on the right.

[IMP] Only put partner_id on move from purchase when really necessary

[FIX] Default value of partner on stock move should be False
2015-01-06 15:21:35 +01:00
Josse Colpaert 6f8546dfb5 [FIX] Make sure we can select dropship on purchase order and see the related customer and invoicing based on shipments works for sale only
[FIX] Sale should lead to invoicing
[IMP] Journal should not depend on picking type code when in dropship

Make sure drop shipment with invoicing on sale orders only, works.
Also the picking type of dropshipping should be incoming.  This
makes it possible to select it on the purchase order.  This also fixes #3421.
And we can create a dropship from a purchase only. (not the good way)
For this, we make the invoicing based on the shipment look at the
purchase related and not on its picking type code as the picking type
of dropshipping is changed back to incoming.
The purchase order will also show the customer address when in
a dropship case.

Closes #3421
2014-12-17 17:10:40 +01:00
Denis Ledoux 162eb84438 [MERGE] forward port of branch 7.0 up to f46fa1d 2014-12-12 15:44:44 +01:00
Martin Trigaux 940b5beb26 [FIX] purchase: cancel PO lines and set related procurements in exception on cancelation of a PO 2014-12-11 14:15:56 +01:00
Josse Colpaert c12f4efc53 [IMP] Cancelling of procurements related to purchase orders should check state/UoM of the purchase order line + optim action_cancel
[IMP] Add tests

[IMP] Clean up
2014-12-08 17:03:16 +01:00
Mart Raudsepp 7a979b2d3e [FIX] Fix floating point handling in purchase _prepare_order_line_move
Without this better floating point handling, an extra stock move might
be created for zero quantity for some order lines upon PO confirmation,
because qty is equal to something closer to e.g 1.14e-13, but this is
larger than 0, so it creates a stock.move, which gets rounded too late
to 0.0

Closes #3346
2014-12-03 16:10:58 +01:00
Josse Colpaert 506c52bcd1 [FIX] Avoid access error on XML id in browse when choosing picking type for manual purchase order. As they are ordered by sequence, just take the first you can find. 2014-11-18 17:22:32 +01:00
Denis Ledoux 7ab413724a [MERGE] forward port of branch 7.0 up to da15c9d 2014-11-14 15:59:33 +01:00
Martin Trigaux 7f4c4a5e8a [IMP] purchase: error message linked to product, not company 2014-11-14 12:24:31 +01:00
Josse Colpaert 518b2f6a3f [FIX] super of scheduler / delivery method and phantom boms / average price
[FIX] super of scheduler should have same params + use_new_cursor should be passed to procure orderpoint confirm

[IMP] Make sure the delivery works when doing phantom boms

[FIX] This should update the average price properly when having multiple moves with the same product

[FIX] Average price should take into account the quantities of all variants

[FIX] Make sure purchase picking type in other company works

[IMP] Views of quants and destination locations of moves
2014-11-13 11:50:01 +01:00
Josse Colpaert 86f785ae1b [FIX] #3153 Digits in wizard should be those of moves,... / Recreate delivery order from sale / Delivery method on delivery order
[IMP] Provide better purchase order picking type

[IMP] Possibly a better product uos handling in the sale order line

[FIX] Recreate of delivery order when sales order in shipping exception

[FIX] Delivery method should be passed to delivery order
2014-11-13 11:50:01 +01:00
Josse Colpaert 06de55649b [FIX] Correct price correction courtesy of richard_willowit #2983 #2985 2014-10-17 17:38:38 +02:00
Josse Colpaert fa2461036b [FIX] Use currency of pricelist when creating PO from procurement 2014-10-13 21:33:13 +02:00
Christophe Simonis 388f1a1d7e [MERGE] forward port of branch saas-3 up to 3d4b82c 2014-10-01 16:46:03 +02:00
Denis Ledoux 3d4b82cd56 [MERGE] forward port of branch 7.0 up to 9cc54dc 2014-10-01 12:41:42 +02:00
dhr-odoo 3c9df6a71f [FIX] purchase: minmum purchase quantity and float precision (opw 610557) 2014-09-30 17:04:04 +02:00
Denis Ledoux 143d024904 [FIX] purchase: do not reset price_unit on qty or uom change
only when the product is actually changed
2014-09-30 10:41:19 +02:00
Denis Ledoux 5bd0249515 [MERGE] forward port of branch 7.0 up to a218a9e 2014-09-18 16:05:34 +02:00
Josse Colpaert 5aeccbd90e [IMP] Use display_name instead of partner_ref 2014-09-17 21:42:07 +02:00
Josse Colpaert 066af964bf [IMP] Purchase on incoming shipments with services added 2014-09-17 21:41:42 +02:00
Josse Colpaert 0f9a9fbae3 [IMP] Purchase order wkf optim 2014-09-17 21:41:42 +02:00
qdp-odoo 8973217ea7 [FIX] stock/purchase: dates and currency rates
Use the currency rate of the purchase date instead of the one of at the reception time (opw 610430)
2014-09-17 18:04:41 +02:00
Josse Colpaert ae2eb43e30 [IMP] Implement comments on pull request 2014-09-12 13:49:42 +02:00
Josse Colpaert d38fafdee8 [IMP] Put wkf_action_cancel back, so the method does not call itself recursively (issue 2079) 2014-09-12 13:49:42 +02:00
Josse Colpaert a0d855ffad [IMP] Inter-company pricing: put price on move when only partner and not connected to sale or purchase + invoice_state inverse function 2014-09-12 13:49:41 +02:00
Josse Colpaert 064b1a3a40 [IMP] Old hack where uom_id had to be empty in on_change
[IMP] Add purchase order origin on picking

[WIP] Picking type on move for location on routing

[IMP] Provide extra function for custom buttons on picking

[IMP] Action assign optim

[IMP] Push apply should take invoice_state into account.  Propagation of cancel of stock moves should depend on procurement rule
2014-09-12 13:49:41 +02:00
Josse Colpaert ff308c2152 [IMP] Make sure we can do dropship where the purchase is invoiced on incoming shipments 2014-09-03 19:18:16 +02:00
qdp-odoo cc7bc21a9d [FIX] purchase: set the commitment date as the max of scheduled dates when creating a picking from a PO, instead of leaving it at the current time (validation) which just doesn't make sense 2014-07-18 12:17:54 +02:00
Josse Colpaert 0aad6b0498 [IMP] Check other comments on pull request: xmlid, no split in context + continue improve receipts instead of receptions 2014-07-16 11:58:22 +02:00
Josse Colpaert 32dd003d60 [MERGE] Resolve conflicts 8.0 2014-07-13 09:27:20 +02:00