Commit Graph

570 Commits

Author SHA1 Message Date
Martin Trigaux 6dc94f0c4e Forward port of branch saas-5 up to eda2f06 2014-07-28 16:37:56 +02:00
Martin Trigaux eda2f064cf [FIX] stock: backport of rev 0a6d63b 2014-07-28 09:35:25 +02:00
Josse Colpaert 28ad04a4de [IMP] Only show number of variants when more than one + bug cursor Compute Minimum Stock Rules 2014-07-16 13:50:56 +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
Christophe Simonis f654a7719b [MERGE] forward port of branch saas-5 up to 73d39a0 2014-07-10 22:49:53 +02:00
Martin Trigaux bd163d7bd4 [FIX] product: allow user to set price at template creation
The lst_price field on product.template is a related to list_price. As we do not allow to set a value for related fields at creation (see orm.py , L4180), we display the list_price instead (float field).
On the product.product form, we display the lst_price (function field, readonly) as we don't want to allow changing the template price from the product. opw 609497
2014-07-09 13:20:48 +02:00
Christophe Matthieu 4117c9c3ed [FIX] product: add menu item to attributes and attribute values. Adding constraint to prevent deleting attributes with references to products. 2014-07-08 09:12:17 +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
Christophe Matthieu dcce993958 [FIX] website_sale: typo and preview display all time in modal 2014-06-17 10:54:47 +02:00
Christophe Matthieu 0f78e602d6 [FIX] website_sale: tour; product split kanban view of product and product template 2014-06-13 17:08:19 +02:00
Fabien Meghazi faa09da325 Removed version="7.0" from form views 2014-06-12 09:09:59 +02:00
Christophe Simonis a5908c5812 [MERGE] forward port of branch saas-5 up to b1c0bc0 2014-06-03 20:02:00 +02:00
Christophe Matthieu 36cdac48b7 [IMP] product: move product packaging field from product.product to product.template 2014-06-03 11:53:41 +02:00
Christophe Matthieu da6f02027a [FIX] product: set required at false for product template field when creating a product product. 2014-06-03 11:13:50 +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 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
Quentin (OpenERP) 7a6b00b651 [MERGE] merged with trunk up to revision 9381
bzr revid: qdp-launchpad@openerp.com-20140425090414-vpg4szws9y4fgznc
2014-04-25 11:04:14 +02:00
Richard Mathot (OpenERP) 8a9ca4641f [FIX] do not use bootstrap wildly in form views
bzr revid: rim@openerp.com-20140422100306-bj8jxlatjmko4oi5
2014-04-22 12:03:06 +02:00
Richard Mathot (OpenERP) 71560225a9 [MERGE] from trunk
bzr revid: rim@openerp.com-20140422093002-5mset34e3o1jkadr
2014-04-22 11:30:02 +02:00
Quentin (OpenERP) 398d96f273 [MERGE] merged trunk up to revision 9327
bzr revid: qdp-launchpad@openerp.com-20140414094743-hv0u7qhigv1to2uc
2014-04-14 11:47:43 +02:00
Rakesh Sindhav (OpenERP) f081a5e441 [IMP]account,purchse,warehouse,sale: view improvement in addons modules
bzr revid: rsi@tinyerp.com-20140411131842-9zppvrs2szqa4o47
2014-04-11 18:48:42 +05:30
Denis Ledoux 41d172ea6d [FIX] product, stock: set active field in default product view, instead of inherited view of stock module
The active field was placed in the Delays section, which does not make sense
Besides, we should be able to disable products by default, not when stock is installed.

