pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
85,196 Commits 1 Branch 0 Tags
2d7c8909394ab482eaec83814aa46e51eab01fbb
Commit Graph
85196 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Simon Lejeune 2d7c890939 Merge remote-tracking branch 'odoo/saas-4' into saas-4-report-fixes-sle 2014-05-23 15:38:56 +02:00
xmo-odoo 14fb733ab2 Merge pull request #183 from odoo-dev/urlencodify 
Improve handling of website image fields
 2014-05-23 15:13:13 +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
Thibault Delavallée f7e0b2dd15 Merge pull request #125 from odoo-dev/saas-4-website-mail-group-tde 
[MERGE] website_mail_group: cleaning and usability improvement of this web module
- refactored the website templates that were basically impossible to use
- fixed display by thread / date and navigation
- added information about group email, participants, messages, ...
 2014-05-23 13:43:00 +02:00
Thibault Delavallée 9fadd0b04c [IMP] website_mail_group: display previous / next message when browsing + take into account thread or date mode. 2014-05-23 13:17:33 +02:00
Thibault Delavallée 41e3f88119 Merge remote-tracking branch 'odoo/saas-4' into saas-4-website-mail-group-tde 2014-05-23 12:40:39 +02:00
Thibault Delavallée c40f184102 [IMP] website_mail_group: better variables name in js file 2014-05-23 12:40:08 +02:00
Thibault Delavallée dc98882c90 [FIX] website_mail_group: added forgotten parameter for a view, added previously in this branch 2014-05-23 12:39:50 +02:00
Richard Mathot 1b0bfd2187 Merge pull request #172 from odoo-dev/saas-4-widget-image-rim 
Some fixes in the image qweb widget + CMS fixes
 2014-05-23 12:35:02 +02:00
Richard Mathot 15ea4563af [FIX] website_crm_partner_assign: better display of partners logos 2014-05-23 11:58:25 +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 47f24697ec [FIX] website_mail_group: effectively handle replies_per_page parameter that controls the number of replies to display under each message. 2014-05-22 13:38:07 +02:00
--global 8a6b0d1d4d [FIX] website_mail_group: number of thread and replies back to normal values after testing. 2014-05-22 13:29:49 +02:00
--global a6eaa7bac3 [FIX] website_mail_group: email-based author was wrongly placed in the layout 2014-05-22 12:48:32 +02:00
--global b0def9d479 [FIX] website_mail_group: order archives by date descending 2014-05-22 12:48:09 +02:00
--global 538d97a6b3 [FIX] website_mail_group: better layout for main mailing lists page: more space for subscribe button 2014-05-22 12:25:35 +02:00
--global 6ed56d8393 Merge remote-tracking branch 'odoo/saas-4' into saas-4-website-mail-group-tde 2014-05-22 12:14:17 +02:00
Richard Mathot 7184f8c3f0 Merge pull request #127 from odoo-dev/saas-4-speakers-rim 
[MERGE][FIX] website_event_track: display speakers name to public users
 2014-05-22 10:29:36 +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
Richard Mathot fbdc29459f Merge remote-tracking branch 'odoo/saas-4' into saas-4-speakers-rim 2014-05-21 17:11:58 +02:00
Richard Mathot 37d6fe344b [FIX] website_event_track: display speakers name to public users 2014-05-21 17:10:50 +02:00
Thibault Delavallée 9d1e0be2e9 Merge pull request #126 from odoo-dev/saas-4-gitignore-tde 
[IMP] [BACKPORT] Converto bzrignore to gitignore, like what has been done in master.
 2014-05-21 17:10:40 +02:00
