Commit Graph

51999 Commits

Author SHA1 Message Date
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
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
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
vta vta@openerp.com d2030f2d06 [MERGE] trunk-bug-1081044-vja.
bzr revid: vta@openerp.com-20121128095058-425l4g4my0um3kzj
2012-11-28 10:50:58 +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
Launchpad Translations on behalf of openerp 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
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
Fabien Pinckaers 854284b6af [MERGE] fgi improve
bzr revid: fp@openerp.com-20121127215908-q5yt8nwna6gmdu88
2012-11-27 22:59:08 +01:00
Fabien Pinckaers 10afab6eb6 [MERGE] addons 24
bzr revid: fp@openerp.com-20121127212322-soubdlrcgqx4cz88
2012-11-27 22:23:22 +01:00
Raphael Collet 7c61b7142d [FIX] auth_oauth: add missing parameter in method call...
bzr revid: rco@openerp.com-20121127153532-5jw6sm8ltcmoewrq
2012-11-27 16:35:32 +01:00
Raphael Collet 22f30bc8dc [FIX] auth_oauth: stupid mistake, using 'self' instead of 'this'...
bzr revid: rco@openerp.com-20121127153040-aol52i523ysabah8
2012-11-27 16:30:40 +01:00
Christophe Matthieu f1ea29e580 [MERGE] from trunk-opw-581041-vja; Fixed the issue of raised exception not displayed in trunk when adding attachment to object if create of ir.attachment raises exception. Now, it should display the warning message.
bzr revid: chm@openerp.com-20121127150808-wqo8qh2vstagz4kj
2012-11-27 16:08:08 +01:00
Quentin (OpenERP) b296312be9 [FIX] hr_timesheet_invoice: fixing the redbot
bzr revid: qdp-launchpad@openerp.com-20121127144338-j2803m1x08xwr6v4
2012-11-27 15:43:38 +01:00
niv-openerp 8e15ed4002 [IMP] small improvement of core lib
bzr revid: nicolas.vanhoren@openerp.com-20121127144140-14y700rqdmpd8w44
2012-11-27 15:41:40 +01:00
Christophe Matthieu ebf4ae991a [MERGE] form trunk-bug-1059320-psa for FIX bug/1059320. Improved code for the displaying the db_list, if more than one db in list display name instead of debug
bzr revid: chm@openerp.com-20121127135621-kmnb4o2kv21bsmwz
2012-11-27 14:56:21 +01:00
Quentin (OpenERP) 928f7ecfe9 [MERGE] trunk
bzr revid: qdp-launchpad@openerp.com-20121127134541-t16ham0o3k4xx0f8
2012-11-27 14:45:41 +01:00
Quentin (OpenERP) 60f1d800a2 [FIX] analytic_contract_hr_expense: use the real cost when reinvoicing expenses
bzr revid: qdp-launchpad@openerp.com-20121127125309-t3lp3abnzh2se0zr
2012-11-27 13:53:09 +01:00
Quentin (OpenERP) 77de5e8f72 [FIX] membership: passing context in action_cancel() method of account.invoice. Fixing the runbot
bzr revid: qdp-launchpad@openerp.com-20121127125022-27bon20szhgyjtt9
2012-11-27 13:50:22 +01:00
Quentin (OpenERP) 14c220cb9a [FIX] account: passing context in action_cancel() method of account.invoice. Fixing the runbot
bzr revid: qdp-launchpad@openerp.com-20121127122416-x9220fce3gbv2vr5
2012-11-27 13:24:16 +01:00
Paramjit Singh Sahota 30212a6af4 [IMP] Improved code as per suggested.
bzr revid: psa@tinyerp.com-20121127122231-5amahuk6tqp9so74
2012-11-27 17:52:31 +05:30
Quentin (OpenERP) 19b743f80f [FIX] account_voucher: fixed newly added constraint
bzr revid: qdp-launchpad@openerp.com-20121127122037-zvm4rdl15h8vj326
2012-11-27 13:20:37 +01:00
Quentin (OpenERP) 6f256d41db [FIX] account_analytic_contract, analytic_contract_hr_expense, hr_timesheet_invoice: fixed the computation of *to_invoice fields
bzr revid: qdp-launchpad@openerp.com-20121127120737-5xeed6lobynqf10l
2012-11-27 13:07:37 +01:00
Divyesh Makwana (Open ERP) 1db3fca04a [REM] Removed the unneccessary changes.
bzr revid: mdi@tinyerp.com-20121127103416-1zos04k7ohny9nvp
2012-11-27 16:04:16 +05:30
Quentin (OpenERP) 65d03bad15 [MERGE] joel's branch containing fixes about constraints newly added
bzr revid: qdp-launchpad@openerp.com-20121127102442-l4qolhlmbn4g788o
2012-11-27 11:24:42 +01:00
Raphael Collet a50bc125f8 [IMP] auth_oauth: doc improvement
bzr revid: rco@openerp.com-20121127100635-vzbuw6a73286t2t2
2012-11-27 11:06:35 +01:00
Vishmita 71c8b58581 [FIX]Fixed the issue of raised exception not displayed when adding attachment to object if create of ir.attachment raises exception.
bzr revid: vja@tinyerp.com-20121127100210-krziqgqh1t1063ry
2012-11-27 15:32:10 +05:30
Xavier Morel ef5be74caa [FIX] disable sorting (column-click) in an editable listview being edited
To do so, extract sort handling to its own method (bound using the
events hash) and override-and-disable in editable.

bzr revid: xmo@openerp.com-20121127094109-mojnq50mzsrcj3q0
2012-11-27 10:41:09 +01:00
Raphael Collet 36059c6ffe [MERGE] from trunk
bzr revid: rco@openerp.com-20121127093915-6zupyre5jh2fxfd7
2012-11-27 10:39:15 +01:00
Paramjit Singh Sahota 77ac04efd8 [FIX][trunk] display dbname if len(db_list())>1 [chs]
lp bug: https://launchpad.net/bugs/1059320 fixed

bzr revid: psa@tinyerp.com-20121127083630-odwky5bdy24gxoa4
2012-11-27 14:06:30 +05:30
Launchpad Translations on behalf of openerp e6d033755f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121127052458-7c24bjy09rqd8r8o
bzr revid: launchpad_translations_on_behalf_of_openerp-20121127054533-m8gqmer5k5jpcs65
2012-11-27 05:45:33 +00:00