5/12/23 - Cambios para DOE

B4A/B4XMainPage.bas

@@ -126,6 +126,35 @@ End Sub
 'This event will be called once, before the page becomes visible.
 Private Sub B4XPage_Created (Root1 As B4XView)
 	If Not(Starter.Logger) Then logger = False
+	
+	Dim sDate, sTime As String
+	DateTime.DateFormat = "yyyyMMdd"
+	sDate=DateTime.Date(DateTime.Now)
+	Starter.skmt.ExecNonQuery("DROP TABLE IF EXISTS PEDIDO3")
+	Starter.skmt.ExecNonQuery("CREATE TABLE PEDIDO3 (PE_PRECIO2 TEXT,PE_TIPO TEXT,PE_FOLIO NUMERIC,PE_DESC NUMERIC,PE_COSTO_SIN TEXT,PE_RUTA TEXT,PE_CEDIS TEXT,PE_COSTO_TOT NUMERIC,PE_COSTOU NUMERIC,PE_CANT NUMERIC,PE_PRONOMBRE TEXT,PE_PROID TEXT,PE_CLIENTE TEXT,PE_FECHA TEXT,PE_USUARIO TEXT)")
+	Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS DESC_CLIENTES (DC_CL_CLIENTE TEXT, CAT_CL_DESCUENTO_SS TEXT, CAT_CL_DESCUENTO_RTEC TEXT, CAT_CL_DESCUENTO_PING TEXT, CAT_CL_TIPOCLIENTE TEXT)")
+	Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS HIST_ENCUESTA (HE_CLIE TEXT, HE_RES TEXT, HE_FECHA TEXT, HE_TIPO TEXT)")
+	Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS CAT_DESCUENTOS_SKU (CAT_DS_CLIENTE TEXT, CAT_DS_PRODID TEXT, CAT_DS_PORCENTAJE TEXT)")
+	Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS HIST_ENVIOS (HE_FECHA TEXT, HE_CUANTOS TEXT, HE_TIPO TEXT)")
+	Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS CAT_ENCUESTA_PREGUNTA (CAT_EP_ID TEXT,CAT_EP_IDTIPOPREGUNTA TEXT,CAT_CE_DESCRIPCION TEXT,CAT_EP_PREGUNTA TEXT,CAT_EP_RES1_PRED TEXT,CAT_EP_RES2_PRED TEXT,CAT_EP_RES3_PRED TEXT,CAT_EP_ORDEN_PREGUNTA TEXT)")
+	Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS HIST_FOTOS (HF_FOTO BLOB, HF_CUENTA TEXT, HF_IDENCUESTA TEXT)")
+	Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS CLIENTE_IMPRESO (CI_CUENTA TEXT)")
+	Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS CAT_PROMO_MONTO (CPM_IDPROMO TEXT, CPM_MONTO TEXT, CPM_PROID TEXT, CPM_CLIENTE TEXT, CPM_CANT TEXT, CPM_RANGO TEXT, CPM_DESC TEXT)")
+	Starter.skmt.ExecNonQuery2("INSERT INTO HIST_ENVIOS VALUES (?,0,?)", Array As Object(sTime, "PEDIDO"))
+	Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS HIST_EXHIBIDORES2 (HIST_EX_ID_CLIENTE TEXT, HIST_EX_TIPO TEXT, HIST_EX_CANT TEXT)")
+	Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS HIST_PROMO_WHATS(HIST_CLIENTE TEXT, HIST_RESPUESTA_PROMO)")
+'	Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS CAT_RMI(CAT_GP_ID TEXT,CAT_GP_NOMBRE TEXT,CAT_GP_PRECIO TEXT)")
+	Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS CAT_RMI(CAT_ID TEXT, CAT_DESCRIPCION TEXT, CAT_MONTO TEXT)")
+	Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS BITACORAGPS(fechab TEXT, usuariob TEXT, almacenb TEXT, rutab TEXT, eventob TEXT, clienteb TEXT, iniciob TEXT, finb TEXT, latitudb TEXT, longitudb TEXT, precision TEXT, motivonoventa TEXT, motivonovisita TEXT)")
+	''' PARA LO DE DOE---
+	Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS CAT_GUNAPROD_DOE (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 TEXT,CAT_GP_ALMACEN TEXT,CAT_GP_TIPOPROD TEXT,CAT_GP_INICIATIVA TEXT,CAT_GP_DEV TEXT,CAT_GP_CODPROMO TEXT)")
+	Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS PEDIDO_DOE (PE_PRECIO2 TEXT,PE_TIPO TEXT,PE_FOLIO NUMERIC,PE_DESC NUMERIC,PE_COSTO_SIN TEXT,PE_RUTA TEXT,PE_CEDIS TEXT,PE_COSTO_TOT NUMERIC,PE_COSTOU NUMERIC,PE_CANT NUMERIC,PE_PRONOMBRE TEXT,PE_PROID TEXT,PE_CLIENTE TEXT,PE_FECHA TEXT,PE_USUARIO TEXT)")
+	Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS PEDIDOS_DOE_ENTREGA (PC_CLIENTE TEXT, PC_ENTREGA TEXT)")
+	''' FIN DOE
+	kh.agregaColumna(Starter.skmt, "kmt_info", "IMPRESION", "INTEGER")
+	kh.agregaColumna(Starter.skmt, "USUARIOA", "FECHA", "TEXT")
+	
+	
 	Root = Root1
 '	Root.LoadLayout("MainPage")
 	Root.LoadLayout("login")
@@ -163,34 +192,9 @@ Private Sub B4XPage_Created (Root1 As B4XView)
 	Panel1.Top = 0 : Panel1.left = 0
 	ruta = Starter.ruta
 	Starter.tiempos.Initialize
-	Dim sDate, sTime As String
-	DateTime.DateFormat = "yyyyMMdd"
-	sDate=DateTime.Date(DateTime.Now)
-	Starter.skmt.ExecNonQuery("DROP TABLE IF EXISTS PEDIDO3")
-	Starter.skmt.ExecNonQuery("CREATE TABLE PEDIDO3 (PE_PRECIO2 TEXT,PE_TIPO TEXT,PE_FOLIO NUMERIC,PE_DESC NUMERIC,PE_COSTO_SIN TEXT,PE_RUTA TEXT,PE_CEDIS TEXT,PE_COSTO_TOT NUMERIC,PE_COSTOU NUMERIC,PE_CANT NUMERIC,PE_PRONOMBRE TEXT,PE_PROID TEXT,PE_CLIENTE TEXT,PE_FECHA TEXT,PE_USUARIO TEXT)")
-	Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS DESC_CLIENTES (DC_CL_CLIENTE TEXT, CAT_CL_DESCUENTO_SS TEXT, CAT_CL_DESCUENTO_RTEC TEXT, CAT_CL_DESCUENTO_PING TEXT, CAT_CL_TIPOCLIENTE TEXT)")
-	Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS HIST_ENCUESTA (HE_CLIE TEXT, HE_RES TEXT, HE_FECHA TEXT, HE_TIPO TEXT)")
-	Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS CAT_DESCUENTOS_SKU (CAT_DS_CLIENTE TEXT, CAT_DS_PRODID TEXT, CAT_DS_PORCENTAJE TEXT)")
-	Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS HIST_ENVIOS (HE_FECHA TEXT, HE_CUANTOS TEXT, HE_TIPO TEXT)")
-	Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS CAT_ENCUESTA_PREGUNTA (CAT_EP_ID TEXT,CAT_EP_IDTIPOPREGUNTA TEXT,CAT_CE_DESCRIPCION TEXT,CAT_EP_PREGUNTA TEXT,CAT_EP_RES1_PRED TEXT,CAT_EP_RES2_PRED TEXT,CAT_EP_RES3_PRED TEXT,CAT_EP_ORDEN_PREGUNTA TEXT)")
-	Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS HIST_FOTOS (HF_FOTO BLOB, HF_CUENTA TEXT, HF_IDENCUESTA TEXT)")
-	Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS CLIENTE_IMPRESO (CI_CUENTA TEXT)")
-	Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS CAT_PROMO_MONTO (CPM_IDPROMO TEXT, CPM_MONTO TEXT, CPM_PROID TEXT, CPM_CLIENTE TEXT, CPM_CANT TEXT, CPM_RANGO TEXT, CPM_DESC TEXT)")
-	Starter.skmt.ExecNonQuery2("INSERT INTO HIST_ENVIOS VALUES (?,0,?)", Array As Object(sTime, "PEDIDO"))
-	Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS HIST_EXHIBIDORES2 (HIST_EX_ID_CLIENTE TEXT, HIST_EX_TIPO TEXT, HIST_EX_CANT TEXT)")
-	Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS HIST_PROMO_WHATS(HIST_CLIENTE TEXT, HIST_RESPUESTA_PROMO)")
-'	Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS CAT_RMI(CAT_GP_ID TEXT,CAT_GP_NOMBRE TEXT,CAT_GP_PRECIO TEXT)")
-	Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS CAT_RMI(CAT_ID TEXT, CAT_DESCRIPCION TEXT, CAT_MONTO TEXT)")
 
-	Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS BITACORAGPS(fechab TEXT, usuariob TEXT, almacenb TEXT, rutab TEXT, eventob TEXT, clienteb TEXT, iniciob TEXT, finb TEXT, latitudb TEXT, longitudb TEXT, precision TEXT, motivonoventa TEXT, motivonovisita TEXT)")
 	
-	''' PARA LO DE DOE---
-	Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS CAT_GUNAPROD_DOE (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 TEXT,CAT_GP_ALMACEN TEXT,CAT_GP_TIPOPROD TEXT,CAT_GP_INICIATIVA TEXT,CAT_GP_DEV TEXT,CAT_GP_CODPROMO TEXT)")
-	Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS PEDIDO_DOE (PE_PRECIO2 TEXT,PE_TIPO TEXT,PE_FOLIO NUMERIC,PE_DESC NUMERIC,PE_COSTO_SIN TEXT,PE_RUTA TEXT,PE_CEDIS TEXT,PE_COSTO_TOT NUMERIC,PE_COSTOU NUMERIC,PE_CANT NUMERIC,PE_PRONOMBRE TEXT,PE_PROID TEXT,PE_CLIENTE TEXT,PE_FECHA TEXT,PE_USUARIO TEXT)")
-	''' FIN DOE
 	
-	kh.agregaColumna(Starter.skmt, "kmt_info", "IMPRESION", "INTEGER")
-	kh.agregaColumna(Starter.skmt, "USUARIOA", "FECHA", "TEXT")
 	kh.guardaAppInfo(Starter.skmt)
 	
 '	Try 'Intentamos usar "pragma_table_info" para revisar si existe la columna "IMPRESION" en la tabla

B4A/C_Cliente.bas

@@ -263,28 +263,36 @@ Sub Class_Globals
 	Private p_promowhats As Panel
 	Private l_promowhats As Label
 	Private l_doe As Label
+	Private gps_boton_doe As String
 	Private p_pideGeoPass As Panel
 	Private et_geopass As EditText
 	Private b_geopass As Button
+	Private P_DOE As Panel
 	Private LP_DOE As ListView
 	Private BP_DOE_A As Button
 	Private BP_DOE_R As Button
-	Private p_doe As Panel
+	Private L_DOE_TOTAL As Label
+	Private BP_DOE_R1 As Button
 	Private ime As IME
 	Dim laDist As Float
-	Private L_DOE_TOTAL As Label
-	Private L_DOE_TOTAL As Label
 	Private Panel11 As Panel
-	Private BP_DOE_R1 As Button
 	Dim RMI_VALOR As String
 	Dim errorImpresora As Int = 0
 	Private b_inicioFinVenta As Button
 	Dim dentroDeGeocerca As Boolean = False
 	Dim motivoNoVenta As String = ""
+	Private motivo As String
 	Dim precision As Int = 0
 	Dim clienteDeudor As Boolean = False
 	Dim usarGeocerca As Boolean = False
 	Dim clienteId As String
+	Private clienteConPromo As String = ""
+	Private r_1 As RadioButton
+	Private r_2 As RadioButton
+	Private r_3 As RadioButton
+	Private r_4 As RadioButton
+	Private R_5 As RadioButton
+	Private e_comm As EditText
 End Sub
 
 'You can add more parameters here.
