Commit Graph

526 Commits

Author SHA1 Message Date
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
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
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
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
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
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) 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) 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
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) 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
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
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
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
Amit Bhavsar (Open ERP) f52b04fee3 [Imp] Remove Unnecessary change.
bzr revid: amb@tinyerp.com-20131119100202-95y4r5t2g74a61of
2013-11-19 15:32:02 +05:30
Darshan Kalola (OpenERP) 7237e7436b [MERGE]with lp:~openerp-dev/openobject-addons/trunk-product-variant-imp-amb
bzr revid: dka@tinyerp.com-20131108134052-49pappgab0d7j49q
2013-11-08 19:10:52 +05:30
Darshan Kalola (OpenERP) 412ee4bd8a [IMP]add search view for product-variant,solve duplication problem of product variant and solve unit price calculation problem.
bzr revid: dka@tinyerp.com-20131108131416-cyqebxz9zgbjy9nj
2013-11-08 18:44:16 +05:30
Amit Bhavsar (Open ERP) e715a7a019 [imp] Improve product and template view and add menu products by templates.
bzr revid: amb@tinyerp.com-20131108123643-4iwtcuf3p9f14l6z
2013-11-08 18:06:43 +05:30
Amit Bhavsar (Open ERP) 445fa763a7 [MERGE] lp:~openerp-dev/openobject-addons/trunk-product-variant-imp-amb-dka
bzr revid: amb@tinyerp.com-20131030114509-iju4k402pmbjbcsa
2013-10-30 17:15:09 +05:30
Darshan Kalola (OpenERP) 8210a9962e [IMP]improve test case and product form view.
bzr revid: dka@tinyerp.com-20131030103521-gmeyqdvug6nt4cd5
2013-10-30 16:05:21 +05:30
Thibault Delavallée 5bb4fa2b43 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20131028163321-5o81wa1m7rzdp1dz
2013-10-28 17:33:21 +01:00
Amit Bhavsar (Open ERP) e80dd25141 [MERGE] lp:~openerp-dev/openobject-addons/trunk-product-variant-imp-amb-dka
bzr revid: amb@tinyerp.com-20131028094412-512svv3vbqpl55g9
2013-10-28 15:14:12 +05:30
Darshan Kalola (OpenERP) 02dec945de [IMP]improve view,label and help of product.
bzr revid: dka@tinyerp.com-20131028090644-fkmxjbbu5pze5f7h
2013-10-28 14:36:44 +05:30
Amit Bhavsar (Open ERP) a94b7a2c77 [MERGE] merge with lp:~openerp-dev/openobject-addons/trunk-product-variant-imp-amb-dka
bzr revid: amb@tinyerp.com-20131024091218-k101jbqmlmj6ae2d
2013-10-24 14:42:18 +05:30
Amit Bhavsar (Open ERP) 2cf5c977ae [MERGE] merge with latest trunk.
bzr revid: amb@tinyerp.com-20131021072954-i41newfty914azna
2013-10-21 12:59:54 +05:30
Amit Bhavsar (Open ERP) 683443c3ce [imp] On Template view set delete=flase for variant o2m.
bzr revid: amb@tinyerp.com-20131021072456-j2cuh3omwig3geta
2013-10-21 12:54:56 +05:30
Darshan Kalola (OpenERP) 9b8c247195 [MERGE] with main addons
bzr revid: dka@tinyerp.com-20131021060101-93g9tq6dcawhh8r8
2013-10-21 11:31:01 +05:30
Darshan Kalola (OpenERP) d97e7a6a4e [IMP]kanban view of product-template.
bzr revid: dka@tinyerp.com-20131018091710-mn1mhgx8m2ytixy3
2013-10-18 14:47:10 +05:30
Amit Bhavsar (Open ERP) 96ce32830e [Imp] add product variant group for productlist view.
bzr revid: amb@tinyerp.com-20131017061109-e5fdeli5017obe13
2013-10-17 11:41:09 +05:30
Darshan Kalola (OpenERP) 1b336d74c6 [ADD]kanban view in product-template.
bzr revid: dka@tinyerp.com-20131015095414-aeu0zrmdoowkt1yy
2013-10-15 15:24:14 +05:30
Darshan Kalola (OpenERP) c1c71c522e [IMP]search,tree and kanban view of product and added search view of product template.
bzr revid: dka@tinyerp.com-20131014094614-m32bm0npqxblz1k0
2013-10-14 15:16:14 +05:30
Darshan Kalola (OpenERP) 3cb95d2227 [IMP] add menu Product Template and improve the form view of product template.
bzr revid: dka@tinyerp.com-20131011110641-q3dcnsfqihbjnfs1
2013-10-11 16:36:41 +05:30
Amit Bhavsar (Open ERP) 1ca616ddfd [imp] changes of cms branch.
bzr revid: amb@tinyerp.com-20131011073225-6xayq84ov0rsnffs
2013-10-11 13:02:25 +05:30