From dfd6dd7b22c63d3503bbf331d8b05f5fdaeb6c9d Mon Sep 17 00:00:00 2001 From: roberto Date: Wed, 18 May 2022 13:31:12 +0000 Subject: [PATCH] Version multitienda git-svn-id: https://192.168.0.254/svn/Proyectos.AbetoDesign_FactuGES/trunk@162 93f398dd-4eb6-7a46-baf6-13f46f578da2 --- .../Empresas/Views/uEditorEmpresa.dfm | 104 ++++++++---------- .../Empresas/Views/uEditorTiendaEmpresa.dfm | 1 + .../Empresas/Views/uEditorTiendaEmpresa.pas | 5 + .../Empresas/Views/uViewTiendas.dfm | 2 + .../Empresas/Views/uViewTiendas.pas | 4 + 5 files changed, 57 insertions(+), 59 deletions(-) diff --git a/Source/ApplicationBase/Empresas/Views/uEditorEmpresa.dfm b/Source/ApplicationBase/Empresas/Views/uEditorEmpresa.dfm index 90559a2..8195d20 100644 --- a/Source/ApplicationBase/Empresas/Views/uEditorEmpresa.dfm +++ b/Source/ApplicationBase/Empresas/Views/uEditorEmpresa.dfm @@ -88,6 +88,7 @@ inherited fEditorEmpresa: TfEditorEmpresa inherited pgPaginas: TPageControl Width = 668 Height = 420 + ActivePage = pagTiendas ExplicitTop = 112 ExplicitWidth = 668 ExplicitHeight = 420 @@ -120,246 +121,233 @@ inherited fEditorEmpresa: TfEditorEmpresa ExplicitHeight = 392 inherited PngSpeedButton1: TPngSpeedButton Left = 596 - Top = 295 + Top = 276 ExplicitLeft = 596 - ExplicitTop = 295 + ExplicitTop = 276 end inherited PngSpeedButton2: TPngSpeedButton Left = 596 - Top = 267 + Top = 248 ExplicitLeft = 596 - ExplicitTop = 267 + ExplicitTop = 248 end inherited eCalle: TcxDBTextEdit - Top = 270 + Top = 251 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitTop = 270 + ExplicitTop = 251 ExplicitWidth = 84 Width = 84 end inherited cbProvincia: TcxDBComboBox - Top = 297 + Top = 278 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitTop = 297 + ExplicitTop = 278 ExplicitWidth = 106 Width = 106 end inherited cbPoblacion: TcxDBComboBox - Top = 324 + Top = 305 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitTop = 324 + ExplicitTop = 305 ExplicitWidth = 100 Width = 100 end inherited eCodigoPostal: TcxDBTextEdit Left = 341 - Top = 297 + Top = 278 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 341 - ExplicitTop = 297 + ExplicitTop = 278 end inherited ePaginaWeb: TcxDBTextEdit Left = 529 - Top = 216 + Top = 197 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 529 - ExplicitTop = 216 + ExplicitTop = 197 ExplicitWidth = 165 Width = 165 end inherited eMailParticular: TcxDBTextEdit Left = 529 - Top = 189 + Top = 170 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 529 - ExplicitTop = 189 + ExplicitTop = 170 ExplicitWidth = 165 Width = 165 end inherited eMailTrabajo: TcxDBTextEdit Left = 529 - Top = 162 + Top = 143 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 529 - ExplicitTop = 162 + ExplicitTop = 143 ExplicitWidth = 129 Width = 129 end inherited eTlfParticular: TcxDBTextEdit Left = 529 - Top = 57 + Top = 38 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 529 - ExplicitTop = 57 + ExplicitTop = 38 ExplicitWidth = 91 Width = 91 end inherited eTlfTrabajo: TcxDBTextEdit Left = 529 - Top = 30 + Top = 11 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 529 - ExplicitTop = 30 + ExplicitTop = 11 ExplicitWidth = 127 Width = 127 end inherited eTlfMovil: TcxDBTextEdit Left = 529 - Top = 84 + Top = 65 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 529 - ExplicitTop = 84 + ExplicitTop = 65 ExplicitWidth = 155 Width = 155 end inherited eFax: TcxDBTextEdit Left = 529 - Top = 111 + Top = 92 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 529 - ExplicitTop = 111 + ExplicitTop = 92 ExplicitWidth = 121 Width = 121 end inherited eNombre: TcxDBTextEdit - Top = 30 + Top = 11 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitTop = 30 + ExplicitTop = 11 ExplicitWidth = 108 Width = 108 end inherited eNIFCIF: TcxDBTextEdit - Top = 57 + Top = 38 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitTop = 57 + ExplicitTop = 38 ExplicitWidth = 108 Width = 108 end inherited memRegistroMercantil: TcxDBMemo - Top = 84 + Top = 65 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitTop = 84 + ExplicitTop = 65 ExplicitWidth = 76 Width = 76 end inherited cxDBImage1: TcxDBImage Left = 434 - Top = 267 + Top = 248 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 434 - ExplicitTop = 267 + ExplicitTop = 248 ExplicitWidth = 140 ExplicitHeight = 100 Height = 100 Width = 140 end inherited cbFormaPago: TcxComboBox - Top = 165 - Enabled = True + Top = 146 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitTop = 165 + ExplicitTop = 146 ExplicitWidth = 359 Width = 359 end inherited cbTipoIVA: TcxComboBox - Top = 138 + Top = 119 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitTop = 138 + ExplicitTop = 119 ExplicitWidth = 202 Width = 202 end inherited frViewObservaciones1: TfrViewObservaciones - Top = 375 + Top = 356 Width = 521 Height = 150 - ExplicitTop = 375 + ExplicitTop = 356 ExplicitWidth = 521 ExplicitHeight = 150 inherited memObservaciones: TcxDBMemo DataBinding.DataSource = frViewEmpresa1.DADataSource - ExplicitWidth = 384 - ExplicitHeight = 20 Height = 150 Width = 521 end end inherited eValidez: TcxDBSpinEdit - Top = 192 + Top = 173 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitTop = 192 + ExplicitTop = 173 ExplicitWidth = 121 Width = 121 end inherited ePrecioPunto: TcxDBCurrencyEdit - Top = 219 - ExplicitTop = 219 + Top = 200 + ExplicitTop = 200 ExplicitWidth = 121 Width = 121 end - inherited dxLayoutControl1Group_Root: TdxLayoutGroup - inherited dxLayoutControl1Group4: TdxLayoutGroup - inherited dxLayoutControl1Group1: TdxLayoutGroup - inherited dxLayoutControl1Item18: TdxLayoutItem - Enabled = True - Visible = True - end - end - end - end end end end @@ -396,9 +384,7 @@ inherited fEditorEmpresa: TfEditorEmpresa end object pagTiendas: TTabSheet Caption = 'Tiendas' - Enabled = False ImageIndex = 2 - TabVisible = False inline frViewTiendas1: TfrViewTiendas Left = 0 Top = 0 diff --git a/Source/ApplicationBase/Empresas/Views/uEditorTiendaEmpresa.dfm b/Source/ApplicationBase/Empresas/Views/uEditorTiendaEmpresa.dfm index a6f02a5..4a83950 100644 --- a/Source/ApplicationBase/Empresas/Views/uEditorTiendaEmpresa.dfm +++ b/Source/ApplicationBase/Empresas/Views/uEditorTiendaEmpresa.dfm @@ -146,6 +146,7 @@ object fEditorTiendaEmpresa: TfEditorTiendaEmpresa Height = 58 Anchors = [akLeft, akTop, akRight] Shape = bsFrame + Visible = False ExplicitWidth = 328 end object Label10: TLabel diff --git a/Source/ApplicationBase/Empresas/Views/uEditorTiendaEmpresa.pas b/Source/ApplicationBase/Empresas/Views/uEditorTiendaEmpresa.pas index c6b9baa..bad84bf 100644 --- a/Source/ApplicationBase/Empresas/Views/uEditorTiendaEmpresa.pas +++ b/Source/ApplicationBase/Empresas/Views/uEditorTiendaEmpresa.pas @@ -179,6 +179,11 @@ begin Label10.Visible := False; eCodigoContable.Visible := False; {$ENDIF} + + //Lo desactivamos porque a ellos no les interesa + Bevel2.Visible := False; + Label10.Visible := False; + eCodigoContable.Visible := False; end; destructor TfEditorTiendaEmpresa.Destroy; diff --git a/Source/ApplicationBase/Empresas/Views/uViewTiendas.dfm b/Source/ApplicationBase/Empresas/Views/uViewTiendas.dfm index ce0d44a..d1c7c6c 100644 --- a/Source/ApplicationBase/Empresas/Views/uViewTiendas.dfm +++ b/Source/ApplicationBase/Empresas/Views/uViewTiendas.dfm @@ -78,6 +78,8 @@ inherited frViewTiendas: TfrViewTiendas object cxGridViewCODIGO_CONTABLE: TcxGridDBColumn Caption = 'C'#243'd.Contable' DataBinding.FieldName = 'CODIGO_CONTABLE' + Visible = False + VisibleForCustomization = False end end end diff --git a/Source/ApplicationBase/Empresas/Views/uViewTiendas.pas b/Source/ApplicationBase/Empresas/Views/uViewTiendas.pas index 7cceefb..5e7940b 100644 --- a/Source/ApplicationBase/Empresas/Views/uViewTiendas.pas +++ b/Source/ApplicationBase/Empresas/Views/uViewTiendas.pas @@ -74,6 +74,10 @@ begin cxGridViewCODIGO_CONTABLE.VisibleForCustomization := false; cxGridViewCODIGO_CONTABLE.Visible := false; {$ENDIF} + + //Lo desactivamos porque a ellos no les interesa + cxGridViewCODIGO_CONTABLE.VisibleForCustomization := false; + cxGridViewCODIGO_CONTABLE.Visible := false; end; procedure TfrViewTiendas.cxGridViewDblClick(Sender: TObject);