Commit Graph

244 Commits

Author SHA1 Message Date
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 bc3fc54fac [IMP] Tour: add tour in web module; tour became available in backend. 2014-06-18 12:25:13 +02:00
Christophe Matthieu 25c564d635 [FIX] website_sale: check ipod product insead of ipad because demo data of ipad was changed 2014-06-17 14:27:26 +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 0f78e602d6 [FIX] website_sale: tour; product split kanban view of product and product template 2014-06-13 17:08:19 +02:00
Christophe Matthieu b8d4cd277e [FIX] website_sale: bind event with touch for ipad 2014-06-13 15:50:08 +02:00
Christophe Matthieu f4474d7295 [FIX] website_sale: add steps to remove the confirm dialog box in tour test 2014-06-13 14:24:48 +02:00
Christophe Matthieu 13920b09f1 [IMP] website_sale: add a tour of test to check confirm dialog box 2014-06-13 14:10:53 +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 Simonis a5908c5812 [MERGE] forward port of branch saas-5 up to b1c0bc0 2014-06-03 20:02:00 +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 e3bd7d953a [FIX] website_sale: tour about customize don't check last step 2014-06-02 12:11:04 +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 abab5c2e94 [MERGE] from trunk 2014-05-27 18:28:40 +02:00
Thibault Delavallée 4fecb29c51 [FIX] website_sale, website_event_sale: updated tests according to the new dom of the checkout page introduced in pull request 232 2014-05-27 14:22:29 +02:00
Thibault Delavallée a6379e2e67 [IMP] payment addons: fixed submit buttons: now have type=submit (and not image or nothing) and removed name, because this may cause issues when trying to submit a form manually with type=submit and a name. Also improved js code in website_sale to correctly handle the click binding, the asynchronous call to the server to create the transaction, and then submit the form. As form submission is synchronous in javascript, we cannot use the deferred. Instead we prevent the click event from bubbling, wait for the server to create the transaction, adn then manually submit the form. 2014-05-27 11:35:32 +02:00
--global ed51e843a2 [IMP] website_sale: change 'pay now' button behavior.
Now: intercept the call, make an asynchronous call to create the tx, then continue to the acquirer. Previous this was done by
a redirection, leading to a get request beign done. However it should be a post request.
2014-05-27 11:35:32 +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 74a6bde093 [MERGE] from trunk
bzr revid: chm@openerp.com-20140505134608-hqcmqyo3d98y851j
2014-05-05 15:46:08 +02:00
Fabien Meghazi b0cbaf330a [IMP] website: load website.xml templates only in editable mode
bzr revid: fme@openerp.com-20140505113800-wv5vh802us270oez
2014-05-05 13:38:00 +02:00
chm@openerp.com 939b2f2d44 [FIX] website_sale & tour
bzr revid: chm@openerp.com-20140502155124-98xz2b4gd2zzzrkx
2014-05-02 17:51:24 +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 ee16b014b1 [MERGE] from trunk
bzr revid: chm@openerp.com-20140502095132-kfx40xou73mukr2y
2014-05-02 11:51:32 +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
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
Denis Ledoux b54e49b291 [FIX] website_sale, website_sale_delivery, delivery: price computation on quantity change
bzr revid: dle@openerp.com-20140425152541-qiabb4sa7y2skgql
2014-04-25 17:25:41 +02:00
chm@openerp.com 4550b532ca [FIX] website_sale: add product: customize img (forgotten merge)
bzr revid: chm@openerp.com-20140411115939-yw257u179wqbh6sy
2014-04-11 13:59:39 +02:00
chm@openerp.com 1fc8f89bc1 [MERGE] from trunk
bzr revid: chm@openerp.com-20140411082050-lr7vtew6yvsqaon6
2014-04-11 10:20:50 +02:00
chm@openerp.com 7298130f31 [MERGE] from trunk
bzr revid: chm@openerp.com-20140410152925-ndajhnyh4rt8pkgu
2014-04-10 17:29:25 +02:00
chm@openerp.com 81cfa028e5 [FIX] website_sale: checkout shipping address; remove url terminal slash
bzr revid: chm@openerp.com-20140410143524-zrrsh6zvvrg9ntgz
2014-04-10 16:35:24 +02:00
chm@openerp.com 673dc5b1d7 [MERGE] from trunk
bzr revid: chm@openerp.com-20140408132412-7ofhd87laj3uoazj
2014-04-08 15:24:12 +02:00
chm@openerp.com be5fe933ec [MERGE] from trunk
bzr revid: chm@openerp.com-20140408080736-6b70rlfsvj3to0od
2014-04-08 10:07:36 +02:00
Thibault Delavallée a06d9099ea [FIX] website_sale: fixed stupid test usign a title
bzr revid: tde@openerp.com-20140404094955-51zhadhaavpjvkzl
2014-04-04 11:49:55 +02:00
Thibault Delavallée f0bc588710 [FIX] website_sale: fixed tour
bzr revid: tde@openerp.com-20140404085012-2h658158mm4ydkpq
2014-04-04 10:50:12 +02:00
Thibault Delavallée 7e9307e4d8 [IMP] payment_transfer: Transfer -> Wire Transfer + updated test
bzr revid: tde@openerp.com-20140404084528-sfdeyj7sl6dq4tm1
2014-04-04 10:45:28 +02:00
chm@openerp.com e0d33ad3c5 [FIX] website editor: shop tour and media editor for field image
bzr revid: chm@openerp.com-20140331133340-vj67s9hlptum0h19
2014-03-31 15:33:40 +02:00
chm@openerp.com 89a6bd0649 [IMP] website tour: fix auto test
bzr revid: chm@openerp.com-20140321123722-dmfdckh59cvot00i
2014-03-21 13:37:22 +01:00
chm@openerp.com 60bdd78706 [IMP] website tour: refactoring and change api for create tour and test
bzr revid: chm@openerp.com-20140320083055-z5ys4oey5brd439v
2014-03-20 09:30:55 +01:00
chm@openerp.com f857905a61 [FIX] website tour: remove testPath from test buy event and product, who hide the real error
bzr revid: chm@openerp.com-20140319093338-f5l9mgmkw2yyl0fx
2014-03-19 10:33:38 +01:00
chm@openerp.com a762af1f21 [FIX] website_sale: payment get status url (ending slash); fix debbuger template url scripts
bzr revid: chm@openerp.com-20140319085700-b4v9iu51a9jtzty3
2014-03-19 09:57:00 +01:00
chm@openerp.com 353bbdc2c3 [FIX] website: route and redirect: remove all backslash from url
bzr revid: chm@openerp.com-20140314162346-25vohj6ayp65tgiy
2014-03-14 17:23:46 +01: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 53f59c16d6 [MERGE] from trunk
bzr revid: chm@openerp.com-20140311154616-tb35jfweo3xuzqws
2014-03-11 16:46:16 +01:00
chm@openerp.com 69237e1c8e [FIX] website_sale: test tour: button in checkout must contains 'Confirm' because for running with public user
bzr revid: chm@openerp.com-20140307142825-lrhnzl32u4ex7l0s
2014-03-07 15:28:25 +01:00
chm@openerp.com c0d20af756 [FIX] Fix bug where button with contenteditable does not work in cross browser. Fix : replace tag 'button' by 'a' with class 'a-submit'; forgotten part
bzr revid: chm@openerp.com-20140307125141-gfvnwq0rnjyqbbvp
2014-03-07 13:51:41 +01:00
chm@openerp.com 9a6dfe1b54 [FIX] website: test tour shop_buy_product
bzr revid: chm@openerp.com-20140307105727-zm6bok7wbr6u0f6f
2014-03-07 11:57:27 +01:00
chm@openerp.com 23eca80556 [MERGE] from trunk
bzr revid: chm@openerp.com-20140307104233-fqz4jwzf5yj6jtm2
2014-03-07 11:42:33 +01:00
chm@openerp.com 29faa56d8e [FIX] website tour
bzr revid: chm@openerp.com-20140306161104-39dmtb9mw1crw2sd
2014-03-06 17:11:04 +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 6d7eccf10a [FIX] website snippet drop for rte; remove dependence to qweb template (remove popover from tours); fx import file with ajax
bzr revid: chm@openerp.com-20140207154520-2injapzg9lgrdbvc
2014-02-07 16:45:20 +01:00
Christophe Matthieu 64eb4376ee [MERGE] from saas-3
bzr revid: chm@openerp.com-20140206150121-drs3ybhgx5837zt2
2014-02-06 16:01:21 +01:00
Christophe Matthieu 14b4efcd28 [FIX] tour and translate title
bzr revid: chm@openerp.com-20140206145236-vwdq74yyz21qvyzu
2014-02-06 15:52:36 +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
Christophe Matthieu 0677fda79e [FIX] website tours: fix and translate
bzr revid: chm@openerp.com-20140206140643-z3b2fu2v9uaozc1z
2014-02-06 15:06:43 +01:00
Christophe Matthieu d23f8425ad [FIX] website tour: flickering; banner auto run; work with different language
bzr revid: chm@openerp.com-20140203112816-c350lxr5pgo9x2li
2014-02-03 12:28:16 +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
Christophe Matthieu ed45f41f9b [FIX] website tour test + add test for shop
bzr revid: chm@openerp.com-20140130224453-e0drwj4m54vymahz
2014-01-30 23:44:53 +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 110f3dd910 [IMP] website tour: refactoring: Check dom insead of trigger
bzr revid: chm@openerp.com-20140130210001-kiecx5nde2um3ni1
2014-01-30 22:00:01 +01:00
Christophe Matthieu 55fdaf0dd0 [FIX] website_sale: activate test tour
bzr revid: chm@openerp.com-20140129175038-663iuxiv0os6f9xt
2014-01-29 18:50:38 +01:00
Christophe Matthieu 876b61f42c [FIX] website: test tour and website_sale tour. Add ajax trigger to display popover when the ajax is complete and hmlt is loaded
bzr revid: chm@openerp.com-20140129160839-ijdcnuiny6ys8z6p
2014-01-29 17:08:39 +01:00
Fabien Pinckaers ca2991908c [IMP] Typo
bzr revid: fp@tinyerp.com-20140129093309-o567mh3bdstx121j
2014-01-29 10:33:09 +01:00
Fabien Pinckaers 0d734eb74e [IMP] Product Tour
bzr revid: fp@tinyerp.com-20140128223623-t9autfy4iin20e20
2014-01-28 23:36:23 +01:00
Christophe Matthieu 70a8e7902b [FIX] remove module_portal_anonymous ref
bzr revid: chm@openerp.com-20140127155412-zujhq5qb2q6xzj2t
2014-01-27 16:54:12 +01:00
Thibault Delavallée aff2b4973f [IMP] payment: distinguish manual from automatic payment acquirers.
Improved validation (manual/automatic) management in ecommerce.

