..

2026-04-17 21:06:32 +00:00 · 2024-11-04 13:20:47 -06:00
parent 7057c92bb6
commit 217b955083
17 changed files with 212 additions and 132 deletions
--- a/B4A/B4XMainPage.bas
+++ b/B4A/B4XMainPage.bas
@@ -76,7 +76,7 @@ Sub Class_Globals
 	Private ImageView1 As ImageView
 	Private Label2 As Label
 	Dim Entrar As Button
-	Dim tipo_venta As String
+	Dim tipo_venta As String = Subs.traeTipoVentaDeBD
 	Dim bTerminarClicked As Boolean = False
 	Private lv_server As ListView
 	Private l_server As Label
@@ -178,6 +178,7 @@ Private Sub B4XPage_Created (Root1 As B4XView)
 	skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS HIST_PRO3054(H_IDCLIENTE TEXT)")
 	skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS HIST_PRO3055(H_IDCLIENTE TEXT)")
 	skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS RUTA_SUPLENCIA(RS_RUTA 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, CAT_GP_CODPROMO TEXT)")
 '	skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS CAT_VARIABLES (CAT_VA_DESCRIPCION TEXT, CAT_VA_VALOR TEXT)")
 	Subs.agregaColumna("HIST_ENCUESTA", "HE_LAT", "TEXT")
 	Subs.agregaColumna("HIST_ENCUESTA", "HE_FOTO", "BLOB")
--- a/B4A/C_Cliente.bas
+++ b/B4A/C_Cliente.bas
@@ -26,7 +26,7 @@ Sub Class_Globals
 	Dim ESPACIO As Int
 	Dim BLANCO As String
 	Dim cuenta As String
-	Dim tipo_venta As String = "PREVENTA"
+	Dim tipo_venta As String = Subs.traeTipoVentaDeBD
 	Dim MAC_IMPRESORA As String
 	Dim btAdmin As BluetoothAdmin
 	Dim Printer1 As EscPosPrinter
@@ -428,6 +428,7 @@ Sub Class_Globals
 	Private p_transparenteInicioFin As Panel
 	
 	Dim b_geo As String
+	Private b_preventa As Button
 End Sub

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

 Sub B4XPage_Appear
+	gest.Text = "PreVenta"
+	If Subs.traeTipoVentaDeBD = "VENTA" Then gest.Text = "Venta"
+	If la_cuenta.Text = "0" Then gest.Text = "Carga Abordo"
+	iniciofin
 	que_modulo = 1
 	dentroDeGeocerca = False
 	indicePregunta = 0
@@ -501,12 +506,13 @@ Sub B4XPage_Appear
 	cercavalor = 0
 	l_version.Text = Application.VersionName
 	p_transparenteInicioFin.Width = Root.Width : p_transparenteInicioFin.Height = Root.Height
+	b_preventa.left = (Root.Width / 2) - (b_preventa.width / 2)
 	b_Inicio_Fin_venta.Left = 5
 	b_Inicio_Fin_venta.Width = Root.Width - 10
 	b_Inicio_Fin_venta.Text = "INICIAR VENTA"
 	b_Inicio_Fin_venta.BringToFront
 '	LogColor(">>>>>> EN VENTA: " & Starter.enVenta, Colors.red)
-	If Not(Starter.enVenta) And la_cuenta.Text <> "0" Then
+	If Not(Starter.enVenta) Then
 		b_Inicio_Fin_venta.Visible = True
 		Log("EnVenta Visible")
 	Else
@@ -699,8 +705,8 @@ Sub B4XPage_Appear
 				For i = 0 To j3.RowCount -1
 					Log("aqui tronare?")
 					j3.Position = i
-					B4XPages.MainPage.skmt.ExecNonQuery($"update CAT_GUNAPROD set cat_gp_almacen = cat_gp_almacen + ${j3.GetString("PE_CANT")} where cat_gp_id = '${j3.Getstring("PE_PROID")}'"$)
-					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(j3.GetString("PE_PRONOMBRE"), "PREVENTA"))
+					B4XPages.MainPage.skmt.ExecNonQuery($"update ${Subs.traeTablaProds(tipo_venta)} set cat_gp_almacen = cat_gp_almacen + ${j3.GetString("PE_CANT")} where cat_gp_id = '${j3.Getstring("PE_PROID")}'"$)
+					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(j3.GetString("PE_PRONOMBRE"), tipo_venta))
 				Next
 			End If
 			j3.Close
@@ -802,7 +808,8 @@ Sub B4XPage_Appear
 		Private s5 As Cursor = B4XPages.MainPage.skmt.ExecQuery2("select iFNULL(sum(PE_RECALCULOTOT),0) as TOTAL_CLIE FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa) and (PE_RECALCULO <> ? or PE_RECALCULO <> ? OR PE_RECALCULO IS NOT NULL)",Array As String("","null"))
 		s5.Position = 0
 		If c.RowCount > 0 Then
-			c.Position=0
+			c.Position = 0
+			Log(">>>>>>  " & c.GetString("CAT_CL_CODIGO"))
 			la_cuenta.Text = c.GetString("CAT_CL_CODIGO")
 			la_cuenta_gallina.Text = c.GetString("CAT_CL_CODIGO")
 			La_nombre.Text = c.GetString("CAT_CL_NOMBRE")
@@ -866,7 +873,7 @@ Sub B4XPage_Appear
 			End If
 			total_cliente = s.GetString("TOTAL_CLIE")
 			m_lat = "0"
-			If c.GetString("CAT_CL_LAT") <> "" Then m_lat =c.GetString("CAT_CL_LAT")
+			If c.GetString("CAT_CL_LAT") <> "" Then m_lat = c.GetString("CAT_CL_LAT")
 			If m_lat.Length < 5 Then m_lat = "0"
 			m_lon = "0"
 			If c.GetString("CAT_CL_LONG") <> "" Then m_lon =c.GetString("CAT_CL_LONG")
@@ -888,6 +895,7 @@ Sub B4XPage_Appear
 		s.Close
 	End If
 	'AQUI TERMINA
+	Starter.idCliente = la_cuenta.text
 	c = skmt.ExecQuery("SELECT CAT_VA_VALOR FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = 'GEOCERCA'")
 	If c.RowCount > 0 Then
 		c.Position = 0
@@ -911,7 +919,7 @@ Sub B4XPage_Appear
 End Sub

 Sub GPS_LocationChanged (Location1 As Location)
-'	LogColor($"Entrando a Cliente.GPS_LocationChanged"$, Colors.red)
+	LogColor($"Entrando a Cliente.GPS_LocationChanged"$, Colors.red)
 	If Tracker.FLP.GetLastKnownLocation.IsInitialized And Tracker.FLP.GetLastKnownLocation.Latitude <> 0 Then
 		B4XPages.MainPage.lat_gps = Tracker.FLP.GetLastKnownLocation.Latitude
 		B4XPages.MainPage.lon_gps = Tracker.FLP.GetLastKnownLocation.Longitude
@@ -951,7 +959,8 @@ Sub GPS_LocationChanged (Location1 As Location)
 				gest.Visible = False
 				Tels.Visible = False
 				p_transparenteInicioFin.Visible = False
-				b_Inicio_Fin_venta.Visible = False
+				Log(999)
+'				b_Inicio_Fin_venta.Visible = False
 			End If
 		End If
 		If geo = "1" Then
@@ -993,7 +1002,8 @@ Sub GPS_LocationChanged (Location1 As Location)
 					Tels.Visible = False
 					gest.Visible = False
 					p_transparenteInicioFin.Visible = False
-					b_Inicio_Fin_venta.Visible = False
+					Log(998)
+'					b_Inicio_Fin_venta.Visible = False
 					c = skmt.ExecQuery("SELECT PC_CLIENTE FROM PEDIDO_CLIENTE WHERE PC_CLIENTE IN (Select CUENTA from cuentaa)")
 					If c.RowCount > 0 Then
 						precision = "0"
@@ -1013,7 +1023,8 @@ Sub GPS_LocationChanged (Location1 As Location)
 							Tels.Visible = False
 							gest.Visible = False
 							p_transparenteInicioFin.Visible = False
-							b_Inicio_Fin_venta.Visible = False
+							Log(997)
+'							b_Inicio_Fin_venta.Visible = False
 							LA_GEO.TextColor = Colors.Red
 							If ALMACEN = "1" Then
 								Tels.Visible = False
@@ -1042,7 +1053,8 @@ Sub GPS_LocationChanged (Location1 As Location)
 					Tels.Visible = False
 					gest.Visible = False
 					p_transparenteInicioFin.Visible  = False
-					b_Inicio_Fin_venta.Visible = False
+					Log(996)
+'					b_Inicio_Fin_venta.Visible = False
 					c = skmt.ExecQuery("SELECT NV_CLIENTE FROM NOVENTA CLIENTE WHERE NV_CLIENTE IN (Select CUENTA from cuentaa)")
 					If c.RowCount > 0 Then
 						Tels.Visible = True
@@ -1053,7 +1065,8 @@ Sub GPS_LocationChanged (Location1 As Location)
 						Tels.Visible = False
 						gest.Visible = False
 						p_transparenteInicioFin.Visible = False
-						b_Inicio_Fin_venta.Visible = False
+						Log(995)
+'						b_Inicio_Fin_venta.Visible = False
 						LA_GEO.TextColor = Colors.Red
 						If ALMACEN = "1" Then
 							Tels.Visible = False
@@ -1074,7 +1087,8 @@ Sub GPS_LocationChanged (Location1 As Location)
 				Tels.Visible = False
 				gest.Visible = False
 				p_transparenteInicioFin.Visible = False
-				b_Inicio_Fin_venta.Visible = False
+				Log(994)
+'				b_Inicio_Fin_venta.Visible = False
 				LA_GEO.TextColor = Colors.Red
 				If ALMACEN = "1" Then
 					Tels.Visible = False
@@ -1102,14 +1116,19 @@ Private Sub p_pideGeoPass_Click

 End Sub

+'Muestra u oculta el boton de inicio y fin de venta
 Private Sub iniciofin
