Olivier Dony
ef53a831c6
[MERGE] Forward-port saas-5 up to a5f7891
2014-07-23 16:58:00 +02:00
Denis Ledoux
a5f7891b68
[MERGE] forward port of branch saas-4 up to 5739aebfb1
2014-07-23 13:18:30 +02:00
Christophe Matthieu
380a7e97f5
[FIX] product: user who don't use product variant can't edit the price of the product in product view. This behavior is not understandable. Add a function inverse to set the value (remove the variante price before change the list_price of the template)
2014-07-18 11:33:09 +02:00
Josse Colpaert
db715f99f4
[IMP] Change reception to receipt
2014-07-16 10:23:57 +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
Raphael Collet
cbe2dbb672
[MERGE] new v8 api by rco
...
A squashed merge is required as the conversion of the apiculture branch from
bzr to git was not correctly done. The git history contains irrelevant blobs
and commits. This branch brings a lot of changes and fixes, too many to list
exhaustively.
- New orm api, objects are now used instead of ids
- Environements to encapsulates cr uid context while maintaining backward compatibility
- Field compute attribute is a new object oriented way to define function fields
- Shared browse record cache
- New onchange protocol
- Optional copy flag on fields
- Documentation update
- Dead code cleanup
- Lots of fixes
2014-07-06 17:05:41 +02:00
Christophe Matthieu
e75d9525bb
merge upstream
2014-06-20 10:09:16 +02:00
Christophe Simonis
eef6330c55
[MERGE] forward port of branch saas-5 up to adf07a9
2014-06-19 16:23:32 +02:00
kevin wang
b4cbac3cba
[FIX] product: create works for internal reference and ean13 code in product.template
...
This is a temporary workaround until these fields are removed from the template or the view is more explicit about the meaning of this field (the one on the first variant)
Fix #542
2014-06-17 10:48:44 +02:00
Christophe Matthieu
45a6012f22
[FIX] product: remove unused values
2014-06-16 17:33:18 +02:00
Christophe Matthieu
1e9c72f308
[MERGE] from master
2014-06-13 12:35:23 +02:00
Christophe Matthieu
8319356630
[IMP] website_sale: allow optional products in shop; In shop, it opens the modal jus after having clicked on the 'Add to cart'. The modal contains the optional products.
2014-06-11 12:50:41 +02:00
sve-odoo
b33bf57832
[ADD] Default value for supplierinfo.min_qty
...
And remove default value for function field "qty"
2014-06-05 09:55:30 +02:00
Christophe Simonis
3f85d4b493
[FIX] product: correct SyntaxError made by kdiff3 (once again) during previous forward port
2014-06-03 21:45:21 +02:00
Christophe Simonis
a5908c5812
[MERGE] forward port of branch saas-5 up to b1c0bc0
2014-06-03 20:02:00 +02:00
Guewen Baconnier
79f2b47576
Wrong variable name. The write() method should accept both int/long and tuple/list
2014-06-03 16:13:54 +02:00
Guewen Baconnier
b4f72fba96
[FIX] product: fix _set_price_extra method
...
avoid crash is context is None
create call does not have ids parameter
2014-06-03 14:19:51 +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
91cb75babd
[FIX] product: remove wrong field on product.template. TODO: move packaging field form product.product to product.template
2014-06-03 11:15:17 +02:00
Christophe Matthieu
caf4bf77bc
[FIX] product: check if context is none in _set_standard_price before check context keys
2014-06-02 15:48:24 +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