pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
88,833 Commits 1 Branch 0 Tags
58263bcbbda0893ebbb4d8da53959bda94ef6607
Commit Graph
298 Commits
Author SHA1 Message Date
Xavier Morel 46712acaec [FIX] bunch of changes lost in incorrect merge f4d78ae738 2014-05-30 17:00:52 +02:00
Xavier Morel d325c0caef [REV] attempt to revert incorrect removals in f4d78ae738 2014-05-30 16:00:28 +02:00
Olivier Dony 04211015fc [MERGE] Forward-port of latest saas-4 fixes, up to 0452851 2014-05-27 20:49:49 +02:00
Christophe Simonis 045285123f [FIX] website: correct bad code indentation introduced during previous commit 2014-05-27 18:46:18 +02:00
Olivier Dony fd21abd847 [MERGE] Forward-port latest saas-3 bugfixes, up to 30f43da 2014-05-27 17:18:43 +02:00
Xavier Morel e06f5b414b [IMP] inherit_option_id -> application 2014-05-27 12:13:51 +02:00
Xavier Morel d67161b649 [IMP] renamed some stuff for clarity 2014-05-27 11:57:06 +02:00
Xavier Morel da4441246e [IMP] use set to collect inherit_id and inherit_option_id 
Also add a few comments to note understanding of code
 2014-05-27 11:57:05 +02:00
Xavier Morel 4e3864c1fb [IMP] no need to ensure an actual context if the method does not use it 
just forwarding the context object does not count as using it, if callees want
a context they can ensure they've got one on their own
 2014-05-27 11:57:04 +02:00
Xavier Morel 85c466611a [IMP] don't pointlessly recreate view_obj every time _views_get is called, better use of pool & data APIs 2014-05-27 11:57:04 +02:00
Xavier Morel ad33728043 [IMP] use sorted + key instead of sort + cmp 2014-05-27 11:57:03 +02:00
Xavier Morel 3d91b2dfa2 [REM] unused stack_result parameter 2014-05-27 11:57:03 +02:00
Xavier Morel 327dda0bde [FIX] correctly handle invalid max_width/max_height passed to website._image 2014-05-23 15:11:13 +02:00
Xavier Morel 4362c6127f [IMP] use url_encode when building url query string 
I have no idea why I originall implemented that crap via string munging.
 2014-05-23 15:03:23 +02:00
Denis Ledoux 51c7b55da0 [FIX] request.handle_exception: cleanup override logic, fixed chain broken by commit a096ae0 
handle_exception() is supposed to try handling an exception and if it cannot,
re-raise it. Overridden methods must therefore call super() within a try/except
block, and only attempt to handle the exception if super() raised.
 2014-05-23 13:15:52 +02:00
Richard Mathot 1d70ecd80d [IMP] website: add max_height and max_width options to image Qweb widget 2014-05-23 11:55:48 +02:00
--global 62c0f6bf11 [FIX] website: ir_http: when rerouting url containing default language -> url without language, the ? was missing, leading to wrong urls. 2014-05-23 10:39:26 +02:00
Denis Ledoux c0e9a15960 [MERGE] Forward-port of latest saas-3 bugfixes, up to rev. a096ae0080 2014-05-22 09:35:26 +02:00
Martin Trigaux a096ae0080 [FIX] http: force rolleback for failed http request 
1st issue:
When an exception was raised, it was badly handled by the website in case of
website_enabled key. The response page was generated without calling super.
The WebRequest object being responsible to rollback the transaction in case
of errors.

2sd issue:
The _failed attribute is required to rollback the transaction in an WebRequest
object. Previously it was only set in the JsonRequest object (which inherit
from WebRequest), replace by call to super. The attribute _failed is now set
in the WebRequest object.
 2014-05-21 19:12:37 +02:00
Christophe Simonis a756b82372 [MERGE] forward port of branch saas-4 up to revid bb26dea 2014-05-20 20:19:55 +02:00
Christophe Simonis 040c93026a [MERGE] merge bzr trunk addons branch 2014-05-20 18:10:36 +02:00
Fabien Meghazi 59bfda8efd Slug redirects loses query_string 2014-05-20 10:25:39 +02:00
Fabien Meghazi 2df2da6514 [FIX] properly set website_multilang attribute 2014-05-19 12:33:47 +02:00
Olivier Dony 6130ed3ce0 [IMP] website: refactor website_image controller (and placeholder), move to model to make it reusable 
It is "almost" reusable because it still depends on the global `request` variable,
this could be solved by making it an explicit parameter.
 2014-05-14 16:32:36 +02:00
Xavier Morel f4d78ae738 Merge branch 'server-trunk' 
Conflicts:
	addons/mass_mailing/controllers/main.py
 2014-05-14 15:13:04 +02:00
Fabien Meghazi c3cfc4bc32 [MERGE] sitemap backport, merge trunk from 9438 til 9440 
merge from 9438 revid:fp@tinyerp.com-20140511115231-g8ke14r9iepyypv4 til 9440 revid:fp@tinyerp.com-20140511143314-nzn1239l00arbxjq
 2014-05-13 16:38:31 +02:00