+	Log(">>>>>    " & Starter.enVenta)
 	If  Starter.enVenta = False Then
+		Log(333)
 		p_transparenteInicioFin.BringToFront
 		p_transparenteInicioFin.Visible = True
 		b_Inicio_Fin_venta.Visible = True
-'		Log("Hacemos visible el boton de Inicio Venta2")
+'		Log("Hacemos visible el boton de Inicio Venta")
 	Else
+		Log(4444)
 		If b_Inicio_Fin_venta.Text <> "TERMINAR VENTA" Then
+			Log(555)
 			p_transparenteInicioFin.Visible = False
 			b_Inicio_Fin_venta.Visible = False
 		End If
@@ -1363,25 +1382,14 @@ End Sub

 Private Sub b_preguntag_Click
 	B4XPages.MainPage.skmt.ExecNonQuery2("UPDATE kmt_info2 SET CAT_CL_GIRO = ? WHERE CAT_CL_CODIGO = ? And CAT_CL_NOMBRE = ?", Array As Object (girotienda, la_cuenta.text,La_nombre.Text))
-
 	skmt.ExecNonQuery2("INSERT INTO HIST_ENCUESTA_AVISO_GIRO(HEAV_CLIENTE , HEAV_MODULO , HEAV_AVISO ,HEAV_GIRO  ) VALUES (?,?,?,?) ", Array As Object( clie_id, ENCUESTA, "ACEPTA",girotienda))
-	
 	If girotienda <> "Selecciona una opcion" Then
-
 		If girotienda = "Tienda de Abarrotes (Abarrotes, Misceláneas, Minisupers, Particulares con Venta y Cremerías)" Then
-			
 			Dim result As Int= -3
 			Do While result=-3
 				result = 	Msgbox2("Entiendo, acepto y consiento que GUNA usará mis datos Personales y serán tratados acorde con lo establecido en la Ley Federal de Protección de Datos Personales en Posesión de los Particulares (en lo sucesivo la “Ley”), y su respectivo Reglamento; bajo lo manifestado en el Aviso de Privacidad – Texto Completo – que se encuentra en la página www.guna.com.mx", "AVISO DE PRIVACIDAD","ACEPTO","", "NO ACEPTO",LoadBitmap(File.DirAssets,"alert2.png"))
 				Select Case result
 					Case DialogResponse.POSITIVE
-						
-					
-						
-					
-		
-
-
 '			If ALMACEN = "35" Or ALMACEN  = "43" Or ALMACEN = "54"  Or ALMACEN = "73" Or ALMACEN = "56" Then 'ALMACEN = "7" Then '
 '				''Or ALMACEN = "56" ATIZAPAN PEDIGRI
 '				p_pregunta1.Visible = False
@@ -1398,8 +1406,6 @@ Private Sub b_preguntag_Click
 '				b_venta.Visible = False
 '				Guardar.Visible = False
 '				HIST.Visible = False
-'	
-						'
 '			Else
 						Log(que_modulo)
 						If que_modulo = Null Or que_modulo = " " Then que_modulo = "1"
@@ -1428,8 +1434,6 @@ Private Sub b_preguntag_Click
 								Panel7.Visible = False
 	
 							else if que_modulo = "2" Then
-	
-
 								'' para la m2
 								If p_m1.IsInitialized And p_m1.Visible Then
 									p_m1.Visible = False
@@ -1458,14 +1462,11 @@ Private Sub b_preguntag_Click
 								p_m3.Width = Root.Width * 0.94
 								SV_ENCUESTA.Panel.Height = p_m3.Height + 60
 							else if que_modulo = "4" Then
-
 								'' para la m4
-						
 								If p_m3.IsInitialized And p_m3.Visible Then
 										
 									p_m3.Visible = False
 								Else
-							
 								End If
 								p_pregunta1.Visible = False
 								p_cliente.Visible = False
@@ -1483,7 +1484,6 @@ Private Sub b_preguntag_Click
 								cb_p3_m4.SetItems(Items2)
 								itemselect2 = "Selecciona una opcion"
 	
-	
 								Dim Items3 As List
 								Items3.Initialize
 								Items3.Add("Selecciona una opcion")
@@ -1502,13 +1502,11 @@ Private Sub b_preguntag_Click
 								itemselect6 = "Selecciona una opcion"
 								cb_p4_5_m4.SetItems(Items3)
 								itemselect7 = "Selecciona una opcion"
-								'
 							else if que_modulo = "5" Then
 								''	'MODULO 5
 								If p_m4.IsInitialized And p_m4.Visible Then
 									p_m4.Visible = False
 								Else
-							
 								End If
 								p_cliente.Visible = False
 								SV_ENCUESTA.Visible = True
@@ -1516,7 +1514,6 @@ Private Sub b_preguntag_Click
 								SV_ENCUESTA.Panel.LoadLayout("ENCUESTA_M5")
 								p_modulo5.Width = Root.Width * 0.94
 								SV_ENCUESTA.Panel.Height = p_modulo5.Height + 30
-	
 								Dim Items8 As List
 								Items8.Initialize
 								Items8.Add("Selecciona una opcion")
@@ -1546,19 +1543,12 @@ Private Sub b_preguntag_Click
 							End If
 						Else
 							p_pregunta1.Visible = False
-		
 							B4XPages.ShowPage("productos")
-
-	
 						End If
 '			End IF
-			
 					Case DialogResponse.NEGATIVE
-						
 						B4XPages.ShowPage("productos")
 				End Select
-	
-				
 			Loop
 			'fin modulos
 '	If girotienda = "Tienda de Abarrotes (Abarrotes, Misceláneas, Minisupers, Particulares con Venta y Cremerías)"  Then
@@ -1705,18 +1695,13 @@ Private Sub b_preguntag_Click
 '			itemselect7 = "Selecciona una opcion"
 '		End If
 			' FIN MODULO 4
-
 '	Else
 '		B4XPages.ShowPage("productos")
 '	End If
 		Else
 			p_pregunta1.Visible = False
-		
 			B4XPages.ShowPage("productos")
-
 		End If
-		
-		
 	Else
 		Msgbox("Contesta la pregunta por favor","AVISO")
 	End If
@@ -1911,8 +1896,8 @@ Sub B_guardaencuesta_Click
 			p_pregunta1.Visible = False
 			SV_ENCUESTA.Visible = False
 			p_cliente.Visible = True
-			tipo_venta = "PREVENTA"
-'	StartActivity(colonia2)
+'			tipo_venta = "PREVENTA"
+'			StartActivity(colonia2)
 			B4XPages.ShowPage("productos")
 		End If
 	Else
@@ -1946,7 +1931,7 @@ Private Sub B4XPage_CloseRequest As ResumableSub
 	Else if SV_ENCUESTA.Visible Then
 		SV_ENCUESTA.visible = False
 		p_cliente.Visible = True
-	Else If B4XPages.MainPage.nota Then
+'	Else If B4XPages.MainPage.nota Then
 		
 	Else
 		B4XPages.ShowPage("Clientes")
@@ -1968,7 +1953,8 @@ Sub Guardar_Click
 	p_transparenteInicioFin.Visible = True
 	b_Inicio_Fin_venta.Visible = True
 	b_Inicio_Fin_venta.Text = "TERMINAR VENTA"
-	Log("Hacemos visible el boton de Terminar Venta3")
+'	Starter.idCliente = ""
+	Log("Hacemos visible el boton de Terminar Venta")
 End Sub

 Sub guardadoventa
@@ -3195,16 +3181,12 @@ Private Sub B_guardaencuesta_m2_Click
 				CB3_P6_M3.Text = "SAHUAYO"
 				CB4_P6_M3.Text = "MERZA/DUERO"
 				CB5_P6_M3.Text = "HUGOSS"
-	
 			End If
-
-
 		Else
 			p_pregunta1.Visible = False
 			SV_ENCUESTA.Visible = False
 			p_cliente.Visible = True
-			tipo_venta = "PREVENTA"
-'	StartActivity(colonia2)
+'			tipo_venta = "PREVENTA"
 			B4XPages.ShowPage("productos")
 			MsgboxAsync("Encuesta guardada","")
 		End If
@@ -3359,10 +3341,8 @@ Private Sub B_guardaencuesta_m3_Click
 			p_pregunta1.Visible = False
 			SV_ENCUESTA.Visible = False
 			p_cliente.Visible = True
-			tipo_venta = "PREVENTA"
-'	StartActivity(colonia2)
+'			tipo_venta = "PREVENTA"
 			B4XPages.ShowPage("productos")
-	
 			MsgboxAsync("Encuesta guardada","")
 		End If
 	Else
@@ -3443,14 +3423,11 @@ Private Sub B_guardaencuesta_m4_Click
 			itemselect16 = "Selecciona una opcion"
 			MsgboxAsync("Encuesta guardada","")
 		Else
-			B4XPages.MainPage.tipo_venta = "PREVENTA"
-			'	B4XPages.ShowPage("productos")
+			B4XPages.MainPage.tipo_venta = tipo_venta
+'			tipo_venta = "PREVENTA"
 			p_pregunta1.Visible = False
 			SV_ENCUESTA.Visible = False
 			p_cliente.Visible = True
-			tipo_venta = "PREVENTA"
-			B4XPages.ShowPage("productos")
-			'	StartActivity(colonia2)
 			B4XPages.ShowPage("productos")
 		End If
 	Else
@@ -3495,7 +3472,7 @@ Private Sub B_guardaencuesta_m5_Click
 		skmt.ExecNonQuery2("INSERT INTO ENCUESTA_MODULO5 (CLIENTE, ALMACEN,P1, P2, P3, P4, P5, P6, P7, P8, P9) VALUES (?,?,?,?,?,?,?,?,?,?,?)", Array As Object(Subs.traeCliente, ALMACEN,itemselect8,itemselect9,itemselect10,itemselect11,itemselect12,itemselect13,itemselect14,itemselect15,itemselect16))
 		SV_ENCUESTA.Visible = False
 		p_cliente.Visible = True