@@ -337,6 +345,14 @@ Private Sub B4XPage_Created (Root1 As B4XView)
 			l_atiende2.Text = c.GetString("CAT_CL_ATIENTE2")
 			la_saldotot.Text = c.GetString("CAT_CL_TELEFONO")
 			la_saldooper.Text = c.GetString("CAT_CL_EMAIL")
+			''' ESTO SE AGREGA PARA QUE SE VEA LOS CLIENTES DOE
+'			If c.GetString("CAT_CL_EMAIL") = "1" Then
+'				l_doe.Visible = True
+'			Else
+'				l_doe.Visible = False
+'			End If
+			If kh.clienteConDOE Then l_doe.Visible = True Else l_doe.Visible = False
+			'''FIN CLIENTES DOE
 			l_total.Text = s.GetString("TOTAL_CLIE")
 			total_cliente = s.GetString("TOTAL_CLIE")
 			MONTO_COMPRA = c.GetString("CAT_CL_MTOCOMPRA")
@@ -367,6 +383,8 @@ Private Sub B4XPage_Created (Root1 As B4XView)
 	Printer1.Initialize(Me, "Printer1")
 	TOMAR_FOTO = 0
 	c.Close
+	Panel_INV_A.Left = 0 : Panel_INV_A.top = 0
+	Panel10.Left = 0 : Panel10.top = 0
 	If s.IsInitialized Then s.Close
 '	Log("#################   PERMISOS BT: " & Starter.rp.Check("android.permission.BLUETOOTH_CONNECT"))
 '	Log("Permisos BT: " & Starter.rp.Check("android.permission.BLUETOOTH_CONNECT"))
@@ -381,8 +399,9 @@ End Sub
 
 Sub B4XPage_Appear
 	clienteId = kh.traeCliente(Starter.skmt)
+	P_DOE.Visible = False
 	If clienteId.StartsWith("N") Then b_noVenta.Visible = False
-	Log($"TOTAL VENTA: ${kh.traeTotalCliente}"$)
+'	Log($"TOTAL VENTA: ${kh.traeTotalCliente}"$)
 	B_VENTA.Visible = False
 	b_noVenta.Visible = False
 '	Log(Starter.rp.Check("android.permission.BLUETOOTH_CONNECT"))
@@ -411,7 +430,7 @@ Sub B4XPage_Appear
 	Starter.MAC_IMPRESORA = MAC_IMPRESORA
 	et_geopass.Text = ""
 	If Subs.traeUltimaActividadBD <> "Cliente" Then Subs.iniciaActividad(Subs.traeUltimaActividadBD)
-	Log($"MUESTRA BOLETA ${muestraBoleta}"$)
+'	Log($"MUESTRA BOLETA ${muestraBoleta}"$)
 	If Not(muestraBoleta) Then Subs.panelVisibleCompleto(P_INF_GENERAL, Root)
 	p_pideGeoPass.Visible = False
 '	If Logger Then Log(muestraBoleta)
@@ -478,13 +497,12 @@ Sub B4XPage_Appear
 			CREDITO = c.GetString("CAT_CL_BCREDITO")
 			ruta_tienda = c.GetString("CAT_CL_RUTA")
 			YA_IMPRIMIO2 = c.GetString("IMPRESION")
-
+'			If c.GetString("CAT_CL_EMAIL") = "1" Then
-			If c.GetString("CAT_CL_EMAIL") = "1" Then
+'				l_doe.Visible = True
-				l_doe.Visible = True
+'			Else
-			Else
+'				l_doe.Visible = False
-				l_doe.Visible = False
+'			End If
-			End If
+			If kh.clienteConDOE Then l_doe.Visible = True Else l_doe.Visible = False
-
 			LONGITUD = 0
 			If c.GetString("CAT_CL_LONG") <> Null And c.GetString("CAT_CL_LONG") <> "null" And IsNumber(c.GetString("CAT_CL_LONG")) Then LONGITUD =  c.GetString("CAT_CL_LONG")
 			LATITUD = 0
@@ -577,7 +595,7 @@ Sub B4XPage_Appear
 		Else
 			Cuestionario
 		End If
-		Log("IMPRESO: " & Subs.revisaImpresa)
+'		Log("IMPRESO: " & Subs.revisaImpresa)
 		If YA_IMPRIMIO2 = 0 Then
 			Guardar.Visible = False
 		Else
@@ -607,6 +625,7 @@ Sub B4XPage_Appear
 					If logger Then Log("Promocion aceptada.")
 					If logger Then Log($"${mPromoEspecial.Get("idProd")}, ${mPromoEspecial.Get("idPromo")}, ${mPromoEspecial.Get("cantProd")}, ${mPromoEspecial.Get("nombreProd")}, ${mPromoEspecial.Get("descrPromo")}, ${la_cuenta.Text}, ${usuario}, ${ruta_tienda}"$)
 					metePromoEspecial(mPromoEspecial.Get("idProd"), mPromoEspecial.Get("idPromo"), mPromoEspecial.Get("cantProd"), mPromoEspecial.Get("nombreProd"), mPromoEspecial.Get("descrPromo"), la_cuenta.Text, usuario, ruta_tienda)
+					Log(">>>> Vamos a poner impreso")
 					Subs.ponImpreso(la_cuenta.Text)
 				End If
 			End If
@@ -641,6 +660,7 @@ Sub B4XPage_Appear
 	
 	'PARA LA PROMO DOE
 	b_whats.Visible = False
+	gps_boton_doe = "0"
 	
 	C1=Starter.skmt.ExecQuery("select IMPRESION FROM kmt_info where CAT_CL_CODIGO In (select cuenta from cuentaa)")
 	C1.Position = 0
@@ -657,7 +677,8 @@ Sub B4XPage_Appear
 					c2=Starter.skmt.ExecQuery2("SELECT CAT_GP_ALMACEN FROM CAT_GUNAPROD2 WHERE CAT_GP_ID = ? ", Array As String("1008094223"))
 					c2.Position = 0
 					If c2.GetString("CAT_GP_ALMACEN") > 0 Then
-'						b_whats.Visible = True
+						b_whats.Visible = False
+'						gps_boton_doe = "1"
 					End If
 					c2.Close
 				End If
@@ -668,6 +689,7 @@ Sub B4XPage_Appear
 		s.Close
 	End If
 	C1.Close
+	gps_boton_doe = "0"
 	CallSubDelayed(Tracker, "Track")
 	CallSubDelayed(Tracker, "StartFLPSmall")
 	If Tracker.FLP.IsInitialized And Tracker.FLP.GetLastKnownLocation.IsInitialized Then 'Si tenemos "UltimaUbicaccionConocida" la usamos.
@@ -758,6 +780,7 @@ Sub GPS_LocationChanged (Location1 As Location)
 	If Not(usarGeocerca) Or dentroDeGeocerca Or usuario = "KMTSKLL1" Or la_cuenta.Text = "0" Then
 '		If pgs_boton_noventa = "1" Then b_noVenta.Visible = True
 '		If gps_boton_doe ="1" Then b_whats.Visible = True
+		If gps_boton_doe = "1" And clienteConPromo = "0" Then b_whats.Visible = True
 		If Not(clienteDeudor) Then B_VENTA.Visible = True 'Si el cliente no tiene adeudo, habilitamos el boton de venta
 		pedido_doe_muestra
 	Else
@@ -828,7 +851,7 @@ Sub Guardar_Click
 	c.Position=0
 	clie_id = c.GetString("CUENTA")
 	usuario = Subs.traeUsuarioDeBD
-	If l_total.Text <> Null And l_total.Text <> "null" Then Subs.ponImpreso(clie_id) 'Solo lo marcamos com impreso si tiene venta (total > 0).
+	If l_total.Text <> Null And l_total.Text <> "null" And l_total.Text <> "0.0" Then Subs.ponImpreso(clie_id) 'Solo lo marcamos com impreso si tiene venta (total > 0).
 	c = Starter.skmt.ExecQuery("select sum(pe_costo_tot) as TOTAL_CLIE, SUM(PE_CANT) AS CANT_CLIE, COUNT(*) AS CUANTOS FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa)")
 	c.Position = 0
 	If c.GetString("CUANTOS") > 0 Then
@@ -877,7 +900,7 @@ Sub Guardar_Click
 	Guardar.SendToBack
 	b_inicioFinVenta.Text = "TERMINAR VENTA"
 	Log("RESPLDO")
-	kh.respaldoBatch
+	kh.RD_respaldoBatch
 	If la_cuenta.Text <> "0" Then 'Si es ABORDO, no mostramos el boton b_inicioFinVenta y regresamos a Principal.
 		b_inicioFinVenta.Visible = True
 	Else
@@ -1247,10 +1270,9 @@ Sub B_IMP2_Click
 			Printer1.WriteString(" " & CRLF)
 			
 			''''''' PEDIDOS DOE
-			
 			s=Starter.skmt.ExecQuery2("select PE_PRONOMBRE, PE_CANT, length(pe_cant) as L_CANT, PE_COSTOU, length(PE_COSTOU) as L_COSTOU, PE_COSTO_TOT, length(PE_COSTO_TOT) as L_COSTO_TOT, PE_PROID, PE_CEDIS FROM PEDIDO WHERE PE_CEDIS = ?  AND PE_CLIENTE IN (Select CUENTA from cuentaa) order by PE_CEDIS,PE_PRONOMBRE", Array As String("DOE"))
 			
-			''		s=Starter.skmt.ExecQuery2("select PE_PRONOMBRE, PE_CANT, length(pe_cant) as L_CANT, PE_COSTOU, length(PE_COSTOU) as L_COSTOU, PE_COSTO_TOT, length(PE_COSTO_TOT) as L_COSTO_TOT, PE_PROID, PE_CEDIS FROM PEDIDO WHERE PE_TIPO = ? and pe_codpromo = ? and substr(pe_pronombre,1,6) <> ? AND PE_CLIENTE IN (Select CUENTA from cuentaa) order by PE_CEDIS,PE_PRONOMBRE", Array As String("VENTA", "DOE", "CAMBIO"))
+'			s=Starter.skmt.ExecQuery2("select PE_PRONOMBRE, PE_CANT, length(pe_cant) as L_CANT, PE_COSTOU, length(PE_COSTOU) as L_COSTOU, PE_COSTO_TOT, length(PE_COSTO_TOT) as L_COSTO_TOT, PE_PROID, PE_CEDIS FROM PEDIDO WHERE PE_TIPO = ? and pe_codpromo = ? and substr(pe_pronombre,1,6) <> ? AND PE_CLIENTE IN (Select CUENTA from cuentaa) order by PE_CEDIS,PE_PRONOMBRE", Array As String("VENTA", "DOE", "CAMBIO"))
 			If S.RowCount>0 Then
 				Printer1.WriteString("------------------------------" & CRLF)
 				Printer1.WriteString("PEDIDO DON TOÑO" & CRLF)
@@ -1348,13 +1370,23 @@ Sub B_IMP2_Click
 			s=Starter.skmt.ExecQuery2("select sum(PE_CANT) as CANTIDAD, SUM(PE_COSTO_TOT) AS TOTAL FROM PEDIDO WHERE PE_CEDIS <> PE_PROID AND PE_TIPO = ? and substr(pe_pronombre,1,6) <> ? AND PE_CEDIS <> ? AND PE_CLIENTE IN (Select CUENTA from cuentaa)", Array As String("VENTA","CAMBIO","DOE"))
 			s.Position = 0
 			Private sTotal2 As Double
