Version: 5.05.22_V2

Me pidieron cambiar la version, aqui ya se esta enviando la version al TMP_DROP

B4A/C_Nota.bas

@@ -104,9 +104,10 @@ Sub B4XPage_Appear
 			label2 = ListView1.TwoLinesLayout.SecondLabel
 			label2.TextSize = 10
 			label2.TextColor = Colors.Blue
-			ListView1.AddTwoLines(cs.Color(textColor).append(c.GetString("PE_PRONOMBRE")).pop,"Cantidad #"& c.GetString("PE_CANT")& " SubTotal $"& c.GetString("PE_COSTO_TOT")& " Folio "& c.GetString("PE_FOLIO"))
-			folio = c.GetString("PE_FOLIO")
-			vamoaver.Add(c.GetString("PE_FOLIO"))
+'			ListView1.AddTwoLines(cs.Color(textColor).append(c.GetString("PE_PRONOMBRE")).pop,"Cantidad #"& c.GetString("PE_CANT")& " SubTotal $"& c.GetString("PE_COSTO_TOT")& " Folio "& c.GetString("PE_FOLIO"))
+			ListView1.AddSingleLine(cs.Color(textColor).Size(12).append(c.GetString("PE_PRONOMBRE") & " ").pop.Append(CRLF).Size(8).Color(Colors.Blue).Append("Cantidad #"& c.GetString("PE_CANT")).Append(" SubTotal $"& c.GetString("PE_COSTO_TOT")).Append(" "  & c.GetString("PE_FOLIO")& " " &c.GetString("PE_CEDIS")).PopAll)
+			
+			vamoaver.Add(folio)
 		Next
 	End If
 	Log($"EXISTE: ${Existe}"$)
@@ -152,81 +153,107 @@ Private Sub B4XPage_CloseRequest As ResumableSub
 End Sub
 
 Sub borra_Click
-'	If folio <> "" Then
-	result =  Msgbox2("Seguro que desea borrar el pedido?","Cancelar pedido", "Si", "", "No",LoadBitmap(File.DirAssets,"alert2.png")) 'ignore
+	Log("Entre al btn borrar")
+	result =  Msgbox2("Seguro que desa borrar el pedido?","Cancelar pedido", "Si", "", "No",LoadBitmap(File.DirAssets,"alert2.png")) 'ignore
 	If result = DialogResponse.POSITIVE Then
-'			c=B4XPages.MainPage.skmt.ExecQuery("select PE_PROID,PE_CANT FROM PEDIDO where pe_cliente in (Select CUENTA from cuentaa) ")
-'			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("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
-'			B4XPages.MainPage.skmt.ExecNonQuery("delete from pedido_cliente where pc_cliente in (Select CUENTA from cuentaa)")
-'			B4XPages.MainPage.skmt.ExecNonQuery("delete from pedido where pe_cliente in (Select CUENTA from cuentaa)")
-'			B4XPages.MainPage.skmt.ExecNonQuery("UPDATE kmt_info set gestion = 0  where CAT_CL_CODIGO In (select cuenta from cuentaa)")
-		Subs.borraPedidoClienteActual
-		If B4XPages.MainPage.productos.clv_prods_ll.IsInitialized Then
-			B4XPages.MainPage.productos.clv_prods_ll.Clear
+		c=B4XPages.MainPage.skmt.ExecQuery("select PE_PROID,PE_CANT FROM PEDIDO where pe_cliente in (Select CUENTA from cuentaa) ")
+		Log($"select PE_PROID,PE_CANT FROM PEDIDO where pe_cliente in (Select CUENTA from cuentaa)"$)
+		If c.RowCount>0 Then
+			For i=0 To c.RowCount -1
+				c.Position=i
+				B4XPages.MainPage.skmt.ExecNonQuery2($"update ${Starter.tabla} set cat_gp_almacen = cat_gp_almacen + ? where cat_gp_id = ?"$, Array As Object(c.GetString("PE_CANT"),c.GetString("PE_PROID")))
+				B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO  INVENT_X_ENVIAR (ALMACEN , PROID , CANTIDAD ) VALUES(?,?,?) ", Array As Object (almacen,c.GetString("PE_PROID"),c.GetString("PE_CANT")* -1))
+			Next
 		End If