-		B4XPages.MainPage.tipo_venta = "PREVENTA"
+		B4XPages.MainPage.tipo_venta = tipo_venta
 		B4XPages.ShowPage("productos")
 		MsgboxAsync("Encuesta guardada","")
 	Else
@@ -3752,8 +3729,7 @@ Private Sub B_GUARDA_CE_PED_Click
 	'b_venta.Visible = True
 	b_like.Visible = False
 	Guardar.Visible = True
-	tipo_venta = "PREVENTA"
-'	StartActivity(colonia2)
+'	tipo_venta = "PREVENTA"
 	B4XPages.ShowPage("productos")
 	
 End Sub
@@ -4802,4 +4778,8 @@ End Sub

 Private Sub p_transparenteInicioFin_Click
 	
+End Sub
+
+Private Sub b_preventa_Click
+	
 End Sub
--- a/B4A/C_Clientes.bas
+++ b/B4A/C_Clientes.bas
@@ -93,7 +93,6 @@ Sub B4XPage_Appear
 End Sub

 Sub ListView1_ItemClick (Position As Int, Value As Object)
-
 	If colonia = 0 Then
 		colonia = Value
 	End If
--- a/B4A/C_NoVenta.bas
+++ b/B4A/C_NoVenta.bas
@@ -31,6 +31,7 @@ Sub Class_Globals
 	Private stay_mi As String
 	Private stay_ss As String
 	Private p_NoVenta As Panel
+	dim tipo_venta = Subs.traeTipoVentaDeBD
 End Sub

 'You can add more parameters here.
@@ -96,7 +97,7 @@ Sub GUARDA_Click
 	If c.RowCount>0 Then
 		For i=0 To c.RowCount -1
 			c.Position=i
-			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($"update ${Subs.traeTablaProds(tipo_venta)} set cat_gp_almacen = cat_gp_almacen + ? where cat_gp_id = ?"$, Array As Object(c.GetString("PE_CANT"),c.GetString("PE_PROID")))
 		Next
 	End If
 	
--- a/B4A/C_Nota.bas
+++ b/B4A/C_Nota.bas
@@ -34,6 +34,7 @@ Sub Class_Globals
 	Dim tgl As Toggle
 	Private almacen As String
 	Private p_nota As Panel
+	Dim tipo_venta As String = Subs.traeTipoVentaDeBD
 End Sub

 'You can add more parameters here.
@@ -165,7 +166,7 @@ Sub borra_Click
 			If c.RowCount>0 Then
 				For i=0 To c.RowCount -1
 					c.Position=i
-					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($"update ${Subs.traeTablaProds(tipo_venta)} 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 (almacen,c.GetString("PE_PROID"),c.GetString("PE_CANT")* -1))
 				Next
 			End If
@@ -222,13 +223,13 @@ Sub ListView1_ItemLongClick (Position As Int, Value As Object)
 '				For j = 0 To c.RowCount -1
 '					Log("aqui tronare?")
 ''					c.Position = j
-					B4XPages.MainPage.skmt.ExecNonQuery($"update CAT_GUNAPROD set cat_gp_almacen = cat_gp_almacen + ${c.GetString("PE_CANT")} where cat_gp_id = '${c.GetString("PE_PROID")}'"$)
+			B4XPages.MainPage.skmt.ExecNonQuery($"update ${Subs.traeTablaProds(tipo_venta)} set cat_gp_almacen = cat_gp_almacen + ${c.GetString("PE_CANT")} where cat_gp_id = '${c.GetString("PE_PROID")}'"$)
 					B4XPages.MainPage.skmt.ExecNonQuery2("delete from pedido where pe_cedis= ? and pe_cliente in (Select CUENTA from cuentaa) AND PE_FOLIO = ?", Array As Object(cedis, c.GetString("PE_FOLIO")))
 '				Next
 '			End If
 '			j3.Close
 		Else
-			B4XPages.MainPage.skmt.ExecNonQuery($"update CAT_GUNAPROD set cat_gp_almacen = cat_gp_almacen + ${c.GetString("PE_CANT")} where cat_gp_id = '${c.Getstring("PE_PROID")}'"$)
+			B4XPages.MainPage.skmt.ExecNonQuery($"update ${Subs.traeTablaProds(tipo_venta)} set cat_gp_almacen = cat_gp_almacen + ${c.GetString("PE_CANT")} where cat_gp_id = '${c.Getstring("PE_PROID")}'"$)
 			B4XPages.MainPage.skmt.ExecNonQuery2("delete from pedido where pe_pronombre = ? and pe_cedis = ? and pe_cliente in (Select CUENTA from cuentaa) AND PE_FOLIO = ?", Array As Object(nom, cedis, c.GetString("PE_FOLIO")))
 		End If
 		c.Close
--- a/B4A/C_Pedidos.bas
+++ b/B4A/C_Pedidos.bas
@@ -59,6 +59,7 @@ Sub Class_Globals
 	Private BONSABOR2 As String
 	Dim cmd As DBCommand
 	Private p_pedido As Panel
+	dim tipo_venta as string = Subs.traeTipoVentaDeBD
 End Sub

 'You can add more parameters here.
@@ -99,7 +100,7 @@ Sub B4XPage_Appear
 	sb.Initialize
 	p.Shell("ping -c1 -W1 177.244.63.54",Null, sb,Null)
 	skmt.Initialize(ruta,"kmt.db", True)
-	c=B4XPages.MainPage.skmt.ExecQuery("select 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  from CAT_GUNAPROD where CAT_GP_NOMBRE In (Select PDESC from PROID)")
+	c=B4XPages.MainPage.skmt.ExecQuery($"select 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  from ${Subs.traeTablaProds(tipo_venta)} where CAT_GP_NOMBRE In (Select PDESC from PROID)"$)
 	c.Position=0
 	L_PROID.Text = c.GetString("CAT_GP_ID")
 	l_tipo.Text = c.GetString("CAT_GP_TIPO")
@@ -152,7 +153,7 @@ Sub B4XPage_Appear
 					HCCP_CANT = DD.GetString("HCCP_CANT")
 					DD.Close
 				End If
-				DD=B4XPages.MainPage.skmt.ExecQuery2("Select COUNT(*) AS CUANTOS FROM PEDIDO WHERE PE_CLIENTE IN  (Select cuenta from cuentaa) AND  PE_PROID IN (select CAT_GP_ID   from CAT_GUNAPROD where CAT_GP_CLASIF = ?) ",Array As String(c.GetString("CAT_GP_NOMBRE")))
+				DD=B4XPages.MainPage.skmt.ExecQuery2($"Select COUNT(*) AS CUANTOS FROM PEDIDO WHERE PE_CLIENTE IN  (Select cuenta from cuentaa) AND  PE_PROID IN (select CAT_GP_ID   from ${Subs.traeTablaProds(tipo_venta)} where CAT_GP_CLASIF = ?) "$,Array As String(c.GetString("CAT_GP_NOMBRE")))
 				DD.Position =0
 				BONSABOR2 = DD.GetString("CUANTOS")
 				DD.Close
@@ -274,7 +275,7 @@ Sub guardar_Click
 						For i=0 To f.RowCount -1
 							f.Position=i
 							precio_Cero = f.GetString("CAT_DP_PRECIO")
-							h=B4XPages.MainPage.skmt.ExecQuery2("select CAT_GP_NOMBRE from CAT_GUNAPROD where CAT_GP_ID = ? ", Array As String(f.GetString("CAT_DP_IDPROD")))
+							h=B4XPages.MainPage.skmt.ExecQuery2($"select CAT_GP_NOMBRE from ${Subs.traeTablaProds(tipo_venta)} where CAT_GP_ID = ? "$, Array As String(f.GetString("CAT_DP_IDPROD")))
 							h.Position=0
 							'0
 							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) VALUES(?,?,?,?,?,?,?,?,?,?) ", Array As Object (L_PROID.text,precio_Cero *  f.GetString("CAT_DP_PZAS") * cantidad.text, precio_Cero, f.GetString("CAT_DP_PZAS") * cantidad.text, h.GetString("CAT_GP_NOMBRE"), f.GetString("CAT_DP_IDPROD"),clie_id, sDate & sTime, usuario,cl_ruta))
@@ -285,7 +286,7 @@ Sub guardar_Click
 				End If
 				e.Close
 				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_FOLIO) VALUES(?,?,?,?,?,?,?,?,?,?,?) ", Array As Object (L_PROID.text,0 , 0, cantidad.text, l_desc.text, L_PROID.Text,clie_id, sDate & sTime, usuario,cl_ruta, B4XPages.MainPage.tipo_venta))
-				B4XPages.MainPage.skmt.ExecNonQuery2("update cat_gunaprod set cat_gp_almacen = cat_gp_almacen - ? where cat_gp_id = ? ", Array As Object(cantidad.Text, L_PROID.Text))
+				B4XPages.MainPage.skmt.ExecNonQuery2($"update ${Subs.traeTablaProds(tipo_venta)} set cat_gp_almacen = cat_gp_almacen - ? where cat_gp_id = ? "$, Array As Object(cantidad.Text, L_PROID.Text))
 			Else
 				Msgbox("Tiene " & TOT_ART_PROMO & " " & TOT_ART_PROMOR & " y necesita " & PROMO_C & " " & PROMO_CR & " Para la Promo. " , "ADVERTENCIA") 'ignore
 			End If
@@ -317,7 +318,7 @@ Sub guardar_Click
 			F=B4XPages.MainPage.skmt.ExecQuery("select CAT_DP_IDPROD, CAT_DP_PZAS, CAT_DP_PRECIO FROM CAT_DETALLES_PAQ WHERE CAT_DP_ID IN (Select PROIDID from PROIDID)")
 			For i =0 To f.RowCount -1
 				F.Position =i
