odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity
84,803 Commits 3 Branches 0 Tags 961 MiB
Commit Graph

89 Commits

Author SHA1 Message Date
Launchpad Translations on behalf of openerp fa60b90c1f Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140422075247-nxfftok20ltlnea6
 2014-04-22 07:52:47 +00:00
Christophe Simonis 61da3f4aba [MERGE] forward port of branch saas-3 up to revid 9409 dle@openerp.com-20140415101427-a6r7lgy50x9bdah3 
bzr revid: chs@openerp.com-20140415142934-rlka4vkxd34fkil8
 2014-04-15 16:29:34 +02:00
Kersten Jeremy b91bcbf0fc [FIX] Fix the call of the cron due to a function which has been renamed. 
[IMP] Add param calendar.block_mail in ir.config.parameters to allow to bypass the sent of mails to attendees.

bzr revid: jke@openerp.com-20140414202936-kh1izog183nwenb7
 2014-04-14 22:29:36 +02:00
Raphael Collet 14be899706 [FIX] calendar: fix string quoting mess in email template 
bzr revid: rco@openerp.com-20140414144754-08fgs7xnzax5uzht
 2014-04-14 16:47:54 +02:00
Launchpad Translations on behalf of openerp e82fbf7d91 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140412083153-3ona1js7o6z421vg
 2014-04-12 08:31:53 +00:00
Richard Mathot (OpenERP) ac8ada1a47 [MERGE] Sync with parent 
bzr revid: rim@openerp.com-20140410120341-n1idn9rtnf2lmvcy
 2014-04-10 14:03:41 +02:00
Gery Debongnie 27dab11ccd [FIX] fix to the previous fix: it should correctly calls the readgroup methods now (addons calendar, idea) 
bzr revid: ged@openerp.com-20140409105127-ctn9bl6h5gd62x0x
 2014-04-09 12:51:27 +02:00
Gery Debongnie 811456f35e [FIX] add the new 'lazy' keyword argument to the read_group calls inherited in several models (addons calendar, idea, note) 
bzr revid: ged@openerp.com-20140409104230-5v0p49ij1wd87qhc
 2014-04-09 12:42:30 +02:00
Richard Mathot (OpenERP) e423d63e90 [MERGE] Sync with parent 
bzr revid: rim@openerp.com-20140408140555-m4z8o9onif92f9i8
 2014-04-08 16:05:55 +02:00
Christophe Simonis 0fad8159f3 [MERGE] forward port of branch saas-3 up to revid 9380 chs@openerp.com-20140407144439-10n8fs6zovodwwtx 
bzr revid: chs@openerp.com-20140407163318-hh3jwfkj3o2c83lk
 2014-04-07 18:33:18 +02:00
Kersten Jeremy 92b037be7a [FIX] Calendar - Typo remove useless whitespace 
bzr revid: jke@openerp.com-20140407095127-kxco10410n33l7h6
 2014-04-07 11:51:27 +02:00
Kersten Jeremy 0695647c66 [FIX] Calendar - Add timezone in mail send for invitations. 
bzr revid: jke@openerp.com-20140407094624-bi8rtxqcdl1kqaal
 2014-04-07 11:46:24 +02:00
Denis Ledoux 0a80f59853 [FIX] calendar: render template even if context values are not set 
bzr revid: dle@openerp.com-20140403092355-cmnt5cv1ffdv19o8
 2014-04-03 11:23:55 +02:00
Kersten Jeremy 0f5c2bda4a [FIX] Calendar - revert commit from forward port 9354. This has been already fixed in 9322. 
bzr revid: jke@openerp.com-20140402071542-cv7zz4t1t26riuuu
 2014-04-02 09:15:42 +02:00
Christophe Simonis dfdbf8cdc4 [MERGE] forward port of branch saas-2 up to revid 9162 chs@openerp.com-20140401184913-5hi2h11lnmadbozr 
bzr revid: chs@openerp.com-20140401190308-f3f2l9br69qb33ob
 2014-04-01 21:03:08 +02:00
Kersten Jeremy 9f7ba14253 [FIX] Calendar mail_message : check context before to use it 
bzr revid: jke@openerp.com-20140401161440-w2jjr0a5u49lwnsj
 2014-04-01 18:14:40 +02:00
Richard Mathot (OpenERP) f07e0ff8c5 [MERGE] Sync with trunk 
bzr revid: rim@openerp.com-20140401071752-mdhg7kjdhgvju1cb
 2014-04-01 09:17:52 +02:00
