Commit Graph

3057 Commits

Author SHA1 Message Date
Christophe Simonis 59d82e6fe7 [MERGE] forward port of branch 7.0 up to 5042d91 2015-04-07 13:36:01 +02:00
Martin Trigaux 49e7e67a27 [FIX] mrp: allow same product on different bom line
Relax the constraint on BoM to allow to have two different lines with the same
product. As the error message says, the purpose of the constraint was to forbid
having the manufactured product as one of the components but had this side
effect.
Such scenario of the same product twice makes sense when using the date
attributes on the lines (e.g. changing quantities)
opw 621468
2015-04-02 16:06:14 +02:00
Christophe Simonis 6b70b80a0e [MERGE] forward port of branch 7.0 up to 881c10b 2015-03-25 17:41:53 +01:00
Loïc BELLIER 881c10b8ec [FIX] mrp: group attribute position
group_mrp_properties is intended for the property_ids field only, not the other
parts in the "Properties" page (probably wrongly named)
2015-03-25 15:25:22 +01:00
Nicolas Martinelli 52649934e3 [FIX] mrp: constraints capacity_per_cycle to be strictly positive
A capacity per cycle only makes sense if it is strictly positive. This also prevents to
divide by zero in _bom_explode.
2015-03-19 11:33:04 +01:00
Denis Ledoux 8c150c609e [MERGE] forward port of branch 7.0 up to 7530d28 2015-01-15 13:37:30 +01:00
Ravi Gohil 7530d28183 [FIX] mrp: production traceability
Upstream traceability on produced goods (serial number on finished product) was
broken due to wrong values in cache for production.move_lines2 after production.
Refresh the value of production after each action_consume to make such the state
of the cache is correct. opw 609450

Similar fix for manufactruing order not going in done state in some specific
configrations (e.g. some components being phantom BOM).
Again due to wrong cache state after consumption. opw 610515
Fixes #1296
2015-01-15 12:04:23 +01:00
Denis Ledoux a692c6e934 [MERGE] forward port of branch 7.0 up to f406847 2015-01-15 11:49:28 +01:00
Denis Ledoux 30a7bea024 [FIX] mrp: prevent creating production lines when testing if production is of product type
The method test_if_product, used in the workflow to test that the mrp production is for a product (!= service), used to call the method _action_compute_lines in order to compute the production lines and determine from them the production type.

The thing is, the method _action_compute_lines, despite the fact it returns the lines of the production, actually creates the lines. So, just to test if the production was of product type, the productin lines were created, in database.

This rev. introduces a _prepare_lines method, which returns the computed production lines, without actually creating them in database, so the test_if_product method can test if the production is of product type without creating the production lines.

Therefore, production lines are now computed and created during the action_compute method, instead of computing them when the production was tested to get the production type.

Computing the lines before the action_compute has as side effect to not set the scheduled date of the work orders in module mrp_operations, at MO confirmation (as, on confirmation, the action_compute method is called only for productions for which the lines are not yet computed, and mrp_operations overide action_compute to set the scheduled date)

opw-620189
2015-01-14 15:37:27 +01:00
Akash Balar 70a51cd761 [FIX] mrp : skip lines not within date range specified on BOM
As date_start and date_stop are date field and not datetime, should use
DEFAULT_SERVER_DATE_FORMAT for search. opw 619592
2015-01-14 12:10:46 +01:00
Olivier Dony d0cd92bb9f [I18N] Sync updated 7.0 translations from Launchpad 2015-01-07 17:57:28 +01:00
Christophe Simonis 2ed212dcbf [MERGE] forward port of branch 7.0 up to d6daf5f 2014-12-03 17:51:06 +01:00
Benoit Guillot bc2a52fb28 [IMP] mrp: add prepare method for manufacturing orders to allow override
Fixes #3973
2014-12-03 10:48:23 +01:00
Denis Ledoux 02f4f9a572 [MERGE] forward port of branch 7.0 up to e2dd18f 2014-11-26 12:35:36 +01:00
Denis Ledoux e2dd18f1e7 [FIX] mrp: prevent recursion from phantom boms with no lines
if the bom is phantom and has no line, we attempt to find a new bom with the default product uom
This is possible that we find the same bom that the current one
In such a case, we must not explode, to avoid recursion.
2014-11-26 12:34:45 +01:00
Denis Ledoux 6c13c8d966 [MERGE] forward port of branch 7.0 up to 529e920 2014-11-19 14:06:48 +01:00
Denis Ledoux 529e920b2c [FIX] mrp: perform location chaining for kit exploded moves
This rev. 7307227 ensured to not (re-)set the state 'confirmed' to exploded moves with a more advanced state (for instance, 'assigned')
Nevertheless, the location chaining is performed on the move confirmation, through the action_confirm method of the stock.move model. Besides, the resulting moves of the _action_explode method had the state 'confirmed' on creation, the 'confirmed' state wasn't set by the method 'action_confirm', meaning that the moves were confirmed without having the location chaining done. Allowing moves to go through the action_confirm method even if the state was 'confirmed' or further triggered the location chaining.