-				h=B4XPages.MainPage.skmt.ExecQuery2("select CAT_GP_NOMBRE from CAT_GUNAPROD where CAT_GP_ID = ? ", Array As String(f.GetString("CAT_DP_IDPROD")))
+				h=B4XPages.MainPage.skmt.ExecQuery2($"select CAT_GP_NOMBRE from ${Subs.traeTablaProds(tipo_venta)} where CAT_GP_ID = ? "$, Array As String(f.GetString("CAT_DP_IDPROD")))
 				h.Position=0
 				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_FOLIO) VALUES(?,?,?,?,?,?,?,?,?,?,?) ", Array As Object (L_PROID.text,f.GetString("CAT_DP_PRECIO") * cantidad.text * f.GetString("CAT_DP_PZAS"), f.GetString("CAT_DP_PRECIO"), f.GetString("CAT_DP_PZAS") * cantidad.text, h.GetString("CAT_GP_NOMBRE"), f.GetString("CAT_DP_IDPROD"),clie_id, sDate & sTime, usuario,cl_ruta, B4XPages.MainPage.tipo_venta))
 				h.Close
@@ -327,7 +328,7 @@ Sub guardar_Click
 		e.Close
 		'0
 		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_FOLIO) VALUES(?,?,?,?,?,?,?,?,?,?,?) ", Array As Object (L_PROID.text,0, 0, cantidad.text, l_desc.text, L_PROID.Text,clie_id, sDate & sTime, usuario,cl_ruta, B4XPages.MainPage.tipo_venta))
-		B4XPages.MainPage.skmt.ExecNonQuery2("update cat_gunaprod set cat_gp_almacen = cat_gp_almacen - ? where cat_gp_id = ? ", Array As Object(cantidad.Text, L_PROID.Text))
+		B4XPages.MainPage.skmt.ExecNonQuery2($"update ${Subs.traeTablaProds(tipo_venta)} set cat_gp_almacen = cat_gp_almacen - ? where cat_gp_id = ? "$, Array As Object(cantidad.Text, L_PROID.Text))
 		cantidad.Text = ""
 		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
@@ -351,7 +352,7 @@ Sub guardar_Click
 		c.Position=0
 		usuario = c.GetString("USUARIO")
 		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 (ALMACEN,cantidad.Text * l_precio.Text, l_precio.text, cantidad.text, l_desc.text, L_PROID.Text,clie_id, sDate & sTime, usuario,cl_ruta,preciosin, B4XPages.MainPage.tipo_venta))
-		B4XPages.MainPage.skmt.ExecNonQuery2("update cat_gunaprod set cat_gp_almacen = cat_gp_almacen - ? where cat_gp_id = ? ", Array As Object(cantidad.Text, L_PROID.Text))
+		B4XPages.MainPage.skmt.ExecNonQuery2($"update ${Subs.traeTablaProds(tipo_venta)} set cat_gp_almacen = cat_gp_almacen - ? where cat_gp_id = ? "$, Array As Object(cantidad.Text, L_PROID.Text))
 		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)")
@@ -444,7 +445,7 @@ Sub Terminar_Click
 						For i=0 To f.RowCount -1
 							f.Position=i
 							precio_Cero = f.GetString("CAT_DP_PRECIO")
-							h=B4XPages.MainPage.skmt.ExecQuery2("select CAT_GP_NOMBRE from CAT_GUNAPROD where CAT_GP_ID = ? ", Array As String(f.GetString("CAT_DP_IDPROD")))
+							h=B4XPages.MainPage.skmt.ExecQuery2($"select CAT_GP_NOMBRE from ${Subs.traeTablaProds(tipo_venta)} where CAT_GP_ID = ? "$, Array As String(f.GetString("CAT_DP_IDPROD")))
 							h.Position=0
 							Log(111)
 							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_FOLIO) VALUES(?,?,?,?,?,?,?,?,?,?,?) ", Array As Object (L_PROID.text,precio_Cero *  f.GetString("CAT_DP_PZAS") * cantidad.text, precio_Cero, f.GetString("CAT_DP_PZAS") * cantidad.text, h.GetString("CAT_GP_NOMBRE"), f.GetString("CAT_DP_IDPROD"),clie_id, sDate & sTime, usuario,cl_ruta, B4XPages.MainPage.tipo_venta))
@@ -455,8 +456,8 @@ Sub Terminar_Click
 				End If
 				e.Close
 				Log(222)
-				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_FOLIO) VALUES(?,?,?,?,?,?,?,?,?,?,?) ", Array As Object (L_PROID.text,0 , 0, cantidad.text, l_desc.text, L_PROID.Text,clie_id, sDate & sTime, usuario,cl_ruta, B4XPages.MainPage.tipo_venta))
-				B4XPages.MainPage.skmt.ExecNonQuery2("update cat_gunaprod set cat_gp_almacen = cat_gp_almacen - ? where cat_gp_id = ? ", Array As Object(cantidad.Text, L_PROID.Text))
+				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_FOLIO) VALUES(?,?,?,?,?,?,?,?,?,?,?) ", Array As Object (L_PROID.text,0 , 0, cantidad.text, l_desc.text, L_PROID.Text,clie_id, sDate & sTime, usuario,cl_ruta, B4XPages.MainPage.tipo_venta))
+				B4XPages.MainPage.skmt.ExecNonQuery2($"update ${Subs.traeTablaProds(tipo_venta)} set cat_gp_almacen = cat_gp_almacen - ? where cat_gp_id = ? "$, Array As Object(cantidad.Text, L_PROID.Text))
 			Else
 				Msgbox("Tiene " & TOT_ART_PROMO & " " & TOT_ART_PROMOR & " y necesita " & PROMO_C & " " & PROMO_CR & " Para la Promo. " , "ADVERTENCIA") 'ignore
 			End If
@@ -487,7 +488,7 @@ Sub Terminar_Click
 			F=B4XPages.MainPage.skmt.ExecQuery("select CAT_DP_IDPROD, CAT_DP_PZAS, CAT_DP_PRECIO FROM CAT_DETALLES_PAQ WHERE CAT_DP_ID IN (Select PROIDID from PROIDID)")
 			For i =0 To f.RowCount -1
 				F.Position =i
-				h=B4XPages.MainPage.skmt.ExecQuery2("select CAT_GP_NOMBRE from CAT_GUNAPROD where CAT_GP_ID = ? ", Array As String(f.GetString("CAT_DP_IDPROD")))
+				h=B4XPages.MainPage.skmt.ExecQuery2($"select CAT_GP_NOMBRE from ${Subs.traeTablaProds(tipo_venta)} where CAT_GP_ID = ? "$, Array As String(f.GetString("CAT_DP_IDPROD")))
 				h.Position=0
 				Log(333)
 				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_FOLIO) VALUES(?,?,?,?,?,?,?,?,?,?,?) ", Array As Object (L_PROID.text,f.GetString("CAT_DP_PRECIO") * cantidad.text * f.GetString("CAT_DP_PZAS"), f.GetString("CAT_DP_PRECIO"), f.GetString("CAT_DP_PZAS") * cantidad.text, h.GetString("CAT_GP_NOMBRE"), f.GetString("CAT_DP_IDPROD"),clie_id, sDate & sTime, usuario,cl_ruta, B4XPages.MainPage.tipo_venta))
@@ -498,7 +499,7 @@ Sub Terminar_Click
 		e.Close
 		Log(444)
 		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_FOLIO) VALUES(?,?,?,?,?,?,?,?,?,?,?) ", Array As Object (L_PROID.text,0, 0, cantidad.text, l_desc.text, L_PROID.Text,clie_id, sDate & sTime, usuario,cl_ruta, B4XPages.MainPage.tipo_venta))
-		B4XPages.MainPage.skmt.ExecNonQuery2("update cat_gunaprod set cat_gp_almacen = cat_gp_almacen - ? where cat_gp_id = ? ", Array As Object(cantidad.Text, L_PROID.Text))
+		B4XPages.MainPage.skmt.ExecNonQuery2($"update ${Subs.traeTablaProds(tipo_venta)} set cat_gp_almacen = cat_gp_almacen - ? where cat_gp_id = ? "$, Array As Object(cantidad.Text, L_PROID.Text))
 		cantidad.Text = ""
 		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
@@ -523,7 +524,7 @@ Sub Terminar_Click
 		usuario = c.GetString("USUARIO")
 		Log(555)
 		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 (ALMACEN,cantidad.Text * l_precio.Text, l_precio.text, cantidad.text, l_desc.text, L_PROID.Text,clie_id, sDate & sTime, usuario,cl_ruta,preciosin, B4XPages.MainPage.tipo_venta))
-		B4XPages.MainPage.skmt.ExecNonQuery2("update cat_gunaprod set cat_gp_almacen = cat_gp_almacen - ? where cat_gp_id = ? ", Array As Object(cantidad.Text, L_PROID.Text))
+		B4XPages.MainPage.skmt.ExecNonQuery2($"update ${Subs.traeTablaProds(tipo_venta)} set cat_gp_almacen = cat_gp_almacen - ? where cat_gp_id = ? "$, Array As Object(cantidad.Text, L_PROID.Text))
 		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)")
@@ -572,8 +573,8 @@ Sub nopromo_Click
 		c=B4XPages.MainPage.skmt.ExecQuery("select USUARIO from usuarioa")
 		c.Position=0
 		usuario = c.GetString("USUARIO")
-		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_FOLIO) VALUES(?,?,?,?,?,?,?,?,?,?) ", Array As Object ("COACALCO",0,0, cantidad.text, l_desc.text, L_PROID.Text,clie_id, sDate & sTime, usuario, b4xpages.MainPage.tipo_venta))
-		B4XPages.MainPage.skmt.ExecNonQuery2("update cat_gunaprod set cat_gp_almacen = cat_gp_almacen - ? where cat_gp_id = ? ", Array As Object(cantidad.Text, L_PROID.Text))
+		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_FOLIO) VALUES(?,?,?,?,?,?,?,?,?,?) ", Array As Object ("COACALCO",0,0, cantidad.text, l_desc.text, L_PROID.Text,clie_id, sDate & sTime, usuario, B4XPages.MainPage.tipo_venta))
+		B4XPages.MainPage.skmt.ExecNonQuery2($"update ${Subs.traeTablaProds(tipo_venta)} set cat_gp_almacen = cat_gp_almacen - ? where cat_gp_id = ? "$, Array As Object(cantidad.Text, L_PROID.Text))
 		cantidad.Text = ""
 		B4XPages.ShowPage("Productos")
 	End If
