moficiacion de venta y preventa y abordo.

2026-04-17 21:06:12 +00:00 · 2024-05-02 13:54:47 -06:00
parent ac0a633bd2
commit 41a60af142
14 changed files with 221 additions and 44 deletions
--- a/B4A/B4XMainPage.bas
+++ b/B4A/B4XMainPage.bas
@@ -158,6 +158,7 @@ Private Sub B4XPage_Created (Root1 As B4XView)
 	Subs.guardaAppInfo(skmt)
 	skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS HIST_CUOTAS (HC_META6 TEXT, HC_META5 TEXT, HC_META4 TEXT, HC_META3 TEXT, HC_META2 TEXT, HC_META1 TEXT, HC_RUTA TEXT, HC_CUOTA1 TEXT, HC_CUOTA2 TEXT, HC_CUOTA3 TEXT, HC_CUOTA4 TEXT, HC_CUOTA5 TEXT, HC_CUOTA6 TEXT)")
 	skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS HIST_GPS (HGDATE TEXT, HGLAT TEXT, HGLON TEXT)")
+	skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS CAT_GUNAPROD2 (CAT_GP_INICIATIVA TEXT, CAT_GP_TIPOPROD TEXT, CAT_GP_DEV TEXT, CAT_GP_ALMACEN NUMERIC, CAT_GP_ID TEXT, CAT_GP_NOMBRE TEXT, CAT_GP_IMP1 TEXT, CAT_GP_IMP2 TEXT, CAT_GP_PRECIO TEXT, CAT_GP_CLASIF TEXT, CAT_GP_STS TEXT, CAT_GP_TIPO TEXT, CAT_GP_SUBTIPO TEXT, CAT_GP_IMG BLOB)")
 	skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS HIST_STAY_STORE (HSS_CODIGO TEXT, HSS_IN TEXT, HSS_OUT TEXT, HSS_TOT TEXT)")
 	skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS HIST_STAY_OUT (HSO_INI TEXT, HSO_FIN TEXT)")
 	skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS INVENT_X_ENVIAR (ALMACEN TEXT, PROID TEXT, CANTIDAD TEXT)")
--- a/B4A/C_Cliente.bas
+++ b/B4A/C_Cliente.bas
@@ -150,6 +150,8 @@ Sub Class_Globals
 	Dim h As Cursor
 	Dim distance As Long
 	Dim cuest As C_Cuestionario
+	Private b_ventaabordo As Button
+	Private l_factura As Label
 End Sub

 'You can add more parameters here.
@@ -373,7 +375,16 @@ Sub B4XPage_Appear
 '	End If
 '	h.Close
 '	j.Close
-'	
+
+	If la_cuenta.Text = "0" Then
+		p_cbFactura.Visible = False
+		l_factura.Visible = False
+		b_ventaabordo.Visible = False
+	Else
+		p_cbFactura.Visible = True
+		l_factura.Visible = True
+		b_ventaabordo.Visible = True
+	End If
 End Sub

 Sub GPS_LocationChanged (Location1 As Location)
@@ -414,18 +425,25 @@ Sub ListView1_ItemLongClick (Position As Int, Value As Object)
 End Sub

 Sub gest_Click
+	If la_cuenta.Text = "0" Then
+		B4XPages.MainPage.tipo_venta = "ABORDO"
+	Else
+	
 	B4XPages.MainPage.tipo_venta = "PREVENTA"
+	End If
+
 	'Buscamos en el historial de cuestionarios si el cliente ya tiene cuestionario contestado.
 	Private hc As Cursor = Starter.skmt.ExecQuery($"select count(HC_CLIENTE) as cuantos from HIST_CUESTIONARIO where HC_CLIENTE = '${Subs.traeCliente}'"$)
 	hc.Position = 0
 	Log($"${cuest.encuestaIniciada} - ${hc.GetString("cuantos")} - ${cuest.clienteConCuestionario(Subs.traeCliente)}"$)
-	If Not(cuest.encuestaIniciada) And hc.GetString("cuantos") = 0 And Not(cuest.clienteConCuestionario(Subs.traeCliente)) Then
+	
+	If la_cuenta.Text <> "0" And Not(cuest.encuestaIniciada) And hc.GetString("cuantos") = 0 And Not(cuest.clienteConCuestionario(Subs.traeCliente)) Then
 		cuest.agregaPregunta("1", "¿Se puede acceder al negocio o está enrejado?", Array As String("No, está enrejado o no se tiene acceso", "Si se pude acceder"))
 		Return False
 	End If
 	Private x As Cursor = B4XPages.MainPage.skmt.ExecQuery($"select tienda_id from COORDENADAS_GPS where tienda_id = '${la_cuenta.text}'"$)
 '	Log("+++++++++++++  " & x.RowCount)
-	If distance > 50 And x.RowCount = 0 Then
+	If la_cuenta.Text<> "0" And distance > 50 And x.RowCount = 0 Then
 		Private res As String = Msgbox2("¿Estas en la tienda, para guardar la nueva ubicación?", "AVISO", "Si","" ,"No", Null) 'ignore
 		If res = DialogResponse.POSITIVE Then
 			DateTime.DateFormat = "MM/dd/yyyy"
@@ -454,6 +472,7 @@ Private Sub B4XPage_CloseRequest As ResumableSub
 '	BACK key pressed
 '	Return True To close, False To cancel
 '	Log($"venimosDeTicketsDia=${venimosDeTicketsDia}"$)
+	If la_cuenta.Text <> "0" Then
 	cuest.encuestaIniciada = False
 	cuest.ocultPanelPregunta
 	If IsNumber(l_total.text) And Not(Subs.pedidoGuardado) Then
@@ -473,6 +492,8 @@ Private Sub B4XPage_CloseRequest As ResumableSub
 	End If
 '	venimosDeTicketsDia = False
 	B4XPages.ShowPage("Clientes")
+	Else
+	End If
 '	Return True
 	Return False
 End Sub
@@ -540,8 +561,8 @@ Sub Guardar_Click
 	Subs.actualizaTET(la_cuenta.text)
 	DateTime.TimeFormat = "HH:mm:ss"

-	mandaPendientes 'LO COMENTAMOS PARA PRUEBAS, ACTIVAR AL FINAL!!!
-	mandapiezas
+'	mandaPendientes 'LO COMENTAMOS PARA PRUEBAS, ACTIVAR AL FINAL!!!
+'	mandapiezas
 	B4XPages.MainPage.productos.reiniciarlistaProds = True
 	B4XPages.MainPage.productos.prodsMap.Initialize
 	B4XPages.MainPage.promos.promosMap.Initialize
@@ -1266,3 +1287,43 @@ Sub cuest_preguntaContestada(m As Map)
 '		Case 6
 	End Select
 End Sub
