Simon Lejeune
babfb0f78d
[IMP] hr* reports converted to qweb
...
bzr revid: sle@openerp.com-20140415191911-0rttsd7ayk6exm6u
2014-04-15 21:19:11 +02:00
Martin Trigaux
3755fa19a5
[IMP] gamification and website_forum improvements
...
gamification:
- fix batch mode when grouping by id
- fix subquery in batch mode when a ending date is set
- serialisation method can exclude categories of challenge
- view improvements
website_forum:
- enabling bages in batch mode
- fix karma computation when creating a new post
- changing previous vote affects the user karma
- do not display forum challenges on user home page
bzr revid: mat@openerp.com-20140415162400-78cklbdw0bmn94zr
2014-04-15 18:24:00 +02:00
Christophe Simonis
15e151dca7
[IMP] orm: postprocess function field values in batch
...
bzr revid: chs@openerp.com-20140415162321-l8hgeh6s48252zhl
2014-04-15 18:23:21 +02:00
Martin Trigaux
0443680952
[FIX] gamification: the subquery domain should use less than for ending dates
...
bzr revid: mat@openerp.com-20140415161538-mdfadjjih90wuj3d
2014-04-15 18:15:38 +02:00
Christophe Simonis
61da3f4aba
[MERGE] forward port of branch saas-3 up to revid 9409 dle@openerp.com-20140415101427-a6r7lgy50x9bdah3
...
bzr revid: chs@openerp.com-20140415142934-rlka4vkxd34fkil8
2014-04-15 16:29:34 +02:00
Christophe Simonis
457b877160
[MERGE] forward port of branch saas-3 up to revid 4000 dle@openerp.com-20140415130951-ckuv8nsl17qkb300
...
bzr revid: chs@openerp.com-20140415142910-c3fqzce7wju83f5e
2014-04-15 16:29:10 +02:00
Christophe Simonis
863e295937
[MERGE] forward port of branch saas-3 up to revid 5116 chs@openerp.com-20140415133650-y46i0o3qkb2atbvi
...
bzr revid: chs@openerp.com-20140415140548-rlg9uypv78pywqhc
2014-04-15 16:05:48 +02:00
Martin Trigaux
35c7f4814d
Allow overwrite of the serialising method to exclude some categories in the challenge search
...
bzr revid: mat@openerp.com-20140415134809-uconkvnp0z32jxjs
2014-04-15 15:48:09 +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
Martin Trigaux
bc0738e47e
One morning I shot an elephant in my pajamas. How he got in my pajamas, I don't know.
...
bzr revid: mat@openerp.com-20140415131929-6pktlodmlgr2fuwz
2014-04-15 15:19:29 +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
Kersten Jeremy
1c5ed2973e
[FIX] mail template view - Set body_html field as simple text area without cke by default. Else, the mako code are considered as mal formatted and moved.
...
bzr revid: jke@openerp.com-20140415113751-h0a1tg36tht1bys1
2014-04-15 13:37:51 +02:00
Martin Trigaux
15306066d0
I love the smell of napalm in the morning.
...
bzr revid: mat@openerp.com-20140415113545-31efpjddjwqr4ajl
2014-04-15 13:35:45 +02:00
Martin Trigaux
14ff39f96e
[FIX] website_forum: mooooore baaaaaadges
...
bzr revid: mat@openerp.com-20140415101842-yf6vndw7h62q0b42
2014-04-15 12:18:42 +02:00
Kersten Jeremy
1e93741081
[FIX] Website banner tour - Fix test according to new banner structure
...
bzr revid: jke@openerp.com-20140415101406-54cdr44xayvyq8xo
2014-04-15 12:14:06 +02:00
Kersten Jeremy
df55b1eb9d
[FIX] Website tour - Click inside the zone before to insert sampleText
...
bzr revid: jke@openerp.com-20140415100834-2pstpw357y9klc89
2014-04-15 12:08:34 +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
Martin Trigaux
9f3a2f84e0
[ADD] website_forum: more badges
...
bzr revid: mat@openerp.com-20140414155344-v580tpy5l12z9v95
2014-04-14 17:53:44 +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
Martin Trigaux
c40318a46a
[ADD] website_forum: self_reply field and some badges
...
bzr revid: mat@openerp.com-20140414145415-8g9jtp95d173183i
2014-04-14 16:54:15 +02:00
Martin Trigaux
0c8539846a
[ADD] website_forum: quality badges
...
bzr revid: mat@openerp.com-20140414135115-onmywwurr03g21dw
2014-04-14 15:51:15 +02:00
Martin Trigaux
a52e13bd86
[FIX] remove wrong required and readonly fields
...
bzr revid: mat@openerp.com-20140414131720-bzqd1sv0j2t5wywd
2014-04-14 15:17:20 +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
Richard Mathot (OpenERP)
fe6ef26720
[MERGE][IMP] hr_timesheet: Quick create of contract (on timesheet) does not open contract edit window anymore
...
bzr revid: rim@openerp.com-20140414125558-zcwstm1ooa3qecpx
2014-04-14 14:55:58 +02:00
Richard Mathot (OpenERP)
fed6bdcf5e
[MERGE][IMP] hr_timesheet: add a menu to configure Timesheet Accounts under HR/Configuration
...
bzr revid: rim@openerp.com-20140414124251-5u5nu75c9q8g8zi9
2014-04-14 14:42:51 +02:00
Fabien Pinckaers
1c4b74a7d1
[IMP] translateable event description
...
bzr revid: fp@tinyerp.com-20140414123443-qom78utc45e86lh1
2014-04-14 14:34:43 +02:00
Fabien Pinckaers
f5ccf4c523
[IMP] Ticket types translateable
...
bzr revid: fp@tinyerp.com-20140414123231-b27qnkaujayk9j84
2014-04-14 14:32:31 +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
Richard Mathot (OpenERP)
028b093102
[MERGE] from trunk
...
bzr revid: rim@openerp.com-20140414115604-x1a32wfbxwkn3yhp
2014-04-14 13:56:04 +02:00
Richard Mathot (OpenERP)
91a5db808d
[MERGE] from trunk
...
bzr revid: rim@openerp.com-20140414115354-w8gpo3eks1rnud9k
2014-04-14 13:53:54 +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
Richard Mathot (OpenERP)
c34ea0a384
[MERGE][IMP] Terminology uniformisation
...
bzr revid: rim@openerp.com-20140414093342-91n7m8o730om25qm
2014-04-14 11:33:42 +02:00
Richard Mathot (OpenERP)
6d99b1df52
[MERGE][IMP] invoice/sale: Terminology uniformisation
...
bzr revid: rim@openerp.com-20140414093158-pbtttnv57a7nt7y6
2014-04-14 11:31:58 +02:00
Richard Mathot (OpenERP)
96417099b3
[MERGE] Sync with trunk
...
bzr revid: ypa@tinyerp.com-20140404114223-zalha5tvp2l0ov8f
bzr revid: rim@openerp.com-20140414091137-icatnn1humn7kisc
2014-04-14 11:11:37 +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
Richard Mathot (OpenERP)
15725997dd
[MERGE] Sync with trunk
...
bzr revid: rim@openerp.com-20140414090336-vc5283odv5f612es
2014-04-14 11:03:36 +02:00
Richard Mathot (OpenERP)
01d9ea6f64
[MERGE][IMP] crm/sale_crm: Terminology
...
Replacement of the term "category" by "tag", for the sake of consistency
bzr revid: rim@openerp.com-20140414083511-b5qvr4ek4mgxx17x
2014-04-14 10:35:11 +02:00
chm@openerp.com
8da0820a88
[FIX] website: media editor: when the user save the picture, the dialog box re-open automatically. Do not re-active snippet when we save a field image
...
bzr revid: chm@openerp.com-20140414082617-svxpb6kuqfhjm8oa
2014-04-14 10:26:17 +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
Raphael Collet
ea167ad7ab
[IMP] test cursor: code cleanup to make it more robust to concurrent accesses
...
bzr revid: rco@openerp.com-20140414075906-2d0i4qhe4x7czsao
2014-04-14 09:59:06 +02:00
Josse Colpaert
72b37e2bbd
[IMP] context_today should apply to function fields also in order to show them in qweb reports
...
bzr revid: jco@openerp.com-20140414074558-irgt7g9st5ongny9
2014-04-14 09:45:58 +02:00
Launchpad Translations on behalf of openerp
001a034e58
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140412094159-mhy3v2prb3ctx32k
bzr revid: launchpad_translations_on_behalf_of_openerp-20140412094217-3u3f03f0wjhbzyo4
bzr revid: launchpad_translations_on_behalf_of_openerp-20140413062047-z833pejjrtuhfygs
bzr revid: launchpad_translations_on_behalf_of_openerp-20140414055948-intynzk8l823ukei
2014-04-14 05:59:48 +00:00