Commit Graph
61575 Commits
Author SHA1 Message Date
Ajay Chauhan (OpenERP) 425d285e2e [IMP] hr_timesheet_invoice: made little change in condition
bzr revid: cha@tinyerp.com-20120928054445-ayg474ppng31318r
2012-09-28 11:14:45 +05:30
Mayur Maheshwari (OpenERP) 826e2b8fdb [FIX]Google_docs: added Resource lib for latest gadta.docs and improve raise msg
bzr revid: mma@tinyerp.com-20120928053338-oqzeawxblt7l6nt4
2012-09-28 11:03:38 +05:30
Rucha (Open ERP) e8d168328b [IMP]: base: * Changed photo of contact so it should look like avtar,
* Added new logo for camptocamp and added new company(Vauxoo)

bzr revid: rpa@tinyerp.com-20120928051816-atlp664v30rpida0
2012-09-28 10:48:16 +05:30
Rucha (Open ERP) dbfffb6104 [IMP]: base: Improved name of Vauxoo
bzr revid: rpa@tinyerp.com-20120928051640-o4b52h70b1g9g5oc
2012-09-28 10:46:40 +05:30
Randhir Mayatra (OpenERP) afebb45f23 [MERGE] merge with parent branch
bzr revid: rma@tinyerp.com-20120928050544-vduavy8n5w0saipg
2012-09-28 10:35:44 +05:30
Amit Patel e63dd6d1a9 [MERGE]:trunk
bzr revid: hmo@tinyerp.com-20120926110557-098p014k6heo4m8t
bzr revid: apa@tinyerp.com-20120928050541-fm2pwdviqefzbtua
2012-09-28 10:35:41 +05:30
Rucha (Open ERP) 824f6f7181 [MERGE]: Merged with latest trunk-server
bzr revid: rpa@tinyerp.com-20120927114939-g72nqop54stmdu3l
bzr revid: rpa@tinyerp.com-20120927115920-ixs1uxx8k6ss6rb9
bzr revid: rpa@tinyerp.com-20120928050533-5z10hnyqiwr28bbp
2012-09-28 10:35:33 +05:30
Amit Patel ad5a175d8b [MERGE]:trunk
bzr revid: apa@tinyerp.com-20120928050433-1gb7lpwwxdfpedlu
2012-09-28 10:34:33 +05:30
Launchpad Translations on behalf of openerp b6254d631a Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120928043937-q806aifjxq7igjv1
bzr revid: launchpad_translations_on_behalf_of_openerp-20120928044730-1vt4fkqsvfisc6kj
2012-09-28 04:47:30 +00:00
Randhir Mayatra (OpenERP) 80abb29155 [MERGE]merge with parent branch
bzr revid: rma@tinyerp.com-20120928044656-ur7w61qeu6r3nvnw
2012-09-28 10:16:56 +05:30
Divyesh Makwana (Open ERP) b44ab86f77 [Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20120927121603-jbd16j0jdjlkdyfm
bzr revid: mdi@tinyerp.com-20120928041856-32cseh83qy3heyfz
2012-09-28 09:48:56 +05:30
Divyesh Makwana (Open ERP) c7569980e8 [Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20120927121802-qch0xhvx5kvhffvd
bzr revid: mdi@tinyerp.com-20120928041512-h86y5x1lxz4i1sm3
2012-09-28 09:45:12 +05:30
Antony Lesuisse 6d692fac36 [IMP] corelib eventdispatcher document triggers
bzr revid: al@openerp.com-20120928005950-722cfdyjsq1pjwyj
2012-09-28 02:59:50 +02:00
Antony Lesuisse 52dd75a609 [IMP] corelib eventdispatcher document events in class, example for JsonRpc
bzr revid: al@openerp.com-20120928004449-d9cvdmfg0ud701nx
2012-09-28 02:44:49 +02:00
Antony Lesuisse 97b1022f8b [IMP] callbackenable goodbye part1
bzr revid: al@openerp.com-20120928002451-qhel37u21zswj1f7
2012-09-28 02:24:51 +02:00
Antony Lesuisse a55cc6072a [IMP] callback2deferred part1 dataset.unlink
bzr revid: al@openerp.com-20120927234513-3aohele9gcoxkha4
2012-09-28 01:45:13 +02:00
Antony Lesuisse 2f1948389e [IMP] data cleanups, rename data.Group
prepare possible DataGroup removal in favor of QueryGroup

bzr revid: al@openerp.com-20120927230551-zo16cjd5lkq11gec
2012-09-28 01:05:51 +02:00
Fabien Pinckaers cfb22c62fb [FIX] visibility of note group
bzr revid: fp@tinyerp.com-20120927192123-oyktxq2ms964eskw
2012-09-27 21:21:23 +02:00
Fabien Pinckaers fbe0c03df3 [FIX] Attendances rules
bzr revid: fp@tinyerp.com-20120927191804-szqoktzis42qju2h
2012-09-27 21:18:04 +02:00
Fabien Pinckaers 0eee48d30a [MERGE] auto-follow Sales Team, Projet, HR Manager
bzr revid: fp@tinyerp.com-20120927191059-pug5mrft8f06uwux
2012-09-27 21:10:59 +02:00
Fabien Pinckaers 386e63e719 [MERGE]
bzr revid: fp@tinyerp.com-20120927174908-qn6ohln74pv4tehe
2012-09-27 19:49:08 +02:00
Fabien Pinckaers 816f50974a [MERGE] optionnal attendances visible
bzr revid: fp@tinyerp.com-20120927174758-zp58w2phycwm30l7
2012-09-27 19:47:58 +02:00
Fabien Pinckaers d59806f85c [MERGE] Access Rights Groups use same name than menu
bzr revid: fp@tinyerp.com-20120927174224-v6uk2eokj73gg04x
2012-09-27 19:42:24 +02:00
Fabien Pinckaers bb1eebe266 [MERGE] Access Rights Groups use same name than menu
bzr revid: fp@tinyerp.com-20120927174145-z5nv8i8fkbukbncs
2012-09-27 19:41:45 +02:00
Fabien Pinckaers c4dbe9fc10 [MERGE] Global attachments are visible only if you nstall document module
bzr revid: fp@tinyerp.com-20120927173919-grczxv8yzv3kf2c8
2012-09-27 19:39:19 +02:00
Fabien Pinckaers b565f90df0 [MERGE] Global attachments are visible only if you nstall document module
bzr revid: fp@tinyerp.com-20120927173854-8tdlr6yclci015z1
2012-09-27 19:38:54 +02:00
Fabien Pinckaers fc9f8491fe [MERGE] related not in 'More...'
bzr revid: fp@tinyerp.com-20120927173641-i503k4kycnwjyefj
2012-09-27 19:36:41 +02:00
Fabien Pinckaers ffb34cf11a [MERGE] expenses on products
bzr revid: fp@tinyerp.com-20120927172857-33gdnizuxzi63dce
2012-09-27 19:28:57 +02:00
Fabien Pinckaers 6c88927a51 [MERGE] MRP Useability: menus
bzr revid: fp@tinyerp.com-20120927172640-w8z1nipu7ijwb8k2
2012-09-27 19:26:40 +02:00
Christophe Matthieu 96dee3a6b0 [IMP]mail post: no send empty message
bzr revid: chm@openerp.com-20120927172350-6nbedjnnmwz3j351
2012-09-27 19:23:50 +02:00
Christophe Matthieu d78a7cdea1 [IMP]mail post: no send empty message
bzr revid: chm@openerp.com-20120927172317-2l19ef9jh0ttfgxy
2012-09-27 19:23:17 +02:00
Fabien Pinckaers 2e3c76f4ff [FIX] Invoice Payment
bzr revid: fp@tinyerp.com-20120927170323-b0qpufpc94dcb58h
2012-09-27 19:03:23 +02:00
Antonin Bourguignon fbab999fe2 [FIX] a lot of typos in yml tests
also put the phonecall tests apart in a separated yml file

bzr revid: abo@openerp.com-20120927165708-7pu4ka5e0obb8g0l
2012-09-27 18:57:08 +02:00
Christophe Matthieu c328ab9afe [IMP]mail: show more, domain. bzr status! test in conment for error
bzr revid: chm@openerp.com-20120927161558-6e5w2tblg64bltmu
2012-09-27 18:15:58 +02:00
Antonin Bourguignon d92fe7019a [FIX] typos in demo data
bzr revid: abo@openerp.com-20120927161435-53b1vef565j0g2vb
2012-09-27 18:14:35 +02:00
Xavier Morel def7e61901 [IMP] reimplement BaseModel.import_data on top of BaseModel.load
adapt tests to assert the corrected behavior of load instead of import_data's broken behavior

bzr revid: xmo@openerp.com-20120927154244-e56ygz2yytullg2l
2012-09-27 17:42:44 +02:00
Xavier Morel 87af7a6365 [FIX] replace warnings capture by explicitly returning a list of warnings from converters
makes converter code noisier, but ultimately simpler without having access to dynamically scoped variables

bzr revid: xmo@openerp.com-20120927144341-j1dx3e0epf3i5ja6
2012-09-27 16:43:41 +02:00
Frédéric van der Essen 155bdaf57b [MERGE] from trunk
bzr revid: fva@openerp.com-20120927142055-p5yc406vkufi6rg9
2012-09-27 16:20:55 +02:00
Frédéric van der Essen 6970a3fec3 [MERGE] css fixes. Mostly to etherpad
bzr revid: fva@openerp.com-20120927141440-fyod8df0f78ncgyz
2012-09-27 16:14:40 +02:00
Frédéric van der Essen f600cadf53 [MERGE] css fixes
bzr revid: fva@openerp.com-20120927141304-tuubki0zopb38w9f
2012-09-27 16:13:04 +02:00
Frédéric van der Essen 978759847a [MERGE] from trunk
bzr revid: fva@openerp.com-20120927132920-zy6gugah0fd13e1x
bzr revid: fva@openerp.com-20120927141244-nnu7kvb2uyopgeqa
2012-09-27 16:12:44 +02:00
Christophe Matthieu 523d10017e [IMP] mail/chatter: in progress
bzr revid: chm@openerp.com-20120927134823-tkwllczna72hb1th
2012-09-27 15:48:23 +02:00
Fabien Meghazi 32d492acf9 [MERGE] trunk
bzr revid: fme@openerp.com-20120927134821-lbqc67yeuxwi515g
2012-09-27 15:48:21 +02:00
Fabien Meghazi a7b02e9eb0 [IMP] Allow easy overloading for tokeninfo
bzr revid: fme@openerp.com-20120927134551-utlf98g775c9mqqs
2012-09-27 15:45:51 +02:00
Antonin Bourguignon 985ca6d762 [MERGE] trunk
bzr revid: abo@openerp.com-20120927134536-022n7jtnh753ol5u
2012-09-27 15:45:36 +02:00
Antonin Bourguignon 22d2823e74 [FIX] leads merge feature
bzr revid: abo@openerp.com-20120927134513-pi9wr5vt0f02bqsu
2012-09-27 15:45:13 +02:00
Antony Lesuisse 34974f91b0 [FIX] statusbar when empty domain better condition
bzr revid: al@openerp.com-20120927134149-1f65yn1cz9lvn0kl
2012-09-27 15:41:49 +02:00
Rajesh Prajapati (OpenERP) d9ad8eb8ad [IMP] Sale : Removed Traceback in settings confiuration-sales
bzr revid: rpr@tinyerp.com-20120927133102-14i6p3clvvvywin3
2012-09-27 19:01:02 +05:30
Frédéric van der Essen 1322cd1a3d [MERGE] from trunk
bzr revid: fva@openerp.com-20120927132942-853bb3uptrp1x55d
2012-09-27 15:29:42 +02:00
Antony Lesuisse 90c0e6628e [FIX] statusbar when empty domain
bzr revid: al@openerp.com-20120927132531-kx5wbchkfv5qhn67
2012-09-27 15:25:31 +02:00