Commit Graph

84352 Commits

Author SHA1 Message Date
Olivier Dony 511cf0270c [MERGE] sale_order_dates: several improvements to usability and planned date computing, courtesy of Lionel Sausin (Numerigraphe)
bzr revid: odo@openerp.com-20140411113007-yj4x5zui3luckg2n
2014-04-11 13:30:07 +02:00
Olivier Dony 410c82bd6a [MERGE] Sync with trunk
bzr revid: odo@openerp.com-20140411094018-zqw3ac1br991qsnp
2014-04-11 11:40:18 +02:00
Martin Trigaux 478cbd7c70 [FIX] read_group: avoid shared context and initialise if none
bzr revid: mat@openerp.com-20140411075556-kdxn1lsth45twgmj
2014-04-11 09:55:56 +02:00
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
Cedric Snauwaert 3a4e264978 [FIX]use bootstrap modal windows. refactor and cleaned from trunk-ui-to-boostrap-modal
bzr revid: csn@openerp.com-20140410155022-3cqys3zc55idc4vg
2014-04-10 17:50:22 +02:00
Cedric Snauwaert 09cd7585e2 [FIX]remove draggable on modal window + clean up
bzr revid: csn@openerp.com-20140410154520-h7790rxb8h2hx2zx
2014-04-10 17:45:20 +02:00
Richard Mathot (OpenERP) 8905975fb8 [REM] unused code
bzr revid: rim@openerp.com-20140410152112-q91jka9pon4q6lya
2014-04-10 17:21:12 +02:00
Cedric Snauwaert 049539809d [FIX]modal strict to bootstrap: no resize and only use 3 size, large-medium-small instead of changing width of modal
bzr revid: csn@openerp.com-20140410151940-w0m1ljjqgo0eysgp
2014-04-10 17:19:40 +02:00
Richard Mathot (OpenERP) 1fe3580fc6 [FIX] Correct saving of comments
bzr revid: rim@openerp.com-20140410150102-3bq9lz31sebigd9i
2014-04-10 17:01:02 +02:00
Richard Mathot (OpenERP) b7989fbeec [FIX] Correct saving of comments
bzr revid: rim@openerp.com-20140410145247-o2759q0r022ybp4q
2014-04-10 16:52:47 +02:00
Richard Mathot (OpenERP) 53ad31c18f [FIX] avoid crash when there is 0 pages for surveys
bzr revid: rim@openerp.com-20140410143018-yk0xvelpiuh8bau2
2014-04-10 16:30:18 +02:00
Thibault Delavallée 4b776a90c0 [FIX] website_forum: user_id -> create_uid
bzr revid: tde@openerp.com-20140410142802-i8kyicrju7wmikem
2014-04-10 16:28:02 +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
Richard Mathot (OpenERP) ea69de5114 [FIX] Dirty fix for links sent by email
bzr revid: rim@openerp.com-20140410141352-tb9rwbvawuy2kwc4
2014-04-10 16:13:52 +02:00
Thibault Delavallée a8445aac37 [FIX] gamification: avoid discarding False or 0 given as result for
python computation.

bzr revid: tde@openerp.com-20140410141049-luw63buvf0jsvkoh
2014-04-10 16:10:49 +02:00
Thibault Delavallée cbac424f91 [REF] website_forum: renamed models (website.forum -> forum) + cleaned models.
Added favorite_count function field, like vote_count and so on, to be able
to have badges based on a simple model.

