diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas index 7d6832b..109712b 100644 --- a/B4A/C_Principal.bas +++ b/B4A/C_Principal.bas @@ -1893,7 +1893,7 @@ Sub resdia_Click c=B4XPages.MainPage.skmt.ExecQuery("Select SUM(HMC_TOTAL) AS TOTAL from HIST_MARCAS_CUOTAS ") c.Position = 0 If c.GetString("TOTAL") > 0 Then - L_NES.Text = ROUND(c.GetString("TOTAL") / 25) + L_NES.Text = Round(c.GetString("TOTAL") / 25) Else L_NES.Text = c.GetString("TOTAL") diff --git a/B4A/C_Promos.bas b/B4A/C_Promos.bas index d30b761..9e0daf4 100644 --- a/B4A/C_Promos.bas +++ b/B4A/C_Promos.bas @@ -361,10 +361,13 @@ End Sub Private Sub b_continuar_Click cuentaProds Log("====================================================================") -' Log($"${prodsIds}${CRLF}${prodsCants}${CRLF}${prodsPrecios}"$) + Log($"${prodsIds}${CRLF}${prodsCants}${CRLF}${prodsPrecios}"$) For t = 0 To prodsIds.Size - 1 'Guardamos los productos fijos de la promocion en pedido. Private pn As String = Subs.traeProdNombre(prodsIds.Get(t)) Subs.guardaProducto(estaPromo, prodsPrecios.Get(t), prodsCants.Get(t), pn, prodsIds.Get(t), Subs.traeCliente, Subs.traeFecha, Subs.traeUsuarioDeBD, Subs.traeRuta, 0, B4XPages.MainPage.tipo_venta) + + If laPromo = prodsIds.Get(t) Then Subs.guardaPromoXruta(laPromo, prodsCants.Get(t)) + Next For t = 0 To prodsIds2.Size - 1 'Guardamos los productos variables de la promocion en pedido. Private pn As String = Subs.traeProdNombre(prodsIds2.Get(t)) diff --git a/B4A/Guna Vistas V3.1.b4a.meta b/B4A/Guna Vistas V3.1.b4a.meta index 1ba02e9..b383f8c 100644 --- a/B4A/Guna Vistas V3.1.b4a.meta +++ b/B4A/Guna Vistas V3.1.b4a.meta @@ -50,8 +50,8 @@ ModuleClosedNodes0= ModuleClosedNodes1=5,7,8,9,10,11,12,13,14 ModuleClosedNodes10= ModuleClosedNodes11=6 -ModuleClosedNodes12=2,4,5,6 -ModuleClosedNodes13=1 +ModuleClosedNodes12=2,4,5,6,7,9,10,11,12,13,14,15,16,17,18,19,20,21,27,28,29,30,31,32 +ModuleClosedNodes13= ModuleClosedNodes14= ModuleClosedNodes15= ModuleClosedNodes16= @@ -70,6 +70,6 @@ ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=C_Principal,cargar_Click,807,6,DBRequestManager,ExecuteCommand,59,0,DBRequestManager,Initialize,23,2,DBRequestManager,ExecuteQuery,42,6,C_Principal,JobDone,942,6,C_Principal,Class_Globals,221,0,Visual Designer,principal.bal,-100,6,C_Principal,B4XPage_Created,241,4,Visual Designer,cliente.bal,-100,2,C_Cliente,Class_Globals,346,0,C_Cliente,B4XPage_Created,359,4 +NavigationStack=Visual Designer,principal.bal,-100,6,Visual Designer,cliente.bal,-100,2,C_Cliente,Class_Globals,346,0,C_Cliente,B4XPage_Created,355,4,C_Principal,B4XPage_Created,229,4,C_Productos,B4XPage_CloseRequest,317,0,C_Productos,Class_Globals,0,0,C_Promos,Class_Globals,0,0,C_Promos,b_continuar_Click,361,0,C_Promos,b_terminar1_Click,351,0 SelectedBuild=0 VisibleModules=21,2,22,14,12,13,4,8,17