From 01a6886a44baea2a9ab837fc546e120254dd7b0c Mon Sep 17 00:00:00 2001 From: david Date: Sun, 18 Nov 2007 12:49:11 +0000 Subject: [PATCH] =?UTF-8?q?Repaso=20a=20contactos:=20*=20T=C3=ADtulos=20in?= =?UTF-8?q?formativos=20en=20las=20ventanas=20(lista=20de=20clientes,=20nu?= =?UTF-8?q?evo=20cliente,=20etc...)=20*=20Rellenar=20los=20campos=20ID=5FE?= =?UTF-8?q?MPRESA=20y=20USUARIO=20con=20sus=20valores.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@130 0c75b7a4-871f-7646-8a2f-f78d34cc349f --- Source/Cliente/FactuGES.dproj | 12 -------- .../Controller/uContactosController.pas | 5 ++-- .../Contactos/Views/uEditorClientes.dfm | 29 +++++++++++++------ .../Contactos/Views/uEditorClientes.pas | 7 ++--- .../Contactos/Views/uEditorContacto.pas | 6 ++-- .../Contactos/Views/uEditorContactos.dfm | 1 - .../Contactos/Views/uEditorContactos.pas | 11 ++++--- .../Contactos/Views/uEditorEmpleados.dfm | 1 - .../Contactos/Views/uEditorEmpleados.pas | 5 ++-- .../Contactos/Views/uEditorProveedores.dfm | 2 -- .../Contactos/Views/uEditorProveedores.pas | 5 ++-- 11 files changed, 37 insertions(+), 47 deletions(-) diff --git a/Source/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj index c33aa7bd..65925705 100644 --- a/Source/Cliente/FactuGES.dproj +++ b/Source/Cliente/FactuGES.dproj @@ -58,18 +58,6 @@ - - - - - - - - - - - - ExpressPrinting System by Developer Express Inc. PluginSDK for Delphi 10 (Runtime) Microsoft Office 2000 Sample Automation Server Wrapper Components diff --git a/Source/Modulos/Contactos/Controller/uContactosController.pas b/Source/Modulos/Contactos/Controller/uContactosController.pas index 6dc0e6f2..68939a42 100644 --- a/Source/Modulos/Contactos/Controller/uContactosController.pas +++ b/Source/Modulos/Contactos/Controller/uContactosController.pas @@ -86,9 +86,8 @@ begin Result.Edit; with Result do begin - // OJO!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!111 - //ID_EMPRESA := dmUsuarios.IDEmpresaActual; - //USUARIO := dmUsuarios.LoginInfo.Usuario; + ID_EMPRESA := AppFactuGES.EmpresaActiva.ID; + USUARIO := AppFactuGES.UsuarioActivo.UserName; end; Result.Post; diff --git a/Source/Modulos/Contactos/Views/uEditorClientes.dfm b/Source/Modulos/Contactos/Views/uEditorClientes.dfm index 49350c19..3cfc7fc8 100644 --- a/Source/Modulos/Contactos/Views/uEditorClientes.dfm +++ b/Source/Modulos/Contactos/Views/uEditorClientes.dfm @@ -78,54 +78,65 @@ inherited fEditorClientes: TfEditorClientes ParentFont = False TabOrder = 3 ReadOnly = False - ExplicitLeft = 229 - ExplicitTop = 61 + ExplicitTop = 102 + ExplicitWidth = 786 + ExplicitHeight = 398 inherited cxGrid: TcxGrid Width = 786 Height = 270 + ExplicitWidth = 786 + ExplicitHeight = 270 inherited cxGridView: TcxGridDBTableView DataController.Summary.FooterSummaryItems = < item Format = '0 clientes' Kind = skCount - Column = frViewClientes1.cxGridViewNIF_CIF + Column = frViewClientes1.cxGridViewTiendaWeb end> end end inherited frViewFiltroBase1: TfrViewFiltroBase Width = 786 + ExplicitWidth = 786 inherited TBXDockablePanel1: TTBXDockablePanel + ExplicitWidth = 786 inherited dxLayoutControl1: TdxLayoutControl Width = 786 + ExplicitWidth = 786 inherited txtFiltroTodo: TcxTextEdit - ExplicitWidth = 273 - Width = 273 + ExplicitWidth = 457 + Width = 457 end inherited edtFechaIniFiltro: TcxDateEdit - ExplicitWidth = 121 - Width = 121 + ExplicitWidth = 240 + Width = 240 end inherited edtFechaFinFiltro: TcxDateEdit - Left = 483 - ExplicitLeft = 483 + Left = 564 + ExplicitLeft = 564 ExplicitWidth = 121 Width = 121 end end inherited TBXAlignmentPanel1: TTBXAlignmentPanel Width = 786 + ExplicitWidth = 786 inherited tbxBotones: TTBXToolbar Width = 776 + ExplicitWidth = 776 end end end end inherited pnlAgrupaciones: TTBXDockablePanel Top = 372 + ExplicitTop = 372 inherited TBXAlignmentPanel1: TTBXAlignmentPanel Width = 786 + ExplicitWidth = 786 inherited TBXToolbar1: TTBXToolbar Width = 776 + ExplicitWidth = 776 end end end diff --git a/Source/Modulos/Contactos/Views/uEditorClientes.pas b/Source/Modulos/Contactos/Views/uEditorClientes.pas index 4c786110..36bdd6da 100644 --- a/Source/Modulos/Contactos/Views/uEditorClientes.pas +++ b/Source/Modulos/Contactos/Views/uEditorClientes.pas @@ -35,7 +35,7 @@ implementation uses uGridUtils, uDataModuleContactos, uDMBase, uEditorGridBase, uBizContactos, - uDBSelectionListUtils, uDataModuleUsuarios, uDialogUtils, + uDBSelectionListUtils, uDataModuleUsuarios, uDialogUtils, uFactuGES_App, uGruposClienteController, uBizGruposCliente, uClientesController; {$R *.dfm} @@ -62,7 +62,7 @@ end; constructor TfEditorClientes.Create(AOwner: TComponent); begin inherited; - ViewGrid := frViewClientes1; //CreateView(TfrViewClientes) as IViewContactos; + ViewGrid := frViewClientes1; end; procedure TfEditorClientes.EliminarInterno; @@ -159,8 +159,7 @@ procedure TfEditorClientes.PonerTitulos(const ATitulo: string); var FTitulo : String; begin - // OJOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO -// FTitulo := 'Lista de clientes - ' + dmUsuarios.EmpresaActual.NOMBRE; + FTitulo := 'Lista de clientes - ' + AppFactuGES.EmpresaActiva.NOMBRE; inherited PonerTitulos(FTitulo); end; diff --git a/Source/Modulos/Contactos/Views/uEditorContacto.pas b/Source/Modulos/Contactos/Views/uEditorContacto.pas index 48ba3380..103005a8 100644 --- a/Source/Modulos/Contactos/Views/uEditorContacto.pas +++ b/Source/Modulos/Contactos/Views/uEditorContacto.pas @@ -53,7 +53,8 @@ implementation {$R *.dfm} uses - uCustomEditor, uDataModuleContactos, uDMBase, uDataModuleUsuarios; + uFactuGES_App, uCustomEditor, uDataModuleContactos, + uDMBase, uDataModuleUsuarios; { ******************************* TfEditorContacto ******************************* @@ -102,8 +103,7 @@ begin inherited PonerTitulos(FTitulo); -// OJOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO -// Self.Caption := FTitulo + ' (' + dmUsuarios.EmpresaActual.NOMBRE + ')'; + Self.Caption := FTitulo + ' (' + AppFactuGES.EmpresaActiva.NOMBRE + ')'; end; procedure TfEditorContacto.SetContacto(const Value: IBizContacto); diff --git a/Source/Modulos/Contactos/Views/uEditorContactos.dfm b/Source/Modulos/Contactos/Views/uEditorContactos.dfm index c722fad7..55901294 100644 --- a/Source/Modulos/Contactos/Views/uEditorContactos.dfm +++ b/Source/Modulos/Contactos/Views/uEditorContactos.dfm @@ -2,7 +2,6 @@ inherited fEditorContactos: TfEditorContactos Left = 285 Top = 448 Caption = 'Lista de contactos' - ExplicitWidth = 320 ExplicitHeight = 471 PixelsPerInch = 96 TextHeight = 13 diff --git a/Source/Modulos/Contactos/Views/uEditorContactos.pas b/Source/Modulos/Contactos/Views/uEditorContactos.pas index faa9e9dd..40cf5389 100644 --- a/Source/Modulos/Contactos/Views/uEditorContactos.pas +++ b/Source/Modulos/Contactos/Views/uEditorContactos.pas @@ -45,9 +45,9 @@ type implementation uses - uCustomEditor, uDataModuleContactos, - uEditorDBBase, uFactuGES_App, - cxGrid, cxGridCustomTableView, uDBSelectionListUtils; + uCustomEditor, uDataModuleContactos, uFactuGES_App, + uEditorDBBase, cxGrid, cxGridCustomTableView, + uDBSelectionListUtils; {$R *.dfm} @@ -101,9 +101,8 @@ var FTitulo : String; begin FTitulo := ATitulo; - // OJOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO -{ if FTitulo = '' then - FTitulo := 'Lista de contactos - ' + dmUsuarios.EmpresaActual.NOMBRE;} + if FTitulo = '' then + FTitulo := 'Lista de contactos - ' + AppFactuGES.EmpresaActiva.NOMBRE; inherited PonerTitulos(FTitulo); end; diff --git a/Source/Modulos/Contactos/Views/uEditorEmpleados.dfm b/Source/Modulos/Contactos/Views/uEditorEmpleados.dfm index 09805033..1822338f 100644 --- a/Source/Modulos/Contactos/Views/uEditorEmpleados.dfm +++ b/Source/Modulos/Contactos/Views/uEditorEmpleados.dfm @@ -1,6 +1,5 @@ inherited fEditorEmpleados: TfEditorEmpleados Caption = 'fEditorEmpleados' - ExplicitHeight = 478 PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader diff --git a/Source/Modulos/Contactos/Views/uEditorEmpleados.pas b/Source/Modulos/Contactos/Views/uEditorEmpleados.pas index 83f4c208..1d85cc0f 100644 --- a/Source/Modulos/Contactos/Views/uEditorEmpleados.pas +++ b/Source/Modulos/Contactos/Views/uEditorEmpleados.pas @@ -33,7 +33,7 @@ implementation uses uGridUtils, uEditorGridBase, uDataModuleUsuarios, uDialogUtils, uBizContactos, - uEmpleadosController, uDBSelectionListUtils; + uEmpleadosController, uDBSelectionListUtils, uFactuGES_App; {$R *.dfm} @@ -139,8 +139,7 @@ procedure TfEditorEmpleados.PonerTitulos(const ATitulo: string); var FTitulo : String; begin -// ojooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo -// FTitulo := 'Lista de empleados - ' + dmUsuarios.EmpresaActual.NOMBRE; + FTitulo := 'Lista de empleados - ' + AppFactuGES.EmpresaActiva.NOMBRE; inherited PonerTitulos(FTitulo); end; diff --git a/Source/Modulos/Contactos/Views/uEditorProveedores.dfm b/Source/Modulos/Contactos/Views/uEditorProveedores.dfm index 923b8875..334aa1ef 100644 --- a/Source/Modulos/Contactos/Views/uEditorProveedores.dfm +++ b/Source/Modulos/Contactos/Views/uEditorProveedores.dfm @@ -1,7 +1,5 @@ inherited fEditorProveedores: TfEditorProveedores Caption = 'fEditorProveedores' - ExplicitWidth = 320 - ExplicitHeight = 240 PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader diff --git a/Source/Modulos/Contactos/Views/uEditorProveedores.pas b/Source/Modulos/Contactos/Views/uEditorProveedores.pas index 942e9e8c..c3f7309a 100644 --- a/Source/Modulos/Contactos/Views/uEditorProveedores.pas +++ b/Source/Modulos/Contactos/Views/uEditorProveedores.pas @@ -32,7 +32,7 @@ implementation uses uGridUtils, uEditorGridBase, uDataModuleUsuarios, uDialogUtils, uBizContactos, - uDBSelectionListUtils, uProveedoresController; + uDBSelectionListUtils, uProveedoresController, uFactuGES_App; {$R *.dfm} @@ -138,8 +138,7 @@ procedure TfEditorProveedores.PonerTitulos(const ATitulo: string); var FTitulo : String; begin -// OJOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO -// FTitulo := 'Lista de proveedores - ' + dmUsuarios.EmpresaActual.NOMBRE; + FTitulo := 'Lista de proveedores - ' + AppFactuGES.EmpresaActiva.NOMBRE; inherited PonerTitulos(FTitulo); end;