Launchpad Translations on behalf of openerp 51aa261b44 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140327073504-l0fydwct329jhirh
 2014-03-27 07:35:04 +00:00
Richard Mathot (OpenERP) ecc7c1fbd3 [MERGE] Sync with trunk 
bzr revid: rim@openerp.com-20140319072330-lvlrxsqq667hfu28
 2014-03-19 08:23:30 +01:00
Christophe Simonis 99a3c45976 [MERGE] forward port of branch saas-3 up to revid 9328 chs@openerp.com-20140318120024-mcxmkncn1xktjs7v 
bzr revid: chs@openerp.com-20140318132741-aur3q1k7t9iympri
 2014-03-18 14:27:41 +01:00
Richard Mathot (OpenERP) 04e2c89c62 [MERGE] Sync with trunk 
bzr revid: rim@openerp.com-20140315102709-3zp27g8lyr3z36d1
 2014-03-15 11:27:09 +01:00
Kersten Jeremy 7c8e468dee [FIX] Convert offset aware into offset naive before to use timedelta. That remove traceback when we try to get notification (notif or mail) for a recurrent event 
bzr revid: jke@openerp.com-20140314165641-6bwyxe3wej4upqzh
 2014-03-14 17:56:41 +01:00
Christophe Simonis 5af434260f [FIX] calendar: correct test: select1 field has been renamed 
bzr revid: chs@openerp.com-20140314113955-acyplukwyu2f7142
 2014-03-14 12:39:55 +01:00
Christophe Simonis b3bb47076b [MERGE] forward port of branch saas-2 up to revid 9151 chs@openerp.com-20140314104803-19c5snl2fcuih91o 
bzr revid: chs@openerp.com-20140314105753-7a7wh9a1z99azgfj
 2014-03-14 11:57:53 +01:00
Kersten Jeremy 808e55d25c [FIX] Revert commit 9208 - Calendar is a module auto install. So we dont need to redirect 
bzr revid: jke@openerp.com-20140313184043-8vy1252h3wpghx12
 2014-03-13 19:40:43 +01:00
Christophe Simonis c4a6bb75ff [FIX] calendar: rename leftover crm.meeting into calendar.event forgotten during previous commit 
bzr revid: chs@openerp.com-20140313175427-wbzt8innt0d874xy
 2014-03-13 18:54:27 +01:00
Christophe Simonis ee8174806e [MERGE] forward port of branch saas-2 up to revid 9149 chs@openerp.com-20140313163420-ifa4hyixj722d6jo 
bzr revid: mat@openerp.com-20140313091920-bahej198pu339e28
bzr revid: chs@openerp.com-20140313170940-yoqg6izfw74s2i3a
 2014-03-13 18:09:40 +01:00
Kersten Jeremy b92001f1d8 [IMP] Calendar - Add redirect to calendar module after the install of it 
bzr revid: jke@openerp.com-20140313110002-m645txvytcrb40lr
 2014-03-13 12:00:02 +01:00
Christophe Simonis 8a8f93a101 [REVERT] revert previous commit: this specific case was legit 
bzr revid: chs@openerp.com-20140311163833-evzfw1z6fl8m63in
 2014-03-11 17:38:33 +01:00
Kersten Jeremy 9dc0859c77 [FIX] Very expensive copy paste type 
bzr revid: jke@openerp.com-20140311160834-vm0ixawo7alh3w5p
 2014-03-11 17:08:34 +01:00
Christophe Simonis d504764eff [MERGE] forward port of branch saas-3 up to revid 9298 chm@openerp.com-20140311130852-3ft0v1mc9ht1any6 
bzr revid: chs@openerp.com-20140311145205-s56fj113fsrnisc3
 2014-03-11 15:52:05 +01:00
Kersten Jeremy 86f48a1a79 [TYPO] Typo in calendar template 
bzr revid: jke@openerp.com-20140311081025-b9r08awsiwi068fw
 2014-03-11 09:10:25 +01:00
Kersten Jeremy ac8048939d [IMP] Add condition in calendar_event to avoid to send email to oneself 
bzr revid: jke@openerp.com-20140310112851-d59a9diz80dgb0ke
 2014-03-10 12:28:51 +01:00
