Commit Graph

72468 Commits

Author SHA1 Message Date
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 9bcda15b97 [FIX] website: prevent to split google analytics script 2014-06-04 16:15:16 +02:00
Martin Trigaux 25292ef0a5 [FIX] point_of_sale: correct call to default value
The default value should be called with a lambda otherwise the payment_date is set to the date the server was started (opw 606715)
2014-06-04 15:19:57 +02:00
Martin Trigaux 7b31b082a1 [FIX] kanban: avoid wrong placement of button on ie9
On ie9, the 'read more' button in kanban view was placed in the middle of the window instead of the bottom
2014-06-04 15:06:53 +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
Martin Trigaux 841e47a46a [FIX] stock: use correct vals in grouped invoice (opw 606535)
When creating a grouped invoice, the invoice_vals value is used to create the invoice line.
The value was not reset for grouped invoice and we reused the values of previous line.
2014-06-04 10:42:43 +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
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
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
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 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 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
Denis Ledoux da231e909a [FIX] mail: commited pudb ... its late and it has been a while since the last time : ). 2014-06-01 22:10:54 +02:00
Denis Ledoux dd36a0e509 [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)
2014-06-01 22:08:56 +02:00
Denis Ledoux d6a2ae642b [FIX] mass_mailing: avoid to eval an undefined domain 2014-06-01 21:45:26 +02:00
Denis Ledoux 97c0dbcd0a [FIX] mail: do not link email to a model/res_id if this model doesn't support new message 2014-06-01 21:27:55 +02:00
Denis Ledoux 9d33ce4900 [FIX] website_sale: missing openerp.tools import 2014-06-01 20:20:21 +02:00
Christophe Simonis c19bb8ce48 [FIX] website: correct "/" redirect to first menu 2014-06-01 14:30:15 +02:00
Christophe Simonis 587084f682 [MERGE] forward port of branch saas-4 up to revid c319dc4 2014-06-01 11:19:03 +02:00
Christophe Simonis c319dc40e7 [FIX] mail: view_mode "list" does not exists, it's "tree" 2014-06-01 11:17:09 +02:00
Christophe Simonis 36f9af78aa [MERGE] forward port of branch saas-3 up to revid faace84 2014-06-01 10:56:39 +02:00
Christophe Simonis faace8493d [FIX] email_template: partners ids are integers, not strings 2014-06-01 10:52:02 +02:00
Christophe Simonis 285e1d5c38 [FIX] website_sale: so javascipt does not like tuples. use a list instead 2014-05-31 15:37:23 +02:00
Christophe Simonis 960b86611e [FIX] website_sale: remove invalid (and stupid) function field 2014-05-31 14:05:48 +02:00
Olivier Dony 52501dde7a [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)
2014-05-31 01:48:55 +02:00
Christophe Simonis 7dd79cb183 Merge pull request #278 from odoo-dev/master-bank-reconcile-ama
[IMP] account: bank statement reconciliation widget
2014-05-30 22:54:05 +02:00
qdp-odoo ee92839465 [FIX] account: fixed inconsistence in yaml test since some demo data was added 2014-05-30 22:25:52 +02:00
Fabien Pinckaers 84d194d7a1 Merge pull request #269 from sve-odoo/patch-1
[ADD] "Model" Column in base_action_rule tree view.
2014-05-30 21:26:13 +02:00
Christophe Simonis 7ce927ab46 [FIX] account_bank_statement_extensions: do not extend dropped form view 2014-05-30 20:34:56 +02:00
qdp-odoo f839621f52 [FIX] account_bank_statement_extension: fixed xml path in view 2014-05-30 19:28:40 +02:00
qdp-odoo 07460d7191 [IMP] account: bank statement reconciliation widget (part 3: missing files lost during manual merge (renamed)) 2014-05-30 19:04:13 +02:00
qdp-odoo e3491ccb71 [IMP] account: bank statement reconciliation widget (part 2) 2014-05-30 18:47:50 +02:00
qdp-odoo 7580b6510b [IMP] account: bank statement reconciliation widget 2014-05-30 18:34:13 +02:00
qdp-odoo 52b799d8d0 [MERGE] master-wmsstaging-jco with fixes on WMS + new barcode reports 2014-05-30 18:09:05 +02:00
Christophe Simonis ee304fa65f [IMP] replace OpenERP by Odoo in backend + change company default logo. 2014-05-30 17:30:36 +02:00
qdp-odoo 0fa755bc89 [MERGE] master 2014-05-30 17:05:44 +02:00
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
Richard Mathot 8d822419e7 [FIX] website: fix incomplete refactoring 2014-05-30 15:35:59 +02:00
Richard Mathot 29387c518e [REV][FIX] Reverting regression introduced in forward-port
04211015fc
2014-05-30 15:20:18 +02:00
Thibault Delavallée 0b54d8fb3c [FIX] website_mail_group: fixed discussion group data, wrongly forward-ported 2014-05-30 11:22:00 +02:00
Josse Colpaert 742cfe83e0 Merge remote-tracking branch 'odoo/master' into master-wmsstaging-jco 2014-05-30 11:15:51 +02:00
Josse Colpaert 45dc3db6cc Merge branch 'master-wmssecurity3-jco' into master-wmsstaging-jco 2014-05-30 10:37:26 +02:00
Josse Colpaert 231278997e Merge branch 'master-wmsstatbut-jco' into master-wmsstaging-jco 2014-05-30 10:24:31 +02:00
Christophe Simonis fb650ee92e [MERGE] product: refactoring of product variants.
close PR #222
2014-05-30 10:22:36 +02:00
Christophe Simonis b8af4775e3 [IMP] product: improve field labels about variant/attributes distinction 2014-05-30 10:00:54 +02:00
Antony Lesuisse c05584a4d9 [FIX] website_sale and website_event imports
missing import prevent cli help display
2014-05-29 23:19:24 +02:00
sve-odoo 6c89284ec6 [ADD] "Model" Column in base_action_rule tree view. 2014-05-29 15:48:10 +02:00
Antony Lesuisse 130c889348 [FIX] ir.attachment mess, restore list view 2014-05-29 15:02:27 +02:00
Josse Colpaert 7b890e138a [IMP] Location barcode 2014-05-29 14:58:48 +02:00
Olivier Dony 045ecc603e [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.
2014-05-29 02:07:18 +02:00
Olivier Dony 248107d11a [FIX] website_mail*: fix + bundlify changes of 0c89ca: move subscription widget from website_mail to website_mail_group 2014-05-29 01:59:47 +02:00
Fabien Meghazi c9e12161c9 [FIX] website_mail.editor.js moved but still referenced
Commit 0c89ca0f8f moves
website_mail.editor.js but is still referenced in website_mail.xml
2014-05-28 23:13:38 +02:00
Christophe Matthieu 138274e30d [FIX] point_of_sale: fix product view layout 2014-05-28 20:50:20 +02:00
Christophe Matthieu 0017d02469 [FIX] membership: increase priority of product view (don't take this view by default). 2014-05-28 20:49:51 +02:00
Christophe Matthieu 435b5b9ca3 [IMP] product: rename fields variant_ids into attribute_line_ids on the template and attribute_value_ids on the product. 2014-05-28 19:42:15 +02:00
Pariket Trivedi 09dd6e3da6 [IMP] event_sale: extra QWeb report for printing event badges, with HTML fields for custom content 2014-05-28 19:05:11 +02:00
Christophe Matthieu 152ec5bf50 [FIX] product: revert change for price_extra. Need to filter by template to apply the price_extra. 2014-05-28 19:04:23 +02:00
Christophe Simonis d42840a6f8 Merge pull request #226 from odoo-dev/master-website_sale-add-vat-chm
[IMP] website_sale: add vat field on checkout + validate it if base_vat module is installed
2014-05-28 18:45:12 +02:00
Christophe Matthieu 6958d56a66 [IMP] product: fixes for review 2014-05-28 18:30:03 +02:00
Denis Ledoux 65d7cc524d [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
2014-05-28 18:00:11 +02:00
Olivier Dony e276ac33f6 [MERGE] Forward-port saas-4 up to bf135ad 2014-05-28 17:45:31 +02:00
Richard Mathot bf135ad057 [FIX] website_blog: display properly (very) long words in comments 2014-05-28 17:23:28 +02:00
Denis Ledoux 6ed774de61 [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 a37bad205b
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
2014-05-28 15:50:02 +02:00
Denis Ledoux f085274d5f [MERGE] Forward-port of latest saas-3 bugfixes, up to rev. df0ae7e4d1 2014-05-28 14:53:32 +02:00
Thibault Delavallée 57c85a8b7a 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
2014-05-28 14:10:05 +02:00
Denis Ledoux df0ae7e4d1 [FIX] payment_paypal: wrong handling fees computation formula 2014-05-28 14:02:56 +02:00
Christophe Matthieu 3f1e459430 [FIX] mrp_sale: move explode product with wrong bom; change product id 2014-05-28 12:29:56 +02:00
Christophe Matthieu be8e10097d [FIX] mrp: demo data is wrong don't produce ipad but pc 2014-05-28 12:26:57 +02:00
Denis Ledoux 00dc3a59df [FIX] website_sale: force changing pricelist on different account signin
opw-607517
2014-05-28 12:04:41 +02:00