--- a/B4A/C_Principal.bas
+++ b/B4A/C_Principal.bas
@@ -236,6 +236,8 @@ Sub Class_Globals
 	Dim p_transparenteActualizacion As Panel
 	Private p_forzarActualizacion As Panel
 	Dim l_forzarActualizacion As Label
+	Dim tipo_venta As String = Subs.traeTipoVentaDeBD
+	Private b_abordo As Button
 End Sub

 'You can add more parameters here.
@@ -274,6 +276,7 @@ Private Sub B4XPage_Created (Root1 As B4XView)
 	f.Position=0
 	l_ruta.Text = f.GetString("CAT_CL_RUTA")
 	f.Close
+	b_abordo.Left = (Root.Width / 2) - (b_abordo.Width / 2) 
 	p_principal.Width = Root.Width : p_principal.Height = Root.Height
 '	ro = B4XPages.MainPage.skmt.ExecQuery("select count(*) as CAT_CL_RUTA from kmt_info2")
 '	ro.Position = 0
@@ -343,6 +346,8 @@ End Sub
 Sub B4XPage_Appear
 '	LogColor($"##########   ${Subs.traeRuta}  ##########"$, Colors.red)
 	p_principal.Visible = True
+'	Log($"|${Subs.traeTipoVentaDeBD}|"$)
+	If Subs.traeTipoVentaDeBD = "VENTA" Or Subs.traeTipoVentaDeBD = "ABORDO" Then b_abordo.Visible = True Else b_abordo.Visible = False
 	E_RUTA2.Text = ""
 	p_ruta2.Visible = False
 	Subs.validaPromoProcterPRO3009
@@ -932,11 +937,21 @@ Sub cargar_Click
 	cmd.Parameters = Array As Object(usuario,e_ruta.text,sDate,imei,sTime,"","","","","CARGA",ALMACEN,Application.VersionName)
 	B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "inst_drop")
 	
+	cmd.Initialize
+	cmd.Name = "select_TipoVenta"
+	cmd.Parameters = Array As Object(ALMACEN, e_ruta.text)
+	B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "tipoVenta")
+	
 	cmd.Initialize
 	cmd.Name = "select_cat_gunaprod_GV2"
 	cmd.Parameters = Array As Object(ALMACEN)
 	B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "gunaprod")
 	
+	cmd.Initialize
+	cmd.Name = "select_cat_gunaprod2_GV2"
+	cmd.Parameters = Array As Object(ALMACEN, e_ruta.text)
+	B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "gunaprod2")
+	
 	cmd.Initialize
 	cmd.Name = "select_HIST_ESPECIAL_GUNA"
 '	cmd.Parameters = Array As Object(ALMACEN)
@@ -1213,6 +1228,7 @@ Sub JobDone(Job As HttpJob)
 					B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO kmt_info2(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,e_ruta.Text,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
+				B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO kmt_info2(CAT_CL_CODIGO, CAT_CL_RUTA, CAT_CL_NOMBRE, CAT_CL_LONG, CAT_CL_LAT, CAT_CL_NUM_SERIEFISICO) VALUES (?,?,?,0,0,0)", Array As Object ("0", e_ruta.Text, "ABORDO"))
 				Listo1 = 1
 				S_CC.Text = "LISTO"
 '				If Starter.marcaCel <> "Sony" Then ToastMessageShow("Catalogo Clientes Actualizados." , True)
@@ -1591,6 +1607,49 @@ Sub JobDone(Job As HttpJob)
 			End If
 		End If

+		If Job.JobName = "DBRequest" Then
+			Dim RESULT As DBResult = B4XPages.MainPage.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_GP_ID"))
+					Dim CAT_GP_NOMBRE As String = records(RESULT.Columns.Get("CAT_GP_NOMBRE"))
+					Dim CAT_GP_IMP1 As String = records(RESULT.Columns.Get("CAT_GP_IMP1"))
+					Dim CAT_GP_IMP2 As String = records(RESULT.Columns.Get("CAT_GP_IMP2"))
+					Dim CAT_GP_PRECIO As String = records(RESULT.Columns.Get("CAT_GP_PRECIO"))
+					Dim CAT_GP_CLASIF As String = records(RESULT.Columns.Get("CAT_GP_CLASIF"))
+					Dim CAT_GP_STS As String = records(RESULT.Columns.Get("CAT_GP_STS"))
+					Dim CAT_GP_TIPO As String = records(RESULT.Columns.Get("CAT_GP_TIPO"))
+					Dim CAT_GP_SUBTIPO As String = records(RESULT.Columns.Get("CAT_GP_SUBTIPO"))
+					Dim CAT_GP_IMG() As Byte = records(RESULT.Columns.Get("CAT_GP_IMG"))
+					Dim CAT_GP_ALMACEN As Int = records(RESULT.Columns.Get("CAT_GP_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_GP_TIPOPROD"))
+					Dim CAT_GP_INICIATIVA As Int = records(RESULT.Columns.Get("CAT_GP_INICIATIVA"))
+					Dim CAT_GP_CODPROMO As String = records(RESULT.Columns.Get("CAT_GP_CODPROMO"))
+'					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,CAT_GP_CODPROMO) 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, CAT_GP_CODPROMO))
+				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 = B4XPages.MainPage.reqManager.HandleJob(Job)
 			If RESULT.Tag = "gunaprodp" Then 'query tag
@@ -1958,6 +2017,14 @@ Sub JobDone(Job As HttpJob)
 				Starter.skmt.ExecNonQuery2("INSERT INTO CAT_VARIABLES(CAT_VA_DESCRIPCION, CAT_VA_VALOR) VALUES (?,?)", Array As Object ("FORZAR_ACTUALIZACION", actualizarAplicacion))
 				Log($">>>>  GUARDAMOS NUEVA VERSION: ${version}, ${actualizarAplicacion}"$)
 			End If
+			If RESULT.Tag = "tipoVenta" Then 'query tag
+				For Each records() As Object In RESULT.Rows
+					Private tipoVenta As String =  records(RESULT.Columns.Get("CAT_RU_CATEGORIA"))
+				Next
+				Starter.skmt.ExecNonQuery2("delete from CAT_VARIABLES where CAT_VA_DESCRIPCION = ?", Array As Object ("TIPO_VENTA"))
+				Starter.skmt.ExecNonQuery2("INSERT INTO CAT_VARIABLES(CAT_VA_DESCRIPCION, CAT_VA_VALOR) VALUES (?,?)", Array As Object ("TIPO_VENTA", tipoVenta))
+				Log($">>>>  GUARDAMOS TIPO_VENTA: ${tipoVenta}"$)
+			End If
 		End If
 	End If
 	
@@ -2077,6 +2144,7 @@ Sub t2_tick
 		B4XPages.MainPage.skmt.ExecNonQuery("delete from clie_act")
 		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")
@@ -2150,6 +2218,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
@@ -2160,6 +2229,10 @@ Sub inv_Click
 	cmd.Parameters = Array As Object(ALMACEN)
 	B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "gunaprod")
 	cmd.Initialize
+	cmd.Name = "select_cat_gunaprod2_GV2"
+	cmd.Parameters = Array As Object(ALMACEN, e_ruta.text)
+	B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "gunaprod2")
+	cmd.Initialize
 	cmd.Name = "select_cat_paquetes_GV2"
 	cmd.Parameters = Array As Object(ALMACEN)
 	B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "gunaprodp")
@@ -2358,7 +2431,7 @@ Sub resdia_Click
 	End If
 	d.Close

-	c=B4XPages.MainPage.skmt.ExecQuery2("Select  sum(PE_COSTO_TOT) As MONTO_DIA from pedido where PE_CLIENTE <> 0 and pe_proid in (Select CAT_GP_ID from cat_gunaprod where CAT_GP_TIPO = ? )", Array As String("RTEC"))
+	c=B4XPages.MainPage.skmt.ExecQuery2($"Select  sum(PE_COSTO_TOT) As MONTO_DIA from pedido where PE_CLIENTE <> 0 and pe_proid in (Select CAT_GP_ID from ${Subs.traeTablaProds(tipo_venta)} where CAT_GP_TIPO = ? )"$, Array As String("RTEC"))
 	c.Position = 0
 	l_monto_k.Text = c.GetString("MONTO_DIA")
 	If l_monto_k.Text = "null" Then
@@ -2366,7 +2439,7 @@ Sub resdia_Click
 	End If
 	c.Close

-	c=B4XPages.MainPage.skmt.ExecQuery2("Select  sum(PE_COSTO_TOT) As MONTO_DIA from pedido where PE_CLIENTE <> 0 and pe_proid in (Select CAT_GP_ID from cat_gunaprod where CAT_GP_TIPO = ? )", Array As String("PING"))
+	c=B4XPages.MainPage.skmt.ExecQuery2($"Select  sum(PE_COSTO_TOT) As MONTO_DIA from pedido where PE_CLIENTE <> 0 and pe_proid in (Select CAT_GP_ID from ${Subs.traeTablaProds(tipo_venta)} where CAT_GP_TIPO = ? )"$, Array As String("PING"))
 	c.Position = 0
 	l_monto_kp.Text = c.GetString("MONTO_DIA")
 	If l_monto_kp.Text = "null" Then
@@ -2477,7 +2550,7 @@ Sub resdia_Click
 		c.Position = 0
 		L_CTE_PROMO.Text = c.GetString("CUANTOS")
 		c.Close
-		d=B4XPages.MainPage.skmt.ExecQuery2("Select sum(PE_COSTO_TOT) AS MONTO_DIA FROM PEDIDO WHERE PE_PROID IN (select CAT_GP_ID from cat_gunaprod where  CAT_GP_TIPOPROD = ?) ", Array As String("PRIORITARIO"))
+		d=B4XPages.MainPage.skmt.ExecQuery2($"Select sum(PE_COSTO_TOT) AS MONTO_DIA FROM PEDIDO WHERE PE_PROID IN (select CAT_GP_ID from ${Subs.traeTablaProds(tipo_venta)} where  CAT_GP_TIPOPROD = ?) "$, Array As String("PRIORITARIO"))
 		d.Position = 0
 		'///////////////////////////////////////////////////////////////////////////////
 		'////////////////////////////   ULTIMA LINEA ANTES DEL ERROR  //////////////////