+
+
+Private Sub b_ventaabordo_Click
+	B4XPages.MainPage.tipo_venta = "VENTA"
+'	If B4XPages.MainPage.productos.clv_prods_ll.Size = 0 Then 
+'		B4XPages.MainPage.productos.LlenaProdsLL(Null)
+'	Else
+'		
+'	B4XPages.MainPage.productos.clv_prods_ll.Clear
+'	End If
+	'Buscamos en el historial de cuestionarios si el cliente ya tiene cuestionario contestado.
+	Private hc As Cursor = Starter.skmt.ExecQuery($"select count(HC_CLIENTE) as cuantos from HIST_CUESTIONARIO where HC_CLIENTE = '${Subs.traeCliente}'"$)
+	hc.Position = 0
+	Log($"${cuest.encuestaIniciada} - ${hc.GetString("cuantos")} - ${cuest.clienteConCuestionario(Subs.traeCliente)}"$)
+	If Not(cuest.encuestaIniciada) And hc.GetString("cuantos") = 0 And Not(cuest.clienteConCuestionario(Subs.traeCliente)) Then
+		cuest.agregaPregunta("1", "¿Se puede acceder al negocio o está enrejado?", Array As String("No, está enrejado o no se tiene acceso", "Si se pude acceder"))
+		Return False
+	End If
+	Private x As Cursor = B4XPages.MainPage.skmt.ExecQuery($"select tienda_id from COORDENADAS_GPS where tienda_id = '${la_cuenta.text}'"$)
+'	Log("+++++++++++++  " & x.RowCount)
+	If distance > 50 And x.RowCount = 0 Then
+		Private res As String = Msgbox2("¿Estas en la tienda, para guardar la nueva ubicación?", "AVISO", "Si","" ,"No", Null) 'ignore
+		If res = DialogResponse.POSITIVE Then
+			DateTime.DateFormat = "MM/dd/yyyy"
+			sDate=DateTime.Date(DateTime.Now)
+			sTime=DateTime.Time(DateTime.Now)
+			B4XPages.MainPage.skmt.ExecNonQuery($"insert into COORDENADAS_GPS (tienda_id, ruta, almacen, latitud, longitud, fecha) values ('${la_cuenta.Text}', '${Subs.traeRuta}', '${Subs.traeAlmacen}', '${B4XPages.MainPage.lat_gps}', '${B4XPages.MainPage.lon_gps}', '${sDate} ${sTime}')"$)
+
+			Dim cmd As DBCommand
+			cmd.Initialize
+			cmd.Name = "insert_coords_nuevas_INTMEX"
+			cmd.Parameters = Array As Object(la_cuenta.text, Subs.traeRuta, Subs.traeAlmacen, sDate & " " & sTime, B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps, usuario)
+'			Log($"${la_cuenta.text}, ${Subs.traeRuta}, ${Subs.traeAlmacen}, ${sDate} ${sTime}, ${m_lat}, ${m_lon}"$)
+			reqManager.ExecuteCommand(cmd , "ins_coords_nuevas")
+		End If
+	End If
+	'Si hay mapa de productos es que hay venta en proceso, entonces borramos la actual para meter la nueva.
+'	If B4XPages.MainPage.productos.prodsMap.IsInitialized And B4XPages.MainPage.productos.prodsMap.Size > 0 Then Subs.borraPedidoClienteActual
+	B4XPages.ShowPage("productos")
+End Sub
--- a/B4A/C_Clientes.bas
+++ b/B4A/C_Clientes.bas
@@ -74,7 +74,7 @@ Sub B4XPage_Appear
 	busca.Text = ""
 	entro ="2"
 	colonia = 0
-	c=B4XPages.MainPage.skmt.ExecQuery("select  CAT_CL_NOMBRE, CAT_CL_CALLE, CAT_CL_CODIGO from kmt_info where  gestion = 0 ORDER BY CAT_CL_CODIGO")
+	c=B4XPages.MainPage.skmt.ExecQuery($"select  CAT_CL_NOMBRE, CAT_CL_CALLE, CAT_CL_CODIGO from kmt_info where  gestion = 0 AND CAT_CL_CODIGO <> ${"0"} ORDER BY CAT_CL_CODIGO"$)
 	ListView1.Clear
 	lfila.Text = "NOMBRE"
 	
@@ -185,7 +185,7 @@ End Sub
 Sub BUSCA_TextChanged (Old As String, New As String)
 	If CHECK = 0 Then
 		q_buscar = "%" & busca.Text & "%"
-		c2=B4XPages.MainPage.skmt.ExecQuery2("select  CAT_CL_NOMBRE, CAT_CL_CALLE, CAT_CL_CODIGO from kmt_info where (CAT_CL_NOMBRE like ? OR CAT_CL_CODIGO LIKE ? OR CAT_CL_CALLE LIKE ?)and gestion = 0 order by CAT_CL_NOMBRE ", Array As String(q_buscar,q_buscar,q_buscar))
+		c2=B4XPages.MainPage.skmt.ExecQuery2($"select  CAT_CL_NOMBRE, CAT_CL_CALLE, CAT_CL_CODIGO from kmt_info where (CAT_CL_NOMBRE like ? OR CAT_CL_CODIGO LIKE ? OR CAT_CL_CALLE LIKE ?)and gestion = 0 AND CAT_CL_CODIGO <> ${"0"} order by CAT_CL_NOMBRE "$, Array As String(q_buscar,q_buscar,q_buscar))
 		ListView1.Clear
 		lfila.text = "Nombre y Calle"
 	