bzr revid: tde@openerp.com-20140124144355-6aqhocw0nfo7212a
2014-01-24 15:43:55 +01:00
Christophe Matthieu 33eeff4448 [IMP] website_crm, website_sale: add a Website sale team and new lead and order to this sale team
[FIX] website_sale: remove auto assignation to administrator from website lead and order

bzr revid: chm@openerp.com-20140124114224-w80wd2ea0bx20ldk
2014-01-24 12:42:24 +01:00
Christophe Matthieu 8a5844d191 [IMP] website_sale: hide test tour from help menu
bzr revid: chm@openerp.com-20140124094241-z1pf5895w2f2sfrh
2014-01-24 10:42:41 +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 4e68fff52e [FIX] website_sale: demo data, test, delivery, context pricelist
bzr revid: chm@openerp.com-20140123104705-679zt0odq0pseu7p
2014-01-23 11:47:05 +01:00
Christophe Matthieu 0fe979572b [FIX] website_sale: test tour
bzr revid: chm@openerp.com-20140122145821-da1l5l5bji39j5mv
2014-01-22 15:58:21 +01:00
Christophe Matthieu 8256bdfe44 [IMP] website: add a log report in tour test
bzr revid: chm@openerp.com-20140122112041-id595hkptgzoym6w
2014-01-22 12:20:41 +01:00
Christophe Matthieu 35b7cd5d51 [WIP] website_sale: test tour debug
bzr revid: chm@openerp.com-20140122081321-8mtcqnd5yyx6c2nj
2014-01-22 09:13:21 +01:00
Christophe Matthieu d9582aa9e4 [WIP] website_sale: test tour error
bzr revid: chm@openerp.com-20140121221438-6j1231868ex479p2
2014-01-21 23:14:38 +01:00
Christophe Matthieu 98bdaf4a1c [WIP] website_sale: test tour error
bzr revid: chm@openerp.com-20140121210506-s11tmbdczs34bkuu
2014-01-21 22:05:06 +01:00
Christophe Matthieu 0f7e290cd6 [WIP] website_sale: test tour error
bzr revid: chm@openerp.com-20140121203102-btt5bvn0dxnyx9y2
2014-01-21 21:31:02 +01:00
Christophe Matthieu 6d320f6f0b [FIX] website_sale: payement button
bzr revid: chm@openerp.com-20140121125040-r4o7wdys2hd3437d
2014-01-21 13:50:40 +01:00
Christophe Matthieu 4ff1af4d01 [FIX] website: display or not editor edit button; website_sale: test tour; website: contact qweb widget
bzr revid: chm@openerp.com-20140121123912-0ya4ziusj09efti3
2014-01-21 13:39:12 +01:00
Christophe Matthieu 8d48ce0f5a [IMP] website: js test/tour: raise an exception when cycling or time overlaps
bzr revid: chm@openerp.com-20140121100717-d8foqqz5vmdyowuo
2014-01-21 11:07:17 +01:00
Christophe Matthieu 3b1fec3220 [FIX] website: double reload in tests process
bzr revid: chm@openerp.com-20140121083038-63cubvi2bu59klaj
2014-01-21 09:30:38 +01:00
Christophe Matthieu 53d8280f1d [IMP] website: test class with test for website_sale sale process
bzr revid: chm@openerp.com-20140120182643-tw65rig4qqi3sqqf
2014-01-20 19:26:43 +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
Christophe Matthieu 4ff74cbf99 [IMP] website: editor menus is displayed in function of users groups (event, blog...)
bzr revid: chm@openerp.com-20140116180535-c736cuxn12qghiea
2014-01-16 19:05:35 +01:00
Christophe Matthieu 4998764d40 [IMP] website_sale: website_sequence with push to top, push up, push down, push to bottom
bzr revid: chm@openerp.com-20140110112442-kmjx97tk6zz5zpwa
2014-01-10 12:24:42 +01:00
Christophe Matthieu c4ea06327c [FIX] website: typo
bzr revid: chm@openerp.com-20140106103855-vjd6ro0w4m0xkfrc
2014-01-06 11:38:55 +01:00
ddm 4d24f84615 [IMP] Ensure correct parsing
bzr revid: ddm@openerp.com-20131231132100-jdddbzx2tzpiqmgi
2013-12-31 14:21:00 +01:00