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
qdp-odoo
d35d47165e
Merge pull request #1124 from odoo-dev/master-wmsstaging4-jco
...
fixes related to WMS, product variants and templates... from Josse
2014-07-17 18:18:16 +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
xmo-odoo
16d67445da
Merge pull request #1076 from xmo-odoo/8.0-shop-fix-xmo
...
Fix access rights issues in new API for the shop home page
2014-07-16 10:28:51 +02:00
Josse Colpaert
db715f99f4
[IMP] Change reception to receipt
2014-07-16 10:23:57 +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
Xavier Morel
6014d44b2b
[IMP] add read access to all users for product.pricelist.type
...
In new API, selection field value is checked (against the selection's possible
values) at both read and write. For pricelist.type this requires read access
to product.pricelist.type.
2014-07-11 13:32:46 +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
Atul Patel
5207f12be0
[FIX]product: disable menu name come from report declaration.because it's called from wizard
2014-07-08 16:11:28 +05:30
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
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
Fabien Pinckaers
5cc81dd64f
Fixes
2014-07-02 18:18:29 +02:00
Christophe Simonis
f31ea32229
[FIX] product: add missing dependency: report
2014-07-01 15:23:11 +02:00
Christophe Simonis
1f57528bc6
[MERGE] forward port of branch saas-5 up to 8dfd5ea
2014-06-27 16:14:40 +02:00
Denis Ledoux
368936df7c
[FIX] product, website_sale: Go in GB (Go is fr)
2014-06-26 23:31:57 +02:00
Antony Lesuisse
893aace122
[MERGE] website_sale optional-products
2014-06-26 12:31:15 +02:00
Jaydeep Barot
026e38b48f
[REM] Unnecessary `size` parameters on char fields
2014-06-25 17:13:43 +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
Christophe Matthieu
dcce993958
[FIX] website_sale: typo and preview display all time in modal
2014-06-17 10:54:47 +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
0f78e602d6
[FIX] website_sale: tour; product split kanban view of product and product template
2014-06-13 17:08:19 +02:00
Christophe Matthieu
1e9c72f308
[MERGE] from master
2014-06-13 12:35:23 +02:00
Fabien Meghazi
faa09da325
Removed version="7.0" from form views
2014-06-12 09:09:59 +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
Christophe Matthieu
7770ca8013
Merge pull request #320 from odoo-dev/saas-5-website_sale-product-layout-chm
...
[FIX] website_sale: change template for product and variant selector (type color)
2014-06-03 18:07:43 +02:00
Christophe Matthieu
057d26f860
[IMP] product: set at false one product variant of ipad
2014-06-03 16:58:26 +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
Denis Ledoux
1c4825294b
[FIX] product: product_variant group does not exist anymore
...
Therefore, the pricelist item view must show the field product_tmpl_id in any case
2014-06-03 15:03:13 +02:00
Martin Trigaux
c1ae43c807
Merge pull request #292 from guewen/product-missing-report-dependency
...
[FIX] product: add module 'report' module in its dependencies
The product pricelist report model inherit from report.abstract_report but report was not present in dependencies.
2014-06-03 14:25:18 +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
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
caf4bf77bc
[FIX] product: check if context is none in _set_standard_price before check context keys
2014-06-02 15:48:24 +02:00
Guewen Baconnier
2da1adcf8f
The 'product' module must list the 'report' module in its dependencies
...
because it refers to the 'report.abstract_report' module
Fixes #290
2014-06-02 14:58:28 +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
aacde7984f
[IMP] product: add demo data for variants
2014-05-27 17:35:52 +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
Olivier Dony
2af03e1b6e
[MERGE] Forward-port latest 7.0 bugfixes, up to f8671cb
2014-05-22 16:44:33 +02:00
Olivier Dony
02035b27b8
[RESTORE] Restore *.sxw files, skipped during bzr-to-git conversion to discard older binary blobs
2014-05-22 14:07:15 +02:00
Christophe Simonis
a756b82372
[MERGE] forward port of branch saas-4 up to revid bb26dea
2014-05-20 20:19:55 +02:00
Launchpad Translations on behalf of openerp
c2584c8cb0
Launchpad automatic translations update.
2014-05-18 05:53:48 +00:00
Launchpad Translations on behalf of openerp
6ab0f645bc
Launchpad automatic translations update.
2014-05-17 07:10:37 +00:00
Martin Trigaux
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
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
Antony Lesuisse
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
Simon Lejeune
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
Richard Mathot (OpenERP)
d0e9ba289f
[MERGE] from trunk
...
bzr revid: rim@openerp.com-20140429124452-5cvpmtpyz2daj8w2
2014-04-29 14:44:52 +02:00
Simon Lejeune
80f68fe4bb
[MERGE] trunk
...
bzr revid: sle@openerp.com-20140429124215-92f645c16v9j1dyi
2014-04-29 14:42:15 +02:00
Denis Ledoux
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
Frédéric van der Essen
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
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
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
Simon Lejeune
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
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)
57cebaaac6
[MERGE] merged trunk up to revision 9365.
...
bzr revid: qdp-launchpad@openerp.com-20140422092815-f4tlfmo8zj1nogbl
2014-04-22 11:28:15 +02:00
Launchpad Translations on behalf of openerp
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
Launchpad Translations on behalf of openerp
fa60b90c1f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140422075247-nxfftok20ltlnea6
2014-04-22 07:52:47 +00:00
Darshan Kalola (OpenERP)
cccc7a3d0c
[MERGE]sync with trunk.
...
bzr revid: dka@tinyerp.com-20140417132329-sd2skyprb3nt88uw
2014-04-17 18:53:29 +05:30
Quentin (OpenERP)
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
Quentin (OpenERP)
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
Simon Lejeune
7be29e97c4
[IMP] Product pricelist converted to QWeb
...
bzr revid: sle@openerp.com-20140414155212-4l3gvys24prccln6
2014-04-14 17:52:12 +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
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
Launchpad Translations on behalf of openerp
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
Launchpad Translations on behalf of openerp
e82fbf7d91
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140412083153-3ona1js7o6z421vg
2014-04-12 08:31:53 +00: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
Christophe Simonis
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
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
Launchpad Translations on behalf of openerp
dcdf729b9f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140408061831-7wnnz72jgait29og
2014-04-08 06:18:31 +00: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
Quentin (OpenERP)
ff4726ea7d
[MERGE] merged trunk up to revision 9281
...
bzr revid: qdp-launchpad@openerp.com-20140403081427-7xpn57wdfv08v2al
2014-04-03 10:14:27 +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
Launchpad Translations on behalf of openerp
51aa261b44
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140327073504-l0fydwct329jhirh
2014-03-27 07:35:04 +00: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
Christophe Simonis
99a3c45976
[MERGE] forward port of branch saas-3 up to revid 9328 chs@openerp.com-20140318120024-mcxmkncn1xktjs7v
...
bzr revid: chs@openerp.com-20140318132741-aur3q1k7t9iympri
2014-03-18 14:27:41 +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
Josse Colpaert
8c49378527
[MERGE] Merge from trunk-wms
...
bzr revid: jco@openerp.com-20140312123434-c6je2o30w3tmtez9
2014-03-12 13:34:34 +01:00
Christophe Simonis
d504764eff
[MERGE] forward port of branch saas-3 up to revid 9298 chm@openerp.com-20140311130852-3ft0v1mc9ht1any6
...
bzr revid: chs@openerp.com-20140311145205-s56fj113fsrnisc3
2014-03-11 15:52:05 +01:00
Quentin (OpenERP)
da210e4b5e
[MERGE] trunk
...
bzr revid: qdp-launchpad@openerp.com-20140311132813-0gmbof2u8nmgv9p3
2014-03-11 14:28:13 +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
Launchpad Translations on behalf of openerp
fd98bf36aa
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140307072427-zkvqj45icrzupx0m
bzr revid: launchpad_translations_on_behalf_of_openerp-20140307072433-0lqpjt07j1s8k8cs
2014-03-07 07:24:33 +00:00
Olivier Dony
c43c308c33
[FIX] product: typo in previous commit
...
"The only man who makes no mistakes is the man who never does anything. ~T.R." ;-)
bzr revid: odo@openerp.com-20140306190906-k8wjr9urekpoy7ch
2014-03-06 20:09:06 +01:00
Martin Trigaux
dc46ffd589
[FIX] use float rounding for pricelist instead of ceiling
...
bzr revid: mat@openerp.com-20140306162953-iu7k53i5zsllokdp
2014-03-06 17:29:53 +01:00
Martin Trigaux
1e048736df
[IMP] remove useless imports
...
bzr revid: mat@openerp.com-20140306153125-czwswqw1k3w5ungh
2014-03-06 16:31:25 +01:00
Martin Trigaux
378dbbfaae
[IMP] product: add python tests
...
bzr revid: mat@openerp.com-20140306133456-cnqjcwmo73ioqxxf
2014-03-06 14:34:56 +01:00
Martin Trigaux
5db649549c
[IMP] mrp: use also the ceiling method from product
...
bzr revid: mat@openerp.com-20140306094504-37r691hxcemp0ual
2014-03-06 10:45:04 +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
Launchpad Translations on behalf of openerp
e231045095
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140306061409-nvr56r44q6smklxz
bzr revid: launchpad_translations_on_behalf_of_openerp-20140305055718-w3c9kzsncncpu12w
bzr revid: launchpad_translations_on_behalf_of_openerp-20140306061519-n2qbjt3fe7l104aw
2014-03-06 06:15:19 +00:00
Denis Ledoux
b38245d6cb
[FIX] product: price_get_multi raise if there is no active pricelist version (same behavior than before the pricelist computation factoring)
...
bzr revid: dle@openerp.com-20140305110314-pgiotwksjmdt63zm
2014-03-05 12:03:14 +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
Launchpad Translations on behalf of openerp
b201dc79b7
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140218054104-8egkh4jj7hiiwuih
bzr revid: launchpad_translations_on_behalf_of_openerp-20140219054048-688twg0fubtm2x2q
bzr revid: launchpad_translations_on_behalf_of_openerp-20140220054214-237ri67t9rw3l4fu
bzr revid: launchpad_translations_on_behalf_of_openerp-20140221063855-wniw42r27gyg3h6y
bzr revid: launchpad_translations_on_behalf_of_openerp-20140222073328-xpn7nwqz407yzumq
bzr revid: launchpad_translations_on_behalf_of_openerp-20140223074516-0r09cpmma58ylqji
bzr revid: launchpad_translations_on_behalf_of_openerp-20140224060319-535oheaq2w9u2ye3
bzr revid: launchpad_translations_on_behalf_of_openerp-20140225062420-zl7curej0e0warhz
bzr revid: launchpad_translations_on_behalf_of_openerp-20140226073146-3vzhw4hddr81olbs
bzr revid: launchpad_translations_on_behalf_of_openerp-20140227062959-24e2rn98rqb9afpr
bzr revid: launchpad_translations_on_behalf_of_openerp-20140228072152-f9gm4ud1wu19ge27
bzr revid: launchpad_translations_on_behalf_of_openerp-20140301055205-r0df0fqz9yf5z66i
bzr revid: launchpad_translations_on_behalf_of_openerp-20140302052638-bjf11oumy7w15oco
bzr revid: launchpad_translations_on_behalf_of_openerp-20140304082704-k1z2te1tfud43zy3
2014-03-04 08:27:04 +00:00
Launchpad Translations on behalf of openerp
9863dbe5c8
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140304075238-yra39uwmwahmrnf3
2014-03-04 07:52:38 +00:00
Josse Colpaert
6694c3a094
[MERGE] Merge from trunk-wms
...
bzr revid: jco@openerp.com-20140303083411-wg6ilg9mft9qx3td
2014-03-03 09:34:11 +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
Quentin (OpenERP)
e36b32a661
[MERGE] merged with main trunk (revision 9186)
...
bzr revid: qdp-launchpad@openerp.com-20140228131516-ihigousbe5p1nt68
2014-02-28 14:15:16 +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
Christophe Simonis
4b72678bc7
[MERGE] forward port of branch saas-2 up to revid 9195 chs@openerp.com-20140220154517-6y531n1mqtnfnsmr
...
bzr revid: chs@openerp.com-20140220163815-69sza1kclnh5mavs
2014-02-20 17:38:15 +01:00
Denis Ledoux
65257c48b5
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9835 revid:launchpad_translations_on_behalf_of_openerp-20140213064742-xiotlx8wzfhexnhc
...
bzr revid: dle@openerp.com-20140210160759-oybxhdwgv2q4ma5a
bzr revid: odo@openerp.com-20140212122042-3m2tysmr31mtecnc
bzr revid: dle@openerp.com-20140212143044-0c94q4evxl4ltwr0
bzr revid: dle@openerp.com-20140213115951-h7c2o65lgg26aosv
2014-02-13 12:59:51 +01:00
Olivier Dony
652c574866
[FIX] product.pricelist: leftover undefined variable from pricelist refactoring at revid:fp@tinyerp.com-20131206221809-x1muf0wonl4ated0
...
bzr revid: odo@openerp.com-20140212175224-wd9etr8xyrg6l0oz
2014-02-12 18:52:24 +01:00
Olivier Dony
bbd813e76e
[MERGE] Forward-port of latest saas-2 (incl. 7.0) bugfixes, up to rev. 9127 odo@openerp.com-20140212122042-3m2tysmr31mtecnc
...
bzr revid: odo@openerp.com-20140212175141-i9yz8zlseglrk8sb
2014-02-12 18:51:41 +01:00
Cedric Snauwaert
ca6a1adb3c
[MERGE]merge with latest trunk-wms
...
bzr revid: csn@openerp.com-20140212153016-50qjg6lpn8o4440r
2014-02-12 16:30:16 +01:00
Cedric Snauwaert
b8826aaa30
[FIX]various usability thing
...
bzr revid: csn@openerp.com-20140212124646-301rfsr1712cdy18
2014-02-12 13:46:46 +01:00
Martin Trigaux
ebdb230699
[FIX] pricelist: correctly take into account uom when computing pricelists based on supplier price on product form (opw 595881)
...
The previous behaviour used the uom of product while it could be a different one selected (by default the purchase unit of measure for purchase orders).
This was an issue especially when having different uom with supplier info lines setting degressive prices. The price should be computed based on selected uom and not the product uom.
bzr revid: mat@openerp.com-20140211145703-9uut4hw9aqh7326o
2014-02-11 15:57:03 +01:00
Cedric Snauwaert
9b249181e3
[MERGE]merge with latest trunk
...
bzr revid: csn@openerp.com-20140210161556-qq52vvhdegyda7k6
2014-02-10 17:15:56 +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
Darshan Kalola (OpenERP)
b3c6e20e36
[MERGE]sync with trunk and resolve conflicts.
...
bzr revid: dka@tinyerp.com-20140210084803-rjkt9e4rhni8nhlt
2014-02-10 14:18:03 +05:30
Launchpad Translations on behalf of openerp
8d85c23e4a
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140209065003-9soyulgvssk8n5ci
bzr revid: launchpad_translations_on_behalf_of_openerp-20140208071621-b018rnkhyxmmm5jk
bzr revid: launchpad_translations_on_behalf_of_openerp-20140209065224-kih7tx56elds0zok
bzr revid: launchpad_translations_on_behalf_of_openerp-20140210055324-raxopm5ej680oc73
2014-02-10 05:53:24 +00:00
Thibault Delavallée
6c478b8125
[MERGE] [IMP] product: added data for american units of measure + 1 yml test
...
bzr revid: tde@openerp.com-20140207151320-gw84zrmq5ifl9rdy
2014-02-07 16:13:20 +01:00
Launchpad Translations on behalf of openerp
ffabcd257c
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140206062321-j6cpns6xz3f81net
bzr revid: launchpad_translations_on_behalf_of_openerp-20140206062510-x502ahdwzezvea54
2014-02-06 06:25:10 +00: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
Launchpad Translations on behalf of openerp
ff8f5104b1
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140131062421-oq9ywafamdrwjbtj
2014-01-31 06:24:21 +00:00
Launchpad Translations on behalf of openerp
4d3a623af7
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140128070310-721zmkmw0ocyz6im
bzr revid: launchpad_translations_on_behalf_of_openerp-20140129060326-647er2mw0mfn2j5s
2014-01-29 06:03:26 +00:00
Antony Lesuisse
033c38c304
[MERGE] trunk
...
bzr revid: al@openerp.com-20140129021916-ckb3rplmcpjbqel3
2014-01-29 03:19:16 +01:00
Launchpad Translations on behalf of openerp
3ce5e01eca
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140128064139-6fjg3b236v5d790j
2014-01-28 06:41:39 +00: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
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
Launchpad Translations on behalf of openerp
d9cdc8564c
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140122061252-9jm03vlbr13ofqo9
bzr revid: launchpad_translations_on_behalf_of_openerp-20140123055652-0p71divui34v1c1q
bzr revid: launchpad_translations_on_behalf_of_openerp-20140124062440-hx0z2e4sd6nz7exc
bzr revid: launchpad_translations_on_behalf_of_openerp-20140126051449-rlunde7qysqsh1b1
bzr revid: launchpad_translations_on_behalf_of_openerp-20140125064003-v340hiykcngjg9ue
bzr revid: launchpad_translations_on_behalf_of_openerp-20140126051541-9fnyw12nex5poeth
bzr revid: launchpad_translations_on_behalf_of_openerp-20140127054606-1jb6usf6pj7gy1xl
2014-01-27 05:46:06 +00: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
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
Antony Lesuisse
beb15c52ab
[FIX] Softwares is made of datas and codes
...
bzr revid: al@openerp.com-20140126204334-4ggfsn31zp1yndix
2014-01-26 21:43:34 +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
Launchpad Translations on behalf of openerp
805d3757e9
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140123055732-ggft6ftma1kfpaq6
2014-01-23 05:57:32 +00: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
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
Launchpad Translations on behalf of openerp
d5bc07f898
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140122061335-z6h1dn3yd94l8850
2014-01-22 06:13:35 +00:00
Thibault Delavallée
14bdf21b17
[CLEAN] product: cleaned product template copy method improvements
...
bzr revid: tde@openerp.com-20140121122139-j4jmr3jfbaoaamyj
2014-01-21 13:21:39 +01:00
Thibault Delavallée
b3fa81982b
[IMP] product: group_product_mono is default
...
bzr revid: tde@openerp.com-20140121122120-r2m1r927ne2r12mi
2014-01-21 13:21:20 +01:00
Thibault Delavallée
744810bbb4
[REV] product: unlink method back, no comment about why it has been
...
removed. It is therefore added back.
bzr revid: tde@openerp.com-20140121111421-x35gyqwo9jdpr3d7
2014-01-21 12:14:21 +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
Quentin (OpenERP)
3f8ec15bbe
[MERGE] stock, sale, sale_stock: several usability problem fixed.
...
lp bug: https://launchpad.net/bugs/1269045 fixed
bzr revid: qdp-launchpad@openerp.com-20140120160303-v5hmfmb6roeg56v6
2014-01-20 17:03:03 +01:00
Quentin (OpenERP)
fc93025818
[MERGE] merged trunk
...
bzr revid: qdp-launchpad@openerp.com-20140120144243-5kw535p28t1x7yeg
2014-01-20 15:42:43 +01:00
Launchpad Translations on behalf of openerp
28d79433c3
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140118070457-rn2tgdxis2fi3nqo
bzr revid: launchpad_translations_on_behalf_of_openerp-20140119055822-ajy043mntc4jr407
bzr revid: launchpad_translations_on_behalf_of_openerp-20140120055854-z7wtyb24c5t8kcmj
bzr revid: launchpad_translations_on_behalf_of_openerp-20140118070538-2xm86ece1aate8u9
bzr revid: launchpad_translations_on_behalf_of_openerp-20140119055932-sa6vrp2g8ua3u88e
bzr revid: launchpad_translations_on_behalf_of_openerp-20140120055948-lwcyqcfutgamwac1
bzr revid: launchpad_translations_on_behalf_of_openerp-20140118070546-d89xqw56zou7e9p9
bzr revid: launchpad_translations_on_behalf_of_openerp-20140120055955-6wrdxqy1018mo7jq
2014-01-20 05:59:55 +00: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)
19bc4842c5
[REMOVE]test case of price margin.
...
bzr revid: dka@tinyerp.com-20140117101353-vbi7u3wfom0dep6j
2014-01-17 15:43:53 +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
Launchpad Translations on behalf of openerp
216824eae4
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140117070359-ulb46tg4k5pv2xl7
2014-01-17 07:03:59 +00:00
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
Darshan Kalola (OpenERP)
5d770d4b6f
[MERGE]with lp:~openerp-dev/openobject-addons/trunk-website-al and resolve conflicts.
...
bzr revid: dka@tinyerp.com-20140116145307-u3e6gio449md3u2v
2014-01-16 20:23:07 +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
Darshan Kalola (OpenERP)
fcf6109d16
[MERGE] with lp:~openerp-dev/openobject-addons/trunk-website-al.
...
bzr revid: dka@tinyerp.com-20140116120607-rkfs8qysinmegp54
2014-01-16 17:36:07 +05:30
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
Thibault Delavallée
a00d24988f
[FIX] product: fixed file whose conflicts markers where still alive. Alive bzr diff
...
bzr revid: tde@openerp.com-20140116105508-qfxgox7rvo1ifjtj
2014-01-16 11:55:08 +01:00
Thibault Delavallée
9cf78e93cc
[MERGE] Sync with trunk, tries to solve conflicts. There are still some new images to convert into images in xml files.
...
bzr revid: tde@openerp.com-20140116103910-qmm2y6kucmngplnk
2014-01-16 11:39:10 +01:00
Darshan Kalola (OpenERP)
79778888e7
[IMP]improved test case in compute_price_margin.
...
bzr revid: dka@tinyerp.com-20140116084128-4g5cqtuf6bqf9mh8
2014-01-16 14:11:28 +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
Darshan Kalola (OpenERP)
a8fe8ac44f
[IMP]added onchange method on product_tmpl_id and added standard_variants function field to check the number of variants, improved view of product and removed unneccessary code.
...
bzr revid: dka@tinyerp.com-20140116072118-0xccl7mkdqbpdggb
2014-01-16 12:51:18 +05:30
Launchpad Translations on behalf of openerp
f39b8bb436
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140116060347-s1e2v9o33n1cxk2y
bzr revid: launchpad_translations_on_behalf_of_openerp-20140116060418-cw791djr2ebt2wuy
bzr revid: launchpad_translations_on_behalf_of_openerp-20140116060651-x8r0l0m27wcx0yav
2014-01-16 06:06:51 +00:00
Christophe Matthieu
6117f829b1
[IMP] product: Service (product.product_product_consultant) eval='False' and True inside demo data
...
bzr revid: chm@openerp.com-20140115153713-vd0tn5ttn7dhb3k6
2014-01-15 16:37:13 +01:00
Christophe Matthieu
cd12832f9e
[IMP] product: Service (product.product_product_consultant) is sale_ok=False by default and overwrite in hr_timesheet to True
...
bzr revid: chm@openerp.com-20140115152526-dptyljv7yxdkmis0
2014-01-15 16:25:26 +01:00
Amit Bhavsar (Open ERP)
e1d3744589
[IMP] add context on product_tmpl_id.
...
bzr revid: amb@tinyerp.com-20140115141238-5bydnxn3a2qgfhz6
2014-01-15 19:42:38 +05:30
Amit Bhavsar (Open ERP)
38b47cb029
[IMP] improve _save_product_lst_price.
...
bzr revid: amb@tinyerp.com-20140115135119-mh7phg952conv2of
2014-01-15 19:21:19 +05:30
Cedric Snauwaert
d0cea6ac39
[FIX]rename group_stock_production_lot to match correct group, remove few extra spaces to match standard.
...
Fix traceback on onchange: product_packaging_change and remove setting default package when creating SOL
lp bug: https://launchpad.net/bugs/1269045 fixed
bzr revid: csn@openerp.com-20140115130123-3ragkt93ukfrfhmq
2014-01-15 14:01:23 +01:00
Amit Bhavsar (Open ERP)
6f277289ea
[IMP] improve code for fields_view_get and _save_product_lst_price.
...
bzr revid: amb@tinyerp.com-20140115125400-2hq2qgg81l21rwr0
2014-01-15 18:24:00 +05:30
Darshan Kalola (OpenERP)
d4460bf323
[IMP]product template: put context 'search_variants' in action to hide a blank varinats and revert the revno 10025.
...
bzr revid: dka@tinyerp.com-20140115122723-we4y9wmn6pu36rh9
2014-01-15 17:57:23 +05:30
Darshan Kalola (OpenERP)
33af9858b5
[IMP]put ondelete='restrict' on product_tmpl_id to restrict deletion of product template if template having a variants.
...
bzr revid: dka@tinyerp.com-20140115113455-26aupx34va3b0km5
2014-01-15 17:04:55 +05:30
Amit Bhavsar (Open ERP)
fcd017aedc
[IMP] Remove deprecated code unlink method and improve code for _set_image
...
bzr revid: amb@tinyerp.com-20140115105223-st7166p7z10lkaa7
2014-01-15 16:22:23 +05:30
Darshan Kalola (OpenERP)
a452ff9d90
[IMP]remove domain from product_variant_ids and improve view.
...
bzr revid: dka@tinyerp.com-20140115065949-8vnj4lvmsiq5vixr
2014-01-15 12:29:49 +05:30
Launchpad Translations on behalf of openerp
5334330d9d
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140115062126-ypg4xp33rspusnts
bzr revid: launchpad_translations_on_behalf_of_openerp-20140115062205-ov2axame3z00jkii
2014-01-15 06:22:05 +00:00
Darshan Kalola (OpenERP)
67f6f54e73
[MERGE] with lp:~openerp-dev/openobject-addons/trunk-website-al.
...
bzr revid: dka@tinyerp.com-20140113130212-4f17b0inc4u3s5k3
bzr revid: dka@tinyerp.com-20140115052550-15ulprts5fo6s30r
2014-01-15 10:55:50 +05:30
Christophe Matthieu
9a53155e7e
[IMP] product: product_variant restrict to the group_product_variant
...
bzr revid: chm@openerp.com-20140114152208-r2hasl9arc28rmm2
2014-01-14 16:22:08 +01:00
Christophe Matthieu
4e94761a8e
[IMP] product: category and website_sale controllers
...
bzr revid: chm@openerp.com-20140114142940-xpshp8e6trio5mxc
2014-01-14 15:29:40 +01:00
Amit Bhavsar (Open ERP)
81c8320a2f
[IMP] price computation and yml testcase.
...
bzr revid: amb@tinyerp.com-20140110132921-klxgy71bas9jjef2
2014-01-10 18:59:21 +05:30
Stephane Wirtel
bea411bb98
[IMP] Backport one feature from website: this feature allows to specify a file
...
path on the field tag fetching the right file instead of using the base64
encoded file in the field.
<field name="image" type="base64" file="base/static/img/main_partner-image.png" />
bzr revid: stw@openerp.com-20140109154550-a04qybctzaaqtrlr
2014-01-09 16:45:50 +01:00
Christophe Matthieu
b100726312
[FIX] product: remove data demo of product in multi_company module; fix product images storage
...
bzr revid: chm@openerp.com-20140109152621-vduwsnm2hbm9nwop
2014-01-09 16:26:21 +01:00
Darshan Kalola (OpenERP)
c103be840c
[IMP]added test case for extra price and remove copy_translations method from product_product.
...
bzr revid: dka@tinyerp.com-20140109132515-my03lj9haj9ex90k
2014-01-09 18:55:15 +05:30
Amit Bhavsar (Open ERP)
c0076916f3
[IMP] change menu sequence, improve price computation on public price, and add domain on variants.
...
bzr revid: amb@tinyerp.com-20140109125127-ua8oa9ceyphsxlvo
2014-01-09 18:21:27 +05:30
Christophe Matthieu
24480a2440
[FIX] product: access right. Resolve: Use Superuser in name_get method to fetch partners/sellers
...
bzr revid: chm@openerp.com-20140109124423-vq7u14q089xiqtt9
2014-01-09 13:44:23 +01:00
Darshan Kalola (OpenERP)
21db945b88
[IMP]Add fields_view_get method to make dynamic view of product.
...
bzr revid: dka@tinyerp.com-20140109103756-d5f37y2eyxjisvoo
2014-01-09 16:07:56 +05:30
Darshan Kalola (OpenERP)
a9e87b56ce
[MERGE]with lp:~openerp-dev/openobject-addons/trunk-website-al.
...
bzr revid: dka@tinyerp.com-20140108093659-c9it34gll0ipcll2
2014-01-08 15:06:59 +05:30
Thibault Delavallée
0b2d085c1b
[IMP] shop: added openchatter on product shop
...
- product.template now inherits from mail.thread
- added opencahtter on product.template form view
- added discussion thread + attachments in product website view
- added file_type field on ir_attachment, that replaces the javascript thing
from mail.js
- added a controller to comment a product.template
bzr revid: tde@openerp.com-20140106135727-uf0zaxav28pdx4sv
2014-01-06 14:57:27 +01:00
Quentin (OpenERP)
ee9aa9ffd4
[IMP] mrp, product, stock, project_mrp: usability of product form view
...
bzr revid: qdp-launchpad@openerp.com-20131220095806-16siwncivyuokrym
2013-12-20 10:58:06 +01:00
Launchpad Translations on behalf of openerp
e6a46a855d
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131220053413-o3xa4nlpu9snoiq6
2013-12-20 05:34:13 +00:00
Quentin (OpenERP)
1af2ac6f9c
[FIX] fixed warnings in runbot
...
bzr revid: qdp-launchpad@openerp.com-20131211154840-u2nk7ztggcgewm7y
2013-12-11 16:48:40 +01:00
Quentin (OpenERP)
a5cc6d6aed
[MERGE] merged with main trunk
...
bzr revid: qdp-launchpad@openerp.com-20131211100354-hwlt65vk8p3xih9u
2013-12-11 11:03:54 +01:00
Fabien Pinckaers
59906a3af8
[IMP] allow users to change product price from CMS[FIX] small bug in reordering of PTT
...
bzr revid: fp@tinyerp.com-20131209210511-5w03vf2wt0pmgdew
2013-12-09 22:05:11 +01:00
Christophe Matthieu
6652856445
[FIX] website_sale: link; product: clean code and use product.template for supplierinfo
...
bzr revid: chm@openerp.com-20131209163254-k9dwxw48rcgz1hbs
2013-12-09 17:32:54 +01:00
Christophe Matthieu
6aface1bd0
[FIX] product.supplierinfo: product_id is a product.product fields. Rename fields into product_tmpl_id for many2one to product.template model
...
bzr revid: chm@openerp.com-20131209151135-q54g17zcq1vnshsl
2013-12-09 16:11:35 +01:00
Fabien Pinckaers
66e85ee1e0
[IMP] Product visible discount: discount is expressed based in Public Price
...
bzr revid: fp@tinyerp.com-20131209142203-20l555dfdyvb60xe
2013-12-09 15:22:03 +01:00
Fabien Pinckaers
20bbabc82b
[IMP] Huge speed improvement in price computation on products: 162 to 39 queries to render /shop with 28 products. O(n)->O(1)
...
bzr revid: fp@tinyerp.com-20131206221809-x1muf0wonl4ated0
2013-12-06 23:18:09 +01:00
Quentin (OpenERP)
a0caaa3d6d
[FIX] product: moved the standard price historization on product_template table instead of product.product (the column is there)
...
bzr revid: qdp-launchpad@openerp.com-20131206163054-3lpu43m16lvc8okp
2013-12-06 17:30:54 +01:00
Quentin (OpenERP)
f2ef7dc29b
[REF] stock_account, product: moved the standard price historization in 'product' module, as it doesn't depend of stock (or account) at all and it was causing problems for products created before stock_account was installed, like all demo data products (no entry for them in prices_history table)
...
bzr revid: qdp-launchpad@openerp.com-20131206103150-2mnvsipy9uai3xlk
2013-12-06 11:31:50 +01:00
Launchpad Translations on behalf of openerp
379dc8bf98
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131201054445-5fy8zd7lvnn9mjp2
bzr revid: launchpad_translations_on_behalf_of_openerp-20131202055138-hq05otjnuktjpa48
bzr revid: launchpad_translations_on_behalf_of_openerp-20131204055601-tbzqqhperzffjbjt
bzr revid: launchpad_translations_on_behalf_of_openerp-20131204055642-0rwynvhgvs0r14b3
2013-12-04 05:56:42 +00:00
Fabien Pinckaers
773d7a25d1
[IMP] huge speed improvement on computing prices of several products 916 SQL queries to 216. Still too much.
...
bzr revid: fp@tinyerp.com-20131203223910-l4hbew0f0iquii9x
2013-12-03 23:39:10 +01:00
Launchpad Translations on behalf of openerp
4fd98907ce
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131130053134-6u83vcd1133xs8yf
bzr revid: launchpad_translations_on_behalf_of_openerp-20131201054550-w0k8alfqs2bigurx
bzr revid: launchpad_translations_on_behalf_of_openerp-20131202055222-2u7o99e48254dceu
bzr revid: launchpad_translations_on_behalf_of_openerp-20131203061621-hyqqh11jt7g0ilqh
2013-12-03 06:16:21 +00:00
Christophe Matthieu
fd2821086f
[MERGE] sync with trunk
...
bzr revid: chm@openerp.com-20131202150925-eqsi0uu0fqtwimhj
2013-12-02 16:09:25 +01:00
Amit Bhavsar (Open ERP)
ca6c085712
[imp] solved image issue when duplicate the product.
...
bzr revid: amb@tinyerp.com-20131202135105-0gy7pmxgdysi5a9p
2013-12-02 19:21:05 +05:30
Amit Bhavsar (Open ERP)
f70b33b5c0
[imp] solved traceback and improve copy method of product template.
...
bzr revid: amb@tinyerp.com-20131202111516-5010t3n3j4na270i
2013-12-02 16:45:16 +05:30
Fabien Pinckaers
2fee01f084
[IMP] removed a feature nobody used for a huge speed improvement (4 SQL Queries per search/read
...
bzr revid: fp@tinyerp.com-20131202084517-80d1vdwfwpbdsqdn
2013-12-02 09:45:17 +01:00
Launchpad Translations on behalf of openerp
9f04e0c76c
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131130050422-r8hhiot5r58eukys
bzr revid: launchpad_translations_on_behalf_of_openerp-20131130051429-uepuma01yhw11md9
2013-11-30 05:14:29 +00:00
Quentin (OpenERP)
df2d5e148e
[MERGE] trunk
...
bzr revid: qdp-launchpad@openerp.com-20131129165644-fx0m3ok07l41o507
2013-11-29 17:56:44 +01:00
Launchpad Translations on behalf of openerp
1fedbc18f5
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131126060718-7io3n16co82qp5pu
bzr revid: launchpad_translations_on_behalf_of_openerp-20131127053913-ypnlpggd4wt58pzx
bzr revid: launchpad_translations_on_behalf_of_openerp-20131128060603-kk12b8iu0uhhtist
bzr revid: launchpad_translations_on_behalf_of_openerp-20131129052938-u0wq863etr3sl1cm
bzr revid: launchpad_translations_on_behalf_of_openerp-20131129053023-zlbrprsiq9e7vs39
2013-11-29 05:30:23 +00:00
Amit Bhavsar (Open ERP)
3c966202ef
[imp] improve a typo.
...
bzr revid: amb@tinyerp.com-20131129052157-snnwkddyb6evdm6w
2013-11-29 10:51:57 +05:30
Amit Bhavsar (Open ERP)
8b75e738c1
[imp] add code note for product.py and improve template demo.
...
bzr revid: amb@tinyerp.com-20131128110703-hjpru7kjwvaqfg6p
2013-11-28 16:37:03 +05:30
Christophe Matthieu
a58a43632d
[IMP] product: add fnct_inv for lst_price field
...
bzr revid: chm@openerp.com-20131128101556-1h4h87va3wuk1kd1
2013-11-28 11:15:56 +01:00
Amit Bhavsar (Open ERP)
82d6ca2363
[imp] add help,typo,improve search and change menu sequence.
...
bzr revid: amb@tinyerp.com-20131128062151-1614s0dmll83i5q6
2013-11-28 11:51:51 +05:30
Launchpad Translations on behalf of openerp
6fd5575930
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131127053957-ekc1bfm5ohug21aa
2013-11-27 05:39:57 +00:00
Fabien Pinckaers
183c75a3c7
[IMP] default values on new events
...
bzr revid: fp@tinyerp.com-20131126161424-savrp6u63zmpoq5w
2013-11-26 17:14:24 +01:00
Thibault Delavallée
000c38816d
[MERGE] [IMP] Addons: updated some field labels to avoid duplicates to ease
...
the import / export process
Aso includes
- project: deprecated priority field: use sequence instead
- base_calendar: calendar.event: deprecated organizer field: use organize_id instead
bzr revid: tde@openerp.com-20131125093741-hx9hpj85xqfalvqw
2013-11-25 10:37:41 +01:00
Launchpad Translations on behalf of openerp
5f21b4bff9
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131123062620-6obt60lwob64hi98
bzr revid: launchpad_translations_on_behalf_of_openerp-20131124054757-4w9nik6wieeqf0yg
bzr revid: launchpad_translations_on_behalf_of_openerp-20131125060111-rf445xxiinvazinv
2013-11-25 06:01:11 +00:00
Xavier Morel
61431d0384
[IMP] product: avoid redundant work
...
bzr revid: xmo@openerp.com-20131121142252-laxz8z457yyebayj
2013-11-21 15:22:52 +01:00
Darshan Kalola (OpenERP)
f19a433dbb
[MERGE] with lp:~openerp-dev/openobject-addons/trunk-product-variant-imp-amb and change necessary code.
...
bzr revid: dka@tinyerp.com-20131121122311-629hbtetmqfrtfyg
2013-11-21 17:53:11 +05:30
Darshan Kalola (OpenERP)
17a5f388eb
[IMP]add variant group in product by template menu.
...
bzr revid: dka@tinyerp.com-20131121055920-fh4e2elnrdy3rz45
2013-11-21 11:29:20 +05:30
Launchpad Translations on behalf of openerp
271ed43e7b
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131121054848-007arsnnoa8fs65e
bzr revid: launchpad_translations_on_behalf_of_openerp-20131121063838-blqn6j0yfmrlw5vp
2013-11-21 06:38:38 +00:00
Launchpad Translations on behalf of openerp
17fe569269
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131119052725-2fcjekn5ouumctna
bzr revid: launchpad_translations_on_behalf_of_openerp-20131120052525-2pwf2q3wdcrbqics
2013-11-20 05:25:25 +00:00
Amit Bhavsar (Open ERP)
f52b04fee3
[Imp] Remove Unnecessary change.
...
bzr revid: amb@tinyerp.com-20131119100202-95y4r5t2g74a61of
2013-11-19 15:32:02 +05:30
Thibault Delavallée
9f38df4d57
[MERGE] Sync with website-al
...
bzr revid: tde@openerp.com-20131115133635-66u5iuesqb5u6leq
2013-11-15 14:36:35 +01:00