Antonin Bourguignon [Tue, 10 Jul 2012 16:47:25 +0000 (18:47 +0200)]
[FIX] remove useless tooltip attr
bzr revid: abo@openerp.com-
20120710164725-370mpfeb4i8linua
Antonin Bourguignon [Tue, 10 Jul 2012 08:58:53 +0000 (10:58 +0200)]
[MERGE] latest trunk
bzr revid: abo@openerp.com-
20120710085853-27qcvuhhzpml8kxj
Antonin Bourguignon [Tue, 10 Jul 2012 08:58:04 +0000 (10:58 +0200)]
[WIP] add project category (should become a m2m ?)
bzr revid: abo@openerp.com-
20120710085804-pyqxt3v377j0422k
Quentin (OpenERP) [Tue, 10 Jul 2012 08:46:26 +0000 (10:46 +0200)]
[MERGE] event: usability, review of form views
bzr revid: qdp-launchpad@openerp.com-
20120710084626-oldsa3pdv3ku2ylb
Fabien Pinckaers [Tue, 10 Jul 2012 07:57:53 +0000 (09:57 +0200)]
[IMP] form css
bzr revid: fp@tinyerp.com-
20120710075753-l922o72cghj9f0f3
Fabien Pinckaers [Tue, 10 Jul 2012 07:50:54 +0000 (09:50 +0200)]
[IMP] form layout
bzr revid: fp@tinyerp.com-
20120710075054-ftlm3g69yrsgni1u
Fabien Pinckaers [Tue, 10 Jul 2012 07:49:46 +0000 (09:49 +0200)]
[IMP] form layout
bzr revid: fp@tinyerp.com-
20120710074946-llxeomd8o5e83y9i
Fabien Pinckaers [Tue, 10 Jul 2012 07:31:45 +0000 (09:31 +0200)]
[IMP] padding between groups in forms
bzr revid: fp@tinyerp.com-
20120710073145-l0rmppe2d7mpterz
Launchpad Translations on behalf of openerp [Tue, 10 Jul 2012 05:41:20 +0000 (05:41 +0000)]
Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-
20120710053402-w16hn5zrg0stasd4
bzr revid: launchpad_translations_on_behalf_of_openerp-
20120710054120-gtxp31tv5y8ogdpr
Quentin (OpenERP) [Mon, 9 Jul 2012 16:41:17 +0000 (18:41 +0200)]
[FIX] timedelta doesn't have a 'months' parameter
bzr revid: qdp-launchpad@openerp.com-
20120709164117-bqjxqxeujhcdikim
Antonin Bourguignon [Mon, 9 Jul 2012 15:54:24 +0000 (17:54 +0200)]
[WIP] issues view in the portal
bzr revid: abo@openerp.com-
20120709155424-2vda15p1s9rca8iz
Quentin (OpenERP) [Mon, 9 Jul 2012 15:17:57 +0000 (17:17 +0200)]
[IMP] project: privacy/visibility field is required
bzr revid: qdp-launchpad@openerp.com-
20120709151757-wl019ftl2xheb9o3
Quentin (OpenERP) [Mon, 9 Jul 2012 14:58:32 +0000 (16:58 +0200)]
[IMP] event: usability, code review of form views
bzr revid: qdp-launchpad@openerp.com-
20120709145832-idr4x5f8v4dtq3ol
niv-openerp [Mon, 9 Jul 2012 13:45:16 +0000 (15:45 +0200)]
[IMP] removed js file arguments in debug mode to ease debugging
bzr revid: nicolas.vanhoren@openerp.com-
20120709134516-bd1yabogwoomipkd
niv-openerp [Mon, 9 Jul 2012 11:57:27 +0000 (13:57 +0200)]
[FIX] small problem with m2o
bzr revid: nicolas.vanhoren@openerp.com-
20120709115727-gtxyt4kzg9c7tqot
Antonin Bourguignon [Mon, 9 Jul 2012 09:19:43 +0000 (11:19 +0200)]
[FIX] remove 'portal' visibility stuff
also put the 'company's news' view in 'inline' mode
bzr revid: abo@openerp.com-
20120709091943-kpgfc4vw51pbzsd8
Antonin Bourguignon [Mon, 9 Jul 2012 08:44:50 +0000 (10:44 +0200)]
[MERGE] latest trunk
bzr revid: abo@openerp.com-
20120709084450-vk240s2z0pc1lfzv
Quentin (OpenERP) [Mon, 9 Jul 2012 08:33:52 +0000 (10:33 +0200)]
[MERGe] trunk
bzr revid: qdp-launchpad@openerp.com-
20120709083352-4ofrg58nd0775ms8
Launchpad Translations on behalf of openerp [Mon, 9 Jul 2012 04:51:13 +0000 (04:51 +0000)]
Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-
20120707051326-0nn73he814pbmz14
bzr revid: launchpad_translations_on_behalf_of_openerp-
20120708044140-ev3j10bquy9p89t7
bzr revid: launchpad_translations_on_behalf_of_openerp-
20120709045113-mh0kg5l420xs8ux4
Launchpad Translations on behalf of openerp [Mon, 9 Jul 2012 04:50:53 +0000 (04:50 +0000)]
Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-
20120708044629-hi6utb4bvynt3rkr
bzr revid: launchpad_translations_on_behalf_of_openerp-
20120707051248-jntdabtha4f8hq6f
bzr revid: launchpad_translations_on_behalf_of_openerp-
20120708044114-bhzndip4ovw142i5
bzr revid: launchpad_translations_on_behalf_of_openerp-
20120709045053-xwfg6fb3w7euf83f
Fabien Pinckaers [Sat, 7 Jul 2012 07:16:54 +0000 (09:16 +0200)]
merge
bzr revid: fp@openerp.com-
20120707071654-bomheifq0v3e6e2k
Launchpad Translations on behalf of openerp [Sat, 7 Jul 2012 05:24:56 +0000 (05:24 +0000)]
Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-
20120707052456-ju2u0te6xoc2tj1h
Minh Tran [Fri, 6 Jul 2012 16:43:57 +0000 (18:43 +0200)]
Many improvements
bzr revid: mit@openerp.com-
20120706164357-c6p6z3ytoqbhmjjn
Antonin Bourguignon [Fri, 6 Jul 2012 15:58:26 +0000 (17:58 +0200)]
[RM] the dropdown feature isn't a top priority, after all
bzr revid: abo@openerp.com-
20120706155826-i271xel4zduvmq6g
Fabien Pinckaers [Fri, 6 Jul 2012 15:08:17 +0000 (17:08 +0200)]
[MERGE] fix in access rights
bzr revid: fp@tinyerp.com-
20120706150817-s01gbb4gga6dxybm
Quentin (OpenERP) [Fri, 6 Jul 2012 15:02:41 +0000 (17:02 +0200)]
[MERGe] trunk
bzr revid: qdp-launchpad@openerp.com-
20120706150241-ngjy36angw6lu3nj
Raphael Collet [Fri, 6 Jul 2012 14:56:08 +0000 (16:56 +0200)]
[MERGE] trunk-improve_config_wizards-rco (use full page for config wizards)
bzr revid: rco@openerp.com-
20120706145608-rxdarbopirltc9gm
Raphael Collet [Fri, 6 Jul 2012 14:54:10 +0000 (16:54 +0200)]
[IMP] config wizards: remove sheet element in their form
bzr revid: rco@openerp.com-
20120706145410-bfw9z4324kjmw19j
Quentin (OpenERP) [Fri, 6 Jul 2012 14:41:09 +0000 (16:41 +0200)]
[MERGE] knowledge usability branch
bzr revid: qdp-launchpad@openerp.com-
20120706144109-7r5zyfsnmo27e0eo
Quentin (OpenERP) [Fri, 6 Jul 2012 14:40:19 +0000 (16:40 +0200)]
[IMP] hr_contract: usability, review of hr.contract form view
bzr revid: qdp-launchpad@openerp.com-
20120706144019-lf4avjk3kc6vcapk
Antonin Bourguignon [Fri, 6 Jul 2012 14:34:01 +0000 (16:34 +0200)]
[WIP] add dropdown to show/hide employees in the portal's contact page
this is achieved by extending the many2many_kanban widget and adding it a few events
bzr revid: abo@openerp.com-
20120706143401-z8zjla7kbiklbua5
Quentin (OpenERP) [Fri, 6 Jul 2012 14:10:03 +0000 (16:10 +0200)]
[IMP] sale: removed duplicated field pricelist_id in sale order form view
bzr revid: qdp-launchpad@openerp.com-
20120706141003-7j7luq6r4nrm3khh
Quentin (OpenERP) [Fri, 6 Jul 2012 14:09:08 +0000 (16:09 +0200)]
[IMP] document: usability, review of attachment form view + made it inheriting from the base view
bzr revid: qdp-launchpad@openerp.com-
20120706140908-w1y8tcfybfcn9h9r
Quentin (OpenERP) [Fri, 6 Jul 2012 14:07:49 +0000 (16:07 +0200)]
[IMP] base: usability, review of attachment form view
bzr revid: qdp-launchpad@openerp.com-
20120706140749-m3v5soqchjgcbep6
Raphael Collet [Fri, 6 Jul 2012 13:31:02 +0000 (15:31 +0200)]
[MERGE] trunk-remove_hr_crm_dependency-rco (remove dependencies of hr modules on crm)
bzr revid: rco@openerp.com-
20120706133102-jj51otc21w1ettgh
Raphael Collet [Fri, 6 Jul 2012 13:09:20 +0000 (15:09 +0200)]
[IMP] hr_recruitment, import_google: remove dependency on module crm
bzr revid: rco@openerp.com-
20120706130920-wj44bogblyt6kenq
Raphael Collet [Fri, 6 Jul 2012 12:43:14 +0000 (14:43 +0200)]
[FIX] import_google: adapt extension of crm.meeting.type
bzr revid: rco@openerp.com-
20120706124314-n8qinysgh9wjf3rn
Raphael Collet [Fri, 6 Jul 2012 12:29:59 +0000 (14:29 +0200)]
[IMP] move the views of crm.meeting in base_calendar, adapt xml ids in xml, and improve the code that opens those views
bzr revid: rco@openerp.com-
20120706122959-o8clpxqvewpyha0k
Quentin (OpenERP) [Fri, 6 Jul 2012 12:19:11 +0000 (14:19 +0200)]
[IMP] document: attchment form view
bzr revid: qdp-launchpad@openerp.com-
20120706121911-n6k0smzsud3d45db
Kuldeep Joshi (OpenERP) [Fri, 6 Jul 2012 12:13:44 +0000 (17:43 +0530)]
[IMP]event: change registration view
bzr revid: kjo@tinyerp.com-
20120706121344-330s2e44t11epg5o
Antonin Bourguignon [Fri, 6 Jul 2012 10:27:56 +0000 (12:27 +0200)]
[FIX] forgot to bzr add
bzr revid: abo@openerp.com-
20120706102756-d7ihynymw01hipf6
Antonin Bourguignon [Fri, 6 Jul 2012 10:05:01 +0000 (12:05 +0200)]
[IMP] remove some weird triple " in stock demo data
bzr revid: abo@openerp.com-
20120706100501-e9zxjnzbxnefothm
Antonin Bourguignon [Fri, 6 Jul 2012 09:52:07 +0000 (11:52 +0200)]
[MERGE] latest trunk
bzr revid: abo@openerp.com-
20120706095207-6l2roojec1osazgi
Thibault Delavallée [Fri, 6 Jul 2012 09:45:51 +0000 (11:45 +0200)]
[MERGE] Merged branch making the mail module a real app. mail is named Social Network and is now installable to have access to the feeds page and to the discussion groups. Module description has also been updated.
bzr revid: tde@openerp.com-
20120706094551-miyw9zx5oxy1c3y0
Thibault Delavallée [Fri, 6 Jul 2012 09:08:28 +0000 (11:08 +0200)]
[IMP] mail module: updated icon and description text.
bzr revid: tde@openerp.com-
20120706090828-kefxs1ddcgj1ro8y
Quentin (OpenERP) [Fri, 6 Jul 2012 08:44:02 +0000 (10:44 +0200)]
[MERGE] trunk
bzr revid: qdp-launchpad@openerp.com-
20120706084402-xnyko0qump0uwvbd
Quentin (OpenERP) [Fri, 6 Jul 2012 08:42:39 +0000 (10:42 +0200)]
[IMP] hr: usability, removal of employee_ids field in hr.job form view
bzr revid: qdp-launchpad@openerp.com-
20120706084239-kzuur6c9956bhnfc
Raphael Collet [Fri, 6 Jul 2012 08:24:16 +0000 (10:24 +0200)]
[FIX] hr_holidays: change onchange method name
bzr revid: rco@openerp.com-
20120706082416-hi7fqtdevepvzwbk
Fabien Pinckaers [Fri, 6 Jul 2012 08:00:17 +0000 (10:00 +0200)]
[IMP] removed EDI specific css
bzr revid: fp@tinyerp.com-
20120706080017-vqlq69nj8p5vrdrv
Raphael Collet [Fri, 6 Jul 2012 07:37:16 +0000 (09:37 +0200)]
[MERGE] from trunk
bzr revid: rco@openerp.com-
20120706073716-wbisgncc54k885vh
Fabien Pinckaers [Fri, 6 Jul 2012 07:30:30 +0000 (09:30 +0200)]
[IMP] width of sheet in a variable
bzr revid: fp@tinyerp.com-
20120706073030-dejwb1d37cmjm738
Kuldeep Joshi (OpenERP) [Fri, 6 Jul 2012 06:50:05 +0000 (12:20 +0530)]
[IMP]event: remove oe_subtotal_footer oe_right class
bzr revid: kjo@tinyerp.com-
20120706065005-agkoyvnja05apcvq
Kuldeep Joshi (OpenERP) [Fri, 6 Jul 2012 05:23:21 +0000 (10:53 +0530)]
[IMP]event: remove name_get method
bzr revid: kjo@tinyerp.com-
20120706052321-fcxb95cckpfwsyvo
Launchpad Translations on behalf of openerp [Fri, 6 Jul 2012 05:07:51 +0000 (05:07 +0000)]
Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-
20120706045835-psdlu6pet8cabwna
bzr revid: launchpad_translations_on_behalf_of_openerp-
20120706050751-xzq60elhr5ajn5i6
Launchpad Translations on behalf of openerp [Fri, 6 Jul 2012 04:58:05 +0000 (04:58 +0000)]
Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-
20120706045805-mezbu748lg7p8gye
Antonin Bourguignon [Thu, 5 Jul 2012 17:26:11 +0000 (19:26 +0200)]
[WIP] attach dropdown menus to employees vignettes to easily change their visibility
bzr revid: abo@openerp.com-
20120705172611-r8su5cz8j3rpyk7t
Quentin (OpenERP) [Thu, 5 Jul 2012 16:11:18 +0000 (18:11 +0200)]
[IMP] hr_application: review form view (again)
bzr revid: qdp-launchpad@openerp.com-
20120705161118-dt8xrnn6tzfcob1c
Quentin (OpenERP) [Thu, 5 Jul 2012 15:49:41 +0000 (17:49 +0200)]
[IMP] hr_application: review form view
bzr revid: qdp-launchpad@openerp.com-
20120705154941-0hw1twcifybz7r21
Quentin (OpenERP) [Thu, 5 Jul 2012 15:49:16 +0000 (17:49 +0200)]
[MERGE] marketing_campaign: usability, review of form views
bzr revid: qdp-launchpad@openerp.com-
20120705154916-ew8y3hztw1lr5us7
Fabien Pinckaers [Thu, 5 Jul 2012 15:24:29 +0000 (17:24 +0200)]
merge
bzr revid: fp@tinyerp.com-
20120705152429-t7tzf5vn3zsc7o93
Minh Tran [Thu, 5 Jul 2012 15:17:40 +0000 (17:17 +0200)]
Fixed the height of systray
bzr revid: mit@openerp.com-
20120705151740-bfvq6wvh316d352c
Fabien Pinckaers [Thu, 5 Jul 2012 15:09:47 +0000 (17:09 +0200)]
[IMP] delvery form view
bzr revid: fp@tinyerp.com-
20120705150947-ointtx2og2a4m3kg
Fabien Pinckaers [Thu, 5 Jul 2012 15:03:43 +0000 (17:03 +0200)]
[IMP] delivery message
bzr revid: fp@tinyerp.com-
20120705150343-id4ehrhkwytxvv37
Fabien Pinckaers [Thu, 5 Jul 2012 15:02:15 +0000 (17:02 +0200)]
[IMP] delivery message
bzr revid: fp@tinyerp.com-
20120705150215-ew11xhtqx26g96pi
Fabien Pinckaers [Thu, 5 Jul 2012 15:00:10 +0000 (17:00 +0200)]
[IMP] properties as m2m_tags
bzr revid: fp@tinyerp.com-
20120705150010-79nnaos25o45wdcy
Fabien Pinckaers [Thu, 5 Jul 2012 13:44:03 +0000 (15:44 +0200)]
[IMP] delete web livechat module
bzr revid: fp@tinyerp.com-
20120705134403-w9g9cl01l2gu6g13
Fabien Pinckaers [Thu, 5 Jul 2012 13:41:53 +0000 (15:41 +0200)]
[IMP] original width of minh mockup
bzr revid: fp@tinyerp.com-
20120705134153-mxz87km72zos9idd
Fabien Pinckaers [Thu, 5 Jul 2012 13:31:03 +0000 (15:31 +0200)]
[IMP] user pref view
bzr revid: fp@tinyerp.com-
20120705133103-o4yi8ztuyq90xsgx
Fabien Pinckaers [Thu, 5 Jul 2012 13:20:03 +0000 (15:20 +0200)]
[IMP] white background
bzr revid: fp@tinyerp.com-
20120705132003-palqn02yh8gq6535
Quentin (OpenERP) [Thu, 5 Jul 2012 13:11:35 +0000 (15:11 +0200)]
[IMP] marketing: usability, review of form views
bzr revid: qdp-launchpad@openerp.com-
20120705131135-qp2j89quk3gpj60l
Quentin (OpenERP) [Thu, 5 Jul 2012 13:09:47 +0000 (15:09 +0200)]
[MERGE] trunk
bzr revid: qdp-launchpad@openerp.com-
20120705130947-6pxlmw8uzds6x1kj
Fabien Pinckaers [Thu, 5 Jul 2012 12:56:17 +0000 (14:56 +0200)]
[IMP] user preference form view
bzr revid: fp@tinyerp.com-
20120705125617-vvv8ml3vax3gw7rl
Fabien Pinckaers [Thu, 5 Jul 2012 12:51:13 +0000 (14:51 +0200)]
merge mit
bzr revid: fp@tinyerp.com-
20120705125113-khtvh51ddnll0eq1
Fabien Pinckaers [Thu, 5 Jul 2012 12:44:59 +0000 (14:44 +0200)]
[merge] trunk-mit
bzr revid: fp@tinyerp.com-
20120705124459-laly02v7rfrrkwas
Fabien Pinckaers [Thu, 5 Jul 2012 12:36:43 +0000 (14:36 +0200)]
[IMP] merge trunk-mit
bzr revid: fp@tinyerp.com-
20120705123643-2th1ioqj4oltpgt9
Fabien Pinckaers [Thu, 5 Jul 2012 12:34:46 +0000 (14:34 +0200)]
[CSS] make
bzr revid: fp@tinyerp.com-
20120705123446-xf32tcsj0m30nn8m
Fabien Pinckaers [Thu, 5 Jul 2012 12:34:08 +0000 (14:34 +0200)]
[merge] trunk
bzr revid: fp@tinyerp.com-
20120705123408-lzrzfw4kiq1e9zet
Fabien Pinckaers [Thu, 5 Jul 2012 12:32:59 +0000 (14:32 +0200)]
mege
bzr revid: fp@tinyerp.com-
20120705123259-okklz6m7nfziqaqf
Fabien Pinckaers [Thu, 5 Jul 2012 12:22:59 +0000 (14:22 +0200)]
[Merge] trunk
bzr revid: fp@tinyerp.com-
20120705122259-zu2hm32a2wh1g6y0
Raphael Collet [Thu, 5 Jul 2012 12:22:07 +0000 (14:22 +0200)]
[FIX] hr_recruitment: fix default value of company_id
bzr revid: rco@openerp.com-
20120705122207-cs730asuew9w7vxz
Raphael Collet [Thu, 5 Jul 2012 12:21:40 +0000 (14:21 +0200)]
[REM] hr_recruitment: remove unused action
bzr revid: rco@openerp.com-
20120705122140-oeqtb9kagobt9qtw
Raphael Collet [Thu, 5 Jul 2012 12:20:15 +0000 (14:20 +0200)]
[FIX] hr_recruitment: remove test about removed wizard
bzr revid: rco@openerp.com-
20120705122015-qcjhrkpbatjlfkmx
Fabien Pinckaers [Thu, 5 Jul 2012 12:18:18 +0000 (14:18 +0200)]
[merge] trunk
bzr revid: fp@tinyerp.com-
20120705121818-zlehm1sftfvi8ddg
Fabien Pinckaers [Thu, 5 Jul 2012 12:10:36 +0000 (14:10 +0200)]
[IMP] small usability fix opporutnity
bzr revid: fp@tinyerp.com-
20120705121036-tgr9sbauwywt50gg
Minh Tran [Thu, 5 Jul 2012 11:59:32 +0000 (13:59 +0200)]
improved icon in the topbar for web_shortcut
bzr revid: mit@openerp.com-
20120705115932-3bas217zqzccvfah
Fabien Pinckaers [Thu, 5 Jul 2012 12:37:18 +0000 (14:37 +0200)]
[mege] trunk
bzr revid: fp@tinyerp.com-
20120705123718-m00s1lxm23y3p070
Minh Tran [Thu, 5 Jul 2012 11:58:47 +0000 (13:58 +0200)]
various improvements to design
bzr revid: mit@openerp.com-
20120705115847-5oncw7ynqxs5m9ig
Jigar Amin - OpenERP [Thu, 5 Jul 2012 11:57:53 +0000 (17:27 +0530)]
[MERGE] lp:~openerp-dev/openobject-addons/trunk-social-network-jam-add-description-tch
bzr revid: jam@tinyerp.com-
20120705115753-8i674s7ak6c5a1u9
Raphael Collet [Thu, 5 Jul 2012 11:55:21 +0000 (13:55 +0200)]
[REM] hr_recruitment: remove unused wizard hr.recruitment.job2phonecall
bzr revid: rco@openerp.com-
20120705115521-ox4hpbqfbrfcsbd0
Twinkle Christian (OpenERP) [Thu, 5 Jul 2012 11:18:53 +0000 (16:48 +0530)]
[IMP]Improving description
bzr revid: tch@tinyerp.com-
20120705111853-1bxqbiihsez0t9oa
Antonin Bourguignon [Thu, 5 Jul 2012 10:44:52 +0000 (12:44 +0200)]
[IMP] don't display parentheses around an employee's login when he doesn't have one
bzr revid: abo@openerp.com-
20120705104452-qq443kyt4gw0985l
Quentin (OpenERP) [Thu, 5 Jul 2012 10:16:50 +0000 (12:16 +0200)]
[MERGE] hr form view
bzr revid: qdp-launchpad@openerp.com-
20120705101650-u8g76ct9ogscoj34
Kuldeep Joshi (OpenERP) [Thu, 5 Jul 2012 09:58:26 +0000 (15:28 +0530)]
[IMP]remove tab
bzr revid: kjo@tinyerp.com-
20120705095826-1pzoelsdmmhbm50h
Kuldeep Joshi (OpenERP) [Thu, 5 Jul 2012 09:33:11 +0000 (15:03 +0530)]
[IMP]event: set indentation
bzr revid: kjo@tinyerp.com-
20120705093311-pxcn4do73mtcd2mg
Quentin (OpenERP) [Thu, 5 Jul 2012 09:29:21 +0000 (11:29 +0200)]
[MERGE] hr review of form views
bzr revid: qdp-launchpad@openerp.com-
20120705092921-0edv4n7z0392ia83
Antonin Bourguignon [Thu, 5 Jul 2012 09:22:03 +0000 (11:22 +0200)]
[MERGE] latest trunk
bzr revid: abo@openerp.com-
20120705092203-gqabuwlajdr7ao4k
Raphael Collet [Thu, 5 Jul 2012 09:14:43 +0000 (11:14 +0200)]
[FIX] crm: fix stupid test (wrong search on ir.model)
bzr revid: rco@openerp.com-
20120705091443-2lkfftu0slyb6dl4
Kuldeep Joshi (OpenERP) [Thu, 5 Jul 2012 09:08:30 +0000 (14:38 +0530)]
[IMP]event: remove conflict
bzr revid: kjo@tinyerp.com-
20120705090830-trou4tqk01ylqqqh
Kuldeep Joshi (OpenERP) [Thu, 5 Jul 2012 08:41:58 +0000 (14:11 +0530)]
[MERGE] lp:openobject-addons
bzr revid: kjo@tinyerp.com-
20120705084158-48j24dp62kr2ejp3
Raphael Collet [Thu, 5 Jul 2012 08:31:57 +0000 (10:31 +0200)]
[FIX] crm_caldav: fix incorrect field references (because crm.meeting changed module)
bzr revid: rco@openerp.com-
20120705083157-b8kgwb12c6u182hs