@@ -2490,12 +2563,12 @@ Sub resdia_Click
 		L_PRIO.Text = d.GetString("MONTO_DIA")
 		d.Close
 		
-		d=B4XPages.MainPage.skmt.ExecQuery2("Select sum(PE_COSTO_TOT) AS MONTO_DIA FROM PEDIDO WHERE PE_PROID IN (select CAT_GP_ID from cat_gunaprod where  CAT_GP_TIPOPROD = ?) ", Array As String("ESTRATEGICO"))
+		d=B4XPages.MainPage.skmt.ExecQuery2($"Select sum(PE_COSTO_TOT) AS MONTO_DIA FROM PEDIDO WHERE PE_PROID IN (select CAT_GP_ID from ${Subs.traeTablaProds(tipo_venta)} where  CAT_GP_TIPOPROD = ?) "$, Array As String("ESTRATEGICO"))
 		d.Position = 0
 		L_SECUND.Text =d.GetString("MONTO_DIA")
 		d.Close

-		d=B4XPages.MainPage.skmt.ExecQuery2("Select sum(PE_COSTO_TOT) AS MONTO_DIA FROM PEDIDO WHERE PE_PROID IN (select CAT_GP_ID from cat_gunaprod where  CAT_GP_TIPOPROD = ?) ", Array As String("COMPLEMENTARIO"))
+		d=B4XPages.MainPage.skmt.ExecQuery2($"Select sum(PE_COSTO_TOT) AS MONTO_DIA FROM PEDIDO WHERE PE_PROID IN (select CAT_GP_ID from ${Subs.traeTablaProds(tipo_venta)} where  CAT_GP_TIPOPROD = ?) "$, Array As String("COMPLEMENTARIO"))
 		d.Position = 0
 		L_COMP.Text =d.GetString("MONTO_DIA")
 		d.Close
@@ -2580,7 +2653,7 @@ End Sub
 Sub e_ruta2_TextChanged (Old As String, New As String)
 '	Dim validChars As String ="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789 "
 '	'Log("Antes: " & Old & " | " & New)
-	If New = e_ruta.text and new <> "" Then
+	If New = e_ruta.text And New <> "" Then
 		cargar.Enabled = False
 		ToastMessageShow("Las rutas NO PUEDEN ser iguales!!", False)
 	Else
@@ -2633,6 +2706,8 @@ Sub B_OK_COMISS_Click
 	Panel_C.Visible = False
 	SCROLL_RESDIA.Visible = False
 	Btn_Ubicar.Visible=True
+	p_principal.Visible = True
+	SCROLL_RESDIA.Panel.RemoveAllViews
 End Sub

 Sub B_MARCAS_Click
@@ -2652,7 +2727,7 @@ Sub B_MARCAS_Click
 	c=B4XPages.MainPage.skmt.ExecQuery("Select CAT_GP_CLASIF, SUM(TOTAL) AS TOTAL FROM TOTAL_MARCAS GROUP BY CAT_GP_CLASIF")
 	CLV1.Clear
 	If c.RowCount>0 Then
-		For i=0 To c.RowCount -1
+		For i=0 To c.RowCount - 1
 			c.Position=i
 			AddTitle(c.GetString("CAT_GP_CLASIF"))
 			If c.GetString("CAT_GP_CLASIF") = "PROMOS" Then
@@ -2666,17 +2741,17 @@ Sub B_MARCAS_Click
 				If f.GetString("CUANTOS") > 0 Then
 					e=B4XPages.MainPage.skmt.ExecQuery2("select HMC_MARCA, HMC_TOTAL from HIST_MARCAS_CUOTAS where HMC_MARCA = ?", Array As String(c.GetString("CAT_GP_CLASIF")))
 					e.Position=0
-					d=B4XPages.MainPage.skmt.ExecQuery2("SELECT count(distinct(PE_CLIENTE)) AS CUANTOS FROM PEDIDO WHERE PE_PROID in (select CAT_GP_ID from cat_gunaprod WHERE CAT_GP_CLASIF =?)", Array As String (c.GetString("CAT_GP_CLASIF")))
+					d=B4XPages.MainPage.skmt.ExecQuery2($"SELECT count(distinct(PE_CLIENTE)) AS CUANTOS FROM PEDIDO WHERE PE_PROID in (select CAT_GP_ID from ${Subs.traeTablaProds(tipo_venta)} WHERE CAT_GP_CLASIF =?)"$, Array As String (c.GetString("CAT_GP_CLASIF")))
 					d.Position=0
 					CLV1.AddTextItem("TOTAL  PREVENTA = $" & c.GetString("TOTAL"),"1")
-					CLV1.AddTextItem("M E T A  MES= $" & e.GetString("HMC_TOTAL"),"1")
-					CLV1.AddTextItem("M E T A  D I A= $" & Round(e.GetString("HMC_TOTAL") / 25),"1")
-					CLV1.AddTextItem("FALTA  DIA= $" & Round((e.GetString("HMC_TOTAL") / 25) - c.GetString("TOTAL")) ,"1")
+					CLV1.AddTextItem("META MES= $" & e.GetString("HMC_TOTAL"),"1")
+					CLV1.AddTextItem("META DIA= $" & Round(e.GetString("HMC_TOTAL") / 25),"1")
+					CLV1.AddTextItem("FALTA DIA= $" & Round((e.GetString("HMC_TOTAL") / 25) - c.GetString("TOTAL")) ,"1")
 					CLV1.AddTextItem("CLIENTES  = " & d.GetString("CUANTOS"),"1")
 					d.Close
 					e.Close
 				Else
-					d=B4XPages.MainPage.skmt.ExecQuery2("SELECT count(distinct(pe_cliente)) AS CUANTOS FROM PEDIDO WHERE PE_PROID in (select CAT_GP_ID from cat_gunaprod WHERE CAT_GP_CLASIF =?)", Array As String (c.GetString("CAT_GP_CLASIF")))
+					d=B4XPages.MainPage.skmt.ExecQuery2($"SELECT count(distinct(pe_cliente)) AS CUANTOS FROM PEDIDO WHERE PE_PROID in (select CAT_GP_ID from ${Subs.traeTablaProds(tipo_venta)} WHERE CAT_GP_CLASIF =?)"$, Array As String (c.GetString("CAT_GP_CLASIF")))
 					d.Position=0
 					CLV1.AddTextItem("TOTAL  PREVENTA = $" & c.GetString("TOTAL"),"1")
 					CLV1.AddTextItem("M E T A  = $" & "1000","1")
@@ -2750,4 +2825,9 @@ End Sub

 Private Sub p_transparenteActualizacion_Click
 	
+End Sub
+
+Private Sub b_abordo_Click
+	Starter.skmt.ExecNonQuery($"update cuentaa set cuenta = '0'"$)
+	B4XPages.ShowPage("Cliente")
 End Sub
--- a/B4A/C_Productos.bas
+++ b/B4A/C_Productos.bas
@@ -55,6 +55,7 @@ Sub Class_Globals
 	Private l_info As Label
 	Private b_buscar As Button
 	Private p_botonesVenta As Panel
+	Dim tipo_venta As String = Subs.traeTipoVentaDeBD
 End Sub

 'You can add more parameters here.
@@ -81,12 +82,13 @@ End Sub
 'You can see the list of page related events in the B4XPagesManager object. The event name is B4XPage.

 Sub B4XPage_Appear
+	LogColor(tipo_venta, Colors.red)
 	prodsMap.Initialize
-	B4XPages.MainPage.skmt.ExecNonQuery2("UPDATE CAT_GUNAPROD SET CAT_GP_TIPOPROD = (?) WHERE CAT_GP_TIPOPROD = (?) ",Array As Object("PRIORITARIO","1"))
-	B4XPages.MainPage.skmt.ExecNonQuery2("UPDATE CAT_GUNAPROD SET CAT_GP_TIPOPROD = (?) WHERE CAT_GP_TIPOPROD = (?) ",Array As Object("ESTRATEGICO","2"))
-	B4XPages.MainPage.skmt.ExecNonQuery2("UPDATE CAT_GUNAPROD SET CAT_GP_TIPOPROD = (?) WHERE CAT_GP_TIPOPROD = (?) ",Array As Object("COMPLEMENTARIO","3"))
-	B4XPages.MainPage.skmt.ExecNonQuery2("UPDATE CAT_GUNAPROD SET CAT_GP_TIPOPROD = (?) WHERE CAT_GP_TIPOPROD = (?) ",Array As Object("CATALOGO REGULAR","0"))
-	B4XPages.MainPage.skmt.ExecNonQuery2("UPDATE CAT_GUNAPROD SET CAT_GP_TIPOPROD = (?) WHERE CAT_GP_CLASIF = (?) ",Array As Object("PROMOS","PROMOS"))
+	B4XPages.MainPage.skmt.ExecNonQuery2($"UPDATE ${Subs.traeTablaProds(tipo_venta)} SET CAT_GP_TIPOPROD = (?) WHERE CAT_GP_TIPOPROD = (?)"$,Array As Object("PRIORITARIO","1"))
+	B4XPages.MainPage.skmt.ExecNonQuery2($"UPDATE ${Subs.traeTablaProds(tipo_venta)} SET CAT_GP_TIPOPROD = (?) WHERE CAT_GP_TIPOPROD = (?)"$,Array As Object("ESTRATEGICO","2"))
+	B4XPages.MainPage.skmt.ExecNonQuery2($"UPDATE ${Subs.traeTablaProds(tipo_venta)} SET CAT_GP_TIPOPROD = (?) WHERE CAT_GP_TIPOPROD = (?)"$,Array As Object("COMPLEMENTARIO","3"))
+	B4XPages.MainPage.skmt.ExecNonQuery2($"UPDATE ${Subs.traeTablaProds(tipo_venta)} SET CAT_GP_TIPOPROD = (?) WHERE CAT_GP_TIPOPROD = (?)"$,Array As Object("CATALOGO REGULAR","0"))
+	B4XPages.MainPage.skmt.ExecNonQuery2($"UPDATE ${Subs.traeTablaProds(tipo_venta)} SET CAT_GP_TIPOPROD = (?) WHERE CAT_GP_CLASIF = (?)"$,Array As Object("PROMOS","PROMOS"))
 	
 '	Private left = (Root.Width/2) - ((clv_productos.AsView.Width)/2)
 	clv_productos.GetBase.SetLayoutAnimated(100, 0dip, 140dip, Root.Width, Root.Height * 0.68) 'Cambiamos el tamaño y posición de la lista de productos
