From aceb4750eb5deea70bcd9d22aef91c9546fed55f Mon Sep 17 00:00:00 2001
From: sonal arora <sonal.arora@apagen.com>
Date: Mon, 28 Sep 2020 10:41:47 +0530
Subject: [PATCH] work on project

---
 mks_delivery/models/project_task.py              |   5 +++++
 mks_delivery/views/project_task_view.xml         |   1 +
 sale_field_service_task/__manifest__.py          |   2 +-
 .../__pycache__/__init__.cpython-36.pyc          | Bin 0 -> 196 bytes
 .../models/__pycache__/__init__.cpython-36.pyc   | Bin 0 -> 234 bytes
 .../models/__pycache__/res_config.cpython-36.pyc | Bin 0 -> 795 bytes
 .../models/__pycache__/sale.cpython-36.pyc       | Bin 0 -> 2255 bytes
 7 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 sale_field_service_task/__pycache__/__init__.cpython-36.pyc
 create mode 100644 sale_field_service_task/models/__pycache__/__init__.cpython-36.pyc
 create mode 100644 sale_field_service_task/models/__pycache__/res_config.cpython-36.pyc
 create mode 100644 sale_field_service_task/models/__pycache__/sale.cpython-36.pyc

diff --git a/mks_delivery/models/project_task.py b/mks_delivery/models/project_task.py
index 5c5f0a5..79b2f47 100644
--- a/mks_delivery/models/project_task.py
+++ b/mks_delivery/models/project_task.py
@@ -17,6 +17,7 @@ class project_task(models.Model):
         ('unassigned', 'Unassigned'),
         ('assigned','Assigned'),('accepted','Accepted'),
         ('started','Started'),('delivered','Delivered'),
+        ('collected','Collected'),
         ('cancel','Cancel'),('issue','Issue'),
         ('paid','Paid'),('non_paid','Non Paid'),
         ], string='Status', readonly=True, copy=False, default='unassigned')
@@ -38,6 +39,10 @@ class project_task(models.Model):
     def action_delivery(self):
         self.state = 'delivered'
         return True
+
+    def action_collect(self):
+        self.state = 'collected'
+        return True
     
     def action_cancel(self):
         self.state = 'cancel'
diff --git a/mks_delivery/views/project_task_view.xml b/mks_delivery/views/project_task_view.xml
index 8a81d8d..1c92791 100644
--- a/mks_delivery/views/project_task_view.xml
+++ b/mks_delivery/views/project_task_view.xml
@@ -11,6 +11,7 @@
 				    <button name="action_accept" type="object"  string="Accept" states="assigned" class="oe_highlight"  />
 				    <button name="action_start" type="object"  string="Start" states="accepted,issue" class="oe_highlight"  />
 				    <button name="action_delivery" type="object"  string="Delivered" states="started" class="oe_highlight"  />
+                    <button name="action_collect" type="object"  string="Collected" states="started" class="oe_highlight"  />
 				    <button name="action_cancel" type="object"  string="Cancel" states="started,issue" class="oe_highlight"  />
 				    <button name="action_issue" type="object"  string="Issue" states="started" class="oe_highlight"  />
 				    
diff --git a/sale_field_service_task/__manifest__.py b/sale_field_service_task/__manifest__.py
index c3ecdf5..b6c46ae 100644
--- a/sale_field_service_task/__manifest__.py
+++ b/sale_field_service_task/__manifest__.py
@@ -24,7 +24,7 @@
     'depends': ['sale_management','industry_fsm','project'],
     'data': [
         'views/res_config_views.xml',
-        'views/sale_view.xml',
+        # 'views/sale_view.xml',
         ],
     'demo': [],
     'test': [],