bzr revid: tde@openerp.com-20140410133928-i0lncz8us9wueb13
2014-04-10 15:39:28 +02:00
Thibault Delavallée 7493326daf [REM] website_forum: removed old badges files
bzr revid: tde@openerp.com-20140410133846-0dze10b09b9xhcoi
2014-04-10 15:38:46 +02:00
Thibault Delavallée f7e6f1792f [IMP] website_forum: first pass of cleaning badges + separated into separate files
bzr revid: tde@openerp.com-20140410133812-qa6z3u3oq8q70zdb
2014-04-10 15:38:12 +02:00
Gery Debongnie e52841aab3 [MERGE] merge from trunk
bzr revid: ged@openerp.com-20140410133408-ekglqz9jc4v9nvn7
2014-04-10 15:34:08 +02:00
Richard Mathot (OpenERP) 89a60326da [FIXes]
bzr revid: rim@openerp.com-20140410132146-5a0k2n4y8k5fzxts
2014-04-10 15:21:46 +02:00
Turkesh Patel (Open ERP) e53f66dcea [IMP] improved typo
bzr revid: tpa@tinyerp.com-20140410130925-xrcsb13lp5bnqe3o
2014-04-10 18:39:25 +05:30
Turkesh Patel (Open ERP) 049d85616d [IMP] redirect to the comment when any comment posted, same thing for comment to answer and answer to comment.
bzr revid: tpa@tinyerp.com-20140410124950-rnm040ag8ppop4kc
2014-04-10 18:19:50 +05:30
Christophe Simonis 95701c28c0 [FIX] test: HttpCase wait http requests to finish
bzr revid: chs@openerp.com-20140410123519-wngil3aghdc6llqc
2014-04-10 14:35:19 +02:00
Gery Debongnie bd8fc24dc1 [MERGE] fix a stupid error with the computation of domains in read_group: it was wrong when the interval is day (orm.py)
bzr revid: ged@openerp.com-20140410142645-x2u0iccvi5qxad74
2014-04-10 16:26:45 +02:00
Gery Debongnie c6f41caf99 [MERGE] merge from trunk
bzr revid: ged@openerp.com-20140409120604-tgc4o9zkkr69sf4q
bzr revid: ged@openerp.com-20140409150557-1wsyuvpw1ly75fhn
bzr revid: ged@openerp.com-20140410133251-k200ui19hjs6jnur
2014-04-10 15:32:51 +02:00
Cedric Snauwaert 964e94f8a8 [FIX]forgot to open a dialog
bzr revid: csn@openerp.com-20140410121122-y0a8l1hzd01af8bn
2014-04-10 14:11:22 +02:00
Richard Mathot (OpenERP) ac8ada1a47 [MERGE] Sync with parent
bzr revid: rim@openerp.com-20140410120341-n1idn9rtnf2lmvcy
2014-04-10 14:03:41 +02:00
Raphael Collet d67e63150e [FIX] sql_db: forgotten attribute renaming _pool -> __pool
bzr revid: rco@openerp.com-20140410113950-71gcyz0t2rfuww57
2014-04-10 13:39:50 +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 15680c94e1 [MERGE] forward port of branch saas-3 up to revid 5115 chs@openerp.com-20140410102422-fcwxhjk40z0oy8x5
bzr revid: chs@openerp.com-20140410105454-6utwgruj80h8wdss
2014-04-10 12:54:54 +02:00
Christophe Simonis 3d2e9b4d2b [MERGE] forward port of branch 7.0 up to revid 5281 launchpad_translations_on_behalf_of_openerp-20140412094159-mhy3v2prb3ctx32k
bzr revid: jke@openerp.com-20140409153527-mic1a8afcvdhsd27
bzr revid: chs@openerp.com-20140410102422-fcwxhjk40z0oy8x5
bzr revid: chs@openerp.com-20140415133650-y46i0o3qkb2atbvi
2014-04-15 15:36:50 +02:00
Denis Ledoux f8d5ef0f80 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 4174 revid:dle@openerp.com-20140415130732-bud8xb3pzgxw2imr
bzr revid: dle@openerp.com-20140415101427-a6r7lgy50x9bdah3
bzr revid: dle@openerp.com-20140415130951-ckuv8nsl17qkb300
2014-04-15 15:09:51 +02:00
Denis Ledoux 4a516a4709 [FIX] web_kanban: show more button of kanban view behind the kanban cards on (ie9)
bzr revid: dle@openerp.com-20140415130732-bud8xb3pzgxw2imr
2014-04-15 15:07:32 +02:00
Denis Ledoux 998b290409 [MERGE][FIX] account: while refuding the invoice with payment term journal items are created wrongly with write-off account
bzr revid: dle@openerp.com-20140415100702-s13cuejf89gtlnhc
2014-04-15 12:07:02 +02:00
Denis Ledoux a701934ac7 [FIX] purchase: invoiced based on invoiced bool of purchase order line, instead of rate
invoiced bool of purchase order line is set to true on invoice validation, not on invoice creation

