dusan
c041ffe52b
[MERGE]with partent
...
bzr revid: dusan@ubuntu-20121129095836-2c230j7tamrmofsk
2012-11-29 10:58:36 +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
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
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
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
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
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
Fabien Meghazi
01436f27c2
[FIX] Kanban drag'n drop wrong index
...
bzr revid: fme@openerp.com-20121128145941-4qvoqp0mb1s09ojl
2012-11-28 15:59:41 +01:00
Thibault Delavallée
4e2c317c28
[FIX] Accuracy of the various server actions 'mark read' and 'mark unread': updated their name by adding the model name to be more precise when seing them in a list.
...
lp bug: https://launchpad.net/bugs/1082199 fixed
bzr revid: tde@openerp.com-20121128145159-d1b2j6swvhdnnl0i
2012-11-28 15:51:59 +01:00
Vo Minh Thu
7221faf3ee
[MERGE] modules: avoid to have the docutils warnings rendered inline in descriptions.
...
bzr revid: vmt@openerp.com-20121128143351-jp1vtqnkr8jyq3hk
2012-11-28 15:33:51 +01:00
Vo Minh Thu
a498d678de
[MERGE] merged the all-modules branch.
...
This branch cleans a bit the init/update mess being present on both
tools.config and the module graph's nodes.
The passed update_module argument to get_db_and_pool() is a real boolean
(otherwise its value could be changed by assigning to tools.config).
The `force` attribute as been renamed more appropirately `force_demo` on the
add_module() function.
The `-i` command-line option now accepts a `all` argument.
Although tools.config is still used for init/update/demo options, it is cleared
after initialization in an attempt to make sure the server operates exactly in
the same way (after the initialization), whether it is started with -i/-u or
not
bzr revid: vmt@openerp.com-20121128142106-pdkcruhyz0sjltk8
2012-11-28 15:21:06 +01:00
Vo Minh Thu
f12d2903c1
[MERGE] merged trunk.
...
bzr revid: vmt@openerp.com-20121128141845-085lqy5c604nd5lu
2012-11-28 15:18:45 +01:00
Vo Minh Thu
79eee180ea
[FIX] The previous merge killed a line.
...
bzr revid: vmt@openerp.com-20121128141202-jncwohi169luyz0l
2012-11-28 15:12:02 +01:00
Xavier Morel
67ad32f797
[FIX] kanban quick-create: don't attempt creation if the field is empty
...
bzr revid: xmo@openerp.com-20121128140428-s7w860xq7wlbi966
2012-11-28 15:04:28 +01:00
Vo Minh Thu
3f56350779
[MERGE] merged trunk.
...
bzr revid: vmt@openerp.com-20121128135101-ko52od4hpngc9btz
2012-11-28 14:51:01 +01:00
Xavier Morel
2b75593168
[FIX] don't display password fields in set_default dialogs
...
lp bug: https://launchpad.net/bugs/1015092 fixed
bzr revid: xmo@openerp.com-20121128135013-xzanbxv6qoqo28kh
2012-11-28 14:50:13 +01:00
Xavier Morel
ddcce477d7
[FIX] eq/neq of arrays in compute_domain
...
bzr revid: xmo@openerp.com-20121128134142-eywfsl3bv56pvoso
2012-11-28 14:41:42 +01:00
Quentin (OpenERP)
d6d4b672db
[MERGE] staging branch, with fixes in contracts
...
bzr revid: qdp-launchpad@openerp.com-20121128121327-b24v6rko1ostm0yb
2012-11-28 13:13:27 +01:00
Fabien Meghazi
9784c7dfa5
[REM] Removed manual many2many tags from kanban views
...
bzr revid: fme@openerp.com-20121128115417-sgpf3hr4rgwglrbm
2012-11-28 12:54:17 +01:00
Quentin (OpenERP)
fc47c738f9
[MERGE] merged the branch with new constraints on accounting + fixes that were spotted by those constraints
...
bzr revid: qdp-launchpad@openerp.com-20121128114714-wxl7r8tr9ov9l46a
2012-11-28 12:47:14 +01:00
Quentin (OpenERP)
0cf6aaf67a
[FIX] purchase: fixing the redbot
...
bzr revid: qdp-launchpad@openerp.com-20121128114146-jqzn3wv7vlsipb07
2012-11-28 12:41:46 +01:00
Quentin (OpenERP)
e037bc48e9
[MERGE] trunk
...
bzr revid: qdp-launchpad@openerp.com-20121128114002-yk9zk24rk79v4pkd
2012-11-28 12:40:02 +01:00
Quentin (OpenERP)
21baf8dfac
[FIX] hr_timesheet_invoice: fixed ambigous reference in sql query. Fixed the redbot
...
bzr revid: qdp-launchpad@openerp.com-20121128112645-5r42r5tajeq0fzs8
2012-11-28 12:26:45 +01:00
Christophe Matthieu
fef6ed2f93
[FIX] When the avatar of 'change my preferences' is mousehover, the scrollbar appears, and after a color bar appears. Set oe_form_field_image_controls on overflow hidden for fixing.
...
bzr revid: chm@openerp.com-20121128111741-pm6fy7z01se90oxd
2012-11-28 12:17:41 +01:00
Quentin (OpenERP)
b59aa36e2e
[FIX] purchase: fixed 'print quotation' report and removed reference to unexisting field 'notes' of purchase.order.line
...
bzr revid: qdp-launchpad@openerp.com-20121128111654-iy9b7wbq14z5zjhg
2012-11-28 12:16:54 +01:00
Quentin (OpenERP)
8dbdbf713f
[FIX] account: pay_and_reconcile() function fixed as per new behavior (accounting entries are created for the parent company if needed)
...
bzr revid: qdp-launchpad@openerp.com-20121128111252-1m37zos11iwg9xyr
2012-11-28 12:12:52 +01:00
Xavier Morel
89d9cd5910
[FIX] use py.js 0.7 API
...
bzr revid: xmo@openerp.com-20121128110542-nplg9o3e5jpxmqic
2012-11-28 12:05:42 +01:00
Raphael Collet
cb32b7e76f
[IMP] auth_reset_password: when sending email, return error message when user has no email address
...
bzr revid: rco@openerp.com-20121128105520-0dpug00newn3rpbm
2012-11-28 11:55:20 +01:00
Raphael Collet
71639ff393
[IMP] auth_oauth: factor js method to make it reusable
...
bzr revid: rco@openerp.com-20121128105342-2djfotkdvzpcbsgb
2012-11-28 11:53:42 +01:00
dusan