36cdac48b7
[IMP] product: move product packaging field from product.product to product.template
2014-06-03 11:53:41 +02:00
b8af4775e3
[IMP] product: improve field labels about variant/attributes distinction
2014-05-30 10:00:54 +02:00
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
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
6958d56a66
[IMP] product: fixes for review
2014-05-28 18:30:03 +02:00
256a17d419
[IMP] product: rename field variants_ids to respect odoo typo; add demo data for mrp
2014-05-28 11:46:32 +02:00
3f69628f96
[FIX] product: recursion error when active field on product.template is modified
2014-05-28 11:29:20 +02:00
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
aacde7984f
[IMP] product: add demo data for variants
2014-05-27 17:35:52 +02:00
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
a756b82372
[MERGE] forward port of branch saas-4 up to revid bb26dea
2014-05-20 20:19:55 +02:00
583fe74ba2
Forward-port of latest saas-3, up to revision 9455 (rev-id mat@openerp.com-20140514080416-m4t23y0rxx2ot7y6)
2014-05-14 10:37:54 +02:00
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
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
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
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
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
8b84615de1
[MERGE] Merge from trunk test
...
bzr revid: jco@openerp.com-20140502130352-c3h1fk332eqyd78b
2014-05-02 15:03:52 +02:00
7e25b9ae55
[MERGE] saas-4 report_webkit missing dependency on report
...
bzr revid: al@openerp.com-20140501152604-4cobh5ui47dt4pem
bzr revid: al@openerp.com-20140501155633-gefnc3zqcsr2rhaz
bzr revid: al@openerp.com-20140501161156-4wbsvhh8gz4r22h3
2014-05-01 18:11:56 +02:00
0f0eef7965
[MERGE][IMP] Point of Sales: reports converted to QWeb (but removed useless ones); removed dead code in wizard folder; folder; Adapted /report/download route to serialize and return osv_exception in order to be handled in core.js get_file
...
bzr revid: sle@openerp.com-20140429163810-s6i8gwjq07ei3830
2014-04-29 18:38:10 +02:00
d0e9ba289f
[MERGE] from trunk
...
bzr revid: rim@openerp.com-20140429124452-5cvpmtpyz2daj8w2
2014-04-29 14:44:52 +02:00
80f68fe4bb
[MERGE] trunk
...
bzr revid: sle@openerp.com-20140429124215-92f645c16v9j1dyi
2014-04-29 14:42:15 +02:00
79d4c57877
[MERGE] Forward-port of latest saas-3 bugfixes, up to rev. 9439 revid:dle@openerp.com-20140429112147-hqfqd0y487s817n7
...
bzr revid: dle@openerp.com-20140429112738-y2el246dmd2o2zy9
2014-04-29 13:27:38 +02:00
0059d7b1cd
[FIX] product: the declaration of decimal precision was done after
...
the declaration of uom precision, preventing uom precision from going above
the default decimal precision. + made the Kg unit precise up to grams by default.
bzr revid: fva@openerp.com-20140429101932-k6s827csz6i1za51
2014-04-29 12:19:32 +02:00
ca65a8e624
[IMP] product: simplify legacy useless code
...
bzr revid: odo@openerp.com-20140428173842-7u83jyr1rrexf3uy
2014-04-28 19:38:42 +02:00
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
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
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
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
b667f6a292
[MERGE] trunk
...
bzr revid: sle@openerp.com-20140422124030-gowf9zyx1d36j01g
bzr revid: sle@openerp.com-20140424124655-95ex30m25soiu4wd
2014-04-24 14:46:55 +02:00
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
71560225a9
[MERGE] from trunk
...
bzr revid: rim@openerp.com-20140422093002-5mset34e3o1jkadr
2014-04-22 11:30:02 +02:00
57cebaaac6
[MERGE] merged trunk up to revision 9365.
...
bzr revid: qdp-launchpad@openerp.com-20140422092815-f4tlfmo8zj1nogbl
2014-04-22 11:28:15 +02:00
89fd1bede4
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140419063533-z6kswp5wkioh5jlv
bzr revid: launchpad_translations_on_behalf_of_openerp-20140420055842-traoy17xi60ufook
bzr revid: launchpad_translations_on_behalf_of_openerp-20140421050815-44ydlitvsaj3xdd9
bzr revid: launchpad_translations_on_behalf_of_openerp-20140422082459-bfjqgpt2bpgll64p
2014-04-22 08:24:59 +00:00
fa60b90c1f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140422075247-nxfftok20ltlnea6
2014-04-22 07:52:47 +00:00
cccc7a3d0c
[MERGE]sync with trunk.
...
bzr revid: dka@tinyerp.com-20140417132329-sd2skyprb3nt88uw
2014-04-17 18:53:29 +05:30
205a13e2f5
[MERGE] stock_account, purchase: better usability in settings to install stock_account and manage options to use costing methods and invenotyr valuation
...
bzr revid: qdp-launchpad@openerp.com-20140415112915-k8ba71ddo1vgu0tm
2014-04-15 13:29:15 +02:00
b5c85bf11f
[FIX] ondelete cascade on product template of price history
...
bzr revid: qdp-launchpad@openerp.com-20140415094218-ji63eiavpniirjcj
2014-04-15 11:42:18 +02:00
7be29e97c4
[IMP] Product pricelist converted to QWeb
...
bzr revid: sle@openerp.com-20140414155212-4l3gvys24prccln6
2014-04-14 17:52:12 +02:00
398d96f273
[MERGE] merged trunk up to revision 9327
...
bzr revid: qdp-launchpad@openerp.com-20140414094743-hv0u7qhigv1to2uc
2014-04-14 11:47:43 +02:00
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
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
e82fbf7d91
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140412083153-3ona1js7o6z421vg
2014-04-12 08:31:53 +00:00
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
3a7e003656
[MERGE] forward port of branch saas-3 up to revid 9394 chs@openerp.com-20140410103638-x7vajn70ewsfp0ck
...
bzr revid: chs@openerp.com-20140410110424-enhdg6pufhii56ni
2014-04-10 13:04:24 +02:00
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
dcdf729b9f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140408061831-7wnnz72jgait29og
2014-04-08 06:18:31 +00:00
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
ff4726ea7d
[MERGE] merged trunk up to revision 9281
...
bzr revid: qdp-launchpad@openerp.com-20140403081427-7xpn57wdfv08v2al
2014-04-03 10:14:27 +02:00
ecb02bc8ab
[MERGE] Merge from trunk-wms
...
bzr revid: jco@openerp.com-20140327142024-ullrstsauxt5ji10
2014-03-27 15:20:24 +01:00
Christophe Matthieu
Christophe Simonis
Martin Trigaux
Quentin (OpenERP)
Josse Colpaert
Antony Lesuisse
Simon Lejeune
Richard Mathot (OpenERP)
Denis Ledoux
Frédéric van der Essen
Olivier Dony
Launchpad Translations on behalf of openerp
Darshan Kalola (OpenERP)
Rakesh Sindhav (OpenERP)
Christophe Simonis