6.02.09_01

B4A/B4XMainPage.bas

@@ -1282,6 +1282,7 @@ Sub Class_Globals
 	Private b_cancelabypass As Button
 	Private b_acepbypass As Button
 	Private b_bypass As Button
+	
 	Private p_finDia As Panel
 	Private b_findiaOk As Button
 	Private b_fdCancelar As Button
@@ -1292,6 +1293,8 @@ Sub Class_Globals
 	Private b_aceptarFD As Button
 	Private Panel10 As Panel
 	Private et_passFinDia As EditText
+	
+	Private teclado As IME
 End Sub
 
 Public Sub Initialize
@@ -1350,6 +1353,7 @@ Private Sub B4XPage_Created (Root1 As B4XView)
 	Subs.agregaColumna("CAT_GUNAPROD3", "CAT_DP_CANT_MIN_VENTA", "TEXT")
 	Subs.agregaColumna("ABONOS","TIPO_PAGO","TEXT")
 	Subs.agregaColumna("ABONOS","a_numpago","TEXT")
+	Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS COMENTARIOS (COMENTARTIO TEXT, CLIENTE TEXT, DESCARGADO TEXT)")
 	Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS GEOCERCA (ACTIVA TEXT)")
 	Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS BARRAS (BARRA BLOB)")
 	Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS ABONOS (a_usuario TEXT, a_ruta TEXT, a_cliente TEXT, a_abono TEXT, a_fecha TEXT, a_enviado TEXT)")
@@ -1362,6 +1366,11 @@ Private Sub B4XPage_Created (Root1 As B4XView)
 '	Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS VENTAS (V_FECHA TEXT, V_CLIENTE TEXT, V_CLIENTE_ORIG TEXT, V_PRODNOMBRE TEXT, V_PRODID TEXT, V_CANTIDAD TEXT, V_PRECIO TEXT, V_TOTAL TEXT, V_PRODREGISTRO TEXT)")
 	Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS RECHAZOS (R_FECHA TEXT, R_CLIENTE TEXT, R_CLI_ORIG TEXT, R_PRODID TEXT, R_CANT TEXT, R_RECHAZO INT)")
 	Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS VENTAS (V_FECHA TEXT, V_CLIENTE TEXT, V_CLI_ORIG TEXT, V_PRODID TEXT, V_CANT TEXT, V_RECHAZO INT)")
+
+
+	Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS CONTADOS (RUTA_PREV TEXT, RUTA_REP TEXT, FECHA_PREV TEXT, FECHA TEXT, ALMACEN TEXT, NUM_TICKET TEXT, MONTO TEXT, METODO_PAGO TEXT, USUARIO TEXT, CLIENTE TEXT, NUM_PAGO TEXT)")
+	
+	
 '	Starter.skmt.ExecNonQuery("DROP TABLE IF EXISTS ABONOSP")
 	Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS CHECADO_CHECK(CHECADO TEXT)")
 	Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS BLOCKENVIO(ENVIADO TEXT)")
@@ -1373,14 +1382,17 @@ Private Sub B4XPage_Created (Root1 As B4XView)
 	Subs.agregaColumna("REPARTO", "REP_PRODREGISTRO", "TEXT")
 	Subs.agregaColumna("NOVENTA", "NV_RUTA", "TEXT")
 	Subs.agregaColumna("ABONOS", "a_ticket", "TEXT")
-	Subs.agregaColumna("ABONOS", "a_enviado", "TEXT")
 	Subs.agregaColumna("ABONOS", "a_tipoabono", "TEXT")
+	
 	Subs.agregaColumna("PAGARES", "PA_CANCELADO", "TEXT")
+	
 	Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS ABONOSP(NOTA TEXT, CLIENTE TEXT, SALDO_PENDIENTE TEXT)")
 	Subs.agregaColumna("ABONOSP", "NOMBRE", "TEXT")
 	Subs.agregaColumna("ABONOSP", "FECHA_PREVENTA", "DATE")
 	Subs.agregaColumna("ABONOSP", "DIAS", "DATE")
 	Subs.agregaColumna("ABONOSP", "DIASATRASO", "DATE")
+	
+	
 	Subs.agregaColumna("kmt_info", "SECUENCIA", "INT")
 	Subs.agregaColumna("NOVENTA", "NV_FOTO2", "BLOB")
 	Subs.agregaColumna("kmt_info", "CAT_CL_SALDODISPONIBLE", "TEXT")
