From eb3972f1da5a192c8a87e069cec9a82ae88464ec Mon Sep 17 00:00:00 2001 From: projectsodoo Date: Tue, 22 Dec 2020 14:01:04 +0530 Subject: [PATCH 1/2] Updated start and end time timesheet --- cor_custom/models/analytic.py | 3 ++ cor_custom/views/analytic_view.xml | 26 +++++++++++++++++- .../__pycache__/__init__.cpython-36.pyc | Bin 178 -> 0 bytes .../__pycache__/__init__.cpython-36.pyc | Bin 226 -> 0 bytes .../__pycache__/mail_template.cpython-36.pyc | Bin 1967 -> 0 bytes .../__pycache__/mail_thread.cpython-36.pyc | Bin 690 -> 0 bytes .../__pycache__/__init__.cpython-36.pyc | Bin 200 -> 0 bytes .../__pycache__/__init__.cpython-36.pyc | Bin 213 -> 0 bytes .../__pycache__/maintenance.cpython-36.pyc | Bin 1065 -> 0 bytes .../models/__pycache__/project.cpython-36.pyc | Bin 2349 -> 0 bytes .../__pycache__/__init__.cpython-36.pyc | Bin 190 -> 0 bytes .../maintenance_report.cpython-36.pyc | Bin 1744 -> 0 bytes .../__pycache__/__init__.cpython-36.pyc | Bin 177 -> 0 bytes .../__pycache__/__init__.cpython-36.pyc | Bin 189 -> 0 bytes .../__pycache__/sub_project.cpython-36.pyc | Bin 576 -> 0 bytes 15 files changed, 28 insertions(+), 1 deletion(-) delete mode 100644 mail_debrand/__pycache__/__init__.cpython-36.pyc delete mode 100644 mail_debrand/models/__pycache__/__init__.cpython-36.pyc delete mode 100644 mail_debrand/models/__pycache__/mail_template.cpython-36.pyc delete mode 100644 mail_debrand/models/__pycache__/mail_thread.cpython-36.pyc delete mode 100644 project_maintenance/__pycache__/__init__.cpython-36.pyc delete mode 100644 project_maintenance/models/__pycache__/__init__.cpython-36.pyc delete mode 100644 project_maintenance/models/__pycache__/maintenance.cpython-36.pyc delete mode 100644 project_maintenance/models/__pycache__/project.cpython-36.pyc delete mode 100644 project_maintenance/report/__pycache__/__init__.cpython-36.pyc delete mode 100644 project_maintenance/report/__pycache__/maintenance_report.cpython-36.pyc delete mode 100644 sub_project/__pycache__/__init__.cpython-36.pyc delete mode 100644 sub_project/models/__pycache__/__init__.cpython-36.pyc delete mode 100644 sub_project/models/__pycache__/sub_project.cpython-36.pyc diff --git a/cor_custom/models/analytic.py b/cor_custom/models/analytic.py index 1e9a5dd..697a09d 100755 --- a/cor_custom/models/analytic.py +++ b/cor_custom/models/analytic.py @@ -8,6 +8,9 @@ from odoo.osv import expression class AccountAnalyticLine(models.Model): _inherit = 'account.analytic.line' + start_time = fields.Float('Start Time', digits=(16, 2)) + end_time = fields.Float('End Time', digits=(16, 2)) + @api.model def create(self, vals): if vals.get('unit_amount') == 0.0: diff --git a/cor_custom/views/analytic_view.xml b/cor_custom/views/analytic_view.xml index 4f3dd79..3c95d65 100755 --- a/cor_custom/views/analytic_view.xml +++ b/cor_custom/views/analytic_view.xml @@ -1,7 +1,7 @@ - + + + + account.analytic.line.tree.hr_timesheet_inherit1 + account.analytic.line + + + + + + + + + + + account.analytic.line.tree.hr_timesheet_inherit1 + account.analytic.line + + + + + + + diff --git a/mail_debrand/__pycache__/__init__.cpython-36.pyc b/mail_debrand/__pycache__/__init__.cpython-36.pyc deleted file mode 100644 index 1025e52b0edde0d23492ce30e611cf9e816dbdf3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 178 zcmXr!<>fMJoENN`@j9AO$9VIq2sXl<4QDEG6 z{p9>2U68DPZenImd`fCkQDR<-etdjpUS>&ryk0@&Ee;!?1*JKub|CwTftUdRpg}9= diff --git a/mail_debrand/models/__pycache__/__init__.cpython-36.pyc b/mail_debrand/models/__pycache__/__init__.cpython-36.pyc deleted file mode 100644 index 4eff49b1d7291ff4347fbec5ae0e9705b6cd7313..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 226 zcmX|*Jr2S!427K*Bn0#ZT%bdV_z@FAY-}uSEK#ToVEt8-h95i9DnxfAAF@l$lv6Z$A|OR zu=FMnK?E(x5O-G4k_|nIXRq+fU>KC)Ff2R64kh0c;fvsuh(LD6(cBw$1${!2@E_1Y zwi0UneNz^RXDPQ{HW}Hltc5Iej_=POw2Y7b28bj>D#(xtI`pJJ4g?e4DVft@=s0H$ zxDIkJ$SxJ3=$uAy6TKil8Fs;XWP6XYQSq}ZCq-stvs?m~nlm=1&KMy9?B3bZ-@(DD zqk^4AGul$&&FN&tK+tnKW5D~suL2MI%mY3E{!8FtpZP6oz1H9LF!-$t6KD#}T!W=o zfc!?rklEX03}%Ff+?cgw?t_@W)$~UyH7ct#xILhQF=I%M{AkN_qo`yOD=)j zNL6act0${NyTtdT;kurxTw1@#sy)p7QLO~-S{A#1k(WOV>WLZDqOL!E;I{RAs!d(4 zXF}AK9^|!J$F~E_78h~{91(*>xfXZl8B8Z9_KGuk?yMB=VuY@cG^Wj0ujW5JSH>?t z=jfbHH;OvX3cZ=Wrp@|4f+tPx%d{A{u4+Gg`SgN zycwH$Gv81sx-aN0(z097V6XsBa}Q7l`}2-^&_WX#Z|uV@odsJ&p zACm2jS;vGT5aB6lJLArrJcPG%svaM&ob%iLSp?^(h4!H2;P5H5aNFVCgU3%%d)xwY z$4jC!$Cix%e)rPVm3adL^ZOVK8nn%(s; zlAgK&N-R^-dV0EJBOF>rNonIEH`*U_Y}>e>viUBZ^jLYA^J+WL4>I5b`h-Y#E&7Xy0_ zzHsR#tWQ^HM1APMK8+b;A?)NDK7pY5MAf;}S|uQxu*;~SqFv7OBGa1l%POi*;Jf>1%nc6Kqs^WF zxcLU%No*s|tE`lq+n95hPtyX=Jq%@$M-JYj4;ZFKN6Gunof93N`n>_YEcRS zZ$U>|-hh@yY@?$rrHs9boS!Dp=abEI?vQ;~`| q8X`;PiI?&bh5PKyDzsiz?FIiUL&hE4Xfaryz8oiel`tZg&g37#FSDBf diff --git a/project_maintenance/__pycache__/__init__.cpython-36.pyc b/project_maintenance/__pycache__/__init__.cpython-36.pyc deleted file mode 100644 index 4e19977e045a7c193914c2a1fbb582597834cced..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 200 zcmX|)F$w}P5JhLQDkAO;yucP3L>ocG#!?$Qo3LzBtZXtN$rc{Tt9XQMt-OMjlg5Gn zdBx|=rYvXX{8A?Xcysg}3JrzHdfq~&M5W@izkmUfx#WFx5g&~D8has0Sijfh-W&*OAqL_ee=3oX* zmY0k`C7O)4xN{RT^GZ_l67!N%fn4^2qWrAX14DH$Npcr&vEeJ~J<~BtBlRpz;=n T4N$N&C)JJxXkIbM79K_b$PYC< diff --git a/project_maintenance/models/__pycache__/maintenance.cpython-36.pyc b/project_maintenance/models/__pycache__/maintenance.cpython-36.pyc deleted file mode 100644 index 1113ea1e1bcbcafe771e14aa6eb2c77a1fb5fec0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1065 zcma)5%Z}496m=5k(HGNBd2~73ENH}l5DSDVjRb5uAkmdKR+MWXqvkPAy2xx{+YjMu zSR#4LieF&Gy=fVxP$3-o=;mDeT-(QfJR0?155LN9He=ser*VuI*ee2HV69nZ2`jUO zojJnExZoCh#lQyVGXqCCSMDcAc*t;Yk#YBo58gW#`ae*Gh1@uCnHukXs@6~$FDpQ; zD`Uxo(!ZOB!2)~r6hSdz0TVV@!U0=wnKy`^;H8XZ$C#GJ#fAt<$6qZHliq zsa9ZuBF7D>THQ>KlrhszO-VIn3TDs|e~D@y>E<5{Pl~d+4ErXKGLJJQrRhtFC$?Er zJe2Z!6R-Cfw;h5cs4CHES*Jy=9Xvk6FFwZFa2jWVH@P~`;=BttnrukZ$;Do*5-aD zt{>x-{fq)MV38Ixm&LlP$A)XfrfV|o2Mu&E-e_QOV_=;dZUr?aSg5f|jg6WL*r>5f zjRVdvTDN+M`)XZN8vZbpmE({{kjYA%0*^AuynxKpA0}5M^8qfn<}%P+9hhryb6`;l z6cj2Kri-C)b4S|GMLOU?K4}h%MX$V1Hm8c%50jiHeiHB=@Z1kEZml$WA;_hJD~G3D zT~@MOgvm>32I+8o*tMnOd5Ir$&yzLJ!^B4st?Qn5GV-I+;&@^52Nz*33`|`*KP7xO z_LH$}&V|Ql*`JzNMGqzZ`L3T1^L`3x`ta+1Fv{{Ye&7S7N!FhxIQM$LDB9H28;%7P zjINB@=rB`Pnrk(+(ejvF-k_MTDd?`rtw9Bhb5=C-oVhl4232Y#I8cQeR=TD%OHfBm zepf8!g7~U*M!?}2R7j@+(WMw*ut*u$c^Vk zv#9bM{{sG`Xv}-NHZ$(bb!?}6Q#ujuMHLPh9+ZAm6T0^C%Jxva{^nGBqW#u8W5CYz z*ITD-K+kJu#;Gx2qI0U#{afu!Kk2;C@QHc)N#zBO1!k=u3fj19h&8+sIno_t>L@h5#!Oac6}HSK zpS`P8y&JE;H313=N74@bEbxINvK_%sMxo#!oixGu<2j#fltAmv0j-yhhkUX!U*#jz zbeXt|*-h$#XT4w~1U7Cgo&9n(t2>p6E>-s$E>5+9HedrCtH=(!hBSEc3iHC#(}XNd zx5DOOh;@A7W~rRL$d7*q|IsEIGrY9P{dd-7>WiJKq9>i&$B~N0(guF)kD`21Kccqn ze6QMeNrk`EQHVPv?xVm~Rv>&C=2?*^c1c<|o`TEeS-OhLCbt(Akot`*Q_>9{Y|@^u zW{Fv38Mhlr)`c$P>tl>>_)G?*?G)nzkbSO-d1Yvuw`iiOut)h*BvdO4g$TY|`t!j&{ zunt>e%6g4;W=#Gox-Vv(g3G~1Ua%Dp5#w0MIfm<~XW|?S8nBEU(?qW-YHP?j9psrc zVj{SOh+3DOx1gZP|DMjwOxKv?M{3%PWUdWF*+|zeJ9i`qiP$k32yqX^q`d$K!Xd9k zVgw}2!%BFkgBCJr&=|z`*brh~a<<$Z`PUVgVqL!jQt4!;s4u#mLBz!W7J)$^4QLD6GkN zODH!nGp{5yFEKAUHNGgdAit=@Pm}2uLlH>-N`@j9AO$9VIq2sXl<4QDPO2Tq&|)BF F008iEGBE%E diff --git a/project_maintenance/report/__pycache__/maintenance_report.cpython-36.pyc b/project_maintenance/report/__pycache__/maintenance_report.cpython-36.pyc deleted file mode 100644 index 87adda01174632129620227203c8cf1ecf32ac57..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1744 zcmb7FOK%%D5avE5%Tnydc2ER8?4bp`sVkw6V-v&>l%hrK1h(1&dm%O=#;-N_W|EyAF=!INOF%IKy*j;=z=e#GB1^!@rfCy`qv*dSL=tW5ce0QygyGx zZg`&N6TbeW0!L@J!ss+lvy~Rwb}AJr*t7LstzW%utI{3Et_`(OBEPb2#ZxBpY_93Z&x?ZF2MVN^!@1P=rbLiUPi|o7@{vn&qu>?G#B}CCUUO(g2hp)Bf(C#aF8@y z;Z2o3lzAJ$xJgB(n;oNALI9##qq4PlTfcPQg#BOfzdlQy36vXM;Cn0Rsgm*I^_=(sA!<62mMuaIo~0oIH7(RO)2%XJwc`NyTWUx_}< zc3txbjbcXFzT0@4IaXcT4*W{VPS{;PymL175qciGstZ8X z0}}7qHl=ww=akwGr7&Ta8J@e8{Lw^4AY@!mlvo%cb4XGu#+40dx-?SZps?+; zG+%usbFMHLd(aHIYLdOz6bfd8XPHcm_3`6Z4=^&!ra_L7#R=bnt?vVAJAU~l(tI~6a&z`*brh~a<<$Z`PUVgVqL!jQt4!;s4u#mLBz!W7J)$^4QLD6GkN zi!C=lB{iqmPm}2uLlH>NN`@j9AO$9V+3V*Ql<4QDEG6 y{p9>2U68DPacNR~K~a8IYI2Ewe0*kJW=VX!UP0w84jZ8Pr8%i~AnS^Om;nHspDXGB diff --git a/sub_project/models/__pycache__/__init__.cpython-36.pyc b/sub_project/models/__pycache__/__init__.cpython-36.pyc deleted file mode 100644 index db5f8344afea4897ccdc78d41178a459529ffb1a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 189 zcmXr!<>l(tI~6aLY6a0WML6DXu)~RfH0ZZV-4t zUJ(#ZX8wZE0Q@ORf-f775@JYJ7bbitcnR8sl>}bu+;QviTjAJxIHDL3^#D@>9`$)J z3xO;!?O7B71|Nbqk8VL|YxGP!ZSN;a&UoI;2lWz+R_lD*l80-yf2$Aw?I)SyqFM6^ zHlc1*As)v`Y$C=)R&mBm%$SwjmJaVQ_S|OWiiubup13L+>j$oLRn$!(g(CJArgtr6 z$umLwg=V_FXDdx6y354NsT7>{>rTL$c}J>mPj=?}HkEagN|5s8yjzBOs~cGjGXN=c znoBiwY`T#;UAA`9HL71!V3WEI>&Ti2``Gtl+5hxf@3f~}jC From 39954327aa6f790be108eda08bb7b664bd8c5098 Mon Sep 17 00:00:00 2001 From: projectsodoo Date: Tue, 22 Dec 2020 14:12:55 +0530 Subject: [PATCH 2/2] Added file --- cor_custom/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cor_custom/__manifest__.py b/cor_custom/__manifest__.py index 8b17674..8079f08 100755 --- a/cor_custom/__manifest__.py +++ b/cor_custom/__manifest__.py @@ -29,7 +29,7 @@ 'views/sale_views.xml', 'views/project_view.xml', 'views/hr_timesheet_templates.xml', - # 'views/analytic_view.xml', + 'views/analytic_view.xml', 'report/project_profitability_report_analysis_views.xml', 'views/views.xml', 'views/templates.xml',