From 473d4035f8905911ed2b0daabb9638e781aa8f93 Mon Sep 17 00:00:00 2001
From: emile <e.emile@ositcom.netm>
Date: Thu, 2 May 2024 21:40:19 +0300
Subject: [PATCH] new

---
 .DS_Store                                     | Bin 8196 -> 8196 bytes
 osinaweb/.DS_Store                            | Bin 10244 -> 10244 bytes
 .../add_templates/customer-add-ticket.html    |   2 +-
 osinaweb/osinacore/.DS_Store                  | Bin 10244 -> 10244 bytes
 .../__pycache__/views.cpython-310.pyc         | Bin 18194 -> 18194 bytes
 .../add/__pycache__/views.cpython-310.pyc     | Bin 13201 -> 13195 bytes
 osinaweb/osinacore/add/views.py               |  10 ++++++----
 osinaweb/osinacore/templates/.DS_Store        | Bin 10244 -> 10244 bytes
 .../templates/add_templates/add-ticket.html   |   2 +-
 osinaweb/static/.DS_Store                     | Bin 8196 -> 10244 bytes
 10 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index 23213aae765ac91ada6578420413b52c4d5f5112..9aa77fe27c44826d04b1715e54b74b9a0d4f67e1 100644
GIT binary patch
delta 159
zcmZp1XmQxEMv(FB<h6ootP+w^k}{KT2;Py77vL|>$S?Oy&d&=dN-fJwEsw|qvV$|L
zQYW7mvXE4Eh&#Xl0-Pav`FW|F$_@cwF2iJTVMR+xMkPjVMiWL`MtepNMo-2l#$?76
m#!SX6h#DqF2+bf1rJ)pK@#K8r9ZU=klWk>`H;0R?<puytz9P;5

delta 146
zcmZp1XmQxEMv(E)<h6ootfCT<QWBGI2;Py7$V|@93(l-cjThiA&d4wK1abq4Qp++^
z%O{@~vJl`5$;;16Rdxtq00Yj+3c`x!0*p$G+KeWQwv6_S9*mxhQH;@y35=N#B}|ME
bnn4CiLn+3r$yLHTHmmbIVBX9w@s}L{Z;K%@

diff --git a/osinaweb/.DS_Store b/osinaweb/.DS_Store
index c0ed0a8f3da12399b46095d65da909df015783a1..0627f6a24149463146e3d8edc3e7d19acdb2acdc 100644
GIT binary patch
delta 141
zcmZn(XbITxU7Sf$X0ojC9qD)h{^E@Ma?j-aynv$Avdq--h)f_mII}8s@&^ekaRvzB
z49UySOXXB{2!QY>J4z}_N-`=jYBQQJ+A`WRdN6u2MlmKcrZ8qQW=)<iqP%&YWHaOB
kba9W(nbL0<CufMeZ=NF?&BZGz6E7f~l$e~IUX))705t|DF#rGn

