From f7db2aebc9e33092ba034f50b3de01e40f6cdca2 Mon Sep 17 00:00:00 2001
From: Deena <deenalaura.m@sosaley.in>
Date: Wed, 6 Aug 2025 10:49:58 +0530
Subject: [PATCH 1/3] Reference for #6

---
 .../sos_inside_sales_leads.cpython-310.pyc    | Bin 6985 -> 6985 bytes
 .../views/sos_inside_sales_leads_view.xml     |   2 +-
 .../models/__pycache__/sos_ir.cpython-310.pyc | Bin 13263 -> 13254 bytes
 sos_inventory/security/ir.model.access.csv    |   1 +
 sos_marketing/models/sos_marketing_leads.py   |  17 ++++
 .../views/sos_marketing_leads_view.xml        |  20 ++++
 .../sos_proposal_boq.cpython-310.pyc          | Bin 52165 -> 51648 bytes
 ...posal_customer_requirement.cpython-310.pyc | Bin 7506 -> 7583 bytes
 sos_sales/models/sos_proposal_boq.py          |  68 ++++++++-----
 .../sos_proposal_customer_requirement.py      |   2 +
 sos_sales/views/sos_proposal_boq_view.xml     |  89 +++++++++---------
 ...sos_proposal_customer_requirement_view.xml |   1 +
 sos_sales/views/sos_sales_leads_view.xml      |   2 +-
 13 files changed, 131 insertions(+), 71 deletions(-)