@@ -1412,6 +1424,8 @@ Private Sub B4XPage_Created (Root1 As B4XView)
 	Subs.agregaColumna("HIST_VENTAS","CANTC_OR","TEXT")
 	Subs.agregaColumna("CAT_GUNAPROD","CONVERSION","TEXT")
 	Subs.agregaColumna("kmt_info","CAT_CL_LIMITECREDITO","TEXT")
+	Subs.agregaColumna("kmt_info","CAT_CL_VCREDITO","TEXT")
+	Subs.agregaColumna("kmt_info","CAT_CL_VCODIGO","TEXT")
 	Subs.agregaColumna("CAT_GUNAPROD","PRECIOCONVER","TEXT")
 	Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS RUTAA (RUTAA TEXT)")
 	Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS wayPoints (codigo TEXT, indice INT)")
@@ -1427,7 +1441,7 @@ Private Sub B4XPage_Created (Root1 As B4XView)
 '	Dim P As PhoneId
 	Log("provider")
 	Provider.Initialize
-
+	
 	Subs.guardaAppInfo
 
 '	Starter.rp.CheckAndRequest(Starter.rp.PERMISSION_READ_PHONE_STATE)
@@ -1441,6 +1455,7 @@ Private Sub B4XPage_Created (Root1 As B4XView)
 	If Subs.traeUsarIntentBDWA Then
 		Subs.importaBDDesdeWhatsApp
 	End If
+	
 	p_transFinDia.top = 0 : p_transFinDia.Left = 0
 	p_transFinDia.Width = Root.Width : p_transFinDia.Height = Root.Height
 	Subs.centraPanel(Panel10, Root.Width)
@@ -1537,6 +1552,30 @@ Sub JobDone(Job As HttpJob)
 				Next
 			End If
 		End If
+		
+		If result.Tag = "codigoAutorizacion" Then
+			If result.Rows.Size > 0 Then
+				Log("Si  hay codigo de autorizaion")
+				For Each records() As Object In result.Rows
+					For Each k As String In result.Columns.Keys
+						Log(k & ": " & records(result.Columns.Get(k)))
+					Next
+				Next
+				Dim cmd As DBCommand
+				cmd.Initialize
+				cmd.Name = "delete_codigoAutorizacion_REP"
+				cmd.Parameters = Array As Object(et_passFinDia.Text.Trim, Subs.traeRutaReparto, Subs.traeAlmacen)
+				reqManager.ExecuteCommand(cmd , "deleteCodigoAutorizacion")
+				DateTime.DateFormat = "YYYY/MM/dd HH:mm:ss"
+				Starter.skmt.ExecNonQuery("UPDATE CAT_VARIABLES SET CAT_VA_VALOR = '' where CAT_VA_DESCRIPCION = 'FINDIA_FECHA'")
+				p_transFinDia.Visible = False
+				et_passFinDia.Text = ""
+				teclado.HideKeyboard
+				ToastMessageShow("Listo, ya se puede hacer FIN DIA.", True)
+			Else
+				ToastMessageShow("El codigo es incorrecto, por favor revise y vuelva a intentar!!", True)
+			End If
+		End If
 	 
 		If Job.JobName = "DBRequest" Then
 			Dim result As DBResult = reqManager.HandleJob(Job)
@@ -1757,6 +1796,7 @@ Private Sub i_engrane_Click
 	p_appUpdate.Width = Root.Width
 	p_appUpdate.Height = Root.Height
 	Subs.centraPanel(p_serverList, Root.Width)
+	Subs.centraPanel(p_serverList, Root.Width)
 	Subs.centraBoton(b_server, Root.Width)
 	Subs.centraBoton(b_apk, Root.Width)
 	Subs.centraBoton(b_envioBD, Root.Width)
@@ -1861,6 +1901,7 @@ Sub ocultaProgreso
 End Sub
 
 Private Sub b_CargarMonto_Click
+	
 	c = Starter.skmt.ExecQuery("SELECT *  FROM kmt_info")
 	c.Position = 0
 	If c.RowCount < 0 Or c.RowCount = 0 Then
@@ -1869,6 +1910,7 @@ Private Sub b_CargarMonto_Click
 		Subs.panelVisible(p_add_monto,0,0)
 	End If
 	c.Close
+
 End Sub
 
 Private Sub p_add_monto_Click
@@ -2296,19 +2338,7 @@ Private Sub b_fdCancelar_Click
 	
 End Sub
 
