Commit Graph

591 Commits

Author SHA1 Message Date
Christophe Matthieu 36cdac48b7 [IMP] product: move product packaging field from product.product to product.template 2014-06-03 11:53:41 +02:00
Christophe Simonis b8af4775e3 [IMP] product: improve field labels about variant/attributes distinction 2014-05-30 10:00:54 +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 152ec5bf50 [FIX] product: revert change for price_extra. Need to filter by template to apply the price_extra. 2014-05-28 19:04:23 +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 3f69628f96 [FIX] product: recursion error when active field on product.template is modified 2014-05-28 11:29:20 +02:00
Christophe Matthieu d24aede8d7 [FIX] product: don't create new variants if the product.template is create by product.product. 2014-05-27 18:03: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
Christophe Simonis a756b82372 [MERGE] forward port of branch saas-4 up to revid bb26dea 2014-05-20 20:19:55 +02:00
Martin Trigaux 8ea4f581ed Forward-port of latest 7.0, up to rev. 10046 (rev-id: launchpad_translations_on_behalf_of_openerp-20140514062049-vjclnuxlkbto0tsj) 2014-05-14 10:04:16 +02:00
Martin Trigaux 6f99764697 [FIX] product: get_history_price recieves ids instead of a browse record for product template
bzr revid: mat@openerp.com-20140509073315-9q0igp9zh6d96bl6
2014-05-09 09:33:15 +02:00
Martin Trigaux 8f43b749f4 [FIX] product: when duplicating a product, keep the language in the context
At the time of the context_wo_lang patch (7.0 revision 6577), the orm did not keep the language in copy_data, this patch intended to be more consistent.
Since server revision 5146 7.0, the new behaviour is to use the translated version in copy_data. Removign this change will be more consistent with the orm.

The expected behaviour is now the following:
In user lang: translated product name + translated '(copy)'
In other lang: same as original product

lp bug: https://launchpad.net/bugs/1159913 fixed

