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
10ba4e5e60
[IMP] [TMP] controller: search for all menus to have their needaction info, because currently needaction_enabled is not searchable (non stored function field). Revert this revision when the column is back as stored.
...
bzr revid: tde@openerp.com-20121128110520-wijh1sr5qvsch7b8
2012-11-28 12:05:20 +01:00
Thibault Delavallée
4be660369d
[DOC] ir_ui_menu: added some comments to the methods related to needaction.
...
bzr revid: tde@openerp.com-20121128110428-lebsx4s3zlmgdhxj
2012-11-28 12:04:28 +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
Xavier Morel
b194e225f1
[FIX] py_date should return a local date, not a UTC date
...
bzr revid: xmo@openerp.com-20121128104716-w7zqiljfazj597pg
2012-11-28 11:47:16 +01:00
Sanjay Gohel (Open ERP)
0e0d10d3cd
[MERGE]merge with parent branch
...
bzr revid: sgo@tinyerp.com-20121128095756-35w9ggb15yuyumbf
2012-11-28 15:27:56 +05:30
Sanjay Gohel (Open ERP)
c860d84701
[MERGE]merge with parent
...
bzr revid: sgo@tinyerp.com-20121128095535-xc6xp0mkbml1xpvh
2012-11-28 15:25:35 +05:30
Sanjay Gohel (Open ERP)
f630e0a338
[MERGE]merge with trunk
...
bzr revid: sgo@tinyerp.com-20121128095512-t9v6p77jl54yai9p
2012-11-28 15:25:12 +05:30
Thibault Delavallée
e5887f2183
[MERGE] Sync with trunk.
...
bzr revid: tde@openerp.com-20121128095111-0p1p6jcb6ttgqzh4
2012-11-28 10:51:11 +01:00
d2030f2d06
[MERGE] trunk-bug-1081044-vja.
...
bzr revid: vta@openerp.com-20121128095058-425l4g4my0um3kzj
2012-11-28 10:50:58 +01:00
Thibault Delavallée
ac587f68fe
[IMP] expression.py: added support of _auto_join in parse. The purpose is to add join clauses to queries instead of replacing many2one or one2many fields by id in ... equivalent leafs. This should lessen the number of executed queries, as well as the time required for some queries like mailboxes queries. Updated the generation of full table aliases when generating SQL, to avoid having a table having it own name as alias.
...
bzr revid: tde@openerp.com-20121128095042-x5rzgwydv0g9uy0m
2012-11-28 10:50:42 +01:00
Thibault Delavallée
0544565a57
[REV] ir_ui_menu: temporarily set needaction_enabled column back to non-stored, to be able to use the branch on internal test database with needaction, without requiring too many hand-made modifications.
...
bzr revid: tde@openerp.com-20121128094234-ux06ludum7ub59u5
2012-11-28 10:42:34 +01:00
Christophe Matthieu
71e999d611
[MERGE] from trunk-improve-notification-infinity-psa; Improved notification when it will be more than 99 than display 99+
...
bzr revid: chm@openerp.com-20121128094131-xewcni2ee1sirqep
2012-11-28 10:41:31 +01:00
Raphael Collet
d132b0d4b0
[FIX] auth_oauth: revert not-so-smart change
...
bzr revid: rco@openerp.com-20121128093617-gqy2zp5orckwz7nj
2012-11-28 10:36:17 +01:00
Nimesh (Open ERP)
05573bb935
[IMP] improve onchge.
...
bzr revid: nco@tinyerp.com-20121128093448-i70yati7mdcr5o1f
2012-11-28 15:04:48 +05:30
Raphael Collet
20627fc8e5
[MERGE] trunk-oauth-signin-rco (small improvements in modules auth_oauth, auth_reset_password, auth_signup)
...
bzr revid: rco@openerp.com-20121128093005-svt8s4mey2ow5qsc
2012-11-28 10:30:05 +01:00
Arnaud Pineux
3df8c5fe9a
[IMP] Base Action Rule (only filter conditions)
...
bzr revid: api@openerp.com-20121128092928-7kbs1d9g8ung4oul
2012-11-28 10:29:28 +01:00
Christophe Simonis