@@ -119,7 +121,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 ${Subs.traeTablaProds(tipo_venta)} where CAT_GP_TIPOPROD = 'PROMOS'"$)
 		c.Position = 0
 		If c.GetInt("hayPromos") > 0 Then
 		If Not(Subs.traeCliente.StartsWith("N")) Then lv_catalogos.AddSingleLine("PROMOS") 'No se venden promos a clientes nuevos.
@@ -155,15 +157,15 @@ Sub lv_catalogos_ItemClick (Position As Int, Value As Object)
 		If cd.RowCount = 0 Then
 		
 			LogColor("Promos" & " | " & marca & " | " & tipo, 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_ID NOT IN (SELECT DISTINCT CAT_PE_IDPROMO FROM CAT_PROMO_ESP) 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 ${Subs.traeTablaProds(tipo_venta)} where CAT_GP_PRECIO > 0 And CAT_GP_ALMACEN > 0 And CAT_GP_TIPOPROD = ? AND CAT_GP_ID NOT IN (SELECT DISTINCT CAT_PE_IDPROMO FROM CAT_PROMO_ESP) 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 If cd.RowCount > 0 Then
 			LogColor("Promos" & " | " & marca & " | " & tipo, 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_ID <> 'PRO2265' AND CAT_GP_ID NOT IN (SELECT DISTINCT CAT_PE_IDPROMO FROM CAT_PROMO_ESP) 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 ${Subs.traeTablaProds(tipo_venta)} where CAT_GP_PRECIO > 0 And CAT_GP_ALMACEN > 0 And CAT_GP_TIPOPROD = ? and CAT_GP_ID <> 'PRO2265' AND CAT_GP_ID NOT IN (SELECT DISTINCT CAT_PE_IDPROMO FROM CAT_PROMO_ESP) 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))
 		End If
 '		End If
 	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 ${Subs.traeTablaProds(tipo_venta)} 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
@@ -263,7 +265,7 @@ Sub lv_promos_ItemClick (Position As Int, Value As Object)
 	End If
 	If entro = "3" Then
 	LogColor("Promos YYY", 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 ${Subs.traeTablaProds(tipo_venta)} 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))
 		clv_productos.AsView.Visible = False
 		lv_promos.Visible = True
 		lv_catalogos.Visible = False
@@ -320,7 +322,7 @@ Sub llenaCatalogo(limpiar As Boolean)
 	Log("LlenaCatalogo")
 	If limpiar Then clv_productos.Clear
 	Private c2 As Cursor
-	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 ${Subs.traeTablaProds(tipo_venta)} where CAT_GP_PRECIO > 0 AND CAT_GP_ALMACEN > 0 and CAT_GP_TIPOPROD <> 'PROMOS'
 	order by
 		Case CAT_GP_TIPOPROD when 'PRIORITARIO' THEN 0
 		WHEN 'ESTRATEGICO' THEN 1
@@ -406,7 +408,7 @@ Sub BUSCA_TextChanged (Old As String, New As String)
 	If New.Length > 2 Or forzarbusqueda Then
 		forzarbusqueda = False
 		Log("searching")
-		se = B4XPages.MainPage.skmt.ExecQuery2("select CAT_GP_ID, CAT_GP_NOMBRE, CAT_GP_ALMACEN, CAT_GP_PRECIO, CAT_GP_TIPOPROD, CAT_GP_IMG from cat_gunaprod where CAT_GP_PRECIO > 0 AND CAT_GP_ALMACEN > 0 and CAT_GP_NOMBRE like ? and CAT_GP_CLASIF <>  ?", Array As String(q_buscar,"PROMOS"))  '  order by CAT_GP_NOMBRE asc
+		se = B4XPages.MainPage.skmt.ExecQuery2($"select CAT_GP_ID, CAT_GP_NOMBRE, CAT_GP_ALMACEN, CAT_GP_PRECIO, CAT_GP_TIPOPROD, CAT_GP_IMG from ${Subs.traeTablaProds(tipo_venta)} where CAT_GP_PRECIO > 0 AND CAT_GP_ALMACEN > 0 and CAT_GP_NOMBRE like ? and CAT_GP_CLASIF <>  ?"$, Array As String(q_buscar,"PROMOS"))  '  order by CAT_GP_NOMBRE asc
 '		lv_catalogos.Clear
 		lv_catalogos.Visible = False
 		lv_promos.Visible = False
@@ -537,7 +539,7 @@ Sub b_prodMas_Click
 End Sub

 Private Sub et_pCant_TextChanged (Old As String, New As String)
-	LogColor($"txt changed: ${Old}|${New}, hasfocus=${etCantHasFocus}"$,Colors.Magenta)
+'	LogColor($"txt changed: ${Old}|${New}, hasfocus=${etCantHasFocus}"$,Colors.Magenta)
 	Try
 		Dim index As Int = clv_productos.GetItemFromView(Sender)
 		Dim pnl0 As B4XView = clv_productos.GetPanel(index)
@@ -679,7 +681,7 @@ End Sub

 'Inserta la promo especial en pedido 
 Sub terminarpromoesp
-	c2 = B4XPages.MainPage.skmt.ExecQuery("select * from CAT_GUNAPROD WHERE CAT_GP_ID IN (SELECT DISTINCT CAT_PE_IDPROMO FROM CAT_PROMO_ESP)")
+	c2 = B4XPages.MainPage.skmt.ExecQuery($"select * from ${Subs.traeTablaProds(tipo_venta)} WHERE CAT_GP_ID IN (SELECT DISTINCT CAT_PE_IDPROMO FROM CAT_PROMO_ESP)"$)
 	If c2.RowCount > 0 Then
 		c2.Position = 0
 		Subs.guardaProducto(c2.GetString("CAT_GP_ID"), "0", 1,c2.GetString("CAT_GP_NOMBRE"), c2.GetString("CAT_GP_ID"), Subs.traeCliente, Subs.traeFecha, Subs.traeUsuarioDeBD, Subs.traeRuta, 0, B4XPages.MainPage.tipo_venta)
@@ -734,7 +736,7 @@ 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 ${Subs.traeTablaProds(tipo_venta)} where CAT_GP_TIPO = 'PROMOS' and CAT_GP_NOMBRE = '${Value}'"$)
 	If c.RowCount > 0 Then
 		c.Position = 0
 		id = c.GetString("CAT_GP_ID")
--- a/B4A/Files/celltitle.bal
+++ b/B4A/Files/celltitle.bal
--- a/B4A/Files/cliente.bal
+++ b/B4A/Files/cliente.bal
--- a/B4A/Files/principal.bal
+++ b/B4A/Files/principal.bal
--- a/B4A/Files/proditem2.bal
+++ b/B4A/Files/proditem2.bal
--- a/B4A/Files/resdia.bal
+++ b/B4A/Files/resdia.bal
--- a/V3.1.b4a.meta
+++ b/V3.1.b4a.meta
@@ -55,8 +55,8 @@ ModuleClosedNodes1=11,13,14
 ModuleClosedNodes10=
 ModuleClosedNodes11=
 ModuleClosedNodes12=6
-ModuleClosedNodes13=
-ModuleClosedNodes14=17,20
+ModuleClosedNodes13=3
+ModuleClosedNodes14=3,17
 ModuleClosedNodes15=
 ModuleClosedNodes16=
 ModuleClosedNodes17=4
@@ -70,12 +70,12 @@ ModuleClosedNodes23=3,4,5,6,7,8,9
 ModuleClosedNodes24=
 ModuleClosedNodes25=
 ModuleClosedNodes3=
-ModuleClosedNodes4=159
+ModuleClosedNodes4=
 ModuleClosedNodes5=
 ModuleClosedNodes6=8,9,10,11
 ModuleClosedNodes7=
 ModuleClosedNodes8=
 ModuleClosedNodes9=
-NavigationStack=C_Productos,l_prodX_LongClick,717,0,Diseñador Visual,nota.bal,-100,4,C_Nota,borra_Click,174,0,C_Nota,ListView1_ItemLongClick,223,6,C_Nota,B4XPage_Appear,69,6,C_Productos,ponProdsEnCero,642,0,Subs,traeTablaProds,1681,0,Subs,revisaProdFueraDePromo,1699,0,C_Historico,Regresar_Click,91,0,C_Historico,B4XPage_CloseRequest,96,0,C_Historico,B4XPage_Appear,84,0
+NavigationStack=C_Principal,B4XPage_Appear,342,5,Subs,revisaProdFueraDePromo,1699,0,C_Cliente,B4XPage_Created,474,0,C_Cliente,p_pideGeoPass_Click,1106,0,Visual Designer,cliente.bal,-100,6,Subs,traeTipoVentaDeBD,1711,6,Tracker,flp_LocationChanged,174,0,C_Cliente,iniciofin,1110,6,C_Cliente,GPS_LocationChanged,1084,1,C_Cliente,B4XPage_Appear,508,6
 SelectedBuild=0
-VisibleModules=23,24,4,5,13,14,25,9,19,10,7
+VisibleModules=23,2,13,24,4,5,14,9,25
--- a/B4A/Starter.bas
+++ b/B4A/Starter.bas
@@ -37,6 +37,7 @@ Sub Process_Globals
 	Dim muestraProgreso = 0 'Parte de la funcionalidad "appUpdater"
 	Public newApp As mNewVersion 'Parte de la funcionalidad "appUpdater"
 	Dim nuevoLink As String