Preventing already confirmed moves to go through the action_confirm method prevented the location chaining, thus.

We now create the resulting moves with the 'draft' state, and then confirm them through the procurement workflow signal 'button_confirm'. Thus, the resulting moves are confirmed by going through the action_confirm method, writing the confirmed state and triggering the location chaining at the same time. We then write the 'assigned' state if necessary.

opw-617235
2014-11-19 14:04:05 +01:00
Christophe Simonis e74fb09a00 [MERGE] forward port of branch 7.0 up to ab5ecef 2014-11-12 10:56:38 +01:00
Martin Trigaux e27afc13cb [FIX] mrp: prevent suppression of bom if used in mo
The field bom_id is required on a manufacturing order and deleting a mrp.bom would block the current mo.
Restrict the suppression for manufacturing order in progress.
Fixes #3417
2014-11-10 15:37:53 +01:00
Denis Ledoux c666030539 [MERGE] forward port of branch 7.0 up to cd69dee 2014-11-05 13:39:41 +01:00
Julien Legros 61a8971db5 [FIX] mrp: chain product move and MO locations
When validating a SO containing a `make to stock` + `manufacture` product
(with bom + orderpoint), we have the following stock moves:
* Product move
* Manufacturing order
Selling 1 such product would yield 2 as incoming quantity, an
inconsistency that this commit solves by setting the location_id of the
product move to the MO's location_dest_id (in the same fashion that
the create_pickings method does in an mts/buy case)

