diff --git a/Build/Build.fbl6 b/Build/Build.fbl6 index e775dd7..d9df602 100644 Binary files a/Build/Build.fbl6 and b/Build/Build.fbl6 differ diff --git a/Build/Build.fbpInf b/Build/Build.fbpInf index 7201f83..3a632be 100644 --- a/Build/Build.fbpInf +++ b/Build/Build.fbpInf @@ -14,8 +14,8 @@ - 00:03:22 - 09/09/2016 18:07:38 + 00:00:00 + 21/01/2020 11:30:34 False diff --git a/Build/Build.fbz6 b/Build/Build.fbz6 index 5b2cff9..6256153 100644 Binary files a/Build/Build.fbz6 and b/Build/Build.fbz6 differ diff --git a/Source/ApplicationBase/Empresas/Views/uEditorEmpresa.dfm b/Source/ApplicationBase/Empresas/Views/uEditorEmpresa.dfm index ee6b704..7ac97b6 100644 --- a/Source/ApplicationBase/Empresas/Views/uEditorEmpresa.dfm +++ b/Source/ApplicationBase/Empresas/Views/uEditorEmpresa.dfm @@ -14,6 +14,7 @@ inherited fEditorEmpresa: TfEditorEmpresa inherited JvNavPanelHeader: TJvNavPanelHeader Width = 674 Caption = 'Empresa' + ExplicitTop = 49 ExplicitWidth = 674 inherited Image1: TImage Left = 647 @@ -87,6 +88,7 @@ inherited fEditorEmpresa: TfEditorEmpresa inherited pgPaginas: TPageControl Width = 668 Height = 423 + ActivePage = pagDatosBancarios ExplicitTop = 109 ExplicitWidth = 668 ExplicitHeight = 423 @@ -160,95 +162,95 @@ inherited fEditorEmpresa: TfEditorEmpresa Width = 100 end inherited eCodigoPostal: TcxDBTextEdit - Left = 351 + Left = 354 Top = 270 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 351 + ExplicitLeft = 354 ExplicitTop = 270 end inherited ePaginaWeb: TcxDBTextEdit - Left = 539 + Left = 542 Top = 216 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 539 + ExplicitLeft = 542 ExplicitTop = 216 ExplicitWidth = 165 Width = 165 end inherited eMailParticular: TcxDBTextEdit - Left = 539 + Left = 542 Top = 189 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 539 + ExplicitLeft = 542 ExplicitTop = 189 ExplicitWidth = 165 Width = 165 end inherited eMailTrabajo: TcxDBTextEdit - Left = 539 + Left = 542 Top = 162 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 539 + ExplicitLeft = 542 ExplicitTop = 162 ExplicitWidth = 129 Width = 129 end inherited eTlfParticular: TcxDBTextEdit - Left = 539 + Left = 542 Top = 57 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 539 + ExplicitLeft = 542 ExplicitTop = 57 ExplicitWidth = 91 Width = 91 end inherited eTlfTrabajo: TcxDBTextEdit - Left = 539 + Left = 542 Top = 30 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 539 + ExplicitLeft = 542 ExplicitTop = 30 ExplicitWidth = 127 Width = 127 end inherited eTlfMovil: TcxDBTextEdit - Left = 539 + Left = 542 Top = 84 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 539 + ExplicitLeft = 542 ExplicitTop = 84 ExplicitWidth = 155 Width = 155 end inherited eFax: TcxDBTextEdit - Left = 539 + Left = 542 Top = 111 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 539 + ExplicitLeft = 542 ExplicitTop = 111 ExplicitWidth = 121 Width = 121 @@ -284,13 +286,13 @@ inherited fEditorEmpresa: TfEditorEmpresa Width = 76 end inherited cxDBImage1: TcxDBImage - Left = 444 + Left = 447 Top = 267 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 444 + ExplicitLeft = 447 ExplicitTop = 267 ExplicitWidth = 140 ExplicitHeight = 100 @@ -388,7 +390,9 @@ inherited fEditorEmpresa: TfEditorEmpresa end object pagTiendas: TTabSheet Caption = 'Tiendas' + Enabled = False ImageIndex = 2 + TabVisible = False inline frViewTiendas1: TfrViewTiendas Left = 0 Top = 0 @@ -409,7 +413,7 @@ inherited fEditorEmpresa: TfEditorEmpresa Width = 660 Height = 370 ExplicitWidth = 660 - ExplicitHeight = 400 + ExplicitHeight = 370 inherited cxGridView: TcxGridDBTableView inherited cxGridViewCODIGO_CONTABLE: TcxGridDBColumn VisibleForCustomization = False @@ -419,24 +423,13 @@ inherited fEditorEmpresa: TfEditorEmpresa inherited ToolBar1: TToolBar Width = 660 ExplicitWidth = 660 - inherited ToolButton1: TToolButton - ExplicitWidth = 113 - end - inherited ToolButton4: TToolButton - ExplicitWidth = 113 - end - inherited ToolButton2: TToolButton - ExplicitWidth = 113 - end - inherited ToolButton7: TToolButton - ExplicitWidth = 113 - end end end end end inherited PnlComentario: TPanel Width = 674 + ExplicitTop = 76 ExplicitWidth = 674 inherited lbComentario: TLabel Width = 664 diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj index 30adc8b..cd2da68 100644 --- a/Source/Base/Base.dproj +++ b/Source/Base/Base.dproj @@ -44,13 +44,6 @@ Package FalseTrueFalseLibreria base de FactuGESFalseFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0 - - - - - - - VCL for the Web Design Package for CodeGear RAD Studio CodeGear WebSnap Components CodeGear SOAP Components @@ -65,56 +58,56 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
fConfigurarConexion
TForm diff --git a/Source/Base/Base.res b/Source/Base/Base.res index 8b251f3..1641339 100644 Binary files a/Source/Base/Base.res and b/Source/Base/Base.res differ diff --git a/Source/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj index 38396e1..babf472 100644 --- a/Source/Cliente/FactuGES.dproj +++ b/Source/Cliente/FactuGES.dproj @@ -52,7 +52,9 @@ Delphi.Personality VCLApplication -FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse2940FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.9.4.0FactuGESFactuGES2.9.4.0 +FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse1000FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.0.0.0FactuGES v2FactuGES v22.0.0.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 4090cea..7ba51c2 100644 Binary files a/Source/Cliente/FactuGES.res and b/Source/Cliente/FactuGES.res differ diff --git a/Source/Cliente/uPantallaPrincipal.dfm b/Source/Cliente/uPantallaPrincipal.dfm index 715d7c5..178a0b5 100644 --- a/Source/Cliente/uPantallaPrincipal.dfm +++ b/Source/Cliente/uPantallaPrincipal.dfm @@ -687,6 +687,8 @@ object fPantallaPrincipal: TfPantallaPrincipal object Logistica1: TMenuItem Tag = 5000 Action = actMenuLogistica + Enabled = False + Visible = False object N7: TMenuItem Tag = 200 Caption = '-' @@ -699,10 +701,14 @@ object fPantallaPrincipal: TfPantallaPrincipal object Contabilidad1: TMenuItem Tag = 6000 Action = actMenuContabilidad + Enabled = False + Visible = False end object Informes1: TMenuItem Tag = 7000 Action = actMenuInformes + Enabled = False + Visible = False end end object JvXPMenuItemPainter1: TJvXPMenuItemPainter diff --git a/Source/Cliente/uPantallaPrincipal.pas b/Source/Cliente/uPantallaPrincipal.pas index dc09015..802a112 100644 --- a/Source/Cliente/uPantallaPrincipal.pas +++ b/Source/Cliente/uPantallaPrincipal.pas @@ -211,8 +211,7 @@ begin if (AppFactuGES.UsuarioActivo.ID_PERFIL <> CTE_PERFIL_ADMINISTRADOR) then begin Administracin1.Visible := False; - if (AppFactuGES.UsuarioActivo.ID_PERFIL <> CTE_PREFIL_GERENCIA) then - ConfigurarFactuGES1.Visible := False; + ConfigurarFactuGES1.Visible := False; end; end; diff --git a/Source/FactuGES.inc b/Source/FactuGES.inc index f533eae..d4ff338 100644 --- a/Source/FactuGES.inc +++ b/Source/FactuGES.inc @@ -1,4 +1,4 @@ -{$DEFINE MULTIEMPRESA} -{$DEFINE ALMACEN} -{$DEFINE PEDIDOSPROVEEDOR} +{DEFINE MULTIEMPRESA} +{DEFINE ALMACEN} +{DEFINE PEDIDOSPROVEEDOR} {$DEFINE CONTABILIDAD} \ No newline at end of file diff --git a/Source/GUIBase/GUIBase.dproj b/Source/GUIBase/GUIBase.dproj index 4054510..84e7139 100644 --- a/Source/GUIBase/GUIBase.dproj +++ b/Source/GUIBase/GUIBase.dproj @@ -58,34 +58,34 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + +
fDialogBase
 diff --git a/Source/GUIBase/GUIBase.res b/Source/GUIBase/GUIBase.res index 8b251f3..1641339 100644 Binary files a/Source/GUIBase/GUIBase.res and b/Source/GUIBase/GUIBase.res differ diff --git a/Source/GUIBase/uViewTotales.dfm b/Source/GUIBase/uViewTotales.dfm index 7bf77e4..7255ad7 100644 --- a/Source/GUIBase/uViewTotales.dfm +++ b/Source/GUIBase/uViewTotales.dfm @@ -1,14 +1,14 @@ inherited frViewTotales: TfrViewTotales - Width = 788 - Height = 224 + Width = 935 + Height = 266 Align = alBottom - ExplicitWidth = 451 - ExplicitHeight = 224 + ExplicitWidth = 935 + ExplicitHeight = 266 object dxLayoutControl1: TdxLayoutControl AlignWithMargins = True Left = 0 Top = 0 - Width = 788 + Width = 935 Height = 217 Margins.Left = 0 Margins.Top = 0 @@ -21,14 +21,14 @@ inherited frViewTotales: TfrViewTotales AutoContentSizes = [acsWidth, acsHeight] ExplicitWidth = 451 object Bevel3: TBevel - Left = 389 + Left = 534 Top = 28 Width = 3 Height = 122 Shape = bsRightLine end object Bevel4: TBevel - Left = 501 + Left = 646 Top = 70 Width = 210 Height = 9 @@ -36,7 +36,7 @@ inherited frViewTotales: TfrViewTotales end object ImporteDto: TcxDBCurrencyEdit Left = 175 - Top = 55 + Top = 82 AutoSize = False DataBinding.DataField = 'IMPORTE_DESCUENTO' DataBinding.DataSource = DADataSource @@ -61,12 +61,12 @@ inherited frViewTotales: TfrViewTotales StyleDisabled.TextColor = clWindowText StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 2 + TabOrder = 3 Height = 21 Width = 93 end object ImporteIVA: TcxDBCurrencyEdit - Left = 572 + Left = 717 Top = 105 AutoSize = False DataBinding.DataField = 'IMPORTE_IVA' @@ -92,12 +92,12 @@ inherited frViewTotales: TfrViewTotales StyleDisabled.TextColor = clWindowText StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 9 + TabOrder = 10 Height = 21 Width = 137 end object ImporteTotal: TcxDBCurrencyEdit - Left = 502 + Left = 647 Top = 159 AutoSize = False DataBinding.DataField = 'IMPORTE_TOTAL' @@ -124,13 +124,13 @@ inherited frViewTotales: TfrViewTotales StyleDisabled.TextColor = clWindowText StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 12 + TabOrder = 13 Height = 21 Width = 137 end object edtDescuento: TcxDBSpinEdit Left = 104 - Top = 55 + Top = 82 AutoSize = False DataBinding.DataField = 'DESCUENTO' DataBinding.DataSource = DADataSource @@ -154,12 +154,12 @@ inherited frViewTotales: TfrViewTotales StyleDisabled.LookAndFeel.NativeStyle = True StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 1 + TabOrder = 2 Height = 21 Width = 65 end object edtIVA: TcxDBSpinEdit - Left = 501 + Left = 646 Top = 105 AutoSize = False DataBinding.DataField = 'IVA' @@ -191,12 +191,12 @@ inherited frViewTotales: TfrViewTotales StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 8 + TabOrder = 9 Height = 21 Width = 65 end object ImporteBase: TcxDBCurrencyEdit - Left = 501 + Left = 646 Top = 28 AutoSize = False DataBinding.DataField = 'BASE_IMPONIBLE' @@ -221,12 +221,12 @@ inherited frViewTotales: TfrViewTotales StyleDisabled.TextColor = clWindowText StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 7 + TabOrder = 8 Height = 21 Width = 92 end object edtRE: TcxDBSpinEdit - Left = 501 + Left = 646 Top = 132 AutoSize = False DataBinding.DataField = 'RE' @@ -258,12 +258,12 @@ inherited frViewTotales: TfrViewTotales StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 10 + TabOrder = 11 Height = 21 Width = 65 end object ImporteRE: TcxDBCurrencyEdit - Left = 572 + Left = 717 Top = 132 AutoSize = False DataBinding.DataField = 'IMPORTE_RE' @@ -289,13 +289,13 @@ inherited frViewTotales: TfrViewTotales StyleDisabled.TextColor = clWindowText StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 11 + TabOrder = 12 Height = 21 Width = 56 end object eImporteNeto: TcxDBCurrencyEdit Left = 104 - Top = 28 + Top = 55 AutoSize = False DataBinding.DataField = 'IMPORTE_NETO' DataBinding.DataSource = DADataSource @@ -320,13 +320,13 @@ inherited frViewTotales: TfrViewTotales StyleDisabled.TextColor = clWindowText StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 0 + TabOrder = 1 Height = 21 Width = 147 end object ePorte: TcxDBCurrencyEdit Left = 104 - Top = 82 + Top = 109 AutoSize = False DataBinding.DataField = 'IMPORTE_PORTE' DataBinding.DataSource = DADataSource @@ -350,13 +350,13 @@ inherited frViewTotales: TfrViewTotales StyleDisabled.TextColor = clWindowText StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 3 + TabOrder = 4 Height = 21 Width = 147 end object eIVA: TcxDBLookupComboBox Left = 104 - Top = 109 + Top = 136 DataBinding.DataField = 'ID_TIPO_IVA' DataBinding.DataSource = DADataSource Properties.DropDownListStyle = lsFixedList @@ -383,20 +383,20 @@ inherited frViewTotales: TfrViewTotales StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 4 + TabOrder = 5 Width = 81 end object bTiposIVA: TButton - Left = 241 - Top = 109 + Left = 386 + Top = 136 Width = 132 Height = 21 Caption = 'Ver los tipos de IVA...' - TabOrder = 5 + TabOrder = 6 end object cbRecargoEquivalencia: TcxDBCheckBox Left = 104 - Top = 136 + Top = 163 Caption = 'Aplicar recargo de equivalencia' DataBinding.DataField = 'RECARGO_EQUIVALENCIA' DataBinding.DataSource = DADataSource @@ -417,9 +417,37 @@ inherited frViewTotales: TfrViewTotales StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 6 + TabOrder = 7 Width = 219 end + object eImporteDetalleResumen: TcxDBCurrencyEdit + Left = 104 + Top = 28 + AutoSize = False + ParentFont = False + Properties.Alignment.Horz = taRightJustify + Properties.ReadOnly = True + Properties.UseLeftAlignmentOnEditing = False + Properties.UseThousandSeparator = True + Style.BorderColor = clWindowFrame + Style.BorderStyle = ebs3D + Style.Font.Charset = DEFAULT_CHARSET + Style.Font.Color = clWindowText + Style.Font.Height = -11 + Style.Font.Name = 'Tahoma' + Style.Font.Style = [fsBold] + Style.HotTrack = False + Style.LookAndFeel.NativeStyle = True + Style.TextColor = clWindowText + Style.IsFontAssigned = True + StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.TextColor = clWindowText + StyleFocused.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.NativeStyle = True + TabOrder = 0 + Height = 21 + Width = 342 + end object dxLayoutControl1Group_Root: TdxLayoutGroup ShowCaption = False Hidden = True @@ -433,6 +461,12 @@ inherited frViewTotales: TfrViewTotales ShowCaption = False Hidden = True ShowBorder = False + object dxLayoutControl1Item10: TdxLayoutItem + Caption = 'ImporteNeto:' + Visible = False + Control = eImporteDetalleResumen + ControlOptions.ShowBorder = False + end object dxLayoutControl1Item8: TdxLayoutItem AutoAligns = [aaVertical] AlignHorz = ahClient diff --git a/Source/GUIBase/uViewTotales.pas b/Source/GUIBase/uViewTotales.pas index 7458376..0f2d847 100644 --- a/Source/GUIBase/uViewTotales.pas +++ b/Source/GUIBase/uViewTotales.pas @@ -59,6 +59,8 @@ type cbRecargoEquivalencia: TcxDBCheckBox; dxLayoutControl1Group10: TdxLayoutGroup; dxLayoutControl1Group11: TdxLayoutGroup; + dxLayoutControl1Item10: TdxLayoutItem; + eImporteDetalleResumen: TcxDBCurrencyEdit; public { Public declarations } end; diff --git a/Source/Informes/1/InfContratoCliente.fr3 b/Source/Informes/1/InfContratoCliente.fr3 new file mode 100644 index 0000000..fb03756 --- /dev/null +++ b/Source/Informes/1/InfContratoCliente.fr3 @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Source/Lib/ApplicationBase.dcp b/Source/Lib/ApplicationBase.dcp index cd66ef4..b4d91de 100644 Binary files a/Source/Lib/ApplicationBase.dcp and b/Source/Lib/ApplicationBase.dcp differ diff --git a/Source/Lib/Base.dcp b/Source/Lib/Base.dcp index abd1863..a6b481b 100644 Binary files a/Source/Lib/Base.dcp and b/Source/Lib/Base.dcp differ diff --git a/Source/Lib/GUIBase.dcp b/Source/Lib/GUIBase.dcp index 99148aa..92145c2 100644 Binary files a/Source/Lib/GUIBase.dcp and b/Source/Lib/GUIBase.dcp differ diff --git a/Source/Modulos/Albaranes de cliente/Plugin/uPluginAlbaranesCliente.dfm b/Source/Modulos/Albaranes de cliente/Plugin/uPluginAlbaranesCliente.dfm index f7ad328..b68500c 100644 --- a/Source/Modulos/Albaranes de cliente/Plugin/uPluginAlbaranesCliente.dfm +++ b/Source/Modulos/Albaranes de cliente/Plugin/uPluginAlbaranesCliente.dfm @@ -254,7 +254,9 @@ object PluginAlbaranesCliente: TPluginAlbaranesCliente object actAlbaranesCliente: TAction Category = 'Ventas' Caption = 'Albaranes de cliente' + Enabled = False ImageIndex = 0 + Visible = False OnExecute = actAlbaranesClienteExecute end object actAlbaranesDevCliente: TAction diff --git a/Source/Modulos/Comisiones/Plugin/uPluginComisiones.dfm b/Source/Modulos/Comisiones/Plugin/uPluginComisiones.dfm index fe77f62..a4a9ead 100644 --- a/Source/Modulos/Comisiones/Plugin/uPluginComisiones.dfm +++ b/Source/Modulos/Comisiones/Plugin/uPluginComisiones.dfm @@ -65,7 +65,9 @@ object PluginComisiones: TPluginComisiones object actComisiones: TAction Category = 'Comisiones' Caption = 'Liquidaciones de comisiones' + Enabled = False ImageIndex = 0 + Visible = False OnExecute = actComisionesExecute OnUpdate = actComisionesUpdate end diff --git a/Source/Modulos/Contabilidad/Plugin/uPluginContabilidad.dfm b/Source/Modulos/Contabilidad/Plugin/uPluginContabilidad.dfm index 1714f95..dfccc92 100644 --- a/Source/Modulos/Contabilidad/Plugin/uPluginContabilidad.dfm +++ b/Source/Modulos/Contabilidad/Plugin/uPluginContabilidad.dfm @@ -620,14 +620,18 @@ object PluginContabilidad: TPluginContabilidad object actBalances: TAction Category = 'Contabilidad' Caption = 'Balances' + Enabled = False ImageIndex = 5 + Visible = False OnExecute = actBalancesExecute OnUpdate = actBalancesUpdate end object actCuentasEspeciales: TAction Category = 'Contabilidad' Caption = 'Cuentas especiales' + Enabled = False ImageIndex = 6 + Visible = False OnExecute = actCuentasEspecialesExecute OnUpdate = actCuentasEspecialesUpdate end diff --git a/Source/Modulos/Contactos/Plugin/uPluginContactos.dfm b/Source/Modulos/Contactos/Plugin/uPluginContactos.dfm index 573910b..e0a9a56 100644 --- a/Source/Modulos/Contactos/Plugin/uPluginContactos.dfm +++ b/Source/Modulos/Contactos/Plugin/uPluginContactos.dfm @@ -286,12 +286,16 @@ object PluginContactos: TPluginContactos end object actGruposCliente: TAction Caption = 'Grupos de cliente' + Enabled = False ImageIndex = 5 + Visible = False OnExecute = actGruposClienteExecute end object actGruposProveedor: TAction Caption = 'Grupos de proveedor' + Enabled = False ImageIndex = 5 + Visible = False OnExecute = actGruposProveedorExecute end object actProcedenciasCliente: TAction diff --git a/Source/Modulos/Contactos/Views/Contactos_view.dproj b/Source/Modulos/Contactos/Views/Contactos_view.dproj index 172ba72..0166601 100644 --- a/Source/Modulos/Contactos/Views/Contactos_view.dproj +++ b/Source/Modulos/Contactos/Views/Contactos_view.dproj @@ -47,40 +47,40 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