--- a/B4A/C_NoVenta.bas
+++ b/B4A/C_NoVenta.bas
@@ -126,7 +126,7 @@ Sub GUARDA_Click
 	B4XPages.MainPage.skmt.ExecNonQuery2("update PEDIDO_INICIO_FINAL set PIF_HORA_FINAL = ? where PIF_CLIENTE = ? and PIF_HORA_FINAL = 0", Array As Object (DateTime.Now, cuenta))
 	LogColor($"actualizamos "${cuenta},  hora_final=${DateTime.now}"$,Colors.Red)
 	
-	mandaPendientesnoventa
+'	mandaPendientesnoventa
 	B4XPages.ShowPage("Principal")
 End Sub

--- a/B4A/C_Nota.bas
+++ b/B4A/C_Nota.bas
@@ -83,11 +83,20 @@ Sub B4XPage_Appear
 			Dim label1 As Label
 			label1 = ListView1.TwoLinesLayout.Label
 			label1.TextSize = 15
-			label1.TextColor = Colors.Black
+				label1.TextColor = Colors.Black
 			label1.color = Colors.White
 			Private textColor As Int = Colors.black
+			If c.GetString("PE_FOLIO") = "VENTA" Then
+				textColor = Colors.Black
+			Else If c.GetString("PE_FOLIO") = "PREVENTA" Then
+				textColor = Colors.Magenta
+			End If
 '			If c.GetString("PE_CEDIS").Contains("PRO") Then textColor = Colors.RGB(210,105,30) 'Si es promo, cambiamos el color del texto.
-			If Not(IsNumber(c.GetString("PE_CEDIS"))) Then textColor = Colors.RGB(210,105,30) 'Si es promo, cambiamos el color del texto.
+			If Not(IsNumber(c.GetString("PE_CEDIS"))) And c.GetString("PE_FOLIO") = "VENTA" Then
+				textColor = Colors.RGB(210,105,30) 'Si es promo, cambiamos el color del texto.
+			Else If Not(IsNumber(c.GetString("PE_CEDIS"))) And c.GetString("PE_FOLIO") = "PREVENTA" Then
+				textColor = Colors.Green 'Si es promo, cambiamos el color del texto.
+			End If
 			Dim label2 As Label
 			label2 = ListView1.TwoLinesLayout.SecondLabel
 			label2.TextSize = 10
--- a/B4A/C_Principal.bas
+++ b/B4A/C_Principal.bas
@@ -209,6 +209,7 @@ Sub Class_Globals
 	Private Label22 As Label
 	Private l_rutasuplencia As Label
 	Dim userpiezas As String
+	Private b_abordo As Button
 End Sub

 'You can add more parameters here.
@@ -523,6 +524,13 @@ Sub B4XPage_Appear
 		l_rutasuplencia.Text = s.GetString("RS_RUTA")
 		
 	End If
+	
+	If l_ruta.Text = "0" Then
+		b_abordo.Visible = False
+	Else 
+		b_abordo.Visible = True
+	End If
+	
 End Sub

 Sub Subir_Click
@@ -823,6 +831,7 @@ Sub cargar_Click
 		B4XPages.MainPage.skmt.ExecNonQuery("delete from cod_result")
 		B4XPages.MainPage.skmt.ExecNonQuery("delete from hist_gest")
 		B4XPages.MainPage.skmt.ExecNonQuery("delete from cat_gunaprod")
+		B4XPages.MainPage.skmt.ExecNonQuery("delete from cat_gunaprod2")
 		B4XPages.MainPage.skmt.ExecNonQuery("delete from CAT_DETALLES_PAQ")
 		B4XPages.MainPage.skmt.ExecNonQuery("delete from telefonos")
 		B4XPages.MainPage.skmt.ExecNonQuery("delete from HIST_VENTAS")
@@ -871,6 +880,11 @@ Sub cargar_Click
 		cmd.Parameters = Array As Object(ALMACEN)
 		reqManager.ExecuteQuery(cmd , 0, "gunaprod")
 		
+		cmd.Initialize
+		cmd.Name = "select_cat_gunaprod2_INTMEX"
+		cmd.Parameters = Array As Object(ALMACEN,e_ruta.Text)
+		reqManager.ExecuteQuery(cmd , 0, "gunaprod2")
+
 '	cmd.Initialize
 '	cmd.Name = "select_resum_apk_INTMEX"   ''' va el nombre de archivo de config
 '	cmd.Parameters = Array As Object(ALMACEN)
@@ -1109,6 +1123,7 @@ Sub JobDone(Job As HttpJob)
 					B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO kmt_info(CAT_CL_CODIGO,CAT_CL_RUTA,CAT_CL_NOMBRE,CAT_CL_ATIENDE1,CAT_CL_ATIENTE2,CAT_CL_TELEFONO,CAT_CL_EMAIL,CAT_CL_CALLE,CAT_CL_NOEXT,CAT_CL_NOINT,CAT_CL_CALLE1,CAT_CL_CALLE2,CAT_CL_COLONIA,CAT_CL_MUNI,CAT_CL_EDO,CAT_CL_CP,CAT_CL_LONG,CAT_CL_LAT,CAT_CL_MTOCOMPRA,CAT_CL_NUM_SERIEFISICO, gestion) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,0)", Array As Object (CAT_CL_CODIGO,CAT_CL_RUTA,CAT_CL_NOMBRE,CAT_CL_ATIENDE1,CAT_CL_ATIENTE2,CAT_CL_TELEFONO,CAT_CL_EMAIL,CAT_CL_CALLE,CAT_CL_NOEXT,CAT_CL_NOINT,CAT_CL_CALLE1,CAT_CL_CALLE2,CAT_CL_COLONIA,CAT_CL_MUNI,CAT_CL_EDO,CAT_CL_CP,CAT_CL_LONG,CAT_CL_LAT,CAT_CL_MTOCOMPRA,CAT_CL_NUM_SERIEFISICO))
 					B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO HIST_STAY_STORE(HSS_CODIGO,  HSS_IN , HSS_OUT , HSS_TOT) VALUES (?,0,0,0)", Array As Object (CAT_CL_CODIGO))
 				Next
+				Starter.skmt.ExecNonQuery2("INSERT INTO kmt_info(CAT_CL_CODIGO,CAT_CL_RUTA,CAT_CL_NOMBRE,CAT_CL_ATIENDE1,CAT_CL_ATIENTE2,CAT_CL_TELEFONO,CAT_CL_EMAIL,CAT_CL_CALLE,CAT_CL_NOEXT,CAT_CL_NOINT,CAT_CL_CALLE1,CAT_CL_CALLE2,CAT_CL_COLONIA,CAT_CL_MUNI,CAT_CL_EDO,CAT_CL_CP,CAT_CL_LONG,CAT_CL_LAT,CAT_CL_MTOCOMPRA,CAT_CL_NUM_SERIEFISICO, gestion) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,0,0,0) ",Array As Object ("0",e_ruta.TEXT, "VENTA ABORDO","null","null","null","null","null","null","null","null","null","null","null","null","NULL","null","NULL"))
 				Listo1 = 1
 				S_CC.Text = "LISTO"
 				If Starter.marcaCel <> "Sony" Then ToastMessageShow("Catalogo Clientes Actualizados." , True)
@@ -1432,6 +1447,50 @@ Sub JobDone(Job As HttpJob)
 			End If
 		End If
 		