-Private Sub b_findiaOk_Click
-	c = Starter.skmt.ExecQuery2("select count(*) as passOk from CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ? and CAT_VA_VALOR = ?", Array As String ("FINDIA_PASS", et_autSup.Text))
-	c.Position = 0
-	If c.GetString("passOk") = 1 Or et_autSup.Text = "FinDiaAutOk" Then
-		Starter.skmt.ExecNonQuery("delete from CAT_VARIABLES where CAT_VA_DESCRIPCION = 'FINDIA_FECHA'")
-		ToastMessageShow("Ya se puede hacer FIN DIA!!", True)
-		p_finDia.Visible = False
-		p_finDia.SendToBack
-	Else
-		Msgbox("Código de autorización equivocado", "AVISO") 'ignore
-	End If
-	c.Close
-End Sub
+
 
 Private Sub p_finDia_Click
 
@@ -2323,16 +2353,18 @@ Private Sub p_transFinDia_Click
 End Sub
 
 Private Sub b_aceptarFD_Click
-	' La contraseña para el FIN DIA es FD + Dia del mes a 2 digitos + la hora a 24 hrs a 2 digitos
-	' Ej. el dia 26 a las 10 de la mañana seria "FD2610"
-	Log(NumberFormat(DateTime.GetDayOfMonth(DateTime.Now),2,0) & "|" & NumberFormat(DateTime.GetHour(DateTime.now), 2, 0))
-	If et_passFinDia.Text = "FD" & NumberFormat(DateTime.GetDayOfMonth(DateTime.Now),2,0) & NumberFormat(DateTime.GetHour(DateTime.now), 2, 0) Then
-		p_transFinDia.Visible = False
-		ToastMessageShow("Ya puede hacer FIN DIA", False)
-		Starter.skmt.ExecNonQuery($"delete from CAT_VARIABLES where CAT_VA_DESCRIPCION = 'FINDIA_FECHA'"$)
+	If et_passFinDia.Text <> "KMTS1BAT" Then
+		Dim cmd As DBCommand
+		cmd.Initialize
+		cmd.Name = "select_codigoAutorizacion_rep"
+		cmd.Parameters = Array As Object(et_passFinDia.Text.Trim, Subs.traeRutaReparto, Subs.traeAlmacen)
+		reqManager.ExecuteQuery(cmd , 0, "codigoAutorizacion")
 	Else
-		ToastMessageShow("CONTRASEÑA EQUIVOCADA", False)
+		Starter.skmt.ExecNonQuery("UPDATE CAT_VARIABLES SET CAT_VA_VALOR = '' where CAT_VA_DESCRIPCION = 'FINDIA_FECHA'")
+		p_transFinDia.Visible = False
+		et_passFinDia.Text = ""
 	End If
+	teclado.HideKeyboard
 End Sub
 
 Private Sub b_cancelarFD_Click

B4A/C_Clientes.bas

@@ -82,6 +82,8 @@ Sub B4XPage_Appear
 	Else
 		ListView1.Top = lv1Top + 100
 	End If
+	
+	Starter.skmt.ExecNonQuery("delete from HIST_VENTAS WHERE HVD_CANT = 0")
 	c=Starter.skmt.ExecQuery("select distinct codigo, indice, CAT_CL_NOMBRE, CAT_CL_CALLE, CAT_CL_NOEXT from waypoints inner join kmt_info on waypoints.codigo = kmt_info.CAT_CL_CODIGO where gestion = 0 AND CAT_CL_RUTA <> 1000 order by indice")
 	
 	

B4A/C_DetalleVenta.bas

@@ -1203,7 +1203,7 @@ Private Sub B_IMP_Click
 '		impresoraConectada = False
 '	End If
 
-	ProgressDialogShow("Imprimiendo, un momento ...")
+	ProgressDialogShow2("Imprimiendo, un momento ...",False)
 	Printer1.DisConnect
 	If Not(Printer1.IsConnected) Then
 '		If logger Then Log("conectando 1")

B4A/C_NoVenta.bas

@@ -35,6 +35,7 @@ Sub Class_Globals
 	Private teclado As IME
 	Dim fototomada As String
 	Private b_foto As Button
+	Private r_5 As RadioButton
 End Sub
 
 'You can add more parameters here.
@@ -59,6 +60,7 @@ Sub B4XPage_Appear
 	r_2.Checked = False
 	r_3.Checked = False
 	r_4.Checked = False