-			If s.GetString("TOTAL") <> Null And IsNumber(s.GETSTRING("TOTAL")) Then
+'			If s.GetString("TOTAL") <> Null And IsNumber(s.GETSTRING("TOTAL")) Then
-				sTotal2 = s.GetString("TOTAL")
+'				sTotal2 = s.GetString("TOTAL")
+'			Else
+'				sTotal2 = 0
+'			End If
+			sTotal2 = kh.traeTotalCliente
+			s=Starter.skmt.ExecQuery2("select sum(PE_CANT) as CANTIDAD, SUM(PE_COSTO_TOT) AS TOTAL FROM PEDIDO WHERE PE_CEDIS <> PE_PROID AND PE_TIPO = ? and substr(pe_pronombre,1,6) = ? AND PE_CLIENTE IN (Select CUENTA from cuentaa)", Array As String("VENTA","CAMBIO"))
+			s.Position = 0
+			Private cant5 As String = s.GetString("CANTIDAD")
+			Private sTotal3 As Double
+			If s.GetString("TOTAL") <> Null And IsNumber(s.GetString("TOTAL")) Then
+				sTotal3 = s.GetString("TOTAL")
 			Else
-				sTotal2 = 0
+				sTotal3 = 0
 			End If
 			Printer1.WriteString(Printer1.REVERSE & "==============================="  & CRLF)
-			Printer1.WriteString( Printer1.UNREVERSE & Printer1.BOLD & $"Sub Total Venta:   $${NumberFormat2(sTotal2, 1, 2, 2, False)}"$ & CRLF)
+			Printer1.WriteString( Printer1.UNREVERSE & Printer1.BOLD & $"Sub Total Venta:   $${NumberFormat2((sTotal2+(sTotal3 * -1)), 1, 2, 2, False)}"$ & CRLF)
 			Private cantidad1 As String = "0"
 			If s.GetString("CANTIDAD") <> Null And IsNumber(s.GetString("CANTIDAD")) Then cantidad1 = s.GetString("CANTIDAD")
 			Printer1.WriteString( Printer1.UNREVERSE & Printer1.BOLD & "No. Productos: " & cantidad1 & CRLF)
@@ -3586,7 +3618,6 @@ End Sub
 Sub revisaPromoEspecial As Map
 '	Necesitamos cliente autorizado, producto promocional con existencia y cliente no impreso.
 	Private hayInventario As String = ""
-	Private clienteConPromo As String = ""
 	Private clienteImpreso As String = ""
 	Dim promoInfo As Map
 	promoInfo.Initialize
@@ -3726,6 +3757,10 @@ Private Sub b_aceptarrpomo_Click
 '		l_promowhats.Text = c.GetString("CAT_CL_NOMBRE")
 '	End If
 '	c.Close
+	Private almadoe As Cursor = Starter.skmt.ExecQuery("SELECT ID_ALMACEN FROM CAT_ALMaCEN")
+	almadoe.Position = 0
+	LogColor(almadoe.GetString("ID_ALMACEN"),Colors.Blue)
+	If almadoe.GetString("ID_ALMACEN") = "3" Then
 		sDate=DateTime.Date(DateTime.Now)
 		sTime=DateTime.Time(DateTime.Now)
 		c=Starter.skmt.ExecQuery("Select CUENTA from cuentaa")
@@ -3736,27 +3771,80 @@ Private Sub b_aceptarrpomo_Click
 		c.Position=0
 		usuario = c.GetString("USUARIO")
 		c.Close
-'	Id_Almacen = Subs.traeAlmacen
+		c=Starter.skmt.ExecQuery("select ID_ALMACEN from CAT_ALMACEN")
+		If c.RowCount>0 Then
+			C.Position=0
+			Id_Almacen = C.GetString("ID_ALMACEN")
+		End If
+		c.Close
 		Starter.skmt.ExecNonQuery2("INSERT INTO HIST_PROMO_WHATS VALUES (?,?)", Array As Object(l_promowhats.Text, "PROMO ACEPTADA"))
-	Starter.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_TIPO,PE_PRECIO2) VALUES(?,?,?,?,?,?,?,?,?,?,?,?) ", Array As Object ("PROMODOE",0 , 0, 1, "KIT DE BIENVENIDA DON TOÑO", "PROMODOE",la_cuenta.TEXT, sDate & sTime, usuario,Starter.rutaV,Starter.tipov,0))
+		Starter.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_TIPO,PE_PRECIO2) VALUES(?,?,?,?,?,?,?,?,?,?,?,?) ", Array As Object ("PROMODOE",0 , 0, 1, "KIT DE BIENVENIDA DOE", "PDOE100123",la_cuenta.TEXT, sDate & sTime, usuario,Starter.rutaV,"VENTA",0))
-	Starter.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_TIPO,PE_PRECIO2) VALUES(?,?,?,?,?,?,?,?,?,?,?,?) ", Array As Object ("PROMODOE",0.01 , 0.01, 1, "CAJA CHOCO ZUCARITAS 260 GR", "1008094223",la_cuenta.TEXT, sDate & sTime, usuario,Starter.rutaV,Starter.tipov,0))
+		Starter. 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_TIPO,PE_PRECIO2) VALUES(?,?,?,?,?,?,?,?,?,?,?,?) ", Array As Object ("PROMODOE",0.02 , 0.01, 2, "LECHE ALL BRAN CHOCO 236ML", "1008027226",la_cuenta.TEXT, sDate & sTime, usuario,Starter.rutaV,"VENTA",0))
-	Starter.skmt.ExecNonQuery2("update cat_gunaprod2 set cat_gp_almacen = cat_gp_almacen - ? where cat_gp_id = ? ", Array As Object("1", "1008094223"))
+		Starter. 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_TIPO,PE_PRECIO2) VALUES(?,?,?,?,?,?,?,?,?,?,?,?) ", Array As Object ("PROMODOE",0.01 , 0.01, 1, "LECHE ALL BRAN NUEZ 236ML", "1008027228",la_cuenta.TEXT, sDate & sTime, usuario,Starter.rutaV,"VENTA",0))
+		Starter. 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_TIPO,PE_PRECIO2) VALUES(?,?,?,?,?,?,?,?,?,?,?,?) ", Array As Object ("PROMODOE",0.01 , 0.01, 1, "LECHE CHOCO MELVIN 236ML", "1008013799",la_cuenta.TEXT, sDate & sTime, usuario,Starter.rutaV,"VENTA",0))
+
+		Starter.skmt.ExecNonQuery2("update cat_gunaprod2 set cat_gp_almacen = cat_gp_almacen - ? where cat_gp_id = ? ", Array As Object("2", "1008027226"))
+		Starter.skmt.ExecNonQuery2("update cat_gunaprod2 set cat_gp_almacen = cat_gp_almacen - ? where cat_gp_id = ? ", Array As Object("1", "1008027228"))
+		Starter.skmt.ExecNonQuery2("update cat_gunaprod2 set cat_gp_almacen = cat_gp_almacen - ? where cat_gp_id = ? ", Array As Object("1", "1008013799"))
 		c=Starter.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
 		Starter.skmt.ExecNonQuery("delete from pedido_cliente where PC_CLIENTE In (select cuenta from cuentaa)")
 		If logger Then LogColor($"Insertamos coordenadas en pedido: ${Starter.lon_gps}, ${Starter.lat_gps}"$, Colors.Magenta)
 		Starter.skmt.ExecNonQuery2("insert into pedido_cliente(PC_CLIENTE, PC_FECHA, PC_USER, PC_NOART, PC_MONTO,PC_LON, PC_LAT,PC_ALMACEN,PC_RUTA,PC_COSTO_SIN) VALUES (?,?,?,?,?,?,?,?,?,?)", Array As Object(clie_id, sDate & sTime, usuario, c.GetString("CANT_CLIE"),c.GetString("TOTAL_CLIE"), Starter.lon_gps, Starter.lat_gps,Id_Almacen,Starter.rutaV,c.GetString("TOTAL_CLIE_SIN")))
-	
 		Starter.skmt.ExecNonQuery("delete from pedido3")
 		Starter.skmt.ExecNonQuery("UPDATE PEDIDO SET PE_FOLIO = 0 where PE_FOLIO IS NULL")
 		Starter.skmt.ExecNonQuery("INSERT INTO PEDIDO3 (PE_PRECIO2, PE_TIPO, PE_FECHA, PE_DESC, PE_COSTO_SIN, PE_RUTA, PE_CEDIS, PE_COSTO_TOT, PE_COSTOU, PE_CANT, PE_PRONOMBRE, PE_PROID, PE_CLIENTE, PE_USUARIO ) SELECT PE_PRECIO2, PE_TIPO, PE_FECHA, PE_DESC, PE_COSTO_SIN, PE_RUTA, PE_CEDIS, SUM(PE_COSTO_TOT) AS PE_COSTO_TOT, PE_COSTOU, SUM(PE_CANT) As PE_CANT, PE_PRONOMBRE, PE_PROID, PE_CLIENTE, PE_USUARIO FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa) GROUP BY PE_PRECIO2, PE_TIPO, PE_DESC, PE_COSTO_SIN,	PE_RUTA, PE_CEDIS, PE_COSTOU, PE_PRONOMBRE,	PE_PROID, PE_CLIENTE ") 'Mod por CHV - 220302 - Agregué PE_FECHA al select/insert
-
+'	starter.skmt.ExecNonQuery2("INSERT INTO")
-'	Starter.skmt.ExecNonQuery2("INSERT INTO")
 		p_promowhats.Visible = False
 		P_INF_GENERAL.Visible = True
 		c.Close
 		b_whats.Visible = False
 		Starter.skmt.ExecNonQuery("delete from HIST_CLIENTE_CANT_PROMOS where HCCP_CLIENTE IN (Select cuenta from cuentaa)")
