Commit Graph

3452 Commits

Author SHA1 Message Date
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
Aaron Bohy ba37ae3cf3 [DEL] Cleaning: key 'images' removed from all __openerp__.py 2015-01-06 14:20:38 +01:00
Josse Colpaert d2d4a3bb71 [IMP] When cancelling MO, cancel the procurements of the consume lines related 2014-12-17 14:58:31 +01:00
Christophe Simonis 5ca7fa18fc [MERGE] forward port of branch 8.0 up to 31a01ea 2014-12-03 19:24:57 +01:00
Christophe Simonis 2ed212dcbf [MERGE] forward port of branch 7.0 up to d6daf5f 2014-12-03 17:51:06 +01:00
Holger Brunn 8eae018b27 [FIX] mrp: keep traceability of procurement.group
Pass group_id information when a manufacturing order is created from
a procurement to keep a better traceability and know the reason of stock.move
creation.
Fixes #4019
2014-12-03 17:30:44 +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
Josse Colpaert b6f3795e33 [IMP] Manufacture should be by default in all warehouses 2014-12-03 10:13:46 +01:00
Josse Colpaert 8c8056d95f [IMP] Query should pass through orm and as such the refreshes can be removed in the code, which will go faster as it is done automatically by the new api 2014-12-02 16:38:36 +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
Holger Brunn 7c070561b3 [FIX] mrp: duplicated xmlid for ir.model.access 2014-11-26 11:28:40 +01:00
Martin Trigaux 1b4953c892 [FIX] mrp: allow to select BoM with a product template only 2014-11-25 09:55:21 +01:00
Josse Colpaert 8f20351ef5 [IMP] Show product_uom_qty instead of normalized quantity in mrp order report 2014-11-21 14:55:40 +01:00
Christophe Simonis f51d4ea6d0 [MERGE] forward port of branch saas-3 up to 6c13c8d 2014-11-20 11:37:23 +01:00
Olivier Dony a6d24db305 [I18N] Update translations from Launchpad 8.0 branches 2014-11-19 17:49:12 +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
Josse Colpaert 2f5ca4380a Revert "[IMP] Remove unnecessary refresh statements because of new api"
This reverts commit b213438176.
2014-11-17 09:44:10 +01:00
Josse Colpaert b213438176 [IMP] Remove unnecessary refresh statements because of new api 2014-11-17 09:24:06 +01:00
Denis Ledoux d9e48bae42 [MERGE] forward port of branch saas-3 up to 7ab4137 2014-11-14 16:58:24 +01:00
Raphael Collet b8071bbaca [FIX] addons: incorrect new-api invocation of method write() with context
This fixes #3411.
2014-11-13 13:34:55 +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
Christophe Matthieu a674512739 [FIX] mrp: The attribute on bom lines is not filtered in function of the selected product template 2014-11-07 12:21:30 +01:00
Denis Ledoux 3a7dffd6cc Revert "[FIX] mrp: chain product move and MO locations"
This reverts commit 61a8971db5.

This rev. is from a 7.0 forward port b4d602fdd3379a0310ec0b9a56f9b88226

This is no longer needed in 8.0, with the new WMS
2014-11-05 13:51:52 +01:00
Denis Ledoux 89716cb4d6 [MERGE] forward port of branch saas-3 up to c666030 2014-11-05 13:40:30 +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
Josse Colpaert c589b49afa [FIX] When extra move for consumption lines, copy lot and when producing more than produced, create extra move 2014-10-25 21:30:18 +02:00
kevin wang ef4d8b2df0 [FIX] mrp: traceability of production
When consuming product, the main_production_move is set as the source of production (used for consumed_for parameter)
However the method action_consume now (since 661a204) returns the new moves (when spliting) instead of the original one. This means that the tracebility would fail.
2014-10-17 17:21:30 +02:00
Josse Colpaert 85f1efac61 [FIX] Produce line should be connected to its procurement
[FIX] Better to work through the production_id of the procurement
2014-10-17 13:19:39 +02:00
Olivier Dony 7439421ad2 [I18N] Update translations from Launchpad 8.0 branches 2014-10-08 17:52:25 +02:00
Josse Colpaert 3b46d03255 [FIX] Can not execute line when stop date is EARLIER than current date 2014-10-07 13:57:09 +02:00
Josse Colpaert 884a8ad4a5 [IMP] UoM corrections + Adapt tables in stock doc
[IMP] Float_compare before splitting moves in mrp
2014-09-30 10:31:33 +02:00
Josse Colpaert 661a204eda [IMP] Better demo data + property comment + recheck
[IMP] Recheck should be type object and procure_method read only when not in draft