bzr revid: dle@openerp.com-20140408180920-jpl50ups6ro1z4qp
2014-04-08 20:09:20 +02:00
Quentin (OpenERP) 4254056188 [MERGE] merged jco's feature branch clearing the packages and logistic units concepts
bzr revid: qdp-launchpad@openerp.com-20140404131637-a23gqw42132q6ig5
2014-04-04 15:16:37 +02:00
Josse Colpaert ecb02bc8ab [MERGE] Merge from trunk-wms
bzr revid: jco@openerp.com-20140327142024-ullrstsauxt5ji10
2014-03-27 15:20:24 +01:00
Quentin (OpenERP) e0b27b4ee8 [MERGE] merged trunk up to revision 9251
bzr revid: qdp-launchpad@openerp.com-20140326152751-b6bo0fawrzmd71f0
2014-03-26 16:27:51 +01:00
Josse Colpaert e374eb4309 [IMP] Adapt nomenclature
bzr revid: jco@openerp.com-20140320140959-d2mr2aic4ei0j5h1
2014-03-20 15:09:59 +01:00
Josse Colpaert 9ac4fd4bcc [IMP] Add ul for palletization on packaging and put dimensions on ul
bzr revid: jco@openerp.com-20140320121335-cnjfecg115t8fa7t
2014-03-20 13:13:35 +01: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
Olivier Dony a6e9d3edcc [FIX] product: avoid reading image_small field which is bandwidth intensive and un-necessary
bzr revid: odo@openerp.com-20140304182724-kplzfik56ebp2boe
2014-03-04 19:27:24 +01:00
Quentin (OpenERP) bbe5811e56 [FIX] fix needed after the previous merge with trunk: produce_delay field doesn't belong to product module anymore
bzr revid: qdp-launchpad@openerp.com-20140203184520-5p1j2y3sk1asu8hj
2014-02-03 19:45:20 +01:00
Quentin (OpenERP) 4416f74c98 [FIX] fix needed after merge with trunk (active field doesn't belong to product.template object)
bzr revid: qdp-launchpad@openerp.com-20140203184140-bxqvqw0slo9trsw0
2014-02-03 19:41:40 +01:00
Quentin (OpenERP) d676e39094 [FIX] fix needed after merge with trunk (cost_method field doesn't belong to product module anymore)
bzr revid: qdp-launchpad@openerp.com-20140203180044-auj3u263qiji203t
2014-02-03 19:00:44 +01:00
Quentin (OpenERP) 753f7541db [MERGE] main trunk
bzr revid: qdp-launchpad@openerp.com-20140203173000-mk092iw2wz3y0e3e
2014-02-03 18:30:00 +01:00
Raphael Collet 19854757a4 [IMP] product: in product form view, hide 'variants' field when is_only_child and no variant name
bzr revid: rco@openerp.com-20140127102928-pe90kntbc6mtv5uu
2014-01-27 11:29:28 +01:00
Antony Lesuisse bd088d8868 [FIX] product rename and reorder variant menu items
bzr revid: al@openerp.com-20140126205954-q33s3h306soh43jc
2014-01-26 21:59:54 +01:00
Cedric Snauwaert 70ec840eaf [MERGE]merge with latest wms-trunk
bzr revid: csn@openerp.com-20140124094419-monnhyomr8721nbx
2014-01-24 10:44:19 +01:00
Thibault Delavallée 055932fc6a [IMP] product: cleaned form in create mode. Moreover generally
changing the template is not possible anymore; create a new tempalte or a new
variant instead. When creating a new product, you will always create a new
template.
Added the link to the template from the product form view.
Cleaned some code (code move).

bzr revid: tde@openerp.com-20140122170218-6j2sixoxvvbbxvhd
2014-01-22 18:02:18 +01:00
Thibault Delavallée 38d64147d5 [IMP] product: only template child / multiple template childs form view improvements
- added a is_only_child field on product.product, telling whether the
product is the only child of the product.template
- improved the product form view, to set readonly all fields coming fgrom
the template when the product is not the only child. This way, the user
is more aware that changing a value in the template changes the value
for all child products. He will have to do those changes on the template
form. A link to the template has been added in the product form view.

bzr revid: tde@openerp.com-20140122095826-8k0wl7af57iiyify
2014-01-22 10:58:26 +01:00
Thibault Delavallée b3a4778f26 [IMP] product variant: removed override of fields_view_get and use a "one group or another"
behavior for product variant. Users are either in group_product_mono or
group_product_variant, allowing to tune the form view according to the
group the user belongs to.
product: added group_product_mono group
sale: added set_group_product_variant method that adds or remove the
group_product_mono according to the group_product_variant being unchecked
or checked.
product: updated form view accordingly

bzr revid: tde@openerp.com-20140121105046-zkbs778upjg0lpyr
2014-01-21 11:50:46 +01:00
Darshan Kalola (OpenERP) 8cfd06f449 [IMP]product: removed product by template menu and action.
bzr revid: dka@tinyerp.com-20140117113910-csv71potcxaklem5
2014-01-17 17:09:10 +05:30
Darshan Kalola (OpenERP) 82cdf9e4c0 [IMP]product: removed unnecessary code from onchange_product_tmpl_id and improved indentation in template form view.
bzr revid: dka@tinyerp.com-20140117110544-y7lc0t2xc0bb6403
2014-01-17 16:35:44 +05:30
Darshan Kalola (OpenERP) 132933f991 [IMP]revert margin calculation.
bzr revid: dka@tinyerp.com-20140117100627-s65f1jlv93h4w3p1
2014-01-17 15:36:27 +05:30
Darshan Kalola (OpenERP) 86ec8bd39a [IMP]removed unnecessary code.
bzr revid: dka@tinyerp.com-20140117082647-6aoiouidtl06r3vk
2014-01-17 13:56:47 +05:30
Darshan Kalola (OpenERP) effa6b282e [IMP]product: removed attrs from variants in form view.
bzr revid: dka@tinyerp.com-20140117075805-r5k1epe8vzj36tzm
2014-01-17 13:28:05 +05:30
Darshan Kalola (OpenERP) 21c54c95a2 [MERGE]with lp:~openerp-dev/openobject-addons/trunk-imp-product-variant-another-amb and remove unnecessary changes.
bzr revid: dka@tinyerp.com-20140117070028-9xglu0v31hjid18f
2014-01-17 12:30:28 +05:30
Cedric Snauwaert 3e87ec567e [FIX]remove unneeded code to compute qty available in product module, use the one defined in stock instead
lp bug: https://launchpad.net/bugs/1268989 fixed

bzr revid: csn@openerp.com-20140116133905-en7y1b9tibstcou3
2014-01-16 14:39:05 +01:00
Amit Bhavsar (Open ERP) 6a1eb008bf [IMP] add context on product_tmpl_id of variant form.
bzr revid: amb@tinyerp.com-20140116111955-528o6gkjsb0p68t3
2014-01-16 16:49:55 +05:30
Darshan Kalola (OpenERP) acde6d86c1 [IMP]rename has_variants field to standard_variants in product form and improved fields_view_get method.
bzr revid: dka@tinyerp.com-20140116074535-m40q8q7dy3kzfguf
2014-01-16 13:15:35 +05:30