Commit Graph
60458 Commits
Author SHA1 Message Date
niv-openerp c538db258a [IMP] now uses py.eval for options
bzr revid: nicolas.vanhoren@openerp.com-20121011125748-8au3gmss2436h5lw
2012-10-11 14:57:48 +02:00
niv-openerp dcae3b64a3 [REVERT] removed server-side evaluation of field options
bzr revid: nicolas.vanhoren@openerp.com-20121011122214-ab1mqyz9h8jnq7ql
2012-10-11 14:22:14 +02:00
Christophe Simonis d1698d2b11 [FIX] edi: correct import of web client
bzr revid: chs@openerp.com-20121011114401-yw8pht7t1gn8bizp
2012-10-11 13:44:01 +02:00
Christophe Simonis 9c3d680214 [FIX] auth_oauth: correct the constraint. How the heck did runbot still green?
bzr revid: chs@openerp.com-20121011114058-svvb5fbz8dye12jk
2012-10-11 13:40:58 +02:00
Olivier Dony 69fa182342 [FIX] web/tests: leftover import errors after removal of standalone web mode
bzr revid: odo@openerp.com-20121011110410-pzons7v1cqn4dywf
2012-10-11 13:04:10 +02:00
Christophe Matthieu 96978f4588 [MERGE] from trunk-openchatter-private-message-chm
bzr revid: chm@openerp.com-20121011102943-9yg65edco1ofwx2b
2012-10-11 12:29:43 +02:00
niv-openerp 70afbd796e Put back readme and license
bzr revid: nicolas.vanhoren@openerp.com-20121011085218-3vwfiujciex326yx
2012-10-11 10:52:18 +02:00
Christophe Matthieu 30be16b0fc [MERGE] from trunk
bzr revid: chm@openerp.com-20121011074626-rztxx7vnhg8sd72l
2012-10-11 09:46:26 +02:00
Christophe Matthieu 3a47e369e1 [MERGE] from trunk
bzr revid: chm@openerp.com-20121011071602-u23xansbga1i41vs
2012-10-11 09:16:02 +02:00
Launchpad Translations on behalf of openerp fc94df2af5 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121011050045-qe3vhe34wrjw1xb8
2012-10-11 05:00:45 +00:00
Antony Lesuisse f44ea704fe [IMP] CrashManager use event dispatcher and cleanups
bzr revid: al@openerp.com-20121011003729-jjbh5se1cpsachvm
2012-10-11 02:37:29 +02:00
Antony Lesuisse 462eccb10d [FIX] auth_signup pass on the state
bzr revid: al@openerp.com-20121011000534-w3wa7m3mh1znylde
2012-10-11 02:05:34 +02:00
Antony Lesuisse b1b8447a6b [FIX] login always set params for potential redirection
bzr revid: al@openerp.com-20121011000217-ck3xsquoain1z8ja
2012-10-11 02:02:17 +02:00
Antony Lesuisse a7891a99bb [MERGE] trunk-export_terminology-mdi manually
bzr revid: al@openerp.com-20121010212352-ulfyar0j2x2w2jbo
2012-10-10 23:23:52 +02:00
Quentin (OpenERP) 407979d8d3 [MERGE] company: reports are now printing the company address as per its country format
bzr revid: qdp-launchpad@openerp.com-20121010205555-fsgudcepuy153ye2
2012-10-10 22:55:55 +02:00
Antony Lesuisse 0dbd9b603a [IMP] remove standalone web client, fix logging
bzr revid: al@openerp.com-20121010204829-5vamumz9lhxpsgob
2012-10-10 22:48:29 +02:00
Antony Lesuisse 84a7523a63 [IMP] remove standalone web client, fix imports
bzr revid: al@openerp.com-20121010204617-ah29rz616xo7i2dr
2012-10-10 22:46:17 +02:00
Antony Lesuisse 07e1fba67d [MERGE] remove standalone web client
bzr revid: al@openerp.com-20121010204451-nq3eatsl1x9zi1cf
2012-10-10 22:44:51 +02:00
Quentin (OpenERP) ceb6078a77 [MERGE] staging branch
bzr revid: qdp-launchpad@openerp.com-20121010204106-93h2ltcok9cuk2mt
2012-10-10 22:41:06 +02:00
Antony Lesuisse ae6ff0764b web remove common, fix imports
bzr revid: al@openerp.com-20121010203753-azrcz3k2kd44ni24
2012-10-10 22:37:53 +02:00
Fabien Pinckaers e085739262 [MERGE] binary fields
bzr revid: fp@openerp.com-20121010202248-xjg4bl3dolrjuder
2012-10-10 22:22:48 +02:00
Fabien Pinckaers 2478d89adb [MERGE] del on google doc icon in attachments
bzr revid: fp@openerp.com-20121010201335-xznfnvpp9272h3gb
2012-10-10 22:13:35 +02:00
Fabien Pinckaers f802974ca2 [MERGE]
bzr revid: fp@openerp.com-20121010193411-78hf4ivhw7jiy6oc
2012-10-10 21:34:11 +02:00
Fabien Pinckaers 2e62db4d07 merge_trunk
bzr revid: fp@openerp.com-20121010193315-3l1tvk8by3p1hy2x
2012-10-10 21:33:15 +02:00
Fabien Pinckaers 191a318f9b [MERGE] partner manager -> contact creation
bzr revid: fp@openerp.com-20121010191514-2mtm2sfssyhqoe3c
2012-10-10 21:15:14 +02:00
Christophe Matthieu 76a257cd1b [MERGE] from trunk
bzr revid: chm@openerp.com-20121010185721-in3ab4mr8h72lect
2012-10-10 20:57:21 +02:00
Quentin (OpenERP) a8c6c4e34a [MERGE] purchase: ps review
bzr revid: qdp-launchpad@openerp.com-20121010184414-eys4z5k531qwx5ck
2012-10-10 20:44:14 +02:00
Quentin (OpenERP) e4f56c09b0 [MERGE] trunk
bzr revid: qdp-launchpad@openerp.com-20121010184205-7ujgszgtohgphhpg
2012-10-10 20:42:05 +02:00
Christophe Matthieu 49a174df57 [IMP] chatter, follower: html/js for css imp
bzr revid: chm@openerp.com-20121010181611-rl167r9h0ejz8zdu
2012-10-10 20:16:11 +02:00
Antony Lesuisse 818fd9f67f remove standalone
bzr revid: al@openerp.com-20121010172418-27stgsd4w71cbxv4
2012-10-10 19:24:18 +02:00
Xavier Morel 3351bb2167 [MERGE] second and last phase of new import
bzr revid: xmo@openerp.com-20121010155101-fs38ceua1mp7rw6z
2012-10-10 17:51:01 +02:00
Xavier Morel 7a7876d4a8 [MERGE] from trunk
bzr revid: xmo@openerp.com-20121010154605-u16f57fnck148ued
2012-10-10 17:46:05 +02:00
Quentin (OpenERP) e86e8433cd [MERGE] merged the branch with monetary widget on main objects
bzr revid: qdp-launchpad@openerp.com-20121010151710-m0iyijgsym6tweq4
2012-10-10 17:17:10 +02:00
Quentin (OpenERP) 672cec8eda [MERGE] purchase, PS review
bzr revid: qdp-launchpad@openerp.com-20121010144059-vr7l0scq6u1ahr20
2012-10-10 16:40:59 +02:00
vta vta@openerp.com db919af452 [MERGE] trunk-trigger-on_unlink.
bzr revid: vta@openerp.com-20121010143653-wi0yjq91l8ty43uj
2012-10-10 16:36:53 +02:00
vta vta@openerp.com 6b509ab8ea [FIX] on_unlink.
bzr revid: vta@openerp.com-20121010143607-nv3lhmy8r27m1ls9
2012-10-10 16:36:07 +02:00
Quentin (OpenERP) 1ec609f1a6 [MERGE] trunk
bzr revid: qdp-launchpad@openerp.com-20121010143206-74p0k9xiojz2yc4z
2012-10-10 16:32:06 +02:00
Christophe Simonis 4436d11ad7 [FIX] auth_oauth: add unique constraint on (oauth_provide_id,oauth_uid) + do not try to create user if signup is not installed
bzr revid: chs@openerp.com-20121010140104-4amqblnbu0es753x
2012-10-10 16:01:04 +02:00
Quentin (OpenERP) ec5b3b7e64 [FIX] project: fixed error introduced in revision 7741
bzr revid: qdp-launchpad@openerp.com-20121010135414-q7hp9mu752j3z3rk
2012-10-10 15:54:14 +02:00
Quentin (OpenERP) cb89d2d842 [FIX] account_voucher: wrong accounting entry for supplier payment in foreign currency
lp bug: https://launchpad.net/bugs/1007487 fixed

