Commit Graph

82 Commits

Author SHA1 Message Date
Christophe Simonis 780dd9891f [MERGE] forward port of branch saas-5 up to 7eab880 2014-09-15 14:00:02 +02:00
Denis Ledoux d3ba8a840d [FIX] website_sale: the order of the attribute list doesn't matter 2014-09-10 15:08:34 +02:00
Fabien Meghazi 5e6e1303e3 [IMP] pretty urls for /website/image 2014-08-28 16:37:38 +02:00
Denis Ledoux 1bb219907f [MERGE] forward port of branch saas-5 up to 655a5b9 2014-08-04 16:56:10 +02:00
Christophe Matthieu ce7212d5d7 [FIX] website_sale: everytime you want to change both billing & delivery address, any change creates duplicates in the backend 2014-08-01 17:11:20 +02:00
Christophe Matthieu 928f4fbf76 merge from 8.0 2014-07-09 16:10:08 +02:00
Christophe Matthieu 21615e6b2b [FIX] website_sale: change picture in function of the product selected 2014-07-02 14:45:37 +02:00
Christophe Matthieu 78f87dce34 [FIX] website_sale_options: tour and filter by attributes 2014-07-02 13:00:13 +02:00
Christophe Matthieu 162ee61d4f [FIX] website_sale: discount price is never hide 2014-06-30 13:53:25 +02:00
Christophe Matthieu 77a07670cf [IMP] website: move custom scripts in the assets; fix website_sale_option to display modal in grid view 2014-06-25 14:03:23 +02:00
Christophe Matthieu 412a7593be [IMP] website_sale_options 2014-06-25 11:31:39 +02:00
Christophe Matthieu 7505cce2e9 [WIP] 2014-06-24 17:37:13 +02:00
Christophe Matthieu 22d528c7a7 [IMP] website_sale: display the discount in the product template when the user select a variant 2014-06-19 13:12:08 +02:00
Christophe Matthieu 9f77cb9d1f [IMP] website_sale: optional product have all time the same quantity of the liked product. 2014-06-17 14:23:15 +02:00
Christophe Matthieu 0ac338ea0a [IMP] website_sale: display state function of selected country 2014-06-17 11:33:28 +02:00
Christophe Matthieu 474d63d6b9 [FIX] website_sale: fix keep query and clean code 2014-06-17 09:44:32 +02:00
Christophe Matthieu 0492e59314 [FIX] website_sale: rounding price; typo and search sequence of membership 2014-06-16 10:53:34 +02:00
Christophe Matthieu b8d4cd277e [FIX] website_sale: bind event with touch for ipad 2014-06-13 15:50:08 +02:00
Christophe Matthieu 8fdfc68074 [IMP] website_sale: display variants choice in confirm dialog box 2014-06-13 13:59:28 +02:00
Christophe Matthieu d8516bcfd8 [IMP] website_sale: optional quantity in product form 2014-06-13 12:47:54 +02:00
Christophe Matthieu 1e9c72f308 [MERGE] from master 2014-06-13 12:35:23 +02:00
Christophe Matthieu 57c59ddfac [IMP] website_sale: confirm/options dialog box have same layout of my cart 2014-06-13 12:31:41 +02:00
Christophe Matthieu 8a24171996 [IMP] website_sale: display 'Product not available' message in product selector 2014-06-13 09:32:28 +02:00
Christophe Matthieu f62673c266 [IMP] website_sale: Optional product with variant suggestion 2014-06-12 16:58:44 +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
Christophe Matthieu ef48c4d440 [FIX] website_sale: disable button does'nt work in the product template. 2014-06-06 10:57:50 +02:00
Christophe Matthieu 5f43d87a33 [IMP] website_sale: display image function of the selected product variant 2014-06-06 10:40:50 +02:00
Christophe Matthieu c5ab412acc [FIX] website_sale: change template for product and variant selector (type color) 2014-06-03 15:38:11 +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 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
chm@openerp.com c10800f2f1 [FIX] website_event_sale: multi tickets
bzr revid: chm@openerp.com-20140502140152-hx7ktaf0cg2m7ija
2014-05-02 16:01:52 +02:00
chm@openerp.com 0bae967baa [MERGE] from trunk
bzr revid: chm@openerp.com-20140312154854-gtq7v1dxfnunkcz6
2014-03-12 16:48:54 +01:00
chm@openerp.com 23eca80556 [MERGE] from trunk
bzr revid: chm@openerp.com-20140307104233-fqz4jwzf5yj6jtm2
2014-03-07 11:42:33 +01:00
Christophe Matthieu b994ae4938 [FIX] website_sale: search filter with multi values for one attribute does not work. (and fix slider)
bzr revid: chm@openerp.com-20140227160519-eakqgm2zwrxseya7
2014-02-27 17:05:19 +01:00
Christophe Matthieu 07b5cb38a0 [IMP] website_sale: refactoring: website_event_sale: fix for refactoring
bzr revid: chm@openerp.com-20140225125736-dni507i8xpz1b61j
2014-02-25 13:57:36 +01:00
Christophe Matthieu 1d4f8783b5 [IMP] website_sale: some fix and imp
bzr revid: chm@openerp.com-20140221172816-5bb5l9z2xsvswz8u
2014-02-21 18:28:16 +01:00
Christophe Matthieu bfeb2b9631 [MERGE] from trunk
bzr revid: chm@openerp.com-20140221094343-s1oh3iq07zi2jo0x
2014-02-21 10:43:43 +01:00
Christophe Matthieu e8964f896c [FIX] website: tour, test and test_runner
bzr revid: chm@openerp.com-20140206140746-jmeyx8q9qxv7sz1j
2014-02-06 15:07:46 +01:00
jke-openerp c18d350468 [FIX] Fix bug where button with contenteditable does not work in cross browser. Fix : replace tag 'button' by 'a' with class 'a-submit'
bzr revid: jke@openerp.com-20140201204741-ygdxaauq0m5axttg
2014-02-01 21:47:41 +01:00
Antony Lesuisse ff37d0ebca website sale refactor
bzr revid: al@openerp.com-20140130233951-55ttup4ohmp4i0nf
2014-01-31 00:39:51 +01:00
Antony Lesuisse 4aa8eadf5f [REN] rename product characterisic into attributes
bzr revid: al@openerp.com-20140130221710-nf2ircxgx3vr1spy
2014-01-30 23:17:10 +01:00
Christophe Matthieu 70090a12ba [FIX] website_sale
bzr revid: chm@openerp.com-20140123152542-6vtsx2by65281sr4
2014-01-23 16:25:42 +01:00
Christophe Matthieu 379f3fa3ff [FIX] website_sale: auto set or remove carrier in function of product (service or not)
bzr revid: chm@openerp.com-20140117173836-s5mpospo9g5xifew
2014-01-17 18:38:36 +01:00
ddm 4d24f84615 [IMP] Ensure correct parsing
bzr revid: ddm@openerp.com-20131231132100-jdddbzx2tzpiqmgi
2013-12-31 14:21:00 +01:00
Thibault Delavallée dbcdddd3d4 [MERGE] Sync with website-al, because sale was broken
bzr revid: tde@openerp.com-20131204130704-fa3pu4gnpku0frsj
bzr revid: tde@openerp.com-20131204144838-vu66z2lsybqtp4hm
2013-12-04 15:48:38 +01:00
Thibault Delavallée 9f0b5a7c53 [IMP] website_sale: improved the choice of acquirer.
Now all acquirer are displayed using a small icon; a Pay Now button is located on the right that
is the next step for the payment.
All acquirers are rendered with a Pay Now button, but only the currently chosen one is
displayed. This allows to display several acquirers without having to do javascript-based
hacks to tune the form, its action or content.

bzr revid: tde@openerp.com-20131204130628-eeqpfhoqaavhv6nk
2013-12-04 14:06:28 +01:00
Christophe Matthieu bc4a7c81bc [FIX] website_sale: fixes for access right with public user, and access to shopping cart, checkout... without passed by shop index, change url add_cart
bzr revid: chm@openerp.com-20131203154422-cwc12og1bgw9j9a8
2013-12-03 16:44:22 +01:00
Thibault Delavallée 32897bf4ee [MERGE] Sync with website-al
bzr revid: tde@openerp.com-20131121132413-lyngpz4c23kocmye
2013-11-21 14:24:13 +01:00
Christophe Matthieu dc8ef4da30 [FIX] website_sale: fix product editor and move edit code in website_sale.editor.js
bzr revid: chm@openerp.com-20131121132317-ysa25sdqqx8dg1wo
2013-11-21 14:23:17 +01:00
Thibault Delavallée 9f38df4d57 [MERGE] Sync with website-al
bzr revid: tde@openerp.com-20131115133635-66u5iuesqb5u6leq
2013-11-15 14:36:35 +01:00