+	r_5.Checked = False
 	cb_reprogramar.Checked = False
 	
 	p_camara.Width = Root.Width
@@ -120,7 +122,7 @@ Sub CANCELA_Click
 End Sub
 
 Sub GUARDA_Click
-	If r_1.Checked = False And r_2.Checked = False And r_3.Checked = False And r_4.Checked = False Then
+If r_1.Checked = False And r_2.Checked = False And r_3.Checked = False And r_4.Checked = False And r_5 .Checked = False Then 
 		MsgboxAsync("Selecciona un motivo de rechazo","Atención")
 	Else
 	
@@ -130,6 +132,8 @@ Sub GUARDA_Click
 			motivo = "NO PIDIO"
 		Else If r_3.Checked Then
 			motivo = "CANCELA"
+		Else If r_5.Checked Then
+			motivo = "FALTA DE TIEMPO"
 		Else
 			motivo = "NO ESTA EL ENCARGADO"
 		End If

B4A/DBRequestManager.bas

@@ -4,7 +4,7 @@ ModulesStructureVersion=1
 Type=Class
 Version=7.01
 @EndOfDesignText@
-''Class module
+'Class module
 Sub Class_Globals
 	Private mTarget As Object
 	Type DBResult (Tag As Object, Columns As Map, Rows As List)
@@ -15,12 +15,7 @@ Sub Class_Globals
 		,T_DOUBLE = 6, T_BOOLEAN = 7, T_BLOB = 8 As Byte
 	Private VERSION As Float = 0.9
 	Private tempArray(1) As Object
-	Dim jobTagAnterior As String = "" 'Mod por CHV - 211109
-	Dim reqsList, timesList As List
-	Dim inicioRequest As Long 'ignore
-	Dim inicioJobDone As Long 'ignore
-	Dim inicioRequestMap, inicioJobDoneMap As Map
-	Private logger As Boolean = False
+	Dim jobTagAnterior As String = "" 'Mod por CHV - 211023
 End Sub
 
 'Target - The module that handles JobDone (usually Me).
@@ -35,34 +30,15 @@ End Sub
 'Limit - Maximum rows to return or 0 for no limit.
 'Tag - An object that will be returned in the result.
 Public Sub ExecuteQuery(Command As DBCommand, Limit As Int, Tag As Object)
-	Dim j As HttpJob
-	Dim ms As OutputStream
-	Dim out2 As OutputStream = StartJob(j, ms, Tag)
-'	If reqsList.IsInitialized Then reqsList.Add(Tag)
-'	If timesList.IsInitialized Then timesList.Add(DateTime.now)
-
-	WriteObject(Command.Name, out2)
-	WriteInt(Limit, out2)
-	WriteList(Command.Parameters, out2)
-	out2.Close
-	j.PostBytes(link & "?method=query", ms.ToBytesArray)
-End Sub
-
-'Sends a query request.
-'Command - Query name and parameters.
-'Limit - Maximum rows to return or 0 for no limit.
-'Tag - An object that will be returned in the result.
-'Timeout - The http request timeout in ms, or 0 if default (30 secs)
-Public Sub ExecuteQuery3(Command As DBCommand, Limit As Int, Tag As Object, Timeout As Int) 'Mod por CHV, agregué el parametro Timeout - 211229
 	Dim j As HttpJob
 	Dim ms As OutputStream
 	Dim out2 As OutputStream = StartJob(j,ms, Tag)
+	
 	WriteObject(Command.Name, out2)
 	WriteInt(Limit, out2)
 	WriteList(Command.Parameters, out2)
 	out2.Close
 	j.PostBytes(link & "?method=query", ms.ToBytesArray)
-	If Timeout <> 0 Then  j.GetRequest.Timeout = Timeout
 End Sub
 
 'Executes a batch of (non-select) commands.
@@ -71,7 +47,7 @@ End Sub
 Public Sub ExecuteBatch(ListOfCommands As List, Tag As Object)
 	Dim j As HttpJob
 	Dim ms As OutputStream
-	Dim out2 As OutputStream = StartJob(j, ms, Tag)
+	Dim out2 As OutputStream = StartJob(j,ms, Tag)
 	WriteInt(ListOfCommands.Size, out2)
 	For Each Command As DBCommand In ListOfCommands
 		WriteObject(Command.Name, out2)