delta 48
zcmZn(XbITxU3{~&@N&k@^CX)YIgAWUbQBEDO(y4yJ8aIBe#1DqO~`%o9NB2D$<o5S
E0HY8O@&Et;

diff --git a/osinaweb/customercore/templates/add_templates/customer-add-ticket.html b/osinaweb/customercore/templates/add_templates/customer-add-ticket.html
index 3faf869d..ba209b93 100644
--- a/osinaweb/customercore/templates/add_templates/customer-add-ticket.html
+++ b/osinaweb/customercore/templates/add_templates/customer-add-ticket.html
@@ -34,7 +34,7 @@
                     <option value="" selected disabled>Select Project</option>
                     {% else %}
                     {% for customer_project in customer_projects %}
-                    <option value="{{customer_project.id}}">{{customer_project.title}}</option>
+                    <option value="{{customer_project.id}}">{{customer_project.name}}</option>
                     {% endfor %}
                     {% endif %}
                 </select>
diff --git a/osinaweb/osinacore/.DS_Store b/osinaweb/osinacore/.DS_Store
index 27b45a181055b10775e9a2ab25bffa865907c116..f3099d358d9658824fc49b015261dedc7f603076 100644
GIT binary patch
delta 193
zcmZn(XbITREk5~%pvUCP;&O~<Cw~%GV-=N@l9rq-D{)6UA~QKZFF3O*HC}+fI3vH@
z6UYrHN-fJwEuSnRslk{z*;Z0QfHNd7KQC3;A%Fo4I49>xDq0FKDluv^nlRcj+B14E
z1~LXQCNrimW-=B*6frSEXa-p*4W$^1Ctna3+x$RMoo!+R_hxp57Iv8HgwG}w<YX3?
R7#Q3a5MX3tW?^Mx2LQI|E_?t0

delta 219
zcmZn(XbITREzV(NV4|a7Xl^q3fuO_W%i?m3Hzt1)S7Viwl9rO4EGuzGI$nUkI3vH@
zGdVvmpeVI0GqpS-6UYwEtV*3MBB{Y>JlR%KLQ>hml>rPmL-O+TQaP0!0wDa!sgjD;
zl8j1>+KeWQwv6_S9*lvEL5#_aIgGiCMU2G|RZNT!nn4aqLn+3Z$rr@MHeZ!gXWPuK
d(87-4T;Ur@1v#0;B?bof1q2wGm|0la*a3&jF^2#E

diff --git a/osinaweb/osinacore/__pycache__/views.cpython-310.pyc b/osinaweb/osinacore/__pycache__/views.cpython-310.pyc
index bba184c9f78c635bf1846c0192976e761ccd51a2..6410f0109a47b5eebb27d35dc287cf3d1118d417 100644
GIT binary patch
delta 22
ccmbQ#$2h5vkvpH4mx}=i?5qqoa<jVw06l~RlmGw#

delta 22
ccmbQ#$2h5vkvpH4mx}=i-1q5k<YspV06@_N9{>OV

diff --git a/osinaweb/osinacore/add/__pycache__/views.cpython-310.pyc b/osinaweb/osinacore/add/__pycache__/views.cpython-310.pyc
index dff5a80753b314ff0dc369d339eeef24408a88c4..5b0c88301d271379e8caa1566bd9f71d5b06b749 100644
GIT binary patch
delta 495
zcmYk2F-rqM5QTSQa=Gl?ZQ@-LPi=)r(8Q2V1PfD$g++pu2qKHZiHhbr=g?kK$hLxa
z2wGT$RF+~X8X;Jww(&<eF~PXY4D)8*2eW&9aCIO~EQ>QbU;XO7-Dr!aqDYf8Db^^O
zm+G^)dC`$9&?u6~JRTY{6~WoE&wOpHCA4CJE_sj|^$hZCktZ?Mza9<sW*s%p^epn5
zLF(8YIV>WMh!A7_OC&D{IsA|KX(=!^vZW&!RT-*Ms9_Ry>SX-M(2kg#Z1I3251ohs
z^Rvi_9Z&66JTTB0PN|;@^U{f+#&*oW^rw)cDXUp}n}ycUbb9N%GKbuomibn!!EgfO
zv`j)y-NXao&mfa7icW3e0bo{rFE-RhX&ch&zBI4;rM-eT_}`cd0y4lMPS=F&U)Dhz
zYPDBhhi>PwTmX1gy`@!nQ%<F5d=P&2GDz>LD_pf(v7xP+l``}?ca=IA-NCFkNOS7h
Mc9c^+pI8y_12VLJ+yDRo

delta 502
zcmYL_Jx?1!5QcY*Ioo@;dxvd|A#@-GSzu$OOG81Vqyh<2ArMNm2jV0<#%zN!D}F%a
z0&PJ<BwrCxP@u>aO%z0%@R7((ehUS2;K)0g*_nBtS?%tZ-Q!*PNeIqpz5P+!`MLI8
zURGp4rANL@e$cZ0%F5BXV#XoQAd7g{Rk;{URx|BjRzW9aa*7*1(A*f>tE7z%>nFxR
zC-NdetY>($G*AW6A<=SJKhYV?ME-yJNC!${YJm7L46=YSjt*upN1ZX9?-pXF#yZ@%
z=yr=S1E$B(rP-mH@1%`~-m^;mQg=cXVtB*0JR@`&T@<QFPm(B~nf((zGpXp9XiAkj
zsda`Un5N5&s)^II@%0O2s*HZ`{rnlgw0&4u=ea!{Hn#O)E3_-sO$h9Hb<Y1MRM`5^
z){U^KxA&C&Tm3k*lYDim3=#t1kS6oUl30W+ILU4|YwzH`_pSC4;FtZqxCA#=)GO{E
s8f{-E;m+R5vfZfX;leiRHR$)g*4MzjPqcm#X6;qJV8yG?Bd;Yq0)O;_)Bpeg

diff --git a/osinaweb/osinacore/add/views.py b/osinaweb/osinacore/add/views.py
index f6c01766..7d058a00 100644
--- a/osinaweb/osinacore/add/views.py
+++ b/osinaweb/osinacore/add/views.py
@@ -634,16 +634,18 @@ def add_ticket(request, customer_id):
     if request.method == 'POST':
         project = None
         product = None
-        department_id = request.POST.get('department')
-        department = get_object_or_404(Department, id=department_id)
+        if request.POST.get('department'):
+            department = get_object_or_404(Department, id=request.POST.get('department'))
         regarding = 'General/Account/Billing'
         if request.POST.get('project'):
             project = get_object_or_404(Project, id=request.POST.get('project'))
-            department = project.project_type.department
+            if not department:
+                department = project.project_type.department
             regarding = 'Project/Product'
         elif request.POST.get('product'):
             product = get_object_or_404(Item, id=request.POST.get('product'))
-            department = product.item_type.department
+            if not department:
+                department = project.project_type.department
             regarding = 'Project/Product'
         ticket = Ticket(
             status = 'Open',
diff --git a/osinaweb/osinacore/templates/.DS_Store b/osinaweb/osinacore/templates/.DS_Store
index 97587ba848d2cb17300fce9e39f845cc2f0bf517..8e010a73422d471530a778fba479e8ebd04dc16c 100644
GIT binary patch
delta 360
zcmZn(XbG6$&#1dGU^hRb?q(hVHx7LnhE#@JhD3%;h8zZ6hGd3(hCGHeAg>54S^{K&
zM06R7f$H)YN+#P&OG^J_U|_8K4+ab%z>hFvl8DIUJOO^`bf6MG+)7pmG_V_*nCU1O
z8Bf+1bmT@e!C4~KToLGue4sPZfn*8L0R=!u76V~9STqHfV<&GAk+Na}S&!^ONrHyK
i{I_08!hq>2nsyQV+9$7<l4X3id8))|md)%6f7t=S>R&Pd

delta 37
tcmZn(XbG6$&#1OBU^hRb+GZXBH;&1FCH*$LOCMm_*sz>wGrPiHb^!N+4MqR}

diff --git a/osinaweb/osinacore/templates/add_templates/add-ticket.html b/osinaweb/osinacore/templates/add_templates/add-ticket.html
index 04be705d..75995a4c 100644
--- a/osinaweb/osinacore/templates/add_templates/add-ticket.html
+++ b/osinaweb/osinacore/templates/add_templates/add-ticket.html
@@ -35,7 +35,7 @@
                     <option value="" selected disabled>Select Project</option>
                     {% else %}
                     {% for customer_project in customer_projects %}
-                    <option value="{{customer_project.id}}">{{customer_project.title}}</option>
+                    <option value="{{customer_project.id}}">{{customer_project.name}}</option>
                     {% endfor %}
                     {% endif %}
                 </select>
diff --git a/osinaweb/static/.DS_Store b/osinaweb/static/.DS_Store
index 78a96fb50e57a3a9dcf6bca2b0734f22c90f0ad2..3acd28f0cc113f97929a59717f0fbcaf5ce4e132 100644
GIT binary patch
delta 456
zcmZp1XbF&DU|?W$DortDU{C-uIe-{M3-C-V6q~50$SA)tU^hRb{AM13Eo_skh0EAY
z%ybltj14FM5O%O(V#s1B&P*;VNXp4i0-AF+sURn_xWvHVzJLHD6Eh1d8#@Ol7dH<t
zAHRU0kg%YLps1*rxP+*rl(gjJGLbsLcme+6<f8nXoPhk|%#zIfyvd(Ml!Y)vBPNT9
zMzSb7q$f<y5|ygY&r4Ny2mrbg2snXG)@E>I@MQ>N$Y!Wwn8+}fVI{+Eh7$~T8QwGe
zWn^a*U{qq%W;9{6WwdAXU<_moVoYXCVa#MKf*8QW2%#Bdp){0YECw>b9?VHM3{K9^
zEr3XvF-@KzUcRwGmQ9cuBBH<zq+LN_wz2R#^JIRRKoKTLNNRu-0L?c5(US{gdN(tQ
L?q{TSFnR+3YSLSB

delta 202
zcmZn(XmOBWU|?W$DortDU;r^WfEYvza8E20o2aMAD7P_SH$S7?W*&hpY>e9{9~3K8
z6R)l|&`~fpG^y25s5Ue(vD8s8Gcv5L<>U}m*0&Cd&(6us%kP~0P(YrsYjU(?zaTTv
oKp>Fd1`@6yvo{ugXP(Tj63D>_v5{eNJkQk4e?<;6l4nH^04pvs2mk;8