--global 1b40b5b37a [IMP] [BACKPORT] Converto bzrignore to gitignore, like what has been done in master. 2014-05-21 16:52:24 +02:00
Thibault Delavallée 59a7c85a6f Merge remote-tracking branch 'odoo/saas-4' into saas-4-website-mail-group-tde 2014-05-21 16:35:48 +02:00
Thibault Delavallée 007725cd07 [FIX] website_mail_group: added forgotten files for css / js. 2014-05-21 16:35:15 +02:00
Thibault Delavallée 52eb9cba89 [IMP] website_mail_group: refactored layout of displayed mailing lists and their archive. Should be a bit more easy to use and understand. Todo: fix number of displayed thread / replies, and probably re-do the layout once somebody decides to change everything. 2014-05-21 16:32:31 +02:00
Thibault Delavallée b7c6b1cbca [FIX] website_mail: message description should effectively be limited to the first 30 characters. 2014-05-21 16:27:17 +02:00
Simon Lejeune d7e8edc880 Merge remote-tracking branch 'odoo/saas-4' into saas-4-report-fixes-sle 2014-05-21 14:09:35 +02:00
Simon Lejeune 1f97c40c9c [FIX] Report: get the wkhtmltopdf version in a cleaner way with a simple regex 2014-05-21 14:05:18 +02:00
Denis Ledoux 2cc28ce65b [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. b6a7402fdb 2014-05-21 13:46:10 +02:00
Richard Mathot 2e760407e4 [FIX] survey: enable survey access to portal users instead of 404 2014-05-21 13:42:17 +02:00
Simon Lejeune b50421e551 [FIX] ir_actions: adapt render_report when called in a tests/qweb report context to generate the pdf only if a directory has been provided 2014-05-21 13:11:27 +02:00
Simon Lejeune 58d3a6f3f7 [FIX] Report: inform the user that he may not print a pdf report while his openerp is running with only one worker; adapt method to extract wkhtmltopdf version to also work on mac where the ouput of '--version' is different from gnu/linux binary 2014-05-21 13:06:31 +02:00
Denis Ledoux ecce35bc6e [MERGE] Forward-port of latest saas-3 bugfixes, up to rev. 6958d47694 2014-05-21 13:05:41 +02:00
Simon Lejeune 654df600c1 [FIX] Report: less verbose error message 2014-05-21 13:02:59 +02:00
Simon Lejeune 226579a80d [FIX] Report: removed psutil/signal/openerp worker crap 2014-05-21 13:01:42 +02:00
Simon Lejeune 1745c738ee [FIX] Report: double the default height/width of barcode image to avoid a blurred/unusable barcode once integrated in a report 2014-05-21 12:59:05 +02:00
Denis Ledoux 6958d47694 [FIX] account_analytic_analysis: recurring invoices prepare and product_id_change 
product_id_change set the description with the same behavior as sale orders
product_id_change set the price unit according to the pricelist
_prepare_invoice is split into two sub methods, _prepare_invoice_data and _prepare_invoice_line
_prepare_invoice actually prepare the invoice values instead of directly creating the invoice
 2014-05-21 12:57:28 +02:00
Simon Lejeune 4019b2b334 [FIX] Report: do not raise when wkhtmltopdf returns a code 1. In most cases, it is due to some http requests which did not success *but* the pdf is still acceptable. Far from the best commit ever, but it avoids to completely crash when just a link to an image is wrong 2014-05-21 12:56:56 +02:00
Simon Lejeune 35c5e56718 [FIX] address div more to the left on external reports 2014-05-21 11:57:45 +02:00
Denis Ledoux b6a7402fdb [FIX] report: correct page numbering 2014-05-21 11:20:37 +02:00
Richard Mathot a7b7fa3d4a Merge pull request #96 from odoo-dev/saas-4-hr-security-rim 
[FIX] website_hr_recruitment: Hide unpublished job offers to portal users and employees
 2014-05-21 10:49:46 +02:00
Richard Mathot f1a6ab5070 [FIX] website_hr_recruitment: Hide unpublished job offers to portal users and employees 2014-05-21 10:00:08 +02:00
Christophe Simonis 93238cd1cb [FIX] website: respect max_{width,height} for /website/image route 2014-05-20 20:23:25 +02:00
Christophe Simonis bb26dea60b [MERGE] forward port of branch saas-3 up to revid 38abc8a 2014-05-20 19:00:50 +02:00
Christophe Simonis 38abc8a006 [MERGE] forward port of branch 7.0 up to revid b09b6a0 2014-05-20 18:57:04 +02:00
Christophe Simonis a70eea3b11 [MERGE] merge bzr saas-4 web branch 2014-05-20 17:14:18 +02:00
Christophe Simonis d93f628c72 [MERGE] merge bzr saas-4 addons branch 2014-05-20 17:12:01 +02:00