+		B4XPage_Appear
+	Else
+		sDate=DateTime.Date(DateTime.Now)
+		sTime=DateTime.Time(DateTime.Now)
+		c=Starter.skmt.ExecQuery("Select CUENTA from cuentaa")
+		c.Position=0
+		clie_id = c.GetString("CUENTA")
+		c.Close
+		c=Starter.skmt.ExecQuery("select USUARIO from usuarioa")
+		c.Position=0
+		usuario = c.GetString("USUARIO")
+		c.Close
+		c=Starter.skmt.ExecQuery("select ID_ALMACEN from CAT_ALMACEN")
+		If c.RowCount>0 Then
+			C.Position=0
+			Id_Almacen = C.GetString("ID_ALMACEN")
+		End If
+		c.Close
+		Starter.skmt.ExecNonQuery2("INSERT INTO HIST_PROMO_WHATS VALUES (?,?)", Array As Object(l_promowhats.Text, "PROMO ACEPTADA"))
+		Starter.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_TIPO,PE_PRECIO2) VALUES(?,?,?,?,?,?,?,?,?,?,?,?) ", Array As Object ("PROMODOE",0 , 0, 1, "KIT DE BIENVENIDA DOE", "PDOE100123",la_cuenta.TEXT, sDate & sTime, usuario,Starter.rutaV,"VENTA",0))
+		Starter. 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_TIPO,PE_PRECIO2) VALUES(?,?,?,?,?,?,?,?,?,?,?,?) ", Array As Object ("PROMODOE",0.01 , 0.01, 1, "LECHE ALL BRAN CHOCO 236ML", "1008027226",la_cuenta.TEXT, sDate & sTime, usuario,Starter.rutaV,"VENTA",0))
+		Starter. 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_TIPO,PE_PRECIO2) VALUES(?,?,?,?,?,?,?,?,?,?,?,?) ", Array As Object ("PROMODOE",0.01 , 0.01, 1, "LECHE ALL BRAN VAINILLA 236ML", "1008027230",la_cuenta.TEXT, sDate & sTime, usuario,Starter.rutaV,"VENTA",0))
+		Starter. 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_TIPO,PE_PRECIO2) VALUES(?,?,?,?,?,?,?,?,?,?,?,?) ", Array As Object ("PROMODOE",0.01 , 0.01, 1, "LECHE ALL BRAN NUEZ 236ML", "1008027228",la_cuenta.TEXT, sDate & sTime, usuario,Starter.rutaV,"VENTA",0))
+		Starter. 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_TIPO,PE_PRECIO2) VALUES(?,?,?,?,?,?,?,?,?,?,?,?) ", Array As Object ("PROMODOE",0.01 , 0.01, 1, "LECHE CHOCO MELVIN 236ML", "1008013799",la_cuenta.TEXT, sDate & sTime, usuario,Starter.rutaV,"VENTA",0))
+		Starter.skmt.ExecNonQuery2("update cat_gunaprod2 set cat_gp_almacen = cat_gp_almacen - ? where cat_gp_id = ? ", Array As Object("1", "1008027226"))
+		Starter.skmt.ExecNonQuery2("update cat_gunaprod2 set cat_gp_almacen = cat_gp_almacen - ? where cat_gp_id = ? ", Array As Object("1", "1008027230"))
+		Starter.skmt.ExecNonQuery2("update cat_gunaprod2 set cat_gp_almacen = cat_gp_almacen - ? where cat_gp_id = ? ", Array As Object("1", "1008027228"))
+		Starter.skmt.ExecNonQuery2("update cat_gunaprod2 set cat_gp_almacen = cat_gp_almacen - ? where cat_gp_id = ? ", Array As Object("1", "1008013799"))
+		c=Starter.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
+		Starter.skmt.ExecNonQuery("delete from pedido_cliente where PC_CLIENTE In (select cuenta from cuentaa)")
+		If logger Then LogColor($"Insertamos coordenadas en pedido: ${Starter.lon_gps}, ${Starter.lat_gps}"$, Colors.Magenta)
+		Starter.skmt.ExecNonQuery2("insert into pedido_cliente(PC_CLIENTE, PC_FECHA, PC_USER, PC_NOART, PC_MONTO,PC_LON, PC_LAT,PC_ALMACEN,PC_RUTA,PC_COSTO_SIN) VALUES (?,?,?,?,?,?,?,?,?,?)", Array As Object(clie_id, sDate & sTime, usuario, c.GetString("CANT_CLIE"),c.GetString("TOTAL_CLIE"), Starter.lon_gps, Starter.lat_gps,Id_Almacen,Starter.rutaV,c.GetString("TOTAL_CLIE_SIN")))
+		Starter.skmt.ExecNonQuery("delete from pedido3")
+		Starter.skmt.ExecNonQuery("UPDATE PEDIDO SET PE_FOLIO = 0 where PE_FOLIO IS NULL")
+		Starter.skmt.ExecNonQuery("INSERT INTO PEDIDO3 (PE_PRECIO2, PE_TIPO, PE_FECHA, PE_DESC, PE_COSTO_SIN, PE_RUTA, PE_CEDIS, PE_COSTO_TOT, PE_COSTOU, PE_CANT, PE_PRONOMBRE, PE_PROID, PE_CLIENTE, PE_USUARIO ) SELECT PE_PRECIO2, PE_TIPO, PE_FECHA, PE_DESC, PE_COSTO_SIN, PE_RUTA, PE_CEDIS, SUM(PE_COSTO_TOT) AS PE_COSTO_TOT, PE_COSTOU, SUM(PE_CANT) As PE_CANT, PE_PRONOMBRE, PE_PROID, PE_CLIENTE, PE_USUARIO FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa) GROUP BY PE_PRECIO2, PE_TIPO, PE_DESC, PE_COSTO_SIN,	PE_RUTA, PE_CEDIS, PE_COSTOU, PE_PRONOMBRE,	PE_PROID, PE_CLIENTE ") 'Mod por CHV - 220302 - Agregué PE_FECHA al select/insert
+'	starter.skmt.ExecNonQuery2("INSERT INTO")
+		p_promowhats.Visible = False
+		P_INF_GENERAL.Visible = True
+		c.Close
+		b_whats.Visible = False
+		Starter.skmt.ExecNonQuery("delete from HIST_CLIENTE_CANT_PROMOS where HCCP_CLIENTE IN (Select cuenta from cuentaa)")
+		B4XPage_Appear
+	End If
+	almadoe.Close
 End Sub
 
 Private Sub b_rechazapromo_Click
@@ -3770,7 +3858,7 @@ Private Sub p_pideGeoPass_Click
 End Sub
 
 Private Sub b_geopass_Click
-	If et_geopass.Text = "KMTS1" Then
+	If et_geopass.Text.trim = "KMTS1" Then
 		m_lat = Starter.lat_gps
 		m_lon = Starter.lon_gps
 		GPS_LocationChanged(Starter.ubicacionActual)
@@ -3779,7 +3867,7 @@ Private Sub b_geopass_Click
 		Dim cmd As DBCommand
 		cmd.Initialize
 		cmd.Name = "select_geoPass"
-		cmd.Parameters = Array As Object(et_geopass.Text, Subs.traeAlmacen, Subs.traeRuta)
+		cmd.Parameters = Array As Object(et_geopass.Text.Trim, Subs.traeAlmacen, Subs.traeRuta)
 		reqManager.ExecuteQuery(cmd , 0, "traeGeoPass")
 		Log($"${Starter.DBReqServer}, ${et_geopass.Text}, ${Subs.traeAlmacen}, ${Subs.traeRuta}"$)
 		et_geopass.Text = ""
@@ -3836,7 +3924,12 @@ Sub JobDone(Job As HttpJob)
 End Sub
 
 Private Sub BP_DOE_A_Click
-'	Id_Almacen = Subs.traeAlmacen
+	c=Starter.skmt.ExecQuery("select ID_ALMACEN from CAT_ALMACEN")
+	If c.RowCount>0 Then
+		C.Position=0
+		Id_Almacen = C.GetString("ID_ALMACEN")
+	End If
+	c.Close
 	DateTime.DateFormat = "MM/dd/yyyy"
 	sDate=DateTime.Date(DateTime.Now)
 	sTime=DateTime.Time(DateTime.Now)
@@ -3847,9 +3940,9 @@ Private Sub BP_DOE_A_Click
 	c.Position=0
 	usuario = c.GetString("USUARIO")
 	c.Close
+	Starter.skmt.BeginTransaction
 	Starter.skmt.ExecNonQuery("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_TIPO,PE_PRECIO2) SELECT PE_CEDIS,PE_COSTO_TOT,PE_COSTOU,PE_CANT,PE_PRONOMBRE,PE_PROID,PE_CLIENTE,PE_FECHA,PE_USUARIO,PE_RUTA,PE_TIPO,PE_PRECIO2 FROM PEDIDO_DOE WHERE PE_CLIENTE IN (Select CUENTA from cuentaa)")
 	Starter.skmt.ExecNonQuery2("UPDATE  PEDIDO SET PE_CEDIS = ?, PE_TIPO = ? WHERE PE_CLIENTE IN (Select CUENTA from cuentaa)", Array As Object("DOE","DOE"))
-	
 	c=Starter.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
 	Starter.skmt.ExecNonQuery("delete from pedido_cliente where PC_CLIENTE In (select cuenta from cuentaa)")
@@ -3857,26 +3950,46 @@ Private Sub BP_DOE_A_Click
 	Starter.skmt.ExecNonQuery2("insert into pedido_cliente(PC_CLIENTE, PC_FECHA, PC_USER, PC_NOART, PC_MONTO,PC_LON, PC_LAT,PC_ALMACEN,PC_RUTA,PC_COSTO_SIN) VALUES (?,?,?,?,?,?,?,?,?,?)", Array As Object(clie_id, sDate & sTime, usuario, c.GetString("CANT_CLIE"),c.GetString("TOTAL_CLIE"), Starter.lon_gps, Starter.lat_gps,Id_Almacen,Starter.rutaV,c.GetString("TOTAL_CLIE_SIN")))
 	Starter.skmt.ExecNonQuery("UPDATE kmt_info set gestion = 2  where CAT_CL_CODIGO In (select cuenta from cuentaa)")
 	c.Close
+	Starter.skmt.ExecNonQuery("delete from PEDIDOS_DOE_ENTREGA where PC_CLIENTE in (Select CUENTA from cuentaa)")
+	Starter.skmt.ExecNonQuery2("insert into PEDIDOS_DOE_ENTREGA (PC_CLIENTE, PC_ENTREGA) VALUES (?,?) ", Array As Object(clie_id,"ENTREGADO"))
 	Starter.skmt.ExecNonQuery("delete from pedido_DOE where pe_cliente in (Select CUENTA from cuentaa)")
-
+	Starter.skmt.TransactionSuccessful
-	p_doe.Visible = False
+	Starter.skmt.EndTransaction
+	P_DOE.Visible = False
 End Sub
 
 Private Sub BP_DOE_R_Click
+	Dim result As Int
+	result = Msgbox2("El cliente perderá el descuento si cancela el pedio, se cancela el pedido ?", "Pedido Cancela", "SI", "", "NO", LoadBitmap(File.DirAssets, "alert2.png"))
+	If result = DialogResponse.Positive Then
 		Panel11.Visible = True
 		BP_DOE_A.Visible = False
 		BP_DOE_R.Visible = False
+	Else
+		P_DOE.Visible = False
+	End If
 End Sub
 
 private Sub pedido_doe_muestra
-	''' ESTO SE AGREGA PARA QUE SE VEA LOS CLIENTES DOE
+	''' ESTO SE AGREGA PARA QUE SE VEAN LOS CLIENTES DOE
+	Dim YA_TIENE_PEDIDO_DOE As String
+	C5=Starter.skmt.ExecQuery2("select COUNT(*) AS CLIENTE_DOE from PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa) AND PE_CEDIS = ? ", Array As String("DOE"))
+	C5.Position = 0
+	If C5.GetString("CLIENTE_DOE") > 0 Then
+		YA_TIENE_PEDIDO_DOE = 1
+	Else
+		YA_TIENE_PEDIDO_DOE = 0
+	End If
+	C5.Close
+	If YA_TIENE_PEDIDO_DOE = 0 Then
 		C5=Starter.skmt.ExecQuery("select COUNT(*) AS CLIENTE_DOE from PEDIDO_DOE WHERE PE_CLIENTE IN (Select CUENTA from cuentaa) ")
 		C5.Position = 0
 		If C5.GetString("CLIENTE_DOE") >0 Then
-		p_doe.VISIBLE = True
+			P_DOE.VISIBLE = True
+			P_DOE.Elevation = 100
+			P_DOE.BringToFront
 			C6=Starter.skmt.ExecQuery("select PE_PROID, PE_PRONOMBRE, PE_CANT, PE_COSTO_TOT from PEDIDO_DOE where  PE_CLIENTE IN (Select CUENTA from cuentaa)")
 			LP_DOE.Clear
-				
 			If C6.RowCount>0 Then
 				For i=0 To C6.RowCount -1
 					C6.Position=i
@@ -3894,20 +4007,31 @@ private Sub pedido_doe_muestra
 			C6.Close
 			C6=Starter.skmt.ExecQuery("select SUM(PE_CANT) AS CANT, SUM(PE_COSTO_TOT) AS TOTAL from PEDIDO_DOE where  PE_CLIENTE IN (Select CUENTA from cuentaa)")
 			C6.Position= 0
