Commit Graph

778 Commits

Author SHA1 Message Date
Nicolas Martinelli ea59856caf [FIX] mrp: display Produced Products done in black instead of grey
Keep consistency between Consumed Product and Finished Products

opw-642267
2015-06-15 11:06:04 +02:00
Goffin Simon 8a7993958d [IMP] mrp: properties on mrp.bom.line
Now it's possible to put a property on a bom line.
For example, the bom for an apple pie and for an apricot pie can be made
in a single bom.
Three lines are necessary in the bom of the product "pie":
	- First line with product " dough" without property
	- Second line, with product "apple" with property "apple" if you want an apple pie
	- Third line, with product "apricot" with property "apricot" if you want an apricot pie

The type of this bom pie must be "set" to allow the customer to assemblate
his favorite pie by himself.

Now to sell an apple pie, you must create a SO with the product "pie" and
the property "apple".

In that way, the delivery order consists of two lines:
	- dough
	- apple
2015-04-28 11:11:29 +02:00
Rifakat Haradwala 7da3854597 [FIX] mrp: reload form when start work orders
Actions button on the work order lines can change the state of the manufacturing
order. As for the product lines, reload the form after actions.
opw 625424
2015-04-01 09:57:19 +02:00
Christophe Simonis 3540ec53e4 [MERGE] forward port of branch saas-3 up to 6b70b80 2015-03-25 18:00:08 +01: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
Martin Trigaux 1b4953c892 [FIX] mrp: allow to select BoM with a product template only 2014-11-25 09:55:21 +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
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 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
Josse Colpaert 636294e1ef [IMP] Scheduled time, weights, remove routing on lines 2014-09-17 21:41:41 +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
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 f6650f0da7 [IMP] Clean 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 6553e22306 [WIP] Create procurement when Phantom 2014-09-03 19:18:16 +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
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 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
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 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 bdfdba0de4 [IMP] Update manufacturing 2014-07-07 23:33:47 +02:00
Josse Colpaert b414e05a41 [IMP] Adapt views of product template start 2014-06-30 09:26:49 +02:00
Josse Colpaert bdda11ab40 [IMP] Update views and production_delay and track_production should go to product_template 2014-06-26 17:52:37 +02:00
Josse Colpaert 6b63d40145 [MERGE] Merge from master and resolve conflict 2014-06-17 16:23:44 +02:00
Christophe Matthieu 96f038a6ab [IMP] product: all left menu item became product.template's action 2014-06-16 17:16:50 +02:00
ged-odoo 74168c4e9d Merge pull request #272 from odoo-dev/master-inline-searchview-ged
[MERGP] Inline Searchview

This task split the searchview in two parts: SearchView and SearchViewDrawer. The drawer is displayed inside the main view and the searchview stays in place.  It also changes the scrolling behavior of the web client: the main view area can scroll without affecting the UI (so the various menus stays in place)

Because of this, other large changes have been made:

the drawer has been redesigned,
the Custom Filter widget has been split in two (Custom Report and SaveCurrentFilter),
the main view is now scrollable, so the UI stays in place and only the view can change
The text 'Group By...' has been changed into 'Group By' (most addons had to be modified)
bootstrap classes are used when it makes sense (for example, badge)
the left menu is also scrollable (separately from the main view)

It is likely that some stupid bugs have been introduced.  Please don't hurt me.
2014-06-12 16:27:11 +02:00
Fabien Meghazi faa09da325 Removed version="7.0" from form views 2014-06-12 09:09:59 +02:00
Josse Colpaert ac943b0307 [IMP] Change mrp lots to depend on lots and not on packing 2014-06-03 09:21:57 +02:00
Géry Debongnie 080b473d1d [FIX] fix wrong conflict resolution in merge
The merge #5142037 from odoo/master in local branch was wrong.
I basically overwrote the changes from master.  This commit resolves
the issue correctly.
2014-05-30 11:03:06 +02:00
Géry Debongnie 514203743d Merge remote-tracking branch 'odoo/master' into master-inline-searchview-ged
Conflicts:
	addons/mrp/mrp_view.xml
2014-05-30 10:29:30 +02:00
Christophe Matthieu 435b5b9ca3 [IMP] product: rename fields variant_ids into attribute_line_ids on the template and attribute_value_ids on the product. 2014-05-28 19:42:15 +02:00
Christophe Matthieu 6958d56a66 [IMP] product: fixes for review 2014-05-28 18:30:03 +02:00
Christophe Matthieu 256a17d419 [IMP] product: rename field variants_ids to respect odoo typo; add demo data for mrp 2014-05-28 11:46:32 +02:00
Christophe Matthieu 43977deb71 [IMP] product: refactoring of product variant. The main view became the view of product template and the product product (or product variant) are created with the variant values combinaison. Bom is splitted into bom and bom line and can use the variant combinaison. 2014-05-27 09:42:52 +02:00
Géry Debongnie 555677f14d [IMP] replace all 'Group By...' by 'Group By'
in all searchview, the 'Group By...' looks weird, next to the Custom
Reports and Filters.  This change was requested by the upper management
2014-05-22 11:44:35 +02:00
Quentin (OpenERP) 70eb74a260 [MERGE] merged with trunk up to revision 9425. Needs to find another icon for Traceability on lot, though
bzr revid: qdp-launchpad@openerp.com-20140507182917-erjammra4okyei1c
2014-05-07 20:29:17 +02:00
Gery Debongnie 5aa2fa150c [MERGE] merge from trunk
bzr revid: ged@openerp.com-20140502130753-4z24z1to9pkrckvq
2014-05-02 15:07:53 +02:00
Quentin (OpenERP) cba2365d95 [MERGE] branch of jco fixing shipping exception in mrp + cancellation in chained moves
bzr revid: qdp-launchpad@openerp.com-20140425132449-s7e8duh884rirrqz
2014-04-25 15:24:49 +02:00
Josse Colpaert 5807343602 [MERGE] Merge from trunk-wms
bzr revid: jco@openerp.com-20140423095528-h4dpd9gdmh8lmk6j
2014-04-23 11:55:28 +02:00
Josse Colpaert af0468c418 [WIP] Remove picking except state on mrp order
bzr revid: jco@openerp.com-20140423094807-za7855wkx2vlr0di
2014-04-23 11:48:07 +02:00
Quentin (OpenERP) 57cebaaac6 [MERGE] merged trunk up to revision 9365.
bzr revid: qdp-launchpad@openerp.com-20140422092815-f4tlfmo8zj1nogbl
2014-04-22 11:28:15 +02:00
Josse Colpaert a7d4e518ae [IMP] Action assign button on production order + quant_ids readonly on serial number
bzr revid: jco@openerp.com-20140422085831-yt7hdb3catb5w00q
2014-04-22 10:58:31 +02:00
Randhir Mayatra rma-openerp 4c0f7b1be8 [IMP] improve strings and project view
bzr revid: rma@tinyerp.com-20140404112926-716zimuh3p2ec80k
2014-04-04 16:59:26 +05:30
Quentin (OpenERP) c5d92d9e1f [REF] mrp: some code cleaning since procure_method and supply_method doesn't exist on the product anymore
bzr revid: qdp-launchpad@openerp.com-20140401132233-2odtndrvudu5ka7q
2014-04-01 15:22:33 +02:00