pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
83,206 Commits 1 Branch 0 Tags
72700a2cf97243da609fffcbc6c9e8fa834701cc
Commit Graph
83206 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Thibault Delavallée 42e2676f4b [IMP] fields: html: now supports a sanitize argument, telling 
whether the content of the html field should be sanitized before storage. This parameter
is true by default.
Example of use: html of email template is considered as html content, but contains
mako strings that makes this content not valid html. Sanitizing the body content
can cause issues to the template; therefore storing it as html but not sanitized
allows to keep its content safe.

Added a test case to ensure this behavior.

bzr revid: tde@openerp.com-20140227120254-6m8gvkt4hf28nl0e
 2014-02-27 13:02:54 +01:00
Paramjit Singh Sahota 89de7d9f25 [MERGE] Merged lp:~openerp/openobject-addons/saas-3 
bzr revid: psa@tinyerp.com-20140227114202-g2yw8pmsn4v0lm05
 2014-02-27 17:12:02 +05:30
Christophe Matthieu 6a777b9e62 [FIX] website editor: Editor bar is showing border in ie. 
bzr revid: chm@openerp.com-20140227111726-s1545ii3exjqjkxz
 2014-02-27 12:17:26 +01:00
Christophe Matthieu 5f70ca61b6 [FIX] website: editor: pointer-events:none for ie doesn't work (because ie). Change snippet overlay to fix this ie bug 
bzr revid: chm@openerp.com-20140227111038-0hodseqys6pnz841
 2014-02-27 12:10:38 +01:00
Fabien Meghazi c1d9449a57 [MERGE] upstream 
bzr revid: fme@openerp.com-20140227101745-k6iseaz765qnflnm
 2014-02-27 11:17:45 +01:00
Fabien Meghazi 2868e9a6ac [MERGE] upstream 
bzr revid: fme@openerp.com-20140227101725-7egd9xq859jasnhj
 2014-02-27 11:17:25 +01:00
Christophe Matthieu 01a898ab8b [FIX] website snippet: pointer-ie 
bzr revid: chm@openerp.com-20140227100917-wq54xrkgii7uhacl
 2014-02-27 11:09:17 +01:00
Richard Mathot (OpenERP) d263942189 [MERGE] Sync with trunk 
bzr revid: rim@openerp.com-20140227093043-y4dj5naxd0wve2ri
 2014-02-27 10:30:43 +01:00
Simon Lejeune c8ebe2dc8a [MERGE] trunk 
bzr revid: sle@openerp.com-20140226175612-4xi5b8sa2h2jp37n
 2014-02-26 18:56:12 +01:00
Christophe Matthieu cfeac71d6a [FIX] website: editor: pointer-events:none for ie doesn't work (because ie). Change snippet overlay to fix this ie bug 
bzr revid: chm@openerp.com-20140226175558-2gyix2zgdawf87yz
 2014-02-26 18:55:58 +01:00
Denis Ledoux 70d3f251a3 [REVERT] rev 8788.1.1769: The exchange rate of the currency of the pricelist should not be applied as this price computation method does not depends of any pricelist 
bzr revid: dle@openerp.com-20140226172300-z2okr3vpjuwxs4mz
 2014-02-26 18:23:00 +01:00
Denis Ledoux 50ecb598e7 [FIX] website: website settings should inherit of res.config.settings and not base.config.settings, as it create a new page settings, instead of extending one 
bzr revid: dle@openerp.com-20140226171114-jwthykyud66l7o6x
 2014-02-26 18:11:14 +01:00
Thibault Delavallée 11e0e64769 [FIX] mail: notification url: only web, not login 
bzr revid: tde@openerp.com-20140226170002-ndr090idip3cyx3n
 2014-02-26 18:00:02 +01:00
Fabien Meghazi 3324351bf6 [IMP] Improvement/changes to the http request/response API. 
- Get rid of LazyResponses
- Made website.render() an alias to request.render() [just kept in case this is merged in saas-3 but should be removed completely in favor of request.render()]

Need server/trunk's rev#5102

bzr revid: fme@openerp.com-20140226164551-d42a3g057grr722y
 2014-02-26 17:45:51 +01:00
Jérôme f664ff2ace [FIX] : tde's last remark correction 
bzr revid: jem@openerp.com-20140226164521-gccablfi8b6e36qr
 2014-02-26 17:45:21 +01:00
Fabien Meghazi 71537320c5 [IMP] Improvement/changes to the http request/response API. 
- Get rid of LazyResponses
- Made website.render() an alias to request.render() [just kept in case this is merged in saas-3 but should be removed completely in favor of request.render()]

Need server/trunk's rev#5102

bzr revid: fme@openerp.com-20140226164448-ad7mjzgg5aw66erq
 2014-02-26 17:44:48 +01:00
Fabien Meghazi 992975f236 [IMP] Improvement/changes to the http request/response API. 
- Added http.Response object
- @http.route decorator wraps methods in order to convert returned value to Response object
- http.Request.func* variables moved to http.EndPoint class
- moved _first_arg_is_req backward compatibility feature in EndPoint class
- CORS support moved to new http.Request object
- Added a #render() helper on request object as a companion of #make_response() that will return a lazy qweb rendering response
- Extra check in routing_map() in order to forbid the chabge of request type in @http.route arguments inheritance
- Fix crash happening when no Host header is present in the request