Richard Mathot (OpenERP) ac45077749 [MERGE] Sync with trunk 
bzr revid: rim@openerp.com-20140304090633-6er115zbxgtsmv8u
 2014-03-04 10:06:33 +01:00
Launchpad Translations on behalf of openerp 9863dbe5c8 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140304075238-yra39uwmwahmrnf3
 2014-03-04 07:52:38 +00:00
Kersten Jeremy c55af162d5 [TYPO] Typo for demo calendar 
bzr revid: jke@openerp.com-20140228160611-uxq6y89bus33vehy
 2014-02-28 17:06:11 +01:00
Kersten Jeremy 4954c0fa39 [FIX] Allow other users to read field recurrent_id_date from private event, else we cannot see that this event is excluded from a recurrence 
bzr revid: jke@openerp.com-20140228143930-3eeam1a3676kgv4i
 2014-02-28 15:39:30 +01:00
Kersten Jeremy 015083df09 [FIX] Calendar - Tempalte Mail - Move the if condition who vas between table and tr into td, else wysiwig and some other sanitizers will move the if condition outside the table 
bzr revid: jke@openerp.com-20140228140053-02952ews6aadfcjf
 2014-02-28 15:00:53 +01:00
Kersten Jeremy 2b7de6164f [FIX] Fix notification in calendar. All peoples had all notifs :( 
bzr revid: jke@openerp.com-20140227142933-33bh05ozdb7uwjy5
 2014-02-27 15:29:33 +01:00
Fabien Meghazi 233665197b [IMP] Do not dismiss server errors on calendar notifications 
bzr revid: fme@openerp.com-20140226154727-dafw83hf9b9a8gpz
 2014-02-26 16:47:27 +01:00
Kersten Jeremy 9a03a57120 [FIX] Use event.display_time and not event.date in mail template. This function field use the timezone ! 
bzr revid: jke@openerp.com-20140225200342-6f96u6dkrknbzjsn
 2014-02-25 21:03:42 +01:00
Kersten Jeremy 4ec292eae9 [MERGE] Fix bug in send_mail_to_attendee of calendar where we passed browse_list and not dict(ids), typo controller calendarr PEP8 
bzr revid: jke@openerp.com-20140225173808-60stzxubljuambd4
 2014-02-25 18:38:08 +01:00
Kersten Jeremy 8b927d7d1c [FIX] fix bug in send_mail_to_attendee of calendar where we passed browse_list and not dict(ids), typo controller calendarr PEP8 
bzr revid: jke@openerp.com-20140225165859-1vyjtirgjmbhoij4
 2014-02-25 17:58:59 +01:00
Richard Mathot (OpenERP) ee51fc0ca6 [MERGE] Sync with trunk 
bzr revid: rim@openerp.com-20140225093040-6k4kmj93uo2bk6t9
 2014-02-25 10:30:40 +01:00
Kersten Jeremy 2907c8dd66 [TYPO] PEP7 - Module calendar (no E501) 
bzr revid: jke@openerp.com-20140224220222-dp26lvbv2bfljxvt
 2014-02-24 23:02:22 +01:00
Kersten Jeremy bfaa40266d [IMP] Calendar : Check that user are not disconnected before to check next_potential_notif, that avoid to see an error in console every 5 minutes 
bzr revid: jke@openerp.com-20140224104850-wty7kk230s72tdcy
 2014-02-24 11:48:50 +01:00
Christophe Simonis 4b72678bc7 [MERGE] forward port of branch saas-2 up to revid 9195 chs@openerp.com-20140220154517-6y531n1mqtnfnsmr 
bzr revid: chs@openerp.com-20140220163815-69sza1kclnh5mavs
 2014-02-20 17:38:15 +01:00
Kersten Jeremy 8d8ede7f7d [FIX] Disable traceback popup when rpc /calendar/notify fail 
bzr revid: jke@openerp.com-20140220150817-0yyovkr4ooqu8ejc
 2014-02-20 16:08:17 +01:00
Kersten Jeremy 6305ac4094 [FIX] Disable traceback popup when rpc /calendar/notify fail 
bzr revid: jke@openerp.com-20140220150817-3rvvm8neeqviba6o
 2014-02-20 16:08:17 +01:00
Richard Mathot (OpenERP) 77e89f6a81 [MERGE] Sync with trunk 
bzr revid: rim@openerp.com-20140220120929-lbhrdz5sv190ylhu
 2014-02-20 13:09:29 +01:00