[FIX] Inversion of moves in the correct way and assigning production_id

As the moves are split the other way, the original move needs to be done.  Also the production_id for linking the
new to be produced moves and the production order must be written on those.

[IMP] Clean
2014-09-30 10:31:33 +02:00
Simon Lejeune 68c8d90221 [FIX] mrp: solve bom structures views
A previous refactoring brought a bom_line_ids field on the mrp.bom, thus
deprecating the _child_compute method. But the previous refactoring did
not go through all the views, breaking everything that relied on the
_child_compute (tree view, report). As the bom_line_ids refers to the
mrp.bom.line model (introduced by this previous refactoring, note:
_child_compute returned mrp.bom record) and that we can't make a treeview
showing different model, this patch introduce a function field _get_child_bom_lines
on the mrp.line model, allowing to go through the bom_line_ids of a mrp.bom.line
if this mrp.bom.line refers to a mrp.bom.

[IMP] Rename bom_line_ids to child_line_ids in mrp_bom_line to avoid confusion
2014-09-30 10:31:33 +02:00
Josse Colpaert 25d2ed6d4b [IMP] Update module descriptions of procurement and product_extended + _bom_find and properties
Module description of procurement was deprecated (talking about mrp, ...) and in product_extended
it described things not implemented in the module.

In _bom_find, we passed a UoM which was not used in Saas-4 and it would not be logical that you
need to select a BoM that matches the UoM, so I removed it.

In the demo data, there was still a push rule which triggered a move from output to pack.  The copy=False
is correct for production_id when you would have these push rules.

For the properties: we want to allow to take a bom which has no properties, but only when there is no other
BoM matching the properties we pass.

Update module descriptions

[IMP] production_id copy + no round

[IMP] _bom_find without uom, property correction
2014-09-30 10:31:33 +02:00
Josse Colpaert 3dcb020373 [IMP] Change documentation + new action_consume/qty/origin corrections
Simplify the action_consume of the consumption lines after the corrections
by Kevin Wang.  Also the UoMs are revised as the action_consume uses the default UoM
of the product.

We have to avoid circular boms where a child bom should not contain the product that
represents the parent bom, but it is possible for example to use another product of the parent bom in
the child bom.

As the consume line move has no procurement rule, its origin will have no description.  So, when there is
none it will also check the description of the previous move (when passed to procurement for example) This way
the chained moves or purchase order for example will have the MO-number as origin and not nothing.

[IMP] Change assignation

[IMP] UoM changes continuation

[IMP] Make sure we can use 2 times the same product in a BoM

[IMP] Source document for consume lines to procurement
2014-09-30 10:31:33 +02:00
Alexandre Fayolle 817e459d43 use warehouse._get_mto_route to get the MTO route
instead of using a custom lookup with a different implementation
closes #2608

