diff --git a/B4A/C_Nota.bas b/B4A/C_Nota.bas index 5fca295..5931552 100644 --- a/B4A/C_Nota.bas +++ b/B4A/C_Nota.bas @@ -90,15 +90,14 @@ Sub B4XPage_Appear label1.color = Colors.White Private textColor As Int = Colors.black If c.GetString("PE_FOLIO") = "VENTA" Then - textColor = Colors.Black - Else If c.GetString("PE_FOLIO") = "PREVENTA" Then - textColor = Colors.Magenta + textColor = Colors.RGB(48,3,195) + Else If c.GetString("PE_FOLIO") = "PREVENTA" Or c.GetString("PE_FOLIO") = "ABORDO" Then + textColor = Colors.RGB(166,0,0) End If -' If c.GetString("PE_CEDIS").Contains("PRO") Then textColor = Colors.RGB(210,105,30) 'Si es promo, cambiamos el color del texto. If Not(IsNumber(c.GetString("PE_CEDIS"))) And c.GetString("PE_FOLIO") = "VENTA" Then - textColor = Colors.RGB(210,105,30) 'Si es promo, cambiamos el color del texto. + textColor = Colors.RGB(154,131,231) 'Si es promo, cambiamos el color del texto. Else If Not(IsNumber(c.GetString("PE_CEDIS"))) And c.GetString("PE_FOLIO") = "PREVENTA" Then - textColor = Colors.Green 'Si es promo, cambiamos el color del texto. + textColor = Colors.RGB(255,111,111) 'Si es promo, cambiamos el color del texto. End If Dim label2 As Label label2 = ListView1.TwoLinesLayout.SecondLabel diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas index 970d71e..668cae8 100644 --- a/B4A/C_Principal.bas +++ b/B4A/C_Principal.bas @@ -210,6 +210,9 @@ Sub Class_Globals Private l_rutasuplencia As Label Dim userpiezas As String Private b_abordo As Button + Private L_ABORDO As Label + Private L_VENTA As Label + Private L_PREVENTA As Label End Sub 'You can add more parameters here. @@ -2246,6 +2249,33 @@ Sub resdia_Click l_monto_ks.Text = "0" End If c.Close + c=B4XPages.MainPage.skmt.ExecQuery2("Select sum(PE_COSTO_TOT) As PREVENTA from pedido where PE_FOLIO = ? AND PE_CLIENTE <> 0", Array As String ("PREVENTA")) + If c.RowCount > 0 Then + c.Position = 0 + L_PREVENTA.Text = c.GetString ("PREVENTA") + If L_PREVENTA.TEXT = "null" Then + L_PREVENTA.Text = "0" + End If + End If + c.Close + c=B4XPages.MainPage.skmt.ExecQuery2("Select sum(PE_COSTO_TOT) As VENTA from pedido where PE_FOLIO = ? AND PE_CLIENTE <> 0", Array As String ("VENTA")) + If c.RowCount > 0 Then + c.Position = 0 + L_VENTA.Text = c.GetString ("VENTA") + If L_VENTA.TEXT = "null" Then + L_VENTA.Text = "0" + End If + End If + c.Close + c=B4XPages.MainPage.skmt.ExecQuery2("Select sum(PE_COSTO_TOT) As ABORDO from pedido where PE_FOLIO = ? AND PE_CLIENTE = ?", Array As String ("ABORDO", "0")) + If c.RowCount > 0 Then + c.Position = 0 + L_ABORDO.Text = c.GetString ("ABORDO") + If L_ABORDO.TEXT = "null" Then + L_ABORDO.Text = "0" + End If + End If + c.Close Dim cuantos_obj As String c=B4XPages.MainPage.skmt.ExecQuery("Select count(*) AS TOTAL from HIST_MARCAS_CUOTAS ") c.Position = 0 diff --git a/B4A/Files/cliente.bal b/B4A/Files/cliente.bal index c4afe47..441e827 100644 Binary files a/B4A/Files/cliente.bal and b/B4A/Files/cliente.bal differ diff --git a/B4A/Files/resdia.bal b/B4A/Files/resdia.bal index 9bd91e1..ef8fb70 100644 Binary files a/B4A/Files/resdia.bal and b/B4A/Files/resdia.bal differ diff --git a/B4A/INTMEX.b4a b/B4A/INTMEX.b4a index c121d2f..98a399a 100644 --- a/B4A/INTMEX.b4a +++ b/B4A/INTMEX.b4a @@ -110,15 +110,16 @@ Library22=okhttputils2 Library23=phone Library24=preoptimizedclv Library25=randomaccessfile -Library26=rspopupmenu -Library27=serial -Library28=sql -Library29=stringutils +Library26=replyauto +Library27=rspopupmenu +Library28=serial +Library29=sql Library3=baqrcode -Library30=togglelibrary -Library31=xcustomlistview -Library32=xui -Library33=replyauto +Library30=stringutils +Library31=togglelibrary +Library32=xcustomlistview +Library33=xui +Library34=runtimepermissions Library4=batteryprogressview Library5=bitmapcreator Library6=byteconverter @@ -155,14 +156,14 @@ Module7=C_Historico Module8=C_Mapas Module9=C_Nota NumberOfFiles=46 -NumberOfLibraries=33 +NumberOfLibraries=34 NumberOfModules=28 -Version=12.5 +Version=12.8 @EndOfDesignText@ #Region Project Attributes #ApplicationLabel: Intmex #VersionCode: 1 - #VersionName: 4.05.01 + #VersionName: 4.05.05 'SupportedOrientations possible values: unspecified, landscape or portrait. #SupportedOrientations: portrait #CanInstallToExternalStorage: False diff --git a/B4A/INTMEX.b4a.meta b/B4A/INTMEX.b4a.meta index f51040e..c4129ab 100644 --- a/B4A/INTMEX.b4a.meta +++ b/B4A/INTMEX.b4a.meta @@ -85,6 +85,6 @@ ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=Subs,restaFijosPromo,932,3,Subs,alcanzanLosVariablesParaPromo,934,6,C_Productos,lv_catalogos_ItemClick,254,6,C_Productos,B4XPage_Created,127,0,C_Cliente,Guardar_Click,557,0,C_NoVenta,GUARDA_Click,122,0,C_Productos,Class_Globals,0,0,C_Productos,b_terminar1_Click,628,0,C_Productos,B4XPage_Appear,189,6,B4XMainPage,Class_Globals,24,0 +NavigationStack=C_NoVenta,GUARDA_Click,122,0,C_Productos,B4XPage_Appear,189,6,B4XMainPage,Class_Globals,24,0,C_Nota,Class_Globals,0,0,C_Productos,Class_Globals,0,0,C_Productos,b_terminar1_Click,635,0,C_Nota,B4XPage_Appear,94,6,C_Principal,resdia_Click,2270,6,Diseñador Visual,resdia.bal,-100,6,Diseñador Visual,clientes.bal,-100,1,Diseñador Visual,cliente.bal,-100,1 SelectedBuild=0 -VisibleModules=2,26,13,16,14,4,27,15,9,6,10 +VisibleModules=2,26,13,16,14,4,27,15,9,6