+		B4XPages.MainPage.skmt.ExecNonQuery("delete from pedido_cliente where pc_cliente in (Select CUENTA from cuentaa)")
+		B4XPages.MainPage.skmt.ExecNonQuery("delete from pedido where pe_cliente in (Select CUENTA from cuentaa)")
+		B4XPages.MainPage.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 Sub
 
 Sub ListView1_ItemLongClick (Position As Int, Value As Object)
 	Log(Value)
-	If Not(Subs.pedidoGuardado) Then
+	Private X() As String = Regex.Split(" ", Value)
+	Private nom As String = ""
+	For i = 0 To X.Length -1
+		If X(i).Contains(CRLF) Then
+		End If
+		If Not(X(i).Contains(CRLF)) Then
+			nom = nom & " " & X(i)
+		Else
+			Exit
+		End If
+	Next
+	nom = nom.Trim
+	Log(nom)
+	Private cedis As String = X(X.Length-1)
+	Log(cedis)
 	result =  Msgbox2("Seguro que desea borrar este articulo?","Borrar Articulo", "Si", "", "No",LoadBitmap(File.DirAssets,"alert2.png")) 'ignore
 	If result = DialogResponse.POSITIVE Then
-		c=B4XPages.MainPage.skmt.ExecQuery2("select PE_PROID,PE_CANT, PE_FOLIO, PE_PRONOMBRE FROM PEDIDO where pe_pronombre = ? and pe_cliente in (Select CUENTA from cuentaa) ", Array As String(Value))
-		c.Position=0
-		Log(vamoaver.Get(Position))
-		If vamoaver.Get(Position) = "PREVENTA_48" Then
+		Log("|" &nom & "|")
+		Log("|" & cedis & "|")
+		Log("|" & Subs.traeCliente & "|")
+		Private y As Cursor =B4XPages.MainPage.skmt.ExecQuery($"select PE_PROID,PE_CANT, PE_FOLIO FROM PEDIDO where pe_pronombre = '${nom.TRIM}' and pe_cliente in (Select CUENTA from cuentaa) AND PE_CEDIS = '${cedis}' "$)
+		Log($"select PE_PROID,PE_CANT, PE_FOLIO FROM PEDIDO where pe_pronombre = '${nom}' and pe_cliente in (Select CUENTA from cuentaa) AND PE_CEDIS = '${cedis}' "$)
+		Log(y.RowCount)
+		y.Position=0
+		Log("Esto es Folio: " & y.GetString("PE_FOLIO"))
+		If y.GetString("PE_FOLIO") = "PREVENTA" Then
 			Log("CAT_GUNAPROD2")
-			Log(Position&",1")
-			Log(Value&",1")
+			Log(Position)
+			Log(Value)
 			Starter.tabla = "CAT_GUNAPROD2"
 		Else
 			Log("CAT_GUNAPROD")
-			Log(Position&",2")
-			Log(Value&",2")
+			Log(Position)
+			Log(Value)
 			Starter.tabla = "CAT_GUNAPROD"
 		End If
