Xavier Morel
74d4d1f58d
[CHG] bundlify website
...
CKEDITOR_BASEPATH has to be defined, by default ckeditor will load its files
relative to "itself" (the file which executes it). After bundling, the path is
incorrect and ckeditor looks for its files (e.g. en.js) in the wrong place.
bzr revid: xmo@openerp.com-20140418121503-4nsja7enutney2vn
2014-04-18 14:15:03 +02:00
Paramjit Singh Sahota
97711ed282
[ImP] Improved typo's AND searched the section_id direct from the xml id AND directly inserted the state on the 2nd position in sale.order rather than declaring the states again.
2014-04-17 10:45:01 +05:30
Paramjit Singh Sahota
be8a180bc5
[ADD] Added a search view for the shopping_cart menu.
2014-04-16 17:09:32 +05:30
Mehul Mehta (OpenERP)
671cbe02e1
[IMP] remove unnecessary reference bcaz which id override on this modules
2014-04-16 15:58:08 +05:30
Paramjit Singh Sahota
79fb080c0e
[REM] REmoveD the shopping cart fliter from the quotations search view bcz itz not need their.
2014-04-16 15:40:52 +05:30
chm@openerp.com
9284bd4817
[FIX] website: tour test inject javascript
...
bzr revid: chm@openerp.com-20140416082138-rhwo2tl9l6jrko78
2014-04-16 10:21:38 +02:00
chm@openerp.com
dbe1b81d15
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140416074634-jkcn3ae30q9uqnsi
2014-04-16 09:46:34 +02:00
Mehul Mehta (OpenERP)
7927f34339
[IMP] remove quotation domain in shopping cart state
2014-04-16 11:21:14 +05:30
Mehul Mehta (OpenERP)
3ef529f1a1
[MERGE] merged with lp:openobject-addons
2014-04-16 10:34:53 +05:30
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
Mehul Mehta (OpenERP)
a8c1649423
[MERGE] merged with lp:openobject-addons
2014-04-15 19:01:17 +05:30
Mehul Mehta (OpenERP)
7ceaefb106
[IMP] draft state replace with shopping_cart state and remove the condition of pending which convert a draft quotation into quotation sent
2014-04-15 18:55:12 +05:30
Mehul Mehta (OpenERP)
6925bdad96
[ADD] Added a menu for 'Shopping Cart' which is available after installing website_sale and all the quotations generated in shop are directly accessable through this menu.
2014-04-15 11:14:05 +05:30
Mehul Mehta (OpenERP)
5f34cb309f
[IMP] improved a code according to a data file
2014-04-14 16:34:49 +05:30
Paramjit Singh Sahota
fdc61b6e60
[IMP] Highlight the confirm order button while the quotation in shopping cart state and added a Shopping Cart in search view.
2014-04-14 15:43:14 +05:30
Mehul Mehta (OpenERP)
635739ee11
[Fix] remove parseError for Extenal ID
2014-04-14 14:37:26 +05:30
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
9932aa3b45
[FIX] website_sale: checkout_parse
...
bzr revid: chm@openerp.com-20140410153746-kp8rw92j89x0c7vp
2014-04-10 17:37:46 +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
db080813df
[FIX] website_sale: checkout prefix
...
bzr revid: chm@openerp.com-20140410151330-md9fq3zg8e6bliok
2014-04-10 17:13:30 +02:00
Paramjit Singh Sahota
7751334d97
Fixed order.state
2014-04-10 20:42:29 +05:30
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
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
Paramjit Singh Sahota
dfffd7cef1
[MERGE] MErged lp:openobject-addons.
2014-04-10 15:09:17 +05:30
Paramjit Singh Sahota
e5229ee8c3
[IMP] Improved code by shifting the complete code to website_sale rather than doing in sale.
2014-04-10 14:26:13 +05:30
Paramjit Singh Sahota
2df2f77818
Test commit
2014-04-09 18:39:42 +05:30
Paramjit Singh Sahota
3ae307003a
[IMP] Improved code for confirm_order state in shopping_cart.
2014-04-09 12:27:12 +05:30
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
Paramjit Singh Sahota
e627f1da63
[MERGE] Merged lp:openobject-addons.
2014-04-08 14:31:51 +05:30
chm@openerp.com
be5fe933ec
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140408080736-6b70rlfsvj3to0od
2014-04-08 10:07:36 +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
Paramjit Singh Sahota
171dd23fa9
[MERGE] Merged lp:openobject-addons.
2014-04-07 10:34:00 +05:30
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
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
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
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
b28a32f6ef
[FIX] website: test_ui running
...
bzr revid: chm@openerp.com-20140326144442-ye2a51f03wyaxi8a
2014-03-26 15:44:42 +01:00
chm@openerp.com
99ac3ff81b
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140326105539-9hf1x7u6lvh2hq2f
2014-03-26 11:55:39 +01: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
chm@openerp.com
62814f9c23
[FIX] website: activate new tour tests
...
bzr revid: chm@openerp.com-20140324081112-15n58puu29weydme
2014-03-24 09:11:12 +01: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
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
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
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
Denis Ledoux
2b762083a3
[FIX] website_sale: only display payment acquirers of the company of the quotation, or payment acquirers not linked to any company
...
bzr revid: dle@openerp.com-20140313085107-ie4ptew82p4rq9cy
2014-03-13 09:51:07 +01:00
chm@openerp.com
4093259ec2
[WIP] website: fix css layout for themes
...
bzr revid: chm@openerp.com-20140312175519-o1ld0jo983ao7aaa
2014-03-12 18:55:19 +01:00
chm@openerp.com
0bae967baa
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140312154854-gtq7v1dxfnunkcz6
2014-03-12 16:48:54 +01:00
Kersten Jeremy
6a01718aef
[FIX] Remove test from saas-3 - Tech Saas & AL agreement
...
bzr revid: dle@openerp.com-20140311164559-1vi0mw3qm8n0vobn
bzr revid: dle@openerp.com-20140312111450-smumao0hm1vzifgn
bzr revid: dle@openerp.com-20140312121555-uum96hj8f2y1rvna
bzr revid: jke@openerp.com-20140312125757-e2kgxuwz0jko77ve
2014-03-12 13:57:57 +01:00
Kersten Jeremy
cf4a211a09
[FIX] Uncomment tests which fail
...
bzr revid: jke@openerp.com-20140312114057-sdlbvs3knty4czon
2014-03-12 12:40:57 +01:00
Kersten Jeremy
282b9624e4
[FIX] Reactivate tests js which have been commented !
...
bzr revid: jke@openerp.com-20140312102554-fcdixi03bw5rqqj1
2014-03-12 11:25:54 +01:00
Kersten Jeremy
eb2913d5b3
[FIX] Remove test from saas-3 - Tech Saas & AL agreement
...
bzr revid: jke@openerp.com-20140312101629-dzf4620cobaeu22t
2014-03-12 11:16:29 +01:00
chm@openerp.com
384f398090
[IMP] website: publish button use action for url to backend
...
bzr revid: chm@openerp.com-20140311171941-1fwhholwlsuncjyh
2014-03-11 18:19:41 +01:00
chm@openerp.com
f75f09db92
[FIX] website_sale: set height for empty cell in grid
...
bzr revid: chm@openerp.com-20140311160419-a9d4dylm0spt4rf3
2014-03-11 17:04:19 +01:00
chm@openerp.com
53f59c16d6
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140311154616-tb35jfweo3xuzqws
2014-03-11 16:46:16 +01:00
Christophe Simonis
d504764eff
[MERGE] forward port of branch saas-3 up to revid 9298 chm@openerp.com-20140311130852-3ft0v1mc9ht1any6
...
bzr revid: chs@openerp.com-20140311145205-s56fj113fsrnisc3
2014-03-11 15:52:05 +01:00
chm@openerp.com
3353305a6f
[FIX] website_sale: remove filter of rows process grid, layout need to create empty tr for rowspan
...
bzr revid: chm@openerp.com-20140311093050-4p75rrdh5bg8mpqy
2014-03-11 10:30:50 +01:00
chm@openerp.com
d41ea1cfdc
[FIX] website_sale: grid view remove rowspan if colspan=4
...
bzr revid: chm@openerp.com-20140310163329-nglj6dxpulzcl5qn
2014-03-10 17:33:29 +01:00
chm@openerp.com
832e6ad2d6
[FIX] website_sale: resize big image if size 1x1 for loading faster; (don't use image_medium who break some layout customisation like 'image full'
...
bzr revid: chm@openerp.com-20140310152847-xjilnu4cxhs3c73b
2014-03-10 16:28:47 +01:00
chm@openerp.com
2b7298fbf6
[FIX] website_sale: grid must display last empty cell and not chacked empty cell
...
bzr revid: chm@openerp.com-20140307165239-qzawwm7vrob9fnxd
2014-03-07 17:52:39 +01:00
chm@openerp.com
3195913272
[FIX] website_sale: grid view don't display empty cells
...
bzr revid: chm@openerp.com-20140307153718-2nlw8mtntfkm7ehu
2014-03-07 16:37:18 +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
dfc428a6a1
[FIX] website_sale: Remove the oe_shadow from product Description; fix description editing; fix resize shopping cart.
...
bzr revid: chm@openerp.com-20140307134551-kxxp703sgep5eacv
2014-03-07 14:45:51 +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
0b92d30081
[FIX] Replace t-esc in t-field for amount_untaxed in checkout of website_sale. Else display monetary does not work
...
bzr revid: chm@openerp.com-20140307103702-lsfj0iehm5kg4z29
2014-03-07 11:37:02 +01:00
Kersten Jeremy
e8e1cf2d2f
[FIX] Fix route of controller to post a comment from a product page
...
bzr revid: jke@openerp.com-20140307103038-rc5rdaa7ottpjgz1
2014-03-07 11:30:38 +01:00
chm@openerp.com
29faa56d8e
[FIX] website tour
...
bzr revid: chm@openerp.com-20140306161104-39dmtb9mw1crw2sd
2014-03-06 17:11:04 +01:00
Paramjit Singh Sahota
e50f23dfb5
[IMP] Added crm in depends and fetch section_id.
2014-03-05 17:02:56 +05:30
Paramjit Singh Sahota
b6c748ffe6
[IMP]Added the 'Shopping Carts' sales team and improved code accordingly
2014-03-05 12:30:24 +05:30
Thibault Delavallée
6924171964
[FIX] website_sale: effectively send the email of a draft
...
or confirmed quotation on the ecommerce. Having the action is not sufficient
we have to trigger it manually.
bzr revid: tde@openerp.com-20140304154433-t9mo6bzsesx7z613
2014-03-04 16:44:33 +01:00
Thibault Delavallée
1802496c9f
[FIX] website_sale: fixed wrong method name, sale_reset_order is not defined anymore
...
bzr revid: tde@openerp.com-20140304143426-0eaec0sr6y4ogta9
2014-03-04 15:34:26 +01:00
Christophe Simonis
47c4728f43
[FIX] mail,website_sale: rename file_type to file_type_icon to avoid name conflict with file_type field added by document module
...
bzr revid: chs@openerp.com-20140228142233-i0mm9lav0czbydkk
2014-02-28 15:22:33 +01:00
Christophe Simonis
c8971214f9
[FIX] website_sale: allow validation of free orders (amount = 0) without payment transaction
...
bzr revid: chs@openerp.com-20140228123414-4chmuemyi72rpwgf
2014-02-28 13:34:14 +01:00
Christophe Matthieu
24f9dc348a
[FIX] website_sale: long product title is over the price in grid view.
...
bzr revid: chm@openerp.com-20140228102257-000435ykuv7000ub
2014-02-28 11:22:57 +01:00
Christophe Matthieu
5e509d07df
[FIX] website_sale: search filter with multi values for one attribute does not work. (and fix slider)
...
bzr revid: chm@openerp.com-20140227164756-846ezfa36fz3v4d9
2014-02-27 17:47:56 +01:00
Christophe Simonis
3e2c1b1be3
[FIX] website_sale: do not write on public user
...
bzr revid: chs@openerp.com-20140227164000-owh6217y3t5iyiow
2014-02-27 17:40:00 +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
6a9d3326db
[FIX] website_sale: 'Ship to a different address' not translatable
...
bzr revid: chm@openerp.com-20140227135120-drw0jha7gzqptdog
2014-02-27 14:51:20 +01:00
Denis Ledoux
70d3f251a3
[REVERT] rev 8788.1.1769: The exchange rate of the currency of the pricelist should not be applied as this price computation method does not depends of any pricelist
...
bzr revid: dle@openerp.com-20140226172300-z2okr3vpjuwxs4mz
2014-02-26 18:23:00 +01:00
Christophe Matthieu
77c484351c
[FIX] website_sale: import test_ui
...
bzr revid: chm@openerp.com-20140225135100-l526befjiyhnv5gp
2014-02-25 14:51:00 +01:00
Christophe Matthieu
e886b5dd71
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140225130638-c8mql44hwo340fg2
2014-02-25 14:06:38 +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
a5ca54fd5b
[IMP] website_sale: fixed and refactored until shop/payment
...
bzr revid: chm@openerp.com-20140225100934-74v930kb4suxb9x4
2014-02-25 11:09:34 +01:00
Fabien Meghazi
2ab61cf001
[IMP] Rename request.httprequest.session -> request.session
...
bzr revid: fme@openerp.com-20140225090506-4rnku48yg7ruvv8p
2014-02-25 10:05:06 +01:00
Frédéric van der Essen
5c08f38a1b
[FIXME] deactivated failed tests to make the runbot green again
...
bzr revid: fva@openerp.com-20140224164321-7631d3uqu2r2zqyw
2014-02-24 17:43:21 +01:00
Christophe Matthieu
73853f0744
[IMP] website_sale: checkout_values, checkout_parse and checkout_form_validate
...
bzr revid: chm@openerp.com-20140224162041-rii00m5hs1e4jadz
2014-02-24 17:20:41 +01:00
Christophe Matthieu
91f64613ae
[FIX] website_sale: int(category)
...
bzr revid: chm@openerp.com-20140224100050-eyye9p5oug3cnq87
2014-02-24 11:00:50 +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
758aa20c75
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140221112742-nq2g1l3emoa2q9cz
2014-02-21 12:27:42 +01:00
Christophe Matthieu
bfeb2b9631
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140221094343-s1oh3iq07zi2jo0x
2014-02-21 10:43:43 +01:00
Christophe Simonis
4b72678bc7
[MERGE] forward port of branch saas-2 up to revid 9195 chs@openerp.com-20140220154517-6y531n1mqtnfnsmr
...
bzr revid: chs@openerp.com-20140220163815-69sza1kclnh5mavs
2014-02-20 17:38:15 +01:00
Christophe Matthieu
1e2a5ddfa6
[FIX] website: fix for ie: add bootstrap class in website_sale and bind click for editor
...
bzr revid: chm@openerp.com-20140225162136-5xdt7n498qxf9myw
2014-02-25 17:21:36 +01:00
Xavier Morel
55a9e5af27
[FIX] re-enable website_sale tests because they pass so whatever
...
bzr revid: xmo@openerp.com-20140219144754-52dz24qmnjq72zor
2014-02-19 15:47:54 +01:00
Xavier Morel
61c82f28a4
[FIX] imports, use @expectedFailure, simplify some inject specs
...
bzr revid: xmo@openerp.com-20140218160339-2r34z4ks2o4lriu5
2014-02-18 17:03:39 +01:00
Antony Lesuisse
e91e562153
[FIX] website_sale disable some tests
...
bzr revid: al@openerp.com-20140217015450-r3ptbenz7642v97b
2014-02-17 02:54:50 +01:00
Antony Lesuisse
2112eb6448
[FIX] website_sale enable some tests
...
bzr revid: al@openerp.com-20140217012827-3rb4mrkgx3ubp0dx
2014-02-17 02:28:27 +01:00
Christophe Matthieu
a7e5025f29
[FIX]website_sale: crappy fix for view product: branding error => can't edit guarantee part when the product_attributes inherit is apply
...
bzr revid: chm@openerp.com-20140212152842-6ymg8kund5l2v7yk
2014-02-12 16:28:42 +01:00
Christophe Matthieu
5a134745e8
[FIX] website_sale: search category with int for saas updating without -u
...
bzr revid: chm@openerp.com-20140212141713-j9cagak2z2j4s20x
2014-02-12 15:17:13 +01:00
Christophe Matthieu
ed785f0783
[FIX] website_sale: pager and breadcrum keep search and filter. Filter keep search and category. Links for category
...
bzr revid: chm@openerp.com-20140212115516-3izdv7cszgh2n3l4
2014-02-12 12:55:16 +01:00
Christophe Matthieu
5b8ea0803a
[FIX] website: crappy layout when use click on edit in the shop. Microforma error. Don't use meta tag in page content: ckeditor bug report 8117.
...
bzr revid: chm@openerp.com-20140211135610-0xhf2yiuwfc8k0ss
2014-02-11 14:56:10 +01:00
Antony Lesuisse
9c7f132a7a
[IMP] website test_ui simplification
...
bzr revid: al@openerp.com-20140210005926-03hhcm56gpplgbt2
2014-02-10 01:59:26 +01:00
Antony Lesuisse
70d498c14a
[FIX] disable http test before conversion
...
bzr revid: al@openerp.com-20140209141950-o9sf0jual07y315f
2014-02-09 15:19:50 +01:00
Antony Lesuisse
87172d90d2
[MERGE] saas-3
...
bzr revid: al@openerp.com-20140209140315-ukqlf90ngy6ycu2k
2014-02-09 15:03:15 +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
b21bb08c22
[ADD] website: test login, backend, go back, branding, edit, logout
...
bzr revid: chm@openerp.com-20140207125231-3zd0i1axdwuht5g4
2014-02-07 13:52:31 +01:00
Christophe Matthieu
22a27ed953
[MERGE] Microformats (microdata) support for improved SEO.
...
Supported formats:
- Organization
https://support.google.com/webmasters/answer/146861?hl=en&ref_topic=1088474
http://schema.org/Organization
- Event
https://support.google.com/webmasters/answer/164506?hl=en&ref_topic=1088474
http://schema.org/Event
- Product+Offer
https://support.google.com/webmasters/answer/146750#offer_properties
http://schema.org/Product
http://schema.org/Offer
Tested with http://www.google.com/webmasters/tools/richsnippets
bzr revid: chm@openerp.com-20140207113721-klunj6bf9qp4b2cx
2014-02-07 12:37:21 +01:00
Christophe Matthieu
a3664a8924
[FIX] website: create event, product
...
bzr revid: chm@openerp.com-20140206154711-vwvw7g1wo1fd1h1y
2014-02-06 16:47:11 +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
052bcacd5f
[FIX] website_sale template; snippet editor
...
bzr revid: chm@openerp.com-20140206140258-l3hriceuksx0c061
2014-02-06 15:02:58 +01:00
Christophe Matthieu
d819d494f1
[IMP] website: add debugger template used to create nex tours/tests (display in customize menu in debug mode)
...
bzr revid: chm@openerp.com-20140206135036-geq8fubtz39pxp20
2014-02-06 14:50:36 +01:00
Fabien Pinckaers
4dbcf24f19
[IMP] Empty product page
...
bzr revid: fp@tinyerp.com-20140205212452-ktjjx4qcufzlmlqc
2014-02-05 22:24:52 +01:00
ddm@openerp.com
706881ab38
[FIX] Proper ticket price micodata
...
bzr revid: ddm@openerp.com-20140205075141-xxedwfwf3lz2v0ej
2014-02-05 08:51:41 +01:00
ddm@openerp.com
af2db3b19d
[IMP] Microdata for product
...
bzr revid: ddm@openerp.com-20140203174422-tah5bx94y9mctlei
2014-02-03 18:44:22 +01:00
ddm@openerp.com
9e12243350
[IMP] Microdata for product list (+description)
...
bzr revid: ddm@openerp.com-20140203165853-g3nt28nzbe59gbvl
2014-02-03 17:58:53 +01:00
ddm@openerp.com
2d4d872300
[IMP] Microdata for product list
...
bzr revid: ddm@openerp.com-20140203165536-5wxskybc50fdd8x3
2014-02-03 17:55:36 +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
jke-openerp
6abf20906e
[Typo] Replace t-esc in t-field for amount_untaxed in checkout of website_sale. Else display monetary does not work
...
bzr revid: jke@openerp.com-20140201200413-zww5pcobl6vmvqe1
2014-02-01 21:04:13 +01:00
Antony Lesuisse
5960d495e5
[FIX] website_sale typo feh police
...
bzr revid: al@openerp.com-20140201121415-pxnhjdc4o3tp91hj
2014-02-01 13:14:15 +01:00
Nicolas Wisniewski
93bbdc6b53
[IMP] Add some video to manisfest ( website, website_blog, website_event, website_ecommerce)
...
bzr revid: nwi@openerp.com-20140228110637-dh15ixb2nppikuif
2014-02-28 12:06:37 +01:00
Olivier Dony
1a63261096
[IMP] website apps flagged as such: website, website_event (replaces event), website_blog, website_sale
...
bzr revid: odo@openerp.com-20140131092721-r8ye1nc6abbgrg5j
2014-01-31 10:27:21 +01:00
Fabien Pinckaers
dc42b875b3
[IMP] missing picture
...
bzr revid: fp@tinyerp.com-20140131091149-e7whsr3cbj6p54ci
2014-01-31 10:11:49 +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
c1739bfb8d
[IMP] product rename suggested to accessory, add alternative to replace recommend
...
bzr revid: al@openerp.com-20140130233240-p0wcs2s57qp9nwp2
2014-01-31 00:32:40 +01:00
Christophe Matthieu
5400c508e5
[FIX] website tour test
...
bzr revid: chm@openerp.com-20140130232330-kgrw8e7d0ez3f3pp
2014-01-31 00:23:30 +01:00
jke-openerp
04e158151a
[FIX] Add tax on product for sale order line from website
...
bzr revid: jke@openerp.com-20140130231818-selp4mhzak8yjml6
2014-01-31 00:18:18 +01:00
Antony Lesuisse
3124343f04
[IMP] product style model renames, add user_id on website to be used in multiwebsite
...
bzr revid: al@openerp.com-20140130225853-6fgpmtaa8v1vr25x
2014-01-30 23:58:53 +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
5e10f80cd4
[fix] website: test tour
...
bzr revid: chm@openerp.com-20140130215717-h211wj65wl20zfru
2014-01-30 22:57:17 +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
jke-openerp
fd6d4d8303
[FIX] Set the good url redirect in "Sign In" button from the cart
...
bzr revid: jke@openerp.com-20140130104937-6rjt51rg3o9bz90k
2014-01-30 11:49:37 +01:00
jke-openerp
ab8ee396ec
[TYPO] Add space between icon and button in cart "Continue Shopping"
...
bzr revid: jke@openerp.com-20140130094927-44b8szwtb602e180
2014-01-30 10:49:27 +01:00
jke-openerp
7027ce6eda
[REF] website_sale : Add missing widget option in recommanded product, to display image
...
bzr revid: jke@openerp.com-20140130091813-hko16qlm4t8tmq37
2014-01-30 10:18:13 +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
Denis Ledoux
255fe082bd
[FIX] website_membership: membership displayed order depending on website_sequence
...
bzr revid: dle@openerp.com-20140129171554-h76n4579xquhdxxv
2014-01-29 18:15:54 +01:00
Olivier Dony
e6e8bb3789
[IMP] website_*: remove useless % chars surrounding ilike operand, this is the default
...
bzr revid: odo@openerp.com-20140129163557-0bb86mx8it57mcvi
2014-01-29 17:35:57 +01:00
Olivier Dony
0ac11b430f
[IMP] website_sale: spellchecking
...
bzr revid: odo@openerp.com-20140129162331-sjmquzz172h9dkp4
2014-01-29 17:23:31 +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
Denis Ledoux
0306adbfe3
[FIX] *: using werkzeug.url_encode instead of urllib.urlencode because urliblib.encode does not accept unicode
...
bzr revid: dle@openerp.com-20140129121316-b5f5e4r6fz9l80kq
2014-01-29 13:13:16 +01:00
Christophe Matthieu
911d95eabd
[FIX] website_sale: display the line name in my cart
...
bzr revid: chm@openerp.com-20140129095900-iux7i0flrtg1qj2t
2014-01-29 10:59:00 +01:00
Fabien Pinckaers
1486e52927
[IMP] better apps names
...
bzr revid: fp@tinyerp.com-20140129095132-fl2fnhxlk4pxanj8
2014-01-29 10:51:32 +01:00
Christophe Matthieu
5b54fa0061
[IMP] website_event_sale: don't display reduction for product event in my cart
...
bzr revid: chm@openerp.com-20140129094220-alhq9n8eevc3fvbt
2014-01-29 10:42:20 +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
Antony Lesuisse
94746ae827
[FIX] website_sale remove usless size
...
bzr revid: al@openerp.com-20140128205328-r5gwz7zfndjmdurq
2014-01-28 21:53:28 +01:00
Antony Lesuisse
d4bbe13963
[REM] t-href is now t-attf-href
...
bzr revid: al@openerp.com-20140128205017-47rxm2xbb84dmjas
2014-01-28 21:50:17 +01:00
Fabien Meghazi
326c35aecd
[IMP] Merge bananas and cumcumbers in order to prepare the t-href|t-action removal
...
bzr revid: fme@openerp.com-20140128201417-1elmttz8qen9q3ws
2014-01-28 21:14:17 +01:00
Christophe Simonis
adac86d0ce
[FIX] website_sale: redirect to shop when trying to pay an empty cart
...
bzr revid: chs@openerp.com-20140128201258-nq4t5axsz3vmrjiw
2014-01-28 21:12:58 +01:00
Olivier Dony
53a0ca20a3
[IMP] website_sale: promo code should not be translatable
...
bzr revid: odo@openerp.com-20140128190013-91v14eauzqt5nip0
2014-01-28 20:00:13 +01:00
Christophe Matthieu
b25a34ea94
[FIX] website_sale: payment if free
...
bzr revid: chm@openerp.com-20140128163815-ksds4a7zox84glv8
2014-01-28 17:38:15 +01:00
Fabien Meghazi
40c7ce4b1c
[REV] Revert t-href and t-action removal
...
bzr revid: fme@openerp.com-20140128161531-t0m0hqpk5u871rwg
2014-01-28 17:15:31 +01:00
Fabien Meghazi
4a9d1489b3
[CHG] Make templates less readable by removing t-href and t-action
...
bzr revid: fme@openerp.com-20140128154909-oau6aq702rw062gy
2014-01-28 16:49:09 +01:00
Christophe Matthieu
316745250b
[FIX] website: public user; website_sale
...
bzr revid: chm@openerp.com-20140128152136-pqh7oqj4drpjk09z
2014-01-28 16:21:36 +01:00
Antony Lesuisse
d54ce03f69
[FIX] remove some colgroups, 2 left as they factorize html and all browsers tolerate them
...
bzr revid: al@openerp.com-20140128151359-rtn0d2edyjf8ajk1
2014-01-28 16:13:59 +01:00
Christophe Matthieu
d7ab648c20
[FIX] website_sale: checkout don't overwrite public partner
...
bzr revid: chm@openerp.com-20140128145246-ruoa5nhmwk00ss3c
2014-01-28 15:52:46 +01:00
Christophe Matthieu
07adc071df
[IMP] website_event: split module: remove depends with sale and move event's ticket form into a bridge: website_event_sale
...
bzr revid: chm@openerp.com-20140128113101-aon81actmpahyn58
2014-01-28 12:31:01 +01:00
Christophe Matthieu
d588e44d34
[IMP] event,event_sale: refactoring; remove crappy 9999 hardcoded values; remove visibility; add constraints
...
[FIX] remove module_portal_anonymous ref
[IMP] website: res_config with wizard
[IMP] event: remove related field to res.partner
[FIX] website_sale: change crappy _get_pricelist method (who return a browse record to a function field type many2one)
bzr revid: chm@openerp.com-20140128092037-zrrbz1hrmgat88o4
2014-01-28 10:20:37 +01:00
Fabien Pinckaers
c974af606d
[IMP] fix manifest links
...
bzr revid: fp@tinyerp.com-20140127224957-n3gb6x82n74w1xaq
2014-01-27 23:49:57 +01:00
Christophe Matthieu
b1462a9d30
[IMP] website: res_config with wizard
...
bzr revid: chm@openerp.com-20140127173816-uldoee71h7ntpyhl
2014-01-27 18:38:16 +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
Fabien Pinckaers
deddf20919
[FIX] bug in modifying quantities
...
bzr revid: fp@tinyerp.com-20140125204107-jri8u2ucbyuhvzfc
2014-01-25 21:41:07 +01:00
Fabien Pinckaers
b15dbfa3a6
[IMP] mini imp
...
bzr revid: fp@openerp.com-20140125123758-4fhewd19ib38oal3
2014-01-25 13:37:58 +01:00
Thibault Delavallée
47d8864dc8
[IMP] website_sale: improved manual payment management in checkout process
...
bzr revid: tde@openerp.com-20140124145713-z30chcqg2n32j1g6
2014-01-24 15:57:13 +01:00
Thibault Delavallée
a771127a7e
[MERGE] Sync with website-al
...
bzr revid: tde@openerp.com-20140124144628-eug8try0jywc7lps
2014-01-24 15:46:28 +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
ab300843ce
[FIX] website_sale_crm: create a bridge to add order into website sale teams if crm is installed
...
bzr revid: chm@openerp.com-20140124135216-3ikjg2glx29stk1j
2014-01-24 14:52:16 +01:00
Thibault Delavallée
cc793480fc
[IMP] payment: renamed message in pre_msg, msg displayed before
...
payment. Added post_msg, message displayed after payment.
[IMP] payment_transfer: added a default value (generated at create) for
post_msg, that contains bank accounts details. bank accounts linked to the
current company and used in report footer are shown.
[FIX] payment_*: make the buttons noupdate.
[IMP] payment: portal_published -> website_published + propagation
[IMP] payment: added process selection field that will be used for some
control in the website, telling w hether we want to refresh a payment
validation page or not.
bzr revid: tde@openerp.com-20140124134652-cc0nz08znnlmftw4
2014-01-24 14:46:52 +01:00
Thibault Delavallée
43deedcdf6
[MERGE] Sync with website-al
...
bzr revid: tde@openerp.com-20140124120925-gyysjhkokizynsd8
2014-01-24 13:09:25 +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
Thibault Delavallée
8c47f0278a
[MERGE] Sync with website-al
...
bzr revid: tde@openerp.com-20140123162202-n4jkgkrzb8htx235
2014-01-23 17:22:02 +01:00
Christophe Matthieu
70090a12ba
[FIX] website_sale
...
bzr revid: chm@openerp.com-20140123152542-6vtsx2by65281sr4
2014-01-23 16:25:42 +01:00
Fabien Meghazi
d6690455e9
[REM] Removed preload_records
...
This feature will be stripped down and moved to server's ir.http#_dispatch()
bzr revid: fme@openerp.com-20140123150448-3hhlj4vytr82k88n
2014-01-23 16:04:48 +01:00
Thibault Delavallée
bad2244494
[MERGE] Sync with website-al
...
bzr revid: tde@openerp.com-20140123134253-z5vee6c8fmbgdyq1
2014-01-23 14:42:53 +01:00
Christophe Matthieu
029e230dfc
[WARN] website_sale: disable tests
...
bzr revid: chm@openerp.com-20140123130812-9r419w11gytadjn8
2014-01-23 14:08:12 +01:00
Christophe Matthieu
dea946f3dc
[IMP] website_sale: breadcrup
...
bzr revid: chm@openerp.com-20140123130801-ngs1die8rrsakc57
2014-01-23 14:08:01 +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
Thibault Delavallée
bd586d8848
[MERGE] Sync with website-al
...
bzr revid: tde@openerp.com-20140123091734-1qn02imaltm9fam5
2014-01-23 10:17:34 +01:00
Christophe Matthieu
4b429a033b
[IMP] website_sale: extend timeout for shoptest tour
...
bzr revid: chm@openerp.com-20140123081411-9u5h4720504jdbvf
2014-01-23 09:14:11 +01:00
ajay javiya (OpenERP)
2577be53ac
[MERGE]: with main
...
bzr revid: aja@tinyerp.com-20140123050930-nxq5nnc3y6q0i2lv
2014-01-23 10:39:30 +05:30
Thibault Delavallée
a4bc8c790c
[MERGE] Sync with website-al
...
bzr revid: tde@openerp.com-20140122190125-p9d9dwnj4fngmnqv
2014-01-22 20:01:25 +01:00
Thibault Delavallée
0b69bad996
[RENAME] payment_acquirer_* -> payment_ *
...
bzr revid: tde@openerp.com-20140122175702-1h1e51z4njt4s70w
2014-01-22 18:57:02 +01:00
Thibault Delavallée
d4d14f6951
[REV] website_sale: reverted changes in shop (JS)
...
bzr revid: tde@openerp.com-20140122171606-md7exi4319w3vqqx
2014-01-22 18:16:06 +01:00
Thibault Delavallée
3a359f0ef4
[REV] website_sale: reverted changes in shop
...
bzr revid: tde@openerp.com-20140122171429-rb6g4zpyl8cw6fvv
2014-01-22 18:14:29 +01:00
Thibault Delavallée
46c55500ff
[MERGE] Sync with website-al
...
bzr revid: tde@openerp.com-20140122171321-6r2q42p7ebfv3kb9
2014-01-22 18:13:21 +01:00
Christophe Matthieu
91f44259b6
[FIX] website_sale: ecommerce_change_pricelist context
...
bzr revid: chm@openerp.com-20140122151852-ia7x4sd5l2h7oskx
2014-01-22 16:18:52 +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
0c5b6caa10
[FIX] website: payment get pricelist
...
bzr revid: chm@openerp.com-20140122145328-5xjhu5uublljqdkx
2014-01-22 15:53:28 +01:00
Christophe Matthieu
d724f00198
[FIX] website_sale: promo code
...
bzr revid: chm@openerp.com-20140122124809-9xha1jsnnxaod65z
2014-01-22 13:48:09 +01:00
Thibault Delavallée
d944a652dc
[FIX] product: when computing lst_price, that is the public price
...
computed based on the template price + margin and extra, use the
pricelist currency if a pricelist has been given. This alows for
example to have 'promo' prices on the ecommerce that are in the
same currency.
bzr revid: tde@openerp.com-20140122120042-ovh2mi70q0beeqwq
2014-01-22 13:00:42 +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
Thibault Delavallée
363f8561af
[MERGE] Sync with website-al
...
bzr revid: tde@openerp.com-20140122095911-ufqs8cj827dxkajy
2014-01-22 10:59:11 +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
ec0f811bd1
[WIP] website_sale: test tour: try to find errors
...
bzr revid: chm@openerp.com-20140121194714-ln6jc2ibqabx3t1l
2014-01-21 20:47:14 +01:00
Christophe Matthieu
d67fa22ea1
[FIX] website_event: test tour
...
bzr revid: chm@openerp.com-20140121172708-bht8omflwve3kibz
2014-01-21 18:27:08 +01:00
Christophe Matthieu
b38d4d8a81
[FIX] website_blog: tour
...
bzr revid: chm@openerp.com-20140121152307-kx92ee0za0w0pprr
2014-01-21 16:23:07 +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
Thibault Delavallée
93711b0f91
[MERGE] Sync with website-al main branch
...
bzr revid: tde@openerp.com-20140121105805-msfn6i901v7kr2o3
2014-01-21 11:58:05 +01:00
Thibault Delavallée
28eaa636f0
[MERGE] Merged DKA's branch about product variants in the CMS. Review is coming.
...
bzr revid: tde@openerp.com-20140121093832-yp3jl36nsuho74vk
2014-01-21 10:38:32 +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
Darshan Kalola (OpenERP)
9ce241349f
[MERGE] with lp:~openerp-dev/openobject-addons/trunk-website-al and removed temporary solution.
...
bzr revid: dka@tinyerp.com-20140121054638-b7hbckj39vsk93tm
2014-01-21 11:16:38 +05:30