Commit Graph

88417 Commits

Author SHA1 Message Date
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
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
--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
Richard Mathot 0b0f74861e [DOC] base_gengo: add changelog 2014-05-22 13:36:48 +02:00
Yogesh Parekh 59ecefbed2 Remove content field in Pages History form in website_blog module 2014-05-22 16:17:22 +05:30
tpa-odoo 41147025b8 [ADD] add wizard to import zipped module 2014-05-22 15:51:51 +05:30
Richard Mathot b283f8d5b1 [FIX] base_gengo: use supported/up-to-date library 2014-05-22 12:13:34 +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
etenesaca 0295e12d6c Merge with Origin Master - odoo/odoo 2014-05-21 08:54:51 -05:00
Fabien Meghazi df35de22b8 Disable logging during commands discovery 2014-05-21 15:53:16 +02:00
Fabien Meghazi eb7f96efbb --addons-path not required anymore 2014-05-21 13:24:39 +02:00
Fabien Meghazi 7adfaf786d Merge pull request #97 from odoo-dev/master-default-addons-path-fme
[FIX] If no addons-path provided, include the main addons [Fixes #29]
2014-05-21 11:15:21 +02:00
Fabien Meghazi d5fcc1e1e0 Merge pull request #95 from odoo-dev/master-seperate-bundle-fme
Seperate web.assets_common from other bundles
2014-05-21 10:40:33 +02:00
Fabien Meghazi 593cdf427f Merge remote-tracking branch 'odoo/master' into master-seperate-bundle-fme 2014-05-21 10:29:04 +02:00
etenesaca bd8b2e9002 Optimized search fields from m2o
Added translation of the message
Now this style of message in a CSS class and not use HTML tags
2014-05-20 21:16:52 -05:00
etenesaca 1ce6322bfc Merge branch 'master' of https://github.com/odoo/odoo 2014-05-20 16:08:22 -05:00
Fabien Meghazi 05f376e310 If no addons-path provided, include the main addons 2014-05-20 22:33:49 +02:00
etenesaca 49657b28e6 Now when a search is conducted in the fields and not m2o results have a message saying "No results to show" since the show nothing will display the user is confused 2014-05-20 14:58:40 -05:00
Christophe Simonis a756b82372 [MERGE] forward port of branch saas-4 up to revid bb26dea 2014-05-20 20:19:55 +02:00
Christophe Simonis bb26dea60b [MERGE] forward port of branch saas-3 up to revid 38abc8a 2014-05-20 19:00:50 +02:00
Christophe Simonis 38abc8a006 [MERGE] forward port of branch 7.0 up to revid b09b6a0 2014-05-20 18:57:04 +02:00
Christophe Simonis 040c93026a [MERGE] merge bzr trunk addons branch 2014-05-20 18:10:36 +02:00
Christophe Simonis ab4c3534de [MERGE] merge bzr trunk server branch 2014-05-20 17:30:01 +02:00
Christophe Simonis a70eea3b11 [MERGE] merge bzr saas-4 web branch 2014-05-20 17:14:18 +02:00
Christophe Simonis d93f628c72 [MERGE] merge bzr saas-4 addons branch 2014-05-20 17:12:01 +02:00
Fabien Meghazi 863edbaaf2 Seperate assets_common from other bundles 2014-05-20 17:06:25 +02:00
Christophe Simonis 8f0066d728 [MERGE] merge bzr saas-4 server branch 2014-05-20 17:05:25 +02:00
Christophe Simonis a5bb6b17e2 [MERGE] merge bzr saas-3 addons branch 2014-05-20 16:46:58 +02:00
Christophe Simonis e046626093 [MERGE] merge bzr saas-3 server branch 2014-05-20 16:41:04 +02:00
Christophe Simonis b09b6a06b1 [MERGE] merge bzr addons branch 2014-05-20 16:31:43 +02:00
Christophe Simonis 528d04d6dd [MERGE] merge bzr server branch 2014-05-20 16:28:48 +02:00
Denis Ledoux 40abb97136 [FIX] account_analytic_analysis: use product.price if pricelist is passed, else list_price 2014-05-20 16:08:03 +02:00
Martin Trigaux 3d70237d0d [FIX] website_forum: correct goal definition and other improvement
- scholar: the field is_correct is on the answer, not on the question
- remove closing reason 'an answer was accepted', the questions should be left as open to be possible to improve the answer afterward
- sort badges by most frequent first
- display the creation date of the question the same way we display the answer date
2014-05-20 15:27:33 +02:00
Martin Trigaux a558a84630 [IMP] display the createion date of the question the same way we display the answer fate 2014-05-20 15:05:27 +02:00
Martin Trigaux 4d9aa300a7 [IMP] as the closing reason is not required, do not display it if none is present 2014-05-20 14:50:51 +02:00
Martin Trigaux 70d3652c27 [FIX] remove closing reason 'an answer was accepted', the questions should be left as open to be possible to improve the answer afterward 2014-05-20 14:41:56 +02:00
Martin Trigaux c786ceb760 [FIX] the badges should be ordered by most popular first 2014-05-20 14:32:21 +02:00
Martin Trigaux 8da2cb6d4a [FIX] definition of badges 2014-05-20 14:31:55 +02:00
Fabien Meghazi a78e27fc0c Merge pull request #69 from odoo-dev/saas-4-auth-user-login-redirect-fme
Automatic auth='user' redirection for unlogged users
2014-05-20 13:20:15 +02:00