pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
84,087 Commits 1 Branch 0 Tags
280caaa95ce16b73503bdd2b06bf6379650f2edd
Commit Graph
84087 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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) 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
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 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 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 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
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
Richard Mathot (OpenERP) 89a60326da [FIXes] 
bzr revid: rim@openerp.com-20140410132146-5a0k2n4y8k5fzxts
 2014-04-10 15:21:46 +02:00
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 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
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