Fabien Meghazi
35efb5bf5f
[MERGE] upstream
2014-05-19 12:12:46 +02:00
Fabien Meghazi
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
Thibault Delavallée
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
chm@openerp.com
ee16b014b1
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140502095132-kfx40xou73mukr2y
2014-05-02 11:51:32 +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
7298130f31
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140410152925-ndajhnyh4rt8pkgu
2014-04-10 17:29:25 +02:00
Denis Ledoux
3b821e0854
[FIX] website_sale_delivery: list pop actually takes as arg the index in the list, not the item (+ check that carrier id is not false)
...
bzr revid: dle@openerp.com-20140404130302-mvm2tzhsc2a58p11
2014-04-04 15:03:02 +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
Denis Ledoux
9e92e40da3
[FIX] websit_sale: checking grid need some more access rights, therefore need to using superuser_id
...
bzr revid: dle@openerp.com-20140402152814-0x90lrp05houblqh
2014-04-02 17:28:14 +02:00
Denis Ledoux
e3f90b7399
[FIX] website_sale: do not try to check order if order is nontype
...
bzr revid: dle@openerp.com-20140402152043-2vl7pwlwso4tf2dp
2014-04-02 17:20:43 +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
Denis Ledoux
166c4d2751
[FIX] website_sale_delivery: avoid displaying or choosing non available delivery methods for torder
...
bzr revid: dle@openerp.com-20140402114815-b42pvgk914r0at1d
2014-04-02 13:48:15 +02: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
Antony Lesuisse
ff37d0ebca
website sale refactor
...
bzr revid: al@openerp.com-20140130233951-55ttup4ohmp4i0nf
2014-01-31 00:39:51 +01:00
jke-openerp
f1204ee9c3
[FIX] Fix bug with demo data from delivery module. We create a grid, but without specify to "use_detailed_pricelist"
...
bzr revid: jke@openerp.com-20140130214944-c5fg5mp8bitt86uy
2014-01-30 22:49:44 +01:00
jke-openerp
1fb3cccef4
[FIX] Use only published carrier_delivery
...
bzr revid: jke@openerp.com-20140130212748-57udob0yxz73775r
2014-01-30 22:27:48 +01:00
jke-openerp
420e819b1f
[FIX] Recompute price at each updates of cart, Fix bug with carrier at payment.
...
bzr revid: jke@openerp.com-20140130173705-wevz607c5djid9ux
2014-01-30 18:37:05 +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
6f859860e9
[FIX] website_sale_delivery: don't raise (for the website customer) if they are no carrier; return true if they aren't need of carrier or if the carrier is good
...
bzr revid: chm@openerp.com-20140124115723-nblyb3qknxym9817
2014-01-24 12:57:23 +01:00
Christophe Simonis
2090330b67
[FIX] move function field `amount_delivery` from delivery module to website_sale_delivery module
...
bzr revid: chs@openerp.com-20140123174208-yzlod98ez4xn72lv
2014-01-23 18:42:08 +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
Fabien Meghazi
14bb6060d7
[REM] Removed @website.route() decorator
...
Need trunk-website-al Rev#5151
bzr revid: fme@openerp.com-20140120153733-ve3dn2kwvha7n3yl
2014-01-20 16:37:33 +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
cf79ae7635
[FIX] website: access for portal user
...
bzr revid: chm@openerp.com-20140117154648-sxfisxqcv8o3fvzt
2014-01-17 16:46:48 +01:00
Christophe Matthieu
bcc307560c
[FIX] website_sale: update price in payement when the user change the delivery method
...
bzr revid: chm@openerp.com-20140117150602-0rdmf0pd2eiocg66
2014-01-17 16:06:02 +01:00
Christophe Matthieu
9624ec21f8
[FIX] website_sale_delivery: public mode
...
bzr revid: chm@openerp.com-20140114145833-73t9cc60z9i8bniw
2014-01-14 15:58:33 +01:00
Christophe Matthieu
8749e13a75
[FIX] website_sale: delivery and payment views
...
bzr revid: chm@openerp.com-20140110102858-57v9dk3hk75c5uu3
2014-01-10 11:28:58 +01:00
Christophe Matthieu
63e2da36a6
[FIX] website: some access right
...
bzr revid: chm@openerp.com-20140106141817-2tf0dpfchi5x6kjw
2014-01-06 15:18:17 +01:00
Thibault Delavallée
86fc66e797
[FIX] website_sale: checkout process: fixed carrier choice redirection
...
bzr revid: tde@openerp.com-20131219105122-awib6gys6uklbvxa
2013-12-19 11:51:22 +01:00
Thibault Delavallée
9315134b7d
[IMP] website_sale_delivery: delivery costs also in review + removed the button to update the sale order as it is now directly updated when choosing a carrier
...
bzr revid: tde@openerp.com-20131218142759-j4j7jznjyobyrfy6
2013-12-18 15:27:59 +01:00
Thibault Delavallée
531d40cd3b
[IMP] website_sale_delivery: when choosing a carrier, immediately update the sale order
...
bzr revid: tde@openerp.com-20131218142735-r444egdcmxfap01v
2013-12-18 15:27:35 +01:00
Thibault Delavallée
7a564f261e
[IMP] [FIX] [ADD] website_sale, website_sale_delivery: delivery + ecommerce code cleaning
...
- added a website_order_line on sale.order model, that are the lines to display
and use in the front-end. This allows to display only products (and not delivery
costs), and to have a correct badge for the number od products.
- cleaned ecommerce website code and method name. Still some cleaning to do
I think.
- fixed some issues in partner and shipping info management, now using CheckoutInfo
more cleanly
- fixed the process of choosing the carrier
bzr revid: tde@openerp.com-20131218132150-f4br0099p2caf43i
2013-12-18 14:21:50 +01:00
Thibault Delavallée
e701544aa4
[CLEAN] website_sale_delivery: removed dead JS code
...
bzr revid: tde@openerp.com-20131217163912-4br0aar371qvr5cs
2013-12-17 17:39:12 +01:00
Thibault Delavallée
3805a86302
[IMP] website_sale_delivery: make the module effectively works.
...
- added JS / HTML to handle the choice of the carrier
- added override of payment controller in website_sale_delivery to handle the carrier
and recompute the amount and details
- some code cleaning
- added amount_delivery field in sale.order, that is the amount related to the
delivery
bzr revid: tde@openerp.com-20131217152605-0xoulnnlo0nn7j9o
2013-12-17 16:26:05 +01:00
Christophe Matthieu
1ae1c0b170
[FIX] website_sale_delivery: inherit view
...
bzr revid: chm@openerp.com-20131125151405-f9k1lzu91ep48hwx
2013-11-25 16:14:05 +01:00
Fabien Pinckaers
8ee465ef17
[IMP] no delivery proposition if none available
...
bzr revid: fp@openerp.com-20131116224442-f6xat1zd064iog4y
2013-11-16 23:44:42 +01:00
Fabien Pinckaers
b61ac1998e
[FIX] access right with sale with event crashed [NEW] website_sale_delivery module
...
bzr revid: fp@openerp.com-20131116224306-7is2hawhhpzazie3
2013-11-16 23:43:06 +01:00