-'			B4XPages.MainPage.skmt.ExecNonQuery2($"update ${Starter.tabla} set cat_gp_almacen = cat_gp_almacen + ? where cat_gp_id = ?"$, Array As Object(c.GetString("PE_CANT"),c.GetString("PE_PROID")))
-'			Log(c.GetString("PE_CANT"))
-		B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO  INVENT_X_ENVIAR (ALMACEN , PROID , CANTIDAD ) VALUES(?,?,?) ", Array As Object (Subs.traeAlmacen,c.GetString("PE_PROID"),c.GetString("PE_CANT")* -1))
-		c2=B4XPages.MainPage.skmt.ExecQuery2($"select count(*) AS CUANTOS from ${Starter.tabla} where  CAT_GP_ID in (select pe_cedis from pedido where pe_pronombre = ? and pe_cliente in (Select CUENTA from cuentaa)) and CAT_GP_CLASIF = 'PROMOS' AND CAT_GP_TIPO = 'PROMOS' AND CAT_GP_SUBTIPO = 'PROMOS'"$, Array As String(Value))
-		c2.Position=0
-		Log("aqui entre1")
-		If c2.GetString("CUANTOS") > 0 Then
-			Log("aqui entre")
-			j3 = B4XPages.MainPage.skmt.ExecQuery2("SELECT PE_CEDIS, PE_CANT,PE_PROID, PE_PRONOMBRE FROM PEDIDO WHERE PE_CEDIS IN (SELECT PE_CEDIS FROM PEDIDO WHERE PE_PRONOMBRE = ? and PE_FOLIO = ?)",Array As String(Value,vamoaver.Get(Position)))
+
+		B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO  INVENT_X_ENVIAR (ALMACEN , PROID , CANTIDAD ) VALUES(?,?,?) ", Array As Object (Subs.traeAlmacen,y.GetString("PE_PROID"),y.GetString("PE_CANT")* -1))
+		Log(cedis)
+		Log(Subs.traeAlmacen)
+		If cedis <> Subs.traeAlmacen Then
+			j3 = B4XPages.MainPage.skmt.ExecQuery2("SELECT PE_CEDIS, PE_CANT,PE_PROID, PE_PRONOMBRE, PE_FOLIO FROM PEDIDO WHERE PE_CEDIS IN (SELECT PE_CEDIS FROM PEDIDO WHERE PE_PRONOMBRE = ? and PE_CEDIS = ?)",Array As String(nom,cedis))
 			Log(j3.RowCount)
-			
 			If j3.RowCount > 0 Then
