c974af606d
[IMP] fix manifest links
...
bzr revid: fp@tinyerp.com-20140127224957-n3gb6x82n74w1xaq
2014-01-27 23:49:57 +01:00
deddf20919
[FIX] bug in modifying quantities
...
bzr revid: fp@tinyerp.com-20140125204107-jri8u2ucbyuhvzfc
2014-01-25 21:41:07 +01:00
b15dbfa3a6
[IMP] mini imp
...
bzr revid: fp@openerp.com-20140125123758-4fhewd19ib38oal3
2014-01-25 13:37:58 +01:00
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
a771127a7e
[MERGE] Sync with website-al
...
bzr revid: tde@openerp.com-20140124144628-eug8try0jywc7lps
2014-01-24 15:46:28 +01:00
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
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
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
43deedcdf6
[MERGE] Sync with website-al
...
bzr revid: tde@openerp.com-20140124120925-gyysjhkokizynsd8
2014-01-24 13:09:25 +01:00
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
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
8c47f0278a
[MERGE] Sync with website-al
...
bzr revid: tde@openerp.com-20140123162202-n4jkgkrzb8htx235
2014-01-23 17:22:02 +01:00
70090a12ba
[FIX] website_sale
...
bzr revid: chm@openerp.com-20140123152542-6vtsx2by65281sr4
2014-01-23 16:25:42 +01:00
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
bad2244494
[MERGE] Sync with website-al
...
bzr revid: tde@openerp.com-20140123134253-z5vee6c8fmbgdyq1
2014-01-23 14:42:53 +01:00
029e230dfc
[WARN] website_sale: disable tests
...
bzr revid: chm@openerp.com-20140123130812-9r419w11gytadjn8
2014-01-23 14:08:12 +01:00
dea946f3dc
[IMP] website_sale: breadcrup
...
bzr revid: chm@openerp.com-20140123130801-ngs1die8rrsakc57
2014-01-23 14:08:01 +01:00
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
bd586d8848
[MERGE] Sync with website-al
...
bzr revid: tde@openerp.com-20140123091734-1qn02imaltm9fam5
2014-01-23 10:17:34 +01:00
4b429a033b
[IMP] website_sale: extend timeout for shoptest tour
...
bzr revid: chm@openerp.com-20140123081411-9u5h4720504jdbvf
2014-01-23 09:14:11 +01:00
2577be53ac
[MERGE]: with main
...
bzr revid: aja@tinyerp.com-20140123050930-nxq5nnc3y6q0i2lv
2014-01-23 10:39:30 +05:30
a4bc8c790c
[MERGE] Sync with website-al
...
bzr revid: tde@openerp.com-20140122190125-p9d9dwnj4fngmnqv
2014-01-22 20:01:25 +01:00
0b69bad996
[RENAME] payment_acquirer_* -> payment_ *
...
bzr revid: tde@openerp.com-20140122175702-1h1e51z4njt4s70w
2014-01-22 18:57:02 +01:00
d4d14f6951
[REV] website_sale: reverted changes in shop (JS)
...
bzr revid: tde@openerp.com-20140122171606-md7exi4319w3vqqx
2014-01-22 18:16:06 +01:00
3a359f0ef4
[REV] website_sale: reverted changes in shop
...
bzr revid: tde@openerp.com-20140122171429-rb6g4zpyl8cw6fvv
2014-01-22 18:14:29 +01:00
46c55500ff
[MERGE] Sync with website-al
...
bzr revid: tde@openerp.com-20140122171321-6r2q42p7ebfv3kb9
2014-01-22 18:13:21 +01:00
91f44259b6
[FIX] website_sale: ecommerce_change_pricelist context
...
bzr revid: chm@openerp.com-20140122151852-ia7x4sd5l2h7oskx
2014-01-22 16:18:52 +01:00
0fe979572b
[FIX] website_sale: test tour
...
bzr revid: chm@openerp.com-20140122145821-da1l5l5bji39j5mv
2014-01-22 15:58:21 +01:00
0c5b6caa10
[FIX] website: payment get pricelist
...
bzr revid: chm@openerp.com-20140122145328-5xjhu5uublljqdkx
2014-01-22 15:53:28 +01:00
d724f00198
[FIX] website_sale: promo code
...
bzr revid: chm@openerp.com-20140122124809-9xha1jsnnxaod65z
2014-01-22 13:48:09 +01:00
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
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
363f8561af
[MERGE] Sync with website-al
...
bzr revid: tde@openerp.com-20140122095911-ufqs8cj827dxkajy
2014-01-22 10:59:11 +01:00
35b7cd5d51
[WIP] website_sale: test tour debug
...
bzr revid: chm@openerp.com-20140122081321-8mtcqnd5yyx6c2nj
2014-01-22 09:13:21 +01:00
d9582aa9e4
[WIP] website_sale: test tour error
...
bzr revid: chm@openerp.com-20140121221438-6j1231868ex479p2
2014-01-21 23:14:38 +01:00
98bdaf4a1c
[WIP] website_sale: test tour error
...
bzr revid: chm@openerp.com-20140121210506-s11tmbdczs34bkuu
2014-01-21 22:05:06 +01:00
0f7e290cd6
[WIP] website_sale: test tour error
...
bzr revid: chm@openerp.com-20140121203102-btt5bvn0dxnyx9y2
2014-01-21 21:31:02 +01:00
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
d67fa22ea1
[FIX] website_event: test tour
...
bzr revid: chm@openerp.com-20140121172708-bht8omflwve3kibz
2014-01-21 18:27:08 +01:00
b38d4d8a81
[FIX] website_blog: tour
...
bzr revid: chm@openerp.com-20140121152307-kx92ee0za0w0pprr
2014-01-21 16:23:07 +01:00
6d320f6f0b
[FIX] website_sale: payement button
...
bzr revid: chm@openerp.com-20140121125040-r4o7wdys2hd3437d
2014-01-21 13:50:40 +01:00
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
93711b0f91
[MERGE] Sync with website-al main branch
...
bzr revid: tde@openerp.com-20140121105805-msfn6i901v7kr2o3
2014-01-21 11:58:05 +01:00
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
3b1fec3220
[FIX] website: double reload in tests process
...
bzr revid: chm@openerp.com-20140121083038-63cubvi2bu59klaj
2014-01-21 09:30:38 +01:00
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
cd3be26606
[IMP] Merge Trunk + Deisgn Improvements
...
bzr revid: fp@tinyerp.com-20140120205229-b9726jvb5tfmj3fc
2014-01-20 21:52:29 +01:00
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
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
cbbf6f5940
[FIX] website_sale: highlight category
...
bzr revid: chm@openerp.com-20140121101529-2cseit2mq5w1d2z2
2014-01-21 11:15:29 +01:00
Fabien Pinckaers
Fabien Pinckaers
Thibault Delavallée
Christophe Matthieu
Fabien Meghazi
ajay javiya (OpenERP)
Darshan Kalola (OpenERP)