+		
+		''AQUI ESTAMOS TRABAJANDO 
+		If Job.JobName = "DBRequest" Then
+			Dim RESULT As DBResult = reqManager.HandleJob(Job)
+			If RESULT.Tag = "gunaprod2" Then 'query tag
+				If PB2.Progress < 30 Then S_CP.Text = "CARGANDO" 'Mod por CHV - 20211028 Agregue el "If PB2.Progress < 30 then"
+				For Each records() As Object In RESULT.Rows
+					Dim CAT_GP_ID As String = records(RESULT.Columns.Get("CAT_DP_ID"))
+					Dim CAT_GP_NOMBRE As String = records(RESULT.Columns.Get("CAT_DP_NOMBRE"))
+					Dim CAT_GP_IMP1 As String = records(RESULT.Columns.Get("CAT_DP_IMP1"))
+					Dim CAT_GP_IMP2 As String = records(RESULT.Columns.Get("CAT_DP_IMP2"))
+					Dim CAT_GP_PRECIO As String = records(RESULT.Columns.Get("CAT_DP_PRECIO"))
+					Dim CAT_GP_CLASIF As String = records(RESULT.Columns.Get("CAT_DP_CLASIF"))
+					Dim CAT_GP_STS As String = records(RESULT.Columns.Get("CAT_DP_STS"))
+					Dim CAT_GP_TIPO As String = records(RESULT.Columns.Get("CAT_DP_TIPO"))
+					Dim CAT_GP_SUBTIPO As String = records(RESULT.Columns.Get("CAT_DP_SUBTIPO"))
+					Dim CAT_GP_IMG() As Byte = records(RESULT.Columns.Get("CAT_DP_IMG"))
+					Dim CAT_GP_ALMACEN As Int = records(RESULT.Columns.Get("CAT_DP_ALMACEN"))
+					'	Dim CAT_GP_DEV As String = records(RESULT.Columns.Get("CAT_GP_DEV"))
+					Dim CAT_GP_TIPOPROD As Int = records(RESULT.Columns.Get("CAT_DP_TIPOPROD"))
+					Dim CAT_GP_INICIATIVA As Int = records(RESULT.Columns.Get("CAT_DP_INICIATIVA"))
+'					CAT_GP_INICIATIVA = 5
+'					skmt.ExecNonQuery2("INSERT INTO CAT_GUNAPROD(CAT_GP_ID,CAT_GP_NOMBRE,CAT_GP_IMP1,CAT_GP_IMP2,CAT_GP_PRECIO,CAT_GP_CLASIF,CAT_GP_STS,CAT_GP_TIPO,CAT_GP_SUBTIPO,CAT_GP_IMG,CAT_GP_ALMACEN,CAT_GP_DEV) VALUES (?,?,?,?,?,?,?,?,?,?,?,?)", Array As Object (CAT_GP_ID,CAT_GP_NOMBRE,CAT_GP_IMP1,CAT_GP_IMP2,CAT_GP_PRECIO,CAT_GP_CLASIF,CAT_GP_STS,CAT_GP_TIPO,CAT_GP_SUBTIPO,CAT_GP_IMG, CAT_GP_ALMACEN,CAT_GP_DEV))
+					B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO CAT_GUNAPROD2(CAT_GP_ID,CAT_GP_NOMBRE,CAT_GP_IMP1,CAT_GP_IMP2,CAT_GP_PRECIO,CAT_GP_CLASIF,CAT_GP_STS,CAT_GP_TIPO,CAT_GP_SUBTIPO,CAT_GP_IMG,CAT_GP_ALMACEN,CAT_GP_TIPOPROD,CAT_GP_INICIATIVA) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)", Array As Object (CAT_GP_ID,CAT_GP_NOMBRE,CAT_GP_IMP1,CAT_GP_IMP2,CAT_GP_PRECIO,CAT_GP_CLASIF,CAT_GP_STS,CAT_GP_TIPO,CAT_GP_SUBTIPO,CAT_GP_IMG, CAT_GP_ALMACEN,CAT_GP_TIPOPROD, CAT_GP_INICIATIVA))
+				Next
+				Listo2=1
+				If PB2.Progress = 0 Then
+					PB2.Progress = 30
+					S_CP.Text = "CARGANDO"
+				ELSE If PB2.Progress = 30 Then
+					PB2.Progress = 60
+				ELSE IF PB2.Progress = 60 Then
+					PB2.Progress = 100
+					S_CP.Text = "LISTO"
+				End If
+				If Starter.marcaCel <> "Sony" Then ToastMessageShow("Productos Actualizados." , True)
+				If Listo1 =1 And Listo2 =1 And Listo3 = 1 And Listo4 = 1 Then
+					B4XPage_Appear
+					img2.Visible=False
+					EJECUTANDO=0
+				End If
+			End If
+		End If
+
 		If Job.JobName = "DBRequest" Then
 			Dim RESULT As DBResult = reqManager.HandleJob(Job)
 			If RESULT.Tag = "gunaprodp" Then 'query tag
@@ -1910,6 +1969,7 @@ Sub e_ruta_EnterPressed
 			B4XPages.MainPage.skmt.ExecNonQuery("delete from kmt_info")
 			B4XPages.MainPage.skmt.ExecNonQuery("delete from kmt_info2")
 			B4XPages.MainPage.skmt.ExecNonQuery("delete from cat_gunaprod")
+			B4XPages.MainPage.skmt.ExecNonQuery("delete from cat_gunaprod2")
 			B4XPages.MainPage.skmt.ExecNonQuery("delete from CAT_DETALLES_PAQ")
 			B4XPages.MainPage.skmt.ExecNonQuery("delete from HIST_VENTAS")
 			B4XPages.MainPage.skmt.ExecNonQuery("delete from HIST_VERIFICACION")
@@ -1948,6 +2008,7 @@ Sub inv_Click
 	EJECUTANDO = 1
 	inve = 1
 	B4XPages.MainPage.skmt.ExecNonQuery("delete from cat_gunaprod")
+	B4XPages.MainPage.skmt.ExecNonQuery("delete from cat_gunaprod2")
 	B4XPages.MainPage.skmt.ExecNonQuery("delete from CAT_DETALLES_PAQ")
 	c=B4XPages.MainPage.skmt.ExecQuery("select usuario from usuarioa")
 	c.Position = 0
@@ -2062,6 +2123,7 @@ Sub B_OK_PAS_Click
 			B4XPages.MainPage.skmt.ExecNonQuery("delete from cod_result")
 			B4XPages.MainPage.skmt.ExecNonQuery("delete from hist_gest")
 			B4XPages.MainPage.skmt.ExecNonQuery("delete from cat_gunaprod")
+			B4XPages.MainPage.skmt.ExecNonQuery("delete from cat_gunaprod2")
 			B4XPages.MainPage.skmt.ExecNonQuery("delete from CAT_DETALLES_PAQ")
 			B4XPages.MainPage.skmt.ExecNonQuery("delete from telefonos")
 			B4XPages.MainPage.skmt.ExecNonQuery("delete from HIST_VENTAS")
@@ -2472,3 +2534,11 @@ End Sub
 Private Sub p_mandaInfo_Click
 	
 End Sub
+
+
+Private Sub b_abordo_Click
+	Starter.skmt.ExecNonQuery("delete from CUENTAA")
+	Starter.skmt.ExecNonQuery2("INSERT INTO CUENTAA VALUES (?)", Array As Object("0"))
+	B4XPages.MainPage.tipo_venta = "ABORDO"
+	B4XPages.ShowPage("Productos")
+End Sub
--- a/B4A/C_Productos.bas
+++ b/B4A/C_Productos.bas
@@ -82,6 +82,7 @@ Sub Class_Globals
 	Dim hayPedido As Boolean
 	Dim listaHints As List
 	Dim r As Cursor
+	Dim vamoaver As List
 End Sub

 'You can add more parameters here.
@@ -131,6 +132,11 @@ End Sub
 'You can see the list of page related events in the B4XPagesManager object. The event name is B4XPage.

 Sub B4XPage_Appear
+	If B4XPages.MainPage.tipo_venta = "PREVENTA" Or B4XPages.MainPage.tipo_venta = "ABORDO" Then
+		Starter.tabla = "CAT_GUNAPROD"
+	Else If B4XPages.MainPage.tipo_venta = "VENTA" Then
+		Starter.tabla = "CAT_GUNAPROD2"
+	End If
 	clienteId = Subs.traeCliente
 	rutaUsuario = Subs.traeRuta
 	B4XPages.MainPage.skmt.ExecNonQuery2("UPDATE CAT_GUNAPROD SET CAT_GP_TIPOPROD = (?) WHERE CAT_GP_TIPOPROD = (?) ",Array As Object("PRIORITARIO","1"))
@@ -167,7 +173,7 @@ Sub B4XPage_Appear
 	label1.TextColor = Colors.Black
 	lv_catalogos.Clear
 	lv_catalogos.AddSingleLine("CATALOGO")
-	c = B4XPages.MainPage.skmt.ExecQuery("select count(*) as hayPromos from cat_gunaprod where CAT_GP_TIPOPROD = 'PROMOS'")
+	c = B4XPages.MainPage.skmt.ExecQuery($"select count(*) as hayPromos from ${Starter.tabla} where CAT_GP_TIPOPROD = 'PROMOS'"$)
 	c.Position = 0
 	If c.GetInt("hayPromos") > 0 Then
 		lv_catalogos.AddSingleLine("PROMOS")
