From 925ac84761af2172733b90687614bb18abbd7df8 Mon Sep 17 00:00:00 2001 From: Antonio Gonzalez Date: Wed, 21 Aug 2019 11:29:48 -0500 Subject: [PATCH] Nueva columna agregada a FormatoClientes.xlsx --- .../SaldosIniciales/FormatoClientes.xlsx | Bin 8929 -> 8857 bytes General/SaldosIniciales.aspx.vb | 15 +++++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Empresas/Grales/SaldosIniciales/FormatoClientes.xlsx b/Empresas/Grales/SaldosIniciales/FormatoClientes.xlsx index 251dc040f912947c37c80f3a7c6c8b835f6449ea..dbc90a51dc5a84275e5ec367c296d0d3d1527a6f 100644 GIT binary patch delta 3068 zcmZ9Oc{CIZ7sdw@WmmRl#28t|k|k@DZ7gHWmR*<@6JszK6%CSY8Z<-5t|8eP+1Hwn z?AuTgvSb;_S|So(@B5zfcE0cabye*S=oUBA>LA<&v!ZL{v1eu`dn^@=c zt$<{|n7{lAC;6_z^{Q=+P+&TLT=jYLq!&D9B*m!t8U~P}$$wa>u|E zzU5<6jK4i>3&5MakjBhB^hNH1kvl-9nm(Voh)mWf(2E+bF*IHCRq79w6V3x)fmKGZc{c)+x823faB#a-wE*_jHrc!VB`3wz z4cL!HqHPPEnkG<4FNvyELscCpGK{qXSlyXfu_0lPAAY1$ronz+X2mS`VZFiEXI7!i z*Y}w0v56FT^f!WASnkbjW;?rYGg5vIR&wHjYGx!&3T@$;08a4KLWIP{dXP@u={1{T zG3KMPvkE)qN z`PHLX@bw-pDN_|&?+mXQyPofG_DP4K}lWtn(!z{sjCtE^aUGuXI z3KP7b5n{Y$(30H|qWw!g=;}39QKEs{#*%;IxPT}+VZNkRQj_N2EIQ<4Qs`Qb8IX?O z3{?~Ie)j{BV0nx+G|fce=lnTV(nseJ&b4HrEe8ixpTk+Uqv^d+INiwjl`$d=d)h;? zH9%Q-heUUn0!!X+&@f-x@(ydvP%Li89Mz}Me{TN(smgOu59!R4^WdPNdb@z}33vT& zA)@9>?xbd^87A^07XB0Bf=z3pOaOp9nZNz{jYTNi0Uxm@?;Y-C?j6}zM{KT~@ir)SxoTbP!W6QaQdfJ=U7>Ql z*37%dc?ej07)iM~uxOMRZIR^Q^(;o9ks+I97w4&1J(2gD&M%_cm0)F%wwY8=%ic74go%-lvN+^ zM^w)P&o^Cp>o2GL%x^3M=^OAJwHwIp=Zy3W)S1s7_Py@!_>)k#x2;pUq3 zec#*3Md;57Pi{_S3&5gxJkv(Fm>jkJKB=9GKgzHJ9#))k!}k`D{%7-V` zAQ!FhRu?+|FHQG*8I@Mm<9RWC3Az`~Cg@r|meW0*Bad+`^8!m^AbT$aegL9&OOC$ zT*O6vSgh=>;1VEhsTkz0K?#pzq|4ommKn*5Z-kv~=TvA~il~^}=kWAzyBjxL&*fe- ze*QADAeFB-wX`@%0%6P{kM^LSJVZ3gQ1Q`EowQz_T-ME)37VUJtaC2wt=l3t#BJX`FZUp+A0+ zK5eUcXoWT7w}e=Bk9_UQ)5Lo z!6aHP%lrG%t!Ds^L>8)gdfZMoR+@HPwDr@T51#M6&`|p$aM*ZN7uQoe4VgxIhK?L>Dl&Uud* zPvzLG!rv<1gh-c8=S5{Zckh4aT!4?oolg<+IwO;5_)#x(e{3Mf*rX(PEw(6kGeq)A zn9)X+Q(Gk~xr~+p*!?lJ2fe{)pOIATJCSYIg-s@< zBaXje%yUOg(c(9ZU8|vB2opY>WMh3_iT}ZjBZ$Dw+A>GY7&Z8>SCCb zhw{uXu$i8d;(j6)H%MpA~z-@^m$it5qdX_Hz<(<}*L8 zS1_E{WS7=UAFo5dEso&K%bTtLK97BMOC|&-$6eA5d^QEZ*1{fJn3t&Nz(N>h86m#- z&lSKxyu5nWciDE+S6_19vWW#in8hA&(}sF|_o?!ZC8pj%;LfvWzo{T#38?Hg98z(= z*~d^nC-%rXJ8sK8BZbs2lR27o%|M4G@zU-hPNwZ|AE_ptA+WIj`J>6w;^#&FeSUuX z3;%DP{|S2zatena`JuQh6NOwaE(QL7^#5sAm g@{0U>-{152{->!CM7{&P$fQGVfJ(5kK>n)z7rjxL6951J delta 3154 zcmZ9OcTf}97KekOLxgA|9TEhoLMT#15T!^_dM8Me1wnd|5)9SFP$UGDBB2Qggixi2 zrZfc!3kV_|=?c;%KzQuFnRVW~f1R1%ojEi2p6}i-Lu*c}@`MpBD|*Oibq)Yvq5}Zf z002PnBk9N9ejZNV-X2oHo{tD-eO_M?kQR=Wo9rzTHcmZB4$5&aVKf*)#%d%guS6vN znpUY0RE2SSGdwk4p+tH$A1LNk!1d|Iy-)jTLeCutWbuM6V@)PeqJN$O7pa-V*qv(C zWA^E_Me>kHhoIZht0cK6hBjXXm|?sR$Jvi{wo1hlkr@CidN+r;Nz1{<;z%v5Xu3 z`8M;xNR)}m)~VvK1@Av*HSojHOy)fxk#_|{)x_8`_!(W(0mjD)q`;@64O-Xl5E7snOO!CiX-xq(2?b znZD1HqS3*<>NPaV&##Do_3Da7+ePnH{Xv$YP(=uFRjbEgSf4pNbPnac-yB~ssU2dN6?+f zMNjrlD#SI#nHx3c#oJ{pyPXq3I&!l6S^z%xr7L;`1<5`i-m40DZs2wTXfvVJb z@ovbk>J`YI>I#1wqH}bLb+wjV@B%H^9>-6q%Q#>1$h#PW8fwG`j^|`j&&KTZ6bLZV z2h!rQfXqx-iVH1-1^@uzJXm1pTdYqvqc#!!QwC5lcIt;?l?XO}kLItbS``G2AZJ|? zetD1-GR5JKfmLffKcpTDp-m+Br%Tvahh)-G|6v^zLH{H#8{>&Q8O5e=05Ti;3Bu=NC$IbafJ7pBRT@9xtK)P-~OpmwY(- zQ$1yA+WlH`xIiTpXb$!?*D)`42|{v~F#8L(?b4mUTQOY@@UHY9j??ztw%qx##k|@aH9@0YAb}qP=a=-8UJu+k|MD3xwdz;OsS>tdAMc(D_#410Vp<%5-*A z|3%e5AmovY|39Ewd`es*;Gz#tyiXaY*BG?BO(7h9tC zv}h>RtUHpH4JT?76NPvd#^zz%`u-V=V)~V~@B*mnd%IGN>n6)(W8w^7;a}g{Bi%WQ zUu)X6keSwYgX8L-1SUBYT4;~%Gao-KC0gsYp^KWCE#YD!hO>vVhQ61y`*7nb;d#aK zBfIaBl%GMS5)VP*<`SMs6_Ian4kx;$GcI#4VDH`$e{>&58pK2kch3cxiWB9lldl_n zvK0c?&iHC5skklGjcOvEYz#b;`}K(Jh!*%GTPEN}sKOxrV&lNf`m4`XAyWL@e!x$ybOgB4OHi$2Fl94ub|?$bjH_I)EX+xLC5^5Z+*1tvM|_!l$d7J^EgL< zm;Q&tY!7hTsG-@KyO6Ch;}P+Lj69E}7C%H8@O|o-sgKSpit~~I%67e^Em1pHqL-=RSaFiUG95+RK*<2K zt`$jY0L&GqgxcJv9l3)q;_HkeMz@6A?PEFRAgQGA?OIE?;Ug$UWG|nS=#wt72ajK ze#)aR+_O626P&!q{#~8wRlOLju)2EG%}~2MY1t@=8WT<9!g4<8~^57D88w10RMNKurM>+BB3+ya--xIgI z-oA$@l4OifJnQ`Q9Dm*?gHFW=d#kLfL6sMN28Bj~qf*JF56fP^E_;6iPb4>O<-~NT z8dif8d4kdEbl(0jN^8;6)`-I8Nd#77 zOfSBruEo_HqElbkZe=RSad13_2o0l8NE8uK0T68%90(i-Q#AW`<^cSp*+Yjm_U`Cq z^iVrn71L>KEV+oF#kn5av3~JSc*P~>D`5ugO(YmMYdM367l3#$bT^6CPrPVa=lFq$ zMtxt;N6w1UtG2yz`F#PBU7sVRfK??a>G(uv)}yc%r9AP(U!8A$aEq$Y6}!pp^-R+n z&`n9G1wb3h8@`K2)j3&+!E6)LD$9S3qg{3%Ux6qs>%oAJRQFGP_%sSC&++s2S zT2ME?uhWee-rE89)exrnus8JAPr!Zf3jPrdQ%DgD9to+}R=t(CdL3H0hBePfd(gKL zhuprc%%$&H9}T=(7PQig7|WMeB?m;ulF2=5&Cp{F2cw`?7U3M`ymcPul0(`-nG?2u zuz&(e5^tY<;&wG;ZWs+ZCdF9)9RdD6Q~pk z3*%?Qt=ljW;HnfxT5v2PAmNG0^iHuBNz?pA%8`<=Ovb3Sfv(>0ae)A8Xy#8ImNg}+ z{k-I->dbyOyxj%Eh|+dTfqV)sj{{nx#}^M|{;lV@8JHaJzov9%?2t1B_`L#Ha6T-T zaItXqGhyJSX~KEKukif8G5p?s3s(t;@%;OgF#-Ubzr(YNj9Z6G@cw(JXYIiMle6&P TWCc}eVsJi!m+AFke`o&zv5wkr diff --git a/General/SaldosIniciales.aspx.vb b/General/SaldosIniciales.aspx.vb index d5bdb3a1b..9ff2eeba6 100644 --- a/General/SaldosIniciales.aspx.vb +++ b/General/SaldosIniciales.aspx.vb @@ -121,6 +121,12 @@ Partial Class General_SaldosIniciales Alert("El nombre de la treceava columna debe ser 'Plazo Cobranza'. Favor de corregirlo", TipoMensaje.MsgError) Exit Sub End If + If RblFormato.SelectedValue = "1" Then + If Not dt.Columns(14).ColumnName = "Es distribuidor" Then + Alert("El nombre de la catorceava columna debe ser 'Es distribuidor'. Favor de corregirlo", TipoMensaje.MsgError) + Exit Sub + End If + End If ElseIf RblFormato.SelectedValue = "3" Or RblFormato.SelectedValue = "4" Then If Not dt.Columns(0).ColumnName = "Sucursal" Then @@ -718,6 +724,7 @@ Partial Class General_SaldosIniciales Dim Contacto As String = Row("Contacto").ToString Dim CelularContacto As String = Row("Celular Contacto").ToString Dim CveCliente As Integer = GlobalDTCliente(UsuarioActual.CveEmpresa).FiltroPrimeroValor("CveCliente", $"RFC = '{RFC}'").ToString.ToEntero + Dim EsDistribuidor As Boolean = If(Row("Es distribuidor").ToString = "si", True, False) If CveCliente > 0 Then ExisteCliente = True @@ -730,7 +737,7 @@ Partial Class General_SaldosIniciales '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) Then + "-1", "-1", -1, "-1", -1, "0", -1, "0", 0, "", 0, "", 0, "", 0, "", "", "", Codigo, 0, "", 1, False, "", "", "", False, "", "", "", "", "", False, "", "", "", False, 0, -1, EsDistribuidor:=EsDistribuidor) Then ErrorClientes = True RFC.GuardaLog Exit For @@ -769,11 +776,11 @@ Partial Class General_SaldosIniciales Dim Encontrados As Integer = 0 DtProveedores = GlobalDTCompProveedores(UsuarioActual.CveEmpresa) Dim RFC As String = "" -Dim drr As DataRow = GlobalDTPS(UsuarioActual.CveEmpresa).FiltroPrimero("") + Dim drr As DataRow = GlobalDTPS(UsuarioActual.CveEmpresa).FiltroPrimero("") Dim CvePS As Integer = drr("CvePS").ToString.ToEntero Dim CveUnidadMedida As Integer = drr("CveUnidadMedida").ToString.ToEntero Dim CveClasificacion As Integer = drr("CveClasificacion").ToString.ToEntero - Dim dtsubp As DataTable = GlobalDTSubProyectos(-1, CveEmpresa:=UsuarioActual.CveEmpresa) + Dim dtsubp As DataTable = GlobalDTSubProyectos(-1, CveEmpresa:=UsuarioActual.CveEmpresa) For Each Row As DataRow In dt.FiltraParametros("RFC <> ''").Rows @@ -789,7 +796,7 @@ Dim drr As DataRow = GlobalDTPS(UsuarioActual.CveEmpresa).FiltroPrimero("") Dim Saldo As Decimal = Row("Saldo").ToString.ToDecimal Dim TipoDocto As String = Row("Tipo Documento").ToString Dim CveProveedor As Integer = DtProveedores.FiltroPrimeroValor("CveProveedor", $"RFC = '{RFC}'").ToString.ToEntero - GuardaLog(Sucursal + " - " + Row("Sucursal").ToString) + GuardaLog(Sucursal + " - " + Row("Sucursal").ToString) Dim RetIVA As Double = Row("Ret IVA").ToString.ToDouble Dim RetISR As Double = Row("Ret ISR").ToString.ToDouble Dim IEPS As Decimal = Row("IEPS").ToString.ToDecimal