diff --git a/Build/Build.fbv b/Build/Build.fbv index 91cd1a8f..4ea3cb87 100644 --- a/Build/Build.fbv +++ b/Build/Build.fbv @@ -1 +1 @@ - + diff --git a/Build/Installer.fbv b/Build/Installer.fbv index 91cd1a8f..4ea3cb87 100644 --- a/Build/Installer.fbv +++ b/Build/Installer.fbv @@ -1 +1 @@ - + diff --git a/Database/ACANA.FDB b/Database/ACANA.FDB index 45a1fcc5..feea0a5d 100644 Binary files a/Database/ACANA.FDB and b/Database/ACANA.FDB differ diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj index de550ec9..5f8005d3 100644 --- a/Source/Base/Base.dproj +++ b/Source/Base/Base.dproj @@ -58,52 +58,52 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - -
fConfigurarConexion
TForm diff --git a/Source/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj index cf6227e1..b7448f9b 100644 --- a/Source/Cliente/FactuGES.dproj +++ b/Source/Cliente/FactuGES.dproj @@ -53,7 +53,7 @@ Delphi.Personality VCLApplication -FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse2330FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.3.3.0FactuGESFactuGES2.3.2.0FactuGES.dprFalse +FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse2340FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.3.4.0FactuGESFactuGES2.3.4.0FactuGES.dprFalse diff --git a/Source/Cliente/FactuGES.rc b/Source/Cliente/FactuGES.rc index 21853333..553201c2 100644 --- a/Source/Cliente/FactuGES.rc +++ b/Source/Cliente/FactuGES.rc @@ -1,7 +1,7 @@ -MAINICON ICON "C:\Codigo Acana\Resources\Iconos\Factuges.ico" +MAINICON ICON "C:\Codigo\Resources\Iconos\Factuges.ico" 1 VERSIONINFO -FILEVERSION 2,3,1,0 -PRODUCTVERSION 2,3,1,0 +FILEVERSION 2,3,4,0 +PRODUCTVERSION 2,3,4,0 FILEFLAGSMASK 0x3FL FILEFLAGS 0x00L FILEOS 0x40004L @@ -13,10 +13,10 @@ BEGIN BLOCK "0C0A04E4" BEGIN VALUE "CompanyName", "Rodax Software S.L.\0" - VALUE "FileVersion", "2.3.1.0\0" + VALUE "FileVersion", "2.3.4.0\0" VALUE "InternalName", "FactuGES\0" VALUE "ProductName", "FactuGES\0" - VALUE "ProductVersion", "2.3.1.0\0" + VALUE "ProductVersion", "2.3.4.0\0" END END BLOCK "VarFileInfo" diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res index fe5fb555..a9e78344 100644 Binary files a/Source/Cliente/FactuGES.res and b/Source/Cliente/FactuGES.res differ diff --git a/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.dfm b/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.dfm index f36caf2f..992e35bc 100644 --- a/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.dfm +++ b/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.dfm @@ -478,7 +478,7 @@ object RptFacturasCliente: TRptFacturasCliente 'cha_factura)'#10'end as TITULO,'#10'REFERENCIA, ID_CLIENTE, NOMBRE, SIT' + 'UACION, NIF_CIF, FECHA_FACTURA, BASE_IMPONIBLE, IMPORTE_IVA, IMP' + 'ORTE_TOTAL'#10#10'from V_facturas_cliente'#10'where {where}'#10'order by ANO, ' + - 'MES, NOMBRE'#10#10 + 'MES, FECHA_FACTURA, NOMBRE'#10#10 StatementType = stSQL ColumnMappings = < item diff --git a/Source/Modulos/Facturas de proveedor/Reports/uRptFacturasProveedor_Server.dfm b/Source/Modulos/Facturas de proveedor/Reports/uRptFacturasProveedor_Server.dfm index 1a19c569..1dcaf27e 100644 --- a/Source/Modulos/Facturas de proveedor/Reports/uRptFacturasProveedor_Server.dfm +++ b/Source/Modulos/Facturas de proveedor/Reports/uRptFacturasProveedor_Server.dfm @@ -157,7 +157,8 @@ object RptFacturasProveedor: TRptFacturasProveedor 'cha_factura)'#10'end as TITULO,'#10'REFERENCIA, REFERENCIA_PROVEEDOR, ID' + '_PROVEEDOR, NOMBRE, SITUACION, NIF_CIF,'#10'FECHA_FACTURA, FECHA_VEN' + 'CIMIENTO, BASE_IMPONIBLE, IMPORTE_IVA, IMPORTE_TOTAL'#10#10'from V_fac' + - 'turas_proveedor'#10'where {where}'#10'order by ANO, MES, NOMBRE'#10#10 + 'turas_proveedor'#10'where {where}'#10'order by ANO, MES, FECHA_FACTURA, ' + + 'OMBRE'#10#10 StatementType = stSQL ColumnMappings = < item @@ -603,6 +604,8 @@ object RptFacturasProveedor: TRptFacturasProveedor RemoteFetchEnabled = False LocalSchema = schReport LocalDataStreamer = Bin2DataStreamer + DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch] + MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] LogicalName = 'ListadoFacturasProveedor' IndexDefs = <> Left = 464 @@ -646,6 +649,8 @@ object RptFacturasProveedor: TRptFacturasProveedor LogChanges = False StreamingOptions = [soDisableEventsWhileStreaming] RemoteFetchEnabled = False + DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch] + MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] IndexDefs = <> Left = 648 Top = 136 diff --git a/Source/Servicios/RODLFILE.res b/Source/Servicios/RODLFILE.res index 374f56b4..bb90bf08 100644 Binary files a/Source/Servicios/RODLFILE.res and b/Source/Servicios/RODLFILE.res differ diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES index 9e878f80..e3a60680 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 477c96f7..c24951be 100644 --- a/Source/Servidor/FactuGES_Server.dproj +++ b/Source/Servidor/FactuGES_Server.dproj @@ -28,7 +28,7 @@ Delphi.Personality - FalseTrueFalseTrueFalse2330FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.3.3.0FactuGES (Servidor)2.3.3.0martes, 28 de abril de 2009 19:48 + FalseTrueFalseTrueFalse2340FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.3.4.0FactuGES (Servidor)2.3.4.0lunes, 08 de junio de 2009 9:55 RemObjects Pascal Script - RemObjects SDK 3.0 Integration FactuGES_Server.dpr diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc index 39661196..b66dfabd 100644 --- a/Source/Servidor/FactuGES_Server.rc +++ b/Source/Servidor/FactuGES_Server.rc @@ -1,7 +1,7 @@ -MAINICON ICON "C:\Codigo Acana\Resources\Iconos\Servidor.ico" +MAINICON ICON "C:\Codigo\Resources\Iconos\Servidor.ico" 1 VERSIONINFO -FILEVERSION 2,3,3,0 -PRODUCTVERSION 2,3,3,0 +FILEVERSION 2,3,4,0 +PRODUCTVERSION 2,3,4,0 FILEFLAGSMASK 0x3FL FILEFLAGS 0x00L FILEOS 0x40004L @@ -13,10 +13,10 @@ BEGIN BLOCK "0C0A04E4" BEGIN VALUE "CompanyName", "Rodax Software S.L.\0" - VALUE "FileVersion", "2.3.3.0\0" + VALUE "FileVersion", "2.3.4.0\0" VALUE "ProductName", "FactuGES (Servidor)\0" - VALUE "ProductVersion", "2.3.3.0\0" - VALUE "CompileDate", "martes, 26 de mayo de 2009 19:00\0" + VALUE "ProductVersion", "2.3.4.0\0" + VALUE "CompileDate", "lunes, 08 de junio de 2009 10:45\0" END END BLOCK "VarFileInfo"