bzr revid: dle@openerp.com-20140415081211-jz6if0vzgq3inzzw
2014-04-15 10:12:11 +02:00
Launchpad Translations on behalf of openerp 6ca81553a0 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140415075130-aqn4mzx05l3txtkb
bzr revid: launchpad_translations_on_behalf_of_openerp-20140415075337-ulie3qkes53t8ivf
2014-04-15 07:53:37 +00:00
Kersten Jeremy b91bcbf0fc [FIX] Fix the call of the cron due to a function which has been renamed.
[IMP] Add param calendar.block_mail in ir.config.parameters to allow to bypass the sent of mails to attendees.

bzr revid: jke@openerp.com-20140414202936-kh1izog183nwenb7
2014-04-14 22:29:36 +02:00
Kersten Jeremy 9c739f12c2 [FIX] Remove watcher, need to be review because it breaks other tests.
bzr revid: jke@openerp.com-20140414165721-i8g23jxy66p1p6ao
2014-04-14 18:57:21 +02:00
Kersten Jeremy faa899adde [FIX] Reactive watcher
bzr revid: jke@openerp.com-20140414163412-88seef6j58xiamug
2014-04-14 18:34:12 +02:00
Kersten Jeremy 552a23a4bd [FIX] Remove watcher
bzr revid: jke@openerp.com-20140414153537-0qjlnqqnk0q9utn0
2014-04-14 17:35:37 +02:00
Kersten Jeremy a8ce5415ad [FIX] Watch if jQuery is overwritted by another version in some script. If an override is detected, we check that all old function is always present else we add the missing.
The problem was that some websites uses externals libraries which use a jQuery more recent that our version. Jquery by default  checks his own version  and overwrite itself if the current version is lower.
Once user had their jquery overwritted, function dropdown was missing and it was impossible to the end user to get menu working again... and so impossible to remove the view with the front end.

bzr revid: jke@openerp.com-20140414151423-zhi3tjj52rihltzy
2014-04-14 17:14:23 +02:00
Kersten Jeremy 65a6b922b5 [FIX] Add prototype watch in js object. That will allow to listen change on some library for example. It's used to know if jquery is overrided by an external script.
bzr revid: jke@openerp.com-20140414145802-osjcjj01f8ehwsqc
2014-04-14 16:58:02 +02:00
Denis Ledoux 2429e04ec2 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9980 revid:dle@openerp.com-20140414121930-xbawuj93ddifhf4m
bzr revid: dle@openerp.com-20140414131146-1jz0isk58wgdsx2p
2014-04-14 15:11:46 +02:00
Denis Ledoux c3300dce7a [FIX] account: name_search methods used '=' or 'ilike' to search, instead of the actual operator
Therefore, for example, searching invoices for journals doesnt containing 'sales' actually returned invoices with journal containing 'sales'.

bzr revid: dle@openerp.com-20140414121930-xbawuj93ddifhf4m
2014-04-14 14:19:30 +02:00
Kersten Jeremy 66e72fec54 [FIX] Website - Don't set active on OpenDialog link else the user cannot click on it again after.
bzr revid: jke@openerp.com-20140414094803-bfyvu3wizy09n53c
2014-04-14 11:48:03 +02:00
Denis Ledoux a0b26b6cfe [FIX] mass_mailing: mail_thread model redefined as a osv.Model, while the original mail thread is an AbstractModel. Mass mailing mail thread must be an Abstract Model as well
bzr revid: dle@openerp.com-20140414090825-o456mdd9q38m47mw
2014-04-14 11:08:25 +02:00
Martin Trigaux 3a27186643 [MERGE] [FIX] FormView: avoid multiple creations of the same line in o2m fields when the save action fails (e.g. forgot one required field)
This is done by removing the added action 'prepend_on_create' that can be present as many time as we pressed the save button

lp bug: https://launchpad.net/bugs/1265705 fixed

bzr revid: mat@openerp.com-20140414081003-290q4v21q01m4rsi
2014-04-14 10:10:03 +02:00