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
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
4d6e7e2d2e
[REM] Remove testing route
...
bzr revid: fme@openerp.com-20140120161237-m96w38qd6zqajc12
2014-01-20 17:12:37 +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
46e7638d81
[FIX] website tour: add 'url' triggers
...
bzr revid: chm@openerp.com-20140120151637-ac1orinuq49rcqx9
2014-01-20 16:16:37 +01:00
Christophe Matthieu
d175a4fd00
[IMP] website tour: add 'url' triggers; triggers emitter raise an exception if emmitter is undefined
...
bzr revid: chm@openerp.com-20140120150614-ra8najdd9hp24y18
2014-01-20 16:06:14 +01:00
Xavier Morel
620652c420
[FIX] excessive horizontal and vertical offsetting of edition button on images in webkit browsers
...
Manually adding margins to offsets was necessary due to
http://bugs.jquery.com/ticket/5445#comment:6 and the original code
using $.fn.position().
When edition buttons were moved to being children of the body (rather
than siblings of the image), $.fn.position() was replaced by
$.fn.offset() (to get the position of the image/link relative to the
body/page toplevel), the adjustment (addition of marginLeft/marginTop)
was left in, even though #5445 does not apply to $.fn.offset().
bzr revid: xmo@openerp.com-20140120144610-nu8q2naemzzhekv2
2014-01-20 15:46:10 +01:00
Antony Lesuisse
3ad6be4466
point_of_sale restore pristine files
...
bzr revid: al@openerp.com-20140120140333-sxg3gh4lgh20teal
2014-01-20 15:03:33 +01:00
Christophe Matthieu
97da0a2e52
[IMP] website tour: add 'reload' triggers
...
bzr revid: chm@openerp.com-20140120133919-hvdsqax5h6n8mlp3
2014-01-20 14:39:19 +01:00
Christophe Matthieu
7651b8f700
[IMP] website snippet: activate margin bottom resizing for colmd snippet
...
bzr revid: chm@openerp.com-20140120111042-nn76p9roezqgdehr
2014-01-20 12:10:42 +01:00
Christophe Matthieu
9730663537
[IMP] website snippet: add background option on quote slider
...
bzr revid: chm@openerp.com-20140120101310-zam2fqzhfegu8rys
2014-01-20 11:13:10 +01:00
Fabien Pinckaers
57505a1b24
[IMP] better about us page
...
bzr revid: fp@tinyerp.com-20140119203319-ctai57l7kd4v2qxq
2014-01-19 21:33:19 +01:00
Fabien Pinckaers
986546ae16
[IMP] improved footer CSS, 8 pixels more
...
bzr revid: fp@tinyerp.com-20140119200952-6cfsm3wwwv8b6x3x
2014-01-19 21:09:52 +01:00
Fabien Pinckaers
c8919713bf
[IMP] left alignment in navbar logo
...
bzr revid: fp@tinyerp.com-20140119194441-ug22bg0n3q89nowr
2014-01-19 20:44:41 +01:00
Fabien Pinckaers
c1b96e7ebf
[IMP] better demo data logo
...
bzr revid: fp@tinyerp.com-20140119194205-z7vossf1x30yftt8
2014-01-19 20:42:05 +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
Fabien Pinckaers
0d20248861
[IMP] typo english
...
bzr revid: fp@tinyerp.com-20140119185018-q36c9bwfju38mmwm
2014-01-19 19:50:18 +01:00
Fabien Pinckaers
40d490f507
[iMP] CSS langs
...
bzr revid: fp@openerp.com-20140119182208-owtazt6q3hn3v7wm
2014-01-19 19:22:08 +01:00
03606aa347
QWeb cleanups 1 sql query less per page
...
bzr revid: jojo_le_bricolo-20140119174642-q2ix8p27ospjkuf4
2014-01-19 18:46:42 +01:00
Fabien Pinckaers
a571dd0849
[IMP] CSS Logo
...
bzr revid: fp@tinyerp.com-20140119125357-v5yta1lltm4yo6q4
2014-01-19 13:53:57 +01:00
Fabien Pinckaers
b77b487c4a
[IMP] CSS
...
bzr revid: fp@tinyerp.com-20140119124958-qz5dsz8m325upphl
2014-01-19 13:49:58 +01:00
Fabien Pinckaers
71df4bd1db
[IMP] CSS logo
...
bzr revid: fp@tinyerp.com-20140119123225-f5og62iymz2kacm2
2014-01-19 13:32:25 +01:00
Fabien Pinckaers
d554f09ca7
[IMP] Logo
...
bzr revid: fp@openerp.com-20140119122959-etp99cwiuuagws30
2014-01-19 13:29:59 +01:00
Fabien Pinckaers
5c5334ea4c
[IMP] CSS logo
...
bzr revid: fp@tinyerp.com-20140119122503-ngjotynnvtvv0rqd
2014-01-19 13:25:03 +01:00
Fabien Pinckaers
7fb925b095
[IMP] CSS
...
bzr revid: fp@tinyerp.com-20140119121715-zmo9x5r234wmqvdj
2014-01-19 13:17:15 +01:00
Fabien Pinckaers
49d5c0bf1b
[IMP] size of logo
...
bzr revid: fp@tinyerp.com-20140119121147-frnx3zh9hnayn24z
2014-01-19 13:11:47 +01:00
Fabien Pinckaers
9cc5ca1672
[IMP] CSS for logo
...
bzr revid: fp@tinyerp.com-20140119120949-8pzoe8kx4y612nav
2014-01-19 13:09:49 +01:00
Fabien Pinckaers
270a25c7f5
[IMP] Allow logo in header
...
bzr revid: fp@openerp.com-20140119120858-43rgeymrjmt42f11
2014-01-19 13:08:58 +01:00
Fabien Pinckaers
d7b81d7607
[IMP] Better Snippets
...
bzr revid: fp@openerp.com-20140119095213-sd6n0us6mm2o7wt3
2014-01-19 10:52:13 +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
Christophe Matthieu
163364e5fe
[FIX] website_event: event.event.ticket access right
...
bzr revid: chm@openerp.com-20140117143752-0jpkcbhjsyavl08j
2014-01-17 15:37:52 +01:00
Darshan Kalola (OpenERP)
69e88b3fec
[]
...
bzr revid: dka@tinyerp.com-20140117140940-kghgmrrndd82pheg
2014-01-17 19:39:40 +05:30
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)
8cfd06f449
[IMP]product: removed product by template menu and action.
...
bzr revid: dka@tinyerp.com-20140117113910-csv71potcxaklem5
2014-01-17 17:09:10 +05:30
Darshan Kalola (OpenERP)
82cdf9e4c0
[IMP]product: removed unnecessary code from onchange_product_tmpl_id and improved indentation in template form view.
...
bzr revid: dka@tinyerp.com-20140117110544-y7lc0t2xc0bb6403
2014-01-17 16:35:44 +05:30
Darshan Kalola (OpenERP)
19bc4842c5
[REMOVE]test case of price margin.
...
bzr revid: dka@tinyerp.com-20140117101353-vbi7u3wfom0dep6j
2014-01-17 15:43:53 +05:30
Darshan Kalola (OpenERP)
132933f991
[IMP]revert margin calculation.
...
bzr revid: dka@tinyerp.com-20140117100627-s65f1jlv93h4w3p1
2014-01-17 15:36:27 +05:30
Fabien Pinckaers
a559aca8d1
[IMP] better images for library
...
bzr revid: fp@tinyerp.com-20140117082813-7wa345r76txiin97
2014-01-17 09:28:13 +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
Fabien Pinckaers
c253330993
[IMP] snippets cleaned feature grid
...
bzr revid: fp@tinyerp.com-20140116190026-rtkluyf1kh0xisny
2014-01-16 20:00:26 +01: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
Xavier Morel
d54544e317
[FIX] portal_crm: access rights merge error
...
bzr revid: xmo@openerp.com-20140116161803-22drqqp2srxxknuq
2014-01-16 17:18:03 +01:00
Darshan Kalola (OpenERP)
5d770d4b6f
[MERGE]with lp:~openerp-dev/openobject-addons/trunk-website-al and resolve conflicts.
...
bzr revid: dka@tinyerp.com-20140116145307-u3e6gio449md3u2v
2014-01-16 20:23:07 +05:30
Thibault Delavallée