@@ -185,6 +191,7 @@ Sub B4XPage_Appear
 	montoPedidoActual = m.Get("monto")
 	hayPedido = Subs.hayPedido
 '	LogColor("Pedido ant? - "&hayPedido, Colors.Magenta)
+		B4XPages.MainPage.productos.clv_prods_ll.Clear
 	If reiniciarlistaProds Then
 '		Log("Llamamos LlenaProdsLL")
 '		LlenaProdsLL(Null)
@@ -244,7 +251,8 @@ Sub lv_catalogos_ItemClick (Position As Int, Value As Object)
 		label14.TextSize = 12
 		label14.TextColor = Colors.Black
 		lfila.text = "PROMOS"
-		c2=B4XPages.MainPage.skmt.ExecQuery2("select  CAT_GP_ID, CAT_GP_NOMBRE, CAT_GP_PRECIO, CAT_GP_ALMACEN, CAT_GP_IMG from cat_gunaprod where CAT_GP_PRECIO > 0 AND  CAT_GP_ALMACEN > 0 and CAT_GP_TIPOPROD = ? AND CAT_GP_TIPO = ? AND CAT_GP_SUBTIPO = ?  AND CAT_GP_ID NOT IN (SELECT PE_PROID FROM PEDIDO WHERE PE_CLIENTE IN (Select cuenta from cuentaa) )", Array As String(Value, Value, Value))
+		
+		c2=B4XPages.MainPage.skmt.ExecQuery2($"select  CAT_GP_ID, CAT_GP_NOMBRE, CAT_GP_PRECIO, CAT_GP_ALMACEN, CAT_GP_IMG from ${Starter.tabla} where CAT_GP_PRECIO > 0 AND  CAT_GP_ALMACEN > 0 and CAT_GP_TIPOPROD = ? AND CAT_GP_TIPO = ? AND CAT_GP_SUBTIPO = ?  AND CAT_GP_ID NOT IN (SELECT PE_PROID FROM PEDIDO WHERE PE_CLIENTE IN (Select cuenta from cuentaa) )"$, Array As String(Value, Value, Value))
 '		Log($"res:${c2.RowCount}, ${Value}, ${marca}, ${tipo}"$)
 		If c2.RowCount > 0 Then
 			For i=0 To c2.RowCount -1
@@ -277,10 +285,10 @@ Sub lv_catalogos2_ItemClick (Position As Int, Value As Object)
 	End If
 	If Value = "PROMOS" Then
 		LogColor("Promos", Colors.red)
-		c2=B4XPages.MainPage.skmt.ExecQuery2("select  CAT_GP_ID, CAT_GP_NOMBRE, CAT_GP_PRECIO, CAT_GP_ALMACEN, CAT_GP_IMG from cat_gunaprod where CAT_GP_PRECIO > 0 AND  CAT_GP_ALMACEN > 0 and CAT_GP_TIPOPROD = ? AND CAT_GP_TIPO = ? AND CAT_GP_SUBTIPO = ?  AND CAT_GP_ID NOT IN (SELECT PE_PROID FROM PEDIDO WHERE PE_CLIENTE IN (Select cuenta from cuentaa) )", Array As String(Value, marca, tipo))
+		c2=B4XPages.MainPage.skmt.ExecQuery2($"select  CAT_GP_ID, CAT_GP_NOMBRE, CAT_GP_PRECIO, CAT_GP_ALMACEN, CAT_GP_IMG from ${Starter.tabla} where CAT_GP_PRECIO > 0 AND  CAT_GP_ALMACEN > 0 and CAT_GP_TIPOPROD = ? AND CAT_GP_TIPO = ? AND CAT_GP_SUBTIPO = ?  AND CAT_GP_ID NOT IN (SELECT PE_PROID FROM PEDIDO WHERE PE_CLIENTE IN (Select cuenta from cuentaa) )"$, Array As String(Value, marca, tipo))
 	Else
 		LogColor("Catalogo", Colors.red)
-		c2=B4XPages.MainPage.skmt.ExecQuery("select CAT_GP_ID, CAT_GP_NOMBRE, CAT_GP_PRECIO, CAT_GP_ALMACEN, CAT_GP_IMG, CAT_GP_TIPOPROD, CAT_GP_INICIATIVA from cat_gunaprod where CAT_GP_PRECIO > 0 AND CAT_GP_ALMACEN > 0 and CAT_GP_TIPOPROD <> 'PROMOS' ")
+		c2=B4XPages.MainPage.skmt.ExecQuery($"select CAT_GP_ID, CAT_GP_NOMBRE, CAT_GP_PRECIO, CAT_GP_ALMACEN, CAT_GP_IMG, CAT_GP_TIPOPROD, CAT_GP_INICIATIVA from ${Starter.tabla} where CAT_GP_PRECIO > 0 AND CAT_GP_ALMACEN > 0 and CAT_GP_TIPOPROD <> 'PROMOS' "$)
 	End If
 	If Value = "CATALOGO" Then
 		lv_catalogos.Visible = False
@@ -591,6 +599,8 @@ Sub b_terminar1_Click
 	Private c_prods As Cursor=B4XPages.MainPage.skmt.ExecQuery("select PE_PRONOMBRE,PE_COSTO_TOT, PE_CANT, PE_FOLIO, PE_CEDIS FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa) order by PE_CEDIS, PE_PRONOMBRE")
 	If c_prods.RowCount > 0 Then
 		Private cs As CSBuilder
+		
+		vamoaver.Initialize
 		For i=0 To c_prods.RowCount -1
 			cs.Initialize
 			c_prods.Position=i
@@ -600,13 +610,24 @@ Sub b_terminar1_Click
 			label1.TextColor = Colors.Black
 			label1.color = Colors.White
 			Private textColor As Int = Colors.black
-			If Not(IsNumber(c_prods.GetString("PE_CEDIS"))) Then textColor = Colors.RGB(210,105,30) 'Si es promo, cambiamos el color del texto.
 			
+			If c_prods.GetString("PE_FOLIO") = "VENTA" Then
+				textColor = Colors.RGB(48,3,195)
+			Else If c_prods.GetString("PE_FOLIO") = "PREVENTA" or c_prods.GetString("PE_FOLIO") = "ABORDO" Then
+				textColor = Colors.RGB(166,0,0)
+			End If
+			If Not(IsNumber(c_prods.GetString("PE_CEDIS"))) And c_prods.GetString("PE_FOLIO") = "VENTA" Then
+				textColor = Colors.RGB(110,74,228) 'Si es promo, cambiamos el color del texto.
+			Else If Not(IsNumber(c_prods.GetString("PE_CEDIS"))) And c_prods.GetString("PE_FOLIO") = "PREVENTA" Then
+				textColor = Colors.RGB(231,6,6) 'Si es promo, cambiamos el color del texto.
+			End If
 			Dim label2 As Label
 			label2 = lv_prodsPedido.TwoLinesLayout.SecondLabel
 			label2.TextSize = 10
 			label2.TextColor = Colors.Blue
