e08d02dc2b
[Merge]merge mistakes
...
bzr revid: dle@openerp.com-20121129143607-lwzsfxv3rsu2eojc
2012-11-29 15:36:07 +01:00
2052aaffab
[MERGE]trunk
...
bzr revid: dle@openerp.com-20121129142010-8yt0p417ibx3p7sy
2012-11-29 15:20:10 +01:00
40042cec1b
[MERGE]trunk
...
bzr revid: dle@openerp.com-20121129141854-2o6o44jhrpi54ssp
2012-11-29 15:18:54 +01:00
c72fc633fc
[FIX]Wrong inherit commented
...
bzr revid: dle@openerp.com-20121129134318-c770ejnoop2b3z0j
2012-11-29 14:43:18 +01:00
8cc5780e58
[FIX]More links
...
bzr revid: dle@openerp.com-20121129131317-0s1rru4pxjn0lzl3
2012-11-29 14:13:17 +01:00
Fabien Pinckaers
bd61641572
[FIX] project issue
...
bzr revid: fp@tinyerp.com-20121129130655-rm5hrk8m7tsy8g4v
2012-11-29 14:06:55 +01:00
Fabien Meghazi
7bfab22e1f
[FIX] Propagate context to kanban's add_group() action
...
bzr revid: fme@openerp.com-20121129120738-fgulo5hqib2uqeqa
2012-11-29 13:07:38 +01:00
Fabien Pinckaers
93eddbd4a8
[IMP] fixes for kanban column visible in tasks & issues
...
bzr revid: fp@tinyerp.com-20121129112737-w3h80e7nbxs0l5lp
2012-11-29 12:27:37 +01:00
Xavier Morel
fe3d493cc8
[FIX] searches with filters using "empty" domain/context values (but not attributes)
...
e.g. @domain="[]" would be seen as non-empty by the search view, and
if multiple domains the search view would generate a nonliteral
``['|', '[]', '[]]`` which would just yield ``['|']`` after evaluation
and concatenation, which is an invalid domain and would blow up the
server.
Specifically filter out the values ``[]`` and ``{}`` from filters
bzr revid: xmo@openerp.com-20121129112413-yrgncnesqs093jwf
2012-11-29 12:24:13 +01:00
Xavier Morel
a2b23a1ca7
[REM] merge conflict file committed
...
bzr revid: xmo@openerp.com-20121129112350-egvxrg8ii71wzdx6
2012-11-29 12:23:50 +01:00
6ac004d619
[merge]latest trunk
...
bzr revid: dle@openerp.com-20121129110331-nk9jz99s2jiug5hl
2012-11-29 12:03:31 +01:00
Antony Lesuisse
c4a845b50e
[FIX] auth_signup on token
...
bzr revid: al@openerp.com-20121129104039-0pv8mls0f55pet2l
2012-11-29 11:40:39 +01:00
Xavier Morel
c7772fdd82
[FIX] server-sourced fields_get has no indirection to the model's fields
...
previous searchview-controller wrapper method did. Remove leftover indirection deref
bzr revid: xmo@openerp.com-20121129103841-6qcl4sctekqmrt2q
2012-11-29 11:38:41 +01:00
Xavier Morel
bf29cecca3
[FIX] if an action descriptor is precisely `false`, treat it as an ir_action_close ~/projects/tiny/web/current
...
Can be seen in e.g. Quotations > [More sidebar] > Sale: Mark Unread:
it's a server action which just returns ``False``, the handler
resulted in a noop but also produced an error message in the browser
console ("No type for action false").
Convert ``false`` (identity-tested) into an ir_action_close in
do_action, before actually mucking into the action descriptor.
bzr revid: xmo@openerp.com-20121129101137-g01nd49hnlg2odfs
2012-11-29 11:11:37 +01:00
Christophe Matthieu
968837ac97
[MERGE] form trunk-openchatter-vive-lilo-chm; Improve openchatter and fix
...
bzr revid: chm@openerp.com-20121129100342-gz3hz858ga8ecmre
2012-11-29 11:03:42 +01:00
Christophe Matthieu
f0c821ebbc
[MERGE] from trunk-openchatter-vive-lilo-chm
...
bzr revid: chm@openerp.com-20121129095214-pniv6qy0p2ea6efe
2012-11-29 10:52:14 +01:00
Christophe Matthieu
e81ea77fa2
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20121129094553-n30aju91kj40cbg6
2012-11-29 10:45:53 +01:00
Christophe Matthieu
f7933378aa
[IMP] note: remove fancy mode
...
bzr revid: chm@openerp.com-20121129094412-s5g8uffx8j7q4xpg
2012-11-29 10:44:12 +01:00
Xavier Morel
106100eea0
[MERGE] evalpocalypse-related fixes
...
bzr revid: xmo@openerp.com-20121129091202-tibeevirun95o1mi
2012-11-29 10:12:02 +01:00
Xavier Morel
1238164680
[MERGE] evalpocalypse
...
bzr revid: xmo@openerp.com-20121129091149-0k26u2mmjzaa2c1a
2012-11-29 10:11:49 +01:00
Xavier Morel
e00cb36f41
[MERGE] from trunk
...
bzr revid: xmo@openerp.com-20121129091038-0fexjx8o12drjbga
2012-11-29 10:10:38 +01:00
Fabien Meghazi
396f76c95a
[MERGE] Fix field binary image controls padding causing overflow
...
bzr revid: fme@openerp.com-20121129091017-0oefnnl6z4fd5aae
2012-11-29 10:10:17 +01:00
76417f249f
[MERGE] trunk-improve_portal-vta.
...
bzr revid: vta@openerp.com-20121129090801-mheiq7yb3h24onqf
2012-11-29 10:08:01 +01:00
Xavier Morel
1f26804726
[MERGE] from trunk
...
bzr revid: xmo@openerp.com-20121129084431-1xo5z47cor2zzmr8
2012-11-29 09:44:31 +01:00
Christophe Matthieu
66e13eb9bf
[IMP] web avatar preference: change overflow hidden into padding: 4px 0
...
bzr revid: chm@openerp.com-20121129083314-gbhblm0vi4nw08sb
2012-11-29 09:33:14 +01:00
4b464deeee
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121129051532-an3wp6f216pkzxiz
bzr revid: launchpad_translations_on_behalf_of_openerp-20121129052158-2gjacp96ppgmvr5t
2012-11-29 05:21:58 +00:00
098ac4cf11
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121129051337-kimflvqgnkhrw3fh
2012-11-29 05:13:37 +00:00
Christophe Simonis
e03f111704
[FIX] module: do not recreate categories when updating modules
...
bzr revid: chs@openerp.com-20121128183701-6d7p1jqu1hdlshcp
2012-11-28 19:37:01 +01:00
Fabien Meghazi
a8e2c0d622
[MERGE] Ensure timzone is unset before testing
...
bzr revid: fme@openerp.com-20121128175916-dm9t0b65d19ztesp
2012-11-28 18:59:16 +01:00
Fabien Meghazi
69a09cc2fb
[FIX] Ensure timzone is unset before testing
...
bzr revid: fme@openerp.com-20121128174318-wg0oygtj3eipozp2
2012-11-28 18:43:18 +01:00
Fabien Meghazi
93091dad79
[MERGE] Fix kanban dataset.ids missing when using 'Show more' button
...
bzr revid: fme@openerp.com-20121128171325-3euuu394e7ybpjzu
2012-11-28 18:13:25 +01:00
Fabien Meghazi
3196dbd84b
[IMP] Preserve dataset ids order
...
bzr revid: fme@openerp.com-20121128171024-qpkn9oo48xa9n2j4
2012-11-28 18:10:24 +01:00
Fabien Meghazi
be019ae11f
[ADD] Timezone set to 'Europe/Brussels' for admin in demo data
...
bzr revid: fme@openerp.com-20121128164858-l7as9cb89qxopdw1
2012-11-28 17:48:58 +01:00
514952bdd3
[MERGE]Latest trunk
...
bzr revid: dle@openerp.com-20121128164105-m3hgq38xw6ikewa5
2012-11-28 17:41:05 +01:00
Xavier Morel
ae16e0e4e5
[FIX] share: typo in function name
...
bzr revid: xmo@openerp.com-20121128161934-42ek0r460w0smsi9
2012-11-28 17:19:34 +01:00
Xavier Morel
8431c69016
[FIX] sidebar activation: put original context before action context in eval sequence
...
bzr revid: xmo@openerp.com-20121128161311-u3e3oqhutt043mzq
2012-11-28 17:13:11 +01:00
Christophe Matthieu
3e0cc5ee13
[IMP] mail: change contrast for messages in thread and parent message
...
bzr revid: chm@openerp.com-20121128160649-6mo704133jjhzr6j
2012-11-28 17:06:49 +01:00
Antony Lesuisse
a34f0ef51c
[MERGE] trunk-timezone-notification-fme
...
if res.users and browser timezone offset differs we display a warning.
openerp-web relies on the browser for datetime manipulations so we need both to be in sync.
bzr revid: al@openerp.com-20121128160344-1iae73w47ocot9ib
2012-11-28 17:03:44 +01:00
Christophe Matthieu
c491c532c0
[FIX] mail: don't display false value as body
...
bzr revid: chm@openerp.com-20121128160134-kbjfov5vvuxtcow6
2012-11-28 17:01:34 +01:00
Antony Lesuisse
299d98ac6e
[MERGE] res.users get_context add timezone offset
...
bzr revid: al@openerp.com-20121128155922-ff67gskivujvx2qa
2012-11-28 16:59:22 +01:00
Xavier Morel
83d5c4f94c
[IMP] update py.js to correctly tokenize unicode literals
...
also various style improvements in the lib
bzr revid: xmo@openerp.com-20121128155448-1tv62wyv3zy2asr5
2012-11-28 16:54:48 +01:00
Vo Minh Thu
adc4c256f9
[MERGE] wkf_expr: Ignore empty lines and lines with blanks.
...
bzr revid: vmt@openerp.com-20121128155153-yigjipqvk06s7wo2
2012-11-28 16:51:53 +01:00
Thibault Delavallée
37e7d2048b
[DOC] mail.js: updated the comment of on_message_read_unread.
...
bzr revid: tde@openerp.com-20121128153843-4p24erdrkpzmrhnu
2012-11-28 16:38:43 +01:00
Olivier Dony
080fe746f5
[FIX] db.drop service: PostgreSQL 9.2 renamed pg_stat_activity.procpid to pid
...
bzr revid: odo@openerp.com-20121128153423-yducsjb91g8kjcae
2012-11-28 16:34:23 +01:00
Xavier Morel
628ed49fff
[FIX] correctly return deferreds from all action type handlers
...
bzr revid: xmo@openerp.com-20121128152524-xrh6zqty0huqb732
2012-11-28 16:25:24 +01:00
Thibault Delavallée
a293a948a6
[IMP] mail: when starring a message, create an unread notification if it does not exist; otherwise, set the notification as unread.
...
bzr revid: tde@openerp.com-20121128151939-v24cfx8k2aul8veg
2012-11-28 16:19:39 +01:00
Vo Minh Thu
fc2f4ab8a4
[MERGE] merged trunk.
...
bzr revid: vmt@openerp.com-20121128151352-n9r87jn5tff949ka
2012-11-28 16:13:52 +01:00
Xavier Morel
48b0d70fc2
[FIX] context evaluation in kanban resequencing
...
bzr revid: xmo@openerp.com-20121128151044-i58uwcdem2cgyyrv
2012-11-28 16:10:44 +01:00
Fabien Meghazi
74657199b0
[REM] Removed manual many2many tags from kanban views
...
Kanban view supports many2many as m2m tags by default.
bzr revid: fme@openerp.com-20121128151022-sdk33xct0p738bff
2012-11-28 16:10:22 +01:00
Vo Minh Thu
63de663ece
[IMP] wkf_expr: Ignore empty lines and lines with blanks.
...
bzr revid: vmt@openerp.com-20121128150637-pikxf9tw2nj0qpuk
2012-11-28 16:06:37 +01:00
dle@openerp.com