Commit Graph

29 Commits

Author SHA1 Message Date
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 22edf72dc1 [FIX] website_sale: fiscal_position must be passed to product_id_change in order to compute taxes correctly
bzr revid: dle@openerp.com-20140425145739-3s7wgsc6l0re3lhe
2014-04-25 16:57:39 +02:00
chm@openerp.com 46dd292c86 [FIX] website_sale: add to cart 1 item if number > 1 or set_number > 1
bzr revid: chm@openerp.com-20140425091232-m4j37y7ffo7o56db
2014-04-25 11:12:32 +02:00
Denis Ledoux 3eb4fa3bac [FIX] website_sale: taxes must be taken from the product_id_change method
So they are computed with the partner, fiscal_position, etc

bzr revid: dle@openerp.com-20140424151605-81t7v9pc2rou17s3
2014-04-24 17:16:05 +02: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
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
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
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
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 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
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 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 46c55500ff [MERGE] Sync with website-al
bzr revid: tde@openerp.com-20140122171321-6r2q42p7ebfv3kb9
2014-01-22 18:13:21 +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
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
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
Darshan Kalola (OpenERP) 27da32873e [IMP]put domainin ecommerce_get_product_domain method of website to restrict the product_template which has not variants(ecommerce view).
bzr revid: dka@tinyerp.com-20140116093347-tz9mn24r01xbfdp0
2014-01-16 15:03:47 +05:30
Christophe Matthieu 9fd7db5150 [WIP] website/ir_rule: remove session from access right evaluation, allow to read pricelist to evrybody and use superuser for saleorder in website_sale
bzr revid: chm@openerp.com-20140107085728-77mxlims6fa0li76
2014-01-07 09:57:28 +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 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
Fabien Pinckaers eeee49bfa8 [IMP] code cleaning '/shop' less SQL queries, WIP
bzr revid: fp@tinyerp.com-20131201002355-82l9yab5l4vilkun
2013-12-01 01:23:55 +01:00
Christophe Matthieu 079aececdf [FIX] website_sale: get_website_sale_domain overited in website_event
bzr revid: chm@openerp.com-20131128095142-3ez3vaiht8ppr4oh
2013-11-28 10:51:42 +01:00
Thibault Delavallée 0759dcb6c0 [MERGE] Sync with website-al
bzr revid: tde@openerp.com-20131127152424-wq2gje9d01t2kw34
2013-11-27 16:24:24 +01:00
Thibault Delavallée cea8f80476 [MOV] website_sale: moved payment_transaction code into its own model file
bzr revid: tde@openerp.com-20131127121820-tgulogxz5x0ikdxd
2013-11-27 13:18:20 +01:00
Christophe Matthieu 3bb30b1337 [IMP] website_sale: clean code and fix for website_event
bzr revid: chm@openerp.com-20131127111658-qkp3ovoa64n3dwp2
2013-11-27 12:16:58 +01:00
Thibault Delavallée 2693636989 [IMP] website_sale: improved checkout process
- confirmation is now a page displaying a sale order, which polls on the
related transaction to have its status
- when receiving an incoming notification thorugh the acquirer controller
the sale order is updated, then the confirmation page is displayed
- this allows to have a confirmation page that is independant from the 
rest of the checkout process
- cleaned confirmation page, removed order details

bzr revid: tde@openerp.com-20131121120902-fm8b7u94gmepohgi
2013-11-21 13:09:02 +01:00
Xavier Morel 804f879518 [MERGE] new fields & field conversions in CMS
bzr revid: xmo@openerp.com-20131014100222-v73qz8dbrurc2eoq
2013-10-14 12:02:22 +02:00