Thibault Delavallée
b4e8416486
[MERGE] Sync with trunk.
...
bzr revid: tde@openerp.com-20121128155246-33vcdcysd47uk4k5
2012-11-28 16:52:46 +01:00
Thibault Delavallée
2f16bf4b56
[MERGE] Sync with trunk.
...
bzr revid: tde@openerp.com-20121128155236-o3zvpj5aqkmimrn7
2012-11-28 16:52:36 +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
6183134f4d
[FIX] Attempt to fix mail bug, why the hell res_model is not in the values?.
...
bzr revid: vta@openerp.com-20121128154717-3ashimdrwd0kl24k
2012-11-28 16:47:17 +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
4b73ea9027
[FIX]Ir values actions
...
bzr revid: dle@openerp.com-20121128150525-zh27h78v8dd6dkwm
2012-11-28 16:05:25 +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
Christophe Matthieu
6b5bdc7e84
[IMP] mail: add option copose_as_todo, to mark as todo the messages wrote by the composer of the root thread
...
bzr revid: chm@openerp.com-20121128145101-7lnw7zfrjp5k8fg3
2012-11-28 15:51:01 +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
Christophe Simonis
7773d0d431
[FIX] win32/setup.py: forgot \n
...
bzr revid: chs@openerp.com-20121128142521-1giiba0fvxhq84mu
2012-11-28 15:25:21 +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
Tejas Tank
f09b67d560
[IMP] Fixed tag issue rendering.
...
bzr revid: tta@openerp.com-20121128140222-y8pijs2rtx3htgv4
2012-11-28 19:02:22 +05:00
Thibault Delavallée
a853b9f2ad
[TEST] Added some tests about the _auto_join feature.
...
bzr revid: tde@openerp.com-20121128140042-4r58wnzahk0io3lw
2012-11-28 15:00:42 +01:00
Christophe Simonis
79b2e72f07
merge upstream
...
bzr revid: chs@openerp.com-20121123165044-n5l5nqtm678abb2s
bzr revid: chs@openerp.com-20121128135644-iuiynfijiue67uth
2012-11-28 14:56:44 +01:00
Christophe Simonis
10697d1c1e
merge upstream
...
bzr revid: chs@openerp.com-20121128135442-nt2dv11726odr2ji
2012-11-28 14:54:42 +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
Tejas Tank
e0f6e8701e
[MERGE]: Merged
...
bzr revid: tta@openerp.com-20121128133712-3b86sc96skj3prfa
2012-11-28 18:37:12 +05:00
Christophe Simonis
af7fbd40ab
some brief changes
...
bzr revid: chs@openerp.com-20121128132413-op2z4vmv78y04u95
2012-11-28 14:24:13 +01:00
Josse Colpaert
479a8b9a8e
[IMP] Added other tests
...
bzr revid: jco@openerp.com-20121128131221-i3rrqc9172ozz7u2
2012-11-28 14:12:21 +01:00
0c1d497c62
[FIX]hr_timesheet_invoice: Fix issue Invoice tasks creates new tasks to invoice
...
lp bug: https://launchpad.net/bugs/948876 fixed
bzr revid: mma@tinyerp.com-20121128122940-96pwz3ot6j5zgym6
2012-11-28 17:59:40 +05:30
Jalpesh Patel (OpenERP)
fbb4e61d71
[FIX]fix problem of POS Receipt missing space
...
bzr revid: pja@tinyerp.com-20121128121401-99mszzxiio5ewd3q
2012-11-28 17:44:01 +05:30
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
Sanjay Gohel (Open ERP)
4080fc712c
[IMP]remove unused messge post
...
bzr revid: sgo@tinyerp.com-20121128121126-s9n0910qjcgc66pt
2012-11-28 17:41:26 +05:30
Christophe Simonis
a55a26c777
[IMP] rewrite win32/setup.py to generate dynamic files
...
bzr revid: chs@openerp.com-20121128120950-bi6uv3bn73gotmwi
2012-11-28 13:09:50 +01:00
Arnaud Pineux
7e8533d278
[FIX] old actions based on filters still work
...
bzr revid: api@openerp.com-20121128120100-58xrtp54txigz0b5
2012-11-28 13:01:00 +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
Sanjay Gohel (Open ERP)
766cad2f02
[IMP]improve code for subtype implementation and if remove record then string shows as removed
...
bzr revid: sgo@tinyerp.com-20121128114823-whnokm2a1j9m3ddk
2012-11-28 17:18:23 +05:30
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
Christophe Matthieu
89fce59283
[IMP] mail: not display the 'no message' before to fetch the wall messages.
...
bzr revid: chm@openerp.com-20121128113421-rcoo4003npxtnfzb
2012-11-28 12:34:21 +01:00
Christophe Matthieu
1c32100052
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20121128112942-k2t9vnkiwfx4xr9b
2012-11-28 12:29:42 +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
Thibault Delavallée