Fabien Meghazi 119823ab84 [IMP] Redirect to language-less url on default language 2014-05-13 12:07:29 +02:00
Fabien Meghazi c73a2f1c57 [FIX] restore request.website_multilang for templates 2014-05-13 12:07:20 +02:00
Fabien Meghazi 8eed143112 [IMP] Invert multilang logic in route decorator. True by default, can be set to False explicitlty 2014-05-13 11:35:45 +02:00
Fabien Meghazi 1d08697bc1 [FIX] Do not display language choice if multilang=False 2014-05-12 17:42:01 +02:00
Martin Trigaux 555d4879c8 Forward-port of latest saas-4, up to revision 9416 (rev-id fme@openerp.com-20140509164338-gnz7p3qxt8etrh5w) 
bzr revid: mat@openerp.com-20140512072331-0lidgqb6x7fregdj
 2014-05-12 09:23:31 +02:00
Fabien Pinckaers 105618443f [IMP] Sitemap 
bzr revid: fp@tinyerp.com-20140511134037-84vnn1b4zfzk8som
 2014-05-11 15:40:37 +02:00
Fabien Pinckaers 54d30d5194 [IMP] clean sitemap, enumerate pages + fixes 
bzr revid: fp@tinyerp.com-20140511115231-g8ke14r9iepyypv4
 2014-05-11 13:52:31 +02:00
Fabien Meghazi 501ad7abeb [IMP] dumb code 
bzr revid: fme@openerp.com-20140509151855-7v4hp08qvmac1u2d
 2014-05-09 17:18:55 +02:00
Fabien Meghazi 69a93b07c7 [MOV] ir.ui.view#write() forced noupdate moved in website (RTE only) 
bzr revid: fme@openerp.com-20140509141024-xa9mawoye3o8e6c1
 2014-05-09 16:10:24 +02:00
Fabien Meghazi f652660cb6 [FIX] is_multilang_url by checking against werkzeug's routing map using query string too 
bzr revid: fme@openerp.com-20140509122323-2ext0livjgr5njb0
 2014-05-09 14:23:23 +02:00
Fabien Meghazi 95e1bd0612 [REM] completetly removed website#preprocess_request() 
bzr revid: fme@openerp.com-20140507170816-rrnh1nlqf97pfy3k
 2014-05-07 19:08:16 +02:00
Antony Lesuisse 56eeefdfda [MERGE] trunk-websit-al-refactor by chm 
- allow fiscal position change on sale orders
- public user on website
- simplify website_sale sale.order and shopping cart code
- remove preprocess_request

bzr revid: al@openerp.com-20140507153223-q73u5lhyrfw98o3a
 2014-05-07 17:32:23 +02:00
Fabien Meghazi cf8cf4f255 [REM] preprocess_request from website 
The method is still there with only a pass statement
Will completetly remove once chm merges his branch

bzr revid: fme@openerp.com-20140505163841-lstk3r37sf23ngrg
 2014-05-05 18:38:41 +02:00
chm@openerp.com ee16b014b1 [MERGE] from trunk 
bzr revid: chm@openerp.com-20140502095132-kfx40xou73mukr2y
 2014-05-02 11:51:32 +02:00
Antony Lesuisse 7e25b9ae55 [MERGE] saas-4 report_webkit missing dependency on report 
bzr revid: al@openerp.com-20140501152604-4cobh5ui47dt4pem
bzr revid: al@openerp.com-20140501155633-gefnc3zqcsr2rhaz
bzr revid: al@openerp.com-20140501161156-4wbsvhh8gz4r22h3
 2014-05-01 18:11:56 +02:00
Fabien Pinckaers 1dd63bce78 [IMP] website images: allow no max_width (default), faster loading if no resize 
bzr revid: fp@tinyerp.com-20140501114003-5xs31o0lzpp8ru2s
 2014-05-01 13:40:03 +02:00
Fabien Meghazi 048c4c284b [FIX] Url mismatch redirection should only be done for GET and HEAD http verbs 
bzr revid: fme@openerp.com-20140429095643-hmq1t45tgv3opyh8
 2014-04-29 11:56:43 +02:00
Fabien Meghazi fdaa70f319 [REM] language passed as query param for bundles controllers 
'translatable' has been removed from assets templates, no need for this anymore

bzr revid: fme@openerp.com-20140428124513-vlbm1hjsv9989den
 2014-04-28 14:45:13 +02:00
chm@openerp.com 13469c23d8 [MERGE] from trunk 
bzr revid: chm@openerp.com-20140424135841-akc01inl26fcirwy
 2014-04-24 15:58:41 +02:00
Olivier Dony 3ad6d69b21 [FIX] website: avoid using werkzeug API only present in 0.9+ 
bzr revid: odo@openerp.com-20140424131415-ot0r5062wndvuicr
 2014-04-24 15:14:15 +02:00
Fabien Meghazi 1d8400418e [MERGE] upstream 
bzr revid: fme@openerp.com-20140423123744-zfz7k8drn2t624zu
 2014-04-23 14:37:44 +02:00
Fabien Meghazi 7f29d7e371 [FIX] website: pass lang to js and css bundle controllers 
bzr revid: fme@openerp.com-20140422135022-u9p7zofv5sbeqo30
 2014-04-22 15:50:22 +02:00
Fabien Meghazi c117c3e10f [MOV] website: translatable context var from website#preprocess_request to ir.ui.view#render 
bzr revid: fme@openerp.com-20140422134748-9niep8iyzx9ldq1l
 2014-04-22 15:47:48 +02:00
chm@openerp.com aaa3265f47 [MERGE] from trunk 
bzr revid: chm@openerp.com-20140411081401-0ybuuboo6f3b58kv
 2014-04-11 10:14:01 +02:00