diff --git a/B4A/C_Productos.bas b/B4A/C_Productos.bas index ff32950..1b5d17b 100644 --- a/B4A/C_Productos.bas +++ b/B4A/C_Productos.bas @@ -646,19 +646,22 @@ Sub b_prodMas_Click Log($"Existencias: ${inv}, inv: ${Subs.traeinventario(pnl.GetView(1).Tag)}"$) inv = Subs.traeinventario(pnl.GetView(1).Tag) + Log($"Existencias: ${inv}, inv: ${Subs.traeinventario(pnl.GetView(1).Tag)}"$) - Private iq As Cursor = Starter.skmt.ExecQuery($"select cat_gp_almacen from ${Subs.traeTablaProds(Starter.tipov)} where cat_gp_id = '${clv_prods_ll.GetValue(index).As(Map).Get("id")}'"$) - If iq.RowCount > 0 Then - iq.Position = 0 +' Private iq As Cursor = Starter.skmt.ExecQuery($"select cat_gp_almacen from ${Subs.traeTablaProds(Starter.tipov)} where cat_gp_id = '${clv_prods_ll.GetValue(index).As(Map).Get("id")}'"$) +' If iq.RowCount > 0 Then +' iq.Position = 0 ' Log($"INV ${clv_prods_ll.GetValue(index).As(Map).Get("id")} = ${iq.GetString("CAT_GP_ALMACEN")}"$) - End If +' End If ' Log(tmpMap) ' Log($"${kh.traeLimiteCredito(Subs.traeCliente)} < ${kh.totalPedido + precio}"$) ' Log(kh.traeLimiteCredito(Subs.traeCliente) < (kh.totalPedido + precio)) - If buttonTag = "vendido" Then + If buttonTag = "vendido" And lfila.Text = "PRODUCTOS" Then + Log(1) ' Log("VENDIDO") ' Log($"${(laCant.Text + 1 <= inv)} And ${(kh.totalPedido - precio > 1)}"$) If inv > 0 And (laCant.Text + 1 <= (laCant.Text + existencias)) And (kh.totalPedido - precio > 1) Then + Log(2) ' Log(clv_prods_ll.GetValue(index).As(Map)) clv_prods_ll.GetValue(index).As(Map).Put("almacen", (inv - 1)) inv = inv - 1 @@ -666,20 +669,26 @@ Sub b_prodMas_Click laCant.Text = NumberFormat2((laCant.Text + 1), 1, 0, 0, False) ' Log(clv_prods_ll.GetValue(index).As(Map)) End If - else if kh.traeLimiteCredito(Subs.traeCliente) < (kh.totalPedido + precio) Then + else if kh.traeLimiteCredito(Subs.traeCliente) < (kh.totalPedido + precio) And lfila.Text = "PRODUCTOS" Then + Log(3) Log($"#######################${CRLF}#### LIMITE CREDITO SUPERADO${CRLF}#######################"$) ToastMessageShow("LIMITE DE CREDITO SUPERADO", False) - else If laCant.Text + 1 <= inv And lfila.Text = "PRODUCTOS" Then -' LogColor(inv, Colors.blue) +' else If laCant.Text + 1 <= inv And lfila.Text = "PRODUCTOS" Then + else If inv > 0 And lfila.Text = "PRODUCTOS" Then + Log(4) + LogColor(inv, Colors.blue) ' laCant.Text = $"$1.0{laCant.Text + 1}"$ laCant.Text = NumberFormat2((laCant.Text + 1), 1, 0, 0, False) ' Log(kh.totalPedido) - else If lfila.Text = "RMI" And laCant.Text + 1 <= inv And (kh.totalPedido - precio > 1) Then +' else If lfila.Text = "RMI" And laCant.Text + 1 <= inv And (kh.totalPedido - precio > 1) Then + else If lfila.Text = "RMI" And (kh.totalPedido - precio > 1) Then + Log(5) LogColor(inv, Colors.blue) ' laCant.Text = $"$1.0{laCant.Text + 1}"$ laCant.Text = NumberFormat2((laCant.Text + 1), 1, 0, 0, False) Log(kh.totalPedido) else if kh.totalPedido < 1 Then + Log(6) laCant.Text = "0" End If Private id As String=clv_prods_ll.GetValue(index).As(Map).Get("id") diff --git a/B4A/KelloggsV4.b4a.meta b/B4A/KelloggsV4.b4a.meta index 3a8c388..c7cbf25 100644 --- a/B4A/KelloggsV4.b4a.meta +++ b/B4A/KelloggsV4.b4a.meta @@ -91,6 +91,6 @@ ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=Subs,revisaBD,189,0,Subs,CreateBitmapWithNumber,1983,0,Subs,comparaVersionesOriginal,1988,0,B4XMainPage,B4XPage_Appear,437,0,B4XMainPage,JobDone,509,0,C_Principal,JobDone,1731,6,Subs,comparaVersiones,2030,6,Main,Process_Globals,24,0,kms_helperSubs,RD_respalda_cat_gunaprod,180,0,kms_helperSubs,RD_Init,73,0,C_Principal,B4XPage_Created,244,0 +NavigationStack=Main,Process_Globals,28,0,B4XMainPage,JobDone,509,0,Subs,comparaVersiones,2021,6,Subs,comparaVersionesOriginal,2011,0,Subs,borraLogDB,321,0,Subs,revisaPushService,431,0,Subs,borraArribaDe100Errores,439,0,B4XMainPage,B4XPage_Created,130,0,B4XMainPage,CreateRequest,938,0,B4XMainPage,B_MACIMP_Click,709,0,C_Productos,b_prodMas_Click,677,1 SelectedBuild=0 VisibleModules=1,28,11,3,29,12,7,9 diff --git a/B4A/Subs.bas b/B4A/Subs.bas index 51ef606..daa4bfa 100644 --- a/B4A/Subs.bas +++ b/B4A/Subs.bas @@ -2034,7 +2034,7 @@ Sub comparaVersiones(versionMinima As String, versionActual As String) As Int Dim numMin As Int = partesMin(i) Dim numAct As Int = partesAct(i) If numAct < numMin Then - ToastMessageShow("Versión vieja, por favor actualizar!", false) + ToastMessageShow("Versión vieja, por favor actualizar!", False) Return -1 ' Actual es menor Else If numAct > numMin Then Return 1 ' Actual es mayor