-		L_DOE_TOTAL.Text = "TOTAL PEDIDO DOE :"& C6.GetString("TOTAL") & " No. PIEZAS: " & C6.GetString("CANT")
+			L_DOE_TOTAL.Text = "TOTAL PEDIDO DOE :"& C6.GetString("TOTAL") & CRLF & " No. PIEZAS: " & C6.GetString("CANT")
 			C6.Close
 			''' FALTAN LOS BOTONES DE ACEPTAR Y RECHAZAR, INVENTAIRO ABORDO MODIFICAR PARA IMPRIMIR
 		End If
-			
 		C5.Close
+	End If
 End Sub
 
 Private Sub BP_DOE_R1_Click
+	If r_1.Checked Then
+		motivo = "CERRADO"
+	Else If r_2.Checked Then
+		motivo = "NO LO PIDIO"
+	Else If r_3.Checked Then
+		motivo = "FUERA DE TIEMPO"
+	Else if r_4.Checked Then
+		motivo = "NO ESTA EL ENCARGADO"
+	Else if R_5.Checked Then
+		motivo = "FALTA DE DINERO"
+	End If
+	motivo = motivo & " " & e_comm.Text
 	BP_DOE_A.Visible = True
 	BP_DOE_R.Visible = True
-	
 	Panel11.Visible = False
-	p_doe.Visible = False
+	P_DOE.Visible = False
 	c=Starter.skmt.ExecQuery("select PE_PROID,PE_CANT, PE_TIPO FROM PEDIDO_DOE where pe_cliente in (Select CUENTA from cuentaa) ")
 	If c.RowCount>0 Then
 		For i=0 To c.RowCount -1
@@ -3916,8 +4040,10 @@ Private Sub BP_DOE_R1_Click
 		Next
 	End If
 '	Starter.skmt.ExecNonQuery("delete from pedido_cliente where pc_cliente in (Select CUENTA from cuentaa)")
+	Starter.skmt.ExecNonQuery("delete from PEDIDOS_DOE_ENTREGA  where PC_CLIENTE in (Select CUENTA from cuentaa)")
+	Starter.skmt.ExecNonQuery2("insert into PEDIDOS_DOE_ENTREGA (PC_CLIENTE, PC_ENTREGA) VALUES (?,?) ", Array As Object(clie_id,motivo))
 	Starter.skmt.ExecNonQuery("delete from pedido_DOE where pe_cliente in (Select CUENTA from cuentaa)")
-	p_doe.Visible = False
+	P_DOE.Visible = False
 End Sub
 
 Private Sub b_inicioFinVenta_Click
@@ -3933,3 +4059,7 @@ Private Sub b_inicioFinVenta_Click
 	End If
 	b_inicioFinVenta.Visible = False
 End Sub
+
+Private Sub P_DOE_Click
+	
+End Sub

B4A/C_Nota.bas

@@ -7,12 +7,13 @@ Version=11.5
 Sub Class_Globals
 	Private Root As B4XView 'ignore
 	Private xui As XUI 'ignore
+	Dim kh As kms_helperSubs
 	'//Process Globals
 	Dim clie_id As String
 	Dim sDate,sTime As String
 	Dim usuario As String
 	'//Globals
-	Dim c As Cursor
+	Dim c, C_DOE As Cursor
 	Dim C1 As Cursor
 	Dim ruta As String
 	Dim Regresar As Button
@@ -30,14 +31,21 @@ Sub Class_Globals
 	Dim TIPO As String
 	Private CAMBIOS As String
 	Dim logger As Boolean = True
+	Private B_PEDIDO_DOE As Button
 	Dim list_prodsPedido As List
 	Private clv_pedidos As CustomListView
 	Private p_pedido As Panel
 	Private l_pedido As Label
+	Private lv_prodsDOE As ListView
+	Private L_CANT_D As Label
+	Private L_TOTAL_D As Label
+	Private l_tipoPedido As Label
+	Dim pedidoMostrado As String = "NORMAL"
 End Sub
 
 'You can add more parameters here.
 Public Sub Initialize As Object
+	kh.Initialize(Me, "kh", Starter.skmt)
 	Return Me
 End Sub
 
@@ -89,6 +97,52 @@ End Sub
 'You can see the list of page related events in the B4XPagesManager object. The event name is B4XPage.
 
 Sub B4XPage_Appear
+	If kh.clienteConDOE Then l_tipoPedido.Visible = True Else l_tipoPedido.Visible = False
+	pedidoMostrado = "NORMAL"
+	Dim sumatotal As Double = 0
+	c=Starter.skmt.ExecQuery2("select count(*) as CUANTOS FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa) AND PE_CEDIS = ?", Array As String("DOE"))
+	c.Position = 0
+	ListView1.Visible = True
+	L_CANT.Visible = True
+	L_TOTAL.Visible = True
+	lv_prodsDOE.Visible = False
+	L_CANT_D.Visible = False
+	L_TOTAL_D.Visible = False
+	l_tipoPedido.Text = "PEDIDO NORMAL"
+	If c.GetString("CUANTOS") > 0 Then
+		B_PEDIDO_DOE.Text = "IR A PEDIDO DON TOÑO"
+		B_PEDIDO_DOE.VISIBLE = True
+		C_DOE=Starter.skmt.ExecQuery2("select PE_PRONOMBRE,PE_COSTO_TOT, PE_CANT, PE_FOLIO FROM PEDIDO WHERE PE_CEDIS = ? AND PE_CLIENTE IN (Select CUENTA from cuentaa) order by PE_PRONOMBRE asc", Array As String("DOE"))
+		lv_prodsDOE.Clear
+		If C_DOE.RowCount>0 Then
+			For i=0 To C_DOE.RowCount -1
+				C_DOE.Position = i
+				Dim cs As CSBuilder
+				cs.Initialize
+				Private txtPromo As String = ""
+				If C_DOE.GetString("PE_COSTO_TOT") < 0.02 And C_DOE.GetString("PE_COSTO_TOT") >= 0 Then txtPromo = "P - "
+				If C_DOE.GetString("PE_COSTO_TOT") < 0 Then txtPromo = "RMI - "
+				Dim label1 As Label
+				label1 = lv_prodsDOE.TwoLinesLayout.Label
+				label1.TextSize = 15
+				label1.TextColor = Colors.Black
+				Dim label2 As Label
+				label2 = lv_prodsDOE.TwoLinesLayout.SecondLabel
+				label2.TextSize = 12
+				label2.TextColor = Colors.Black
+				lv_prodsDOE.AddTwoLines(cs.Color(Colors.RGB(10,153,10)).append(C_DOE.GetString("PE_PRONOMBRE")).PopAll,txtPromo & "Cantidad #"& C_DOE.GetString("PE_CANT")& " SubTotal $"& C_DOE.GetString("PE_COSTO_TOT")& " Folio "& C_DOE.GetString("PE_FOLIO"))
+				folio = C_DOE.GetString("PE_FOLIO")
+			Next
+		End If
+		C_DOE.Close
+		C_DOE=Starter.skmt.ExecQuery2("select sum(pe_cant) AS CANTIDAD, sum(pe_costo_tot) AS MONTO from  pedido where PE_CEDIS <> PE_PROID and pe_cliente in (Select CUENTA from cuentaa)  AND PE_CEDIS = ?", Array As String("DOE"))
+		C_DOE.Position=0
+		L_CANT_D.Text = C_DOE.GetString("CANTIDAD")
+		L_TOTAL_D.Text = C_DOE.GetString("MONTO")
+		c.Close
+	Else
+		B_PEDIDO_DOE.VISIBLE = False
+	End If
 	c=Starter.skmt.ExecQuery("select count(*) as CUANTOS from kmt_info where (impresion = 1 or cat_cl_codigo in (select ci_cuenta from cliente_impreso)) and CAT_CL_CODIGO in (Select CUENTA from cuentaa)")
 	c.Position = 0
 	If logger Then Log($"Impreso: ${c.GetString("CUANTOS")}"$)
@@ -106,7 +160,7 @@ Sub B4XPage_Appear
 	C.Position = 0
 	Existe = C.GetString("EXISTE")
 	C.Close
-	c=Starter.skmt.ExecQuery("select PE_PRONOMBRE, PE_COSTO_TOT, PE_CANT, PE_FOLIO, PE_CEDIS, PE_PROID FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa) order by PE_PRONOMBRE asc")
+	c=Starter.skmt.ExecQuery("select PE_PRONOMBRE, PE_COSTO_TOT, PE_CANT, PE_FOLIO, PE_CEDIS, PE_PROID FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa) and PE_CEDIS <> 'DOE' order by PE_PRONOMBRE asc")
 	Private cs As CSBuilder
 	ListView1.Clear
 	clv_pedidos.Clear
@@ -142,7 +196,7 @@ Sub B4XPage_Appear
 		c = Starter.skmt.ExecQuery("select sum(pe_cant) AS CANTIDAD, sum(pe_costo_tot) AS MONTO from pedido where PE_CEDIS <> PE_PROID and pe_cliente in (Select CUENTA from cuentaa)")
 		C.Position = 0
 		L_CANT.Text = c.GetString("CANTIDAD")
-		L_TOTAL.Text = c.GetString("MONTO")
+		L_TOTAL.Text = kh.traeTotalCliente
 		c.Close
 		c = Starter.skmt.ExecQuery("select SUM(IFNULL(PE_DESC,0)) AS DESCUENTO FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa)")
 		c.Position = 0
@@ -197,8 +251,13 @@ Private Sub B4XPage_CloseRequest As ResumableSub
 End Sub
 
 Sub borra_Click
+	Log(pedidoMostrado)
+	Log("CON DOE: " & kh.clienteConDOE)
+	Private textoExtra As String = ""
+	If pedidoMostrado = "DOE" Then textoExtra = " DOE"
+	If kh.clienteConDOE And pedidoMostrado = "NORMAL" Then textoExtra = " (Sin DOE)"
 	If folio = "0" Then 'Si el folio es 0 o el cliente actual es "abordo", los deja borrar. - Mod por CHV 220512  'Para que el abordo borre siempre agregar -> " Or Subs.clienteActual = "0""
-		result =  Msgbox2("¿Seguro que desea borrar el pedido?","Cancelar pedido", "Si", "", "No", LoadBitmap(File.DirAssets,"alert2.png")) 'ignore
+		result =  Msgbox2($"¿Seguro que desea borrar el pedido${textoExtra}?"$,"Cancelar pedido", "Si", "", "No", LoadBitmap(File.DirAssets,"alert2.png")) 'ignore
 		If result = DialogResponse.POSITIVE Then
 '			c = Starter.skmt.ExecQuery("select PE_PROID, PE_CANT, PE_TIPO, PE_CEDIS FROM PEDIDO where pe_cliente in (Select CUENTA from cuentaa) ")
 '			If c.RowCount>0 Then
@@ -211,7 +270,7 @@ Sub borra_Click
 '			Starter.skmt.ExecNonQuery("delete from pedido_cliente where pc_cliente in (Select CUENTA from cuentaa)")
 '			Starter.skmt.ExecNonQuery("delete from pedido where pe_cliente in (Select CUENTA from cuentaa)")
 '			Starter.skmt.ExecNonQuery("UPDATE kmt_info set gestion = 0  where CAT_CL_CODIGO In (select cuenta from cuentaa)")
-			Subs.borraPedidoClienteActual
+			If pedidoMostrado = "DOE" Then Subs.borraPedidoDOEClienteActual Else Subs.borraPedidoClienteActual
 '			B4XPages.MainPage.productos.prodsMap.Initialize 'inicializamos mapa de productos para que no aparezcan como vendidos en la lista
 			B4XPages.MainPage.promos.promosMap.Initialize
 '			Log("Llamamos LlenaProdsLL")
@@ -350,6 +409,30 @@ Sub b_desc_Click
 	End If
 End Sub
 
+Private Sub B_PEDIDO_DOE_Click
+	If B_PEDIDO_DOE.Text = "IR A PEDIDO DON TOÑO" Then
+		pedidoMostrado = "DOE"
+		l_tipoPedido.Text = "PEDIDO DON TOÑO"
+		ListView1.Visible = False
+		L_CANT.Visible = False
+		L_TOTAL.Visible = False
+		B_PEDIDO_DOE.Text = "IR A PEDIDO NORMAL"
+		lv_prodsDOE.Visible = True
+		L_CANT_D.Visible = True
+		L_TOTAL_D.Visible = True
+	Else
+		pedidoMostrado = "NORMAL"
+		l_tipoPedido.Text = "PEDIDO NORMAL"
+		ListView1.Visible = True
+		B_PEDIDO_DOE.Text = "IR A PEDIDO DON TOÑO"
+		lv_prodsDOE.Visible = False
+		L_CANT_D.Visible = False
+		L_TOTAL_D.Visible = False
+		L_CANT.Visible = True
+		L_TOTAL.Visible = True
+	End If
+End Sub
+
 Private Sub clv_pedidos_ItemLongClick (position As Int, Value As Object)
 	Private thisLog As Boolean = False
 	c = Starter.skmt.ExecQuery("select count(*) as hayImpresos from CLIENTE_IMPRESO where CI_CUENTA in  (Select CUENTA from cuentaa)")
@@ -425,3 +508,35 @@ Private Sub clv_pedidos_ItemLongClick (position As Int, Value As Object)
 		ToastMessageShow("Esta venta ya esta impresa, no se puede editar ni borrar.", False)
 	End If
 End Sub
+
+Private Sub lv_prodsDOE_ItemLongClick (Position As Int, Value As Object)
+	If kh.revisaImpresa Then
+		ToastMessageShow("Esta venta ya esta impresa, no se puede editar ni borrar.", False)
+	Else
+		If folio = "0" Then 'Si el folio es 0 o el cliente actual es "abordo", los deja borrar. - Mod por CHV 220512 poner esto para borrar abordo "Or Subs.clienteActual = "0""
+			result =  Msgbox2("Seguro que desea borrar el pedido?","Cancelar pedido", "Si", "", "No",LoadBitmap(File.DirAssets,"alert2.png")) 'ignore
+			If result = DialogResponse.POSITIVE Then
+				c=Starter.skmt.ExecQuery2("select PE_PROID,PE_CANT, PE_TIPO FROM PEDIDO where pe_cliente in (Select CUENTA from cuentaa) AND PE_CEDIS = ?", Array As String("DOE"))
+				If c.RowCount > 0 Then
+					For i = 0 To c.RowCount - 1
+						c.Position = i
+						TIPO = c.GetString("PE_TIPO")
+						If c.GetString("PE_TIPO") = "VENTA" or c.GetString("PE_TIPO") = "DOE" Then
+							Log($"update cat_gunaprod2 set cat_gp_almacen = cat_gp_almacen + ${c.GetString("PE_CANT")} where cat_gp_id = 4{c.GetString("PE_PROID")}"$)
+							Starter.skmt.ExecNonQuery2("update cat_gunaprod2 set cat_gp_almacen = cat_gp_almacen + ? where cat_gp_id = ?", Array As Object(c.GetString("PE_CANT"),c.GetString("PE_PROID")))
+						Else
+							Log("rrrr")
+							Starter.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")))
+						End If
+					Next
+				End If
+				Starter.skmt.ExecNonQuery2("delete from pedido where pe_cliente in (Select CUENTA from cuentaa) AND PE_CEDIS = ?", Array As Object("DOE"))
+				Starter.skmt.ExecNonQuery("delete from pedido_cliente where pc_cliente in (Select CUENTA from cuentaa)")
+				Starter.skmt.ExecNonQuery("UPDATE kmt_info set gestion = 0 where CAT_CL_CODIGO In (select cuenta from cuentaa)")
+				B4XPage_Appear
+			End If
+		Else
+			Msgbox("CLIENTE YA SE TRANSMITIO, FAVOR DE LLAMAR A SOPORTE PARA ASISTENCIA","AVISO") 'ignore
+		End If
+	End If
+End Sub

B4A/C_Principal.bas

@@ -25,6 +25,13 @@ Sub Class_Globals
 	Dim b As Cursor
 	Dim e As Cursor
 	Dim f As Cursor
+	Dim C_DOE As Cursor
+	Dim D_DOE As Cursor
+	Dim F_DOE As Cursor
+	Dim TOTAL_DOE_BB As String
+	Dim TOTAL_EFE_DOE As String
+	Dim TOTAL_ENTREGA_DOE As String
+	Private L_DOE As Label
 	Dim DDD As Cursor
 	Dim cargar As Button
 	Dim foto1() As Byte
@@ -189,6 +196,7 @@ Sub Class_Globals
 	Private ion As Object
 	Private p_centrado As Panel
 	Private l_version As Label
+	Private p_botonesResumen As Panel
 End Sub
 
 'You can add more parameters here.
@@ -250,7 +258,11 @@ Private Sub B4XPage_Created (Root1 As B4XView)
 		L_MONTOD.Text = c.GetString("MONTO_DIA")
 		l_cuantosc.Text = c.GetString("CLIENTES_DIA")
 			l_cuantosn.Text = b.GetString("CUANTOS")
+		Try
 			drop = c.GetString("MONTO_DIA") / c.GetString("CLIENTES_DIA")
+		Catch
+			Log(LastException)
+		End Try
 		l_drop.Text = Round2(drop,2)
 		efectiva = c.GetString("CLIENTES_DIA") / e.GetString("POR_VISITAR")
 		l_efectiva.text = Round2(efectiva*100,2)
@@ -259,6 +271,12 @@ Private Sub B4XPage_Created (Root1 As B4XView)
 	End If
 	kh.Initialize(Me, "kh", Starter.skmt)
 	kh.RD_Init
+	kh.centraPanel(Panel2, Root.Width)
+	kh.centraPanel(Panel1, Root.Width)
+	kh.centraPanel(p_botonesResumen, Root.Width)
+'	kh.centraPanel(Panel7, Root.Width)
+'	kh.centraPanel(PNL_ACCESO, Root.Width)
+	
 	P_RESUMEN.Top = 0 : P_RESUMEN.Left = 0 'Panel Resumen
 	Panel5.Top = 0 : Panel5.Left = 0 ' Panel Resumen Acumualado
 	p_downloadPDF.Top = 0 : p_downloadPDF.left = 0
@@ -594,7 +612,6 @@ Sub cargar_Click
 		Starter.skmt.ExecNonQuery("delete from cat_gunaprod2")
 		Starter.skmt.ExecNonQuery("DELETE FROM CAT_GUNAPROD5")
 		Starter.skmt.ExecNonQuery("DELETE FROM HIST_ENCUESTA2")
-	
 		Starter.skmt.ExecNonQuery("delete from CAT_DETALLES_PAQ")
 		Starter.skmt.ExecNonQuery("delete from telefonos")
 		Starter.skmt.ExecNonQuery("delete from HIST_VENTAS")
@@ -1799,8 +1816,7 @@ Sub JobDone(Job As HttpJob)
 			End If
 		End If
 		
-'''		INICIA CARGA PEDIDO DOE
+		''' CARGAS DOE CATALOGO
-		If Job.JobName = "DBRequest" Then
 		Dim RESULT As DBResult = reqManager.HandleJob(Job)
 		If RESULT.Tag = "cat_gunaprod_doe" Then 'query tag
 			If logger Then Log("TIEMPO gunaprod_DOE : " & ((DateTime.Now-inicioContador)/1000))
@@ -1833,15 +1849,11 @@ Sub JobDone(Job As HttpJob)
 			'			skmt.ExecNonQuery2("INSERT INTO COUNT_GUNAPROD(CAT_GP_CLASIF, CUANTOS) VALUES (?,?)", Array As Object (c.GetString("CAT_GP_CLASIF"), c.GetString("CUANTOS")))
 			'			c.Close
 			'Listo2=1
-				
 			' ToastMessageShow("Productos Actualizados." , True)
-				
 		End If
-		End If
-	 
 		''' FIN CARGA CATALOGO DOE
