Commit Graph
365 Commits
Author SHA1 Message Date
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 4aa8eadf5f [REN] rename product characterisic into attributes
bzr revid: al@openerp.com-20140130221710-nf2ircxgx3vr1spy
2014-01-30 23:17:10 +01:00
jke-openerp fd6d4d8303 [FIX] Set the good url redirect in "Sign In" button from the cart
bzr revid: jke@openerp.com-20140130104937-6rjt51rg3o9bz90k
2014-01-30 11:49:37 +01:00
jke-openerp ab8ee396ec [TYPO] Add space between icon and button in cart "Continue Shopping"
bzr revid: jke@openerp.com-20140130094927-44b8szwtb602e180
2014-01-30 10:49:27 +01:00
jke-openerp 7027ce6eda [REF] website_sale : Add missing widget option in recommanded product, to display image
bzr revid: jke@openerp.com-20140130091813-hko16qlm4t8tmq37
2014-01-30 10:18:13 +01:00
Denis Ledoux 255fe082bd [FIX] website_membership: membership displayed order depending on website_sequence
bzr revid: dle@openerp.com-20140129171554-h76n4579xquhdxxv
2014-01-29 18:15:54 +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 5b54fa0061 [IMP] website_event_sale: don't display reduction for product event in my cart
bzr revid: chm@openerp.com-20140129094220-alhq9n8eevc3fvbt
2014-01-29 10:42:20 +01:00
Antony Lesuisse d4bbe13963 [REM] t-href is now t-attf-href
bzr revid: al@openerp.com-20140128205017-47rxm2xbb84dmjas
2014-01-28 21:50:17 +01:00
Fabien Meghazi 326c35aecd [IMP] Merge bananas and cumcumbers in order to prepare the t-href|t-action removal
bzr revid: fme@openerp.com-20140128201417-1elmttz8qen9q3ws
2014-01-28 21:14:17 +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
Fabien Meghazi 40c7ce4b1c [REV] Revert t-href and t-action removal
bzr revid: fme@openerp.com-20140128161531-t0m0hqpk5u871rwg
2014-01-28 17:15:31 +01:00
Fabien Meghazi 4a9d1489b3 [CHG] Make templates less readable by removing t-href and t-action
bzr revid: fme@openerp.com-20140128154909-oau6aq702rw062gy
2014-01-28 16:49:09 +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
Antony Lesuisse d54ce03f69 [FIX] remove some colgroups, 2 left as they factorize html and all browsers tolerate them
bzr revid: al@openerp.com-20140128151359-rtn0d2edyjf8ajk1
2014-01-28 16:13:59 +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
Fabien Pinckaers deddf20919 [FIX] bug in modifying quantities
bzr revid: fp@tinyerp.com-20140125204107-jri8u2ucbyuhvzfc
2014-01-25 21:41:07 +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
Christophe Matthieu 70090a12ba [FIX] website_sale
bzr revid: chm@openerp.com-20140123152542-6vtsx2by65281sr4
2014-01-23 16:25:42 +01:00
Christophe Matthieu dea946f3dc [IMP] website_sale: breadcrup
bzr revid: chm@openerp.com-20140123130801-ngs1die8rrsakc57
2014-01-23 14:08:01 +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 3a359f0ef4 [REV] website_sale: reverted changes in shop
bzr revid: tde@openerp.com-20140122171429-rb6g4zpyl8cw6fvv
2014-01-22 18:14:29 +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
Thibault Delavallée d944a652dc [FIX] product: when computing lst_price, that is the public price
computed based on the template price + margin and extra, use the
pricelist currency if a pricelist has been given. This alows for
example to have 'promo' prices on the ecommerce that are in the
same currency.

