diff --git a/Build/Build.fbl6 b/Build/Build.fbl6 index 3e5c615..852467c 100644 Binary files a/Build/Build.fbl6 and b/Build/Build.fbl6 differ diff --git a/Source/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj index 5102b31..c37c7b8 100644 --- a/Source/Cliente/FactuGES.dproj +++ b/Source/Cliente/FactuGES.dproj @@ -52,7 +52,7 @@ Delphi.Personality VCLApplication -FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse2320FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.3.2.0FactuGES v2FactuGES v22.3.2.0 +FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse2330FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.3.3.0FactuGES v2FactuGES v22.3.3.0 File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found FactuGES.dprFalse diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res index 1a7fd68..ce20cec 100644 Binary files a/Source/Cliente/FactuGES.res and b/Source/Cliente/FactuGES.res differ diff --git a/Source/GUIBase/uEditorDBItem.dfm b/Source/GUIBase/uEditorDBItem.dfm index 15294aa..c190a05 100644 --- a/Source/GUIBase/uEditorDBItem.dfm +++ b/Source/GUIBase/uEditorDBItem.dfm @@ -21,7 +21,7 @@ inherited fEditorDBItem: TfEditorDBItem Width = 650 ExplicitWidth = 650 inherited tbxMain: TTBXToolbar - ExplicitWidth = 605 + ExplicitWidth = 647 inherited TBXItem26: TTBXItem Visible = False end @@ -77,12 +77,14 @@ inherited fEditorDBItem: TfEditorDBItem object pgPaginas: TPageControl [3] AlignWithMargins = True Left = 3 - Top = 109 + Top = 111 Width = 644 - Height = 328 + Height = 326 ActivePage = pagGeneral Align = alClient TabOrder = 2 + ExplicitTop = 109 + ExplicitHeight = 328 object pagGeneral: TTabSheet Caption = 'General' ExplicitLeft = 0 @@ -93,7 +95,7 @@ inherited fEditorDBItem: TfEditorDBItem end object PnlComentario: TPanel [4] Left = 0 - Top = 76 + Top = 78 Width = 650 Height = 30 Align = alTop @@ -103,6 +105,7 @@ inherited fEditorDBItem: TfEditorDBItem ParentBackground = False TabOrder = 4 VerticalAlignment = taAlignTop + ExplicitTop = 76 object lbComentario: TLabel AlignWithMargins = True Left = 6 diff --git a/Source/Modulos/Contratos de cliente/Views/uEditorContratoCliente.dfm b/Source/Modulos/Contratos de cliente/Views/uEditorContratoCliente.dfm index 18c8f0a..0ad2207 100644 --- a/Source/Modulos/Contratos de cliente/Views/uEditorContratoCliente.dfm +++ b/Source/Modulos/Contratos de cliente/Views/uEditorContratoCliente.dfm @@ -5,14 +5,15 @@ inherited fEditorContratoCliente: TfEditorContratoCliente ClientHeight = 798 ClientWidth = 872 OnClose = CustomEditorClose - ExplicitWidth = 880 - ExplicitHeight = 832 + ExplicitTop = -113 + ExplicitWidth = 888 + ExplicitHeight = 836 PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader Width = 872 Caption = 'Nuevo presupuesto de cliente' - ExplicitTop = 49 + ExplicitTop = 51 ExplicitWidth = 872 inherited Image1: TImage Left = 845 @@ -130,7 +131,7 @@ inherited fEditorContratoCliente: TfEditorContratoCliente Width = 872 ExplicitWidth = 872 inherited tbxMain: TTBXToolbar - ExplicitWidth = 488 + ExplicitWidth = 518 inherited TBXItem2: TTBXItem Visible = False end @@ -174,32 +175,33 @@ inherited fEditorContratoCliente: TfEditorContratoCliente end inherited pgPaginas: TPageControl Width = 866 - Height = 473 + Height = 471 TabOrder = 1 OnChanging = pgPaginasChanging + ExplicitTop = 111 ExplicitWidth = 866 - ExplicitHeight = 473 + ExplicitHeight = 471 inherited pagGeneral: TTabSheet ExplicitLeft = 4 ExplicitTop = 24 ExplicitWidth = 858 - ExplicitHeight = 445 + ExplicitHeight = 443 inline frViewContratoCliente1: TfrViewContratoCliente Left = 0 Top = 0 Width = 858 - Height = 445 + Height = 443 Align = alClient TabOrder = 0 ReadOnly = False ExplicitWidth = 858 - ExplicitHeight = 445 + ExplicitHeight = 443 inherited dxLayoutControl1: TdxLayoutControl Width = 858 - Height = 445 + Height = 443 LookAndFeel = dxLayoutOfficeLookAndFeel1 ExplicitWidth = 858 - ExplicitHeight = 445 + ExplicitHeight = 443 inherited edtFechaContrato: TcxDBDateEdit Left = 155 Top = 84 @@ -271,8 +273,8 @@ inherited fEditorContratoCliente: TfEditorContratoCliente Width = 396 end inherited memPlazoEntrega: TcxDBMemo - Top = 378 - ExplicitTop = 378 + Top = 377 + ExplicitTop = 377 ExplicitWidth = 396 ExplicitHeight = 100 Height = 100 @@ -454,7 +456,7 @@ inherited fEditorContratoCliente: TfEditorContratoCliente Left = 0 Top = 0 Width = 858 - Height = 445 + Height = 443 Align = alClient BiDiMode = bdLeftToRight Font.Charset = DEFAULT_CHARSET @@ -467,7 +469,7 @@ inherited fEditorContratoCliente: TfEditorContratoCliente TabOrder = 0 ReadOnly = False ExplicitWidth = 858 - ExplicitHeight = 445 + ExplicitHeight = 443 inherited ToolBar1: TToolBar Width = 858 ExplicitWidth = 858 @@ -481,19 +483,19 @@ inherited fEditorContratoCliente: TfEditorContratoCliente ExplicitLeft = 334 ExplicitTop = 0 end - inherited FontName: TJvFontComboBox + inherited FontSize: TEdit [5] Left = 0 - ExplicitLeft = 0 - end - inherited FontSize: TEdit - Left = 145 Width = 110 - ExplicitLeft = 145 + ExplicitLeft = 0 ExplicitWidth = 110 end - inherited UpDown1: TUpDown - Left = 255 - ExplicitLeft = 255 + inherited UpDown1: TUpDown [6] + Left = 110 + ExplicitLeft = 110 + end + inherited FontName: TJvFontComboBox [7] + Left = 127 + ExplicitLeft = 127 end inherited ToolButton13: TToolButton Left = 272 @@ -530,15 +532,15 @@ inherited fEditorContratoCliente: TfEditorContratoCliente end inherited cxGrid: TcxGrid Width = 858 - Height = 373 + Height = 371 ExplicitWidth = 858 - ExplicitHeight = 373 + ExplicitHeight = 371 end inherited TBXDock1: TTBXDock Width = 858 ExplicitWidth = 858 inherited TBXToolbar1: TTBXToolbar - ExplicitWidth = 665 + ExplicitWidth = 718 end end inherited cxLookupComboBox1: TcxLookupComboBox @@ -561,7 +563,7 @@ inherited fEditorContratoCliente: TfEditorContratoCliente Left = 0 Top = 0 Width = 858 - Height = 445 + Height = 443 Align = alClient TabOrder = 0 TabStop = False @@ -608,7 +610,7 @@ inherited fEditorContratoCliente: TfEditorContratoCliente Left = 0 Top = 0 Width = 858 - Height = 445 + Height = 443 Align = alClient TabOrder = 0 TabStop = False @@ -653,12 +655,12 @@ inherited fEditorContratoCliente: TfEditorContratoCliente ImageIndex = 2 DesignSize = ( 858 - 445) + 443) inline frViewIncidenciasCli: TfrViewIncidencias Left = 0 Top = 0 Width = 858 - Height = 445 + Height = 443 Align = alClient Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -669,7 +671,7 @@ inherited fEditorContratoCliente: TfEditorContratoCliente TabOrder = 0 ReadOnly = False ExplicitWidth = 858 - ExplicitHeight = 445 + ExplicitHeight = 443 inherited pnlSup: TPanel Width = 858 ExplicitWidth = 858 @@ -681,13 +683,13 @@ inherited fEditorContratoCliente: TfEditorContratoCliente end inherited GroupBox1: TGroupBox Width = 858 - Height = 417 + Height = 415 ExplicitWidth = 858 - ExplicitHeight = 417 + ExplicitHeight = 415 inherited eIncidencias: TcxDBMemo ExplicitWidth = 854 - ExplicitHeight = 400 - Height = 400 + ExplicitHeight = 398 + Height = 398 Width = 854 end end @@ -726,7 +728,7 @@ inherited fEditorContratoCliente: TfEditorContratoCliente Left = 0 Top = 0 Width = 858 - Height = 445 + Height = 443 Align = alClient Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -737,14 +739,14 @@ inherited fEditorContratoCliente: TfEditorContratoCliente TabOrder = 0 ReadOnly = False ExplicitWidth = 858 - ExplicitHeight = 445 + ExplicitHeight = 443 inherited TBXDock: TTBXDock Width = 858 ExplicitWidth = 858 end inherited ListView1: TListView Width = 858 - Height = 422 + Height = 418 ExplicitWidth = 858 ExplicitHeight = 422 end @@ -757,6 +759,7 @@ inherited fEditorContratoCliente: TfEditorContratoCliente end inherited PnlComentario: TPanel Width = 872 + ExplicitTop = 78 ExplicitWidth = 872 inherited lbComentario: TLabel Width = 862 @@ -863,6 +866,7 @@ inherited fEditorContratoCliente: TfEditorContratoCliente ExplicitLeft = 203 end inherited cbRecargoEquivalencia: TcxDBCheckBox + Enabled = False ExplicitWidth = 219 Width = 219 end @@ -886,6 +890,10 @@ inherited fEditorContratoCliente: TfEditorContratoCliente Visible = False end end + inherited dxLayoutControl1Item16: TdxLayoutItem + Enabled = False + Visible = False + end end end end diff --git a/Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.dfm b/Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.dfm index c129386..164d72e 100644 --- a/Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.dfm +++ b/Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.dfm @@ -213,6 +213,10 @@ inherited frViewContratosCliente: TfrViewContratosCliente Caption = 'Factura/s asociada/s' DataBinding.FieldName = 'FACTURA_ASOCIADA' end + object cxGridViewFORMA_PAGO: TcxGridDBColumn + Caption = 'Forma pago' + DataBinding.FieldName = 'FORMA_PAGO' + end end inherited cxGridLevel: TcxGridLevel Caption = 'Todos' diff --git a/Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.pas b/Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.pas index 957c6d4..c758d2c 100644 --- a/Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.pas +++ b/Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.pas @@ -67,6 +67,7 @@ type cxGridViewIMPORTE_DESCUENTO: TcxGridDBColumn; cxGridViewIMPORTE_NETO: TcxGridDBColumn; cxGridViewFECHA_ULT_PRESENTACION_CLIENTE: TcxGridDBColumn; + cxGridViewFORMA_PAGO: TcxGridDBColumn; procedure cxGridActiveTabChanged(Sender: TcxCustomGrid; ALevel: TcxGridLevel); procedure cxGridViewStylesGetContentStyle(Sender: TcxCustomGridTableView; diff --git a/Source/Modulos/Facturas de cliente/Data/uDataModuleFacturasCliente.dfm b/Source/Modulos/Facturas de cliente/Data/uDataModuleFacturasCliente.dfm index 66e3934..c8d7db7 100644 --- a/Source/Modulos/Facturas de cliente/Data/uDataModuleFacturasCliente.dfm +++ b/Source/Modulos/Facturas de cliente/Data/uDataModuleFacturasCliente.dfm @@ -230,6 +230,11 @@ inherited DataModuleFacturasCliente: TDataModuleFacturasCliente DisplayLabel = 'FacturasCliente_ID_FORMA_PAGO' DictionaryEntry = 'FacturasCliente_ID_FORMA_PAGO' end + item + Name = 'REF_FORMA_PAGO' + DataType = datString + Size = 255 + end item Name = 'RECARGO_EQUIVALENCIA' DataType = datSmallInt diff --git a/Source/Modulos/Facturas de cliente/Model/schFacturasClienteClient_Intf.pas b/Source/Modulos/Facturas de cliente/Model/schFacturasClienteClient_Intf.pas index ce9e786..2c6dcbb 100644 --- a/Source/Modulos/Facturas de cliente/Model/schFacturasClienteClient_Intf.pas +++ b/Source/Modulos/Facturas de cliente/Model/schFacturasClienteClient_Intf.pas @@ -9,9 +9,9 @@ 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_ListaAnosFacturas = '{01C99D6F-78B2-4E5F-B7F8-D9956D0AE8D4}'; - RID_FacturasCliente = '{78230E46-9D32-4F95-BED8-F15B9AE4D5F8}'; - RID_FacturasCliente_Detalles = '{01FA3B03-4B5B-4FB4-8724-A89BF09A75EF}'; + RID_ListaAnosFacturas = '{C20CF57F-5920-416F-9249-367A4691A064}'; + RID_FacturasCliente = '{C27622E4-449D-4D51-A938-F95AFFB07A9F}'; + RID_FacturasCliente_Detalles = '{0DB3EB96-08FF-4251-A5E1-82746147F81E}'; { Data table names } nme_ListaAnosFacturas = 'ListaAnosFacturas'; @@ -58,6 +58,7 @@ const fld_FacturasClienteFECHA_MODIFICACION = 'FECHA_MODIFICACION'; fld_FacturasClienteUSUARIO = 'USUARIO'; fld_FacturasClienteID_FORMA_PAGO = 'ID_FORMA_PAGO'; + fld_FacturasClienteREF_FORMA_PAGO = 'REF_FORMA_PAGO'; fld_FacturasClienteRECARGO_EQUIVALENCIA = 'RECARGO_EQUIVALENCIA'; fld_FacturasClienteID_TIPO_IVA = 'ID_TIPO_IVA'; fld_FacturasClienteIMPORTE_NETO = 'IMPORTE_NETO'; @@ -114,27 +115,28 @@ const idx_FacturasClienteFECHA_MODIFICACION = 30; idx_FacturasClienteUSUARIO = 31; idx_FacturasClienteID_FORMA_PAGO = 32; - idx_FacturasClienteRECARGO_EQUIVALENCIA = 33; - idx_FacturasClienteID_TIPO_IVA = 34; - idx_FacturasClienteIMPORTE_NETO = 35; - idx_FacturasClienteIMPORTE_PORTE = 36; - idx_FacturasClienteID_AGENTE = 37; - idx_FacturasClienteREFERENCIA_COMISION = 38; - idx_FacturasClienteIGNORAR_CONTABILIDAD = 39; - idx_FacturasClienteID_TIENDA = 40; - idx_FacturasClienteTIENDA = 41; - idx_FacturasClienteID_SUBCUENTA = 42; - idx_FacturasClienteSUBCUENTA = 43; - idx_FacturasClienteID_EJERCICIO = 44; - idx_FacturasClienteESTADO_EJERCICIO = 45; - idx_FacturasClienteASIENTO_PUNTEADO = 46; - idx_FacturasClienteID_CONTRATO = 47; - idx_FacturasClienteREF_CONTRATO = 48; - idx_FacturasClienteVENDEDOR = 49; - idx_FacturasClienteSIN_COMISION = 50; - idx_FacturasClienteTIPO_FACTURA = 51; - idx_FacturasClienteLISTA_NOMBRES = 52; - idx_FacturasClientePROCEDENCIA_CLIENTE = 53; + idx_FacturasClienteREF_FORMA_PAGO = 33; + idx_FacturasClienteRECARGO_EQUIVALENCIA = 34; + idx_FacturasClienteID_TIPO_IVA = 35; + idx_FacturasClienteIMPORTE_NETO = 36; + idx_FacturasClienteIMPORTE_PORTE = 37; + idx_FacturasClienteID_AGENTE = 38; + idx_FacturasClienteREFERENCIA_COMISION = 39; + idx_FacturasClienteIGNORAR_CONTABILIDAD = 40; + idx_FacturasClienteID_TIENDA = 41; + idx_FacturasClienteTIENDA = 42; + idx_FacturasClienteID_SUBCUENTA = 43; + idx_FacturasClienteSUBCUENTA = 44; + idx_FacturasClienteID_EJERCICIO = 45; + idx_FacturasClienteESTADO_EJERCICIO = 46; + idx_FacturasClienteASIENTO_PUNTEADO = 47; + idx_FacturasClienteID_CONTRATO = 48; + idx_FacturasClienteREF_CONTRATO = 49; + idx_FacturasClienteVENDEDOR = 50; + idx_FacturasClienteSIN_COMISION = 51; + idx_FacturasClienteTIPO_FACTURA = 52; + idx_FacturasClienteLISTA_NOMBRES = 53; + idx_FacturasClientePROCEDENCIA_CLIENTE = 54; { FacturasCliente_Detalles fields } fld_FacturasCliente_DetallesID = 'ID'; @@ -171,7 +173,7 @@ const type { IListaAnosFacturas } IListaAnosFacturas = interface(IDAStronglyTypedDataTable) - ['{80613B96-203D-4FEF-9621-DA0D5B02C3CD}'] + ['{0DFD9CF9-9ACC-4CAB-AAA5-EA74D23016DE}'] { Property getters and setters } function GetANOValue: String; procedure SetANOValue(const aValue: String); @@ -206,7 +208,7 @@ type { IFacturasCliente } IFacturasCliente = interface(IDAStronglyTypedDataTable) - ['{E065EEAD-79C9-48AA-8A3E-A7DD626FC162}'] + ['{08554CA8-CD1B-493A-BEC1-5945282D8408}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -339,6 +341,10 @@ type procedure SetID_FORMA_PAGOValue(const aValue: Integer); function GetID_FORMA_PAGOIsNull: Boolean; procedure SetID_FORMA_PAGOIsNull(const aValue: Boolean); + function GetREF_FORMA_PAGOValue: String; + procedure SetREF_FORMA_PAGOValue(const aValue: String); + function GetREF_FORMA_PAGOIsNull: Boolean; + procedure SetREF_FORMA_PAGOIsNull(const aValue: Boolean); function GetRECARGO_EQUIVALENCIAValue: SmallInt; procedure SetRECARGO_EQUIVALENCIAValue(const aValue: SmallInt); function GetRECARGO_EQUIVALENCIAIsNull: Boolean; @@ -492,6 +498,8 @@ type property USUARIOIsNull: Boolean read GetUSUARIOIsNull write SetUSUARIOIsNull; property ID_FORMA_PAGO: Integer read GetID_FORMA_PAGOValue write SetID_FORMA_PAGOValue; property ID_FORMA_PAGOIsNull: Boolean read GetID_FORMA_PAGOIsNull write SetID_FORMA_PAGOIsNull; + property REF_FORMA_PAGO: String read GetREF_FORMA_PAGOValue write SetREF_FORMA_PAGOValue; + property REF_FORMA_PAGOIsNull: Boolean read GetREF_FORMA_PAGOIsNull write SetREF_FORMA_PAGOIsNull; property RECARGO_EQUIVALENCIA: SmallInt read GetRECARGO_EQUIVALENCIAValue write SetRECARGO_EQUIVALENCIAValue; property RECARGO_EQUIVALENCIAIsNull: Boolean read GetRECARGO_EQUIVALENCIAIsNull write SetRECARGO_EQUIVALENCIAIsNull; property ID_TIPO_IVA: Integer read GetID_TIPO_IVAValue write SetID_TIPO_IVAValue; @@ -674,6 +682,10 @@ type procedure SetID_FORMA_PAGOValue(const aValue: Integer); virtual; function GetID_FORMA_PAGOIsNull: Boolean; virtual; procedure SetID_FORMA_PAGOIsNull(const aValue: Boolean); virtual; + function GetREF_FORMA_PAGOValue: String; virtual; + procedure SetREF_FORMA_PAGOValue(const aValue: String); virtual; + function GetREF_FORMA_PAGOIsNull: Boolean; virtual; + procedure SetREF_FORMA_PAGOIsNull(const aValue: Boolean); virtual; function GetRECARGO_EQUIVALENCIAValue: SmallInt; virtual; procedure SetRECARGO_EQUIVALENCIAValue(const aValue: SmallInt); virtual; function GetRECARGO_EQUIVALENCIAIsNull: Boolean; virtual; @@ -826,6 +838,8 @@ type property USUARIOIsNull: Boolean read GetUSUARIOIsNull write SetUSUARIOIsNull; property ID_FORMA_PAGO: Integer read GetID_FORMA_PAGOValue write SetID_FORMA_PAGOValue; property ID_FORMA_PAGOIsNull: Boolean read GetID_FORMA_PAGOIsNull write SetID_FORMA_PAGOIsNull; + property REF_FORMA_PAGO: String read GetREF_FORMA_PAGOValue write SetREF_FORMA_PAGOValue; + property REF_FORMA_PAGOIsNull: Boolean read GetREF_FORMA_PAGOIsNull write SetREF_FORMA_PAGOIsNull; property RECARGO_EQUIVALENCIA: SmallInt read GetRECARGO_EQUIVALENCIAValue write SetRECARGO_EQUIVALENCIAValue; property RECARGO_EQUIVALENCIAIsNull: Boolean read GetRECARGO_EQUIVALENCIAIsNull write SetRECARGO_EQUIVALENCIAIsNull; property ID_TIPO_IVA: Integer read GetID_TIPO_IVAValue write SetID_TIPO_IVAValue; @@ -877,7 +891,7 @@ type { IFacturasCliente_Detalles } IFacturasCliente_Detalles = interface(IDAStronglyTypedDataTable) - ['{22259244-690D-4493-A734-5B3D8C2ECB2D}'] + ['{14D5D2ED-02F4-44DC-899A-29119D36FD90}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -1814,6 +1828,27 @@ begin DataTable.Fields[idx_FacturasClienteID_FORMA_PAGO].AsVariant := Null; end; +function TFacturasClienteDataTableRules.GetREF_FORMA_PAGOValue: String; +begin + result := DataTable.Fields[idx_FacturasClienteREF_FORMA_PAGO].AsString; +end; + +procedure TFacturasClienteDataTableRules.SetREF_FORMA_PAGOValue(const aValue: String); +begin + DataTable.Fields[idx_FacturasClienteREF_FORMA_PAGO].AsString := aValue; +end; + +function TFacturasClienteDataTableRules.GetREF_FORMA_PAGOIsNull: boolean; +begin + result := DataTable.Fields[idx_FacturasClienteREF_FORMA_PAGO].IsNull; +end; + +procedure TFacturasClienteDataTableRules.SetREF_FORMA_PAGOIsNull(const aValue: Boolean); +begin + if aValue then + DataTable.Fields[idx_FacturasClienteREF_FORMA_PAGO].AsVariant := Null; +end; + function TFacturasClienteDataTableRules.GetRECARGO_EQUIVALENCIAValue: SmallInt; begin result := DataTable.Fields[idx_FacturasClienteRECARGO_EQUIVALENCIA].AsSmallInt; diff --git a/Source/Modulos/Facturas de cliente/Model/schFacturasClienteServer_Intf.pas b/Source/Modulos/Facturas de cliente/Model/schFacturasClienteServer_Intf.pas index fec22a4..d621efc 100644 --- a/Source/Modulos/Facturas de cliente/Model/schFacturasClienteServer_Intf.pas +++ b/Source/Modulos/Facturas de cliente/Model/schFacturasClienteServer_Intf.pas @@ -9,14 +9,14 @@ 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_ListaAnosFacturasDelta = '{3852FAEA-64F2-4C8F-9FDF-E08A357F1861}'; - RID_FacturasClienteDelta = '{07651992-560F-432E-8583-EEEAAAA10E52}'; - RID_FacturasCliente_DetallesDelta = '{9385E500-5ECA-4B3A-8906-5660B5DB9309}'; + RID_ListaAnosFacturasDelta = '{BC4B775B-C16B-48D3-B40F-B9684CDD9839}'; + RID_FacturasClienteDelta = '{AAE0C12B-EEB0-41BD-9374-D2492F491485}'; + RID_FacturasCliente_DetallesDelta = '{DEF2FAAB-FA4A-4478-B582-9F32D15AE44E}'; type { IListaAnosFacturasDelta } IListaAnosFacturasDelta = interface(IListaAnosFacturas) - ['{3852FAEA-64F2-4C8F-9FDF-E08A357F1861}'] + ['{BC4B775B-C16B-48D3-B40F-B9684CDD9839}'] { Property getters and setters } function GetOldANOValue : String; @@ -50,7 +50,7 @@ type { IFacturasClienteDelta } IFacturasClienteDelta = interface(IFacturasCliente) - ['{07651992-560F-432E-8583-EEEAAAA10E52}'] + ['{AAE0C12B-EEB0-41BD-9374-D2492F491485}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_EMPRESAValue : Integer; @@ -85,6 +85,7 @@ type function GetOldFECHA_MODIFICACIONValue : DateTime; function GetOldUSUARIOValue : String; function GetOldID_FORMA_PAGOValue : Integer; + function GetOldREF_FORMA_PAGOValue : String; function GetOldRECARGO_EQUIVALENCIAValue : SmallInt; function GetOldID_TIPO_IVAValue : Integer; function GetOldIMPORTE_NETOValue : Currency; @@ -141,6 +142,7 @@ type property OldFECHA_MODIFICACION : DateTime read GetOldFECHA_MODIFICACIONValue; property OldUSUARIO : String read GetOldUSUARIOValue; property OldID_FORMA_PAGO : Integer read GetOldID_FORMA_PAGOValue; + property OldREF_FORMA_PAGO : String read GetOldREF_FORMA_PAGOValue; property OldRECARGO_EQUIVALENCIA : SmallInt read GetOldRECARGO_EQUIVALENCIAValue; property OldID_TIPO_IVA : Integer read GetOldID_TIPO_IVAValue; property OldIMPORTE_NETO : Currency read GetOldIMPORTE_NETOValue; @@ -368,6 +370,12 @@ type function GetOldID_FORMA_PAGOIsNull: Boolean; virtual; procedure SetID_FORMA_PAGOValue(const aValue: Integer); virtual; procedure SetID_FORMA_PAGOIsNull(const aValue: Boolean); virtual; + function GetREF_FORMA_PAGOValue: String; virtual; + function GetREF_FORMA_PAGOIsNull: Boolean; virtual; + function GetOldREF_FORMA_PAGOValue: String; virtual; + function GetOldREF_FORMA_PAGOIsNull: Boolean; virtual; + procedure SetREF_FORMA_PAGOValue(const aValue: String); virtual; + procedure SetREF_FORMA_PAGOIsNull(const aValue: Boolean); virtual; function GetRECARGO_EQUIVALENCIAValue: SmallInt; virtual; function GetRECARGO_EQUIVALENCIAIsNull: Boolean; virtual; function GetOldRECARGO_EQUIVALENCIAValue: SmallInt; virtual; @@ -628,6 +636,10 @@ type property ID_FORMA_PAGOIsNull : Boolean read GetID_FORMA_PAGOIsNull write SetID_FORMA_PAGOIsNull; property OldID_FORMA_PAGO : Integer read GetOldID_FORMA_PAGOValue; property OldID_FORMA_PAGOIsNull : Boolean read GetOldID_FORMA_PAGOIsNull; + property REF_FORMA_PAGO : String read GetREF_FORMA_PAGOValue write SetREF_FORMA_PAGOValue; + property REF_FORMA_PAGOIsNull : Boolean read GetREF_FORMA_PAGOIsNull write SetREF_FORMA_PAGOIsNull; + property OldREF_FORMA_PAGO : String read GetOldREF_FORMA_PAGOValue; + property OldREF_FORMA_PAGOIsNull : Boolean read GetOldREF_FORMA_PAGOIsNull; property RECARGO_EQUIVALENCIA : SmallInt read GetRECARGO_EQUIVALENCIAValue write SetRECARGO_EQUIVALENCIAValue; property RECARGO_EQUIVALENCIAIsNull : Boolean read GetRECARGO_EQUIVALENCIAIsNull write SetRECARGO_EQUIVALENCIAIsNull; property OldRECARGO_EQUIVALENCIA : SmallInt read GetOldRECARGO_EQUIVALENCIAValue; @@ -721,7 +733,7 @@ type { IFacturasCliente_DetallesDelta } IFacturasCliente_DetallesDelta = interface(IFacturasCliente_Detalles) - ['{9385E500-5ECA-4B3A-8906-5660B5DB9309}'] + ['{DEF2FAAB-FA4A-4478-B582-9F32D15AE44E}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_FACTURAValue : Integer; @@ -1999,6 +2011,37 @@ begin BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteID_FORMA_PAGO] := Null; end; +function TFacturasClienteBusinessProcessorRules.GetREF_FORMA_PAGOValue: String; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteREF_FORMA_PAGO]; +end; + +function TFacturasClienteBusinessProcessorRules.GetREF_FORMA_PAGOIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteREF_FORMA_PAGO]); +end; + +function TFacturasClienteBusinessProcessorRules.GetOldREF_FORMA_PAGOValue: String; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasClienteREF_FORMA_PAGO]; +end; + +function TFacturasClienteBusinessProcessorRules.GetOldREF_FORMA_PAGOIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasClienteREF_FORMA_PAGO]); +end; + +procedure TFacturasClienteBusinessProcessorRules.SetREF_FORMA_PAGOValue(const aValue: String); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteREF_FORMA_PAGO] := aValue; +end; + +procedure TFacturasClienteBusinessProcessorRules.SetREF_FORMA_PAGOIsNull(const aValue: Boolean); +begin + if aValue then + BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteREF_FORMA_PAGO] := Null; +end; + function TFacturasClienteBusinessProcessorRules.GetRECARGO_EQUIVALENCIAValue: SmallInt; begin result := BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteRECARGO_EQUIVALENCIA]; diff --git a/Source/Modulos/Facturas de cliente/Servidor/srvFacturasCliente_Impl.dfm b/Source/Modulos/Facturas de cliente/Servidor/srvFacturasCliente_Impl.dfm index bae4c1c..12cdf61 100644 --- a/Source/Modulos/Facturas de cliente/Servidor/srvFacturasCliente_Impl.dfm +++ b/Source/Modulos/Facturas de cliente/Servidor/srvFacturasCliente_Impl.dfm @@ -263,6 +263,10 @@ object srvFacturasCliente: TsrvFacturasCliente item DatasetField = 'PROCEDENCIA_CLIENTE' TableField = 'PROCEDENCIA_CLIENTE' + end + item + DatasetField = 'REF_FORMA_PAGO' + TableField = 'REF_FORMA_PAGO' end> end> Name = 'FacturasCliente' @@ -444,6 +448,11 @@ object srvFacturasCliente: TsrvFacturasCliente DataType = datInteger DictionaryEntry = 'FacturasCliente_ID_FORMA_PAGO' end + item + Name = 'REF_FORMA_PAGO' + DataType = datString + Size = 255 + end item Name = 'RECARGO_EQUIVALENCIA' DataType = datSmallInt diff --git a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm index dd43244..66d5cc8 100644 --- a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm +++ b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm @@ -2,18 +2,18 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente Left = 454 Top = 208 Caption = 'Nueva factura de cliente' - ClientHeight = 662 + ClientHeight = 864 ClientWidth = 860 Position = poScreenCenter OnClose = CustomEditorClose - ExplicitWidth = 868 - ExplicitHeight = 696 + ExplicitWidth = 876 + ExplicitHeight = 902 PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader Width = 860 Caption = 'Nueva factura de cliente' - ExplicitTop = 49 + ExplicitTop = 51 ExplicitWidth = 860 inherited Image1: TImage Left = 833 @@ -43,7 +43,7 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente Width = 860 ExplicitWidth = 860 inherited tbxMain: TTBXToolbar - ExplicitWidth = 488 + ExplicitWidth = 518 inherited TBXItem2: TTBXItem Visible = False end @@ -70,7 +70,7 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente end end inherited StatusBar: TJvStatusBar - Top = 643 + Top = 845 Width = 860 Panels = < item @@ -81,20 +81,21 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente end inherited pgPaginas: TPageControl Width = 854 - Height = 368 + Height = 568 OnChanging = pgPaginasChanging + ExplicitTop = 111 ExplicitWidth = 854 - ExplicitHeight = 368 + ExplicitHeight = 366 inherited pagGeneral: TTabSheet ExplicitLeft = 4 ExplicitTop = 24 ExplicitWidth = 846 - ExplicitHeight = 340 + ExplicitHeight = 338 inline frViewFacturaCliente1: TfrViewFacturaCliente Left = 0 Top = 0 Width = 846 - Height = 340 + Height = 540 Align = alClient Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -105,12 +106,12 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente TabOrder = 0 ReadOnly = False ExplicitWidth = 846 - ExplicitHeight = 340 + ExplicitHeight = 338 inherited dxLayoutControl1: TdxLayoutControl Width = 846 - Height = 340 + Height = 540 ExplicitWidth = 846 - ExplicitHeight = 340 + ExplicitHeight = 338 inherited eReferencia: TcxDBTextEdit ExplicitWidth = 159 Width = 159 @@ -172,15 +173,15 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente Width = 276 end inherited edtCodigoPostal: TcxDBTextEdit - Left = 244 + Left = 261 DataBinding.DataSource = dsDataTable Enabled = True Properties.ReadOnly = False - ExplicitLeft = 244 + ExplicitLeft = 261 end inherited Button3: TBitBtn - Left = 134 - ExplicitLeft = 134 + Left = 151 + ExplicitLeft = 151 end inherited cxDBTextEdit1: TcxDBTextEdit ExplicitWidth = 283 @@ -228,15 +229,12 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente object pagContenido: TTabSheet Caption = 'Contenido' ImageIndex = 1 - ExplicitLeft = 0 - ExplicitTop = 0 - ExplicitWidth = 0 - ExplicitHeight = 0 + ExplicitHeight = 338 inline frViewDetallesFacturaCliente1: TfrViewDetallesFacturaCliente Left = 0 Top = 0 Width = 846 - Height = 340 + Height = 540 Align = alClient BiDiMode = bdLeftToRight Font.Charset = DEFAULT_CHARSET @@ -249,7 +247,7 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente TabOrder = 0 ReadOnly = False ExplicitWidth = 846 - ExplicitHeight = 340 + ExplicitHeight = 338 inherited ToolBar1: TToolBar Width = 846 Height = 24 @@ -336,10 +334,10 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente inherited cxGrid: TcxGrid Top = 50 Width = 846 - Height = 290 + Height = 490 ExplicitTop = 50 ExplicitWidth = 846 - ExplicitHeight = 290 + ExplicitHeight = 288 end inherited TBXDock1: TTBXDock Top = 24 @@ -347,7 +345,7 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente ExplicitTop = 24 ExplicitWidth = 846 inherited TBXToolbar1: TTBXToolbar - ExplicitWidth = 548 + ExplicitWidth = 597 end end end @@ -357,6 +355,7 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente Enabled = False ImageIndex = 2 TabVisible = False + ExplicitHeight = 338 inline frViewListaSubcuentas1: TfrViewListaSubcuentas Left = 0 Top = 0 @@ -400,11 +399,16 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente inherited PnlComentario: TPanel Width = 860 TabOrder = 5 + ExplicitTop = 78 ExplicitWidth = 860 + inherited lbComentario: TLabel + Width = 850 + Height = 25 + end end inline frViewTotales1: TfrViewTotales [5] Left = 0 - Top = 480 + Top = 682 Width = 860 Height = 163 Align = alBottom @@ -537,6 +541,7 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente end inherited cbRecargoEquivalencia: TcxDBCheckBox Top = 138 + Enabled = False ExplicitTop = 138 ExplicitWidth = 291 Width = 291 @@ -565,6 +570,10 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente Visible = False end end + inherited dxLayoutControl1Item16: TdxLayoutItem + Enabled = False + Visible = False + end end inherited dxLayoutControl1Group5: TdxLayoutGroup inherited dxLayoutControl1Group3: TdxLayoutGroup diff --git a/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.dfm index 3860f57..c1eefe8 100644 --- a/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.dfm +++ b/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.dfm @@ -1,6 +1,6 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente - Width = 451 - Height = 304 + Width = 1140 + Height = 855 Align = alClient OnCreate = CustomViewCreate OnDestroy = CustomViewDestroy @@ -9,17 +9,19 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente object dxLayoutControl1: TdxLayoutControl Left = 0 Top = 0 - Width = 451 - Height = 304 + Width = 1140 + Height = 855 Align = alClient ParentBackground = True TabOrder = 0 TabStop = False AutoContentSizes = [acsWidth, acsHeight] LookAndFeel = dxLayoutOfficeLookAndFeel1 + ExplicitWidth = 451 + ExplicitHeight = 304 DesignSize = ( - 451 - 304) + 1140 + 855) object eReferencia: TcxDBTextEdit Left = 135 Top = 30 @@ -96,7 +98,7 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente Width = 78 end object bFormasPago: TButton - Left = 311 + Left = 440 Top = 135 Width = 132 Height = 23 @@ -133,7 +135,7 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente end end inline frViewClienteFactura1: TfrViewClienteFactura - Left = 471 + Left = 600 Top = 30 Width = 398 Height = 265 @@ -145,7 +147,7 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente ParentFont = False TabOrder = 9 ReadOnly = False - ExplicitLeft = 471 + ExplicitLeft = 600 ExplicitTop = 30 ExplicitWidth = 398 ExplicitHeight = 265 @@ -175,12 +177,12 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente Width = 276 end inherited edtCodigoPostal: TcxDBTextEdit - Left = 192 - ExplicitLeft = 192 + Left = 426 + ExplicitLeft = 426 end inherited Button3: TBitBtn - Left = 82 - ExplicitLeft = 82 + Left = 316 + ExplicitLeft = 316 end inherited cxDBTextEdit1: TcxDBTextEdit ExplicitWidth = 283 diff --git a/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.dfm index bf49aa1..0535a09 100644 --- a/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.dfm +++ b/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.dfm @@ -192,6 +192,10 @@ inherited frViewFacturasCliente: TfrViewFacturasCliente Caption = 'Procedencia' DataBinding.FieldName = 'PROCEDENCIA_CLIENTE' end + object cxGridViewREF_FORMA_PAGO: TcxGridDBColumn + Caption = 'Forma pago' + DataBinding.FieldName = 'REF_FORMA_PAGO' + end end inherited cxGridLevel: TcxGridLevel Caption = 'Todas' @@ -280,7 +284,6 @@ inherited frViewFacturasCliente: TfrViewFacturasCliente end inherited TBXAlignmentPanel1: TTBXAlignmentPanel Width = 802 - ExplicitTop = 75 ExplicitWidth = 802 inherited tbxBotones: TTBXToolbar Width = 792 diff --git a/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.pas b/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.pas index a2cc15d..0721bea 100644 --- a/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.pas +++ b/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.pas @@ -67,6 +67,7 @@ type cxGridViewLISTA_NOMBRES: TcxGridDBColumn; cxGridViewLOPD: TcxGridDBColumn; cxGridViewPROCEDENCIA_CLIENTE: TcxGridDBColumn; + cxGridViewREF_FORMA_PAGO: TcxGridDBColumn; procedure cxGridViewStylesGetContentStyle(Sender: TcxCustomGridTableView; ARecord: TcxCustomGridRecord; AItem: TcxCustomGridTableItem; out AStyle: TcxStyle); diff --git a/Source/Servidor/FactuGES_Server.dpr b/Source/Servidor/FactuGES_Server.dpr index 666bf75..7947910 100644 --- a/Source/Servidor/FactuGES_Server.dpr +++ b/Source/Servidor/FactuGES_Server.dpr @@ -135,10 +135,10 @@ uses schFormasPagoServer_Intf in '..\Modulos\Formas de pago\Model\schFormasPagoServer_Intf.pas', schPresupuestosClienteClient_Intf in '..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteClient_Intf.pas', schPresupuestosClienteServer_Intf in '..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteServer_Intf.pas', - schFacturasClienteClient_Intf in '..\Modulos\Facturas de cliente\Model\schFacturasClienteClient_Intf.pas', - schFacturasClienteServer_Intf in '..\Modulos\Facturas de cliente\Model\schFacturasClienteServer_Intf.pas', schContratosClienteClient_Intf in '..\Modulos\Contratos de cliente\Model\schContratosClienteClient_Intf.pas', - schContratosClienteServer_Intf in '..\Modulos\Contratos de cliente\Model\schContratosClienteServer_Intf.pas'; + schContratosClienteServer_Intf in '..\Modulos\Contratos de cliente\Model\schContratosClienteServer_Intf.pas', + schFacturasClienteClient_Intf in '..\Modulos\Facturas de cliente\Model\schFacturasClienteClient_Intf.pas', + schFacturasClienteServer_Intf in '..\Modulos\Facturas de cliente\Model\schFacturasClienteServer_Intf.pas'; {$R *.res} {$R ..\Servicios\RODLFile.res} diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj index 0180e2a..7e926a8 100644 --- a/Source/Servidor/FactuGES_Server.dproj +++ b/Source/Servidor/FactuGES_Server.dproj @@ -28,7 +28,7 @@ Delphi.Personality - FalseTrueFalseTrueFalse2320FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.3.2.0FactuGES v2(Servidor)2.3.2.0jueves, 10 de octubre de 2024 18:55 + FalseTrueFalseTrueFalse2330FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.3.3.0FactuGES v2(Servidor)2.3.3.0viernes, 14 de marzo de 2025 16:56 File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found FactuGES_Server.dpr diff --git a/Source/Servidor/FactuGES_Server.res b/Source/Servidor/FactuGES_Server.res index 755bbb3..2bb17e8 100644 Binary files a/Source/Servidor/FactuGES_Server.res and b/Source/Servidor/FactuGES_Server.res differ