bzr revid: fme@openerp.com-20140226164407-5avn72p20o3o4f7x
 2014-02-26 17:44:07 +01:00
Fabien Meghazi e2f92040db [REM] removed Request's getattr proxying to httprequest 
This might be a problem when merging the new api so we let it as is for the moment

bzr revid: fme@openerp.com-20140226161627-edgbe5f8mpzylq46
 2014-02-26 17:16:27 +01:00
Gery Debongnie d3bbda62bc [MERGE] web_graph: multiple fixes to search facet sync + performance optimizations and cleanup 
bzr revid: odo@openerp.com-20140226155711-fx9pgaa72buyu7gi
 2014-02-26 16:57:11 +01:00
Christophe Simonis e1daea744f [FIX] web: bootstrap template rendered using request uid 
bzr revid: chs@openerp.com-20140226155536-5z7r50bzxxackg1d
 2014-02-26 16:55:36 +01:00
Fabien Meghazi 233665197b [IMP] Do not dismiss server errors on calendar notifications 
bzr revid: fme@openerp.com-20140226154727-dafw83hf9b9a8gpz
 2014-02-26 16:47:27 +01:00
Xavier Morel 30a99471e2 [FIX] Webkit created spurious spans with inline style when joining lines 
Post process to manually unwrap node if it only has purely looks-oriented CSS
properties set inline.

ref:
https://code.google.com/p/chromium/issues/detail?id=226941
https://bugs.webkit.org/show_bug.cgi?id=114791
http://dev.ckeditor.com/ticket/9998
http://www.neotericdesign.com/blog/2013/3/working-around-chrome-s-contenteditable-span-bug

bzr revid: xmo@openerp.com-20140226152004-9ybbki1op80lpxin
 2014-02-26 16:20:04 +01:00
Gery Debongnie a37f96d043 [FIX] adds a missing semicolon... :/ (addon web_graph) 
bzr revid: ged@openerp.com-20140226144032-st0eqbkzco8n2unk
 2014-02-26 15:40:32 +01:00
Gery Debongnie b453252c2d [IMP] this commit adds two css classes (graph_pivot_mode and graph_chart_mode) to better separate the ui from the code in graph view (addon web_graph) 
bzr revid: ged@openerp.com-20140226143919-cejqoq2kd4iwrq04
 2014-02-26 15:39:19 +01:00
Martin Trigaux 43df0b4d23 [MERGE] [FIX] orm: when generating xml ids for export, use the model of the exported field instead of the current model. Courtesy of Stefan Rijnhart (Therp). 
bzr revid: mat@openerp.com-20140226133716-vgdjjmqc2lou0n3u
 2014-02-26 14:37:16 +01:00
Gery Debongnie eb1eb48ef3 [IMP] optimizes pivot table so that it doesn't reload data when the groupbys have been changed in such a way that it should only fold some headers (addon web_graph) 
bzr revid: ged@openerp.com-20140226130424-rtb5iof0c14caf56
 2014-02-26 14:04:24 +01:00
Gery Debongnie e7306f2c4a [FIX] fixes various problems with the graph view and the filters in the searchbar. Now, it should properly compute and update the groupby/col_groupby in the search bar (addon web_graph) 
bzr revid: ged@openerp.com-20140226111710-q11qx1tb2l0nryxf
 2014-02-26 12:17:10 +01:00
Launchpad Translations on behalf of openerp bf51816215 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140225062406-g9e0edcgz29z4det
bzr revid: launchpad_translations_on_behalf_of_openerp-20140226073044-dmjdmn4cvpbgh806
 2014-02-26 07:30:44 +00:00
Launchpad Translations on behalf of openerp a900c2f44d Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140226063458-06tloufxtz1og92z
 2014-02-26 06:34:58 +00:00
Kersten Jeremy 3279c76c62 [FIX] Fix bug with filter when date are between 2 months. If an event was starting before the current month, but ending this month or later... it was not always displayed 
bzr revid: jke@openerp.com-20140225234250-2lx3tc9ktwume7a9
 2014-02-26 00:42:50 +01:00
Kersten Jeremy f87524a257 [FIX] Set event from hr_holiday with a class confidential by default. 
bzr revid: jke@openerp.com-20140225213121-hyz46xpsiqtao18o
 2014-02-25 22:31:21 +01:00
Kersten Jeremy 9a03a57120 [FIX] Use event.display_time and not event.date in mail template. This function field use the timezone ! 
bzr revid: jke@openerp.com-20140225200342-6f96u6dkrknbzjsn
 2014-02-25 21:03:42 +01:00
Denis Ledoux d105ec6e82 [FIX] crm: missing argument in on_change of merge lead/opp wizard 
bzr revid: dle@openerp.com-20140225175002-lz0zdwp3th30955q
 2014-02-25 18:50:02 +01:00