pass context as a named argument
2014-09-30 10:31:33 +02:00
kevin wang 58301b99e8 [FIX]keep primary move when split consume raw materials 2014-09-30 10:31:33 +02:00
Josse Colpaert c6c622542b [IMP] UoM in mrp + rereserve of partial 2014-09-30 10:31:33 +02:00
Olivier Dony b74d830eb2 [I18N] Update translation templates with latest term changes 2014-09-23 19:13:50 +02:00
Olivier Dony 1c5b5e4290 [I18N] Update translations from Launchpad 8.0 branches
server: rev. 26 rev-id launchpad_translations_on_behalf_of_openerp-20140923072744-tkfs0yinu8msjh09
addons: rev. 39 rev-id launchpad_translations_on_behalf_of_openerp-20140923072715-5j7qvnuvmmb1zzy1
web: rev. 23 rev-id launchpad_translations_on_behalf_of_openerp-20140923072757-jvh9l6r2x0vfcyhb
2014-09-23 13:42:05 +02:00
Josse Colpaert 277c870de7 [FIX] Previous move subtleties 2014-09-22 11:29:39 +02:00
Olivier Dony 53aa92d3c9 [I18N] Update translations from Launchpad branches 2014-09-18 11:47:16 +02:00
Josse Colpaert f06df3290a [IMP] MO should pass warehouse + improvements on pack_operation_ids when someone would make it visible 2014-09-17 21:41:42 +02:00
Josse Colpaert 636294e1ef [IMP] Scheduled time, weights, remove routing on lines 2014-09-17 21:41:41 +02:00
Josse Colpaert df655f00a3 [IMP] Solve landed costs bug + invoice_state in account_anglo_saxon.yml 2014-09-12 13:50:53 +02:00
Josse Colpaert aabebbbc6c [FIX] Bom qty 2014-09-12 13:49:42 +02:00
Josse Colpaert ae2eb43e30 [IMP] Implement comments on pull request 2014-09-12 13:49:42 +02:00
Josse Colpaert cd462b7c8d [IMP] Invoice_state on move and search custom picking type 2014-09-12 13:49:42 +02:00
Josse Colpaert 82c5aa6774 [IMP] Patch for boms that explode in boms to have the correct quantities courtesy of chm 2014-09-12 13:49:42 +02:00
Josse Colpaert 246c425226 [WIP] Pricelist of purchase is not in stock only and remove product_manufacturer module in view + manufacturer 2014-09-12 13:49:42 +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
Olivier Dony 13be43f8e3 [FIX] mrp: force default values for dropped fields
Those values were dropped at rev 9b34358 but
need to be forced to empty so older databases
get fixed when upgrading
2014-09-10 17:04:48 +02:00
Olivier Dony f39a604faf [FIX] mrp: force empty values for fields that were dropped
This ensures the field values are cleared during
upgrades from previous versions
2014-09-10 14:58:45 +02:00
Olivier Dony bfb29230b7 [FIX] mrp: force empty domain to reset action at upgrade
There was a domain in 7.0 but it must be forced
to empty during upgrade, as the MRP BoM model
has changed.
2014-09-10 09:07:25 +02:00
Olivier Dony fac96241df [I18N] Update 8.0 translations with latest changes from Launchpad 2014-09-08 19:04:25 +02:00
Josse Colpaert 114f66c277 Merge pull request #2027 from odoo-dev/8.0-wmsstaging7-jco
8.0 wmsstaging7 jco
2014-09-03 21:36:01 +02:00
Josse Colpaert b8a40a4e0f [IMP] Clean 2014-09-03 19:19:18 +02:00
Josse Colpaert 7e1919fe0f [IMP] Change static buttons with group_ids each time 2014-09-03 19:19:18 +02:00
Josse Colpaert 6f75507ce7 [WIP] Allow to produce more than the total qty of the production order in the last step 2014-09-03 19:19:18 +02:00
Josse Colpaert f6650f0da7 [IMP] Clean 2014-09-03 19:18:17 +02:00
Josse Colpaert 12d9333f48 [IMP] Clean 2014-09-03 19:18:17 +02:00
Josse Colpaert 9b34358196 [IMP] Adapt mrp workflow and moves + Differ between Bose speakers and Custom Computer 2014-09-03 19:18:17 +02:00
Josse Colpaert 655570fe23 [IMP] Domain on model instead of view + no production order without consume lines 2014-09-03 19:18:17 +02:00
Josse Colpaert 11828c69db [IMP] Phantom BoMs only out of services products should work 2014-09-03 19:18:16 +02:00
Josse Colpaert 28421e1e85 [IMP] Make sure normal products will still work 2014-09-03 19:18:16 +02:00
Josse Colpaert 6a071b049d [WIP] This should be enough to put sale order to delivered when all tasks have been done. Problem is that because of procurement_jit it is creating it twice 2014-09-03 19:18:16 +02:00
Josse Colpaert 1a9eb52341 [WIP] Add link with sale order by duplicating. That way sale order will be delivered when procurement is done 2014-09-03 19:18:16 +02:00
Josse Colpaert 86b8e73482 [IMP] Clean need_procurement and add partner on procurement for Phantom with service 2014-09-03 19:18:16 +02:00
Josse Colpaert 6553e22306 [WIP] Create procurement when Phantom 2014-09-03 19:18:16 +02: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
Fabien Pinckaers 8aca457e34 [IMP] Updated website urls on modules and info page 2014-08-26 21:40:18 +02:00
Olivier Dony 50ef63881a [I18N] Update 8.0 translation with latest source code 2014-08-14 17:01:54 +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
Josse Colpaert 242d25c9c2 [FIX] Don't change to product_uom_qty if not move 2014-08-12 13:37:27 +02:00
Josse Colpaert 5dea263e1b [FIX] Change two-one step wh, multi-comp wh, quantity field float, show product_uom_qty instead of product_qty in mrp production for moves 2014-08-12 13:37:27 +02:00
Josse Colpaert 4aa9ef8224 [IMP] Type manufacturing orders, remove double accounting entries, child_of, push rule global has no route 2014-08-12 13:37:26 +02:00
Josse Colpaert dd4bf0b7ed [IMP] Condition tag would not be upgraded when migrating 2014-08-12 13:37:26 +02:00
Fabien Pinckaers ef944dcd55 [IMP] Maifest for Github README.md on main apps 2014-08-12 11:33:15 +02:00
Denis Ledoux 625aa7e75d [MERGE] forward port of branch saas-5 up to 7d7f6fe 2014-08-05 16:04:58 +02:00
Florian Hatat c4f5caa511 [FIX] mrp: Fix spelling error on 'manufacturing'
Changing .po files to avoid to retranslate existing terms.
Fixes #1328
2014-08-05 11:11:49 +02:00
Martin Trigaux 4d8337fec8 [FIX] mrp: better selection of bom
When searching for a bom based on a product.product, the method used to return any bom linked to the template (so searching for bom for variant A could return bom for variant B if both share the same product.template).
This will allow to return bom not linked to a variant without returning the one of another variant (opw 609358)
2014-08-04 16:28:18 +02:00
Martin Trigaux 4152e99bbd [FIX] mrp: duplicated find bom buttons
The product_id field is not required on a mrp.bom (while product_tmpl_id is). When searching for BOMs linked to a product.product, we should display the one specific to this product and the ones linked to the template (but not linked to another variant).
2014-08-04 14:43:28 +02:00
Martin Trigaux eda2f064cf [FIX] stock: backport of rev 0a6d63b 2014-07-28 09:35:25 +02:00
Richard Mathot 6f1b820d33 [REF] OpenERP --> Odoo in various UI texts (2)
Some things missed by commit 8b67a7202d
2014-07-18 14:59:38 +02:00
rlu-odoo 8b67a7202d [REF] OpenERP --> Odoo in various UI texts
Rebranding has been done in:
- data/demo files
- html templates
- help notices
- comments
- logger messages
- and other various messages