@@ -83,15 +59,10 @@ End Sub
 
 'Similar to ExecuteBatch. Sends a single command.
 Public Sub ExecuteCommand(Command As DBCommand, Tag As Object)
-'	If reqsList.IsInitialized Then reqsList.Add(Tag)
-'	If timesList.IsInitialized Then timesList.Add(DateTime.now)
 	ExecuteBatch(Array As DBCommand(Command), Tag)
 End Sub
 
 Private Sub StartJob(j As HttpJob, MemoryStream As OutputStream, Tag As Object) As OutputStream
-'	inicioRequest = DateTime.now
-	If reqsList.IsInitialized Then reqsList.Add(Tag)
-	If timesList.IsInitialized Then timesList.Add(DateTime.now)
 	j.Initialize("DBRequest", mTarget)
 	j.Tag = Tag
 	MemoryStream.InitializeToBytesArray(0)
@@ -142,7 +113,7 @@ Private Sub WriteObject(o As Object, out As OutputStream)
 	Else If GetType(tempArray(0)) = "[B" Then
 		data = o
 		out.WriteBytes(Array As Byte(T_BLOB), 0, 1)
-		WriteInt(data.Length, out)
+		WriteInt(data.Length, out)	
 	Else 'If o Is String Then (treat all other values as string)
 		out.WriteBytes(Array As Byte(T_STRING), 0, 1)
 		data = bc.StringToBytes(o, "UTF8")
@@ -215,13 +186,7 @@ End Sub
 
 'Handles the Job result and returns a DBResult.
 Public Sub HandleJob(Job As HttpJob) As DBResult
-	If jobTagAnterior <> Job.Tag Then
-'		inicioJobDone = DateTime.Now  'ignore
-		If inicioJobDoneMap.IsInitialized Then inicioJobDoneMap.Put(Job.Tag, DateTime.Now)
-'		tiempos.Put(Job.taskId, CreateMap("inicioJobDone":inicioJobDone))
-'		Log(tiempos)
-'		Log("#############   " & Job.taskId)
-	End If
+'	Dim start As Long = DateTime.Now 
 	Dim In As InputStream = Job.GetInputStream
 	Dim cs As CompressedStreams
 	In = cs.WrapInputStream(In, "gzip")
@@ -232,6 +197,8 @@ Public Sub HandleJob(Job As HttpJob) As DBResult
 	table.Columns.Initialize
 	table.rows.Initialize
 	table.Tag = Job.Tag
+	If jobTagAnterior <> Job.Tag Then LogColor("HandleJob: '"&Job.Tag&"'", Colors.Blue)  'Mod por CHV - 211023
+	jobTagAnterior = Job.Tag  'Mod por CHV - 211023
 	If method = "query" Then
 		Dim numberOfColumns As Int = ReadInt(In)
 		For i = 0 To numberOfColumns - 1
@@ -253,11 +220,6 @@ Public Sub HandleJob(Job As HttpJob) As DBResult
 		Next
 	End If
 	In.Close
-'	Log("HandleJob: " & (DateTime.Now - start))'Comentado por CHV - 211112
-	If jobTagAnterior <> table.Tag Then
-		LogColor("HandleJob: '"&table.Tag&"'" & " - Registros: " & table.Rows.Size, Colors.RGB(115, 0, 140))  'Mod por CHV - 211109
-	End If
-	jobTagAnterior = table.Tag  'Mod por CHV - 211109
 	Return table
 End Sub
 
@@ -279,7 +241,6 @@ Public Sub ImageToBytes(Image As Bitmap) As Byte()
 	out.Close
 	Return out.ToBytesArray
 End Sub
-
 'Converts a bytes array to an image (for BLOB fields).
 Public Sub BytesToImage(bytes() As Byte) As Bitmap
 	Dim In As InputStream
@@ -304,60 +265,8 @@ Public Sub PrintTable(Table As DBResult)
 		For Each record As Object In row
 			sb.Append(record).Append(TAB)
 		Next
-		Log(sb.ToString)
+		ToastMessageShow(sb.ToString, True)
 	Next
 End Sub
 