fEditorCliente
diff --git a/Source/Modulos/Contactos/Views/uEditorCliente.dfm b/Source/Modulos/Contactos/Views/uEditorCliente.dfm index 9b12390..2c13aed 100644 --- a/Source/Modulos/Contactos/Views/uEditorCliente.dfm +++ b/Source/Modulos/Contactos/Views/uEditorCliente.dfm @@ -4,7 +4,6 @@ inherited fEditorCliente: TfEditorCliente Caption = 'Ficha de cliente' ClientHeight = 1052 ClientWidth = 994 - ExplicitTop = -70 ExplicitWidth = 1002 ExplicitHeight = 1086 PixelsPerInch = 96 @@ -12,7 +11,8 @@ inherited fEditorCliente: TfEditorCliente inherited JvNavPanelHeader: TJvNavPanelHeader Width = 994 Caption = 'Ficha de cliente' - ExplicitWidth = 998 + ExplicitTop = 49 + ExplicitWidth = 994 inherited Image1: TImage Left = 967 Picture.Data = { @@ -51,9 +51,9 @@ inherited fEditorCliente: TfEditorCliente end inherited TBXDock: TTBXDock Width = 994 - ExplicitWidth = 998 + ExplicitWidth = 994 inherited tbxMain: TTBXToolbar - ExplicitWidth = 579 + ExplicitWidth = 446 object TBXItem7: TTBXItem [7] Action = actGruposCliente DisplayMode = nbdmImageAndText @@ -66,32 +66,34 @@ inherited fEditorCliente: TfEditorCliente inherited StatusBar: TJvStatusBar Top = 1033 Width = 994 - ExplicitTop = 833 - ExplicitWidth = 998 + ExplicitTop = 1033 + ExplicitWidth = 994 end inherited pgPaginas: TPageControl Width = 988 - Height = 912 - ExplicitWidth = 992 - ExplicitHeight = 712 + Height = 921 + ExplicitTop = 109 + ExplicitWidth = 988 + ExplicitHeight = 921 inherited pagGeneral: TTabSheet - ExplicitLeft = 0 - ExplicitTop = 0 - ExplicitWidth = 984 - ExplicitHeight = 684 + ExplicitWidth = 980 + ExplicitHeight = 893 inherited frViewPersonalContacto1: TfrViewPersonalContacto - Top = 681 + Top = 690 Width = 980 + Enabled = False TabOrder = 1 - ExplicitTop = 681 + Visible = False + ExplicitTop = 690 ExplicitWidth = 980 inherited cxGrid: TcxGrid Width = 980 - ExplicitWidth = 984 + ExplicitWidth = 980 + ExplicitHeight = 178 end inherited ToolBar1: TToolBar Width = 980 - ExplicitWidth = 984 + ExplicitWidth = 980 inherited ToolButton1: TToolButton ExplicitWidth = 62 end @@ -110,7 +112,7 @@ inherited fEditorCliente: TfEditorCliente Left = 0 Top = 0 Width = 980 - Height = 681 + Height = 690 Align = alClient Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -120,14 +122,14 @@ inherited fEditorCliente: TfEditorCliente ParentFont = False TabOrder = 0 ReadOnly = False - ExplicitWidth = 984 - ExplicitHeight = 534 + ExplicitWidth = 980 + ExplicitHeight = 690 inherited dxLayoutControlContacto: TdxLayoutControl Width = 980 - Height = 681 + Height = 690 LookAndFeel = dxLayoutOfficeLookAndFeel - ExplicitWidth = 984 - ExplicitHeight = 534 + ExplicitWidth = 980 + ExplicitHeight = 690 inherited PngSpeedButton1: TPngSpeedButton Left = 935 Top = 218 @@ -148,18 +150,30 @@ inherited fEditorCliente: TfEditorCliente end inherited eCalle: TcxDBTextEdit Top = 216 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitTop = 216 ExplicitWidth = 428 Width = 428 end inherited cbProvincia: TcxDBComboBox Top = 243 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitTop = 243 ExplicitWidth = 336 Width = 336 end inherited cbPoblacion: TcxDBComboBox Top = 270 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitTop = 270 ExplicitWidth = 428 Width = 428 @@ -167,12 +181,20 @@ inherited fEditorCliente: TfEditorCliente inherited eCodigoPostal: TcxDBTextEdit Left = 568 Top = 243 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 568 ExplicitTop = 243 end inherited eTlfParticular: TcxDBTextEdit Left = 747 Top = 57 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 747 ExplicitTop = 57 ExplicitWidth = 177 @@ -180,36 +202,61 @@ inherited fEditorCliente: TfEditorCliente end inherited eNombreComercial: TcxDBTextEdit Top = 84 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitTop = 84 ExplicitWidth = 428 Width = 428 end inherited cbClienteBloqueado: TcxDBCheckBox Top = 348 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitTop = 348 ExplicitWidth = 538 Width = 538 end inherited cbGrupoCliente: TcxDBComboBox Top = 138 + Enabled = False + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitTop = 138 ExplicitWidth = 428 Width = 428 end inherited eBloqueo: TcxDBTextEdit Top = 375 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitTop = 375 ExplicitWidth = 428 Width = 428 end inherited eCodigoAsignado: TcxDBTextEdit Top = 111 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitTop = 111 ExplicitWidth = 428 Width = 428 end inherited cbProcedenciaCliente: TcxDBComboBox Top = 165 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitTop = 165 ExplicitWidth = 428 Width = 428 @@ -217,6 +264,10 @@ inherited fEditorCliente: TfEditorCliente inherited eTlfTrabajo: TcxDBTextEdit Left = 747 Top = 30 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 747 ExplicitTop = 30 ExplicitWidth = 177 @@ -225,6 +276,10 @@ inherited fEditorCliente: TfEditorCliente inherited eTlfMovil: TcxDBTextEdit Left = 747 Top = 84 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 747 ExplicitTop = 84 ExplicitWidth = 177 @@ -233,6 +288,10 @@ inherited fEditorCliente: TfEditorCliente inherited eFax: TcxDBTextEdit Left = 747 Top = 111 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 747 ExplicitTop = 111 ExplicitWidth = 177 @@ -240,6 +299,10 @@ inherited fEditorCliente: TfEditorCliente end inherited eNombre: TcxDBTextEdit Top = 57 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitTop = 57 ExplicitWidth = 428 Width = 428 @@ -247,6 +310,10 @@ inherited fEditorCliente: TfEditorCliente inherited eNIFCIF: TcxDBTextEdit Left = 315 Top = 30 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 315 ExplicitTop = 30 ExplicitWidth = 271 @@ -256,6 +323,10 @@ inherited fEditorCliente: TfEditorCliente Left = 747 Top = 162 Properties.Prefix = 'mailto:' + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 747 ExplicitTop = 162 ExplicitWidth = 148 @@ -265,6 +336,10 @@ inherited fEditorCliente: TfEditorCliente Left = 747 Top = 190 Properties.Prefix = 'mailto:' + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 747 ExplicitTop = 190 ExplicitWidth = 148 @@ -273,6 +348,10 @@ inherited fEditorCliente: TfEditorCliente inherited ePaginaWeb: TcxDBHyperLinkEdit Left = 747 Top = 217 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 747 ExplicitTop = 217 ExplicitWidth = 148 @@ -280,12 +359,20 @@ inherited fEditorCliente: TfEditorCliente end inherited eReferencia: TcxDBTextEdit Top = 30 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitTop = 30 ExplicitWidth = 104 Width = 104 end inherited ePersonaContacto: TcxDBTextEdit Top = 297 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitTop = 297 ExplicitWidth = 428 Width = 428 @@ -297,6 +384,10 @@ inherited fEditorCliente: TfEditorCliente ExplicitTop = 270 inherited dxLayoutControl1: TdxLayoutControl inherited cbTienda: TcxComboBox + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 229 Width = 229 end @@ -313,6 +404,26 @@ inherited fEditorCliente: TfEditorCliente Width = 521 end end + inherited dxLayoutControlContactoGroup_Root: TdxLayoutGroup + inherited dxLayoutControlContactoGroup9: TdxLayoutGroup + inherited dxLayoutControlContactoGroup4: TdxLayoutGroup + inherited dxLayoutControlContactoGroup1: TdxLayoutGroup + inherited dxLayoutControlContactoItem24: TdxLayoutItem + Visible = False + end + inherited dxLayoutControlContactoItem19: TdxLayoutItem + Enabled = False + Visible = False + end + end + end + inherited dxLayoutControlContactoGroup6: TdxLayoutGroup + inherited dxLayoutControlContactoGroup100: TdxLayoutGroup + Visible = False + end + end + end + end end inherited dsContacto: TDADataSource Left = 24 @@ -321,13 +432,15 @@ inherited fEditorCliente: TfEditorCliente end end inherited pagDatosBancarios: TTabSheet + Enabled = False + TabVisible = False ExplicitWidth = 980 - ExplicitHeight = 884 + ExplicitHeight = 893 inherited frViewClienteDatosBancarios: TfrViewClienteDatosBancarios Width = 980 - Height = 884 + Height = 893 ExplicitWidth = 980 - ExplicitHeight = 884 + ExplicitHeight = 893 inherited dxLayoutControl1: TdxLayoutControl Width = 980 LookAndFeel = dxLayoutOfficeLookAndFeel @@ -354,20 +467,24 @@ inherited fEditorCliente: TfEditorCliente end end inherited pagPersonal: TTabSheet + Enabled = False + TabVisible = False ExplicitLeft = 4 ExplicitTop = 24 - ExplicitWidth = 984 - ExplicitHeight = 684 + ExplicitWidth = 980 + ExplicitHeight = 893 inherited memObservaciones22: TcxDBMemo ExplicitWidth = 980 - ExplicitHeight = 884 - Height = 884 + ExplicitHeight = 893 + Height = 893 Width = 980 end end object pagDatosComerciales: TTabSheet Caption = 'Datos comerciales' + Enabled = False ImageIndex = 4 + TabVisible = False inline frViewClienteDatosComerciales1: TfrViewClienteDatosComerciales Left = 0 Top = 0 @@ -401,23 +518,39 @@ inherited fEditorCliente: TfEditorCliente inherited eDiasVencimiento: TcxDBSpinEdit Left = 710 Top = 62 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 710 ExplicitTop = 62 end inherited cbRegimenIVA: TcxDBComboBox Top = 30 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitTop = 30 ExplicitWidth = 427 Width = 427 end inherited cbRecargoEquivalencia: TcxDBCheckBox Top = 111 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitTop = 111 ExplicitWidth = 427 Width = 427 end inherited cbFormaPago: TcxDBLookupComboBox Top = 57 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitTop = 57 ExplicitWidth = 289 Width = 289 @@ -430,6 +563,10 @@ inherited fEditorCliente: TfEditorCliente end inherited eIVA: TcxDBLookupComboBox Top = 84 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitTop = 84 ExplicitWidth = 289 Width = 289 @@ -443,12 +580,20 @@ inherited fEditorCliente: TfEditorCliente inherited cxDBSpinEdit1: TcxDBSpinEdit Left = 710 Top = 89 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 710 ExplicitTop = 89 end inherited cxDBSpinEdit2: TcxDBSpinEdit Left = 710 Top = 116 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 710 ExplicitTop = 116 end @@ -464,12 +609,14 @@ inherited fEditorCliente: TfEditorCliente end object pagDirecciones: TTabSheet Caption = 'Direcciones' + Enabled = False ImageIndex = 1 + TabVisible = False inline frViewDireccionesEntrega1: TfrViewDireccionesEntrega Left = 0 Top = 0 Width = 980 - Height = 884 + Height = 893 Align = alClient Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -480,12 +627,12 @@ inherited fEditorCliente: TfEditorCliente TabOrder = 0 ReadOnly = False ExplicitWidth = 980 - ExplicitHeight = 884 + ExplicitHeight = 893 inherited cxGrid: TcxGrid Width = 980 - Height = 859 - ExplicitWidth = 984 - ExplicitHeight = 668 + Height = 868 + ExplicitWidth = 980 + ExplicitHeight = 868 inherited cxGridView: TcxGridDBTableView inherited cxGridViewID: TcxGridDBColumn SortIndex = 0 @@ -495,19 +642,7 @@ inherited fEditorCliente: TfEditorCliente end inherited ToolBar1: TToolBar Width = 980 - ExplicitWidth = 984 - inherited ToolButton1: TToolButton - ExplicitWidth = 113 - end - inherited ToolButton4: TToolButton - ExplicitWidth = 113 - end - inherited ToolButton2: TToolButton - ExplicitWidth = 113 - end - inherited ToolButton7: TToolButton - ExplicitWidth = 113 - end + ExplicitWidth = 980 end end end @@ -519,7 +654,7 @@ inherited fEditorCliente: TfEditorCliente Left = 0 Top = 0 Width = 980 - Height = 884 + Height = 893 Align = alClient Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -530,16 +665,16 @@ inherited fEditorCliente: TfEditorCliente TabOrder = 0 ReadOnly = False ExplicitWidth = 980 - ExplicitHeight = 884 + ExplicitHeight = 893 inherited cxGrid: TcxGrid Width = 980 - Height = 859 - ExplicitWidth = 984 - ExplicitHeight = 668 + Height = 868 + ExplicitWidth = 980 + ExplicitHeight = 868 end inherited ToolBar1: TToolBar Width = 980 - ExplicitWidth = 984 + ExplicitWidth = 980 inherited ToolButton1: TToolButton ExplicitWidth = 62 end @@ -557,16 +692,14 @@ inherited fEditorCliente: TfEditorCliente end object pagContabilidad: TTabSheet Caption = 'Contabilidad' + Enabled = False ImageIndex = 5 - ExplicitLeft = 0 - ExplicitTop = 0 - ExplicitWidth = 984 - ExplicitHeight = 684 + TabVisible = False inline frViewSubCuentaContacto1: TfrViewSubCuentaContacto Left = 0 Top = 0 Width = 980 - Height = 884 + Height = 893 Align = alClient AutoSize = True Font.Charset = DEFAULT_CHARSET @@ -577,17 +710,21 @@ inherited fEditorCliente: TfEditorCliente ParentFont = False TabOrder = 0 ReadOnly = False - ExplicitWidth = 984 - ExplicitHeight = 684 + ExplicitWidth = 980 + ExplicitHeight = 893 inherited layoutApunte: TdxLayoutControl Width = 980 - Height = 884 - ExplicitWidth = 984 - ExplicitHeight = 684 + Height = 893 + ExplicitWidth = 980 + ExplicitHeight = 893 DesignSize = ( 980 - 884) + 893) inherited eRefSubCuenta: TcxDBTextEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 441 Width = 441 end @@ -596,6 +733,10 @@ inherited fEditorCliente: TfEditorCliente ExplicitLeft = 638 end inherited eSubCuenta: TcxDBTextEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 779 Width = 779 end @@ -609,6 +750,10 @@ inherited fEditorCliente: TfEditorCliente end inherited cbIgnorarContabilidad: TcxDBCheckBox DataBinding.DataSource = frViewCliente1.dsContacto + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 862 Width = 862 end @@ -625,7 +770,12 @@ inherited fEditorCliente: TfEditorCliente end inherited PnlComentario: TPanel Width = 994 - ExplicitWidth = 998 + ExplicitTop = 76 + ExplicitWidth = 994 + inherited lbComentario: TLabel + Width = 984 + Height = 25 + end end inherited dsDataTable: TDADataSource Left = 16 diff --git a/Source/Modulos/Contactos/Views/uEditorCliente.pas b/Source/Modulos/Contactos/Views/uEditorCliente.pas index 43d9338..06a9490 100644 --- a/Source/Modulos/Contactos/Views/uEditorCliente.pas +++ b/Source/Modulos/Contactos/Views/uEditorCliente.pas @@ -72,9 +72,9 @@ begin ViewContacto := frViewCliente1; {$IFDEF CONTABILIDAD} - pagContabilidad.TabVisible := true; +// pagContabilidad.TabVisible := true; {$ELSE} - pagContabilidad.TabVisible := false; +// pagContabilidad.TabVisible := false; {$ENDIF} end; diff --git a/Source/Modulos/Contactos/Views/uEditorContacto.dfm b/Source/Modulos/Contactos/Views/uEditorContacto.dfm index 45be8f6..8e3788f 100644 --- a/Source/Modulos/Contactos/Views/uEditorContacto.dfm +++ b/Source/Modulos/Contactos/Views/uEditorContacto.dfm @@ -24,7 +24,7 @@ inherited fEditorContacto: TfEditorContacto Width = 949 ExplicitWidth = 949 inherited tbxMain: TTBXToolbar - ExplicitWidth = 423 + ExplicitWidth = 330 inherited TBXItem2: TTBXItem Visible = False end @@ -86,17 +86,17 @@ inherited fEditorContacto: TfEditorContacto end inherited pgPaginas: TPageControl Width = 943 - Height = 599 + Height = 608 ExplicitWidth = 943 ExplicitHeight = 599 inherited pagGeneral: TTabSheet ExplicitLeft = 4 ExplicitTop = 24 ExplicitWidth = 935 - ExplicitHeight = 571 + ExplicitHeight = 580 inline frViewPersonalContacto1: TfrViewPersonalContacto Left = 0 - Top = 368 + Top = 377 Width = 935 Height = 203 Align = alBottom @@ -108,7 +108,7 @@ inherited fEditorContacto: TfEditorContacto ParentFont = False TabOrder = 0 ReadOnly = False - ExplicitTop = 368 + ExplicitTop = 377 ExplicitWidth = 935 ExplicitHeight = 203 inherited cxGrid: TcxGrid @@ -120,6 +120,18 @@ inherited fEditorContacto: TfEditorContacto inherited ToolBar1: TToolBar Width = 935 ExplicitWidth = 935 + inherited ToolButton1: TToolButton + ExplicitWidth = 113 + end + inherited ToolButton4: TToolButton + ExplicitWidth = 113 + end + inherited ToolButton2: TToolButton + ExplicitWidth = 113 + end + inherited ToolButton7: TToolButton + ExplicitWidth = 113 + end end end end @@ -130,7 +142,7 @@ inherited fEditorContacto: TfEditorContacto Left = 0 Top = 0 Width = 935 - Height = 571 + Height = 580 Align = alClient Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -141,7 +153,7 @@ inherited fEditorContacto: TfEditorContacto TabOrder = 0 ReadOnly = False ExplicitWidth = 935 - ExplicitHeight = 571 + ExplicitHeight = 580 inherited dxLayoutControl1: TdxLayoutControl Width = 935 LookAndFeel = dxLayoutOfficeLookAndFeel @@ -182,6 +194,10 @@ inherited fEditorContacto: TfEditorContacto object pagPersonal: TTabSheet Caption = 'Observaciones' ImageIndex = 2 + ExplicitLeft = 0 + ExplicitTop = 0 + ExplicitWidth = 0 + ExplicitHeight = 0 object memObservaciones22: TcxDBMemo Left = 0 Top = 0 @@ -194,7 +210,7 @@ inherited fEditorContacto: TfEditorContacto StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True TabOrder = 0 - Height = 571 + Height = 580 Width = 935 end end @@ -202,10 +218,6 @@ inherited fEditorContacto: TfEditorContacto inherited PnlComentario: TPanel Width = 949 ExplicitWidth = 949 - inherited lbComentario: TLabel - Width = 939 - Height = 25 - end end inherited dsDataTable: TDADataSource [5] Left = 168 diff --git a/Source/Modulos/Contactos/Views/uEditorProveedor.dfm b/Source/Modulos/Contactos/Views/uEditorProveedor.dfm index 83d1440..6a73b27 100644 --- a/Source/Modulos/Contactos/Views/uEditorProveedor.dfm +++ b/Source/Modulos/Contactos/Views/uEditorProveedor.dfm @@ -8,7 +8,8 @@ inherited fEditorProveedor: TfEditorProveedor TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader Width = 945 - ExplicitWidth = 648 + ExplicitTop = 49 + ExplicitWidth = 945 inherited Image1: TImage Left = 918 Picture.Data = { @@ -47,7 +48,7 @@ inherited fEditorProveedor: TfEditorProveedor end inherited TBXDock: TTBXDock Width = 945 - ExplicitWidth = 648 + ExplicitWidth = 945 inherited tbxMenu: TTBXToolbar ExplicitWidth = 945 end @@ -55,32 +56,33 @@ inherited fEditorProveedor: TfEditorProveedor inherited StatusBar: TJvStatusBar Top = 801 Width = 945 - ExplicitTop = 571 - ExplicitWidth = 648 + ExplicitTop = 801 + ExplicitWidth = 945 end inherited pgPaginas: TPageControl Width = 939 Height = 689 - ExplicitWidth = 642 - ExplicitHeight = 459 + ExplicitTop = 109 + ExplicitWidth = 939 + ExplicitHeight = 689 inherited pagGeneral: TTabSheet - ExplicitWidth = 634 - ExplicitHeight = 431 + ExplicitWidth = 931 + ExplicitHeight = 661 inherited frViewPersonalContacto1: TfrViewPersonalContacto - Top = 511 + Top = 458 Width = 931 TabOrder = 1 - ExplicitTop = 281 - ExplicitWidth = 634 + Visible = False + ExplicitTop = 458 + ExplicitWidth = 931 inherited cxGrid: TcxGrid Width = 931 - ExplicitTop = 25 - ExplicitWidth = 634 - ExplicitHeight = 406 + ExplicitWidth = 931 + ExplicitHeight = 178 end inherited ToolBar1: TToolBar Width = 931 - ExplicitWidth = 634 + ExplicitWidth = 931 inherited ToolButton1: TToolButton ExplicitWidth = 62 end @@ -99,7 +101,7 @@ inherited fEditorProveedor: TfEditorProveedor Left = 0 Top = 0 Width = 931 - Height = 511 + Height = 458 Align = alClient Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -109,30 +111,30 @@ inherited fEditorProveedor: TfEditorProveedor ParentFont = False TabOrder = 0 ReadOnly = False - ExplicitWidth = 634 - ExplicitHeight = 0 + ExplicitWidth = 931 + ExplicitHeight = 458 inherited dxLayoutControlContacto: TdxLayoutControl Width = 931 - Height = 511 + Height = 458 LookAndFeel = dxLayoutOfficeLookAndFeel - ExplicitWidth = 634 - ExplicitHeight = 0 + ExplicitWidth = 931 + ExplicitHeight = 458 inherited PngSpeedButton1: TPngSpeedButton - Left = 886 + Left = 869 Top = 218 - ExplicitLeft = 886 + ExplicitLeft = 869 ExplicitTop = 218 end inherited PngSpeedButton2: TPngSpeedButton - Left = 886 + Left = 869 Top = 190 - ExplicitLeft = 886 + ExplicitLeft = 869 ExplicitTop = 190 end inherited PngSpeedButton3: TPngSpeedButton - Left = 886 + Left = 869 Top = 162 - ExplicitLeft = 886 + ExplicitLeft = 869 ExplicitTop = 162 end inherited eCalle: TcxDBTextEdit @@ -166,23 +168,23 @@ inherited fEditorProveedor: TfEditorProveedor Width = 267 end inherited eCodigoPostal: TcxDBTextEdit - Left = 518 + Left = 507 Top = 243 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 518 + ExplicitLeft = 507 ExplicitTop = 243 end inherited eTlfParticular: TcxDBTextEdit - Left = 697 + Left = 686 Top = 57 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 697 + ExplicitLeft = 686 ExplicitTop = 57 ExplicitWidth = 172 Width = 172 @@ -201,6 +203,7 @@ inherited fEditorProveedor: TfEditorProveedor end inherited cbGrupoProveedor: TcxDBComboBox Top = 165 + Enabled = False ExplicitTop = 165 ExplicitWidth = 227 Width = 227 @@ -218,37 +221,37 @@ inherited fEditorProveedor: TfEditorProveedor Width = 221 end inherited eTlfTrabajo: TcxDBTextEdit - Left = 697 + Left = 686 Top = 30 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 697 + ExplicitLeft = 686 ExplicitTop = 30 ExplicitWidth = 172 Width = 172 end inherited eTlfMovil: TcxDBTextEdit - Left = 697 + Left = 686 Top = 84 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 697 + ExplicitLeft = 686 ExplicitTop = 84 ExplicitWidth = 172 Width = 172 end inherited eFax: TcxDBTextEdit - Left = 697 + Left = 686 Top = 111 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 697 + ExplicitLeft = 686 ExplicitTop = 111 ExplicitWidth = 172 Width = 172 @@ -264,26 +267,26 @@ inherited fEditorProveedor: TfEditorProveedor Width = 263 end inherited eNIFCIF: TcxDBTextEdit - Left = 303 + Left = 299 Top = 30 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 303 + ExplicitLeft = 299 ExplicitTop = 30 ExplicitWidth = 254 Width = 254 end inherited eMailTrabajo: TcxDBHyperLinkEdit - Left = 697 + Left = 686 Top = 162 Properties.Prefix = 'mailto:' Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 697 + ExplicitLeft = 686 ExplicitTop = 162 ExplicitWidth = 129 Width = 129 @@ -295,26 +298,26 @@ inherited fEditorProveedor: TfEditorProveedor Width = 192 end inherited eMailParticular: TcxDBHyperLinkEdit - Left = 697 + Left = 686 Top = 190 Properties.Prefix = 'mailto:' Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 697 + ExplicitLeft = 686 ExplicitTop = 190 ExplicitWidth = 165 Width = 165 end inherited ePaginaWeb: TcxDBHyperLinkEdit - Left = 697 + Left = 686 Top = 217 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 697 + ExplicitLeft = 686 ExplicitTop = 217 ExplicitWidth = 165 Width = 165 @@ -340,10 +343,11 @@ inherited fEditorProveedor: TfEditorProveedor Width = 253 end inherited frViewTienda1: TfrViewTienda - Left = 602 + Left = 591 Top = 270 Width = 290 - ExplicitLeft = 602 + Enabled = False + ExplicitLeft = 591 ExplicitTop = 270 ExplicitWidth = 290 inherited dxLayoutControl1: TdxLayoutControl @@ -372,21 +376,42 @@ inherited fEditorProveedor: TfEditorProveedor Width = 521 end end + inherited dxLayoutControlContactoGroup_Root: TdxLayoutGroup + inherited dxLayoutControlContactoGroup9: TdxLayoutGroup + inherited dxLayoutControlContactoGroup4: TdxLayoutGroup + inherited dxLayoutControlContactoGroup1: TdxLayoutGroup + inherited dxLayoutControlContactoItem20: TdxLayoutItem + Enabled = False + Visible = False + end + end + end + inherited dxLayoutControlContactoGroup6: TdxLayoutGroup + inherited dxLayoutControlContactoGroup100: TdxLayoutGroup + Enabled = False + Visible = False + end + end + end + inherited dxLayoutControlContactoGroup7: TdxLayoutGroup + Visible = True + end + end end end end inherited pagDatosBancarios: TTabSheet - ExplicitWidth = 634 - ExplicitHeight = 431 + ExplicitWidth = 931 + ExplicitHeight = 661 inherited frViewClienteDatosBancarios: TfrViewClienteDatosBancarios Width = 931 Height = 661 - ExplicitWidth = 634 - ExplicitHeight = 431 + ExplicitWidth = 931 + ExplicitHeight = 661 inherited dxLayoutControl1: TdxLayoutControl Width = 931 LookAndFeel = dxLayoutOfficeLookAndFeel - ExplicitWidth = 634 + ExplicitWidth = 931 inherited eEntidad: TcxDBTextEdit Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' @@ -431,16 +456,22 @@ inherited fEditorProveedor: TfEditorProveedor end end inherited pagPersonal: TTabSheet + Enabled = False + TabVisible = False ExplicitLeft = 4 ExplicitTop = 24 ExplicitWidth = 931 ExplicitHeight = 661 + inherited memObservaciones22: TcxDBMemo + ExplicitWidth = 931 + ExplicitHeight = 661 + Height = 661 + Width = 931 + end end object pagDatosComerciales: TTabSheet Caption = 'Datos comerciales' ImageIndex = 2 - ExplicitWidth = 634 - ExplicitHeight = 431 inline frViewProveedorDatosComerciales1: TfrViewProveedorDatosComerciales Left = 0 Top = 0 @@ -455,15 +486,16 @@ inherited fEditorProveedor: TfEditorProveedor ParentFont = False TabOrder = 0 ReadOnly = False - ExplicitWidth = 634 + ExplicitWidth = 931 ExplicitHeight = 225 inherited dxLayoutControl1: TdxLayoutControl Width = 931 LookAndFeel = dxLayoutOfficeLookAndFeel - ExplicitWidth = 634 + ExplicitWidth = 931 inherited Label1: TLabel Top = 135 Width = 190 + Enabled = False ExplicitTop = 135 ExplicitWidth = 190 end @@ -471,6 +503,7 @@ inherited fEditorProveedor: TfEditorProveedor Left = 641 Top = 30 Width = 149 + Enabled = False ExplicitLeft = 641 ExplicitTop = 30 ExplicitWidth = 149 @@ -519,6 +552,7 @@ inherited fEditorProveedor: TfEditorProveedor end inherited eDescuento: TcxDBSpinEdit Top = 167 + Enabled = False Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' @@ -530,6 +564,7 @@ inherited fEditorProveedor: TfEditorProveedor inherited eDiasVencimiento1: TcxDBSpinEdit Left = 713 Top = 75 + Enabled = False Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' @@ -540,6 +575,7 @@ inherited fEditorProveedor: TfEditorProveedor inherited eDiasVencimiento2: TcxDBSpinEdit Left = 713 Top = 102 + Enabled = False Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' @@ -550,6 +586,7 @@ inherited fEditorProveedor: TfEditorProveedor inherited eDiasVencimiento3: TcxDBSpinEdit Left = 713 Top = 129 + Enabled = False Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' @@ -557,14 +594,26 @@ inherited fEditorProveedor: TfEditorProveedor ExplicitLeft = 713 ExplicitTop = 129 end + inherited dxLayoutGroup1: TdxLayoutGroup + inherited dxLayoutControl1Group6: TdxLayoutGroup + inherited dxLayoutControl1Group5: TdxLayoutGroup + Enabled = False + Visible = False + end + end + inherited dxLayoutControl1Group4: TdxLayoutGroup + Enabled = False + Visible = False + end + end end end end object pagDirecciones: TTabSheet Caption = 'Direcciones' + Enabled = False ImageIndex = 3 - ExplicitWidth = 634 - ExplicitHeight = 431 + TabVisible = False inline frViewDireccionesEntrega1: TfrViewDireccionesEntrega Left = 0 Top = 0 @@ -579,17 +628,17 @@ inherited fEditorProveedor: TfEditorProveedor ParentFont = False TabOrder = 0 ReadOnly = False - ExplicitWidth = 634 - ExplicitHeight = 431 + ExplicitWidth = 931 + ExplicitHeight = 661 inherited cxGrid: TcxGrid Width = 931 Height = 636 - ExplicitWidth = 634 - ExplicitHeight = 436 + ExplicitWidth = 931 + ExplicitHeight = 636 end inherited ToolBar1: TToolBar Width = 931 - ExplicitWidth = 634 + ExplicitWidth = 931 inherited ToolButton1: TToolButton ExplicitWidth = 113 end @@ -607,9 +656,9 @@ inherited fEditorProveedor: TfEditorProveedor end object PagContabilidad: TTabSheet Caption = 'Contabilidad' + Enabled = False ImageIndex = 4 - ExplicitWidth = 634 - ExplicitHeight = 431 + TabVisible = False inline frViewSubCuentaContacto1: TfrViewSubCuentaContacto Left = 0 Top = 0 @@ -625,13 +674,13 @@ inherited fEditorProveedor: TfEditorProveedor ParentFont = False TabOrder = 0 ReadOnly = False - ExplicitWidth = 634 - ExplicitHeight = 431 + ExplicitWidth = 931 + ExplicitHeight = 661 inherited layoutApunte: TdxLayoutControl Width = 931 Height = 661 - ExplicitWidth = 634 - ExplicitHeight = 431 + ExplicitWidth = 931 + ExplicitHeight = 661 inherited eRefSubCuenta: TcxDBTextEdit Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' @@ -679,7 +728,8 @@ inherited fEditorProveedor: TfEditorProveedor end inherited PnlComentario: TPanel Width = 945 - ExplicitWidth = 648 + ExplicitTop = 76 + ExplicitWidth = 945 inherited lbComentario: TLabel Width = 935 Height = 25 diff --git a/Source/Modulos/Contactos/Views/uEditorProveedor.pas b/Source/Modulos/Contactos/Views/uEditorProveedor.pas index 6b44293..cfe1156 100644 --- a/Source/Modulos/Contactos/Views/uEditorProveedor.pas +++ b/Source/Modulos/Contactos/Views/uEditorProveedor.pas @@ -15,7 +15,7 @@ uses dxLayoutLookAndFeels, uViewContactoDatosBancarios, uBizContactos, uViewProveedorDatosComerciales, uViewDetallesGenerico, uViewDireccionesEntrega, uDAInterfaces, uViewSubCuentaContacto, StdCtrls, DBCtrls, - uViewPersonalContacto; + uViewPersonalContacto, cxMemo; type TfEditorProveedor = class(TfEditorContacto, IEditorProveedor) @@ -67,9 +67,9 @@ begin ViewContacto := frViewProveedor1; {$IFDEF CONTABILIDAD} - pagContabilidad.TabVisible := true; +// pagContabilidad.TabVisible := true; {$ELSE} - pagContabilidad.TabVisible := false; +// pagContabilidad.TabVisible := false; {$ENDIF} end; diff --git a/Source/Modulos/Contactos/Views/uViewCliente.dfm b/Source/Modulos/Contactos/Views/uViewCliente.dfm index 02b2c55..c8592cc 100644 --- a/Source/Modulos/Contactos/Views/uViewCliente.dfm +++ b/Source/Modulos/Contactos/Views/uViewCliente.dfm @@ -9,18 +9,18 @@ inherited frViewCliente: TfrViewCliente Width = 646 Height = 563 ExplicitWidth = 646 - ExplicitHeight = 609 + ExplicitHeight = 563 inherited PngSpeedButton1: TPngSpeedButton - Left = 601 - ExplicitLeft = 601 + Left = 584 + ExplicitLeft = 584 end inherited PngSpeedButton2: TPngSpeedButton - Left = 601 - ExplicitLeft = 601 + Left = 584 + ExplicitLeft = 584 end inherited PngSpeedButton3: TPngSpeedButton - Left = 601 - ExplicitLeft = 601 + Left = 584 + ExplicitLeft = 584 end inherited eCalle: TcxDBTextEdit Left = 132 @@ -62,24 +62,24 @@ inherited frViewCliente: TfrViewCliente Width = 213 end inherited eCodigoPostal: TcxDBTextEdit - Left = 268 + Left = 259 Top = 247 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' TabOrder = 9 - ExplicitLeft = 268 + ExplicitLeft = 259 ExplicitTop = 247 end inherited eTlfParticular: TcxDBTextEdit - Left = 449 + Left = 440 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' TabOrder = 15 - ExplicitLeft = 449 + ExplicitLeft = 440 ExplicitWidth = 233 Width = 233 end @@ -239,35 +239,35 @@ inherited frViewCliente: TfrViewCliente Width = 211 end inherited eTlfTrabajo: TcxDBTextEdit - Left = 449 + Left = 440 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' TabOrder = 14 - ExplicitLeft = 449 + ExplicitLeft = 440 ExplicitWidth = 233 Width = 233 end inherited eTlfMovil: TcxDBTextEdit - Left = 449 + Left = 440 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' TabOrder = 16 - ExplicitLeft = 449 + ExplicitLeft = 440 ExplicitWidth = 233 Width = 233 end inherited eFax: TcxDBTextEdit - Left = 449 + Left = 440 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' TabOrder = 17 - ExplicitLeft = 449 + ExplicitLeft = 440 ExplicitWidth = 233 Width = 233 end @@ -282,47 +282,47 @@ inherited frViewCliente: TfrViewCliente Width = 135 end inherited eNIFCIF: TcxDBTextEdit - Left = 247 + Left = 242 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 247 + ExplicitLeft = 242 ExplicitWidth = 59 Width = 59 end inherited eMailTrabajo: TcxDBHyperLinkEdit - Left = 449 + Left = 440 Properties.Prefix = 'mailto:' Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' TabOrder = 18 - ExplicitLeft = 449 + ExplicitLeft = 440 ExplicitWidth = 204 Width = 204 end inherited eMailParticular: TcxDBHyperLinkEdit - Left = 449 + Left = 440 Properties.Prefix = 'mailto:' Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' TabOrder = 19 - ExplicitLeft = 449 + ExplicitLeft = 440 ExplicitWidth = 204 Width = 204 end inherited ePaginaWeb: TcxDBHyperLinkEdit - Left = 449 + Left = 440 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' TabOrder = 20 - ExplicitLeft = 449 + ExplicitLeft = 440 ExplicitWidth = 204 Width = 204 end @@ -350,11 +350,11 @@ inherited frViewCliente: TfrViewCliente Width = 256 end inherited frViewTienda1: TfrViewTienda - Left = 354 + Left = 345 Width = 270 AutoSize = True TabOrder = 21 - ExplicitLeft = 354 + ExplicitLeft = 345 ExplicitWidth = 270 inherited dxLayoutControl1: TdxLayoutControl Width = 270 @@ -379,6 +379,8 @@ inherited frViewCliente: TfrViewCliente ExplicitHeight = 127 inherited memObservaciones: TcxDBMemo DataBinding.DataSource = dsContacto + ExplicitWidth = 585 + ExplicitHeight = 127 Height = 127 Width = 585 end @@ -440,6 +442,7 @@ inherited frViewCliente: TfrViewCliente end end inherited dxLayoutControlContactoGroup7: TdxLayoutGroup + Visible = True inherited dxLayoutControlContactoItem8: TdxLayoutItem AutoAligns = [aaHorizontal] end diff --git a/Source/Modulos/Contactos/Views/uViewClientes.dfm b/Source/Modulos/Contactos/Views/uViewClientes.dfm index 8f68ba2..996445f 100644 --- a/Source/Modulos/Contactos/Views/uViewClientes.dfm +++ b/Source/Modulos/Contactos/Views/uViewClientes.dfm @@ -45,23 +45,36 @@ inherited frViewClientes: TfrViewClientes VisibleForCustomization = False Width = 22 end + inherited cxGridViewTIENDA: TcxGridDBColumn + Visible = False + VisibleForCustomization = False + end object cxGridViewFECHA_ALTA: TcxGridDBColumn [4] Caption = 'Fecha alta' DataBinding.FieldName = 'FECHA_ALTA' PropertiesClassName = 'TcxDateEditProperties' Properties.ShowTime = False + Visible = False + VisibleForCustomization = False end object cxGridViewNOMBRE_COMERCIAL: TcxGridDBColumn [7] DataBinding.FieldName = 'NOMBRE_COMERCIAL' + Visible = False + VisibleForCustomization = False Width = 164 end object cxGridViewPERSONA_CONTACTO: TcxGridDBColumn [9] Caption = 'Persona contacto' DataBinding.FieldName = 'PERSONA_CONTACTO' end + inherited cxGridViewPAGINA_WEB: TcxGridDBColumn + VisibleForCustomization = False + end object cxGridViewLISTA_NOMBRES: TcxGridDBColumn DataBinding.FieldName = 'LISTA_NOMBRES' + Visible = False BestFitMaxWidth = 60 + VisibleForCustomization = False Width = 90 end end @@ -75,15 +88,27 @@ inherited frViewClientes: TfrViewClientes Width = 633 ExplicitWidth = 633 inherited txtFiltroTodo: TcxTextEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 661 Width = 661 end inherited edtFechaIniFiltro: TcxDateEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 217 Width = 217 end inherited edtFechaFinFiltro: TcxDateEdit Left = 271 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 271 ExplicitWidth = 427 Width = 427 diff --git a/Source/Modulos/Contactos/Views/uViewContacto.dfm b/Source/Modulos/Contactos/Views/uViewContacto.dfm index 378d93a..5522b0f 100644 --- a/Source/Modulos/Contactos/Views/uViewContacto.dfm +++ b/Source/Modulos/Contactos/Views/uViewContacto.dfm @@ -415,6 +415,7 @@ inherited frViewContacto: TfrViewContacto Top = 28 DataBinding.DataField = 'REFERENCIA' DataBinding.DataSource = dsContacto + Properties.ReadOnly = True Style.BorderColor = clWindowFrame Style.BorderStyle = ebs3D Style.Color = clWindow @@ -473,7 +474,6 @@ inherited frViewContacto: TfrViewContacto ExplicitLeft = 312 ExplicitTop = 280 inherited dxLayoutControl1: TdxLayoutControl - ExplicitWidth = 290 inherited cbTienda: TcxComboBox Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' @@ -503,8 +503,7 @@ inherited frViewContacto: TfrViewContacto inherited memObservaciones: TcxDBMemo DataBinding.DataField = 'NOTAS' DataBinding.DataSource = dsContacto - ExplicitWidth = 580 - ExplicitHeight = 163 + ExplicitHeight = 228 Height = 228 end end diff --git a/Source/Modulos/Contactos/Views/uViewProveedor.dfm b/Source/Modulos/Contactos/Views/uViewProveedor.dfm index 428b20b..49f3693 100644 --- a/Source/Modulos/Contactos/Views/uViewProveedor.dfm +++ b/Source/Modulos/Contactos/Views/uViewProveedor.dfm @@ -25,6 +25,10 @@ inherited frViewProveedor: TfrViewProveedor inherited eCalle: TcxDBTextEdit Left = 138 Top = 220 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' TabOrder = 7 ExplicitLeft = 138 ExplicitTop = 220 @@ -34,6 +38,10 @@ inherited frViewProveedor: TfrViewProveedor inherited cbProvincia: TcxDBComboBox Left = 138 Top = 247 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' TabOrder = 8 ExplicitLeft = 138 ExplicitTop = 247 @@ -43,6 +51,10 @@ inherited frViewProveedor: TfrViewProveedor inherited cbPoblacion: TcxDBComboBox Left = 138 Top = 274 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' TabOrder = 10 ExplicitLeft = 138 ExplicitTop = 274 @@ -52,12 +64,20 @@ inherited frViewProveedor: TfrViewProveedor inherited eCodigoPostal: TcxDBTextEdit Left = 271 Top = 247 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' TabOrder = 9 ExplicitLeft = 271 ExplicitTop = 247 end inherited eTlfParticular: TcxDBTextEdit Left = 452 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' TabOrder = 15 ExplicitLeft = 452 ExplicitWidth = 91 @@ -170,6 +190,10 @@ inherited frViewProveedor: TfrViewProveedor end inherited eTlfTrabajo: TcxDBTextEdit Left = 452 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' TabOrder = 14 ExplicitLeft = 452 ExplicitWidth = 127 @@ -177,6 +201,10 @@ inherited frViewProveedor: TfrViewProveedor end inherited eTlfMovil: TcxDBTextEdit Left = 452 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' TabOrder = 16 ExplicitLeft = 452 ExplicitWidth = 155 @@ -184,6 +212,10 @@ inherited frViewProveedor: TfrViewProveedor end inherited eFax: TcxDBTextEdit Left = 452 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' TabOrder = 17 ExplicitLeft = 452 ExplicitWidth = 121 @@ -191,12 +223,20 @@ inherited frViewProveedor: TfrViewProveedor end inherited eNombre: TcxDBTextEdit Left = 138 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 138 ExplicitWidth = 221 Width = 221 end inherited eNIFCIF: TcxDBTextEdit Left = 211 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 211 ExplicitWidth = 205 Width = 205 @@ -204,6 +244,10 @@ inherited frViewProveedor: TfrViewProveedor inherited eMailTrabajo: TcxDBHyperLinkEdit Left = 452 Properties.Prefix = 'mailto:' + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' TabOrder = 18 ExplicitLeft = 452 ExplicitWidth = 133 @@ -232,6 +276,10 @@ inherited frViewProveedor: TfrViewProveedor inherited eMailParticular: TcxDBHyperLinkEdit Left = 452 Properties.Prefix = 'mailto:' + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' TabOrder = 19 ExplicitLeft = 452 ExplicitWidth = 133 @@ -239,6 +287,10 @@ inherited frViewProveedor: TfrViewProveedor end inherited ePaginaWeb: TcxDBHyperLinkEdit Left = 452 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' TabOrder = 20 ExplicitLeft = 452 ExplicitWidth = 133 @@ -246,6 +298,10 @@ inherited frViewProveedor: TfrViewProveedor end inherited eReferencia: TcxDBTextEdit Left = 138 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 138 ExplicitWidth = 38 Width = 38 @@ -253,6 +309,10 @@ inherited frViewProveedor: TfrViewProveedor inherited ePersonaContacto: TcxDBTextEdit Left = 138 Top = 301 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' TabOrder = 11 ExplicitLeft = 138 ExplicitTop = 301 @@ -268,18 +328,25 @@ inherited frViewProveedor: TfrViewProveedor inherited dxLayoutControl1: TdxLayoutControl Width = 451 inherited cbTienda: TcxComboBox + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 376 Width = 376 end end end inherited frViewObservaciones1: TfrViewObservaciones + Top = 442 Width = 521 Height = 228 TabOrder = 22 + ExplicitTop = 442 ExplicitWidth = 521 ExplicitHeight = 228 inherited memObservaciones: TcxDBMemo + DataBinding.DataSource = dsContacto Height = 228 Width = 521 end @@ -300,7 +367,6 @@ inherited frViewProveedor: TfrViewProveedor end object dxLayoutControlContactoItem24: TdxLayoutItem Caption = 'C'#243'digo de cliente:' - Visible = False Control = eCodigoAsignado ControlOptions.ShowBorder = False end @@ -327,6 +393,11 @@ inherited frViewProveedor: TfrViewProveedor end end inherited dxLayoutControlContactoGroup6: TdxLayoutGroup + inherited dxLayoutControlContactoGroup2: TdxLayoutGroup + inherited dxLayoutControlContactoItem9: TdxLayoutItem + Visible = True + end + end inherited dxLayoutControlContactoGroup100: TdxLayoutGroup Caption = 'El proveedor pertenece a la tienda' end diff --git a/Source/Modulos/Contactos/Views/uViewProveedores.dfm b/Source/Modulos/Contactos/Views/uViewProveedores.dfm index 48750bf..eea0b26 100644 --- a/Source/Modulos/Contactos/Views/uViewProveedores.dfm +++ b/Source/Modulos/Contactos/Views/uViewProveedores.dfm @@ -29,11 +29,17 @@ inherited frViewProveedores: TfrViewProveedores ImageIndex = 1 Value = 1 end> + Visible = False BestFitMaxWidth = 22 MinWidth = 22 Options.HorzSizing = False + VisibleForCustomization = False Width = 22 end + inherited cxGridViewTIENDA: TcxGridDBColumn + Visible = False + VisibleForCustomization = False + end inherited cxGridViewNOMBRE: TcxGridDBColumn BestFitMaxWidth = 0 end @@ -56,15 +62,27 @@ inherited frViewProveedores: TfrViewProveedores Width = 483 ExplicitWidth = 483 inherited txtFiltroTodo: TcxTextEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 386 Width = 386 end inherited edtFechaIniFiltro: TcxDateEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 130 Width = 130 end inherited edtFechaFinFiltro: TcxDateEdit Left = 234 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 234 ExplicitWidth = 239 Width = 239 diff --git a/Source/Modulos/Contratos de cliente/ContratosCliente_Group.groupproj b/Source/Modulos/Contratos de cliente/ContratosCliente_Group.groupproj index b01a96d..ef076c1 100644 --- a/Source/Modulos/Contratos de cliente/ContratosCliente_Group.groupproj +++ b/Source/Modulos/Contratos de cliente/ContratosCliente_Group.groupproj @@ -16,15 +16,19 @@ + + + + @@ -182,6 +186,15 @@ + + + + + + + + + @@ -281,14 +294,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + \ No newline at end of file diff --git a/Source/Modulos/Contratos de cliente/Controller/uContratosClienteController.pas b/Source/Modulos/Contratos de cliente/Controller/uContratosClienteController.pas index 005e696..3229157 100644 --- a/Source/Modulos/Contratos de cliente/Controller/uContratosClienteController.pas +++ b/Source/Modulos/Contratos de cliente/Controller/uContratosClienteController.pas @@ -268,6 +268,7 @@ begin begin AContrato.DataTable.Edit; AContrato.SITUACION := Situacion; + AContrato.FECHA_DECISION := FechaDecision; AContrato.DataTable.Post; end; @@ -283,6 +284,7 @@ begin begin AContrato.DataTable.Edit; AContrato.SITUACION := Situacion; + AContrato.FECHA_DECISION := FechaDecision; AContrato.DataTable.Post; end; Next; diff --git a/Source/Modulos/Contratos de cliente/Data/uDataModuleContratosCliente.dfm b/Source/Modulos/Contratos de cliente/Data/uDataModuleContratosCliente.dfm index 01d42ca..78de308 100644 --- a/Source/Modulos/Contratos de cliente/Data/uDataModuleContratosCliente.dfm +++ b/Source/Modulos/Contratos de cliente/Data/uDataModuleContratosCliente.dfm @@ -106,7 +106,7 @@ inherited DataModuleContratosCliente: TDataModuleContratosCliente Name = 'PROVINCIA' DataType = datString Size = 255 - DisplayLabel = 'Provincia' + DisplayLabel = 'ContratosCliente_PROVINCIA' DictionaryEntry = 'ContratosCliente_PROVINCIA' end item @@ -337,12 +337,24 @@ inherited DataModuleContratosCliente: TDataModuleContratosCliente Name = 'REFERENCIA_CLIENTE' DataType = datString Size = 255 + DisplayLabel = 'ContratosCliente_REFERENCIA_CLIENTE' + DictionaryEntry = 'ContratosCliente_REFERENCIA_CLIENTE' end item Name = 'LISTA_NOMBRES' DataType = datString Size = 255 DisplayLabel = 'Otros nombres' + DictionaryEntry = 'ContratosCliente_LISTA_NOMBRES' + end + item + Name = 'FECHA_DECISION' + DataType = datDateTime + end + item + Name = 'FACTURA_ASOCIADA' + DataType = datString + Size = 255 end> Params = <> StreamingOptions = [soDisableEventsWhileStreaming] diff --git a/Source/Modulos/Contratos de cliente/Model/schContratosClienteClient_Intf.pas b/Source/Modulos/Contratos de cliente/Model/schContratosClienteClient_Intf.pas index a1e4c97..afaa6ff 100644 --- a/Source/Modulos/Contratos de cliente/Model/schContratosClienteClient_Intf.pas +++ b/Source/Modulos/Contratos de cliente/Model/schContratosClienteClient_Intf.pas @@ -9,13 +9,13 @@ const { Data table rules ids Feel free to change them to something more human readable but make sure they are unique in the context of your application } - RID_Valores = '{58A2DEFE-73CE-4294-A509-3456173EC1E8}'; - RID_Propiedades = '{FD279174-BDCF-4C6E-86A5-9EF688F8A386}'; - RID_ListaAnosContratos = '{995B8113-D69E-45F6-B0C6-279DE92E8AE1}'; - RID_ContratosClienteBeneficios = '{AADFE498-8072-4F5F-84FD-7BDAE2D03E88}'; - RID_ContratosCliente = '{6BBAF32D-E3F6-4C2F-BB50-EEB0BABCE782}'; - RID_TiposCapitulos = '{4355D117-B641-4CF9-99AC-17558CB0C354}'; - RID_ContratosCliente_Detalles = '{02F28C43-5EC9-4A4F-A2BC-CD4BF581ED0B}'; + RID_Valores = '{FF170B3B-0B30-4A6E-B36F-AED5E8250AC5}'; + RID_Propiedades = '{2CA5D47F-7A40-4C99-8D82-62D14C8611F9}'; + RID_ListaAnosContratos = '{CB4AC0C2-A13B-4E20-B34C-FA4B4B7AAAB7}'; + RID_ContratosClienteBeneficios = '{C8F49F14-3BD4-4EDC-B535-1084245828BA}'; + RID_ContratosCliente = '{84BF7884-DAEC-4F6F-82D1-6F65B0955416}'; + RID_TiposCapitulos = '{B2D051D8-4424-4B02-AD1F-C5BAE040894B}'; + RID_ContratosCliente_Detalles = '{9DBF2D50-49C9-4CE5-BFBD-D0DBFCE0EA8E}'; { Data table names } nme_Valores = 'Valores'; @@ -136,6 +136,8 @@ const fld_ContratosClienteCALIDADES = 'CALIDADES'; fld_ContratosClienteREFERENCIA_CLIENTE = 'REFERENCIA_CLIENTE'; fld_ContratosClienteLISTA_NOMBRES = 'LISTA_NOMBRES'; + fld_ContratosClienteFECHA_DECISION = 'FECHA_DECISION'; + fld_ContratosClienteFACTURA_ASOCIADA = 'FACTURA_ASOCIADA'; { ContratosCliente field indexes } idx_ContratosClienteID = 0; @@ -187,6 +189,8 @@ const idx_ContratosClienteCALIDADES = 46; idx_ContratosClienteREFERENCIA_CLIENTE = 47; idx_ContratosClienteLISTA_NOMBRES = 48; + idx_ContratosClienteFECHA_DECISION = 49; + idx_ContratosClienteFACTURA_ASOCIADA = 50; { TiposCapitulos fields } fld_TiposCapitulosID = 'ID'; @@ -245,7 +249,7 @@ const type { IValores } IValores = interface(IDAStronglyTypedDataTable) - ['{8DC482B0-0D63-436F-AB19-74A480249588}'] + ['{37D9C952-11C7-44D0-8A56-023852645B0F}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -304,7 +308,7 @@ type { IPropiedades } IPropiedades = interface(IDAStronglyTypedDataTable) - ['{83E4E5BD-A49A-4677-A830-7C9B83F3DDE4}'] + ['{5252B717-197E-41E3-A902-78CD6A804EBD}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -363,7 +367,7 @@ type { IListaAnosContratos } IListaAnosContratos = interface(IDAStronglyTypedDataTable) - ['{35D2C046-61DA-487F-A0F4-5E3AB7CCA58D}'] + ['{C59F0AC9-2FA9-46DB-B506-352CCE2AAA5E}'] { Property getters and setters } function GetANOValue: String; procedure SetANOValue(const aValue: String); @@ -398,7 +402,7 @@ type { IContratosClienteBeneficios } IContratosClienteBeneficios = interface(IDAStronglyTypedDataTable) - ['{FEA1561B-0DF3-4193-8881-62C4433488E8}'] + ['{6EFAD955-7B1E-45EF-9DA1-D7596933323F}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -601,7 +605,7 @@ type { IContratosCliente } IContratosCliente = interface(IDAStronglyTypedDataTable) - ['{F2DEA876-B1A6-475D-8D1D-8D416E7D40CA}'] + ['{C292C53E-7CE7-4DAC-8FED-D5984431BAF6}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -793,6 +797,14 @@ type procedure SetLISTA_NOMBRESValue(const aValue: String); function GetLISTA_NOMBRESIsNull: Boolean; procedure SetLISTA_NOMBRESIsNull(const aValue: Boolean); + function GetFECHA_DECISIONValue: DateTime; + procedure SetFECHA_DECISIONValue(const aValue: DateTime); + function GetFECHA_DECISIONIsNull: Boolean; + procedure SetFECHA_DECISIONIsNull(const aValue: Boolean); + function GetFACTURA_ASOCIADAValue: String; + procedure SetFACTURA_ASOCIADAValue(const aValue: String); + function GetFACTURA_ASOCIADAIsNull: Boolean; + procedure SetFACTURA_ASOCIADAIsNull(const aValue: Boolean); { Properties } @@ -894,6 +906,10 @@ type property REFERENCIA_CLIENTEIsNull: Boolean read GetREFERENCIA_CLIENTEIsNull write SetREFERENCIA_CLIENTEIsNull; property LISTA_NOMBRES: String read GetLISTA_NOMBRESValue write SetLISTA_NOMBRESValue; property LISTA_NOMBRESIsNull: Boolean read GetLISTA_NOMBRESIsNull write SetLISTA_NOMBRESIsNull; + property FECHA_DECISION: DateTime read GetFECHA_DECISIONValue write SetFECHA_DECISIONValue; + property FECHA_DECISIONIsNull: Boolean read GetFECHA_DECISIONIsNull write SetFECHA_DECISIONIsNull; + property FACTURA_ASOCIADA: String read GetFACTURA_ASOCIADAValue write SetFACTURA_ASOCIADAValue; + property FACTURA_ASOCIADAIsNull: Boolean read GetFACTURA_ASOCIADAIsNull write SetFACTURA_ASOCIADAIsNull; end; { TContratosClienteDataTableRules } @@ -1103,6 +1119,14 @@ type procedure SetLISTA_NOMBRESValue(const aValue: String); virtual; function GetLISTA_NOMBRESIsNull: Boolean; virtual; procedure SetLISTA_NOMBRESIsNull(const aValue: Boolean); virtual; + function GetFECHA_DECISIONValue: DateTime; virtual; + procedure SetFECHA_DECISIONValue(const aValue: DateTime); virtual; + function GetFECHA_DECISIONIsNull: Boolean; virtual; + procedure SetFECHA_DECISIONIsNull(const aValue: Boolean); virtual; + function GetFACTURA_ASOCIADAValue: String; virtual; + procedure SetFACTURA_ASOCIADAValue(const aValue: String); virtual; + function GetFACTURA_ASOCIADAIsNull: Boolean; virtual; + procedure SetFACTURA_ASOCIADAIsNull(const aValue: Boolean); virtual; { Properties } property ID: Integer read GetIDValue write SetIDValue; @@ -1203,6 +1227,10 @@ type property REFERENCIA_CLIENTEIsNull: Boolean read GetREFERENCIA_CLIENTEIsNull write SetREFERENCIA_CLIENTEIsNull; property LISTA_NOMBRES: String read GetLISTA_NOMBRESValue write SetLISTA_NOMBRESValue; property LISTA_NOMBRESIsNull: Boolean read GetLISTA_NOMBRESIsNull write SetLISTA_NOMBRESIsNull; + property FECHA_DECISION: DateTime read GetFECHA_DECISIONValue write SetFECHA_DECISIONValue; + property FECHA_DECISIONIsNull: Boolean read GetFECHA_DECISIONIsNull write SetFECHA_DECISIONIsNull; + property FACTURA_ASOCIADA: String read GetFACTURA_ASOCIADAValue write SetFACTURA_ASOCIADAValue; + property FACTURA_ASOCIADAIsNull: Boolean read GetFACTURA_ASOCIADAIsNull write SetFACTURA_ASOCIADAIsNull; public constructor Create(aDataTable: TDADataTable); override; @@ -1215,7 +1243,7 @@ type } { ITiposCapitulos } ITiposCapitulos = interface(IDAStronglyTypedDataTable) - ['{5F81E7D5-452E-4E0A-88C8-1F996B6AF531}'] + ['{6FD186D4-E64F-45A9-88A6-163E72D11671}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -1310,7 +1338,7 @@ type { IContratosCliente_Detalles } IContratosCliente_Detalles = interface(IDAStronglyTypedDataTable) - ['{251944F0-59A0-4544-BC1D-DC85411F2FD7}'] + ['{43B88BE1-14BC-4332-889D-8091C7420325}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -3121,6 +3149,48 @@ begin DataTable.Fields[idx_ContratosClienteLISTA_NOMBRES].AsVariant := Null; end; +function TContratosClienteDataTableRules.GetFECHA_DECISIONValue: DateTime; +begin + result := DataTable.Fields[idx_ContratosClienteFECHA_DECISION].AsDateTime; +end; + +procedure TContratosClienteDataTableRules.SetFECHA_DECISIONValue(const aValue: DateTime); +begin + DataTable.Fields[idx_ContratosClienteFECHA_DECISION].AsDateTime := aValue; +end; + +function TContratosClienteDataTableRules.GetFECHA_DECISIONIsNull: boolean; +begin + result := DataTable.Fields[idx_ContratosClienteFECHA_DECISION].IsNull; +end; + +procedure TContratosClienteDataTableRules.SetFECHA_DECISIONIsNull(const aValue: Boolean); +begin + if aValue then + DataTable.Fields[idx_ContratosClienteFECHA_DECISION].AsVariant := Null; +end; + +function TContratosClienteDataTableRules.GetFACTURA_ASOCIADAValue: String; +begin + result := DataTable.Fields[idx_ContratosClienteFACTURA_ASOCIADA].AsString; +end; + +procedure TContratosClienteDataTableRules.SetFACTURA_ASOCIADAValue(const aValue: String); +begin + DataTable.Fields[idx_ContratosClienteFACTURA_ASOCIADA].AsString := aValue; +end; + +function TContratosClienteDataTableRules.GetFACTURA_ASOCIADAIsNull: boolean; +begin + result := DataTable.Fields[idx_ContratosClienteFACTURA_ASOCIADA].IsNull; +end; + +procedure TContratosClienteDataTableRules.SetFACTURA_ASOCIADAIsNull(const aValue: Boolean); +begin + if aValue then + DataTable.Fields[idx_ContratosClienteFACTURA_ASOCIADA].AsVariant := Null; +end; + { TTiposCapitulosDataTableRules } constructor TTiposCapitulosDataTableRules.Create(aDataTable: TDADataTable); diff --git a/Source/Modulos/Contratos de cliente/Model/schContratosClienteServer_Intf.pas b/Source/Modulos/Contratos de cliente/Model/schContratosClienteServer_Intf.pas index 5a19d64..d9656a4 100644 --- a/Source/Modulos/Contratos de cliente/Model/schContratosClienteServer_Intf.pas +++ b/Source/Modulos/Contratos de cliente/Model/schContratosClienteServer_Intf.pas @@ -9,18 +9,18 @@ const { Delta rules ids Feel free to change them to something more human readable but make sure they are unique in the context of your application } - RID_ValoresDelta = '{B57572E7-8CF0-400C-A161-CC3597A61C0B}'; - RID_PropiedadesDelta = '{9194A821-5316-4432-AB61-66CB529F49E3}'; - RID_ListaAnosContratosDelta = '{E141AD09-588D-4313-90DB-61941556C617}'; - RID_ContratosClienteBeneficiosDelta = '{662E0B0F-1674-4F05-9CF7-89346BE5E7D5}'; - RID_ContratosClienteDelta = '{07069709-DA46-44C8-9C1C-AAB3F80D3F26}'; - RID_TiposCapitulosDelta = '{19191BFF-2C9D-43C5-85D6-81B96CDBBF10}'; - RID_ContratosCliente_DetallesDelta = '{65037CFE-4A72-4CD0-A197-CECC6A4FDD1D}'; + RID_ValoresDelta = '{8D6C76F9-F425-4A12-A6DA-CDADFCB371D5}'; + RID_PropiedadesDelta = '{785FA853-7F7C-4D4B-A3F1-F605B64D365A}'; + RID_ListaAnosContratosDelta = '{9AED0858-AA56-4911-97AE-7FA8F5BA1BDF}'; + RID_ContratosClienteBeneficiosDelta = '{0A6BE4D0-4128-48DD-8E05-87DB06C0181F}'; + RID_ContratosClienteDelta = '{13EC691D-B231-48FE-BE2D-E8EC546D4FDA}'; + RID_TiposCapitulosDelta = '{ABCB3BD5-D32A-405C-9799-900FAB730F45}'; + RID_ContratosCliente_DetallesDelta = '{09923382-3A40-4992-9F2C-903B5B6CA290}'; type { IValoresDelta } IValoresDelta = interface(IValores) - ['{B57572E7-8CF0-400C-A161-CC3597A61C0B}'] + ['{8D6C76F9-F425-4A12-A6DA-CDADFCB371D5}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_PROPIEDADValue : Integer; @@ -78,7 +78,7 @@ type { IPropiedadesDelta } IPropiedadesDelta = interface(IPropiedades) - ['{9194A821-5316-4432-AB61-66CB529F49E3}'] + ['{785FA853-7F7C-4D4B-A3F1-F605B64D365A}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldDESCRIPCIONValue : String; @@ -136,7 +136,7 @@ type { IListaAnosContratosDelta } IListaAnosContratosDelta = interface(IListaAnosContratos) - ['{E141AD09-588D-4313-90DB-61941556C617}'] + ['{9AED0858-AA56-4911-97AE-7FA8F5BA1BDF}'] { Property getters and setters } function GetOldANOValue : String; @@ -170,7 +170,7 @@ type { IContratosClienteBeneficiosDelta } IContratosClienteBeneficiosDelta = interface(IContratosClienteBeneficios) - ['{662E0B0F-1674-4F05-9CF7-89346BE5E7D5}'] + ['{0A6BE4D0-4128-48DD-8E05-87DB06C0181F}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldREFERENCIAValue : String; @@ -372,7 +372,7 @@ type { IContratosClienteDelta } IContratosClienteDelta = interface(IContratosCliente) - ['{07069709-DA46-44C8-9C1C-AAB3F80D3F26}'] + ['{13EC691D-B231-48FE-BE2D-E8EC546D4FDA}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_EMPRESAValue : Integer; @@ -423,6 +423,8 @@ type function GetOldCALIDADESValue : IROStrings; function GetOldREFERENCIA_CLIENTEValue : String; function GetOldLISTA_NOMBRESValue : String; + function GetOldFECHA_DECISIONValue : DateTime; + function GetOldFACTURA_ASOCIADAValue : String; { Properties } property OldID : Integer read GetOldIDValue; @@ -474,6 +476,8 @@ type property OldCALIDADES : IROStrings read GetOldCALIDADESValue; property OldREFERENCIA_CLIENTE : String read GetOldREFERENCIA_CLIENTEValue; property OldLISTA_NOMBRES : String read GetOldLISTA_NOMBRESValue; + property OldFECHA_DECISION : DateTime read GetOldFECHA_DECISIONValue; + property OldFACTURA_ASOCIADA : String read GetOldFACTURA_ASOCIADAValue; end; { TContratosClienteBusinessProcessorRules } @@ -781,6 +785,18 @@ type function GetOldLISTA_NOMBRESIsNull: Boolean; virtual; procedure SetLISTA_NOMBRESValue(const aValue: String); virtual; procedure SetLISTA_NOMBRESIsNull(const aValue: Boolean); virtual; + function GetFECHA_DECISIONValue: DateTime; virtual; + function GetFECHA_DECISIONIsNull: Boolean; virtual; + function GetOldFECHA_DECISIONValue: DateTime; virtual; + function GetOldFECHA_DECISIONIsNull: Boolean; virtual; + procedure SetFECHA_DECISIONValue(const aValue: DateTime); virtual; + procedure SetFECHA_DECISIONIsNull(const aValue: Boolean); virtual; + function GetFACTURA_ASOCIADAValue: String; virtual; + function GetFACTURA_ASOCIADAIsNull: Boolean; virtual; + function GetOldFACTURA_ASOCIADAValue: String; virtual; + function GetOldFACTURA_ASOCIADAIsNull: Boolean; virtual; + procedure SetFACTURA_ASOCIADAValue(const aValue: String); virtual; + procedure SetFACTURA_ASOCIADAIsNull(const aValue: Boolean); virtual; { Properties } property ID : Integer read GetIDValue write SetIDValue; @@ -979,6 +995,14 @@ type property LISTA_NOMBRESIsNull : Boolean read GetLISTA_NOMBRESIsNull write SetLISTA_NOMBRESIsNull; property OldLISTA_NOMBRES : String read GetOldLISTA_NOMBRESValue; property OldLISTA_NOMBRESIsNull : Boolean read GetOldLISTA_NOMBRESIsNull; + property FECHA_DECISION : DateTime read GetFECHA_DECISIONValue write SetFECHA_DECISIONValue; + property FECHA_DECISIONIsNull : Boolean read GetFECHA_DECISIONIsNull write SetFECHA_DECISIONIsNull; + property OldFECHA_DECISION : DateTime read GetOldFECHA_DECISIONValue; + property OldFECHA_DECISIONIsNull : Boolean read GetOldFECHA_DECISIONIsNull; + property FACTURA_ASOCIADA : String read GetFACTURA_ASOCIADAValue write SetFACTURA_ASOCIADAValue; + property FACTURA_ASOCIADAIsNull : Boolean read GetFACTURA_ASOCIADAIsNull write SetFACTURA_ASOCIADAIsNull; + property OldFACTURA_ASOCIADA : String read GetOldFACTURA_ASOCIADAValue; + property OldFACTURA_ASOCIADAIsNull : Boolean read GetOldFACTURA_ASOCIADAIsNull; public constructor Create(aBusinessProcessor: TDABusinessProcessor); override; @@ -988,7 +1012,7 @@ type { ITiposCapitulosDelta } ITiposCapitulosDelta = interface(ITiposCapitulos) - ['{19191BFF-2C9D-43C5-85D6-81B96CDBBF10}'] + ['{ABCB3BD5-D32A-405C-9799-900FAB730F45}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldPOSICIONValue : Integer; @@ -1082,7 +1106,7 @@ type { IContratosCliente_DetallesDelta } IContratosCliente_DetallesDelta = interface(IContratosCliente_Detalles) - ['{65037CFE-4A72-4CD0-A197-CECC6A4FDD1D}'] + ['{09923382-3A40-4992-9F2C-903B5B6CA290}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_CONTRATOValue : Integer; @@ -3609,6 +3633,68 @@ begin BusinessProcessor.CurrentChange.NewValueByName[fld_ContratosClienteLISTA_NOMBRES] := Null; end; +function TContratosClienteBusinessProcessorRules.GetFECHA_DECISIONValue: DateTime; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_ContratosClienteFECHA_DECISION]; +end; + +function TContratosClienteBusinessProcessorRules.GetFECHA_DECISIONIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_ContratosClienteFECHA_DECISION]); +end; + +function TContratosClienteBusinessProcessorRules.GetOldFECHA_DECISIONValue: DateTime; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_ContratosClienteFECHA_DECISION]; +end; + +function TContratosClienteBusinessProcessorRules.GetOldFECHA_DECISIONIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_ContratosClienteFECHA_DECISION]); +end; + +procedure TContratosClienteBusinessProcessorRules.SetFECHA_DECISIONValue(const aValue: DateTime); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_ContratosClienteFECHA_DECISION] := aValue; +end; + +procedure TContratosClienteBusinessProcessorRules.SetFECHA_DECISIONIsNull(const aValue: Boolean); +begin + if aValue then + BusinessProcessor.CurrentChange.NewValueByName[fld_ContratosClienteFECHA_DECISION] := Null; +end; + +function TContratosClienteBusinessProcessorRules.GetFACTURA_ASOCIADAValue: String; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_ContratosClienteFACTURA_ASOCIADA]; +end; + +function TContratosClienteBusinessProcessorRules.GetFACTURA_ASOCIADAIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_ContratosClienteFACTURA_ASOCIADA]); +end; + +function TContratosClienteBusinessProcessorRules.GetOldFACTURA_ASOCIADAValue: String; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_ContratosClienteFACTURA_ASOCIADA]; +end; + +function TContratosClienteBusinessProcessorRules.GetOldFACTURA_ASOCIADAIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_ContratosClienteFACTURA_ASOCIADA]); +end; + +procedure TContratosClienteBusinessProcessorRules.SetFACTURA_ASOCIADAValue(const aValue: String); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_ContratosClienteFACTURA_ASOCIADA] := aValue; +end; + +procedure TContratosClienteBusinessProcessorRules.SetFACTURA_ASOCIADAIsNull(const aValue: Boolean); +begin + if aValue then + BusinessProcessor.CurrentChange.NewValueByName[fld_ContratosClienteFACTURA_ASOCIADA] := Null; +end; + { TTiposCapitulosBusinessProcessorRules } constructor TTiposCapitulosBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor); diff --git a/Source/Modulos/Contratos de cliente/Model/uBizContratosCliente.pas b/Source/Modulos/Contratos de cliente/Model/uBizContratosCliente.pas index 333789f..a91d81b 100644 --- a/Source/Modulos/Contratos de cliente/Model/uBizContratosCliente.pas +++ b/Source/Modulos/Contratos de cliente/Model/uBizContratosCliente.pas @@ -12,7 +12,8 @@ const BIZ_CLIENT_CONTRATOS_CLIENTE_BENEFICIOS = 'Client.ContratosClienteBeneficios'; SITUACION_CONTRATO_PENDIENTE = 'PENDIENTE'; - SITUACION_CONTRATO_TERMINADO = 'TERMINADO'; + SITUACION_CONTRATO_ACEPTADO = 'ACEPTADO'; + SITUACION_CONTRATO_RECHAZADO = 'RECHAZADO'; type @@ -207,7 +208,8 @@ begin with Result do begin Add(SITUACION_CONTRATO_PENDIENTE); - Add(SITUACION_CONTRATO_TERMINADO); + Add(SITUACION_CONTRATO_ACEPTADO); + Add(SITUACION_CONTRATO_RECHAZADO); end; end; diff --git a/Source/Modulos/Contratos de cliente/Plugin/uPluginContratosCliente.dfm b/Source/Modulos/Contratos de cliente/Plugin/uPluginContratosCliente.dfm index 84208a4..85419d9 100644 --- a/Source/Modulos/Contratos de cliente/Plugin/uPluginContratosCliente.dfm +++ b/Source/Modulos/Contratos de cliente/Plugin/uPluginContratosCliente.dfm @@ -134,13 +134,13 @@ object PluginContratosCliente: TPluginContratosCliente Top = 72 object actContratosCliente: TAction Category = 'Ventas' - Caption = 'Contratos de cliente' + Caption = 'Presupuestos de cliente' ImageIndex = 0 OnExecute = actContratosClienteExecute end object actInfContratos: TAction Category = 'Informes' - Caption = 'Informe contratos' + Caption = 'Informe presupuestos' OnExecute = actContratosClienteExecute end end diff --git a/Source/Modulos/Contratos de cliente/Plugin/uPluginContratosCliente.pas b/Source/Modulos/Contratos de cliente/Plugin/uPluginContratosCliente.pas index 32a30f6..f66992d 100644 --- a/Source/Modulos/Contratos de cliente/Plugin/uPluginContratosCliente.pas +++ b/Source/Modulos/Contratos de cliente/Plugin/uPluginContratosCliente.pas @@ -78,7 +78,7 @@ var AContratosCliente : IBizContratoCliente; AText : String; begin - AText := Format('Lista de contratos del cliente %s', [ANombreCliente]); +// AText := Format('Lista de presupuestos de cliente - %s', [ANombreCliente]); AContratosClienteController := TContratosClienteController.Create; try ShowHourglassCursor; diff --git a/Source/Modulos/Contratos de cliente/Reports/uRptContratosCliente_Server.dfm b/Source/Modulos/Contratos de cliente/Reports/uRptContratosCliente_Server.dfm index 37bc0b4..db98b70 100644 --- a/Source/Modulos/Contratos de cliente/Reports/uRptContratosCliente_Server.dfm +++ b/Source/Modulos/Contratos de cliente/Reports/uRptContratosCliente_Server.dfm @@ -1207,8 +1207,7 @@ object RptContratosCliente: TRptContratosCliente Top = 128 end object IBDatabase1: TIBDatabase - Connected = True - DatabaseName = 'C:\Codigo Acana\Output\Debug\Database\FACTUGES.FDB' + DatabaseName = 'C:\Codigo Arribas2\Output\Debug\Database\FACTUGES.FDB' Params.Strings = ( 'user_name=sysdba' 'password=masterkey' @@ -1219,7 +1218,6 @@ object RptContratosCliente: TRptContratosCliente Top = 296 end object IBTransaction1: TIBTransaction - Active = True Left = 48 Top = 352 end diff --git a/Source/Modulos/Contratos de cliente/Reports/uRptContratosCliente_Server.pas b/Source/Modulos/Contratos de cliente/Reports/uRptContratosCliente_Server.pas index 4a5254d..d64b751 100644 --- a/Source/Modulos/Contratos de cliente/Reports/uRptContratosCliente_Server.pas +++ b/Source/Modulos/Contratos de cliente/Reports/uRptContratosCliente_Server.pas @@ -82,6 +82,10 @@ type FListaNombresClientes: TStringList; FImporteMinimo: Currency; FDesglosado : Boolean; + FVerLogotipo : Boolean; + FNombreEmpresa: String; + FVerPrecios: Boolean; + FVerTotales: Boolean; procedure _GenerarContrato(const AID : Integer); @@ -146,6 +150,14 @@ var i: Integer; begin Result := Binary.Create; + + //Inicializamos parametros + FVerLogotipo := true; + FNombreEmpresa := ''; + FVerPrecios := true; + FVerTotales := true; + + try //Vamos generando todos y cada uno de los Contratos recibidos for i := 0 to ListaID.Count - 1 do @@ -482,6 +494,13 @@ var i: Integer; begin Result := Binary.Create; + + //Inicializamos parametros + FVerLogotipo := True; + FNombreEmpresa := ''; + FVerPrecios := True; + FVerTotales := True; + try //Vamos generando todos y cada uno de los Contratos recibidos for i := 0 to ListaID.Count - 1 do @@ -539,8 +558,13 @@ begin raise Exception.Create (('Error Servidor: _GenerarContrato, no encuentra informe ' + rptInforme)); frxReport.LoadFromFile(AInforme, True); + frxReport.Variables.Variables['VerLogotipo'] := FVerLogotipo; + frxReport.Variables.Variables['NombreEmpresa'] := ''''+FNombreEmpresa+''''; + frxReport.Variables.Variables['VerPrecios'] := FVerPrecios; + frxReport.Variables.Variables['VerTotales'] := FVerTotales; frxReport.AddFunction('function PONERJUSTIFICACIONCOMPLETA(ARTFText : String): String', 'User Function',''); frxReport.ReportOptions.Name := 'Contrato ' + tbl_Cabecera.FieldByName('REFERENCIA').AsString; + frxReport.PrepareReport(False); finally FConnection.RollbackTransaction; //<--- Creo que no va a hacer falta. "PUES SI ES NECESARIO" diff --git a/Source/Modulos/Contratos de cliente/Servidor/srvContratosCliente_Impl.dfm b/Source/Modulos/Contratos de cliente/Servidor/srvContratosCliente_Impl.dfm index 7a2d546..8800368 100644 --- a/Source/Modulos/Contratos de cliente/Servidor/srvContratosCliente_Impl.dfm +++ b/Source/Modulos/Contratos de cliente/Servidor/srvContratosCliente_Impl.dfm @@ -478,6 +478,14 @@ object srvContratosCliente: TsrvContratosCliente item DatasetField = 'LISTA_NOMBRES' TableField = 'LISTA_NOMBRES' + end + item + DatasetField = 'FECHA_DECISION' + TableField = 'FECHA_DECISION' + end + item + DatasetField = 'FACTURA_ASOCIADA' + TableField = 'FACTURA_ASOCIADA' end> end> Name = 'ContratosCliente' @@ -752,6 +760,15 @@ object srvContratosCliente: TsrvContratosCliente DataType = datString Size = 255 DictionaryEntry = 'ContratosCliente_LISTA_NOMBRES' + end + item + Name = 'FECHA_DECISION' + DataType = datDateTime + end + item + Name = 'FACTURA_ASOCIADA' + DataType = datString + Size = 255 end> end item @@ -1216,6 +1233,11 @@ object srvContratosCliente: TsrvContratosCliente DataType = datString Size = 255 Value = '' + end + item + Name = 'FECHA_DECISION' + DataType = datDateTime + Value = '' end> Statements = < item @@ -1232,16 +1254,17 @@ object srvContratosCliente: TsrvContratosCliente '_IVA,'#10' IMPORTE_TOTAL, ID_FORMA_PAGO, ID_TIENDA, ID_VENDEDOR,' + ' PERSONA_CONTACTO,'#10' RE, IMPORTE_RE, RECARGO_EQUIVALENCIA, TE' + 'LEFONO, MOVIL, TIPO_CONTRATO, CONDICIONES,'#10' CALIDADES, REFER' + - 'ENCIA_CLIENTE)'#10' VALUES'#10' (:ID, :ID_CLIENTE, :NIF_CIF, :NOMBRE' + - ', :ID_DIRECCION, :CALLE, :POBLACION, :PROVINCIA,'#10' :CODIGO_PO' + - 'STAL, :REFERENCIA, :FECHA_CONTRATO, :SITUACION, :FORMA_PAGO,'#10' ' + - ' :PLAZO_ENTREGA, :OBSERVACIONES, :INCIDENCIAS, :INCIDENCIAS_ACT' + - 'IVAS, CURRENT_TIMESTAMP,'#10' :USUARIO, :IMPORTE_NETO, :IMPORTE_' + - 'PORTE, :DESCUENTO, :IMPORTE_DESCUENTO,'#10' :BASE_IMPONIBLE, :ID' + - '_TIPO_IVA, :IVA, :IMPORTE_IVA, :IMPORTE_TOTAL, :ID_FORMA_PAGO,'#10' ' + - ' :ID_TIENDA, :ID_VENDEDOR, :PERSONA_CONTACTO, :RE, :IMPORTE_R' + - 'E, :RECARGO_EQUIVALENCIA,'#10' :TELEFONO, :MOVIL, :TIPO_CONTRATO' + - ', :CONDICIONES, :CALIDADES, :REFERENCIA_CLIENTE)'#10#10 + 'ENCIA_CLIENTE, FECHA_DECISION)'#10' VALUES'#10' (:ID, :ID_CLIENTE, :' + + 'NIF_CIF, :NOMBRE, :ID_DIRECCION, :CALLE, :POBLACION, :PROVINCIA,' + + #10' :CODIGO_POSTAL, :REFERENCIA, :FECHA_CONTRATO, :SITUACION, ' + + ':FORMA_PAGO,'#10' :PLAZO_ENTREGA, :OBSERVACIONES, :INCIDENCIAS, ' + + ':INCIDENCIAS_ACTIVAS, CURRENT_TIMESTAMP,'#10' :USUARIO, :IMPORTE' + + '_NETO, :IMPORTE_PORTE, :DESCUENTO, :IMPORTE_DESCUENTO,'#10' :BAS' + + 'E_IMPONIBLE, :ID_TIPO_IVA, :IVA, :IMPORTE_IVA, :IMPORTE_TOTAL, :' + + 'ID_FORMA_PAGO,'#10' :ID_TIENDA, :ID_VENDEDOR, :PERSONA_CONTACTO,' + + ' :RE, :IMPORTE_RE, :RECARGO_EQUIVALENCIA,'#10' :TELEFONO, :MOVIL' + + ', :TIPO_CONTRATO, :CONDICIONES, :CALIDADES, :REFERENCIA_CLIENTE,' + + #10' :FECHA_DECISION)'#10#10 StatementType = stSQL ColumnMappings = <> end> @@ -1481,6 +1504,11 @@ object srvContratosCliente: TsrvContratosCliente Size = 255 Value = '' end + item + Name = 'FECHA_DECISION' + DataType = datDateTime + Value = '' + end item Name = 'OLD_ID' Value = '' @@ -1510,8 +1538,8 @@ object srvContratosCliente: TsrvContratosCliente 'RE,'#10' RECARGO_EQUIVALENCIA = :RECARGO_EQUIVALENCIA,'#10' TELEFO' + 'NO = :TELEFONO,'#10' MOVIL = :MOVIL,'#10' TIPO_CONTRATO = :TIPO_CO' + 'NTRATO,'#10' CONDICIONES = :CONDICIONES,'#10' CALIDADES = :CALIDAD' + - 'ES,'#10' REFERENCIA_CLIENTE = :REFERENCIA_CLIENTE'#10' WHERE'#10' (ID' + - ' = :OLD_ID)'#10#10 + 'ES,'#10' REFERENCIA_CLIENTE = :REFERENCIA_CLIENTE,'#10' FECHA_DECI' + + 'SION = :FECHA_DECISION'#10' WHERE'#10' (ID = :OLD_ID)'#10#10 StatementType = stSQL ColumnMappings = <> end> diff --git a/Source/Modulos/Contratos de cliente/Views/ContratosCliente_view.dpk b/Source/Modulos/Contratos de cliente/Views/ContratosCliente_view.dpk index 907f646..8e67390 100644 --- a/Source/Modulos/Contratos de cliente/Views/ContratosCliente_view.dpk +++ b/Source/Modulos/Contratos de cliente/Views/ContratosCliente_view.dpk @@ -76,7 +76,8 @@ requires JvCoreD11R, JvSystemD11R, JvPageCompsD11R, - ConCli_PedProv_relation; + ConCli_PedProv_relation, + ConCli_RecCli_relation; contains uContratosClienteViewRegister in 'uContratosClienteViewRegister.pas', @@ -94,6 +95,7 @@ contains uViewDatosYSeleccionClienteContrato in 'uViewDatosYSeleccionClienteContrato.pas' {frViewDatosYSeleccionClienteContrato: TFrame}, uViewContratosClienteBeneficios in 'uViewContratosClienteBeneficios.pas' {frViewContratosClienteBeneficios: TFrame}, uEditorContratosClienteBeneficios in 'uEditorContratosClienteBeneficios.pas' {fEditorContratosClienteBeneficios: TFrame}, - uViewClienteContrato in 'uViewClienteContrato.pas' {frViewClienteContrato: TFrame}; + uViewClienteContrato in 'uViewClienteContrato.pas' {frViewClienteContrato: TFrame}, + uEditorFechaDecisionContrato in 'uEditorFechaDecisionContrato.pas' {fEditorFechaDecisionContrato: TFrame}; end. diff --git a/Source/Modulos/Contratos de cliente/Views/ContratosCliente_view.dproj b/Source/Modulos/Contratos de cliente/Views/ContratosCliente_view.dproj index 4b3add8..89bd806 100644 --- a/Source/Modulos/Contratos de cliente/Views/ContratosCliente_view.dproj +++ b/Source/Modulos/Contratos de cliente/Views/ContratosCliente_view.dproj @@ -49,51 +49,59 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
fEditorPresupuestoCliente
@@ -119,6 +127,10 @@
fEditorElegirPresupuestosCliente
TfEditorElegirPedidosCliente + +
fEditorFechaDecisionContrato
+ TFrame +
frViewClienteContrato
TFrame @@ -155,13 +167,6 @@
frViewElegirArticulosContratosCliente
TFrame - - - - - - -