bzr revid: mat@openerp.com-20140508134937-7cbja3vsv311z5j4
2014-05-08 15:49:37 +02:00
Quentin (OpenERP) 693a60058e [REV] revert of a partially wrong commit introduced in a previous merge with trunk and detected during the code review
bzr revid: qdp-launchpad@openerp.com-20140505123709-2v2efr7ghzgxgo76
2014-05-05 14:37:09 +02:00
Quentin (OpenERP) 78a7ae966f [REF] product: get_price_history refactored and moved in product.template object
bzr revid: qdp-launchpad@openerp.com-20140505120743-zjviksa7o1mpawuf
2014-05-05 14:07:43 +02:00
Josse Colpaert 8b84615de1 [MERGE] Merge from trunk test
bzr revid: jco@openerp.com-20140502130352-c3h1fk332eqyd78b
2014-05-02 15:03:52 +02:00
Olivier Dony ca65a8e624 [IMP] product: simplify legacy useless code
bzr revid: odo@openerp.com-20140428173842-7u83jyr1rrexf3uy
2014-04-28 19:38:42 +02:00
Quentin (OpenERP) 7ed26f1e07 [REF] product refactoring: prices.history model renamed into product.price.history + passed 'date' as real parameter instead of contextual one in get_history_price() because it makes more sense.
bzr revid: qdp-launchpad@openerp.com-20140428153355-vbuam1hfnah7m4wp
2014-04-28 17:33:55 +02:00
Denis Ledoux 2832d2ddc9 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 10016 revid:dle@openerp.com-20140425125507-njfyl1r6wn11vqwx
bzr revid: dle@openerp.com-20140425125926-5nchz1tcq4fx18jx
2014-04-25 14:59:26 +02:00
Denis Ledoux 12eb157397 [FIX] product: price computation failed when for pricelists based on Cost price for non-employee users
bzr revid: dle@openerp.com-20140425125507-njfyl1r6wn11vqwx
2014-04-25 14:55:07 +02:00
Josse Colpaert 4768c24340 [IMP] Improve the copying of products and make sure the orderpoints apply their copy method
bzr revid: jco@openerp.com-20140414084821-1yi87wk6cfrr69qg
2014-04-14 10:48:21 +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) 0d7e144492 [FIX] fixes of bug introduced in the previous merge with trunk
bzr revid: qdp-launchpad@openerp.com-20140326162208-d5m8qr8gz8fel7q1
2014-03-26 17:22:08 +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
Quentin (OpenERP) bde6b6d6e5 [REF] refactoring made during code review. Some optimization patches have been rewritten more clearly, others abandonned or kept. WIP
bzr revid: qdp-launchpad@openerp.com-20140319163359-2ea7tjn5ba1ggein
2014-03-19 17:33:59 +01:00
Denis Ledoux d8d312768c [FIX] product: overwritten name_search of product.pricelist ignored lang translations. It worked prior to saas-3 because the pricelist filter in the searchview used a selection widget, which did not care about translations
bzr revid: dle@openerp.com-20140317120126-qx4wrkqfdu3nr3sp
2014-03-17 13:01:26 +01:00
Josse Colpaert dcb12c7db8 [MERGE] Merge from trunk-wms-loconopmerge2 + only keep good optims
bzr revid: jco@openerp.com-20140313170620-fq25a32fdlo3xrxy
2014-03-13 18:06:20 +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
Martin Trigaux 1967b6ce19 [FIX] product: when converting unit of mesures, round above instead of mathematical rounding
bzr revid: mat@openerp.com-20140305171456-goo7on3ncfihu0wu
2014-03-05 18:14:56 +01:00
Josse Colpaert d39056faec [IMP] Change _compute_qty to0 _compute_qty_obj in order to pass browse records immediately instead
bzr revid: jco@openerp.com-20140228173241-qfenlx2hb8h1k40j
2014-02-28 18:32:41 +01:00
Josse Colpaert bd0fcb70b7 [IMP] name_get of product should not ask for seller_ids if not necessary
bzr revid: jco@openerp.com-20140227160808-m53f0kkgbqno1ea8
2014-02-27 17:08:08 +01:00
Denis Ledoux 70d3f251a3 [REVERT] rev 8788.1.1769: The exchange rate of the currency of the pricelist should not be applied as this price computation method does not depends of any pricelist
bzr revid: dle@openerp.com-20140226172300-z2okr3vpjuwxs4mz
2014-02-26 18:23:00 +01:00
Cedric Snauwaert b8826aaa30 [FIX]various usability thing
bzr revid: csn@openerp.com-20140212124646-301rfsr1712cdy18
2014-02-12 13:46:46 +01:00
Cedric Snauwaert 9502276166 [FIX]work on view for better usability
bzr revid: csn@openerp.com-20140210100727-1q2q61t3c3nxfd10
2014-02-10 11:07:27 +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 17616e08ef [IMP] product: simplify further product_product.copy()
bzr revid: rco@openerp.com-20140127101957-1ywu40m081uo79nl
2014-01-27 11:19:57 +01:00
Raphael Collet 31d4a2cc6f [IMP] product: in product.name_search(), do no search on variants (too costly)
bzr revid: rco@openerp.com-20140127100037-t1hzbw0f4v8uys6f
2014-01-27 11:00:37 +01:00
Raphael Collet 3ce7ccd57e [IMP] product: Python fixes ('<>' -> '!=')
bzr revid: rco@openerp.com-20140127091856-1cvelz2tq16lfaml
2014-01-27 10:18:56 +01:00
Antony Lesuisse aa727b9a43 [FIX] product use osv _check_recursion helper
bzr revid: al@openerp.com-20140126210921-0dh2dghkcyymvron
2014-01-26 22:09:21 +01:00
Antony Lesuisse 232475e83a [FIX] product remove arbitrary size limits
bzr revid: al@openerp.com-20140126210506-3kjf53g9uxtvhn40
2014-01-26 22:05:06 +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
Christophe Simonis 2cf97c76d3 [IMP] product: correct copy() of products variants
bzr revid: chs@openerp.com-20140123183208-jg76zjt7tzd1fl75
2014-01-23 19:32:08 +01:00
Thibault Delavallée 86b9f997c8 [IMP] product: supplier_info: when renaming a field, please
use @oldname parameter.
Therefore added oldname on product_tmpl_id that was once known as product.id.

bzr revid: tde@openerp.com-20140123163243-ct1vde3luoypj5qx
2014-01-23 17:32:43 +01:00
Thibault Delavallée 46c55500ff [MERGE] Sync with website-al
bzr revid: tde@openerp.com-20140122171321-6r2q42p7ebfv3kb9
2014-01-22 18:13:21 +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 d944a652dc [FIX] product: when computing lst_price, that is the public price
computed based on the template price + margin and extra, use the
pricelist currency if a pricelist has been given. This alows for
example to have 'promo' prices on the ecommerce that are in the
same currency.

bzr revid: tde@openerp.com-20140122120042-ovh2mi70q0beeqwq
2014-01-22 13:00:42 +01:00