+			
 			lv_prodsPedido.AddTwoLines(cs.Color(textColor).append(c_prods.GetString("PE_PRONOMBRE")).pop,"Cantidad #"& c_prods.GetString("PE_CANT")& " SubTotal $"& c_prods.GetString("PE_COSTO_TOT")& " Folio "& c_prods.GetString("PE_FOLIO"))
+			vamoaver.Add(c_prods.GetString("PE_FOLIO"))
 			folio = c_prods.GetString("PE_FOLIO")
 		Next
 '		c=B4XPages.MainPage.skmt.ExecQuery("select pc_noart, pc_monto from pedido_cliente where pc_cliente in (Select CUENTA from cuentaa)")
@@ -665,7 +686,7 @@ End Sub
 Private Sub lv_promos_ItemLongClick (Position As Int, Value As Object)
 	Log("Promo longclic = "&Value)
 	Private id As String = ""
-	Dim c As Cursor = B4XPages.MainPage.skmt.ExecQuery($"select CAT_GP_ID from cat_gunaprod where CAT_GP_TIPO = 'PROMOS' and CAT_GP_NOMBRE = '${Value}'"$)
+	Dim c As Cursor = B4XPages.MainPage.skmt.ExecQuery($"select CAT_GP_ID from ${Starter.tabla} where CAT_GP_TIPO = 'PROMOS' and CAT_GP_NOMBRE = '${Value}'"$)
 	If c.RowCount > 0 Then
 		c.Position = 0
 		id = c.GetString("CAT_GP_ID")
@@ -752,18 +773,31 @@ Private Sub lv_prodsPedido_ItemLongClick (Position As Int, Value As Object)
 	If Not(Subs.pedidoGuardado) Then
 		result =  Msgbox2("Seguro que desea borrar este articulo?","Borrar Articulo", "Si", "", "No",LoadBitmap(File.DirAssets,"alert2.png")) 'ignore
 		If result = DialogResponse.POSITIVE Then
-			c=B4XPages.MainPage.skmt.ExecQuery2("select PE_PROID,PE_CANT FROM PEDIDO where pe_pronombre = ? and pe_cliente in (Select CUENTA from cuentaa) ", Array As String(Value))
+			c=B4XPages.MainPage.skmt.ExecQuery2("select PE_PROID,PE_CANT, PE_FOLIO FROM PEDIDO where pe_pronombre = ? and pe_cliente in (Select CUENTA from cuentaa) ", Array As String(Value))
 			c.Position=0
-			B4XPages.MainPage.skmt.ExecNonQuery2("update cat_gunaprod set cat_gp_almacen = cat_gp_almacen + ? where cat_gp_id = ?", Array As Object(c.GetString("PE_CANT"),c.GetString("PE_PROID")))
-			B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO  INVENT_X_ENVIAR (ALMACEN , PROID , CANTIDAD ) VALUES(?,?,?) ", Array As Object (Subs.traeAlmacen,c.GetString("PE_PROID"),c.GetString("PE_CANT")* -1))
-			c.Close
-			c=B4XPages.MainPage.skmt.ExecQuery2("select count(*) AS CUANTOS from cat_gunaprod where  CAT_GP_ID in (select pe_cedis from pedido where pe_pronombre = ? and pe_cliente in (Select CUENTA from cuentaa)) and CAT_GP_CLASIF = 'PROMOS' AND CAT_GP_TIPO = 'PROMOS' AND CAT_GP_SUBTIPO = 'PROMOS'", Array As String(Value))
-			c.Position=0
-			If c.GetString("CUANTOS") > 0 Then
-				B4XPages.MainPage.skmt.ExecNonQuery2("delete from pedido where  pe_cedis in (select pe_cedis from pedido where pe_pronombre = ?) and pe_cliente in (Select CUENTA from cuentaa)", Array As Object(Value))
+			Log(vamoaver.Get(Position))
+			If vamoaver.Get(Position) = "VENTA" Then
+				Log("CAT_GUNAPROD2")
+				Log(Position)
+				Log(Value)
+				Starter.tabla = "CAT_GUNAPROD2"
 			Else
-				B4XPages.MainPage.skmt.ExecNonQuery2("delete from pedido where  pe_pronombre = ?  and pe_cliente in (Select CUENTA from cuentaa)", Array As Object(Value))
+				Log("CAT_GUNAPROD")
+				Log(Position)
+				Log(Value)
+				Starter.tabla = "CAT_GUNAPROD"
 			End If
+			B4XPages.MainPage.skmt.ExecNonQuery2($"update ${Starter.tabla} set cat_gp_almacen = cat_gp_almacen + ? where cat_gp_id = ?"$, Array As Object(c.GetString("PE_CANT"),c.GetString("PE_PROID")))
+			B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO  INVENT_X_ENVIAR (ALMACEN , PROID , CANTIDAD ) VALUES(?,?,?) ", Array As Object (Subs.traeAlmacen,c.GetString("PE_PROID"),c.GetString("PE_CANT")* -1))
+			c2=B4XPages.MainPage.skmt.ExecQuery2($"select count(*) AS CUANTOS from ${Starter.tabla} where  CAT_GP_ID in (select pe_cedis from pedido where pe_pronombre = ? and pe_cliente in (Select CUENTA from cuentaa)) and CAT_GP_CLASIF = 'PROMOS' AND CAT_GP_TIPO = 'PROMOS' AND CAT_GP_SUBTIPO = 'PROMOS'"$, Array As String(Value))
+			c2.Position=0
+			If c2.GetString("CUANTOS") > 0 Then
+				B4XPages.MainPage.skmt.ExecNonQuery2("delete from pedido where  pe_cedis in (select pe_cedis from pedido where pe_pronombre = ?) and pe_cliente in (Select CUENTA from cuentaa) AND PE_FOLIO = ?", Array As Object(Value, c.GetString("PE_FOLIO")))
+			Else
+				B4XPages.MainPage.skmt.ExecNonQuery2("delete from pedido where  pe_pronombre = ?  and pe_cliente in (Select CUENTA from cuentaa) AND PE_FOLIO = ?", Array As Object(Value, c.GetString("PE_FOLIO")))
+			End If
+			c.Close
+			c2.Close
 			DateTime.DateFormat = "MM/dd/yyyy"
 			sDate=DateTime.Date(DateTime.Now)
 			sTime=DateTime.Time(DateTime.Now)
@@ -874,7 +908,7 @@ Sub Busca_TextChanged (Old As String, New As String)
 	listaProds.Initialize
 	listaHints.Initialize
 	Sleep(0)
-	Dim p As ResultSet = B4XPages.MainPage.skmt.ExecQuery($"select CAT_GP_ID, CAT_GP_NOMBRE, CAT_GP_ALMACEN, CAT_GP_PRECIO, CAT_GP_TIPOPROD from CAT_GUNAPROD where CAT_GP_NOMBRE like '%${New}%' and CAT_GP_PRECIO > 0 AND CAT_GP_ALMACEN > 0 and CAT_GP_CLASIF <> 'PROMOS' order by CAT_GP_NOMBRE"$)
+	Dim p As ResultSet = B4XPages.MainPage.skmt.ExecQuery($"select CAT_GP_ID, CAT_GP_NOMBRE, CAT_GP_ALMACEN, CAT_GP_PRECIO, CAT_GP_TIPOPROD from ${Starter.tabla} where CAT_GP_NOMBRE like '%${New}%' and CAT_GP_PRECIO > 0 AND CAT_GP_ALMACEN > 0 and CAT_GP_CLASIF <> 'PROMOS' order by CAT_GP_NOMBRE"$)
 	Log("Llamamos LlenaProdsLL")
 	LlenaProdsLL(p)
 '	Do While p.NextRow
