diff --git a/Build/Build.fbl6 b/Build/Build.fbl6 index 34e9056..5dfb45f 100644 Binary files a/Build/Build.fbl6 and b/Build/Build.fbl6 differ diff --git a/Source/Cliente/FactuGES.dpr b/Source/Cliente/FactuGES.dpr index e443745..93ec023 100644 --- a/Source/Cliente/FactuGES.dpr +++ b/Source/Cliente/FactuGES.dpr @@ -1,7 +1,7 @@ program FactuGES; uses - ExceptionLog, +// ExceptionLog, Forms, Windows, SysUtils, diff --git a/Source/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj index c136bd1..69da050 100644 --- a/Source/Cliente/FactuGES.dproj +++ b/Source/Cliente/FactuGES.dproj @@ -54,7 +54,7 @@ Delphi.Personality VCLApplication -FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse1000FalseFalseFalseFalseFalse30821252Rodax Software S.L.1.0.0.0FactuGES1.0.0.0FactuGES.dprFalse +FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse1010FalseFalseFalseFalseFalse30821252Rodax Software S.L.1.0.1.0FactuGES1.0.1.0FactuGES.dprFalse diff --git a/Source/Cliente/FactuGES.rc b/Source/Cliente/FactuGES.rc index 7123305..e883881 100644 --- a/Source/Cliente/FactuGES.rc +++ b/Source/Cliente/FactuGES.rc @@ -1,7 +1,7 @@ MAINICON ICON "C:\Codigo Noviseda\Resources\Iconos\Factuges.ico" 1 VERSIONINFO -FILEVERSION 1,0,0,0 -PRODUCTVERSION 1,0,0,0 +FILEVERSION 1,0,1,0 +PRODUCTVERSION 1,0,1,0 FILEFLAGSMASK 0x3FL FILEFLAGS 0x00L FILEOS 0x40004L @@ -13,9 +13,9 @@ BEGIN BLOCK "0C0A04E4" BEGIN VALUE "CompanyName", "Rodax Software S.L.\0" - VALUE "FileVersion", "1.0.0.0\0" + VALUE "FileVersion", "1.0.1.0\0" VALUE "InternalName", "FactuGES\0" - VALUE "ProductVersion", "1.0.0.0\0" + VALUE "ProductVersion", "1.0.1.0\0" END END BLOCK "VarFileInfo" diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res index ef36764..955a536 100644 Binary files a/Source/Cliente/FactuGES.res and b/Source/Cliente/FactuGES.res differ diff --git a/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.dfm b/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.dfm index c9c47f5..45bb52a 100644 --- a/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.dfm +++ b/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.dfm @@ -95,6 +95,10 @@ inherited frViewRecibosCliente: TfrViewRecibosCliente DataBinding.FieldName = 'FECHA_VENCIMIENTO' Width = 40 end + object cxGridViewFORMA_PAGO_FACTURA: TcxGridDBColumn + Caption = 'Forma de pago' + DataBinding.FieldName = 'FORMA_PAGO_FACTURA' + end object cxGridViewDESCRIPCION: TcxGridDBColumn Caption = 'Descripci'#243'n' DataBinding.FieldName = 'DESCRIPCION' @@ -173,18 +177,22 @@ inherited frViewRecibosCliente: TfrViewRecibosCliente Width = 531 ExplicitWidth = 531 inherited txtFiltroTodo: TcxTextEdit + Left = 161 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' + ExplicitLeft = 161 ExplicitWidth = 434 Width = 434 end inherited edtFechaIniFiltro: TcxDateEdit + Left = 161 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' + ExplicitLeft = 161 ExplicitWidth = 195 Width = 195 end diff --git a/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.pas b/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.pas index 6354839..8736dfd 100644 --- a/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.pas +++ b/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.pas @@ -52,6 +52,7 @@ type cxGridViewREFERENCIA_REC_COMPENSADO: TcxGridDBColumn; cxGridViewID_RECIBO_COMPENSADO: TcxGridDBColumn; cxGridViewDATOS_BANCARIOS: TcxGridDBColumn; + cxGridViewFORMA_PAGO_FACTURA: TcxGridDBColumn; procedure cxGridViewICONOCustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean); diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES index d41f6eb..573c801 100644 Binary files a/Source/Servidor/FactuGES_Server.RES and b/Source/Servidor/FactuGES_Server.RES differ diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj index ba19229..1ce8697 100644 --- a/Source/Servidor/FactuGES_Server.dproj +++ b/Source/Servidor/FactuGES_Server.dproj @@ -35,7 +35,7 @@ Delphi.Personality - FalseTrueFalse/standaloneTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0lunes, 01 de febrero de 2010 9:47FactuGES_Server.dpr + FalseTrueFalse/standaloneTrueFalse1010FalseFalseFalseFalseFalse308212521.0.1.01.0.1.0viernes, 12 de febrero de 2010 9:47FactuGES_Server.dpr diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc index db5f678..04c991f 100644 --- a/Source/Servidor/FactuGES_Server.rc +++ b/Source/Servidor/FactuGES_Server.rc @@ -1,7 +1,7 @@ MAINICON ICON "C:\Codigo Noviseda\Resources\Iconos\Servidor.ico" 1 VERSIONINFO -FILEVERSION 1,0,0,0 -PRODUCTVERSION 1,0,0,0 +FILEVERSION 1,0,1,0 +PRODUCTVERSION 1,0,1,0 FILEFLAGSMASK 0x3FL FILEFLAGS 0x00L FILEOS 0x40004L @@ -12,9 +12,9 @@ BEGIN BEGIN BLOCK "0C0A04E4" BEGIN - VALUE "FileVersion", "1.0.0.0\0" - VALUE "ProductVersion", "1.0.0.0\0" - VALUE "CompileDate", "viernes, 05 de febrero de 2010 17:26\0" + VALUE "FileVersion", "1.0.1.0\0" + VALUE "ProductVersion", "1.0.1.0\0" + VALUE "CompileDate", "viernes, 12 de febrero de 2010 10:26\0" END END BLOCK "VarFileInfo"