133038c722
[FIX] website_forum: fixed toggle_correct for setting answers as correct
...
bzr revid: tde@openerp.com-20140411155622-18bdyddcs6hdln77
2014-04-11 17:56:22 +02:00
668fb8a542
[MERGE] gamification: add batch mode, improve some views, remove inprogess_update state and "realtime" (using cron) badge to recieve badges without needing to close the challenge
...
bzr revid: mat@openerp.com-20140411154740-pzw0v7po7pmci42l
2014-04-11 17:47:40 +02:00
5a402ce73a
[FIX] website_forum: disable the tour as it is not implemented
...
and seems to make other tours crash.
bzr revid: tde@openerp.com-20140411154150-4tn3bfe7wp8n901d
2014-04-11 17:41:50 +02:00
236a4d71be
[MERGE] sync with trunk
...
bzr revid: mat@openerp.com-20140411154002-6557tcjfetqwb0kf
2014-04-11 17:40:02 +02:00
56d8d0afb6
[FIX] website_forum: ask a question was hidden by default, we want the reversal
...
bzr revid: tde@openerp.com-20140411153738-werwgvte4tzrmu6y
2014-04-11 17:37:38 +02:00
68cb0dca6f
[FIX] website_forum: temporary fix to enable the counter
...
computation at creation.
bzr revid: tde@openerp.com-20140411153724-8x7o0o774uf5g2x2
2014-04-11 17:37:24 +02:00
f3bb1036f6
[DEMO] website_forum: better demo dta
...
bzr revid: tde@openerp.com-20140411152340-akpg0q2zg5q3xt90
2014-04-11 17:23:40 +02:00
e937d106af
[FIX] website_forum: display forum description as html
...
bzr revid: tde@openerp.com-20140411152328-ny4aej5vrlj6qrmv
2014-04-11 17:23:28 +02:00
c67c964d5f
[ADD] gamification: realtime badge to recieve badge without closing the challenge
...
bzr revid: mat@openerp.com-20140411151917-21drebbaa1d36jv4
2014-04-11 17:19:17 +02:00
aa48312b98
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140411145955-91iohb1enc50se5l
2014-04-11 16:59:55 +02:00
926cfb33b2
[REM] website_forum: remove file not used anymore
...
bzr revid: tde@openerp.com-20140411145856-81t6jwbbk7wq2nm1
2014-04-11 16:58:56 +02:00
2e8ef095ae
[REM] website_forum: removed dummy directories
...
bzr revid: tde@openerp.com-20140411145210-in1x6uzhsrn4s7c5
2014-04-11 16:52:10 +02:00
f280c8d2f7
[CLEAN] website_forum: removed some licences, only one is sufficient
...
bzr revid: tde@openerp.com-20140411145018-16dxhi62bkt4l2dg
2014-04-11 16:50:18 +02:00
f0dcf52159
[FIX] instrumentation to debug a deadlock probably due to a race condition in
...
the test cursor
bzr revid: al@openerp.com-20140411143645-ojb4t9plop4dmizh
2014-04-11 16:36:45 +02:00
bf7c16d6d9
[FIX] mail: res_users post: fixed partner_ids computation, could receive
...
a list of ids, or a list of commands. Both cases should be taken into account.
bzr revid: tde@openerp.com-20140411142842-kw0x1vrop6x6i5kf
2014-04-11 16:28:42 +02:00
5d177a9b10
[MERGE] Sync with trunk
...
bzr revid: rim@openerp.com-20140411142817-svp3hp2qfx1xw25k
2014-04-11 16:28:17 +02:00
fb19b54ff9
[MERGE] Forward-port of 7.0 bugfixes up to rev 9976 rev-id: odo@openerp.com-20140411142429-y0rpkzqbrsabxqsg
...
bzr revid: odo@openerp.com-20140411142800-t8sbcmfkj3qgmrh3
2014-04-11 16:28:00 +02:00
9861b5cada
[FIX] mail.thread: avoid overwriting thread_id/model with foreign values when reply-to hostname does not match + fix tests
...
This improve previous commit by making sure we
never consider the thread_id/model values in the
In-Reply-To/References header if the host name
did not match.
Also fixes the tests that were using the
6.1 compatibility mode to post in a mail group
thread instead of specifying the right
message-id.
bzr revid: odo@openerp.com-20140411142429-y0rpkzqbrsabxqsg
2014-04-11 16:24:29 +02:00
21022c5472
[REF] gamification: add batch mode, improve some views, remove inprogess_update state (replaced with boolean 'to update')
...
bzr revid: mat@openerp.com-20140411142257-zpaul4sq3t5j5r64
2014-04-11 16:22:57 +02:00
e2dc6b782d
[FIX] mail: avoid crashing message_post if the subtype does not exists anymore.
...
Using xmlid_to_res_id, subtype_id will be False if not found.
bzr revid: tde@openerp.com-20140411142214-nvvgkduzv51cc2eg
2014-04-11 16:22:14 +02:00
c2f3fffee6
[FIX] Empty all current line(s) when you change template. Before, the display do it, but when you save, you have back the old lines.
...
bzr revid: jke@openerp.com-20140411142022-rceic1ma2axakzpe
2014-04-11 16:20:22 +02:00
563dd0c138
[FIX] website_sale_quote - Make the sale quote template translatable when you edit a template. Force use of the language of partner in quotation, when you use a template.
...
bzr revid: jke@openerp.com-20140411141932-fk41zgsuw9e68t3a
2014-04-11 16:19:32 +02:00
e4d4c00312
[FIX] gamification: allow having False or 0 values as result of a computation.
...
bzr revid: tde@openerp.com-20140411141510-c11djv7qlf9qgek2
2014-04-11 16:15:10 +02:00
2929f2438a
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140411140929-7w4qo086j991houy
2014-04-11 16:09:29 +02:00
6ed34b7219
[MERGE] Merge refactoring branch. Still fixing to do.
...
bzr revid: tde@openerp.com-20140411140854-bxl6p3d4h4oczkl4
2014-04-11 16:08:54 +02:00
f8664c8d97
[MERGE][IMP] Kanban view: Better display of help message when there are no records, especially when displaying empty columns
...
bzr revid: rim@openerp.com-20140411135759-r4fv9g4vucjee6t6
2014-04-11 15:57:59 +02:00
452c77c09b
[FIX] 500 error on connection when using PyWebDAV 0.9.4
...
(and maybe others)
Courtesy of Holger Brunn (Therp)
bzr revid: dle@openerp.com-20140411134203-lxt4mnquiiclv6w3
2014-04-11 15:42:03 +02:00
e51049e8ed
[MERGE] Sync with upstream
...
bzr revid: tde@openerp.com-20140411134052-x74otuwuxoz20qab
2014-04-11 15:40:52 +02:00
d04ee666cc
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140411133813-4rj4de6dlzna5g5s
2014-04-11 15:38:13 +02:00
6b84615627
[MERGE]change modal windows to only use bootstrap3
...
bzr revid: csn@openerp.com-20140411133113-odansac9am8av3fh
2014-04-11 15:31:13 +02:00
cd4afee17e
[CLEAN] website_forum: cleaning before merging
...
- cleaned models
- cleaned controllers: lots of cleaning, rewriting, simplfiication + updated in views
- added an override of the contact widget, to be able to display partner-related
stuff about karma and badges
- some css tweaking
- badges cleaning
bzr revid: tde@openerp.com-20140411132939-bmvyc9bqpqpkk843
2014-04-11 15:29:39 +02:00
280caaa95c
[MERGE]change modal windows to only use bootstrap3
...
bzr revid: csn@openerp.com-20140411132934-iodyidypjxb7v9ug
2014-04-11 15:29:34 +02:00
fb912d82be
[MERGE] Sync with trunk
...
bzr revid: rim@openerp.com-20140411131028-fqudb40nz71qhwc6
2014-04-11 15:10:28 +02:00
27738154c3
[MERGE][REM] Remove unused 'Survey' category for modules ('survey' will be now listed under 'Marketing')
...
bzr revid: rim@openerp.com-20140411125709-yrih60a1bcnq1vsx
2014-04-11 14:57:09 +02:00
fee0d0100d
[FIX] read_group: someone added a field, thought it was fun to destroy
...
the method call.
bzr revid: tde@openerp.com-20140411124732-e22dzjmav0tuhag5
2014-04-11 14:47:32 +02:00
12e84d59d8
[MERGE][IMP] Large refactoring of "survey" module
...
- surveys are now displayed through website
- new reporting tool
- model refactoring
- usability improvements
(affects also hr_evaluation and hr_recruitment, that use surveys)
bzr revid: rim@openerp.com-20140411124527-cbnd4r2wg38ihnss
2014-04-11 14:45:27 +02:00
23abadb62b
[MERGE] Sync with trunk
...
bzr revid: rim@openerp.com-20140411124318-pgxdmjfidsyny2ob
2014-04-11 14:43:18 +02:00
89d665aa79
[FIX]some cosmetic of code
...
bzr revid: csn@openerp.com-20140411122840-tv1mx2nu5p2is669
2014-04-11 14:28:40 +02:00
c8607c8b81
[FIX]few cosmetic of code
...
bzr revid: csn@openerp.com-20140411122753-qzxb29uwkw89mrxs
2014-04-11 14:27:53 +02:00
2a8232c25e
[IMP] Typo and add link in layout
...
bzr revid: rim@openerp.com-20140411122620-33rcxanaxhf5qxap
2014-04-11 14:26:20 +02:00
63c2093d2c
[IMP] Larger texts
...
bzr revid: fp@tinyerp.com-20140411122232-s8yipnar4tllspm0
2014-04-11 14:22:32 +02:00
22fff5237b
[FIX] Correct prefill for comment answers
...
bzr revid: rim@openerp.com-20140411121541-pj3m0z44hwd0z89w
2014-04-11 14:15:41 +02:00
f3cd340628
[MERGE] posbox : regression fix, made it easier to add support for new printers
...
bzr revid: fva@openerp.com-20140411121003-dxt1mx57felkufb9
2014-04-11 14:10:03 +02:00
41447050e5
[FIX] Dirty fix: prevent crash in computing data from SCQ/MCQ/matrices by ignoring comments
...
bzr revid: rim@openerp.com-20140411120735-u04occnkchgm3ztc
2014-04-11 14:07:35 +02:00
57c636fb7a
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20140411120636-o6yuuzphfiq33b8j
2014-04-11 14:06:36 +02:00
d704fb0060
[IMP] hw_proxy, hw_escpos: it is now possible to add support for new printers from the posbox hardware status page + fix backward compatiblity for hardcoded receipts
...
bzr revid: fva@openerp.com-20140411120510-t3a8b3axq1q4wuje
2014-04-11 14:05:10 +02:00
1e330fdd9e
[MERGE] Sync with trunk
...
bzr revid: rim@openerp.com-20140401071103-v3290rmesztf6rjl
bzr revid: rim@openerp.com-20140402073433-y5spv10ms9nnmdim
bzr revid: rim@openerp.com-20140404062949-88d0tqhn8mr4ejnz
bzr revid: rim@openerp.com-20140407141506-e54pr3bwtnts6y3g
bzr revid: rim@openerp.com-20140408140530-fy6u3iz2x75xil9c
bzr revid: rim@openerp.com-20140409193801-ckzgmc5zfjlg4irk
bzr revid: rim@openerp.com-20140410120421-md5ts8wxd33mitnl
bzr revid: rim@openerp.com-20140410152240-t54id35dkowbqi56
bzr revid: rim@openerp.com-20140411115553-cbd8pq1yafkv7qcr
2014-04-11 13:55:53 +02:00
8ce4ac4d94
[MERGE] Sync with trunk
...
bzr revid: rim@openerp.com-20140411115525-87b9wa1ttwphiwf2
2014-04-11 13:55:25 +02:00
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
4ed8413dc7
[FIX] mail.thread: avoid wrongly matching model,id from a foreign OpenERP system
...
When emails transit from an OpenERP system to another
there is a chance of wrongly considering the foreign
model,id pair as local, possibly attaching a reply
to a wrong parent message.
This naive heuristic ignore the foreign identifiers
unless the hostname of the message-id mentioned in
the In-Reply-To header matches the local one.
This may fail after a change of local hostname but
is still better than the alternative.
In OpenERP v8 we should stop including the model,res_id
in outgoing Message-Id headers and only rely on the
stored, opaque, unique Message-Ids, preventing
any future mismatch.
bzr revid: odo@openerp.com-20140411101349-h3jmkdzvbr7lut26
2014-04-11 12:13:49 +02:00
Thibault Delavallée
Martin Trigaux
Antony Lesuisse
Richard Mathot (OpenERP)
Olivier Dony
Kersten Jeremy
Denis Ledoux
Cedric Snauwaert
Fabien Pinckaers
Frédéric van der Essen