Commit Graph

88565 Commits

Author SHA1 Message Date
Fabien Pinckaers f6575e2645 [FIX] Missing file 2014-05-23 09:43:34 +02:00
Fabien Pinckaers 143615ddc1 Merge branch 'master-remove-html-fields-backend-ypa' of https://github.com/odoo-dev/odoo into odoo-dev-master-remove-html-fields-backend-ypa 2014-05-23 09:24:16 +02:00
Fabien Pinckaers a3f5da5f4f Merge pull request #168 from legalsylvain/master
[FIX] Issues #167. Remove obsolete shop reference
2014-05-23 09:15:08 +02:00
Sylvain LE GAL 5d8927e2b1 [FIX] Issues #167. Remove obsolete shop reference 2014-05-22 22:55:50 +02:00
etenesaca aa1deea9b5 Merge remote-tracking branch 'odoo/master' 2014-05-22 14:42:14 -05:00
Olivier Dony 2af03e1b6e [MERGE] Forward-port latest 7.0 bugfixes, up to f8671cb 2014-05-22 16:44:33 +02:00
Thibault Delavallée ada00bbe32 Merge pull request #164 from odoo-dev/master-website_sale--fix-tde
[FIX] website_sale: cleaned call to removed methods in website_sale
2014-05-22 16:22:32 +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
Martin Trigaux c0fdc2cdbe Improvement of the delivery module
Add field sequence on the delivery.gird.line to order rules
Add condition quantity to add more flexibility in the rules
Add operators > and < to be able to create rules without gap (instead of needing hack like 'x <= 100', 'x >= 100.000001')
2014-05-22 15:41:36 +02:00
--global 13ac3865d5 [CLEAN] Use none or false, but not both on two lines ... 2014-05-22 15:40:29 +02:00
--global 15e874b5c8 [FIX] website_sale: still cleaning lost references to deleted code in website_sale ...
Fixed checkout redirection that was meant to clean the session (incorrect sale order or transaction) that may happen
when having issues with the payment.
2014-05-22 15:34:09 +02:00
Martin Trigaux 0efc066aa6 Add sequence field with handle in tree view 2014-05-22 14:56:33 +02:00
Martin Trigaux 4e34e3bce5 Add < and > operators to allow rules without gap (eg: until 100 & above 100) 2014-05-22 14:55:26 +02:00
Thibault Delavallée 8df42a88ab Merge pull request #160 from odoo-dev/master-forum-subtypes-tde
MERGE [IMP] website_forum: make forum.forum inherit from mail.thread. This way we add the possibility to users to follow a forum and be automatically followers of new questions, using some new subtypes on the forum.forum model that do the auto subscription.

Misc :

also added a profile link on the forum, when logged.
also added a subscribe button on the forum.
2014-05-22 14:29:06 +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
--global 2649beba97 [IMP] website_forum: make forum;forum inherit from mail.thread. This way we
add the possibility to users to follow a forum and be automatically followers of new
questions, using some new subtypes on the forum.forum model that do the auto subscription.

Also added a profile link on the forum, when logged.

Also added a subscribe button on the forum.
2014-05-22 13:49:41 +02:00
Richard Mathot 8ad97da843 Merge pull request #159 from odoo-dev/master-gengo-fix-rim
[FIX] base_gengo: use supported/up-to-date library
2014-05-22 13:46:15 +02:00
tpa-odoo 15e0662200 [IMP] improved sequence of menu 2014-05-22 17:12:57 +05:30
tpa-odoo 8fa3a17c39 [IMP] improved code to show import result in wizard and improved typo 2014-05-22 17:09:52 +05:30
--global 47f24697ec [FIX] website_mail_group: effectively handle replies_per_page parameter that controls the number of replies to display under each message. 2014-05-22 13:38:07 +02:00
Richard Mathot 0b0f74861e [DOC] base_gengo: add changelog 2014-05-22 13:36:48 +02:00
--global 8a6b0d1d4d [FIX] website_mail_group: number of thread and replies back to normal values after testing. 2014-05-22 13:29:49 +02:00
--global a6eaa7bac3 [FIX] website_mail_group: email-based author was wrongly placed in the layout 2014-05-22 12:48:32 +02:00
--global b0def9d479 [FIX] website_mail_group: order archives by date descending 2014-05-22 12:48:09 +02:00
Yogesh Parekh 59ecefbed2 Remove content field in Pages History form in website_blog module 2014-05-22 16:17:22 +05:30
--global 538d97a6b3 [FIX] website_mail_group: better layout for main mailing lists page: more space for subscribe button 2014-05-22 12:25:35 +02:00
tpa-odoo 41147025b8 [ADD] add wizard to import zipped module 2014-05-22 15:51:51 +05:30
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
--global 6ed56d8393 Merge remote-tracking branch 'odoo/saas-4' into saas-4-website-mail-group-tde 2014-05-22 12:14:17 +02:00
Richard Mathot b283f8d5b1 [FIX] base_gengo: use supported/up-to-date library 2014-05-22 12:13:34 +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
Yogesh Parekh 52f571ac8a Remove content html field from website_blog module 2014-05-22 15:33:37 +05:30
Yogesh Parekh c0f453a1ea Remove description html field from website_event_track module 2014-05-22 15:28:39 +05:30
Yogesh Parekh a79ffefd87 Remove description html field in website_forum module 2014-05-22 15:26:10 +05:30
Yogesh Parekh 3772a3a3af Remove html fields in frontend from website_quote module 2014-05-22 15:23:09 +05:30
Richard Mathot 7184f8c3f0 Merge pull request #127 from odoo-dev/saas-4-speakers-rim
[MERGE][FIX] website_event_track: display speakers name to public users
2014-05-22 10:29:36 +02:00
Denis Ledoux c0e9a15960 [MERGE] Forward-port of latest saas-3 bugfixes, up to rev. a096ae0080 2014-05-22 09:35:26 +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
Richard Mathot fbdc29459f Merge remote-tracking branch 'odoo/saas-4' into saas-4-speakers-rim 2014-05-21 17:11:58 +02:00
Richard Mathot 37d6fe344b [FIX] website_event_track: display speakers name to public users 2014-05-21 17:10:50 +02:00
Thibault Delavallée 9d1e0be2e9 Merge pull request #126 from odoo-dev/saas-4-gitignore-tde
[IMP] [BACKPORT] Converto bzrignore to gitignore, like what has been done in master.
2014-05-21 17:10:40 +02:00
--global 1b40b5b37a [IMP] [BACKPORT] Converto bzrignore to gitignore, like what has been done in master. 2014-05-21 16:52:24 +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
Thibault Delavallée 59a7c85a6f Merge remote-tracking branch 'odoo/saas-4' into saas-4-website-mail-group-tde 2014-05-21 16:35:48 +02:00
Thibault Delavallée 007725cd07 [FIX] website_mail_group: added forgotten files for css / js. 2014-05-21 16:35:15 +02:00
Thibault Delavallée 52eb9cba89 [IMP] website_mail_group: refactored layout of displayed mailing lists and their archive. Should be a bit more easy to use and understand. Todo: fix number of displayed thread / replies, and probably re-do the layout once somebody decides to change everything. 2014-05-21 16:32:31 +02:00
Thibault Delavallée b7c6b1cbca [FIX] website_mail: message description should effectively be limited to the first 30 characters. 2014-05-21 16:27:17 +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
etenesaca 0295e12d6c Merge with Origin Master - odoo/odoo 2014-05-21 08:54:51 -05: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