@@ -898,12 +932,12 @@ Sub Busca_TextChanged (Old As String, New As String)
 End Sub

 Sub LlenaProdsLL(p As ResultSet)
-'	Log("Iniciamos LlenaProdsLL")
+	Log("Iniciamos LlenaProdsLL")
 	listaProds.Initialize
 	If hayPedido Then 'Si hay pedido obtenemos las cantidades de los productos para agregarlos al CLV.
 		Dim cantsMap As Map
 		cantsMap.Initialize
-		Dim pe As ResultSet = B4XPages.MainPage.skmt.ExecQuery($"select PE_PROID, PE_CANT from PEDIDO where PE_CLIENTE = '${clienteId}' and PE_CEDIS = '${Subs.traeAlmacen}'"$)
+		Dim pe As ResultSet = B4XPages.MainPage.skmt.ExecQuery($"select PE_PROID, PE_CANT from PEDIDO where PE_CLIENTE = '${clienteId}' and PE_CEDIS = '${Subs.traeAlmacen}' and PE_FOLIO = '${B4XPages.MainPage.tipo_venta}'"$)
 '		LogColor("Ponemos productos de pedido anterior: "&pe.RowCount, Colors.red)
 		Do While pe.NextRow
 			Private cant As Int = 0
@@ -916,7 +950,8 @@ Sub LlenaProdsLL(p As ResultSet)
 '		Log("YA HAY RESULSET")
 	Else
 '		Log("NO HAY RESULSET")
-		Dim p As ResultSet = B4XPages.MainPage.skmt.ExecQuery($"select CAT_GP_ID, CAT_GP_NOMBRE, CAT_GP_ALMACEN, CAT_GP_PRECIO, CAT_GP_TIPOPROD from CAT_GUNAPROD where CAT_GP_PRECIO > 0 And CAT_GP_ALMACEN > 0 And CAT_GP_CLASIF <> 'PROMOS' order by CAT_GP_NOMBRE"$)
+LogColor(Starter.tabla,Colors.blue)
+		Dim p As ResultSet = B4XPages.MainPage.skmt.ExecQuery($"select CAT_GP_ID, CAT_GP_NOMBRE, CAT_GP_ALMACEN, CAT_GP_PRECIO, CAT_GP_TIPOPROD from ${Starter.tabla} where CAT_GP_PRECIO > 0 And CAT_GP_ALMACEN > 0 And CAT_GP_CLASIF <> 'PROMOS' order by CAT_GP_NOMBRE"$)
 	End If
 	
 	Do While p.NextRow
--- a/B4A/Files/cliente.bal
+++ b/B4A/Files/cliente.bal
--- a/B4A/Files/login.bal
+++ b/B4A/Files/login.bal
--- a/B4A/Files/principal.bal
+++ b/B4A/Files/principal.bal
--- a/B4A/INTMEX.b4a
+++ b/B4A/INTMEX.b4a
@@ -162,7 +162,7 @@ Version=12.5
 #Region  Project Attributes 
 	#ApplicationLabel: Intmex
 	#VersionCode: 1
-	#VersionName: 4.03.06
+	#VersionName: 4.05.01
 	'SupportedOrientations possible values: unspecified, landscape or portrait.
 	#SupportedOrientations: portrait
 	#CanInstallToExternalStorage: False
--- a/B4A/INTMEX.b4a.meta
+++ b/B4A/INTMEX.b4a.meta
@@ -62,7 +62,7 @@ ModuleClosedNodes10=
 ModuleClosedNodes11=
 ModuleClosedNodes12=
 ModuleClosedNodes13=
-ModuleClosedNodes14=9,11
+ModuleClosedNodes14=11
 ModuleClosedNodes15=9,10
 ModuleClosedNodes16=
 ModuleClosedNodes17=
@@ -85,6 +85,6 @@ ModuleClosedNodes6=
 ModuleClosedNodes7=
 ModuleClosedNodes8=
 ModuleClosedNodes9=1
-NavigationStack=C_Principal,Subir_Click,727,6,Starter,Service_Create,39,0,Starter,Process_Globals,16,0,C_Principal,Class_Globals,0,0,C_Principal,JobDone,1388,4,C_Principal,cargar_Click,863,0,C_Productos,B4XPage_Appear,192,0,C_Cliente,MODS,0,0,C_Cliente,B_GUARDA_C_Click,706,0,C_Cliente,Guardar_Click,537,0
+NavigationStack=C_Clientes,B4XPage_Appear,101,6,C_Principal,b_abordo_Click,2527,0,C_Principal,B_OK_PANEL5_Click,2509,0,Diseñador Visual,cliente.bal,-100,1,C_Principal,Class_Globals,206,0,C_Principal,B4XPage_Created,284,0,C_Principal,B4XPage_Appear,522,6,Diseñador Visual,principal.bal,-100,3,Diseñador Visual,login.bal,-100,1,C_Cliente,B4XPage_Appear,371,0,C_Cliente,B4XPage_CloseRequest,488,6
 SelectedBuild=0
-VisibleModules=2,26,13,16,14,4,27,15,9,6
+VisibleModules=2,26,13,16,14,4,27,15,9,6,5
--- a/B4A/Starter.bas
+++ b/B4A/Starter.bas
@@ -20,10 +20,10 @@ Sub Process_Globals
 	Public FLP As FusedLocationProvider
 '	Private flpStarted As Boolean
 	Dim reqManager As DBRequestManager
-	Dim DBReqServer As String = "http://187.189.244.154:1781"
-'	Dim DBReqServer As String = "http://187.189.244.154:1783"
+'	Dim DBReqServer As String = "http://187.189.244.154:1781"
+	Dim DBReqServer As String = "http://11.0.0.119:1781"
 '	Dim DBReqServer As String = "http://10.0.0.205:1783"
-'	Dim DBReqServer As String = "http://11.0.0.207:1781"
+'	Dim DBReqServer As String = "http://192.168.100.10:1781"
 	Dim Timer1 As Timer
 	Dim Interval As Int = 10
 	Dim ruta As String = File.DirInternal
@@ -33,6 +33,7 @@ Sub Process_Globals
 	Dim muestraProgreso = 0
 	Dim logger As Boolean = False
 	Dim marcaCel As String = ph.manufacturer
+	Dim tabla As String
 End Sub

 Sub Service_Create