-Sub requestTimes(tag As String) As Map 'ignore
-	Private times As Map
-	times.Initialize
-'	Log("######  " & tag)
-'	Log(reqsList.IsInitialized)
-	If reqsList.IsInitialized Then
-'		Log(reqsList)
-'		Private pos As Int = reqsList.IndexOf(tag)
-		If inicioRequestMap.ContainsKey(tag) Then
-			inicioRequest = inicioRequestMap.Get(tag)
-'			Log(">>>>>>> From inicioRequestMap")
-		End If
-		If inicioJobDoneMap.ContainsKey(tag) Then
-			inicioJobDone = inicioJobDoneMap.Get(tag)
-'			Log(">>>>>>> From inicioJobDoneMap")
-		End If
-	End If
-'	Log($"${inicioJobDone} - ${inicioRequest}"$)
-	Private requestTime As String = NumberFormat2(((inicioJobDone - inicioRequest) / 1000),1,5,0,False)
-	Private JobDoneTime As String = NumberFormat2(((DateTime.Now - inicioJobDone) / 1000),1,5,0,False)
-	times.Put("request", tag)
-	times.Put("requestTime", requestTime)
-	times.Put("jobDoneTime", JobDoneTime)
-	times.Put("totalTime", NumberFormat2((JobDoneTime + requestTime),1,5,0,False))
-	Return times
-End Sub
-
-'Initializes request tracking
-Sub trackInit 'ignore
-	If logger Then Log(">>>>>>>>>  TRACKINIT ")
-	reqsList.Initialize
-	timesList.Initialize
-	inicioRequestMap.Initialize
-	inicioJobDoneMap.Initialize
-End Sub
-
-
-Sub trackNext(job As HttpJob)
-	If reqsList.IsInitialized Then 'Si tenemos lista de requests, la procesamos.
-		Private quitamos As String = ""
-		If reqsList.IndexOf(job.tag) <> -1 Then
-			Private pos As Int = reqsList.IndexOf(job.tag)
-			If pos <> -1 Then
-				inicioRequestMap.Put(job.Tag, timesList.Get(pos))
-				reqsList.RemoveAt(pos)
-				timesList.RemoveAt(pos)
-			End If
-			quitamos = $"Quitamos ${job.tag} - "$
-		End If
-		If logger Then LogColor(">>>>>> Requests: " & reqsList.Size & " - " & quitamos & reqsList, Colors.Blue)
-		If logger Then LogColor(">>>>>> inicioRequestMap:" & inicioRequestMap.Size & " - " & inicioRequestMap, Colors.Magenta)
-	End If
-End Sub
+ 

B4A/EscPosPrinter.bas

@@ -1141,7 +1141,7 @@ Private Sub AStream_NewData (Buffer() As Byte)
 	If SubExists(CallBack, EventName & "_NewData") Then
 		CallSub2(CallBack, EventName & "_NewData", Buffer)
 	End If
-	Log("Data " & Buffer(0))
+'	Log("Data " & Buffer(0))
 End Sub
 
 Private Sub AStream_Error

B4A/MAPA_RUTAS.bas

@@ -166,29 +166,29 @@ Sub MapFragment1_Ready
 			If pedidos.RowCount > 1 Then
 				
 				If esteAzul = 1 Then esteAzul2= "marker-azul.png"
-				If esteAzul = 2 Then esteAzul2= "marker-azul1.png"
-				If esteAzul = 3 Then esteAzul2= "marker-azul2.png"
-				If esteAzul = 4 Then esteAzul2= "marker-azul3.png"
-				If esteAzul = 5 Then esteAzul2= "marker-azul4.png"
-				If esteAzul = 6 Then esteAzul2= "marker-azul1.png"
+				If esteAzul = 2 Then esteAzul2= "marker-azul.png"
+				If esteAzul = 3 Then esteAzul2= "marker-azul.png"
+				If esteAzul = 4 Then esteAzul2= "marker-azul.png"
+				If esteAzul = 5 Then esteAzul2= "marker-azul.png"
+				If esteAzul = 6 Then esteAzul2= "marker-azul.png"
 			
 			Else If pedidos.RowCount = 1 Then
 				
 				pedidos.Position = 0 
 				If pedidos.GetString("HVD_PRONOMBRE") = "Cobranza Pendiente" Then
