Turkesh Patel (Open ERP)
e8036b627c
[IMP] remove menu of product template
...
bzr revid: tpa@tinyerp.com-20140121094423-k17idc4cg9qy5n3j
2014-01-21 15:14:23 +05:30
Chirag Dodiya (OpenERP)
081be6181a
[ADD]Added demo data for product template
...
bzr revid: cod@tinyerp.com-20140121093854-18dxvjdx6co1amqp
2014-01-21 15:08:54 +05:30
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
Fabien Meghazi
f43f06a6b0
[IMP] use 'error' key in login template
...
bzr revid: fme@openerp.com-20140121093224-8auf7b00jxfq8940
2014-01-21 10:32:24 +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
698e2de138
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140121062040-gq8r12g3ypksxa4t
2014-01-21 06:20:40 +00: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
e33c70a318
[IMP] Small improvements: messages
...
bzr revid: fp@tinyerp.com-20140120222228-pj7xhlui2cwmnrxw
2014-01-20 23:22:28 +01:00
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
Denis Ledoux
4f3a4dce3b
[FIX] purchase: on unlink purchase order line, cancel procurements associated to the move of the purchase order line
...
bzr revid: dle@openerp.com-20140120170729-57fm8tluz5p4zdk5
2014-01-20 18:07:29 +01:00
Christophe Simonis
e516362da4
[IMP] calendar: tell orm to rename old select1 column
...
bzr revid: chs@openerp.com-20140120164054-ia6pw4svp3ylww5w
2014-01-20 17:40:54 +01:00
Martin Trigaux
c09798bfbb
[FIX] css: remove useless css properties
...
float:left with cleartext hack is the same as no properties, and it's working in firefox
bzr revid: mat@openerp.com-20140120163554-zf0sq98ko8qqc9fb
2014-01-20 17:35:54 +01:00
Xavier Morel
ca02581993
[IMP] replace icon size select by selectable multi-size preview
...
bzr revid: xmo@openerp.com-20140120162604-yoyg21bf1z306hwg
2014-01-20 17:26:04 +01:00
Fabien Meghazi
1e921cd03d
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140120161321-txvp4fpb136tfker
2014-01-20 17:13:21 +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
c1f0fb5ed1
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140120161145-ntxx6y01vekk3tg2
2014-01-20 17:11:45 +01:00
Fabien Meghazi
05e2942121
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140120161129-elnp1afn8ognyc6z
2014-01-20 17:11:29 +01:00
Martin Trigaux
263693e44e
[FIX] search: add delay of 250us (was 0) on autocomplete fields in search bar and m2o fields.
...
This avoids making a search request for each keypressed
bzr revid: mat@openerp.com-20140120160147-q7lg4j93c836ec44
2014-01-20 17:01:47 +01:00
Christophe Simonis
9b31f30c29
[FIX] edi: /edi/import_edi_url route is a json route
...
bzr revid: chs@openerp.com-20140120154422-blccmtrql7mlwmvn
2014-01-20 16:44:22 +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
Fabien Meghazi
8702ef5d3b
[CHG] Allow @http.route() to use additional parameters and inherits them properly
...
bzr revid: fme@openerp.com-20140120153614-t8l7tfit686ehfn0
2014-01-20 16:36:14 +01:00
Xavier Morel
501e88d3eb
[IMP] replace select2 by grid for icons selection
...
bzr revid: xmo@openerp.com-20140120153610-xktkxjfbpl59xnpz
2014-01-20 16:36:10 +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
Christophe Matthieu
849fc19aa1
[FIX] website: import openerp.addons.website_blog.tests
...
bzr revid: chm@openerp.com-20140121093415-ork5jis48mmq4dp8
2014-01-21 10:34:15 +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
Martin Trigaux
c3e31842e0
[FIX] css: unify lines in view log menu
...
This prevents lines in bold font to be larger than normal one and produce a gap in lines (in Firefox at least)
bzr revid: mat@openerp.com-20140120150606-dvoetrbp3cavtuc3
2014-01-20 16:06:06 +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
Quentin (OpenERP)
c01779e4c5
[FIX] account_followup: used <pre> instead of <para> tags in order to print the whitespaces as the user encoded it in the templates
...
bzr revid: qdp-launchpad@openerp.com-20140120135728-8agsvzkzce5wppfp
2014-01-20 14:57:28 +01:00
Xavier Morel
eebda715bb
[IMP] py26 compatibility
...
bzr revid: xmo@openerp.com-20140120135333-7b7qccr4quh2h1um
2014-01-20 14:53: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
Raphael Collet
16028dedfd
[FIX] calendar: function field of type 'selection' must be given a selection parameter
...
bzr revid: rco@openerp.com-20140120125953-zk6iwkvye4reansl
2014-01-20 13:59:53 +01:00
Pooja Zankhariya (OpenERP)
1c127ac6b9
[MERGE]Merge with Parent
...
bzr revid: pza@tinyerp.com-20140120122859-ody7gvh40e3ey0q2
2014-01-20 17:28:59 +05:00
Raphael Collet
77457bd8b2
[FIX] calendar: type of related field should be 'integer', not 'int'
...
bzr revid: rco@openerp.com-20140120114901-ryrqgu0drewsjx4y
2014-01-20 12:49:01 +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
Frédéric van der Essen
e055dc35b3
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20140120103034-78rddwe668y2w2un
2014-01-20 11:30:34 +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
Gery Debongnie
f404bf8b40
[IMP] optimizes pivot table so that it doesn't reload data when the groupbys have been changed in such a way that it should only fold some headers (addon web_graph)
...
bzr revid: ged@openerp.com-20140120093254-mta9v6hjmsgfpr2n
2014-01-20 10:32:54 +01:00
ajay javiya (OpenERP)
ffe9398651
[FIX]: add extra canvas on modal
...
bzr revid: aja@tinyerp.com-20140120061843-90oxmn16dgi29mtw
2014-01-20 11:48:43 +05:30
28d79433c3
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140118070457-rn2tgdxis2fi3nqo
bzr revid: launchpad_translations_on_behalf_of_openerp-20140119055822-ajy043mntc4jr407
bzr revid: launchpad_translations_on_behalf_of_openerp-20140120055854-z7wtyb24c5t8kcmj
bzr revid: launchpad_translations_on_behalf_of_openerp-20140118070538-2xm86ece1aate8u9
bzr revid: launchpad_translations_on_behalf_of_openerp-20140119055932-sa6vrp2g8ua3u88e
bzr revid: launchpad_translations_on_behalf_of_openerp-20140120055948-lwcyqcfutgamwac1
bzr revid: launchpad_translations_on_behalf_of_openerp-20140118070546-d89xqw56zou7e9p9
bzr revid: launchpad_translations_on_behalf_of_openerp-20140120055955-6wrdxqy1018mo7jq
2014-01-20 05:59:55 +00: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
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
Turkesh Patel (Open ERP)