+	Dim idCliente As String = ""
 End Sub

 Sub Service_Create
--- a/B4A/Subs.bas
+++ b/B4A/Subs.bas
@@ -649,7 +649,7 @@ End Sub
 Sub traeProdNombre(id As String) As String
 	Private h As Cursor
 	Private n As String
-	h=B4XPages.MainPage.skmt.ExecQuery2("select CAT_GP_NOMBRE from CAT_GUNAPROD where CAT_GP_ID = ? ", Array As String(id.Trim))
+	h=B4XPages.MainPage.skmt.ExecQuery2($"select CAT_GP_NOMBRE from ${traeTablaProds(traeTipoVentaDeBD)} where CAT_GP_ID = ? "$, Array As String(id.Trim))
 	If h.RowCount > 0 Then
 		h.Position = 0
 		n = h.GetString("CAT_GP_NOMBRE")
@@ -766,7 +766,7 @@ Sub guardaProducto(cedis As String, costoU As String, cant As String, nombre As
 	LogColor("guardaProducto: "&prodId&", cant="&cant&" - TV:"&tipoVenta, 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, traeRutaBitacora, 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 ${traeTablaProds(traeTipoVentaDeBD)} 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)")
@@ -834,7 +834,7 @@ Sub traePromo(promo As String, cliente As String) As Map
 	End If
 	

-	c = B4XPages.MainPage.skmt.ExecQuery("Select CAT_GP_STS, CAT_GP_NOMBRE from CAT_GUNAPROD where CAT_GP_ID = '"& promo & "'") 'Obtenemos las piezas requeridas de productos variables para la promoción.
+	c = B4XPages.MainPage.skmt.ExecQuery($"Select CAT_GP_STS, CAT_GP_NOMBRE from ${traeTablaProds(traeTipoVentaDeBD)} where CAT_GP_ID = '${promo}' "$) 'Obtenemos las piezas requeridas de productos variables para la promoción.

 	c.Position = 0
 	Private pvr As String = 0
@@ -855,7 +855,7 @@ End Sub
 'Regresa un mapa con el inventario disponible por producto para la promoción (desde la base de datos).
 Sub traemosInventarioDisponibleParaPromo(promo As String) As Map 'ignore
 	Private c As Cursor
-	c = B4XPages.MainPage.skmt.ExecQuery2("SELECT CAT_GP_ID, CAT_GP_ALMACEN FROM CAT_GUNAPROD WHERE CAT_GP_ID IN (select CAT_DP_IDPROD FROM CAT_DETALLES_PAQ WHERE CAT_DP_ID = ?)", Array As String(promo))
+	c = B4XPages.MainPage.skmt.ExecQuery2($"SELECT CAT_GP_ID, CAT_GP_ALMACEN FROM ${traeTablaProds(traeTipoVentaDeBD)} WHERE CAT_GP_ID IN (select CAT_DP_IDPROD FROM CAT_DETALLES_PAQ WHERE CAT_DP_ID = ?)"$, Array As String(promo))
 '	Private prodInv As Map
 '	prodInv.Initialize
 	Private prods As Map
@@ -1155,7 +1155,7 @@ End Sub
 Sub traeProdIdDeBD As Map 'ignore
 	Private c As Cursor
 	Private m As Map
-	c=B4XPages.MainPage.skmt.ExecQuery("select CAT_GP_ID, CAT_GP_NOMBRE, CAT_GP_TIPO, CAT_GP_SUBTIPO from CAT_GUNAPROD where CAT_GP_NOMBRE In (Select PDESC from PROID)")
+	c=B4XPages.MainPage.skmt.ExecQuery($"select CAT_GP_ID, CAT_GP_NOMBRE, CAT_GP_TIPO, CAT_GP_SUBTIPO from ${traeTablaProds(traeTipoVentaDeBD)} where CAT_GP_NOMBRE In (Select PDESC from PROID)"$)
 	If c.RowCount > 0 Then
 		c.Position = 0
 		m = CreateMap("id":c.GetString("CAT_GP_ID"), "nombre":c.GetString("CAT_GP_NOMBRE"), "tipo":c.GetString("CAT_GP_TIPO"), "subtipo":c.GetString("CAT_GP_SUBTIPO"))
@@ -1174,7 +1174,7 @@ Sub traePromoIdDeBD As Map 'ignore
 	Private m As Map
 	
 	Log("ENTRE")
-	c=B4XPages.MainPage.skmt.ExecQuery("select CAT_GP_ID, CAT_GP_NOMBRE, CAT_GP_TIPO, CAT_GP_SUBTIPO from CAT_GUNAPROD where CAT_GP_NOMBRE In (Select PDESC from PROID) and CAT_GP_TIPO = 'PROMOS'")
+	c=B4XPages.MainPage.skmt.ExecQuery($"select CAT_GP_ID, CAT_GP_NOMBRE, CAT_GP_TIPO, CAT_GP_SUBTIPO from ${traeTablaProds(traeTipoVentaDeBD)} where CAT_GP_NOMBRE In (Select PDESC from PROID) and CAT_GP_TIPO = 'PROMOS'"$)
 	If c.RowCount > 0 Then
 		c.Position = 0
 		m = CreateMap("id":c.GetString("CAT_GP_ID"), "nombre":c.GetString("CAT_GP_NOMBRE"), "tipo":c.GetString("CAT_GP_TIPO"), "subtipo":c.GetString("CAT_GP_SUBTIPO"))
@@ -1237,7 +1237,7 @@ End Sub

 Sub InvSuficientePromoEsp As Boolean
 	Private y As Boolean = False
-	Private c As Cursor = B4XPages.MainPage.skmt.ExecQuery("select CAT_DP_IDPROD, CAT_DP_PZAS, ifnull(CAT_GP_ALMACEN, 0) As CAT_GP_ALMACEN from CAT_DETALLES_PAQ left JOIN CAT_GUNAPROD ON CAT_DP_IDPROD = CAT_GP_ID WHERE CAT_DP_ID IN (SELECT DISTINCT CAT_PE_IDPROMO FROM CAT_PROMO_ESP)")
+	Private c As Cursor = B4XPages.MainPage.skmt.ExecQuery($"select CAT_DP_IDPROD, CAT_DP_PZAS, ifnull(CAT_GP_ALMACEN, 0) As CAT_GP_ALMACEN from CAT_DETALLES_PAQ left JOIN ${traeTablaProds(traeTipoVentaDeBD)} ON CAT_DP_IDPROD = CAT_GP_ID WHERE CAT_DP_ID IN (SELECT DISTINCT CAT_PE_IDPROMO FROM CAT_PROMO_ESP)"$)
 	If c.RowCount > 0 Then
 		For i = 0 To c.RowCount - 1
 		c.Position = i
@@ -1401,7 +1401,7 @@ Sub revisaPromoProcterPRO3009(prodsMap1 As Map)
 		Private monto As String = 0
 		Private invRegalo As Int = 0
 		Private totalRegalos As Int = 0
-		Private r As ResultSet = Starter.skmt.ExecQuery($"select ifnull(cat_gp_almacen, 0) as CAT_GP_ALMACEN from cat_gunaprod where cat_gp_id = '${idRegalo}'"$) ' Traemos el inventario del regalo.
+		Private r As ResultSet = Starter.skmt.ExecQuery($"select ifnull(cat_gp_almacen, 0) as CAT_GP_ALMACEN from ${traeTablaProds(traeTipoVentaDeBD)} where cat_gp_id = '${idRegalo}'"$) ' Traemos el inventario del regalo.
 		Do While r.NextRow
 			Log(r.GetString("CAT_GP_ALMACEN"))
 			If r.GetString("CAT_GP_ALMACEN") > 0 Then invRegalo = r.GetString("CAT_GP_ALMACEN")
@@ -1687,7 +1687,7 @@ End Sub
 Sub traeTablaProds(tipoventa As String) As String
 	Private tablaProds As String = "cat_gunaprod2"
 	If tipoventa = "ABORDO" Or tipoventa = "PREVENTA" Then tablaProds = "cat_gunaprod"
-'	LogColor($"Tipo= ${tipoventa}, tabla=${tablaProds}"$, Colors.RGB(200,136,0))
+	LogColor($"Tipo= ${tipoventa}, tabla=${tablaProds}"$, Colors.RGB(200,136,0))
 	Return tablaProds
 End Sub

@@ -1699,8 +1699,22 @@ Sub revisaProdFueraDePromo(prodId As String) As Boolean
 	Log("rowcount: " & p.RowCount)
 	If p.RowCount > 0 Then
 		p.Position = 0
-'		Log($"|${p.GetString("PE_CEDIS")}|${prodId}|"$)
+		Log($"|${p.GetString("PE_CEDIS")}|${prodId}|"$)
 		fueraDePromo = True
 	End If
 	Return fueraDePromo
+End Sub
+
+'Trae el tipo de venta (VENTA o PREVENTA) desde CAT_VARIABLES, o "PREVENTA" por default.
+Sub traeTipoVentaDeBD As String
+	Private tipoVenta As String = "PREVENTA"
+	Private r As ResultSet = Starter.skmt.ExecQuery("select * from CAT_VARIABLES where CAT_VA_DESCRIPCION = 'TIPO_VENTA'  ")
+	Do While r.NextRow
+		tipoVenta = r.GetString("CAT_VA_VALOR")
+	Loop
+	If Starter.idCliente = "0" Then
+		tipoVenta = "ABORDO"
+	End If
+	Log(">>>>>>>    " & tipoVenta)
+	Return tipoVenta
 End Sub
--- a/B4A/Tracker.bas
+++ b/B4A/Tracker.bas
@@ -54,7 +54,7 @@ Sub Service_Create
 End Sub

 Sub flp_ConnectionSuccess
-	Log("Connected to location provider")
+'	Log("Connected to location provider")
 	'FLP.GetLastKnownLocation
 End Sub