diff --git a/sale_field_service_task/__pycache__/__init__.cpython-36.pyc b/sale_field_service_task/__pycache__/__init__.cpython-36.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..aab7f5597feb2d57a692ce52e50ffac67cfe31b7
GIT binary patch
literal 196
zcmYj~F$%&!5JhLBhy(&&BaMru74ZZX+Sv?ib~H;i*{~ZGPh#Z(Jc~C-YvmQJ98)>)
z-~YuQewHNh^FGI$0C>UQMVwcxFkxuW!a^l>LV%98kPhD5hg5W<%4xD;okkt_-_Ha5
zkgdmOBMVoNRE;`PEicZOp;0+Wr=9CD%Vg^n?p0n=tz}S_@L<Sl4CK!yCu~(HC8DWK
Ti#Tnr-FU&1CritiX95ep@0~O?

literal 0
HcmV?d00001

diff --git a/sale_field_service_task/models/__pycache__/__init__.cpython-36.pyc b/sale_field_service_task/models/__pycache__/__init__.cpython-36.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..c2fcf6e358ef137d1aee73dce51ddb052e3739eb
GIT binary patch
literal 234
zcmYj~F|NWe42GQ+BtUQjF3^SO!HN(kU}1vA3XS1KO`9qyAP&O;Shxr`=*q+um~fb|
z<WHY1+5c=b8a%F3ybFLQ{8Yle<PKwo1}!X<Vk<=Sggx0N?CBb^&Wmp$6YaoLz}!`P
zbKt2Hl%-Xcw&3G0pE7RXyU`=w8~N`_lB!k*s^r=EBGf7;>9liS{LN(J74B4CP^D%3
qhkHX-V<3MrIbowhAxo#p28n1Y(;!ajOWT|C@@Q$%=b#YdhvEZ9r9J2X

literal 0
HcmV?d00001

diff --git a/sale_field_service_task/models/__pycache__/res_config.cpython-36.pyc b/sale_field_service_task/models/__pycache__/res_config.cpython-36.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..b8407cc4c592ea0c9e553678f2fc9f3e9cf7a878
GIT binary patch
literal 795
zcmbu7zjD+t5XNQ8|8Q~%A<)xaa~_g5!(@h;P$k0<DpP2LwYm7tmW<?txwO#c5%K^$
z3vZy7idUdw*Y*Jg9h%wCt55c>^plTgv;5n`kq9_r-`QUy!u%A&ouDYDf`+w08MI*;
zw!Gv4d(Bj+_!p))1gq#XFJp8f6{8cQlc1BT<dV(PA6S9SxldZ7pm9FAs-aQNbJ^7u
zt!+n)$ti|=jsmO<6e~j&lpLZ}Ox>vdJuj27uFv0sdu7^A>doDb1-GcC$$n?e3aWlF
zJ$?FSG|uLsPh4+nz4Vy{sf=zm7xUC-LTK575Iz?I_j%J$zAMDX8`(@NnW*(O*t)j}
zi}~yv`yLq$KA+l%T76}99~TGt`M$U|EflhoOVGt9W7n>e6%<ApGsuhMqPJ3fkkuNr
zDxAcw103PN-qsa}Ub=NLax3tJqB8obUM{+gC0H{IM>mxPQ8+mN#q(g`NewQc?~#$a
zI~=hNP2JXfHgU%DZV6+0W)s{A-g9c9kv%Az;oPPuNZ3B2NlvmuvP(i7Egiz{k^Ck%
zW{=4`Ksm(tb4+qB=9!NOqYde$p$>8I@j3lt0}8+Q&PwfS(EVuAhyUu~vy<`0U()u5
JMo;;Z<QKYu#f1O>

literal 0
HcmV?d00001

diff --git a/sale_field_service_task/models/__pycache__/sale.cpython-36.pyc b/sale_field_service_task/models/__pycache__/sale.cpython-36.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..5b89cf0d606634812dcdb3978536cfa36a76e6e8
GIT binary patch
literal 2255
zcmb7G-HzKt6rQoij^kv1D2ujL`Eg5Cno65Mi;A?WDkMtbrYoctkSw8*>zQnwI<`CG
zY`a!+Ln`$Oo&X+zXW<RzmMdO?E6y2bySsEz!O<MgocTHPouALSxwaPm{_72Xy-Ua+
z<ix|E|2Z_h3qlY<b26ndojS2Ibz^tRVn$K#<lfYeeM-I}!WHZV5lqraXX(a)@E(wX
z|0nDx17`ebDP*pVKh9(>v~iOvGn5ag+4wHWGm+F;S$wHfsZ!i=^mwa|{u(-x#8i;j
z5j1usn|Q)Oo5K6ajeX&Z&I=NEL?F8G4qlQm6`|<82;#2ji#5=NF9{=Y4{o(?LY?H2
zmr6+0*#5BX_bXLSWLgjFL_cZXzK55M9!PbNrBX)^L3wZB7+=>aEA|ab%jz(tt2^Rd
zJJ7y>rhf)8ClfNEdaHJ7SI{N=ex$8VU2WeJR$UX$f{KlW^ZZlLd3VVV*B9>Gsr|V-
z=}dwp6~Q*KqwbP!6VZjnw#jE?;XJ+dJ=zGMh3Wt$ocCNf(CgVo=Z*+}@fU2)0QKfx
zbL*QHUbGXPf@YCLMOjB_S&Xy&nUW#`S5#8vhtZ{bjlWmcQtvk2?MG^Kr`g^)`)Rsh
zK+Mv5H)=w=v|aB;pkUF{`f%VIRwPqt!YWa9Ar;SrIalRLQAoid4J3ag_p`!mp3=!e
zz>fCvxT7bePE}T6)-=8La;>S$CkAI<a;N#|&1>4jKK_pjk5TXb-yO$Z8uU$=meVRJ
z4gsQChYV6a3QR2H0P4^tDbKS)8W(cVx&+;g>qA_%0Y0*dSvlq4Zq-9=X#Hw84?M%P
z%*Xb4;}sZI!|aLdAj$P_L|ud}e|<Z8Tu$XEsgiwJjGmS1iLR1Vj!IFMR(x`ERI7wP
zO426~oRO_3TiaZ><-)OqMs3;K>0xzfwpNqc&T_CglX?pb>i0nq8qmITjxvYQK6U6d
z%IGFE2K~TkJ~%Gg;aTUT4xRyz3l00W65oXmR0D9>1*pb3RN=yzI}@l9?g|I$!rg05
zmHk7YD_0f=#!r=mgj8?A38sT^z|R9$ZR5CS$1Q+(^C&e}i?nrOE6~1qhgV8M#!Glx
zg0c9o!IZ`j6Mz}eCOQG|%nh%&1`!@LeFX+JsexOTfNMz>$TBXxkqOw`SyD>o6p+$A
z2*0OiP}T~W%B&|TRuH#UucqofP^!xyj!?QvYIO+})O0yd^F(XTkAW$)y#q}LAP8Lt
z7$I#goB(p##A^s_jF8<iMiYuWi5P@)VTD7uZN${w)d~hHfc3}DK15Uaw+Td(L9YWn
zL>cTgSF%FPpg<1!SWky1UCvk60lh-vRuPEi!+&3YkjZC!T&k&IR(hy_?-)1+v%yoC
zxCZ<*HVo25z?UwmDk*H%9J$eNty*LMOpVRejjSQepPO)??t>t73!KTE^XSrxue<cs
z4q%RebEH+yO~^SE-3&f&-1IqrI!p4^Ou)0^u~b>DFm+6DADHGw2^<{3@HqB1rfP^w
z)>a`;Wu6~}9qC~})m7YsxotCP4LTYbD}eh3G;o8h!0Y>VZg0>v40%IgO<LOu|6jDc
qwt+K4`8<`D%(bOF<K4%<3wHYnf1zn>(*(C$jCYXrG@f=InB#9(KUkmu

literal 0
HcmV?d00001