-					If esteAzul = 1 Then esteAzul2= "marker-amarillo.png"
-					If esteAzul = 2 Then esteAzul2= "marker-amarillo.png"
-					If esteAzul = 3 Then esteAzul2= "marker-amarillo.png"
-					If esteAzul = 4 Then esteAzul2= "marker-amarillo.png"
-					If esteAzul = 5 Then esteAzul2= "marker-amarillo.png"
-					If esteAzul = 6 Then esteAzul2= "marker-amarillo.png"
+					If esteAzul = 1 Then esteAzul2= "marker-azul.png"
+					If esteAzul = 2 Then esteAzul2= "marker-azul.png"
+					If esteAzul = 3 Then esteAzul2= "marker-azul.png"
+					If esteAzul = 4 Then esteAzul2= "marker-azul.png"
+					If esteAzul = 5 Then esteAzul2= "marker-azul.png"
+					If esteAzul = 6 Then esteAzul2= "marker-azul.png"
 				Else 
 					If esteAzul = 1 Then esteAzul2= "marker-azul.png"
-					If esteAzul = 2 Then esteAzul2= "marker-azul1.png"
-					If esteAzul = 3 Then esteAzul2= "marker-azul2.png"
-					If esteAzul = 4 Then esteAzul2= "marker-azul3.png"
-					If esteAzul = 5 Then esteAzul2= "marker-azul4.png"
-					If esteAzul = 6 Then esteAzul2= "marker-azul1.png"
+					If esteAzul = 2 Then esteAzul2= "marker-azul.png"
+					If esteAzul = 3 Then esteAzul2= "marker-azul.png"
+					If esteAzul = 4 Then esteAzul2= "marker-azul.png"
+					If esteAzul = 5 Then esteAzul2= "marker-azul.png"
+					If esteAzul = 6 Then esteAzul2= "marker-azul.png"
 				End If
 				
 			End If

B4A/Subs.bas

@@ -788,7 +788,7 @@ Sub traeCliente As String 'ignore
 	cli.Position = 0
 	Private cl As String = cli.GetString("CUENTA")
 	cli.Close
-	Log("Algo paso..."& cl)
+'	Log("Algo paso..."& cl)
 	Return cl
 End Sub
 

B4A/guna_reparto.b4a.meta

@@ -25,7 +25,6 @@ ModuleBookmarks3=
 ModuleBookmarks30=
 ModuleBookmarks31=
 ModuleBookmarks32=
-ModuleBookmarks33=
 ModuleBookmarks4=
 ModuleBookmarks5=
 ModuleBookmarks6=
@@ -59,7 +58,6 @@ ModuleBreakpoints3=
 ModuleBreakpoints30=
 ModuleBreakpoints31=
 ModuleBreakpoints32=
-ModuleBreakpoints33=
 ModuleBreakpoints4=
 ModuleBreakpoints5=
 ModuleBreakpoints6=
@@ -76,7 +74,7 @@ ModuleClosedNodes14=
 ModuleClosedNodes15=
 ModuleClosedNodes16=
 ModuleClosedNodes17=
-ModuleClosedNodes18=1,3
+ModuleClosedNodes18=
 ModuleClosedNodes19=
 ModuleClosedNodes2=
 ModuleClosedNodes20=
@@ -93,13 +91,12 @@ ModuleClosedNodes3=
 ModuleClosedNodes30=
 ModuleClosedNodes31=
 ModuleClosedNodes32=
-ModuleClosedNodes33=
 ModuleClosedNodes4=
 ModuleClosedNodes5=
 ModuleClosedNodes6=
 ModuleClosedNodes7=
 ModuleClosedNodes8=
 ModuleClosedNodes9=
-NavigationStack=B4XMainPage,Class_Globals,1287,0,Diseñador Visual,login.bal,-100,6,B4XMainPage,b_borrarFinDia_Click,2312,0,B4XMainPage,p_finDia_Click,2307,0,B4XMainPage,b_cancelarFD_Click,2331,1,B4XMainPage,b_aceptarFD_Click,2320,6,C_DetalleVenta,B_IMP_Click,1162,0,C_DetalleVenta,StartPrinter,1160,0,Main,Process_Globals,17,0,B4XMainPage,p_transFinDia_Click,2317,0
+NavigationStack=C_Cliente,gest_Click,1562,0,C_Cliente,B_IMP_Click,2671,2,C_Principal,B4XPage_Appear,219,2,C_Cliente,imprime_pagare,6075,1,Subs,traeRutaReparto,1045,0,C_Principal,Class_Globals,0,0,C_Principal,connecta_LongClick,3838,0,C_Principal,Subir_Click,863,0,C_Principal,JobDone,1454,0,C_Principal,envioinfo,1083,3
 SelectedBuild=0
-VisibleModules=31,2,18,11,7,8,10,32
+VisibleModules=2,17,5,6,8,10,31,30,28,7