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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
a3664a8924
[FIX] website: create event, product
...
bzr revid: chm@openerp.com-20140206154711-vwvw7g1wo1fd1h1y
2014-02-06 16:47:11 +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
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
Antony Lesuisse
4aa8eadf5f
[REN] rename product characterisic into attributes
...
bzr revid: al@openerp.com-20140130221710-nf2ircxgx3vr1spy
2014-01-30 23:17:10 +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
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 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
Christophe Matthieu
b25a34ea94
[FIX] website_sale: payment if free
...
bzr revid: chm@openerp.com-20140128163815-ksds4a7zox84glv8
2014-01-28 17:38:15 +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
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
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
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
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
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
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