From 8578339975b881665b078edab00af879acc0de16 Mon Sep 17 00:00:00 2001 From: mayur200 Date: Mon, 12 Oct 2020 01:19:49 +0530 Subject: [PATCH 1/3] changes made in the manifest and removed extra duplicate content --- openacademy/__manifest__.py | 3 +- openacademy/security/security.xml | 2 +- openacademy/views/openacademy.xml | 457 +++++++++++++++--------------- openacademy/views/partner.xml | 92 +++--- 4 files changed, 276 insertions(+), 278 deletions(-) diff --git a/openacademy/__manifest__.py b/openacademy/__manifest__.py index ad4331a..8d9a8a5 100644 --- a/openacademy/__manifest__.py +++ b/openacademy/__manifest__.py @@ -7,7 +7,7 @@ subtitle on modules listing or apps.openerp.com""", 'description': """ - Long description of module's purpose cccccccccccc + Long description of module's purpose """, 'author': "My Company", @@ -20,7 +20,6 @@ 'version': '0.1', # any module necessary for this one to work correctly - # 'depends': ['base'], 'depends': ['base', 'board'], # always loaded diff --git a/openacademy/security/security.xml b/openacademy/security/security.xml index 8d53108..e3fe9bb 100644 --- a/openacademy/security/security.xml +++ b/openacademy/security/security.xml @@ -21,7 +21,7 @@ ['|', ('responsible_id','=',False), - ('responsible_id','=',user.id)] + ('responsible_id','=',user.id)] diff --git a/openacademy/views/openacademy.xml b/openacademy/views/openacademy.xml index 52bc6f3..9e53647 100644 --- a/openacademy/views/openacademy.xml +++ b/openacademy/views/openacademy.xml @@ -1,245 +1,244 @@ - - course.form - openacademy.course - -
- - + + course.form + openacademy.course + + + + + + + + + + + + + + + + + + + + + This is an example of notebooks + + + + + + + + + + course.search + openacademy.course + + + + + + + + + + + + + + + course.tree + openacademy.course + + + + + + + + + + + + + + Courses + openacademy.course + tree,form + +

Create the first course +

+ + + + + + + + + + + + + + session.form + openacademy.session + +
+ + + + - - + + + + + + + + - - - - - - - - - - - - - - This is an example of notebooks - - - -
- - - - - - course.search - openacademy.course - - - - - - - - - - - - - - course.tree - openacademy.course - - - - - - - - - - - - - - Courses - openacademy.course - tree,form - -

Create the first course -

- - - - - - - - - - - - - - session.form - openacademy.session - -
- - - - + +
+ + + + + + session.tree + openacademy.session + + + + + + + + + + + + + + session.calendar + openacademy.session + + + + + + + + + session.gantt + openacademy.session + + + + + + + + openacademy.session.graph + openacademy.session + + + + + + + + + + openacademy.session.pivot + openacademy.session + + + + + + + + + + + + openacademy.session.kanban + openacademy.session + + + + + +
+ + + + + + + + + + + + + + + + +
+ + Session name: - - - +
+ Start date: +
+ duration: - - - - - -
+ + + + + - - Sessions - openacademy.session - tree,form,calendar,gantt,graph,pivot,kanban - + + Sessions + openacademy.session + tree,form,calendar,gantt,graph,pivot,kanban + - + diff --git a/openacademy/views/partner.xml b/openacademy/views/partner.xml index fbdc0cb..3e23136 100644 --- a/openacademy/views/partner.xml +++ b/openacademy/views/partner.xml @@ -1,52 +1,52 @@ - - - partner.instructor - res.partner - - - - - - - - - - - - - - - Contacts - res.partner - tree,form - - - - - - - Contact Tags - res.partner.category - tree,form - - - - - - Teacher / Level 1 - - - - Teacher / Level 2 - + + + partner.instructor + res.partner + + + + + + + + + + + + + + + Contacts + res.partner + tree,form + + + + + + + Contact Tags + res.partner.category + tree,form + + + + + + Teacher / Level 1 + + + + Teacher / Level 2 + From d8e05575cc611b7d9e964dae3e77944bf43d6300 Mon Sep 17 00:00:00 2001 From: mayur200 Date: Mon, 12 Oct 2020 01:20:31 +0530 Subject: [PATCH 2/3] indentation fixed for xml files --- openacademy/__pycache__/__init__.cpython-36.pyc | Bin 233 -> 0 bytes .../__pycache__/__init__.cpython-36.pyc | Bin 186 -> 0 bytes .../__pycache__/controllers.cpython-36.pyc | Bin 186 -> 0 bytes .../models/__pycache__/__init__.cpython-36.pyc | Bin 206 -> 0 bytes .../models/__pycache__/models.cpython-36.pyc | Bin 4114 -> 0 bytes .../models/__pycache__/partner.cpython-36.pyc | Bin 555 -> 0 bytes .../wizards/__pycache__/__init__.cpython-36.pyc | Bin 177 -> 0 bytes .../wizards/__pycache__/wizard.cpython-36.pyc | Bin 1033 -> 0 bytes 8 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 openacademy/__pycache__/__init__.cpython-36.pyc delete mode 100644 openacademy/controllers/__pycache__/__init__.cpython-36.pyc delete mode 100644 openacademy/controllers/__pycache__/controllers.cpython-36.pyc delete mode 100644 openacademy/models/__pycache__/__init__.cpython-36.pyc delete mode 100644 openacademy/models/__pycache__/models.cpython-36.pyc delete mode 100644 openacademy/models/__pycache__/partner.cpython-36.pyc delete mode 100644 openacademy/wizards/__pycache__/__init__.cpython-36.pyc delete mode 100644 openacademy/wizards/__pycache__/wizard.cpython-36.pyc diff --git a/openacademy/__pycache__/__init__.cpython-36.pyc b/openacademy/__pycache__/__init__.cpython-36.pyc deleted file mode 100644 index c7a3c3a2a672fa1eebe47dcb8418de408572fe69..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 233 zcmX|)K?=e!5Ji)wR#AHbFJKoMr3*JAp1_T}f`-sUEF>LCDpGIcmAcfGS8(OTg#-Wb z28Q{0nhw{K=kY)Yd13w&p=~jKicmyRLo6*Q4IZIKMf7uq&I*Pe?@88sQ#{XTH!7iS z92ldW$2GB_v-(_(}TxfADAVxfhOM(Y{R{RWB^ON-E%0U6lmic_aZ7ZZw lPw8mdK3Qo@OMnd^b6!aH$?yd diff --git a/openacademy/controllers/__pycache__/__init__.cpython-36.pyc b/openacademy/controllers/__pycache__/__init__.cpython-36.pyc deleted file mode 100644 index 9b993d3509a84a8879a7ff5acfac458df54be98b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 186 zcmXr!<>h)OazD<9fq~&M5W@izkmUfx#R5Pgg&~D8has0Sijk2ag(;XplldhhP*{`k z7I$)fUP)1YPEKl3v7aW>ErueH#+3|3EI$U$PO2R<(A;7m GW&i-r{4eDI diff --git a/openacademy/controllers/__pycache__/controllers.cpython-36.pyc b/openacademy/controllers/__pycache__/controllers.cpython-36.pyc deleted file mode 100644 index 9375ee79e44027e36df5f570274e685261ef8ebd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 186 zcmXr!<>h)OazE}n69dCz1|$IFGdKWou>g=rVMt-jVaR2SVq|1UVG3r@WPS-0Wzb~2 z#gb7{QsAe_bc-cFB|pCiq-!NZ5etw46TjT_GxBp&_0tlIb4v9=N^}j4^$hfLE8`PW zQu6bP_45l-^AeL2Q&Mv)^^^1SN{aGxa#D+mk=c3$mA5!-a`RJ4b5iXlIT@-mKMKJ-{%)tzr zEH4>>N;Da7vE}Bcq~;U@S?mRgMJ0KuMShyhw-|~*MinswiIogRtROas_+_V`k)NBY zpO#phQ>vezlAo_@Xsl;Jy`&%eyg z8^*tkvByFGAzt}=G|XUTVsuU4G^uYTR@e6JuH!r1ieKqg{c5-7*G%Kr2D6#-#$XP& zJMN+FPk>TkRZyw}N}bhS7%lf5xEd`}P2_QxGoIvOtD>si3|*Tv~T!S2OYVA4mW(08NS6#-)5HY@Jgpj(y+=~%dcVN9vc1xzI9e*HRfVw z;;rL1Kxwi%Yp^Dpd~5rYY~d$k!(`KJ=FNmZ#TMD=P0OGD$#4vR29htS>RQ$pk{7dC zkEdZ2GTz-=iAvhsx1c>LX*ttCw#qSsjAFHoNg*t@a=vqI4dRumn(hAg)Cgj zb1&^DiE4b$We@tsuM*y}m7Aq73(vWzLr+zSG2AWY#*dd=N?1rulyU?y^W7IEO}0$E zuN_$fbJ5jS@Y;A~2TgA5n>{x+4$T8|-{_dkWL9o5`_Syz7(0jNhP`QG*4nq^L(G6O zoH?-5Sx_oN%D#1I9oYN!KDgXB@=9LaHx8{%Z6Et#zG_=JY1rjO+N~j zhWF#a)uMhpD5j75-t`|3S}j*OERJ&3lspvCRsc=YT+|>w{3R3JFc&j4sK|bg3*l1V ziNL+(C`a;SL)94H2>VIyH$jd$D_JNvD3ktb z#evmemaaSatn~K8NeD29SCUkQ*|Z#M$#kq)d)9JI(wm$J ze$(4ir|9&6aT$qNdwLLU@#yu@(%NsHtbKExX1$9Kys-tXqkHRH+{?+a$a*;j<<)y~ zE9)oBOS9a2g%y|>+ou}(sD2u6_xVxtW&7E8FQ4cGT1OX%E(Z>g>qL+X;CYvC?RLb8`#endZf7a?rw};97=gPh_uG`;?qb$&41xhvsc%8e1adpUZKnvo zFivx+CI|N%@gxZXu|(oigIGCD{WH{%3(+e{Q`dBGdsC)sR?Q~*O>63eVH&1oQLER! zhfTEcA#GkU|35apHA`e7bm~k1sZ76)euI4ue3}4mH8Gkbbi&LO`qMx(S~Wv-;Moa$ zX9>C36#IgGxoNX`VA!0do@A%k0@g1A<>o;-iFK#J$?{KO)L={O3_FX_0!A)7hn45q z1?FM(A}EvWBD)0IW$-)AmpW(I6?XN|V%OO68vuoW7PNB%+I7~_wDWr14fYAveab%5 zv$nXu! z?J8v>P>_%2k*PYy8MH+IBZ?8Yi{0MDX8jC0e|iXQz6M1##w?@kgr|Z|!(E)BSyLQ` zei`$>1o=5$N%3n~bws;s74ripTNyX>NDtCyq{nYDK+Z(L^ct`T$xX_mXpu8nZx8;)vId9tF&%zTM&Cy`ymu5N{3?MSsGHRr1%{g#7$nnI};rs_y5f3myC7EoZA^&S4<5gbZlu$q(Lt@O^|D8yWVHo(|4@VP&=+lLNS8s>l){fvW*IkMVSWd188;@$Z8>8y zk0Z^;Wu_#%yQpQJIWVat?Vw~VZ)9L~U4V@IN==V^bO1kPRDV>yN8tWfl8*wF>{^_C z&z>K!Qj^E%4$OK_;!&vI2B+OmwZvCSD+{u&mi%>9RCB9i=MIAwhvwgo;mT?kpFBcT z>WY0?A}I~iiWi0HvaYzobQD#sig3dyF`v|QUYrz|Qcr>rUb z7St^&Ea%<%lk-h?Vzwe^XS>xZd+on(Iw)NL diff --git a/openacademy/models/__pycache__/partner.cpython-36.pyc b/openacademy/models/__pycache__/partner.cpython-36.pyc deleted file mode 100644 index e87ab106ef7b7f00f386475708a435a8504e6ad4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 555 zcmYjOy>1jS5VpO)w;?DIFOUjp3wD9DfI{)cpdQN=xQMggrm#3;yy>pVL+$9`qH8Vqt$d#FMKJ4mOTpLDjjX^)OD4fq~&M5W@izkmUfx#R5Pgg&~D8has0Sijk2ag(;XplldhhP*{`k z7F&5{Rbo+!pC;2Sh9Z!jl?+8JKnhI!ve(bZ&rQ`&ODxVQ)z44K&(}3H)-%x0t&C4h zNy*PE*3U0U%}Y#9Oi9hH)Q6ZqAQ7%;uT#Q5l^o9TxQHfK7pp}p;fwj#{ii3aBU8ilLa%!)A z5T1cI*(02I1y0P`ZWReuns3*$qnU5M9dCELt$6F_=N}GZzu4NMZ?;3G9uWWop0JdM zJhehAwL_b;w+t+>FB#a#XU>Hky5Q`y!2M0}EU>kg=75RP-ZaJpl(xk@o|wDq< zOzjdN3pudR0v_66g$~%@T(ZzbZ`J@8JZPW`{*@E@rKbrkXkS@j6FShPxEA!N_ATvw zj8{U!>P|k#OiTn|x*VQXzU}Jn`QZH`o_rmAz@u0dQWSBX4f5&Wbx~jjh-y&egMCzr z{A$99n^|VJ$=;BuO@ebaBT*i(8K;vqBhnZAf)fdQyt=zyT~(=cOH7LR1fv*K;Ak7O z6YU+!{8XX#qe-3>cvfip2#bJgM`1Gk&SZxQ{dqb1lBYPD3Y9EIIpq1{r`y9PqjVVw z0OB}Wt2U~7RrNlcFZJyRa4Hr_5!Fmo*Ysc!FuvNXL>c}Q^#3OOYhez|3zK|tcBFlY z$BS4Z=tf;?)t0D+b0LcirEcCx8*sTnWp7k9B+Q_dsy?K{*_P3DmwoDg Date: Fri, 30 Oct 2020 21:26:26 +0800 Subject: [PATCH 3/3] Update __manifest__.py For Odoo V14, you have to change the sequence, how the views are loaded. Because in partner.xml, you create a new menu (Configuration) with a parent from the openacademy.xml view. --- openacademy/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openacademy/__manifest__.py b/openacademy/__manifest__.py index 8d9a8a5..1fb2fc3 100644 --- a/openacademy/__manifest__.py +++ b/openacademy/__manifest__.py @@ -27,9 +27,9 @@ 'security/security.xml', 'security/ir.model.access.csv', 'views/views.xml', + 'views/openacademy.xml', 'views/partner.xml', 'views/templates.xml', - 'views/openacademy.xml', 'wizards/wizard_view.xml', 'reports/report.xml', 'reports/session_board.xml',