04211015fc
[MERGE] Forward-port of latest saas-4 fixes, up to 0452851
2014-05-27 20:49:49 +02:00
fd21abd847
[MERGE] Forward-port latest saas-3 bugfixes, up to 30f43da
2014-05-27 17:18:43 +02:00
63b7f678f3
[FIX] website_sale: in the product grid, a product must have min size 1 and max size 4
2014-05-27 16:11:27 +02:00
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
13ac3865d5
[CLEAN] Use none or false, but not both on two lines ...
2014-05-22 15:40:29 +02:00
15e874b5c8
[FIX] website_sale: still cleaning lost references to deleted code in website_sale ...
...
Fixed checkout redirection that was meant to clean the session (incorrect sale order or transaction) that may happen
when having issues with the payment.
2014-05-22 15:34:09 +02:00
35efb5bf5f
[MERGE] upstream
2014-05-19 12:12:46 +02:00
9b0b918ed6
[FIX] website_sale: removed now unnecessary dependency
...
towards crm for website-sale, as sales_team module is a dependancy of sale.
Also reverted some changes in comments.
2014-05-14 17:34:17 +02:00
ae89496bbc
[MERGE] Sync with trunk
2014-05-14 17:21:54 +02:00
28b20d312d
[FIX] Re-added code removed by al at rev 9421: website quotation email was not sent anymore.
2014-05-13 12:32:53 +02:00
8eed143112
[IMP] Invert multilang logic in route decorator. True by default, can be set to False explicitlty
2014-05-13 11:35:45 +02:00
2b8739cf8b
[IMP] website sales salesteam: refactored implementation
...
- now having a website sales sales team in website_sale;
- temporarily crm accepted as a dependency of website_sale (will be improved when sales team are
taken out of crm);
- removed website_sale_crm unnecessary module + dead code
- removed shopping cart state + its management
- added acquirer and transaction fields on sale order
- azdded use_opportunities and use_quotations fields on sales team like use_leads
2014-05-12 17:52:10 +02:00
2ac1156925
[MERGE] Merged lp:openobject-addons.
2014-05-12 10:31:53 +05:30
fe9b88a3ba
[REVERT] Reverted the changes of rev 9219.
2014-05-12 10:25:20 +05:30
54d30d5194
[IMP] clean sitemap, enumerate pages + fixes
...
bzr revid: fp@tinyerp.com-20140511115231-g8ke14r9iepyypv4
2014-05-11 13:52:31 +02:00
2fe8beac28
Missed while merging.
2014-05-08 18:51:17 +05:30
f1dd083521
[MERGE] Merged lp:openobject-addons.
2014-05-08 18:41:39 +05:30
d3678bf521
[FIX] website_sale: don't rewrite sale order partner_id with the public user
...
bzr revid: chm@openerp.com-20140505124702-cq6tvb6h3lgyst99
2014-05-05 14:47:02 +02:00
41ade23b09
[FIX] website_sale & website_event: create product (redirect with slug)
...
bzr revid: chm@openerp.com-20140505095724-mc9k6d2yf68ln9nq
2014-05-05 11:57:24 +02:00
06c63594be
[FIX] website_sale: message confirmation
...
bzr revid: chm@openerp.com-20140505093423-nrmou02ov1txod3k
2014-05-05 11:34:23 +02:00
1fd1114c69
[FIX] website_sale: access to the webite partner_id
...
bzr revid: chm@openerp.com-20140502160628-nbwzx28j4daj1ua8
2014-05-02 18:06:28 +02:00
bbfdc57ad9
[FIX] website_sale: add to cart product => quantity + 1
...
bzr revid: chm@openerp.com-20140502150842-nitu8tsxd02e6dnh
2014-05-02 17:08:42 +02:00
c10800f2f1
[FIX] website_event_sale: multi tickets
...
bzr revid: chm@openerp.com-20140502140152-hx7ktaf0cg2m7ija
2014-05-02 16:01:52 +02:00
5e3eb59d0f
[MERGE] Merged lp:openobject-addons.
2014-05-02 16:22:26 +05:30
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
1199b60d70
[IMP] website_sale: use street 2 to set company_name
...
bzr revid: chm@openerp.com-20140428134632-v3w7imtz7j3u3tp0
2014-04-28 15:46:32 +02:00
bb2ebf7cb9
[FIX] website_sale: apply fiscal position on change product id and update cart.
...
[IMP] sale: apply fiscal position of the partner if they are not fiscal position defined
bzr revid: chm@openerp.com-20140428093609-8z8my9vj322shcll
2014-04-28 11:36:09 +02:00
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
cee3cabaa8
[IMP] website_sale: create new shipping address; company_name field; fix acquierer image
...
bzr revid: chm@openerp.com-20140425132049-kg4w68qn07eof47q
2014-04-25 15:20:49 +02:00
3b49850d1a
[FIX] website_sale: filter redirect to 404 error if a category is selected. (url: /shopcategory/?filters=...). Add slash between shop and category
...
bzr revid: chm@openerp.com-20140425075304-qnlyb6n6hpyvttv1
2014-04-25 09:53:04 +02:00
3ef529f1a1
[MERGE] merged with lp:openobject-addons
2014-04-16 10:34:53 +05:30
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
a8c1649423
[MERGE] merged with lp:openobject-addons
2014-04-15 19:01:17 +05:30
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
9932aa3b45
[FIX] website_sale: checkout_parse
...
bzr revid: chm@openerp.com-20140410153746-kp8rw92j89x0c7vp
2014-04-10 17:37:46 +02:00
db080813df
[FIX] website_sale: checkout prefix
...
bzr revid: chm@openerp.com-20140410151330-md9fq3zg8e6bliok
2014-04-10 17:13:30 +02:00
7751334d97
Fixed order.state
2014-04-10 20:42:29 +05:30
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
a3016b4d95
[FIX] Remove double return
...
bzr revid: jke@openerp.com-20140410114048-hw26q9x0dm11wbqc
2014-04-10 13:40:48 +02:00
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
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
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
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
dfffd7cef1
[MERGE] MErged lp:openobject-addons.
2014-04-10 15:09:17 +05:30
2df2f77818
Test commit
2014-04-09 18:39:42 +05:30
3ae307003a
[IMP] Improved code for confirm_order state in shopping_cart.
2014-04-09 12:27:12 +05:30
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
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
e627f1da63
[MERGE] Merged lp:openobject-addons.
2014-04-08 14:31:51 +05:30
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
Olivier Dony
Denis Ledoux
--global
Fabien Meghazi
Paramjit Singh Sahota
Fabien Pinckaers
chm@openerp.com
Mehul Mehta (OpenERP)
Christophe Simonis
Kersten Jeremy