From 5c53b9ac00e9ed39538566bd9566982afd163e44 Mon Sep 17 00:00:00 2001 From: jke-openerp Date: Thu, 12 Dec 2013 12:05:50 +0100 Subject: [PATCH] [IMP] Add description on Google Calendar module bzr revid: jke@openerp.com-20131212110550-kf8mgq605v7ddben --- addons/google_calendar/__openerp__.py | 1 - addons/google_calendar/google_calendar.py | 5 +- addons/google_calendar/google_calendar.pyc | Bin 30611 -> 30582 bytes .../google_calendar/google_calendar_data.xml | 13 -- addons/google_calendar/res_config_view.xml | 81 ++++++------- .../static/description/_the_calendar.png | Bin 0 -> 44973 bytes .../static/description/an_event.png | Bin 0 -> 6153 bytes .../static/description/calendar_in_action.png | Bin 0 -> 84708 bytes .../static/description/coworker.png | Bin 0 -> 8501 bytes .../static/description/create_quick.png | Bin 0 -> 9583 bytes .../static/description/email.png | Bin 0 -> 32902 bytes .../static/description/icon.png | Bin 0 -> 1831 bytes .../static/description/index.html | 114 ++++++++++++++++++ .../static/description/notification.png | Bin 0 -> 18674 bytes .../static/description/recurrent.png | Bin 0 -> 33459 bytes .../static/description/the_calendar.png | Bin 0 -> 95173 bytes 16 files changed, 157 insertions(+), 57 deletions(-) delete mode 100644 addons/google_calendar/google_calendar_data.xml create mode 100644 addons/google_calendar/static/description/_the_calendar.png create mode 100644 addons/google_calendar/static/description/an_event.png create mode 100644 addons/google_calendar/static/description/calendar_in_action.png create mode 100644 addons/google_calendar/static/description/coworker.png create mode 100644 addons/google_calendar/static/description/create_quick.png create mode 100644 addons/google_calendar/static/description/email.png create mode 100644 addons/google_calendar/static/description/icon.png create mode 100644 addons/google_calendar/static/description/index.html create mode 100644 addons/google_calendar/static/description/notification.png create mode 100644 addons/google_calendar/static/description/recurrent.png create mode 100644 addons/google_calendar/static/description/the_calendar.png diff --git a/addons/google_calendar/__openerp__.py b/addons/google_calendar/__openerp__.py index fd273ff55e7..fd885b406db 100644 --- a/addons/google_calendar/__openerp__.py +++ b/addons/google_calendar/__openerp__.py @@ -35,7 +35,6 @@ The module adds the possibility to synchronize Google Calendar with OpenERP 'js': ['static/src/js/*.js'], 'qweb': ['static/src/xml/*.xml'], 'data': [ - 'google_calendar_data.xml', 'res_config_view.xml', 'security/ir.model.access.csv', ], diff --git a/addons/google_calendar/google_calendar.py b/addons/google_calendar/google_calendar.py index f1e755a7491..131c39c8040 100644 --- a/addons/google_calendar/google_calendar.py +++ b/addons/google_calendar/google_calendar.py @@ -570,8 +570,9 @@ class google_calendar(osv.osv): if event_to_synchronize[base_event][0][1].get('OE_event_id'): parent_oe_id = event_to_synchronize[base_event][0][1].get('OE_event_id') crm_meeting.unlink(cr,uid,"%s-%s" % (parent_oe_id,new_google_event_id),unlink_level=1,context=context) - else: - raise "Need to delete !" + #else: + + #raise "Need to delete !" elif actToDo == 'DELETE': if actSrc == 'GG': diff --git a/addons/google_calendar/google_calendar.pyc b/addons/google_calendar/google_calendar.pyc index 9d1d626c6cf83eb53a9dd20b3d0401b8962d79bb..ef793166c5ac760a99053b763cf9116ed1086b1d 100644 GIT binary patch delta 960 zcmZ8eU1$?o6h3DraoU+q99R02hBOrk)>cK$&!mllg+i-{Rs0DeX{+8=O=5M@)Lr$~ z2P;0PyGYLlb|1DPBDOE0UhqLd@S&ifpe`(Gg%t!Jt0D;XLA;a3io)S=?)mw?@18^N z@Y4)x>PJ&Qac1(S_MsVP#BB4^1r?7~Za_zRik_{ptIoL(Zh^leeM(fX4P#AF=Zk@@ zgscMjqRw{0X#}T8TO;k}4<#CpEVYWdQ>*b`fF(-(P4qO_Ck!BpN)^Cd<+F#A-ZD|0nF~37uD#zqnqCl$K(H z)Y96G2|C#tYq{-n#$4k;$jDO$TydlF`u!I7Kt=z>d&#YYdmuqPDPpR0?fy zRXVhxEoA0_`&`RZ0vn=STcCZnRS3;z+?`2d8zJj~{BG-8XF2KT)uqeGnPu}c^q{TV z6SG)>0?B$$kHv+ga3-|Et81v z#ccO$#82Yowp%88#qYiSD*h!t?mMgCRdJ%f7V(xC8!!-Wi}3^d5$_1)P+GxzqA$B1 xagP|!$>al}3`P`uCE`cVA-)m!og0WRuH=UloTZ`Rvl9RF@So_t>|f*$eg!&z2Xz1d delta 1127 zcmZWmU1%It6h3EmlHJVgY)5OdPS&IwW$jP;W4r$e6@q~zAcuv zO@vGugMmSBXM}~J6oK$um$@2|)eyaA(oybYa?u&nj{_Y8l?_2#4V4;=^XW`ire-n+ zj%eW3%>Lq5m~RJWK&cB@J4hUQpPB`!Koe3)UTO$e3?hC#6UTG>UM8kn5pwz8ncaHc zqDj6lo9vqczX>P+EC98DHXj3;h5;5+3~$Ilnh2=4v>Jz?)B+S%YSOnO6J>rOJBs7{ zQMNN?TN~}zmSpf1$;RZ4az+&TXdXX$~}iC_z$^k>lK5wto3|Q zx|XLvCwU@2g3t46KHdFI#9L5@bwEk(E~aePBu&|7I+TLI5SRuO0-E99<`7` zleRmR|5@JCv+eX8u!uUU3BS?A5IB<>v<(dU36=1lZIF)H{^K&2f}10^&s`E_N zVsUUM>bteDCVm+j(($%9Fnk$tMf^B&5Ajd2`0|$)>SAWh4d5r@`|-0HUKB+)ig;C2 zCr!k!#F?oH#B1XIbWy`a@k03^;$d;7A|G#v`^S?S-Vx5s2Z%q5i{2NAOBW8!Y50i0 ST0JZI?^e%Y(`U|OPRBo4*DC)2 diff --git a/addons/google_calendar/google_calendar_data.xml b/addons/google_calendar/google_calendar_data.xml deleted file mode 100644 index 85e3ce5d5d5..00000000000 --- a/addons/google_calendar/google_calendar_data.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - google_calendar_client_id - - - - google_calendar_client_secret - - - - \ No newline at end of file diff --git a/addons/google_calendar/res_config_view.xml b/addons/google_calendar/res_config_view.xml index 59c571721e5..953aaacc05b 100644 --- a/addons/google_calendar/res_config_view.xml +++ b/addons/google_calendar/res_config_view.xml @@ -14,56 +14,55 @@
- -
-