Commit Graph

88687 Commits

Author SHA1 Message Date
Christophe Matthieu 286ced7183 Merge pull request #405 from odoo-dev/saas-5-fix-website-contact-form-chm
[FIX] website_crm: when there is an error in required field, user_id=False in the controller overwrite the user_id browse record to display the contact form template.
2014-06-06 12:40:44 +02:00
Christophe Matthieu afc495a99e [FIX] website_crm: when there is an error in required field, user_id=False in the controller overwrite the user_id browse record to display the contact form template. 2014-06-06 09:56:40 +02:00
Olivier Dony d1b0d2586b [FIX] ir.qweb: rendering non-string attributes could cause unicode errors (Issue #282)
This occurs because werkzeug.utils.escape() auto-casts
non-basestring values to unicode, while we expect to be
working with bytestrings only.
So when evaluating attribute values, make sure we always
return bytestring values, never int, bool or unicode.
2014-06-05 10:11:23 +02:00
Christophe Simonis 651e5acd5d Merge pull request #344 from odoo-dev/saas-5-fix-mrp.bom-wrong-bom_find-check-chm
[FIX] mrp.bom: wrong check for bom_find.

If the user defined a bom line type phantom to a product without bom the check is wrong to display the error message.
2014-06-04 19:22:31 +02:00
Thibault Delavallée 1dc7d4d3d8 [FIX] mass_mailing: fixed computation of mailing domain when having more than 1 mailing list added in the recipients. A bit longer, but less buggy. 2014-06-04 18:54:20 +02:00
Christophe Matthieu fabbcf508f [FIX] mrp.bom: wrong check for bom_find. If the user defined a bom line type phantom to a product without bom the check is wrong to display the error message. 2014-06-04 18:44:02 +02:00
Thibault Delavallée 00b8f5b001 [FIX] mass_mailing: mailing form view: better display of action buttons, avoiding having several 'red action buttons' at the same time. 2014-06-04 18:20:55 +02:00
Denis Ledoux 489742873d [FIX] website_sale: backport commit 3cc4785ba6 of master
This fix aimed saas-5, not master.
original Commit message:
display accessory field in form view and display the good accessory product inside ecommerce
This is related to previous rev 86055fb8cd
2014-06-04 11:25:51 +02:00
Denis Ledoux 86055fb8cd [FIX] website_sale: accessory_product_ids are product.product, not product.template
This many2many field should actually have product.template as relation
But, in a stable release, we cannot alter the database
Therefore, when displaying accessory products in the card, it display the product_tmpl_id of the product.product, not itself
This relation should be changed in trunk
+ Actually displaying this field in the backend
2014-06-04 10:44:56 +02:00
Christophe Simonis b1c0bc0b46 [MERGE] forward port of branch saas-4 up to 65f68c1 2014-06-03 19:45:19 +02:00
Christophe Simonis 65f68c1f65 [MERGE] forward port of branch saas-3 up to 7dd6954 2014-06-03 19:14:22 +02:00
Christophe Simonis 7dd69540e8 [MERGE] forward port of branch 7.0 up to 0c4bc1c 2014-06-03 19:11:44 +02:00
Christophe Matthieu 7770ca8013 Merge pull request #320 from odoo-dev/saas-5-website_sale-product-layout-chm
[FIX] website_sale: change template for product and variant selector (type color)
2014-06-03 18:07:43 +02:00
Christophe Simonis 70041a5f1b [FIX] routing_map: correct subclasses detection.
Subclass detection didn't include the class itself if all it's subclasses
were invalid. As we create a new regrouping subclass, that was always the
case after a registry reloading, causing subclassed controllers to not be
taken in account.

[IMP] routing_map: clean code a little bit
2014-06-03 17:55:34 +02:00
Martin Trigaux 0c4bc1cf72 [FIX] sale: keep customer reference in grouped invoice (opw 606523) 2014-06-03 17:15:08 +02:00
Denis Ledoux 7a157dd35e [FIX] delivery: allow to add delivery method in quotation if quotation in quotation sent stage
opw-607920
2014-06-03 17:12:07 +02:00
Christophe Matthieu 057d26f860 [IMP] product: set at false one product variant of ipad 2014-06-03 16:58:26 +02:00
Martin Trigaux a07af9e715 Merge pull request #322 from guewen/product-write-fix
[FIX] product: write() should accept both int/long and tuple/list
2014-06-03 16:48:40 +02:00
Denis Ledoux eafa5ff0b5 [MERGE] Forward-port of latest saas-3 bugfixes, up to rev. e7a0b1bb90 2014-06-03 16:28:06 +02:00
Guewen Baconnier 79f2b47576 Wrong variable name. The write() method should accept both int/long and tuple/list 2014-06-03 16:13:54 +02:00
Christophe Matthieu c5ab412acc [FIX] website_sale: change template for product and variant selector (type color) 2014-06-03 15:38:11 +02:00
Thibault Delavallée 4be1ba8b6f [FIX] mass_mailing: newsletter snippet:
- fixed subscription, was always subscribing to the last created list;
- slightly improved the snippet display, now displaying a 'thanks' when subscribed instead of just making everything disabled;
- removed unnecessary JS line
2014-06-03 15:21:29 +02:00
Denis Ledoux 1c4825294b [FIX] product: product_variant group does not exist anymore
Therefore, the pricelist item view must show the field product_tmpl_id in any case
2014-06-03 15:03:13 +02:00
Guewen Baconnier b4f72fba96 [FIX] product: fix _set_price_extra method
avoid crash is context is None
create call does not have ids parameter
2014-06-03 14:19:51 +02:00
Christophe Matthieu f911d213b0 Merge pull request #298 from odoo-dev/saas-5-fixes-product-chm
[FIX] product
Context in _set_standard_price and many2one in product.packaging;
Set required at false for product template field when creating a product product;
Remove wrong field on product.template. TODO: move packaging field form product.product to product.template
2014-06-03 13:16:27 +02:00
Denis Ledoux e7a0b1bb90 [FIX] event_sale: stored seats_max field
seats_max is a stored field in event, and should remain stored when overrided in event_sale
2014-06-03 12:21:34 +02:00
Thibault Delavallée c1b2b657fa Merge pull request #288 from odoo-dev/saas-4-mass_mailing_fixes-tde
[FIX] mass_mailing: fixes
- backport (+ cleaning) of eb22d202e4 (saas-5): mail_thread: routing: instead of exclusive routing heuristics, use each case as a fallback of the previous.
- better fix for dd36a0e509 (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 d6a2ae642b (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)
2014-06-03 12:03:42 +02:00
Christophe Matthieu 91cb75babd [FIX] product: remove wrong field on product.template. TODO: move packaging field form product.product to product.template 2014-06-03 11:15:17 +02:00
Christophe Matthieu da6f02027a [FIX] product: set required at false for product template field when creating a product product. 2014-06-03 11:13:50 +02:00
Thibault Delavallée e02759a58e [FIX] website_mail: fixed template choice and body duplication in the email designer that was buddy; added some css to the page to make it more look like an email designer; also added a demo data for a template for mass mailing contacts in mass_mailing module. 2014-06-03 10:56:05 +02:00
Martin Trigaux aa1165441c [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.
2014-06-03 10:48:26 +02:00
Martin Trigaux 3cb551bf50 [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) 2014-06-03 10:20:55 +02:00
Thibault Delavallée 257631e331 [FIX] sales_team, crm: fixed sales_team form view: alias data was not displayed due to wrongly done inheritance + fixed a typo hidden in the view 2014-06-03 08:55:00 +02:00
Olivier Dony d9ff7c4efc [FIX] procurement: restore fixes for background procurement from rev.9b6f5dc, accidentally reverted by v8 WMS branch
Probably forgotten during a sync with master, as the
fixes belong to a different file now.
This is the second part of the fix in previous commit.
2014-06-02 19:47:03 +02:00
Olivier Dony 1e9b41e2a4 [FIX] procurement: restore fix for background procurement from 9b6f5dc, accidentally reverted by WMS branch for v8
Probably forgotten during a sync with master, as the
fix belongs to a different file now.
2014-06-02 19:21:23 +02:00
Denis Ledoux 0a537dae91 [FIX] auth_oauth: missing res_users.py diff from rev 33bfec2174
Most probably due to github migration
+  fix: directly redirect to login redirect paramas, instead of redirecting on the complete  web/login + redirect url
2014-06-02 18:47:41 +02:00
OstapYakovenko e035cc9105 [FIX] hr_timesheet_sheet: fix typo in field name 2014-06-02 18:37:52 +02:00
Martin Trigaux 6e5bef9bd2 [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.
2014-06-02 18:22:06 +02:00
Martin Trigaux 530d8bf3ce 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/`.
2014-06-02 18:10:36 +02:00
Cédric Snauwaert 444b18e494 Merge pull request #300 from odoo-dev/saas-4-modal-kanban-fix-csn
[FIX]modal close function in kanban and edi
2014-06-02 17:15:08 +02:00
Cedric Snauwaert 772a5d6b75 [FIX]modal close function in kanban and edi 2014-06-02 16:41:58 +02:00
Christophe Matthieu caf4bf77bc [FIX] product: check if context is none in _set_standard_price before check context keys 2014-06-02 15:48:24 +02:00
Christophe Simonis 45d42d0134 [FIX] http: change the way the routing map is build
Instead of only taking direct subclasses of controllers, take the lowest controller in the hierarchy
Allowing subclassing controllers
2014-06-02 15:38:02 +02:00
Christophe Simonis 8ac408f70e [FIX] auth_oauth: controller need to inherit from auth_signup controller 2014-06-02 15:17:58 +02:00
Thibault Delavallée cbdf7830b1 [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.
2014-06-02 13:52:27 +02:00
Denis Ledoux e61fb4d80a [FIX] base: security, do not override basic ir_config_paramter ACL 2014-06-02 13:00:36 +02:00
Denis Ledoux a7a51cf55d [FIX] base: security, group settings is authorized to alter ir.config_parameter 2014-06-02 12:57:57 +02:00
Denis Ledoux 6ed5b04146 [FIX] calendar: replace end_type = final_date by end_date, the actual right selection 2014-06-02 12:02:11 +02:00
Jean-Baptiste Quenot 310ecb0d60 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"
2014-06-02 11:48:30 +02:00
Denis Ledoux eb22d202e4 [FIX] mail: mail routing, allow more fallback cases
Specifically, allow mail to fallback in aliases if the post in the document res_model/res_id wasnt succesful
2014-06-02 01:37:45 +02:00