opw-616229
2014-11-05 12:44:02 +01:00
Denis Ledoux ff0f92acfa [MERGE] forward port of branch 7.0 up to 7307227 2014-09-03 18:26:53 +02:00
Denis Ledoux 73072272de [FIX] mrp: do not reset back stock moves to confirm
For instance, setting a BOM Phantom with:
Finished product: stockable, MTO Manufacture
Components: stockable, MTS, Buy. Inventory set to 1000
Stock moves of components are directly set to assigned once the procurement confirmed thanks to JIT
The stock moves should not be set back to confirmed after they have been assigned
2014-09-03 18:25:19 +02:00
Olivier Dony 96c36e895c [I18N] Update all 7.0 translation templates with latest terms and annotations
Total new terms: 168
Total deleted terms: 95
Total identical terms: 16329
(Some modules skipped, typically all l10n_* modules)
2014-08-14 02:24:24 +02:00
Christophe Simonis bf53aeda94 [MERGE] forward port of branch 7.0 up to e5533d0 2014-06-19 15:32:32 +02:00
Najlaâ El Khayat e7285c6e1d Production : Source location of the BOM
Use the source location defined on the current MO's routing not directly on the BOM
2014-06-19 14:51:32 +02:00
Olivier Dony 2af03e1b6e [MERGE] Forward-port latest 7.0 bugfixes, up to f8671cb 2014-05-22 16:44:33 +02:00
Olivier Dony 02035b27b8 [RESTORE] Restore *.sxw files, skipped during bzr-to-git conversion to discard older binary blobs 2014-05-22 14:07:15 +02:00
Launchpad Translations on behalf of openerp f173d926c8 Launchpad automatic translations update. 2014-05-13 06:28:52 +00:00
Launchpad Translations on behalf of openerp f426972e37 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140430070138-uuemdpfseyysxlvs
bzr revid: launchpad_translations_on_behalf_of_openerp-20140502064550-9r0c2t3tr8dp1hwu
bzr revid: launchpad_translations_on_behalf_of_openerp-20140501063929-ta3t6lhed5dpdz9a
bzr revid: launchpad_translations_on_behalf_of_openerp-20140502064608-1zwt52snc5pg5kfi
bzr revid: launchpad_translations_on_behalf_of_openerp-20140504062721-dgb7m6o6ge2btumg
2014-05-04 06:27:21 +00:00
Anael Closson e3ecf7f4d4 [FIX] en_US typos - opw 606919
bzr revid: acl@openerp.com-20140422085837-9flv9ksh54ymvv7i
2014-04-22 10:58:37 +02:00
Launchpad Translations on behalf of openerp 001a034e58 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140412094159-mhy3v2prb3ctx32k
bzr revid: launchpad_translations_on_behalf_of_openerp-20140412094217-3u3f03f0wjhbzyo4
bzr revid: launchpad_translations_on_behalf_of_openerp-20140413062047-z833pejjrtuhfygs
bzr revid: launchpad_translations_on_behalf_of_openerp-20140414055948-intynzk8l823ukei
2014-04-14 05:59:48 +00:00
Christophe Simonis 4a701cb168 [MERGE] forward port of branch 7.0 up to revid 9956 odo@openerp.com-20140404135145-t8b0m2ijcq3y8sh6
bzr revid: chs@openerp.com-20140404161713-8w2c9y05l4dzzd9s
2014-04-04 18:17:13 +02:00
Lionel Sausin a386aea7d3 [FIX] revert to v7 report API
bzr revid: ls@numerigraphe.com-20140404124036-1vt0fkakfllj1qax
2014-04-04 14:40:36 +02:00
Martin Trigaux af64d6cc97 [FIX] changes made at merge time into the trunk - remove offending test
bzr revid: ls@numerigraphe.com-20140404123655-9ihrychuho6n6qt2
2014-04-04 14:36:55 +02:00
Foram Katharotiya (OpenERP) bae4c6ce40 [IMP] bring back the tests for MRP - backported from little after v7.0 in the trunk
lp bug: https://launchpad.net/bugs/1182515 fixed