-				Log("estoy aqui")
-				For i = 0 To j3.RowCount -1
+				Log("Soy promo")
+				For j = 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.ExecNonQuery($"update CAT_GUNAPROD2 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(Value, vamoaver.Get(Position)))
+				
+					j3.Position = j
+					Log(j3.GetString("PE_CANT"))
+					Log($"update ${Starter.tabla} set CAT_GP_ALMACEN = CAT_GP_ALMACEN + '${j3.GetString("PE_CANT")}' where CAT_GP_ID = '${j3.GetString("PE_PROID")}'"$)
+					If y.GetString("PE_FOLIO") = "PREVENTA" Then
+						Log("Esto es Folio: " & y.GetString("PE_FOLIO") & " <<<<<<<<<<<<<<<<<<<<<<<<")
+						Starter.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.ExecNonQuery($"delete from pedido where pe_cedis= '${cedis}' and pe_cliente in (Select CUENTA from cuentaa) AND PE_FOLIO = '${j3.GetString("PE_FOLIO")}' AND PE_PROID = '${j3.GetString("PE_PROID")}'"$)', Array As Object(cedis, c.GetString("PE_FOLIO")))
+					Else
+						Starter.skmt.ExecNonQuery($"update ${Starter.tabla} set CAT_GP_ALMACEN = CAT_GP_ALMACEN + ${j3.GetString("PE_CANT")} where CAT_GP_ID = '${j3.GetString("PE_PROID")}'"$)
+						B4XPages.MainPage.skmt.ExecNonQuery($"delete from pedido where pe_cedis= '${cedis}' and pe_cliente in (Select CUENTA from cuentaa) AND PE_FOLIO = '${j3.GetString("PE_FOLIO")}' AND PE_PROID = '${j3.GetString("PE_PROID")}'"$)', Array As Object(cedis, c.GetString("PE_FOLIO")))
+								
+					End If
 				Next
 			End If
 			j3.Close
 		Else
-			Log("aqui entre2")
-			
-			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 CAT_GUNAPROD2 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_cliente in (Select CUENTA from cuentaa) AND PE_FOLIO = ?", Array As Object(Value, vamoaver.Get(Position)))
+			Log(y.GetString("PE_CANT"))
+			Log(y.Getstring("PE_PROID"))
+			Log("Esto no es promo")
+			Log("Nombre: " & nom & "Cedis: " & cedis & "Folio: " & y.GetString("PE_FOLIO"))
+			Log("Esto es Folio: " & y.GetString("PE_FOLIO") & " <<<<<<<<<<<<<<<<<<<<<<<<")
+			If y.GetString("PE_FOLIO") = "PREVENTA" Then
+				Log("Esto es Folio: " & y.GetString("PE_FOLIO") & " <<<<<<<<<<<<<<<<<<<<<<<<")
+				Log("Entre? <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<")
+				B4XPages.MainPage.skmt.ExecNonQuery($"update CAT_GUNAPROD set cat_gp_almacen = cat_gp_almacen + ${y.GetString("PE_CANT")} where cat_gp_id = '${y.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, y.GetString("PE_FOLIO")))
+			Else
+				B4XPages.MainPage.skmt.ExecNonQuery($"update ${Starter.tabla} set cat_gp_almacen = cat_gp_almacen + ${y.GetString("PE_CANT")} where cat_gp_id = '${y.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, y.GetString("PE_FOLIO")))
+			End If
 		End If
-		c.Close
-		c2.Close
+		y.Close
 		DateTime.DateFormat = "MM/dd/yyyy"
 		sDate=DateTime.Date(DateTime.Now)
 		sTime=DateTime.Time(DateTime.Now)
@@ -248,9 +275,6 @@ Sub ListView1_ItemLongClick (Position As Int, Value As Object)
 		End If
 		B4XPage_Appear
 	End If
-	Else
-		ToastMessageShow("Pedido guardado, NO se puede editar.",False)
-	End If
 End Sub
 
 Sub b_desc_Click

B4A/C_Productos.bas

@@ -874,7 +874,8 @@ Sub b_terminar1_Click
 			label2.TextSize = 10
 			label2.TextColor = Colors.Blue
 			
-			lv_prodsPedido.AddTwoLines(cs.Color(textColor).append(c_prods.GetString("PE_PRONOMBRE")).pop,"Cantidad #"& c_prods.GetString("PE_CANT")& " SubTotal $"& c_prods.GetString("PE_COSTO_TOT")& " Folio "& c_prods.GetString("PE_FOLIO"))
+'			lv_prodsPedido.AddTwoLines(cs.Color(textColor).append(c_prods.GetString("PE_PRONOMBRE")).pop,"Cantidad #"& c_prods.GetString("PE_CANT")& " SubTotal $"& c_prods.GetString("PE_COSTO_TOT")& " Folio "& c_prods.GetString("PE_FOLIO"))
+			lv_prodsPedido.AddSingleLine(cs.Color(textColor).Size(12).append(c_prods.GetString("PE_PRONOMBRE") & " ").pop.Append(CRLF).Size(8).Color(Colors.Blue).Append("Cantidad #"& c_prods.GetString("PE_CANT")).Append(" SubTotal $"& c_prods.GetString("PE_COSTO_TOT")).Append(" "  & c_prods.GetString("PE_FOLIO")& " " &c_prods.GetString("PE_CEDIS")).PopAll)
 			vamoaver.Add(c_prods.GetString("PE_FOLIO"))
 			folio = c_prods.GetString("PE_FOLIO")
 		Next
@@ -1018,53 +1019,80 @@ End Sub
 
 Private Sub lv_prodsPedido_ItemLongClick (Position As Int, Value As Object)
 	Private sDate,sTime, clie_id, usuario As String
-	If Not(Subs.pedidoGuardado) Then
+	Log(Value)
+	Private X() As String = Regex.Split(" ", Value)
+'	Log(X.Length)
+	Private nom As String = ""
+	For i = 0 To X.Length -1
+		If X(i).Contains(CRLF) Then
+		End If
+		If Not(X(i).Contains(CRLF)) Then
+			nom = nom & " " & X(i)
+		Else
+			Exit
+		End If
+	Next
+	nom = nom.Trim
+	Log(nom)
+	Private cedis As String = X(X.Length-1)
+	Log(cedis)
+'	If Not(Subs.pedidoGuardado) Then
 	result =  Msgbox2("Seguro que desea borrar este articulo?","Borrar Articulo", "Si", "", "No",LoadBitmap(File.DirAssets,"alert2.png")) 'ignore
 	If result = DialogResponse.POSITIVE Then
-		c=B4XPages.MainPage.skmt.ExecQuery2("select PE_PROID,PE_CANT, PE_FOLIO, PE_PRONOMBRE FROM PEDIDO where pe_pronombre = ? and pe_cliente in (Select CUENTA from cuentaa) ", Array As String(Value))
-		c.Position=0
+		c =B4XPages.MainPage.skmt.ExecQuery2("select PE_PROID,PE_CANT, PE_FOLIO FROM PEDIDO where pe_pronombre = ? and pe_cliente in (Select CUENTA from cuentaa) AND PE_CEDIS = ? ", Array As String(nom, cedis))
+		c.Position = 0
 		Log(vamoaver.Get(Position))
-		If vamoaver.Get(Position) = "PREVENTA_48" Then
+		If vamoaver.Get(Position) = "VENTA" Then
 			Log("CAT_GUNAPROD2")
-			Log(Position&",1")
-			Log(Value&",1")
+			Log(Position)
+			Log(Value)
 			Starter.tabla = "CAT_GUNAPROD2"
 		Else
 			Log("CAT_GUNAPROD")
-			Log(Position&",2")
-			Log(Value&",2")
+			Log(Position)
+			Log(Value)
 			Starter.tabla = "CAT_GUNAPROD"
 		End If
+		Log(Subs.traeAlmacen)
 '			B4XPages.MainPage.skmt.ExecNonQuery2($"update ${Starter.tabla} set cat_gp_almacen = cat_gp_almacen + ? where cat_gp_id = ?"$, Array As Object(c.GetString("PE_CANT"),c.GetString("PE_PROID")))
 '			Log(c.GetString("PE_CANT"))
 		B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO  INVENT_X_ENVIAR (ALMACEN , PROID , CANTIDAD ) VALUES(?,?,?) ", Array As Object (Subs.traeAlmacen,c.GetString("PE_PROID"),c.GetString("PE_CANT")* -1))
-		c2=B4XPages.MainPage.skmt.ExecQuery2($"select count(*) AS CUANTOS from ${Starter.tabla} where CAT_GP_ID in (select pe_cedis from pedido where pe_pronombre = ? and pe_cliente in (Select CUENTA from cuentaa)) and CAT_GP_CLASIF = 'PROMOS' AND CAT_GP_TIPO = 'PROMOS' AND CAT_GP_SUBTIPO = 'PROMOS'"$, Array As String(Value))
-		c2.Position=0
-		Log("aqui entre1")
-		If c2.GetString("CUANTOS") > 0 Then
-			Log("aqui entre")
-			j3 = B4XPages.MainPage.skmt.ExecQuery2("SELECT PE_CEDIS, PE_CANT,PE_PROID, PE_PRONOMBRE FROM PEDIDO WHERE PE_CEDIS IN (SELECT PE_CEDIS FROM PEDIDO WHERE PE_PRONOMBRE = ? and PE_FOLIO = ?)",Array As String(Value,vamoaver.Get(Position)))
+'			c2=B4XPages.MainPage.skmt.ExecQuery2($"select count(*) AS CUANTOS from ${Starter.tabla} where  CAT_GP_ID in (select pe_cedis from pedido where pe_pronombre = ? and pe_cliente in (Select CUENTA from cuentaa)) and CAT_GP_CLASIF = 'PROMOS' AND CAT_GP_TIPO = 'PROMOS' AND CAT_GP_SUBTIPO = 'PROMOS'"$, Array As String(Value))
+'			c2.Position=0
+		If cedis <> Subs.traeAlmacen Then
+			j3 = B4XPages.MainPage.skmt.ExecQuery2("SELECT PE_CEDIS, PE_CANT,PE_PROID, PE_PRONOMBRE, PE_FOLIO FROM PEDIDO WHERE PE_CEDIS IN (SELECT PE_CEDIS FROM PEDIDO WHERE PE_PRONOMBRE = ? and PE_CEDIS = ?)",Array As String(nom,cedis))
 			Log(j3.RowCount)
-			
 			If j3.RowCount > 0 Then
-				Log("estoy aqui")
-				For i = 0 To j3.RowCount -1
+				Log("Soy promo")
+				For j = 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.ExecNonQuery($"update CAT_GUNAPROD2 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(Value, vamoaver.Get(Position)))
+				
+					j3.Position = j
+					Log(j3.GetString("PE_CANT"))
+					Log($"update ${Starter.tabla} set CAT_GP_ALMACEN = CAT_GP_ALMACEN + '${j3.GetString("PE_CANT")}' where CAT_GP_ID = '${j3.GetString("PE_PROID")}'"$)
+					If vamoaver.Get(Position) = "PREVENTA_CREDITO" Then
+						Starter.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.ExecNonQuery($"delete from pedido where pe_cedis= '${cedis}' and pe_cliente in (Select CUENTA from cuentaa) AND PE_FOLIO = '${j3.GetString("PE_FOLIO")}' AND PE_PROID = '${j3.GetString("PE_PROID")}'"$)', Array As Object(cedis, c.GetString("PE_FOLIO")))
+					Else
+						Starter.skmt.ExecNonQuery($"update ${Starter.tabla} set CAT_GP_ALMACEN = CAT_GP_ALMACEN + ${j3.GetString("PE_CANT")} where CAT_GP_ID = '${j3.GetString("PE_PROID")}'"$)
+						B4XPages.MainPage.skmt.ExecNonQuery($"delete from pedido where pe_cedis= '${cedis}' and pe_cliente in (Select CUENTA from cuentaa) AND PE_FOLIO = '${j3.GetString("PE_FOLIO")}' AND PE_PROID = '${j3.GetString("PE_PROID")}'"$)', Array As Object(cedis, c.GetString("PE_FOLIO")))
+					End If
 				Next
 			End If
 			j3.Close
 		Else
-			Log("aqui entre2")
-			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 CAT_GUNAPROD2 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_cliente in (Select CUENTA from cuentaa) AND PE_FOLIO = ?", Array As Object(Value, vamoaver.Get(Position)))
+			Log(c.GetString("PE_CANT"))
+			Log(c.Getstring("PE_PROID"))
+			If vamoaver.Get(Position) = "PREVENTA_CREDITO" Then
+				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.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, vamoaver.Get(Position)))
+			Else
+				B4XPages.MainPage.skmt.ExecNonQuery($"update ${Starter.tabla} 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, vamoaver.Get(Position)))
+			End If
 		End If
 		c.Close
-		c2.Close
+'			c2.Close
 		DateTime.DateFormat = "MM/dd/yyyy"
 		sDate=DateTime.Date(DateTime.Now)
 		sTime=DateTime.Time(DateTime.Now)
@@ -1083,6 +1111,7 @@ Private Sub lv_prodsPedido_ItemLongClick (Position As Int, Value As Object)
 			B4XPages.MainPage.skmt.ExecNonQuery("delete from pedido_cliente where PC_CLIENTE In (select cuenta from cuentaa)")
 			B4XPages.MainPage.skmt.ExecNonQuery("UPDATE kmt_info set gestion = 0  where CAT_CL_CODIGO In (select cuenta from cuentaa)")
 			Private h As Cursor = B4XPages.MainPage.skmt.ExecQuery("select sum(PE_CANT) as PC_NOART, sum (PE_COSTO_TOT) as PC_MONTO from PEDIDO where PE_CLIENTE in (Select CUENTA from cuentaa) AND PE_PROID NOT IN (SELECT CAT_PA_ID FROM PROMOS_COMP )")
+			Log($"select sum(PE_CANT) as PC_NOART, sum (PE_COSTO_TOT) as PC_MONTO from PEDIDO where PE_CLIENTE in (Select CUENTA from cuentaa) AND PE_PROID NOT IN (SELECT CAT_PA_ID FROM PROMOS_COMP )"$)
 			h.Position=0
 			l_cant.Text = h.GetString("PC_NOART")
 			l_total2.Text = h.GetString("PC_MONTO")
@@ -1099,9 +1128,9 @@ Private Sub lv_prodsPedido_ItemLongClick (Position As Int, Value As Object)
 		End If
 		b_terminar1_Click
 	End If
-	Else
-		ToastMessageShow("Esta venta ya esta guardada, no se puede editar ni borrar.", False)
-	End If
+'	Else
+'		ToastMessageShow("Esta venta ya esta guardada, no se puede editar ni borrar.", False)
+'	End If
 End Sub
 
 Private Sub clv_prods_ll_ItemClick (Index As Int, Value As Object)

B4A/MEDICOMED.b4a

@@ -189,7 +189,7 @@ Version=13.1
 #Region  Project Attributes 
 	#ApplicationLabel: Medicomed
 	#VersionCode: 1
-	#VersionName: 5.04.18_V2
+	#VersionName: 5.05.22_V2
 	'SupportedOrientations possible values: unspecified, landscape or portrait.
 	#SupportedOrientations: portrait
 	#CanInstallToExternalStorage: False

B4A/MEDICOMED.b4a.meta

@@ -94,6 +94,6 @@ ModuleClosedNodes6=
 ModuleClosedNodes7=
 ModuleClosedNodes8=
 ModuleClosedNodes9=
-NavigationStack=Diseñador Visual,inicioFinVenta.bal,-100,6,Diseñador Visual,cliente.bal,-100,5,C_NuevoCliente,B4XPage_Created,69,0,B4XMainPage,B_Aceptar_Monto_Click,1173,0,Diseñador Visual,MainPage.bal,-100,1,Diseñador Visual,login.bal,-100,2,B4XMainPage,b_aceptar_Click,1156,0,C_Principal,JobDone,1583,0,C_Principal,cargar_Click,1124,1,B4XMainPage,Entrar_Click,449,0
+NavigationStack=C_Cliente,MODS,0,0,C_Productos,LlenaProdsLL,1283,0,C_Nota,ListView1_ItemLongClick,270,6,C_Productos,lv_prodsPedido_ItemLongClick,1036,0,C_Productos,B4XPage_Created,120,0,C_Productos,B4XPage_Appear,203,0,C_Productos,PCLV_AddProds,271,0,C_Productos,lv_catalogos2_ItemClick,390,0,C_Productos,lv_catalogos_ItemClick,318,0,C_Productos,b_terminar1_Click,858,0,C_Principal,Subir_Click,816,0
 SelectedBuild=0
-VisibleModules=29,1,14,2,12,3,6,7,8,26
+VisibleModules=29,1,14,2,12,3,6,7,8,26,15

B4A/Objects/AndroidManifest.xml

@@ -3,7 +3,7 @@
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	package="medicomed.keymon.com.mx"
 	android:versionCode="1"
-	android:versionName="5.04.05_V2"
+	android:versionName="5.05.22_V2"
 	android:installLocation="internalOnly">
 	
 	<uses-sdk android:minSdkVersion="5" android:targetSdkVersion="33"/>