bzr revid: tde@openerp.com-20140122120042-ovh2mi70q0beeqwq
2014-01-22 13:00:42 +01:00
Thibault Delavallée 363f8561af [MERGE] Sync with website-al
bzr revid: tde@openerp.com-20140122095911-ufqs8cj827dxkajy
2014-01-22 10:59:11 +01:00
Christophe Matthieu ec0f811bd1 [WIP] website_sale: test tour: try to find errors
bzr revid: chm@openerp.com-20140121194714-ln6jc2ibqabx3t1l
2014-01-21 20:47:14 +01:00
Christophe Matthieu 4ff1af4d01 [FIX] website: display or not editor edit button; website_sale: test tour; website: contact qweb widget
bzr revid: chm@openerp.com-20140121123912-0ya4ziusj09efti3
2014-01-21 13:39:12 +01:00
Thibault Delavallée 93711b0f91 [MERGE] Sync with website-al main branch
bzr revid: tde@openerp.com-20140121105805-msfn6i901v7kr2o3
2014-01-21 11:58:05 +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 53d8280f1d [IMP] website: test class with test for website_sale sale process
bzr revid: chm@openerp.com-20140120182643-tw65rig4qqi3sqqf
2014-01-20 19:26:43 +01:00
Christophe Matthieu cbbf6f5940 [FIX] website_sale: highlight category
bzr revid: chm@openerp.com-20140121101529-2cseit2mq5w1d2z2
2014-01-21 11:15:29 +01:00
Fabien Pinckaers a83f1282fa [IMP] CSS for logo, one pixel better
bzr revid: fp@tinyerp.com-20140119193527-8e7oc1umebqkqxgx
2014-01-19 20:35:27 +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 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
Darshan Kalola (OpenERP) 86ec8bd39a [IMP]removed unnecessary code.
bzr revid: dka@tinyerp.com-20140117082647-6aoiouidtl06r3vk
2014-01-17 13:56:47 +05:30
Darshan Kalola (OpenERP) effa6b282e [IMP]product: removed attrs from variants in form view.
bzr revid: dka@tinyerp.com-20140117075805-r5k1epe8vzj36tzm
2014-01-17 13:28:05 +05:30
Darshan Kalola (OpenERP) f75f2eccef [IMP]improved template view in website_sale.
bzr revid: dka@tinyerp.com-20140117073308-wcyg4q60aj187wek
2014-01-17 13:03:08 +05:30
Darshan Kalola (OpenERP) 21c54c95a2 [MERGE]with lp:~openerp-dev/openobject-addons/trunk-imp-product-variant-another-amb and remove unnecessary changes.
bzr revid: dka@tinyerp.com-20140117070028-9xglu0v31hjid18f
2014-01-17 12:30:28 +05:30
Christophe Matthieu 4ff74cbf99 [IMP] website: editor menus is displayed in function of users groups (event, blog...)
bzr revid: chm@openerp.com-20140116180535-c736cuxn12qghiea
2014-01-16 19:05:35 +01:00
Darshan Kalola (OpenERP) fcf6109d16 [MERGE] with lp:~openerp-dev/openobject-addons/trunk-website-al.
bzr revid: dka@tinyerp.com-20140116120607-rkfs8qysinmegp54
2014-01-16 17:36:07 +05:30
Darshan Kalola (OpenERP) 4e3bed270e [IMP]improved product template in website_sale.
bzr revid: dka@tinyerp.com-20140116120100-m305tam84zvjh0fw
2014-01-16 17:31:00 +05:30
Christophe Matthieu 52e4cb3f99 [IMP] website_job: no job offer found message, better template, and fix type
bzr revid: chm@openerp.com-20140115160219-mqh0sx869zfwk1g7
2014-01-15 17:02:19 +01:00
Darshan Kalola (OpenERP) 90248025a4 [MERGE]with lp:~openerp-dev/openobject-addons/trunk-website-al.
bzr revid: dka@tinyerp.com-20140115144940-srkv28a758ov0xx8
2014-01-15 20:19:40 +05:30
Christophe Matthieu 3487d36fc2 [FIX] website_sale: fix boostrap row
bzr revid: chm@openerp.com-20140115143139-dieh48j9t1tbh4w3
2014-01-15 15:31:39 +01:00
Christophe Matthieu c7bf7ad759 [FIX] website_sale: shiping and invoicing data in red (required) are agressive even the first time
bzr revid: chm@openerp.com-20140115131716-zj38n7pl3pnmdzpd
2014-01-15 14:17:16 +01:00
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
Darshan Kalola (OpenERP) 67f6f54e73 [MERGE] with lp:~openerp-dev/openobject-addons/trunk-website-al.
bzr revid: dka@tinyerp.com-20140113130212-4f17b0inc4u3s5k3
bzr revid: dka@tinyerp.com-20140115052550-15ulprts5fo6s30r
2014-01-15 10:55:50 +05:30
Fabien Pinckaers d73c8f15b6 [IMP] cleaned CSS, removed CSS
bzr revid: fp@tinyerp.com-20140114212533-iz4oleo0opads01l
2014-01-14 22:25:33 +01:00