Commit Graph
70704 Commits
Author SHA1 Message Date
Ajay Chauhan (OpenERP) 79a982dffe [MERGE] merge lp:~openerp-dev/openobject-addons/trunk-stock_cancel_button_fix-cha
bzr revid: cha@tinyerp.com-20120921063025-q1z0lj1ida0ew975
2012-09-21 12:00:25 +05:30
Mayur Maheshwari (OpenERP) 3ace478eb8 [MERGE]: Merge with lp:openobject-addons
bzr revid: mma@tinyerp.com-20120921062921-aadbg52i82e0qa5u
2012-09-21 11:59:21 +05:30
Ajay Chauhan (OpenERP) 3c084ff4aa [IMP] stock: solve the issue of getting state as delivered
bzr revid: cha@tinyerp.com-20120921062821-jhzcvnz3k44hjs54
2012-09-21 11:58:21 +05:30
Mayur Maheshwari (OpenERP) 3a161c4d8c [MERGE]: Merge with lp:openobject-addons
bzr revid: mma@tinyerp.com-20120921062628-8wlq1ou35ddekg85
2012-09-21 11:56:28 +05:30
Mayur Maheshwari (OpenERP) 54801477db [MERGE]: Merge with lp:openobject-addons
bzr revid: mma@tinyerp.com-20120921061921-f118dvvphastk4ge
2012-09-21 11:49:21 +05:30
Khushboo Bhatt (Open ERP) aab48f93a5 [FIX]l10n_ch:solved configuration wizard traceback
bzr revid: kbh@tinyerp.com-20120921061643-5p25uqu3yidpppf5
2012-09-21 11:46:43 +05:30
Ajay Chauhan (OpenERP) f76ca870aa [MERGE] merge with main addons
bzr revid: cha@tinyerp.com-20120921053752-bb08mfml4d8afbyl
2012-09-21 11:07:52 +05:30
Rajesh Prajapati (OpenERP) 5a85f820f0 [MERGE] merge with main addons
bzr revid: rpr@tinyerp.com-20120921052850-mkmb4crc5drsqnlw
2012-09-21 10:58:50 +05:30
Rajesh Prajapati (OpenERP) ebb1b86634 [MERGE] merge with main addons
bzr revid: rpr@tinyerp.com-20120921052717-8om0yc29afs92fl8
2012-09-21 10:57:17 +05:30
Atul Patel (OpenERP) 884736b979 [MERGE]: Merged with lp:openobject-addons
bzr revid: atp@tinyerp.com-20120921051640-8kyvd9x9dj54mmat
2012-09-21 10:46:40 +05:30
Atul Patel (OpenERP) 4dad1503e4 [MERGE]: Merged with lp:openobject-addons
bzr revid: atp@tinyerp.com-20120921051507-vozcjdsnm0i8d76l
2012-09-21 10:45:07 +05:30
Launchpad Translations on behalf of openerp fa9b5c7dc3 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120921044319-mr13n94g400e7b63
2012-09-21 04:43:19 +00:00
Launchpad Translations on behalf of openerp f4a296e028 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120921044140-w8fwjdfb1n4nj0ru
2012-09-21 04:41:40 +00:00
Divyesh Makwana (Open ERP) 84fa3ab482 [Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20120921042000-uvsws0189z865jxf
2012-09-21 09:50:00 +05:30
Divyesh Makwana (Open ERP) a8e8c87d8d [Merge] Merge with main server.
bzr revid: mdi@tinyerp.com-20120919042049-m90dfhji3h83nk2j
bzr revid: mdi@tinyerp.com-20120920040416-eaahw29q6j7g2m6j
bzr revid: mdi@tinyerp.com-20120921041912-vcm18tpgy2ie3e6i
2012-09-21 09:49:12 +05:30
Divyesh Makwana (Open ERP) 0c69c9be11 [Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20120921041847-9arz59udkcgz3kkw
2012-09-21 09:48:47 +05:30
Antony Lesuisse 283131289d [MERGE] note: remove optionals tags, pad: fix lazy pad creation
bzr revid: al@openerp.com-20120920235343-tveo33j410atkt2y
2012-09-21 01:53:43 +02:00
Quentin (OpenERP) d1a078687e [IMP] sale: help tooltip on state field of sale.order
bzr revid: qdp-launchpad@openerp.com-20120920172249-kb6xene37ygwxawc
2012-09-20 19:22:49 +02:00
niv-openerp 4dfc435b09 Added mark as reconciled
bzr revid: nicolas.vanhoren@openerp.com-20120920162257-njbnth2t30jranvx
2012-09-20 18:22:57 +02:00
Frédéric van der Essen eafe341629 [MERGE] css fixes
bzr revid: fva@openerp.com-20120920162239-5nrt9hk2xftdl814
2012-09-20 18:22:39 +02:00
Frédéric van der Essen 549c99e6ea [FIX] basic css of embeded html
bzr revid: fva@openerp.com-20120920162205-9w05atal8hu10smu
2012-09-20 18:22:05 +02:00
Frédéric van der Essen 615cc75314 [MERGE] css improvements to mail, hr, and etherpad integration
bzr revid: fva@openerp.com-20120920155216-wzvpnk8rv4ltym5v
2012-09-20 17:52:16 +02:00
Frédéric van der Essen 05c912603a [MERGE] css fixes
bzr revid: fva@openerp.com-20120920155042-e4z7s1hju21ra3an
2012-09-20 17:50:42 +02:00
Antonin Bourguignon 0c6258855d [FIX] event registrations record rules
now a portal user has full control over his own event registrations

bzr revid: abo@openerp.com-20120920155006-ullbntw8jju4xnh4
2012-09-20 17:50:06 +02:00
Frédéric van der Essen cf6d39b95d [IMP] fixed header overflow, made form lighter
bzr revid: fva@openerp.com-20120920154926-47viarlirvbnelky
2012-09-20 17:49:26 +02:00
Frédéric van der Essen db6c61f666 [FIX] made things more to my taste in hr and chatter's css
bzr revid: fva@openerp.com-20120920154645-lctwfo0tbaxsobwg
2012-09-20 17:46:45 +02:00
Fabien Meghazi 14f399df47 [ADD] Added oauth tokeninfo
bzr revid: fme@openerp.com-20120920154557-1ltsxnkoz6vzezan
2012-09-20 17:45:57 +02:00
Cedric Snauwaert ea636eb033 [CHANGE]Correct some mistakes in an object name
bzr revid: csn@openerp.com-20120920152121-24nlyjripej2v502
2012-09-20 17:21:21 +02:00
Quentin (OpenERP) eafd95a1d5 [FIX] sale: fixed yaml tests
bzr revid: qdp-launchpad@openerp.com-20120920152043-u0euspbyr04vjqwn
2012-09-20 17:20:43 +02:00
Thibault Delavallée a514ed0208 [FIX] message_read: added back the limit, removed for ... well, I do not know.
bzr revid: tde@openerp.com-20120920151819-kra9h7nqzw7fq12d
2012-09-20 17:18:19 +02:00
Fabien Meghazi a6068f909e [ADD] Create oauth token in res.users
bzr revid: fme@openerp.com-20120920151538-stb6kamfpmwzf9xz
2012-09-20 17:15:38 +02:00
Xavier Morel a9bc82c46d [IMP] translation tests, translated acceptable values for boolean fields
bzr revid: xmo@openerp.com-20120920150443-l9lna4bnkta7n2o8
2012-09-20 17:04:43 +02:00
Antonin Bourguignon c7b1d6cb63 [MERGE] latest trunk
bzr revid: abo@openerp.com-20120920145753-2izkiam4sf8t53of
2012-09-20 16:57:53 +02:00
Antonin Bourguignon 457533c808 [IMP] methods names
bzr revid: abo@openerp.com-20120920145708-zsuechbcj2uxcys3
2012-09-20 16:57:08 +02:00
Antonin Bourguignon 01cda53501 [IMP] indentation
bzr revid: abo@openerp.com-20120920145658-oigqs5ctd3qoiq7u
2012-09-20 16:56:58 +02:00
olt@tinyerp.com 649cf2e677 [FIX] fixed message format (wrong number of arguments)
bzr revid: olt@tinyerp.com-20120920145519-j842fb8woer25p8i
2012-09-20 16:55:19 +02:00
Thibault Delavallée cb806332be [FIX] subtype_xml_id -> subtype in message_post.
bzr revid: tde@openerp.com-20120920145405-vwi1kt1ttkd2w8sz
2012-09-20 16:54:05 +02:00
Thibault Delavallée 84fbc3b7da [MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120920144900-isobpji9066sftj1
2012-09-20 16:49:00 +02:00
Thibault Delavallée 3774f6d545 [IMP] [FIX] Chatter: fixed load more, message_read and expandables. Cleaned tests.
bzr revid: tde@openerp.com-20120920144645-o92edguwjzws3t3e
2012-09-20 16:46:45 +02:00
Frédéric van der Essen b9fd12a301 [FIX] fixed etherpad's css integration
bzr revid: fva@openerp.com-20120920144017-il5ck5997gjdn5e7
2012-09-20 16:40:17 +02:00
Quentin (OpenERP) ee8d27fce3 [IMP] sale: yaml test improved
bzr revid: qdp-launchpad@openerp.com-20120920143641-eplfb3xyeei6e0ur
2012-09-20 16:36:41 +02:00
Quentin (OpenERP) a9efeda640 [FIX] sale, sale_stock: moved back the group_invoice_so_lines into sale module, because it is used to hide/show the menuitem 'Lines to Invoice', in sale... which has nothing to do with stock
bzr revid: qdp-launchpad@openerp.com-20120920143616-trffd9jwwys528qr
2012-09-20 16:36:16 +02:00
Quentin (OpenERP) 79cf29697c [FIX] sale, sale_stock: res_config review
bzr revid: qdp-launchpad@openerp.com-20120920141602-ckewes9a4m3qwoho
2012-09-20 16:16:02 +02:00
Fabien Meghazi 100c0a60a5 [ADD] Added res_user oauth token field
bzr revid: fme@openerp.com-20120920140041-eied4nfw8pjs6ye8
2012-09-20 16:00:41 +02:00
Cedric Snauwaert ee0be8846b [add]add some fields in vehicle object and associated view
bzr revid: csn@openerp.com-20120920134853-tq1e7b58opf93a06
2012-09-20 15:48:53 +02:00
Fabien Meghazi 62926be708 [WIP] oauth provider
bzr revid: fme@openerp.com-20120920134618-ema9qyumuorvozig
2012-09-20 15:46:18 +02:00
Cedric Snauwaert 0b9d4cd973 [add]add object for model name and model make
bzr revid: csn@openerp.com-20120920131804-sieluxv9tnz8qlhp
2012-09-20 15:18:04 +02:00
Quentin (OpenERP) c439bdb3c0 [FIX] sale: put back the button 'View Invoice' on sale orders (removed for no reason) + reorganized files to reduce the diff with trunk
bzr revid: qdp-launchpad@openerp.com-20120920131711-hu825gunt4cbtzin
2012-09-20 15:17:11 +02:00
Quentin (OpenERP) ec7ae052fe [IMP] sale, sale_stock: fixed __openerp__.py files
bzr revid: qdp-launchpad@openerp.com-20120920131328-5nodw9twus3wetqz
2012-09-20 15:13:28 +02:00
Quentin (OpenERP) 6ab2b852d9 [FIX] sale: removed buggy and useless fields_view_get() from wizard sale_make_invoice_advance.py
bzr revid: qdp-launchpad@openerp.com-20120920131229-3bozie3no4302bk9
2012-09-20 15:12:29 +02:00