From bb49956693ffda68ee820b3beee9d2a87af9e103 Mon Sep 17 00:00:00 2001
From: Flatlogic Bot <support@flatlogic.com>
Date: Tue, 10 Feb 2026 10:51:03 +0000
Subject: [PATCH] Ver 14.06 overtime still on progress

---
 core/__pycache__/models.cpython-311.pyc       | Bin 14911 -> 14943 bytes
 core/__pycache__/views.cpython-311.pyc        | Bin 55310 -> 55374 bytes
 ...remove_worklog_overtime_priced_and_more.py |  22 ++++++++++++++++++
 ...g_overtime_priced_and_more.cpython-311.pyc | Bin 0 -> 1025 bytes
 core/models.py                                |   2 +-
 core/views.py                                 |   8 +++----
 6 files changed, 27 insertions(+), 5 deletions(-)
 create mode 100644 core/migrations/0014_remove_worklog_overtime_priced_and_more.py
 create mode 100644 core/migrations/__pycache__/0014_remove_worklog_overtime_priced_and_more.cpython-311.pyc

diff --git a/core/__pycache__/models.cpython-311.pyc b/core/__pycache__/models.cpython-311.pyc
index 956a0439c0aae73f96bfd3f4b44d4a9007088ad9..0b0b86d3615b0d31bdd70390f10a6dbb0d899b6b 100644
GIT binary patch
delta 797
zcmY*XUr1A76u;*-ui}`g+3xODH&YjFYuQp)WJIN8klI_4Bsz9i2-CZ+S0N&DWLQ+L
zbwWslD0CJjX}5<ED(ESE$jKyXJ>*MK5F|bJP<`hrR0qBv=l;(5e&^5qUg{rp+qBJ=
z&oS%FyV}z@XS3SjhauT#;owGM$s&b{O%WeCQX4q#Av<f<;o!MuPLYN=MNaW7!p?d`
zQc8!p4jBc<OnJ6g9gJvtPj93v7V1&DqUz~>53g-wshSOkDuejV(GKUaN%{<>=#zaA
z$9DNdaklXPd%B8qE*V$k0ytxQmnD!z|Bb<A(SQHcv!?X1a9UKBL}gi2(v}jVtSrF8
zHEeU<WooO=i<tD4Fz>RfQ5d1ZBe>+sz=$zbu?TPr2P#|glZ?;iw5Xvz3^>bR48K%P
zKmspS9f1jaQ}xt3N*C)05=>IURCRZ?$(=Mgf^mXwf?R?SK^(pA3MO&XE!*!fq8}I>
z&>R$_np)C0=iUU6G!k2H^D+{(ox#`N<hcnN2_E1f&pmj8pFGnrgx9?;Awl#gE=o>J
zdv7+Gy_nN!ERZdTh0bbfG}@&_!m6g2wX&8dn@{`Oa5qW(+iS|_7bc0EG~WAKA&2~M
zvZ&NJ?BC17D~#7PTVGIomf$&NYG&Xy#&-@E4l%;RXNAE?pQ37PY}(O|z_>L|nL&aD
z%mj2{p4@q(b(an~<TLrr_@Q<I9%HI*3tTbZ#IL$`c#FsDV?`HO3e(MvX{s_1*4LN6
zTHgut*cKG6??`TKB8&ygg$#XX5QEc@!G_&qwdP99O`C(6<;^5JWr_s!Gk)gn>tz+9
Nk^S0=VcFBb{{chi=-dDR

delta 762
zcmYjPQAkr^6u#%yrftlW@^1HTZRT7sr`S^0D2+hK3M+b&%+R?zL7dz8n}Z;7kVq7+
z<-x#=$RriaRBkUq5k0i1m(q-2FG3GN4@n^e*+c#3>O%+qkMn=${NK6f<E|xNCN0wz
zi%H<|<=4#~>!QUh!MY|(3(#mImO`~Yu}y&>%<{7pZL%md3#vRQsLGVcEBtI%6xBW`
zwAs;Qo7-`MRpG<(0Gi}hxQbo!S8(7d#RqBZS1w4bkw3}rj;A6l+0z&4NU)x8M8##7
zf}2Va^lH28GVGPS+3r=zyWsgC1(&7ZsuWD0(;6Ip5pH43Il;AxUDr#8xfJUpC?E(C
zq;ba8WE`S&2!Fah!jSg5>^%VDXnBh%%lW*aB_4|5d8Y$LvCw@VGWghi62@`e{miUO
z*3s(>A0cC|qO(Hh+I5a#jG&X?|EZ@vWn7}yqeu^U=`xvioROJ~X0og{?%4y7)#eY3
ziOL93RUE$krOZRnL@<M0-bb*AhRSIez`077F+=n)ewUs2qjJQje~Z2y<Ar=tB6Nkt
zqtOl)3CEeL&&uzN^8Hvl-geozQ8{0=agszPwcoxoV4ysFr^K#xS054K6;9MNn_p0U
zp5Qrd)Xc#foH#gGJirOBm^Y>(F*VM(vt-Cw|2=b>Is*i6al@Z9E>XIq^&LurfpRWi
zihpX~!BfoD?S~us@8GO&g-@8OPn2BaEnK%C!QyIvIJxa~ao`dxVJu)Ze<rytzcCxw
xXI!EC3TlCASiy^j@7C)3>$d8P>Erb#i8`$W<osq~Lm!_IjT~cZT1D`v_z$$+*xLXA

diff --git a/core/__pycache__/views.cpython-311.pyc b/core/__pycache__/views.cpython-311.pyc
index 37788abab175728a99897d6d482925784fc942ed..6cc1e740890d6b6396f0e050551099fd85a3eec1 100644
GIT binary patch
delta 755
zcmX|<ZAepL6vywm*Xi7xySr;-OS73TTP@!vg=C2zG*BeM3Y2Qiu8M+acb7=rv_!B-
ztvnGzCI)GxGq-LAS|lp?DQuGq1If@2K}yo>g^Z%QH>(5Bk8=)(bDsZso-Qvn=cP3F
zH5wHmnO1eRy3ePfon(y`({C1H`tvC4v&CSi(+7IY<$IJK)gTbWFyJz8icoL*!ZLq~
z0)voyp@M=$3^-HpWs|5#Vw2fq9B}2UQyMh{;WoJvSTlZcwSxuS?tIvdGw!pn2UD6I
zV8$!WwGq}qQtC~jH)jWKZxO(XuUe7}d)cVXynIF3+^KA;5P2~hBGTFjS8~4%j~Wwj
z=^%|wmu4*Kz0qzPe{Qo>ri)-RT(&_<YAu~jD<LeISk-Dzw7^1C-T4ZRudc1I+pBmf
zrvJzFj%wD<*9q@hj{p=1``acX$TVd)XU3f!-XcF^2{73rlO1I8=9xTyNvWU73ovCO
zQx;^(=b3W9v%$}l2be~YY5YnM`a<&KABG5`h&)EFOTlsSvrIwJSs6=;)Ze9RarWUV
zn9w)$jcVd!@rKHP`)C6Ohi^r@lr{Q)D*CtJU9|y+?rD`kbbQ}M@X<KwG2jbND#YWO
z#}rAs!fq3+?hb`##^dm{Qb$@CJUsFQe~fe~7AObH;<ZP;>bKIHK9iQ?)RW!ZR-t&b
z9kzwS30;gxn}f7<p0++X5umd~I?GRI;fl9Xn^|BaXN{(UT*d4mD99B~`xYr!!JM&l
zSQTo=t^=$IKcBuK;R7y?Cx*Y523T}BI%P!DM6r~tn=r$=&@=Hk970$$wGzK1RV*kS
zY>l07sITDiC5@a>%5iqt`-COaCt*YIP6yTS3op;bLKqIr<%fgxV>l2(a~TSwtb$vW
Vu_j|(#)b^Q17aK)g;H^h`VGMH02lxO

delta 714
zcmX|<dq`7p6vuzRd!3tekGpFte5~nk&a38wVUIsj0v}LVLj55TOzF;8AZ~XnD(`%h
z&>udSov0)$>kk9-*)NG!Q7VWaES1qrdRP=>NzMo)2<cw54*Wixb2#Vl{lYIaLU)eP
z+WT6q8cFdnrp+acY8fvsAv?XP7$Ye5-B9!Df%rZOp$8NM3e6<rOc9MK;ymZ1u^Q&Q
zHaIRCfEFhe>AaP<!i-oNpK(EpkUved@HR;HUsh&r?Z4b(hKA>Q;HLDnmFFO@*$5l{
z!#E2n8f&l(h8yc}Hkg_s%IvKTPn_A9!)rDxS)?5PTz(hHYu<;Ixvfad=(R(O)&fiW
z8Mxar$>sIv{C1ybb5y2?_<YgcM@tr@w;4wfR{$Ls9hNeVTGZ5^bqYRLozvks<y+MM
zuiS#`q?0Gir6ZVBx4ux~L`ZFaQ#fs%Ww|-FGR#&+*s6K9YSvXh%T~>??l9|)uub!9
zQxu^C)In+up@c)!FPWsIqc#P<2G6}52&v5Aex?US|2J%bX#a0o^rb+T+6cQDBWxeI
z#`27)awPl{E2?_8!CH4Z)&2)Q4V2?l$Qn$GGl(%a5zpSDq4$Xi-l_}~mjJDUkMJ?r
zJJhKVsxd+^Gt{I0EG17R=UzSW4Bx@VrL5e5GR)W(m>t(OS2SI^tGa*=xY1g@y)2oU
zN=_?Bim75;j>zrNcQpPA;#fXjCWB)Ej8{m}<M$N)0j6Mj?04xfXMol5B&Z2iNX_A3
zCXSMY;KNwF3T@-d<`2@uqN;{J?eLv<JB3ook&q<y1c#jc1eiF1*GY6D5|1}vI+TKG
o_!26OMbdW@5Xpa4ph%L{3(GQAWJG1G%RtZ&HsM6l9Ui0q0yJIjr~m)}

diff --git a/core/migrations/0014_remove_worklog_overtime_priced_and_more.py b/core/migrations/0014_remove_worklog_overtime_priced_and_more.py
new file mode 100644
index 0000000..aa15a6b
--- /dev/null
+++ b/core/migrations/0014_remove_worklog_overtime_priced_and_more.py
@@ -0,0 +1,22 @@
+# Generated by Django 5.2.7 on 2026-02-10 10:28
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0013_worklog_overtime_worklog_overtime_priced'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='worklog',
+            name='overtime_priced',
+        ),
+        migrations.AddField(
+            model_name='worklog',
+            name='overtime_paid_to',
+            field=models.ManyToManyField(blank=True, related_name='overtime_paid_logs', to='core.worker'),
+        ),
+    ]
diff --git a/core/migrations/__pycache__/0014_remove_worklog_overtime_priced_and_more.cpython-311.pyc b/core/migrations/__pycache__/0014_remove_worklog_overtime_priced_and_more.cpython-311.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..c8a35bd8732e225de1d31a8425aff4a597896374
GIT binary patch
literal 1025
zcmZ`%zi-n(6uz?^$97V+SV#;l6ahl@KwSi5g+vD`A=&||4rVyHxg&MzAK~l(VamXO
z#L}(*K>@XYOpr2Ew=%K0YNt-TyVR+o!rAxvy?fu?eeXSgpP6wG3~GIg)-{BFOQ#yO
zOXF-6i~~dw#W6~7fD<jyFw)REqS_Zkb%r~7wdoM7qlp*j)Odru+8-JAG~pysn}<b|
zrMWPZjIuayRXgQZiGlCg0N?;I6kv)1jp8;AbPX}1Q;CABseWu6g6Jcd<DnR4<pHAx
zEA@^wSutsyTF3UZ$YW>PZ)<@~8z8$W?2Sq<h&NgpXX4Sy%Ht>GW5)O5tWB~Hj2BVD
zt}k?X)M8ZBFPUO?LLEm`HDm=y8YWB_3g@m!VMIxhZ3%aJ2`<e)H>8qfc{1akE^0e*
znC^)tXK`3CIzCV<GEe6XNS!wUMD1O~V!G)$!Xk=6h;RsjCiG$kc9W3zy)c$Cq(@no
zrIe+uh~-@NQ#4+)1hl-6#|Y~=rOM)ljLmL@X@4t|IF376mt8jcCprTPx*+~;mN37!
z(@Tq<&pxqMugJJBv&g$)i}^As|LO<vq0mnWSC{^;yd+F1qyWX}_PK1l0%_!ZfWhP`
zO=Pd(QrB*pgIA@4?8UFn$hvcK>+Z>odu2_xol^vGE}^uLy&%K$Dt!OMUD|&*a+iJ-
z!?o?<+uflX{c@v`8<llK?gKcNP&ORb9K4hdU#PTfdWNuRCrsPfGTl*?R3#g$otHGl
zy$#ldwK{IcGrkBehM8{zlsd*3GQi#tEnR<0a}Jv&x(@r!XzszO44nTXs_y*@{o@ts

literal 0
HcmV?d00001

diff --git a/core/models.py b/core/models.py
index aafdec0..96b9e07 100644
--- a/core/models.py
+++ b/core/models.py
@@ -90,7 +90,7 @@ class WorkLog(models.Model):
     notes = models.TextField(blank=True)
     
     overtime = models.DecimalField(max_digits=3, decimal_places=2, default=0, choices=OT_CHOICES)
-    overtime_priced = models.BooleanField(default=False)
+    overtime_paid_to = models.ManyToManyField(Worker, blank=True, related_name='overtime_paid_logs')
 
     class Meta:
         verbose_name = "Work Log / Attendance"
diff --git a/core/views.py b/core/views.py
index ba04e9f..b7b3dd9 100644
--- a/core/views.py
+++ b/core/views.py
@@ -662,8 +662,8 @@ def payroll_dashboard(request):
         log_count = unpaid_logs.count()
         log_amount = log_count * worker.day_rate
 
-        # Overtime Logic (Step 5)
-        ot_logs = worker.work_logs.filter(overtime__gt=0, overtime_priced=False).exclude(paid_in__worker=worker).select_related('project')
+        # Overtime Logic (Updated: Check M2M field)
+        ot_logs = worker.work_logs.filter(overtime__gt=0).exclude(overtime_paid_to=worker).exclude(paid_in__worker=worker).select_related('project')
         ot_data_worker = []
         ot_hours_unpriced = Decimal('0.0')
 
@@ -986,8 +986,8 @@ def price_overtime(request):
                 )
                 created += 1
                 
-                worklog.overtime_priced = True
-                worklog.save()
+                # Updated: Use M2M field
+                worklog.overtime_paid_to.add(worker)
                 
         except (WorkLog.DoesNotExist, Worker.DoesNotExist, Exception):
             continue