From 6e456afc1d1236c5cb76e1ce8d586446c93a27d0 Mon Sep 17 00:00:00 2001 From: david Date: Fri, 5 Jun 2009 15:21:34 +0000 Subject: [PATCH] =?UTF-8?q?-=20En=20los=20informes=20de=20facturas=20de=20?= =?UTF-8?q?proveedores,=20debe=20salir=20la=20columna=20de=20referencia=20?= =?UTF-8?q?de=20factura=20del=20PROVEEDOR.=20-=20Incremento=20a=20versi?= =?UTF-8?q?=C3=B3n=202.3.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://192.168.0.254/svn/Proyectos.Acana_FactuGES2/trunk@423 f4e31baf-9722-1c47-927c-6f952f962d4b --- Source/Cliente/FactuGES.dproj | 6 +-- Source/Cliente/FactuGES.res | Bin 171984 -> 172156 bytes Source/Informes/InformeIVAProveedores.fr3 | 28 +++++++------- .../InformeIVAProveedoresDesglosado.fr3 | 30 +++++++-------- .../InformeListadoFacturasProveedor.fr3 | 32 ++++++++-------- ...ormeListadoFacturasProveedorDesglosado.fr3 | 32 ++++++++-------- ...ormeListadoFacturasProveedorPendientes.fr3 | 32 ++++++++-------- ...oFacturasProveedorPendientesDesglosado.fr3 | 36 +++++++++--------- .../Reports/uRptFacturasProveedor_Server.dfm | 21 ++++++---- Source/Servidor/FactuGES_Server.RES | Bin 23352 -> 23344 bytes Source/Servidor/FactuGES_Server.dproj | 2 +- Source/Servidor/FactuGES_Server.rc | 10 ++--- 12 files changed, 115 insertions(+), 114 deletions(-) diff --git a/Source/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj index db2f769c..cf6227e1 100644 --- a/Source/Cliente/FactuGES.dproj +++ b/Source/Cliente/FactuGES.dproj @@ -53,11 +53,7 @@ Delphi.Personality VCLApplication -FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse2310FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.3.1.0FactuGESFactuGES2.3.1.0 - - - - FactuGES.dprFalse +FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse2330FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.3.3.0FactuGESFactuGES2.3.2.0FactuGES.dprFalse diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res index 16693b55ca73f4c5c98ec13fc3ad3f6166f454d8..fe5fb55506f85deacf49e5f7b9213f85dca1b974 100644 GIT binary patch delta 488 zcmY+9yGjE=6o$W&$HS%1F4vKjHNA2u^4Mhun;rRmZ{31QYjQY)(#*`xola#0uHsB zW#ea9q}Pj`nQ&1UXe0;IsVhgx7ZjQQ&_J8-q25_d$g*OUdq47o>xNDLF)@3AE~qc# z2fDhxA-dw2Cf8hYBOuB%YDm@jhoj%Z>nwc6X@OUN|ZVkcO74nhvIAV5asGL wBxzyW=e~+Kd@dx{lDET^Oq;=a&*F}z%nh4on}w_;xd^5((!Sah($ delta 318 zcmY+9v1-Cl6o$WZj2crZSqd2gB6a8xp<9uPlhCDuyXn@qFhd6)pl~N+$38%J9Xt9A zogI9Df<0+Mff4J8U(z J_xMAf{s0GvDsun; diff --git a/Source/Informes/InformeIVAProveedores.fr3 b/Source/Informes/InformeIVAProveedores.fr3 index c9477ed2..4cb4ada7 100644 --- a/Source/Informes/InformeIVAProveedores.fr3 +++ b/Source/Informes/InformeIVAProveedores.fr3 @@ -1,8 +1,8 @@ - + - + @@ -11,10 +11,10 @@ - + - + @@ -22,28 +22,28 @@ - + - - - + + + - + - + - + @@ -52,16 +52,16 @@ - + - + - + diff --git a/Source/Informes/InformeIVAProveedoresDesglosado.fr3 b/Source/Informes/InformeIVAProveedoresDesglosado.fr3 index 135a5de0..85384f90 100644 --- a/Source/Informes/InformeIVAProveedoresDesglosado.fr3 +++ b/Source/Informes/InformeIVAProveedoresDesglosado.fr3 @@ -1,8 +1,8 @@ - + - + @@ -11,11 +11,11 @@ - + - - + + @@ -24,8 +24,8 @@ - - + + @@ -33,21 +33,21 @@ - + - + - - + + - + @@ -56,16 +56,16 @@ - + - + - + diff --git a/Source/Informes/InformeListadoFacturasProveedor.fr3 b/Source/Informes/InformeListadoFacturasProveedor.fr3 index d11897dd..f210e71b 100644 --- a/Source/Informes/InformeListadoFacturasProveedor.fr3 +++ b/Source/Informes/InformeListadoFacturasProveedor.fr3 @@ -1,8 +1,8 @@ - + - + @@ -11,41 +11,41 @@ - + - + - + - + - + - - + + - + - + - + - + @@ -54,16 +54,16 @@ - + - + - + diff --git a/Source/Informes/InformeListadoFacturasProveedorDesglosado.fr3 b/Source/Informes/InformeListadoFacturasProveedorDesglosado.fr3 index ef349500..06672339 100644 --- a/Source/Informes/InformeListadoFacturasProveedorDesglosado.fr3 +++ b/Source/Informes/InformeListadoFacturasProveedorDesglosado.fr3 @@ -1,8 +1,8 @@ - + - + @@ -11,10 +11,10 @@ - + - + @@ -25,31 +25,31 @@ - + - + - - + + - + - + - - + + - + @@ -58,16 +58,16 @@ - + - + - + diff --git a/Source/Informes/InformeListadoFacturasProveedorPendientes.fr3 b/Source/Informes/InformeListadoFacturasProveedorPendientes.fr3 index 7b934f4d..dcadcced 100644 --- a/Source/Informes/InformeListadoFacturasProveedorPendientes.fr3 +++ b/Source/Informes/InformeListadoFacturasProveedorPendientes.fr3 @@ -1,8 +1,8 @@ - + - + @@ -11,36 +11,36 @@ - + - + - + - + - + - - - + + + - + - + - + @@ -49,16 +49,16 @@ - + - + - + diff --git a/Source/Informes/InformeListadoFacturasProveedorPendientesDesglosado.fr3 b/Source/Informes/InformeListadoFacturasProveedorPendientesDesglosado.fr3 index 1aca6854..68bd7405 100644 --- a/Source/Informes/InformeListadoFacturasProveedorPendientesDesglosado.fr3 +++ b/Source/Informes/InformeListadoFacturasProveedorPendientesDesglosado.fr3 @@ -1,8 +1,8 @@ - + - + @@ -11,40 +11,40 @@ - + - + - + - + - + - - - + + + - + - + - - + + - + @@ -53,16 +53,16 @@ - + - + - + diff --git a/Source/Modulos/Facturas de proveedor/Reports/uRptFacturasProveedor_Server.dfm b/Source/Modulos/Facturas de proveedor/Reports/uRptFacturasProveedor_Server.dfm index 87261808..1a19c569 100644 --- a/Source/Modulos/Facturas de proveedor/Reports/uRptFacturasProveedor_Server.dfm +++ b/Source/Modulos/Facturas de proveedor/Reports/uRptFacturasProveedor_Server.dfm @@ -154,10 +154,10 @@ object RptFacturasProveedor: TRptFacturasProveedor #10'when extract (month from fecha_factura) = 11 then '#39'NOVIEMBRE - ' + #39' || extract (year from fecha_factura)'#10'when extract (month from ' + 'fecha_factura) = 12 then '#39'DICIEMBRE - '#39' || extract (year from fe' + - 'cha_factura)'#10'end as TITULO,'#10'REFERENCIA, ID_PROVEEDOR, NOMBRE, S' + - 'ITUACION, NIF_CIF, FECHA_FACTURA, FECHA_VENCIMIENTO, BASE_IMPONI' + - 'BLE, IMPORTE_IVA, IMPORTE_TOTAL'#10#10'from V_facturas_proveedor'#10'where' + - ' {where}'#10'order by ANO, MES, NOMBRE'#10#10 + '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 StatementType = stSQL ColumnMappings = < item @@ -218,6 +218,10 @@ object RptFacturasProveedor: TRptFacturasProveedor item DatasetField = 'FECHA_VENCIMIENTO' TableField = 'FECHA_VENCIMIENTO' + end + item + DatasetField = 'REFERENCIA_PROVEEDOR' + TableField = 'REFERENCIA_PROVEEDOR' end> end> Name = 'ListadoFacturasProveedor' @@ -244,6 +248,11 @@ object RptFacturasProveedor: TRptFacturasProveedor DataType = datString Size = 255 end + item + Name = 'REFERENCIA_PROVEEDOR' + DataType = datString + Size = 255 + end item Name = 'ID_PROVEEDOR' DataType = datInteger @@ -594,8 +603,6 @@ 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 @@ -639,8 +646,6 @@ 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/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES index 7f699fafa2da223159bb5971b02f012153a452fa..9e878f80b9385a63ee4f974c272e4db8d48fab7a 100644 GIT binary patch delta 135 zcmdn7jd24I-HBi{nS3`w9!UO;Fy&-sU}j)qU|?XLY#k}fIB9ZZq%vdP zQPteW40;R(K=~vF#mU`K^0tW#MGPejsSL#oIt&U7Mhs>^G6l$2V8~@iWT<4whx3hq U`V1H>fqX+CX$9g3us7$;jt$}-NH92u$1ST?yfvYpXz zGHX;dw;_Wbg8@)Ji$QgAca*$qCc{gHB8Fs!e1;r`REA;(9R>vkLk3eInF8c1FeEZ0 e0p&A+vM>=Npnd}eORzdK1}g?*2II-kqdWnOtRPYV diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj index 7ed2b821..477c96f7 100644 --- a/Source/Servidor/FactuGES_Server.dproj +++ b/Source/Servidor/FactuGES_Server.dproj @@ -28,7 +28,7 @@ Delphi.Personality - FalseTrueFalseTrueFalse2310FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.3.1.0FactuGES (Servidor)2.3.1.0miércoles, 11 de marzo de 2009 16:18 + FalseTrueFalseTrueFalse2330FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.3.3.0FactuGES (Servidor)2.3.3.0martes, 28 de abril de 2009 19:48 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 01a674f2..39661196 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" 1 VERSIONINFO -FILEVERSION 2,3,1,0 -PRODUCTVERSION 2,3,1,0 +FILEVERSION 2,3,3,0 +PRODUCTVERSION 2,3,3,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.3.0\0" VALUE "ProductName", "FactuGES (Servidor)\0" - VALUE "ProductVersion", "2.3.1.0\0" - VALUE "CompileDate", "miércoles, 15 de abril de 2009 16:33\0" + VALUE "ProductVersion", "2.3.3.0\0" + VALUE "CompileDate", "martes, 26 de mayo de 2009 19:00\0" END END BLOCK "VarFileInfo"