Commit Graph

151 Commits

Author SHA1 Message Date
Olivier Dony 0ac11b430f [IMP] website_sale: spellchecking
bzr revid: odo@openerp.com-20140129162331-sjmquzz172h9dkp4
2014-01-29 17:23:31 +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
Antony Lesuisse 94746ae827 [FIX] website_sale remove usless size
bzr revid: al@openerp.com-20140128205328-r5gwz7zfndjmdurq
2014-01-28 21:53:28 +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 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 70090a12ba [FIX] website_sale
bzr revid: chm@openerp.com-20140123152542-6vtsx2by65281sr4
2014-01-23 16:25:42 +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) b3248f9db9 [IMP]passed template id instead of product id in website url.
bzr revid: dka@tinyerp.com-20140117123740-w7mtferx8jejy1fl
2014-01-17 18:07:40 +05:30
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 320a0bc28c [IMP] website/website_sale: Use group to display shipping address in frontend like the backend. Use group for product facet caracteristique (backend/frontend). Customize templates is displayed function of groups of ir.ui.view templates.
bzr revid: chm@openerp.com-20140115110547-v0nllq0f800tlhpg
2014-01-15 12:05:47 +01:00
Christophe Matthieu 4998764d40 [IMP] website_sale: website_sequence with push to top, push up, push down, push to bottom
bzr revid: chm@openerp.com-20140110112442-kmjx97tk6zz5zpwa
2014-01-10 12:24:42 +01:00
Christophe Matthieu 3f0f6b820b [FIX] website: Access rights and Access for: website_crm_partner_assign, website_customer, website_event, website_event_track, website_membership, website_partner, website_sale
bzr revid: chm@openerp.com-20140107135933-h622wxwfhwoulg7q
2014-01-07 14:59:33 +01:00
Christophe Matthieu 0293e7b707 [FIX] website/ir_rule: Access rights can be cached if they use the html session: 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-20140107095210-73zf5ah4jrfo3dg2
2014-01-07 10:52:10 +01:00
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
Thibault Delavallée 0ee7ffe282 [MERGE] [IMP] shop: added openchatter on product shop
- product.template now inherits from mail.thread
- added opencahtter on product.template form view
- added discussion thread + attachments in product website view
- added file_type field on ir_attachment, that replaces the javascript thing
from mail.js
- added a controller to comment a product.template
- added a css file for the openchatter embedded in the product website view

bzr revid: tde@openerp.com-20140106162706-v9a60ek6eazn9mm0
2014-01-06 17:27:06 +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 0b2d085c1b [IMP] shop: added openchatter on product shop
- product.template now inherits from mail.thread
- added opencahtter on product.template form view
- added discussion thread + attachments in product website view
- added file_type field on ir_attachment, that replaces the javascript thing
from mail.js
- added a controller to comment a product.template

bzr revid: tde@openerp.com-20140106135727-uf0zaxav28pdx4sv
2014-01-06 14:57:27 +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 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
Thibault Delavallée fab63158a1 [CLEAN] sale: removed code that should not lie here. website code has nothing to do in the base sale module. website_sale: renamed website_sale file into sale_order and added the get_website_data method.
bzr revid: tde@openerp.com-20131213110629-rhgpqpy2dj03ng8h
2013-12-13 12:06:29 +01:00
Christophe Matthieu 6652856445 [FIX] website_sale: link; product: clean code and use product.template for supplierinfo
bzr revid: chm@openerp.com-20131209163254-k9dwxw48rcgz1hbs
2013-12-09 17:32:54 +01:00
Christophe Matthieu 6aface1bd0 [FIX] product.supplierinfo: product_id is a product.product fields. Rename fields into product_tmpl_id for many2one to product.template model
bzr revid: chm@openerp.com-20131209151135-q54g17zcq1vnshsl
2013-12-09 16:11:35 +01:00
Christophe Matthieu bc4a7c81bc [FIX] website_sale: fixes for access right with public user, and access to shopping cart, checkout... without passed by shop index, change url add_cart
bzr revid: chm@openerp.com-20131203154422-cwc12og1bgw9j9a8
2013-12-03 16:44:22 +01:00
Christophe Matthieu c3660ba7b9 [FIX] website: product backend view with website_button widget
bzr revid: chm@openerp.com-20131202163010-9nksvoxmbuj9v8i1
2013-12-02 17:30:10 +01:00
Christophe Matthieu c1f306dd96 [WIP] website: add website_button widget in backend to publish and go back to the website. (need bootstrap 3 for layout)
bzr revid: chm@openerp.com-20131202124504-78zvm5t0p1hpsn53
2013-12-02 13:45:04 +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
Fabien Pinckaers c69f31d82c [iMP] Order of published/unpublished documents
bzr revid: fp@openerp.com-20131116095426-lqwfdid9z1asi2se
2013-11-16 10:54:26 +01:00
Christophe Matthieu 4ff0a207f6 [IMP] website_sale: some change for attributes
bzr revid: chm@openerp.com-20131107162101-82tl3ibbhxkbgjro
2013-11-07 17:21:01 +01:00
Christophe Matthieu f318f99825 [IMP] website_sale: attributes/filter, fix access right, add default value for filter (for custom user ecommerce with category,label...)
bzr revid: chm@openerp.com-20131105150928-ps01ziqnfgd9hu46
2013-11-05 16:09:28 +01:00
Thibault Delavallée 258846a697 [FIX] [WIP] website_sale: Tries to fix method
that does things not commented on things that do not necessarily exist.

Does it hurt you to put some docstrings ?

bzr revid: tde@openerp.com-20131024105524-eattmf2s52ekztn3
2013-10-24 12:55:24 +02:00
Fabien Meghazi 0373662dd4 [NODISK] @ddm: Got no floppy disk so I push here
bzr revid: fme@openerp.com-20131018130034-vo6rgndvzv1ni6nu
2013-10-18 15:00:34 +02:00
Christophe Matthieu fc43a53079 [FIX] product.attribute: store min and max
bzr revid: chm@openerp.com-20131017131604-x2xo963p9pq81hvf
2013-10-17 15:16:04 +02:00
ddm ebdfbc58f1 [FIX] SEO for shop products
bzr revid: ddm@openerp.com-20131016160232-e5rxi1hoofm5anrw
2013-10-16 18:02:32 +02:00
Christophe Matthieu 110d2d1386 [FIX] website_sale: forgotten files
bzr revid: chm@openerp.com-20131015094505-g0n3g48megu96kh0
2013-10-15 11:45:05 +02:00
Christophe Matthieu e6a831a1a2 [IMP] website: add facets/attributes on product template. Displayed in the left category menu in the ecommerce
bzr revid: chm@openerp.com-20131015082726-6f1tkyhoaju27p85
2013-10-15 10:27:26 +02: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
Christophe Matthieu 2d719d3d7b [MOVE] website_sale: py files to models/
bzr revid: chm@openerp.com-20131014081841-k8iz2b67voezgue4
2013-10-14 10:18:41 +02:00