diff --git a/sos_inside_sales/models/__pycache__/sos_inside_sales_leads.cpython-310.pyc b/sos_inside_sales/models/__pycache__/sos_inside_sales_leads.cpython-310.pyc
index b37697ba8d87736ac4e6ef315ccfc81f65fa78eb..900f94156bf951eb8fbe1a6d895d06eadb0e1b05 100644
GIT binary patch
delta 20
acmX?UcG8SHpO=@50SFeapSY3RP8t9`Y6X=5

delta 20
acmX?UcG8SHpO=@50SNfn`!;ghNdo{iUj$YF

diff --git a/sos_inside_sales/views/sos_inside_sales_leads_view.xml b/sos_inside_sales/views/sos_inside_sales_leads_view.xml
index 0e8622e..19d706a 100755
--- a/sos_inside_sales/views/sos_inside_sales_leads_view.xml
+++ b/sos_inside_sales/views/sos_inside_sales_leads_view.xml
@@ -11,7 +11,7 @@
                   <field name="location"/>
                   <field name="products_interested" string="Products" widget="many2many_tags" options="{'color_field': 'color'}"/>
                   <field name="project_name"/>
-                 <field name="lead_generated_by"/>
+                <field name="lead_generated_by" string="Lead Generated By"/>
                  <!-- <field name="entry_date" string="Lead Generated On"/> -->
                 <field name="move_div_display" widget="boolean_toggle" readonly="1"/>
             </tree>
diff --git a/sos_inventory/models/__pycache__/sos_ir.cpython-310.pyc b/sos_inventory/models/__pycache__/sos_ir.cpython-310.pyc
index 1310398db536acf9f77ff15f8cb41ef9d9948a83..b1577ced1ff0889b998025119dafae45556ccc4f 100644
GIT binary patch
delta 43
xcmX?~ek`3gpO=@50SFE>PRO{nk#_?-KfiBcNorAMVotGwPi9`~=Bw<#v;je&52OG9

delta 52
zcmX?>em<QypO=@50SLY{Ovt#uk#_^TgoJZ`Zb5!tYF<gPLRx;2f^T9;YEfol&gL`h
GzqA46yAyi=

diff --git a/sos_inventory/security/ir.model.access.csv b/sos_inventory/security/ir.model.access.csv
index f5dd6d4..519f887 100755
--- a/sos_inventory/security/ir.model.access.csv
+++ b/sos_inventory/security/ir.model.access.csv
@@ -55,6 +55,7 @@ access_ir_act_window_sales_user,Access Action Window for Sales Users,base.model_
 access_ir_act_window_healthcare_user,Access Action Window for Health Care Users,base.model_ir_actions_act_window,sos_inventory.sos_healthcare_user,1,0,0,0
 access_ir_act_window_sos_inside_sales_user,Access Action Window for Inside sales Users,base.model_ir_actions_act_window,sos_inventory.sos_inside_sales_user,1,0,0,0
 access_ir_act_window_hr_user,Access Action Window for Human Care Resources Users,base.model_ir_actions_act_window,sos_inventory.sos_hr_user,1,0,0,0
+access_ir_act_window_sos_marketing_user,Access Action Window for Marketing Users,base.model_ir_actions_act_window,sos_inventory.sos_marketing_user,1,0,0,0
 access_sos_return_fir,sos_return_fir access,model_sos_return_fir,base.group_user,1,1,1,1
 access_sos_return_fir_line,sos_return_fir_line access,model_sos_return_fir_line,base.group_user,1,1,1,1
 access_sos_return_calibration_devices_fir,sos_return_calibration_devices_fir access,model_sos_return_calibration_devices_fir,base.group_user,1,1,1,1
diff --git a/sos_marketing/models/sos_marketing_leads.py b/sos_marketing/models/sos_marketing_leads.py
index f09f16d..4de1a7a 100755
--- a/sos_marketing/models/sos_marketing_leads.py
+++ b/sos_marketing/models/sos_marketing_leads.py
@@ -41,9 +41,21 @@ class sos_marketing(models.Model):
     cc_mail = fields.Many2one('res.users',string="CC to", domain=lambda self: [('groups_id', 'in', self.env.ref('sos_inventory.sos_sales_user').ids + self.env.ref('sos_inventory.sos_inside_sales_user').ids)])
     move_div_display = fields.Boolean(default=False,string="Moved to Sales")
     moved_on = fields.Date(string="Moved On")
+    source = fields.Selection(
+            [
+                ('Expo', 'Expo'), 
+                ('Conference', 'Conference'), 
+                ('LinkedIn Groups', 'LinkedIn Groups'),  
+                ('LinkedIn Poll', 'LinkedIn Poll'),
+                ('Direct Company', 'Direct Company'),
+                ('Expo [Paricipated]', 'Expo [Paricipated]')
+
+            ],
+            string="Source",default="Expo")
     @api.onchange('expo_option')
     def _onchange_expo(self):
         if self.expo_option:
+            self.source = "Expo"
             self.conference_option = False
             self.linkedin_groups_option = False
             self.linkedin_poll_option = False
@@ -53,6 +65,7 @@ class sos_marketing(models.Model):
     @api.onchange('conference_option')
     def _onchange_conference(self):
         if self.conference_option:
+            self.source = "Conference"
             self.expo_option = False
             self.linkedin_groups_option = False
             self.linkedin_poll_option = False
@@ -62,6 +75,7 @@ class sos_marketing(models.Model):
     @api.onchange('linkedin_groups_option')
     def _onchange_linkedin_groups(self):
         if self.linkedin_groups_option:
+            self.source = "LinkedIn Groups"
             self.expo_option = False
             self.conference_option = False
             self.linkedin_poll_option = False
@@ -71,6 +85,7 @@ class sos_marketing(models.Model):
     @api.onchange('linkedin_poll_option')
     def _onchange_linkedin_poll(self):
         if self.linkedin_poll_option:
+            self.source = "LinkedIn Poll"
             self.expo_option = False
             self.conference_option = False
             self.linkedin_groups_option = False
@@ -80,6 +95,7 @@ class sos_marketing(models.Model):
     @api.onchange('direct_company')
     def _onchange_direct_company(self):
         if self.direct_company:
+            self.source = "Direct Company"
             self.expo_option = False
             self.conference_option = False
             self.linkedin_groups_option = False
@@ -89,6 +105,7 @@ class sos_marketing(models.Model):
     @api.onchange('expo_participated_option')
     def _onchange_expo_participated(self):
         if self.expo_participated_option:
+            self.source = "Expo [Paricipated]"
             self.expo_option = False
             self.conference_option = False
             self.linkedin_groups_option = False
diff --git a/sos_marketing/views/sos_marketing_leads_view.xml b/sos_marketing/views/sos_marketing_leads_view.xml
index f0b55b7..0da03bc 100755
--- a/sos_marketing/views/sos_marketing_leads_view.xml
+++ b/sos_marketing/views/sos_marketing_leads_view.xml
@@ -7,7 +7,25 @@
     <field name="view_mode">tree,form,kanban</field>
 </record>
 
+<record id="sos_marketing_leads_view_panel" model="ir.ui.view">
+    <field name="name">sos_marketing_leads.search</field>
+    <field name="model">sos_marketing_leads</field>
+    <field name="arch" type="xml">
+        <search>
+   
+<searchpanel>
 
+<field name="source" string="Source" icon="fa-list-ul" enable_counters="1"/>
+
+</searchpanel>
+            <!-- Add fields to search on -->
+            <field name="company_name" string="Company Name"/>
+
+            
+      
+        </search>
+    </field>
+</record>
 
     <record id="sos_marketing_leads_view_tree" model="ir.ui.view">
         <field name="name">sos_marketing_leads.view.tree</field>
@@ -16,6 +34,7 @@
             <tree>
                 
                 <field name="company_name"/>
+                <field name="source"/>
                
            
 
@@ -55,6 +74,7 @@
                             </group>
                             <!-- Second Column -->
                             <group>
+                            <field name="source" invisible="1"/>
                            <field name="website_url"/>
                            <field name="location"/>
                             </group>
diff --git a/sos_sales/models/__pycache__/sos_proposal_boq.cpython-310.pyc b/sos_sales/models/__pycache__/sos_proposal_boq.cpython-310.pyc
index 9153736f4aec15d09f8fdd2c702cbe63fd68879b..9b8f470df6faf3f43c12290fbab649f31fbaa0ab 100644
GIT binary patch
literal 51648
zcmd^o33waFbw98GK@bG*TPJi2mPC=@?Z~n&>#!|aHf7mn;=m9GqCk-VH2@_Gp&UC>
zVmpq{IH#RNa+0QM(&p%q^h%qiN0Q!G+HQK}Y7)0i+C<GIU;p2GyBI9)m2CRo?=$)B
zVCFY7Z|8XPX6DVYiMl$U1AoomdHiVeF{k5O<gos^;n;>J`FW?qAsoUv?U-?nJ7=_U
zZN@e3auTLZyT{#o9Kt2sXC1;Fbxu{CagBR`R0$6dkBL+RsTN)!UK8;GsS!RPJ`<?{
zQY-vG{3hZ9QYY$x)SE~xkcI-JQ8Xb;lNrX3FwLR`NQ;To0cjO&K-x^C9!R_B0McP1
z4L~|Y7mzL!X#}!JEC#aJM4Ess5lewAHIZf@%fxaZ%T1&ONI<Lrvcg1Kfvgm(fUGi+
zHXy6T8X#*-q#ejwu@1;O6X^i5UIc*zO{5dZRbm5>4JOhBWTV&wWRr<30@5uu1KDgM
zi-k7k2=+WnH5+v4o|%M*PA7HGkyvzEBz0G0Ha0pzp4LCV=}7(nwy0y=DIDXPaE`l#
zHtrU#@hagS_lT-V=XiD0J5?h*RJmq#);{bW_W?y!in@oL<9@c+v%L=XdQ>3c4Qy{@
zdn4PMK%@C#ZM=zHE$q|G_ExsHu)U4#t+2OEq7t8RiVh&!csu)cvTq05yV%|ddlywC
zs?IBxB6W)xSq5aei7aL$0Az)UEMa6NkX4}K8ehup)ylmL?i#TMl}7Jg4p%^|L)`Un
zt$=H#2=d!kaX3^PDvFqW6KJglwuY)n^dLqrQnZ$lkmys$I!5}%fI`+YGAM==5@cjp
zj40$PMy?jGQ^*D&l+G=j&W&&d#5HC*H^H@1Y~^%zbIfbSHu&|3?MTyRMs|puaPLB@
zd)R#)T)UCSUbsSH56A6epS@zAira4@*DGWINSnAp+&HO;{bH2MVG!7mxQS^D!(J~A
zuziH>H?#d}*t^6nD0i<ILn>a!eh1la3)^pH`!#Go#P+SQuMxMIDZMtwwJpcBon5z!
zI}mnUydJsU0i+8Jc(HhcxKrFN-uQ6U_)dj|6}C%ZcPZ>Tg+&y$TVaP4wnt$T3frqN
zp|E`liz@7Tg&k4Y4GNo7*o_K1s<8bEiz#eWVN(jbNnytnc0gg%3cHyxYDY5)yG3Df
zg^ejJp|FDrn^oAY3OlZ_Lkg1$yG>z9h25^Ol)~;%*qp+~6?Q^luUFVfg}p&xcPs2p
zg`HB^8x@vTSXg0iQrKOLkrbL&SVUo`6?Rx*_b6;aVQ*HLP}sc+iz@6sg&k4YTNE~_
zurmrfs<5*Piz)1_3Y${c+Z1+8VfQO+T44_;Y(`-ZDlD$Bw<|2c7|Gg)6gI1{cPQ+*
z!X8$bRM;a5ODgP9g{2hsn8M~1_PD}MDC`M^omAL66?V76o>bT=g}qB*X@$L8VQ*5{
zdlWXWu=gtLw8Gw}uzMJze(L=Sd$YoxQrNu;ds<=lDeMCZdyB$8sIW5%`;fxUD(sxX
z-m0+k3VWNvo>AES3j46a9#Ggv6!xIPKB};{E9@5(_K?Cprm%M?>=zaGFtCugAbtsb
z$s5s^Ji_jeEBB-9{)BQr#_nHM?#J2vE6V)@yFaPi?_~F<l>13`e_FZU#qQ52_q*Bs
ztIGWzcK@1kzn9&=uH5fq_irfo``P_j<$j9YpHuFq;ii7@H&rkE0Y-icy`5M5HcH@w
z?EW3){t(<<;&;JKpGQyX8b8PG--G-2*?pefUx51$*!>K<zX<mqvirmA{v){mnB5;?
z_n*N1C3b(5-Cu_LEA0LScK<2df5z^QvHQ>A{tI^hBD?<*?!RL91$O^6+<(LFUt;&)
z!u@yb{y4k;9`3KQ`xET`2e|){-M`H4e}Y?Q_pd}hIrXXg9Y>tvYvP~Jde1n=Kh3Ux
z5&wGDJN_B*Z{q7`9pk?$z9GJe-(QP<^4zbBZ;5Y<e;3~o-xc2z&z`Rq{~`YKtOGHB
zgMI(&yi<H%{D6_qGV<Tzf5Z>PkHkgszv9OT{}b_3_Wd0D{!skvye57wE;06-j6Elw
z2lj$^k+I)m>?Oh;!#Es|lkwk1+J7A`?GeIUcrXP+I(~=3!&QaHgQpsg7f;Q3LVS2?
zIo$7N@(#qG$vxtJUbxOXfz{!`)C&}U54Hw8jVOcP$8Qs!X4t=AzNrQ7Ry=KZ+VOPY
z>BQ58XAz#oc$S=}H!sDrjA{OX8Fx9qD*zl*CcNv5CccvKRlrv>{)Z;MhViw)F<C<R
zKQi(4j0b^V#rPka_y)!|0>?B7;r|4-ZakPGjeiNhJ$QOy|ML9~w`2S(V~+J9%y#v_
zjz}sMm8Zh{;>lEGdODJdCF0>*qQ~cAGCC8Dr}V~TA{m~QiP=OlG95mgIG$c&#tB&C
z1a?JJkr*aiwJK~(q#G=bKqNVViCObpJa&98nk9)~Ee5vU5;~Y(e87BZVBfC5%v>@R
zI2;Wa0axfNa#A$`-^5H*hGjP4=~_$tgA>TC`XhT4o}GA-0T=?@HSd_h^uEh+&N=Bg
z?>wgo_j%`(>xgU8iD_lksIDQMo_Hb^h{dG`abz`&pj&rE<0o`aG8&N+M=|S+%+5xI
z?uv=z1*h&#MyHQlaL6VEy>#8?#B6GFLL?HsLzy2V;o*o7iFk4|<q3rxO>Q<OuMDU%
zLD6^5p3=QrrXw?lMPzFoh$b}{0Y^GmsT#X8v1n?XOvzY$QumsrC3KHS%tT`Gblpy~
zAOoY3ndk+lYz2AUdt+jP`6AsiIyZATDg%ilCf~%O$#hc|9Am=CbX^v@^}yH#&7f0-
zN|MoZBcQ-7AQ+zvtiR#V_F%ewG(jY<n~qL^z(iy^a3B(oPN&;4jJ7i}8<~iuP6gI)
z-y012g4(5;9eekW1$w(fhvZ_U5lA&7a4#|3ULyp6rB<MS_>f#?0G=KD$2RRfB$pe`
zT5{faDA3!}vt0%Z%x7Z#fL0igcMMoyU|_pkX#myxcLqWOJ-5kK?AB}df)`Q;BQg@7
zl&gX1UT~tAn@A<oej}&*BS|#6bgkhUn~t1_>RmY;jmi$sL=Y$znbtirdL$eZdd+?l
zNe0a#bx$O~60HSMlSd}gEo0G{*rwgFcr1A|Dgt{F38+C@3W6eJeO{nIPN11sav}=J
z5RWG2lHph?I+N5L`nsGj)3JC|r8gY2$dYu8j3&G1l2MsVH}1IU=D^t8;h7j@jtJ~H
zm0m;nOlFYq;Zxx_7_U1Sn~X<Nb21u^%|s@nK~1lgQOG8=EHG^Zjb-{&+MlI#Q~Z*j
zUNbQ#Wi&p4MzYhi6|{R&_EEdPNNmDw-r41tLi?XY-y+-(Yg5{6ov0dfT=0y_UW7q|
zaZ{o$Ij_-O`$lhhmZS&TcGYwY`PhBIC2Ijl(j-aJGs*@ssKpybGuc{TY{qku+UpWW
zrbSeX=#j|WbV_dzPb6k$=TgydDgiMZJ~9a)nM&6kBxhjvp1@8x_1a7Z!3_{S)n+84
zdDSaVR(Z)Dyh`uLBMincDAya5$1<ds<OR$ypAovn2%X_SBQ?RiDAsDvG6UzM!-${L
zVQ`LC<k84wHjdkAzT3)%Mgm&$B6Dz`5uB)}Yqw8KB<A9&B=Oqn$ize#;#nq6L`5l9
zLliSa;3mk!+aeOp7=nir+oaxi(!_&qE_=BhWi1zxu>(fB@upd@DRrf&JdWC+qRvF*
zWGo(ZSt4?rCHZjzvyil=1T@>bLA^GUs`YDvX&>5d<|WzkI6@#^37%Q5-kb%)ARRtz
z^!#XCRVUHe3%%+#`hnX^ZgfLQ-AfSJ(#<;)Gc)LYjh-NI@DxbgNO^4=n~hGyj>IMc
zmQh18-D$|SXdIc1qVWeZolV+j_=w1<q#?PYcc)~86B{Nuk_<X!kSH(PABhL{C*rB2
zf%OMK0$pS<&>Ki40-?Yi5GO_bL*(Db{>zKS2L_2EDS+;#s@a{c+ZR|H*va)o-D0*a
z#v*Ys5suzH8;vKUsA_6aMzv9maiyodXh77V_3E9fpjjGX1VBtSH=Bfrpnf#VBq~x!
z+4_{NU)ctfZBW^Ulx<kqM$$EzMD%2>y;*B0YwgQg`?J=8bPWjt&PUdYXc-jIGFC*(
zSS`^8v*=LPI-IqRq<xuay*(Ctuf-m+*!wK@ev5q|U9Y5&k=|T)D9^ty&)uKr&Zjq+
z=RcI^9?o-*q#JV6(~}SM<^!R8pf4Zj&j$w5?K!gZhFHq1t>Sp7MEJfEcz+4J)O!a@
zgdZw_50}74(jCR~)l<r&x0FYylt*7FkN#2~1L>CiIlYa+XhpzKv5<Ym!2V)j(H9LC
z3prE_94-cqq+5$5zNaYKTNDiyMf-}P{YB9MW02n)$o9p0vl5RGiN-L;2o<t~GLXIk
zq`v?eC_n}akf8!(xBwZkB28S;J%x}pCut*8PO=RsC*1~=lW+sFrd;n*rDF7g+yQc5
zm~K4~nK(w1q_u(F35gMhfFskFa0f&Kj&#d*A!6oGBQr42mlTf9ld}<wr&0F3>Dn=}
zo84Bqpdo9}P+6*d)}Vc5gZ5j4_LmJhU=2D@Ht3)==wR8PL)M@}WrGe|gASJsI${kv
zqAx911wEL(Wb2@(eBj=kz`f-IhjIdk$_MVt3EWpcaDPtV{_=qbasm%bXkgXMp9_}E
zlkA5h<v0Vi%e?cv^E4LU=ba}UvT<HJr=52=9rIY#hjNCnPGGJKcEL5Ow-uc|>aE2F
z`j{?NCFd|`)jbn5HjnBn!%#L%Vk`))QD*i9-B$|Z^Jpr}8W??T<uGBq4Ws!+<U@C#
zh(H78!c-I!#F}t;VmgvchQpSL;4uXIYdpz%7=F#`^g7)x?~5><>2(#AI7Z5^pfDXp
z3e%A-OgV|vV1PS?AIt_MCi!w2b~!`1kvSPBPpBf2n6S!O^5sb`&u=C9;W4s>Oj)wE
zwqmyUg*h{IVvmf5?qUdz%uM|pX6nKPmuBeZz%pQ%U5-0Fr!}yLo7m%cqi|sU?jDsj
zh{<|7IS5;@$}&|a?H$k8Eh0Fdogi$vS{qE|12c-G%_QKM{3$+_*EjK8^ukzz0`NKA
zFQs=@%zR}ID_Jr!MVXj`Q6g*E*)=r@nhv51$<epSlSCp<TS2w{9m3Nv(tBQkEKnoS
zeepy%aU{$WzeO{VINBKIcH!PsA{0I)p=37Zc)G<eluGpF_;qFD!A3JV6|E!drAYD&
z*y5q+u}6D0Mur&SIps})E2A??UJb{*1Kie0TsP&w<7_1p0&2?D>gXW58&8#K_mFS6
z`nbj%=^PDu<!LI|d&#(mjQhxVGZ}9oV;+WHXG}cJ`hv2ExKN%VBd?}z0roteB(*}X
z<^$7dFZnd>MYraC5$rcqx$ZKeFK4ow?#!E%L*WGVTDiixNUBaQoVwG_6sy$Faslna
za>N-FS6DNOA?O+{C}Aq)B%X`yFzy2xv}Z2iL)4zR^yC?M1))=?R9w(>t-D8e({L%T
zO!S&9lhHUP?Q*LJs=A9*dD^|Lj`V)}WsyG?gZ3OM@ag2%ZbchvL058aMsF!nP<mrN
z0kaNCd`={!$V;+3gfzM+v9z$@)jCOXTz%!qm1jXlugfT@xZ&%*6l)f#^k|ualu+_9
z3fB(ZI*l{K&~}86sF9}Lf>jA~U>VMkDyTRT)I0GMZ5rGhG&WsE(_piTO%IuwreRdB
zS3U_+@?B)Sn+!^yd=DA#C4;l&%c`;DTM5l;64wLsqAZg}S$0!d_S-MZEOosllWP(&
z6Ics_xXCF1Vl7nwJ#aAlw-}r|>lGNzKo&TmPu5Pm=3T<I7{eKs2$`nf9{nz&@t;JR
z9n=rw?~ZNgbh#Mb4;PmTdS@jCbob#%GOAab$;vN*y@*psB|z$ELnt&l-7lm=_Ddm?
zbG_N%6sy8eZ;A6N5XthxtV6^qP)@l}YgXlQ6&zeHjYhf11}YOg4pkBs;c!74l}{lC
z^8X?H$PbdiyilyJ_rbS?+KrJ@kF(L~)!fggd+g`bYzglJr7Ot;YSa*HmORLFAePAh
z5!TzYTxBiEqWpUUA}m6l<at=q+wAA0_&b7|(j7`4d1SKNkOH$<W{X~GvwG01JQf$x
zyVHxUFx2I=bVaMeBs$Wa$`eZoIn>&7e6r-0<ly=AmMY)OibD?3Y+96emhy_ixcTJQ
zs31A36USnyoY$->9W490VCg{luU)Bv<}7IByfaWDO!kFqON7XO+j12yJIS}cDxJ-q
zC4dbop-NOj-8QK7Rie^ohf04XD*bk-3{;{rV28?JB`Sk<s0>x2GGvF!a3w0kcBqV0
zqB2rICCk5Ars~Ndv$_ah_SmA+Taiw$EjqajTr53>99%44xh!0aP9YB$qm#?T#po1r
zaWOi%Y+Q^^0Uzh|ZZx;1$uafP$rCWRhaSuf+|Ov3<8(iW{V-6-xao+Caqi&($5W0E
zXh%HoZ9VNuq0gIlozYIa=e3l^`^kLRbLE|P8$<pf$7$_&XUa8?eODAy)P2A;ubpvW
zL|<c01?orTFy8(w4{gxtIrLh^Ge;(MzjC0n(VLVj(--Jn3d$GndbT^t5y5)1ilW#y
zr)V;Rmp&?*wJ>-(Qf~}i9&jAfBoFG?)bgh%F1<#HZ=E(jS^G}C*3$XP2SFNIB4^AP
zzR?6uz5~W}C<a!eX!p7u8b&nkmpo4Qi|O6=M*@@tepQiqi|&H2?lJsHDMs5=FqVYQ
z3u8GcA3+lI>ZIX<S|K~=tYVTn#@{$l!}~O74+Pe0jSPH-GQhdG6}FX>i<Pi=JL;j^
z(lpI!{6jT#$>*(y%l}flTl*nK=Y3a@Gx=e9-ABmyC>g&%#>Ze3)FrX{PCUs&uo0U-
zrrr5bqc)*Tf;#CewtLYaj)tT_aP-GSz_^UK6+%;c3R9(!DiiT2#A71W3aK^`uR^>g
zQlpR>6Y(j;XCk!<sWlP5Li{Fz35J>GIuof^NWF<PD1-*!l#51%Gy-V?(xi}P6KPgR
zi;1)-q}4=P71CxRZ3<~Ok#>c2m`I00I!&ZgAzdcYrI1A?vPdC|O$6t@%)Bo#ktGUQ
zY9dP&vdl!5DP*~cELTVX$O@E3Kp`tlWQ9UjnaE0otTvHV3Rz<!s}-`=MAj%|or$bf
z$a)i5r;wnDtXIfYCK6Q01{1kTAsbC(gF-f$$VP>9o5&`GY&MZ@h4cXFMQLnSNXSHb
z6w+rRy$b0!k&r?LOr%dCgC^3ikRcNpP{^=}3@T*AM1~Y{wTTQX<aH)8qL3{na<xLP
zF_G6PWUGm6QOLC>a*aZ^0ojhy*s72nCUUJpcACgGh3qns?FzZhM0O}-w~6dj$Q~2f
zrI5WQa-Bl<naFO1TyG+K6mo-!>{ZB(CbCZ<`%UC}g^ZfW4GOu*L~c~b0ka$5pR3WM
zj-0yDF+4mqH?;T1u#`jdd+PDAxAc?zqdTYb^%t~RZVWVdvz*V7zQKO~p!#-W=Z&TR
zGdIoVbPv{a%HN^nXrs?k!sX}5_&qZ6v`dt>gNP@;083?JG`=cN>{k24NZnMP*dhDG
zs9P*g>^A$vNYz%J*zNX-@yblu3b?~QF<Oi%pR#fL#CSQWY|375pBSmE%BSoN_KEQp
z)UqkN(>^hO#gx6#J~7&*UOt;)`^0F`v^=r9>=WaCx@F5OVvm^o-HOQ~Nnt}|$Umq^
zN!X<HhZQMBZBqK<ij<Dnr1YhVlqPLb`btGgM{QF2vx<~rHYxo@MM_gPDg9MNO1Q?t
z7C-$>MM~2)Dg9kVN;5VoeYGN`xJ^p`Sdmh~CMDXtP+qXi+NAW)6)7FJNvX0_N!p}T
zS*oOLQmQOf=4?``ELBd}q*Pg|oU}=)vQ)X-CZ)<!<&;fIm8DABCZ)<!<xMszRhBCA
zHYrt>DyMBysw`FRu}P`2RC%*aN|mL`y*4RTmMZtzq*Pg|oV7`*vQ&AiO-hxe%G+#G
zsw`FRw@In8RC&NArOHy}L7S8+OO?0Vq*Pg|JY<tnWvTKGo0KX`m4|Iosw`C=u}P`2
zRC&}UrOHy}F`JYsOO?lMQmQOfp0G)&vQ&A}CZ)<!<y|%@RhBC6wn?e7RC$k0N|mL`
zdu>vxELGlTlTu}=@_w6?Dod58Y*MN$Ri3s<sj^i0fK5u3rOF3wQmQOfK4g<pWvOz`
zCZ)<!<-AQwm8Hrv8A`#M<ps=_bnlVaG`5`M3~Hm&;NqY%Rw{c7kWc~ASAg^vAOi)+
zU;#2zfD9KPBbHTYGle~cP;Vg=Dunt9q5eW>K>iXHQFig0j&O6y6hPK@n4zriFd^$Z
zOlY8x{9qw8R0s_hLL=4{c2z`{Rd*BXEfOwN1nVn;^%ubg<j1L;EX)4pWeG-M6~{v*
z!uOTH`%B;hCGf!#_)rOaxCB0;XE*U>Ha~E_dP;fpmhuRd^5`q&(O=4AKz@RXe3@#q
z`I|6|qA%|sst~`gf`5Mn|A7krgBARTD)<jq@E_5$+w+Q+Pfw))y_EulDh24P6rjIS
zfC2f-RMnR4nAQWbMm?AD43&%7SI)D)oaaC}&%tt@L*+b&%XyCI*$u5ZJB!TrSkAY%
zY+M|$R4u8HGR{<%@x?L9GQI;vcN)|3?Dgo1lkbPc=WTYD{nuWGuj@+VwmRLPN{?Le
z`furzax0N#>#@Umy737I5V1Sma>y`<)oNOfG>^tfI=!d6uvJQ55vD^X5?u^kiDled
z5k4XlGwNO|YyfXWa6UFCpCH>T8N8m{Og19+Q7V2fEPkBbp+kT<OUm?W4<6pWbPIyg
zI(o8-&Jw}qOxDvmI5zPv6LsMHkt2*}$}v?18y?s^u;GEN8a6zzd11o?TMcY@VDrI-
z2ew++YEypUOx2yE_aLUw7GtXv_WL<ax9gZg-i!mAjxe?q!EB6s1-%_E;l|E*AfgI8
z2<f~Y-q-5DDG0JPVaK3bc(9c&j-#D8H+8xy-VUT1$VuTfkvbqXK<*Vj6LE`L!zTRm
z+B}YtAf{*DBkFLHz!7d1^^=qe+~&r=F7sD2e_PDo)_KRdHaaIrB^GQjcObT+oSzji
z<QHMYKIKMDSB)lQ>ZtC%Et*U{ODq4n`#Rj*^lS$O`zIKaef)Rv+R1OETYqKGH-2<2
zYW>UPi^?*LV7qYuk;b_^LNSJOb?VA8x?4#1()l9VWUsdyhvabSig_1Sc$V(M;?od%
zUH0S!?c(#A8w`_rGfr`3Z)XXoa660MmNYMBvEGV?vx_s4yLC4P5y;p?G&Zf*sXJQ2
z@kG)%fmS1M?+fqxH;&&>KhHgY+<=?~tC_WR-wcj|#%8BuI91z{IYoqXQWJB=J#u<|
z20S(y?!`@9TM-$DA=DY8ur+Wk9cl?jX6VA6yloeHTR0J)I7&MeRr|t;v`>IsaxaqR
z(cI2vJU+A{>wl-y@ARNud4RiNr*o;)&df*ilg&ja{rjEi!OEhhSVD4IEwylJ`Ly>V
z`8@cDcs|=|1>HBLnWtEBzZ~}0Qmb&|ra4Vur|rYkzMPL~G7Yo}zw?vWM~laW$Bm~7
zk0*s&$;n@!70_;7Y-${N5NA=Qs<Ais>!+*H?!5EWQ(kUUyT}!Pg56%UsNbX%P1T(9
z@t$3}oZgFbv^DcJ@^kYwQ?;jk^FG9`nevO;R$NjK8(P?6?B8ANI9)61=WE@_+%cy-
zE*c;KPQ*2*BkmH7r~UDOXi&cQiYEBJ)%0zKZ<A<JzK@C)_&#a+w!&8vZKwT68SYl(
z66!#?`04&Vvs54t&eaS2&(}>g;Ax!q!fe9R`~Y8R|8(^c+~|n3EajXoLQcP$lhehP
zoPIUca;}wfCYF#?qkKb}P?@z&wa<P{EIrq8-f_BKESs-C;W*vEbULy9*KwMTrW@&?
zunmaOINvCLI^Q6FDwfAxOrZ&8Gam1J<6}<gna8b?(j)5Q$O|J4jNpR*xD&akp6Wsl
z0#DZ%=|4`J-WH)A-*~#3Xiyy@{yMJ35k^ppK(^=PZbdeC@Y_Z?GHNouoa3N8fZvr9
zXJt;DyGoRat02FW^K2e7Iau|y*T}(R&f~Nhb20L8!py^Je*2^R_9bG?G2G)RA4Rx(
zEIE7%rBgk%l<FaVttFqI%SrRvoHTznlTQ_MCC4;!tLMaAmlIPjmfH*!#cSC*uAJw4
zkmqH{^Q5KTG}L>sTxoJuPTJO6(x%CkWpbs->vCcSb7EdsHdj?wP?JBK_pqFxPcqQP
z<>j=yAA9>f$3y5z1L%oe^X~a7^ursUuA=rw{c7e3ZW`4)=q3z&j3IUc1E#~cO$;Z=
z;zweWdNou5)cx`4d^rqh&U*vp2qfnvzi~;TaTVmHnw<x66_}Vqw}@cskL(&A>YUY1
zL)xT2=HMfxmNk9e>60COQH=klH+}(@^ufw<ztVWGaIazPd*}k>KY+gcTQVrIauZD5
zvwzoE&rr{^qz*P6y|InTXK=&-`+Iahm0f1Wuh(U4C_xcD7_8R)bbLDz$Kh1EAksCL
zn9=K#ILwP1EU<?^d^~kZ_u<yI6uM2E_|t0zj%v!-EDbey1E%~Gl5ok-S5Q_eV7U(|
zv{9_ps1Yt!`6rxX80p6BfF@uJX!w+8jl7v?(%4oWB!jj?>NRx9q%nx8F^)_iFOs%|
za&kH0CE37kDwkza`LZdk%22}T{vz3typb|D^_Lp<#i8(wM^k2@>#kFIhiH*o#oBiB
zG?Gcl%g)o*SB%oluNb96MJWN~qfFGG`Mk~~23&VGoW>Q>f(AtNU_dpcp^J4sjbYZ~
zIDCzPzsBtmGrIvqln=nry~pQp*(2_mWe&qoUU^C0*!duZ%#|a$Z_9KHS4N-}ZjB--
zNgDZi99ot8IX8x!IQioAKc7DI%8HlF3voP$rxm0iHs%&;oE}_ZOgngEsGt0YsQIvr
z9VFXt0K>;|Ch1}a=1|>_DFsht8Twc9Uz(k77<UHqB^{ZYBlSj#F=5`#8$Na-V$4!J
zbO&-=7`LJ3Hf{MjdiNGGxTR15;}lWiWK_xlpnT~74e@i%O;wYc8tK&iO8$|nEoQbM
z>QCY{T{%H@M^&Y_7O2`NMpLd@g|aS@f?$&|Ri{}x)*>d2>AYS;uO+QYQm<DpHr!1n
z`7jO=n?Za;+px=rh!D%+>8O&!O`tJxlrCDx6ttwRuX@b{-!_D<O&%b3gL;>7Sp@D)
zK_40BLeg7e$#7Pb8goOv86XQ)+*LUdjnX|~#srFam6Z)NZTlxY$p8$TCo`u?+KZaY
z^Fn=<!K-Ap^Hj-)X_L>{4mXAE#J@*9ZjElYF?icBHK*_A+P%IS3g1p=@M)^0QOsrz
zN7^552|xAuX+q{lC=XNC?ltV~W_XH2A?d0Ana{rnHb4IxF>t+!83SqHH{`{ry`0eg
zT6dN2Id^sDY#Q3?bB_DGKThv>`Rz4F0@GB`hi50A<S2|ZO?2oC7F15>aP_!xjnQow
zIJq4u*QvEmO!=ISbbShE&*n8cba@5?tJ@rRK&GA6?%@kj4BJWPN!&FsnqEx<1-?AI
zJ7OHym(f|MFS7Gx=&91ncH@qAT)m7tQgK~?z@@AdCSb(4I$&NSME4sV(d$eChNtd3
z6q%ljUMFQj>Qxv`#8ak*OZS)|oCR00H037ca4LR+WMn-`Km$*Bob^uB<GtETHtwb<
zAccVq)(4G)jBF2C?0pt{zr{Xau@748Ll*n6#Xe%%Yw2A*h9jqHsr#Yo<*L0A7CuS4
z!Z=_^T@PP&QuY#*scH`6WwVB_Me$khys4G*Xta`d!to|H-hakh$L=GKw~%p$4BooM
zyRP1al*q@);302z+`EU8NR>c}MX$E)GOtH5hGTpaL<x0&`CEeI+wj_QHvq}|DbZ(O
z;E2$t$<DoQUM}7NkF&^yd>EGWt(BW==9VKP{kh!$<;F64&)gma_I`xk&kG-&r6LwB
z<lTsOA0_Xdlsp^Kq*C(I*(2Wh9b0#HcwfMnP(CqZUPh@)-fCB>%pX)`e&^+uc}}`j
z7gwR|X*{DtTG5^8r3n<RgX<9WZK@8gf8~;!wyd<6OU$oo9Xz7y;K1c(%5JfLoQl20
zWckc8I#pHClHP^T52=#A=4B-+on7a~=<8K2*C$lDUdDk#ql{>vSb>vy6Gwe+@S>$j
z9m%7rG>0#@G&4y_XE!{&%H{ZORgRb4=qeW@&3E)VqZrN5MN9EognOqd#ml$`FNbuF
zK&4*31`qf2gRls?dlJJqp><(U2CcB+B5gk3nt@d?&-rS)!t@+4x<TW-3lq<p(Mvb@
z0_NYA*{wUG7}^K69Nv1s{NBx$&4;%JV#&bC2(Dkl{l8c*37ksI$-u3%f)|OlY@Xe!
zDCo^J@<RuL+Z4lwawo|js7ZH-XcV6Th|I}I_slkg!lz|Ub>lNH%QJ5ZjGe-VNM-_?
z0y$siNG~IjvG@t7l@jt)H@WC`srUpg5XP50<Wb~aUy^@aX7=L>i8$ufH1)*SgD?{e
zPs+sHY&eQ<%uE}1Zg!ZXIb4s5Pkn^d_dYU1%9_IoaVmT?HG}1;B);i`k9y$MDMZg5
z2w=Ww-c1z^N0}7HnD0To^E@2092d<XjPX5gK&yNYToH0POh7%V7Y{Q*3KnJnEa^bs
zpn(a99q<t$EMnl=6k>!ajh8TRfeIFOa0#63n|Do_=9C*Q=Q&=Y#j+<Y)532G%brF|
z8u!m@=RIH{=Q%9e3S6(kEaV@Ryce3cRufNVFFDO>Pz@$%*a@*sT(k>XLR7SjA-LX<
zb44zy%bRyKs=n0nDW#knLo+vjByfSC-o({wEEZboSJGbQ%#C$V(8!dwB<qc!nL{hT
zHgR(=-!w+4Q`PwlRp(VmHP-MnpUaOME;Y^bVlz)#X{tyQO8j1O`&2~_R1}-V-W2>(
z-5ciog~PfpOm_fdRt~#A9ENIWn&;tRy~-#8KXlqknTp$fF<Uo0JYih%h$Yd+aPl~P
zgacp0k@&h&Dk({X=-&O2_^A+TgDVXmp*V_<iS$t+^;02LlV%Y2ni{&4rUDI&B=wD6
zPdWr_KOl7iDP9ca$zk(jUP>nuIjYx;vA%#5zN7+z4g_g|N}0Yugv4R7Rc~Y{NuMDy
z5${d$Xb5+rp2{v+8>%K64D+rpLk3jsqwn+R?FFKMzuTjGcVY05ib2EA8}7Fm*+<rK
z$?_@r5apRqEbsvcK2O2NGkEgCeA<@7r#RHlbmfy2^GQm|yUF+<(XHA&ort6)?PZa4
z>7IOs3{rUM?!6Esa)csXL&iM$JW9rCGVURRuVB5GZ1<7z7BbF~@o!{&os4gg@l7(m
zMaH+u_;)hCL&kT>_#PS0lJOs8{3jXzMaK8Z_yHOJO~(I_@k26xM8-uj{+Em&lkpQW
zeoDsA$oM%Km&kaIjOWRCfs7Z)c!><`X2ALa8BiNIq>BtU8C7IJfIvc!K^J4n8Zvxj
z)RN&RqmGPvG8)KeB%_IpW-?mHXeFbKjCL|Q$mk@aiwwT9a534Ikg=4EWn?TTgS1X^
z1sN;JSVhKaGS-j*b%#T)BV#=oK{76T%B%AfJ);j`M@AvQj*Lct9T}AXJ4~HG-fg3L
zi`r17E{f_c28N1(eZ|23V&FhAaIhFSR16$029D^hMH1gr6zwgFhKiznMbZAE=zyfY
zQm^8R)OoWL>sqt-itG6L73qnS@)ly@Lu6b}#$Gb^k#PeVw~{diL-%I(UdUa<A{)qf
z6B(q`kTmI*H0zVQ$e<ot(lAiIlY-D`2))j{lAXS1mbsRl2NbgujuoYJF9sz%`TL0A
zb&xueRg#+fC7%mQ%a{DvHA4UOY|;)At=98nKNOqBCbvc?K<nAp7<eGg3(Zy84RD5E
zGlw$bm;;m--B88)-G20NjZS~H@eT^z>}=Iqon`)AW&E72?w8?PmU5$u@>=S@Su5p}
z#obg+Ui`UR+p!bJ<3nn(e}|qbJf3=|ue!e7-JGcfl+<(e)$W5(F~iTl(eY;gvTh3H
zwmdG_@%UY>wUTOc0#D8#f!pvTdr-wu$2eAs#x>y_$IV~k?r7DNhdu<yn@(Kg)$GR5
zU0|CGJ{0SPyJpfMYM-HxiPnjFU_K7hfcvzX@WJ?6xcs77w1`%?>e$tW_~fdGt3kAj
z4$%o$BfGjxR};JF!`U@r38*&1-6EEXWn#Gqz}?F36=J1Wg}7~S`Ne9y(K+4@JEdt2
z(zI5r18vuM2e3}Dp8dOEZxBJyy$UfGMHio2BJjCTvC;fg=u#ldM7P+CkFoa9M?&%W
z(B+JUL?5tzF~C?r3}X5+q<4+oG#1WGA;OqBg!h{|0=X8&YWZ*{%_=f}fgAa*I1fU|
z^)T@DI(!f`BBHn(n>OE3>&7O5D263Bp<XW4sfeRk{y1ocl5GeY^x*z)&kO~{Rd)ON
z7f2O-FeNGf9<kwajbby~KN$9^i3EL`v}z~)P{`?6N=D^B8@}2xd<*l2*mPo2MrJsQ
z?z%NGgEwxa#8Tq;OMo&&Hro7mX%Q*xFplA6_il??MMNzL--$(fP}!WJa;Y^Z8a@D$
z!j`*BEn^tPO-BP`SPi~8vjRCxk*=Y4)g0t+0K!-IX1w+6r|4*z|6~lavV#<38^!S5
ziWUFB0lwq6Bj=S_UEu{6e@xEE9i>pO;`ivSG?%n|ijX%BWJ-TK1+3kb9rs>v2Q|3|
z<;Vu?d&y1)?1#us2JCl`oebU0-;Sd=mzwv*C#L5_6yH?Me17dx4Sj=WA6-N&yYMz%
zC(N0GX+UWpO#=SnG8n9J_Zb>@$yeghf^XPq(V<_^jP*v|WAHfQ<j*|Xvl|Sp1@=|E
zOkFNbi%+<Sv8N>acNZsO>|D4V87`fVC7FEGWLFN<{n%I*GBo0@EGc6}x=2>!vv|?h
zDBaZ5ypY1UVsS&6G-s+i%Sa%=<Vz-3{+xoG0ewu^xlC!%)lk<LOVSVE`)^2+d=8d$
zw~fRYY8d9d(F-dipFn(y-tjaUd}NPL+YuwkX9!zIHeOWzMRM}G^ESdhOio@|&2FFJ
zT}K}w58jtSbz>ChC&|V+`ZUG8m7KT1(5rVO64TL0Ji7yh$2aoJ6ym33e2EMyd`a20
zFjx~&;=#qA!sGKO2mb1fF}P?%1-0^kfx7y7?oMfFfyr)_=Q%$*H`=bsT_QR)NfahP
zFX!(HJ2Z3#)SY=qtw5a_x{VsRedtQ+(Ulk-nyW;IR(ly8n*TC7v>LNRqf`{@(8xd2
zq4{5-4z0C-A@Qj~Nh*hQd#0Z=G-UWlVzwL8T@>uksIvc@j9x^@_7S*5l~!c&d0j7k
z_>em>`Bw;c!6W~gf`65ae<b5;Wc&*me@6y&TJq~;d;><h%_@+(4gIc&8dRx=k>5tB
zOHDbUn7_Y6Bvd~lze~>Vk-<!=x(oRqg#9NO|3$|4$zT@d{c-<8&L5KTBQjXlUnJZA
zl2KViCo70(`n<N5zRhPUM7bAC9i=V-+E0Ah6rWU@i_+(z@5**wcLh!!jm86aS@V1s
zsZ5PM;-Xto8<jtyWEK-j)M%fl#^^)6d8=r{1Izb9S&90)a?zfZmGV-lq)>&pA<7K-
zxV9KOcB^jrGUW6{;$iL{^FO{|e1^h>E|R)R`lU|h9D-kP8zRo8Soc!0&m&$sSU%ZS
ziH_Y#b|v~Ykj@wDB++$mrX?7*%a-W!MXHTY5&2J&L6g4Aljbjhz_;_IIZ5!WJg2En
z5oulxiB8g-D3q4wq)4$pJ$Xf?xt}KynF$IeC7^ChP?iY8WtpD9&zPJ91g0l&8IzM$
z!Ya#GqeoeT>B(X>Ia$a4hAdx?{wIi-#^eM$jWO-8PEVHPO;47I5X1(QECoCViM#<d
znQqGw+_`dFD<`%+yxK9DuFetKQlsHZo@CA)&hv5<1T#fca#^}4UY^t~CYZMo`;jEZ
zSa}E8dD?OLvRI90Yz*GY3#6bDNNb9e@)gM=>88>+N7<_)TQRXrJ<ld3RMwY$b&gC~
z{_<rCZAhn`)p9oyA$fer16x(7vefvns5G%LBJ`pdnvmOM4+<qSBFxGVLzQHxjItv_
zNDo7PQ0&t3gLLCI<Oj}|2roueJobZ<fb516!^d_~VR(3i=tT=PR2Wcv(D)E-nPh|?
z7l%XP0bi04&7u{qHn>`%t>@ZE-GSEJDY{sR&@L9C<u2BFiE-9k@eJ>`o+hRhE4dMg
z&;PvbKCD$5YnysqPK@jzOn1{jizn&wX5uq$dfAZ~H>hpoL41bU3pcYJ1Z*dR1~mtb
zQ4J4rXa>%kgD+!3^Z><SzWFrSN-_C%)xP>j<diOpY*WkO_YT|q&NH9^O3SB-uQ`2L
z=H5mg%-5V;?hLbiBX^6;$R%eresJLc@$e#0%J6VTNosJg551tIaHY95grwQvR`W{~
zubMJ$iC79QH+nl(#fcSg8~q(rabh+2-01Jt<S66TqQ6@Q1zc7c7qlqju0lK8fS5*q
zw-L&?O`@CIhoOwyEPBvpdPT^hjO!ys+<BK66ho#uZWt|TL|>E3J(=w~*6mW*r7XKq
zIYqw0ot@6GRxaC;SPLirlG_7KTZ;97c~c(wO$zrdGH6aB|DB9tot^3rcS8-uEpR(A
zA<012U@h>JME;l(c81<oc6Jb^7Wy-Uy|l$v887@KK~RdGqZAF<Oi^j=4v&3Hj}mNl
z)ki5s=TVfGuD;9^S%sN=o@%6tY9wp0%A^58V-MbOMJf|N4YG;C1SseHDV53P4YL1F
zi=7S(uW3D?6P<7aginoF4-wN9U36}-2tvfr0Y1|0F9EWYhSv}=(E2mBj4^2cfkEqU
zh#k=n0W-h_XdL2GeH5=Q^0H{=qu2kR<%n!VE!&nIm!rS1D=gkZ4S|G(Y@(#7A!F$l
zrj)4V$Km%AVQTZTnFy<Sd1=Bno9;tIn3}F^0pZaL0owzLvT9cO0;QG57pf3SD_654
zjVqjmQ}a$BCrRqyGNTXc96YO2rA1r*9wsd?LNrX|hy*y4RJa8WH5hSVWzcD^4B|2i
z;YO>XbwMw$5gG$$H7q%cwLuIJXibonsx(lB+b<f?mYU=N5Kh-#cQ<wfSu}~<>tetA
zUr@=_Q!UdfQ?_@_scMAb73!T7q>qe#GG0eU0~vV|v<28xRMlHxN%Lpv^S)V|#P0XV
z%wZAP$}3LBz<C=&AC$Mj91Ygl=8O+h4t@)fjJC+bN*-@!6U8=`?Nk^~P}Q}=VpLr{
zR@bxZ=B-s+U<LI=D;wMJT%>&^s-6l~aLs!1WIkVpddRHb`Y=4pD7}sKTVq0#S-;Ip
zXpHsSR!os-dSgs}cuE78p&sd^2@YI_dZdfgBNlbHSFPZ>ORV5FLSoYjZU@vOUZ!No
z@3nBP16@OYuZR2&imNR0dxO{rS)Ca+8uA;%Mo4g1z694>sB30%t<Dnn%G*(Z>Bcdv
zLPoQTw7tA*&=>`_6C>V46}r%)z+%!HdPtg2Sd<}~$yrPzvJm3@Gt^>8oTslUQg{nL
z()%pEpQL`8$M<=amz@$8YJ*>yaoumz`_B`LtS_4X%(yaV6xT)^Q>>+T!s8q$Ud#&V
z`htb8W>%GwvLmzP#p5@MJAs7c{ADD7?0|0&d#DN%8IpG(N&$z5{?Bl@?4sg&wHW&E
zsX|LJbZFrjTBrAyVraZS!%z#w(Em#BFU8Q7_uFIW#i+V362(PShvb^b;ZHbhuxOtg
zFUF#MuTd8L85L+L7VTSj7JY%<Uy4QX{)J{yCzNd^S=91=dn~#HO!*zfqU5>~7VVd>
zFUF$%uTd6VOjT5hMf(??MFaHyQY?!1FEop;F2|yl_uFI9rC`b$qR3K|Tvx)P1M&^U
zSajeu%A#A#vFO0Uv*^xpEQ<FpG>h&j$D)?^+hb9>CTOE#QF2`giw?>=i?Qh7Ym`MJ
z<ydrZ;aT)ZITpqH7n((<%CV^B{q|UNIhgV$#iHc85*8hjZ!E^5L$6U5JzI`NhZdei
zA1ueBc>hAP=)>h$)bf6NEE)h)(he)5qbJvuu;{Q17h}=k*C>mAtQ?CDFFcEWq8y9j
z{R_>abVqZ^>5}FB_E>ZUnDSkUMagv~EIK0ZD#oHCuTd8LN;wuCS$G!x%W^D=_b)Vy
z{%tuHwY=XRi>?GyeonC{xhk?~YoT7Ww?{^ZN1O6h|2?l!CjGu*(hbE*YvH-{M~X|=
z7Ei!Jv*}M1n+D4#z#gB{g{WUsd`hk>;?rJvxG10g-&v!2bv5`6Se`a?PsRAOcj5W8
zl@h?pr(%4H1S~Y4c2WXZhhL0OEeWv4r>nu4FDO1G*A?+;NK&*ydHPyiY3eP@r?0|N
z(_mRXwXF3l)LPTkW%<;S0DFA82AsK^NV1xgTvx=WeNq(V)7R>9(^y$PeHGT5ZZFHH
zmIa@M;?p;j<x@)n?D6SZaOQT!r{uaKKJAy$qI~*VU2~eFBIPxwV*UQBu;`Sg1eEOe
zEvr5Y#i#dB0!sG#mIT=2({;p|M3UtxyTEWcfBB2|#pY21@(AJ-_WQ5Zg{SwF<<nPT
z<>~3Nd}>+xStvd|SC&sL39!ef>%pgQReVaW;1b=P5Q&6@9oKx3f$=Lge>!m@whA9e
z!I#1i!NK<g@bOYfXT<pE4e#UT{gjfnRPm-2N!tP>Exbxv+LE+*AX!;U3NT432Fahd
zpuw@Ek%uI)E~(8(N>H)gUb=USadX~Qq{@+`ZKtgcFFw%acys2z`P$~S&6}E6H#ax0
SZ(h}0k0<|sWi$V`ul#?IMnS6p

literal 52165
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

diff --git a/sos_sales/models/__pycache__/sos_proposal_customer_requirement.cpython-310.pyc b/sos_sales/models/__pycache__/sos_proposal_customer_requirement.cpython-310.pyc
index dec46a8b441a7fa7493a601c22ac5798057d632d..5a0b441a3af279edb0683605ae46d99b42efa9f2 100644
GIT binary patch
delta 932
zcmYk4NoZ416o%i))FDZSv}S0NG@b0EN$1Hat*x_F>(oXigq+wZH0f(9SW<#UM9_la
z3JwdKDmZM45~ZbrIBe8HMcs9wE2VDSsXOu9tB4QYfB*BH|K5Axz4z@i8}uQ)K2xGc
zyP6oBOXwegGx1_EmW@`_O@n7mKr?JaoA4&`+5rjew*ZUKfjQGkkC`(p#*zUAmSUM;
zmj77!UsfR4TCAX4C02=Cp<vZmLu?(c7tBh`hRzte=t_mhPGu3+q8jU{a!^%_^<tP3
z@}<~-jo3uB(o;rt8a9hwIe9*43k}+eZQ|gyoMAg|pvyMmCc!EM+l*U?xv@jAN@6yQ
zIk6MBVi$H#t2|W#IdL0q|4XU^HOY0jV-|2H?m8#M!LuHB<DPSp$BBEfhgKIQYH=SW
z_TvGOs1tj7i5$d3g4E+-JVMz9Jc@m^He&xlsminB==8A<Mte%D{HQQb8hb*H&`C#k
zFyN2KLw;Y-vEMfu2&TTO&ud_cg?0BJ#w_|CIKu`><7{3(3;tApmK)##yOF)1y+mJE
z<}%sN-Wf|+EN2xM8_c~Amzlv3aR;dtm4+phCO~fFE-HCJ5ExO(hKK?caX1U89Dpf^
zD0wFiUDApCDMb{LD)!V+oK_H}9bPs2VhGwb@)bIA#W))BhE93||0ef_`Q)rGueX#3
z#?2&|igd_?bkHcWNOhnA-LFiQ>icA?m^G=(Nd3tB25_5wUULy<*qE`+a)<WGx__eQ
zj{n1R?4@xNG%+x}Qp?u~u-B#pB-t@@6U?%Nc}#ngNAHR}v)fEsSwmh$@Ax8fSzPS6
z<zhyb?hp1SaxJNhf`<Ta*^|N+^)khtv!8{{tlpaMp5uooxjf_2!Q}y$t6Uy)xyEII
zWF==JJnr@T!an~{<g|C>luv%k&RFv_Z+K#vPoj~R$fwx6wE~vdC+lWXyR89ge*>Y+
B0e}Di

delta 872
zcmY+COHWfl6oBu!Z7)!Ip_JMOw7lQ%_frrMMSP%wqBb#2<q#Bz;-#pVA_j=Y0Fp8!
zx=;ZVi3rA!l0b}+#FdiB!X+AifIBxXiDxD(^e(<R=R0R+PBM4C_FIj5Lsg9ueVrff
zTulqA>yQ%s^nUaJy3jNY9$UB48`&eF`z2rkCZc&-=dp8#NtoOtV+y7U=lI8^?K`J%
z>6k%%nV2Q|;)Kh_9CEpsCtN%^7v^ID-6(t9lqHN}AsVoV(nLy=uviR}OmPa9U@4YS
zuJfc)9){(jmPRojw1Nh$#42%cI(Jx&HFQ}m9uzJ^xH_yScL*DV%OuAKXv8KwjLp+}
z&uG@ZI)X>{Rd#pILN2x}0v^NG327WWd3YR8Oh}%5Jc*}hEufA<Y@?3Tct&&-i9Kh@
zv}1=b#dr?SQ*Q}&;sshu@nVOReQ7tT$>;ZXYs22w>w|t@KbtXILU!FxIixBN6bP_6
z(`&fL>eM#4&!&iD?7O-MS3)CE4FC_>$LLL%4Ba+c0cP1$%reZd3X8uA>0JX-uY}SN
zXhkA|KD`#@2b9NQ3{cktBjA^LWgMEN%hnM&01G<y%aR;s3qU~f>X{|BUomKNbQF6Q
z+n&fM7_<?LvJt{Tk)wzvP{6cj)a(C*qOI{VEV5kNB)ni7wrY6Ae%tJ@$|CG_P{vy9
zpPAJWgn72)D2E01!*SF6oKDl0IQXBanP@{S8*oOzCcEn_WGl``5vnOtQ>fS#jB$oK
z<JJInSh%aw@Ri&aYj#zPF7vH#I951TIo@*UIJP(%Io@$R;aKN*%CSM%H4hC8db@lB
zzOHNjVQ=3ppSHtmvmB2(^c-I}_^q1hKd?QUV%R3N#`Nw?*k*a|dSaiu6bk+VHJRw)

diff --git a/sos_sales/models/sos_proposal_boq.py b/sos_sales/models/sos_proposal_boq.py
index daaa84c..a87954c 100755
--- a/sos_sales/models/sos_proposal_boq.py
+++ b/sos_sales/models/sos_proposal_boq.py
@@ -17,6 +17,7 @@ class Battery_Installation_Requirement(models.Model):
     number_of_strings = fields.Integer(string="Number of Strings")
     number_of_ups = fields.Integer(string="Number of UPS",store=True)
     ups_rating_kva = fields.Integer(string="UPS Rating (KVA)")
+    no_of_electrical_panel = fields.Integer(string="No of Electrical Panel")
     battery_capacity_ah = fields.Integer(string="Battery Capacity (AH)")
     products = fields.Selection([
         ('BHMS 1.2V', 'BHMS 1.2V'), 
@@ -69,13 +70,19 @@ class Battery_Installation_Requirement(models.Model):
     #CE Team Fields
     engineers_nos=fields.Integer(string="No of engineers required")
     no_of_days=fields.Integer(string="No of days")
-    mode_of_transport = fields.Selection([('car','🚗 Car'),('bus','🚌 Bus'),('train','🚂 Train'),('flight','🛩️ Flight')],string='Mode of Transport',default="train")
-    
     extra_cost_line_ids = fields.One2many('sos_extra_cost_lines', 'ref_id',copy=True)
-    transport_expense = fields.Monetary(readonly=False,string="Transport", compute='_compute_transport_expense', store=True, currency_field='currency_id')
-    food_expense = fields.Monetary(readonly=False,string="Food", compute='_compute_food_expense', store=True, currency_field='currency_id')
-    stay_expense = fields.Monetary(readonly=False,string="Room Rent", compute='_compute_stay_expense', store=True, currency_field='currency_id')
-    local_expense = fields.Monetary(readonly=False,string="Local Conveyance", compute='_compute_local_expense', store=True, currency_field='currency_id')
+
+    # mode_of_transport = fields.Selection([('car','🚗 Car'),('bus','🚌 Bus'),('train','🚂 Train'),('flight','🛩️ Flight')],string='Mode of Transport',default="train")
+    # transport_expense = fields.Monetary(readonly=False,string="Transport", compute='_compute_transport_expense', store=True, currency_field='currency_id')
+    # food_expense = fields.Monetary(readonly=False,string="Food", compute='_compute_food_expense', store=True, currency_field='currency_id')
+    # stay_expense = fields.Monetary(readonly=False,string="Room Rent", compute='_compute_stay_expense', store=True, currency_field='currency_id')
+    # local_expense = fields.Monetary(readonly=False,string="Local Conveyance", compute='_compute_local_expense', store=True, currency_field='currency_id')
+    man_month_1to2_yrs_persons = fields.Integer(string="Man Month (Persons) 1 to 2 Yrs")
+    man_month_2to3_yrs_persons = fields.Integer(string="Man Month (Persons) 2 to 3 Yrs")
+    man_month_manager_persons = fields.Integer(string="Man Month (Persons) Manager Yrs")
+    man_month_1to2_yrs_cost = fields.Monetary(string="Cost", currency_field='currency_id')
+    man_month_2to3_yrs_cost = fields.Monetary(string="Cost", currency_field='currency_id')
+    man_month_manager_cost = fields.Monetary(string="Cost", currency_field='currency_id')
     iandc_costing=fields.Monetary(readonly=False,string="I & C Costing",currency_field='currency_id',compute='_compute_iandc_expense')
     #FG Fields
     line_ids_fg_ups1 = fields.One2many('sos_proposal_boq_fg', 'ref_id', string="FG UPS 1",compute='_compute_line_ids_by_ups',store=False)
@@ -225,26 +232,29 @@ class Battery_Installation_Requirement(models.Model):
         for rec in related_records:
             rec._compute_acc_costing_submitted_by()
 
-    @api.depends('no_of_days')
-    def _compute_local_expense(self):
-        for rec in self:
-            rec.local_expense = rec.no_of_days * 500
-    @api.depends('no_of_days')
-    def _compute_stay_expense(self):
-        for rec in self:
-            rec.stay_expense = rec.no_of_days * 2500
-    @api.depends('no_of_days')
-    def _compute_food_expense(self):
-        for rec in self:
-            rec.food_expense = rec.no_of_days * 600
-    @api.depends('no_of_days')
-    def _compute_transport_expense(self):
-        for rec in self:
-            rec.transport_expense = 5000
-    @api.depends('no_of_days','transport_expense','food_expense','stay_expense','local_expense')
+    # @api.depends('no_of_days')
+    # def _compute_local_expense(self):
+    #     for rec in self:
+    #         rec.local_expense = rec.no_of_days * 500
+    # @api.depends('no_of_days')
+    # def _compute_stay_expense(self):
+    #     for rec in self:
+    #         rec.stay_expense = rec.no_of_days * 2500
+    # @api.depends('no_of_days')
+    # def _compute_food_expense(self):
+    #     for rec in self:
+    #         rec.food_expense = rec.no_of_days * 600
+    # @api.depends('no_of_days')
+    # def _compute_transport_expense(self):
+    #     for rec in self:
+    #         rec.transport_expense = 5000
+
+    @api.depends('no_of_days','man_month_1to2_yrs_persons','man_month_2to3_yrs_persons','man_month_manager_persons','man_month_1to2_yrs_cost','man_month_2to3_yrs_cost','man_month_manager_cost')
     def _compute_iandc_expense(self):
         for rec in self:
-            rec.iandc_costing = rec.transport_expense + rec.food_expense + rec.stay_expense + rec.local_expense
+            rec.iandc_costing = ((rec.man_month_1to2_yrs_persons * rec.man_month_1to2_yrs_cost) +
+                                (rec.man_month_2to3_yrs_persons * rec.man_month_2to3_yrs_cost) +
+                                (rec.man_month_manager_persons * rec.man_month_manager_cost)) * rec.no_of_days
     
     @api.depends('extra_cost_line_ids.cost')
     def _compute_extra_lines_cost(self):
@@ -425,6 +435,7 @@ class Battery_Installation_Requirement(models.Model):
 
         self.customer_name = self.proposal_id.customer_name
         self.location = self.proposal_id.location
+        self.no_of_electrical_panel = self.proposal_id.no_of_electrical_panel
         self.number_of_batteries = self.proposal_id.number_of_batteries
         self.number_of_ups = self.proposal_id.number_of_ups
         self.products = self.proposal_id.products
@@ -508,17 +519,22 @@ class Battery_Installation_Requirement(models.Model):
                         matching_ups_line = self.proposal_id.ups_line_ids.filtered(lambda l: l.ups_index == ups_index)
                         if matching_ups_line:
                             single_set_qty = math.ceil((matching_ups_line.number_of_batteries)/4) * matching_ups_line.number_of_strings_per_battery
+                    name_lower = (line.component_id.name or "").lower()
+                    is_electrical_panel = "electrical panel" in name_lower
+                    is_panel_exceeding = self.proposal_id.no_of_electrical_panel < ups_index
 
                     fg_lines.append((0, 0, {
                         'component_id': line.component_id.id,
                         'uom': line.uom,
-                        'unit_price': line.component_id.unit_price,
+                        'unit_price': 0.00 if is_panel_exceeding and is_electrical_panel else line.component_id.unit_price,
                         'description': line.description,
                         'item_type': line.item_type,
-                        'singet_set_qty': single_set_qty,
+                        'total_set': 0 if is_panel_exceeding and is_electrical_panel else 1,
+                        'singet_set_qty': 0 if is_panel_exceeding and is_electrical_panel else single_set_qty,
                         'production_cost': line.add_production_cost,
                         'ups_index': ups_index
                     }))
+
                 for line in record.sfg_ids:
                     if line.item_type == 'Master Panel':
                         single_set_qty = 1 
diff --git a/sos_sales/models/sos_proposal_customer_requirement.py b/sos_sales/models/sos_proposal_customer_requirement.py
index b921509..4980c47 100755
--- a/sos_sales/models/sos_proposal_customer_requirement.py
+++ b/sos_sales/models/sos_proposal_customer_requirement.py
@@ -30,6 +30,7 @@ class Battery_Installation_Requirement(models.Model):
     number_of_strings = fields.Integer(string="Number of Strings")
     number_of_ups = fields.Integer(string="Number of UPS")
     ups_rating_kva = fields.Integer(string="UPS Rating (KVA)")
+    no_of_electrical_panel = fields.Integer(string="No of Electrical Panel")
     battery_capacity_ah = fields.Integer(string="Battery Capacity (AH)")
     specific_requirements = fields.Html(string="Specific Requirements")
     products = fields.Selection(
@@ -147,6 +148,7 @@ class Battery_Installation_Requirement(models.Model):
     @api.onchange('number_of_ups')
     def _onchange_number_of_ups(self):
         if self.number_of_ups is not None:
+            self.no_of_electrical_panel = self.number_of_ups
             if self.number_of_ups > 15:
                 raise ValidationError("Number of UPS cannot be more than 15.")
 
diff --git a/sos_sales/views/sos_proposal_boq_view.xml b/sos_sales/views/sos_proposal_boq_view.xml
index 5d11f3a..28e00a0 100755
--- a/sos_sales/views/sos_proposal_boq_view.xml
+++ b/sos_sales/views/sos_proposal_boq_view.xml
@@ -13,12 +13,12 @@
            
             <group>
                 <group>
-                <field name="proposal_id"/>
-                <field name="customer_name"/>
+                <field name="proposal_id" readonly="acc_approved_by_name"/>
+                <field name="customer_name" readonly="acc_approved_by_name"/>
                 </group>
                  <group>
-                  <field name="location"/>
-                    <field name="products"/>
+                  <field name="location" readonly="acc_approved_by_name"/>
+                    <field name="products" readonly="acc_approved_by_name"/>
                 </group>
                 </group>
                      <br></br>
@@ -26,9 +26,9 @@
     <h2 style="text-align: center;text-transform: uppercase;text-shadow: 1px 1p 1px #140718;color: #65407c;padding:5px;">Detailed Specifications</h2><hr></hr><br></br>  
    <group>
                 <group>
-                <field name="communication_type"/>
-                    <field name="number_of_batteries"/>
-                <field name="number_of_ups"/>
+                <field name="communication_type" readonly="acc_approved_by_name"/>
+                    <field name="number_of_batteries" readonly="acc_approved_by_name"/>
+                <field name="number_of_ups" readonly="acc_approved_by_name"/>
                     
                 </group>
                  <group>
@@ -111,7 +111,7 @@
     </field>
         <h3 style="text-transform: uppercase;
     text-decoration: underline;">Spare/Additional Materials</h3>
-    <field name="line_ids_spare_ups1" context="{'default_ups_index': 1}">
+    <field name="line_ids_spare_ups1" context="{'default_ups_index': 1}"  readonly="acc_approved_by_name">
     <tree editable="bottom">
      <field name="ups_index" column_invisible="1"/>
     <field name="production_cost" widget="boolean_toggle"/>
@@ -219,7 +219,7 @@
     </field>
             <h3 style="text-transform: uppercase;
     text-decoration: underline;">Spare/Additional Materials</h3>
-    <field name="line_ids_spare_ups2" context="{'default_ups_index': 2}">
+    <field name="line_ids_spare_ups2" context="{'default_ups_index': 2}" readonly="acc_approved_by_name">
     <tree editable="bottom">
     <field name="ups_index" column_invisible="1"/>
     <field name="production_cost" widget="boolean_toggle"/>
@@ -328,7 +328,7 @@
     </field>
                <h3 style="text-transform: uppercase;
     text-decoration: underline;">Spare/Additional Materials</h3>
-    <field name="line_ids_spare_ups3" context="{'default_ups_index': 3}">
+    <field name="line_ids_spare_ups3" context="{'default_ups_index': 3}" readonly="acc_approved_by_name">
     <tree editable="bottom">
     <field name="ups_index" column_invisible="1"/>
     <field name="production_cost" widget="boolean_toggle"/>
@@ -436,7 +436,7 @@
     </field>
                <h3 style="text-transform: uppercase;
     text-decoration: underline;">Spare/Additional Materials</h3>
-    <field name="line_ids_spare_ups4" context="{'default_ups_index': 4}">
+    <field name="line_ids_spare_ups4" context="{'default_ups_index': 4}" readonly="acc_approved_by_name">
     <tree editable="bottom">
     <field name="ups_index" column_invisible="1"/>
     <field name="production_cost" widget="boolean_toggle"/>
@@ -544,7 +544,7 @@
     </field>
     <h3 style="text-transform: uppercase;
     text-decoration: underline;">Spare/Additional Materials</h3>
-    <field name="line_ids_spare_ups5" context="{'default_ups_index': 5}">
+    <field name="line_ids_spare_ups5" context="{'default_ups_index': 5}" readonly="acc_approved_by_name">
     <tree editable="bottom">
     <field name="ups_index" column_invisible="1"/>
     <field name="production_cost" widget="boolean_toggle"/>
@@ -651,7 +651,7 @@
     </field>
         <h3 style="text-transform: uppercase;
     text-decoration: underline;">Spare/Additional Materials</h3>
-    <field name="line_ids_spare_ups6" context="{'default_ups_index': 6}">
+    <field name="line_ids_spare_ups6" context="{'default_ups_index': 6}" readonly="acc_approved_by_name">
     <tree editable="bottom">
     <field name="ups_index" column_invisible="1"/>
     <field name="production_cost" widget="boolean_toggle"/>
@@ -759,7 +759,7 @@
     </field>
         <h3 style="text-transform: uppercase;
     text-decoration: underline;">Spare/Additional Materials</h3>
-    <field name="line_ids_spare_ups7" context="{'default_ups_index': 7}">
+    <field name="line_ids_spare_ups7" context="{'default_ups_index': 7}" readonly="acc_approved_by_name">
     <tree editable="bottom">
     <field name="ups_index" column_invisible="1"/>
     <field name="production_cost" widget="boolean_toggle"/>
@@ -867,7 +867,7 @@
     </field>
         <h3 style="text-transform: uppercase;
     text-decoration: underline;">Spare/Additional Materials</h3>
-    <field name="line_ids_spare_ups8" context="{'default_ups_index': 8}">
+    <field name="line_ids_spare_ups8" context="{'default_ups_index': 8}" readonly="acc_approved_by_name">
     <tree editable="bottom">
     <field name="ups_index" column_invisible="1"/>
     <field name="production_cost" widget="boolean_toggle"/>
@@ -975,7 +975,7 @@
     </field>
         <h3 style="text-transform: uppercase;
     text-decoration: underline;">Spare/Additional Materials</h3>
-    <field name="line_ids_spare_ups9" context="{'default_ups_index': 9}">
+    <field name="line_ids_spare_ups9" context="{'default_ups_index': 9}" readonly="acc_approved_by_name">
     <tree editable="bottom">
     <field name="ups_index" column_invisible="1"/>
     <field name="production_cost" widget="boolean_toggle"/>
@@ -1083,7 +1083,7 @@
     </field>
         <h3 style="text-transform: uppercase;
     text-decoration: underline;">Spare/Additional Materials</h3>
-    <field name="line_ids_spare_ups10" context="{'default_ups_index': 10}">
+    <field name="line_ids_spare_ups10" context="{'default_ups_index': 10}" readonly="acc_approved_by_name">
     <tree editable="bottom">
     <field name="ups_index" column_invisible="1"/>
     <field name="production_cost" widget="boolean_toggle"/>
@@ -1190,7 +1190,7 @@
     </field>
         <h3 style="text-transform: uppercase;
     text-decoration: underline;">Spare/Additional Materials</h3>
-    <field name="line_ids_spare_ups11" context="{'default_ups_index': 11}">
+    <field name="line_ids_spare_ups11" context="{'default_ups_index': 11}" readonly="acc_approved_by_name">
     <tree editable="bottom">
     <field name="ups_index" column_invisible="1"/>
     <field name="production_cost" widget="boolean_toggle"/>
@@ -1297,7 +1297,7 @@
     </field>
         <h3 style="text-transform: uppercase;
     text-decoration: underline;">Spare/Additional Materials</h3>
-    <field name="line_ids_spare_ups12" context="{'default_ups_index': 12}">
+    <field name="line_ids_spare_ups12" context="{'default_ups_index': 12}" readonly="acc_approved_by_name">
     <tree editable="bottom">
     <field name="ups_index" column_invisible="1"/>
     <field name="production_cost" widget="boolean_toggle"/>
@@ -1404,7 +1404,7 @@
     </field>
         <h3 style="text-transform: uppercase;
     text-decoration: underline;">Spare/Additional Materials</h3>
-    <field name="line_ids_spare_ups13" context="{'default_ups_index': 13}">
+    <field name="line_ids_spare_ups13" context="{'default_ups_index': 13}" readonly="acc_approved_by_name">
     <tree editable="bottom">
     <field name="ups_index" column_invisible="1"/>
     <field name="production_cost" widget="boolean_toggle"/>
@@ -1511,7 +1511,7 @@
     </field>
         <h3 style="text-transform: uppercase;
     text-decoration: underline;">Spare/Additional Materials</h3>
-    <field name="line_ids_spare_ups14" context="{'default_ups_index': 14}">
+    <field name="line_ids_spare_ups14" context="{'default_ups_index': 14}" readonly="acc_approved_by_name">
     <tree editable="bottom">
     <field name="ups_index" column_invisible="1"/>
     <field name="production_cost" widget="boolean_toggle"/>
@@ -1618,7 +1618,7 @@
     </field>
         <h3 style="text-transform: uppercase;
     text-decoration: underline;">Spare/Additional Materials</h3>
-    <field name="line_ids_spare_ups15" context="{'default_ups_index': 15}">
+    <field name="line_ids_spare_ups15" context="{'default_ups_index': 15}" readonly="acc_approved_by_name">
     <tree editable="bottom">
     <field name="ups_index" column_invisible="1"/>
     <field name="production_cost" widget="boolean_toggle"/>
@@ -1754,16 +1754,19 @@
     </group>
 </page> -->
 <page string="Installation &amp; Commissioning" invisible="proposal_id == False">
-<group>
-<field name="engineers_nos"/>
-<field name="no_of_days"/>
-<field name="mode_of_transport"/>
-<field name="transport_expense" groups="sos_inventory.sos_management_user,sos_inventory.sos_finance_user"/>
-<field name="food_expense" groups="sos_inventory.sos_management_user,sos_inventory.sos_finance_user"/>
-<field name="stay_expense" groups="sos_inventory.sos_management_user,sos_inventory.sos_finance_user"/>
-<field name="local_expense" groups="sos_inventory.sos_management_user,sos_inventory.sos_finance_user"/>
-<field name="iandc_costing" groups="sos_inventory.sos_management_user,sos_inventory.sos_finance_user"/>
-</group>
+
+<group><field name="engineers_nos"/></group>
+<group><field name="no_of_days"/></group>
+<br></br>
+<table class="table_custom" groups="sos_inventory.sos_management_user,sos_inventory.sos_finance_user">
+<thead><td></td><td><b>No of Persons</b></td><td><b>Cost</b></td></thead>
+<tbody>
+<tr><td><b>Man Month( 1 to 2 Yrs)</b></td><td><field name="man_month_1to2_yrs_persons"/></td><td><field name="man_month_1to2_yrs_cost"/></td></tr>
+<tr><td><b>Man Month( 2 to 3 Yrs)</b></td><td><field name="man_month_2to3_yrs_persons"/></td><td><field name="man_month_2to3_yrs_cost"/></td></tr>
+<tr><td><b>Man Month(Manager)</b></td><td><field name="man_month_manager_persons"/></td><td><field name="man_month_manager_cost"/></td></tr>
+<tr><td><b>Total</b></td><td colspan="2"><field name="iandc_costing"/></td></tr>
+</tbody>
+</table>
 
 </page>
 <page string="Costing By Accounts" invisible="proposal_id == False" groups="sos_inventory.sos_management_user,sos_inventory.sos_finance_user">
@@ -1798,7 +1801,7 @@
 <table class="table">
 <h3 style="text-transform: uppercase;
     text-decoration: underline;">Miscellaneous Cost</h3>
-<field name="extra_cost_line_ids">
+<field name="extra_cost_line_ids" readonly="acc_approved_by_name">
 <tree editable="bottom">
 <field name="field_name"/>
 <field name="cost"/>
@@ -1812,20 +1815,20 @@
 <table class="table">
 <h3 style="text-transform: uppercase;
     text-decoration: underline;">Final Cost</h3>
-<tr><td class="column">Product Cost</td><td><field name="total_cost"/></td></tr> 
-<tr><td class="column">Opreational Cost per Battery</td><td><field name="margin_per_battery"/></td></tr>
+<tr><td class="column">Product Cost</td><td><field name="total_cost" readonly="acc_approved_by_name"/></td></tr> 
+<tr><td class="column">Opreational Cost per Battery</td><td><field name="margin_per_battery" readonly="acc_approved_by_name"/></td></tr>
 
-<tr><td class="column">Opreational Cost</td><td><field name="margin"/></td></tr>
-<tr><td class="column">Packing &amp; Forwarding</td><td><field name="packing_and_forwarding"/></td></tr>
-<tr><td class="column">Installation &amp; Commissioning</td><td><field name="iandc_costing"/></td></tr>
-<tr><td class="column">Warranty (%)</td><td><field name="warranty_percentage"/></td></tr>
+<tr><td class="column">Opreational Cost</td><td><field name="margin" readonly="acc_approved_by_name"/></td></tr>
+<tr><td class="column">Packing &amp; Forwarding</td><td><field name="packing_and_forwarding" readonly="acc_approved_by_name"/></td></tr>
+<tr><td class="column">Installation &amp; Commissioning</td><td><field name="iandc_costing" readonly="acc_approved_by_name"/></td></tr>
+<tr><td class="column">Warranty (%)</td><td><field name="warranty_percentage" readonly="acc_approved_by_name"/></td></tr>
 
-<tr><td class="column">Warranty Cost</td><td><field name="warranty_cost"/></td></tr>
+<tr><td class="column">Warranty Cost</td><td><field name="warranty_cost" readonly="acc_approved_by_name"/></td></tr>
 
-<tr><td class="column">Additional Warranty</td><td><field name="additional_warranty"/></td></tr>
-<tr style="background-color: aliceblue;"><td class="column">MSP Per Battery</td><td><field style="font-weight: bold;font-size: 16px;" name="final_cost_per_battery"/></td></tr>
+<tr><td class="column">Additional Warranty</td><td><field name="additional_warranty" readonly="acc_approved_by_name"/></td></tr>
+<tr style="background-color: aliceblue;"><td class="column">MSP Per Battery</td><td><field style="font-weight: bold;font-size: 16px;" name="final_cost_per_battery" readonly="acc_approved_by_name"/></td></tr>
 
-<tr style="background-color: aliceblue;"><td class="column">Final MSP</td><td><field style="font-weight: bold;font-size: 18px;" name="final_cost"/></td></tr>
+<tr style="background-color: aliceblue;"><td class="column">Final MSP</td><td><field style="font-weight: bold;font-size: 18px;" name="final_cost" readonly="acc_approved_by_name"/></td></tr>
 </table>
 </div>
 
diff --git a/sos_sales/views/sos_proposal_customer_requirement_view.xml b/sos_sales/views/sos_proposal_customer_requirement_view.xml
index bd54e83..6160b9a 100755
--- a/sos_sales/views/sos_proposal_customer_requirement_view.xml
+++ b/sos_sales/views/sos_proposal_customer_requirement_view.xml
@@ -37,6 +37,7 @@
    <group>
    <field name="type_of_source"/>
     <field name="number_of_ups" string="Number of UPS"/>
+    <field name="no_of_electrical_panel"/>
     <field name="ups_line_ids">
         <tree editable="bottom">
         <field name="ups_index" column_invisible="1"/>
diff --git a/sos_sales/views/sos_sales_leads_view.xml b/sos_sales/views/sos_sales_leads_view.xml
index 33dea9c..4a822f4 100755
--- a/sos_sales/views/sos_sales_leads_view.xml
+++ b/sos_sales/views/sos_sales_leads_view.xml
@@ -8,7 +8,7 @@
             <tree>
                 <field name="company_name"/>
                   <field name="location"/>
-                   <field name="vertical_domain"/>
+                   <field name="vertical_domain" widget="many2many_tags"/>
                 <field name="interested_in"/>
                 <field name="lead_generated_by"/>
                 <field name="status" decoration-success="status == 'Moved to Customer'"/>
-- 
2.34.1


From faa8f2ff3b3a420399e2cb714dd3a7651b9251c5 Mon Sep 17 00:00:00 2001
From: Deena <deenalaura.m@sosaley.in>
Date: Mon, 11 Aug 2025 11:14:47 +0530
Subject: [PATCH 2/3] Reference #7

---
 .../sos_proposal_boq.cpython-310.pyc          | Bin 51648 -> 61066 bytes
 ...s_sales_achievement_report.cpython-310.pyc | Bin 26278 -> 26508 bytes
 sos_sales/models/sos_proposal_boq.py          | 504 +++++++++++++++++-
 .../models/sos_sales_achievement_report.py    |  22 +-
 sos_sales/views/sos_proposal_boq_view.xml     | 126 +----
 5 files changed, 531 insertions(+), 121 deletions(-)

diff --git a/sos_sales/models/__pycache__/sos_proposal_boq.cpython-310.pyc b/sos_sales/models/__pycache__/sos_proposal_boq.cpython-310.pyc
index 9b8f470df6faf3f43c12290fbab649f31fbaa0ab..bc5e6a94c8593a085e7f4cd51eb2957f537ebc32 100644
GIT binary patch
literal 61066
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

literal 51648
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
SZ(h}0k0<|sWi$V`ul#?IMnS6p

diff --git a/sos_sales/models/__pycache__/sos_sales_achievement_report.cpython-310.pyc b/sos_sales/models/__pycache__/sos_sales_achievement_report.cpython-310.pyc
index 7b98b7b4a0e64ba59602e88f5fe30e96aa334464..8e696706b0aae3f04da2c4a3b2f6c21772ad873d 100644
GIT binary patch
delta 811
zcmaJ<&rcIk5Z-y)ZOgXX7TQvXkQfh!O*Azq67dKTC8bz?D5k-t@wJs=C~k{Uc(wTB
zLM&c}gAo)OBT+8~_h6zn#)C)Y#HANwyyzdG2?x~oRwdDcyO}RD-+XVf@0(qF2jva$
z<TOo{_@gBk&p&;(?s?T0^6=8dL*|jc1Cqp~9%<|ie(d{Pq7Le0O4gf}X`Pk%tX$<e
ztjbhnBwL^LR!CaT$VE4kvJKSLEM@)7P2E&mAVrO7`R9N5)qt4w_esw1nbgDV7VoV9
zb5P&1qXHmZ+)tRc>Sm6emYvow%T|jNf`vvV-5|UV6&RBA1`I|HyW06Jj9UUaFc$F-
z9}+1O(8I50%=4_KOyv@jIo)Ac;*{V!grY29K|q>wHRV$B!gNZPjf_wT%4+H%EJqUh
z1EI5ySp!x?`B1<U0cV8zAP3!p-u|_=mz=CQQ<ul{h4IOZ5f|-{5H<-o&CC0Q+kXn*
z_lNhXiW>r8+YZ=mL<Jjozz&4JP9Ex(P5qs1`|LAq80+4HozalGv%=dr8Z9eTCL2}!
z5`7I-d_2&yms=>&U<GL7FK-KhLeR3WUf5UkF(0=ugr5c`TL0rq2Fzn8onYS-9~;5p
z*l`7%TfRD6iB%NKBJ3TkLZ_(==>+^39(hX?+59%LP9SVP8qE{v!j||wn8O$GF4%2;
zjeh_r;pSM>mF7R7(aW8fX~iGOpxJ%)2*4~B6LU~9zbBReuHfBdOY^Mo?jHjOId|RM
zNKOzgI!gOt3Fqle*PM`ATP<Nzsx@fs@ERv;&M6~Dr_UAg##QV~oq$1eF{OcWpkY^I
F`%jLb$zT8g

delta 591
zcmX|7O=uHA7@cpjyV;~k-6T!YprtAv8bOp=f9SFGprJ{d2BO7i+GMxLM!R*Bh{S0d
zQ3NrF@*TCBSS%<AhSft*=}B+mJqjXt5WINt(t|h?!5QW;@6CK4?|qF=u=x@CEx+GO
z_>!vkE*yK=?thzz`ZyJui=XmwAcT<<<lKGymiRHn+`79Y*~o~wLsw&@sWI6MFlf4T
z52I$#474a$LS{hsGKK%{d#JPk$Yoj?sDv50L7P4XEy$3#535s0hk1Kqk8$Ywi`8<)
zx@6e-r3H?+x%Ny!Egkc8<tqypt42J6L&^NU$D-o7fDHi#?_eJhw>fb;%z?Lln%s<?
z6+9|l1_hkv^bzHeCa|13IH*cqkf0wFpuMeb)4JxVjbM6mFaAnJy&hiF8^J9MOgH2X
zbJ-nyGQBm~;o%iM#KQ-eY6h9iF=Phy0VeUl;eUbu$K}Im!HUK-9yyY-M}?JF*iMIV
zYi4F+EDg#BVJd;+vnSo#nkqpp-t+Kc_L{pZFI)K~3lC)8!HDxS6Q|(9aP~d@O`R{<
zHicp5?p&F|ex$i|Si@#+95m;1?km75zB!+QtmDm}0VrW{z7Cf2ef|N!Rje0wK@Han
zQLvrYg%ah`9wP~N&@yiJt%<QUgw0j_V+@7sf?wy*RhMl`uNEt1dj$_Io`MOdw&(|W
JcW`H9^e-gUp=kgB

diff --git a/sos_sales/models/sos_proposal_boq.py b/sos_sales/models/sos_proposal_boq.py
index a87954c..bb898ef 100755
--- a/sos_sales/models/sos_proposal_boq.py
+++ b/sos_sales/models/sos_proposal_boq.py
@@ -1,5 +1,7 @@
 from odoo import models, fields, api
 import math
+from collections import defaultdict
+from odoo.tools.misc import format_amount
 
 class Battery_Installation_Requirement(models.Model):
     _name = 'sos_proposal_boq'
@@ -100,6 +102,14 @@ class Battery_Installation_Requirement(models.Model):
     line_ids_fg_ups13 = fields.One2many('sos_proposal_boq_fg', 'ref_id', string="FG UPS 13",compute='_compute_line_ids_by_ups',store=False)
     line_ids_fg_ups14 = fields.One2many('sos_proposal_boq_fg', 'ref_id', string="FG UPS 14",compute='_compute_line_ids_by_ups',store=False)
     line_ids_fg_ups15 = fields.One2many('sos_proposal_boq_fg', 'ref_id', string="FG UPS 15",compute='_compute_line_ids_by_ups',store=False)
+    merged_fg_html = fields.Html(string="FG (Merged)", compute="_compute_merged_fg_html", sanitize=False)
+    merged_sfg_html = fields.Html(string="SFG (Merged)", compute="_compute_merged_sfg_html", sanitize=False)
+    merged_material_html = fields.Html(string="Materials (Merged)", compute="_compute_merged_material_html", sanitize=False)
+    merged_installation_kit_html = fields.Html(string="InstallationKit (Merged)", compute="_compute_merged_installation_kit_html", sanitize=False)
+    merged_miscellaneous_html = fields.Html(string="Miscellaneous (Merged)", compute="_compute_merged_miscellaneous_html", sanitize=False)
+    merged_spare_html = fields.Html(string="Spare (Merged)", compute="_compute_merged_spare_html", sanitize=False)
+
+
 
     #SFG Fields
     line_ids_sfg_ups1 = fields.One2many('sos_proposal_boq_sfg', 'ref_id', string="SFG UPS 1",compute='_compute_line_ids_by_ups',store=False)
@@ -120,21 +130,21 @@ class Battery_Installation_Requirement(models.Model):
 
 
     #Material Fields
-    line_ids_material_ups1 = fields.One2many('sos_proposal_boq_material', 'ref_id', string="Material UPS 1",compute='_compute_line_ids_by_ups',store=False)
-    line_ids_material_ups2 = fields.One2many('sos_proposal_boq_material', 'ref_id', string="Material UPS 2",compute='_compute_line_ids_by_ups',store=False)
-    line_ids_material_ups3 = fields.One2many('sos_proposal_boq_material', 'ref_id', string="Material UPS 3",compute='_compute_line_ids_by_ups',store=False)
-    line_ids_material_ups4 = fields.One2many('sos_proposal_boq_material', 'ref_id', string="Material UPS 4",compute='_compute_line_ids_by_ups',store=False)
-    line_ids_material_ups5 = fields.One2many('sos_proposal_boq_material', 'ref_id', string="Material UPS 5",compute='_compute_line_ids_by_ups',store=False)
-    line_ids_material_ups6 = fields.One2many('sos_proposal_boq_material', 'ref_id', string="Material UPS 6",compute='_compute_line_ids_by_ups',store=False)
-    line_ids_material_ups7 = fields.One2many('sos_proposal_boq_material', 'ref_id', string="Material UPS 7",compute='_compute_line_ids_by_ups',store=False)
-    line_ids_material_ups8 = fields.One2many('sos_proposal_boq_material', 'ref_id', string="Material UPS 8",compute='_compute_line_ids_by_ups',store=False)
-    line_ids_material_ups9 = fields.One2many('sos_proposal_boq_material', 'ref_id', string="Material UPS 9",compute='_compute_line_ids_by_ups',store=False)
-    line_ids_material_ups10 = fields.One2many('sos_proposal_boq_material', 'ref_id', string="Material UPS 10",compute='_compute_line_ids_by_ups',store=False)
-    line_ids_material_ups11 = fields.One2many('sos_proposal_boq_material', 'ref_id', string="Material UPS 11",compute='_compute_line_ids_by_ups',store=False)
-    line_ids_material_ups12 = fields.One2many('sos_proposal_boq_material', 'ref_id', string="Material UPS 12",compute='_compute_line_ids_by_ups',store=False)
-    line_ids_material_ups13 = fields.One2many('sos_proposal_boq_material', 'ref_id', string="Material UPS 13",compute='_compute_line_ids_by_ups',store=False)
-    line_ids_material_ups14 = fields.One2many('sos_proposal_boq_material', 'ref_id', string="Material UPS 14",compute='_compute_line_ids_by_ups',store=False)
-    line_ids_material_ups15 = fields.One2many('sos_proposal_boq_material', 'ref_id', string="Material UPS 15",compute='_compute_line_ids_by_ups',store=False)
+    line_ids_material_ups1 = fields.One2many('sos_proposal_boq_material', 'ref_id', string="Material UPS 1",compute='_compute_line_ids_by_ups',store=False,readonly=False)
+    line_ids_material_ups2 = fields.One2many('sos_proposal_boq_material', 'ref_id', string="Material UPS 2",compute='_compute_line_ids_by_ups',store=False,readonly=False)
+    line_ids_material_ups3 = fields.One2many('sos_proposal_boq_material', 'ref_id', string="Material UPS 3",compute='_compute_line_ids_by_ups',store=False,readonly=False)
+    line_ids_material_ups4 = fields.One2many('sos_proposal_boq_material', 'ref_id', string="Material UPS 4",compute='_compute_line_ids_by_ups',store=False,readonly=False)
+    line_ids_material_ups5 = fields.One2many('sos_proposal_boq_material', 'ref_id', string="Material UPS 5",compute='_compute_line_ids_by_ups',store=False,readonly=False)
+    line_ids_material_ups6 = fields.One2many('sos_proposal_boq_material', 'ref_id', string="Material UPS 6",compute='_compute_line_ids_by_ups',store=False,readonly=False)
+    line_ids_material_ups7 = fields.One2many('sos_proposal_boq_material', 'ref_id', string="Material UPS 7",compute='_compute_line_ids_by_ups',store=False,readonly=False)
+    line_ids_material_ups8 = fields.One2many('sos_proposal_boq_material', 'ref_id', string="Material UPS 8",compute='_compute_line_ids_by_ups',store=False,readonly=False)
+    line_ids_material_ups9 = fields.One2many('sos_proposal_boq_material', 'ref_id', string="Material UPS 9",compute='_compute_line_ids_by_ups',store=False,readonly=False)
+    line_ids_material_ups10 = fields.One2many('sos_proposal_boq_material', 'ref_id', string="Material UPS 10",compute='_compute_line_ids_by_ups',store=False,readonly=False)
+    line_ids_material_ups11 = fields.One2many('sos_proposal_boq_material', 'ref_id', string="Material UPS 11",compute='_compute_line_ids_by_ups',store=False,readonly=False)
+    line_ids_material_ups12 = fields.One2many('sos_proposal_boq_material', 'ref_id', string="Material UPS 12",compute='_compute_line_ids_by_ups',store=False,readonly=False)
+    line_ids_material_ups13 = fields.One2many('sos_proposal_boq_material', 'ref_id', string="Material UPS 13",compute='_compute_line_ids_by_ups',store=False,readonly=False)
+    line_ids_material_ups14 = fields.One2many('sos_proposal_boq_material', 'ref_id', string="Material UPS 14",compute='_compute_line_ids_by_ups',store=False,readonly=False)
+    line_ids_material_ups15 = fields.One2many('sos_proposal_boq_material', 'ref_id', string="Material UPS 15",compute='_compute_line_ids_by_ups',store=False,readonly=False)
 
 
     #Installation Kit Fields
@@ -206,6 +216,454 @@ class Battery_Installation_Requirement(models.Model):
     line_ids_spare_ups13 = fields.One2many('sos_proposal_line_spare_ups13','ref_id', string="Spare UPS 13")
     line_ids_spare_ups14 = fields.One2many('sos_proposal_line_spare_ups14','ref_id', string="Spare UPS 14")
     line_ids_spare_ups15 = fields.One2many('sos_proposal_line_spare_ups15','ref_id', string="Spare UPS 15")
+    def _compute_merged_spare_html(self):
+        for rec in self:
+            # Collect lines from ups1..ups15 (skip models that don't exist)
+            models = [f'sos_proposal_line_spare_ups{i}' for i in range(1, 16)]
+
+            agg = defaultdict(float)  # (component_id, uom, currency_id, unit_price) -> qty
+            name_map, curr_map, price_map = {}, {}, {}
+
+            for model in models:
+                if model not in self.env:
+                    continue
+                for l in self.env[model].search([('ref_id', '=', rec.id)]):
+                    unit_price = l.unit_price or 0.0
+                    curr_id = l.currency_id.id if l.currency_id else False
+                    key = (l.component_id.id, l.uom, curr_id, unit_price)
+
+                    agg[key] += float(l.quantity or 0)
+                    if key not in name_map:
+                        # Use part number (fallback to component name if needed)
+                        name_map[key] = (getattr(l.component_id, 'part_no', False) or l.component_id.name or '')
+                        curr_map[key] = l.currency_id if l.currency_id else False
+                        price_map[key] = unit_price
+
+            rows_sorted = sorted(agg.items(), key=lambda it: name_map[it[0]].lower())
+            if not rows_sorted:
+                rec.merged_spare_html = "<em>No Material items.</em>"
+                continue
+
+            def fmt_price(amount, currency):
+                return format_amount(self.env, amount, currency) if currency else f"{amount:.2f}"
+
+            total_sum = 0.0
+            rows_html = ""
+            for key, qty in rows_sorted:
+                if not qty:
+                    continue
+                total_price = qty * price_map[key]
+                total_sum += total_price
+                rows_html += (
+                    f"<tr>"
+                    f"<td>{name_map[key]}</td>"
+                    f"<td>{key[1] or ''}</td>"
+                    f"<td style='text-align:right'>{fmt_price(price_map[key], curr_map[key])}</td>"
+                    f"<td style='text-align:right'>{qty:.2f}</td>"
+                    f"<td style='text-align:right'>{fmt_price(total_price, curr_map[key])}</td>"
+                    f"</tr>"
+                )
+
+            if not rows_html:
+                rec.merged_spare_html = "<em>No Material items.</em>"
+                continue
+
+            currency_for_total = curr_map[rows_sorted[0][0]] if rows_sorted else False
+            rows_html += (
+                f"<tr style='font-weight:bold;'>"
+                f"<td colspan='4' style='text-align:right'>Grand Total:</td>"
+                f"<td style='text-align:right'>{fmt_price(total_sum, currency_for_total)}</td>"
+                f"</tr>"
+            )
+
+            rec.merged_spare_html = f"""
+                <table class="table table-sm" style="width:100%;">
+                <thead>
+                    <tr>
+                    <th><b>Material Name</b></th>
+                    <th><b>UoM</b></th>
+                    <th style="text-align:right"><b>Unit Price</b></th>
+                    <th style="text-align:right"><b>Total Qty</b></th>
+                    <th style="text-align:right"><b>Total Price</b></th>
+                    </tr>
+                </thead>
+                <tbody>{rows_html}</tbody>
+                </table>
+            """
+    def _compute_merged_miscellaneous_html(self):
+        for rec in self:
+            lines = self.env['sos_proposal_miscellaneous_items'].search([('ref_id', '=', rec.id)])
+
+            # Group by (component, currency, cost)
+            agg = defaultdict(float)
+            name_map = {}
+            curr_map = {}
+            price_map = {}
+
+            for l in lines:
+                cost = l.cost or 0.0
+                curr_id = l.currency_id.id if l.currency_id else False
+                key = (l.name, curr_id, cost)
+
+                agg[key] += float(l.quantity or 0)
+                if key not in name_map:
+                    name_map[key] = l.name or ''
+                    curr_map[key] = l.currency_id if l.currency_id else False
+                    price_map[key] = cost
+
+            rows_sorted = sorted(agg.items(), key=lambda it: name_map[it[0]].lower())
+            if not rows_sorted:
+                rec.merged_miscellaneous_html = "<em>No Miscellaneous items.</em>"
+                continue
+
+            def fmt_price(amount, currency):
+                if currency:
+                    return format_amount(self.env, amount, currency)
+                return f"{amount:.2f}"
+
+            total_sum = 0.0
+            rows_html = ""
+            for key, qty in rows_sorted:
+                if not qty:  # Skip rows with qty = 0
+                    continue
+                total_price = qty * price_map[key]
+                total_sum += total_price
+                rows_html += (
+                    f"<tr>"
+                    f"<td>{name_map[key]}</td>"
+                    f"<td style='text-align:right'>{fmt_price(price_map[key], curr_map[key])}</td>"
+                    f"<td style='text-align:right'>{qty:.2f}</td>"
+                    f"<td style='text-align:right'>{fmt_price(total_price, curr_map[key])}</td>"
+                    f"</tr>"
+                )
+
+            if not rows_html:  # If all rows were skipped
+                rec.merged_miscellaneous_html = "<em>No Miscellaneous items.</em>"
+                continue
+
+            # Add grand total row
+            currency_for_total = curr_map[rows_sorted[0][0]] if rows_sorted else False
+            rows_html += (
+                f"<tr style='font-weight:bold;'>"
+                f"<td colspan='3' style='text-align:right'>Grand Total:</td>"
+                f"<td style='text-align:right'>{fmt_price(total_sum, currency_for_total)}</td>"
+                f"</tr>"
+            )
+
+            rec.merged_miscellaneous_html = f"""
+                <table class="table table-sm" style="width:100%;">
+                <thead>
+                    <tr>
+                    <th><b>Name</b></th>
+                    <th style="text-align:right"><b>Unit Price</b></th>
+                    <th style="text-align:right"><b>Total Qty</b></th>
+                    <th style="text-align:right"><b>Total Price</b></th>
+                    </tr>
+                </thead>
+                <tbody>{rows_html}</tbody>
+                </table>
+            """
+    def _compute_merged_installation_kit_html(self):
+        for rec in self:
+            lines = self.env['sos_proposal_line_material_installation'].search([('ref_id', '=', rec.id)])
+
+            # Group by (component, uom, currency, unit_price)
+            agg = defaultdict(float)
+            name_map = {}
+            curr_map = {}
+            price_map = {}
+
+            for l in lines:
+                unit_price = l.unit_price or 0.0
+                curr_id = l.currency_id.id if l.currency_id else False
+                key = (l.component_id.id, l.uom, curr_id, unit_price)
+
+                agg[key] += float(l.quantity or 0)
+                if key not in name_map:
+                    name_map[key] = l.component_id.part_no or ''
+                    curr_map[key] = l.currency_id if l.currency_id else False
+                    price_map[key] = unit_price
+
+            rows_sorted = sorted(agg.items(), key=lambda it: name_map[it[0]].lower())
+            if not rows_sorted:
+                rec.merged_installation_kit_html = "<em>No Material items.</em>"
+                continue
+
+            def fmt_price(amount, currency):
+                if currency:
+                    return format_amount(self.env, amount, currency)
+                return f"{amount:.2f}"
+
+            total_sum = 0.0
+            rows_html = ""
+            for key, qty in rows_sorted:
+                if not qty:  # Skip rows with qty = 0
+                    continue
+                total_price = qty * price_map[key]
+                total_sum += total_price
+                rows_html += (
+                    f"<tr>"
+                    f"<td>{name_map[key]}</td>"
+                    f"<td>{key[1] or ''}</td>"
+                    f"<td style='text-align:right'>{fmt_price(price_map[key], curr_map[key])}</td>"
+                    f"<td style='text-align:right'>{qty:.2f}</td>"
+                    f"<td style='text-align:right'>{fmt_price(total_price, curr_map[key])}</td>"
+                    f"</tr>"
+                )
+
+            if not rows_html:  # If all rows were skipped
+                rec.merged_installation_kit_html = "<em>No Material items.</em>"
+                continue
+
+            # Add grand total row
+            currency_for_total = curr_map[rows_sorted[0][0]] if rows_sorted else False
+            rows_html += (
+                f"<tr style='font-weight:bold;'>"
+                f"<td colspan='4' style='text-align:right'>Grand Total:</td>"
+                f"<td style='text-align:right'>{fmt_price(total_sum, currency_for_total)}</td>"
+                f"</tr>"
+            )
+
+            rec.merged_installation_kit_html = f"""
+                <table class="table table-sm" style="width:100%;">
+                <thead>
+                    <tr>
+                    <th><b>Material Name</b></th>
+                    <th><b>UoM</b></th>
+                    <th style="text-align:right"><b>Unit Price</b></th>
+                    <th style="text-align:right"><b>Total Qty</b></th>
+                    <th style="text-align:right"><b>Total Price</b></th>
+                    </tr>
+                </thead>
+                <tbody>{rows_html}</tbody>
+                </table>
+            """
+    def _compute_merged_material_html(self):
+        for rec in self:
+            lines = self.env['sos_proposal_boq_material'].search([('ref_id', '=', rec.id)])
+
+            # Group by (component, uom, currency, unit_price)
+            agg = defaultdict(float)
+            name_map = {}
+            curr_map = {}
+            price_map = {}
+
+            for l in lines:
+                unit_price = l.unit_price or 0.0
+                curr_id = l.currency_id.id if l.currency_id else False
+                key = (l.component_id.id, l.uom, curr_id, unit_price)
+
+                agg[key] += float(l.quantity or 0)
+                if key not in name_map:
+                    name_map[key] = l.component_id.part_no or ''
+                    curr_map[key] = l.currency_id if l.currency_id else False
+                    price_map[key] = unit_price
+
+            rows_sorted = sorted(agg.items(), key=lambda it: name_map[it[0]].lower())
+            if not rows_sorted:
+                rec.merged_material_html = "<em>No Material items.</em>"
+                continue
+
+            def fmt_price(amount, currency):
+                if currency:
+                    return format_amount(self.env, amount, currency)
+                return f"{amount:.2f}"
+
+            total_sum = 0.0
+            rows_html = ""
+            for key, qty in rows_sorted:
+                if not qty:  # Skip rows with qty = 0
+                    continue
+                total_price = qty * price_map[key]
+                total_sum += total_price
+                rows_html += (
+                    f"<tr>"
+                    f"<td>{name_map[key]}</td>"
+                    f"<td>{key[1] or ''}</td>"
+                    f"<td style='text-align:right'>{fmt_price(price_map[key], curr_map[key])}</td>"
+                    f"<td style='text-align:right'>{qty:.2f}</td>"
+                    f"<td style='text-align:right'>{fmt_price(total_price, curr_map[key])}</td>"
+                    f"</tr>"
+                )
+
+            if not rows_html:  # If all rows were skipped
+                rec.merged_material_html = "<em>No Material items.</em>"
+                continue
+
+            # Add grand total row
+            currency_for_total = curr_map[rows_sorted[0][0]] if rows_sorted else False
+            rows_html += (
+                f"<tr style='font-weight:bold;'>"
+                f"<td colspan='4' style='text-align:right'>Grand Total:</td>"
+                f"<td style='text-align:right'>{fmt_price(total_sum, currency_for_total)}</td>"
+                f"</tr>"
+            )
+
+            rec.merged_material_html = f"""
+                <table class="table table-sm" style="width:100%;">
+                <thead>
+                    <tr>
+                    <th><b>Material Name</b></th>
+                    <th><b>UoM</b></th>
+                    <th style="text-align:right"><b>Unit Price</b></th>
+                    <th style="text-align:right"><b>Total Qty</b></th>
+                    <th style="text-align:right"><b>Total Price</b></th>
+                    </tr>
+                </thead>
+                <tbody>{rows_html}</tbody>
+                </table>
+            """
+    def _compute_merged_sfg_html(self):
+        for rec in self:
+            lines = self.env['sos_proposal_boq_sfg'].search([('ref_id', '=', rec.id)])
+
+            # Group by (component, uom, currency, unit_price)
+            agg = defaultdict(float)
+            name_map = {}
+            curr_map = {}
+            price_map = {}
+
+            for l in lines:
+                unit_price = l.unit_price or 0.0
+                curr_id = l.currency_id.id if l.currency_id else False
+                key = (l.component_id.id, l.uom, curr_id, unit_price)
+
+                agg[key] += float(l.quantity or 0)
+                if key not in name_map:
+                    name_map[key] = l.component_id.name or ''
+                    curr_map[key] = l.currency_id if l.currency_id else False
+                    price_map[key] = unit_price
+
+            rows_sorted = sorted(agg.items(), key=lambda it: name_map[it[0]].lower())
+            if not rows_sorted:
+                rec.merged_sfg_html = "<em>No SFG items.</em>"
+                continue
+
+            def fmt_price(amount, currency):
+                if currency:
+                    return format_amount(self.env, amount, currency)
+                return f"{amount:.2f}"
+
+            total_sum = 0.0
+            rows_html = ""
+            for key, qty in rows_sorted:
+                if not qty:  # Skip rows with qty = 0
+                    continue
+                total_price = qty * price_map[key]
+                total_sum += total_price
+                rows_html += (
+                    f"<tr>"
+                    f"<td>{name_map[key]}</td>"
+                    f"<td>{key[1] or ''}</td>"
+                    f"<td style='text-align:right'>{fmt_price(price_map[key], curr_map[key])}</td>"
+                    f"<td style='text-align:right'>{qty:.2f}</td>"
+                    f"<td style='text-align:right'>{fmt_price(total_price, curr_map[key])}</td>"
+                    f"</tr>"
+                )
+
+            if not rows_html:  # If all rows were skipped
+                rec.merged_sfg_html = "<em>No SFG items.</em>"
+                continue
+
+            # Add grand total row
+            currency_for_total = curr_map[rows_sorted[0][0]] if rows_sorted else False
+            rows_html += (
+                f"<tr style='font-weight:bold;'>"
+                f"<td colspan='4' style='text-align:right'>Grand Total:</td>"
+                f"<td style='text-align:right'>{fmt_price(total_sum, currency_for_total)}</td>"
+                f"</tr>"
+            )
+
+            rec.merged_sfg_html = f"""
+                <table class="table table-sm" style="width:100%;">
+                <thead>
+                    <tr>
+                    <th><b>SFG Name</b></th>
+                    <th><b>UoM</b></th>
+                    <th style="text-align:right"><b>Unit Price</b></th>
+                    <th style="text-align:right"><b>Total Qty</b></th>
+                    <th style="text-align:right"><b>Total Price</b></th>
+                    </tr>
+                </thead>
+                <tbody>{rows_html}</tbody>
+                </table>
+            """
+    def _compute_merged_fg_html(self):
+        for rec in self:
+            lines = self.env['sos_proposal_boq_fg'].search([('ref_id', '=', rec.id)])
+
+            # Group by (component, uom, currency, unit_price)
+            agg = defaultdict(float)
+            name_map = {}
+            curr_map = {}
+            price_map = {}
+
+            for l in lines:
+                unit_price = l.unit_price or 0.0
+                curr_id = l.currency_id.id if l.currency_id else False
+                key = (l.component_id.id, l.uom, curr_id, unit_price)
+
+                agg[key] += float(l.quantity or 0)
+                if key not in name_map:
+                    name_map[key] = l.component_id.name or ''
+                    curr_map[key] = l.currency_id if l.currency_id else False
+                    price_map[key] = unit_price
+
+            rows_sorted = sorted(agg.items(), key=lambda it: name_map[it[0]].lower())
+            if not rows_sorted:
+                rec.merged_fg_html = "<em>No FG items.</em>"
+                continue
+
+            def fmt_price(amount, currency):
+                if currency:
+                    return format_amount(self.env, amount, currency)
+                return f"{amount:.2f}"
+
+            total_sum = 0.0
+            rows_html = ""
+            for key, qty in rows_sorted:
+                if not qty:  # Skip rows with qty = 0
+                    continue
+                total_price = qty * price_map[key]
+                total_sum += total_price
+                rows_html += (
+                    f"<tr>"
+                    f"<td>{name_map[key]}</td>"
+                    f"<td>{key[1] or ''}</td>"
+                    f"<td style='text-align:right'>{fmt_price(price_map[key], curr_map[key])}</td>"
+                    f"<td style='text-align:right'>{qty:.2f}</td>"
+                    f"<td style='text-align:right'>{fmt_price(total_price, curr_map[key])}</td>"
+                    f"</tr>"
+                )
+
+            if not rows_html:  # If all rows were skipped
+                rec.merged_fg_html = "<em>No FG items.</em>"
+                continue
+
+            # Add grand total row
+            currency_for_total = curr_map[rows_sorted[0][0]] if rows_sorted else False
+            rows_html += (
+                f"<tr style='font-weight:bold;'>"
+                f"<td colspan='4' style='text-align:right'>Grand Total:</td>"
+                f"<td style='text-align:right'>{fmt_price(total_sum, currency_for_total)}</td>"
+                f"</tr>"
+            )
+
+            rec.merged_fg_html = f"""
+                <table class="table table-sm" style="width:100%;">
+                <thead>
+                    <tr>
+                    <th><b>FG Name</b></th>
+                    <th><b>UoM</b></th>
+                    <th style="text-align:right"><b>Unit Price</b></th>
+                    <th style="text-align:right"><b>Total Qty</b></th>
+                    <th style="text-align:right"><b>Total Price</b></th>
+                    </tr>
+                </thead>
+                <tbody>{rows_html}</tbody>
+                </table>
+            """
+
     @api.model
     def create(self, vals):
         res = super().create(vals)
@@ -662,10 +1120,22 @@ class Battery_Installation_Requirement(models.Model):
             record.total_fg_cost = sum(line.total_price for line in record.line_ids_fg)
     def action_ce_esign_btn(self):
         body_html = f"""
-        <p>Below <b>Proposal</b> is waiting for your Updation</p>
+            <p>Below <b>BOQ</b> is waiting for your updation.</p>
+            <p><b>Customer Name:</b> {self.customer_name or ''}</p>
+            <p><b>Location:</b> {self.location or ''}</p>
+            <p><b>Number of Batteries:</b> {self.number_of_batteries or ''}</p>
         """
+
         sequence_util = self.env['sos_common_scripts']
-        sequence_util.send_group_email(self.env,'sos_proposal_boq',self.id,"deenalaura.m@sosaley.in","Proposal System - BOQ Submitted",body_html,'sos_inventory.sos_finance_user')
+        sequence_util.send_group_email(
+                self.env,
+                'sos_proposal_boq',
+                self.id,
+                "deenalaura.m@sosaley.in",
+                f"Proposal System - BOQ Submitted for {self.customer_name}",
+                body_html,
+                'sos_inventory.sos_finance_user'
+            )
         return sequence_util.action_assign_signature(
         self, 
         'boq_submitted_by_name',
diff --git a/sos_sales/models/sos_sales_achievement_report.py b/sos_sales/models/sos_sales_achievement_report.py
index 25b26ca..7bb5410 100755
--- a/sos_sales/models/sos_sales_achievement_report.py
+++ b/sos_sales/models/sos_sales_achievement_report.py
@@ -694,16 +694,31 @@ class SOS_Sales_Achievement_Report_Brief(models.Model):
                         report.write({
                             new_field_billed: (getattr(report, new_field_billed, 0.0) or 0.0) + new_billed_amount
                         })
-                    # Optionally create billing collection entry (if needed)
-            if new_billed_amount > 0:
+                    # Optionally create billing collection entry (if needed
+            domain = [
+                ('ref_id', '=', report.id),
+                ('sales_person', '=', report.sales_person.id),
+                ('customer_name', '=', vals.get('customer_name', rec.customer_name.id))
+            ]
+
+            existing = self.env['sos_billing_collection'].search(domain, limit=1)
+
+            if not existing:
                 self.env['sos_billing_collection'].create({
                     'ref_id': report.id,
                     'customer_name': vals.get('customer_name', rec.customer_name.id),
                     'sales_person': report.sales_person.id,
                     'action_status': 'Billed',
                     'date_of_action': new_billed_date,
+                    'po_no':vals.get('po_no'),
                     'value': new_billed_amount
                 })
+            else:
+                existing.write({
+                        'value': new_billed_amount, 
+                        'po_no':vals.get('po_no'),
+                        'date_of_action': new_billed_date
+                })
 
         return super(SOS_Sales_Achievement_Report_Brief, self).write(vals)
 
@@ -748,7 +763,8 @@ class SOS_Sales_Achievement_Report_Brief(models.Model):
                     'sales_person': report.sales_person.id,
                     'action_status': 'Billed',
                     'date_of_action': billed_date,
-                    'value': billed_value
+                    'value': billed_value,
+                    'po_no':vals.get('po_no')
                 })
         new_record = super(SOS_Sales_Achievement_Report_Brief, self).create(vals)
         return new_record
diff --git a/sos_sales/views/sos_proposal_boq_view.xml b/sos_sales/views/sos_proposal_boq_view.xml
index 28e00a0..f70bcc1 100755
--- a/sos_sales/views/sos_proposal_boq_view.xml
+++ b/sos_sales/views/sos_proposal_boq_view.xml
@@ -40,6 +40,7 @@
                 
 <notebook>
 <!-- Page 1 -->
+
     <page string="UPS 1" invisible="number_of_ups &lt; 1">
     <h3 style="text-transform: uppercase;
     text-decoration: underline;">Finished Goods</h3>
@@ -1654,115 +1655,38 @@
     </div>
 </div>
     </page>
-<!-- <page string="Finished Goods">
-<field name="line_ids_fg">
-<tree editable="bottom">
-<field name="production_cost" widget="boolean_toggle"/>
-<field name="component_id"/>
-<field name="description"/>
-<field name="item_type"/>
-<field name="uom"/>
-<field name="unit_price" groups="sos_inventory.sos_management_user,sos_inventory.sos_finance_user,sos_inventory.sos_scg_group_user"/>
-<field name="singet_set_qty"/>
-<field name="total_set"/>
-<field name="quantity"/>
-<field name="total_price" groups="sos_inventory.sos_management_user,sos_inventory.sos_finance_user,sos_inventory.sos_scg_group_user"/>
-</tree>
-</field>
-<group style="float: right;
-    font-weight: bold;
-    font-size: 18px;">
-    <field name="total_fg_cost"/>
-    </group>
-</page> -->
-<!-- <page string="Semi Finished Goods">
-<field name="line_ids_sfg">
-<tree editable="bottom">
-<field name="production_cost" widget="boolean_toggle"/>
-<field name="component_id"/>
-<field name="description"/>
-<field name="item_type"/>
-<field name="uom"/>
-<field name="unit_price" groups="sos_inventory.sos_management_user,sos_inventory.sos_finance_user,sos_inventory.sos_scg_group_user"/>
-<field name="singet_set_qty"/>
-<field name="total_set"/>
-<field name="quantity"/>
-<field name="total_price" groups="sos_inventory.sos_management_user,sos_inventory.sos_finance_user,sos_inventory.sos_scg_group_user"/>
-</tree>
-</field>
-             <group style="float: right;
-    font-weight: bold;
-    font-size: 18px;">
-    <field name="total_sfg_cost"/>
-    </group>
-</page> -->
-<!-- <page string="Materials">
-<field name="line_ids_material">
-<tree editable="bottom">
-<field name="production_cost" widget="boolean_toggle"/>
-<field name="component_id"/>
-<field name="item_type"/>
-<field name="description"/>
-<field name="uom"/>
-<field name="unit_price" groups="sos_inventory.sos_management_user,sos_inventory.sos_finance_user,sos_inventory.sos_scg_group_user"/>
-<field name="singet_set_qty"/>
-<field name="total_set"/>
-<field name="quantity"/>
-<field name="total_price" groups="sos_inventory.sos_management_user,sos_inventory.sos_finance_user,sos_inventory.sos_scg_group_user"/>
-</tree>
-</field>
-         <group style="float: right;
-    font-weight: bold;
-    font-size: 18px;">
-    <field name="total_material_cost"/>
-    </group>
-</page> -->
-<!-- <page string="Installation Kit">
-<field name="line_ids_installation_kit">
-<tree editable="bottom">
-<field name="production_cost" widget="boolean_toggle"/>
-<field name="component_id"/>
-<field name="description"/>
-<field name="item_type"/>
-<field name="uom"/>
-<field name="unit_price" groups="sos_inventory.sos_management_user,sos_inventory.sos_finance_user,sos_inventory.sos_scg_group_user"/>
-<field name="singet_set_qty"/>
-<field name="total_set"/>
-<field name="quantity"/>
-<field name="total_price" groups="sos_inventory.sos_management_user,sos_inventory.sos_finance_user,sos_inventory.sos_scg_group_user"/>
-</tree>
-</field>
-     <group style="float: right;
-    font-weight: bold;
-    font-size: 18px;">
-    <field name="total_installation_material_cost"/>
-    </group>
+<page string="Summary" groups="sos_inventory.sos_management_user,sos_inventory.sos_finance_user">
+<h3 style="text-transform: uppercase;
+    text-decoration: underline;">Finished Goods</h3>
+  <field name="merged_fg_html" nolabel="1"/>
+<h3 style="text-transform: uppercase;
+    text-decoration: underline;">Semi-Finished Goods</h3>
+      <field name="merged_sfg_html" nolabel="1"/>
+<h3 style="text-transform: uppercase;
+    text-decoration: underline;">Materials</h3>
+    <field name="merged_material_html" nolabel="1"/>
+    <h3 style="text-transform: uppercase;
+    text-decoration: underline;">Installation Kit</h3>
+    <field name="merged_installation_kit_html" nolabel="1"/>
+    <h3 style="text-transform: uppercase;
+    text-decoration: underline;">Spare</h3>
+    <field name="merged_spare_html" nolabel="1"/>
+    
+     <h3 style="text-transform: uppercase;
+    text-decoration: underline;">Miscellaneous</h3>
+    <field name="merged_miscellaneous_html" nolabel="1"/>
+    
 </page>
-<page string="Miscellaneous">
-<field name="line_ids_miscellaneous">
-<tree editable="bottom">
-<field name="name"/>
-<field name="cost"/>
-<field name="quantity"/>
-<field name="total_price" groups="sos_inventory.sos_management_user,sos_inventory.sos_finance_user,sos_inventory.sos_scg_group_user"/>
-</tree>
-</field>
- <group style="float: right;
-    font-weight: bold;
-    font-size: 18px;">
-    <field name="total_miscellaneous_cost"/>
-    </group>
-</page> -->
 <page string="Installation &amp; Commissioning" invisible="proposal_id == False">
 
 <group><field name="engineers_nos"/></group>
 <group><field name="no_of_days"/></group>
 <br></br>
 <table class="table_custom" groups="sos_inventory.sos_management_user,sos_inventory.sos_finance_user">
-<thead><td></td><td><b>No of Persons</b></td><td><b>Cost</b></td></thead>
+<thead><td></td><td><b>No of Persons</b></td><td><b>Cost per Day</b></td></thead>
 <tbody>
-<tr><td><b>Man Month( 1 to 2 Yrs)</b></td><td><field name="man_month_1to2_yrs_persons"/></td><td><field name="man_month_1to2_yrs_cost"/></td></tr>
-<tr><td><b>Man Month( 2 to 3 Yrs)</b></td><td><field name="man_month_2to3_yrs_persons"/></td><td><field name="man_month_2to3_yrs_cost"/></td></tr>
+<tr><td><b>Man Month( 2 to 3 Yrs)</b></td><td><field name="man_month_1to2_yrs_persons"/></td><td><field name="man_month_1to2_yrs_cost"/></td></tr>
+<tr><td><b>Man Month( 3 to 5 Yrs)</b></td><td><field name="man_month_2to3_yrs_persons"/></td><td><field name="man_month_2to3_yrs_cost"/></td></tr>
 <tr><td><b>Man Month(Manager)</b></td><td><field name="man_month_manager_persons"/></td><td><field name="man_month_manager_cost"/></td></tr>
 <tr><td><b>Total</b></td><td colspan="2"><field name="iandc_costing"/></td></tr>
 </tbody>
-- 
2.34.1


From 611cb5e418004ff4db8851eab869a6ca443c43c5 Mon Sep 17 00:00:00 2001
From: Deena <deenalaura.m@sosaley.in>
Date: Mon, 11 Aug 2025 16:26:29 +0530
Subject: [PATCH 3/3] Reference #9

---
 sos_inventory/__manifest__.py                 |   1 +
 .../sos_deliverables_boq.cpython-310.pyc      | Bin 12598 -> 14117 bytes
 .../sos_dock_audit.cpython-310.pyc            | Bin 20128 -> 20283 bytes
 .../__pycache__/sos_fir.cpython-310.pyc       | Bin 10711 -> 11361 bytes
 .../sos_inventory_customers.cpython-310.pyc   | Bin 1280 -> 1644 bytes
 .../models/__pycache__/sos_ir.cpython-310.pyc | Bin 13254 -> 13422 bytes
 .../sos_sales_order.cpython-310.pyc           | Bin 5815 -> 5493 bytes
 sos_inventory/models/sos_deliverables_boq.py  |  48 +++
 sos_inventory/models/sos_dock_audit.py        |  15 +-
 sos_inventory/models/sos_fir.py               |  32 +-
 .../models/sos_inventory_customers.py         |  24 +-
 sos_inventory/models/sos_ir.py                |   9 +
 sos_inventory/models/sos_sales_order.py       |  20 +-
 sos_inventory/report/sos_boq_labels.xml       | 303 +++++++++++-------
 sos_inventory/report/sos_boq_report.xml       | 100 ++++++
 sos_inventory/report/sos_fir_report.xml       |  26 +-
 .../views/sos_deliverables_boq_view.xml       |  58 +++-
 sos_inventory/views/sos_dock_audit_view.xml   |   2 +
 sos_inventory/views/sos_fir_view.xml          |  12 +-
 .../views/sos_order_delivery_plan_view.xml    |   2 +-
 20 files changed, 489 insertions(+), 163 deletions(-)
 create mode 100755 sos_inventory/report/sos_boq_report.xml

diff --git a/sos_inventory/__manifest__.py b/sos_inventory/__manifest__.py
index 90f48b2..5408d67 100755
--- a/sos_inventory/__manifest__.py
+++ b/sos_inventory/__manifest__.py
@@ -114,6 +114,7 @@
         'report/mme_history_card_report.xml',
         'report/sos_boq_labels.xml',
         'report/shelflife_report.xml',
+        'report/sos_boq_report.xml',
         'data/send_indent_plan_email_template.xml',
         'data/selection_item.xml'
         
diff --git a/sos_inventory/models/__pycache__/sos_deliverables_boq.cpython-310.pyc b/sos_inventory/models/__pycache__/sos_deliverables_boq.cpython-310.pyc
index 36ffa6638c1e115df553ac5d1599f0f20bc1aeb2..bb729ebc4f951fc13c42b9ced37913b111cb8f49 100644
GIT binary patch
delta 5417
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
Z%rJ_>?#n-xzQK}uAg3&6U5+JR_aD}4Lb(6{

delta 4058
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

diff --git a/sos_inventory/models/__pycache__/sos_dock_audit.cpython-310.pyc b/sos_inventory/models/__pycache__/sos_dock_audit.cpython-310.pyc
index 0b3a6b537c9b6ae5bc00166ca95d7fa5e6322fed..5f36228a58f8b572facc4871987127e683f538d9 100644
GIT binary patch
delta 6139
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
AfdBvi

delta 6186
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
ZUA{(q99Wz?;@aZc<Qi~Qy4IIC{sk}STHgQw

diff --git a/sos_inventory/models/__pycache__/sos_fir.cpython-310.pyc b/sos_inventory/models/__pycache__/sos_fir.cpython-310.pyc
index 26b6fed1bba3d36dcfed420e84dcd0c3393259a1..427b994ceb759568a500e023268f3b17ab21f6df 100644
GIT binary patch
delta 2524
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
Toa_>RIyyUNU~G77=$7!Gj^CxJ

delta 1995
zcma)+U2IfU5P*BO+fugOb-M++?H1bIQs_bz1fo$|N?Tee(3VnB1aY~&=g__M?%wv?
zZL$89pQ??BA_Jm{@)H__X!vmxf=XiWNun_bO7+SMfk2E8#DphbaONx$V|bv=emgre
zXJ+oq+;eU1c$d%edOcbA2a9*c_su`;o6lT#T<Ip(<{DmjsFtrd%=k*)Hj=f2t*a9Y
z4=v*Dyo0aeorm3gHSbdTdj1SwGm^D#G1?pW3jXY27k`egRklW@dmf{#<Li~C=|5gC
z@C{10gulpR7@?VO<Qjgr@NTZxps<v4F7SI99;)S=Fia1Rt0S%4;G5C1ocDHRMa^`F
zyD}GYyrbEFvpU%0ZFK#?;EFf$xZ^UoT!ar8bvdrb<~nZENDBD~Dr6xcfN(sureUXa
zE77;870P^Tis*ooEs}#yt}QgF$7K_2^Tk+m`kJqd`P=Da2VoVV6TJQltP{rlf3an7
zp|G2+hnm3H9D|IRP<?%g<1XnZ#Rh`PeZK&?0CgJN4eVwK*j*GU>3x9DT-3$k`=U?g
zQAnwRCrEmb^P^}m$w+v)3VtuDN`EtH5@R;}JoyP`r1PijVkOJa=oIz{?1+{UF<bNx
zh@>v00jG<nR64o36sULdy0w%ZkF{G)UjKlWOc|*m`4R<hf?LIcHA7plk=g0pK{xaF
zlRlsD3gJ~4D`}iddE^^}Cc>MDs5{e*ohUmVTO@f*Bs9a6qo{!1U<u4A&1d^zVd)QH
zXQGWYX=W^G$t~pX<-#-ug&c};tWWksBviw8K}V>xS*6;BP7(+z-(Hfo6S5JGdkH;M
zPRioiP^Ok_RSV6U(#TQxEHs-Ph4IkV>if^*WVf`gmIW9f>XItUa7I=`9fjetVs;kx
zmnCu!P?8|ro)(12)EagUI;P%MN?8v}rtM?n;7rrl5vVN>RXRmR((V&_%CM3#E_B02
zA?lSBBa@{SHka3ws^>UD%1;T$2*(M_;Z%7!TLBl#i%Z5x@xRSFh`Jy5RJ5T>d&LI!
z5qw@zQb@ydCUyxklUN>rD;3l8)mo`G?S-6h-K^#0RiO3tNo!E>SU*mkmd?p(F)b}6
z)$UoSkgtIm4z7KjY(6QrSh5%0b!#A*lJAl-zh8@W55<gx)+6M5bYe5%1F}uFQ<fBV
zObT7#Nclal{p2u00Js{i8dh)IR{H%R!YQyZfhIZ4UsG?Q<IzoP;GTlsO2@m&kclmt
z6d9*ZI_xGxo|V+&S`uq%qn{q#O4=!@;UJ_&PI1ys;Gz$g(pImggtsG}(s#)CKH+16
zk8p@^5KctGYy>Vw+KXL&=3$eVpZQ&$`=30PeyTFWaOP{K8<QRPs)nvEc?FLicRB8s
zhSrtxSGY8N!N!vm?G)iO;R`~VKzl2{BFrY7BdBdSN>T%%k)SSxFG*6%afT$dFyE1M
z4C@T$Tte|C?5GN}OHf}u6~3)H$u6hmi~y^9i2T)f+6m~IX>{YAk=fco1MiG8aDHYK
z_v_D@^TSus=?;Eux?S_K+|12<*chMs4={N(U0>bIo>Xg?ZE)KOXoL9fYu%=ZZR&|7
zwS=%Ac&*)_c<^;}>B@&JHFHm?e(k`s@+{#dfmT8OM7Tk1$-R!^-7GL?m9p!qFJrUb
z(l3*J1|dlJg)mO|jX)EW^APRP0{O57shOx7DKjTZ9=e4=ybK#g_shQxD_}t;Z^8N5
dtNk=HNnMpxCMr)vis9*+iV0f47s#LD`v;Ax7c2k(

diff --git a/sos_inventory/models/__pycache__/sos_inventory_customers.cpython-310.pyc b/sos_inventory/models/__pycache__/sos_inventory_customers.cpython-310.pyc
index 2d548e467efc3716f6f4628249bc15bc572e7977..7fc552896dc8dc495ac19a7cd22d226b0567941e 100644
GIT binary patch
delta 750
zcmYLHJ#W)M7`_jGoRc&ZT1rzy6a=b>ge*WXQFUVOQcx!pjL%J-UTo)VQiyB?ks`{7
zEG9ro*ce$EnfMJiut(xY@Lt-gC%uo~kLTX6^V`b5T0LG`svtO*|9n39YW=MD@VE*l
z1EC=4FMu3R5yvx}Se#7p3>73NaxVj%U``KBxz|P9_>MoK4`?5AlUv8EpgGm?!pPB-
zcF_zMW^O(~&+iphZuN}h?pZDycsB4@W<o||g2&umM-vRxjl#)|+{qozuA%p&fr?6A
z$=MLeXPLzvo#qST-~+6FGbi{R9y}gwX7&V4Sq=^FqIPXZ+AxAba}z#oXLKo%;n2&1
zmI(V{7Vwds46~NV_{agpZHaNlT}8nGAQDBx$XCRVmF>s<#EagjsvpZFmR=Udk&hwk
z`5~a_Dk~sq6W|2F6s*9o0$3ufkQ8V@z=9=0Z)8X6-M5LdWsnHZ50sf^O&KQOG9s@Z
zDB~!W{0COfO9&r|FwM$M`t*jX_#*J4j^=FWY8C*)b<FVSLHUBN-}GewL%Lfc_C1kq
zyBGYq=FaW%A=$-Fc|z_#Qr0QET~$UJh<#-Y;f`WaaI~l(bqQ5JH#>`5<zM2it^}{4
zr7-F)cxQnsz225<a78vW+yYnzN$&t$A<Kl3n!(HpS@c_eqF0R?8#Q&;<!^d?Tl3XY
x2a<Vd>IXt}I&vL+r{HR>QTB`j_rkf*bTP%Y`Z0ecf^GdSss4*sp-v62(f`Ug!8!l{

delta 392
zcmYL@&q~8U5XN`*Ut+K&TESW*^`M7>6ny|swnuxZR|%zwmKtlj2`$J5#puc7-V`By
z1h0ax(L<iVg3n;xXu*N+w==Wf2lKUhXBDpt1q<o=Y&`X5^sU&3TT_p@h*tQlAt6N`
zOkv19oWc~vSYpwPG!yX1B@<1FQgVT&5EDrn=xjfxlJ@D)S^8PTmTp=`31~+p<`PRT
zxkon9Bi=%>Aq~mKNE{zU++%tC1$kT=n#L<j;2uV`Q8_XqQ=$Z?D^efSMm4h~41HpT
z=1f0xsy;{?EVV`t_XN*BcvtwH$gi0h4gKIeqvK8xX6C@3xP#7>uO_sv-f2aZ$mxM7
z>4dEn?r5xI8(U!FB5V*FOu%4i@daJr1^%|p8%LdxvZ}L(-8`2ST(=u^!m#THf$IuK
V@BXlzcU3iGJ^O$8+f`MIJ3ld{TW$aV

diff --git a/sos_inventory/models/__pycache__/sos_ir.cpython-310.pyc b/sos_inventory/models/__pycache__/sos_ir.cpython-310.pyc
index b1577ced1ff0889b998025119dafae45556ccc4f..1cb55d4d457740040442d6e35405c488e850e1cb 100644
GIT binary patch
delta 2344
zcmb7EYiv_h96#sw_V#t#_1$%Ex~^--HdrTU2tgAxIv>%97)>B0?zCI)pdF_hBzj9t
z_#zOJ>G2b6x+TQu1Q9A<V8j=KF($_N$s3|0K@m(4Kk$Xb;QxQy!8H0|ZO-rf&;R{u
zFOJ+C^%UK1CxOq<=-Z=TZ9C<ON9b`e7}-XL#8f0)nWEc0WmP8{Vb&;_m339KYRVif
zyMbrp+YmKHcWZXdv4_IjJ?msHh8DojNh35*=O`th;bQJFiBEz=sd)iZ;kcP+S}uEl
zPgn!Q@aP`!-vI9hUil0!&HE_XzPaoLCyMUH1i;a!rny)1jam6o=GDC!e~ps~pp8tl
zAoD#)B$5g4)=|RzV=`X=`vATo1S|r~XWAjJ=ILDBQ{6-5z6<6@RdD6jLM$*QO;K*s
z9i?l!4Z<mKpkC&LJB;Ch4o)j&pKj+r>2{F&m~A7`B`v~2EPR+kl|HD_v6L8iQ*_6_
zI-}|pRci#5D2sqImu^{R?!vb2eh7jQM$NX#vy@TR$ZT^K2okNO1lCO$1ddf}HnG<J
z7Ld2X!F1c;C=B(Yta-Wt60@_GvR@|^a4ttlIiLq-+d&CJVKuCkwdsD=K4-%e3O7I^
zu@2~o#0P=yfN?F>w`SEpwk8PDRZ#0*yrJ5l7Q?+UIYHQ*n7KJ1sc%jft`5;US*O|X
zcYuzA@(kQvQ?!J4T=R;>XsB{j_rlB*SgSep#1!3qpnyqtgT?u}1>W7}KKWsvf{;Re
zpFrmv(5Ah)8)!eTFYjrTg}@rqUf$DMH<J|*wZd7}P8Oebm(e7pDbSfv-B}k7NDrC&
zV9J0_Y$U83?j-C;eV|$oOR=7sb<Q$EnUAeLES1B0*z^_FRx@9Olp}f=`qrygBK05I
z{e1|TbL_)8{_hz3m&ORyK7UV7hE#iX!q%|0Y+z2Ngr)z}3l1BX;Q`&RvURu(jBFvP
z^<rQ1({962nj9bBna}dlb-8+}*-z=Qs?p-1+YMhS%lG7mvzc*T+>>XZ!TaDpDCOo)
z!o@#8m`B)x@FBu6gckt}dnq@P87_j=N60&g@G-(u2&by)wgZ&*iG}t=iocAkBLIda
z&q{`MFV9b84QFXIyEB*Bna^eU6R0sGZnt+uFofaD7fR#V;fZ{)klB@;7%eifzN5=!
z=5QQ!Pl#Mc(pJmt6LF|xL*NXu&BUKU>MTI@YDbawv`|8vl9SfH9_pbgmFr(s3QA$1
zJyf~tl*MGMH>z4>DoHX`s00FqDtBbNllrMD&c-(S=GB*+G$=LIZB&c68@ol%i(8#X
zI=+FBDJyql_#XibTWRtY4XWS<vV{0E5D@3%ZS=M3<@i=gPm6S7(<-#$mk>$-DY<4Z
zkbzFPA>K@+>A~uSgpDc}k#j+O-@T8X6VD}M;RRqAj(mY-3lo__k^h44Rx#HV5;IAM
z>sQqO8evhKN;c6e;@jkY^=D*UMYu-9mHvp}snbeYZQwQ{4h=L{AM4p*p(n-beQ(e+
z!qK0u{D!*M5pE!Ggx?V?2!9~N5FSUki7<_D2LZ=r*oF!d*^w;gUn1)Sf;r0}q~1d?
zH((Gc3(Sk}MM^>{Lr8+~9r(VDFoW<pf{dV`P6#0^7W*5mu>ItS_^W>%wTXiRE#lcV
zKWw$5*nv<*6Bke~a24>?&~S0rc(H)Z%d`G_EA2tu2819Q_>l4<_z?o8Kx|4sVhscN
zomg1gw`1ikG8fkDLIfR}T`>D$wqmLFdg-;|qM-PN$PIMTC=}O98^!wr4@d8nXDFp&
zDU%yns_?CJQ+!3GTo?P(y==v$7`CPVf)$n1&<y2V#@d?@n#G2}%`TiD$2#G?2&?(-
MV9Xl!C&NvD1J*S|{r~^~

delta 2167
zcmb7^U2IfU5XaBC``P{ezLXZWyW5Z50xfM(d>~4KiXbE;C`KY#u(NIV7Ixw68lt)D
zhTsF5kW`Nk2Kvw<3JQw24~iN;BR**~MjjSTu%af4AAQgmAJmz%yC}#@o7~?$ch1b5
znfagX&lBgzeMPU=#qjUl15*<hwx9KN>-<hRqCda~<&++)?)a_ZF`2=@*3M?ErpK@u
z_E}!>nqI>J?nzDTz+HR8j&$PF2A*ka#iydY809j37~#inw>U{OJh!tQ>nZ`vVK)Pm
z5%Zi-(E-CdX%h#*X9lu9v{aqAP@z_41i-(VX)GJq2jmQaNvk-H3H<b>Gx7w#3M5-2
z)w9i1c<i+qAV8j&$!i25hz0y)wv|3H9jYB>gbX{lOjb3*s$x5YrtOuW=@cKDPOLfz
zjy25Gj0l7wa+qU}LF}>ZYFSszw(F)slZoOJgD7Tlo0k8?x@S3O`)<LL7;rT)>kJ1D
zF{nCbEqH{ETUZf>>vRM@He-=uWAyE~zZf4XwgVqK&~6Ocr~O!#6BbuOXk}n+XO*xS
zp6OIyoLYen=rlvHWY$3?6h6Zp4VF%7Q<`AZ{}R;dqvjomUvmc{=(-fT(3OixT*vWk
z;Ja&zm*^c=I)_o`$iF(H&x9F3DH7C(k~1;I_iZc0F(Qe(Pc$>oJ84wus)YWR;t;B<
z5-8Ov!G5zfGMbnUG>O!86Kl+>8+Wdo6(pv;l_=VK3_F%E*UXg!M|IX>MwQlT6W6IV
z47%~%gZel1GJ2sG`WoS5mT?Y#NFUZJF*Bx;#f(1i>#U-iv6(bvOg+y@?^ZP4ov0G2
z{{|vu@j^6JTGmntyKP(*QqzjHW=salVFe7#S~-Kk8>C^d5|1OThcL@9X$@>E%Z$j&
z9h+)vJN=v=t8H20;~T{a{9lmqijDXZCkQ7ATL~`^juEyY>dw;Gcy_c1IdPh7FA-iQ
z+)X%BdvodIocGH+x_ZNPS7{=*dn~&<Kb8}B(e_dKbXQL&C94PXh0@;KXgOajWcTFC
z6GagBqg{U5)#Fx2zDNP5o=T+UaAI{_mGUZ?RE?Wy^%|mX+b{CvT+K`rIrqpb$qu_q
zi)bz`qp9WXE{m0Gnw8tR#)<YntxgvYahKelTGMvMv(?2Tnup61sbBdU@|o@<9p^D;
z#wNU!{|n0RC_VI`fpv-ta&ynkT+|-xxtH@-WWD#+1UZZM2_;0v+6a?mpjZr<4~ONZ
zzBoTn+ui5j_V>v8j(j-%D1Tl4kxmBBp`qTEFF>wP&K8Q|Yq>0w>YXFE4+vk<egtxR
z%h`M(J36sTjOViXJ-fzp;wxFs9Q0fyuS<k)m>gOalkNRAo~eD@zum&0m+65+{Ionf
zFkHP%F5eQqBM8Fx1PkFuLXxna@B`rp;dcTlQFm-8lyi8jc$-Y82uh|6v^q{u3Xjn0
zZ^C}UUxX}Uy-e(+<vigi;Vpudpm9Wy5R&sli)<ELJ}I9Yyop=n#lc@<c)gjh5zdl3
z-ePu-aLP+7JGxzDbrT}A<)xK};3N160T~}!YYXA>yo8|@I~P6(b?a2GVM?faRb8uw
zTOBqVY_t$X$8*v*oZ?Yzp;HqPxn=ma`>u9Ux0i~g?AUm#8FYUnGFsfTw^*QykcWZR
zk8D95UXsg3mcxQOtUFq#EvQSsj%9yNBZ(1oIXAM-P2ve^AHU~^bh&<2(&i1NV~hU*
DmO&WD

diff --git a/sos_inventory/models/__pycache__/sos_sales_order.cpython-310.pyc b/sos_inventory/models/__pycache__/sos_sales_order.cpython-310.pyc
index b4a5ee00a19d6452455af113431d737b428e1a85..b5bd074ec6f67e914fa6b9b560815c8c5fbc96d5 100644
GIT binary patch
delta 962
zcmY+B-%C?r7{~YQwByljXTLW$bGkX*51r0AZJMQ(w<ZLF?IIDM;SX@bonx?Ai4;YF
zn7ly<MU*92R>YwGiLScnVpmdEb<<Th-PH5G3~Yn*Ip6Q+yytoMZl99B6Kc_FZ86a2
zW0)<QgS+aEJV{Lp?(WZRs%S?CI=78ETfS-4jxNfOb5K^$EwWR1kH{{{ZuE-mq1>`$
zK;H|%R#eckE#<s*=O-7aJ0H1LY!l6x^NV)6-U6q1We*^}sbFVa2J1sYG$f2&7@@%(
z4X#_b&IZ>bT&TfCg$p;hm~dSUE{>5++9c8-6JlXExgP8lCyr9KpcPg6qJ5Yo_HWC%
z7}+=uV2aila|voHwL#H(sr6wRhiGkvc1TjU<FJ_4Pk8`GL{8<~`44_ZltIkm=p92Y
zjbnJ0?n5|U{c6k_{WYIf)aF+T*YgFvSSrsiZfJUOEnm`@YWiu8(0^KrawM1}KZI2E
zk-QI(Wm%;?uxhFpR%N=H=u*)5r0F@_gbL8RYf1<-wxev>W_51`DpJLCTLQ!SH0x+S
zwocH%KXC2`&^=zYv>ZWztD3Z~mrED;ZWlQ&aZIr<=6RT`rY+3?a&_Dq2I+D<!|vLa
zVS@d#`MPV$^g^MWE*A3Q-I_ABpy%}!I>Uccsv-M%U@MNfpqWoSfrVESL8eQ)!u~q^
zpfbO6)M&|6=bR~kPIlkb2G7_lSJM8HuYO9XNwYK4r4jbcH3p-s-Cc%5_Sl_)1NPZ{
z)&80<Q#jsmyk*0lKKUKR8&P)b_OOb_+p*4{lsGgFonwPT;;66>p4LE_#~F@W9ETi7
t99!(WCl)`TSW}9H#pQ*<Qoi(_KRG#>NaA>VEaQ#C9=qm^5$}0Z{{Yld@K^u<

delta 1284
zcmY+DO>7%Q6vy}NuAPlzI~#vHO~_Z1X48B%P12;$lu|wp&;}7&iiKoZep}nYwcFWk
zRF^FVB~m1$2&$2gK$V)d5~32QQVo<VNQfii$o9e&jvy|acr$T<tTg}q|9><4=FQss
z*Tkc#Xgv}MDRlk#L%IA@|IO%!L6MxfoA)j>4K%T52XaxnW4#+=(wpQBj7#4mc|!Ua
z`8Xz}Pmm9l6inR(OrwF}9W9q^vkb9po27`Qu~#NFmyzi}J7w(-lP3Gxv6m(d{w`Qe
zQFxGw4B;@2P~oTAh4<J&$p-eZQOO4Pu`$Vp_OU~f4ew*)l8yYwnzXSc;X#6<I3Z6w
zMm~%Yj8eOYaguauCzv}#bR4H~hSsP#i_!$8S(y$~n#3bGM{AGLF{UVY<GidkO@0O!
zq@N{k;G*<L@EDFRZ7I1qT*l*cKWfjfFKjCp0iVWawv0{4Ep98ik~`M=UR_doJn(zh
z2>qIDOo+ve;72gi`XqP{V3D6N`ZJ!g9;DGh!$9>`#~ru<9x%pTV+a`k*m%GDbvNaK
zr+I-*4U{Xd@UhNcBP&$yZ#eNA(EWZZ9{K`$1@g5kZi78bj-3+noRHJ}m##dVY%Pa7
z0rb}C$S^dED$P8(bTVRSG@RE+JlItbs1?;y*$}k`sAiRQ6#+F*y{MG{bqwsNH#ARk
z{+-{|5InU)&w=9VZopGE)m_b_yrx*ev$8Ee?bMxorCHmsYi^x2^2Mu;Tfby8hrK`>
zvloTDL}CSftz^6GyZ|{NZ;<!_=jvsfv4B{iGx6E@`bMGZ>=ifcYZb?>)Jpfk@66|m
z)q>;X^Q=oe9u^{MT&6MMh!|3J=mQ-RV5--XYpZMdwL;Z)RvFrCy2$K;Yg<da94*5N
z|2djI(B9;E;%<d{{@*KZMY>lY<Qr!SwZ>e%X7iWL3oGKC`hiPzw5xmFN7_9V?P~Q&
zU$VIkTDjMuIGOnVo%8%VGYet<*jx@8^SYjbR;p(f`Uhyz3RtSI)#{F~ovl0M1Fsf}
zZ#(RBUW`qdUy5R%k@(uV)iZ2?@5YY95`P?Pz(am6J`WH02k|$}mRM#8`AWz){LlC#
zJmQ0i*@0^UG=y9i@{SNsi1>%FPkB9&>3vVwRUunK9t!zd$Tq)|7&jk~^^JP1ST58`
bHv5*}HZyRS|B<jr`;z0Nx6L$vE1CTV(vCl%

diff --git a/sos_inventory/models/sos_deliverables_boq.py b/sos_inventory/models/sos_deliverables_boq.py
index 3bcdea3..b5158ef 100755
--- a/sos_inventory/models/sos_deliverables_boq.py
+++ b/sos_inventory/models/sos_deliverables_boq.py
@@ -65,6 +65,19 @@ class sos_deliverables_boq(models.Model):
     verified_by = fields.Many2one('res.users', string='Prepared by')
     verified_by_image = fields.Image(related="verified_by.signature_image",string='Prepared by Sign',readonly=True)
     verified_on = fields.Datetime(string="Prepared On")
+    ce_verified_by = fields.Many2one('res.users', string='CE Verified by')
+    ce_verified_by_image = fields.Image(related="ce_verified_by.signature_image",string='CE Verified by Sign',readonly=True)
+    ce_verified_on = fields.Datetime(string="CE Head Verified On")
+    scg_head_verified_by = fields.Many2one('res.users', string='SCG Verified by')
+    scg_head_verified_by_image = fields.Image(related="scg_head_verified_by.signature_image",string='SCG Verified by Sign',readonly=True)
+    scg_head_verified_on = fields.Datetime(string="SCG Head Verified On")
+    batter_or_cells=fields.Integer(string="Battery/Cells")
+    def action_report_boq(self):
+        try:
+            action = self.env.ref("sos_inventory.action_sos_deliverables_boq").report_action(self)
+            return action
+        except ValueError as e:
+            print(f"Failed to find report action: {e}")
     def action_print_labels_btn(self):
         try:
             action = self.env.ref("sos_inventory.action_report_labels").report_action(self)
@@ -127,11 +140,44 @@ class sos_deliverables_boq(models.Model):
     )
     def action_prepared_esign_btn(self):
         sequence_util = self.env['sos_common_scripts']
+        # Email part
+        body_html = f"""
+        <p>Below <b>Deliverables/BOQ</b> is waiting for your Approval</p>
+        """ 
+        sequence_util.send_group_email(self.env,'sos_deliverables_boq',self.id,"deenalaura.m@sosaley.in","Deliverables/BOQ Approval Request",body_html,'sos_inventory.sos_ce_head')
+        # Email part ends
         return sequence_util.action_assign_signature(
         self, 
         'prepared_by',
         'prepared_on'
     )
+    def action_ce_verified_esign_btn(self):
+        sequence_util = self.env['sos_common_scripts']
+        # Email part
+        body_html = f"""
+        <p>Below <b>Deliverables/BOQ</b> is waiting for your Approval</p>
+        """ 
+        sequence_util.send_group_email(self.env,'sos_deliverables_boq',self.id,"deenalaura.m@sosaley.in","Deliverables/BOQ Approval Request",body_html,'sos_inventory.sos_scg_group_manager')
+        # Email part ends
+        return sequence_util.action_assign_signature(
+        self, 
+        'ce_verified_by',
+        'ce_verified_on'
+    )
+    def action_scg_head_verified_esign_btn(self):
+        sequence_util = self.env['sos_common_scripts']
+        # Email part
+        body_html = f"""
+        <p>Below <b>Deliverables/BOQ</b> is waiting for your Approval</p>
+        """ 
+        sequence_util.send_group_email(self.env,'sos_deliverables_boq',self.id,"deenalaura.m@sosaley.in","Deliverables/BOQ Approval Request",body_html,'sos_inventory.sos_qa_user')
+        # Email part ends
+        return sequence_util.action_assign_signature(
+        self, 
+        'scg_head_verified_by',
+        'scg_head_verified_on'
+    )
+    
     def action_scg_esign_btn(self):
         sequence_util = self.env['sos_common_scripts']
         return sequence_util.action_assign_signature(
@@ -185,6 +231,7 @@ class sos_deliverables_boq_Line_Material(models.Model):
 
     ref_id = fields.Many2one('sos_deliverables_boq', string="Materials", ondelete="cascade")
     component_id = fields.Many2one('sos_material', string="Material Name", required=True)
+    display_name = fields.Char(string="Display Name", related="component_id.name", store=True)
     uom = fields.Selection([('meters', 'Meters'),('Nos', 'Nos'),('coils', 'Coils'), ('litre', 'litre'), ('kg', 'Kilogram')], default="Nos",string="Uom")
     currency_id = fields.Many2one('res.currency', string='Currency')
     material_code = fields.Char(related="component_id.material_code",string="Material Code")
@@ -306,6 +353,7 @@ class sos_deliverables_Material_installationkit(models.Model):
 
     ref_id = fields.Many2one('sos_deliverables_boq', string="Materials", ondelete="cascade")
     component_id = fields.Many2one('sos_material', string="Material Name", required=True)
+    display_name = fields.Char(string="Display Name", related="component_id.name", store=True)
     uom = fields.Selection([('meters', 'Meters'),('Nos', 'Nos'),('coils', 'Coils'), ('litre', 'litre'), ('kg', 'Kilogram'), ('Packs', 'Packs')], default="Nos",string="Uom")
     currency_id = fields.Many2one('res.currency', string='Currency')
     material_code = fields.Char(related="component_id.material_code",string="Material Code")
diff --git a/sos_inventory/models/sos_dock_audit.py b/sos_inventory/models/sos_dock_audit.py
index 1e55618..83d6754 100755
--- a/sos_inventory/models/sos_dock_audit.py
+++ b/sos_inventory/models/sos_dock_audit.py
@@ -17,12 +17,15 @@ class SOS_Dock_Audit(models.Model):
     deliverables_boq_id = fields.Many2one('sos_deliverables_boq', string="Deliverables/BOQ Id")
     fg_name = fields.Selection(
             [
-                ('BHMS 1.2V', 'BHMS 1.2V'),
-                ('BHMS 2V', 'BHMS 2V'),
-                ('BHMS 12V', 'BHMS 12V'),
+                ('BHMS 1.2V', 'BHMS 1.2V'), 
+                ('BHMS 2V', 'BHMS 2V'), 
+                ('BHMS 12V', 'BHMS 12V'),  
+                ('BHMS 48V', 'BHMS 48V'),
+                ('BMS-HV', 'BMS-HV'),
                 ('BMS-LV 100A', 'BMS-LV 100A'), 
-                ('BMS-LV 40A', 'BMS-LV 40A'),
-                ('MC 250W', 'MC 250W'),
+                ('BMS-LV 40A', 'BMS-LV 40A'), 
+                ('SBMS 55A', 'SBMS 55A'),              
+                ('MC 250W', 'MC 250W'),                                
                 ('HeartTarang', 'HeartTarang')
             ],
             string="Product Type",required=True)
@@ -384,6 +387,7 @@ class sos_dock_audit_Line_Material(models.Model):
 
     ref_id = fields.Many2one('sos_dock_audit', string="Materials", ondelete="cascade")
     component_id = fields.Many2one('sos_material', string="Material Name", required=True)
+    display_name = fields.Char(string="Display Name", related="component_id.name", store=True)
     uom = fields.Selection([('meters', 'Meters'),('Nos', 'Nos'),('coils', 'Coils'), ('litre', 'litre'), ('kg', 'Kilogram')], default="Nos",string="Uom")
     currency_id = fields.Many2one('res.currency', string='Currency')
     material_code = fields.Char(related="component_id.material_code",string="Material Code")
@@ -689,6 +693,7 @@ class sos_dock_audit_Material_installationkit(models.Model):
 
     ref_id = fields.Many2one('sos_dock_audit', string="Materials", ondelete="cascade")
     component_id = fields.Many2one('sos_material', string="Material Name", required=True)
+    display_name = fields.Char(string="Display Name", related="component_id.name", store=True)
     uom = fields.Selection([('meters', 'Meters'),('Nos', 'Nos'),('coils', 'Coils'), ('litre', 'litre'), ('kg', 'Kilogram')], default="Nos",string="Uom")
     currency_id = fields.Many2one('res.currency', string='Currency')
     material_code = fields.Char(related="component_id.material_code",string="Material Code")
diff --git a/sos_inventory/models/sos_fir.py b/sos_inventory/models/sos_fir.py
index e2302b6..9ab45da 100755
--- a/sos_inventory/models/sos_fir.py
+++ b/sos_inventory/models/sos_fir.py
@@ -51,21 +51,45 @@ class FIR_Only(models.Model):
     stores_received_on = fields.Date(string="Stores Received On")
     ncmr_ref = fields.Many2one('sos_ncmr',string="NCMR Reference (If any Rejected)")
     customer_name = fields.Many2one('sos_inventory_customers', string="Customer Name", required=True)
-
     remarks = fields.Text(string="Remarks")
     test_log = fields.Binary("Test Log", required=False, attachment=True)
     test_log_filename = fields.Char("Test Log Filename")
     rejected_line_ids = fields.One2many('sos_fir_rejected_lines', 'ref_id', string="Finished Goods",copy=True, ondelete='cascade')
     serial_no_line_ids = fields.One2many('sos_fir_serial_no_lines', 'ref_id',copy=True)
-
     sd_card_data = fields.Binary("SD Card Data", required=False, attachment=True)
     sd_card_data_filename = fields.Char("SD Card Data Filename")
-
     cloud_data = fields.Binary("Cloud Data", required=False, attachment=True)
     cloud_data_filename = fields.Char("Cloud Data Filename")
-
     firmware_data = fields.Binary("Firmware Data", required=False, attachment=True)
     firmware_data_filename = fields.Char("Firmware Data Filename")
+    serial_no_parse = fields.Text(string="Serial no's to parse")
+    def parse_serial_nos(self):
+        self.ensure_one()
+        if not self.serial_no_parse:
+            return
+
+        # Split into clean serial numbers
+        serial_numbers = [
+            line.strip() for line in self.serial_no_parse.splitlines() if line.strip()
+        ]
+
+        SerialLine = self.env['sos_fir_serial_no_lines']
+
+        for serial in serial_numbers:
+            # Check if already exists for this ref_id
+            exists = SerialLine.search([
+                ('ref_id', '=', self.id),
+                ('serial_no', '=', serial)
+            ], limit=1)
+
+            if not exists:
+                SerialLine.create({
+                    'ref_id': self.id,
+                    'serial_no': serial,
+                    'inspection_decision': 'PASS',  # default
+                })
+
+
     @api.onchange('batch_size')
     def _onchange_batch_size(self):
         if self._origin and self.batch_size is not False:
diff --git a/sos_inventory/models/sos_inventory_customers.py b/sos_inventory/models/sos_inventory_customers.py
index b9c0615..b54768a 100755
--- a/sos_inventory/models/sos_inventory_customers.py
+++ b/sos_inventory/models/sos_inventory_customers.py
@@ -18,18 +18,30 @@ class sos_inventory_customers(models.Model):
         new_name = (vals.get('customer_name') or '').lower()
 
         if new_name and len(new_name) >= 5:
-            existing_customers = self.search([])
+            # Words/phrases to exclude
+            blacklist = [
+                'private limited', 'pvt ltd', 'pvt. ltd.', 'ltd', 'llp', 'inc', 'co', 'company', 'corporation'
+            ]
 
+            def clean_name(name):
+                for word in blacklist:
+                    name = name.replace(word, '')
+                return name.strip()
+
+            new_name_clean = clean_name(new_name)
+
+            existing_customers = self.search([])
             for customer in existing_customers:
                 existing_name = (customer.customer_name or '').lower()
+                existing_name_clean = clean_name(existing_name)
 
-                # Check all substrings of length 5 or more
-                for i in range(len(new_name) - 4):
-                    substring = new_name[i:i+5]
-                    if substring in existing_name:
+                # Check all substrings of length 7 or more
+                for i in range(len(new_name_clean) - 6):
+                    substring = new_name_clean[i:i+7]
+                    if substring in existing_name_clean:
                         raise UserError(
                             f"A customer with a similar name already exists: '{customer.customer_name}' "
                             f"(matched substring: '{substring}')"
                         )
 
-        return super(sos_inventory_customers, self).create(vals)
\ No newline at end of file
+        return super().create(vals)
\ No newline at end of file
diff --git a/sos_inventory/models/sos_ir.py b/sos_inventory/models/sos_ir.py
index ed8d164..6a19daa 100755
--- a/sos_inventory/models/sos_ir.py
+++ b/sos_inventory/models/sos_ir.py
@@ -217,6 +217,11 @@ class SOS_IR(models.Model):
             for item in self.line_ids_material:
                 # Fetch the component related to the current item
                 component = self.env['sos_material'].browse(item.component_id.id)
+                if self.supplier_name and self.supplier_name.id not in component.suppliers.ids:
+                    component.write({
+                        'suppliers': [(4, self.supplier_name.id)]
+                    })
+
                 if component.shelf_life == "yes":
                     shelflife_line_values = {
                             'ir_ref_no':self.id,
@@ -301,6 +306,10 @@ class SOS_IR(models.Model):
             for item in self.line_ids_sfg:
                 # PO update part
                 sfg_component = self.env['sos_sfg'].browse(item.component_id.id)
+                if self.service_provider_name and self.service_provider_name.id not in sfg_component.service_providers.ids:
+                    sfg_component.write({
+                        'service_providers': [(4, self.service_provider_name.id)]
+                    })
                 if self.wo_planned_at == "outsource":
                     if self.wo_no: 
                         if not self.orr_no:               
diff --git a/sos_inventory/models/sos_sales_order.py b/sos_inventory/models/sos_sales_order.py
index d7a1ab4..3ee5d5b 100755
--- a/sos_inventory/models/sos_sales_order.py
+++ b/sos_inventory/models/sos_sales_order.py
@@ -25,7 +25,7 @@ class SOS_SalesOrder(models.Model):
             ],
             string="Product Name",required=True)
     line_ids = fields.One2many('sos_sales_order_line', 'ref_id',copy=True)
-    customer_name = fields.Char(string="Customer Name")
+    customer_name = fields.Many2one('sos_inventory_customers',string="Customer Name")
     lead_time = fields.Datetime(string="Lead Time")
     customer_po_no = fields.Char(string="PO No")
     customer_po_date = fields.Datetime(string="PO Date")
@@ -58,7 +58,7 @@ class SOS_SalesOrder(models.Model):
             'sales_id':self.id,
             'fg_name':self.fg_name,
             'quantity':self.qty,
-            'customer_name':self.customer_name,
+            'customer_name':self.customer_name.customer_name,
             'lead_time':self.lead_time,
             'customer_po_no':self.customer_po_no,
             'customer_po_date':self.customer_po_date
@@ -109,15 +109,15 @@ class SOS_SalesOrder(models.Model):
         sequence_util = self.env['sos_common_scripts']
         return sequence_util.generate_sequence('sos_sales_order','SALES', 'order_id')
 
-    @api.model
-    def create(self, vals):
-        customer_name = vals.get('customer_name')
-        if customer_name:
-            existing = self.env['sos_inventory_customers'].search([('customer_name', '=', customer_name)], limit=1)
-            if not existing:
-                self.env['sos_inventory_customers'].create({'customer_name': customer_name})
+    # @api.model
+    # def create(self, vals):
+    #     customer_name = vals.get('customer_name')
+    #     if customer_name:
+    #         existing = self.env['sos_inventory_customers'].search([('customer_name', '=', customer_name)], limit=1)
+    #         if not existing:
+    #             self.env['sos_inventory_customers'].create({'customer_name': customer_name})
 
-        return super(SOS_SalesOrder, self).create(vals)
+    #     return super(SOS_SalesOrder, self).create(vals)
 
 class SOS_SalesOrder_Line(models.Model):
     _name = 'sos_sales_order_line'
diff --git a/sos_inventory/report/sos_boq_labels.xml b/sos_inventory/report/sos_boq_labels.xml
index 86ae22f..c7a8ea7 100755
--- a/sos_inventory/report/sos_boq_labels.xml
+++ b/sos_inventory/report/sos_boq_labels.xml
@@ -86,131 +86,192 @@
                         }
                     </style>
 
-                    <div class="page">
+<div class="page">
+    
+
+    <t t-set="counter" t-value="0"/>
+    <t t-foreach="range(o.master_quantity)" t-as="line_items">
+        <t t-set="counter" t-value="counter + 1"/>
+        <div class="label-set">
+            <!-- Combine all tables into a single list -->
+            <t t-set="all_tables" t-value="[]"/>
+            <!-- Add FG tables -->
+            <t t-set="fg_counter" t-value="0"/>
+            <t t-foreach="o.line_ids_fg or []" t-as="fg_item">
+            <t t-set="fg_counter" t-value="fg_counter + 1"/>
+            <t t-set="all_tables" t-value="all_tables + [(1, fg_item, fg_counter)]"/>
+            </t>
+            <!-- Add SFG tables -->
+            <t t-set="sfg_counter" t-value="0"/>
+            <t t-foreach="o.line_ids_sfg or []" t-as="sfg_item">
+            <t t-set="sfg_counter" t-value="sfg_counter + 1"/>
+            <t t-set="all_tables" t-value="all_tables + [(2, sfg_item, sfg_counter)]"/>
+            </t>
+            <!-- Add Materials tables -->
+            <t t-set="material_counter" t-value="0"/>
+            <t t-foreach="o.line_ids_material or []" t-as="material_item">
+            <t t-set="material_counter" t-value="material_counter + 1"/>
+            <t t-set="all_tables" t-value="all_tables + [(3, material_item, material_counter)]"/>
+            </t>
+            <!-- Add Installation Kit tables -->
+            <t t-set="installation_kit_counter" t-value="0"/>
+            <t t-foreach="o.line_ids_installation_kit or []" t-as="installation_kit_item">
+            <t t-set="installation_kit_counter" t-value="installation_kit_counter + 1"/>
+            <t t-set="all_tables" t-value="all_tables + [(4, installation_kit_item, installation_kit_counter)]"/>
+            </t>
+            <!-- Add Miscelleneous tables -->
+            <t t-set="miscellaneous_counter" t-value="0"/>
+            <t t-foreach="o.line_ids_miscellaneous or []" t-as="miscellaneous_item">
+            <t t-set="miscellaneous_counter" t-value="miscellaneous_counter + 1"/>
+            <t t-set="all_tables" t-value="all_tables + [(5, miscellaneous_item, miscellaneous_counter)]"/>
+            </t>
+
+
+        
+
+            <!-- Process all tables in pairs -->
+            <t t-foreach="range(0, len(all_tables), 2)" t-as="pair_index">
+                <div class="row">
+                    <!-- First table in the pair -->
+                    <div class="col-6">
+                        <t t-set="table_info" t-value="all_tables[pair_index]"/>
+                        <t t-set="category" t-value="table_info[0]"/>
+                        <t t-set="item" t-value="table_info[1]"/>
+                        <t t-set="index" t-value="table_info[2]"/>
                         
+                        <div class="table-container">
+                            <table class="label-table">
+                                <tbody>
+                                    <tr>
+                                        <td class="column">Set No</td>
+                                        <td>#<t t-esc="counter"/>/<t t-esc="o.master_quantity"/></td>
+                                    </tr>
+                                    <tr>
+                                        <td class="column">Battery</td>
+                                        <td><t t-esc="o.batter_or_cells"/></td>
+                                    </tr>
+                                    <tr>
+                                        <td class="column">No</td>
+                                        <td><t t-esc="category"/>.<t t-esc="index"/></td>
+                                    </tr>
+                                    <tr>
+                                    <td class="column">Name</td>
+                                    <td>
+                                        <t t-if="'component_id' in item">
+                                            <t t-esc="item.component_id.name or item.component_id.part_no or item.name or 'N/A'"/>
+                                        </t>
+                                        <t t-else="">
+                                            <t t-esc="item.name or 'N/A'"/>
+                                        </t>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td class="column">UOM</td>
+                                    <td>
+                                        <t t-if="'uom' in item">
+                                            <t t-esc="item.uom or 'N/A'"/>
+                                        </t>
+                                        <t t-else="">
+                                            <t t-esc="'N/A'"/>
+                                        </t>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td class="column">Qty</td>
+                                    <td>
+                                        <t t-if="'singet_set_qty' in item">
+                                            <t t-esc="item.singet_set_qty or 'N/A'"/>
+                                        </t>
+                                        <t t-else="">
+                                            <t t-esc="item.quantity or 'N/A'"/>
+                                        </t>
+                                    </td>
+                                </tr>
+                                    
+                                    
+                                    <tr>
+                                        <td class="column">S.No</td>
+                                        <td></td>
+                                    </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
 
-                        <t t-set="counter" t-value="0"/>
-                        <t t-foreach="range(o.master_quantity)" t-as="line_items">
-                            <t t-set="counter" t-value="counter + 1"/>
-                            <div class="label-set">
-                                <!-- Combine all tables into a single list -->
-                                <t t-set="all_tables" t-value="[]"/>
-                                <!-- Add FG tables -->
-                                <t t-foreach="o.line_ids_fg or []" t-as="fg_item">
-                                    <t t-set="fg_index_safe" t-value="fg_index if fg_index is not None else 0"/>
-                                    <t t-set="all_tables" t-value="all_tables + [(1, fg_item, fg_index_safe + 1)]"/>
-                                </t>
-                                <!-- Add SFG tables -->
-                                <t t-foreach="o.line_ids_sfg or []" t-as="sfg_item">
-                                    <t t-set="sfg_index_safe" t-value="sfg_index if sfg_index is not None else 0"/>
-                                    <t t-set="all_tables" t-value="all_tables + [(2, sfg_item, sfg_index_safe + 1)]"/>
-                                </t>
-                                <!-- Add Materials tables -->
-                                <t t-foreach="o.line_ids_material or []" t-as="material_item">
-                                    <t t-set="material_index_safe" t-value="material_index if material_index is not None else 0"/>
-                                    <t t-set="all_tables" t-value="all_tables + [(3, material_item, material_index_safe + 1)]"/>
-                                </t>
-
-                           
-
-                                <!-- Process all tables in pairs -->
-                                <t t-foreach="range(0, len(all_tables), 2)" t-as="pair_index">
-                                    <div class="row">
-                                        <!-- First table in the pair -->
-                                        <div class="col-6">
-                                            <t t-set="table_info" t-value="all_tables[pair_index]"/>
-                                            <t t-set="category" t-value="table_info[0]"/>
-                                            <t t-set="item" t-value="table_info[1]"/>
-                                            <t t-set="index" t-value="table_info[2]"/>
-                                            <div class="table-container">
-                                                <table class="label-table">
-                                                    <tbody>
-                                                        <tr>
-                                                            <td class="column">Set No</td>
-                                                            <td>#<t t-esc="counter"/>/<t t-esc="o.master_quantity"/></td>
-                                                        </tr>
-                                                        <tr>
-                                                            <td class="column">Battery</td>
-                                                            <td></td>
-                                                        </tr>
-                                                        <tr>
-                                                            <td class="column">No</td>
-                                                            <td><t t-esc="category"/>.<t t-esc="index"/></td>
-                                                        </tr>
-                                                        <tr>
-                                                            <td class="column">Name</td>
-                                                            <td><t t-esc="item.component_id.name or 'N/A'"/></td>
-                                                        </tr>
-                                                        <tr>
-                                                            <td class="column">UOM</td>
-                                                            <td><t t-esc="item.uom or 'N/A'"/></td>
-                                                        </tr>
-                                                        <tr>
-                                                            <td class="column">Qty</td>
-                                                            <td><t t-esc="item.singet_set_qty or 'N/A'"/></td>
-                                                        </tr>
-                                                        <tr>
-                                                            <td class="column">S.No</td>
-                                                            <td></td>
-                                                        </tr>
-                                                    </tbody>
-                                                </table>
-                                            </div>
-                                        </div>
-
-                                        <!-- Second table in the pair (if exists) -->
-                                        <div class="col-6">
-                                            <t t-if="pair_index + 1 &lt; len(all_tables)">
-                                                <t t-set="table_info" t-value="all_tables[pair_index + 1]"/>
-                                                <t t-set="category" t-value="table_info[0]"/>
-                                                <t t-set="item" t-value="table_info[1]"/>
-                                                <t t-set="index" t-value="table_info[2]"/>
-                                                <div class="table-container">
-                                                    <table class="label-table">
-                                                        <tbody>
-                                                            <tr>
-                                                                <td class="column">Set No</td>
-                                                                <td>#<t t-esc="counter"/>/<t t-esc="o.master_quantity"/></td>
-                                                            </tr>
-                                                            <tr>
-                                                                <td class="column">Battery</td>
-                                                                <td></td>
-                                                            </tr>
-                                                            <tr>
-                                                                <td class="column">No</td>
-                                                                <td><t t-esc="category"/>.<t t-esc="index"/></td>
-                                                            </tr>
-                                                            <tr>
-                                                                <td class="column">Name</td>
-                                                                <td><t t-esc="item.component_id.name or 'N/A'"/></td>
-                                                            </tr>
-                                                            <tr>
-                                                                <td class="column">UOM</td>
-                                                                <td><t t-esc="item.uom or 'N/A'"/></td>
-                                                            </tr>
-                                                            <tr>
-                                                                <td class="column">Qty</td>
-                                                                <td><t t-esc="item.singet_set_qty or 'N/A'"/></td>
-                                                            </tr>
-                                                            <tr>
-                                                                <td class="column">S.No</td>
-                                                                <td></td>
-                                                            </tr>
-                                                        </tbody>
-                                                    </table>
-                                                </div>
-                                            </t>
-                                            <t t-else="">
-                                                <div class="empty-col"></div>
-                                            </t>
-                                        </div>
-                                    </div> <!-- Close row -->
-                                </t>
+                    <!-- Second table in the pair (if exists) -->
+                    <div class="col-6">
+                        <t t-if="pair_index + 1 &lt; len(all_tables)">
+                            <t t-set="table_info" t-value="all_tables[pair_index + 1]"/>
+                            <t t-set="category" t-value="table_info[0]"/>
+                            <t t-set="item" t-value="table_info[1]"/>
+                            <t t-set="index" t-value="table_info[2]"/>
+                            <div class="table-container">
+                                <table class="label-table">
+                                    <tbody>
+                                        <tr>
+                                            <td class="column">Set No</td>
+                                            <td>#<t t-esc="counter"/>/<t t-esc="o.master_quantity"/></td>
+                                        </tr>
+                                        <tr>
+                                            <td class="column">Battery</td>
+                                            <td><t t-esc="o.batter_or_cells"/></td>
+                                        </tr>
+                                        <tr>
+                                            <td class="column">No</td>
+                                            <td><t t-esc="category"/>.<t t-esc="index"/></td>
+                                        </tr>
+                                        <tr>
+                                        <td class="column">Name</td>
+                                                <td>
+                                                    <t t-if="'component_id' in item">
+                                                        <t t-esc="item.component_id.name or item.component_id.part_no or item.name or 'N/A'"/>
+                                                    </t>
+                                                    <t t-else="">
+                                                        <t t-esc="item.name or 'N/A'"/>
+                                                    </t>
+                                                </td>
+                                            </tr>
+                                        <tr>
+                                    <td class="column">UOM</td>
+                                    <td>
+                                        <t t-if="'uom' in item">
+                                            <t t-esc="item.uom or 'N/A'"/>
+                                        </t>
+                                        <t t-else="">
+                                            <t t-esc="'N/A'"/>
+                                        </t>
+                                    </td>
+                                </tr>
+                                        <tr>
+                                    <td class="column">Qty</td>
+                                    <td>
+                                        <t t-if="'singet_set_qty' in item">
+                                            <t t-esc="item.singet_set_qty or 'N/A'"/>
+                                        </t>
+                                        <t t-else="">
+                                            <t t-esc="item.quantity or 'N/A'"/>
+                                        </t>
+                                    </td>
+                                </tr>
+                                        <tr>
+                                            <td class="column">S.No</td>
+                                            <td></td>
+                                        </tr>
+                                    </tbody>
+                                </table>
                             </div>
                         </t>
+                        <t t-else="">
+                            <div class="empty-col"></div>
+                        </t>
                     </div>
-                </t>
+                </div> <!-- Close row -->
             </t>
-        </t>
-    </template>
+        </div>
+    </t>
+</div>
+</t>
+</t>
+</t>
+</template>
 </odoo>
\ No newline at end of file
diff --git a/sos_inventory/report/sos_boq_report.xml b/sos_inventory/report/sos_boq_report.xml
new file mode 100755
index 0000000..4ab3776
--- /dev/null
+++ b/sos_inventory/report/sos_boq_report.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+    <template id="report_boq">
+        <t t-call="web.html_container">
+         <t t-foreach="docs" t-as="o">
+            <t t-call="web.external_layout">
+                <div class="page">
+                    <h2>Deliverables/BOQ Report</h2>
+            <br></br>
+                    
+                    <table class="table">
+                    
+                    <tr><td class="column">Customer Name</td><td><t t-esc="o.customer_name"/></td><td class="column">Location</td><td><t t-esc="o.customer_location"/></td></tr>
+
+                    <tr><td class="column">Product Name</td><td><t t-esc="o.fg_name"/></td><td class="column">Quantity</td><td><t t-esc="o.quantity"/></td></tr>
+                    </table>
+                     <br></br>
+                      <table class="table table-bordered">
+                            <tbody>
+                            <tr><td colspan="6" class="column" style="background-color:#ccc">Finished Goods</td></tr>
+                                <tr class="column">
+                                    <td>S.No</td>
+                                    <td>Name</td>
+                                    <td>UOM</td>
+                                    <td>Single set Qty</td>
+                                    <td>Total Set</td>
+                                    <td>Qty</td>
+                                </tr>
+                                <t t-foreach="enumerate(o.line_ids_fg)" t-as="it">
+                                <tr>
+                                    <td><t t-esc="'1.%s' % (it[0] + 1)"/></td>
+                                    <td><t t-esc="it[1].component_id.name"/></td>
+                                    <td><t t-esc="it[1].uom"/></td>
+                                    <td><t t-esc="it[1].singet_set_qty"/></td>
+                                    <td><t t-esc="it[1].total_set"/></td>
+                                    <td><t t-esc="it[1].quantity"/></td>
+                                </tr>
+                                </t>
+                                <tr><td colspan="6" class="column" style="background-color:#ccc">Semi-Finished Goods</td></tr>
+                                <t t-foreach="enumerate(o.line_ids_sfg)" t-as="it">
+                                <tr>
+                                    <td><t t-esc="'2.%s' % (it[0] + 1)"/></td>
+                                    <td><t t-esc="it[1].component_id.name"/></td>
+                                    <td><t t-esc="it[1].uom"/></td>
+                                    <td><t t-esc="it[1].singet_set_qty"/></td>
+                                    <td><t t-esc="it[1].total_set"/></td>
+                                    <td><t t-esc="it[1].quantity"/></td>
+                                </tr>
+                                </t>
+<tr><td colspan="6" class="column" style="background-color:#ccc">Materials</td></tr>
+                                <t t-foreach="enumerate(o.line_ids_material)" t-as="it">
+                                <tr>
+                                    <td><t t-esc="'3.%s' % (it[0] + 1)"/></td>
+                                    <td><t t-esc="it[1].component_id.part_no"/></td>
+                                    <td><t t-esc="it[1].uom"/></td>
+                                    <td><t t-esc="it[1].singet_set_qty"/></td>
+                                    <td><t t-esc="it[1].total_set"/></td>
+                                    <td><t t-esc="it[1].quantity"/></td>
+                                </tr>
+                                </t>
+<tr><td colspan="6" class="column" style="background-color:#ccc">Installation Kit</td></tr>
+                                <t t-foreach="enumerate(o.line_ids_installation_kit)" t-as="it">
+                                <tr>
+                                    <td><t t-esc="'4.%s' % (it[0] + 1)"/></td>
+                                    <td><t t-esc="it[1].component_id.part_no"/></td>
+                                    <td><t t-esc="it[1].uom"/></td>
+                                    <td><t t-esc="it[1].singet_set_qty"/></td>
+                                    <td><t t-esc="it[1].total_set"/></td>
+                                    <td><t t-esc="it[1].quantity"/></td>
+                                </tr>
+                                </t>
+                                <tr><td colspan="6" class="column" style="background-color:#ccc">Miscellaneous</td></tr>
+                                <tr class="column">
+                                    <td>S.No</td>
+                                    <td>Name</td>
+                                    <td colspan="4">Qty</td>
+                                </tr>
+                                <t t-foreach="enumerate(o.line_ids_miscellaneous)" t-as="it">
+                                
+                                <tr>
+                                    <td><t t-esc="'5.%s' % (it[0] + 1)"/></td>
+                                    <td><t t-esc="it[1].name"/></td>
+                                    <td colspan="4"><t t-esc="it[1].quantity"/></td>
+                                </tr>
+                                </t>
+                            </tbody>
+                        </table>
+                </div>
+            </t>
+             </t>
+        </t>
+    </template>
+
+    <record id="action_sos_deliverables_boq" model="ir.actions.report">
+        <field name="name">BOQ Report</field>
+        <field name="model">sos_deliverables_boq</field>
+        <field name="report_type">qweb-pdf</field>
+        <field name="report_name">sos_inventory.report_boq</field>
+    </record>
+</odoo>
\ No newline at end of file
diff --git a/sos_inventory/report/sos_fir_report.xml b/sos_inventory/report/sos_fir_report.xml
index 88073d7..f99c570 100755
--- a/sos_inventory/report/sos_fir_report.xml
+++ b/sos_inventory/report/sos_fir_report.xml
@@ -45,10 +45,7 @@
                                 <td class="column">Sampling Size</td><td><t t-esc="o.approved_qty"/></td>
                            
                             </tr>
-                            <tr>
-                                <td class="column">Serial No</td><td colspan="3"><t t-esc="o.serial_no"/></td>
-                           
-                            </tr>
+                      
 </t>
                              <t t-else="">
                         <tr>
@@ -56,10 +53,7 @@
                                 <td class="column">Sampling Size</td><td><t t-esc="o.sampling_size"/></td>
                            
                             </tr>
-                  <tr>
-                                <td class="column">Serial No</td><td colspan="3"><t t-esc="o.serial_no"/></td>
-                           
-                            </tr>
+         
 
                             </t>  
                                                         <tr>
@@ -74,7 +68,21 @@
                             </tr>
                         </tbody>
                     </table>
-                  <br></br>
+                  <table class="table table-bordered" style="width:100%;">
+    <tbody>
+    <tr style="background-color:#ccc"><td colspan="7" class="column"><h5>Serial No's</h5></td></tr>
+
+
+    <t t-set="lines" t-value="o.serial_no_line_ids"/>
+    <t t-foreach="range(0, len(lines), 2)" t-as="i">
+      <tr>
+        <td><t t-esc="lines[i].serial_no or ''"/></td>
+        <td><t t-esc="(lines[i+1].serial_no if i+1 &lt; len(lines) else '')"/></td>
+      </tr>
+    </t>
+  </tbody>
+</table>
+
 <!-- <table class="table table-bordered">
     <tbody>
 <tr style="background-color:#ccc"><td colspan="7" class="column"><h5>Summary Report</h5></td></tr>
diff --git a/sos_inventory/views/sos_deliverables_boq_view.xml b/sos_inventory/views/sos_deliverables_boq_view.xml
index 3ac0057..bb171e5 100755
--- a/sos_inventory/views/sos_deliverables_boq_view.xml
+++ b/sos_inventory/views/sos_deliverables_boq_view.xml
@@ -43,10 +43,12 @@
         <field name="arch" type="xml">
 <form string="Model Form">
         <header>
-                    <button class="btn btn-primary" type="object"
+        <button class="btn btn-primary" type="object"
                             name="action_print_labels_btn"><i class="fa fa-print"></i> Print Labels</button>
                     
-                            
+
+        <button name="action_report_boq" string="Report"
+                type="object" class="btn-primary"/>        
                 </header>
                     <sheet>
  
@@ -71,7 +73,7 @@
                <field name="show_ev_fields" invisible="1"/> 
                <field name="master_quantity" invisible="show_ev_fields == False"/>
                <field name="slave_quantity" invisible="show_ev_fields == False"/>
-               
+               <field name="batter_or_cells"/>
                    </group>
                         </group>
                      
@@ -108,6 +110,7 @@
 <field name="line_ids_material">
 <tree editable="bottom">
 <field name="component_id"/>
+<field name="display_name"/>
 <field name="add_production_cost" widget="boolean_toggle"/>
 <field name="is_spare" widget="boolean_toggle"/>
 
@@ -122,6 +125,7 @@
 <field name="line_ids_installation_kit">
 <tree editable="bottom">
 <field name="component_id"/>
+<field name="display_name"/>
 <field name="uom"/>
 <field name="singet_set_qty"/>
 <field name="total_set"/>
@@ -285,13 +289,55 @@
         </tr>
     </table>
 </div>
-<div class="col-4"></div>
 <div class="col-4">
+<table class="table_custom" style="box-shadow: rgba(0, 0, 0, 0.24) 0px 3px 8px;background-color: #fff;border: solid 4px #9689c1;">
+
+        <tr style="border-bottom: solid 1px #ccc;">
+            <td style="padding: 8px;" class="column"><b>CE Head Verified By</b>
+            <br></br><br></br>
+                <button string="Approve" invisible="ce_verified_by_image" class="btn-primary custom_btn" type="object" name="action_ce_verified_esign_btn"></button>
+            </td>
+            <td><field name="ce_verified_by_image" widget="image"/></td>
+        </tr>
+        <tr invisible="ce_verified_by_image == False">
+            <td style="padding: 8px;" class="column"><b>Verified On</b></td>
+            <td><field name="ce_verified_on" readonly="1"/></td>
+        </tr>
+        <tr invisible="ce_verified_by_image == False">
+            <td style="padding: 8px;" class="column"><b>Verified By</b></td>
+            <td><field name="ce_verified_by" readonly="1"/></td>
+        </tr>
+    </table>
+    </div>
+    <div class="col-4">
+<table class="table_custom" style="box-shadow: rgba(0, 0, 0, 0.24) 0px 3px 8px;background-color: #fff;border: solid 4px #9689c1;">
+
+        <tr style="border-bottom: solid 1px #ccc;">
+            <td style="padding: 8px;" class="column"><b>SCG Head Verified By</b>
+            <br></br><br></br>
+                <button string="Approve" invisible="scg_head_verified_by_image" class="btn-primary custom_btn" type="object" name="action_scg_head_verified_esign_btn"></button>
+            </td>
+            <td><field name="scg_head_verified_by_image" widget="image"/></td>
+        </tr>
+        <tr invisible="scg_head_verified_by_image == False">
+            <td style="padding: 8px;" class="column"><b>Verified On</b></td>
+            <td><field name="scg_head_verified_on" readonly="1"/></td>
+        </tr>
+        <tr invisible="scg_head_verified_by_image == False">
+            <td style="padding: 8px;" class="column"><b>Verified By</b></td>
+            <td><field name="scg_head_verified_by" readonly="1"/></td>
+        </tr>
+    </table>
+    </div>
+    </div>
+    <div class="row">
+<div class="col-3"></div>
+<div class="col-6">
     <!-- Second Table -->
 <table class="table_custom" style="box-shadow: rgba(0, 0, 0, 0.24) 0px 3px 8px;background-color: #fff;border: solid 4px #9689c1;">
 
         <tr style="border-bottom: solid 1px #ccc;">
-            <td style="padding: 8px;" class="column"><b>Verified By</b>
+            <td style="padding: 8px;" class="column"><b>QA Verified By</b>
             <br></br><br></br>
                 <button string="Approve" invisible="verified_by_image" class="btn-primary custom_btn" type="object" name="action_verified_esign_btn"></button>
             </td>
@@ -307,6 +353,8 @@
         </tr>
     </table>
 </div>
+<div class="col-3"></div>
+
 </div>    
 
                     </sheet>
diff --git a/sos_inventory/views/sos_dock_audit_view.xml b/sos_inventory/views/sos_dock_audit_view.xml
index f2d52c0..db5c7a5 100755
--- a/sos_inventory/views/sos_dock_audit_view.xml
+++ b/sos_inventory/views/sos_dock_audit_view.xml
@@ -108,6 +108,7 @@
 <field name="line_ids_material" >
 <tree editable="bottom">
 <field name="component_id"/>
+<field name="display_name"/>
 <field name="is_spare" widget="boolean_toggle"/>
 
 <field name="uom"/>
@@ -122,6 +123,7 @@
 <field name="line_ids_installation_kit" >
 <tree editable="bottom">
 <field name="component_id"/>
+<field name="display_name"/>
 <field name="uom"/>
 <field name="singet_set_qty"/>
 <field name="total_set"/>
diff --git a/sos_inventory/views/sos_fir_view.xml b/sos_inventory/views/sos_fir_view.xml
index f31eb38..de4fe21 100755
--- a/sos_inventory/views/sos_fir_view.xml
+++ b/sos_inventory/views/sos_fir_view.xml
@@ -20,11 +20,12 @@
                             <field name="fg_name" widget="many2many_tags"/>
                             <field name="product_type"/>
                             
-                            <field name="customer_name"/>
+                            
                             </group>
                             <group>
+                            <field name="customer_name"/>
                             <field name="batch_No"/>
-                            <field name="serial_no"/>
+                            <!-- <field name="serial_no"/> -->
                             <field name="mfg_date"/>
                             <field name="sampling_size"/>
                             <field name="remarks"/>
@@ -61,6 +62,13 @@
     </field>
     </page>
       <page string="Serial No's">
+      <table class="table_custom">
+      <thead><tr><td colspan="3"><b>Parse Serial No's</b></td></tr></thead>
+      <tr><td colspan="3"><field name="serial_no_parse"/></td><td><button type="object" name="parse_serial_nos" class="btn btn-primary" string="Parse"></button></td></tr>
+      </table>
+      <br></br>
+      
+      
                                 <field name="serial_no_line_ids">
                                     <tree editable="bottom">
                                         <field name="serial_no"/>
diff --git a/sos_inventory/views/sos_order_delivery_plan_view.xml b/sos_inventory/views/sos_order_delivery_plan_view.xml
index 77bbb78..bc79c39 100755
--- a/sos_inventory/views/sos_order_delivery_plan_view.xml
+++ b/sos_inventory/views/sos_order_delivery_plan_view.xml
@@ -62,7 +62,7 @@
     </group>
     </group>
 <notebook>
-<page string="Accessories">
+<page string="Product / Accessories">
 
     <div class="new_header">Finished Goods</div>
      <field name="line_ids_fg">
-- 
2.34.1