pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
85,003 Commits 1 Branch 0 Tags
affeeeda2e445b5bddfa0818dc15485e4c19dc5d
Commit Graph
85003 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Thibault Delavallée 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
Antony Lesuisse 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
Thibault Delavallée 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
Richard Mathot (OpenERP) 5d177a9b10 [MERGE] Sync with trunk 
bzr revid: rim@openerp.com-20140411142817-svp3hp2qfx1xw25k
 2014-04-11 16:28:17 +02:00
Olivier Dony 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
Olivier Dony 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
Martin Trigaux 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
Thibault Delavallée 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
Kersten Jeremy 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
Kersten Jeremy 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
Thibault Delavallée 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
Thibault Delavallée 2929f2438a [MERGE] Sync with trunk 
bzr revid: tde@openerp.com-20140411140929-7w4qo086j991houy
 2014-04-11 16:09:29 +02:00
Thibault Delavallée 6ed34b7219 [MERGE] Merge refactoring branch. Still fixing to do. 
bzr revid: tde@openerp.com-20140411140854-bxl6p3d4h4oczkl4
 2014-04-11 16:08:54 +02:00
Richard Mathot (OpenERP) 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
Denis Ledoux 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
Thibault Delavallée e51049e8ed [MERGE] Sync with upstream 
bzr revid: tde@openerp.com-20140411134052-x74otuwuxoz20qab
 2014-04-11 15:40:52 +02:00
Thibault Delavallée d04ee666cc [MERGE] Sync with trunk 
bzr revid: tde@openerp.com-20140411133813-4rj4de6dlzna5g5s
 2014-04-11 15:38:13 +02:00
Cedric Snauwaert 6b84615627 [MERGE]change modal windows to only use bootstrap3 
bzr revid: csn@openerp.com-20140411133113-odansac9am8av3fh
 2014-04-11 15:31:13 +02:00
Thibault Delavallée 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
Cedric Snauwaert 280caaa95c [MERGE]change modal windows to only use bootstrap3 
bzr revid: csn@openerp.com-20140411132934-iodyidypjxb7v9ug
 2014-04-11 15:29:34 +02:00
Richard Mathot (OpenERP) fb912d82be [MERGE] Sync with trunk 
bzr revid: rim@openerp.com-20140411131028-fqudb40nz71qhwc6
 2014-04-11 15:10:28 +02:00
Richard Mathot (OpenERP) 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
Thibault Delavallée 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
Richard Mathot (OpenERP) 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
Richard Mathot (OpenERP) 23abadb62b [MERGE] Sync with trunk 
bzr revid: rim@openerp.com-20140411124318-pgxdmjfidsyny2ob
 2014-04-11 14:43:18 +02:00
Cedric Snauwaert 89d665aa79 [FIX]some cosmetic of code 
bzr revid: csn@openerp.com-20140411122840-tv1mx2nu5p2is669
 2014-04-11 14:28:40 +02:00
Cedric Snauwaert c8607c8b81 [FIX]few cosmetic of code 
bzr revid: csn@openerp.com-20140411122753-qzxb29uwkw89mrxs
 2014-04-11 14:27:53 +02:00
Richard Mathot (OpenERP) 2a8232c25e [IMP] Typo and add link in layout 
bzr revid: rim@openerp.com-20140411122620-33rcxanaxhf5qxap
 2014-04-11 14:26:20 +02:00
Fabien Pinckaers 63c2093d2c [IMP] Larger texts 
bzr revid: fp@tinyerp.com-20140411122232-s8yipnar4tllspm0
 2014-04-11 14:22:32 +02:00
Richard Mathot (OpenERP) 22fff5237b [FIX] Correct prefill for comment answers 
bzr revid: rim@openerp.com-20140411121541-pj3m0z44hwd0z89w
 2014-04-11 14:15:41 +02:00
Frédéric van der Essen 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
Richard Mathot (OpenERP) 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
Frédéric van der Essen 57c636fb7a [MERGE] from trunk 
bzr revid: fva@openerp.com-20140411120636-o6yuuzphfiq33b8j
 2014-04-11 14:06:36 +02:00
Frédéric van der Essen 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
Richard Mathot (OpenERP) 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
Richard Mathot (OpenERP) 8ce4ac4d94 [MERGE] Sync with trunk 
bzr revid: rim@openerp.com-20140411115525-87b9wa1ttwphiwf2
 2014-04-11 13:55:25 +02:00
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 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
Olivier Dony 410c82bd6a [MERGE] Sync with trunk 
bzr revid: odo@openerp.com-20140411094018-zqw3ac1br991qsnp
 2014-04-11 11:40:18 +02:00
Thibault Delavallée 24e5270347 [IMP] ir_qweb: added country flag management in contact widget 
bzr revid: tde@openerp.com-20140411091621-q0c2ndzv9xpptzqo
 2014-04-11 11:16:21 +02:00
chm@openerp.com 9941f49364 [MERGE] from trunk 
bzr revid: chm@openerp.com-20140411081513-xlptxuxmvs5ysb8s
 2014-04-11 10:15:13 +02:00
chm@openerp.com aaa3265f47 [MERGE] from trunk 
bzr revid: chm@openerp.com-20140411081401-0ybuuboo6f3b58kv
 2014-04-11 10:14:01 +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
Thibault Delavallée 94c580e933 [MERGE] Sync with trunk 
bzr revid: tde@openerp.com-20140411075551-xh4o3k3172cr7scz
 2014-04-11 09:55:51 +02:00
Launchpad Translations on behalf of openerp 63e9150cff Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140411055930-7coykr7rveqsucp3
 2014-04-11 05:59:30 +00: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