bzr revid: ls@numerigraphe.com-20140404123003-cdt5zz1vmupbgd1j
2014-04-04 14:30:03 +02:00
Launchpad Translations on behalf of openerp 16ce262c33 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140329073038-m7q4sxpb8tprh00r
bzr revid: launchpad_translations_on_behalf_of_openerp-20140330061549-r3t0pecngy76c2rw
bzr revid: launchpad_translations_on_behalf_of_openerp-20140331064021-x3wjc8s4oa0ncq95
bzr revid: launchpad_translations_on_behalf_of_openerp-20140401065325-w3viflz7c33n4uis
bzr revid: launchpad_translations_on_behalf_of_openerp-20140402064459-d7e3d8nwo8famjh6
2014-04-02 06:44:59 +00:00
Launchpad Translations on behalf of openerp 2fa6706037 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140321065150-vovy9a0q2y6vkwm4
2014-03-21 06:51:50 +00:00
Launchpad Translations on behalf of openerp 1f3c4f852f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140319063002-sd17jxb37ycogrrz
bzr revid: launchpad_translations_on_behalf_of_openerp-20140320061944-bwpy0lt1bp5ee0y2
2014-03-20 06:19:44 +00:00
Launchpad Translations on behalf of openerp 9965b2c434 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140315072920-dmiymtbhrgu87wm0
bzr revid: launchpad_translations_on_behalf_of_openerp-20140316060652-akf1fti2hc1a9vmm
bzr revid: launchpad_translations_on_behalf_of_openerp-20140317050959-2xx2aoylhn6a28fo
2014-03-17 05:09:59 +00:00
Denis Ledoux 74af3ac0fe [MERGE] Forward-port of latest saas-2 bugfixes, up to rev. 9144 revid:dle@openerp.com-20140310133913-465x5t3n1bo7fu98
bzr revid: dle@openerp.com-20140310143600-kz7qjfe4p63s0a34
2014-03-10 15:36:00 +01:00
Denis Ledoux c2ba11e72e [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9885 revid:dle@openerp.com-20140310114026-r0ijm0m36su19wn7
bzr revid: dle@openerp.com-20140310122101-gicombyc5ii0yz6a
2014-03-10 13:21:01 +01:00
Launchpad Translations on behalf of openerp f166daf065 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140308065427-0he29w0cqe07xmc8
bzr revid: launchpad_translations_on_behalf_of_openerp-20140308065421-4udfyb7xcfq5h1zy
bzr revid: launchpad_translations_on_behalf_of_openerp-20140309060314-64jktl10pkq3inv4
2014-03-09 06:03:14 +00:00
Launchpad Translations on behalf of openerp fd98bf36aa Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140307072427-zkvqj45icrzupx0m
bzr revid: launchpad_translations_on_behalf_of_openerp-20140307072433-0lqpjt07j1s8k8cs
2014-03-07 07:24:33 +00:00
Martin Trigaux 5db649549c [IMP] mrp: use also the ceiling method from product
bzr revid: mat@openerp.com-20140306094504-37r691hxcemp0ual
2014-03-06 10:45:04 +01:00
Launchpad Translations on behalf of openerp b201dc79b7 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140218054104-8egkh4jj7hiiwuih
bzr revid: launchpad_translations_on_behalf_of_openerp-20140219054048-688twg0fubtm2x2q
bzr revid: launchpad_translations_on_behalf_of_openerp-20140220054214-237ri67t9rw3l4fu
bzr revid: launchpad_translations_on_behalf_of_openerp-20140221063855-wniw42r27gyg3h6y
bzr revid: launchpad_translations_on_behalf_of_openerp-20140222073328-xpn7nwqz407yzumq
bzr revid: launchpad_translations_on_behalf_of_openerp-20140223074516-0r09cpmma58ylqji
bzr revid: launchpad_translations_on_behalf_of_openerp-20140224060319-535oheaq2w9u2ye3
bzr revid: launchpad_translations_on_behalf_of_openerp-20140225062420-zl7curej0e0warhz
bzr revid: launchpad_translations_on_behalf_of_openerp-20140226073146-3vzhw4hddr81olbs
bzr revid: launchpad_translations_on_behalf_of_openerp-20140227062959-24e2rn98rqb9afpr
bzr revid: launchpad_translations_on_behalf_of_openerp-20140228072152-f9gm4ud1wu19ge27
bzr revid: launchpad_translations_on_behalf_of_openerp-20140301055205-r0df0fqz9yf5z66i
bzr revid: launchpad_translations_on_behalf_of_openerp-20140302052638-bjf11oumy7w15oco
bzr revid: launchpad_translations_on_behalf_of_openerp-20140304082704-k1z2te1tfud43zy3
2014-03-04 08:27:04 +00:00
Launchpad Translations on behalf of openerp 19ba8c54c9 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140214074449-flu4n6hfh9nua9t3
bzr revid: launchpad_translations_on_behalf_of_openerp-20140214074835-2p2r1vb6ucynbspm
2014-02-14 07:48:35 +00:00
Launchpad Translations on behalf of openerp faf6d33bc0 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140213064742-xiotlx8wzfhexnhc
2014-02-13 06:47:42 +00:00
Olivier Dony bbd813e76e [MERGE] Forward-port of latest saas-2 (incl. 7.0) bugfixes, up to rev. 9127 odo@openerp.com-20140212122042-3m2tysmr31mtecnc
bzr revid: odo@openerp.com-20140212175141-i9yz8zlseglrk8sb
2014-02-12 18:51:41 +01:00
Launchpad Translations on behalf of openerp 9554c144ff Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140212062357-8n13ec90bnclm1ek
2014-02-12 06:23:57 +00:00