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
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
Vo Minh Thu
fc2f4ab8a4
[MERGE] merged trunk.
...
bzr revid: vmt@openerp.com-20121128151352-n9r87jn5tff949ka
2012-11-28 16:13:52 +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
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
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
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
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
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
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
Raphael Collet
99e58b8566
[IMP] auth_oauth: make js code more robust
...
bzr revid: rco@openerp.com-20121128092821-2pig86cyknkgkai5
2012-11-28 10:28:21 +01:00
Raphael Collet
0dbea5192a
[IMP] auth_reset_password: add a useful tooltip on the Reset Password button
...
bzr revid: rco@openerp.com-20121128091231-1f2jjg345465382e
2012-11-28 10:12:31 +01:00
Raphael Collet
3e46253ae4
[IMP] auth_reset_password: make password not required in user form (Reset Password button can do the job)
...
bzr revid: rco@openerp.com-20121128090514-ponlrne0mz8uxy7u
2012-11-28 10:05:14 +01:00
Raphael Collet
572f0a76d8
[FIX] auth_signup: change the user status to 'reset' when a valid signup token is present
...
bzr revid: rco@openerp.com-20121128090335-rq0xpjajg6bt2xde
2012-11-28 10:03:35 +01:00
Christophe Matthieu
b41ee4833e
[MERGE] from trunk-first-10clicks-accounting-tta; Selection Placeholder. No traceback py but a warning/constraint message for wrong value insert for float and int.
...
bzr revid: chm@openerp.com-20121128083349-qfnl5rbaprq7hlh6
2012-11-28 09:33:49 +01:00
Christophe Matthieu
4c7229f2c3
[MERGE] from trunk-addons_23-mdi; FIX for 'Debug mode becomes permanent in local databases.' and Fonts for 'Print' and 'More' menus are grey (they should be pure black, because grey = deactivated in the mind of most people)
...
bzr revid: chm@openerp.com-20121128082130-x16m1x0bdsgo7grp
2012-11-28 09:21:30 +01:00
Vishmita
f2c8f6d970
[FIX]when there is no product into the POS category it gives an error.
...
bzr revid: vja@tinyerp.com-20121128062926-qjweapwl8o3l94op
2012-11-28 11:59:26 +05:30
Tejas Tank
81a2e23dd6
[FIX] clean the code.
...
bzr revid: tta@openerp.com-20121128053540-01z3yiooq83foyew
2012-11-28 11:05:40 +05:30
09eccd07dc
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121128044150-jz3ll5wdeuxmt0uq
bzr revid: launchpad_translations_on_behalf_of_openerp-20121128045740-q3cav2rhekdy6gq8
2012-11-28 04:57:40 +00:00
3c92e1f62b
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121128044032-avm584dzac8w8wf3
2012-11-28 04:40:32 +00:00
Divyesh Makwana (Open ERP)
91b19d1a7c
[Merge] Merge with trunk.
...
bzr revid: mdi@tinyerp.com-20121128042303-eu3ttdp9nvt99o2k
2012-11-28 09:53:03 +05:30
Antony Lesuisse
eb4d14cd86
[IMP] auth_signup remove all css, better wording, auth_oauth align button better wording
...
bzr revid: al@openerp.com-20121128001449-jy86hb86eyv0milv
2012-11-28 01:14:49 +01:00
Antony Lesuisse
f63bdc67e2
[FIX] Login button left for better looking signup and oauth integration
...
bzr revid: al@openerp.com-20121127235942-oudu8auo2f9ctulo
2012-11-28 00:59:42 +01:00
Antony Lesuisse
db26909b8a
[MERGE] signup with oauth by rco
...
bzr revid: al@openerp.com-20121127234543-apz9ddxzp3vntorj
2012-11-28 00:45:43 +01:00
Thibault Delavallée