diff --git a/Build/Build.fbl6 b/Build/Build.fbl6 index d9df602..36ee6bc 100644 Binary files a/Build/Build.fbl6 and b/Build/Build.fbl6 differ diff --git a/Resources/LOGO ALONSO Y SAL.jpg b/Resources/LOGO ALONSO Y SAL.jpg new file mode 100644 index 0000000..5486553 Binary files /dev/null and b/Resources/LOGO ALONSO Y SAL.jpg differ diff --git a/Source/ApplicationBase/Ejercicios/Plugin/uPluginEjercicios.dfm b/Source/ApplicationBase/Ejercicios/Plugin/uPluginEjercicios.dfm index c0ef714..8b79c28 100644 --- a/Source/ApplicationBase/Ejercicios/Plugin/uPluginEjercicios.dfm +++ b/Source/ApplicationBase/Ejercicios/Plugin/uPluginEjercicios.dfm @@ -66,7 +66,9 @@ object PluginEjercicios: TPluginEjercicios object actEjercicios: TAction Category = 'Ejercicios' Caption = 'Ejercicios' + Enabled = False ImageIndex = 0 + Visible = False OnExecute = actEjerciciosExecute end end diff --git a/Source/Base/Base.res b/Source/Base/Base.res index 1641339..8b251f3 100644 Binary files a/Source/Base/Base.res and b/Source/Base/Base.res differ diff --git a/Source/Cliente/uPantallaPrincipal.dfm b/Source/Cliente/uPantallaPrincipal.dfm index 178a0b5..fc77f9d 100644 --- a/Source/Cliente/uPantallaPrincipal.dfm +++ b/Source/Cliente/uPantallaPrincipal.dfm @@ -701,8 +701,6 @@ object fPantallaPrincipal: TfPantallaPrincipal object Contabilidad1: TMenuItem Tag = 6000 Action = actMenuContabilidad - Enabled = False - Visible = False end object Informes1: TMenuItem Tag = 7000 diff --git a/Source/Cliente/uPantallaPrincipal.pas b/Source/Cliente/uPantallaPrincipal.pas index 802a112..6e07ede 100644 --- a/Source/Cliente/uPantallaPrincipal.pas +++ b/Source/Cliente/uPantallaPrincipal.pas @@ -196,12 +196,14 @@ end; procedure TfPantallaPrincipal.FormShow(Sender: TObject); begin //El usuario vendedor y logistica será restringido - if ((AppFactuGES.UsuarioActivo.ID_PERFIL = 5) OR (AppFactuGES.UsuarioActivo.ID_PERFIL = 4)) then + if ((AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PREFIL_LOGISTICA) OR (AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PERFIL_VENDEDOR)) then begin Informes1.Enabled := False; Informes1.Visible := False; Contabilidad1.Enabled := False; Contabilidad1.Visible := False; + Compras1.Enabled := False; + Compras1.Visible := False; Informacindeempresa1.Visible := False; end; diff --git a/Source/GUIBase/GUIBase.dproj b/Source/GUIBase/GUIBase.dproj index 84e7139..fd91c4e 100644 --- a/Source/GUIBase/GUIBase.dproj +++ b/Source/GUIBase/GUIBase.dproj @@ -58,34 +58,34 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + +
fDialogBase
 diff --git a/Source/GUIBase/uViewTotales.dfm b/Source/GUIBase/uViewTotales.dfm index 7255ad7..e79581c 100644 --- a/Source/GUIBase/uViewTotales.dfm +++ b/Source/GUIBase/uViewTotales.dfm @@ -1,14 +1,14 @@ inherited frViewTotales: TfrViewTotales - Width = 935 - Height = 266 + Width = 1064 + Height = 206 Align = alBottom - ExplicitWidth = 935 - ExplicitHeight = 266 + ExplicitWidth = 1063 + ExplicitHeight = 206 object dxLayoutControl1: TdxLayoutControl AlignWithMargins = True Left = 0 Top = 0 - Width = 935 + Width = 1064 Height = 217 Margins.Left = 0 Margins.Top = 0 @@ -21,14 +21,14 @@ inherited frViewTotales: TfrViewTotales AutoContentSizes = [acsWidth, acsHeight] ExplicitWidth = 451 object Bevel3: TBevel - Left = 534 + Left = 520 Top = 28 Width = 3 Height = 122 Shape = bsRightLine end object Bevel4: TBevel - Left = 646 + Left = 632 Top = 70 Width = 210 Height = 9 @@ -36,7 +36,7 @@ inherited frViewTotales: TfrViewTotales end object ImporteDto: TcxDBCurrencyEdit Left = 175 - Top = 82 + Top = 55 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 = 3 + TabOrder = 2 Height = 21 Width = 93 end object ImporteIVA: TcxDBCurrencyEdit - Left = 717 + Left = 703 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 = 10 + TabOrder = 9 Height = 21 Width = 137 end object ImporteTotal: TcxDBCurrencyEdit - Left = 647 + Left = 633 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 = 13 + TabOrder = 12 Height = 21 Width = 137 end object edtDescuento: TcxDBSpinEdit Left = 104 - Top = 82 + Top = 55 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 = 2 + TabOrder = 1 Height = 21 Width = 65 end object edtIVA: TcxDBSpinEdit - Left = 646 + Left = 632 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 = 9 + TabOrder = 8 Height = 21 Width = 65 end object ImporteBase: TcxDBCurrencyEdit - Left = 646 + Left = 632 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 = 8 + TabOrder = 7 Height = 21 Width = 92 end object edtRE: TcxDBSpinEdit - Left = 646 + Left = 632 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 = 11 + TabOrder = 10 Height = 21 Width = 65 end object ImporteRE: TcxDBCurrencyEdit - Left = 717 + Left = 703 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 = 12 + TabOrder = 11 Height = 21 Width = 56 end object eImporteNeto: TcxDBCurrencyEdit Left = 104 - Top = 55 + Top = 28 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 = 1 + TabOrder = 0 Height = 21 Width = 147 end object ePorte: TcxDBCurrencyEdit Left = 104 - Top = 109 + Top = 82 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 = 4 + TabOrder = 3 Height = 21 Width = 147 end object eIVA: TcxDBLookupComboBox Left = 104 - Top = 136 + Top = 109 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 = 5 + TabOrder = 4 Width = 81 end object bTiposIVA: TButton - Left = 386 - Top = 136 + Left = 372 + Top = 109 Width = 132 Height = 21 Caption = 'Ver los tipos de IVA...' - TabOrder = 6 + TabOrder = 5 end object cbRecargoEquivalencia: TcxDBCheckBox Left = 104 - Top = 163 + Top = 136 Caption = 'Aplicar recargo de equivalencia' DataBinding.DataField = 'RECARGO_EQUIVALENCIA' DataBinding.DataSource = DADataSource @@ -417,37 +417,9 @@ inherited frViewTotales: TfrViewTotales StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 7 + TabOrder = 6 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 @@ -461,12 +433,6 @@ 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 0f2d847..7458376 100644 --- a/Source/GUIBase/uViewTotales.pas +++ b/Source/GUIBase/uViewTotales.pas @@ -59,8 +59,6 @@ type cbRecargoEquivalencia: TcxDBCheckBox; dxLayoutControl1Group10: TdxLayoutGroup; dxLayoutControl1Group11: TdxLayoutGroup; - dxLayoutControl1Item10: TdxLayoutItem; - eImporteDetalleResumen: TcxDBCurrencyEdit; public { Public declarations } end; diff --git a/Source/Informes/1/InfAlbaranCliente.fr3 b/Source/Informes/1/InfAlbaranCliente.fr3 deleted file mode 100644 index acb4bb5..0000000 --- a/Source/Informes/1/InfAlbaranCliente.fr3 +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/Informes/1/InfComision.fr3 b/Source/Informes/1/InfComision.fr3 deleted file mode 100644 index d6e1837..0000000 --- a/Source/Informes/1/InfComision.fr3 +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/Informes/1/InfContratoCliente.fr3 b/Source/Informes/1/InfContratoCliente.fr3 index fb03756..f46b7be 100644 --- a/Source/Informes/1/InfContratoCliente.fr3 +++ b/Source/Informes/1/InfContratoCliente.fr3 @@ -1,9 +1,9 @@ - + - + @@ -15,30 +15,28 @@ - - + + - - - + + - - + + - - - + + - + - - - - - + + + + + @@ -53,9 +51,9 @@ - + - + @@ -67,8 +65,9 @@ - + + diff --git a/Source/Informes/1/InfFacturaCliente.fr3 b/Source/Informes/1/InfFacturaCliente.fr3 index bb6971c..34524a7 100644 --- a/Source/Informes/1/InfFacturaCliente.fr3 +++ b/Source/Informes/1/InfFacturaCliente.fr3 @@ -1,81 +1,61 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + - - - - - - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + - - - - + + + + diff --git a/Source/Informes/1/InfReciboCliente.fr3 b/Source/Informes/1/InfReciboCliente.fr3 index aceca57..4afd997 100644 --- a/Source/Informes/1/InfReciboCliente.fr3 +++ b/Source/Informes/1/InfReciboCliente.fr3 @@ -1,83 +1,45 @@ - + - - - - + + + + - - - - - - - - - - - - - - - - - + + + + + + - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - + diff --git a/Source/Informes/1/InformeIVAClientes.fr3 b/Source/Informes/1/InformeIVAClientes.fr3 deleted file mode 100644 index d91749c..0000000 --- a/Source/Informes/1/InformeIVAClientes.fr3 +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/Informes/1/InformeIVAClientesDesglosado.fr3 b/Source/Informes/1/InformeIVAClientesDesglosado.fr3 deleted file mode 100644 index 7dd7ca6..0000000 --- a/Source/Informes/1/InformeIVAClientesDesglosado.fr3 +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/Informes/1/InformeIVAProveedores.fr3 b/Source/Informes/1/InformeIVAProveedores.fr3 deleted file mode 100644 index 614d7e3..0000000 --- a/Source/Informes/1/InformeIVAProveedores.fr3 +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/Informes/1/InformeIVAProveedoresDesglosado.fr3 b/Source/Informes/1/InformeIVAProveedoresDesglosado.fr3 deleted file mode 100644 index a99d074..0000000 --- a/Source/Informes/1/InformeIVAProveedoresDesglosado.fr3 +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/Informes/1/InformeListadoFacturasCliente.fr3 b/Source/Informes/1/InformeListadoFacturasCliente.fr3 deleted file mode 100644 index 1a31314..0000000 --- a/Source/Informes/1/InformeListadoFacturasCliente.fr3 +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/Informes/1/InformeListadoFacturasClienteDesglosado.fr3 b/Source/Informes/1/InformeListadoFacturasClienteDesglosado.fr3 deleted file mode 100644 index cc336f9..0000000 --- a/Source/Informes/1/InformeListadoFacturasClienteDesglosado.fr3 +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/Informes/1/InformeListadoFacturasClientePendientes.fr3 b/Source/Informes/1/InformeListadoFacturasClientePendientes.fr3 deleted file mode 100644 index 6497f78..0000000 --- a/Source/Informes/1/InformeListadoFacturasClientePendientes.fr3 +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/Informes/1/InformeListadoFacturasClientePendientesDesglosado.fr3 b/Source/Informes/1/InformeListadoFacturasClientePendientesDesglosado.fr3 deleted file mode 100644 index f2dedb3..0000000 --- a/Source/Informes/1/InformeListadoFacturasClientePendientesDesglosado.fr3 +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/Informes/1/InformeListadoFacturasProveedor.fr3 b/Source/Informes/1/InformeListadoFacturasProveedor.fr3 deleted file mode 100644 index 0cc9b18..0000000 --- a/Source/Informes/1/InformeListadoFacturasProveedor.fr3 +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/Informes/1/InformeListadoFacturasProveedorDesglosado.fr3 b/Source/Informes/1/InformeListadoFacturasProveedorDesglosado.fr3 deleted file mode 100644 index a0db9aa..0000000 --- a/Source/Informes/1/InformeListadoFacturasProveedorDesglosado.fr3 +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/Informes/1/InformeListadoFacturasProveedorPendientes.fr3 b/Source/Informes/1/InformeListadoFacturasProveedorPendientes.fr3 deleted file mode 100644 index 6ea8d3c..0000000 --- a/Source/Informes/1/InformeListadoFacturasProveedorPendientes.fr3 +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/Informes/1/InformeListadoFacturasProveedorPendientesDesglosado.fr3 b/Source/Informes/1/InformeListadoFacturasProveedorPendientesDesglosado.fr3 deleted file mode 100644 index 71f8c8a..0000000 --- a/Source/Informes/1/InformeListadoFacturasProveedorPendientesDesglosado.fr3 +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/Informes/1/InformeListadoRecibosCliPendientes.fr3 b/Source/Informes/1/InformeListadoRecibosCliPendientes.fr3 deleted file mode 100644 index c01ba3f..0000000 --- a/Source/Informes/1/InformeListadoRecibosCliPendientes.fr3 +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/Informes/1/InformeListadoRecibosCliPendientesDesglosado.fr3 b/Source/Informes/1/InformeListadoRecibosCliPendientesDesglosado.fr3 deleted file mode 100644 index 4ba051a..0000000 --- a/Source/Informes/1/InformeListadoRecibosCliPendientesDesglosado.fr3 +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/Informes/1/InformeListadoRecibosCliente.fr3 b/Source/Informes/1/InformeListadoRecibosCliente.fr3 deleted file mode 100644 index 230feda..0000000 --- a/Source/Informes/1/InformeListadoRecibosCliente.fr3 +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/Informes/1/InformeListadoRecibosClienteDesglosado.fr3 b/Source/Informes/1/InformeListadoRecibosClienteDesglosado.fr3 deleted file mode 100644 index a232d8f..0000000 --- a/Source/Informes/1/InformeListadoRecibosClienteDesglosado.fr3 +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/Informes/1/InformeListadoRecibosProvPendientes.fr3 b/Source/Informes/1/InformeListadoRecibosProvPendientes.fr3 deleted file mode 100644 index 0ca3ee6..0000000 --- a/Source/Informes/1/InformeListadoRecibosProvPendientes.fr3 +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/Informes/1/InformeListadoRecibosProvPendientesDesglosado.fr3 b/Source/Informes/1/InformeListadoRecibosProvPendientesDesglosado.fr3 deleted file mode 100644 index 79c0d66..0000000 --- a/Source/Informes/1/InformeListadoRecibosProvPendientesDesglosado.fr3 +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/Informes/1/InformeListadoRecibosProveedor.fr3 b/Source/Informes/1/InformeListadoRecibosProveedor.fr3 deleted file mode 100644 index d4175a6..0000000 --- a/Source/Informes/1/InformeListadoRecibosProveedor.fr3 +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/Informes/1/InformeListadoRecibosProveedorDesglosado.fr3 b/Source/Informes/1/InformeListadoRecibosProveedorDesglosado.fr3 deleted file mode 100644 index 016d497..0000000 --- a/Source/Informes/1/InformeListadoRecibosProveedorDesglosado.fr3 +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/Lib/ApplicationBase.dcp b/Source/Lib/ApplicationBase.dcp index b4d91de..0e2733d 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 a6b481b..b8afc94 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 92145c2..0f548c0 100644 Binary files a/Source/Lib/GUIBase.dcp and b/Source/Lib/GUIBase.dcp differ diff --git a/Source/Modulos/Articulos/Views/uViewArticulo.dfm b/Source/Modulos/Articulos/Views/uViewArticulo.dfm index dd1f10c..c7814e8 100644 --- a/Source/Modulos/Articulos/Views/uViewArticulo.dfm +++ b/Source/Modulos/Articulos/Views/uViewArticulo.dfm @@ -1,6 +1,6 @@ inherited frViewArticulo: TfrViewArticulo - Width = 451 - Height = 304 + Width = 1010 + Height = 444 Align = alClient OnCreate = CustomViewCreate OnDestroy = CustomViewDestroy @@ -10,18 +10,19 @@ inherited frViewArticulo: TfrViewArticulo object dxLayoutControlArticulo: TdxLayoutControl Left = 0 Top = 0 - Width = 451 + Width = 1010 Height = 393 Align = alTop ParentBackground = True TabOrder = 0 TabStop = False AutoContentSizes = [acsWidth] + ExplicitWidth = 451 DesignSize = ( - 451 + 1010 393) object PngSpeedButton2: TPngSpeedButton - Left = 546 + Left = 965 Top = 28 Width = 23 Height = 22 @@ -48,7 +49,7 @@ inherited frViewArticulo: TfrViewArticulo PngOptions = [pngBlendOnDisabled, pngGrayscaleOnDisabled] end object PngSpeedButton1: TPngSpeedButton - Left = 546 + Left = 965 Top = 56 Width = 23 Height = 22 @@ -121,7 +122,7 @@ inherited frViewArticulo: TfrViewArticulo Width = 144 end object eImagen: TcxImage - Left = 409 + Left = 691 Top = 28 Properties.GraphicClassName = 'TJPEGImage' Properties.PopupMenuLayout.MenuItems = [] @@ -167,7 +168,7 @@ inherited frViewArticulo: TfrViewArticulo Width = 70 end inline frViewDatosYSeleccionProveedor1: TfrViewDatosYSeleccionProveedor - Left = 219 + Left = 638 Top = 166 Width = 350 Height = 202 @@ -179,7 +180,7 @@ inherited frViewArticulo: TfrViewArticulo ParentFont = False TabOrder = 12 ReadOnly = False - ExplicitLeft = 219 + ExplicitLeft = 638 ExplicitTop = 166 inherited dxLayoutControl1: TdxLayoutControl inherited edtNIFCIF: TcxDBTextEdit @@ -206,6 +207,7 @@ inherited frViewArticulo: TfrViewArticulo Anchors = [akLeft, akTop, akRight] DataBinding.DataField = 'REFERENCIA_PROV' DataBinding.DataSource = dsViewArticulo + Enabled = False Style.BorderColor = clWindowFrame Style.BorderStyle = ebs3D Style.Color = 14745599 @@ -222,6 +224,7 @@ inherited frViewArticulo: TfrViewArticulo Top = 193 DataBinding.DataField = 'PRECIO_COSTE' DataBinding.DataSource = dsViewArticulo + Enabled = False Properties.Alignment.Horz = taRightJustify Style.BorderColor = clWindowFrame Style.BorderStyle = ebs3D @@ -242,6 +245,7 @@ inherited frViewArticulo: TfrViewArticulo Top = 220 DataBinding.DataField = 'DESCUENTO' DataBinding.DataSource = dsViewArticulo + Enabled = False Properties.Alignment.Horz = taRightJustify Properties.ImmediatePost = True Properties.MaxValue = 100.000000000000000000 @@ -290,6 +294,7 @@ inherited frViewArticulo: TfrViewArticulo Top = 274 DataBinding.DataField = 'PRECIO_PORTE' DataBinding.DataSource = dsViewArticulo + Enabled = False Properties.Alignment.Horz = taRightJustify Style.BorderColor = clWindowFrame Style.BorderStyle = ebs3D @@ -306,7 +311,7 @@ inherited frViewArticulo: TfrViewArticulo Width = 86 end object cbNoInventariable: TcxDBCheckBox - Left = 242 + Left = 414 Top = 109 Caption = 'Art'#237'culo no inventariable' DataBinding.DataField = 'INVENTARIABLE' @@ -334,6 +339,7 @@ inherited frViewArticulo: TfrViewArticulo Top = 301 DataBinding.DataField = 'PRECIO_PVP' DataBinding.DataSource = dsViewArticulo + Enabled = False Properties.Alignment.Horz = taRightJustify Style.BorderColor = clWindowFrame Style.BorderStyle = ebs3D @@ -459,6 +465,8 @@ inherited frViewArticulo: TfrViewArticulo AutoAligns = [aaVertical] AlignHorz = ahClient Caption = 'Datos del proveedor para el art'#237'culo' + Enabled = False + Visible = False object dxLayoutControlArticuloItem15: TdxLayoutItem Caption = 'Ref. del prov:' Visible = False diff --git a/Source/Modulos/Comisiones/Plugin/uPluginComisiones.pas b/Source/Modulos/Comisiones/Plugin/uPluginComisiones.pas index adfe707..350af81 100644 --- a/Source/Modulos/Comisiones/Plugin/uPluginComisiones.pas +++ b/Source/Modulos/Comisiones/Plugin/uPluginComisiones.pas @@ -64,7 +64,7 @@ begin uComisionesViewRegister.RegisterViews; //El usuario vendedor y logistica será restringido - if ((AppFactuGES.UsuarioActivo.ID_PERFIL = 5) OR (AppFactuGES.UsuarioActivo.ID_PERFIL = 4)) then + if ((AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PREFIL_LOGISTICA) OR (AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PERFIL_VENDEDOR)) then actComisiones.Visible := False; end; diff --git a/Source/Modulos/Contabilidad/Plugin/uPluginContabilidad.dfm b/Source/Modulos/Contabilidad/Plugin/uPluginContabilidad.dfm index dfccc92..5053b12 100644 --- a/Source/Modulos/Contabilidad/Plugin/uPluginContabilidad.dfm +++ b/Source/Modulos/Contabilidad/Plugin/uPluginContabilidad.dfm @@ -613,7 +613,9 @@ object PluginContabilidad: TPluginContabilidad object actEpigrafes: TAction Category = 'Contabilidad' Caption = 'Epigrafes' + Enabled = False ImageIndex = 3 + Visible = False OnExecute = actEpigrafesExecute OnUpdate = actEpigrafesUpdate end @@ -652,7 +654,9 @@ object PluginContabilidad: TPluginContabilidad object actDiario: TAction Category = 'Contabilidad' Caption = 'Libro de diario' + Enabled = False ImageIndex = 0 + Visible = False OnExecute = actDiarioExecute OnUpdate = actDiarioUpdate end diff --git a/Source/Modulos/Contabilidad/Plugin/uPluginContabilidad.pas b/Source/Modulos/Contabilidad/Plugin/uPluginContabilidad.pas index 7fb497e..e932408 100644 --- a/Source/Modulos/Contabilidad/Plugin/uPluginContabilidad.pas +++ b/Source/Modulos/Contabilidad/Plugin/uPluginContabilidad.pas @@ -184,11 +184,18 @@ begin inherited; uContabilidadViewRegister.RegisterViews; - //El usuario vendedor y logistica será restringido - if ((AppFactuGES.UsuarioActivo.ID_PERFIL = 5) OR (AppFactuGES.UsuarioActivo.ID_PERFIL = 4)) then + //Solo lo verá el perfil Administrador + if (AppFactuGES.UsuarioActivo.ID_PERFIL <> CTE_PERFIL_ADMINISTRADOR) then + begin + actSubCuentas.Visible := False; + actCuentas.Visible := False; + end; + + //El usuario vendedor y logistica será restringido + if ((AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PREFIL_LOGISTICA) OR (AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PERFIL_VENDEDOR)) then begin actCuentasEspeciales.Visible := False; - actBalances.Visible := False; + actBalances.Visible := False; end; end; diff --git a/Source/Modulos/Contabilidad/Views/Contabilidad_view.res b/Source/Modulos/Contabilidad/Views/Contabilidad_view.res index 8b251f3..1641339 100644 Binary files a/Source/Modulos/Contabilidad/Views/Contabilidad_view.res and b/Source/Modulos/Contabilidad/Views/Contabilidad_view.res differ diff --git a/Source/Modulos/Contabilidad/Views/uEditorApunte.dfm b/Source/Modulos/Contabilidad/Views/uEditorApunte.dfm index 7543bc2..4a47445 100644 --- a/Source/Modulos/Contabilidad/Views/uEditorApunte.dfm +++ b/Source/Modulos/Contabilidad/Views/uEditorApunte.dfm @@ -94,6 +94,14 @@ inherited fEditorApunte: TfEditorApunte end end end + inherited StatusBar: TJvStatusBar + Width = 632 + Panels = < + item + Width = 200 + end> + ExplicitWidth = 632 + end inherited pgPaginas: TPageControl Width = 626 ExplicitWidth = 626 @@ -103,28 +111,25 @@ inherited fEditorApunte: TfEditorApunte ExplicitWidth = 618 end end - inherited StatusBar: TJvStatusBar + inherited PnlComentario: TPanel Width = 632 - Panels = < - item - Width = 200 - end> - ExplicitWidth = 632 + inherited lbComentario: TLabel + Width = 622 + Height = 25 + end end inherited EditorActionList: TActionList Top = 128 end - inherited SmallImages: TPngImageList - Top = 112 - end inherited dsDataTable: TDADataSource [6] Left = 168 Top = 120 end - inherited LargeImages: TPngImageList [7] + inherited LargeImages: TPngImageList Top = 112 end - inherited JvFormStorage: TJvFormStorage [8] + inherited SmallImages: TPngImageList [9] + Top = 112 end object dxLayoutLookAndFeelList1: TdxLayoutLookAndFeelList Left = 320 diff --git a/Source/Modulos/Contabilidad/Views/uEditorAsiento.dfm b/Source/Modulos/Contabilidad/Views/uEditorAsiento.dfm index e17cf33..6ffedc2 100644 --- a/Source/Modulos/Contabilidad/Views/uEditorAsiento.dfm +++ b/Source/Modulos/Contabilidad/Views/uEditorAsiento.dfm @@ -97,30 +97,39 @@ inherited fEditorAsiento: TfEditorAsiento end end end + inherited StatusBar: TJvStatusBar + Top = 576 + Width = 869 + Panels = < + item + Width = 200 + end> + ExplicitTop = 576 + ExplicitWidth = 869 + end inherited pgPaginas: TPageControl Width = 863 - Height = 494 - ExplicitLeft = 3 - ExplicitTop = 79 + Height = 464 + ExplicitTop = 109 ExplicitWidth = 863 - ExplicitHeight = 494 + ExplicitHeight = 464 inherited pagGeneral: TTabSheet ExplicitLeft = 4 ExplicitTop = 24 ExplicitWidth = 855 - ExplicitHeight = 466 + ExplicitHeight = 436 object dxLayoutControl1: TdxLayoutControl Left = 0 Top = 0 Width = 855 - Height = 466 + Height = 436 Align = alClient TabOrder = 0 TabStop = False AutoContentSizes = [acsWidth, acsHeight] DesignSize = ( 855 - 466) + 436) object edtOrden: TcxDBSpinEdit Left = 293 Top = 10 @@ -224,20 +233,6 @@ inherited fEditorAsiento: TfEditorAsiento end> end end - inherited ToolBar1: TToolBar - 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 object dxLayoutControl1Group_Root: TdxLayoutGroup ShowCaption = False @@ -277,30 +272,25 @@ inherited fEditorAsiento: TfEditorAsiento end end end - inherited StatusBar: TJvStatusBar - Top = 576 + inherited PnlComentario: TPanel Width = 869 - Panels = < - item - Width = 200 - end> - ExplicitTop = 576 - ExplicitWidth = 869 + inherited lbComentario: TLabel + Width = 859 + Height = 25 + end end inherited EditorActionList: TActionList Top = 128 end - inherited SmallImages: TPngImageList - Top = 112 - end inherited dsDataTable: TDADataSource [6] Left = 16 Top = 168 end - inherited LargeImages: TPngImageList [7] + inherited LargeImages: TPngImageList Top = 112 end - inherited JvFormStorage: TJvFormStorage [8] + inherited SmallImages: TPngImageList [9] + Top = 112 end inherited StatusBarImages: TPngImageList Left = 24 diff --git a/Source/Modulos/Contabilidad/Views/uEditorDiario.dfm b/Source/Modulos/Contabilidad/Views/uEditorDiario.dfm index 840194c..2a04376 100644 --- a/Source/Modulos/Contabilidad/Views/uEditorDiario.dfm +++ b/Source/Modulos/Contabilidad/Views/uEditorDiario.dfm @@ -2,13 +2,15 @@ inherited fEditorDiario: TfEditorDiario Left = 489 Top = 325 Caption = 'Libro de diario' - ExplicitWidth = 320 - ExplicitHeight = 240 + ClientWidth = 572 + ExplicitWidth = 580 PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader + Width = 572 Caption = 'Libro de diario' inherited Image1: TImage + Left = 545 Picture.Data = { 0B546478504E47496D61676589504E470D0A1A0A0000000D4948445200000018 000000180806000000E0773DF8000000017352474200AECE1CE9000000046741 @@ -33,6 +35,10 @@ inherited fEditorDiario: TfEditorDiario end end inherited TBXDock: TTBXDock + Width = 572 + inherited tbxMain: TTBXToolbar + ExplicitWidth = 572 + end inherited tbxFiltro: TTBXToolbar ExplicitWidth = 269 inherited tbxEditFiltro: TTBXEditItem @@ -42,22 +48,27 @@ inherited fEditorDiario: TfEditorDiario Visible = False end end + inherited tbxMenu: TTBXToolbar + ExplicitWidth = 572 + end inherited TBXTMain2: TTBXToolbar Left = 275 DockPos = 275 Visible = True ExplicitLeft = 275 - ExplicitWidth = 176 object TBXItem38: TTBXItem Action = actPuntear DisplayMode = nbdmImageAndText end end end + inherited StatusBar: TJvStatusBar + Width = 572 + end inline frViewDiario1: TfrViewDiario [3] Left = 0 Top = 102 - Width = 543 + Width = 572 Height = 323 Align = alClient Font.Charset = DEFAULT_CHARSET @@ -72,7 +83,7 @@ inherited fEditorDiario: TfEditorDiario ExplicitWidth = 543 ExplicitHeight = 323 inherited cxGrid: TcxGrid - Width = 543 + Width = 572 Height = 195 ExplicitWidth = 543 ExplicitHeight = 195 @@ -102,12 +113,12 @@ inherited fEditorDiario: TfEditorDiario end end inherited frViewFiltroBase1: TfrViewFiltroBase - Width = 543 + Width = 572 ExplicitWidth = 543 inherited TBXDockablePanel1: TTBXDockablePanel ExplicitWidth = 543 inherited dxLayoutControl1: TdxLayoutControl - Width = 543 + Width = 572 ExplicitWidth = 543 inherited txtFiltroTodo: TcxTextEdit Style.LookAndFeel.SkinName = '' @@ -126,21 +137,21 @@ inherited fEditorDiario: TfEditorDiario Width = 121 end inherited edtFechaFinFiltro: TcxDateEdit - Left = 337 + Left = 355 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 337 + ExplicitLeft = 355 ExplicitWidth = 121 Width = 121 end end inherited TBXAlignmentPanel1: TTBXAlignmentPanel - Width = 543 + Width = 572 ExplicitWidth = 543 inherited tbxBotones: TTBXToolbar - Width = 533 + Width = 562 ExplicitWidth = 533 end end @@ -151,10 +162,10 @@ inherited fEditorDiario: TfEditorDiario ExplicitTop = 297 ExplicitWidth = 543 inherited TBXAlignmentPanel1: TTBXAlignmentPanel - Width = 543 + Width = 572 ExplicitWidth = 543 inherited TBXToolbar1: TTBXToolbar - Width = 533 + Width = 562 ExplicitWidth = 533 end end @@ -191,7 +202,9 @@ inherited fEditorDiario: TfEditorDiario object actPuntear: TAction Category = 'OperacionesEspeciales' Caption = 'Puntear/Despuntear asiento' + Enabled = False ImageIndex = 24 + Visible = False OnExecute = actPuntearExecute OnUpdate = actPuntearUpdate end diff --git a/Source/Modulos/Contabilidad/Views/uEditorElegirSubCuentas.dfm b/Source/Modulos/Contabilidad/Views/uEditorElegirSubCuentas.dfm index 8e5f63d..be9e4b1 100644 --- a/Source/Modulos/Contabilidad/Views/uEditorElegirSubCuentas.dfm +++ b/Source/Modulos/Contabilidad/Views/uEditorElegirSubCuentas.dfm @@ -10,8 +10,7 @@ inherited fEditorElegirSubCuentas: TfEditorElegirSubCuentas Width = 851 Caption = 'Lista de subcuentas' Visible = False - ExplicitLeft = -8 - ExplicitTop = -10 + ExplicitTop = 64 ExplicitWidth = 851 inherited Image1: TImage Left = 824 @@ -22,6 +21,7 @@ inherited fEditorElegirSubCuentas: TfEditorElegirSubCuentas Top = 91 Width = 851 Height = 49 + ExplicitTop = 91 ExplicitWidth = 851 ExplicitHeight = 49 inherited tbxMain: TTBXToolbar @@ -113,13 +113,14 @@ inherited fEditorElegirSubCuentas: TfEditorElegirSubCuentas Top = 140 Width = 851 Height = 236 + ExplicitTop = 140 ExplicitWidth = 851 - ExplicitHeight = 274 + ExplicitHeight = 236 inherited cxGrid: TcxGrid Width = 851 Height = 108 ExplicitWidth = 851 - ExplicitHeight = 146 + ExplicitHeight = 108 inherited cxGridView: TcxGridDBTableView DataController.Summary.DefaultGroupSummaryItems = < item @@ -146,16 +147,24 @@ inherited fEditorElegirSubCuentas: TfEditorElegirSubCuentas Width = 851 ExplicitWidth = 851 inherited txtFiltroTodo: TcxTextEdit - ExplicitWidth = 273 - Width = 273 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' end inherited edtFechaIniFiltro: TcxDateEdit - ExplicitWidth = 121 - Width = 121 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' end inherited edtFechaFinFiltro: TcxDateEdit - Left = 286 - ExplicitLeft = 286 + Left = 372 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitLeft = 372 ExplicitWidth = 421 Width = 421 end @@ -172,7 +181,7 @@ inherited fEditorElegirSubCuentas: TfEditorElegirSubCuentas end inherited pnlAgrupaciones: TTBXDockablePanel Top = 210 - ExplicitTop = 248 + ExplicitTop = 210 ExplicitWidth = 851 inherited TBXAlignmentPanel1: TTBXAlignmentPanel Width = 851 @@ -211,8 +220,6 @@ inherited fEditorElegirSubCuentas: TfEditorElegirSubCuentas Padding.Bottom = 8 ParentBackground = False TabOrder = 5 - ExplicitLeft = -8 - ExplicitTop = -21 object lblTitle: TLabel AlignWithMargins = True Left = 25 @@ -251,7 +258,13 @@ inherited fEditorElegirSubCuentas: TfEditorElegirSubCuentas Left = 112 Top = 192 end - inherited dsDataTable: TDADataSource + inherited JvFormStorage: TJvFormStorage [9] + end + inherited JvAppRegistryStorage: TJvAppRegistryStorage [10] + end + inherited StatusBarImages: TPngImageList [11] + end + inherited dsDataTable: TDADataSource [12] Left = 8 Top = 192 end diff --git a/Source/Modulos/Contabilidad/Views/uViewCuentas.pas b/Source/Modulos/Contabilidad/Views/uViewCuentas.pas index 81dc6df..9a216a2 100644 --- a/Source/Modulos/Contabilidad/Views/uViewCuentas.pas +++ b/Source/Modulos/Contabilidad/Views/uViewCuentas.pas @@ -14,7 +14,7 @@ uses dxPSEdgePatterns, dxPSCore, dxPScxCommon, dxPScxGrid6Lnk, cxGridCustomPopupMenu, cxGridPopupMenu, uViewFiltroBase, TB2Item, TBX, TB2Toolbar, TBXDkPanels, TB2Dock, dxPgsDlg, uDAInterfaces, cxCalendar, - cxImageComboBox, cxTextEdit; + cxImageComboBox, cxTextEdit, uCustomView, uViewBase; type IViewCuentas = interface(IViewGrid) diff --git a/Source/Modulos/Contabilidad/Views/uViewDiario.pas b/Source/Modulos/Contabilidad/Views/uViewDiario.pas index bb0a9b8..5d877bd 100644 --- a/Source/Modulos/Contabilidad/Views/uViewDiario.pas +++ b/Source/Modulos/Contabilidad/Views/uViewDiario.pas @@ -14,7 +14,7 @@ uses dxPSEdgePatterns, dxPSCore, dxPScxCommon, dxPScxGrid6Lnk, cxGridCustomPopupMenu, cxGridPopupMenu, uViewFiltroBase, TB2Item, TBX, TB2Toolbar, TBXDkPanels, TB2Dock, dxPgsDlg, uDAInterfaces, cxCalendar, - cxImageComboBox, cxTextEdit, cxCurrencyEdit; + cxImageComboBox, cxTextEdit, cxCurrencyEdit, uCustomView, uViewBase; type IViewDiario = interface(IViewGrid) diff --git a/Source/Modulos/Contabilidad/Views/uViewExtractoMovimientos.dfm b/Source/Modulos/Contabilidad/Views/uViewExtractoMovimientos.dfm index 4f956c8..eaaf462 100644 --- a/Source/Modulos/Contabilidad/Views/uViewExtractoMovimientos.dfm +++ b/Source/Modulos/Contabilidad/Views/uViewExtractoMovimientos.dfm @@ -1,7 +1,13 @@ inherited frViewExtractoMovimientos: TfrViewExtractoMovimientos + Width = 950 + Height = 639 OnDestroy = CustomViewDestroy OnShow = CustomViewShow + ExplicitWidth = 950 + ExplicitHeight = 639 inherited cxGrid: TcxGrid + Width = 950 + Height = 511 RootLevelOptions.DetailTabsPosition = dtpTop OnActiveTabChanged = cxGridActiveTabChanged inherited cxGridView: TcxGridDBTableView @@ -76,18 +82,24 @@ inherited frViewExtractoMovimientos: TfrViewExtractoMovimientos object cxGridViewORDEN: TcxGridDBColumn Caption = 'Orden asiento' DataBinding.FieldName = 'ORDEN_ASIENTO' + Visible = False SortIndex = 1 SortOrder = soDescending + VisibleForCustomization = False end object cxGridViewREF_SUBCUENTA: TcxGridDBColumn Caption = 'Ref. subcuenta' DataBinding.FieldName = 'REF_SUBCUENTA' PropertiesClassName = 'TcxTextEditProperties' + Visible = False + VisibleForCustomization = False Width = 304 end object cxGridViewSUBCUENTA: TcxGridDBColumn Caption = 'Subcuenta' DataBinding.FieldName = 'SUBCUENTA' + Visible = False + VisibleForCustomization = False end object cxGridViewCONCEPTO: TcxGridDBColumn Caption = 'Concepto' @@ -98,6 +110,8 @@ inherited frViewExtractoMovimientos: TfrViewExtractoMovimientos object cxGridViewDOCUMENTO: TcxGridDBColumn Caption = 'Documento' DataBinding.FieldName = 'DOCUMENTO' + Visible = False + VisibleForCustomization = False end object cxGridViewDEBE: TcxGridDBColumn Caption = 'Debe' @@ -124,8 +138,10 @@ inherited frViewExtractoMovimientos: TfrViewExtractoMovimientos end end inherited frViewFiltroBase1: TfrViewFiltroBase + Width = 950 inherited TBXDockablePanel1: TTBXDockablePanel inherited dxLayoutControl1: TdxLayoutControl + Width = 950 inherited txtFiltroTodo: TcxTextEdit Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' @@ -143,20 +159,32 @@ inherited frViewExtractoMovimientos: TfrViewExtractoMovimientos Width = 242 end inherited edtFechaFinFiltro: TcxDateEdit - Left = 346 + Left = 585 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 346 + ExplicitLeft = 585 ExplicitWidth = 198 Width = 198 end end + inherited TBXAlignmentPanel1: TTBXAlignmentPanel + Width = 950 + inherited tbxBotones: TTBXToolbar + Width = 940 + end + end end end inherited pnlAgrupaciones: TTBXDockablePanel - ExplicitWidth = 554 + Top = 613 + inherited TBXAlignmentPanel1: TTBXAlignmentPanel + Width = 950 + inherited TBXToolbar1: TTBXToolbar + Width = 940 + end + end end inherited dxComponentPrinter: TdxComponentPrinter inherited dxComponentPrinterLink: TdxGridReportLink diff --git a/Source/Modulos/Contabilidad/Views/uViewSubCuentas.pas b/Source/Modulos/Contabilidad/Views/uViewSubCuentas.pas index 36566ff..5d9f7ce 100644 --- a/Source/Modulos/Contabilidad/Views/uViewSubCuentas.pas +++ b/Source/Modulos/Contabilidad/Views/uViewSubCuentas.pas @@ -14,7 +14,7 @@ uses dxPSEdgePatterns, dxPSCore, dxPScxCommon, dxPScxGrid6Lnk, cxGridCustomPopupMenu, cxGridPopupMenu, uViewFiltroBase, TB2Item, TBX, TB2Toolbar, TBXDkPanels, TB2Dock, dxPgsDlg, uDAInterfaces, cxCalendar, - cxImageComboBox, cxTextEdit, cxCurrencyEdit; + cxImageComboBox, cxTextEdit, cxCurrencyEdit, uCustomView, uViewBase; type IViewSubCuentas = interface(IViewGrid) diff --git a/Source/Modulos/Contactos/Plugin/uPluginContactos.pas b/Source/Modulos/Contactos/Plugin/uPluginContactos.pas index 617e99d..02b4b2b 100644 --- a/Source/Modulos/Contactos/Plugin/uPluginContactos.pas +++ b/Source/Modulos/Contactos/Plugin/uPluginContactos.pas @@ -145,7 +145,7 @@ begin uContactosViewRegister.RegisterViews; //El usuario vendedor y logistica será restringido - if ((AppFactuGES.UsuarioActivo.ID_PERFIL = 5) OR (AppFactuGES.UsuarioActivo.ID_PERFIL = 4)) then + if ((AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PREFIL_LOGISTICA) OR (AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PERFIL_VENDEDOR)) then actVendedores.Visible := False; end; diff --git a/Source/Modulos/Contactos/Views/uEditorClientes.dfm b/Source/Modulos/Contactos/Views/uEditorClientes.dfm index 13ff79c..cf09405 100644 --- a/Source/Modulos/Contactos/Views/uEditorClientes.dfm +++ b/Source/Modulos/Contactos/Views/uEditorClientes.dfm @@ -1931,12 +1931,6 @@ inherited fEditorClientes: TfEditorClientes item Caption = 'Previsualizar la lista de clientes actual' Value = 200 - end - item - Caption = - 'Previsulalizar lista de clientes seleccionados (SOLO DATOS CONTA' + - 'CTO)' - Value = 300 end> ButtonBar.Buttons = [cbCancel] MainIcon = tdiCustom diff --git a/Source/Modulos/Contactos/Views/uEditorClientes.pas b/Source/Modulos/Contactos/Views/uEditorClientes.pas index 62b7996..b7bcd1c 100644 --- a/Source/Modulos/Contactos/Views/uEditorClientes.pas +++ b/Source/Modulos/Contactos/Views/uEditorClientes.pas @@ -199,6 +199,7 @@ begin if Assigned(AClientes) then (FController as IClientesController).PreviewInformeEtiquetas(AClientes, AllItems); end; +{ 300 : begin // Elemento Seleccionado if AllItems then begin @@ -211,7 +212,7 @@ begin if Assigned(AClientes) then (FController as IClientesController).PreviewInformeListaDatosContacto(AClientes, AllItems); end; - +} end; end; end; diff --git a/Source/Modulos/Contactos/Views/uEditorContactos.dfm b/Source/Modulos/Contactos/Views/uEditorContactos.dfm index 357b021..1870c0b 100644 --- a/Source/Modulos/Contactos/Views/uEditorContactos.dfm +++ b/Source/Modulos/Contactos/Views/uEditorContactos.dfm @@ -2,8 +2,6 @@ inherited fEditorContactos: TfEditorContactos Left = 285 Top = 448 Caption = 'Lista de contactos' - ExplicitWidth = 320 - ExplicitHeight = 240 PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader diff --git a/Source/Modulos/Contactos/Views/uEditorElegirClientes.dfm b/Source/Modulos/Contactos/Views/uEditorElegirClientes.dfm index 088787a..e2840dd 100644 --- a/Source/Modulos/Contactos/Views/uEditorElegirClientes.dfm +++ b/Source/Modulos/Contactos/Views/uEditorElegirClientes.dfm @@ -23,17 +23,17 @@ inherited fEditorElegirClientes: TfEditorElegirClientes ExplicitWidth = 683 ExplicitHeight = 49 inherited tbxMain: TTBXToolbar - ExplicitWidth = 378 + ExplicitWidth = 266 inherited TBXItem36: TTBXItem Action = actAnchoAuto2 end end inherited tbxFiltro: TTBXToolbar - Left = 378 + Left = 266 Top = 23 DockPos = 96 DockRow = 1 - ExplicitLeft = 378 + ExplicitLeft = 266 ExplicitTop = 23 inherited TBXItem34: TTBXItem Action = actQuitarFiltro2 @@ -145,9 +145,25 @@ inherited fEditorElegirClientes: TfEditorElegirClientes inherited dxLayoutControl1: TdxLayoutControl Width = 663 ExplicitWidth = 663 + inherited txtFiltroTodo: TcxTextEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + end + inherited edtFechaIniFiltro: TcxDateEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + end inherited edtFechaFinFiltro: TcxDateEdit - Left = 388 - ExplicitLeft = 388 + Left = 466 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitLeft = 466 ExplicitWidth = 232 Width = 232 end @@ -250,12 +266,6 @@ inherited fEditorElegirClientes: TfEditorElegirClientes inherited EditorActionList: TActionList [6] Left = 112 Top = 192 - inherited actNuevo: TAction - Visible = False - end - inherited actModificar: TAction - Visible = False - end inherited actGuardarCerrar: TAction Visible = False end @@ -268,6 +278,14 @@ inherited fEditorElegirClientes: TfEditorElegirClientes inherited actConfPagina: TAction Visible = False end + inherited actPrevisualizar: TAction + Enabled = False + Visible = False + end + inherited actImprimir: TAction + Enabled = False + Visible = False + end inherited actDeshacer: TEditUndo Visible = False end @@ -310,6 +328,10 @@ inherited fEditorElegirClientes: TfEditorElegirClientes inherited actDuplicar: TAction Visible = False end + inherited actExportarExcel: TAction + Enabled = False + Visible = False + end inherited actGruposCliente: TAction Visible = False end diff --git a/Source/Modulos/Contactos/Views/uEditorElegirClientes.pas b/Source/Modulos/Contactos/Views/uEditorElegirClientes.pas index 6d2b4a7..7b3f62c 100644 --- a/Source/Modulos/Contactos/Views/uEditorElegirClientes.pas +++ b/Source/Modulos/Contactos/Views/uEditorElegirClientes.pas @@ -69,7 +69,7 @@ end; procedure TfEditorElegirClientes.FormShow(Sender: TObject); begin inherited; - EditorActionList.State := asSuspended; +// EditorActionList.State := asSuspended; frViewClientes1.cxViewGridPopupMenu.PopupMenus.Items[0].HitTypes := []; end; diff --git a/Source/Modulos/Contactos/Views/uEditorElegirProveedores.dfm b/Source/Modulos/Contactos/Views/uEditorElegirProveedores.dfm index 3dbe3cb..218e191 100644 --- a/Source/Modulos/Contactos/Views/uEditorElegirProveedores.dfm +++ b/Source/Modulos/Contactos/Views/uEditorElegirProveedores.dfm @@ -23,7 +23,7 @@ inherited fEditorElegirProveedores: TfEditorElegirProveedores ExplicitTop = 91 ExplicitWidth = 656 inherited tbxMain: TTBXToolbar - ExplicitWidth = 387 + ExplicitWidth = 266 inherited TBXItem2: TTBXItem Images = frViewProveedores1.PngImageList end @@ -32,11 +32,11 @@ inherited fEditorElegirProveedores: TfEditorElegirProveedores end end inherited tbxFiltro: TTBXToolbar - Left = 387 + Left = 266 Top = 23 DockPos = 108 DockRow = 1 - ExplicitLeft = 387 + ExplicitLeft = 266 ExplicitTop = 23 inherited TBXItem34: TTBXItem Action = actQuitarFiltro2 @@ -118,7 +118,7 @@ inherited fEditorElegirProveedores: TfEditorElegirProveedores ExplicitLeft = 10 ExplicitTop = 112 ExplicitWidth = 636 - ExplicitHeight = 180 + ExplicitHeight = 116 inherited cxGridView: TcxGridDBTableView DataController.Summary.FooterSummaryItems = < item @@ -142,9 +142,31 @@ inherited fEditorElegirProveedores: TfEditorElegirProveedores inherited dxLayoutControl1: TdxLayoutControl Width = 636 ExplicitWidth = 636 + inherited txtFiltroTodo: TcxTextEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitWidth = 460 + Width = 460 + end + inherited edtFechaIniFiltro: TcxDateEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitWidth = 207 + Width = 207 + end inherited edtFechaFinFiltro: TcxDateEdit Left = 376 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 376 + ExplicitWidth = 201 + Width = 201 end end inherited TBXAlignmentPanel1: TTBXAlignmentPanel @@ -161,7 +183,7 @@ inherited fEditorElegirProveedores: TfEditorElegirProveedores Left = 10 Top = 228 ExplicitLeft = 10 - ExplicitTop = 292 + ExplicitTop = 228 ExplicitWidth = 636 inherited TBXAlignmentPanel1: TTBXAlignmentPanel Width = 636 @@ -204,13 +226,11 @@ inherited fEditorElegirProveedores: TfEditorElegirProveedores Padding.Bottom = 8 ParentBackground = False TabOrder = 5 - ExplicitLeft = -8 - ExplicitTop = -37 object lblTitle: TLabel AlignWithMargins = True Left = 25 Top = 8 - Width = 135 + Width = 606 Height = 13 Margins.Left = 0 Margins.Top = 0 @@ -224,28 +244,25 @@ inherited fEditorElegirProveedores: TfEditorElegirProveedores Font.Name = 'Tahoma' Font.Style = [fsBold] ParentFont = False + ExplicitWidth = 135 end object lblComments: TLabel AlignWithMargins = True Left = 50 Top = 29 - Width = 3 - Height = 13 + Width = 581 + Height = 27 Margins.Left = 25 Margins.Top = 0 Margins.Right = 0 Align = alClient + ExplicitWidth = 3 + ExplicitHeight = 13 end end inherited EditorActionList: TActionList [6] Left = 112 Top = 192 - inherited actNuevo: TAction - Visible = False - end - inherited actModificar: TAction - Visible = False - end inherited actGuardarCerrar: TAction Visible = False end @@ -258,6 +275,14 @@ inherited fEditorElegirProveedores: TfEditorElegirProveedores inherited actConfPagina: TAction Visible = False end + inherited actPrevisualizar: TAction + Enabled = False + Visible = False + end + inherited actImprimir: TAction + Enabled = False + Visible = False + end inherited actDeshacer: TEditUndo Visible = False end @@ -300,6 +325,10 @@ inherited fEditorElegirProveedores: TfEditorElegirProveedores inherited actDuplicar: TAction Visible = False end + inherited actExportarExcel: TAction + Enabled = False + Visible = False + end end inherited SmallImages: TPngImageList [7] end diff --git a/Source/Modulos/Contactos/Views/uViewContacto.dfm b/Source/Modulos/Contactos/Views/uViewContacto.dfm index 5522b0f..f9eba4b 100644 --- a/Source/Modulos/Contactos/Views/uViewContacto.dfm +++ b/Source/Modulos/Contactos/Views/uViewContacto.dfm @@ -268,6 +268,7 @@ inherited frViewContacto: TfrViewContacto Top = 109 DataBinding.DataField = 'FAX' DataBinding.DataSource = dsContacto + Enabled = False Style.BorderColor = clWindowFrame Style.BorderStyle = ebs3D Style.LookAndFeel.Kind = lfStandard @@ -603,23 +604,25 @@ inherited frViewContacto: TfrViewContacto object dxLayoutControlContactoGroup2: TdxLayoutGroup Caption = 'Tel'#233'fonos' object dxLayoutControlContactoItem10: TdxLayoutItem - Caption = 'Tlf. trabajo:' + Caption = 'Tlf.1:' Control = eTlfTrabajo ControlOptions.ShowBorder = False end object dxLayoutControlContactoItem9: TdxLayoutItem - Caption = 'Tlf. particular:' + Caption = 'Tlf.2:' Visible = False Control = eTlfParticular ControlOptions.ShowBorder = False end object dxLayoutControlContactoItem11: TdxLayoutItem - Caption = 'M'#243'vil:' + Caption = 'Tlf.3:' Control = eTlfMovil ControlOptions.ShowBorder = False end object dxLayoutControlContactoItem12: TdxLayoutItem Caption = 'Fax:' + Enabled = False + Visible = False Control = eFax ControlOptions.ShowBorder = False end diff --git a/Source/Modulos/Contratos de cliente/Data/uDataModuleContratosCliente.dfm b/Source/Modulos/Contratos de cliente/Data/uDataModuleContratosCliente.dfm index 78de308..8048777 100644 --- a/Source/Modulos/Contratos de cliente/Data/uDataModuleContratosCliente.dfm +++ b/Source/Modulos/Contratos de cliente/Data/uDataModuleContratosCliente.dfm @@ -355,6 +355,15 @@ inherited DataModuleContratosCliente: TDataModuleContratosCliente Name = 'FACTURA_ASOCIADA' DataType = datString Size = 255 + end + item + Name = 'FECHA_PREVISTA_MONTAJE' + DataType = datDateTime + end + item + Name = 'CAMPO_LIBRE' + 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 afaa6ff..e3b2018 100644 --- a/Source/Modulos/Contratos de cliente/Model/schContratosClienteClient_Intf.pas +++ b/Source/Modulos/Contratos de cliente/Model/schContratosClienteClient_Intf.pas @@ -3,19 +3,19 @@ unit schContratosClienteClient_Intf; interface uses - Classes, DB, schBase_Intf, SysUtils, uROClasses, uDAInterfaces, uDADataTable, FmtBCD, uROXMLIntf; + Classes, DB, SysUtils, uROClasses, uDAInterfaces, uDADataTable, FmtBCD, uROXMLIntf; 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 = '{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}'; + RID_Valores = '{15E11A92-F4CF-4E0E-B5D8-6184059DD8CE}'; + RID_Propiedades = '{B429EF7C-4158-41C1-BE6D-922C169CF14E}'; + RID_ListaAnosContratos = '{30057A80-16CD-42BE-8D5D-EDAFE97E8C5A}'; + RID_ContratosClienteBeneficios = '{2A70B854-D3DC-4787-87AD-051A0184E82C}'; + RID_ContratosCliente = '{0DB07217-A4E5-4685-BE8F-F2170E3AB1CA}'; + RID_TiposCapitulos = '{3C034371-9C2C-46CB-A282-6F62EFA16CB7}'; + RID_ContratosCliente_Detalles = '{AC6A2500-FFA3-4A5B-A26B-AA952998F27F}'; { Data table names } nme_Valores = 'Valores'; @@ -138,6 +138,8 @@ const fld_ContratosClienteLISTA_NOMBRES = 'LISTA_NOMBRES'; fld_ContratosClienteFECHA_DECISION = 'FECHA_DECISION'; fld_ContratosClienteFACTURA_ASOCIADA = 'FACTURA_ASOCIADA'; + fld_ContratosClienteFECHA_PREVISTA_MONTAJE = 'FECHA_PREVISTA_MONTAJE'; + fld_ContratosClienteCAMPO_LIBRE = 'CAMPO_LIBRE'; { ContratosCliente field indexes } idx_ContratosClienteID = 0; @@ -191,6 +193,8 @@ const idx_ContratosClienteLISTA_NOMBRES = 48; idx_ContratosClienteFECHA_DECISION = 49; idx_ContratosClienteFACTURA_ASOCIADA = 50; + idx_ContratosClienteFECHA_PREVISTA_MONTAJE = 51; + idx_ContratosClienteCAMPO_LIBRE = 52; { TiposCapitulos fields } fld_TiposCapitulosID = 'ID'; @@ -249,7 +253,7 @@ const type { IValores } IValores = interface(IDAStronglyTypedDataTable) - ['{37D9C952-11C7-44D0-8A56-023852645B0F}'] + ['{9648EEF6-67C0-48F2-98D0-3F28225AE35F}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -275,7 +279,7 @@ type end; { TValoresDataTableRules } - TValoresDataTableRules = class(TIntfObjectDADataTableRules, IValores) + TValoresDataTableRules = class(TDADataTableRules, IValores) private protected { Property getters and setters } @@ -308,7 +312,7 @@ type { IPropiedades } IPropiedades = interface(IDAStronglyTypedDataTable) - ['{5252B717-197E-41E3-A902-78CD6A804EBD}'] + ['{DAB78C0C-ABB8-4638-A964-D66FCE695D0B}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -334,7 +338,7 @@ type end; { TPropiedadesDataTableRules } - TPropiedadesDataTableRules = class(TIntfObjectDADataTableRules, IPropiedades) + TPropiedadesDataTableRules = class(TDADataTableRules, IPropiedades) private protected { Property getters and setters } @@ -367,7 +371,7 @@ type { IListaAnosContratos } IListaAnosContratos = interface(IDAStronglyTypedDataTable) - ['{C59F0AC9-2FA9-46DB-B506-352CCE2AAA5E}'] + ['{803D3DE4-AE98-4631-A877-1D0F20987BC1}'] { Property getters and setters } function GetANOValue: String; procedure SetANOValue(const aValue: String); @@ -381,7 +385,7 @@ type end; { TListaAnosContratosDataTableRules } - TListaAnosContratosDataTableRules = class(TIntfObjectDADataTableRules, IListaAnosContratos) + TListaAnosContratosDataTableRules = class(TDADataTableRules, IListaAnosContratos) private protected { Property getters and setters } @@ -402,7 +406,7 @@ type { IContratosClienteBeneficios } IContratosClienteBeneficios = interface(IDAStronglyTypedDataTable) - ['{6EFAD955-7B1E-45EF-9DA1-D7596933323F}'] + ['{80E97C0A-AA60-4FA0-9AE7-25932450F7FA}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -500,7 +504,7 @@ type end; { TContratosClienteBeneficiosDataTableRules } - TContratosClienteBeneficiosDataTableRules = class(TIntfObjectDADataTableRules, IContratosClienteBeneficios) + TContratosClienteBeneficiosDataTableRules = class(TDADataTableRules, IContratosClienteBeneficios) private protected { Property getters and setters } @@ -605,7 +609,7 @@ type { IContratosCliente } IContratosCliente = interface(IDAStronglyTypedDataTable) - ['{C292C53E-7CE7-4DAC-8FED-D5984431BAF6}'] + ['{C90AFE40-BB27-4460-A9A5-3EF0A0DD8972}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -805,6 +809,14 @@ type procedure SetFACTURA_ASOCIADAValue(const aValue: String); function GetFACTURA_ASOCIADAIsNull: Boolean; procedure SetFACTURA_ASOCIADAIsNull(const aValue: Boolean); + function GetFECHA_PREVISTA_MONTAJEValue: DateTime; + procedure SetFECHA_PREVISTA_MONTAJEValue(const aValue: DateTime); + function GetFECHA_PREVISTA_MONTAJEIsNull: Boolean; + procedure SetFECHA_PREVISTA_MONTAJEIsNull(const aValue: Boolean); + function GetCAMPO_LIBREValue: String; + procedure SetCAMPO_LIBREValue(const aValue: String); + function GetCAMPO_LIBREIsNull: Boolean; + procedure SetCAMPO_LIBREIsNull(const aValue: Boolean); { Properties } @@ -910,10 +922,14 @@ type 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; + property FECHA_PREVISTA_MONTAJE: DateTime read GetFECHA_PREVISTA_MONTAJEValue write SetFECHA_PREVISTA_MONTAJEValue; + property FECHA_PREVISTA_MONTAJEIsNull: Boolean read GetFECHA_PREVISTA_MONTAJEIsNull write SetFECHA_PREVISTA_MONTAJEIsNull; + property CAMPO_LIBRE: String read GetCAMPO_LIBREValue write SetCAMPO_LIBREValue; + property CAMPO_LIBREIsNull: Boolean read GetCAMPO_LIBREIsNull write SetCAMPO_LIBREIsNull; end; { TContratosClienteDataTableRules } - TContratosClienteDataTableRules = class(TIntfObjectDADataTableRules, IContratosCliente) + TContratosClienteDataTableRules = class(TDADataTableRules, IContratosCliente) private f_FORMA_PAGO: IROStrings; f_PLAZO_ENTREGA: IROStrings; @@ -1127,6 +1143,14 @@ type procedure SetFACTURA_ASOCIADAValue(const aValue: String); virtual; function GetFACTURA_ASOCIADAIsNull: Boolean; virtual; procedure SetFACTURA_ASOCIADAIsNull(const aValue: Boolean); virtual; + function GetFECHA_PREVISTA_MONTAJEValue: DateTime; virtual; + procedure SetFECHA_PREVISTA_MONTAJEValue(const aValue: DateTime); virtual; + function GetFECHA_PREVISTA_MONTAJEIsNull: Boolean; virtual; + procedure SetFECHA_PREVISTA_MONTAJEIsNull(const aValue: Boolean); virtual; + function GetCAMPO_LIBREValue: String; virtual; + procedure SetCAMPO_LIBREValue(const aValue: String); virtual; + function GetCAMPO_LIBREIsNull: Boolean; virtual; + procedure SetCAMPO_LIBREIsNull(const aValue: Boolean); virtual; { Properties } property ID: Integer read GetIDValue write SetIDValue; @@ -1231,6 +1255,10 @@ type 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; + property FECHA_PREVISTA_MONTAJE: DateTime read GetFECHA_PREVISTA_MONTAJEValue write SetFECHA_PREVISTA_MONTAJEValue; + property FECHA_PREVISTA_MONTAJEIsNull: Boolean read GetFECHA_PREVISTA_MONTAJEIsNull write SetFECHA_PREVISTA_MONTAJEIsNull; + property CAMPO_LIBRE: String read GetCAMPO_LIBREValue write SetCAMPO_LIBREValue; + property CAMPO_LIBREIsNull: Boolean read GetCAMPO_LIBREIsNull write SetCAMPO_LIBREIsNull; public constructor Create(aDataTable: TDADataTable); override; @@ -1243,7 +1271,7 @@ type } { ITiposCapitulos } ITiposCapitulos = interface(IDAStronglyTypedDataTable) - ['{6FD186D4-E64F-45A9-88A6-163E72D11671}'] + ['{1EAC55ED-FD74-4C09-BA7C-01071428BF24}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -1287,7 +1315,7 @@ type end; { TTiposCapitulosDataTableRules } - TTiposCapitulosDataTableRules = class(TIntfObjectDADataTableRules, ITiposCapitulos) + TTiposCapitulosDataTableRules = class(TDADataTableRules, ITiposCapitulos) private protected { Property getters and setters } @@ -1338,7 +1366,7 @@ type { IContratosCliente_Detalles } IContratosCliente_Detalles = interface(IDAStronglyTypedDataTable) - ['{43B88BE1-14BC-4332-889D-8091C7420325}'] + ['{0C09878D-60CA-4203-BC67-10838C9E8EAA}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -1448,7 +1476,7 @@ type end; { TContratosCliente_DetallesDataTableRules } - TContratosCliente_DetallesDataTableRules = class(TIntfObjectDADataTableRules, IContratosCliente_Detalles) + TContratosCliente_DetallesDataTableRules = class(TDADataTableRules, IContratosCliente_Detalles) private protected { Property getters and setters } @@ -3191,6 +3219,48 @@ begin DataTable.Fields[idx_ContratosClienteFACTURA_ASOCIADA].AsVariant := Null; end; +function TContratosClienteDataTableRules.GetFECHA_PREVISTA_MONTAJEValue: DateTime; +begin + result := DataTable.Fields[idx_ContratosClienteFECHA_PREVISTA_MONTAJE].AsDateTime; +end; + +procedure TContratosClienteDataTableRules.SetFECHA_PREVISTA_MONTAJEValue(const aValue: DateTime); +begin + DataTable.Fields[idx_ContratosClienteFECHA_PREVISTA_MONTAJE].AsDateTime := aValue; +end; + +function TContratosClienteDataTableRules.GetFECHA_PREVISTA_MONTAJEIsNull: boolean; +begin + result := DataTable.Fields[idx_ContratosClienteFECHA_PREVISTA_MONTAJE].IsNull; +end; + +procedure TContratosClienteDataTableRules.SetFECHA_PREVISTA_MONTAJEIsNull(const aValue: Boolean); +begin + if aValue then + DataTable.Fields[idx_ContratosClienteFECHA_PREVISTA_MONTAJE].AsVariant := Null; +end; + +function TContratosClienteDataTableRules.GetCAMPO_LIBREValue: String; +begin + result := DataTable.Fields[idx_ContratosClienteCAMPO_LIBRE].AsString; +end; + +procedure TContratosClienteDataTableRules.SetCAMPO_LIBREValue(const aValue: String); +begin + DataTable.Fields[idx_ContratosClienteCAMPO_LIBRE].AsString := aValue; +end; + +function TContratosClienteDataTableRules.GetCAMPO_LIBREIsNull: boolean; +begin + result := DataTable.Fields[idx_ContratosClienteCAMPO_LIBRE].IsNull; +end; + +procedure TContratosClienteDataTableRules.SetCAMPO_LIBREIsNull(const aValue: Boolean); +begin + if aValue then + DataTable.Fields[idx_ContratosClienteCAMPO_LIBRE].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 d9656a4..d60e64e 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 = '{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}'; + RID_ValoresDelta = '{3B063834-C8A8-4844-ACC8-234467330330}'; + RID_PropiedadesDelta = '{619FA028-3343-49AB-9A72-A6DF0667FC32}'; + RID_ListaAnosContratosDelta = '{7F13079B-DB22-4617-A28C-01007AF43172}'; + RID_ContratosClienteBeneficiosDelta = '{28BA457E-2509-4B11-9724-10E60AFB2BA9}'; + RID_ContratosClienteDelta = '{DFEAF2D7-9D59-40C6-8205-677DCCD6C526}'; + RID_TiposCapitulosDelta = '{74EAAE1F-DEB6-49BD-BF6C-FAE257428A2D}'; + RID_ContratosCliente_DetallesDelta = '{72FC35AB-AC55-43FB-B58A-152274E2A1CC}'; type { IValoresDelta } IValoresDelta = interface(IValores) - ['{8D6C76F9-F425-4A12-A6DA-CDADFCB371D5}'] + ['{3B063834-C8A8-4844-ACC8-234467330330}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_PROPIEDADValue : Integer; @@ -78,7 +78,7 @@ type { IPropiedadesDelta } IPropiedadesDelta = interface(IPropiedades) - ['{785FA853-7F7C-4D4B-A3F1-F605B64D365A}'] + ['{619FA028-3343-49AB-9A72-A6DF0667FC32}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldDESCRIPCIONValue : String; @@ -136,7 +136,7 @@ type { IListaAnosContratosDelta } IListaAnosContratosDelta = interface(IListaAnosContratos) - ['{9AED0858-AA56-4911-97AE-7FA8F5BA1BDF}'] + ['{7F13079B-DB22-4617-A28C-01007AF43172}'] { Property getters and setters } function GetOldANOValue : String; @@ -170,7 +170,7 @@ type { IContratosClienteBeneficiosDelta } IContratosClienteBeneficiosDelta = interface(IContratosClienteBeneficios) - ['{0A6BE4D0-4128-48DD-8E05-87DB06C0181F}'] + ['{28BA457E-2509-4B11-9724-10E60AFB2BA9}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldREFERENCIAValue : String; @@ -372,7 +372,7 @@ type { IContratosClienteDelta } IContratosClienteDelta = interface(IContratosCliente) - ['{13EC691D-B231-48FE-BE2D-E8EC546D4FDA}'] + ['{DFEAF2D7-9D59-40C6-8205-677DCCD6C526}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_EMPRESAValue : Integer; @@ -425,6 +425,8 @@ type function GetOldLISTA_NOMBRESValue : String; function GetOldFECHA_DECISIONValue : DateTime; function GetOldFACTURA_ASOCIADAValue : String; + function GetOldFECHA_PREVISTA_MONTAJEValue : DateTime; + function GetOldCAMPO_LIBREValue : String; { Properties } property OldID : Integer read GetOldIDValue; @@ -478,6 +480,8 @@ type property OldLISTA_NOMBRES : String read GetOldLISTA_NOMBRESValue; property OldFECHA_DECISION : DateTime read GetOldFECHA_DECISIONValue; property OldFACTURA_ASOCIADA : String read GetOldFACTURA_ASOCIADAValue; + property OldFECHA_PREVISTA_MONTAJE : DateTime read GetOldFECHA_PREVISTA_MONTAJEValue; + property OldCAMPO_LIBRE : String read GetOldCAMPO_LIBREValue; end; { TContratosClienteBusinessProcessorRules } @@ -797,6 +801,18 @@ type function GetOldFACTURA_ASOCIADAIsNull: Boolean; virtual; procedure SetFACTURA_ASOCIADAValue(const aValue: String); virtual; procedure SetFACTURA_ASOCIADAIsNull(const aValue: Boolean); virtual; + function GetFECHA_PREVISTA_MONTAJEValue: DateTime; virtual; + function GetFECHA_PREVISTA_MONTAJEIsNull: Boolean; virtual; + function GetOldFECHA_PREVISTA_MONTAJEValue: DateTime; virtual; + function GetOldFECHA_PREVISTA_MONTAJEIsNull: Boolean; virtual; + procedure SetFECHA_PREVISTA_MONTAJEValue(const aValue: DateTime); virtual; + procedure SetFECHA_PREVISTA_MONTAJEIsNull(const aValue: Boolean); virtual; + function GetCAMPO_LIBREValue: String; virtual; + function GetCAMPO_LIBREIsNull: Boolean; virtual; + function GetOldCAMPO_LIBREValue: String; virtual; + function GetOldCAMPO_LIBREIsNull: Boolean; virtual; + procedure SetCAMPO_LIBREValue(const aValue: String); virtual; + procedure SetCAMPO_LIBREIsNull(const aValue: Boolean); virtual; { Properties } property ID : Integer read GetIDValue write SetIDValue; @@ -1003,6 +1019,14 @@ type property FACTURA_ASOCIADAIsNull : Boolean read GetFACTURA_ASOCIADAIsNull write SetFACTURA_ASOCIADAIsNull; property OldFACTURA_ASOCIADA : String read GetOldFACTURA_ASOCIADAValue; property OldFACTURA_ASOCIADAIsNull : Boolean read GetOldFACTURA_ASOCIADAIsNull; + property FECHA_PREVISTA_MONTAJE : DateTime read GetFECHA_PREVISTA_MONTAJEValue write SetFECHA_PREVISTA_MONTAJEValue; + property FECHA_PREVISTA_MONTAJEIsNull : Boolean read GetFECHA_PREVISTA_MONTAJEIsNull write SetFECHA_PREVISTA_MONTAJEIsNull; + property OldFECHA_PREVISTA_MONTAJE : DateTime read GetOldFECHA_PREVISTA_MONTAJEValue; + property OldFECHA_PREVISTA_MONTAJEIsNull : Boolean read GetOldFECHA_PREVISTA_MONTAJEIsNull; + property CAMPO_LIBRE : String read GetCAMPO_LIBREValue write SetCAMPO_LIBREValue; + property CAMPO_LIBREIsNull : Boolean read GetCAMPO_LIBREIsNull write SetCAMPO_LIBREIsNull; + property OldCAMPO_LIBRE : String read GetOldCAMPO_LIBREValue; + property OldCAMPO_LIBREIsNull : Boolean read GetOldCAMPO_LIBREIsNull; public constructor Create(aBusinessProcessor: TDABusinessProcessor); override; @@ -1012,7 +1036,7 @@ type { ITiposCapitulosDelta } ITiposCapitulosDelta = interface(ITiposCapitulos) - ['{ABCB3BD5-D32A-405C-9799-900FAB730F45}'] + ['{74EAAE1F-DEB6-49BD-BF6C-FAE257428A2D}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldPOSICIONValue : Integer; @@ -1106,7 +1130,7 @@ type { IContratosCliente_DetallesDelta } IContratosCliente_DetallesDelta = interface(IContratosCliente_Detalles) - ['{09923382-3A40-4992-9F2C-903B5B6CA290}'] + ['{72FC35AB-AC55-43FB-B58A-152274E2A1CC}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_CONTRATOValue : Integer; @@ -3695,6 +3719,68 @@ begin BusinessProcessor.CurrentChange.NewValueByName[fld_ContratosClienteFACTURA_ASOCIADA] := Null; end; +function TContratosClienteBusinessProcessorRules.GetFECHA_PREVISTA_MONTAJEValue: DateTime; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_ContratosClienteFECHA_PREVISTA_MONTAJE]; +end; + +function TContratosClienteBusinessProcessorRules.GetFECHA_PREVISTA_MONTAJEIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_ContratosClienteFECHA_PREVISTA_MONTAJE]); +end; + +function TContratosClienteBusinessProcessorRules.GetOldFECHA_PREVISTA_MONTAJEValue: DateTime; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_ContratosClienteFECHA_PREVISTA_MONTAJE]; +end; + +function TContratosClienteBusinessProcessorRules.GetOldFECHA_PREVISTA_MONTAJEIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_ContratosClienteFECHA_PREVISTA_MONTAJE]); +end; + +procedure TContratosClienteBusinessProcessorRules.SetFECHA_PREVISTA_MONTAJEValue(const aValue: DateTime); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_ContratosClienteFECHA_PREVISTA_MONTAJE] := aValue; +end; + +procedure TContratosClienteBusinessProcessorRules.SetFECHA_PREVISTA_MONTAJEIsNull(const aValue: Boolean); +begin + if aValue then + BusinessProcessor.CurrentChange.NewValueByName[fld_ContratosClienteFECHA_PREVISTA_MONTAJE] := Null; +end; + +function TContratosClienteBusinessProcessorRules.GetCAMPO_LIBREValue: String; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_ContratosClienteCAMPO_LIBRE]; +end; + +function TContratosClienteBusinessProcessorRules.GetCAMPO_LIBREIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_ContratosClienteCAMPO_LIBRE]); +end; + +function TContratosClienteBusinessProcessorRules.GetOldCAMPO_LIBREValue: String; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_ContratosClienteCAMPO_LIBRE]; +end; + +function TContratosClienteBusinessProcessorRules.GetOldCAMPO_LIBREIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_ContratosClienteCAMPO_LIBRE]); +end; + +procedure TContratosClienteBusinessProcessorRules.SetCAMPO_LIBREValue(const aValue: String); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_ContratosClienteCAMPO_LIBRE] := aValue; +end; + +procedure TContratosClienteBusinessProcessorRules.SetCAMPO_LIBREIsNull(const aValue: Boolean); +begin + if aValue then + BusinessProcessor.CurrentChange.NewValueByName[fld_ContratosClienteCAMPO_LIBRE] := Null; +end; + { TTiposCapitulosBusinessProcessorRules } constructor TTiposCapitulosBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor); diff --git a/Source/Modulos/Contratos de cliente/Servidor/srvContratosCliente_Impl.dfm b/Source/Modulos/Contratos de cliente/Servidor/srvContratosCliente_Impl.dfm index 8800368..46e85b0 100644 --- a/Source/Modulos/Contratos de cliente/Servidor/srvContratosCliente_Impl.dfm +++ b/Source/Modulos/Contratos de cliente/Servidor/srvContratosCliente_Impl.dfm @@ -486,6 +486,14 @@ object srvContratosCliente: TsrvContratosCliente item DatasetField = 'FACTURA_ASOCIADA' TableField = 'FACTURA_ASOCIADA' + end + item + DatasetField = 'FECHA_PREVISTA_MONTAJE' + TableField = 'FECHA_PREVISTA_MONTAJE' + end + item + DatasetField = 'CAMPO_LIBRE' + TableField = 'CAMPO_LIBRE' end> end> Name = 'ContratosCliente' @@ -769,6 +777,15 @@ object srvContratosCliente: TsrvContratosCliente Name = 'FACTURA_ASOCIADA' DataType = datString Size = 255 + end + item + Name = 'FECHA_PREVISTA_MONTAJE' + DataType = datDateTime + end + item + Name = 'CAMPO_LIBRE' + DataType = datString + Size = 255 end> end item @@ -1238,6 +1255,17 @@ object srvContratosCliente: TsrvContratosCliente Name = 'FECHA_DECISION' DataType = datDateTime Value = '' + end + item + Name = 'FECHA_PREVISTA_MONTAJE' + DataType = datDateTime + Value = '' + end + item + Name = 'CAMPO_LIBRE' + DataType = datString + Size = 255 + Value = '' end> Statements = < item @@ -1254,17 +1282,18 @@ 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, 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 + 'ENCIA_CLIENTE, FECHA_DECISION, FECHA_PREVISTA_MONTAJE, CAMPO_LIB' + + 'RE)'#10' VALUES'#10' (:ID, :ID_CLIENTE, :NIF_CIF, :NOMBRE, :ID_DIREC' + + 'CION, :CALLE, :POBLACION, :PROVINCIA,'#10' :CODIGO_POSTAL, :REFE' + + 'RENCIA, :FECHA_CONTRATO, :SITUACION, :FORMA_PAGO,'#10' :PLAZO_EN' + + 'TREGA, :OBSERVACIONES, :INCIDENCIAS, :INCIDENCIAS_ACTIVAS, CURRE' + + 'NT_TIMESTAMP,'#10' :USUARIO, :IMPORTE_NETO, :IMPORTE_PORTE, :DES' + + 'CUENTO, :IMPORTE_DESCUENTO,'#10' :BASE_IMPONIBLE, :ID_TIPO_IVA, ' + + ':IVA, :IMPORTE_IVA, :IMPORTE_TOTAL, :ID_FORMA_PAGO,'#10' :ID_TIE' + + 'NDA, :ID_VENDEDOR, :PERSONA_CONTACTO, :RE, :IMPORTE_RE, :RECARGO' + + '_EQUIVALENCIA,'#10' :TELEFONO, :MOVIL, :TIPO_CONTRATO, :CONDICIO' + + 'NES, :CALIDADES, :REFERENCIA_CLIENTE,'#10' :FECHA_DECISION, :FEC' + + 'HA_PREVISTA_MONTAJE, :CAMPO_LIBRE)'#10#10 StatementType = stSQL ColumnMappings = <> end> @@ -1509,6 +1538,17 @@ object srvContratosCliente: TsrvContratosCliente DataType = datDateTime Value = '' end + item + Name = 'FECHA_PREVISTA_MONTAJE' + DataType = datDateTime + Value = '' + end + item + Name = 'CAMPO_LIBRE' + DataType = datString + Size = 255 + Value = '' + end item Name = 'OLD_ID' Value = '' @@ -1539,7 +1579,9 @@ object srvContratosCliente: TsrvContratosCliente 'NO = :TELEFONO,'#10' MOVIL = :MOVIL,'#10' TIPO_CONTRATO = :TIPO_CO' + 'NTRATO,'#10' CONDICIONES = :CONDICIONES,'#10' CALIDADES = :CALIDAD' + 'ES,'#10' REFERENCIA_CLIENTE = :REFERENCIA_CLIENTE,'#10' FECHA_DECI' + - 'SION = :FECHA_DECISION'#10' WHERE'#10' (ID = :OLD_ID)'#10#10 + 'SION = :FECHA_DECISION,'#10' FECHA_PREVISTA_MONTAJE = :FECHA_PREV' + + 'ISTA_MONTAJE,'#10' CAMPO_LIBRE = :CAMPO_LIBRE'#10' WHERE'#10' (ID = :' + + 'OLD_ID)'#10#10 StatementType = stSQL ColumnMappings = <> end> diff --git a/Source/Modulos/Contratos de cliente/Views/uEditorContratoCliente.dfm b/Source/Modulos/Contratos de cliente/Views/uEditorContratoCliente.dfm index 5453646..176e40f 100644 --- a/Source/Modulos/Contratos de cliente/Views/uEditorContratoCliente.dfm +++ b/Source/Modulos/Contratos de cliente/Views/uEditorContratoCliente.dfm @@ -175,6 +175,7 @@ inherited fEditorContratoCliente: TfEditorContratoCliente inherited pgPaginas: TPageControl Width = 866 Height = 473 + ActivePage = pagInicidencias TabOrder = 1 OnChanging = pgPaginasChanging ExplicitTop = 109 @@ -202,17 +203,15 @@ inherited fEditorContratoCliente: TfEditorContratoCliente ExplicitWidth = 858 ExplicitHeight = 445 inherited edtFechaContrato: TcxDBDateEdit - Left = 103 Top = 84 - ExplicitLeft = 103 ExplicitTop = 84 ExplicitWidth = 129 Width = 129 end inherited memObservaciones: TcxDBMemo - Left = 451 + Left = 464 Top = 330 - ExplicitLeft = 451 + ExplicitLeft = 464 ExplicitTop = 330 ExplicitWidth = 404 ExplicitHeight = 139 @@ -220,29 +219,24 @@ inherited fEditorContratoCliente: TfEditorContratoCliente Width = 404 end inherited eReferencia: TcxDBTextEdit - Left = 103 Top = 30 - ExplicitLeft = 103 ExplicitTop = 30 ExplicitWidth = 122 Width = 122 end inherited cbFormaPago: TcxDBLookupComboBox - Left = 103 - Top = 165 - ExplicitLeft = 103 - ExplicitTop = 165 + Top = 192 + ExplicitTop = 192 ExplicitWidth = 122 Width = 122 end inherited bFormasPago: TButton - Left = 291 - Top = 165 - ExplicitLeft = 291 - ExplicitTop = 165 + Left = 304 + Top = 192 + ExplicitLeft = 304 + ExplicitTop = 192 end inherited cbSituacion: TcxDBImageComboBox - Left = 103 Top = 138 Properties.Items = < item @@ -258,57 +252,52 @@ inherited fEditorContratoCliente: TfEditorContratoCliente Description = 'RECHAZADO' Value = 'RECHAZADO' end> - ExplicitLeft = 103 ExplicitTop = 138 ExplicitWidth = 260 Width = 260 end inherited memFormaPago: TcxDBMemo - Top = 243 - ExplicitTop = 243 + Top = 270 + ExplicitTop = 270 ExplicitWidth = 396 ExplicitHeight = 100 Height = 100 Width = 396 end inherited memPlazoEntrega: TcxDBMemo - Top = 351 - ExplicitTop = 351 + Top = 365 + ExplicitTop = 365 ExplicitWidth = 396 ExplicitHeight = 100 Height = 100 Width = 396 end inherited cbVendedor: TcxDBLookupComboBox - Left = 103 - Top = 192 - ExplicitLeft = 103 - ExplicitTop = 192 + Top = 219 + ExplicitTop = 219 ExplicitWidth = 27 Width = 27 end inherited cbTipoContrato: TcxDBComboBox - Left = 320 + Left = 339 Top = 84 - ExplicitLeft = 320 + ExplicitLeft = 339 ExplicitTop = 84 ExplicitWidth = 113 Width = 113 end inherited edtlREF_CLIENTE: TcxDBTextEdit - Left = 103 Top = 57 Enabled = False - ExplicitLeft = 103 ExplicitTop = 57 ExplicitWidth = 335 Width = 335 end inherited frViewClienteContrato1: TfrViewClienteContrato - Left = 451 + Left = 464 Top = 30 Width = 357 - ExplicitLeft = 451 + ExplicitLeft = 464 ExplicitTop = 30 ExplicitWidth = 357 inherited dxLayoutControl1: TdxLayoutControl @@ -371,10 +360,10 @@ inherited fEditorContratoCliente: TfEditorContratoCliente Width = 707 end inherited edtCodigoPostal: TcxDBTextEdit - Left = 292 + Left = 279 Top = 176 DataBinding.DataSource = dsDataTable - ExplicitLeft = 292 + ExplicitLeft = 279 ExplicitTop = 176 end inherited Button1: TBitBtn @@ -390,9 +379,9 @@ inherited fEditorContratoCliente: TfEditorContratoCliente ExplicitTop = 11 end inherited Button3: TBitBtn - Left = 182 + Left = 169 Top = 230 - ExplicitLeft = 182 + ExplicitLeft = 169 ExplicitTop = 230 end inherited cxDBTextEdit1: TcxDBTextEdit @@ -406,13 +395,17 @@ inherited fEditorContratoCliente: TfEditorContratoCliente end end inherited edtFechaDecision: TcxDBDateEdit - Left = 103 Top = 111 - ExplicitLeft = 103 ExplicitTop = 111 ExplicitWidth = 115 Width = 115 end + inherited edtFechaPrevMontaje: TcxDBDateEdit + Top = 165 + ExplicitTop = 165 + ExplicitWidth = 295 + Width = 295 + end inherited dxLayoutControl1Group_Root: TdxLayoutGroup inherited dxLayoutControl1Group8: TdxLayoutGroup inherited dxLayoutControl1Group1: TdxLayoutGroup @@ -468,57 +461,56 @@ inherited fEditorContratoCliente: TfEditorContratoCliente ExplicitLeft = 334 ExplicitTop = 0 end - inherited FontSize: TEdit [5] + inherited FontName: TJvFontComboBox Left = 0 - Width = 110 ExplicitLeft = 0 + end + inherited FontSize: TEdit + Left = 145 + Width = 110 + ExplicitLeft = 145 ExplicitWidth = 110 end - inherited UpDown1: TUpDown [6] - Left = 110 - ExplicitLeft = 110 - end - inherited FontName: TJvFontComboBox [7] - Left = 127 - ExplicitLeft = 127 + inherited UpDown1: TUpDown + Left = 271 + ExplicitLeft = 271 end inherited ToolButton13: TToolButton - Left = 272 - ExplicitLeft = 272 + Left = 288 + ExplicitLeft = 288 end inherited ToolButton6: TToolButton - Left = 280 - ExplicitLeft = 280 + Left = 296 + ExplicitLeft = 296 end inherited ToolButton7: TToolButton - Left = 314 - ExplicitLeft = 314 + Left = 330 + ExplicitLeft = 330 end inherited ToolButton8: TToolButton - Left = 348 - ExplicitLeft = 348 + Left = 364 + ExplicitLeft = 364 end inherited ToolButton12: TToolButton - Left = 382 - ExplicitLeft = 382 + Left = 398 + ExplicitLeft = 398 end inherited ToolButton9: TToolButton - Left = 390 - ExplicitLeft = 390 + Left = 406 + ExplicitLeft = 406 end inherited ToolButton10: TToolButton - Left = 424 - ExplicitLeft = 424 + Left = 440 + ExplicitLeft = 440 end inherited ToolButton11: TToolButton - Left = 458 - ExplicitLeft = 458 + Left = 474 + ExplicitLeft = 474 end end inherited cxGrid: TcxGrid Width = 858 Height = 373 - ExplicitTop = 72 ExplicitWidth = 858 ExplicitHeight = 373 end @@ -641,6 +633,9 @@ inherited fEditorContratoCliente: TfEditorContratoCliente object pagInicidencias: TTabSheet Caption = 'Incidencias' ImageIndex = 2 + DesignSize = ( + 858 + 445) inline frViewIncidenciasCli: TfrViewIncidencias Left = 0 Top = 0 @@ -661,7 +656,9 @@ inherited fEditorContratoCliente: TfEditorContratoCliente Width = 858 ExplicitWidth = 858 inherited eIncidenciaActiva: TcxDBCheckBox + ExplicitWidth = 173 ExplicitHeight = 21 + Width = 173 end end inherited GroupBox1: TGroupBox @@ -677,6 +674,31 @@ inherited fEditorContratoCliente: TfEditorContratoCliente end end end + object eCampoLibre: TcxDBTextEdit + Left = 176 + Top = 4 + Anchors = [akLeft, akTop, akRight] + DataBinding.DataField = 'CAMPO_LIBRE' + DataBinding.DataSource = frViewIncidenciasCli.DADataSource + Properties.ReadOnly = False + Properties.ValidateOnEnter = True + Style.BorderColor = clWindowFrame + Style.BorderStyle = ebs3D + Style.Color = clInfoBk + Style.HotTrack = False + Style.LookAndFeel.Kind = lfStandard + Style.LookAndFeel.NativeStyle = True + StyleDisabled.Color = clMenuBar + StyleDisabled.LookAndFeel.Kind = lfStandard + StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.TextColor = clWindowText + StyleFocused.LookAndFeel.Kind = lfStandard + StyleFocused.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.Kind = lfStandard + StyleHot.LookAndFeel.NativeStyle = True + TabOrder = 1 + Width = 305 + end end object pagDocumentos: TTabSheet Caption = 'Documentos' diff --git a/Source/Modulos/Contratos de cliente/Views/uEditorContratoCliente.pas b/Source/Modulos/Contratos de cliente/Views/uEditorContratoCliente.pas index 20ae5df..0b8986b 100644 --- a/Source/Modulos/Contratos de cliente/Views/uEditorContratoCliente.pas +++ b/Source/Modulos/Contratos de cliente/Views/uEditorContratoCliente.pas @@ -48,6 +48,7 @@ type dxLayoutGroup1: TdxLayoutGroup; dxLayoutItem1: TdxLayoutItem; frViewContratoCliente1: TfrViewContratoCliente; + eCampoLibre: TcxDBTextEdit; procedure FormShow(Sender: TObject); procedure CustomEditorClose(Sender: TObject; var Action: TCloseAction); diff --git a/Source/Modulos/Contratos de cliente/Views/uEditorContratosCliente.dfm b/Source/Modulos/Contratos de cliente/Views/uEditorContratosCliente.dfm index 944ccc1..7b58ad9 100644 --- a/Source/Modulos/Contratos de cliente/Views/uEditorContratosCliente.dfm +++ b/Source/Modulos/Contratos de cliente/Views/uEditorContratosCliente.dfm @@ -132,27 +132,19 @@ inherited fEditorContratosCliente: TfEditorContratosCliente DisplayMode = nbdmImageAndText ImageIndex = 22 object bCocina: TTBXItem - Caption = 'Contrato de cocina' + Caption = 'Presupuesto de cocina' OnClick = bCocinaClick end - object bArmario: TTBXItem - Caption = 'Contrato de armario' - OnClick = bArmarioClick - end object bBano: TTBXItem - Caption = 'Contrato de ba'#241'o' + Caption = 'Presupuesto de ba'#241'o' OnClick = bBanoClick end object bElectrodomestico: TTBXItem - Caption = 'Contrato de electrodom'#233'stico' + Caption = 'Presupuesto de electrodom'#233'stico' OnClick = bElectrodomesticoClick end - object bObra: TTBXItem - Caption = 'Contrato de obra' - OnClick = bObraClick - end object bVarios: TTBXItem - Caption = 'Contrato de varios' + Caption = 'Presupuesto de varios' OnClick = bVariosClick end end diff --git a/Source/Modulos/Contratos de cliente/Views/uEditorContratosCliente.pas b/Source/Modulos/Contratos de cliente/Views/uEditorContratosCliente.pas index 5f5e2bf..882ed88 100644 --- a/Source/Modulos/Contratos de cliente/Views/uEditorContratosCliente.pas +++ b/Source/Modulos/Contratos de cliente/Views/uEditorContratosCliente.pas @@ -43,7 +43,6 @@ type actListadoBeneficios: TAction; TBXItem42: TTBXItem; TBXSubmenuItem3: TTBXSubmenuItem; - bObra: TTBXItem; TBXItem43: TTBXItem; Generaralbarndecliente1: TMenuItem; actGenerarPedidoProv: TAction; diff --git a/Source/Modulos/Contratos de cliente/Views/uViewContratoCliente.dfm b/Source/Modulos/Contratos de cliente/Views/uViewContratoCliente.dfm index 9b90d8b..cd5467d 100644 --- a/Source/Modulos/Contratos de cliente/Views/uViewContratoCliente.dfm +++ b/Source/Modulos/Contratos de cliente/Views/uViewContratoCliente.dfm @@ -19,7 +19,7 @@ inherited frViewContratoCliente: TfrViewContratoCliente 817 491) object edtFechaContrato: TcxDBDateEdit - Left = 104 + Left = 131 Top = 82 Anchors = [akLeft, akTop, akRight] DataBinding.DataField = 'FECHA_CONTRATO' @@ -42,7 +42,7 @@ inherited frViewContratoCliente: TfrViewContratoCliente Width = 129 end object memObservaciones: TcxDBMemo - Left = 429 + Left = 441 Top = 334 Align = alClient DataBinding.DataField = 'OBSERVACIONES' @@ -59,12 +59,12 @@ inherited frViewContratoCliente: TfrViewContratoCliente StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 12 + TabOrder = 13 Height = 139 Width = 404 end object eReferencia: TcxDBTextEdit - Left = 104 + Left = 131 Top = 28 Anchors = [akLeft, akTop, akRight] DataBinding.DataField = 'REFERENCIA' @@ -89,8 +89,8 @@ inherited frViewContratoCliente: TfrViewContratoCliente Width = 122 end object cbFormaPago: TcxDBLookupComboBox - Left = 104 - Top = 163 + Left = 131 + Top = 190 DataBinding.DataField = 'ID_FORMA_PAGO' DataBinding.DataSource = DADataSource Properties.KeyFieldNames = 'ID' @@ -115,20 +115,20 @@ inherited frViewContratoCliente: TfrViewContratoCliente StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 6 + TabOrder = 7 Width = 122 end object bFormasPago: TButton - Left = 267 - Top = 163 + Left = 279 + Top = 190 Width = 132 Height = 21 Caption = 'Ver las formas de pago...' - TabOrder = 7 + TabOrder = 8 OnClick = bFormasPagoClick end object cbSituacion: TcxDBImageComboBox - Left = 104 + Left = 131 Top = 136 DataBinding.DataField = 'SITUACION' DataBinding.DataSource = DADataSource @@ -159,7 +159,7 @@ inherited frViewContratoCliente: TfrViewContratoCliente end object memFormaPago: TcxDBMemo Left = 22 - Top = 247 + Top = 274 Anchors = [akLeft, akTop, akRight, akBottom] DataBinding.DataField = 'FORMA_PAGO' DataBinding.DataSource = DADataSource @@ -175,35 +175,35 @@ inherited frViewContratoCliente: TfrViewContratoCliente StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 9 - Height = 100 - Width = 396 - end - object memPlazoEntrega: TcxDBMemo - Left = 22 - Top = 376 - Anchors = [akLeft, akTop, akRight, akBottom] - DataBinding.DataField = 'PLAZO_ENTREGA' - DataBinding.DataSource = DADataSource - Properties.ScrollBars = ssVertical - Style.BorderColor = clWindowFrame - Style.BorderStyle = ebs3D - Style.HotTrack = False - Style.LookAndFeel.Kind = lfStandard - Style.LookAndFeel.NativeStyle = True - StyleDisabled.LookAndFeel.Kind = lfStandard - StyleDisabled.LookAndFeel.NativeStyle = True - StyleFocused.LookAndFeel.Kind = lfStandard - StyleFocused.LookAndFeel.NativeStyle = True - StyleHot.LookAndFeel.Kind = lfStandard - StyleHot.LookAndFeel.NativeStyle = True TabOrder = 10 Height = 100 Width = 396 end + object memPlazoEntrega: TcxDBMemo + Left = 22 + Top = 390 + Anchors = [akLeft, akTop, akRight, akBottom] + DataBinding.DataField = 'PLAZO_ENTREGA' + DataBinding.DataSource = DADataSource + Properties.ScrollBars = ssVertical + Style.BorderColor = clWindowFrame + Style.BorderStyle = ebs3D + Style.HotTrack = False + Style.LookAndFeel.Kind = lfStandard + Style.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.Kind = lfStandard + StyleDisabled.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.Kind = lfStandard + StyleFocused.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.Kind = lfStandard + StyleHot.LookAndFeel.NativeStyle = True + TabOrder = 11 + Height = 100 + Width = 396 + end object cbVendedor: TcxDBLookupComboBox - Left = 104 - Top = 190 + Left = 131 + Top = 217 DataBinding.DataField = 'ID_VENDEDOR' DataBinding.DataSource = DADataSource Properties.KeyFieldNames = 'ID' @@ -228,11 +228,11 @@ inherited frViewContratoCliente: TfrViewContratoCliente StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 8 + TabOrder = 9 Width = 27 end object cbTipoContrato: TcxDBComboBox - Left = 298 + Left = 316 Top = 82 DataBinding.DataField = 'TIPO_CONTRATO' DataBinding.DataSource = DADataSource @@ -258,7 +258,7 @@ inherited frViewContratoCliente: TfrViewContratoCliente Width = 113 end object edtlREF_CLIENTE: TcxDBTextEdit - Left = 104 + Left = 131 Top = 55 Anchors = [akLeft, akTop, akRight] AutoSize = False @@ -280,13 +280,13 @@ inherited frViewContratoCliente: TfrViewContratoCliente Width = 335 end inline frViewClienteContrato1: TfrViewClienteContrato - Left = 429 + Left = 441 Top = 28 Width = 366 Height = 270 - TabOrder = 11 + TabOrder = 12 ReadOnly = False - ExplicitLeft = 429 + ExplicitLeft = 441 ExplicitTop = 28 ExplicitWidth = 366 ExplicitHeight = 270 @@ -316,12 +316,16 @@ inherited frViewContratoCliente: TfrViewContratoCliente Width = 707 end inherited edtCodigoPostal: TcxDBTextEdit - Left = 274 - ExplicitLeft = 274 + Left = 262 + ExplicitLeft = 262 end inherited Button3: TBitBtn - Left = 164 - ExplicitLeft = 164 + Left = 152 + ExplicitLeft = 152 + end + inherited cxDBTextEdit1: TcxDBTextEdit + ExplicitWidth = 283 + Width = 283 end inherited dxLayoutControl1Group_Root: TdxLayoutGroup inherited dxLayoutControl1Item10: TdxLayoutItem @@ -332,7 +336,7 @@ inherited frViewContratoCliente: TfrViewContratoCliente end end object edtFechaDecision: TcxDBDateEdit - Left = 104 + Left = 131 Top = 109 Anchors = [akLeft, akTop, akRight] DataBinding.DataField = 'FECHA_DECISION' @@ -354,6 +358,29 @@ inherited frViewContratoCliente: TfrViewContratoCliente TabOrder = 4 Width = 115 end + object edtFechaPrevMontaje: TcxDBDateEdit + Left = 131 + Top = 163 + Anchors = [akLeft, akTop, akRight] + DataBinding.DataField = 'FECHA_PREVISTA_MONTAJE' + DataBinding.DataSource = DADataSource + Properties.DateButtons = [btnToday] + Properties.ImmediatePost = True + Style.BorderColor = clWindowFrame + Style.BorderStyle = ebs3D + Style.Color = clInfoBk + Style.HotTrack = False + Style.LookAndFeel.NativeStyle = True + Style.Shadow = False + Style.ButtonStyle = bts3D + Style.ButtonTransparency = ebtNone + Style.PopupBorderStyle = epbsFrame3D + StyleDisabled.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.NativeStyle = True + TabOrder = 6 + Width = 295 + end object dxLayoutControl1Group_Root: TdxLayoutGroup ShowCaption = False Hidden = True @@ -413,6 +440,11 @@ inherited frViewContratoCliente: TfrViewContratoCliente Control = cbSituacion ControlOptions.ShowBorder = False end + object dxLayoutControl1Item14: TdxLayoutItem + Caption = 'Fecha prev. montaje:' + Control = edtFechaPrevMontaje + ControlOptions.ShowBorder = False + end object dxLayoutControl1Group5: TdxLayoutGroup ShowCaption = False Hidden = True diff --git a/Source/Modulos/Contratos de cliente/Views/uViewContratoCliente.pas b/Source/Modulos/Contratos de cliente/Views/uViewContratoCliente.pas index 9884ef9..1d4b51c 100644 --- a/Source/Modulos/Contratos de cliente/Views/uViewContratoCliente.pas +++ b/Source/Modulos/Contratos de cliente/Views/uViewContratoCliente.pas @@ -69,6 +69,8 @@ type frViewClienteContrato1: TfrViewClienteContrato; dxLayoutControl1Item13: TdxLayoutItem; edtFechaDecision: TcxDBDateEdit; + dxLayoutControl1Item14: TdxLayoutItem; + edtFechaPrevMontaje: TcxDBDateEdit; procedure CustomViewCreate(Sender: TObject); procedure CustomViewDestroy(Sender: TObject); procedure bFormasPagoClick(Sender: TObject); diff --git a/Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.dfm b/Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.dfm index ff3a727..f1960d7 100644 --- a/Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.dfm +++ b/Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.dfm @@ -31,6 +31,10 @@ inherited frViewContratosCliente: TfrViewContratosCliente Kind = skSum Column = cxGridViewIMPORTE_TOTAL end> + object cxGridViewCAMPO_LIBRE: TcxGridDBColumn + Caption = '-' + DataBinding.FieldName = 'CAMPO_LIBRE' + end object cxGridViewINCIDENCIASACTIVAS: TcxGridDBColumn Caption = 'Incidencias' DataBinding.FieldName = 'INCIDENCIAS_ACTIVAS' @@ -77,6 +81,10 @@ inherited frViewContratosCliente: TfrViewContratosCliente Caption = 'Fecha decisi'#243'n' DataBinding.FieldName = 'FECHA_DECISION' end + object cxGridViewFECHA_PREVISTA_MONTAJE: TcxGridDBColumn + Caption = 'Fecha prev. montaje' + DataBinding.FieldName = 'FECHA_PREVISTA_MONTAJE' + end object cxGridViewTIPO_CONTRATO: TcxGridDBColumn DataBinding.FieldName = 'TIPO_CONTRATO' BestFitMaxWidth = 25 @@ -118,6 +126,7 @@ inherited frViewContratosCliente: TfrViewContratosCliente Visible = False end object cxGridViewPROVINCIA: TcxGridDBColumn + Caption = 'Provincia' DataBinding.FieldName = 'PROVINCIA' Visible = False end diff --git a/Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.pas b/Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.pas index c587c14..538a51f 100644 --- a/Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.pas +++ b/Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.pas @@ -50,6 +50,8 @@ type cxGridLevelRechazados: TcxGridLevel; cxGridViewFECHA_DECISION: TcxGridDBColumn; cxGridViewFACTURA_ASOCIADA: TcxGridDBColumn; + cxGridViewFECHA_PREVISTA_MONTAJE: TcxGridDBColumn; + cxGridViewCAMPO_LIBRE: TcxGridDBColumn; procedure cxGridActiveTabChanged(Sender: TcxCustomGrid; ALevel: TcxGridLevel); procedure cxGridViewStylesGetContentStyle(Sender: TcxCustomGridTableView; diff --git a/Source/Modulos/Contratos de cliente/Views/uViewDetallesContratoCliente.dfm b/Source/Modulos/Contratos de cliente/Views/uViewDetallesContratoCliente.dfm index 0fca398..bab3f51 100644 --- a/Source/Modulos/Contratos de cliente/Views/uViewDetallesContratoCliente.dfm +++ b/Source/Modulos/Contratos de cliente/Views/uViewDetallesContratoCliente.dfm @@ -1,89 +1,5 @@ inherited frViewDetallesContratoCliente: TfrViewDetallesContratoCliente - Width = 855 - Height = 510 - inherited ToolBar1: TToolBar - Width = 855 - Height = 24 - inherited ToolButton4: TToolButton - Wrap = False - end - inherited ToolButton14: TToolButton - Left = 334 - Top = 0 - ExplicitLeft = 334 - ExplicitTop = 0 - end - inherited FontName: TJvFontComboBox - Left = 368 - Top = 0 - ExplicitLeft = 368 - ExplicitTop = 0 - end - inherited FontSize: TEdit - Left = 513 - Top = 0 - ExplicitLeft = 513 - ExplicitTop = 0 - end - inherited UpDown1: TUpDown - Left = 555 - Top = 0 - ExplicitLeft = 555 - ExplicitTop = 0 - end - inherited ToolButton13: TToolButton - Left = 572 - Top = 0 - ExplicitLeft = 572 - ExplicitTop = 0 - end - inherited ToolButton6: TToolButton - Left = 580 - Top = 0 - ExplicitLeft = 580 - ExplicitTop = 0 - end - inherited ToolButton7: TToolButton - Left = 614 - Top = 0 - ExplicitLeft = 614 - ExplicitTop = 0 - end - inherited ToolButton8: TToolButton - Left = 648 - Top = 0 - ExplicitLeft = 648 - ExplicitTop = 0 - end - inherited ToolButton12: TToolButton - Left = 682 - Top = 0 - ExplicitLeft = 682 - ExplicitTop = 0 - end - inherited ToolButton9: TToolButton - Left = 690 - Top = 0 - ExplicitLeft = 690 - ExplicitTop = 0 - end - inherited ToolButton10: TToolButton - Left = 724 - Top = 0 - ExplicitLeft = 724 - ExplicitTop = 0 - end - inherited ToolButton11: TToolButton - Left = 758 - Top = 0 - ExplicitLeft = 758 - ExplicitTop = 0 - end - end inherited cxGrid: TcxGrid - Top = 50 - Width = 855 - Height = 460 inherited cxGridView: TcxGridDBTableView inherited cxGridViewID_ARTICULO: TcxGridDBColumn Width = 57 @@ -110,6 +26,7 @@ inherited frViewDetallesContratoCliente: TfrViewDetallesContratoCliente Width = 186 end inherited cxGridViewCANTIDAD: TcxGridDBColumn + Properties.Alignment.Horz = taRightJustify VisibleForCustomization = False Width = 20 end @@ -118,6 +35,10 @@ inherited frViewDetallesContratoCliente: TfrViewDetallesContratoCliente Width = 26 end inherited cxGridViewDESCUENTO: TcxGridDBColumn + Properties.Alignment.Horz = taCenter + FooterAlignmentHorz = taCenter + HeaderAlignmentHorz = taCenter + HeaderGlyphAlignmentHorz = taCenter VisibleForCustomization = False Width = 20 end @@ -126,25 +47,20 @@ inherited frViewDetallesContratoCliente: TfrViewDetallesContratoCliente VisibleForCustomization = False Width = 29 end - inherited cxGridViewVISIBLE: TcxGridDBColumn [13] - Visible = True - end - inherited cxGridViewIMPORTEPORTE: TcxGridDBColumn [14] - end - inherited cxGridViewVISIBLE2: TcxGridDBColumn [15] - Visible = True - end - inherited cxGridViewIMPORTETOTAL: TcxGridDBColumn [16] + inherited cxGridViewIMPORTETOTAL: TcxGridDBColumn VisibleForCustomization = False Width = 22 end + inherited cxGridViewVISIBLE: TcxGridDBColumn + Visible = True + end + inherited cxGridViewVISIBLE2: TcxGridDBColumn + Visible = True + end end end inherited TBXDock1: TTBXDock - Top = 24 - Width = 855 inherited TBXToolbar1: TTBXToolbar - ExplicitWidth = 665 object TBXSubmenuItem1: TTBXSubmenuItem [0] Caption = 'A'#241'adir cap'#237'tulo' DisplayMode = nbdmImageAndText diff --git a/Source/Modulos/Facturas de cliente/Controller/FacturasCliente_controller.RES b/Source/Modulos/Facturas de cliente/Controller/FacturasCliente_controller.RES index 1641339..8b251f3 100644 Binary files a/Source/Modulos/Facturas de cliente/Controller/FacturasCliente_controller.RES and b/Source/Modulos/Facturas de cliente/Controller/FacturasCliente_controller.RES differ diff --git a/Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.dfm index 7666e43..f88074f 100644 --- a/Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.dfm +++ b/Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.dfm @@ -1,6 +1,16 @@ inherited frViewDetallesFacturaCliente: TfrViewDetallesFacturaCliente inherited cxGrid: TcxGrid inherited cxGridView: TcxGridDBTableView + inherited cxGridViewCANTIDAD: TcxGridDBColumn + Properties.Alignment.Horz = taRightJustify + end + inherited cxGridViewDESCUENTO: TcxGridDBColumn + Properties.Alignment.Horz = taCenter + FooterAlignmentHorz = taCenter + GroupSummaryAlignment = taCenter + HeaderAlignmentHorz = taCenter + HeaderGlyphAlignmentHorz = taCenter + end inherited cxGridViewIMPORTENETO: TcxGridDBColumn Visible = False VisibleForCustomization = False diff --git a/Source/Modulos/Facturas de proveedor/Controller/uDetallesFacturaProveedorController.pas b/Source/Modulos/Facturas de proveedor/Controller/uDetallesFacturaProveedorController.pas index 96b8285..28edd4b 100644 --- a/Source/Modulos/Facturas de proveedor/Controller/uDetallesFacturaProveedorController.pas +++ b/Source/Modulos/Facturas de proveedor/Controller/uDetallesFacturaProveedorController.pas @@ -9,7 +9,7 @@ uses type IDetallesFacturaProveedorController = interface(IControllerDetallesArticulos) ['{49F6199E-E031-42F5-AEA5-E70C3E3479A1}'] - procedure AnadirArticulos(ADetalles: IDAStronglyTypedDataTable; AProveedor: IBizProveedor; const ANuevaFila :Boolean = True; const ACantidad: Integer = 1); overload; + procedure AnadirArticulos(ADetalles: IDAStronglyTypedDataTable; AProveedor: IBizProveedor; const ANuevaFila :Boolean = True; const ACantidad: Integer = 1); overload; procedure ActualizarDetalles(ADetalles: IDAStronglyTypedDataTable; AProveedor: IBizProveedor); procedure AnadirDetalleFacturaAsociadaAbono(ADetalles: IBizDetallesFacturaProveedor; AReferencia: String; AFecha: String); procedure DesglosarPorteDetalles(ImportePorte: Currency; ADetalles: IDAStronglyTypedDataTable); @@ -25,10 +25,11 @@ type procedure AsignarController; override; //Si sobreescribimos este método podremos tener en cuenta otras columnas para el calculo del importe total de un concepto - function CalcularImporteTotalConcepto(DataTable: TDADataTable): Double; override; + procedure ValidarCampos(DataTable: TDADataTable); override; procedure DesglosarPorteDetalles(ImportePorte: Currency; ADetalles: IDAStronglyTypedDataTable); function DarTotalPorteTotal(ADetalles: IDAStronglyTypedDataTable): Double; + function CalcularImporteTotalConcepto(DataTable: TDADataTable): Double; override; public procedure AnadirArticulos(ADetalles: IDAStronglyTypedDataTable; AProveedor: IBizProveedor; const ANuevaFila :Boolean = True; const ACantidad: Integer = 1); overload; diff --git a/Source/Modulos/Facturas de proveedor/Controller/uFacturasProveedorController.pas b/Source/Modulos/Facturas de proveedor/Controller/uFacturasProveedorController.pas index 0ba79a2..931cc16 100644 --- a/Source/Modulos/Facturas de proveedor/Controller/uFacturasProveedorController.pas +++ b/Source/Modulos/Facturas de proveedor/Controller/uFacturasProveedorController.pas @@ -257,14 +257,6 @@ begin if not Assigned(AFactura) then raise Exception.Create ('Factura no asignada (Anadir)'); AFactura.Insert; - - FDetallesController.Add(AFactura.Detalles, TIPO_DETALLE_CONCEPTO); - if not AFactura.Detalles.DataTable.Editing then - AFactura.Detalles.DataTable.Edit; - AFactura.Detalles.CANTIDAD := 1; - AFactura.Detalles.IMPORTE_UNIDAD := 0; - AFactura.Detalles.Post; - Result := True; end; @@ -708,8 +700,8 @@ begin if (EsFechaVacia(AFactura.FECHA_FACTURA)) then raise Exception.Create('Debe indicar la fecha de esta factura'); - if (AFactura.Detalles.DataTable.RecordCount = 0) then - raise Exception.Create('La factura debe tener al menos un concepto en su contenido'); +// if (AFactura.Detalles.DataTable.RecordCount = 0) then +// raise Exception.Create('La factura debe tener al menos un concepto en su contenido'); if (AFactura.IGNORAR_CONTABILIDAD = 0) then begin @@ -1037,7 +1029,7 @@ begin if Supports(ADataTable, IBizDetallesFacturaProveedor, ADetalles) and Supports(ADetalles.DataTable.MasterSource.DataTable, IBizFacturaProveedor, AFactura) then begin - RecalcularImportes(AFactura); +// RecalcularImportes(AFactura); end; end; @@ -1166,7 +1158,7 @@ begin ShowHourglassCursor; // Asegurarnos de que todos los importes están bien. - RecalcularImportes(AFactura); +// RecalcularImportes(AFactura); try AFactura.DataTable.ApplyUpdates; diff --git a/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.dfm b/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.dfm index 08b91eb..30199a7 100644 --- a/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.dfm +++ b/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.dfm @@ -82,7 +82,6 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor inherited pgPaginas: TPageControl Width = 1105 Height = 374 - ActivePage = pagContenido OnChanging = pgPaginasChanging ExplicitTop = 109 ExplicitWidth = 1105 @@ -205,11 +204,13 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor end inherited frViewObservaciones1: TfrViewObservaciones Width = 671 + Height = 228 ExplicitWidth = 671 + ExplicitHeight = 228 inherited memObservaciones: TcxDBMemo DataBinding.DataSource = frViewFacturaProveedor1.DADataSource - ExplicitWidth = 1036 - ExplicitHeight = 20 + ExplicitWidth = 671 + Height = 228 Width = 671 end end @@ -219,6 +220,7 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor object pagContenido: TTabSheet Caption = 'Contenido' ImageIndex = 1 + TabVisible = False inline frViewDetallesFacturaProveedor1: TfrViewDetallesFacturaProveedor Left = 0 Top = 0 @@ -375,6 +377,18 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor inherited ToolBar1: TToolBar Width = 1097 ExplicitWidth = 1097 + 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 @@ -451,94 +465,94 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor Width = 1111 ExplicitWidth = 1111 inherited Bevel3: TBevel - Left = 630 + Left = 587 Top = 30 Height = 122 - ExplicitLeft = 630 + ExplicitLeft = 587 ExplicitTop = 30 ExplicitHeight = 122 end inherited Bevel4: TBevel - Left = 742 + Left = 699 Top = 57 Width = 186 - ExplicitLeft = 742 + ExplicitLeft = 699 ExplicitTop = 57 ExplicitWidth = 186 end inherited ImporteDto: TcxDBCurrencyEdit - Top = 84 + Top = 57 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitTop = 84 + ExplicitTop = 57 ExplicitWidth = 207 Width = 207 end inherited ImporteIVA: TcxDBCurrencyEdit - Left = 813 + Left = 770 Top = 77 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 813 + ExplicitLeft = 770 ExplicitTop = 77 ExplicitWidth = 143 Width = 143 end inherited ImporteTotal: TcxDBCurrencyEdit - Left = 743 + Left = 700 Top = 131 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 743 + ExplicitLeft = 700 ExplicitTop = 131 ExplicitWidth = 213 Width = 213 end inherited edtDescuento: TcxDBSpinEdit - Top = 84 + Top = 57 Properties.OnValidate = frViewTotales1edtDescuentoPropertiesValidate Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitTop = 84 + ExplicitTop = 57 end inherited edtIVA: TcxDBSpinEdit - Left = 742 + Left = 699 Top = 77 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 742 + ExplicitLeft = 699 ExplicitTop = 77 end inherited ImporteBase: TcxDBCurrencyEdit - Left = 742 + Left = 699 Top = 30 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 742 + ExplicitLeft = 699 ExplicitTop = 30 ExplicitWidth = 214 Width = 214 end inherited edtRE: TcxDBSpinEdit - Left = 742 + Left = 699 Top = 104 Properties.AssignedValues.MinValue = True Style.LookAndFeel.SkinName = '' @@ -546,35 +560,37 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 742 + ExplicitLeft = 699 ExplicitTop = 104 end inherited ImporteRE: TcxDBCurrencyEdit - Left = 813 + Left = 770 Top = 104 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 813 + ExplicitLeft = 770 ExplicitTop = 104 ExplicitWidth = 143 Width = 143 end inherited eImporteNeto: TcxDBCurrencyEdit - Top = 57 + Top = 30 + Enabled = True + Properties.ReadOnly = False Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitTop = 57 + ExplicitTop = 30 ExplicitWidth = 278 Width = 278 end inherited ePorte: TcxDBCurrencyEdit - Top = 111 + Top = 84 DataBinding.DataSource = dsDataTable Properties.OnValidate = frViewTotales1ePortePropertiesValidate Style.LookAndFeel.SkinName = '' @@ -583,62 +599,44 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' OnEditing = frViewTotales1ePorteEditing - ExplicitTop = 111 + ExplicitTop = 84 ExplicitWidth = 278 Width = 278 end inherited eIVA: TcxDBLookupComboBox - Top = 138 + Top = 111 Properties.OnValidate = frViewTotales1eIVAPropertiesValidate Style.Color = clInfoBk Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitTop = 138 + ExplicitTop = 111 ExplicitWidth = 140 Width = 140 end inherited bTiposIVA: TButton - Left = 482 - Top = 138 + Left = 439 + Top = 111 OnClick = frViewTotales1bTiposIVAClick - ExplicitLeft = 482 - ExplicitTop = 138 + ExplicitLeft = 439 + ExplicitTop = 111 end inherited cbRecargoEquivalencia: TcxDBCheckBox - Top = 165 + Top = 138 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitTop = 165 + ExplicitTop = 138 ExplicitWidth = 278 Width = 278 end - inherited eImporteDetalleResumen: TcxDBCurrencyEdit - Top = 30 - DataBinding.DataField = 'IMPORTE_UNIDAD' - DataBinding.DataSource = frViewDetallesFacturaProveedor1.DADataSource - Properties.ReadOnly = False - Properties.OnEditValueChanged = frViewTotales1eImporteDetalleResumenPropertiesEditValueChanged - Style.IsFontAssigned = True - ExplicitTop = 30 - ExplicitWidth = 342 - Width = 342 - end inherited dxLayoutControl1Group_Root: TdxLayoutGroup LookAndFeel = frViewFacturaProveedor1.dxLayoutOfficeLookAndFeel1 inherited dxLayoutControl1Group1: TdxLayoutGroup inherited dxLayoutControl1Group2: TdxLayoutGroup - inherited dxLayoutControl1Item10: TdxLayoutItem - Visible = True - end - inherited dxLayoutControl1Item8: TdxLayoutItem - Visible = False - end inherited dxLayoutControl1Group7: TdxLayoutGroup - Visible = False inherited dxLayoutControl1Group10: TdxLayoutGroup inherited dxLayoutControl1Item4: TdxLayoutItem Visible = False @@ -647,6 +645,9 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor Visible = False end end + inherited dxLayoutControl1Item9: TdxLayoutItem + Visible = False + end end end inherited dxLayoutControl1Group5: TdxLayoutGroup diff --git a/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.pas b/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.pas index 42e25dd..5f96de0 100644 --- a/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.pas +++ b/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.pas @@ -44,8 +44,8 @@ type procedure frViewTotales1ePorteEditing(Sender: TObject; var CanEdit: Boolean); procedure OnRecargoEquivalenciaPropertiesValidate(Sender: TObject; var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean); - procedure frViewTotales1eImporteDetalleResumenPropertiesEditValueChanged( - Sender: TObject); //Importante en este punto se deben de quitar los eventos que puedan afectar a la tabla una vez se cierre el editor. + + private procedure RecalcularPortePorUnidad; @@ -198,13 +198,6 @@ begin Factura.DESCUENTO := DisplayValue; end; -procedure TfEditorFacturaProveedor.frViewTotales1eImporteDetalleResumenPropertiesEditValueChanged( - Sender: TObject); -begin - inherited; - showmessage('recalcular importes detalle'); -end; - procedure TfEditorFacturaProveedor.frViewTotales1eIVAPropertiesValidate( Sender: TObject; var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean); diff --git a/Source/Modulos/Facturas de proveedor/Views/uViewDetallesFacturaProveedor.dfm b/Source/Modulos/Facturas de proveedor/Views/uViewDetallesFacturaProveedor.dfm index ad37ff3..0f98178 100644 --- a/Source/Modulos/Facturas de proveedor/Views/uViewDetallesFacturaProveedor.dfm +++ b/Source/Modulos/Facturas de proveedor/Views/uViewDetallesFacturaProveedor.dfm @@ -5,7 +5,11 @@ inherited frViewDetallesFacturaProveedor: TfrViewDetallesFacturaProveedor Properties.Alignment.Horz = taRightJustify end inherited cxGridViewDESCUENTO: TcxGridDBColumn + Properties.Alignment.Horz = taCenter Visible = False + FooterAlignmentHorz = taCenter + GroupSummaryAlignment = taCenter + HeaderAlignmentHorz = taCenter VisibleForCustomization = False end inherited cxGridViewIMPORTENETO: TcxGridDBColumn diff --git a/Source/Modulos/Formas de pago/Plugin/uPluginFormasPago.dfm b/Source/Modulos/Formas de pago/Plugin/uPluginFormasPago.dfm index 21628f0..d6bc045 100644 --- a/Source/Modulos/Formas de pago/Plugin/uPluginFormasPago.dfm +++ b/Source/Modulos/Formas de pago/Plugin/uPluginFormasPago.dfm @@ -53,7 +53,9 @@ object PluginFormasPago: TPluginFormasPago object actFormasPago: TAction Category = 'FormasPago' Caption = 'Formas de pago' + Enabled = False ImageIndex = 0 + Visible = False OnExecute = actFormasPagoExecute end end diff --git a/Source/Modulos/Formas de pago/Plugin/uPluginFormasPago.pas b/Source/Modulos/Formas de pago/Plugin/uPluginFormasPago.pas index ba2a2c5..f872193 100644 --- a/Source/Modulos/Formas de pago/Plugin/uPluginFormasPago.pas +++ b/Source/Modulos/Formas de pago/Plugin/uPluginFormasPago.pas @@ -31,7 +31,7 @@ implementation {$R *.dfm} uses - Forms, Dialogs, SysUtils, + Forms, Dialogs, SysUtils, uFactuGES_App, uFormasPagoController, uBizFormasPago, uFormasPagoViewRegister; function GetModule : TModuleController; @@ -56,6 +56,14 @@ constructor TPluginFormasPago.Create(AOwner: TComponent); begin inherited; uFormasPagoViewRegister.RegisterViews; + + //Solo lo verá el perfil Administrador + if ((AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PERFIL_ADMINISTRADOR) OR (AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PREFIL_GERENCIA)) then + begin + actFormasPago.Visible := True; + actFormasPago.Enabled := True; + end; + end; destructor TPluginFormasPago.Destroy; diff --git a/Source/Modulos/Formas de pago/Views/uEditorFormaPago.dfm b/Source/Modulos/Formas de pago/Views/uEditorFormaPago.dfm index 2aded0b..749261d 100644 --- a/Source/Modulos/Formas de pago/Views/uEditorFormaPago.dfm +++ b/Source/Modulos/Formas de pago/Views/uEditorFormaPago.dfm @@ -4,8 +4,8 @@ object fEditorFormaPago: TfEditorFormaPago BorderIcons = [biSystemMenu] BorderStyle = bsSingle Caption = 'Forma de pago' - ClientHeight = 390 - ClientWidth = 484 + ClientHeight = 435 + ClientWidth = 493 Color = clBtnFace Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -26,21 +26,21 @@ object fEditorFormaPago: TfEditorFormaPago object dxLayoutControl1: TdxLayoutControl Left = 0 Top = 0 - Width = 484 - Height = 390 + Width = 493 + Height = 435 Align = alClient TabOrder = 0 TabStop = False object Bevel4: TBevel Left = 10 - Top = 329 + Top = 380 Width = 388 Height = 10 Shape = bsBottomLine end object Bevel2: TBevel Left = 10 - Top = 151 + Top = 202 Width = 388 Height = 10 Shape = bsBottomLine @@ -56,20 +56,9 @@ object fEditorFormaPago: TfEditorFormaPago DataSource = dsFormaPago TabOrder = 0 end - object eDescripcion: TDBEdit - Left = 76 - Top = 43 - Width = 262 - Height = 21 - BorderStyle = bsNone - Color = clInfoBk - DataField = 'DESCRIPCION' - DataSource = dsFormaPago - TabOrder = 1 - end object ListaFormasPago: TcxGrid Left = 10 - Top = 167 + Top = 218 Width = 246 Height = 156 TabOrder = 6 @@ -112,7 +101,7 @@ object fEditorFormaPago: TfEditorFormaPago end object bAnadir: TButton Left = 262 - Top = 167 + Top = 218 Width = 95 Height = 23 Action = actAnadir @@ -120,7 +109,7 @@ object fEditorFormaPago: TfEditorFormaPago end object bEliminar: TButton Left = 262 - Top = 196 + Top = 247 Width = 95 Height = 23 Action = actEliminar @@ -128,7 +117,7 @@ object fEditorFormaPago: TfEditorFormaPago end object bAceptar: TButton Left = 314 - Top = 345 + Top = 396 Width = 75 Height = 23 Action = actAceptar @@ -136,7 +125,7 @@ object fEditorFormaPago: TfEditorFormaPago end object bCancelar: TButton Left = 395 - Top = 345 + Top = 396 Width = 75 Height = 23 Action = actCancelar @@ -145,7 +134,7 @@ object fEditorFormaPago: TfEditorFormaPago end object rdPagoPlazos: TcxRadioButton Left = 10 - Top = 125 + Top = 176 Width = 388 Height = 20 Caption = 'Plazos del pago' @@ -154,7 +143,7 @@ object fEditorFormaPago: TfEditorFormaPago end object rdPagoVencimiento: TcxRadioButton Left = 10 - Top = 72 + Top = 123 Width = 388 Height = 20 Caption = 'Pago por vencimiento' @@ -163,7 +152,7 @@ object fEditorFormaPago: TfEditorFormaPago end object cbSubcuenta: TcxDBLookupComboBox Left = 74 - Top = 98 + Top = 149 DataBinding.DataField = 'ID_SUBCUENTA' DataBinding.DataSource = dsFormaPago Enabled = False @@ -194,7 +183,7 @@ object fEditorFormaPago: TfEditorFormaPago end object cxDBCheckBox1: TcxDBCheckBox Left = 330 - Top = 98 + Top = 149 Caption = 'Ignorar en contabilidad' DataBinding.DataField = 'IGNORAR_CONTABILIDAD' DataBinding.DataSource = dsFormaPago @@ -204,6 +193,18 @@ object fEditorFormaPago: TfEditorFormaPago TabOrder = 4 Width = 140 end + object eDescripcion: TDBMemo + Left = 76 + Top = 43 + Width = 392 + Height = 72 + BorderStyle = bsNone + Color = clInfoBk + DataField = 'DESCRIPCION' + DataSource = dsFormaPago + ScrollBars = ssVertical + TabOrder = 1 + end object dxLayoutControl1Group_Root: TdxLayoutGroup AutoAligns = [aaVertical] AlignHorz = ahClient diff --git a/Source/Modulos/Formas de pago/Views/uEditorFormaPago.pas b/Source/Modulos/Formas de pago/Views/uEditorFormaPago.pas index 7812e02..920debf 100644 --- a/Source/Modulos/Formas de pago/Views/uEditorFormaPago.pas +++ b/Source/Modulos/Formas de pago/Views/uEditorFormaPago.pas @@ -55,8 +55,6 @@ type dxLayoutControl1: TdxLayoutControl; dxLayoutControl1Item1: TdxLayoutItem; eReferencia: TDBEdit; - dxLayoutControl1Item2: TdxLayoutItem; - eDescripcion: TDBEdit; dxLayoutControl1Item3: TdxLayoutItem; ListaFormasPago: TcxGrid; ListaFormasPagoDBTableView1: TcxGridDBTableView; @@ -90,6 +88,8 @@ type cxDBCheckBox1: TcxDBCheckBox; checkIgnorarContabilidad: TdxLayoutItem; panelVencimiento: TdxLayoutGroup; + dxLayoutControl1Item2: TdxLayoutItem; + eDescripcion: TDBMemo; procedure FormShow(Sender: TObject); procedure actAnadirExecute(Sender: TObject); diff --git a/Source/Modulos/Formas de pago/Views/uEditorFormasPago.pas b/Source/Modulos/Formas de pago/Views/uEditorFormasPago.pas index 0b09bc7..6da0862 100644 --- a/Source/Modulos/Formas de pago/Views/uEditorFormasPago.pas +++ b/Source/Modulos/Formas de pago/Views/uEditorFormasPago.pas @@ -115,7 +115,7 @@ begin (Sender as TAction).Enabled := Assigned(FFormasPago) and FFormasPago.DataTable.Active and (FFormasPago.DataTable.RecordCount > 0) and - (AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PERFIL_ADMINISTRADOR); + ((AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PERFIL_ADMINISTRADOR) OR (AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PREFIL_GERENCIA)) end; procedure TfEditorFormasPago.actModificarExecute(Sender: TObject); @@ -128,7 +128,7 @@ begin (Sender as TAction).Enabled := Assigned(FFormasPago) and FFormasPago.DataTable.Active and (FFormasPago.DataTable.RecordCount > 0) and - (AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PERFIL_ADMINISTRADOR); + ((AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PERFIL_ADMINISTRADOR) OR (AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PREFIL_GERENCIA)) end; constructor TfEditorFormasPago.Create(AOwner: TComponent); diff --git a/Source/Modulos/Lib/AlbCli_FacCli_relation.dcp b/Source/Modulos/Lib/AlbCli_FacCli_relation.dcp index 23546d0..b329aaf 100644 Binary files a/Source/Modulos/Lib/AlbCli_FacCli_relation.dcp and b/Source/Modulos/Lib/AlbCli_FacCli_relation.dcp differ diff --git a/Source/Modulos/Lib/AlbaranesCliente_controller.dcp b/Source/Modulos/Lib/AlbaranesCliente_controller.dcp index 3cd6268..4bd644b 100644 Binary files a/Source/Modulos/Lib/AlbaranesCliente_controller.dcp and b/Source/Modulos/Lib/AlbaranesCliente_controller.dcp differ diff --git a/Source/Modulos/Lib/AlbaranesCliente_data.dcp b/Source/Modulos/Lib/AlbaranesCliente_data.dcp index 8757085..5f40b12 100644 Binary files a/Source/Modulos/Lib/AlbaranesCliente_data.dcp and b/Source/Modulos/Lib/AlbaranesCliente_data.dcp differ diff --git a/Source/Modulos/Lib/AlbaranesCliente_model.dcp b/Source/Modulos/Lib/AlbaranesCliente_model.dcp index 752b9f7..071d86c 100644 Binary files a/Source/Modulos/Lib/AlbaranesCliente_model.dcp and b/Source/Modulos/Lib/AlbaranesCliente_model.dcp differ diff --git a/Source/Modulos/Lib/AlbaranesCliente_plugin.dcp b/Source/Modulos/Lib/AlbaranesCliente_plugin.dcp index f3bd2c8..59d5d0a 100644 Binary files a/Source/Modulos/Lib/AlbaranesCliente_plugin.dcp and b/Source/Modulos/Lib/AlbaranesCliente_plugin.dcp differ diff --git a/Source/Modulos/Lib/AlbaranesCliente_view.dcp b/Source/Modulos/Lib/AlbaranesCliente_view.dcp index ae004b0..6003a08 100644 Binary files a/Source/Modulos/Lib/AlbaranesCliente_view.dcp and b/Source/Modulos/Lib/AlbaranesCliente_view.dcp differ diff --git a/Source/Modulos/Lib/AlbaranesProveedor_controller.dcp b/Source/Modulos/Lib/AlbaranesProveedor_controller.dcp index 1af7549..ec9e5dc 100644 Binary files a/Source/Modulos/Lib/AlbaranesProveedor_controller.dcp and b/Source/Modulos/Lib/AlbaranesProveedor_controller.dcp differ diff --git a/Source/Modulos/Lib/AlbaranesProveedor_data.dcp b/Source/Modulos/Lib/AlbaranesProveedor_data.dcp index cc6aa1c..fed3721 100644 Binary files a/Source/Modulos/Lib/AlbaranesProveedor_data.dcp and b/Source/Modulos/Lib/AlbaranesProveedor_data.dcp differ diff --git a/Source/Modulos/Lib/AlbaranesProveedor_model.dcp b/Source/Modulos/Lib/AlbaranesProveedor_model.dcp index 0ab6d93..58cd719 100644 Binary files a/Source/Modulos/Lib/AlbaranesProveedor_model.dcp and b/Source/Modulos/Lib/AlbaranesProveedor_model.dcp differ diff --git a/Source/Modulos/Lib/AlbaranesProveedor_plugin.dcp b/Source/Modulos/Lib/AlbaranesProveedor_plugin.dcp index 03f44cf..55291d1 100644 Binary files a/Source/Modulos/Lib/AlbaranesProveedor_plugin.dcp and b/Source/Modulos/Lib/AlbaranesProveedor_plugin.dcp differ diff --git a/Source/Modulos/Lib/AlbaranesProveedor_view.dcp b/Source/Modulos/Lib/AlbaranesProveedor_view.dcp index 6c102aa..8c85c53 100644 Binary files a/Source/Modulos/Lib/AlbaranesProveedor_view.dcp and b/Source/Modulos/Lib/AlbaranesProveedor_view.dcp differ diff --git a/Source/Modulos/Lib/Almacenes_controller.dcp b/Source/Modulos/Lib/Almacenes_controller.dcp index 5d685c5..fa37356 100644 Binary files a/Source/Modulos/Lib/Almacenes_controller.dcp and b/Source/Modulos/Lib/Almacenes_controller.dcp differ diff --git a/Source/Modulos/Lib/Almacenes_data.dcp b/Source/Modulos/Lib/Almacenes_data.dcp index 874de7e..9af7deb 100644 Binary files a/Source/Modulos/Lib/Almacenes_data.dcp and b/Source/Modulos/Lib/Almacenes_data.dcp differ diff --git a/Source/Modulos/Lib/Almacenes_model.dcp b/Source/Modulos/Lib/Almacenes_model.dcp index 5ee8154..c91542f 100644 Binary files a/Source/Modulos/Lib/Almacenes_model.dcp and b/Source/Modulos/Lib/Almacenes_model.dcp differ diff --git a/Source/Modulos/Lib/Almacenes_plugin.dcp b/Source/Modulos/Lib/Almacenes_plugin.dcp index d4346e8..3ef7a9a 100644 Binary files a/Source/Modulos/Lib/Almacenes_plugin.dcp and b/Source/Modulos/Lib/Almacenes_plugin.dcp differ diff --git a/Source/Modulos/Lib/Almacenes_view.dcp b/Source/Modulos/Lib/Almacenes_view.dcp index e2d5e95..0c18222 100644 Binary files a/Source/Modulos/Lib/Almacenes_view.dcp and b/Source/Modulos/Lib/Almacenes_view.dcp differ diff --git a/Source/Modulos/Lib/Articulos_controller.dcp b/Source/Modulos/Lib/Articulos_controller.dcp index 883cde2..c322a07 100644 Binary files a/Source/Modulos/Lib/Articulos_controller.dcp and b/Source/Modulos/Lib/Articulos_controller.dcp differ diff --git a/Source/Modulos/Lib/Articulos_data.dcp b/Source/Modulos/Lib/Articulos_data.dcp index 3e4d02f..0688371 100644 Binary files a/Source/Modulos/Lib/Articulos_data.dcp and b/Source/Modulos/Lib/Articulos_data.dcp differ diff --git a/Source/Modulos/Lib/Articulos_model.dcp b/Source/Modulos/Lib/Articulos_model.dcp index 81eed40..fc64ac4 100644 Binary files a/Source/Modulos/Lib/Articulos_model.dcp and b/Source/Modulos/Lib/Articulos_model.dcp differ diff --git a/Source/Modulos/Lib/Articulos_plugin.dcp b/Source/Modulos/Lib/Articulos_plugin.dcp index d826f66..b9d0994 100644 Binary files a/Source/Modulos/Lib/Articulos_plugin.dcp and b/Source/Modulos/Lib/Articulos_plugin.dcp differ diff --git a/Source/Modulos/Lib/Articulos_view.dcp b/Source/Modulos/Lib/Articulos_view.dcp index f40335d..5935a5f 100644 Binary files a/Source/Modulos/Lib/Articulos_view.dcp and b/Source/Modulos/Lib/Articulos_view.dcp differ diff --git a/Source/Modulos/Lib/BancaElectronica_controller.dcp b/Source/Modulos/Lib/BancaElectronica_controller.dcp index 986c3dd..48061c8 100644 Binary files a/Source/Modulos/Lib/BancaElectronica_controller.dcp and b/Source/Modulos/Lib/BancaElectronica_controller.dcp differ diff --git a/Source/Modulos/Lib/BancaElectronica_plugin.dcp b/Source/Modulos/Lib/BancaElectronica_plugin.dcp index 3cf0c87..52c1753 100644 Binary files a/Source/Modulos/Lib/BancaElectronica_plugin.dcp and b/Source/Modulos/Lib/BancaElectronica_plugin.dcp differ diff --git a/Source/Modulos/Lib/BancaElectronica_view.dcp b/Source/Modulos/Lib/BancaElectronica_view.dcp index ae67b1e..9e29d61 100644 Binary files a/Source/Modulos/Lib/BancaElectronica_view.dcp and b/Source/Modulos/Lib/BancaElectronica_view.dcp differ diff --git a/Source/Modulos/Lib/Comisiones_controller.dcp b/Source/Modulos/Lib/Comisiones_controller.dcp index 2978707..f43a03b 100644 Binary files a/Source/Modulos/Lib/Comisiones_controller.dcp and b/Source/Modulos/Lib/Comisiones_controller.dcp differ diff --git a/Source/Modulos/Lib/Comisiones_data.dcp b/Source/Modulos/Lib/Comisiones_data.dcp index c11d053..6be06e6 100644 Binary files a/Source/Modulos/Lib/Comisiones_data.dcp and b/Source/Modulos/Lib/Comisiones_data.dcp differ diff --git a/Source/Modulos/Lib/Comisiones_model.dcp b/Source/Modulos/Lib/Comisiones_model.dcp index fdbbd48..4f0a9d0 100644 Binary files a/Source/Modulos/Lib/Comisiones_model.dcp and b/Source/Modulos/Lib/Comisiones_model.dcp differ diff --git a/Source/Modulos/Lib/Comisiones_plugin.dcp b/Source/Modulos/Lib/Comisiones_plugin.dcp index ac8de6d..12ac517 100644 Binary files a/Source/Modulos/Lib/Comisiones_plugin.dcp and b/Source/Modulos/Lib/Comisiones_plugin.dcp differ diff --git a/Source/Modulos/Lib/Comisiones_view.dcp b/Source/Modulos/Lib/Comisiones_view.dcp index b38fdae..7f2e45c 100644 Binary files a/Source/Modulos/Lib/Comisiones_view.dcp and b/Source/Modulos/Lib/Comisiones_view.dcp differ diff --git a/Source/Modulos/Lib/ConCli_AlbCli_relation.dcp b/Source/Modulos/Lib/ConCli_AlbCli_relation.dcp index e220ddb..049dab4 100644 Binary files a/Source/Modulos/Lib/ConCli_AlbCli_relation.dcp and b/Source/Modulos/Lib/ConCli_AlbCli_relation.dcp differ diff --git a/Source/Modulos/Lib/ConCli_FacCli_relation.dcp b/Source/Modulos/Lib/ConCli_FacCli_relation.dcp index b70b155..1ce71fa 100644 Binary files a/Source/Modulos/Lib/ConCli_FacCli_relation.dcp and b/Source/Modulos/Lib/ConCli_FacCli_relation.dcp differ diff --git a/Source/Modulos/Lib/ConCli_PedProv_relation.dcp b/Source/Modulos/Lib/ConCli_PedProv_relation.dcp index 62acb49..cbadd15 100644 Binary files a/Source/Modulos/Lib/ConCli_PedProv_relation.dcp and b/Source/Modulos/Lib/ConCli_PedProv_relation.dcp differ diff --git a/Source/Modulos/Lib/ConCli_RecCli_relation.dcp b/Source/Modulos/Lib/ConCli_RecCli_relation.dcp new file mode 100644 index 0000000..2c0ddaa Binary files /dev/null and b/Source/Modulos/Lib/ConCli_RecCli_relation.dcp differ diff --git a/Source/Modulos/Lib/Contabilidad_controller.dcp b/Source/Modulos/Lib/Contabilidad_controller.dcp index cb74688..66b6538 100644 Binary files a/Source/Modulos/Lib/Contabilidad_controller.dcp and b/Source/Modulos/Lib/Contabilidad_controller.dcp differ diff --git a/Source/Modulos/Lib/Contabilidad_data.dcp b/Source/Modulos/Lib/Contabilidad_data.dcp index 92d3e51..dbf272e 100644 Binary files a/Source/Modulos/Lib/Contabilidad_data.dcp and b/Source/Modulos/Lib/Contabilidad_data.dcp differ diff --git a/Source/Modulos/Lib/Contabilidad_model.dcp b/Source/Modulos/Lib/Contabilidad_model.dcp index 640275e..c17d165 100644 Binary files a/Source/Modulos/Lib/Contabilidad_model.dcp and b/Source/Modulos/Lib/Contabilidad_model.dcp differ diff --git a/Source/Modulos/Lib/Contabilidad_plugin.dcp b/Source/Modulos/Lib/Contabilidad_plugin.dcp index 36250e4..800e17a 100644 Binary files a/Source/Modulos/Lib/Contabilidad_plugin.dcp and b/Source/Modulos/Lib/Contabilidad_plugin.dcp differ diff --git a/Source/Modulos/Lib/Contabilidad_view.dcp b/Source/Modulos/Lib/Contabilidad_view.dcp index 4cbd87d..214517e 100644 Binary files a/Source/Modulos/Lib/Contabilidad_view.dcp and b/Source/Modulos/Lib/Contabilidad_view.dcp differ diff --git a/Source/Modulos/Lib/Contactos_controller.dcp b/Source/Modulos/Lib/Contactos_controller.dcp index 76587d6..41cb6e5 100644 Binary files a/Source/Modulos/Lib/Contactos_controller.dcp and b/Source/Modulos/Lib/Contactos_controller.dcp differ diff --git a/Source/Modulos/Lib/Contactos_data.dcp b/Source/Modulos/Lib/Contactos_data.dcp index 66a0b5b..b92d423 100644 Binary files a/Source/Modulos/Lib/Contactos_data.dcp and b/Source/Modulos/Lib/Contactos_data.dcp differ diff --git a/Source/Modulos/Lib/Contactos_model.dcp b/Source/Modulos/Lib/Contactos_model.dcp index 28131c6..10ea129 100644 Binary files a/Source/Modulos/Lib/Contactos_model.dcp and b/Source/Modulos/Lib/Contactos_model.dcp differ diff --git a/Source/Modulos/Lib/Contactos_plugin.dcp b/Source/Modulos/Lib/Contactos_plugin.dcp index fc0dcd4..0d56176 100644 Binary files a/Source/Modulos/Lib/Contactos_plugin.dcp and b/Source/Modulos/Lib/Contactos_plugin.dcp differ diff --git a/Source/Modulos/Lib/Contactos_view.dcp b/Source/Modulos/Lib/Contactos_view.dcp index 4deb51d..a93fd6f 100644 Binary files a/Source/Modulos/Lib/Contactos_view.dcp and b/Source/Modulos/Lib/Contactos_view.dcp differ diff --git a/Source/Modulos/Lib/ContratosCliente_controller.dcp b/Source/Modulos/Lib/ContratosCliente_controller.dcp index 25598b5..24ce16f 100644 Binary files a/Source/Modulos/Lib/ContratosCliente_controller.dcp and b/Source/Modulos/Lib/ContratosCliente_controller.dcp differ diff --git a/Source/Modulos/Lib/ContratosCliente_data.dcp b/Source/Modulos/Lib/ContratosCliente_data.dcp index 519936b..4a99346 100644 Binary files a/Source/Modulos/Lib/ContratosCliente_data.dcp and b/Source/Modulos/Lib/ContratosCliente_data.dcp differ diff --git a/Source/Modulos/Lib/ContratosCliente_model.dcp b/Source/Modulos/Lib/ContratosCliente_model.dcp index 652a951..eeb914a 100644 Binary files a/Source/Modulos/Lib/ContratosCliente_model.dcp and b/Source/Modulos/Lib/ContratosCliente_model.dcp differ diff --git a/Source/Modulos/Lib/ContratosCliente_plugin.dcp b/Source/Modulos/Lib/ContratosCliente_plugin.dcp index 8aa8405..c98a40e 100644 Binary files a/Source/Modulos/Lib/ContratosCliente_plugin.dcp and b/Source/Modulos/Lib/ContratosCliente_plugin.dcp differ diff --git a/Source/Modulos/Lib/ContratosCliente_view.dcp b/Source/Modulos/Lib/ContratosCliente_view.dcp index 2ea4c15..4d2f820 100644 Binary files a/Source/Modulos/Lib/ContratosCliente_view.dcp and b/Source/Modulos/Lib/ContratosCliente_view.dcp differ diff --git a/Source/Modulos/Lib/Ejercicios_plugin.dcp b/Source/Modulos/Lib/Ejercicios_plugin.dcp index a2cd455..9f2f510 100644 Binary files a/Source/Modulos/Lib/Ejercicios_plugin.dcp and b/Source/Modulos/Lib/Ejercicios_plugin.dcp differ diff --git a/Source/Modulos/Lib/FacturasCliente_controller.dcp b/Source/Modulos/Lib/FacturasCliente_controller.dcp index bf99d7b..e5da9ba 100644 Binary files a/Source/Modulos/Lib/FacturasCliente_controller.dcp and b/Source/Modulos/Lib/FacturasCliente_controller.dcp differ diff --git a/Source/Modulos/Lib/FacturasCliente_data.dcp b/Source/Modulos/Lib/FacturasCliente_data.dcp index b444adf..7304bb3 100644 Binary files a/Source/Modulos/Lib/FacturasCliente_data.dcp and b/Source/Modulos/Lib/FacturasCliente_data.dcp differ diff --git a/Source/Modulos/Lib/FacturasCliente_model.dcp b/Source/Modulos/Lib/FacturasCliente_model.dcp index e262742..75b1f2e 100644 Binary files a/Source/Modulos/Lib/FacturasCliente_model.dcp and b/Source/Modulos/Lib/FacturasCliente_model.dcp differ diff --git a/Source/Modulos/Lib/FacturasCliente_plugin.dcp b/Source/Modulos/Lib/FacturasCliente_plugin.dcp index a58f64d..998d0c4 100644 Binary files a/Source/Modulos/Lib/FacturasCliente_plugin.dcp and b/Source/Modulos/Lib/FacturasCliente_plugin.dcp differ diff --git a/Source/Modulos/Lib/FacturasCliente_view.dcp b/Source/Modulos/Lib/FacturasCliente_view.dcp index 8974320..8f0238c 100644 Binary files a/Source/Modulos/Lib/FacturasCliente_view.dcp and b/Source/Modulos/Lib/FacturasCliente_view.dcp differ diff --git a/Source/Modulos/Lib/FacturasProveedor_controller.dcp b/Source/Modulos/Lib/FacturasProveedor_controller.dcp index 959733f..3ba7969 100644 Binary files a/Source/Modulos/Lib/FacturasProveedor_controller.dcp and b/Source/Modulos/Lib/FacturasProveedor_controller.dcp differ diff --git a/Source/Modulos/Lib/FacturasProveedor_data.dcp b/Source/Modulos/Lib/FacturasProveedor_data.dcp index 605bc23..bbc7d9b 100644 Binary files a/Source/Modulos/Lib/FacturasProveedor_data.dcp and b/Source/Modulos/Lib/FacturasProveedor_data.dcp differ diff --git a/Source/Modulos/Lib/FacturasProveedor_model.dcp b/Source/Modulos/Lib/FacturasProveedor_model.dcp index 72e57d0..ce72fbe 100644 Binary files a/Source/Modulos/Lib/FacturasProveedor_model.dcp and b/Source/Modulos/Lib/FacturasProveedor_model.dcp differ diff --git a/Source/Modulos/Lib/FacturasProveedor_plugin.dcp b/Source/Modulos/Lib/FacturasProveedor_plugin.dcp index 8d005ba..3c63484 100644 Binary files a/Source/Modulos/Lib/FacturasProveedor_plugin.dcp and b/Source/Modulos/Lib/FacturasProveedor_plugin.dcp differ diff --git a/Source/Modulos/Lib/FacturasProveedor_view.dcp b/Source/Modulos/Lib/FacturasProveedor_view.dcp index d37e004..8ab2588 100644 Binary files a/Source/Modulos/Lib/FacturasProveedor_view.dcp and b/Source/Modulos/Lib/FacturasProveedor_view.dcp differ diff --git a/Source/Modulos/Lib/Familias_controller.dcp b/Source/Modulos/Lib/Familias_controller.dcp index eeabe74..a22ebd0 100644 Binary files a/Source/Modulos/Lib/Familias_controller.dcp and b/Source/Modulos/Lib/Familias_controller.dcp differ diff --git a/Source/Modulos/Lib/Familias_data.dcp b/Source/Modulos/Lib/Familias_data.dcp index 7e23b7f..6db4090 100644 Binary files a/Source/Modulos/Lib/Familias_data.dcp and b/Source/Modulos/Lib/Familias_data.dcp differ diff --git a/Source/Modulos/Lib/Familias_model.dcp b/Source/Modulos/Lib/Familias_model.dcp index fb97d37..d756d0f 100644 Binary files a/Source/Modulos/Lib/Familias_model.dcp and b/Source/Modulos/Lib/Familias_model.dcp differ diff --git a/Source/Modulos/Lib/Familias_plugin.dcp b/Source/Modulos/Lib/Familias_plugin.dcp index 1d33e6e..bebf5aa 100644 Binary files a/Source/Modulos/Lib/Familias_plugin.dcp and b/Source/Modulos/Lib/Familias_plugin.dcp differ diff --git a/Source/Modulos/Lib/Familias_view.dcp b/Source/Modulos/Lib/Familias_view.dcp index 8116294..ec21906 100644 Binary files a/Source/Modulos/Lib/Familias_view.dcp and b/Source/Modulos/Lib/Familias_view.dcp differ diff --git a/Source/Modulos/Lib/FormasPago_controller.dcp b/Source/Modulos/Lib/FormasPago_controller.dcp index 00419da..748d839 100644 Binary files a/Source/Modulos/Lib/FormasPago_controller.dcp and b/Source/Modulos/Lib/FormasPago_controller.dcp differ diff --git a/Source/Modulos/Lib/FormasPago_data.dcp b/Source/Modulos/Lib/FormasPago_data.dcp index 98f2ab5..8a686a1 100644 Binary files a/Source/Modulos/Lib/FormasPago_data.dcp and b/Source/Modulos/Lib/FormasPago_data.dcp differ diff --git a/Source/Modulos/Lib/FormasPago_model.dcp b/Source/Modulos/Lib/FormasPago_model.dcp index 7901165..592121d 100644 Binary files a/Source/Modulos/Lib/FormasPago_model.dcp and b/Source/Modulos/Lib/FormasPago_model.dcp differ diff --git a/Source/Modulos/Lib/FormasPago_plugin.dcp b/Source/Modulos/Lib/FormasPago_plugin.dcp index 7bc2c12..3d3185b 100644 Binary files a/Source/Modulos/Lib/FormasPago_plugin.dcp and b/Source/Modulos/Lib/FormasPago_plugin.dcp differ diff --git a/Source/Modulos/Lib/FormasPago_view.dcp b/Source/Modulos/Lib/FormasPago_view.dcp index f3eca05..bdfe699 100644 Binary files a/Source/Modulos/Lib/FormasPago_view.dcp and b/Source/Modulos/Lib/FormasPago_view.dcp differ diff --git a/Source/Modulos/Lib/GestorDocumentos_controller.dcp b/Source/Modulos/Lib/GestorDocumentos_controller.dcp index ac05793..6e42256 100644 Binary files a/Source/Modulos/Lib/GestorDocumentos_controller.dcp and b/Source/Modulos/Lib/GestorDocumentos_controller.dcp differ diff --git a/Source/Modulos/Lib/GestorDocumentos_data.dcp b/Source/Modulos/Lib/GestorDocumentos_data.dcp index 1f89b63..85a69ab 100644 Binary files a/Source/Modulos/Lib/GestorDocumentos_data.dcp and b/Source/Modulos/Lib/GestorDocumentos_data.dcp differ diff --git a/Source/Modulos/Lib/GestorInformes_controller.dcp b/Source/Modulos/Lib/GestorInformes_controller.dcp index 56972e0..47a9ff4 100644 Binary files a/Source/Modulos/Lib/GestorInformes_controller.dcp and b/Source/Modulos/Lib/GestorInformes_controller.dcp differ diff --git a/Source/Modulos/Lib/GestorInformes_data.dcp b/Source/Modulos/Lib/GestorInformes_data.dcp index ddbca1c..df4b2bd 100644 Binary files a/Source/Modulos/Lib/GestorInformes_data.dcp and b/Source/Modulos/Lib/GestorInformes_data.dcp differ diff --git a/Source/Modulos/Lib/GestorInformes_model.dcp b/Source/Modulos/Lib/GestorInformes_model.dcp index 7ba0117..0e16ce8 100644 Binary files a/Source/Modulos/Lib/GestorInformes_model.dcp and b/Source/Modulos/Lib/GestorInformes_model.dcp differ diff --git a/Source/Modulos/Lib/GestorInformes_plugin.dcp b/Source/Modulos/Lib/GestorInformes_plugin.dcp index 74e2c2d..19acacb 100644 Binary files a/Source/Modulos/Lib/GestorInformes_plugin.dcp and b/Source/Modulos/Lib/GestorInformes_plugin.dcp differ diff --git a/Source/Modulos/Lib/GestorInformes_view.dcp b/Source/Modulos/Lib/GestorInformes_view.dcp index de1d300..bcedd89 100644 Binary files a/Source/Modulos/Lib/GestorInformes_view.dcp and b/Source/Modulos/Lib/GestorInformes_view.dcp differ diff --git a/Source/Modulos/Lib/HistoricoMovimientos_controller.dcp b/Source/Modulos/Lib/HistoricoMovimientos_controller.dcp index 6349115..70a1295 100644 Binary files a/Source/Modulos/Lib/HistoricoMovimientos_controller.dcp and b/Source/Modulos/Lib/HistoricoMovimientos_controller.dcp differ diff --git a/Source/Modulos/Lib/HistoricoMovimientos_data.dcp b/Source/Modulos/Lib/HistoricoMovimientos_data.dcp index da00830..14ed1ca 100644 Binary files a/Source/Modulos/Lib/HistoricoMovimientos_data.dcp and b/Source/Modulos/Lib/HistoricoMovimientos_data.dcp differ diff --git a/Source/Modulos/Lib/HistoricoMovimientos_model.dcp b/Source/Modulos/Lib/HistoricoMovimientos_model.dcp index b1a5f40..c32e71e 100644 Binary files a/Source/Modulos/Lib/HistoricoMovimientos_model.dcp and b/Source/Modulos/Lib/HistoricoMovimientos_model.dcp differ diff --git a/Source/Modulos/Lib/HistoricoMovimientos_plugin.dcp b/Source/Modulos/Lib/HistoricoMovimientos_plugin.dcp index 0dca099..7ad114a 100644 Binary files a/Source/Modulos/Lib/HistoricoMovimientos_plugin.dcp and b/Source/Modulos/Lib/HistoricoMovimientos_plugin.dcp differ diff --git a/Source/Modulos/Lib/HistoricoMovimientos_view.dcp b/Source/Modulos/Lib/HistoricoMovimientos_view.dcp index 7713295..fceb0d7 100644 Binary files a/Source/Modulos/Lib/HistoricoMovimientos_view.dcp and b/Source/Modulos/Lib/HistoricoMovimientos_view.dcp differ diff --git a/Source/Modulos/Lib/Inventario_controller.dcp b/Source/Modulos/Lib/Inventario_controller.dcp index 45e93f4..c1df32d 100644 Binary files a/Source/Modulos/Lib/Inventario_controller.dcp and b/Source/Modulos/Lib/Inventario_controller.dcp differ diff --git a/Source/Modulos/Lib/Inventario_data.dcp b/Source/Modulos/Lib/Inventario_data.dcp index f3c1fbb..31003f8 100644 Binary files a/Source/Modulos/Lib/Inventario_data.dcp and b/Source/Modulos/Lib/Inventario_data.dcp differ diff --git a/Source/Modulos/Lib/Inventario_model.dcp b/Source/Modulos/Lib/Inventario_model.dcp index a9cb641..d9569c8 100644 Binary files a/Source/Modulos/Lib/Inventario_model.dcp and b/Source/Modulos/Lib/Inventario_model.dcp differ diff --git a/Source/Modulos/Lib/Inventario_plugin.dcp b/Source/Modulos/Lib/Inventario_plugin.dcp index 91a232d..8b7b9ab 100644 Binary files a/Source/Modulos/Lib/Inventario_plugin.dcp and b/Source/Modulos/Lib/Inventario_plugin.dcp differ diff --git a/Source/Modulos/Lib/Inventario_view.dcp b/Source/Modulos/Lib/Inventario_view.dcp index 3832157..71dce90 100644 Binary files a/Source/Modulos/Lib/Inventario_view.dcp and b/Source/Modulos/Lib/Inventario_view.dcp differ diff --git a/Source/Modulos/Lib/PedidosProveedor_controller.dcp b/Source/Modulos/Lib/PedidosProveedor_controller.dcp index 0228253..a9925bf 100644 Binary files a/Source/Modulos/Lib/PedidosProveedor_controller.dcp and b/Source/Modulos/Lib/PedidosProveedor_controller.dcp differ diff --git a/Source/Modulos/Lib/PedidosProveedor_data.dcp b/Source/Modulos/Lib/PedidosProveedor_data.dcp index f81d24b..d1cac76 100644 Binary files a/Source/Modulos/Lib/PedidosProveedor_data.dcp and b/Source/Modulos/Lib/PedidosProveedor_data.dcp differ diff --git a/Source/Modulos/Lib/PedidosProveedor_model.dcp b/Source/Modulos/Lib/PedidosProveedor_model.dcp index 75d3857..6a52674 100644 Binary files a/Source/Modulos/Lib/PedidosProveedor_model.dcp and b/Source/Modulos/Lib/PedidosProveedor_model.dcp differ diff --git a/Source/Modulos/Lib/PedidosProveedor_plugin.dcp b/Source/Modulos/Lib/PedidosProveedor_plugin.dcp index 53845d5..7d90243 100644 Binary files a/Source/Modulos/Lib/PedidosProveedor_plugin.dcp and b/Source/Modulos/Lib/PedidosProveedor_plugin.dcp differ diff --git a/Source/Modulos/Lib/PedidosProveedor_view.dcp b/Source/Modulos/Lib/PedidosProveedor_view.dcp index 1574e13..22363a6 100644 Binary files a/Source/Modulos/Lib/PedidosProveedor_view.dcp and b/Source/Modulos/Lib/PedidosProveedor_view.dcp differ diff --git a/Source/Modulos/Lib/PreCli_ConCli_relation.dcp b/Source/Modulos/Lib/PreCli_ConCli_relation.dcp index 4703115..8f79f9a 100644 Binary files a/Source/Modulos/Lib/PreCli_ConCli_relation.dcp and b/Source/Modulos/Lib/PreCli_ConCli_relation.dcp differ diff --git a/Source/Modulos/Lib/PresupuestosCliente_controller.dcp b/Source/Modulos/Lib/PresupuestosCliente_controller.dcp index d506b58..ac2fb30 100644 Binary files a/Source/Modulos/Lib/PresupuestosCliente_controller.dcp and b/Source/Modulos/Lib/PresupuestosCliente_controller.dcp differ diff --git a/Source/Modulos/Lib/PresupuestosCliente_data.dcp b/Source/Modulos/Lib/PresupuestosCliente_data.dcp index 6926f5f..40a1f3e 100644 Binary files a/Source/Modulos/Lib/PresupuestosCliente_data.dcp and b/Source/Modulos/Lib/PresupuestosCliente_data.dcp differ diff --git a/Source/Modulos/Lib/PresupuestosCliente_model.dcp b/Source/Modulos/Lib/PresupuestosCliente_model.dcp index 55ae93c..1337a73 100644 Binary files a/Source/Modulos/Lib/PresupuestosCliente_model.dcp and b/Source/Modulos/Lib/PresupuestosCliente_model.dcp differ diff --git a/Source/Modulos/Lib/PresupuestosCliente_plugin.dcp b/Source/Modulos/Lib/PresupuestosCliente_plugin.dcp index 036b47e..3bd38cc 100644 Binary files a/Source/Modulos/Lib/PresupuestosCliente_plugin.dcp and b/Source/Modulos/Lib/PresupuestosCliente_plugin.dcp differ diff --git a/Source/Modulos/Lib/PresupuestosCliente_view.dcp b/Source/Modulos/Lib/PresupuestosCliente_view.dcp index 4d01d1f..7f1e904 100644 Binary files a/Source/Modulos/Lib/PresupuestosCliente_view.dcp and b/Source/Modulos/Lib/PresupuestosCliente_view.dcp differ diff --git a/Source/Modulos/Lib/RecibosCliente_controller.dcp b/Source/Modulos/Lib/RecibosCliente_controller.dcp index e12d4ee..2b769bf 100644 Binary files a/Source/Modulos/Lib/RecibosCliente_controller.dcp and b/Source/Modulos/Lib/RecibosCliente_controller.dcp differ diff --git a/Source/Modulos/Lib/RecibosCliente_data.dcp b/Source/Modulos/Lib/RecibosCliente_data.dcp index fb9182a..a33623c 100644 Binary files a/Source/Modulos/Lib/RecibosCliente_data.dcp and b/Source/Modulos/Lib/RecibosCliente_data.dcp differ diff --git a/Source/Modulos/Lib/RecibosCliente_model.dcp b/Source/Modulos/Lib/RecibosCliente_model.dcp index f74e081..ad6e3c4 100644 Binary files a/Source/Modulos/Lib/RecibosCliente_model.dcp and b/Source/Modulos/Lib/RecibosCliente_model.dcp differ diff --git a/Source/Modulos/Lib/RecibosCliente_plugin.dcp b/Source/Modulos/Lib/RecibosCliente_plugin.dcp index b69a475..2ee2175 100644 Binary files a/Source/Modulos/Lib/RecibosCliente_plugin.dcp and b/Source/Modulos/Lib/RecibosCliente_plugin.dcp differ diff --git a/Source/Modulos/Lib/RecibosCliente_view.dcp b/Source/Modulos/Lib/RecibosCliente_view.dcp index fcc94d1..99c9456 100644 Binary files a/Source/Modulos/Lib/RecibosCliente_view.dcp and b/Source/Modulos/Lib/RecibosCliente_view.dcp differ diff --git a/Source/Modulos/Lib/RecibosProveedor_controller.dcp b/Source/Modulos/Lib/RecibosProveedor_controller.dcp index 75c6222..7b0adcc 100644 Binary files a/Source/Modulos/Lib/RecibosProveedor_controller.dcp and b/Source/Modulos/Lib/RecibosProveedor_controller.dcp differ diff --git a/Source/Modulos/Lib/RecibosProveedor_data.dcp b/Source/Modulos/Lib/RecibosProveedor_data.dcp index 7a1f578..5139a23 100644 Binary files a/Source/Modulos/Lib/RecibosProveedor_data.dcp and b/Source/Modulos/Lib/RecibosProveedor_data.dcp differ diff --git a/Source/Modulos/Lib/RecibosProveedor_model.dcp b/Source/Modulos/Lib/RecibosProveedor_model.dcp index fb2a056..969ed87 100644 Binary files a/Source/Modulos/Lib/RecibosProveedor_model.dcp and b/Source/Modulos/Lib/RecibosProveedor_model.dcp differ diff --git a/Source/Modulos/Lib/RecibosProveedor_plugin.dcp b/Source/Modulos/Lib/RecibosProveedor_plugin.dcp index 4b04320..e48c5ae 100644 Binary files a/Source/Modulos/Lib/RecibosProveedor_plugin.dcp and b/Source/Modulos/Lib/RecibosProveedor_plugin.dcp differ diff --git a/Source/Modulos/Lib/RecibosProveedor_view.dcp b/Source/Modulos/Lib/RecibosProveedor_view.dcp index 1fb3ec7..dd95a76 100644 Binary files a/Source/Modulos/Lib/RecibosProveedor_view.dcp and b/Source/Modulos/Lib/RecibosProveedor_view.dcp differ diff --git a/Source/Modulos/Lib/Referencias_controller.dcp b/Source/Modulos/Lib/Referencias_controller.dcp index f5985cd..803d636 100644 Binary files a/Source/Modulos/Lib/Referencias_controller.dcp and b/Source/Modulos/Lib/Referencias_controller.dcp differ diff --git a/Source/Modulos/Lib/Referencias_data.dcp b/Source/Modulos/Lib/Referencias_data.dcp index b900a19..5f58bb1 100644 Binary files a/Source/Modulos/Lib/Referencias_data.dcp and b/Source/Modulos/Lib/Referencias_data.dcp differ diff --git a/Source/Modulos/Lib/Referencias_model.dcp b/Source/Modulos/Lib/Referencias_model.dcp index bbeb71a..df09190 100644 Binary files a/Source/Modulos/Lib/Referencias_model.dcp and b/Source/Modulos/Lib/Referencias_model.dcp differ diff --git a/Source/Modulos/Lib/Referencias_plugin.dcp b/Source/Modulos/Lib/Referencias_plugin.dcp index 0f8f6b4..0082187 100644 Binary files a/Source/Modulos/Lib/Referencias_plugin.dcp and b/Source/Modulos/Lib/Referencias_plugin.dcp differ diff --git a/Source/Modulos/Lib/Referencias_view.dcp b/Source/Modulos/Lib/Referencias_view.dcp index 1f92769..c719210 100644 Binary files a/Source/Modulos/Lib/Referencias_view.dcp and b/Source/Modulos/Lib/Referencias_view.dcp differ diff --git a/Source/Modulos/Lib/RemesasCliente_controller.dcp b/Source/Modulos/Lib/RemesasCliente_controller.dcp index 76adb55..fe225dd 100644 Binary files a/Source/Modulos/Lib/RemesasCliente_controller.dcp and b/Source/Modulos/Lib/RemesasCliente_controller.dcp differ diff --git a/Source/Modulos/Lib/RemesasCliente_data.dcp b/Source/Modulos/Lib/RemesasCliente_data.dcp index 57ce1b8..d150ce8 100644 Binary files a/Source/Modulos/Lib/RemesasCliente_data.dcp and b/Source/Modulos/Lib/RemesasCliente_data.dcp differ diff --git a/Source/Modulos/Lib/RemesasCliente_model.dcp b/Source/Modulos/Lib/RemesasCliente_model.dcp index a936c3b..00ea9bd 100644 Binary files a/Source/Modulos/Lib/RemesasCliente_model.dcp and b/Source/Modulos/Lib/RemesasCliente_model.dcp differ diff --git a/Source/Modulos/Lib/RemesasCliente_plugin.dcp b/Source/Modulos/Lib/RemesasCliente_plugin.dcp index 5ca2602..64d8168 100644 Binary files a/Source/Modulos/Lib/RemesasCliente_plugin.dcp and b/Source/Modulos/Lib/RemesasCliente_plugin.dcp differ diff --git a/Source/Modulos/Lib/RemesasCliente_view.dcp b/Source/Modulos/Lib/RemesasCliente_view.dcp index 23d2ed8..edca2e3 100644 Binary files a/Source/Modulos/Lib/RemesasCliente_view.dcp and b/Source/Modulos/Lib/RemesasCliente_view.dcp differ diff --git a/Source/Modulos/Lib/RemesasProveedor_controller.dcp b/Source/Modulos/Lib/RemesasProveedor_controller.dcp index 0f01bf9..7825c51 100644 Binary files a/Source/Modulos/Lib/RemesasProveedor_controller.dcp and b/Source/Modulos/Lib/RemesasProveedor_controller.dcp differ diff --git a/Source/Modulos/Lib/RemesasProveedor_data.dcp b/Source/Modulos/Lib/RemesasProveedor_data.dcp index 3b3a74c..67da85b 100644 Binary files a/Source/Modulos/Lib/RemesasProveedor_data.dcp and b/Source/Modulos/Lib/RemesasProveedor_data.dcp differ diff --git a/Source/Modulos/Lib/RemesasProveedor_model.dcp b/Source/Modulos/Lib/RemesasProveedor_model.dcp index 73572e8..53ed5f3 100644 Binary files a/Source/Modulos/Lib/RemesasProveedor_model.dcp and b/Source/Modulos/Lib/RemesasProveedor_model.dcp differ diff --git a/Source/Modulos/Lib/RemesasProveedor_plugin.dcp b/Source/Modulos/Lib/RemesasProveedor_plugin.dcp index dd55d7c..49cc7e0 100644 Binary files a/Source/Modulos/Lib/RemesasProveedor_plugin.dcp and b/Source/Modulos/Lib/RemesasProveedor_plugin.dcp differ diff --git a/Source/Modulos/Lib/RemesasProveedor_view.dcp b/Source/Modulos/Lib/RemesasProveedor_view.dcp index 89eaf41..faf6473 100644 Binary files a/Source/Modulos/Lib/RemesasProveedor_view.dcp and b/Source/Modulos/Lib/RemesasProveedor_view.dcp differ diff --git a/Source/Modulos/Lib/TiposIVA_controller.dcp b/Source/Modulos/Lib/TiposIVA_controller.dcp index 324245c..5b989f1 100644 Binary files a/Source/Modulos/Lib/TiposIVA_controller.dcp and b/Source/Modulos/Lib/TiposIVA_controller.dcp differ diff --git a/Source/Modulos/Lib/TiposIVA_data.dcp b/Source/Modulos/Lib/TiposIVA_data.dcp index e12e262..463ec3b 100644 Binary files a/Source/Modulos/Lib/TiposIVA_data.dcp and b/Source/Modulos/Lib/TiposIVA_data.dcp differ diff --git a/Source/Modulos/Lib/TiposIVA_model.dcp b/Source/Modulos/Lib/TiposIVA_model.dcp index 95ceb91..3c1ab14 100644 Binary files a/Source/Modulos/Lib/TiposIVA_model.dcp and b/Source/Modulos/Lib/TiposIVA_model.dcp differ diff --git a/Source/Modulos/Lib/TiposIVA_plugin.dcp b/Source/Modulos/Lib/TiposIVA_plugin.dcp index 6d66e3b..8b98cff 100644 Binary files a/Source/Modulos/Lib/TiposIVA_plugin.dcp and b/Source/Modulos/Lib/TiposIVA_plugin.dcp differ diff --git a/Source/Modulos/Lib/TiposIVA_view.dcp b/Source/Modulos/Lib/TiposIVA_view.dcp index db2101a..1dd9997 100644 Binary files a/Source/Modulos/Lib/TiposIVA_view.dcp and b/Source/Modulos/Lib/TiposIVA_view.dcp differ diff --git a/Source/Modulos/Lib/UnidadesMedida_controller.dcp b/Source/Modulos/Lib/UnidadesMedida_controller.dcp index 96e25db..888fa82 100644 Binary files a/Source/Modulos/Lib/UnidadesMedida_controller.dcp and b/Source/Modulos/Lib/UnidadesMedida_controller.dcp differ diff --git a/Source/Modulos/Lib/UnidadesMedida_data.dcp b/Source/Modulos/Lib/UnidadesMedida_data.dcp index 51dec11..b62fe21 100644 Binary files a/Source/Modulos/Lib/UnidadesMedida_data.dcp and b/Source/Modulos/Lib/UnidadesMedida_data.dcp differ diff --git a/Source/Modulos/Lib/UnidadesMedida_model.dcp b/Source/Modulos/Lib/UnidadesMedida_model.dcp index 03807c0..eb9fdb5 100644 Binary files a/Source/Modulos/Lib/UnidadesMedida_model.dcp and b/Source/Modulos/Lib/UnidadesMedida_model.dcp differ diff --git a/Source/Modulos/Lib/UnidadesMedida_plugin.dcp b/Source/Modulos/Lib/UnidadesMedida_plugin.dcp index 50b3e8a..9ab7a3c 100644 Binary files a/Source/Modulos/Lib/UnidadesMedida_plugin.dcp and b/Source/Modulos/Lib/UnidadesMedida_plugin.dcp differ diff --git a/Source/Modulos/Lib/UnidadesMedida_view.dcp b/Source/Modulos/Lib/UnidadesMedida_view.dcp index 909aab8..4421009 100644 Binary files a/Source/Modulos/Lib/UnidadesMedida_view.dcp and b/Source/Modulos/Lib/UnidadesMedida_view.dcp differ diff --git a/Source/Modulos/Recibos de cliente/Model/schRecibosClienteClient_Intf.pas b/Source/Modulos/Recibos de cliente/Model/schRecibosClienteClient_Intf.pas index 2375822..c3292a0 100644 --- a/Source/Modulos/Recibos de cliente/Model/schRecibosClienteClient_Intf.pas +++ b/Source/Modulos/Recibos de cliente/Model/schRecibosClienteClient_Intf.pas @@ -3,7 +3,7 @@ unit schRecibosClienteClient_Intf; interface uses - Classes, DB, SysUtils, uROClasses, uDAInterfaces, uDADataTable, FmtBCD, uROXMLIntf; + Classes, DB, schBase_Intf, SysUtils, uROClasses, uDAInterfaces, uDADataTable, FmtBCD, uROXMLIntf; const { Data table rules ids @@ -249,7 +249,7 @@ type end; { TListaAnosRecibosDataTableRules } - TListaAnosRecibosDataTableRules = class(TDADataTableRules, IListaAnosRecibos) + TListaAnosRecibosDataTableRules = class(TIntfObjectDADataTableRules, IListaAnosRecibos) private protected { Property getters and setters } @@ -524,7 +524,7 @@ type end; { TRecibosClienteDataTableRules } - TRecibosClienteDataTableRules = class(TDADataTableRules, IRecibosCliente) + TRecibosClienteDataTableRules = class(TIntfObjectDADataTableRules, IRecibosCliente) private protected { Property getters and setters } @@ -901,7 +901,7 @@ type end; { TPagosClienteDataTableRules } - TPagosClienteDataTableRules = class(TDADataTableRules, IPagosCliente) + TPagosClienteDataTableRules = class(TIntfObjectDADataTableRules, IPagosCliente) private protected { Property getters and setters } @@ -1260,7 +1260,7 @@ type end; { TRecibosCompensadosCliDataTableRules } - TRecibosCompensadosCliDataTableRules = class(TDADataTableRules, IRecibosCompensadosCli) + TRecibosCompensadosCliDataTableRules = class(TIntfObjectDADataTableRules, IRecibosCompensadosCli) private protected { Property getters and setters } diff --git a/Source/Modulos/Recibos de cliente/Views/uEditorFechaPago.dfm b/Source/Modulos/Recibos de cliente/Views/uEditorFechaPago.dfm index 25f30d3..8dfb2a5 100644 --- a/Source/Modulos/Recibos de cliente/Views/uEditorFechaPago.dfm +++ b/Source/Modulos/Recibos de cliente/Views/uEditorFechaPago.dfm @@ -3,8 +3,8 @@ object fEditorFechaPago: TfEditorFechaPago Top = 0 BorderStyle = bsDialog Caption = 'Fecha del cobro / devoluci'#243'n' - ClientHeight = 234 - ClientWidth = 560 + ClientHeight = 205 + ClientWidth = 422 Color = clWindow Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -20,7 +20,7 @@ object fEditorFechaPago: TfEditorFechaPago TextHeight = 13 object Label1: TLabel Left = 38 - Top = 64 + Top = 33 Width = 362 Height = 13 Caption = @@ -29,7 +29,7 @@ object fEditorFechaPago: TfEditorFechaPago end object Label2: TLabel Left = 38 - Top = 87 + Top = 61 Width = 77 Height = 13 Alignment = taRightJustify @@ -38,14 +38,14 @@ object fEditorFechaPago: TfEditorFechaPago end object Label3: TLabel Left = 38 - Top = 127 + Top = 101 Width = 306 Height = 13 Caption = 'Seleccione el banco o caja donde se hace el cobro o devoluci'#243'n:' end object eFechaPago: TcxDateEdit Left = 121 - Top = 84 + Top = 58 Properties.OnEditValueChanged = eFechaPagoPropertiesEditValueChanged Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True @@ -56,12 +56,12 @@ object fEditorFechaPago: TfEditorFechaPago StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True TabOrder = 0 - Width = 267 + Width = 293 end inline frViewListaSubcuentas1: TfrViewListaSubcuentas Left = 0 - Top = 143 - Width = 560 + Top = 114 + Width = 422 Height = 50 Align = alBottom Font.Charset = DEFAULT_CHARSET @@ -72,12 +72,12 @@ object fEditorFechaPago: TfEditorFechaPago ParentFont = False TabOrder = 1 ReadOnly = False - ExplicitTop = 143 - ExplicitWidth = 560 + ExplicitTop = 114 + ExplicitWidth = 422 ExplicitHeight = 50 inherited dxLayoutControl1: TdxLayoutControl - Width = 560 - ExplicitWidth = 560 + Width = 422 + ExplicitWidth = 422 inherited cbSubCuentas: TcxComboBox Left = 122 Style.LookAndFeel.SkinName = '' @@ -85,18 +85,17 @@ object fEditorFechaPago: TfEditorFechaPago StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 122 - ExplicitWidth = 376 - Width = 376 + ExplicitWidth = 1000 + Width = 1000 end inherited eContabilizar: TcxCheckBox - Left = 393 + Left = 351 Enabled = False Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - Visible = False - ExplicitLeft = 393 + ExplicitLeft = 351 ExplicitWidth = 203 Width = 203 end @@ -104,17 +103,20 @@ object fEditorFechaPago: TfEditorFechaPago inherited dxLayoutControl1Item1: TdxLayoutItem Caption = ' Caja/Banco: ' end + inherited dxLayoutControl1Item2: TdxLayoutItem + Enabled = False + Visible = False + end end end end object PnlComentario: TPanel Left = 0 Top = 0 - Width = 560 - Height = 45 + Width = 422 + Height = 25 Align = alTop Alignment = taLeftJustify - AutoSize = True Color = 13499902 ParentBackground = False TabOrder = 2 @@ -123,8 +125,8 @@ object fEditorFechaPago: TfEditorFechaPago AlignWithMargins = True Left = 6 Top = 4 - Width = 550 - Height = 40 + Width = 412 + Height = 20 Margins.Left = 5 Align = alClient Caption = 'Comentario' @@ -135,13 +137,13 @@ object fEditorFechaPago: TfEditorFechaPago end object Panel1: TPanel Left = 0 - Top = 193 - Width = 560 + Top = 164 + Width = 422 Height = 41 Align = alBottom TabOrder = 3 object bAceptar: TButton - Left = 347 + Left = 241 Top = 8 Width = 75 Height = 25 @@ -150,7 +152,7 @@ object fEditorFechaPago: TfEditorFechaPago TabOrder = 0 end object bCancelar: TButton - Left = 445 + Left = 339 Top = 8 Width = 75 Height = 25 diff --git a/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.dfm b/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.dfm index aa5dd92..abfa743 100644 --- a/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.dfm +++ b/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.dfm @@ -202,6 +202,8 @@ inherited frViewRecibosCliente: TfrViewRecibosCliente object cxGridViewLISTA_NOMBRES: TcxGridDBColumn Caption = 'Otros nombres' DataBinding.FieldName = 'LISTA_NOMBRES' + Visible = False + VisibleForCustomization = False end object cxGridViewCUENTA_CONTABLE: TcxGridDBColumn Caption = 'Cuenta contable' diff --git a/Source/Modulos/Recibos de proveedor/Views/uEditorFechaPagoProveedor.dfm b/Source/Modulos/Recibos de proveedor/Views/uEditorFechaPagoProveedor.dfm index 7973675..6d31400 100644 --- a/Source/Modulos/Recibos de proveedor/Views/uEditorFechaPagoProveedor.dfm +++ b/Source/Modulos/Recibos de proveedor/Views/uEditorFechaPagoProveedor.dfm @@ -3,8 +3,8 @@ object fEditorFechaPagoProveedor: TfEditorFechaPagoProveedor Top = 0 BorderStyle = bsDialog Caption = 'Fecha del cobro / devoluci'#243'n' - ClientHeight = 217 - ClientWidth = 563 + ClientHeight = 199 + ClientWidth = 443 Color = clWindow Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -20,7 +20,7 @@ object fEditorFechaPagoProveedor: TfEditorFechaPagoProveedor TextHeight = 13 object Label1: TLabel Left = 42 - Top = 61 + Top = 31 Width = 362 Height = 13 Caption = @@ -29,7 +29,7 @@ object fEditorFechaPagoProveedor: TfEditorFechaPagoProveedor end object Label2: TLabel Left = 42 - Top = 83 + Top = 57 Width = 80 Height = 13 Alignment = taRightJustify @@ -38,14 +38,14 @@ object fEditorFechaPagoProveedor: TfEditorFechaPagoProveedor end object Label3: TLabel Left = 42 - Top = 124 + Top = 101 Width = 306 Height = 13 Caption = 'Seleccione el banco o caja donde se hace el cobro o devoluci'#243'n:' end object eFechaPago: TcxDateEdit Left = 129 - Top = 80 + Top = 57 Properties.OnEditValueChanged = eFechaPagoPropertiesEditValueChanged Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True @@ -56,17 +56,18 @@ object fEditorFechaPagoProveedor: TfEditorFechaPagoProveedor StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True TabOrder = 0 - Width = 275 + Width = 306 end object Panel1: TPanel Left = 0 - Top = 176 - Width = 563 + Top = 158 + Width = 443 Height = 41 Align = alBottom TabOrder = 1 + ExplicitTop = 176 object bAceptar: TButton - Left = 368 + Left = 268 Top = 6 Width = 75 Height = 25 @@ -75,7 +76,7 @@ object fEditorFechaPagoProveedor: TfEditorFechaPagoProveedor TabOrder = 0 end object bCancelar: TButton - Left = 459 + Left = 359 Top = 6 Width = 75 Height = 25 @@ -86,8 +87,8 @@ object fEditorFechaPagoProveedor: TfEditorFechaPagoProveedor end inline frViewListaSubcuentas1: TfrViewListaSubcuentas Left = 0 - Top = 136 - Width = 563 + Top = 118 + Width = 443 Height = 40 Align = alBottom Font.Charset = DEFAULT_CHARSET @@ -99,11 +100,11 @@ object fEditorFechaPagoProveedor: TfEditorFechaPagoProveedor TabOrder = 2 ReadOnly = False ExplicitTop = 136 - ExplicitWidth = 563 + ExplicitWidth = 443 ExplicitHeight = 40 inherited dxLayoutControl1: TdxLayoutControl - Width = 563 - ExplicitWidth = 563 + Width = 443 + ExplicitWidth = 443 inherited cbSubCuentas: TcxComboBox Left = 128 Style.LookAndFeel.SkinName = '' @@ -115,12 +116,13 @@ object fEditorFechaPagoProveedor: TfEditorFechaPagoProveedor Width = 440 end inherited eContabilizar: TcxCheckBox - Left = 410 + Left = 322 + Enabled = False Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 410 + ExplicitLeft = 322 ExplicitWidth = 203 Width = 203 end @@ -128,17 +130,20 @@ object fEditorFechaPagoProveedor: TfEditorFechaPagoProveedor inherited dxLayoutControl1Item1: TdxLayoutItem Caption = ' Caja/Banco: ' end + inherited dxLayoutControl1Item2: TdxLayoutItem + Enabled = False + Visible = False + end end end end object PnlComentario: TPanel Left = 0 Top = 0 - Width = 563 - Height = 45 + Width = 443 + Height = 25 Align = alTop Alignment = taLeftJustify - AutoSize = True Color = 13499902 ParentBackground = False TabOrder = 3 @@ -147,11 +152,12 @@ object fEditorFechaPagoProveedor: TfEditorFechaPagoProveedor AlignWithMargins = True Left = 6 Top = 4 - Width = 553 - Height = 40 + Width = 433 + Height = 20 Margins.Left = 5 Align = alClient Caption = 'Comentario' + Visible = False WordWrap = True ExplicitWidth = 55 ExplicitHeight = 13 diff --git a/Source/Modulos/Relaciones/Contratos de cliente - Recibos de cliente/ConCli_RecCli_relation.dpk b/Source/Modulos/Relaciones/Contratos de cliente - Recibos de cliente/ConCli_RecCli_relation.dpk new file mode 100644 index 0000000..14b9c93 --- /dev/null +++ b/Source/Modulos/Relaciones/Contratos de cliente - Recibos de cliente/ConCli_RecCli_relation.dpk @@ -0,0 +1,42 @@ +package ConCli_RecCli_relation; + +{$R *.res} +{$ALIGN 8} +{$ASSERTIONS ON} +{$BOOLEVAL OFF} +{$DEBUGINFO ON} +{$EXTENDEDSYNTAX ON} +{$IMPORTEDDATA ON} +{$IOCHECKS ON} +{$LOCALSYMBOLS ON} +{$LONGSTRINGS ON} +{$OPENSTRINGS ON} +{$OPTIMIZATION ON} +{$OVERFLOWCHECKS OFF} +{$RANGECHECKS OFF} +{$REFERENCEINFO ON} +{$SAFEDIVIDE OFF} +{$STACKFRAMES OFF} +{$TYPEDADDRESS OFF} +{$VARSTRINGCHECKS ON} +{$WRITEABLECONST OFF} +{$MINENUMSIZE 1} +{$IMAGEBASE $400000} +{$IMPLICITBUILD OFF} + +requires + Base, + Contactos_model, + Contactos_controller, + ContratosCliente_controller, + ContratosCliente_model, + FacturasCliente_controller, + FacturasCliente_model, + PresupuestosCliente_model, + RecibosCliente_controller, + RecibosCliente_model; + +contains + uGenerarRecibosCliUtils in 'uGenerarRecibosCliUtils.pas' {dmGenerarRecibosCli}; + +end. diff --git a/Source/Modulos/Relaciones/Contratos de cliente - Recibos de cliente/ConCli_RecCli_relation.dproj b/Source/Modulos/Relaciones/Contratos de cliente - Recibos de cliente/ConCli_RecCli_relation.dproj new file mode 100644 index 0000000..5e3d908 --- /dev/null +++ b/Source/Modulos/Relaciones/Contratos de cliente - Recibos de cliente/ConCli_RecCli_relation.dproj @@ -0,0 +1,655 @@ + + + {69494a8c-0a35-41ea-b8ec-ea790bfc0662} + ConCli_RecCli_relation.dpk + Debug + AnyCPU + DCC32 + ..\..\..\..\Output\Debug\Cliente\ConCli_RecCli_relation.bpl + + + 7.0 + False + False + 0 + .\ + .\ + .\ + ..\..\..\..\Output\Debug\Cliente + ..\..\Lib + ..\..\..\Lib;..\..\Lib + ..\..\..\Lib;..\..\Lib + ..\..\..\Lib;..\..\Lib + ..\..\..\Lib;..\..\Lib + RELEASE + + + 7.0 + .\ + .\ + .\ + ..\..\..\..\Output\Debug\Cliente + ..\..\Lib + ..\..\..\Lib;..\..\Lib + ..\..\..\Lib;..\..\Lib + ..\..\..\Lib;..\..\Lib + ..\..\..\Lib;..\..\Lib + + + Delphi.Personality + Package + +FalseTrueFalseFalseFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Borland Sample Components + Delphi 1.0 Compatibility Components + Borland MyBase DataAccess Components + TeeChart Components + Borland SimpleDataset Component (DBX) + ExpressBars extended items by Developer Express Inc. + ExpressBars by Developer Express Inc. + ExpressScheduler 2 by Developer Express Inc. + ExpressVerticalGrid by Developer Express Inc. + ExpressBars DBNavigator by Developer Express Inc. + ExpressBars extended DB items by Developer Express Inc. + ExpressSideBar by Developer Express Inc. + JVCL Band Objects + JVCL Non-Visual Components + JVCL Encryption and Compression Components + JVCL Dialog Components + JVCL Docking Components + JVCL DotNet Controls + JVCL EDI Components Designtime Package + JVCL HMI Controls design time unit + JVCL Interpreter Components + JVCL Jans Components + JVCL Managed Threads + JVCL Multimedia and Image Components + JVCL Network Components + JVCL Page Style Components + JVCL Plugin Components + JVCL Print Preview Components + JVCL Runtime Design Components + JVCL Time Framework + JVCL Unified Interbase Components + JVCL Validators and Error Provider Components + SMImport suite: data importing into dataset. Scalabium/Mike Shkolnik, 2000-2005 + SMExport suite: data export from dataset. Written by Mike Shkolnik/Scalabium, 1998-2004. + Intraweb 8.0 Design Package for Borland Development Studio 2006 + Internet Explorer Components + ConCli_RecCli_relation.dpk + + + + + MainSource + + + + + + + + + + + + +
