Thibault Delavallée
41e3f88119
Merge remote-tracking branch 'odoo/saas-4' into saas-4-website-mail-group-tde
2014-05-23 12:40:39 +02:00
Thibault Delavallée
c40f184102
[IMP] website_mail_group: better variables name in js file
2014-05-23 12:40:08 +02:00
Thibault Delavallée
dc98882c90
[FIX] website_mail_group: added forgotten parameter for a view, added previously in this branch
2014-05-23 12:39:50 +02:00
Richard Mathot
1b0bfd2187
Merge pull request #172 from odoo-dev/saas-4-widget-image-rim
...
Some fixes in the image qweb widget + CMS fixes
2014-05-23 12:35:02 +02:00
xmo-odoo
576b00a196
Merge pull request #174 from odoo-dev/tnx-remains
...
Various ex-module remains
2014-05-23 12:21:33 +02:00
Xavier Morel
9f6f9853a0
[REM] leftovers from removed/deactivated modules
...
* document_page should have disappeared a long time ago, no idea why it
remains
* thunderbird seems to have suffered from odd conflictual moves (or lack
thereof)
* audittrail was removed but not deactivated in rosetta
2014-05-23 12:18:17 +02:00
Xavier Morel
ed156e6724
[REM] undead modules reanimated by translation file exports
2014-05-23 12:02:03 +02:00
Richard Mathot
15ea4563af
[FIX] website_crm_partner_assign: better display of partners logos
2014-05-23 11:58:25 +02:00
Richard Mathot
1d70ecd80d
[IMP] website: add max_height and max_width options to image Qweb widget
2014-05-23 11:55:48 +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
Thibault Delavallée
c69f0260ef
Merge pull request #170 from odoo-dev/master-fix-languages-thingy-tde
...
[FIX] website: fixed languages errors
- ir_http: added a missing ? when a route using the default language was re-rerouted to remove the language part of the path, leading to a wrong url
- website layout: fixed use of a languages variable not always defined depending on the working conditions
2014-05-23 11:06:47 +02:00
--global
62c0f6bf11
[FIX] website: ir_http: when rerouting url containing default language -> url without language, the ? was missing, leading to wrong urls.
2014-05-23 10:39:26 +02:00
--global
319f4cb270
[FIX] website: define languages variable outside of an 'if' as it is used below in the same template, leading to a crash due to the variable not always being defined.
2014-05-23 10:23:13 +02:00
Fabien Pinckaers
7a6435b0a3
[MERGE] no website description
2014-05-23 10:20:06 +02:00
Martin Trigaux
4c36ee0b59
Restore missed images during bzr to git transition
2014-05-23 10:11:25 +02:00
Fabien Pinckaers
1ddc8c7f93
[IMP] missing file
2014-05-23 09:55:24 +02:00
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
Josse Colpaert
41136215ae
[IMP] Change the barcodes to code128 and make a little bigger
2014-05-22 14:37:23 +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