Olivier Dony [Tue, 3 Jun 2014 22:08:01 +0000 (00:08 +0200)]
[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.
Christophe Simonis [Wed, 4 Jun 2014 17:22:31 +0000 (19:22 +0200)]
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.
Thibault Delavallée [Wed, 4 Jun 2014 16:54:20 +0000 (18:54 +0200)]
[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.
Christophe Matthieu [Wed, 4 Jun 2014 16:44:02 +0000 (18:44 +0200)]
[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.
Thibault Delavallée [Wed, 4 Jun 2014 16:20:55 +0000 (18:20 +0200)]
[FIX] mass_mailing: mailing form view: better display of action buttons, avoiding having several 'red action buttons' at the same time.
Denis Ledoux [Wed, 4 Jun 2014 09:25:51 +0000 (11:25 +0200)]
[FIX] website_sale: backport commit
3cc4785ba6d27475323a606fef9466286024ad0e 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
86055fb8cd5f86d9b4416d9d9a1a736e1c06aba9
Denis Ledoux [Wed, 4 Jun 2014 08:44:56 +0000 (10:44 +0200)]
[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
Christophe Simonis [Tue, 3 Jun 2014 17:45:19 +0000 (19:45 +0200)]
[MERGE] forward port of branch saas-4 up to 65f68c1
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
Christophe Matthieu [Tue, 3 Jun 2014 16:07:43 +0000 (18:07 +0200)]
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)
Christophe Simonis [Tue, 3 Jun 2014 15:48:08 +0000 (17:48 +0200)]
[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
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
Christophe Matthieu [Tue, 3 Jun 2014 14:58:26 +0000 (16:58 +0200)]
[IMP] product: set at false one product variant of ipad
Martin Trigaux [Tue, 3 Jun 2014 14:48:40 +0000 (16:48 +0200)]
Merge pull request #322 from guewen/product-write-fix
[FIX] product: write() should accept both int/long and tuple/list
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
Guewen Baconnier [Tue, 3 Jun 2014 14:13:54 +0000 (16:13 +0200)]
Wrong variable name. The write() method should accept both int/long and tuple/list
Christophe Matthieu [Tue, 3 Jun 2014 13:38:11 +0000 (15:38 +0200)]
[FIX] website_sale: change template for product and variant selector (type color)
Thibault Delavallée [Tue, 3 Jun 2014 13:21:29 +0000 (15:21 +0200)]
[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
Denis Ledoux [Tue, 3 Jun 2014 13:03:13 +0000 (15:03 +0200)]
[FIX] product: product_variant group does not exist anymore
Therefore, the pricelist item view must show the field product_tmpl_id in any case
Guewen Baconnier [Tue, 3 Jun 2014 12:19:51 +0000 (14:19 +0200)]
[FIX] product: fix _set_price_extra method
avoid crash is context is None
create call does not have ids parameter
Christophe Matthieu [Tue, 3 Jun 2014 11:16:27 +0000 (13:16 +0200)]
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
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)
Christophe Matthieu [Tue, 3 Jun 2014 09:15:17 +0000 (11:15 +0200)]
[FIX] product: remove wrong field on product.template. TODO: move packaging field form product.product to product.template
Christophe Matthieu [Tue, 3 Jun 2014 09:13:50 +0000 (11:13 +0200)]
[FIX] product: set required at false for product template field when creating a product product.
Thibault Delavallée [Tue, 3 Jun 2014 08:56:05 +0000 (10:56 +0200)]
[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.
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)
Thibault Delavallée [Tue, 3 Jun 2014 06:55:00 +0000 (08:55 +0200)]
[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
Olivier Dony [Mon, 2 Jun 2014 17:47:03 +0000 (19:47 +0200)]
[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.
Olivier Dony [Mon, 2 Jun 2014 16:57:26 +0000 (18:57 +0200)]
[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.
Denis Ledoux [Mon, 2 Jun 2014 16:47:41 +0000 (18:47 +0200)]
[FIX] auth_oauth: missing res_users.py diff from rev
33bfec21743c9200f491bd0ddcc6d368cd948f85
Most probably due to github migration
+ fix: directly redirect to login redirect paramas, instead of redirecting on the complete web/login + redirect url
OstapYakovenko [Mon, 2 Jun 2014 16:37:52 +0000 (18:37 +0200)]
[FIX] hr_timesheet_sheet: fix typo in field name
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
Christophe Matthieu [Mon, 2 Jun 2014 13:48:24 +0000 (15:48 +0200)]
[FIX] product: check if context is none in _set_standard_price before check context keys
Christophe Simonis [Mon, 2 Jun 2014 13:38:02 +0000 (15:38 +0200)]
[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
Christophe Simonis [Mon, 2 Jun 2014 13:17:58 +0000 (15:17 +0200)]
[FIX] auth_oauth: controller need to inherit from auth_signup controller
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
Denis Ledoux [Mon, 2 Jun 2014 10:02:11 +0000 (12:02 +0200)]
[FIX] calendar: replace end_type = final_date by end_date, the actual right selection
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"
Denis Ledoux [Sun, 1 Jun 2014 23:37:45 +0000 (01:37 +0200)]
[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
Denis Ledoux [Sun, 1 Jun 2014 20:10:54 +0000 (22:10 +0200)]
[FIX] mail: commited pudb ... its late and it has been a while since the last time : ).
Denis Ledoux [Sun, 1 Jun 2014 20:08:56 +0000 (22:08 +0200)]
[FIX] mass_mailing: on mass mailing sending, set same_thread for message composer
same_thread boolean field of mail.compose.message model define wether or not replies should be posted in the thread or not
On composer creation, this boolean should be passed according to the reply_to_mode of the mass_mailing
Otherwise, all replies would be posted in the thread, and the reply_to will be ignored (if same_thread id True, reply_to is poped from the mails values, mail/wizard/mail_compose_message.py:284)
Denis Ledoux [Sun, 1 Jun 2014 19:45:26 +0000 (21:45 +0200)]
[FIX] mass_mailing: avoid to eval an undefined domain
Denis Ledoux [Sun, 1 Jun 2014 19:27:55 +0000 (21:27 +0200)]
[FIX] mail: do not link email to a model/res_id if this model doesn't support new message
Denis Ledoux [Sun, 1 Jun 2014 18:20:21 +0000 (20:20 +0200)]
[FIX] website_sale: missing openerp.tools import
Christophe Simonis [Sun, 1 Jun 2014 12:30:15 +0000 (14:30 +0200)]
[FIX] website: correct "/" redirect to first menu
Christophe Simonis [Sun, 1 Jun 2014 09:19:03 +0000 (11:19 +0200)]
[MERGE] forward port of branch saas-4 up to revid c319dc4
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
Christophe Simonis [Sat, 31 May 2014 13:37:23 +0000 (15:37 +0200)]
[FIX] website_sale: so javascipt does not like tuples. use a list instead
Christophe Simonis [Sat, 31 May 2014 12:05:48 +0000 (14:05 +0200)]
[FIX] website_sale: remove invalid (and stupid) function field
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)
Christophe Simonis [Fri, 30 May 2014 21:05:34 +0000 (23:05 +0200)]
[REL] saas-5
Christophe Simonis [Fri, 30 May 2014 20:54:05 +0000 (22:54 +0200)]
Merge pull request #278 from odoo-dev/master-bank-reconcile-ama
[IMP] account: bank statement reconciliation widget
qdp-odoo [Fri, 30 May 2014 20:25:52 +0000 (22:25 +0200)]
[FIX] account: fixed inconsistence in yaml test since some demo data was added
Fabien Pinckaers [Fri, 30 May 2014 19:26:13 +0000 (21:26 +0200)]
Merge pull request #269 from sve-odoo/patch-1
[ADD] "Model" Column in base_action_rule tree view.
Christophe Simonis [Fri, 30 May 2014 18:34:56 +0000 (20:34 +0200)]
[FIX] account_bank_statement_extensions: do not extend dropped form view
qdp-odoo [Fri, 30 May 2014 17:28:40 +0000 (19:28 +0200)]
[FIX] account_bank_statement_extension: fixed xml path in view
qdp-odoo [Fri, 30 May 2014 17:04:13 +0000 (19:04 +0200)]
[IMP] account: bank statement reconciliation widget (part 3: missing files lost during manual merge (renamed))
qdp-odoo [Fri, 30 May 2014 16:47:50 +0000 (18:47 +0200)]
[IMP] account: bank statement reconciliation widget (part 2)
qdp-odoo [Fri, 30 May 2014 16:34:13 +0000 (18:34 +0200)]
[IMP] account: bank statement reconciliation widget
qdp-odoo [Fri, 30 May 2014 16:09:05 +0000 (18:09 +0200)]
[MERGE] master-wmsstaging-jco with fixes on WMS + new barcode reports
Christophe Simonis [Fri, 30 May 2014 15:30:36 +0000 (17:30 +0200)]
[IMP] replace OpenERP by Odoo in backend + change company default logo.
qdp-odoo [Fri, 30 May 2014 14:52:03 +0000 (16:52 +0200)]
[MERGE] master
Xavier Morel [Fri, 30 May 2014 15:00:52 +0000 (17:00 +0200)]
[FIX] bunch of changes lost in incorrect merge
f4d78ae738e474abd4e77dc8fc6cdf8a668a5d72
Xavier Morel [Fri, 30 May 2014 14:00:28 +0000 (16:00 +0200)]
[REV] attempt to revert incorrect removals in
f4d78ae738e474abd4e77dc8fc6cdf8a668a5d72
Richard Mathot [Fri, 30 May 2014 13:35:59 +0000 (15:35 +0200)]
[FIX] website: fix incomplete refactoring
Richard Mathot [Fri, 30 May 2014 13:20:18 +0000 (15:20 +0200)]
[REV][FIX] Reverting regression introduced in forward-port
04211015fc3d4be2a8c65b9d977c2d9c4dac8be7
Thibault Delavallée [Fri, 30 May 2014 09:22:00 +0000 (11:22 +0200)]
[FIX] website_mail_group: fixed discussion group data, wrongly forward-ported
Josse Colpaert [Fri, 30 May 2014 09:15:51 +0000 (11:15 +0200)]
Merge remote-tracking branch 'odoo/master' into master-wmsstaging-jco
Josse Colpaert [Fri, 30 May 2014 08:37:26 +0000 (10:37 +0200)]
Merge branch 'master-wmssecurity3-jco' into master-wmsstaging-jco
Josse Colpaert [Fri, 30 May 2014 08:24:31 +0000 (10:24 +0200)]
Merge branch 'master-wmsstatbut-jco' into master-wmsstaging-jco
Christophe Simonis [Fri, 30 May 2014 08:16:23 +0000 (10:16 +0200)]
[MERGE] product: refactoring of product variants.
close PR #222
Christophe Simonis [Fri, 30 May 2014 08:00:54 +0000 (10:00 +0200)]
[IMP] product: improve field labels about variant/attributes distinction
Antony Lesuisse [Fri, 30 May 2014 07:55:30 +0000 (09:55 +0200)]
[FIX] odoo.py git_locate
Antony Lesuisse [Thu, 29 May 2014 23:52:07 +0000 (01:52 +0200)]
[IMP] packaging v8 part1, tgz deb and rpm
Antony Lesuisse [Thu, 29 May 2014 21:19:24 +0000 (23:19 +0200)]
[FIX] website_sale and website_event imports
missing import prevent cli help display
Antony Lesuisse [Thu, 29 May 2014 16:51:59 +0000 (18:51 +0200)]
[FIX] odoo.py setup deps and readme.md
Antony Lesuisse [Thu, 29 May 2014 16:33:04 +0000 (18:33 +0200)]
[IMP] repository cleanup
- move packaging stuff to setup
- remove historical stuff
- remove oe, odoo-cmd-fme will be merged with the convered commands
- add an odoo.py script to run odo and boostrap it
- simplify README
- prepare to move documentation to the github wiki
sve-odoo [Thu, 29 May 2014 13:48:10 +0000 (15:48 +0200)]
[ADD] "Model" Column in base_action_rule tree view.
Antony Lesuisse [Thu, 29 May 2014 13:02:27 +0000 (15:02 +0200)]
[FIX] ir.attachment mess, restore list view
Josse Colpaert [Thu, 29 May 2014 12:58:48 +0000 (14:58 +0200)]
[IMP] Location barcode
Olivier Dony [Thu, 29 May 2014 00:07:18 +0000 (02:07 +0200)]
[FIX] website_mail_group: restore missing snippet icon
The file was originally added in website_mail at 59b934
in saas-4 but was lost in master since.
Olivier Dony [Wed, 28 May 2014 23:59:47 +0000 (01:59 +0200)]
[FIX] website_mail*: fix + bundlify changes of 0c89ca: move subscription widget from website_mail to website_mail_group
Fabien Meghazi [Wed, 28 May 2014 22:27:54 +0000 (00:27 +0200)]
Merge pull request #263 from odoo-dev/master-fix-asset-fme
[FIX] website_mail.editor.js moved but still referenced
Commit 0c89ca0 moves
website_mail.editor.js but is still referenced in website_mail.xml
Fabien Meghazi [Wed, 28 May 2014 21:13:38 +0000 (23:13 +0200)]
[FIX] website_mail.editor.js moved but still referenced
Commit
0c89ca0f8f2d96e37353348fe33591da8142368b moves
website_mail.editor.js but is still referenced in website_mail.xml
Christophe Matthieu [Wed, 28 May 2014 18:50:20 +0000 (20:50 +0200)]
[FIX] point_of_sale: fix product view layout
Christophe Matthieu [Wed, 28 May 2014 18:49:51 +0000 (20:49 +0200)]
[FIX] membership: increase priority of product view (don't take this view by default).
Christophe Matthieu [Wed, 28 May 2014 17:42:15 +0000 (19:42 +0200)]
[IMP] product: rename fields variant_ids into attribute_line_ids on the template and attribute_value_ids on the product.
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
Christophe Matthieu [Wed, 28 May 2014 17:04:23 +0000 (19:04 +0200)]
[FIX] product: revert change for price_extra. Need to filter by template to apply the price_extra.