dmGenerarRecibosCli
+ + + + diff --git a/Source/Modulos/Tipos de IVA/Plugin/uPluginTiposIVA.dfm b/Source/Modulos/Tipos de IVA/Plugin/uPluginTiposIVA.dfm index ed4f467..52ee131 100644 --- a/Source/Modulos/Tipos de IVA/Plugin/uPluginTiposIVA.dfm +++ b/Source/Modulos/Tipos de IVA/Plugin/uPluginTiposIVA.dfm @@ -43,7 +43,9 @@ object PluginTiposIVA: TPluginTiposIVA object actTiposIVA: TAction Category = 'TiposIVA' Caption = 'Tipos de IVA' + Enabled = False ImageIndex = 0 + Visible = False OnExecute = actTiposIVAExecute end end diff --git a/Source/Modulos/Tipos de IVA/Plugin/uPluginTiposIVA.pas b/Source/Modulos/Tipos de IVA/Plugin/uPluginTiposIVA.pas index d9f156c..f5e0086 100644 --- a/Source/Modulos/Tipos de IVA/Plugin/uPluginTiposIVA.pas +++ b/Source/Modulos/Tipos de IVA/Plugin/uPluginTiposIVA.pas @@ -31,7 +31,7 @@ implementation {$R *.dfm} uses - Forms, Dialogs, SysUtils, + Forms, Dialogs, SysUtils, uFactuGES_App, uTiposIVAController, uBizTiposIVA, uTiposIVAViewRegister; function GetModule : TModuleController; @@ -56,6 +56,14 @@ constructor TPluginTiposIVA.Create(AOwner: TComponent); begin inherited; uTiposIVAViewRegister.RegisterViews; + + //Solo lo verá el perfil Administrador + if ((AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PERFIL_ADMINISTRADOR) OR (AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PREFIL_GERENCIA)) then + begin + actTiposIVA.Visible := True; + actTiposIVA.Enabled := True; + end; + end; destructor TPluginTiposIVA.Destroy; diff --git a/Source/Servidor/FactuGES_Server.res b/Source/Servidor/FactuGES_Server.res index 54fe388..25ec187 100644 Binary files a/Source/Servidor/FactuGES_Server.res and b/Source/Servidor/FactuGES_Server.res differ diff --git a/migracion.sql b/migracion.sql new file mode 100644 index 0000000..80e296e --- /dev/null +++ b/migracion.sql @@ -0,0 +1,290 @@ +crear tablas para migrar + +CREATE TABLE PRESUPUESTOSVIEJOS ( + CODIGOEMPRESA CODIGOSEMPRESAS NOT NULL /* CODIGOSEMPRESAS = SMALLINT */, + CODIGO CODIGOS NOT NULL /* CODIGOS = INTEGER */, + FECHAALTA FECHAS NOT NULL /* FECHAS = DATE */, + USUARIO NOMBRES NOT NULL /* NOMBRES = VARCHAR(100) */, + CODIGOCONTACTO CODIGOS NOT NULL /* CODIGOS = INTEGER */, + TIPO VARCHAR(10) NOT NULL, + FECHAPRESUPUESTO FECHAS NOT NULL /* FECHAS = DATE */, + VIGENCIAPRESUPUESTO FECHAS /* FECHAS = DATE */, + SITUACION SITUACIONES NOT NULL /* SITUACIONES = VARCHAR(30) */, + FECHADECISION FECHAS /* FECHAS = DATE */, + BASEIMPONIBLE IMPORTES2 /* IMPORTES2 = NUMERIC(11,2) DEFAULT 0 */, + DESCUENTO PORCENTAJES /* PORCENTAJES = FLOAT */, + IMPORTEDESCUENTO IMPORTES2 /* IMPORTES2 = NUMERIC(11,2) DEFAULT 0 */, + IVA PORCENTAJES /* PORCENTAJES = FLOAT */, + IMPORTEIVA IMPORTES2 /* IMPORTES2 = NUMERIC(11,2) DEFAULT 0 */, + IMPORTETOTAL IMPORTES2 /* IMPORTES2 = NUMERIC(11,2) DEFAULT 0 */, + OBSERVACIONES OBSERVACIONES /* OBSERVACIONES = BLOB SUB_TYPE 1 SEGMENT SIZE 100 */, + PLAZOENTREGA OBSERVACIONES /* OBSERVACIONES = BLOB SUB_TYPE 1 SEGMENT SIZE 100 */, + FORMAPAGO OBSERVACIONES /* OBSERVACIONES = BLOB SUB_TYPE 1 SEGMENT SIZE 100 */, + OPCION NOMBRES /* NOMBRES = VARCHAR(100) */, + BAJA CHAR(1) DEFAULT 'N', + SITUACION_MONTAJE SITUACIONES /* SITUACIONES = VARCHAR(30) */, + CODIGO_CONTACTO CODIGOS NOT NULL /* CODIGOS = INTEGER */, + NIFCIF NIFCIFS /* NIFCIFS = VARCHAR(10) */, + NOMBRE NOMBRES NOT NULL /* NOMBRES = VARCHAR(100) */, + NOTAS DESCRIPCIONES /* DESCRIPCIONES = VARCHAR(2000) */, + CALLE CALLES /* CALLES = VARCHAR(150) */, + PROVINCIA PROVINCIAS /* PROVINCIAS = VARCHAR(30) */, + CODIGOPOSTAL CODIGOSPOSTALES /* CODIGOSPOSTALES = VARCHAR(5) */, + POBLACION POBLACIONES /* POBLACIONES = VARCHAR(40) */, + TELEFONO1 TELEFONOS /* TELEFONOS = VARCHAR(30) */, + TELEFONO2 TELEFONOS /* TELEFONOS = VARCHAR(30) */, + MOVIL TELEFONOS /* TELEFONOS = VARCHAR(30) */, + FAX TELEFONOS /* TELEFONOS = VARCHAR(30) */, + CORREO1 CORREOS /* CORREOS = VARCHAR(60) */, + CORREO2 CORREOS /* CORREOS = VARCHAR(60) */, + PAGINAWEB NOMBRES /* NOMBRES = VARCHAR(100) */, + PERSONACONTACTO NOMBRES /* NOMBRES = VARCHAR(100) */, + BAJA_LOGICA SMALLINT DEFAULT 0 NOT NULL +); + + + +CREATE TABLE PRESUPUESTOSVIEJOS_DETALLES ( + CODIGOPRESUPUESTO CODIGOS NOT NULL /* CODIGOS = INTEGER */, + NUMCONCEPTO NUMCONCEPTOS NOT NULL /* NUMCONCEPTOS = SMALLINT */, + POSICION SMALLINT NOT NULL, + TIPO CHAR(1), + DESCRIPCION DESCRIPCIONES /* DESCRIPCIONES = VARCHAR(2000) */, + CANTIDAD CANTIDADES /* CANTIDADES = NUMERIC(9,0) */, + PUNTOS PUNTOS /* PUNTOS = INTEGER */, + IMPORTEPUNTOS IMPORTES2 /* IMPORTES2 = NUMERIC(11,2) DEFAULT 0 */, + IMPORTEUNIDAD IMPORTES2 /* IMPORTES2 = NUMERIC(11,2) DEFAULT 0 */, + IMPORTETOTAL IMPORTES2 /* IMPORTES2 = NUMERIC(11,2) DEFAULT 0 */, + VISIBLE VISIBLE NOT NULL /* VISIBLE = CHAR(1) DEFAULT 'S' NOT NULL */, + VALORADO CHAR(1) NOT NULL +); + + + +//CARGAMOS LAS TABLAS + +insert into presupuestosviejos +select + presupuestos.CODIGOEMPRESA, + presupuestos.CODIGO, + presupuestos.FECHAALTA, + presupuestos.USUARIO, + CODIGOCONTACTO, + TIPO, + FECHAPRESUPUESTO, + VIGENCIAPRESUPUESTO, + SITUACION, + FECHADECISION, + BASEIMPONIBLE, + DESCUENTO, + IMPORTEDESCUENTO, + IVA, + IMPORTEIVA, + IMPORTETOTAL, + OBSERVACIONES, + PLAZOENTREGA, + FORMAPAGO, + OPCION, + BAJA, + SITUACION_MONTAJE, + contactos.CODIGO as CODIGO_CONTACTO, + NIFCIF, + NOMBRE, + NOTAS, + CALLE, + PROVINCIA, + CODIGOPOSTAL, + POBLACION, + TELEFONO1, + TELEFONO2, + MOVIL, + FAX, + CORREO1, + CORREO2, + PAGINAWEB, + PERSONACONTACTO, + BAJA_LOGICA +from presupuestos +left join contactos on (contactos.codigo = presupuestos.codigocontacto) +where fechapresupuesto > '2020.01.01' + + +insert into PRESUPUESTOSVIEJOS_DETALLES +select * +from detallespresupuestos +where codigopresupuesto in (select codigo from presupuestosviejos); + + + +migramos las dos tablas a la nueva base de datos + +creamos las tablas + + +CREATE TABLE PRESUPUESTOSVIEJOS ( + CODIGOEMPRESA SMALLINT, + CODIGO INTEGER, + FECHAALTA DATE, + USUARIO VARCHAR(100), + CODIGOCONTACTO INTEGER, + TIPO VARCHAR(10) NOT NULL, + FECHAPRESUPUESTO DATE , + VIGENCIAPRESUPUESTO DATE , + SITUACION VARCHAR(30) , + FECHADECISION DATE , + BASEIMPONIBLE NUMERIC(11,2) DEFAULT 0 , + DESCUENTO FLOAT , + IMPORTEDESCUENTO NUMERIC(11,2) DEFAULT 0 , + IVA FLOAT , + IMPORTEIVA NUMERIC(11,2) DEFAULT 0 , + IMPORTETOTAL NUMERIC(11,2) DEFAULT 0 , + OBSERVACIONES BLOB SUB_TYPE 1 SEGMENT SIZE 100 , + PLAZOENTREGA BLOB SUB_TYPE 1 SEGMENT SIZE 100 , + FORMAPAGO BLOB SUB_TYPE 1 SEGMENT SIZE 100 , + OPCION VARCHAR(100) , + BAJA CHAR(1) DEFAULT 'N', + SITUACION_MONTAJE VARCHAR(30) , + CODIGO_CONTACTO INTEGER , + NIFCIF VARCHAR(10) , + NOMBRE VARCHAR(100) , + NOTAS VARCHAR(2000) , + CALLE VARCHAR(150) , + PROVINCIA VARCHAR(30) , + CODIGOPOSTAL VARCHAR(5) , + POBLACION VARCHAR(40) , + TELEFONO1 VARCHAR(30) , + TELEFONO2 VARCHAR(30) , + MOVIL VARCHAR(30) , + FAX VARCHAR(30) , + CORREO1 VARCHAR(60) , + CORREO2 VARCHAR(60) , + PAGINAWEB VARCHAR(100) , + PERSONACONTACTO VARCHAR(100) , + BAJA_LOGICA SMALLINT DEFAULT 0 NOT NULL +); + +CREATE TABLE PRESUPUESTOSVIEJOS_DETALLES ( + CODIGOPRESUPUESTO INTEGER, + NUMCONCEPTO SMALLINT , + POSICION SMALLINT NOT NULL, + TIPO CHAR(1), + DESCRIPCION VARCHAR(2000), + CANTIDAD NUMERIC(9,0), + PUNTOS INTEGER, + IMPORTEPUNTOS NUMERIC(11,2) DEFAULT 0, + IMPORTEUNIDAD NUMERIC(11,2) DEFAULT 0, + IMPORTETOTAL NUMERIC(11,2) DEFAULT 0, + VISIBLE CHAR(1) DEFAULT 'S' NOT NULL, + VALORADO CHAR(1) NOT NULL +); + + +exportamos metadata e importamos en la nueva + +//INSERTAMOS LOS PRESUPUESTO EN LOS CONTRATOS +insert into contratos_cliente +select GEN_ID(GEN_PRESUPUESTOS_CLI_ID, 1), 1, null, nifcif, nombre, calle, poblacion, provincia, codigopostal, 'PRE20/000' || GEN_ID(GEN_EMPRESAS_ID, 1), FECHAPRESUPUESTO, SITUACION, +FORMAPAGO, PLAZOENTREGA, OBSERVACIONES, null, 0, fechaalta, fechaalta, 'carga_inicial', +baseimponible, null, descuento, importedescuento, baseimponible - importedescuento, iva, importeiva, importetotal, 6, 1, null, +case +when iva is null then 4 +when iva = 21 then 7 +else 4 +end, + +codigo_contacto, +0, +0, +0, + null, null, null, tipo, null, null, opcion, fechadecision, null, codigo + +from presupuestosviejos + + + + +create view V_clientesViejos( +nifcif, nombre, calle, poblacion, provincia, codigopostal, +telefono1, telefono2, movil, movil2, fax, +correo1, correo2, paginaweb, notas, +fechaalta, fechamodificacion, codigo_contacto +) +as + +select distinct nifcif, nombre, calle, poblacion, provincia, codigopostal, +substr(telefono1,1,24), substr(telefono2,1,24), substr(movil,1,24), substr(fax,1,24), substr(fax,1,24), +correo1, correo2, paginaweb, notas, +current_date , current_date , codigo_contacto +from presupuestosviejos; + + + +//CREAMOS LOS CONTACTOS NUEVOS +insert into contactos +select GEN_ID(GEN_CONTACTOS_ID, 1), nifcif, nombre, calle, poblacion, provincia, codigopostal, +telefono1, telefono2, movil, movil2, fax, +correo1, correo2, paginaweb, notas, +fechaalta, fechaalta, 'carga_inicial', 'CL20/000' || GEN_ID(GEN_PRESUPUESTOS_CLI_ID, 1), codigo_contacto, 1 + +from V_clientesViejos + + +//Añadimos como clientes +insert into contactos_categorias +select id, 1 +from contactos +where id < 10000 + +//Añadimos el premiso para la empreas +insert into empresas_contactos +select GEN_ID(GEN_EMPRESAS_CONTACTOS_ID, 1), 1, id +from contactos +where id < 10000 + +//Insertamos tupla vacia de clientes_datos a todos los clientes +insert into clientes_datos (id_cliente) +select id +from contactos +where usuario = 'carga_inicial'; + + + +//Enlazamos los clientes +update contratos_cliente +set contratos_cliente.id_cliente = (select contactos.ID from contactos where ((contactos.PERSONA_CONTACTO is not null) and (contactos.PERSONA_CONTACTO = contratos_cliente.persona_contacto))) +where contratos_cliente.id_cliente is null; + + + + + +insert into contratos_cliente_detalles +select GEN_ID(GEN_CONTRATOS_CLI_DETALLE_ID, 1), +(select contratos_cliente.ID from contratos_cliente where ((contratos_cliente.campo_libre is not null) and (contratos_cliente.campo_libre = presupuestosviejos_detalles.codigopresupuesto))), +presupuestosviejos_detalles.posicion, +case +when tipo = 'C' then 'Concepto' +when tipo = 'T' then 'Titulo' +when tipo = 'S' then 'Subtotal' +end, +null, +null, +null, +descripcion, +cantidad, +importeunidad, +null, +null, +importetotal, +case +when visible = 'S' then 1 +when visible = 'N' then 0 +end, +current_date, +current_date, +case +when valorado = 'S' then 1 +when valorado = 'N' then 0 +end + +from presupuestosviejos_detalles