diff --git a/Build/Installer.fbpInf b/Build/Installer.fbpInf index 528efe61..a2881ebf 100644 --- a/Build/Installer.fbpInf +++ b/Build/Installer.fbpInf @@ -6,7 +6,7 @@ - + @@ -14,8 +14,8 @@ - 00:00:00 - 30/12/1899 + 00:00:44 + 06/02/2013 11:10:03 True diff --git a/Build/Installer.fbz6 b/Build/Installer.fbz6 index d503aad6..7f39bdeb 100644 Binary files a/Build/Installer.fbz6 and b/Build/Installer.fbz6 differ diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj index e9a6bf9b..22517df8 100644 --- a/Source/Base/Base.dproj +++ b/Source/Base/Base.dproj @@ -54,57 +54,57 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
fConfigurarConexion
diff --git a/Source/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj index a940aadb..b2821c2d 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\TrueFalse1950FalseFalseFalseFalseFalse30821252Rodax Software S.L.1.9.5.0FactuGESFactuGES1.9.5.0FactuGES.dprFalse +FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse1970FalseFalseFalseFalseFalse30821252Rodax Software S.L.1.9.7.0FactuGESFactuGES1.9.7.0FactuGES.dprFalse diff --git a/Source/Cliente/FactuGES.rc b/Source/Cliente/FactuGES.rc index eb303991..f8fa7e53 100644 --- a/Source/Cliente/FactuGES.rc +++ b/Source/Cliente/FactuGES.rc @@ -1,7 +1,7 @@ MAINICON ICON "C:\Codigo tecsitel\Resources\Iconos\Factuges.ico" 1 VERSIONINFO -FILEVERSION 1,9,5,0 -PRODUCTVERSION 1,9,5,0 +FILEVERSION 1,9,6,0 +PRODUCTVERSION 1,9,6,0 FILEFLAGSMASK 0x3FL FILEFLAGS 0x00L FILEOS 0x40004L @@ -13,10 +13,10 @@ BEGIN BLOCK "0C0A04E4" BEGIN VALUE "CompanyName", "Rodax Software S.L.\0" - VALUE "FileVersion", "1.9.5.0\0" + VALUE "FileVersion", "1.9.6.0\0" VALUE "InternalName", "FactuGES\0" VALUE "ProductName", "FactuGES\0" - VALUE "ProductVersion", "1.9.5.0\0" + VALUE "ProductVersion", "1.9.6.0\0" END END BLOCK "VarFileInfo" diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res index 6ded508b..6ec0223e 100644 Binary files a/Source/Cliente/FactuGES.res and b/Source/Cliente/FactuGES.res differ diff --git a/Source/Informes/3/InfFacturaCliente.fr3 b/Source/Informes/3/InfFacturaCliente.fr3 index 08fd59fb..1e2b3934 100644 --- a/Source/Informes/3/InfFacturaCliente.fr3 +++ b/Source/Informes/3/InfFacturaCliente.fr3 @@ -1,5 +1,5 @@ - + @@ -29,14 +29,14 @@ - - - - - + + + + + - - + + @@ -46,15 +46,15 @@ - - - - - + + + + + - + diff --git a/Source/Informes/3/InfPresupuestoCliente.fr3 b/Source/Informes/3/InfPresupuestoCliente.fr3 index eeb3623d..4f103399 100644 --- a/Source/Informes/3/InfPresupuestoCliente.fr3 +++ b/Source/Informes/3/InfPresupuestoCliente.fr3 @@ -1,5 +1,5 @@ - + @@ -18,7 +18,7 @@ - + @@ -37,14 +37,14 @@ - + - + - - - + + + @@ -55,9 +55,9 @@ - + - + @@ -78,7 +78,7 @@ - + diff --git a/Source/Informes/3/InfReciboCliente.fr3 b/Source/Informes/3/InfReciboCliente.fr3 new file mode 100644 index 00000000..31551e12 --- /dev/null +++ b/Source/Informes/3/InfReciboCliente.fr3 @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Source/Modulos/Presupuestos de cliente/Reports/uRptWordPresupuestoCliente.pas b/Source/Modulos/Presupuestos de cliente/Reports/uRptWordPresupuestoCliente.pas index 1e4976b2..d561be8f 100644 --- a/Source/Modulos/Presupuestos de cliente/Reports/uRptWordPresupuestoCliente.pas +++ b/Source/Modulos/Presupuestos de cliente/Reports/uRptWordPresupuestoCliente.pas @@ -116,8 +116,9 @@ begin FWordApp.SaveActiveDocAs(FNombreFichero); try - if not RellenarPortada then - RaiseError('Se producido un error al generar la portada del informe en MS Word.'); + if (tbl_Cabecera.FieldByName('ID_EMPRESA').AsInteger <> 3) then + if not RellenarPortada then + RaiseError('Se producido un error al generar la portada del informe en MS Word.'); if not RellenarCabecera then RaiseError('Se producido un error al generar la cabecera del informe en MS Word.'); @@ -309,24 +310,30 @@ begin FWordApp.InsertFile(NombreFichero, 'Notas'); SysUtils.DeleteFile(NombreFichero); - ReplaceBookmark('NombreEmpresaPortada', tbl_Empresa.FieldByName('NOMBRE').AsString); - ReplaceBookmark('DireccionEmpresaPortada', - Format('%s. %s %s', [tbl_Empresa.FieldByName('CALLE').AsString, - tbl_Empresa.FieldByName('CODIGO_POSTAL').AsString, tbl_Empresa.FieldByName('POBLACION').AsString])); - ReplaceBookmark('TelefonoEmpresaPortada', tbl_Empresa.FieldByName('TELEFONO_1').AsString); - ReplaceBookmark('FaxEmpresaPortada', tbl_Empresa.FieldByName('FAX').AsString); - ReplaceBookmark('CorreoEmpresaPortada', tbl_Empresa.FieldByName('EMAIL_1').AsString); - + if (tbl_Cabecera.FieldByName('ID_EMPRESA').AsInteger <> 3) then + begin + ReplaceBookmark('NombreEmpresaPortada', tbl_Empresa.FieldByName('NOMBRE').AsString); + ReplaceBookmark('DireccionEmpresaPortada', + Format('%s. %s %s', [tbl_Empresa.FieldByName('CALLE').AsString, + tbl_Empresa.FieldByName('CODIGO_POSTAL').AsString, tbl_Empresa.FieldByName('POBLACION').AsString])); + ReplaceBookmark('TelefonoEmpresaPortada', tbl_Empresa.FieldByName('TELEFONO_1').AsString); + ReplaceBookmark('FaxEmpresaPortada', tbl_Empresa.FieldByName('FAX').AsString); + ReplaceBookmark('CorreoEmpresaPortada', tbl_Empresa.FieldByName('EMAIL_1').AsString); + end; + ReplaceBookmark('NombreEmpresa', tbl_Empresa.FieldByName('NOMBRE').AsString); ReplaceBookmark('CifEmpresa', tbl_Empresa.FieldByName('NIF_CIF').AsString); ReplaceBookmark('DireccionEmpresa', Format('%s. %s %s', [tbl_Empresa.FieldByName('CALLE').AsString, tbl_Empresa.FieldByName('CODIGO_POSTAL').AsString, tbl_Empresa.FieldByName('POBLACION').AsString])); ReplaceBookmark('TelefonoEmpresa', tbl_Empresa.FieldByName('TELEFONO_1').AsString); - ReplaceBookmark('FaxEmpresa', tbl_Empresa.FieldByName('FAX').AsString); - ReplaceBookmark('CorreoEmpresa', tbl_Empresa.FieldByName('EMAIL_1').AsString); - ReplaceBookmark('NombreEmpresaFirma', tbl_Empresa.FieldByName('NOMBRE').AsString); + if (tbl_Cabecera.FieldByName('ID_EMPRESA').AsInteger <> 3) then + begin + ReplaceBookmark('FaxEmpresa', tbl_Empresa.FieldByName('FAX').AsString); + ReplaceBookmark('CorreoEmpresa', tbl_Empresa.FieldByName('EMAIL_1').AsString); + ReplaceBookmark('NombreEmpresaFirma', tbl_Empresa.FieldByName('NOMBRE').AsString); + end; end; Result := True; diff --git a/Source/Modulos/Recibos de cliente/Reports/uRptRecibosCliente_Server.dfm b/Source/Modulos/Recibos de cliente/Reports/uRptRecibosCliente_Server.dfm index d0144255..62e0c9bc 100644 --- a/Source/Modulos/Recibos de cliente/Reports/uRptRecibosCliente_Server.dfm +++ b/Source/Modulos/Recibos de cliente/Reports/uRptRecibosCliente_Server.dfm @@ -207,8 +207,6 @@ object RptRecibosCliente: TRptRecibosCliente RemoteFetchEnabled = False LocalSchema = schReport LocalDataStreamer = Bin2DataStreamer - DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch] - MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] LogicalName = 'Informe_Cabecera' IndexDefs = <> Left = 264 @@ -1179,7 +1177,7 @@ object RptRecibosCliente: TRptRecibosCliente Top = 158 end object frxReport: TfrxReport - Version = '4.3' + Version = '4.7.71' DotMatrixReport = False EngineOptions.DoublePass = True IniFile = '\Software\Fast Reports' @@ -1187,17 +1185,67 @@ object RptRecibosCliente: TRptRecibosCliente PreviewOptions.Zoom = 1.000000000000000000 PrintOptions.Printer = 'Por defecto' PrintOptions.PrintOnSheet = 0 - ReportOptions.CreateDate = 37800.807714351900000000 - ReportOptions.LastChange = 39840.717636527780000000 + ReportOptions.CreateDate = 39065.872423495400000000 + ReportOptions.LastChange = 41330.513803576390000000 ScriptLanguage = 'PascalScript' ScriptText.Strings = ( - 'procedure frxReportOnStartReport(Sender: TfrxComponent);' + '' + 'procedure DatosEmpresaOnBeforePrint(Sender: TfrxComponent);' + 'var' + ' Cadena: String;' 'begin' - ' Set('#39'Pagina'#39', 0);' - ' Set('#39'TotalPaginas'#39', 0); ' + '{ DatosEmpresa.Lines.Clear;' + ' if ( <> '#39#39') then' + ' Cadena := '#39'TLF: '#39' + ;' + ' if ( <> '#39#39') then' + + ' Cadena := Cadena + '#39' FAX: '#39' + ;' + ' DatosEmpresa.Lines.Add(Cadena);' + '}' 'end;' '' - 'procedure Band1OnBeforePrint(Sender: TfrxComponent);' + 'procedure NombreEmpresaOnBeforePrint(Sender: TfrxComponent);' + 'begin' + '{ NombreEmpresa.Lines.Clear;' + ' NombreEmpresa.Lines.Add();' + '}' + 'end;' + '' + 'procedure DireccionEnvioOnBeforePrint(Sender: TfrxComponent);' + 'var' + ' ACadena : String;' + 'begin' + '{ ACadena := '#39#39';' + ' DireccionEnvio.Lines.Clear;' + ' if ( <> '#39#39') then' + ' ACadena := ;' + '' + ' if ( <> '#39#39') then' + + ' ACadena := ACadena + '#39' '#39' + ;' + '' + ' DireccionEnvio.Lines.Add(ACadena);' + ' ACadena := '#39#39';' + ' DireccionEnvio.Lines.Add();' + ' if ( <> '#39#39') then' + ' ACadena := + '#39' '#39';' + ' if ( <> '#39#39') then' + ' ACadena := ACadena + ;' + '' + ' if (ACadena <> '#39#39') then' + ' DireccionEnvio.Lines.Add(ACadena);' + '' + ' if ( <> '#39#39') then' + ' DireccionEnvio.Lines.Add();' + '' + ' if ( <> '#39#39') then' + ' DireccionEnvio.Lines.Add();' + '}' + 'end;' + '' + 'procedure PageHeader1OnBeforePrint(Sender: TfrxComponent);' 'begin' ' if not Engine.FinalPass then' ' Set('#39'TotalPaginas'#39', ( + 1));' @@ -1206,26 +1254,137 @@ object RptRecibosCliente: TRptRecibosCliente ' Set('#39'Pagina'#39', ( + 1)); ' 'end;' '' - 'procedure mContinuaOnBeforePrint(Sender: TfrxComponent);' + 'procedure frxReportOnStartReport(Sender: TfrxComponent);' 'begin' - ' if Engine.FinalPass then' - ' begin' + ' Set('#39'Pagina'#39', 0);' + ' Set('#39'TotalPaginas'#39', 0);' + ' Set('#39'Capitulo'#39', 0);' + ' Set('#39'NumCapitulos'#39', 0); ' + 'end;' + '' + 'procedure Memo4OnBeforePrint(Sender: TfrxComponent);' + 'begin' + ' if (Length() = 0) then' + ' Memo4.Visible := False; ' + 'end;' + '' + 'procedure Memo22OnBeforePrint(Sender: TfrxComponent);' + 'begin' + ' if ( = 0) then' + ' begin ' + ' Subtotal.Text := '#39'Base imponible:'#39';' + ' BaseImponible.Text := '#39'Importe total:'#39'; ' + ' BaseImponible.Font.Style := fsBold;' + '' - ' //A la vez que salta este salta la asignacion de pagina por ' + - 'lo que no coincide nunca si no suponemos +1 ' + + ' ImpBaseImponible.Text := FormatFloat('#39'#,##0.00 '#8364#39', );' + ' ImpBaseImponible.Font.Style := fsBold; ' + ' ' + + ' Descuento.Text := (FormatFloat('#39'#,##0.00 %'#39', ) + '#39' IVA:'#39');' + + ' ImpDescuento.Text := FormatFloat('#39'#,##0.00 '#8364#39', );' + '// Memo11.Color := $00CCFFCC;' + '' + ' if ( > 0) then' + ' begin ' + ' BaseImponible.Text := '#39'Total certificaci'#243'n:'#39';' + + ' IVA.Text := FormatFloat('#39'#,##0.00 %'#39',) + '#39' Retenci'#243'n:'#39'; ' + + ' ImpIVA.Text := FormatFloat('#39'-#,##0.00 '#8364#39',);' + + ' ImporteTotal.Text := '#39'TOTAL FACTURA'#39'; ' + ' ' + - ' ' + - ' ' + - ' ' - ' if (( + 1) = ) then' - ' begin ' - ' mContinua.Visible := True;' - ' end ' - ' else' - ' begin ' - ' mContinua.Visible := False;' - ' end ' - ' end; ' + ' ' + + ' ImpImporteTotal.Text := FormatFloat('#39'#,##0.00 '#8364#39', ( - ' + + ')); ' + ' end ' + ' else' + ' begin' + ' IVA.Visible := False;' + ' ImpIVA.Visible := False;' + ' ImporteTotal.Visible := False;' + ' ImpImporteTotal.Visible := False;' + '// Memo16.Visible := False; ' + '// Memo17.Visible := False;' + ' end;' + ' end' + ' else' + ' begin ' + ' if ( > 0) then' + ' begin' + ' ImporteTotal.Text := '#39'Total certificaci'#243'n:'#39'; ' + ' Retencion.Visible := True;' + ' ImpRetencion.Visible := True;' + '// LinRetencion.Visible := True; ' + ' TotalFacturaRet.Visible := True;' + ' ImpTotalFacturaRet.Visible := True;' + '// LinImporteTotalFacturaRet.Visible := True; ' + ' end' + ' end ' + 'end;' + '' + 'procedure Memo39OnBeforePrint(Sender: TfrxComponent);' + 'begin' + ' Memo25.Clear; ' + ' if ( = '#39'F'#39') then' + + ' Memo25.Text := '#39'FACTURA'#39' ' + + ' ' + ' else' + ' Memo25.Text := '#39'ABONO'#39'; ' + 'end;' + '' + 'procedure Picture4OnBeforePrint(Sender: TfrxComponent);' + 'begin' + ' if ( = 1) then' + ' Picture4.Visible := True' + ' else' + ' Picture4.Visible := False; ' + 'end;' + '' + 'procedure eCopiaOnBeforePrint(Sender: TfrxComponent);' + 'begin' + ' if ( = 1) then' + ' eCopia.Visible := True' + ' else' + ' eCopia.Visible := False; ' + 'end;' + '' + + 'procedure frxDBDetallesCANTIDADOnBeforePrint(Sender: TfrxCompone' + + 'nt);' + 'var ' + ' ACantidad: String; ' + ' AIndice: Integer;' + ' AText : String; ' + 'begin' + ' frxDBDetallesCANTIDAD.Memo.Clear; ' + ' ACantidad := FloatToStr();' + ' if ACantidad = '#39'0'#39' then' + ' AText := '#39#39 + ' else begin ' + ' AIndice := Pos('#39','#39', ACantidad);' + + ' if AIndice > 0 then ' + + ' ' + + ' AText := '#39'[FormatFloat('#39#39'#,##0.00'#39#39',)] [frxDBDetalles."UNIDAD_MEDIDA"]'#39 + ' else ' + + ' AText := '#39'[FormatFloat('#39#39'#,##0.##'#39#39',)] [frxDBDetalles."UNIDAD_MEDIDA"]'#39'; ' + ' end; ' + ' frxDBDetallesCANTIDAD.Memo.Add(AText);' 'end;' '' 'begin' @@ -1241,6 +1400,7 @@ object RptRecibosCliente: TRptRecibosCliente UserName = 'frxDBCabecera' CloseDataSource = False DataSource = DADataCabecera + BCDToCurrency = False Left = 264 Top = 16 end @@ -1254,6 +1414,7 @@ object RptRecibosCliente: TRptRecibosCliente UserName = 'frxDBCompensados' CloseDataSource = False DataSource = DADataCompensados + BCDToCurrency = False Left = 360 Top = 16 end @@ -1286,8 +1447,6 @@ object RptRecibosCliente: TRptRecibosCliente RemoteFetchEnabled = False LocalSchema = schReport LocalDataStreamer = Bin2DataStreamer - DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch] - MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] LogicalName = 'Informe_Compensados' IndexDefs = <> Left = 360 @@ -1351,8 +1510,6 @@ object RptRecibosCliente: TRptRecibosCliente RemoteFetchEnabled = False LocalSchema = schReport LocalDataStreamer = Bin2DataStreamer - DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch] - MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] LogicalName = 'InformeListadoRecibos' IndexDefs = <> Left = 496 @@ -1368,6 +1525,7 @@ object RptRecibosCliente: TRptRecibosCliente UserName = 'frxDBInformeListadoRecibos' CloseDataSource = False DataSource = DADSInformeListadoRecibos + BCDToCurrency = False Left = 496 Top = 16 end @@ -1379,6 +1537,7 @@ object RptRecibosCliente: TRptRecibosCliente UserName = 'frxDBInformeListadoRecibosResumen' CloseDataSource = False DataSource = DADSInformeListadoRecibosResumen + BCDToCurrency = False Left = 504 Top = 192 end @@ -1396,8 +1555,6 @@ object RptRecibosCliente: TRptRecibosCliente LogChanges = False StreamingOptions = [soDisableEventsWhileStreaming] RemoteFetchEnabled = False - DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch] - MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] IndexDefs = <> Left = 504 Top = 304 @@ -1406,6 +1563,7 @@ object RptRecibosCliente: TRptRecibosCliente UserName = 'frxDBInformeListadoRecibosPendientes' CloseDataSource = False DataSource = DADSInformeListadoRecibosPendientes + BCDToCurrency = False Left = 704 Top = 16 end @@ -1482,8 +1640,6 @@ object RptRecibosCliente: TRptRecibosCliente RemoteFetchEnabled = False LocalSchema = schReport LocalDataStreamer = Bin2DataStreamer - DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch] - MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] LogicalName = 'InformeListadoRecibosPendientes' IndexDefs = <> Left = 704 @@ -1493,6 +1649,7 @@ object RptRecibosCliente: TRptRecibosCliente UserName = 'frxDBInformeListadoRecibosPendResumen' CloseDataSource = False DataSource = DADSInformeListadoRecibosPendResumen + BCDToCurrency = False Left = 704 Top = 192 end @@ -1510,8 +1667,6 @@ object RptRecibosCliente: TRptRecibosCliente LogChanges = False StreamingOptions = [soDisableEventsWhileStreaming] RemoteFetchEnabled = False - DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch] - MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] IndexDefs = <> Left = 704 Top = 304 diff --git a/Source/Modulos/Remesas de cliente/Views/uEditorRemesasCliente.dfm b/Source/Modulos/Remesas de cliente/Views/uEditorRemesasCliente.dfm index 1e1350b3..34cb7383 100644 --- a/Source/Modulos/Remesas de cliente/Views/uEditorRemesasCliente.dfm +++ b/Source/Modulos/Remesas de cliente/Views/uEditorRemesasCliente.dfm @@ -45,7 +45,7 @@ inherited fEditorRemesasCliente: TfEditorRemesasCliente Width = 785 ExplicitWidth = 785 inherited tbxMain: TTBXToolbar - ExplicitWidth = 785 + ExplicitWidth = 704 object TBXSeparatorItem17: TTBXSeparatorItem [12] end end diff --git a/Source/Modulos/Remesas de cliente/Views/uEditorRemesasCliente.pas b/Source/Modulos/Remesas de cliente/Views/uEditorRemesasCliente.pas index 135f4767..aaa161a9 100644 --- a/Source/Modulos/Remesas de cliente/Views/uEditorRemesasCliente.pas +++ b/Source/Modulos/Remesas de cliente/Views/uEditorRemesasCliente.pas @@ -111,6 +111,8 @@ begin if not ViewGrid.esSeleccionCeldaDatos then inherited else + inherited; +{ begin Respuesta := JsImprimirDialog.Execute; if Respuesta <> IDCANCEL then @@ -134,6 +136,7 @@ begin end; end; end; +} end; function TfEditorRemesasCliente.GetController: IRemesasClienteController; @@ -185,6 +188,8 @@ begin if not ViewGrid.esSeleccionCeldaDatos then inherited else + inherited; +{ begin Respuesta := JsPrevisualizarDialog.Execute; if Respuesta <> IDCANCEL then @@ -208,6 +213,7 @@ begin end; end; end; +} end; procedure TfEditorRemesasCliente.RefrescarInterno; diff --git a/Source/Modulos/Remesas de proveedor/Views/uEditorRemesasProveedor.dfm b/Source/Modulos/Remesas de proveedor/Views/uEditorRemesasProveedor.dfm index f62799dd..8ddf580c 100644 --- a/Source/Modulos/Remesas de proveedor/Views/uEditorRemesasProveedor.dfm +++ b/Source/Modulos/Remesas de proveedor/Views/uEditorRemesasProveedor.dfm @@ -43,7 +43,7 @@ inherited fEditorRemesasProveedor: TfEditorRemesasProveedor Width = 820 ExplicitWidth = 820 inherited tbxMain: TTBXToolbar - ExplicitWidth = 809 + ExplicitWidth = 704 object TBXSeparatorItem17: TTBXSeparatorItem [12] end end diff --git a/Source/Modulos/Remesas de proveedor/Views/uEditorRemesasProveedor.pas b/Source/Modulos/Remesas de proveedor/Views/uEditorRemesasProveedor.pas index ea9c01bc..f00b23c2 100644 --- a/Source/Modulos/Remesas de proveedor/Views/uEditorRemesasProveedor.pas +++ b/Source/Modulos/Remesas de proveedor/Views/uEditorRemesasProveedor.pas @@ -111,6 +111,8 @@ begin if not ViewGrid.esSeleccionCeldaDatos then inherited else + inherited; +{ begin Respuesta := JsImprimirDialog.Execute; if Respuesta <> IDCANCEL then @@ -134,6 +136,7 @@ begin end; end; end; +} end; function TfEditorRemesasProveedor.GetController: IRemesasProveedorController; @@ -185,6 +188,8 @@ begin if not ViewGrid.esSeleccionCeldaDatos then inherited else + inherited; +{ begin Respuesta := JsPrevisualizarDialog.Execute; if Respuesta <> IDCANCEL then @@ -208,6 +213,7 @@ begin end; end; end; +} end; procedure TfEditorRemesasProveedor.RefrescarInterno; diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES index 501df49f..e849401f 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 2f3b8b84..55ee3b33 100644 --- a/Source/Servidor/FactuGES_Server.dproj +++ b/Source/Servidor/FactuGES_Server.dproj @@ -1,334 +1,335 @@ - + - - {ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1} - FactuGES_Server.dpr - Debug - AnyCPU - DCC32 - ..\..\Output\Debug\Servidor\FactuGES_Server.exe - vcl;rtl;vclx;vclactnband;dbrtl;vcldb;vcldbx;bdertl;dsnap;dsnapcon;teeUI;teedb;tee;adortl;vclib;ibxpress;dbxcds;dbexpress;DbxCommonDriver;IndyCore;IndySystem;IndyProtocols;VclSmp;vclie;webdsnap;xmlrtl;inet;inetdbbde;inetdbxpress;RemObjects_BPDX_D11;RemObjects_RODX_D11;RemObjects_Indy_D11;RemObjects_Synapse_D11;RemObjects_WebBroker_D11;DataAbstract_Core_D11;DataAbstract_DBXDriver_D11;DataAbstract_IDE_D11;DataAbstract_Scripting_D11;DataAbstract_SDACDriver_D11;sdac105;dac105;DataAbstract_SQLiteDriver_D11;cxEditorsD10;cxLibraryD10;dxThemeD10;cxDataD10;cxExtEditorsD10;cxGridD10;cxPageControlD10;cxSchedulerD10;cxTreeListD10;cxVerticalGridD10;dxBarD10;dxComnD10;dxBarDBNavD10;dxBarExtDBItemsD10;dxBarExtItemsD10;dxDockingD10;dxLayoutControlD10;dxNavBarD10;dxPSCoreD10;dxsbD10;dxPScxCommonD10;dxPSLnksD10;vclshlctrls;dxPScxExtCommonD10;dxPScxGridLnkD10;dxPScxPCProdD10;dxPScxScheduler2LnkD10;dxPScxTLLnkD10;dxPSdxLCLnkD10;dxPsPrVwAdvD10;pckMD5;pckUCDataConnector;pckUserControl_RT;PluginSDK_D10R;PNG_D10;PngComponentsD10;tb2k_d10;tbx_d10;JclVcl;Jcl;JvXPCtrlsD11R;JvCoreD11R;JvSystemD11R;JvStdCtrlsD11R;JvAppFrmD11R;JvBandsD11R;JvDBD11R;JvDlgsD11R;JvBDED11R;JvCmpD11R;JvCryptD11R;JvCtrlsD11R;JvCustomD11R;JvDockingD11R;JvDotNetCtrlsD11R;JvEDID11R;JvGlobusD11R;JvHMID11R;JvInterpreterD11R;JvJansD11R;JvManagedThreadsD11R;JvMMD11R;JvNetD11R;JvPageCompsD11R;JvPluginD11R;JvPrintPreviewD11R;JvRuntimeDesignD11R;JvTimeFrameworkD11R;JvUIBD11R;JvValidatorsD11R;JvWizardD11R;pckUCADOConn;pckUCBDEConn;pckUCIBXConn;pckUCMidasConn;cxIntlPrintSys3D10;cxExportD10;cxIntl5D10;GUISDK_D11R;ccpackD11;JSDialog100;fsTee11;fs11;frx11;frxADO11;frxBDE11;frxDB11;frxDBX11;frxe11;frxIBX11;frxTee11;fsADO11;fsBDE11;fsDB11;fsIBX11;websnap;soaprtl;IntrawebDB_90_100;Intraweb_90_100 - - - 7.0 - False - False - 0 - 3 - ..\..\Output\Release\Servidor - RELEASE - - - 7.0 - 3 - ..\..\Output\Debug\Servidor - DEBUG; - True - True - True - C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 - C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 - C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 - C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 - - - Delphi.Personality - - - FalseTrueFalse/standaloneTrueFalse1940FalseFalseFalseFalseFalse308212521.9.4.01.9.4.0martes, 22 de noviembre de 2011 10:27 - ExpressPrinting System by Developer Express Inc. - FactuGES_Server.dpr - - - - - MainSource - - - - - -
srvEmpresas
- TDARemoteService - - -
srvProvinciasPoblaciones_Impl
- TDataModule - - - - -
srvUsuarios
- TDataAbstractService - - - - - - - - -
RptAlbaranesCliente
- TDataModule - - -
RptWordAlbaranCliente
- TDataModule - - -
srvAlbaranesCliente
- TDataAbstractService - - - - - -
RptAlbaranesProveedor
- TDataModule - - -
RptWordAlbaranProveedor
- TDataModule - - -
srvAlbaranesProveedor
- TDataAbstractService - - - - -
srvAlmacenes
- TDARemoteService - - - - - -
srvArticulos
- TDARemoteService - - - - - - - - -
RptEtiquetasContacto
- TDataModule - - -
RptFichasEmpleado
- TDataModule - - -
srvContactos
- TDARemoteService - - - - -
srvFabricantes
- TDataAbstractService - - - - - -
RptFacturasCliente
- TDataModule - - -
RptWordFacturaCliente
- TDataModule - - -
srvFacturasCliente
- TDataAbstractService - - - - - -
RptFacturasProveedor
- TDataModule - - -
srvFacturasProveedor
- TDataAbstractService - - - - -
srvFamilias
- TDataAbstractService - - - - -
srvFormasPago
- TDataAbstractService - - -
srvGestorDocumentos
- TDataAbstractService - - -
srvGestorInformes
- TDataAbstractService - - - - -
srvHistoricoMovimientos
- TDataAbstractService - - - - -
srvInventario
- TDataAbstractService - - - - - -
srvObras
- TDataAbstractService - - - - - -
RptPedidosProveedor
- TDataModule - - -
RptWordPedidoProveedor
- TDataModule - - -
srvPedidosProveedor
- TDataAbstractService - - - - - -
RptPresupuestosCliente
- TDataModule - - -
RptWordCertificadoTrabajo
- TDataModule - - -
RptWordPresupuestoCliente
- TDataModule - - -
srvPresupuestosCliente
- TDataAbstractService - - - - -
RptRecibosCliente
- TDataModule - - -
srvRecibosCliente
- TDataAbstractService - - - - -
RptRecibosProveedor
- TDataModule - - -
srvRecibosProveedor
- TDataAbstractService - - - - -
srvReferencias
- TDataAbstractService - - - - - -
srvRemesasCliente
- TDataAbstractService - - - - - -
srvRemesasProveedor
- TDataAbstractService - - - - -
srvTiposIVA
- TDataAbstractService - - - - -
srvUnidadesMedida
- TDataAbstractService - - - - -
srvConfiguracion
- TDataAbstractService - - -
frConexionBD
- TFrame - - -
frConfGeneral
- TFrame - - -
fConfiguracion
- TForm - - -
FrameConfiguracion
- TFrame - - -
srvLogin
- TDARemoteService - - -
fAcercaDe
- - -
dmServer
- TDataModule - - -
fServerForm
- - - - - - - - - - - - + + {ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1} + FactuGES_Server.dpr + Debug + AnyCPU + DCC32 + ..\..\Output\Debug\Servidor\FactuGES_Server.exe + vcl;rtl;vclx;vclactnband;dbrtl;vcldb;vcldbx;bdertl;dsnap;dsnapcon;teeUI;teedb;tee;adortl;vclib;ibxpress;dbxcds;dbexpress;DbxCommonDriver;IndyCore;IndySystem;IndyProtocols;VclSmp;vclie;webdsnap;xmlrtl;inet;inetdbbde;inetdbxpress;RemObjects_BPDX_D11;RemObjects_RODX_D11;RemObjects_Indy_D11;RemObjects_Synapse_D11;RemObjects_WebBroker_D11;DataAbstract_Core_D11;DataAbstract_DBXDriver_D11;DataAbstract_IDE_D11;DataAbstract_Scripting_D11;DataAbstract_SDACDriver_D11;sdac105;dac105;DataAbstract_SQLiteDriver_D11;cxEditorsD10;cxLibraryD10;dxThemeD10;cxDataD10;cxExtEditorsD10;cxGridD10;cxPageControlD10;cxSchedulerD10;cxTreeListD10;cxVerticalGridD10;dxBarD10;dxComnD10;dxBarDBNavD10;dxBarExtDBItemsD10;dxBarExtItemsD10;dxDockingD10;dxLayoutControlD10;dxNavBarD10;dxPSCoreD10;dxsbD10;dxPScxCommonD10;dxPSLnksD10;vclshlctrls;dxPScxExtCommonD10;dxPScxGridLnkD10;dxPScxPCProdD10;dxPScxScheduler2LnkD10;dxPScxTLLnkD10;dxPSdxLCLnkD10;dxPsPrVwAdvD10;pckMD5;pckUCDataConnector;pckUserControl_RT;PluginSDK_D10R;PNG_D10;PngComponentsD10;tb2k_d10;tbx_d10;JclVcl;Jcl;JvXPCtrlsD11R;JvCoreD11R;JvSystemD11R;JvStdCtrlsD11R;JvAppFrmD11R;JvBandsD11R;JvDBD11R;JvDlgsD11R;JvBDED11R;JvCmpD11R;JvCryptD11R;JvCtrlsD11R;JvCustomD11R;JvDockingD11R;JvDotNetCtrlsD11R;JvEDID11R;JvGlobusD11R;JvHMID11R;JvInterpreterD11R;JvJansD11R;JvManagedThreadsD11R;JvMMD11R;JvNetD11R;JvPageCompsD11R;JvPluginD11R;JvPrintPreviewD11R;JvRuntimeDesignD11R;JvTimeFrameworkD11R;JvUIBD11R;JvValidatorsD11R;JvWizardD11R;pckUCADOConn;pckUCBDEConn;pckUCIBXConn;pckUCMidasConn;cxIntlPrintSys3D10;cxExportD10;cxIntl5D10;GUISDK_D11R;ccpackD11;JSDialog100;fsTee11;fs11;frx11;frxADO11;frxBDE11;frxDB11;frxDBX11;frxe11;frxIBX11;frxTee11;fsADO11;fsBDE11;fsDB11;fsIBX11;websnap;soaprtl;IntrawebDB_90_100;Intraweb_90_100 + + + 7.0 + False + False + 0 + 3 + ..\..\Output\Release\Servidor + RELEASE + + + 7.0 + 3 + ..\..\Output\Debug\Servidor + DEBUG; + True + True + True + C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 + C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 + C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 + C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 + + + Delphi.Personality + + +FalseTrueFalse/standaloneTrueFalse1970FalseFalseFalseFalseFalse308212521.9.7.01.9.7.0lunes, 25 de febrero de 2013 12:25 + + ExpressPrinting System by Developer Express Inc. + FactuGES_Server.dpr + + + + + MainSource + + + + + +
srvEmpresas
+ TDARemoteService + + +
srvProvinciasPoblaciones_Impl
+ TDataModule + + + + +
srvUsuarios
+ TDataAbstractService + + + + + + + + +
RptAlbaranesCliente
+ TDataModule + + +
RptWordAlbaranCliente
+ TDataModule + + +
srvAlbaranesCliente
+ TDataAbstractService + + + + + +
RptAlbaranesProveedor
+ TDataModule + + +
RptWordAlbaranProveedor
+ TDataModule + + +
srvAlbaranesProveedor
+ TDataAbstractService + + + + +
srvAlmacenes
+ TDARemoteService + + + + + +
srvArticulos
+ TDARemoteService + + + + + + + + +
RptEtiquetasContacto
+ TDataModule + + +
RptFichasEmpleado
+ TDataModule + + +
srvContactos
+ TDARemoteService + + + + +
srvFabricantes
+ TDataAbstractService + + + + + +
RptFacturasCliente
+ TDataModule + + +
RptWordFacturaCliente
+ TDataModule + + +
srvFacturasCliente
+ TDataAbstractService + + + + + +
RptFacturasProveedor
+ TDataModule + + +
srvFacturasProveedor
+ TDataAbstractService + + + + +
srvFamilias
+ TDataAbstractService + + + + +
srvFormasPago
+ TDataAbstractService + + +
srvGestorDocumentos
+ TDataAbstractService + + +
srvGestorInformes
+ TDataAbstractService + + + + +
srvHistoricoMovimientos
+ TDataAbstractService + + + + +
srvInventario
+ TDataAbstractService + + + + + +
srvObras
+ TDataAbstractService + + + + + +
RptPedidosProveedor
+ TDataModule + + +
RptWordPedidoProveedor
+ TDataModule + + +
srvPedidosProveedor
+ TDataAbstractService + + + + + +
RptPresupuestosCliente
+ TDataModule + + +
RptWordCertificadoTrabajo
+ TDataModule + + +
RptWordPresupuestoCliente
+ TDataModule + + +
srvPresupuestosCliente
+ TDataAbstractService + + + + +
RptRecibosCliente
+ TDataModule + + +
srvRecibosCliente
+ TDataAbstractService + + + + +
RptRecibosProveedor
+ TDataModule + + +
srvRecibosProveedor
+ TDataAbstractService + + + + +
srvReferencias
+ TDataAbstractService + + + + + +
srvRemesasCliente
+ TDataAbstractService + + + + + +
srvRemesasProveedor
+ TDataAbstractService + + + + +
srvTiposIVA
+ TDataAbstractService + + + + +
srvUnidadesMedida
+ TDataAbstractService + + + + +
srvConfiguracion
+ TDataAbstractService + + +
frConexionBD
+ TFrame + + +
frConfGeneral
+ TFrame + + +
fConfiguracion
+ TForm + + +
FrameConfiguracion
+ TFrame + + +
srvLogin
+ TDARemoteService + + +
fAcercaDe
+ + +
dmServer
+ TDataModule + + +
fServerForm
+ + + + + + + + + + + +