Commit Graph

9 Commits

Author SHA1 Message Date
Antonin Bourguignon 59dc49061c [IMP] we don't need a special type of exception anymore
bzr revid: abo@openerp.com-20130124154119-5283u6x1it5xvt0r
2013-01-24 16:41:19 +01:00
Antonin Bourguignon aab0dd122a [MERGE] trunk
bzr revid: abo@openerp.com-20130122122250-8pu5jycraqj435nu
2013-01-22 13:22:50 +01:00
Antonin Bourguignon 8bd622202b [IMP] introduce a new type of exception: WarningConfig. Note that no corresponding RPC_FAULT_CODE has been added; WarningConfig will share the same RPC_FAULT_CODE than Warning (RPC_FAULT_CODE_WARNING = 2)
Also remove a few whitespaces

bzr revid: abo@openerp.com-20130118152346-5v4j94wjrq34hq4m
2013-01-18 16:23:46 +01:00
Vo Minh Thu 8119d89200 [ADD] oe web: run an OpenERP web process.
bzr revid: vmt@openerp.com-20130111153113-ue2ybx33e2gh99sx
2013-01-11 16:31:13 +01:00
Christophe Simonis 236df95b22 merge upstream
bzr revid: chs@openerp.com-20121210132406-9ro3amw6s6pzeez4
2012-12-10 14:24:06 +01:00
Antony Lesuisse 3d3eac7c50 service cleanups, more wizard removal
bzr revid: al@openerp.com-20121209184632-hp9b9fbbn9g4h2lw
2012-12-09 19:46:32 +01:00
Christophe Simonis 7d3f3d475b merge upstream
bzr revid: chs@openerp.com-20121010115500-xz9oqr2g8vzr79jq
2012-10-10 13:55:00 +02:00
Antony Lesuisse d77fe9c185 [FIX] restore poxy-mode command line option to prevent ip address impersonation
bzr revid: al@openerp.com-20120924105622-nb3iwe1vnuffqrbm
2012-09-24 12:56:22 +02:00
Antony Lesuisse 4679680dba manual merge of multicorn
bzr revid: al@openerp.com-20120922105107-q02ogtsfudphzkl6
2012-09-22 12:51:07 +02:00