Christophe Simonis
05fe3ca7e3
Merge pull request #228 from xmo-odoo/extended-view-inheritance
...
Extended view inheritance
2014-05-27 17:10:28 +02:00
Thibault Delavallée
d22e515d52
[MERGE] [ADD] module: payment_buckaroo acquirer: manage payments using Buckaroo.
2014-05-27 16:57:31 +02:00
Fabien Meghazi
bb2760d3cc
Merge pull request #239 from odoo-dev/master-revert-bundles
...
Revert "Merge pull request #225 from odoo-dev/master-frontend-assets"
2014-05-27 16:13:43 +02:00
Fabien Meghazi
0544fc2929
Revert "Merge pull request #225 from odoo-dev/master-frontend-assets"
...
This reverts commit dd900408de
, reversing
changes made to 4da882d48f
.
2014-05-27 16:12:52 +02:00
Thibault Delavallée
c24848fea9
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
2014-05-27 15:02:26 +02:00
Martin Trigaux
3b32464ed2
Merge pull request #202 from lyinfo/master-fix-zero-qweb-field
...
[FIX]t-field wrong outputs when precision is 0
2014-05-27 14:46:31 +02:00
Thibault Delavallée
4fecb29c51
[FIX] website_sale, website_event_sale: updated tests according to the new dom of the checkout page introduced in pull request 232
2014-05-27 14:22:29 +02:00
Xavier Morel
ab7dd57771
[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)
2014-05-27 12:23:02 +02:00
Xavier Morel
0f5424eac4
[IMP] replace check_mode python-level constraint by an SQL CHECK constraint
2014-05-27 12:21:52 +02:00
Xavier Morel
9555b32c7b
[IMP] add some more explanations for the behavior of the mode attribute on views
2014-05-27 12:20:04 +02:00
Xavier Morel
cdd89f4ae6
[FIX] forgot to add primary attribute support to <template> in schema
2014-05-27 12:19:13 +02:00
Xavier Morel
833f5894d2
[FIX] typos
2014-05-27 12:18:22 +02:00
Thibault Delavallée
b5a7156f7d
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
2014-05-27 12:09:01 +02:00
Xavier Morel
8b9f774a22
[ADD] support for primary mode in <template>
...
should probably validate that there's an inherit_id (?)
2014-05-27 11:57:02 +02:00
Xavier Morel
da345aaa2d
[ADD] use of explicit primary mode in read_combined
2014-05-27 11:57:02 +02:00
Xavier Morel
4e3dbb96b3
[FIX] default_view should be based on mode=primary, not on inherit_id=False
2014-05-27 11:57:01 +02:00
Xavier Morel
434be479f9
[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
2014-05-27 11:57:01 +02:00
Xavier Morel
d9ce012d29
[IMP] simplify handling of callable _constraint message
2014-05-27 11:57:00 +02:00
Xavier Morel
d8377a931e
[REM] idiotic _invalids attribute, as well as get_invalid_fields
2014-05-27 11:56:59 +02:00
Fabien Meghazi
dd900408de
Merge pull request #225 from odoo-dev/master-frontend-assets
...
[IMP] Move website assets to frontend bundle
2014-05-27 11:49:28 +02:00
Thibault Delavallée
a6379e2e67
[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.
2014-05-27 11:35:32 +02:00
--global
ed51e843a2
[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.
2014-05-27 11:35:32 +02:00
Fabien Meghazi
51e10ffbac
Indentation
2014-05-27 11:16:57 +02:00
Fabien Meghazi
1744208928
Changed xpath expression from /t to .
2014-05-27 10:45:07 +02:00
Martin Trigaux
4da882d48f
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.
2014-05-27 09:28:15 +02:00
Mitesh Savani
d89064c73c
[IMP]Improved code
2014-05-27 10:45:04 +05:30
etenesaca
2097af20b7
* Deleted: oe_m2o_dropdown_option_no_results_to_show AND REUSED oe_m2o_dropdown_option
...
* Deleted: manually translation in es.po
2014-05-26 11:51:24 -05:00
etenesaca
b6189b4d5a
Merge remote-tracking branch 'odoo/master'
2014-05-26 11:29:48 -05:00
Fabien Meghazi
a91a12e67f
Merge pull request #216 from odoo-dev/master-import-module-wizard-tpa
...
[IMP] Add 'Import Module' wizard to base_import_module
2014-05-26 17:30:29 +02:00
Fabien Meghazi
fc9d0d9ab0
[FIX] typo
2014-05-26 17:26:19 +02:00
etenesaca
0aa4203d41
Merge remote-tracking branch 'odoo/master'
2014-05-26 09:55:11 -05:00
Fabien Meghazi
06b10a8ef2
Merge remote-tracking branch 'odoo/master' into master-import-module-wizard-tpa
2014-05-26 16:52:41 +02:00
Martin Trigaux
1779495f79
Merge pull request #188 from blaggacao/patch-2
...
Removed confusing doubled check box "child_depend" in the tax view
2014-05-26 16:28:57 +02:00
Fabien Meghazi
1e68947a16
Merge pull request #212 from odoo-dev/master-fix-sitemap-urls-fme
...
[FIX] sitemap.xml urls
2014-05-26 15:03:19 +02:00
Fabien Meghazi
5cc1317a5f
[FIX] sitemap.xml urls
2014-05-26 14:58:30 +02:00
Martin Trigaux
ba4ce723fd
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
2014-05-26 14:26:18 +02:00
Martin Trigaux
dcb4b610e2
[FIX] website_forum: display the users as a table in block of 3 cols
2014-05-26 13:37:58 +02:00
Martin Trigaux
49d29cd2e0
Merge pull request #208 from odoo-dev/master-contributing-mat
...
Add contributing.md file
2014-05-26 13:05:20 +02:00
Martin Trigaux
c0e326eb9b
Update contributing.md
2014-05-26 12:55:58 +02:00
Martin Trigaux
41c4090d20
typo
2014-05-26 12:22:59 +02:00
Martin Trigaux
34c490e40f
Adding bug report example and fixing typos
2014-05-26 12:21:23 +02:00
Martin Trigaux
ecffb93f76
Adding basic contribution guidelines
2014-05-26 11:39:48 +02:00
kevin wang
9bfa02386c
[FIX]t-field wrong outputs when precision is 0
2014-05-26 17:06:49 +08:00
etenesaca
d97b044274
Merge remote-tracking branch 'odoo/master'
2014-05-23 16:05:49 -05:00
David Arnold
6e8e22f1be
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.
2014-05-23 14:01:16 -05:00
Mitesh Savani
daba406886
[IMP]Move assetss to frontend template.
2014-05-23 18:31:01 +05:30
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
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