bzr revid: qdp-launchpad@openerp.com-20121010135359-0h0cxeyvk8lrtzni
2012-10-10 15:53:59 +02:00
Xavier Morel 24c7e25b9b [MERGE] base_import: second phase; update to some addons
bzr revid: xmo@openerp.com-20121010134737-u6zka0yas8sgawhz
2012-10-10 15:47:37 +02:00
vta vta@openerp.com 709eca0aa6 [MERGE] Merged trunk-trigger-on_saved.
bzr revid: vta@openerp.com-20121010132543-1363lzujopqo0wo7
2012-10-10 15:25:43 +02:00
vta vta@openerp.com 94ac244a22 [FIX] Fixed on_saved.
bzr revid: vta@openerp.com-20121010132049-uuqru2c0k81s3o90
2012-10-10 15:20:49 +02:00
Xavier Morel 01f6099cd1 [MERGE] from trunk
bzr revid: xmo@openerp.com-20121010130653-zjsc2kuhmbyb512s
2012-10-10 15:06:53 +02:00
Antony Lesuisse 5775b402a7 [MERGE] trunk
bzr revid: al@openerp.com-20121010125833-1w3xgpxgol5x626h
2012-10-10 14:58:33 +02:00
Fabien Meghazi 7796ecaccf [FIX] auth_oauth calling refactored method
bzr revid: fme@openerp.com-20121010125545-kolr1xcmgvtt1ouc
2012-10-10 14:55:45 +02:00
Quentin (OpenERP) 7162a62550 [IMP] account_asset: added monetary widget on asset form view
bzr revid: qdp-launchpad@openerp.com-20121010125231-q3pmc65m5ujz2anr
2012-10-10 14:52:31 +02:00
vta vta@openerp.com 6ef264339c [FIX] Fixed conflicts in kanban.js. Thanks to VME.
bzr revid: vta@openerp.com-20121010125212-oy5m304knbifad52
2012-10-10 14:52:12 +02:00
Quentin (OpenERP) 5cae4f05bf [IMP] hr_expense: added monetary widget on expense form view
bzr revid: qdp-launchpad@openerp.com-20121010124626-gw4inlqinqptubup
2012-10-10 14:46:26 +02:00
Xavier Morel b70d0dab52 [FIX] cases where options dict is decoded as unicode strings on windows: csv.reader kwargs *must* be strings
bzr revid: xmo@openerp.com-20121010123827-x76udyurqzgnqebg
2012-10-10 14:38:27 +02:00