Commit Graph
1310 Commits
Author SHA1 Message Date
Twinkle Christian (OpenERP) f76521b531 [FIX]fix tooltip
bzr revid: tch@tinyerp.com-20121031070040-2lga67jkp11ogoqe
2012-10-31 12:30:40 +05:30
Jiten (OpenERP) 405b9d8cda [MERGE] Merged trunk.
bzr revid: jra@tinyerp.com-20121030054946-962hxaxlml82viy2
2012-10-30 11:19:46 +05:30
Launchpad Translations on behalf of openerp 87d3caa50f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121030053700-w841c92uvirpii9h
2012-10-30 05:37:00 +00:00
Amit Patel 139bd09fd9 [MERGE]:trunk
bzr revid: apa@tinyerp.com-20121030045711-c88fjivi8qwek8m8
2012-10-30 10:27:11 +05:30
Divyesh Makwana (Open ERP) d3466a9624 [Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20121030044702-as91g4l1lr89d8x1
2012-10-30 10:17:02 +05:30
Amit Patel 9a82511a45 [MERGE]:trunk
bzr revid: apa@tinyerp.com-20121030044309-6lz27pqu5er7gdf0
2012-10-30 10:13:09 +05:30
Amit Patel 755a01ef33 typo
bzr revid: apa@tinyerp.com-20121029130756-uao0j4sgovtbew62
2012-10-29 18:37:56 +05:30
Amit Patel 464de3b91e typo
bzr revid: apa@tinyerp.com-20121029123539-2ktdcot8fe5x503x
2012-10-29 18:05:39 +05:30
Amit Patel 3eca978451 [MERGE]:trunk
bzr revid: apa@tinyerp.com-20121029060528-yvb0ez8jdr1sine8
2012-10-29 11:35:28 +05:30
Jiten (OpenERP) 5401a4f8e2 [MERGE] Merged trunk.
bzr revid: jra@tinyerp.com-20121025115155-hf1pin3e0n2zf2l1
2012-10-25 17:21:55 +05:30
Ajay Chauhan (OpenERP) b287ead46d [IMP] event: changed domain for field 'log_ids'
bzr revid: cha@tinyerp.com-20121025112730-r9i812f5twmszh22
2012-10-25 16:57:30 +05:30
Vishmita fd762aba95 [Fix]Improve code for IE for kanban view in event
bzr revid: vja@tinyerp.com-20121025090712-h3a7fls712w45fon
2012-10-25 14:37:12 +05:30
Amit Patel 3e4e8006de [MERGE]:trunk
bzr revid: apa@tinyerp.com-20121025070133-x6g4can9le7p4d5z
2012-10-25 12:31:33 +05:30
Fabien Pinckaers 1ae6bd0bd5 [MERGE] typo
bzr revid: fp@openerp.com-20121024202948-x1nbbin2j4mk4us5
2012-10-24 22:29:48 +02:00
Fabien Pinckaers a334d1ebea [MERGE] typo
bzr revid: fp@openerp.com-20121024201859-aljpjevofisrt9o3
2012-10-24 22:18:59 +02:00
Fabien Pinckaers a7368145ca [MERGE] typo
bzr revid: fp@openerp.com-20121024201424-98la8f2wkhfjrtae
2012-10-24 22:14:24 +02:00
Amit Patel a8aba12a76 [MERGE]:trunk
bzr revid: apa@tinyerp.com-20121023090301-85dm7m3seu5k42ii
2012-10-23 14:33:01 +05:30
Jiten (OpenERP) b578da16df [MERGE] Merged trunk.
bzr revid: jra@tinyerp.com-20121023062924-ht4ekcavbhd82q3q
2012-10-23 11:59:24 +05:30
Amit Patel 5803a92423 [MERGE]:trunk
bzr revid: apa@tinyerp.com-20121023055403-tdry1nr3t44gtm77
2012-10-23 11:24:03 +05:30
Fabien Pinckaers 65c2193e33 [MERGE] fix breadcrum bouncing issue
bzr revid: fp@tinyerp.com-20121022173520-zr373cyq3nvrhvrv
2012-10-22 19:35:20 +02:00
Amit Patel 230a11ec7f [MERGE]:event
bzr revid: apa@tinyerp.com-20121022123944-b3xdt0hjrc4u71j2
2012-10-22 18:09:44 +05:30
Randhir Mayatra (OpenERP) 5d557f2ec9 [IMP] change the class name in event view
bzr revid: rma@tinyerp.com-20121022121619-67kcqdw44a611aae
2012-10-22 17:46:19 +05:30
Randhir Mayatra (OpenERP) 470c7d33f2 [IMP] make changes into the event module
bzr revid: rma@tinyerp.com-20121022114737-0g22tzx0sxpbhwjg
2012-10-22 17:17:37 +05:30
Amit Patel beeb5d92ce [MERGE]:event
bzr revid: apa@tinyerp.com-20121022093205-ik6hkwuhsdgv3lsl
2012-10-22 15:02:05 +05:30
Fabien Pinckaers 101c6096e6 [MERGE] open chatter fix message read/unread
bzr revid: fp@tinyerp.com-20121022080251-9plcyik4ag328m0z
2012-10-22 10:02:51 +02:00
Jiten (OpenERP) 87362b5168 [MERGE] Merged trunk.
bzr revid: jra@tinyerp.com-20121016054150-3wk2tozq98u83kuk
bzr revid: jra@tinyerp.com-20121018060228-4th3uexqp9cks3xx
bzr revid: jra@tinyerp.com-20121019055038-pr1jz3u01hi0qjfq
bzr revid: jra@tinyerp.com-20121022060208-5fd962drv61gnu2j
2012-10-22 11:32:08 +05:30
Divyesh Makwana (Open ERP) d3f99be6f7 [Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20121016043915-jj52ndvtvtry8wtn
bzr revid: mdi@tinyerp.com-20121017044114-rx20qcnmj0h2di9m
bzr revid: mdi@tinyerp.com-20121018040816-rldo7d3wvdarhrrn
bzr revid: mdi@tinyerp.com-20121019043918-ajzdhughbwm3j859
bzr revid: mdi@tinyerp.com-20121022041308-wczx6ppb8id1100g
2012-10-22 09:43:08 +05:30
Launchpad Translations on behalf of openerp 5bfa3c5a7d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121019053933-51d6oob5aw0ujz40
2012-10-19 05:39:33 +00:00
Mayur Maheshwari (OpenERP) 1901cda266 [MERGE]: Merge with lp:openobject-addons
bzr revid: mma@tinyerp.com-20121019052334-zgq8u774xdrns0pd
2012-10-19 10:53:34 +05:30
Mayur Maheshwari (OpenERP) 7295442de8 [MERGE]: Merge with lp:openobject-addons
bzr revid: mma@tinyerp.com-20121016051445-r8q5f1ueuja66q5h
bzr revid: mma@tinyerp.com-20121018052148-1k463zktexttldb2
bzr revid: mma@tinyerp.com-20121019045120-t8ee1fyz84fe751c
2012-10-19 10:21:20 +05:30
Foram Katharotiya (OpenERP) 7fbd15bfcd [IMP] remove graph view
bzr revid: fka@tinyerp.com-20121017133356-heetzi8ntfv3aoqo
2012-10-17 19:03:56 +05:30
Foram Katharotiya (OpenERP) ec98ebf92d [FIX] traceback of graph in event
bzr revid: fka@tinyerp.com-20121017115626-d04xo8ri38yj8sll
2012-10-17 17:26:26 +05:30
Atul Patel (OpenERP) 94bca52631 [MERGE]: Merged with lp:openobject-addons
bzr revid: atp@tinyerp.com-20121016171502-ldl0i75wv50sgdyy
2012-10-16 22:45:02 +05:30
Mayur Maheshwari (OpenERP) 8346293d72 [MERGE]: Merge with lp:openobject-addons
bzr revid: mma@tinyerp.com-20121015090200-irfaskfn9i1p68j9
bzr revid: mma@tinyerp.com-20121016052513-vl56jxtp7xbpa2ry
2012-10-16 10:55:13 +05:30
Fabien Pinckaers a48589b72b [MERGE] date_end computed on events
bzr revid: fp@tinyerp.com-20121015152852-nndcg6ekd8i0punb
2012-10-15 17:28:52 +02:00
Mayur Maheshwari (OpenERP) 3a38ecd3c2 [IMP]event : improve kanaban button condition
bzr revid: mma@tinyerp.com-20121015113022-um8ursgf4mzwvskl
2012-10-15 17:00:22 +05:30
Mayur Maheshwari (OpenERP) e479d6a05d [IMP]event : improve kanaban button condition
bzr revid: mma@tinyerp.com-20121015111110-wvbw3rg54s2c6u3k
2012-10-15 16:41:10 +05:30
Jiten (OpenERP) ee077e0c7e [MERGE] Merged trunk.
bzr revid: jra@tinyerp.com-20121015095749-yglvi7gur28q1vqu
2012-10-15 15:27:49 +05:30
Mayur Maheshwari (OpenERP) 66f4943ab6 [MERGE]: Merge with lp:openobject-addons
bzr revid: mma@tinyerp.com-20121012051141-ng6om6vdys0j0tnj
bzr revid: mma@tinyerp.com-20121015090009-hlximum1k8l55ec8
2012-10-15 14:30:09 +05:30
Divyesh Makwana (Open ERP) ad24f7026b [Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20121015053217-06u3fa6yyybpartw
2012-10-15 11:02:17 +05:30
Nimesh (Open ERP) 99bf2fb663 [MERGE] merge with lp:openobject-addons
bzr revid: nco@tinyerp.com-20121015045434-kp7a7h2l1mqa1x01
2012-10-15 10:24:34 +05:30
Fabien Pinckaers 3bb88076e1 [MERGE] events improvements
bzr revid: fp@tinyerp.com-20121013104045-w552j40hzvqv9d89
2012-10-13 12:40:45 +02:00
Nimesh (Open ERP) 199db0e73f [ADD] set bouce effect by stting groups on button in event/event_view.xml.
bzr revid: nco@tinyerp.com-20121012132623-j4ae12wq3un36xzj
2012-10-12 18:56:23 +05:30
Mayur Maheshwari (OpenERP) 0b87880029 [IMP]all: imporve string state to status
bzr revid: mma@tinyerp.com-20121012114258-w2q3hg1wb5wlt8wi
2012-10-12 17:12:58 +05:30
Saurang Suthar 40c43f21d3 [MERGE]:merged with latest addons
bzr revid: ssu@tinyerp.com-20121012062337-4cjzskoxb77d5dme
2012-10-12 11:53:37 +05:30
Mayur Maheshwari (OpenERP) 3079bf9ce0 [MERGE]: Merge with lp:openobject-addons
bzr revid: mma@tinyerp.com-20121012055106-eu39hyg4vt2mxr07
2012-10-12 11:21:06 +05:30
Divyesh Makwana (Open ERP) fb87569289 [Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20121011045301-ttt0tzlrk8ge06db
bzr revid: mdi@tinyerp.com-20121012052424-z2toltq0vw0pnyk9
2012-10-12 10:54:24 +05:30
Antonin Bourguignon 9f296a8005 [MERGE] trunk-bug-1024145-abo: fix an issue in event reporting due to a missing outer join in the psql view
lp bug: https://launchpad.net/bugs/1024145 fixed

bzr revid: abo@openerp.com-20121011145427-m8ol0yo980kz5j9k
2012-10-11 16:54:27 +02:00
Antonin Bourguignon 90ff5bf65a [IMP] properly fetch events that have no registration
in order to achieve that, remove the previous patch which was too exclusive (WHERE r.id IS NOT NULL) and use 'virtual' ids instead
the unicity is guaranteed by concatenating the event id and the registration id (if any)

bzr revid: abo@openerp.com-20121011135809-fag9br23hthrwy1s
2012-10-11 15:58:09 +02:00
Jiten (OpenERP) 6d19d423a6 [MERGE] Merged trunk.
bzr revid: jra@tinyerp.com-20121011061952-o2sgf4wm3e9p67ry
2012-10-11 11:49:52 +05:30