Commit Graph
82194 Commits
Author SHA1 Message Date
Denis Ledoux 9bcda15b97 [FIX] website: prevent to split google analytics script 2014-06-04 16:15:16 +02:00
Christophe Simonis 7dd69540e8 [MERGE] forward port of branch 7.0 up to 0c4bc1c 2014-06-03 19:11:44 +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
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
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
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
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
Christophe Simonis faace8493d [FIX] email_template: partners ids are integers, not strings 2014-06-01 10:52:02 +02:00
Denis Ledoux 3f6f43214f [FIX] replace .bzrignore by .gitignore, as we are now working with git 2014-05-28 18:17:33 +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
Denis Ledoux df0ae7e4d1 [FIX] payment_paypal: wrong handling fees computation formula 2014-05-28 14:02:56 +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
Richard Mathot 5f94504c08 [TYPO] in crm_partner_assign 2014-05-28 10:06:42 +02:00
Denis Ledoux cadf582d78 [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
2014-05-27 18:39:00 +02:00
Martin Trigaux 41c5ceb8eb [FIX] stock: clean previous commit 2014-05-27 17:56:30 +02:00
Martin Trigaux 1ef2c18103 [FIX] stock: auto_validate move not set to done when multiple parent move set to done at the same time (opw 607970) 2014-05-27 17:47:28 +02:00
Olivier Dony 30f43daa3b [MERGE] Forward-port of latest 7.0 bugfixes, up to aeaa826 2014-05-27 16:50:02 +02:00
Martin Trigaux aeaa826d2f 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.
2014-05-27 16:37:10 +02:00
Denis Ledoux 63b7f678f3 [FIX] website_sale: in the product grid, a product must have min size 1 and max size 4 2014-05-27 16:11:27 +02:00
Mohammed Shekha 26cb208903 [FIX]Refixed the issue of o2m record duplication 2014-05-27 19:35:09 +05:30
Martin Trigaux 14c300bdbd Merge pull request #223 from odoo-dev/7.0-ail-form-context-parent-mat
account: safer access to parent in invoice line form
2014-05-27 10:32:53 +02:00
Denis Ledoux c6c8fb06a9 [FIX] account_followup: account_followup_print report, sxw according to rml 2014-05-27 10:29:12 +02:00
Martin Trigaux 222e7915a6 [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
2014-05-27 10:16:44 +02:00
Mohammed Shekha 477fa85e55 [FIX]Fixe the issue o2m record duplication. 2014-05-27 10:10:06 +05:30
Martin Trigaux 8b546d20ad 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.
2014-05-26 17:07:14 +02:00
Martin Trigaux c4d63fe364 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.
2014-05-26 14:35:04 +02:00
JoshuaJan e6973e2c64 'invoiced' fields help message is wrong 2014-05-26 17:55:26 +08:00
Denis Ledoux fa5cfcd67e [FIX] hr_recruitment: default company set according to department company 2014-05-26 11:20:40 +02:00
buke 1971141dc5 Fixed delivery grid get_price
It's wrong for cal weight in delivery gird . It's use product.weight * qty.
2014-05-26 17:12:38 +08:00
Denis Ledoux be0ce80f5f [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 2014-05-23 17:58:00 +02:00
Denis Ledoux c59427d23f [FIX] purchase: po email template, the currency could be different than the pricelist currency 2014-05-23 17:13:42 +02:00
Denis Ledoux 7ccd8fdcc7 [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
2014-05-23 15:54:43 +02:00
Denis Ledoux 51c7b55da0 [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.
2014-05-23 13:15:52 +02:00
Denis Ledoux 7a3b7f7fe2 [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
2014-05-23 11:16:46 +02:00
Martin Trigaux 4c36ee0b59 Restore missed images during bzr to git transition 2014-05-23 10:11:25 +02:00
Olivier Dony 2af03e1b6e [MERGE] Forward-port latest 7.0 bugfixes, up to f8671cb 2014-05-22 16:44:33 +02:00
Denis Ledoux f8671cb48a [REVERT] b6a7402fdb, pagereset seems to be useful in some cases. Need to check deeper 2014-05-22 16:17:04 +02:00
Olivier Dony 02035b27b8 [RESTORE] Restore *.sxw files, skipped during bzr-to-git conversion to discard older binary blobs 2014-05-22 14:07:15 +02:00
Martin Trigaux 35a07975de [FIX] website_sale: add the parameter _mail_post_access on product.template
This parameter gives the possibility to post messages en product.template to
people having a read access. The website_sale giving the possibility to post
comments, people not belonging to the 'Sale Manager' group were not able to
post messages.
2014-05-22 12:15:45 +02:00
Martin Trigaux 1ae8c980c3 Merge pull request #55 from yvaucher/7.0-fix-1319095
report_webkit: use safer and non-deprecated methods to handle temporary files
2014-05-22 12:05:05 +02:00
Anaël Closson f96a03247b [FIX] stock: auto_validate move not set to done when multiple parent move set to done at the same time - opw 607970 2014-05-22 09:26:40 +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
Martin Trigaux 91d61212e1 Merge pull request #14 from savoirfairelinux/7.0-crossovered_unicode_1292245
[FIX] Fix account_budget name unicode error (7.0 lp:1292245)
2014-05-21 16:51:34 +02:00
Martin Trigaux acca55b06b Merge pull request #124 from odoo-dev/7.0-aged-partner-partial-mat
[IMP] account: support for partial reconciliation in aged partner balance
    
When computing the aged partner balance, the partial reconciliation was not handled correctly. The reconciled amount should be removed from the original remaining amount instead of displaying two entries in the journal.
eg: if invocie of 1000 in period 1 and payment of 300 in period 2, should only display +700 in period 1 instead of two entries
2014-05-21 16:16:19 +02:00
Martin Trigaux abe5c803a0 [IMP] account: support for partial reconciliation in aged partner balance
When computing the aged partner balance, the partial reconciliation was not
handled correctly. The reconciled amount should be removed from the original
remaining amount instead of displaying two entries in the journal.
eg: if invocie of 1000 in period 1 and payment of 300 in period 2, should only
display +700 in period 1 instead of two entries
2014-05-21 15:48:35 +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
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