(Commit taken from odoo-dev:8.0-improve-openerp-odoo-rlu at rev 7deaa08)

Closes #1260
2014-07-18 13:45:41 +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 db715f99f4 [IMP] Change reception to receipt 2014-07-16 10:23:57 +02:00
Josse Colpaert 32dd003d60 [MERGE] Resolve conflicts 8.0 2014-07-13 09:27:20 +02:00
Martin Trigaux 0a6d63b82c [FIX] product: unfuck templates and products in views
product.product reuses most of the product.template views however some parts need to be excluded or replaced.
Instead of adding template only parts in base view and removing it for product, split the views in 'common' (product_template_form_view), 'template only' (product_template_only_form_view) and 'product only' (product_normal_form_view) where the first is inherited by the other two. The attribute mode='primary' on both second views allows to make sure that future inheritance of product_template_form_view and product_template_only_form_view will work with the full rendered product_template_form_view view.
This allows us to have valid buttons in crm for bill of material (filters based on active_id).
Also cleaning the mess with circular dependencies.
2014-07-11 17:03:04 +02:00
Josse Colpaert beb12f71f1 Merge branch 'odoo/8.0' into master-wmsstaging4-jco 2014-07-07 23:34:42 +02:00
Josse Colpaert bdfdba0de4 [IMP] Update manufacturing 2014-07-07 23:33:47 +02:00
Josse Colpaert 2518767005 [IMP] Start of extra primary view on product template that is not inherited by product_product 2014-07-07 21:45:11 +02:00