From d739266e314a60404071bd04a4019d43d9ada5a4 Mon Sep 17 00:00:00 2001
From: Antonio Gonzalez <jose_antony11@hotmail.com>
Date: Wed, 21 Aug 2019 13:22:27 -0500
Subject: [PATCH] Agregando nuevos campos al formato de cliente en saldos
 iniciales

---
 .../SaldosIniciales/FormatoClientes.xlsx      | Bin 8857 -> 8911 bytes
 General/SaldosIniciales.aspx.vb               |  19 +++++++++++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/Empresas/Grales/SaldosIniciales/FormatoClientes.xlsx b/Empresas/Grales/SaldosIniciales/FormatoClientes.xlsx
index dbc90a51dc5a84275e5ec367c296d0d3d1527a6f..a5159403a08dcb6cced0e7ecd1579527b6a56016 100644
GIT binary patch
delta 1566
zcmV+(2I2XcMbAaBVhahb&?-4C0RRADlWPkcf08jz!!QtqcO?FU<()b(076MRMD2u7
z1%>?@U)z(MyI?!0^dB*IW6dAK6%s-<jQ-v|-MuH5(_QD(8~Q-PmA;%5S|PV$i8qyg
zUd}IWwF(i~f)mC{zhltT`uwa6A*$r%Q0Z-q{hcwP-C_q}B0X|a*5W&e>FGBn^d7;6
ze=TC{oVhBBYtsR-R;>&i)7~4c2By~mn;%e@f$B2WO*&>HrHOTEj^vv@!e01ES^}3z
z^X3#a;2fU9hw-yRFA8@NJ&Dguk|Gmicsv{rQoW>JvgHd|IcRA-@TqT>#%-2kiEjK@
z3ui(j9HEUlM>ja|>OcLSI*O<okCt-xD8i-Ql6U2S_gS=AP?kdUv>M3fg}fkJ{DU_R
z0<Eb{x#d@ElfFp(1(T5j6q8gT5VOJz^a=`-{7nl20{{RK36sDVAb;C(n=lZ4?@a$e
z!+W?I-^MtT#&wgXX_H=`Wg%=$08u2{$=`P+kZlZ;A$_qfK6`fe>`G#G`JAO_M@zwY
z9$B94T8QR^$1Gn*)~}z-i?M}-#CeQUp3}&Bp~AYHzkfH|^YTe-D3u5pauHb@DT}G&
z2(qCW7B(+v4*w*)%zv<iWw~}lQBoXhqbzlN*Bv?;X1P@{Ov^qTJV_X#3r@Bf&1FSW
z(iBUGUu;+*3|mI}&}F!M+7=gtX9ZBKSjyy!CbdvTrnl>ymw1&z-p}3u6T__+E&7a+
zk_(<l8|a)W(00xfXW{_Ud=@jvK*^3unnc!>H+}RiXFk*V{C{S2FHYu2;?)nDQX**#
zWwMZxf5rKe0^Y)w3yeYo6eA{*?dUa4)5ro=B>rk2l>_JCVLm&~jkl#P*h7g{SkP;p
z{$a7)fJ<nMm?n6e%I|!CL)m&GVK)Rxlrq!!WkCgjl0Yc7AF4zMPk|JEQO2ORAdCz@
z>v3Omj%<G%dVk>%@MuMaTr$OJA+i;cXU22QRj~v$3yg*(w7r4*7LGy90plT(-T^?U
zIt>_&@z5T5?j#t&)+>>ZYC{;0k%uEU@KpM*7{UqE9$_?w{@aD~KvzwpCN+;A*aJTt
zjdcV)3*ebLs!2y8eQ8V~y^~4?_Cb%nG^Uo`Nihfip?{7ktLo@FtBE}h!@+Q@>e@G)
zp%ED-hhp_NH$CE=G)ZvmuGgb*sspD__X0~ipOt)%;8ul#ivp`V+M6oo?h^|~Re`S*
zTHC-`6mYBT=I+ed!Bs(O#D_M*Ya*`O2)~I~R0wFHgO{L*_}JzcG!e@-B5Wc)wGqQ6
z;--xlHGdJeZN#{V_}oTJnuxm&#m+?i(g8VB^}YjgChOM@$eFI+Iv{7VJ#;|MbbIW8
z9LwWC;~lzBJwLs>?@pm3D^PcS#ZtXcRX-PaP498JX1PEqP4rs>{ajX$k!!<T@<P2p
z`pj|(uZUS~;M0Rbf4eqZI0@&{ER?6i$ISd60F#je6a;2&{<O2p8YlsOOT#b}h2I7L
zL&<xaq=jvUwgVk|av-y!_!g48t=Oa`iFW(<rtMZc6d!ZXx!*nal5}}gRqzGImbK0h
zjR*=ri&~a?pP`px9WGE{9oLdqwT29xz@lY-dy|TWiQ2%EsT(k^1RHpgwoEh`Iyl!b
zjIB6;;x_UQ?ZsVf6nFlAY4*6`;)Cx2$ArwV0>>qH9CyI58HwnOlww3SpQh>oQedb+
zfp!+th~giw1EcJp4ZSjPs?wbrztcJHlr6;|j_#u^M`PQzQJeHJe13}GHjmH!s$r?S
zTM0mUDg_e;xT{UR;<|(?#gkHZzKUD7@t59}An#B4cDq@p_;=k!lltHT4rJh?up#(G
zc}*Tx#Tw-?q4SW?klqz>!YE-RdGE$v^>@*Rf;tcXpLiFNMHth9&RH^JF`W=EfV|Ir
z{T=de0F#je6thYl$O8$k&?-4C0RRADlN%vZ0ke~DAwU5-ldvHm8<YG^3jzZG01*iQ
z02lxO00000000000002Dlj|WX8)k0)v`hg209yh801*HH00000000000002*lQAMb
Q0dkXYA|nPlAOHXW0KVAI2LJ#7

delta 1500
zcmV<21ta>;MVUpgVhaf&7P{>o0RR9jlWPkcf04mT12GVW?}G0Ta<{31BC@+ZEbU38
zXnlZmGi?WwnKhY}+Bfpto7a6YQv{I)kNN)jnfd=zvwiUD9b!VJT3=75S^;(JkhZmc
zT`jKewMt^iS<eKu{(z)s&E-XvlBn#ZRO_8c|6ok&b`Wfua1WG~4aZ<5KjYS<K7w^=
ze+MAJo15wM&IF63RmTHK-g~RnK=?L5`wN;XVN*%d=3};88EGnWB0u!m9++OZL+cA^
z(VnB$dJpIDY5WQhS;1Z)BFDnSIWpP;kH^zNs^{EGv3$vEZ#x{1bnctyaaZJ6fge9N
zOoh-giS4B1;0JG``cHqvfC8$G;IMQr8GY_8d)Lv@p@=q5%3+d->jB;0LQMYc<{Oid
z0~C{rArQ0C4D<>LL9qy|+X4UpMF^A67a)Jxa+@#|eeX>Ffzf+djkht*q;cJ(X_`#e
zXCZ{q1Q3<vC4b*5VH{)J4C#v{;iGf!J$HfG<*vxB4Hc5{GD4p1B8!%UC#+mW=;x2+
z#TZ#q;WEKFFKL9HsYI9a_wQy~E}mpYsj`5flo865s-})3Nk$7SZC=q5{z<tgu!4W1
zSUIv16es3VkvqQY4xIwC64eY-(T9VlDI;{j$-1DWs!0URu>${P#wyvc6{HVcfyL9h
zx*)u$fFfo&Q_qGJSp}Kiu1YR&oI~6@Z-7a|Z4Mp!f)T+bPn8XHPVHzn=7}?LfN4HU
z7(}3Dw**ZibmdJSeB{h$MxS4dZsmW`-cmUJPIF2WO(0Fk((=cgKWX4CJaU0i8h~cR
zM6nIMrg<Kr#{e?;$Jl@^7;p|2j`xkVrAgSMuwpFfHP3&uL}g$S3L~K@Ugzo?-`-HR
z$`m{eK@zRZG<jZ7NgyTQitUHm4&gbF!mm{@s4X8P#XGZZ_naf!ABSEz1iXJ0Q>m6r
zb0UkZrQ$_ndCyg|Krn^{)`lgty@C4{j=`P-)`KU#9ROF21F$xihxW*GC&36Fz2f<3
ze-YLf&%==$csl%7E<y(yi?B8q{kIF}fv$!|Z}vQXU=RFoG&UaeOn}$qQE$!!(wC-5
zq<56bz&_~Fm!`?3ca+S*f2e=cq*YgR6IJk%*Vo-~>QXm-wZIC`XM%4nm}elhtgxPr
z-t^zS0!^a9R~l{ZKo>~p=gr)mIU8tFvPXRABD^-@x{L7Jh((Qn<Q=R8ZN$ee$DoZ^
zb`fD4@u`a#wh=d7#Hfw9?IOl)#OE$z(nj2!QS3z2FJ~Yps@|W0oXA-E^$g@h*M~EZ
z7hxSJnM2(`cKX-NokmBfp6!OEp73=gR(M74u~@NES~*S4e1;Ju>H+TBuvfg&Q(Mok
zm@AmP%_)P|HHFG_ZD`VzbJZO5TjcNoF#ijakpmP24|+8(vjH0@0e??}FcgK~P5cj}
z?@$VHx&~OH%br|fCPw31)81{3w2-#S_U|pQA&bVx-gEAE&%J53IH)T40%K*Zb3~#T
z1)zB?q~7J|rCfz~D6o!c!KzwAj*ei_qPV`wctd$@;K|et7$?C7o}?}1O^)`?H56mZ
z_n?@KyhD3&TN}lke}9@CZW#YyJHSaC&#(f=1ak~`z_1yK=!6t}L^hwM>H&gds6c^s
z7L$nJAFl(W?4J$2GI1*Dj*Z{x6nDxNd=N+X!OGFtwr$j=eGH$U;J5YTbH8dRb$2Tc
zsK^AT+yHa6DV9u2s4_e$b?2*?b!&g=tpss@EH<0<D#O3)o<-CLA8;T7AB7IV&&q51
zuq;=oNMdpu#v~;3GD#_kX`H@yV=wx<XhT7rhW}5Thw)vQkdn+OnbVtOLOcVCKKJE!
zD82!ckpmR7fE~yK2_Y7`?H&OD04$SHAyWdR43p0c6_dLmDgi5#<{=;(L9qy|+X4Up
zMF;=@7ytkO0000000000005|yAtEaT4|+8(lTacS0lAZBB0d2;lcpjg1_K}f0000P
C;>pGU

diff --git a/General/SaldosIniciales.aspx.vb b/General/SaldosIniciales.aspx.vb
index 9ff2eeba6..3fbfc4bca 100644
--- a/General/SaldosIniciales.aspx.vb
+++ b/General/SaldosIniciales.aspx.vb
@@ -122,7 +122,15 @@ Partial Class General_SaldosIniciales
                     Exit Sub
                 End If
                 If RblFormato.SelectedValue = "1" Then
-                    If Not dt.Columns(14).ColumnName = "Es distribuidor" Then
+                    If Not dt.Columns(14).ColumnName = "Vendedor" Then
+                        Alert("El nombre de la catorceava columna debe ser 'Es distribuidor'. Favor de corregirlo", TipoMensaje.MsgError)
+                        Exit Sub
+                    End If
+                    If Not dt.Columns(15).ColumnName = "Clasificación" Then
+                        Alert("El nombre de la catorceava columna debe ser 'Es distribuidor'. Favor de corregirlo", TipoMensaje.MsgError)
+                        Exit Sub
+                    End If
+                    If Not dt.Columns(16).ColumnName = "Es distribuidor" Then
                         Alert("El nombre de la catorceava columna debe ser 'Es distribuidor'. Favor de corregirlo", TipoMensaje.MsgError)
                         Exit Sub
                     End If
@@ -723,7 +731,12 @@ Partial Class General_SaldosIniciales
                     Dim Telefono As String = Row("Teléfono").ToString
                     Dim Contacto As String = Row("Contacto").ToString
                     Dim CelularContacto As String = Row("Celular Contacto").ToString
+                    Dim Vendedor As String = Row("Vendedor").ToString
+                    Dim Clasificacion As String = Row("Clasificación").ToString
                     Dim CveCliente As Integer = GlobalDTCliente(UsuarioActual.CveEmpresa).FiltroPrimeroValor("CveCliente", $"RFC = '{RFC}'").ToString.ToEntero
+
+                    Dim CveVendedor As Integer = GlobalDTVendedores(UsuarioActual.CveEmpresa).FiltroPrimeroValor("CveVendedor", $"Vendedor = '{Vendedor}'").ToString.ToEntero
+                    Dim CveClasificación As Integer = GlobalDTClasificaciones(UsuarioActual.CveEmpresa).FiltroPrimeroValor("CveClasificacion", $"Clasificacion = '{Clasificacion}'").ToString.ToEntero
                     Dim EsDistribuidor As Boolean = If(Row("Es distribuidor").ToString = "si", True, False)
 
                     If CveCliente > 0 Then
@@ -736,8 +749,8 @@ Partial Class General_SaldosIniciales
                         '    Exit For
                         'End If
                     Else
-                        If Not ObjClientes.AddCliente(RazonSocial, RazonSocial, Calle, "", "", Colonia, "", "", Estado, Pais, RFC, CodigoPostal, "", "", Contacto, "", "", "", "", -1, False, 0, 0, False, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, "", -1, -1, -1,
-                                   "-1", "-1", -1, "-1", -1, "0", -1, "0", 0, "", 0, "", 0, "", 0, "", "", "", Codigo, 0, "", 1, False, "", "", "", False, "", "", "", "", "", False, "", "", "", False, 0, -1, EsDistribuidor:=EsDistribuidor) Then
+                        If Not ObjClientes.AddCliente(RazonSocial, RazonSocial, Calle, "", "", Colonia, "", "", Estado, Pais, RFC, CodigoPostal, "", "", Contacto, "", "", "", "", -1, False, 0, 0, False, UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, "", CveVendedor, -1, -1,
+                                   "-1", "-1", -1, "-1", -1, "0", -1, "0", 0, "", 0, "", 0, "", 0, "", "", "", Codigo, 0, "", 1, False, "", "", "", False, "", "", "", "", "", False, "", "", "", False, 0, -1, EsDistribuidor:=EsDistribuidor, CveClienteClasificacion:=CveClasificación) Then
                             ErrorClientes = True
                             RFC.GuardaLog
                             Exit For