Christophe Simonis [Tue, 27 May 2014 15:57:33 +0000 (17:57 +0200)]
[MERGE] Replace inherit_option_id by a selection field (PR #229)
Christophe Simonis [Tue, 27 May 2014 15:10:28 +0000 (17:10 +0200)]
Merge pull request #228 from xmo-odoo/extended-view-inheritance
Extended view inheritance
Thibault Delavallée [Tue, 27 May 2014 14:57:31 +0000 (16:57 +0200)]
[MERGE] [ADD] module: payment_buckaroo acquirer: manage payments using Buckaroo.
Fabien Meghazi [Tue, 27 May 2014 14:13:43 +0000 (16:13 +0200)]
Merge pull request #239 from odoo-dev/master-revert-bundles
Revert "Merge pull request #225 from odoo-dev/master-frontend-assets"
Fabien Meghazi [Tue, 27 May 2014 14:12:52 +0000 (16:12 +0200)]
Revert "Merge pull request #225 from odoo-dev/master-frontend-assets"
This reverts commit
dd900408ded4ece90df5f80f36daa049bc8f0e5b, reversing
changes made to
4da882d48ffd09651b66e72a6e5c87e76d05a346.
Thibault Delavallée [Tue, 27 May 2014 13:02:26 +0000 (15:02 +0200)]
Merge pull request #234 from odoo-dev/master-fix-sale-test-tde
[FIX] website_sale, website_event_sale: updated JS tests according to the new dom of the checkout page introduced in pull request 232
Martin Trigaux [Tue, 27 May 2014 12:46:31 +0000 (14:46 +0200)]
Merge pull request #202 from lyinfo/master-fix-zero-qweb-field
[FIX]t-field wrong outputs when precision is 0
Thibault Delavallée [Tue, 27 May 2014 12:22:29 +0000 (14:22 +0200)]
[FIX] website_sale, website_event_sale: updated tests according to the new dom of the checkout page introduced in pull request 232
Xavier Morel [Tue, 27 May 2014 10:26:38 +0000 (12:26 +0200)]
[IMP] application field doc
Xavier Morel [Tue, 27 May 2014 10:23:02 +0000 (12:23 +0200)]
[IMP] make mode handling more regular
Before this commit, @mode=primary would be sorta-ignored[0] if the current
view and its parent had the same model: the current view would *still* get
applied (as an extension) when asking OpenERP for its parent. This commit
makes mode=primary views behave regularly, they are *never* applied when
asking for their parent, only when asking for them or their children.
This allows "forking" views, and using extended views in some contexts without
breaking or duplicating the original view
[0] there was actually a problem when asking for the current view directly,
first its parent would be resolved by applying it, then it would be
applied to resolve itself, the view would thus get applied twice (oops)
Xavier Morel [Tue, 27 May 2014 10:21:52 +0000 (12:21 +0200)]
[IMP] replace check_mode python-level constraint by an SQL CHECK constraint
Xavier Morel [Tue, 27 May 2014 10:20:04 +0000 (12:20 +0200)]
[IMP] add some more explanations for the behavior of the mode attribute on views
Xavier Morel [Tue, 27 May 2014 10:19:13 +0000 (12:19 +0200)]
[FIX] forgot to add primary attribute support to <template> in schema
Xavier Morel [Tue, 27 May 2014 10:18:22 +0000 (12:18 +0200)]
[FIX] typos
Xavier Morel [Tue, 27 May 2014 09:54:01 +0000 (11:54 +0200)]
[IMP] inherit_option_id -> application
Thibault Delavallée [Tue, 27 May 2014 10:09:01 +0000 (12:09 +0200)]
Merge pull request #224 from odoo-dev/master-payment-post-tde
[IMP] website_sale: correctly submit the payment form using a post request, correctly create the tx asynchronously
Xavier Morel [Tue, 27 May 2014 09:52:57 +0000 (11:52 +0200)]
[IMP] prevent changing a view from application: always to application: disabled
not sure that's actually useful, and can still go always -> enabled -> disabled...
Xavier Morel [Tue, 27 May 2014 09:49:26 +0000 (11:49 +0200)]
[ADD] application field & check during inheriting views read
Xavier Morel [Tue, 27 May 2014 09:34:49 +0000 (11:34 +0200)]
[IMP] renamed some stuff for clarity
Xavier Morel [Tue, 27 May 2014 09:34:14 +0000 (11:34 +0200)]
[IMP] dict(int: True) -> set(int)
Xavier Morel [Tue, 27 May 2014 09:33:37 +0000 (11:33 +0200)]
[IMP] use set to collect inherit_id and inherit_option_id
Also add a few comments to note understanding of code
Xavier Morel [Tue, 27 May 2014 09:33:12 +0000 (11:33 +0200)]
[IMP] use sets to check for groups/ACL
rco notes that group tests are generally intersections, if the user has *any*
group set on the object he can see/use it. This change is a literal
translation of the original semantics, which may be wrong.
Xavier Morel [Tue, 27 May 2014 09:32:18 +0000 (11:32 +0200)]
[IMP] no need to ensure an actual context if the method does not use it
just forwarding the context object does not count as using it, if callees want
a context they can ensure they've got one on their own
Xavier Morel [Tue, 27 May 2014 09:31:44 +0000 (11:31 +0200)]
[IMP] don't pointlessly recreate view_obj every time _views_get is called, better use of pool & data APIs
Xavier Morel [Tue, 27 May 2014 09:31:22 +0000 (11:31 +0200)]
[IMP] use sorted + key instead of sort + cmp
Xavier Morel [Tue, 27 May 2014 09:30:42 +0000 (11:30 +0200)]
[REM] unused stack_result parameter
Xavier Morel [Tue, 27 May 2014 09:47:44 +0000 (11:47 +0200)]
[ADD] support for primary mode in <template>
should probably validate that there's an inherit_id (?)
Xavier Morel [Tue, 27 May 2014 09:46:58 +0000 (11:46 +0200)]
[ADD] use of explicit primary mode in read_combined
Xavier Morel [Tue, 27 May 2014 09:44:55 +0000 (11:44 +0200)]
[FIX] default_view should be based on mode=primary, not on inherit_id=False
Xavier Morel [Tue, 27 May 2014 09:43:08 +0000 (11:43 +0200)]
[ADD] mode attribute to views
Not used yet, only defined its relation to inherit_id:
not inherit_id + primary -> ok
not inherit_id + extension -> error
inherit_id + primary -> ok
inherit_id + extension -> ok
Xavier Morel [Tue, 27 May 2014 09:39:32 +0000 (11:39 +0200)]
[IMP] simplify handling of callable _constraint message
Xavier Morel [Tue, 27 May 2014 09:39:03 +0000 (11:39 +0200)]
[REM] idiotic _invalids attribute, as well as get_invalid_fields
Fabien Meghazi [Tue, 27 May 2014 09:49:28 +0000 (11:49 +0200)]
Merge pull request #225 from odoo-dev/master-frontend-assets
[IMP] Move website assets to frontend bundle
Thibault Delavallée [Tue, 27 May 2014 09:34:55 +0000 (11:34 +0200)]
[IMP] payment addons: fixed submit buttons: now have type=submit (and not image or nothing) and removed name, because this may cause issues when trying to submit a form manually with type=submit and a name. Also improved js code in website_sale to correctly handle the click binding, the asynchronous call to the server to create the transaction, and then submit the form. As form submission is synchronous in javascript, we cannot use the deferred. Instead we prevent the click event from bubbling, wait for the server to create the transaction, adn then manually submit the form.
--global [Fri, 23 May 2014 07:53:12 +0000 (09:53 +0200)]
[IMP] website_sale: change 'pay now' button behavior.
Now: intercept the call, make an asynchronous call to create the tx, then continue to the acquirer. Previous this was done by
a redirection, leading to a get request beign done. However it should be a post request.
Fabien Meghazi [Tue, 27 May 2014 09:16:57 +0000 (11:16 +0200)]
Indentation
Fabien Meghazi [Tue, 27 May 2014 08:45:07 +0000 (10:45 +0200)]
Changed xpath expression from /t to .
Martin Trigaux [Tue, 27 May 2014 07:28:15 +0000 (09:28 +0200)]
Merge pull request #83 from etenesaca/master
[IMP] When no result is displayed in m2o field with option "no_create", add a "No result" value to avoid confusion.
Mitesh Savani [Tue, 27 May 2014 05:15:04 +0000 (10:45 +0530)]
[IMP]Improved code
etenesaca [Mon, 26 May 2014 16:51:24 +0000 (11:51 -0500)]
* Deleted: oe_m2o_dropdown_option_no_results_to_show AND REUSED oe_m2o_dropdown_option
* Deleted: manually translation in es.po
etenesaca [Mon, 26 May 2014 16:29:48 +0000 (11:29 -0500)]
Merge remote-tracking branch 'odoo/master'
Fabien Meghazi [Mon, 26 May 2014 15:30:29 +0000 (17:30 +0200)]
Merge pull request #216 from odoo-dev/master-import-module-wizard-tpa
[IMP] Add 'Import Module' wizard to base_import_module
Fabien Meghazi [Mon, 26 May 2014 15:26:19 +0000 (17:26 +0200)]
[FIX] typo
etenesaca [Mon, 26 May 2014 14:55:11 +0000 (09:55 -0500)]
Merge remote-tracking branch 'odoo/master'
Fabien Meghazi [Mon, 26 May 2014 14:52:41 +0000 (16:52 +0200)]
Merge remote-tracking branch 'odoo/master' into master-import-module-wizard-tpa
Martin Trigaux [Mon, 26 May 2014 14:28:57 +0000 (16:28 +0200)]
Merge pull request #188 from blaggacao/patch-2
Removed confusing doubled check box "child_depend" in the tax view
Fabien Meghazi [Mon, 26 May 2014 13:03:19 +0000 (15:03 +0200)]
Merge pull request #212 from odoo-dev/master-fix-sitemap-urls-fme
[FIX] sitemap.xml urls
Fabien Meghazi [Mon, 26 May 2014 12:58:30 +0000 (14:58 +0200)]
[FIX] sitemap.xml urls
Martin Trigaux [Mon, 26 May 2014 12:26:18 +0000 (14:26 +0200)]
Merge pull request #209 from odoo-dev/master-forum-users-row-mat
[FIX] website_forum: display the users as a table in block of 3 cols
Martin Trigaux [Mon, 26 May 2014 11:37:58 +0000 (13:37 +0200)]
[FIX] website_forum: display the users as a table in block of 3 cols
Martin Trigaux [Mon, 26 May 2014 11:05:20 +0000 (13:05 +0200)]
Merge pull request #208 from odoo-dev/master-contributing-mat
Add contributing.md file
Martin Trigaux [Mon, 26 May 2014 10:55:58 +0000 (12:55 +0200)]
Update contributing.md
Martin Trigaux [Mon, 26 May 2014 10:22:59 +0000 (12:22 +0200)]
typo
Martin Trigaux [Mon, 26 May 2014 10:21:23 +0000 (12:21 +0200)]
Adding bug report example and fixing typos
Martin Trigaux [Mon, 26 May 2014 09:39:48 +0000 (11:39 +0200)]
Adding basic contribution guidelines
kevin wang [Mon, 26 May 2014 09:06:49 +0000 (17:06 +0800)]
[FIX]t-field wrong outputs when precision is 0
etenesaca [Fri, 23 May 2014 21:05:49 +0000 (16:05 -0500)]
Merge remote-tracking branch 'odoo/master'
David Arnold [Fri, 23 May 2014 19:01:16 +0000 (14:01 -0500)]
Removed confusing doubled check box "child_depend"
This checkbox caused greate confusion, as it was doubled in the tax form view. Field is already present in line 937
Thanks for merging.
Mitesh Savani [Fri, 23 May 2014 13:01:01 +0000 (18:31 +0530)]
[IMP]Move assetss to frontend template.
xmo-odoo [Fri, 23 May 2014 10:21:33 +0000 (12:21 +0200)]
Merge pull request #174 from odoo-dev/tnx-remains
Various ex-module remains
Xavier Morel [Fri, 23 May 2014 10:18:17 +0000 (12:18 +0200)]
[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
Xavier Morel [Fri, 23 May 2014 10:02:03 +0000 (12:02 +0200)]
[REM] undead modules reanimated by translation file exports
Thibault Delavallée [Fri, 23 May 2014 09:06:47 +0000 (11:06 +0200)]
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
--global [Fri, 23 May 2014 08:39:26 +0000 (10:39 +0200)]
[FIX] website: ir_http: when rerouting url containing default language -> url without language, the ? was missing, leading to wrong urls.
--global [Fri, 23 May 2014 08:23:13 +0000 (10:23 +0200)]
[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.
Fabien Pinckaers [Fri, 23 May 2014 08:20:06 +0000 (10:20 +0200)]
[MERGE] no website description
Fabien Pinckaers [Fri, 23 May 2014 07:55:24 +0000 (09:55 +0200)]
[IMP] missing file
Fabien Pinckaers [Fri, 23 May 2014 07:43:34 +0000 (09:43 +0200)]
[FIX] Missing file
Fabien Pinckaers [Fri, 23 May 2014 07:24:16 +0000 (09:24 +0200)]
Merge branch 'master-remove-html-fields-backend-ypa' of https://github.com/odoo-dev/odoo into odoo-dev-master-remove-html-fields-backend-ypa
Fabien Pinckaers [Fri, 23 May 2014 07:15:08 +0000 (09:15 +0200)]
Merge pull request #168 from legalsylvain/master
[FIX] Issues #167. Remove obsolete shop reference
Sylvain LE GAL [Thu, 22 May 2014 20:55:50 +0000 (22:55 +0200)]
[FIX] Issues #167. Remove obsolete shop reference
etenesaca [Thu, 22 May 2014 19:42:14 +0000 (14:42 -0500)]
Merge remote-tracking branch 'odoo/master'
Thibault Delavallée [Thu, 22 May 2014 14:22:32 +0000 (16:22 +0200)]
Merge pull request #164 from odoo-dev/master-website_sale--fix-tde
[FIX] website_sale: cleaned call to removed methods in website_sale
Martin Trigaux [Thu, 22 May 2014 13:41:36 +0000 (15:41 +0200)]
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')
--global [Thu, 22 May 2014 13:40:29 +0000 (15:40 +0200)]
[CLEAN] Use none or false, but not both on two lines ...
--global [Thu, 22 May 2014 13:34:09 +0000 (15:34 +0200)]
[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.
Martin Trigaux [Thu, 22 May 2014 12:56:33 +0000 (14:56 +0200)]
Add sequence field with handle in tree view
Martin Trigaux [Thu, 22 May 2014 12:55:26 +0000 (14:55 +0200)]
Add < and > operators to allow rules without gap (eg: until 100 & above 100)
Thibault Delavallée [Thu, 22 May 2014 12:29:06 +0000 (14:29 +0200)]
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.
--global [Thu, 22 May 2014 11:49:41 +0000 (13:49 +0200)]
[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.
Richard Mathot [Thu, 22 May 2014 11:46:15 +0000 (13:46 +0200)]
Merge pull request #159 from odoo-dev/master-gengo-fix-rim
[FIX] base_gengo: use supported/up-to-date library
tpa-odoo [Thu, 22 May 2014 11:42:57 +0000 (17:12 +0530)]
[IMP] improved sequence of menu
tpa-odoo [Thu, 22 May 2014 11:39:52 +0000 (17:09 +0530)]
[IMP] improved code to show import result in wizard and improved typo
Richard Mathot [Thu, 22 May 2014 11:29:07 +0000 (13:29 +0200)]
[DOC] base_gengo: add changelog
Yogesh Parekh [Thu, 22 May 2014 10:47:22 +0000 (16:17 +0530)]
Remove content field in Pages History form in website_blog module
tpa-odoo [Thu, 22 May 2014 10:21:51 +0000 (15:51 +0530)]
[ADD] add wizard to import zipped module
Richard Mathot [Thu, 22 May 2014 10:13:34 +0000 (12:13 +0200)]
[FIX] base_gengo: use supported/up-to-date library
Yogesh Parekh [Thu, 22 May 2014 10:03:37 +0000 (15:33 +0530)]
Remove content html field from website_blog module
Yogesh Parekh [Thu, 22 May 2014 09:58:39 +0000 (15:28 +0530)]
Remove description html field from website_event_track module
Yogesh Parekh [Thu, 22 May 2014 09:56:10 +0000 (15:26 +0530)]
Remove description html field in website_forum module
Yogesh Parekh [Thu, 22 May 2014 09:53:09 +0000 (15:23 +0530)]
Remove html fields in frontend from website_quote module
etenesaca [Wed, 21 May 2014 13:54:51 +0000 (08:54 -0500)]
Merge with Origin Master - odoo/odoo
Fabien Meghazi [Wed, 21 May 2014 09:15:21 +0000 (11:15 +0200)]
Merge pull request #97 from odoo-dev/master-default-addons-path-fme
[FIX] If no addons-path provided, include the main addons [Fixes #29]
Fabien Meghazi [Wed, 21 May 2014 08:40:33 +0000 (10:40 +0200)]
Merge pull request #95 from odoo-dev/master-seperate-bundle-fme
Seperate web.assets_common from other bundles
Fabien Meghazi [Wed, 21 May 2014 08:29:04 +0000 (10:29 +0200)]
Merge remote-tracking branch 'odoo/master' into master-seperate-bundle-fme
etenesaca [Wed, 21 May 2014 02:16:52 +0000 (21:16 -0500)]
Optimized search fields from m2o
Added translation of the message
Now this style of message in a CSS class and not use HTML tags
etenesaca [Tue, 20 May 2014 21:08:22 +0000 (16:08 -0500)]
Merge branch 'master' of https://github.com/odoo/odoo
Fabien Meghazi [Tue, 20 May 2014 20:33:49 +0000 (22:33 +0200)]
If no addons-path provided, include the main addons
etenesaca [Tue, 20 May 2014 19:58:40 +0000 (14:58 -0500)]
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
Christophe Simonis [Tue, 20 May 2014 18:19:55 +0000 (20:19 +0200)]
[MERGE] forward port of branch saas-4 up to revid bb26dea