bd586d8848
[MERGE] Sync with website-al
...
bzr revid: tde@openerp.com-20140123091734-1qn02imaltm9fam5
2014-01-23 10:17:34 +01:00
72d7a19d0f
[FIX] website_payment: fixed openerp.py: payment_acquirer -> payment
...
bzr revid: tde@openerp.com-20140123091707-ozqxm49j9o24ptuc
2014-01-23 10:17:07 +01:00
ffba2091e7
[IMP] website: ui_test_runer: display report before 'wait for' message
...
bzr revid: chm@openerp.com-20140123081721-gi9y1y5mfneaufy6
2014-01-23 09:17:21 +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
b32fbce49c
[IMP] empty pages
...
bzr revid: fp@tinyerp.com-20140122194416-veyfgwg4xmjk0w6v
2014-01-22 20:44:16 +01:00
ef5a50fa98
[IMP] wording
...
bzr revid: fp@tinyerp.com-20140122193818-vxn20qaibfvgn1u3
2014-01-22 20:38:18 +01:00
df3a1486f4
[IMP] remove under construction
...
bzr revid: fp@tinyerp.com-20140122193523-ni1uzv38plutq41m
2014-01-22 20:35:23 +01:00
efcbaa4bd0
[FIX] typo
...
bzr revid: al@openerp.com-20140122193059-rh8rkju5nn8c09kl
2014-01-22 20:30:59 +01:00
986471dcba
[IMP] design of sign in/up
...
bzr revid: fp@tinyerp.com-20140122192322-nvtcood5ll0outn9
2014-01-22 20:23:22 +01:00
a4bc8c790c
[MERGE] Sync with website-al
...
bzr revid: tde@openerp.com-20140122190125-p9d9dwnj4fngmnqv
2014-01-22 20:01:25 +01:00
2e7b5991b7
[REF] portal, portal_sale, payment: refactored old acquirer in portal
...
now based on the new implementation of payment.
[REM] portal: removed acquirer model, views and implementation
[REF] portal_sale: now using payment rendering methods
[IMP] payment: added render_payment_block, taken from old
acquirer, that renders all portal_published acquirers.
bzr revid: tde@openerp.com-20140122190022-lef4b3o1tpcua3vx
2014-01-22 20:00:22 +01:00
7445a207f0
[FIX] payment_*: fixed references to payment_acquirer -> payment
...
bzr revid: tde@openerp.com-20140122185204-y0mievmfnm3jfkn1
2014-01-22 19:52:04 +01:00
44cff7f383
[FIX] payment_*: fixed openerp.py file
...
bzr revid: tde@openerp.com-20140122184256-ojcz0f1vxwoj2aw0
2014-01-22 19:42:56 +01:00
59876ddec4
[MERGE] [IMP] product: product and product template management
...
product
- added a is_only_child field, telling whether the product is the only child of its template
- form view: fields coming from the template are now readonly when there are several products (variants) for the template; added a link to the template on the product form view
- renamed Products menu into All Products
- some improvements in search view, notably groupby
product.template
- improved form view to look more similar to the product one
- added Product Template menus when using variants
website_sale: do not fetch templates without products
bzr revid: tde@openerp.com-20140122183759-s9lfvfeo8f6ytm34
2014-01-22 19:37:59 +01:00
d3a14cd5b4
[REM] portal features deprecated by website
...
bzr revid: al@openerp.com-20140122183630-n04tcm22e7xcl8b0
2014-01-22 19:36:30 +01:00
7182f0b997
[REM] remove portal_event, portal_crm, portal_hr_employee deprecated by website
...
bzr revid: al@openerp.com-20140122181002-4i3v3xtdmyrm3t6f
2014-01-22 19:10:02 +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
055932fc6a
[IMP] product: cleaned form in create mode. Moreover generally
...
changing the template is not possible anymore; create a new tempalte or a new
variant instead. When creating a new product, you will always create a new
template.
Added the link to the template from the product form view.
Cleaned some code (code move).
bzr revid: tde@openerp.com-20140122170218-6j2sixoxvvbbxvhd
2014-01-22 18:02:18 +01:00
f70e542556
[CHG] python 2.6 compat'
...
bzr revid: xmo@openerp.com-20140122161727-0inchgb570e1r7pi
2014-01-22 17:17:27 +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
3ddf62ac83
[FIX] HTML editor error reporting
...
bzr revid: ddm@openerp.com-20140122142537-as7tyryit0ft0p35
2014-01-22 15:25:37 +01:00
92f06e7eab
[MERGE] server side login
...
bzr revid: fme@openerp.com-20140122133757-hougjgwesg9n9s1p
2014-01-22 14:37:57 +01:00
bdc1266264
[FIX] HTML editor, reopen template
...
bzr revid: ddm@openerp.com-20140122132338-4mhth5fzy8iijxja
2014-01-22 14:23:38 +01:00
6979de83cb
[FIX] website snippet vs widget on drop
...
bzr revid: chm@openerp.com-20140122132159-efse87uk30t0tehv
2014-01-22 14:21:59 +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
df63fcba81
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140122102232-77lvvwpzet58sa7p
2014-01-22 11:22:32 +01:00
e6c54ca924
[REV] website: ui_test_runner log
...
bzr revid: chm@openerp.com-20140122100403-6w2pek1cbmhhra0j
2014-01-22 11:04:03 +01:00
363f8561af
[MERGE] Sync with website-al
...
bzr revid: tde@openerp.com-20140122095911-ufqs8cj827dxkajy
2014-01-22 10:59:11 +01:00
38d64147d5
[IMP] product: only template child / multiple template childs form view improvements
...
- added a is_only_child field on product.product, telling whether the
product is the only child of the product.template
- improved the product form view, to set readonly all fields coming fgrom
the template when the product is not the only child. This way, the user
is more aware that changing a value in the template changes the value
for all child products. He will have to do those changes on the template
form. A link to the template has been added in the product form view.
bzr revid: tde@openerp.com-20140122095826-8k0wl7af57iiyify
2014-01-22 10:58:26 +01:00
dcb6ccd711
[FIX] website snippet: on_remove column create parent overlay
...
bzr revid: chm@openerp.com-20140122094654-mh426x5aqmyjh8pd
2014-01-22 10:46:54 +01:00
0e2b946ff3
[IMP] website snippet: convert column widget into visible snippet (in content category)
...
bzr revid: chm@openerp.com-20140122094149-pdnc86o0q0v9aywo
2014-01-22 10:41:49 +01:00
060cbedfb0
[IMP] Sign in shall not redirect to website
...
bzr revid: fme@openerp.com-20140122085948-18tzsgz2p7f2zqpl
2014-01-22 09:59:48 +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
ef18e601dd
[FIX] Reflect endpoints changes introduced in server's Revision: 5153 revid:fme@openerp.com-20140121195348-mcdreqjo3kod0p7i
...
bzr revid: fme@openerp.com-20140121195441-ijt2yjv32v8b39kq
2014-01-21 20:54:41 +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
9d39a2c1b7
[IMP] better formatting of address
...
bzr revid: fp@openerp.com-20140121190242-dfs8difj7tey9fts
2014-01-21 20:02:42 +01:00
d67fa22ea1
[FIX] website_event: test tour
...
bzr revid: chm@openerp.com-20140121172708-bht8omflwve3kibz
2014-01-21 18:27:08 +01:00
d5afe7e5b9
[FIX] move Google Analytics key to correct group
...
bzr revid: ddm@openerp.com-20140121165942-yen9xlfgme5u00o6
2014-01-21 17:59:42 +01:00
1c3a7a8fd3
[IMP] Add support for Google Analytics
...
bzr revid: ddm@openerp.com-20140121163456-i3v3a7oh8qejc9oo
2014-01-21 17:34:56 +01:00
87d6f608da
[IMP] website: In the top menu, we should see the active page
...
bzr revid: chm@openerp.com-20140121154348-1y6uqc6t2oveae7i
2014-01-21 16:43:48 +01:00
Thibault Delavallée
Christophe Matthieu
Fabien Pinckaers
Antony Lesuisse
Xavier Morel
ddm@openerp.com
Fabien Meghazi
Fabien Pinckaers