diff --git a/B4A/C_Productos.bas b/B4A/C_Productos.bas index 1ba9187..a435680 100644 --- a/B4A/C_Productos.bas +++ b/B4A/C_Productos.bas @@ -1095,10 +1095,10 @@ Private Sub lv_prodsPedido_ItemLongClick (Position As Int, Value As Object) End Sub Private Sub clv_prods_ll_ItemLongClick (Index As Int, Value As Object) - Log("LONGCLIC") - kh.centraPanel(p_rmi, Root.Width) - p_rmi.BringToFront - p_rmi.Visible = True +' Log("LONGCLIC") +' kh.centraPanel(p_rmi, Root.Width) +' p_rmi.BringToFront +' p_rmi.Visible = True End Sub Sub l_prodX_Click @@ -1158,7 +1158,13 @@ Private Sub l_prodX_LongClick ' ToastMessageShow("¡¡En preventa NO hay cambios!!", True) ' Return ' End If - If ventaT > 0 Then + Private rmis As Cursor =Starter.skmt.ExecQuery($"select CAT_GP_DEV from ${Subs.traeTablaProds(Starter.tipov)} where CAT_GP_ID = '${pId}'"$) +' If rmis.RowCount > 0 Then +' rmis.Position = 0 +' Log(rmis.GetString("CAT_GP_DEV")) +' End If + rmis.Position = 0 + If rmis.RowCount > 0 And rmis.GetString("CAT_GP_DEV") = 1 Then t = Starter.skmt.ExecQuery($"select sum(PE_CANT) as totalRMI from pedido where PE_PROID = '${pId}' and PE_CEDIS = 'DUR' and PE_CLIENTE in (Select CUENTA from cuentaa)"$) t.Position = 0 Private totalRMI As String = t.GetString("totalRMI") @@ -1169,12 +1175,12 @@ Private Sub l_prodX_LongClick Private pu0() As String = Regex.Split("\$", Sender.as(Label).Text) Private pu As String If pu0.Length > 1 Then pu = pu0(pu0.Length-1) Else pu = 0 - ' Log(ventaT & ", " & totalRMI & ", " & Sender.as(Label).tag & ", " & pu) + 'Log(ventaT & ", " & totalRMI & ", " & Sender.as(Label).tag & ", " & pu) ' l_rmi_usado.Text = $"RMI usado: $1.0{(ventaT - totalRMI)}"$ - l_montoDisponible.Text = $"Disponible para RMI: $1.0{(ventaT)}"$ + l_montoDisponible.Text = $"DEVOLUCIONES"$ Private esteInv As Int = Subs.traeInventario(pId, Starter.tipov) If esteInv < ventaT Then ventaT = esteInv 'Si el inventario disponble es menor a los productos del pedido, entoncs tomamos ese valor. - Private m As Map = CreateMap("disponible":(ventaT - totalRMI), "inv":ventaT, "totalRMI":totalRMI, "pu":pu, "id":pId, "nombre":pNombre) + Private m As Map = CreateMap("disponible":clv_prods_ll.GetValue(index).As(Map).Get("almacen"), "inv":clv_prods_ll.GetValue(index).As(Map).Get("almacen"), "totalRMI":totalRMI, "pu":pu, "id":pId, "nombre":pNombre) rmiMap = m Log(rmiMap) ' b_rmi_mas.Tag = m @@ -1186,7 +1192,7 @@ Private Sub l_prodX_LongClick p_rmi.BringToFront p_rmi.Visible = True Else - ToastMessageShow("No hay venta suficiente para RMIs", True) + ToastMessageShow("No hay devoluciones para este producto", True) End If End If End Sub diff --git a/B4A/Durakelo.b4a b/B4A/Durakelo.b4a index 0840e69..07474de 100644 --- a/B4A/Durakelo.b4a +++ b/B4A/Durakelo.b4a @@ -1398,7 +1398,7 @@ Version=12.5 #Region Project Attributes #ApplicationLabel: Durakelo #VersionCode: 1 - #VersionName: 4.02.02.ENCU + #VersionName: 4.02.05.ENCU 'SupportedOrientations possible values: unspecified, landscape or portrait. #SupportedOrientations: portrait #CanInstallToExternalStorage: False diff --git a/B4A/Durakelo.b4a.meta b/B4A/Durakelo.b4a.meta index d344f0d..4c44ddc 100644 --- a/B4A/Durakelo.b4a.meta +++ b/B4A/Durakelo.b4a.meta @@ -51,7 +51,7 @@ ModuleBreakpoints9= ModuleClosedNodes0= ModuleClosedNodes1= ModuleClosedNodes10= -ModuleClosedNodes11=1,7,35,36,37,38,39,40,41,42 +ModuleClosedNodes11=7,35,36,41,42 ModuleClosedNodes12= ModuleClosedNodes13= ModuleClosedNodes14= @@ -73,6 +73,6 @@ ModuleClosedNodes6=5 ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=C_Cliente,B4XPage_Appear,228,0,C_Principal,B4XPage_Created,168,0,C_Cuestionario,Class_Globals,0,0,C_Cuestionario,Initialize,21,0,C_Cliente,B_IMP_Click,759,0,C_Cliente,cuest_preguntaContestada,1717,6,C_Cliente,Class_Globals,146,0,C_Principal,Subir_Click,755,6,C_Principal,JobDone,1912,3,C_Principal,Class_Globals,0,0 +NavigationStack=C_Productos,b_rmi_mas_Click,1443,0,C_Principal,JobDone,1912,3,C_Principal,Class_Globals,0,0,C_Productos,B4XPage_Appear,154,0,C_Productos,B4XPage_CloseRequest,485,0,C_Productos,b_rmi_aceptar_Click,1419,0,C_Productos,clv_prods_ll_ItemLongClick,1091,0,C_Productos,p_rmi_Click,1418,0,Visual Designer,productos.bal,-100,2,C_Productos,l_prodX_LongClick,1167,6 SelectedBuild=0 -VisibleModules=1,2,10,4,5,6,8,9,11 +VisibleModules=1,2,10,4,5,6,8,9,11,24