Mansi Kariya (OpenERP)
fcd7f025a0
[MERGE] Merged with main Addons
...
bzr revid: mka@tinyerp.com-20140410103213-kq36gxiih5xdmt4l
bzr revid: mka@tinyerp.com-20140411053339-yic5dugaubzbyfhq
2014-04-11 11:03:39 +05:30
Barad Mahendra
0152bea512
[MERGE] [ADD] website_twitter: add twitter scroller snippet
...
bzr revid: odo@openerp.com-20140410174622-j2waid38nk3fqitt
2014-04-10 19:46:22 +02:00
Olivier Dony
7c75b5e004
[FIX] website: avoid discarding snippet animator after edit + properly restart animation while disabling clicks
...
bzr revid: odo@openerp.com-20140410174314-vecg7inmfgm7r5fq
2014-04-10 19:43:14 +02:00
Gery Debongnie
60f74ff3f4
[MERGE] this commit contains a fix for a crash when the graph view does not have any data (wrong check for 0 data) and a quite good optimization of the javascript code in graph view when loading large tables. (addon graph view)
...
bzr revid: ged@openerp.com-20140410142419-vphlbb2diw21jih3
2014-04-10 16:24:19 +02:00
Gery Debongnie
e52841aab3
[MERGE] merge from trunk
...
bzr revid: ged@openerp.com-20140410133408-ekglqz9jc4v9nvn7
2014-04-10 15:34:08 +02:00
Raphael Collet
3ba23748bc
[FIX] event_sale: fix non-closing tags in xml file
...
bzr revid: rco@openerp.com-20140410112922-wryrl5dw8aveyw27
2014-04-10 13:29:22 +02:00
Christophe Simonis
3a7e003656
[MERGE] forward port of branch saas-3 up to revid 9394 chs@openerp.com-20140410103638-x7vajn70ewsfp0ck
...
bzr revid: chs@openerp.com-20140410110424-enhdg6pufhii56ni
2014-04-10 13:04:24 +02:00
Christophe Simonis
e521085fff
[MERGE] forward port of branch saas-3 up to revid 3997 dle@openerp.com-20140409093616-3060or02z8zmv8tm
...
bzr revid: chs@openerp.com-20140410105525-m68vejubszroawfm
2014-04-10 12:55:25 +02:00
Christophe Simonis
bd7804272b
[MERGE] forward port of branch 7.0 up to revid 9971 chs@openerp.com-20140410100027-5ug4801pfch9virt
...
bzr revid: chs@openerp.com-20140410103638-x7vajn70ewsfp0ck
2014-04-10 12:36:38 +02:00
Christophe Simonis
c65832f8c6
[FIX] account: Chart Installer: new way to get apps server
...
bzr revid: chs@openerp.com-20140410100027-5ug4801pfch9virt
2014-04-10 12:00:27 +02:00
Denis Ledoux
694fb63dda
[FIX] website_sale: use commercial_partner_id instead of parent_id to have the company name of the artner in the checkout form
...
If the user is portal, its partner is a company and has a parent: a security rule prevent to read the parent_id
and the company which should be displayed is the closest company of the partner in the hierarchy, and, in this case, itself.
bzr revid: dle@openerp.com-20140410095814-x7hqymfelspvjdsw
2014-04-10 11:58:14 +02:00
Fabien Pinckaers
ec2ea6643b
[IMP] evnet
...
bzr revid: fp@tinyerp.com-20140410091747-mznpvuxdbi1uxj2d
2014-04-10 11:17:47 +02:00
Denis Ledoux
3f33b1e716
[FIX] payment: remove mail of dependance (as account already depends on it) and set auto_install
...
payment was added as dependance of portal_sale, which used to be auto installed when portal and sale were installed. With this new dependance, it wasnt the case anymore
With auto install of the payment module with the installation of account, this module is installed on the installation of sale (depends on account), and, therefore, on the installation of portal, portal_sale is now installed correctly
bzr revid: dle@openerp.com-20140410084846-78kxwc63nmv0rg9k
2014-04-10 10:48:46 +02:00
Denis Ledoux
9e1dc2a2bd
[FIX] website_quote: security fix, only salesman were able to read sale order options, while other users, like portal and public, obviously need to be able to read these options
...
bzr revid: dle@openerp.com-20140410081445-mcg075upmujpr5w1
2014-04-10 10:14:45 +02:00
Gery Debongnie
522d612b8c
[MERGE] readgroup signature has changed, so addons inheriting and modifying read_group need to be changed to make sure they call their parent's read_group with the correct signature
...
bzr revid: ged@openerp.com-20140410072039-mpkd4y8zf978ali3
2014-04-10 09:20:39 +02:00
Gery Debongnie
492f0d8942
[MERGE] merge from trunk
...
bzr revid: ged@openerp.com-20140409125731-wx1zjr58p2h5vaqn
bzr revid: ged@openerp.com-20140409150048-anl3mwq8raxsfmcz
bzr revid: ged@openerp.com-20140410071049-17ygqlc45ns3zp3a
2014-04-10 09:10:49 +02:00
Mansi Kariya (OpenERP)
c3869dc5fb
[FIX] Fixed issues got when merged with main
...
bzr revid: mka@tinyerp.com-20140410070617-rwxia7tf4hkgm398
2014-04-10 12:36:17 +05:30
Launchpad Translations on behalf of openerp
fc25f85b52
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140410064650-qqd9g5dsaf5dqm52
2014-04-10 06:46:50 +00:00
Launchpad Translations on behalf of openerp
a8ab53566c
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140409064154-4bbr668s262a11mn
bzr revid: launchpad_translations_on_behalf_of_openerp-20140410055655-a13zzhsch5dj1w5r
2014-04-10 05:56:55 +00:00
Fabien Pinckaers
80160ef79d
[IMP] gengo fix in callback
...
bzr revid: fp@tinyerp.com-20140409221121-8iwng0wmcp3fjasd
2014-04-10 00:11:21 +02:00
Fabien Pinckaers
6afe3b6447
[IMP] grouping jobs together
...
bzr revid: fp@tinyerp.com-20140409215927-gfu3v8dnrgeqnvvd
2014-04-09 23:59:27 +02:00
Fabien Pinckaers
d5599de606
[IMP] Gengo Fixes
...
bzr revid: fp@tinyerp.com-20140409214509-0ww46dnt3np66ncx
2014-04-09 23:45:09 +02:00
Fabien Pinckaers
3705aa837f
[IMP] Gengo translation cron every 6 hours
...
bzr revid: fp@tinyerp.com-20140409185919-m01wz9sp3cynr6wf
2014-04-09 20:59:19 +02:00
Fabien Pinckaers
8970cefdd1
[IMP] track duration in hours
...
bzr revid: fp@tinyerp.com-20140409184334-ehkhowyhyqw6cdmx
2014-04-09 20:43:34 +02:00
Fabien Pinckaers
65908c769b
[IMP] Event Agenda: merge with cleaning
...
bzr revid: fp@tinyerp.com-20140409172600-bwy97j8kr8dzrgg9
2014-04-09 19:26:00 +02:00
Denis Ledoux
7715bf1823
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9969 revid:dle@openerp.com-20140409162932-y5fxd5wbojing2t2
...
bzr revid: dle@openerp.com-20140409163132-n3apqh6nvfg2qof9
2014-04-09 18:31:32 +02:00
Denis Ledoux
c28a5a1021
[FIX] pad: render_value binded on change effective_readonly event, so render value calls wait for each others
...
Proper fix than 9968 revid:dle@openerp.com-20140409160214-1anxi8z07xj49vsp
bzr revid: dle@openerp.com-20140409162932-y5fxd5wbojing2t2
2014-04-09 18:29:32 +02:00
chm@openerp.com
35d6a6f8a8
[IMP] website: create a media snippet editor who merge image dialog, font awesome, video youtube...
...
bzr revid: chm@openerp.com-20140409161538-uogr3vi552begja5
2014-04-09 18:15:38 +02:00
Denis Ledoux
83996269ca
[FIX] pad: render_value binded on change effective_readonly event, so render value calls wait for each others
...
bzr revid: dle@openerp.com-20140409160214-1anxi8z07xj49vsp
2014-04-09 18:02:14 +02:00
chm@openerp.com
15c035631d
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140409154520-eddr2h21bei95xxu
2014-04-09 17:45:20 +02:00
Martin Trigaux
4a3140be89
[IMP] lunch: add security rules, it's rude to look at other people's food
...
bzr revid: mat@openerp.com-20140409154216-hz4fkv24aprcem5g
2014-04-09 17:42:16 +02:00
Raphael Collet
48e5bb9075
[MERGE] test_cursor: adapt code to small api changes in registry for handling http tests
...
bzr revid: rco@openerp.com-20140409150002-le29vuu4x41j61q6
2014-04-09 17:00:02 +02:00
Gery Debongnie
f966931b87
[IMP] performance improvement: write a custom isEqual function to use instead of _.isEqual to make the code faster in graph view (isEqual was determined guilty of being slow by profiling on a large view) (addon web_graph)
...
bzr revid: ged@openerp.com-20140409145735-m21t2fzmaepr1hsa
2014-04-09 16:57:35 +02:00
Martin Trigaux
141f24abc4
[FIX] analytic_user_function: add missing _rec_name
...
bzr revid: mat@openerp.com-20140409142917-ueqzyblgh3iwblc0
2014-04-09 16:29:17 +02:00
chm@openerp.com
f090689984
[FIX] website: The separator block is not working (no drop zone)
...
bzr revid: chm@openerp.com-20140409140733-ne0frg4o7b3c1lr0
2014-04-09 16:07:33 +02:00
Raphael Collet
cde05592ce
[IMP] edi: use context manager for new cursor
...
bzr revid: rco@openerp.com-20140409134440-ylhri8kl6mwv4g2k
2014-04-09 15:44:40 +02:00
chm@openerp.com
4347df6e4d
[FIX] website: Default Url not correct for the button 'contact us' in the block features>Button
...
bzr revid: chm@openerp.com-20140409134143-aoiqbd2aqe78hgyc
2014-04-09 15:41:43 +02:00
chm@openerp.com
fc48e1a8d2
[TYPO] website: tour for banner
...
bzr revid: chm@openerp.com-20140409133330-6ny4oug0hucpzsn8
2014-04-09 15:33:30 +02:00
Mansi Kariya (OpenERP)
c8e215f986
[MERGE] Merged With main Addons
...
bzr revid: mka@tinyerp.com-20140409132813-61ohxqh8mrtj2xzb
2014-04-09 18:58:13 +05:30
Martin Trigaux
1b75fc6d95
[IMP] lunch: add security rules, it's very impolite to look in other people plates
...
bzr revid: mat@openerp.com-20140409131016-kzx7scln4daz14xj
2014-04-09 15:10:16 +02:00
Denis Ledoux
ce83eb0968
[FIX] portal: portal template should have portal group ONLY (magic number 6 replace current groups by the portal group only)
...
bzr revid: dle@openerp.com-20140409124741-wsycxwqik41s0hfn
2014-04-09 14:47:41 +02:00
chm@openerp.com
88eaa5f26f
[IMP] website: remove transform in modile view and change order menu
...
bzr revid: chm@openerp.com-20140409124321-cwu86whebzuwtz1e
2014-04-09 14:43:21 +02:00
Gery Debongnie
281c19a751
[FIX] correctly determines when there is no data to read in graph view (instead of the good old crash) (addon web_graph)
...
bzr revid: ged@openerp.com-20140409123628-erw8dpb2l36l7hu6
2014-04-09 14:36:28 +02:00
Thibault Delavallée
452f1fbe59
[MERGE] [IMP] website_blog: layout and usability improvements. This task proposes a better layout that eases the reading + smooth transitions between blogs based on suggestions dynamically chosen based on a ranking.
...
Featuring :
- blog: blog now have a subtitle field
- blog_post: blog post now have a subtitle field, removed shortened content + website_published_datetime (create_date and write_date are sufficient). Added tracking of visits + ranking computation, to select the next post the user will see. Added background-image, that is used to display a cover behind the post title and subtitle. Overall display improvement.
- added new feature that allows a user to tweet selected text on twitter from post.
- added new feature that allows a user to discuss on every paragraph (anonymous user have to give their name and email)
- better blog demo data
Misc:
- website: removed dead code about website_published_datetime that could have been generic but has never been used
- [FIX] website: fixed image controller, do not attempt to read website_published on models that do not have that field
bzr revid: tde@openerp.com-20140409123550-tkrcfvnofxz7ryiz
2014-04-09 14:35:50 +02:00
Gery Debongnie
b8b43ac7a5
[MERGE] merge from trunk
...
bzr revid: ged@openerp.com-20140409121242-tod94f8nazphqgwz
2014-04-09 14:12:42 +02:00
Gery Debongnie
8c5a06655d
[MERGE] merge from trunk
...
bzr revid: ged@openerp.com-20140409115954-p49pp91tioc3yw9t
2014-04-09 13:59:54 +02:00
Anael Closson
1e123f5be0
[FIX] pad: pad in readonly when opening form view in edit mode - opw 606208
...
bzr revid: acl@openerp.com-20140409114825-t10ps6o7qn7qbd7y
2014-04-09 13:48:25 +02:00
Gery Debongnie
27dab11ccd
[FIX] fix to the previous fix: it should correctly calls the readgroup methods now (addons calendar, idea)
...
bzr revid: ged@openerp.com-20140409105127-ctn9bl6h5gd62x0x
2014-04-09 12:51:27 +02:00
Gery Debongnie
811456f35e
[FIX] add the new 'lazy' keyword argument to the read_group calls inherited in several models (addons calendar, idea, note)
...
bzr revid: ged@openerp.com-20140409104230-5v0p49ij1wd87qhc
2014-04-09 12:42:30 +02:00
Gery Debongnie
3d70e2c76c
[FIX] add the 'lazy' parameter to the horrible inherited read_group method in account report entries (addon account)
...
bzr revid: ged@openerp.com-20140409103045-d4401h586il3x0ii
2014-04-09 12:30:45 +02:00