Xavier Morel
833f5894d2
[FIX] typos
2014-05-27 12:18:22 +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
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
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
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
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
--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
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
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