diff --git a/Build/Build.fbl6 b/Build/Build.fbl6 index 615316c..44bd633 100644 Binary files a/Build/Build.fbl6 and b/Build/Build.fbl6 differ diff --git a/Resources/Iconos/Thumbs.db b/Resources/Iconos/Thumbs.db index ecac6ff..06454b7 100644 Binary files a/Resources/Iconos/Thumbs.db and b/Resources/Iconos/Thumbs.db differ diff --git a/Source/ApplicationBase/uFactuGES_App.pas b/Source/ApplicationBase/uFactuGES_App.pas index 7072d44..6815ad8 100644 --- a/Source/ApplicationBase/uFactuGES_App.pas +++ b/Source/ApplicationBase/uFactuGES_App.pas @@ -11,12 +11,14 @@ const CTE_PERFIL_ADMINISTRADOR = 3; CTE_PERFIL_VENDEDOR_GRADEN = 7; CTE_PERFIL_VENDEDOR_MARBELLA = 9; + CTE_PERFIL_VENDEDOR_DONOSTI = 10; CTE_PERFIL_COMPRAS = 8; CTE_PERFIL_USUARIO = 5; CTE_EMPRESA_ABETO = 1; CTE_EMPRESA_GRADEN = 2; - CTE_EMPRESA_GRADEN_MARBELLA = 6; + CTE_EMPRESA_GRADEN_MARBELLA = 6; + CTE_EMPRESA_GRADEN_DONOSTI = 10; type TAppFactuGES_Event = procedure; diff --git a/Source/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj index ad6bb94..ce773e4 100644 --- a/Source/Cliente/FactuGES.dproj +++ b/Source/Cliente/FactuGES.dproj @@ -52,7 +52,7 @@ Delphi.Personality VCLApplication -FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse4320FalseFalseFalseFalseFalse30821252Rodax Software S.L.4.3.2.0FactuGESFactuGES4.3.2.0 +FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse4330FalseFalseFalseFalseFalse30821252Rodax Software S.L.4.3.3.0FactuGESFactuGES4.3.3.0 File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found FactuGES.dprFalse diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res index cab4175..3559276 100644 Binary files a/Source/Cliente/FactuGES.res and b/Source/Cliente/FactuGES.res differ diff --git a/Source/Cliente/uPantallaPrincipal.pas b/Source/Cliente/uPantallaPrincipal.pas index a00050c..fb2a2d7 100644 --- a/Source/Cliente/uPantallaPrincipal.pas +++ b/Source/Cliente/uPantallaPrincipal.pas @@ -196,7 +196,8 @@ procedure TfPantallaPrincipal.FormShow(Sender: TObject); begin //El usuario vendedor de graden solo podrá ver ventas (Graden-Vendedor(2)) if (AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PERFIL_VENDEDOR_GRADEN) - or (AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PERFIL_VENDEDOR_MARBELLA) then + or (AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PERFIL_VENDEDOR_MARBELLA) + or (AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PERFIL_VENDEDOR_DONOSTI) then begin Informes1.Enabled := False; Informes1.Visible := False; diff --git a/Source/GUIBase/GUIBase.dproj b/Source/GUIBase/GUIBase.dproj index f44e3be..f1ed43a 100644 --- a/Source/GUIBase/GUIBase.dproj +++ b/Source/GUIBase/GUIBase.dproj @@ -58,34 +58,34 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + +
fDialogBase
 diff --git a/Source/Informes/2/2/InfContratoCliente.fr3 b/Source/Informes/2/2/InfContratoCliente.fr3 index a13bc36..6c2c263 100644 --- a/Source/Informes/2/2/InfContratoCliente.fr3 +++ b/Source/Informes/2/2/InfContratoCliente.fr3 @@ -1,25 +1,25 @@ - + - + - + - + - + @@ -78,8 +78,8 @@ - - + + @@ -87,7 +87,7 @@ - + diff --git a/Source/Informes/2/2/InfFacturaCliente.fr3 b/Source/Informes/2/2/InfFacturaCliente.fr3 index 0f3414a..3d8a1c0 100644 --- a/Source/Informes/2/2/InfFacturaCliente.fr3 +++ b/Source/Informes/2/2/InfFacturaCliente.fr3 @@ -1,21 +1,21 @@ - + - + - + - - - - - - + + + + + + @@ -23,23 +23,23 @@ - + - + - + - + - + - + - - + + - - + + @@ -51,8 +51,8 @@ - - + + @@ -61,9 +61,9 @@ - - - + + + diff --git a/Source/Informes/2/2/InfPresupuestoCliente.fr3 b/Source/Informes/2/2/InfPresupuestoCliente.fr3 index dbfb74c..8859bb5 100644 --- a/Source/Informes/2/2/InfPresupuestoCliente.fr3 +++ b/Source/Informes/2/2/InfPresupuestoCliente.fr3 @@ -1,16 +1,16 @@ - + - + - + - + @@ -67,7 +67,7 @@ - + @@ -78,14 +78,14 @@ - + - - + + diff --git a/Source/Informes/2/2/InfReciboCliente.fr3 b/Source/Informes/2/2/InfReciboCliente.fr3 index 67acc27..ba18e32 100644 --- a/Source/Informes/2/2/InfReciboCliente.fr3 +++ b/Source/Informes/2/2/InfReciboCliente.fr3 @@ -1,15 +1,15 @@ - + + - + - diff --git a/Source/Modulos/Contactos/Views/uViewVendedor.dfm b/Source/Modulos/Contactos/Views/uViewVendedor.dfm index f0378b2..edd9698 100644 --- a/Source/Modulos/Contactos/Views/uViewVendedor.dfm +++ b/Source/Modulos/Contactos/Views/uViewVendedor.dfm @@ -28,6 +28,10 @@ inherited frViewVendedor: TfrViewVendedor inherited eCalle: TcxDBTextEdit Left = 121 Top = 166 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' TabOrder = 5 ExplicitLeft = 121 ExplicitTop = 166 @@ -37,6 +41,10 @@ inherited frViewVendedor: TfrViewVendedor inherited cbProvincia: TcxDBComboBox Left = 121 Top = 193 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' TabOrder = 6 ExplicitLeft = 121 ExplicitTop = 193 @@ -46,6 +54,10 @@ inherited frViewVendedor: TfrViewVendedor inherited cbPoblacion: TcxDBComboBox Left = 121 Top = 220 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' TabOrder = 8 ExplicitLeft = 121 ExplicitTop = 220 @@ -55,46 +67,66 @@ inherited frViewVendedor: TfrViewVendedor inherited eCodigoPostal: TcxDBTextEdit Left = 282 Top = 193 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' TabOrder = 7 ExplicitLeft = 282 ExplicitTop = 193 end inherited eTlfParticular: TcxDBTextEdit Left = 463 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' TabOrder = 11 ExplicitLeft = 463 - ExplicitWidth = 91 - Width = 91 end inherited eTlfTrabajo: TcxDBTextEdit Left = 463 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' TabOrder = 10 ExplicitLeft = 463 - ExplicitWidth = 127 - Width = 127 end inherited eTlfMovil: TcxDBTextEdit Left = 463 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' TabOrder = 12 ExplicitLeft = 463 - ExplicitWidth = 155 - Width = 155 end inherited eFax: TcxDBTextEdit Left = 463 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' TabOrder = 13 ExplicitLeft = 463 - ExplicitWidth = 121 - Width = 121 end inherited eNombre: TcxDBTextEdit Left = 121 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 121 ExplicitWidth = 263 Width = 263 end inherited eNIFCIF: TcxDBTextEdit Left = 216 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 216 ExplicitWidth = 100 Width = 100 @@ -102,6 +134,10 @@ inherited frViewVendedor: TfrViewVendedor inherited eMailTrabajo: TcxDBHyperLinkEdit Left = 463 Properties.Prefix = 'mailto:' + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' TabOrder = 14 ExplicitLeft = 463 ExplicitWidth = 129 @@ -163,6 +199,10 @@ inherited frViewVendedor: TfrViewVendedor inherited eMailParticular: TcxDBHyperLinkEdit Left = 463 Properties.Prefix = 'mailto:' + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' TabOrder = 15 ExplicitLeft = 463 ExplicitWidth = 165 @@ -170,6 +210,10 @@ inherited frViewVendedor: TfrViewVendedor end inherited ePaginaWeb: TcxDBHyperLinkEdit Left = 463 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' TabOrder = 16 ExplicitLeft = 463 ExplicitWidth = 165 @@ -177,13 +221,19 @@ inherited frViewVendedor: TfrViewVendedor end inherited eReferencia: TcxDBTextEdit Left = 121 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 121 - ExplicitWidth = 38 - Width = 38 end inherited ePersonaContacto: TcxDBTextEdit Left = 121 Top = 247 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' TabOrder = 9 ExplicitLeft = 121 ExplicitTop = 247 @@ -200,20 +250,17 @@ inherited frViewVendedor: TfrViewVendedor Width = 264 ExplicitWidth = 264 inherited cbTienda: TcxComboBox - ExplicitWidth = 376 - Width = 376 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' end end end inherited frViewObservaciones1: TfrViewObservaciones - Width = 521 - Height = 228 TabOrder = 18 - ExplicitWidth = 521 - ExplicitHeight = 228 inherited memObservaciones: TcxDBMemo - Height = 228 - Width = 521 + DataBinding.DataSource = dsContacto end end inherited dxLayoutControlContactoGroup_Root: TdxLayoutGroup diff --git a/Source/Modulos/Contactos/Views/uViewVendedor.pas b/Source/Modulos/Contactos/Views/uViewVendedor.pas index 0e418ce..56b4882 100644 --- a/Source/Modulos/Contactos/Views/uViewVendedor.pas +++ b/Source/Modulos/Contactos/Views/uViewVendedor.pas @@ -74,6 +74,19 @@ var begin inherited; +//FILTRO DE EMPRESAS + if (AppFactuGES.EmpresaActiva.ID = CTE_EMPRESA_ABETO) then + begin + dxLayoutControlContactoGroup100.Visible := false; +// frViewDatosYSeleccionInstalador1.Visible := true; +// dxLayoutControl1Item15.visible := true; + end + else + begin + dxLayoutControlContactoGroup100.Visible := true; +// frViewDatosYSeleccionInstalador1.Visible := false; +// dxLayoutControl1Item15.visible := false; + end; FListaUsuarios := AppFactuGES.UsuariosController.DarListaUsuarios; with cbUsuario.Properties.Items do diff --git a/Source/Modulos/Facturas de cliente/Controller/uFacturasClienteController.pas b/Source/Modulos/Facturas de cliente/Controller/uFacturasClienteController.pas index a43d45a..90e8e04 100644 --- a/Source/Modulos/Facturas de cliente/Controller/uFacturasClienteController.pas +++ b/Source/Modulos/Facturas de cliente/Controller/uFacturasClienteController.pas @@ -760,6 +760,7 @@ begin SITUACION := CTE_PENDIENTE; //Al ser una nueva debe de estar pendiente FECHA_FACTURA := DateOf(Now); ID_COMISION_LIQUIDADA := 0; + FAC_PROV_GRADENIsNull := True; {$IFDEF CONTABILIDAD} ID_EJERCICIO := AppFactuGES.EjercicioActivo.ID; diff --git a/Source/Modulos/Tarifas/Controller/Tarifas_controller.dcu b/Source/Modulos/Tarifas/Controller/Tarifas_controller.dcu index f54f6ae..6c36708 100644 Binary files a/Source/Modulos/Tarifas/Controller/Tarifas_controller.dcu and b/Source/Modulos/Tarifas/Controller/Tarifas_controller.dcu differ diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj index 759a6b6..8ed780e 100644 --- a/Source/Servidor/FactuGES_Server.dproj +++ b/Source/Servidor/FactuGES_Server.dproj @@ -28,7 +28,7 @@ Delphi.Personality - FalseTrueFalseTrueFalse4320FalseFalseFalseFalseFalse30821252Rodax Software S.L.4.3.2.0FactuGES (Servidor)4.3.2.0martes, 07 de febrero de 2023 17:51 + FalseTrueFalseTrueFalse4330FalseFalseFalseFalseFalse30821252Rodax Software S.L.4.3.3.0FactuGES (Servidor)4.3.3.0miércoles, 08 de febrero de 2023 16:16 File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found FactuGES_Server.dpr diff --git a/Source/Servidor/FactuGES_Server.res b/Source/Servidor/FactuGES_Server.res index 5e517d7..c658d7b 100644 Binary files a/Source/Servidor/FactuGES_Server.res and b/Source/Servidor/FactuGES_Server.res differ