+		
 		''' INICIO CARGA PEDIDO DOE
-		If Job.JobName = "DBRequest" Then
 		Dim RESULT As DBResult = reqManager.HandleJob(Job)
 		If RESULT.Tag = "pedido_doe" Then 'query tag
 			If logger Then Log("TIEMPO PEDIDO_DOE : " & ((DateTime.Now-inicioContador)/1000))
@@ -1865,18 +1877,6 @@ Sub JobDone(Job As HttpJob)
 			Next
 			Starter.skmt.TransactionSuccessful
 			Starter.skmt.EndTransaction
-				
-				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 = 80
-				ELSE IF PB2.Progress = 80 Then
-					PB2.Progress = 100
-					S_CP.Text = "LISTO"
-				End If
 			'			c=skmt.ExecQuery("select CAT_GP_CLASIF, COUNT(*) AS CUANTOS from CAT_GUNAPROD GROUP BY CAT_GP_CLASIF order by CAT_GP_CLASIF asc")
 			'			c.Position=0
 			'			skmt.ExecNonQuery("DELETE FROM COUNT_GUNAPROD")
@@ -1885,8 +1885,8 @@ Sub JobDone(Job As HttpJob)
 			'Listo2=1
 				
 			' ToastMessageShow("Productos Actualizados." , True)
-				
 		End If
+		''' FIN CARGA PEDIDO DOE
 
 		If Job.JobName = "DBRequest" Then
 			Dim RESULT As DBResult = reqManager.HandleJob(Job)
@@ -1902,9 +1902,6 @@ Sub JobDone(Job As HttpJob)
 			End If
 		End If
 	End If