Kersten Jeremy 4ec292eae9 [MERGE] Fix bug in send_mail_to_attendee of calendar where we passed browse_list and not dict(ids), typo controller calendarr PEP8 
bzr revid: jke@openerp.com-20140225173808-60stzxubljuambd4
 2014-02-25 18:38:08 +01:00
Kersten Jeremy 27380e6f3a [MERGE] Merge with saas-3-calendar-jke. - Fix filters 
bzr revid: jke@openerp.com-20140225173055-01uouh0prhyni3i0
 2014-02-25 18:30:55 +01:00
Kersten Jeremy 8b927d7d1c [FIX] fix bug in send_mail_to_attendee of calendar where we passed browse_list and not dict(ids), typo controller calendarr PEP8 
bzr revid: jke@openerp.com-20140225165859-1vyjtirgjmbhoij4
 2014-02-25 17:58:59 +01:00
Christophe Matthieu a22379520c [FIX] website: error managment in ace editor for ie9 
bzr revid: chm@openerp.com-20140225165720-c451gumsd5mce5ya
 2014-02-25 17:57:20 +01:00
Xavier Morel cdc83a0763 [FIX] dataset.read_ids should always return records in the order of the parameter ids 
BufferedDataSet.read_ids assumes the input and output orders are the same, and
returns wonky results when not the case, which in turns fucks up its cache as
it associates ids and records incorrectly.

bzr revid: xmo@openerp.com-20140225162813-8ofxpiy1012eehgk
 2014-02-25 17:28:13 +01:00
Christophe Matthieu 1e2a5ddfa6 [FIX] website: fix for ie: add bootstrap class in website_sale and bind click for editor 
bzr revid: chm@openerp.com-20140225162136-5xdt7n498qxf9myw
 2014-02-25 17:21:36 +01:00
Kersten Jeremy 02835ebdbd [REF] Refactoring all filters. Now, calendar remember if the filter is checked between each do_search and event_source refresh 
bzr revid: jke@openerp.com-20140225154137-45tr7l50xlceom2b
 2014-02-25 16:41:37 +01:00
Kersten Jeremy 50c3d34a8e [FIX] Transform get_default_options of calendar into a function, to be instancied after date.js 
bzr revid: jke@openerp.com-20140225153926-ltwubk1sxfi3heuv
 2014-02-25 16:39:26 +01:00
Simon Lejeune 258c8b5ee5 [FIX] type in the import of the reset stylesheet 
bzr revid: sle@openerp.com-20140225144407-li218a3ppz4f8y7z
 2014-02-25 15:44:07 +01:00
Gery Debongnie 47340431f9 [FIX] fixes the tooltip position in chart mode (graph view). The position was wrong because the parent position was not 'relative'. (addon web_graph) 
bzr revid: ged@openerp.com-20140225141623-cawr7yur38zhjcz4
 2014-02-25 15:16:23 +01:00
Fabien Meghazi 5da9305bf5 [MERGE] upstream 
bzr revid: fme@openerp.com-20140225105045-9t4a443nq0lw55qu
 2014-02-25 11:50:45 +01:00
Fabien Meghazi 35a7182893 [MERGE] upstream 
bzr revid: fme@openerp.com-20140225104654-d1ni7z5t8w0qc7mw
 2014-02-25 11:46:54 +01:00
Gery Debongnie fed81544ad [IMP] optimizes graph view to avoid reloading data in some cases (such as removing a filter from the search view) (addon web_graph) 
bzr revid: ged@openerp.com-20140225104233-zidrw03dh2hlwrng
 2014-02-25 11:42:33 +01:00
Gery Debongnie 02b70e2950 [FIX] fixes problems due to the preceding merge (resolved conflict was not properly resolved) (addon web_graph) 
bzr revid: ged@openerp.com-20140225103155-9cdbs8p79sa7hkwi
 2014-02-25 11:31:55 +01:00
Christophe Simonis 0123c51997 [FIX] crm: lead to opportunity convertion: pass id instead of browse record object 
bzr revid: chs@openerp.com-20140225102830-1za1ei2xlr1oc4nv
 2014-02-25 11:28:30 +01:00
Xavier Morel 750b9f405c [FIX] tags edition breakage in website_event_track 
* remove some nodes from the $editables set, ``li`` really does not like being
  widgetified. Remove a few others just in case

* split fa outside of li to make it safely (ish) editable

* simplify upcast function for icons cke widget

bzr revid: xmo@openerp.com-20140225131228-2m75itgi4zbj5xfh
 2014-02-25 14:12:28 +01:00
Olivier Dony 4572ea9ef3 [FIX] website_event_track: employees should not be restricted to public events only 
Also switched rule to noupdate. A manual fix of existing installations
will be necessary, as is usually the case for ir.rules changes.
This module has not made it into a LTS version yet, so it is acceptable.
+ Added a _description for the event.track model to avoid it being
replaced by inherited descriptions.

bzr revid: odo@openerp.com-20140225115742-ghnt3khn6hvycnnw
 2014-02-25 12:57:42 +01:00