Commit Graph

2341 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
Amit Bhavsar (Open ERP) 9cc4983fb7 Override demo data for prouct_visible_discount and remove unused code from dka merge.
bzr revid: amb@tinyerp.com-20131115124902-om1kduj623f9cub8
2013-11-15 18:19:02 +05:30
Christophe Matthieu 3ef7c80aa6 [WIP] website: remove contraints with many2one to res.partner field. The website field must use a contact/address widget without force user to publish the partner
bzr revid: chm@openerp.com-20131114102033-dfmv019mmqow0ebt
2013-11-14 11:20:33 +01:00
Darshan Kalola (OpenERP) e97c4924b7 [IMP]solve yml issue and improve unit price for invoice line.
bzr revid: dka@tinyerp.com-20131111132418-aeazzv8dkyaijgne
2013-11-11 18:54:18 +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
Launchpad Translations on behalf of openerp eaa917bef9 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131120054418-15be15rhz84vk0et
2013-11-20 05:44:18 +00:00
Launchpad Translations on behalf of openerp 523b10fe44 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131119055635-19g4i058ihed0ivz
2013-11-19 05:56:35 +00:00
Launchpad Translations on behalf of openerp 108ccbf108 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131114062958-ies8xa3pft7n59ms
bzr revid: launchpad_translations_on_behalf_of_openerp-20131106055135-r0xt2vr04710jh1t
bzr revid: launchpad_translations_on_behalf_of_openerp-20131107055120-r8z445ergt50erlx
bzr revid: launchpad_translations_on_behalf_of_openerp-20131108062620-bvfofx1jl1wb1csh
bzr revid: launchpad_translations_on_behalf_of_openerp-20131110064525-ioceogsmu0nmx2qj
bzr revid: launchpad_translations_on_behalf_of_openerp-20131111053908-gbrp09ast5fhr6iw
bzr revid: launchpad_translations_on_behalf_of_openerp-20131112062316-5uf2bvbzdhkq1b7k
bzr revid: launchpad_translations_on_behalf_of_openerp-20131113060841-bkjcuz4e9rtzn6f9
bzr revid: launchpad_translations_on_behalf_of_openerp-20131114063058-rrm2q5lxkyawuvpz
2013-11-14 06:30:58 +00:00
Amit Bhavsar (Open ERP) 9ff3a27488 [MERGE] lp:~openerp-dev/openobject-addons/trunk-product-variant-imp-amb-dka
bzr revid: amb@tinyerp.com-20131101105321-us7192tfr6k4mxox
2013-11-01 16:23:21 +05:30
Darshan Kalola (OpenERP) 50963cc810 [IMP]improve typo and solve the product duplication problem.
bzr revid: dka@tinyerp.com-20131101102528-21x66oz8wn5uxaq2
2013-11-01 15:55:28 +05:30
Launchpad Translations on behalf of openerp 30e141708b Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131031054753-45rivp2vcydq7cv3
2013-10-31 05:47:53 +00:00
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
Launchpad Translations on behalf of openerp 40c309024c Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131026062529-74ir3upguunr9mw3
bzr revid: launchpad_translations_on_behalf_of_openerp-20131027061317-d9s440jzv1juvswi
bzr revid: launchpad_translations_on_behalf_of_openerp-20131028054233-15znliqv2eh2jq0i
bzr revid: launchpad_translations_on_behalf_of_openerp-20131029051429-rcytejyrg2s4t9db
bzr revid: launchpad_translations_on_behalf_of_openerp-20131030055438-gp0hyend0jooi941
2013-10-30 05:54:38 +00:00
Thibault Delavallée 7da7f0bd63 [MERGE] Sync with website-al
bzr revid: tde@openerp.com-20131028165203-wgt2qfzhw3kr1pqi
2013-10-28 17:52:03 +01:00
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
Darshan Kalola (OpenERP) bc14d3e659 [ADD]test case for computation of price margin.
bzr revid: dka@tinyerp.com-20131028053025-4h9ftnaqtmbzp2yl
2013-10-28 11:00:25 +05:30
Darshan Kalola (OpenERP) 162329ee4a [IMP]demo data of product and yml test of point of sale.
bzr revid: dka@tinyerp.com-20131025122415-b1cssqumzdowxjrb
2013-10-25 17:54:15 +05:30
Darshan Kalola (OpenERP) 21bf32477f [IMP]demo data of product.
bzr revid: dka@tinyerp.com-20131025070047-d7drcy22lclon13d
2013-10-25 12:30:47 +05:30
Launchpad Translations on behalf of openerp 8bc457816f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131024052057-4ai7sltsmuoke8l5
bzr revid: launchpad_translations_on_behalf_of_openerp-20131025060100-ua2rf6g9urivk8bm
2013-10-25 06:01:00 +00:00
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
Darshan Kalola (OpenERP) cfb4780369 [IMP]add image field and description field in product_product.
bzr revid: dka@tinyerp.com-20131024065805-lffcw1zq616dwv3m
2013-10-24 12:28:05 +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
Denis Ledoux f2e561afec [MERGE] Forward-port of latest saas-2 bugfixes, up to rev. 8960 rev-id: dle@openerp.com-20131018125818-1k168nlo2ferj25w
bzr revid: dle@openerp.com-20131018131007-etdut0wpjqhnexz2
2013-10-18 15:10:07 +02:00
Denis Ledoux a7e05f1af4 [MERGE] Forward-port of latest saas-1 bugfixes, up to rev. 8793 rev-id: dle@openerp.com-20131018124037-v3501acvv4fh1077
bzr revid: dle@openerp.com-20131018125818-1k168nlo2ferj25w
2013-10-18 14:58:18 +02:00
Denis Ledoux 1a555475cc [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9529 rev-id: mat@openerp.com-20131018120428-2vdmdm2th8rz57zr
bzr revid: dle@openerp.com-20131018121236-zp221von16vekthp
2013-10-18 14:12:36 +02:00
Christophe Matthieu 666387a274 [WIP] payment_acquirer
bzr revid: chm@openerp.com-20131018111530-tjyhp3cu1qlabhij
2013-10-18 13:15:30 +02:00
niv-openerp 67a9fee553 [MERGE] saas2
bzr revid: nicolas.vanhoren@openerp.com-20131018103820-a0sklx6hyx3hx93e
2013-10-18 12:38:20 +02:00
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
Christophe Matthieu 6b20e1baea [FIX] product: wrong product and supplierinfo demo data. Because product_id of product.supplierinfo is a product.template field and not a product.product field
bzr revid: chm@openerp.com-20131015132738-d1l7bb8vbndz5mu5
2013-10-15 15:27:38 +02:00
Christophe Matthieu 4724266802 [FIX] product: wrong product and supplierinfo demo data. Because product_id of product.supplierinfo is a product.template field and not a product.product field
bzr revid: chm@openerp.com-20131015125308-mzmq1p1nm1kfqd9g
2013-10-15 14:53:08 +02:00
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) 90d676bc2a [MERGE] with lp:~openerp-dev/openobject-addons/trunk-product-variant-imp-amb.
bzr revid: dka@tinyerp.com-20131014102139-m63gux5j0pkjbfnj
2013-10-14 15:51:39 +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
Launchpad Translations on behalf of openerp 566af6033f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131011052941-f4x7ued38x0siu4u
bzr revid: launchpad_translations_on_behalf_of_openerp-20131013053842-x6nja74l8by5vd1q
bzr revid: launchpad_translations_on_behalf_of_openerp-20131014053313-j22u5qen55na9js8
2013-10-14 05:33:13 +00:00
Olivier Dony 8ac110c4dd [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 5098 rev-id: odo@openerp.com-20131011123914-7zuvd9mch21yxgj8
bzr revid: dle@openerp.com-20131009131902-a93nsbou4w8y0vlx
bzr revid: chs@openerp.com-20131009175454-j06y1ngylfbqyrpj
bzr revid: dle@openerp.com-20130918160049-fo88fl7uyhfoofkv
bzr revid: dle@openerp.com-20130924130544-kmkyr0d73cusvdav
bzr revid: odo@openerp.com-20131011134433-nyfjipvlql4xu127
2013-10-11 15:44:33 +02:00
Amit Bhavsar (Open ERP) 7384ea8108 [imp] Improve the price margin calculation and name_search for variant.
bzr revid: amb@tinyerp.com-20131011123024-utkshw2tr1z8y8ah
2013-10-11 18:00:24 +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
Christophe Simonis 273face907 [MERGE] forward port of branch saas-1 up to revid 8791 chs@openerp.com-20131009175454-j06y1ngylfbqyrpj
bzr revid: chs@openerp.com-20131009180337-cxgdt6zzd1z68ga9
2013-10-09 20:03:37 +02:00
Thibault Delavallée dd2dd19b23 [MERGE] Sync with trunk until revision 8934
bzr revid: tde@openerp.com-20131007081153-qx4ybltaxbuy3thp
2013-10-07 10:11:53 +02:00
Antony Lesuisse 4c84a49afe [REM] shortcuts, deprecated by browser bookmarks
bzr revid: al@openerp.com-20131006131225-jguvkys2ngwsd6er
2013-10-06 15:12:25 +02:00
Olivier Dony bec80227d9 [FIX] account_voucher, product, stock: use selection widgets for magic context fields, to pass IDs in the context instead of strings
Many2one fields resolve to strings when used
as `self` within the @context or @filter_domain
attributes of a search field, because they
must be able to support partial matches,
e.g. search for "Sto" to match "Stock".
In many case the code was not prepared to accept
string for the magic context values, so the
magic fields now caused crashes.

The widget="selection" attribute was dropped
during the search view cleanup for 7.0,
without noticing this unfortunate side-effect,
at revision:
  addons 7.0 revno 7142 revid:qdp-launchpad@openerp.com-20120731150358-jqd3eoz06imzlx01

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

bzr revid: odo@openerp.com-20131004105218-edvb5ewduqar3x88
2013-10-04 12:52:18 +02:00
Thibault Delavallée 94887c5cb8 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20131004085039-is2mi6jlh9avo79k
2013-10-04 10:50:39 +02:00
Launchpad Translations on behalf of openerp 6ad09a8b40 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131004054526-wrer2m4h9u0lpvmm
2013-10-04 05:45:26 +00:00
Christophe Matthieu 16a3aa522b [IMP] website_sale: variant change the price
bzr revid: chm@openerp.com-20131003104701-28mvvte5wa6q8mt7
2013-10-03 12:47:01 +02:00
Paramjit Singh Sahota a3a0d02d19 Added product description for the published products.
bzr revid: psa@tinyerp.com-20131003062124-veb3i998ouxianil
2013-10-03 11:51:24 +05:30
Christophe Matthieu 0a3e643b18 [IMP] product template view
bzr revid: chm@openerp.com-20131002162738-x11l6521o9yonmlp
2013-10-02 18:27:38 +02:00
Thibault Delavallée 607de396ba [MERGE] Sync with trunk, until revision 8927
bzr revid: tde@openerp.com-20131002135442-g8l2vpkq7h0roqdt
2013-10-02 15:54:42 +02:00
Xavier Morel 3b431eec45 [IMP] file read
bzr revid: xmo@openerp.com-20130927121335-iixxhkft8qmii85x
2013-09-27 14:13:35 +02:00
Launchpad Translations on behalf of openerp 23620b2e54 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130925054843-vx0nogr2rpf5amw4
bzr revid: launchpad_translations_on_behalf_of_openerp-20130926055416-ubjv2v9mogsb49f3
bzr revid: launchpad_translations_on_behalf_of_openerp-20130927061626-2rcumswg0tc4e10e
bzr revid: launchpad_translations_on_behalf_of_openerp-20130926055451-072mn28h3ew4cwfp
bzr revid: launchpad_translations_on_behalf_of_openerp-20130927061658-4svrcqcw04av1e5w
2013-09-27 06:16:58 +00:00
Launchpad Translations on behalf of openerp ba95017720 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130925054914-zqgjgcb39ny7ejt5
2013-09-25 05:49:14 +00:00
Christophe Matthieu bd16487da1 [IMP] website_sale: change css and demo data
bzr revid: chm@openerp.com-20130924152639-v6hr0laatjcbxe39
2013-09-24 17:26:39 +02:00
Christophe Matthieu 51fae1fcf8 [IMP] website_sale display only non empty category in non editable mode
bzr revid: chm@openerp.com-20130924102834-op0bm475w20x35j4
2013-09-24 12:28:34 +02:00
Denis Ledoux db84e912bd [MERGE] Forward-port of latest saas-1 bugfixes, up to rev. 8781 rev-id: dle@openerp.com-20130923165651-0jt823r5wy37enw6
bzr revid: dle@openerp.com-20130923171310-mav1riq3d2rebmv2
2013-09-23 19:13:10 +02:00
Denis Ledoux 274cf1e293 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9475 rev-id: dle@openerp.com-20130923162428-g0s3o9tid09ogfv3
bzr revid: dle@openerp.com-20130923165651-0jt823r5wy37enw6
2013-09-23 18:56:51 +02:00
Fabien Pinckaers 512a9970df [IMP] Shop Improvements
bzr revid: fp@openerp.com-20130922172727-9zvivms9w9v5hv2q
2013-09-22 19:27:27 +02:00
Martin Trigaux 2a6419ea55 [FIX] product: avoid getting date=False in pricelist if wrong value in context, courtesy of Alexis de Lattre
bzr revid: mat@openerp.com-20130920144529-800nviktzebexwtt
2013-09-20 16:45:29 +02:00
Launchpad Translations on behalf of openerp c7471d1bff Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130919045624-x71znzpi3rpnvpcs
bzr revid: launchpad_translations_on_behalf_of_openerp-20130920060145-80h8zse3uw3jg2fx
2013-09-20 06:01:45 +00:00
Denis Ledoux 546a191f0a [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9459 rev-id: fva@openerp.com-20130918153347-fy4nuvbm82ngfb8x
bzr revid: mat@openerp.com-20130826135110-f9q4p65ds2aholcw
bzr revid: dle@openerp.com-20130828141129-ecxl2vlpb8vw0o9f
bzr revid: dle@openerp.com-20130828162659-n8a0ku9o3h01qaov
bzr revid: dle@openerp.com-20130830094205-q3itwd7x0246d9n6
bzr revid: dle@openerp.com-20130830133604-mfnfbscn5wdk4vi4
bzr revid: dle@openerp.com-20130902131244-v9uh0s8rg4889i7j
bzr revid: mat@openerp.com-20130903134105-68ziuaccreu6rs61
bzr revid: chs@openerp.com-20130906171851-jtfsf4au1k30wwlr
bzr revid: dle@openerp.com-20130909103120-k5oefxgebhyslac3
bzr revid: dle@openerp.com-20130909170047-pbzw4ernvcpivbhh
bzr revid: chs@openerp.com-20130910122113-171osvcukxffxcry
bzr revid: tde@openerp.com-20130912121059-k840pi4rwdzpez8g
bzr revid: dle@openerp.com-20130913085251-p906ci2divy82jur
bzr revid: tde@openerp.com-20130913092546-kzshg1a7sls566l8
bzr revid: mat@openerp.com-20130917122102-drf8fj9lrjj0fvju
bzr revid: mat@openerp.com-20130917161614-w8u2c1ayeb5kxm30
bzr revid: dle@openerp.com-20130918161305-7ep1642nxzyy3vhd
2013-09-18 18:13:05 +02:00
Launchpad Translations on behalf of openerp a46cbb7a31 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130913060803-zltruvkg213vqm57
bzr revid: launchpad_translations_on_behalf_of_openerp-20130915061052-1kts2jol7uvq1n4f
bzr revid: launchpad_translations_on_behalf_of_openerp-20130917051850-e1s8v09muo1atjwh
bzr revid: launchpad_translations_on_behalf_of_openerp-20130917051903-257acdjbxi60zyv8
2013-09-17 05:19:03 +00:00
Launchpad Translations on behalf of openerp 07f41591af Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130914055308-488d7jp6pk12s4oq
bzr revid: launchpad_translations_on_behalf_of_openerp-20130915061118-idedxdulpa7nb0s0
bzr revid: launchpad_translations_on_behalf_of_openerp-20130916061418-3r990vgrtgj1quyt
2013-09-16 06:14:18 +00:00
Launchpad Translations on behalf of openerp 4cb9834833 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130913060838-a2k0hfitlgdrqj0h
2013-09-13 06:08:38 +00:00
Launchpad Translations on behalf of openerp 9dba69ba48 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130912064018-3vecn03jcu9fm1m8
2013-09-12 06:40:18 +00:00
Christophe Simonis 3fa90321e1 [MERGE] forward port of branch saas-1 up to revid 8772 chs@openerp.com-20130910122113-171osvcukxffxcry
bzr revid: chs@openerp.com-20130910124803-wxkb8gkz1tub5qjf
2013-09-10 14:48:03 +02:00
Martin Trigaux d241afa6bd [FIX] product: pass count argument to super call for search (opw #585031)
bzr revid: mat@openerp.com-20130909140414-7mndwgkbwntgcgnj
2013-09-09 16:04:14 +02:00
Olivier Dony 6de0051315 [FIX] product: support string values for context `pricelist` key when computing prices
As of v7 search views will replace the value of any `self`
      literal in a @context attribute by the name of the
      record, whereas it used to be its ID.
      This means that the `Pricelist` filter used to display
      the product list with a specific pricelist would not
      work anymore.
      
      The fix requires a rather hackish name_search()
      override for product.pricelist because the display
      name of pricelists includes their currency, while
      that could be a valid name for a pricelist too.
      
      To avoid side-effects the name_search() override
      only picks up the special case used by the
      product.product._product_price() method when it
      tries to apply the context pricelist, that is
      with operator explicitly set to `=` and no extra
      domain `args`.

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

bzr revid: odo@openerp.com-20130906155047-7dmozy2jpe1ca1p2
2013-09-06 17:50:47 +02:00
Thibault Delavallée 8b48cc9520 [MERGE] addons: added groups when quick creating user in various addons.
bzr revid: tde@openerp.com-20130904141122-uaxlnu7qxzri4q3a
2013-09-04 16:11:22 +02:00
Olivier Dony 04560e356e [FIX] product: avoid triggering warning about pricelist_id being non-searchable
It is a dummy file that is not meant to be used
for filtering, but only for setting the context.

bzr revid: odo@openerp.com-20130904123949-z1zfoxucspx7avwv
2013-09-04 14:39:49 +02:00
Launchpad Translations on behalf of openerp 3ef8dbeac3 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130904050344-pjsmx05h22n09162
2013-09-04 05:03:44 +00:00
Launchpad Translations on behalf of openerp cb8f9c5a0d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130903054857-i15nhvtthlho7chm
2013-09-03 05:48:57 +00:00
Christophe Matthieu 2fab26a2d2 [IMP] point_of_sale, product: change model 'pos.category' of the pos into product.public.category in product. product.public.category is used for eg by pos and website_sale. Add some demo data for this category. Add a domain in pos 'model.js' to select non empty categories
bzr revid: chm@openerp.com-20130828151658-3isgyl93c3hwp1pc
2013-08-28 17:16:58 +02:00
Launchpad Translations on behalf of openerp 642311aa26 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130827050316-c3hzsnzygj4np1qh
2013-08-27 05:03:16 +00:00