-		''' FIN CARGA PEDIDO DOE
-
-	End If
 	
 	If PB2.Progress = 100 Then S_CP.Text = "LISTO"
 	Job.Release
@@ -2034,7 +2031,7 @@ Sub e_ruta_EnterPressed
 		End If
 		c.Close
 	End If
-	kh.respaldoBatch
+	kh.RD_respaldoBatch
 	If e_ruta.Text = "FIN DIA" And adelanteFinDia Then
 		res =  Msgbox2("Seguro que desea hacer el cierre? ... todos los datos se borraran","Cierre", "Si", "", "No",LoadBitmap(File.DirAssets,"alert2.png")) 'ignore
 		If res = DialogResponse.POSITIVE Then
@@ -2198,6 +2195,19 @@ Sub B_OK_PAS_Click
 		End If
 	End If
 	If CARGA = "CARGAR" And S_CP.Text = "LISTO" And S_CC.Text = "LISTO" And S_CH.Text = "LISTO" Then
+		c=Starter.skmt.ExecQUERY("SELECT COUNT(*) AS CUANTOS FROM PEDIDO_DOE WHERE PE_CLIENTE <> 0")
+		c.Position = 0
+		cuantos_pedidosc = c.GetString("CUANTOS")
+		c.Close
+		If cuantos_pedidosc > 0 Then
+			c=Starter.skmt.ExecQUERY("SELECT PE_PROID, SUM(PE_CANT) AS PE_CANT FROM PEDIDO_DOE WHERE PE_CLIENTE <> 0 GROUP BY PE_PROID")
+			If c.RowCount>0 Then
+				For i=0 To c.RowCount -1
+					c.Position=i
+					Starter.skmt.ExecNonQuery2("update CAT_GUNAPROD2 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
+		End If
 		c=Starter.skmt.ExecQuery("select COUNT(DISTINCT(PE_CLIENTE)) AS CLIENTES from PEDIDO_DOE ")
 		c.Position = 0
 		If c.GetString("CLIENTES") > 0 Then Msgbox("AVISO TIENES "& c.GetString("CLIENTES") & " PEDIDOS DON TOÑO PARA ENTREGAR"," PEDIDOS DON TOÑO")
@@ -2314,6 +2324,23 @@ Sub Resumen_Click
 		l_monto_k.Text = "0"
 		l_monto_ks.Text = "0"
 	Else
+		' aqui poner lo de efectividad de doe y la cantidad de doe para enviar a tiempo real
+		Dim TOTAL_DOE_BB As String
+		Dim TOTAL_EFE_DOE As String
+		Dim TOTAL_ENTREGA_DOE As String
+		C_DOE = Starter.skmt.ExecQuery("SELECT COUNT(*) AS CUANTOS FROM PEDIDO_DOE")
+		C_DOE.Position = 0
+		If C_DOE.GetString("CUANTOS") > 0 Then
+			F_DOE = Starter.skmt.ExecQuery("SELECT SUM(PE_COSTO_TOT) AS TOTAL FROM PEDIDO_DOE")
+			F_DOE.Position = 0
+			TOTAL_DOE_BB = F_DOE.GetString("TOTAL")
+			F_DOE.Close
+			D_DOE=Starter.skmt.ExecQuery2("select  sum(PE_COSTO_TOT) as DOE from pedido where PE_CEDIS  = ? ", Array As String("PROMODOE"))
+			D_DOE.Position = 0
+			TOTAL_ENTREGA_DOE = D_DOE.GetString("DOE")
+			D_DOE.Close
+		End If
+		'' fin de esto modificar lo anterior
 		c=Starter.skmt.ExecQuery2("select sum(pe_cant) as CAMBIOS from pedido where substr(pe_pronombre,1,6) = ?", Array As String("CAMBIO"))
 		c.Position = 0
 		l_cambios.Text = c.GetString("CAMBIOS")
@@ -2796,6 +2823,23 @@ Sub SUBIR_INFO_PEDIDO
 	cuantos_noventa = D.GetString("CUANTOS_NOVENTA")
 	PB2.Progress = 100
 	d.Close
+	
+	' ENTREGA DOE PEDIDOS_DOE_ENTREGA (PC_CLIENTE, PC_ENTREGA)
+	c=Starter.skmt.ExecQuery("SELECT  PC_CLIENTE, PC_ENTREGA FROM PEDIDOS_DOE_ENTREGA")
+	If c.RowCount>0 Then
+		For i=0 To c.RowCount -1
+			c.Position=i
+			Dim cmd As DBCommand
+			cmd.Initialize
+			cmd.Name = "UPDATE_PEDIDOS_DOE_ENTREGA"
+			cmd.Parameters = Array As Object(C.GetString("PC_CLIENTE"),C.GetString("PC_ENTREGA"), ALMACEN, l_ruta.Text)
+			reqManager.ExecuteCommand(cmd , "UPDATE_PEDIDOS_DOE_ENTREGA")
+			PB2.Progress = PB2.Progress + 1
+			contador_env = contador_env + 1
+		Next
+		c.Close
+	End If
+
 	' CHECK LIST VALIDAR
 	'Msgbox("antesde de mandar","") 'ignore
 	c = Starter.skmt.ExecQuery("SELECT " & Chr(34) & "TMP_AUTO_RUTA " & Chr(34) & " as TMP_AUTO_RUTA," & Chr(34) & "TMP_AUTO_PLACA" & Chr(34) & " as TMP_AUTO_PLACA," & Chr(34) & "TMP_AUTO_CEDIS " & Chr(34) & " as TMP_AUTO_CEDIS," & Chr(34) & "TMP_AUTO_IDALMACEN" & Chr(34) & " as TMP_AUTO_IDALMACEN," & Chr(34) & "TMP_AUTO_FECHA " & Chr(34) & " as TMP_AUTO_FECHA," & Chr(34) & "TMP_AUTO_KILOMETRAJE" & Chr(34) & " as TMP_AUTO_KILOMETRAJE," & Chr(34) & "TMP_AUTO_COMBUSTIBLE" & Chr(34) & " as TMP_AUTO_COMBUSTIBLE," & Chr(34) & "TMP_AUTO_TABLERO " & Chr(34) & " as TMP_AUTO_TABLERO," & Chr(34) & "TMP_AUTO_CLAXON " & Chr(34) & " as TMP_AUTO_CLAXON," & Chr(34) & "TMP_AUTO_PARABRISAS " & Chr(34) & " as TMP_AUTO_PARABRISAS," & Chr(34) & "TMP_AUTO_CINTURON " & Chr(34) & " as TMP_AUTO_CINTURON," & Chr(34) & "TMP_AUTO_ESPEJOS " & Chr(34) & " as TMP_AUTO_ESPEJOS," & Chr(34) & "TMP_AUTO_LICENCIA " & Chr(34) & " as TMP_AUTO_LICENCIA," & Chr(34) & "TMP_AUTO_LIB_OBJETOSINE " & Chr(34) & " as TMP_AUTO_LIB_OBJETOSINE," & Chr(34) & "TMP_AUTO_LIB_OBJETOTMPERVI " & Chr(34) & " as TMP_AUTO_LIB_OBJETOTMPERVI," & Chr(34) & "TMP_AUTO_ORDEN_HERRA " & Chr(34) & " as TMP_AUTO_ORDEN_HERRA," & Chr(34) & "TMP_AUTO_UNILIMPIA " & Chr(34) & " as TMP_AUTO_UNILIMPIA," & Chr(34) & "TMP_AUTO_LIMPIO " & Chr(34) & " as TMP_AUTO_LIMPIO," & Chr(34) & "TMP_AUTO_BASURA " & Chr(34) & " as TMP_AUTO_BASURA," & Chr(34) & "TMP_AUTO_RESPONSABILIDAD " & Chr(34) & " as TMP_AUTO_RESPONSABILIDAD," & Chr(34) & "TMP_AUTO_AUDITORIA " & Chr(34) & " as TMP_AUTO_AUDITORIA," & Chr(34) & "TMP_AUTO_HABITUAL " & Chr(34) & " as TMP_AUTO_HABITUAL," & Chr(34) & "TMP_AUTO_HERRAMIENTAS " & Chr(34) & " as TMP_AUTO_HERRAMIENTAS," & Chr(34) & "TMP_AUTO_CONOS " & Chr(34) & " as TMP_AUTO_CONOS," & Chr(34) & "TMP_AUTO_EDO_CARROCERIA " & Chr(34) & " as TMP_AUTO_EDO_CARROCERIA," & Chr(34) & "TMP_AUTO_FUN_LUCES " & Chr(34) & " as TMP_AUTO_FUN_LUCES," & Chr(34) & "TMP_AUTO_PLACAS_CIRCU " & Chr(34) & " as TMP_AUTO_PLACAS_CIRCU," & Chr(34) & "TMP_AUTO_COND_LLANTAS " & Chr(34) & " as TMP_AUTO_COND_LLANTAS," & Chr(34) & "TMP_AUTO_ACEITEMOTOR " & Chr(34) & " as TMP_AUTO_ACEITEMOTOR," & Chr(34) & "TMP_AUTO_ACEITEDIREC " & Chr(34) & " as TMP_AUTO_ACEITEDIREC," & Chr(34) & "TMP_AUTO_NVL_REFRIGERANTE " & Chr(34) & " as TMP_AUTO_NVL_REFRIGERANTE," & Chr(34) & "TMP_AUTO_NVL_LIQUIDBRISAS " & Chr(34) & " as TMP_AUTO_NVL_LIQUIDBRISAS," & Chr(34) & "TMP_AUTO_COND_BANMOTOR " & Chr(34) & " as TMP_AUTO_COND_BANMOTOR," & Chr(34) & "TMP_AUTO_FUGASGRAL " & Chr(34) & " as TMP_AUTO_FUGASGRAL," & Chr(34) & "TMP_AUTO_FRENOS " & Chr(34) & " as TMP_AUTO_FRENOS," & Chr(34) & "TMP_AUTO_COMENTARIOS " & Chr(34) & " as TMP_AUTO_COMENTARIOS FROM TMP_INSPECCION_AUTO_DIARIA")
@@ -3210,3 +3254,15 @@ Sub borraClientesNuevosSinVenta 'ignore
 		Next
 	End If
 End Sub
+
+'Private Sub Panel1_Click
+'	
+'End Sub
+'
+'Private Sub Panel2_Click
+'	
+'End Sub
+
+Private Sub P_RESUMEN_Click
+	
+End Sub

B4A/C_Productos.bas

@@ -8,7 +8,7 @@ Sub Class_Globals
 	Private Root As B4XView 'ignore
 	Private xui As XUI 'ignore
 	Dim ruta As String
-	dim kh as kms_helperSubs
+	Dim kh As kms_helperSubs
 	Dim q_buscar As String
 	Dim forzarBusqueda As Boolean = False
 	Dim skmt As SQL
@@ -599,7 +599,7 @@ Sub b_prodMas_Click
 	Private tmpMap As Map = clv_prods_ll.GetValue(index).As(Map)
 	Private precio As String=clv_prods_ll.GetValue(index).As(Map).Get("precio")
 	Private inv As Int = clv_prods_ll.GetValue(index).As(Map).Get("almacen")
-	Log(tmpMap) 
+'	Log(tmpMap) 
 	If buttonTag = "vendido" Then
 		Log("VENDIDO")
 		Log($"${(laCant.Text + 1 <= inv)} And ${(Subs.totalPedido - precio > 1)}"$)
@@ -612,10 +612,10 @@ Sub b_prodMas_Click
 			Log(clv_prods_ll.GetValue(index).As(Map))
 		End If
 	else If laCant.Text + 1 <= inv And lfila.Text = "PRODUCTOS" Then
-		LogColor(inv, Colors.blue)
+'		LogColor(inv, Colors.blue)
 '		laCant.Text = $"$1.0{laCant.Text + 1}"$
 		laCant.Text = NumberFormat2((laCant.Text + 1), 1, 0, 0, False)
-		Log(Subs.totalPedido)
+'		Log(Subs.totalPedido)
 	else If lfila.Text = "RMI" And laCant.Text + 1 <= inv And (Subs.totalPedido - precio > 1) Then
 		LogColor(inv, Colors.blue)
 '		laCant.Text = $"$1.0{laCant.Text + 1}"$
@@ -732,7 +732,7 @@ End Sub
 
 Sub cuentaProds
 	'LogColor($"Productos de la orden: ${c_prodsX.GetString("cantProds")}, Total: ${c_prodsX.GetString("costoTotal")}"$, Colors.red)
-	Log("===========================")
+'	Log("===========================")
 	Private c As Cursor = Starter.skmt.ExecQuery($"select sum(PE_COSTO_TOT) as total, sum(PE_CANT) as cant from PEDIDO where PE_CLIENTE = '${clienteId}'"$)
 '	LogColor("TIEMPO cuentaProds =" & ((DateTime.Now-inicioContador)/1000), Colors.Red)
 '	LogColor(prodsMap, Colors.Magenta)
@@ -744,8 +744,8 @@ Sub cuentaProds
 	If lfila.Text = "RMI" Then l_mDisponible.Visible = True Else l_mDisponible.Visible = False
 	l_mDisponible.Text = $"Disponible: $${Subs.totalPedido}"$
 	
-	Log($"${kh.traeLimiteAbordoXInventario} - ${kh.traeVenta} - ${kh.traeLimiteAbordoWeb}"$)
+'	Log($"${kh.traeLimiteAbordoXInventario} - ${kh.traeVenta} - ${kh.traeLimiteAbordoWeb}"$)
-	Log($"LIMITE ABORDO DISPONIBLE: ${NumberFormat2((kh.traeLimiteAbordoWeb - (kh.traeLimiteAbordoXInventario - kh.traeVenta) - kh.traeVentaAbordo), 0, 2, 2, False)}"$)
+'	Log($"LIMITE ABORDO DISPONIBLE: ${NumberFormat2((kh.traeLimiteAbordoWeb - (kh.traeLimiteAbordoXInventario - kh.traeVenta) - kh.traeVentaAbordo), 0, 2, 2, False)}"$)
 	dispAbordo = NumberFormat2((kh.traeLimiteAbordoWeb - (kh.traeLimiteAbordoXInventario - kh.traeVenta) - kh.traeVentaAbordo), 0, 2, 2, False)
 	l_limiteAbordoDisp.Text = $"Disp Abordo: $${dispAbordo}"$
 	If dispAbordo < 1 Then
@@ -758,7 +758,7 @@ Sub cuentaProds
 		b_continuar.Visible = True
 		b_terminar1.Visible = True
 	End If
-	Log($"Total Prods: ${c.GetString("cant")}, Total Compra: $$1.2{c.GetString("total")}"$)
+'	Log($"Total Prods: ${c.GetString("cant")}, Total Compra: $$1.2{c.GetString("total")}"$)
 	c.Close
 End Sub
 
@@ -773,7 +773,7 @@ Sub b_terminar1_Click
 	Subs.agrupador
 	lv_prodsPedido.Clear
 	list_prodsPedido.Initialize
-	Private c_prods As Cursor=Starter.skmt.ExecQuery("select PE_PRONOMBRE,PE_COSTO_TOT, PE_COSTOU, PE_CANT, PE_FOLIO, PE_CEDIS, PE_PROID FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa) order by PE_CEDIS, PE_PRONOMBRE")
+	Private c_prods As Cursor=Starter.skmt.ExecQuery("select PE_PRONOMBRE,PE_COSTO_TOT, PE_COSTOU, PE_CANT, PE_FOLIO, PE_CEDIS, PE_PROID FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa) and PE_TIPO <> 'DOE' order by PE_CEDIS, PE_PRONOMBRE")
 '	Log(c_prods.RowCount)
 	If c_prods.RowCount > 0 Then
 		c_prods.Position = 0

B4A/KelloggsV4.b4a

@@ -870,7 +870,7 @@ Version=12.5
 #Region  Project Attributes	
 	#ApplicationLabel: Kelloggs Venta
 	#VersionCode: 3000
-	#VersionName: 3.11.29 PRUEBA V4
+	#VersionName: 3.12.05 PRUEBA V4
 	#SupportedOrientations: portrait
 	#CanInstallToExternalStorage: False
 	#BridgeLogger:true

B4A/KelloggsV4.b4a.meta

@@ -63,10 +63,10 @@ ModuleBreakpoints9=
 ModuleClosedNodes0=
 ModuleClosedNodes1=35
 ModuleClosedNodes10=
-ModuleClosedNodes11=50,51,52
+ModuleClosedNodes11=4,50,51,52
-ModuleClosedNodes12=
+ModuleClosedNodes12=1
 ModuleClosedNodes13=
-ModuleClosedNodes14=39,40,41,42,43,44
+ModuleClosedNodes14=39,40,41,43,44
 ModuleClosedNodes15=
 ModuleClosedNodes16=
 ModuleClosedNodes17=
@@ -83,14 +83,14 @@ ModuleClosedNodes26=2
 ModuleClosedNodes27=
 ModuleClosedNodes28=9,10,11
 ModuleClosedNodes29=
-ModuleClosedNodes3=1
+ModuleClosedNodes3=24,86,100
 ModuleClosedNodes30=
 ModuleClosedNodes4=
 ModuleClosedNodes5=
 ModuleClosedNodes6=
-ModuleClosedNodes7=
+ModuleClosedNodes7=3,11,12,14
 ModuleClosedNodes8=
 ModuleClosedNodes9=
-NavigationStack=C_Productos,LlenaProdsLL,1181,0,Visual Designer,cliente.bal,-100,1,Visual Designer,checklist.bal,-100,1,Visual Designer,checks.bal,-100,2,C_Productos,et_pCant_FocusChanged,720,0,Visual Designer,foto.bal,-100,3,C_Productos,cuentaProds,735,0,C_Productos,b_prodMas_Click,636,4,kms_helperSubs,traeVentaAbordo,711,0,C_Productos,et_pCant_TextChanged,698,6
+NavigationStack=C_Productos,b_prodMas_Click,611,0,C_Productos,cuentaProds,754,0,C_Cliente,B4XPage_Appear,591,0,C_Nota,B4XPage_Created,89,0,C_Nota,B4XPage_Appear,146,0,Subs,borraPedidoClienteActual,1406,6,Visual Designer,cliente.bal,-100,4,C_Cliente,JobDone,3895,0,C_Cliente,b_geopass_Click,3853,2,C_Cliente,b_rechazapromo_Click,3849,0,C_Cliente,b_aceptarrpomo_Click,3842,0
 SelectedBuild=0
-VisibleModules=1,28,11,24,3,29,14,12,9
+VisibleModules=1,28,11,24,3,12,7,29

B4A/Subs.bas

@@ -1405,10 +1405,11 @@ End Sub
 'Borra los registros de la tabla "pedido" y "pedido_cliente"
 'Actualiza las tablas "cat_gunaprod" o "cat_gunaprod2" y "kmt_info".
 Sub borraPedidoClienteActual As String
-	Log($"Boramos pedido de ${traeCliente}"$)
+	Log($"Borramos pedido de ${traeCliente}"$)
 	Private thisC As Cursor
 '	Private tablaProds As String = "cat_gunaprod2"
-	thisC = Starter.skmt.ExecQuery("select PE_PROID, PE_CANT, PE_CEDIS FROM PEDIDO where pe_cliente in (Select CUENTA from cuentaa)")
+	thisC = Starter.skmt.ExecQuery("select PE_PROID, PE_CANT, PE_CEDIS FROM PEDIDO where pe_cliente in (Select CUENTA from cuentaa) and PE_CEDIS <> 'DOE'")
+	Log($"Registros = ${thisC.RowCount}"$)
 	If thisC.RowCount > 0 Then
 		For i = 0 To thisC.RowCount - 1
 			thisC.Position=i
@@ -1418,8 +1419,38 @@ Sub borraPedidoClienteActual As String
 '			Starter.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
-	Starter.skmt.ExecNonQuery("delete from pedido_cliente where pc_cliente in (Select CUENTA from cuentaa)")
+	
-	Starter.skmt.ExecNonQuery("delete from pedido where pe_cliente in (Select CUENTA from cuentaa)")
+	Starter.skmt.ExecNonQuery("delete from pedido where pe_cliente in (Select CUENTA from cuentaa) and PE_CEDIS <> 'DOE'")
+	
+	'la intencion es que al borrar el pedido, y queda doe o normal, no se borre el cliente de pedido_cliente
+	thisC = Starter.skmt.ExecQuery($"select pe_cedis from pedido where pe_cliente in (Select CUENTA from cuentaa)"$)
+	If thisC.RowCount < 1 Then Starter.skmt.ExecNonQuery("delete from pedido_cliente where pc_cliente in (Select CUENTA from cuentaa)")
+	
+	Starter.skmt.ExecNonQuery("UPDATE kmt_info set gestion = 0 where CAT_CL_CODIGO In (select cuenta from cuentaa)")
+	Return 1
+End Sub
+
+'Borra el pedido DOE del cliente actual.
+'Borra los registros de la tabla "pedido" y "pedido_cliente"
+'Actualiza las tablas "cat_gunaprod" o "cat_gunaprod2" y "kmt_info".
+Sub borraPedidoDOEClienteActual As String
+	Log($"Borramos pedido DOE de ${traeCliente}"$)
+	Private thisC As Cursor
+'	Private tablaProds As String = "cat_gunaprod2"
+	thisC = Starter.skmt.ExecQuery("select PE_PROID, PE_CANT, PE_CEDIS FROM PEDIDO where pe_cliente in (Select CUENTA from cuentaa) and PE_CEDIS = 'DOE'")
+	Log($"Registros = ${thisC.RowCount}"$)
+	If thisC.RowCount > 0 Then
+		For i = 0 To thisC.RowCount - 1
+			thisC.Position=i
+			If thisC.GetString("PE_CEDIS") <> "DUR" Then
+				Starter.skmt.ExecNonQuery2($"update ${traeTablaProds(Starter.tipov)} set cat_gp_almacen = cat_gp_almacen + ? where cat_gp_id = ?"$, Array As Object(thisC.GetString("PE_CANT"), thisC.GetString("PE_PROID")))
+			End If
+'			Starter.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
+	thisC = Starter.skmt.ExecQuery($"select pe_cedis from pedido where pe_cliente in (Select CUENTA from cuentaa)"$)
+	If thisC.RowCount < 1 Then Starter.skmt.ExecNonQuery("delete from pedido_cliente where pc_cliente in (Select CUENTA from cuentaa)")
+	Starter.skmt.ExecNonQuery("delete from pedido where pe_cliente in (Select CUENTA from cuentaa) and PE_CEDIS = 'DOE'")
 	Starter.skmt.ExecNonQuery("UPDATE kmt_info set gestion = 0 where CAT_CL_CODIGO In (select cuenta from cuentaa)")
 	Return 1
 End Sub

B4A/kms_helperSubs.bas

@@ -45,7 +45,7 @@ End Sub
 
 'RD - Inicializa Respaldo Diario
 Sub RD_Init
-	Dim Dirp As String = File.DirRootExternal
+	Dim Dirp As String = File.DirInternal
 	Dim Dir As String
 '	Dim Dir2 As String
 '	File.MakeDir(File.DirRootExternal,"/kmts")
@@ -54,15 +54,15 @@ Sub RD_Init
 		File.MakeDir(Dirp,"/kmts")
 		Dir = "/kmts"
 		Log("Creado kmts " & Dirp & Dir)
-		Log(File.IsDirectory(Dirp, Dir))
 	Catch
 		Dir = ""
 		Log("Creado en raiz")
 	End Try
+	Log(File.IsDirectory(Dirp, Dir))
 	safePath = Dirp & Dir
 	'Si no existe el directorio "kmts" en el raiz de la tarjeta de memoria, nos cambiamos al directorio seguro (sdcard/Android/data/kelloggs...)
 	If Not(File.IsDirectory(Dirp, Dir)) Then safePath = rp.GetSafeDirDefaultExternal("kmts")
-	Log($"Hay directirio: ${Dirp} ${Dir}- ${File.IsDirectory(Dirp, Dir)}"$)
+	Log($"Hay directorio: ${Dirp} ${Dir} - ${File.IsDirectory(Dirp, Dir)}"$)
 	If Starter.Logger Then Log($"Safepath:${safePath}"$)
 	Private name() As String = Regex.split(" ", Application.LabelName) 'Obtenemos el nombre de la app para ponerselo a la BD.
 	rkmt.Initialize(safePath, $"${name(0)}.rkmt.km"$, True)
@@ -405,7 +405,8 @@ Sub RD_restaura_cat_rmi
 	Log("R-RMI: " & ((DateTime.Now - inicio)/1000) & " segs")
 End Sub
 
-Sub respaldoBatch 'ignore
+'Los subs del los respaldos diarios independientes en una sola llamada.
+Sub RD_respaldoBatch 'ignore
 	If RD_Init_IsInitialized Then
 		RD_respalda_cat_detalle_paq
 		RD_respalda_cat_gunaprod
@@ -414,11 +415,30 @@ Sub respaldoBatch 'ignore
 		RD_respalda_pedido
 		RD_respalda_promos_comp
 		RD_respalda_cat_rmi
+		RD_copiaRespaldoDiario
 	Else
 		Log("******   RD NO INICIALIZADO   ********")
 	End If
 End Sub
 
+'RD - Copia la base de datos del respaldo diario a la memoria externa.
+Sub RD_copiaRespaldoDiario 'ignore
+	Try
+		File.MakeDir(File.DirRootExternal, "kmts")
+	Catch
+		Log(LastException)
+	End Try
+	Private extDir = ""
+	If File.IsDirectory(File.DirRootExternal, "kmts") Then extDir = "/kmts"
+	Try
+		Private name() As String = Regex.split(" ", Application.LabelName) 'Obtenemos el nombre de la app para ponerselo a la BD.
+		Log($"------  COPIAMOS A SDCARD - ${name(0)}.rkmt.km"$)
+		File.Copy(File.DirInternal&"/kmts", $"${name(0)}.rkmt.km"$, File.DirRootExternal & extDir, $"${name(0)}.rkmt.km"$)
+	Catch
+		Log(LastException)
+	End Try
+End Sub
+
 'RD - Realiza un "vacuum" de la base de datos "rkmt".
 Sub RD_vacuum 'ignore
 	Log("Vacuum")
@@ -822,6 +842,25 @@ Sub traeMaxClientesNuevos As Int 'ignore
 	Return CN
 End Sub
 
+'Regresa verdadero o falso dependiendo si el cliente lleva pedido DOE.
+Sub clienteConDOE As Boolean 'ignore
+	Private c As Cursor = Starter.skmt.ExecQuery2("select count(*) as CUANTOS FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa) AND PE_CEDIS = ?", Array As String("DOE"))
+	Private b As Cursor = Starter.skmt.ExecQuery("select COUNT(*) AS CLIENTE_DOE from PEDIDO_DOE WHERE PE_CLIENTE IN (Select CUENTA from cuentaa) ")
+	c.Position = 0
+	b.Position = 0
+	If c.GetString("CUANTOS") > 0 Or b.GetString("CLIENTE_DOE") > 0 Then Return True Else Return False
+End Sub
+
+'Regresa verdadero si el usuario actual ya imprimio la venta.
+Sub revisaImpresa As Boolean
+	Dim imp As Boolean = False
+'	Dim i As Cursor = Starter.skmt.ExecQuery("select count(*) as CUANTOS from CLIENTE_IMPRESO where CI_CUENTA in (Select CUENTA from cuentaa)")
+	Dim i As Cursor = Starter.skmt.ExecQuery("select count(*) as CUANTOS from kmt_info where (impresion = 1 or cat_cl_codigo in (select ci_cuenta from cliente_impreso)) and CAT_CL_CODIGO in (Select CUENTA from cuentaa)")
+	i.Position = 0
+	If i.GetString("CUANTOS") > 0 Then imp = True Else imp = False
+	Return imp
+End Sub
+
 '################  Manage External Storage (MES)   #########################
 '
 ''Inicializa "Manage External Storage" (MES), que nos da acceso a la tarjeta de memoria en Android 11+