Commit Graph

767 Commits

Author SHA1 Message Date
Christophe Simonis 61da3f4aba [MERGE] forward port of branch saas-3 up to revid 9409 dle@openerp.com-20140415101427-a6r7lgy50x9bdah3
bzr revid: chs@openerp.com-20140415142934-rlka4vkxd34fkil8
2014-04-15 16:29:34 +02:00
Kersten Jeremy a3016b4d95 [FIX] Remove double return
bzr revid: jke@openerp.com-20140410114048-hw26q9x0dm11wbqc
2014-04-10 13:40:48 +02:00
Kersten Jeremy 986b445fed [FIX] Website - Fix quantity not refresh when you add a product in your cart
bzr revid: jke@openerp.com-20140410113952-g0nvc9nfjma2t614
2014-04-10 13:39:52 +02:00
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 9c074a67a5 [FIX] website_sale: Do not search and associate a company to the partner when an order is validated
This can be regarded as a security leak: You can associate your partner to an existing company, which you maybe do not really belong, and therefore potentially access data which you are not authorized to see

Use street for the company name, street2 for the actual street, meanwhile

bzr revid: dle@openerp.com-20140410105804-am2xjmr09u3jk36r
2014-04-10 12:58:04 +02:00
Denis Ledoux 694fb63dda [FIX] website_sale: use commercial_partner_id instead of parent_id to have the company name of the artner in the checkout form
If the user is portal, its partner is a company and has a parent: a security rule prevent to read the parent_id
and the company which should be displayed is the closest company of the partner in the hierarchy, and, in this case, itself.

bzr revid: dle@openerp.com-20140410095814-x7hqymfelspvjdsw
2014-04-10 11:58:14 +02:00
Kersten Jeremy bd7a58adb3 [FIX] Website sale : cast quantity as flaot when forced by post input.
bzr revid: jke@openerp.com-20140408162432-21vbw3of9jd4c1sz
2014-04-08 18:24:32 +02:00
Kersten Jeremy 2cf1dad2a9 [FIX] Allow to pass qty in add_to_cart button (number and set_numer)
bzr revid: jke@openerp.com-20140408161107-0x7uxn68olvsjnnt
2014-04-08 18:11:07 +02:00
chm@openerp.com 673dc5b1d7 [MERGE] from trunk
bzr revid: chm@openerp.com-20140408132412-7ofhd87laj3uoazj
2014-04-08 15:24:12 +02:00
Christophe Simonis 0fad8159f3 [MERGE] forward port of branch saas-3 up to revid 9380 chs@openerp.com-20140407144439-10n8fs6zovodwwtx
bzr revid: chs@openerp.com-20140407163318-hh3jwfkj3o2c83lk
2014-04-07 18:33:18 +02:00
Kersten Jeremy 9226642436 [FIX] Ecomm - login to post a comment if not logged
bzr revid: jke@openerp.com-20140404135005-4uz7qtzyke58sgy2
2014-04-04 15:50:05 +02:00
Denis Ledoux 368afae722 [FIX] website_sale: order data refresh problem
bzr revid: dle@openerp.com-20140404102512-72x74ys4k6whk8ss
2014-04-04 12:25:12 +02:00
Thibault Delavallée 045a12c5c2 [FIX] website_sale: fixed post_msg, display only when having it (may have False, None, ..)
bzr revid: tde@openerp.com-20140404104918-cyszi1l333173d1t
2014-04-04 12:49:18 +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
Thibault Delavallée 0e7d514a3e [ADD] website_sale: added inherit of the transaction
form view to display the sale_order_id field.

bzr revid: tde@openerp.com-20140404084420-hhe0yd9npf8vox5h
2014-04-04 10:44:20 +02:00
Thibault Delavallée ec318c33e1 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20140404082228-g7g3b2ju06meqvq4
2014-04-04 10:22:28 +02:00
Denis Ledoux b5c0c3a5d2 [FIX] website_sale: order categories according to their sequence
bzr revid: dle@openerp.com-20140403112511-h4yi8jimf9hjucyl
2014-04-03 13:25:11 +02:00
Denis Ledoux ad680380b8 [FIX] website_sale*: not possible to process order if no delivery methods available
bzr revid: dle@openerp.com-20140402144520-ulfex2r3q9wwd3ig
2014-04-02 16:45:20 +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 13d7cfe86c [MERGE] from trunk
bzr revid: chm@openerp.com-20140324082341-d6gqyloc7822aen2
bzr revid: chm@openerp.com-20140325084852-i1yomuyhyen4ss95
2014-03-25 09:48:52 +01:00
Christophe Simonis d93b79e6f4 [MERGE] forward port of branch saas-3 up to revid 9345 dle@openerp.com-20140324110349-e82t1bmmtjqbl85k
bzr revid: chs@openerp.com-20140324133811-4az1kvbznd26seow
2014-03-24 14:38:11 +01:00
Kersten Jeremy 356e4f595a [FIX] Redirect user to /web/login and not /web. The redirect is now compatible with the rev web:3983 (needto be retrocompatible), but the good practice should be to always redirect to login. It is to login controller to redirect if user is alreayd logged.
bzr revid: jke@openerp.com-20140321115524-j3vk6lovuphnaods
2014-03-21 12:55:24 +01:00
Thibault Delavallée 38ae695d00 [IMP] payment modules: added provider selection field that is different
from the name. This allows to distinguish name and provider. Provider is a more
technical field, used to call some specific methods (<provider>_method_name). The
name field is used for display on the website.

