Alicia FLOREZ [Thu, 5 Jun 2014 12:10:20 +0000 (14:10 +0200)]
Merge 'upstream/saas-4' into saas-4
Christophe Simonis [Tue, 3 Jun 2014 17:14:22 +0000 (19:14 +0200)]
[MERGE] forward port of branch saas-3 up to 7dd6954
Christophe Simonis [Tue, 3 Jun 2014 17:11:44 +0000 (19:11 +0200)]
[MERGE] forward port of branch 7.0 up to 0c4bc1c
Martin Trigaux [Tue, 3 Jun 2014 14:56:07 +0000 (16:56 +0200)]
[FIX] sale: keep customer reference in grouped invoice (opw 606523)
Denis Ledoux [Tue, 3 Jun 2014 15:12:07 +0000 (17:12 +0200)]
[FIX] delivery: allow to add delivery method in quotation if quotation in quotation sent stage
opw-607920
Denis Ledoux [Tue, 3 Jun 2014 14:28:06 +0000 (16:28 +0200)]
[MERGE] Forward-port of latest saas-3 bugfixes, up to rev.
e7a0b1bb9095048914e11eb1915c20d336f74c08
Denis Ledoux [Tue, 3 Jun 2014 10:21:34 +0000 (12:21 +0200)]
[FIX] event_sale: stored seats_max field
seats_max is a stored field in event, and should remain stored when overrided in event_sale
Thibault Delavallée [Tue, 3 Jun 2014 10:03:42 +0000 (12:03 +0200)]
Merge pull request #288 from odoo-dev/saas-4-mass_mailing_fixes-tde
[FIX] mass_mailing: fixes
- backport (+ cleaning) of
eb22d202e48068a82ddcfa3878dbe0cbb845cc9c (saas-5): mail_thread: routing: instead of exclusive routing heuristics, use each case as a fallback of the previous.
- better fix for
dd36a0e5093df90bd92667d26f529a3a79fe0397 (saas-5): mail_thread: routing: fixed replies always choosen even when replying to emails with a specified reply_to (using ref_match in the algorithm)
- backport of
d6a2ae642b1a48ce6cb227c3cde2deca847a0a33 (saas-5): avoid evaluating a False / None domain
- fixed keeping the original message for routing, only when choosing to reply in the original thread (notification=True)
- mail_thread: routing: fixed replies always chosen even when replying to emails with a specified reply_to (using ref_match in the algorithm)
Martin Trigaux [Tue, 3 Jun 2014 08:48:26 +0000 (10:48 +0200)]
[FIX] gamification: do not group on agregated field for sum
The read_group behaviour has changed and read_group no longer sum on the field you are grouping.
Instead agregate on the field we want to sum and use no groupby.
For future version, grouping on a user such as what is done in batch mode is a better way to process.
Martin Trigaux [Tue, 3 Jun 2014 08:20:55 +0000 (10:20 +0200)]
[FIX] read_group: do not change the return format of the read group in case of no groupby_fields and keep the same return format as with groupby fields (a list of dict)
Martin Trigaux [Mon, 2 Jun 2014 16:00:25 +0000 (18:00 +0200)]
[FIX] calendar: avoid double popup, opw 606297
Some browsers (e.g. chrome) trigger onEmptyClick as well as
onBeforeLightbox during drag&drop which calls two slow_create
calls (and two popups). Workaround to kill the second one.
Martin Trigaux [Mon, 2 Jun 2014 16:10:36 +0000 (18:10 +0200)]
Merge pull request #286 from jbq/bugfix
[FIX] mail: detection of MIME type
When parsing the mail headers, the content-type may has a 'type' attribute for Multipart/Related objects (rfc2387).
Previous check would match on attached files of type text instead of real `content-type: text/`.
Cédric Snauwaert [Mon, 2 Jun 2014 15:15:08 +0000 (17:15 +0200)]
Merge pull request #300 from odoo-dev/saas-4-modal-kanban-fix-csn
[FIX]modal close function in kanban and edi
Cedric Snauwaert [Mon, 2 Jun 2014 14:41:58 +0000 (16:41 +0200)]
[FIX]modal close function in kanban and edi
Thibault Delavallée [Mon, 2 Jun 2014 11:52:27 +0000 (13:52 +0200)]
[FIX] mass_mailing: fixes:
- fixed keeping the original message for routing, only when choosing to reply in the
original thread (notification=True)
- auto delete sent emails explicitely
- mail_thread: routing: fixed replies always choosen even when replying to emails
with a specified reply_to (using ref_match in the algorithm)
- mail_thread: routing: instead of exclusive routing heuristics, use each case
as a fallback of the previous.
Denis Ledoux [Mon, 2 Jun 2014 11:00:36 +0000 (13:00 +0200)]
[FIX] base: security, do not override basic ir_config_paramter ACL
Denis Ledoux [Mon, 2 Jun 2014 10:57:57 +0000 (12:57 +0200)]
[FIX] base: security, group settings is authorized to alter ir.config_parameter
Jean-Baptiste Quenot [Wed, 28 May 2014 13:45:29 +0000 (15:45 +0200)]
Fix detection of MIME type in message_parse()
Be careful, content-type may contain tricky content like in the
following example so test the MIME type with startswith()
Content-Type: multipart/related;
boundary="_004_3f1e4da175f349248b8d43cdeb9866f1AMSPR06MB343eurprd06pro_";
type="text/html"
Christophe Simonis [Sun, 1 Jun 2014 09:17:09 +0000 (11:17 +0200)]
[FIX] mail: view_mode "list" does not exists, it's "tree"
Christophe Simonis [Sun, 1 Jun 2014 08:56:39 +0000 (10:56 +0200)]
[MERGE] forward port of branch saas-3 up to revid faace84
Christophe Simonis [Sun, 1 Jun 2014 08:52:02 +0000 (10:52 +0200)]
[FIX] email_template: partners ids are integers, not strings
Olivier Dony [Fri, 30 May 2014 23:48:55 +0000 (01:48 +0200)]
[FIX] website_mail_group: duplicate preventDefault() call (called before onclick already)
Plus it fails because `event` is not defined nor passed there (e.g. in Firefox)
Antony Lesuisse [Thu, 29 May 2014 13:02:27 +0000 (15:02 +0200)]
[FIX] ir.attachment mess, restore list view
Pariket Trivedi [Wed, 28 May 2014 17:05:11 +0000 (19:05 +0200)]
[IMP] event_sale: extra QWeb report for printing event badges, with HTML fields for custom content
Denis Ledoux [Wed, 28 May 2014 16:17:33 +0000 (18:17 +0200)]
[FIX] replace .bzrignore by .gitignore, as we are now working with git
Denis Ledoux [Wed, 28 May 2014 16:00:11 +0000 (18:00 +0200)]
[FIX] purchase: Do not allow to delete a purchase order line which is validated
This restriction behavior copied from the sale.order model
Moreover, the purchase.order lines state were not set to cancel when the purchase order was cancelled.
This is now the case, this behavior is also coped from the sale.order model
When the purchase order is reset to draft, we also reset the order lines state to draft
Richard Mathot [Wed, 28 May 2014 15:23:28 +0000 (17:23 +0200)]
[FIX] website_blog: display properly (very) long words in comments
Denis Ledoux [Wed, 28 May 2014 13:50:02 +0000 (15:50 +0200)]
[FIX] web: on new ir actions act_window target current, change the active* params from context for the dataset only
This fix is related to
a37bad205b13cec4f19f8e84e28801278e3e36ca
This previous fix did solved the issue of its purpose, but had a side effect for actions using these active* params, e.g. search views
For instance, Go to Project > Projects, click on any project, you are than redirected to tasks/issues of this project
If you reload the page, an error pops up, complaining that active_id cannot be found
Denis Ledoux [Wed, 28 May 2014 12:53:32 +0000 (14:53 +0200)]
[MERGE] Forward-port of latest saas-3 bugfixes, up to rev.
df0ae7e4d155a180f5e49e85f18ce52bf503c22c
Thibault Delavallée [Wed, 28 May 2014 12:10:05 +0000 (14:10 +0200)]
Merge pull request #251 from odoo-dev/saas-4-follower-route-tde
[FIX] website_mail_group: discussion group snippet
- moved into website_mail_group, instead of having the snippet in website_mail and the archives in website_mail_group
- fixed routes to avoid security issues
- better display of email on groups and archive
Denis Ledoux [Wed, 28 May 2014 12:02:56 +0000 (14:02 +0200)]
[FIX] payment_paypal: wrong handling fees computation formula
Denis Ledoux [Wed, 28 May 2014 10:04:41 +0000 (12:04 +0200)]
[FIX] website_sale: force changing pricelist on different account signin
opw-607517
Thibault Delavallée [Wed, 28 May 2014 09:12:33 +0000 (11:12 +0200)]
[FIX] website_mail, websit_mail_group: moved discussion group snippet to the right module; it should not be available when the mailing list archives module is not installed. Also fixed get_alias_info route to be mail_group specific and to avoid allowing people to browse the database.
Richard Mathot [Wed, 28 May 2014 08:35:58 +0000 (10:35 +0200)]
[ADD] website_crm_partner_assign: display demo data on website
Richard Mathot [Wed, 28 May 2014 08:06:42 +0000 (10:06 +0200)]
[TYPO] in crm_partner_assign
Thibault Delavallée [Wed, 28 May 2014 07:59:31 +0000 (09:59 +0200)]
[FIX] website_mail: fixed is_follower controller, that could leak data about records.
Added instead a controller to get alias data. This controller is called by the
discussion group snippet to have the info about the alias.
Fabien Pinckaers [Tue, 27 May 2014 20:50:14 +0000 (22:50 +0200)]
Merge pull request #238 from odoo-dev/saas-4-ir_qweb-contact-chm
[FIX] ir_qweb: contact field must add 'http://' if the website url value has not any protocol
Christophe Simonis [Tue, 27 May 2014 16:46:18 +0000 (18:46 +0200)]
[FIX] website: correct bad code indentation introduced during previous commit
Denis Ledoux [Tue, 27 May 2014 16:39:00 +0000 (18:39 +0200)]
[FIX] event_sale, website_event_sale: ACLs for event.event.ticket
event.event.ticket were set in website_event_sale, while this model is set in event_sale module
Manager acl moved from website_event_sale to event_sale
Created a new acl for event user in event_sale
Left the acl for everyone in website_event_sale, meaning that when this module is installed, everyone can read tickets, event those who aren't event user
Martin Trigaux [Tue, 27 May 2014 15:56:30 +0000 (17:56 +0200)]
[FIX] stock: clean previous commit
Martin Trigaux [Tue, 27 May 2014 15:47:28 +0000 (17:47 +0200)]
[FIX] stock: auto_validate move not set to done when multiple parent move set to done at the same time (opw 607970)
Olivier Dony [Tue, 27 May 2014 15:18:43 +0000 (17:18 +0200)]
[MERGE] Forward-port latest saas-3 bugfixes, up to 30f43da
Olivier Dony [Tue, 27 May 2014 14:50:02 +0000 (16:50 +0200)]
[MERGE] Forward-port of latest 7.0 bugfixes, up to aeaa826
Martin Trigaux [Tue, 27 May 2014 14:37:10 +0000 (16:37 +0200)]
Merge pull request #221 from odoo-dev/7.0-o2m-duplication-issue-msh
[FIX] Fix o2m record duplication when clicking on a button
The button action will execute a write call, creating the new line.
The reload is necessary to avoid recreating the line when using the save button.
Denis Ledoux [Tue, 27 May 2014 14:11:27 +0000 (16:11 +0200)]
[FIX] website_sale: in the product grid, a product must have min size 1 and max size 4
Mohammed Shekha [Tue, 27 May 2014 14:05:09 +0000 (19:35 +0530)]
[FIX]Refixed the issue of o2m record duplication
Richard Mathot [Tue, 27 May 2014 13:51:09 +0000 (15:51 +0200)]
[BACKPORT][FIX] base_gengo: use supported/up-to-date library
Commit backported from master
8ad97da843bbd5c34f44dc4d5f7a4942179cf7b8
Thibault Delavallée [Tue, 27 May 2014 13:35:17 +0000 (15:35 +0200)]
[CLEAN] website_mail: cleaned a lost console.log and a commented line that should have been removed with pr 213
Christophe Matthieu [Tue, 27 May 2014 13:13:44 +0000 (15:13 +0200)]
[FIX] ir_qweb: contact field must add '' if the website url value has not any protocol
Thibault Delavallée [Tue, 27 May 2014 12:16:39 +0000 (14:16 +0200)]
Merge pull request #232 from odoo-dev/saas-4-mass_mailing-fixes-tde
[FIX] mass_mailing: fixes in mail (default recipients), mass_mailing (recipients computation), web (chardomain widget)
Thibault Delavallée [Tue, 27 May 2014 11:33:10 +0000 (13:33 +0200)]
[FIX] mail: fixed get_default_recipient, trying to call a method even if the target model do not have it; also fixed default recipients generation on the contact model; sending a mass mailing when not having recipient now raise a warning.
Thibault Delavallée [Tue, 27 May 2014 11:31:12 +0000 (13:31 +0200)]
[FIX] web: chardomain widget: fixed selection of some records in a list (bad domain formatting), fixed domain evaluation tah is done server-side instead of through a stringigy.
Martin Trigaux [Tue, 27 May 2014 08:32:53 +0000 (10:32 +0200)]
Merge pull request #223 from odoo-dev/7.0-ail-form-context-parent-mat
account: safer access to parent in invoice line form
Denis Ledoux [Tue, 27 May 2014 08:29:12 +0000 (10:29 +0200)]
[FIX] account_followup: account_followup_print report, sxw according to rml
Martin Trigaux [Tue, 27 May 2014 08:16:44 +0000 (10:16 +0200)]
[FIX] account: safer access to parent in invoice line form
In the account.invoice.line form, do not assume the parent is defined when
evaluating the context to invoice_line_tax_id as we could come from another
view (e.g.: purchase order line form).
Fixes #206
Richard Mathot [Tue, 27 May 2014 08:01:58 +0000 (10:01 +0200)]
[DIRTY FIX] website_sale: make the runbot green
Thibault Delavallée [Tue, 27 May 2014 07:26:10 +0000 (09:26 +0200)]
Merge pull request #213 from odoo-dev/saas-4-group-snippet-imp-tde
[IMP] website_mail: improved snippet to subscribe to a mail.group
Richard Mathot [Tue, 27 May 2014 07:18:31 +0000 (09:18 +0200)]
[FIX] website_event_sale: bad xpath in template
Thibault Delavallée [Mon, 26 May 2014 13:43:57 +0000 (15:43 +0200)]
[IMP] website_mail: improved snippet to subscribe to a mail.group.
Main modifications :
- layout: input - button when not following, links (email - archives - unsubscribe) when following
- when adding your email, update all other subscribe snippets input in the page to avoid havign to re-type it
- management of fields of the record to subscribe to, used to have access to the alias of the group
Mohammed Shekha [Tue, 27 May 2014 04:40:06 +0000 (10:10 +0530)]
[FIX]Fixe the issue o2m record duplication.
Martin Trigaux [Mon, 26 May 2014 15:07:14 +0000 (17:07 +0200)]
Merge pull request #203 from buke/7.0
[FIX] delivery: when computing the weight and volume, use the quantity converted to the product uom instead of the uom of the purchase order.
Denis Ledoux [Mon, 26 May 2014 15:05:02 +0000 (17:05 +0200)]
[FIX] web: on launching ir_actions_act_window, reset the active_* params if the target is current
This commit is related to
8d496399336b4a97200f6f7b5907ed1c7b99970c and
b88755c4317ac61fc8d0533162d4ed19082f3fab
When hitting buttons of type object, the active_model and active_id(s) were kept, and, therefore, when calling a feature using the active* args, this feature used the active* args from the previous action.
Nevertheless, concerning wizards, the active* args should be indeed the active* args of the previous action, as wizards expects to have the active* args from the previous action. Thus, we reset these active* args only when this is not a wizard (target === 'current')
For example, from a sales order, hit the 'view invoice' button, and on the invoice, hit the 'send by email' button: The active_id in the send by email wizard were the id of the sale order, not of the invoice
Richard Mathot [Mon, 26 May 2014 14:55:12 +0000 (16:55 +0200)]
[FIX] website_sale: test did not load js properly and failed
Fabien Meghazi [Mon, 26 May 2014 14:12:15 +0000 (16:12 +0200)]
Merge pull request #210 from odoo-dev/saas-4-fix-partner-grade-access-fme
[FIX] access rights for public user on res.partner.grade
Martin Trigaux [Mon, 26 May 2014 12:35:04 +0000 (14:35 +0200)]
Merge pull request #207 from joshuajan/7.0
'invoiced' fields help message is wrong
the purchase order is set as invoiced when every line has a validated invoiced.
Fabien Meghazi [Mon, 26 May 2014 12:25:37 +0000 (14:25 +0200)]
[FIX] duplicate xmlid
JoshuaJan [Mon, 26 May 2014 09:55:26 +0000 (17:55 +0800)]
'invoiced' fields help message is wrong
Denis Ledoux [Mon, 26 May 2014 09:49:26 +0000 (11:49 +0200)]
[FIX] website_forum: do not check if the user has the group comment
This access rights checks is meaningful for website_blog only
Fabien Meghazi [Mon, 26 May 2014 09:24:58 +0000 (11:24 +0200)]
[FIX] access rights for public user on res.partner.grade
Denis Ledoux [Mon, 26 May 2014 09:20:40 +0000 (11:20 +0200)]
[FIX] hr_recruitment: default company set according to department company
buke [Mon, 26 May 2014 09:12:38 +0000 (17:12 +0800)]
Fixed delivery grid get_price
It's wrong for cal weight in delivery gird . It's use product.weight * qty.
Richard Mathot [Mon, 26 May 2014 08:42:24 +0000 (10:42 +0200)]
Merge pull request #200 from odoo-dev/saas-4-w3validation-rim
[FIX] website: DOM fixes according to W3C Validator
Richard Mathot [Mon, 26 May 2014 07:43:01 +0000 (09:43 +0200)]
[FIX] website: SEO js
Richard Mathot [Mon, 26 May 2014 06:53:54 +0000 (08:53 +0200)]
[FIX] website: SEO promote box
Richard Mathot [Fri, 23 May 2014 13:26:10 +0000 (15:26 +0200)]
[REF] website: shorter tag for charset
Richard Mathot [Fri, 23 May 2014 12:45:56 +0000 (14:45 +0200)]
[FIX] website: remove illegal HTML attribute
Richard Mathot [Fri, 23 May 2014 10:42:53 +0000 (12:42 +0200)]
[FIX] website: remove illegal HTML attribute
Richard Mathot [Fri, 23 May 2014 08:03:47 +0000 (10:03 +0200)]
[FIX] website: convert non-standard HTML metatag to data attribute
Richard Mathot [Thu, 22 May 2014 13:31:11 +0000 (15:31 +0200)]
[FIX] website: not well-formed HTML
Denis Ledoux [Fri, 23 May 2014 15:58:00 +0000 (17:58 +0200)]
[FIX] account_analytic_analysis: set false to price_unit in product_id_change in form view, so the price unit is reset when the product id is changed
sle-odoo [Fri, 23 May 2014 15:37:23 +0000 (17:37 +0200)]
Merge pull request #119 from odoo-dev/saas-4-report-fixes-sle
[FIX] Multiple report fixes including better handling of rendering a report with one worker (and the removal of the workers creation) and some report views changes (address block more to the left)
Denis Ledoux [Fri, 23 May 2014 15:13:42 +0000 (17:13 +0200)]
[FIX] purchase: po email template, the currency could be different than the pricelist currency
Denis Ledoux [Fri, 23 May 2014 13:54:43 +0000 (15:54 +0200)]
[FIX] mail: push to breadcrumb on subject, author or notified partners links click
opw-608251: When coming from website > My account, and clicking on a lead link from a message in the inbox, and then deleting the lead, the history_back is triggered and we come back in the website, while we should have come back in the inbox. This is because the action performed was not pushed in the breadcrumb
Simon Lejeune [Fri, 23 May 2014 13:38:56 +0000 (15:38 +0200)]
Merge remote-tracking branch 'odoo/saas-4' into saas-4-report-fixes-sle
xmo-odoo [Fri, 23 May 2014 13:13:13 +0000 (15:13 +0200)]
Merge pull request #183 from odoo-dev/urlencodify
Improve handling of website image fields
Xavier Morel [Fri, 23 May 2014 13:11:13 +0000 (15:11 +0200)]
[FIX] correctly handle invalid max_width/max_height passed to website._image
Xavier Morel [Fri, 23 May 2014 13:03:23 +0000 (15:03 +0200)]
[IMP] use url_encode when building url query string
I have no idea why I originall implemented that crap via string munging.
Thibault Delavallée [Fri, 23 May 2014 11:43:00 +0000 (13:43 +0200)]
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, ...
Thibault Delavallée [Fri, 23 May 2014 11:17:33 +0000 (13:17 +0200)]
[IMP] website_mail_group: display previous / next message when browsing + take into account thread or date mode.
Denis Ledoux [Fri, 23 May 2014 11:15:52 +0000 (13:15 +0200)]
[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.
Thibault Delavallée [Fri, 23 May 2014 10:40:39 +0000 (12:40 +0200)]
Merge remote-tracking branch 'odoo/saas-4' into saas-4-website-mail-group-tde
Thibault Delavallée [Fri, 23 May 2014 10:40:08 +0000 (12:40 +0200)]
[IMP] website_mail_group: better variables name in js file
Thibault Delavallée [Fri, 23 May 2014 10:39:50 +0000 (12:39 +0200)]
[FIX] website_mail_group: added forgotten parameter for a view, added previously in this branch
Richard Mathot [Fri, 23 May 2014 10:35:02 +0000 (12:35 +0200)]
Merge pull request #172 from odoo-dev/saas-4-widget-image-rim
Some fixes in the image qweb widget + CMS fixes
Richard Mathot [Fri, 23 May 2014 09:58:25 +0000 (11:58 +0200)]
[FIX] website_crm_partner_assign: better display of partners logos
Richard Mathot [Fri, 23 May 2014 09:55:48 +0000 (11:55 +0200)]
[IMP] website: add max_height and max_width options to image Qweb widget
Denis Ledoux [Fri, 23 May 2014 09:16:46 +0000 (11:16 +0200)]
[FIX] account_analytic_analysis: recurring invoice line description and yearly interval
the product_id_change name is reset if name is not passed to method args
the product_id_change call in account_analytic_view set name as false so it is reset each time the product is change
the yearly interval add a year to the next recurring date instead of one month
Martin Trigaux [Fri, 23 May 2014 08:11:25 +0000 (10:11 +0200)]
Restore missed images during bzr to git transition
Olivier Dony [Thu, 22 May 2014 14:44:33 +0000 (16:44 +0200)]
[MERGE] Forward-port latest 7.0 bugfixes, up to f8671cb
Denis Ledoux [Thu, 22 May 2014 14:10:56 +0000 (16:10 +0200)]
[REVERT]
b6a7402fdbddfe817fa36292e6f89e8659f9bdea, pagereset seems to be useful in some cases. Need to check deeper