--- a/B4A/Subs.bas
+++ b/B4A/Subs.bas
@@ -738,7 +738,7 @@ Sub guardaProducto(cedis As String, costoU As String, cant As String, nombre As
 '	LogColor("guardaProducto: "&prodId&", cant="&cant, Colors.Magenta)
 	Private c As Cursor
 	B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO  PEDIDO (PE_CEDIS,PE_COSTO_TOT,PE_COSTOU,PE_CANT,PE_PRONOMBRE,PE_PROID,PE_CLIENTE,PE_FECHA,PE_USUARIO,PE_RUTA,PE_COSTO_SIN,PE_FOLIO) VALUES(?,?,?,?,?,?,?,?,?,?,?,?) ", Array As Object (cedis, (cant * costoU), costoU, cant, nombre, prodId, clienteId, fecha, usuario, rutaV, precioSin, tipoVenta))
-	B4XPages.MainPage.skmt.ExecNonQuery2("update cat_gunaprod set cat_gp_almacen = cat_gp_almacen - ? where cat_gp_id = ? ", Array As Object(cant, prodId))
+	B4XPages.MainPage.skmt.ExecNonQuery2($"update ${Starter.tabla} set cat_gp_almacen = cat_gp_almacen - ? where cat_gp_id = ? "$, Array As Object(cant, prodId))
 	c=B4XPages.MainPage.skmt.ExecQuery("select sum(pe_costo_tot) as TOTAL_CLIE, SUM(PE_CANT) AS CANT_CLIE, SUM(PE_COSTO_SIN) AS TOTAL_CLIE_SIN FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa)")
 	c.Position=0
 	B4XPages.MainPage.skmt.ExecNonQuery("delete from pedido_cliente where PC_CLIENTE In (select cuenta from cuentaa)")
@@ -753,7 +753,7 @@ Sub guardaProductoSinGestion(cedis As String, costoU As String, cant As String,
 '	LogColor("guardaProducto: "&prodId&", cant="&cant, Colors.Magenta)
 	Private c As Cursor
 	B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO PEDIDO (PE_CEDIS,PE_COSTO_TOT,PE_COSTOU,PE_CANT,PE_PRONOMBRE,PE_PROID,PE_CLIENTE,PE_FECHA,PE_USUARIO,PE_RUTA,PE_COSTO_SIN,PE_FOLIO,PE_ENVIO_OK) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,0) ", Array As Object (cedis, (cant * costoU), costoU, cant, nombre, prodId, clienteId, fecha, usuario, rutaV, precioSin, tipoVenta))
-	B4XPages.MainPage.skmt.ExecNonQuery2("update cat_gunaprod set cat_gp_almacen = cat_gp_almacen - ? where cat_gp_id = ? ", Array As Object(cant, prodId))
+	B4XPages.MainPage.skmt.ExecNonQuery2($"update ${Starter.tabla} set cat_gp_almacen = cat_gp_almacen - ? where cat_gp_id = ? "$, Array As Object(cant, prodId))
 	c=B4XPages.MainPage.skmt.ExecQuery("select sum(pe_costo_tot) as TOTAL_CLIE, SUM(PE_CANT) AS CANT_CLIE, SUM(PE_COSTO_SIN) AS TOTAL_CLIE_SIN FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa)")
 	c.Position=0
 	B4XPages.MainPage.skmt.ExecNonQuery("delete from pedido_cliente where PC_CLIENTE In (select cuenta from cuentaa)")
@@ -761,19 +761,19 @@ Sub guardaProductoSinGestion(cedis As String, costoU As String, cant As String,
 End Sub

 Sub actualizaProducto(cedis As String, costoU As String, cant As String, nombre As String, prodId As String, clienteId As String, fecha As String, usuario As String, rutaV As String, precioSin As String, tipoVenta As String)
-	Private c As Cursor=B4XPages.MainPage.skmt.ExecQuery($"select * from pedido where pe_cedis = '${cedis}' and pe_proid = '${prodId}' and pe_cliente = '${clienteId}'"$)
+	Private c As Cursor=B4XPages.MainPage.skmt.ExecQuery($"select * from pedido where pe_cedis = '${cedis}' and pe_proid = '${prodId}' and pe_cliente = '${clienteId}' AND PE_FOLIO = '${B4XPages.MainPage.tipo_venta}'"$)
 '	Log($"ROWCOUNT: ${c.RowCount}, ${cant}"$)
 	If c.RowCount > 0 Then
 		c.Position=0
 		Private antCant As Int = 0
 		If IsNumber(c.GetInt("PE_CANT")) Then antCant=c.GetInt("PE_CANT")
 		Private difCant As Int = cant - antCant
-		B4XPages.MainPage.skmt.ExecNonQuery($"update pedido set pe_cant = ${cant}, pe_costo_tot = ${(cant*c.GetString("PE_COSTOU"))} where pe_cedis = '${cedis}' and pe_proid = '${prodId}' and pe_cliente = '${clienteId}' "$)
-		B4XPages.MainPage.skmt.ExecNonQuery($"update cat_gunaprod set cat_gp_almacen = cat_gp_almacen - (${difCant}) where cat_gp_id = '${prodId}' "$)
+		B4XPages.MainPage.skmt.ExecNonQuery($"update pedido set pe_cant = ${cant}, pe_costo_tot = ${(cant*c.GetString("PE_COSTOU"))} where pe_cedis = '${cedis}' and pe_proid = '${prodId}' and pe_cliente = '${clienteId}' AND PE_FOLIO = '${B4XPages.MainPage.tipo_venta}'"$)
+		B4XPages.MainPage.skmt.ExecNonQuery($"update ${Starter.tabla} set cat_gp_almacen = cat_gp_almacen - (${difCant}) where cat_gp_id = '${prodId}' "$)
 		Log($"CANT=${cant}"$)
 		If cant = 0 Then
 			Log("BORRAMOS PROD")
-			B4XPages.MainPage.skmt.ExecNonQuery($"delete from pedido where pe_cedis = '${cedis}' and pe_proid = '${prodId}' and pe_cliente = '${clienteId}' "$)
+			B4XPages.MainPage.skmt.ExecNonQuery($"delete from pedido where pe_cedis = '${cedis}' and pe_proid = '${prodId}' and pe_cliente = '${clienteId}' AND PE_FOLIO = '${B4XPages.MainPage.tipo_venta}'"$)
 			Private pe As Cursor = B4XPages.MainPage.skmt.ExecQuery("select count(pe_cliente) as cuantosPedidos from pedido where pe_cliente In (select cuenta from cuentaa)")
 			pe.Position=0
 			If pe.GetString("cuantosPedidos") = 0 Then B4XPages.MainPage.skmt.ExecNonQuery("delete from pedido_cliente where PC_CLIENTE In (select cuenta from cuentaa)")
@@ -1267,7 +1267,7 @@ Sub borraPedidoClienteActual As String
 	If thisC.RowCount>0 Then
 		For i=0 To thisC.RowCount -1
 			thisC.Position=i
-			B4XPages.MainPage.skmt.ExecNonQuery2("update cat_gunaprod set cat_gp_almacen = cat_gp_almacen + ? where cat_gp_id = ?", Array As Object(thisC.GetString("PE_CANT"),thisC.GetString("PE_PROID")))
+			B4XPages.MainPage.skmt.ExecNonQuery2($"update ${Starter.tabla} set cat_gp_almacen = cat_gp_almacen + ? where cat_gp_id = ?"$, Array As Object(thisC.GetString("PE_CANT"),thisC.GetString("PE_PROID")))
 			B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO INVENT_X_ENVIAR (ALMACEN , PROID , CANTIDAD ) VALUES(?,?,?) ", Array As Object (traeAlmacen, thisC.GetString("PE_PROID"),thisC.GetString("PE_CANT")* -1))
 		Next
 	End If