Code and views udpated accordingly.

bzr revid: tde@openerp.com-20140319144608-0i4rv520l0bh53f0
2014-03-19 15:46:08 +01:00
Denis Ledoux b245af63b5 [FIX] website_sale: do not display product categories with no products
bzr revid: dle@openerp.com-20140319141130-dease119j9b2l2fh
2014-03-19 15:11:30 +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 8db7982726 [IMP] website_sale: remove print
bzr revid: chm@openerp.com-20140319083054-x10c4m7ecxk9202o
2014-03-19 09:30:54 +01:00
chm@openerp.com ed2743f755 merge upstream
bzr revid: chm@openerp.com-20140318161114-4t331xpt4xeitgxo
2014-03-18 17:11:14 +01:00
chm@openerp.com 42ba805cc8 [WIP] rev me
bzr revid: chm@openerp.com-20140318153456-gwz47zs8il23rwii
2014-03-18 16:34:56 +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
chm@openerp.com 5b722a036a [PATCH] sle
bzr revid: chm@openerp.com-20140318123225-zgn83zslr65z0wej
2014-03-18 13:32:25 +01:00
chm@openerp.com f9c68abfb5 [FIX] website_sale: test must inject tour
bzr revid: chm@openerp.com-20140318115631-aiifjcqmtubiofb0
2014-03-18 12:56:31 +01:00
chm@openerp.com 31893ce1bb [FIX]
bzr revid: chm@openerp.com-20140318111830-pudmv5okc69lo8a5
2014-03-18 12:18:30 +01:00
chm@openerp.com bc578bd6a7 [IMP] website_sale: activate tests
bzr revid: chm@openerp.com-20140318103014-bfjkkqka98tc3hmv
2014-03-18 11:30:14 +01:00
chm@openerp.com abe8e7208e [MERGE] from trunk
bzr revid: chm@openerp.com-20140318102102-ug0ny6q360i4o1e6
2014-03-18 11:21:02 +01:00
chm@openerp.com 363bbd00db [FIX] website_sale: display empty message for public user and allow admin to edit 'no product found' message
bzr revid: chm@openerp.com-20140317141749-vmsx9x1kkmygnc61
2014-03-17 15:17:49 +01:00
chm@openerp.com 34b6fac77a [FIX] website_sale: test tour shop_buy_product (step: 'select ipod 32Go'): remove teminal backslash in products grid view
bzr revid: chm@openerp.com-20140317094118-5gsddsfhmisi7xs3
2014-03-17 10:41:18 +01:00
chm@openerp.com 6fc418883e [FIX] website: route and redirect: remove all backslash from url
bzr revid: chm@openerp.com-20140317080145-6l5mk4q05uf639li
2014-03-17 09:01:45 +01:00
Antony Lesuisse 973ea59b28 [FIX] website_sale disabling tests while i rewrite Tour
bzr revid: al@openerp.com-20140316213304-gh0898xwonhca36z
2014-03-16 22:33:04 +01:00
Antony Lesuisse c93b466d32 [FIX] website tour, prepare for manual injection
- reorder website.js in a choerent way
- remove injectable website.tour.test.js

We will do injection manually using website.inject_tour, in the mean time only
non injection test are supported, fully disable test needing inject, until fme
merge its fix.

bzr revid: al@openerp.com-20140316165442-p82wqwv82559oact
2014-03-16 17:54:42 +01:00
chm@openerp.com b370a4e695 [FIX] website: test tour: must inject tour in page
bzr revid: chm@openerp.com-20140314180705-fjx0uetgyug1diaw
2014-03-14 19:07:05 +01:00
chm@openerp.com d5ddf5152c [FIX] website: remove backslash from redirect with enable_editor
bzr revid: chm@openerp.com-20140314180029-iaeq4i6735pcw100
2014-03-14 19:00:29 +01:00
chm@openerp.com 410ec52276 [MERGE] website: add optional 'action' in managment edit button to laod one specific backend view
bzr revid: chm@openerp.com-20140314162909-ff0obqbw6j7lalmz
2014-03-14 17:29:09 +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 79e1813d6e [MERGE] from trunk
bzr revid: chm@openerp.com-20140314151011-xhhsovbsg1r0sbwk
2014-03-14 16:10:11 +01:00
chm@openerp.com ba63094b9b [FIX] website_sale,website_event: can't create product and event. Why: controller and route are strict mode, remove / at the end of the route
bzr revid: chm@openerp.com-20140313132013-2foflswtdd5fp8hb
2014-03-13 14:20:13 +01:00
chm@openerp.com 2390c9179b [MERGE] from trunk
bzr revid: chm@openerp.com-20140312140429-4x94dc1x70yfik1w
bzr revid: chm@openerp.com-20140313122048-1zrqhq6dbtv8jpad
2014-03-13 13:20:48 +01:00
chm@openerp.com e9fc839785 [FIX] website: css themes
bzr revid: chm@openerp.com-20140313102140-37okt41sx5nchx50
2014-03-13 11:21:40 +01:00