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
Fabien Pinckaers
ca2991908c
[IMP] Typo
...
bzr revid: fp@tinyerp.com-20140129093309-o567mh3bdstx121j
2014-01-29 10:33:09 +01:00
Fabien Pinckaers
0d734eb74e
[IMP] Product Tour
...
bzr revid: fp@tinyerp.com-20140128223623-t9autfy4iin20e20
2014-01-28 23:36:23 +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
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 Simonis
adac86d0ce
[FIX] website_sale: redirect to shop when trying to pay an empty cart
...
bzr revid: chs@openerp.com-20140128201258-nq4t5axsz3vmrjiw
2014-01-28 21:12:58 +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
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
d7ab648c20
[FIX] website_sale: checkout don't overwrite public partner
...
bzr revid: chm@openerp.com-20140128145246-ruoa5nhmwk00ss3c
2014-01-28 15:52:46 +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
Fabien Pinckaers
c974af606d
[IMP] fix manifest links
...
bzr revid: fp@tinyerp.com-20140127224957-n3gb6x82n74w1xaq
2014-01-27 23:49:57 +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
70a8e7902b
[FIX] remove module_portal_anonymous ref
...
bzr revid: chm@openerp.com-20140127155412-zujhq5qb2q6xzj2t
2014-01-27 16:54:12 +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
Fabien Pinckaers
b15dbfa3a6
[IMP] mini imp
...
bzr revid: fp@openerp.com-20140125123758-4fhewd19ib38oal3
2014-01-25 13:37:58 +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
a771127a7e
[MERGE] Sync with website-al
...
bzr revid: tde@openerp.com-20140124144628-eug8try0jywc7lps
2014-01-24 15:46:28 +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
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
Thibault Delavallée
cc793480fc
[IMP] payment: renamed message in pre_msg, msg displayed before
...
payment. Added post_msg, message displayed after payment.
[IMP] payment_transfer: added a default value (generated at create) for
post_msg, that contains bank accounts details. bank accounts linked to the
current company and used in report footer are shown.
[FIX] payment_*: make the buttons noupdate.
[IMP] payment: portal_published -> website_published + propagation
[IMP] payment: added process selection field that will be used for some
control in the website, telling w hether we want to refresh a payment
validation page or not.
bzr revid: tde@openerp.com-20140124134652-cc0nz08znnlmftw4
2014-01-24 14:46:52 +01:00
Thibault Delavallée
43deedcdf6
[MERGE] Sync with website-al
...
bzr revid: tde@openerp.com-20140124120925-gyysjhkokizynsd8
2014-01-24 13:09:25 +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
8a5844d191
[IMP] website_sale: hide test tour from help menu
...
bzr revid: chm@openerp.com-20140124094241-z1pf5895w2f2sfrh
2014-01-24 10:42:41 +01:00
Thibault Delavallée
8c47f0278a
[MERGE] Sync with website-al
...
bzr revid: tde@openerp.com-20140123162202-n4jkgkrzb8htx235
2014-01-23 17:22:02 +01:00
Christophe Matthieu
70090a12ba
[FIX] website_sale
...
bzr revid: chm@openerp.com-20140123152542-6vtsx2by65281sr4
2014-01-23 16:25:42 +01:00
Fabien Meghazi
d6690455e9
[REM] Removed preload_records
...
This feature will be stripped down and moved to server's ir.http#_dispatch()
bzr revid: fme@openerp.com-20140123150448-3hhlj4vytr82k88n
2014-01-23 16:04:48 +01:00
Thibault Delavallée
bad2244494
[MERGE] Sync with website-al
...
bzr revid: tde@openerp.com-20140123134253-z5vee6c8fmbgdyq1
2014-01-23 14:42:53 +01:00
Christophe Matthieu
029e230dfc
[WARN] website_sale: disable tests
...
bzr revid: chm@openerp.com-20140123130812-9r419w11gytadjn8
2014-01-23 14:08:12 +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
bd586d8848
[MERGE] Sync with website-al
...
bzr revid: tde@openerp.com-20140123091734-1qn02imaltm9fam5
2014-01-23 10:17:34 +01:00
Christophe Matthieu
4b429a033b
[IMP] website_sale: extend timeout for shoptest tour
...
bzr revid: chm@openerp.com-20140123081411-9u5h4720504jdbvf
2014-01-23 09:14:11 +01:00
ajay javiya (OpenERP)
2577be53ac
[MERGE]: with main
...
bzr revid: aja@tinyerp.com-20140123050930-nxq5nnc3y6q0i2lv
2014-01-23 10:39:30 +05:30
Thibault Delavallée
a4bc8c790c
[MERGE] Sync with website-al
...
bzr revid: tde@openerp.com-20140122190125-p9d9dwnj4fngmnqv
2014-01-22 20:01:25 +01:00
Thibault Delavallée
0b69bad996
[RENAME] payment_acquirer_* -> payment_ *
...
bzr revid: tde@openerp.com-20140122175702-1h1e51z4njt4s70w
2014-01-22 18:57:02 +01:00
Thibault Delavallée
d4d14f6951
[REV] website_sale: reverted changes in shop (JS)
...
bzr revid: tde@openerp.com-20140122171606-md7exi4319w3vqqx
2014-01-22 18:16:06 +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
91f44259b6
[FIX] website_sale: ecommerce_change_pricelist context
...
bzr revid: chm@openerp.com-20140122151852-ia7x4sd5l2h7oskx
2014-01-22 16:18:52 +01:00
Christophe Matthieu
0fe979572b
[FIX] website_sale: test tour
...
bzr revid: chm@openerp.com-20140122145821-da1l5l5bji39j5mv
2014-01-22 15:58:21 +01:00
Christophe Matthieu
0c5b6caa10
[FIX] website: payment get pricelist
...
bzr revid: chm@openerp.com-20140122145328-5xjhu5uublljqdkx
2014-01-22 15:53:28 +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
Christophe Matthieu
8256bdfe44
[IMP] website: add a log report in tour test
...
bzr revid: chm@openerp.com-20140122112041-id595hkptgzoym6w
2014-01-22 12:20:41 +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
35b7cd5d51
[WIP] website_sale: test tour debug
...
bzr revid: chm@openerp.com-20140122081321-8mtcqnd5yyx6c2nj
2014-01-22 09:13:21 +01:00
Christophe Matthieu
d9582aa9e4
[WIP] website_sale: test tour error
...
bzr revid: chm@openerp.com-20140121221438-6j1231868ex479p2
2014-01-21 23:14:38 +01:00
Christophe Matthieu
98bdaf4a1c
[WIP] website_sale: test tour error
...
bzr revid: chm@openerp.com-20140121210506-s11tmbdczs34bkuu
2014-01-21 22:05:06 +01:00
Christophe Matthieu
0f7e290cd6
[WIP] website_sale: test tour error
...
bzr revid: chm@openerp.com-20140121203102-btt5bvn0dxnyx9y2
2014-01-21 21:31:02 +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
d67fa22ea1
[FIX] website_event: test tour
...
bzr revid: chm@openerp.com-20140121172708-bht8omflwve3kibz
2014-01-21 18:27:08 +01:00
Christophe Matthieu
b38d4d8a81
[FIX] website_blog: tour
...
bzr revid: chm@openerp.com-20140121152307-kx92ee0za0w0pprr
2014-01-21 16:23:07 +01:00
Christophe Matthieu
6d320f6f0b
[FIX] website_sale: payement button
...
bzr revid: chm@openerp.com-20140121125040-r4o7wdys2hd3437d
2014-01-21 13:50:40 +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
Thibault Delavallée
28eaa636f0
[MERGE] Merged DKA's branch about product variants in the CMS. Review is coming.
...
bzr revid: tde@openerp.com-20140121093832-yp3jl36nsuho74vk
2014-01-21 10:38:32 +01:00
Christophe Matthieu
3b1fec3220
[FIX] website: double reload in tests process
...
bzr revid: chm@openerp.com-20140121083038-63cubvi2bu59klaj
2014-01-21 09:30:38 +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
Fabien Pinckaers
cd3be26606
[IMP] Merge Trunk + Deisgn Improvements
...
bzr revid: fp@tinyerp.com-20140120205229-b9726jvb5tfmj3fc
2014-01-20 21:52:29 +01:00
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
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
cbbf6f5940
[FIX] website_sale: highlight category
...
bzr revid: chm@openerp.com-20140121101529-2cseit2mq5w1d2z2
2014-01-21 11:15:29 +01:00
Christophe Matthieu
8d48ce0f5a
[IMP] website: js test/tour: raise an exception when cycling or time overlaps
...
bzr revid: chm@openerp.com-20140121100717-d8foqqz5vmdyowuo
2014-01-21 11:07:17 +01:00
Christophe Matthieu
5d78f8f064
[FIX] website: import full_path
...
bzr revid: chm@openerp.com-20140121100524-elxz0n8qfve1iefr
2014-01-21 11:05:24 +01:00
ajay javiya (OpenERP)
5cd399721d
[MERGE]: with main
...
bzr revid: aja@tinyerp.com-20140120051407-qor80rgyq7ll4xwp
2014-01-20 10:44:07 +05:30
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
Fabien Pinckaers
0d20248861
[IMP] typo english
...
bzr revid: fp@tinyerp.com-20140119185018-q36c9bwfju38mmwm
2014-01-19 19:50:18 +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
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)
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
Pooja Zankhariya (OpenERP)
722aee5336
[MERGE]Merge with Parent
...
bzr revid: pza@tinyerp.com-20140117062056-yaw069hktnsk3iwj
2014-01-17 11:20:56 +05:00
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
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
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
Pooja Zankhariya (OpenERP)
ba458f6abc
[MERGE]Merge with Parent
...
bzr revid: pza@tinyerp.com-20140115123052-n9pfmaoh5jzev28d
2014-01-15 17:30:52 +05: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
Christophe Matthieu
45feba1f86
[IMP]website_sale: no product message for public users
...
bzr revid: chm@openerp.com-20140114162925-z1gcl5h2rkxb7crx
2014-01-14 17:29:25 +01:00
Christophe Matthieu
4e94761a8e
[IMP] product: category and website_sale controllers
...
bzr revid: chm@openerp.com-20140114142940-xpshp8e6trio5mxc
2014-01-14 15:29:40 +01:00
Christophe Matthieu
c3cc2b08f1
[IMP] website_sale: demo data for suggested product
...
bzr revid: chm@openerp.com-20140114105744-gz1z4ap9zra33s11
2014-01-14 11:57:44 +01:00
Christophe Matthieu
057184bb64
[FIX] website_sale: if I add a suggested product to the card: Page not found wrong url
...
bzr revid: chm@openerp.com-20140114095721-xjj4keju12znfoky
2014-01-14 10:57:21 +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
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
24480a2440
[FIX] product: access right. Resolve: Use Superuser in name_get method to fetch partners/sellers
...
bzr revid: chm@openerp.com-20140109124423-vq7u14q089xiqtt9
2014-01-09 13:44:23 +01:00
Darshan Kalola (OpenERP)
a9e87b56ce
[MERGE]with lp:~openerp-dev/openobject-addons/trunk-website-al.
...
bzr revid: dka@tinyerp.com-20140108093659-c9it34gll0ipcll2
2014-01-08 15:06:59 +05:30
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
b6517bd5bd
[FIX] website_sale: product template
...
- fixed link to comments
- fixed Comments title + comment form not visible if no previous discussion on the prodcut
bzr revid: tde@openerp.com-20140106171813-rolti0md6xaz1dxd
2014-01-06 18:18:13 +01:00
Thibault Delavallée
1053f3c922
[IMP] website_sale: product website chatter: added a title-link for the comment section
...
bzr revid: tde@openerp.com-20140106164434-4d0ddzc1okmfwgrd
2014-01-06 17:44:34 +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
Thibault Delavallée
3aaa474d3c
[IMP] website_sale: website chatter: some styling on the attachments
...
bzr revid: tde@openerp.com-20140106154358-z3anh1xpdkcmd7wm
2014-01-06 16:43: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
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
Christophe Matthieu
c4ea06327c
[FIX] website: typo
...
bzr revid: chm@openerp.com-20140106103855-vjd6ro0w4m0xkfrc
2014-01-06 11:38:55 +01:00
Fabien Pinckaers
9cbe77bc90
[IMP] several cleaning
...
bzr revid: fp@tinyerp.com-20140101154754-cp4m9u84okx7m057
2014-01-01 16:47:54 +01:00
ddm
4d24f84615
[IMP] Ensure correct parsing
...
bzr revid: ddm@openerp.com-20131231132100-jdddbzx2tzpiqmgi
2013-12-31 14:21:00 +01:00
ddm
f3ef0e15ff
[FIX] Fixed popovers in product tour
...
bzr revid: ddm@openerp.com-20131231104153-fy4sr9d7e0vwlef7
2013-12-31 11:41:53 +01:00
Thibault Delavallée
c1fb818999
[REV] Reverted commit 10363
...
bzr revid: tde@openerp.com-20131224151201-g8luax3t431t7ky4
2013-12-24 16:12:01 +01:00
Thibault Delavallée
dfd52bfc2c
[FIX] website_sale: fixed several access rights issue related to public user + billing / shipping partner_id of sale order badly set, retrieved and displayed in the checkout process
...
bzr revid: tde@openerp.com-20131224145845-q6255ll7n8wy0syv
2013-12-24 15:58:45 +01:00
Thibault Delavallée
f5f055340f
[MERGE] Merged demo homepage improvements
...
bzr revid: tde@openerp.com-20131224100630-x0r20pj1v2y1g5pg
2013-12-24 11:06:30 +01:00
Paramjit Singh Sahota
18d8368ee1
[MERGE] Merged lp:~openerp-dev/openobject-addons/trunk-website-al
...
bzr revid: psa@tinyerp.com-20131224053125-3lrogsrgd3ccp0i6
2013-12-24 11:01:25 +05:30
Thibault Delavallée
348a2bda96
[FIX] website_sale: get_total_quantity -> get_number_of_products
...
[FIX] website_sale: fixed domain to find the shipping_partner_id
bzr revid: tde@openerp.com-20131219103732-84nrt5xlqyqbwsns
2013-12-19 11:37:32 +01:00
ajay javiya (OpenERP)
f00f358f77
[REM]: remove unwanted methods and clean code
...
bzr revid: aja@tinyerp.com-20131219101210-tlvhlogviruzyqvn
2013-12-19 15:42:10 +05:30
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
ajay javiya (OpenERP)
5567caa27d
[IMP]: overwrite record rule to allow public user to read sale.order data
...
bzr revid: aja@tinyerp.com-20131218055645-fb9izyc3029jtz0k
2013-12-18 11:26:45 +05:30
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
ajay javiya (OpenERP)
63d3fd9742
[REV]revert:unwanted code
...
bzr revid: aja@tinyerp.com-20131217064930-bmyrhcf0iru9b21e
2013-12-17 12:19:30 +05:30
ajay javiya (OpenERP)
689606c2f6
[MERGE]: with main
...
bzr revid: aja@tinyerp.com-20131216053732-28d7ksu2tiyno6kf
2013-12-16 11:07:32 +05:30
Fabien Pinckaers
c62e8fc793
[IMP] Small improvements
...
bzr revid: fp@tinyerp.com-20131214192105-0ngdj4t6fz8xjd4q
2013-12-14 20:21:05 +01:00
Fabien Pinckaers
b5393c97e4
[IMP] slugify products/categories
...
bzr revid: fp@tinyerp.com-20131214115227-6g3w70pm6cotiqdk
2013-12-14 12:52:27 +01:00
Fabien Pinckaers
cbc4b5e7ff
[IMP] Product image improved layout
...
bzr revid: fp@tinyerp.com-20131214114625-uian4kh4gexpc6aa
2013-12-14 12:46:25 +01:00
Fabien Pinckaers
fd772ee527
[IMP] better css
...
bzr revid: fp@tinyerp.com-20131213213014-hz0x1tfxygrmev1o
2013-12-13 22:30:14 +01:00
Christophe Matthieu
b32dd93365
[IMP] website_sale: layout for all theme and mobile view
...
bzr revid: chm@openerp.com-20131213161850-le6823cp9njx8iny
2013-12-13 17:18:50 +01:00
Christophe Matthieu
aca3b51bf3
[IMP] website_sale: layout for all theme and mobile view
...
bzr revid: chm@openerp.com-20131213161642-e1ltxlidm9apg3l4
2013-12-13 17:16:42 +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
ajay javiya (OpenERP)
558e5fdf9b
[MERGE] : with main
...
bzr revid: aja@tinyerp.com-20131213051723-onb54coa8f2930sj
2013-12-13 10:47:23 +05:30
Christophe Matthieu
fbf71a27c5
[FIX] website_sale: checkout default partner is not the public user
...
bzr revid: chm@openerp.com-20131212122543-hcc53zjn6wlw5l80
2013-12-12 13:25:43 +01:00
Christophe Matthieu
c641d58610
[FIX] website_sale: address layout
...
bzr revid: chm@openerp.com-20131212120232-gsx1h0vk5t91wpcw
2013-12-12 13:02:32 +01:00
Christophe Matthieu
796b8bf362
[FIX] website_sale: layout; add push to top in grid
...
bzr revid: chm@openerp.com-20131212114731-9ivgwupic064o3x0
2013-12-12 12:47:31 +01:00
Christophe Matthieu
745a559c77
[IMP] website: Removing unnecessary spaces at beginning of line; website_sale: fix css
...
bzr revid: chm@openerp.com-20131212110740-4ofu3tebr3vgcrnd
2013-12-12 12:07:40 +01:00
Christophe Matthieu
730fdb904d
[FIX] website_sale: css
...
bzr revid: chm@openerp.com-20131212110626-5kj461y6erg5ddhq
2013-12-12 12:06:26 +01:00
Christophe Matthieu
ee370a837c
[IMP] website: Removing unnecessary spaces at beginning of line
...
bzr revid: chm@openerp.com-20131212105821-mqvxb7yc04cj5k2s
2013-12-12 11:58:21 +01:00
Christophe Matthieu
6655cd8ccd
[IMP] website_sale: product placeholder image must be bigger
...
bzr revid: chm@openerp.com-20131212104724-0jmsepf8k5gtl18h
2013-12-12 11:47:24 +01:00
ddm
76b5bef5fb
[FIX] Tour should not start 'uninvited'
...
bzr revid: ddm@openerp.com-20131212102807-ra4uon05udtp5twu
2013-12-12 11:28:07 +01:00
Christophe Matthieu
dfe3ca1172
[IMP] website_sale: Rename 'Incl Taxes' into Taxes
...
bzr revid: chm@openerp.com-20131212101442-k1abgkueua4t8iaa
2013-12-12 11:14:42 +01:00
Christophe Matthieu
fa217bba33
[IMP] website_sale, website_event: layout
...
bzr revid: chm@openerp.com-20131212101258-tzzyyuz74ysmfn6s
2013-12-12 11:12:58 +01:00
ddm
64794a8c3b
[FIX] Restore tutorial on module install
...
bzr revid: ddm@openerp.com-20131212095950-3675vfd0tjpzlsug
2013-12-12 10:59:50 +01:00
ddm
e84d9a7f85
[FIX] Shop tour
...
bzr revid: ddm@openerp.com-20131211181410-rfy68dlqps8oldll
2013-12-11 19:14:10 +01:00
Christophe Matthieu
350bda93a6
[IMP] website_sale: empty comment
...
bzr revid: chm@openerp.com-20131211160749-a9f0u00mn4fjx7oe
2013-12-11 17:07:49 +01:00
Christophe Matthieu
17e132bb01
[FIX] website: order of script for editor and tours
...
bzr revid: chm@openerp.com-20131211153345-6hand0upjjqba85f
2013-12-11 16:33:45 +01:00
Christophe Matthieu
2257e8d431
[IMP] website: change editable and use groups
...
bzr revid: chm@openerp.com-20131211145930-r0izxh9t0efjwhxh
2013-12-11 15:59:30 +01:00
Christophe Matthieu
5217c8ebe8
[IMP] website: remove secure_layout. Inherit with groups for js editor
...
bzr revid: chm@openerp.com-20131211144402-lpanprv3u362qvd7
2013-12-11 15:44:02 +01:00
ddm
6893a6ab15
[IMP] Improve automated tests
...
bzr revid: ddm@openerp.com-20131210163522-p23703mcu8pfdsl0
2013-12-10 17:35:22 +01:00
ajay javiya (OpenERP)
060fe3329c
[ADD]:Recommendation of related product
...
[IMP]: demo data
bzr revid: aja@tinyerp.com-20131210104442-1yqigjiwszjowogp
2013-12-10 16:14:42 +05:30
Fabien Pinckaers
59906a3af8
[IMP] allow users to change product price from CMS[FIX] small bug in reordering of PTT
...
bzr revid: fp@tinyerp.com-20131209210511-5w03vf2wt0pmgdew
2013-12-09 22:05:11 +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
ddm
5f0fcfb9be
[IMP] Tour improvements => automated tests
...
bzr revid: ddm@openerp.com-20131209112534-3ysihjgm20jj3d9k
2013-12-09 12:25:34 +01:00
Christophe Matthieu
229696111b
[FIX] website_sale: access for product.pricelist.item
...
bzr revid: chm@openerp.com-20131209091142-1pyz1tz64d0gh39r
2013-12-09 10:11:42 +01:00
ddm
9be1dbfe9e
[FIX] Regression in shop tour
...
bzr revid: ddm@openerp.com-20131206140940-v0rerf362fuj2tqz
2013-12-06 15:09:40 +01:00
ddm
74ed3d2e5f
[FIX] Make tour declarative to enable autotests
...
bzr revid: ddm@openerp.com-20131206133239-mrhduf2fi0sm8sh7
2013-12-06 14:32:39 +01:00
Christophe Matthieu
b2bd96340f
[FIX] website: create button and help (fix inherit_id in modules)
...
bzr revid: chm@openerp.com-20131205165340-ty0xybh7uz859gnm
2013-12-05 17:53:40 +01:00
Christophe Matthieu
1a88541ec5
[FIX] website_sale: filters and partner controller
...
bzr revid: chm@openerp.com-20131205162240-33wfteow79zlbdrn
2013-12-05 17:22:40 +01:00
Fabien Meghazi
7a3b490f46
[IMP] preload records and throw 404 if not exists for blog, event, product
...
bzr revid: fme@openerp.com-20131205155450-y6joi29l2cn9amkn
2013-12-05 16:54:50 +01:00
Thibault Delavallée
5a2ed4b4b4
[MERGE] [CLEAN] [FIX] payment_acquirer and acquirer implementation: code cleaning + misc bugfixing.
...
[ADD] payment_acquirer: in the rendering, now supported in the context :
- tx_url: the form action URL, that can be set by the context, otherwise fall back on the acquirer default tx URL
- submit_class and submit_txt: submit is now a button with an image, unless asked not to; used in the ecommerce to display a Pay Now button instead of the acquirer logo
- updated all acquirers accordingly.
[IMP] payment_acquirer: cleaned and improved form view, for acquirer and tx models.
[IMP] payment_acquirer: amount and fees are now (16,2) float fields. Updated code to handle this kind of floats. Probably those values should come from some config parameters, but it is still not the case.
[CLEAN] various acquirers: removed unnecessary fields, among other the fields holding URLs. URLs of an acquirer should be accessible through a method, but storing them in a field is wasted space. Updated all acquirers and code accordingly.
[FIX] various acquirers: fixed ckeckout and getting data back processes. Some fixed in the controllers, some fixes in the data management due to prior refactoring and improvements in website and acquirer model.
[IMP] website_sale: updated the choice of the acquirer. They are all displayed with a small image as radio input; a Pay Now button is present to activate the payment process. Actually each acquirer generated a Pay Now button, but only the one of the chosen acquirer is displayed. This rendering uses the new options added in the button rendering process described hereabove.
[REM] website_payment: removed most of the code that was present for testing purposes. Only some JS is kept, for future credit-card form rendering.
bzr revid: tde@openerp.com-20131204175715-gdbl0tp5vbnc6pxm
2013-12-04 18:57:15 +01:00
Christophe Matthieu
b1765e2834
[IMP] website: slip layout
...
bzr revid: chm@openerp.com-20131204161754-5dq4bt7gghnk878c
2013-12-04 17:17:54 +01:00
Thibault Delavallée
dbcdddd3d4
[MERGE] Sync with website-al, because sale was broken
...
bzr revid: tde@openerp.com-20131204130704-fa3pu4gnpku0frsj
bzr revid: tde@openerp.com-20131204144838-vu66z2lsybqtp4hm
2013-12-04 15:48:38 +01:00
Christophe Matthieu
edee3e5da3
[FIX] website_sale: shop/confirm_order: from_partner
...
bzr revid: chm@openerp.com-20131204141056-f4u5rqbbqfka95ka
2013-12-04 15:10:56 +01:00
Thibault Delavallée
9f0b5a7c53
[IMP] website_sale: improved the choice of acquirer.
...
Now all acquirer are displayed using a small icon; a Pay Now button is located on the right that
is the next step for the payment.
All acquirers are rendered with a Pay Now button, but only the currently chosen one is
displayed. This allows to display several acquirers without having to do javascript-based
hacks to tune the form, its action or content.
bzr revid: tde@openerp.com-20131204130628-eeqpfhoqaavhv6nk
2013-12-04 14:06:28 +01:00
Fabien Pinckaers
642fce4a5b
[IMP] speed improvement + small bug
...
bzr revid: fp@tinyerp.com-20131203171033-oe6pkzb9jal3ril8
2013-12-03 18:10:33 +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
Fabien Meghazi
a7738ab2ea
[IMP] Reorder menu
...
bzr revid: fme@openerp.com-20131203120910-yv82gwref4uikn7b
2013-12-03 13:09:10 +01:00
Fabien Meghazi
6745bb3fed
[FIX] font-awesome icons migration to v4
...
bzr revid: fme@openerp.com-20131203141632-ubc35ca7d4l80s7m
2013-12-03 15:16:32 +01:00
Christophe Matthieu
06f96e4dea
[FIX] website_sale: user going to /shop/payment/validate/ without pass by mycart and add to cart
...
bzr revid: chm@openerp.com-20131203133345-0e7k3ab87u1d3we7
2013-12-03 14:33:45 +01:00
ddm
63f63ef470
[IMP] Tour: advance on any snippet drop
...
bzr revid: ddm@openerp.com-20131203094704-h995gaoo7onhlqpv
2013-12-03 10:47:04 +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
Thibault Delavallée
37c3ed60f6
[IMP] [WIP] website_sale: beginning of cleaning acquirer choice (should be small icon + pay now button)
...
bzr revid: tde@openerp.com-20131202150218-i403w7ulnm3b7b1n
2013-12-02 16:02:18 +01:00
Fabien Meghazi
d376bd55ca
[IMP] url slug in templates
...
bzr revid: fme@openerp.com-20131202125723-aw66fidrinaolgyo
2013-12-02 13:57:23 +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
Thibault Delavallée
b04c2a4a56
[FIX] website_sale: fixed order confirmation cleaning: self.pool -> request.registry
...
bzr revid: tde@openerp.com-20131202103124-9lf4up79uxjwdyxp
2013-12-02 11:31:24 +01:00
Thibault Delavallée
5b488cf2ec
[FIX] website_sale: fixed checkout cleaning: self.pool -> request.registry
...
bzr revid: tde@openerp.com-20131202102959-inj25wnqk1prv6qy
2013-12-02 11:29:59 +01:00
Christophe Matthieu
2ce50aeb2f
[FIX] website_sale: table_compute fill table ending holes
...
bzr revid: chm@openerp.com-20131202094229-tqggruo231po721m
2013-12-02 10:42:29 +01:00
Fabien Pinckaers
db8f3b4f40
[IMP] small bugfix
...
bzr revid: fp@tinyerp.com-20131201173208-r72mybhgek0aibfl
2013-12-01 18:32:08 +01:00
Fabien Pinckaers
d6f77f5853
[IMP] Speed improvements
...
bzr revid: fp@tinyerp.com-20131201172541-p8403347rv08uurh
2013-12-01 18:25:41 +01:00
Fabien Pinckaers
dd62046680
[IMP] renaming + comment
...
bzr revid: fp@tinyerp.com-20131201003520-nikzk23fwkkku2lg
2013-12-01 01:35:20 +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
Fabien Pinckaers
ed7623fc45
[IMP] Performance improvement: improved cache with context, better get_object
...
bzr revid: fp@tinyerp.com-20131130154659-uqis34x2cemmocly
2013-11-30 16:46:59 +01:00
ddm
36966d140f
[FIX] Shop tour was broken by change
...
bzr revid: ddm@openerp.com-20131129131529-seqk3hypzcka8qxi
2013-11-29 14:15:29 +01:00
Christophe Matthieu
32ec9cccdd
[IMP] website: views for drag and drop snippets
...
bzr revid: chm@openerp.com-20131128160851-xmepb4h6n0logclo
2013-11-28 17:08:51 +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
c8142a4e8f
[FIX] website_sale: fixed call to website.get_order, located on website model
...
bzr revid: tde@openerp.com-20131127160154-v5qpxuh70axz9cck
2013-11-27 17:01:54 +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
ddm
09a54b25de
[IMP] Tour: simplify modal handling
...
bzr revid: ddm@openerp.com-20131126141324-3aynn0r5sqpttc90
2013-11-26 15:13:24 +01:00
ddm
cbef8ac39b
[FIX] Various tour fixes and imps
...
bzr revid: ddm@openerp.com-20131126112246-tuj0wvruy2668fyi
2013-11-26 12:22:46 +01:00
Christophe Matthieu
c948374f06
[FIX] website_sale: add/remove product cart (json controller)
...
bzr revid: chm@openerp.com-20131126094320-4935pnkuhwfkw8j9
2013-11-26 10:43:20 +01:00
Xavier Morel
f5236dfdb0
[IMP] use dict.fromkeys when applicable
...
bzr revid: xmo@openerp.com-20131126085122-3axgsp11eb10yo05
2013-11-26 09:51:22 +01:00
Christophe Matthieu
d24f8e45b3
[FIX] website_sale: price is displayed twice
...
bzr revid: chm@openerp.com-20131125164506-oitajyqdjnmd02qg
2013-11-25 17:45:06 +01:00
ddm
1dd3026cf6
[FIX] Tour: modal bug fixes
...
bzr revid: ddm@openerp.com-20131125163844-qn6gxp59n094d6el
2013-11-25 17:38:44 +01:00
ddm
b2ebae427c
[FIX] Tour: modal bug fixes
...
bzr revid: ddm@openerp.com-20131125163622-4e6o0gzr2gocrcej
2013-11-25 17:36:22 +01:00
ddm
97fb6198dd
[IMP] Product tour: upload image
...
bzr revid: ddm@openerp.com-20131125160833-9pavzpff5akck451
2013-11-25 17:08:33 +01:00
Christophe Matthieu
4fe9f90495
[FIX] website_event: create sale order and pricelist init
...
bzr revid: chm@openerp.com-20131125160358-bxj3tx90bru3mywz
2013-11-25 17:03:58 +01:00
ddm
1a0b6a55e5
[FIX] Fixed product tour
...
bzr revid: ddm@openerp.com-20131125154953-9vyfdtrnmws6qm32
2013-11-25 16:49:53 +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
ddm
e18fafb8a8
[FIX] Tour: various fixes (leaks etc.)
...
bzr revid: ddm@openerp.com-20131125134754-i3j9qgovrqc22qn9
2013-11-25 14:47:54 +01:00
Xavier Morel
e997c622d4
[FIX] remove apparently pointless parameter
...
bzr revid: xmo@openerp.com-20131125123717-ahyzg4e682qtmwy6
2013-11-25 13:37:17 +01:00
ddm
0bda85949a
[IMP] Various tour imps
...
bzr revid: ddm@openerp.com-20131122173038-s9dfq8lxau3fadfl
2013-11-22 18:30:38 +01:00
ddm
6a307069b4
[IMP] Blog tour
...
bzr revid: ddm@openerp.com-20131122110154-fsjeahreh7skk0fj
2013-11-22 12:01:54 +01:00
Darshan Kalola (OpenERP)
9f2dce4fe0
[IMP]improve product template view and change necessary xpath
...
bzr revid: dka@tinyerp.com-20131122054850-8sfin7rypnyf17ip
2013-11-22 11:18:50 +05:30
Xavier Morel
14d15b95a5
[FIX] crap
...
* (1, '=', 1) is a noop domain section
* list.append. A thing.
* converting an int to an int is not useful
* search_count avoids having to fetch all product.template ids from
the database just to call len() on the result when it's not
necessary
* when using a dict value 5 times in a row, it's simpler to get it
just once and refer a local variable thereafter
bzr revid: xmo@openerp.com-20131121141647-2w9z2a7b8p5sek22
2013-11-21 15:16:47 +01:00
Thibault Delavallée
32897bf4ee
[MERGE] Sync with website-al
...
bzr revid: tde@openerp.com-20131121132413-lyngpz4c23kocmye
2013-11-21 14:24:13 +01:00
Christophe Matthieu
dc8ef4da30
[FIX] website_sale: fix product editor and move edit code in website_sale.editor.js
...
bzr revid: chm@openerp.com-20131121132317-ysa25sdqqx8dg1wo
2013-11-21 14:23:17 +01:00
Christophe Matthieu
07819834bb
[FIX] website_sale: filter controller and shop/?category=37 --> shop/category/37
...
bzr revid: chm@openerp.com-20131121130529-1zs3ioih5156ceit
2013-11-21 14:05:29 +01:00
Thibault Delavallée
bc726e4da7
[MERGE] Sync with website-al
...
bzr revid: tde@openerp.com-20131121120935-srk3s4qhxar0k5l5
2013-11-21 13:09:35 +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
ddm
56e19c374f
[FIX] Avoid reserved keywords as method names
...
bzr revid: ddm@openerp.com-20131121114922-w731pvjnnvqzxu42
2013-11-21 12:49:22 +01:00
ddm
77c60a94be
[IMP] Tour: method names
...
bzr revid: ddm@openerp.com-20131121112312-2n8kd2tja6upji3i
2013-11-21 12:23:12 +01:00
ddm
ec4372ac23
[IMP] Tour: better defaults
...
bzr revid: ddm@openerp.com-20131121111102-l66jzdysdkqm7fje
2013-11-21 12:11:02 +01:00
Thibault Delavallée
04818e7584
[FIX] website_sale: fixed some 'add cart' buttons not working
...
bzr revid: tde@openerp.com-20131121094816-w8ulontnt9kv5zbf
2013-11-21 10:48:16 +01:00
Thibault Delavallée
d5ac601823
[MERGE] Sync with website-al
...
bzr revid: tde@openerp.com-20131120140414-zf1qiepxueyrhn4j
2013-11-20 15:04:14 +01:00
Thibault Delavallée
5dcb10fc01
[IMP] website_sale: end of checkout process improvements
...
- added a controller that validates the payment: confirm the quotation (if paid)
and send it by email
- some fixes in payment routes
- some cleaning in payment template, removed unnecessary code, added a class on a
div to ease the submit button management
bzr revid: tde@openerp.com-20131120140321-mderltwy8xp2vfn4
2013-11-20 15:03:21 +01:00
Christophe Matthieu
6b10be15b2
[IMP] website snippet: add group for styles snippets, add custom picture with style snippet, mouseover and mouseout preview, fix dark css class in demo data
...
bzr revid: chm@openerp.com-20131120115250-etqv5ofqguze0zsj
2013-11-20 12:52:50 +01:00
ddm
c706db9b79
[IMP] Tour code cleanup
...
bzr revid: ddm@openerp.com-20131120110757-lq4gnmxj9nf1e7p0
2013-11-20 12:07:57 +01:00
ddm
e8858b02a6
[IMP] Simplify tour declaration II
...
bzr revid: ddm@openerp.com-20131120110233-1hoc40q2wrs0739d
2013-11-20 12:02:33 +01:00
ddm
10e7a76ae4
[IMP] Simplify tour declaration
...
bzr revid: ddm@openerp.com-20131120105205-u5w4167rposrfazd
2013-11-20 11:52:05 +01:00
ddm
be6c14c5b6
[IMP] Shop tour code cleanup
...
bzr revid: ddm@openerp.com-20131120104107-hoiu7n6cq68qf69u
2013-11-20 11:41:07 +01:00
Thibault Delavallée
d1bc4d3766
[MERGE] Sync with website-al
...
bzr revid: tde@openerp.com-20131120091851-mtln13mmv8amuau7
2013-11-20 10:18:51 +01:00
Christophe Matthieu
e41e8f3957
[IMP] website_hr_recruitment: clear url path
...
bzr revid: chm@openerp.com-20131119161403-wsqwgfi9w3ythjeg
2013-11-19 17:14:03 +01:00
Thibault Delavallée
38a9a3f480
[MERGE] Sync with website-al
...
bzr revid: tde@openerp.com-20131119160204-1yvqbg4vgpc0bkqs
2013-11-19 17:02:04 +01:00
Thibault Delavallée
4f6e792733
[IMP] website_sale: improved checkout process
...
- now going to shop/confirmation when coming back from the acquirer
- added poll on the confirmation page to wait for data from acquirer
- misc cleaning of checkout process, order and transaction management
- added cancel state on payment.transaction, when canceled by the
customer
bzr revid: tde@openerp.com-20131119160129-fkwkhjvk1bh0uarf
2013-11-19 17:01:29 +01:00
ddm
e17d99988b
[FIX] Shop tutorial false start
...
bzr revid: ddm@openerp.com-20131119153908-8n1kse1y2js7v8oj
2013-11-19 16:39:08 +01:00
Christophe Matthieu
20add62aef
[IMP] website_sale: Remove new button
...
bzr revid: chm@openerp.com-20131119152903-r1h3slpy5vigfor4
2013-11-19 16:29:03 +01:00
Christophe Matthieu
cae5522196
[IMP] website_sale: breadcrum layout in my cart
...
bzr revid: chm@openerp.com-20131119152344-w2f56nmd2ce0spon
2013-11-19 16:23:44 +01:00
ddm
47295c4e0e
[FIX] Fixes to shop tour
...
bzr revid: ddm@openerp.com-20131119151059-8xl169vodupwy8xw
2013-11-19 16:10:59 +01:00
ddm
a89c3dff4c
[FIX] Missing double quotes
...
bzr revid: ddm@openerp.com-20131119122605-o6tjpfq7be5tn6zk
2013-11-19 13:26:05 +01:00
ddm
1ec2cb9331
[IMP] Shop tutorial continued
...
bzr revid: ddm@openerp.com-20131119122319-45fu90nooiwb7so7
2013-11-19 13:23:19 +01:00
Fabien Meghazi
3951af2ab5
[IMP] Content->New Product asks for name of product
...
bzr revid: fme@openerp.com-20131119113822-ve7bl516xowa7u1f
2013-11-19 12:38:22 +01:00
Christophe Matthieu
910c2657a9
[IMP] website: add a group_website_publisher to Display Editor Bar on Website and other editable option
...
bzr revid: chm@openerp.com-20131119103042-stdyd6r00e1zgli5
2013-11-19 11:30:42 +01:00
Thibault Delavallée
ba14bbe339
[MOV] website_sale: move get_order and get_current_order code into Website class
...
and into website specific file.
bzr revid: tde@openerp.com-20131119102921-ie03umd2ozasp798
2013-11-19 11:29:21 +01:00
ddm
4ba5cad0e3
[IMP] Improve tour registration
...
bzr revid: ddm@openerp.com-20131119094353-kg04ijualwtsz1lo
2013-11-19 10:43:53 +01:00
Thibault Delavallée
5a51562c18
[ADD] website_sale: added website file in controllers, for website specific code
...
bzr revid: tde@openerp.com-20131119093735-peyoz1ri2hv21w3v
2013-11-19 10:37:35 +01:00
Thibault Delavallée
4d84a4a627
[MERGE] Sync with website-al
...
bzr revid: tde@openerp.com-20131119091935-2bhj417353diri9l
2013-11-19 10:19:35 +01:00
ddm
c40105ce18
[IMP] Start eCommerce tutorial on install
...
bzr revid: ddm@openerp.com-20131119090812-amjdzjfh5xwoouex
2013-11-19 10:08:12 +01:00
Christophe Matthieu
5a6a1efc79
[IMP] website_blog: add breadcrumb; [IMP] clean links
...
bzr revid: chm@openerp.com-20131118143530-5205sp6q7xp6lbj7
2013-11-18 15:35:30 +01:00
Thibault Delavallée
7237ae3a63
[MERGE] Sync with website-al
...
bzr revid: tde@openerp.com-20131118100534-1pw762aklfdt2hwn
2013-11-18 11:05:34 +01:00
Paramjit Singh Sahota
5900672160
[MERGE] Merged lp:~openerp-dev/openobject-addons/trunk-website-al.
...
bzr revid: psa@tinyerp.com-20131118050254-oc3szg7ws2m75lu4
2013-11-18 10:32:54 +05:30
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
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
e61ec3f1cd
[FIX] website_sale: click on blank cd, add to cart -> I have a webcam instead
...
bzr revid: chm@openerp.com-20131115163048-i999l74bfd8t3zrh
2013-11-15 17:30:48 +01:00
Christophe Matthieu
85014499a5
[IMP] website_sale: domain to display product in shop, overwrited in website_event
...
bzr revid: chm@openerp.com-20131115160828-pjv3gessa5sxu2ap
2013-11-15 17:08:28 +01:00
Christophe Matthieu
419c7c6b32
[FIX] website_sale: ribon
...
bzr revid: chm@openerp.com-20131115160721-btxwlxaj7nf9se5n
2013-11-15 17:07:21 +01:00