diff --git a/B4A/ADM.b4a b/B4A/ADM.b4a index 6826955..7c07376 100644 --- a/B4A/ADM.b4a +++ b/B4A/ADM.b4a @@ -1121,7 +1121,7 @@ Version=12.8 #Region Project Attributes #ApplicationLabel: ADM #VersionCode: 1 - #VersionName: 6.01.10 + #VersionName: 6.01.11 'SupportedOrientations possible values: unspecified, landscape or portrait. #SupportedOrientations: portrait #CanInstallToExternalStorage: False diff --git a/B4A/ADM.b4a.meta b/B4A/ADM.b4a.meta index 5972032..a65765f 100644 --- a/B4A/ADM.b4a.meta +++ b/B4A/ADM.b4a.meta @@ -67,7 +67,7 @@ ModuleBreakpoints9= ModuleClosedNodes0= ModuleClosedNodes1= ModuleClosedNodes10= -ModuleClosedNodes11= +ModuleClosedNodes11=4 ModuleClosedNodes12=3 ModuleClosedNodes13= ModuleClosedNodes14=4,5,16 @@ -97,6 +97,6 @@ ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=C_Cliente,B4XPage_Created,186,0,C_Cliente,B4XPage_Appear,434,0,C_Cliente,imprime_venta,1794,0,C_Cliente,savePDF,1756,0,C_Cliente,openPDF,1777,0,C_TicketsDia,B4XPage_Appear,59,6,Diseñador Visual,resdia.bal,-100,2,Diseñador Visual,principal.bal,-100,3,C_Principal,B_MARCAS_Click,2692,6,C_Principal,B_OK_COMISS_Click,2688,0,C_Cliente,imprime_preventa,1255,1 +NavigationStack=C_Cliente,PDFGENERAR,1662,1,Main,Globals,23,0,Main,Activity_ActionBarHomeClick,35,0,Main,Process_Globals,19,0,C_NoVenta,Class_Globals,0,0,C_NoVenta,B4XPage_Created,52,0,Diseñador Visual,principal.bal,-100,2,Diseñador Visual,noventa.bal,-100,1,C_NoVenta,GUARDA_Click,115,1,C_BItacora,b_Inicio_Fin_venta2_Click,139,0,C_BItacora,mandaBitacora,48,0 SelectedBuild=0 -VisibleModules=2,14,30,12,5,6,32,31,19,15 +VisibleModules=2,14,30,12,5,6,32,31,15,11,4 diff --git a/B4A/C_Cliente.bas b/B4A/C_Cliente.bas index cb2a2c5..b3e790d 100644 --- a/B4A/C_Cliente.bas +++ b/B4A/C_Cliente.bas @@ -1476,8 +1476,7 @@ Private Sub Label20_LongClick Next PDF.sFont(PDF.fontHelvetica,0,10,PDF.colorBlack) multiplicador = multiplicador +1 - PDF.outtext(1,pagina-multiplicador*6, s.GETSTRING("PE_CANT") & BLANCO & s.GETSTRING("PE_COSTOU") & BLANCO & s.GETSTRING("PE_COSTO_TOT")) - + PDF.outtext(1,pagina-multiplicador*6, s.GETSTRING("PE_CANT") & BLANCO & NumberFormat2(s.GETSTRING("PE_COSTOU"), 1,2,2,True) & BLANCO & NumberFormat2(s.GETSTRING("PE_COSTO_TOT"), 1,2,2,True)) End If Next End If @@ -1667,7 +1666,7 @@ Private Sub PDFGENERAR Next PDF.sFont(PDF.fontHelvetica,0,10,PDF.colorBlack) multiplicador = multiplicador +1 - PDF.outtext(1,pagina-multiplicador*6, s.GETSTRING("PE_CANT") & BLANCO & s.GETSTRING("PE_COSTOU") & BLANCO & s.GETSTRING("PE_COSTO_TOT")) + PDF.outtext(1,pagina-multiplicador*6, s.GETSTRING("PE_CANT") & BLANCO & NumberFormat2(s.GETSTRING("PE_COSTOU"),1,2,2,True) & BLANCO & NumberFormat2(s.GETSTRING("PE_COSTO_TOT"),1,2,2,True)) End If Next @@ -1684,7 +1683,7 @@ Private Sub PDFGENERAR s=skmt.ExecQuery2("select SUM(PE_COSTO_TOT) AS TOTAL FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa) AND PE_FOLIO = ?", Array As String("PREVENTA")) s.Position =0 multiplicador = multiplicador +1 - PDF.outtext(1,pagina-multiplicador*6,"Total preventa: $" & s.GetString("TOTAL") ) + PDF.outtext(1,pagina-multiplicador*6,"Total preventa: $" & NumberFormat2(s.GetString("TOTAL"),1,2,2,True)) s.Close c= skmt.ExecQuery2("select sum(PE_CANT) as PC_NOART from PEDIDO where PE_CLIENTE in (Select CUENTA from cuentaa) AND PE_PROID NOT IN (SELECT CAT_PA_ID FROM PROMOS_COMP ) AND PE_FOLIO = ?", Array As String("PREVENTA")) C.Position=0 diff --git a/B4A/C_NoVenta.bas b/B4A/C_NoVenta.bas index 1e1a4fa..49eba89 100644 --- a/B4A/C_NoVenta.bas +++ b/B4A/C_NoVenta.bas @@ -119,7 +119,7 @@ Sub GUARDA_Click ' 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)") - bitacora.mandaBitacora(Subs.fechanormal(DateTime.Now), Subs.traeUsuarioDeBD, Subs.traeAlmacen, Subs.traeRutaBitacora, "No Venta", Subs.traeCliente, Subs.fechanormal(DateTime.Now), Subs.fechanormal(DateTime.Now), B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps, 2, motivo, "", "") + bitacora.mandaBitacora(Subs.fechanormal(DateTime.Now), Subs.traeUsuarioDeBD, Subs.traeAlmacen, Subs.traeRutaBitacora, "No Venta", Subs.traeCliente, Subs.fechanormal(DateTime.Now), Subs.fechanormal(DateTime.Now), B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps, 2, motivo, e_comm.Text, "") B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO NOVENTA (NV_CLIENTE,NV_FECHA,NV_USER,NV_MOTIVO,NV_COMM,NV_LAT,NV_LON) VALUES(?,?,?,?,?,?,?) ", Array As Object (cuenta,sDate & sTime, usuario, motivo,e_comm.text, B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps)) B4XPages.MainPage.skmt.ExecNonQuery("UPDATE kmt_info set gestion = 3 where CAT_CL_CODIGO In (select cuenta from cuentaa)")