Tecistel/Tecsitel_FactuGES2
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Incremento de versión

Browse Source 
- Ocultar la columna 'ID_ARTICULO' en el grid de precios de la ficha de un artículo
- Confirmar al usuario que se han generado los certificados de trabajos cuando he terminado bien el proceso desde la ficha de un presupuesto.


git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@511 0c75b7a4-871f-7646-8a2f-f78d34cc349f
This commit is contained in:
David Arranz 2008-08-08 10:19:02 +00:00
parent 136f08d376
commit 4acbee69a4
8 changed files with 387 additions and 347 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Cliente/FactuGES.dproj
View File

@ -54,15 +54,7 @@
<Borland.Personality>Delphi.Personality</Borland.Personality>
<Borland.ProjectType>VCLApplication</Borland.ProjectType>
<BorlandProject>
<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">2</VersionInfo><VersionInfo Name="Release">1</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.2.1.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.2.1.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">2</VersionInfo><VersionInfo Name="Release">2</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.2.2.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.2.2.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>

BIN
Source/Cliente/FactuGES.res
View File

Binary file not shown.

74
Source/Modulos/Articulos/Views/uEditorArticulo.dfm
View File

@ -104,17 +104,17 @@ inherited fEditorArticulo: TfEditorArticulo
inherited pagGeneral: TTabSheet
ExplicitLeft = 4
ExplicitTop = 24
ExplicitWidth = 610
ExplicitHeight = 351
ExplicitWidth = 891
ExplicitHeight = 376
end
object TabSheet1: TTabSheet
Caption = 'Precios'
ImageIndex = 1
inline frViewArticulosProveedores1: TfrViewArticulosProveedores
Left = 0
Top = 105
Top = 97
Width = 891
Height = 271
Height = 279
Align = alClient
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
@ -129,9 +129,54 @@ inherited fEditorArticulo: TfEditorArticulo
ExplicitHeight = 271
inherited cxGrid: TcxGrid
Width = 891
Height = 246
Height = 254
ExplicitWidth = 891
ExplicitHeight = 246
inherited cxGridView: TcxGridDBTableView
inherited cxGridViewPRECIO_COSTE: TcxGridDBColumn
PropertiesClassName = 'TcxCurrencyEditProperties'
Properties.Alignment.Horz = taRightJustify
FooterAlignmentHorz = taRightJustify
GroupSummaryAlignment = taRightJustify
HeaderAlignmentHorz = taRightJustify
end
inherited cxGridViewDESCUENTO: TcxGridDBColumn
Properties.Alignment.Horz = taRightJustify
GroupSummaryAlignment = taRightJustify
end
inherited cxGridViewPRECIO_NETO: TcxGridDBColumn
PropertiesClassName = 'TcxCurrencyEditProperties'
Properties.Alignment.Horz = taRightJustify
FooterAlignmentHorz = taRightJustify
GroupSummaryAlignment = taRightJustify
HeaderAlignmentHorz = taRightJustify
end
inherited cxGridViewPRECIO_PORTE: TcxGridDBColumn
PropertiesClassName = 'TcxCurrencyEditProperties'
Properties.Alignment.Horz = taRightJustify
FooterAlignmentHorz = taRightJustify
GroupSummaryAlignment = taRightJustify
HeaderAlignmentHorz = taRightJustify
end
inherited cxGridViewPRECIO_PVP_VENTA: TcxGridDBColumn
PropertiesClassName = 'TcxCurrencyEditProperties'
Properties.Alignment.Horz = taRightJustify
FooterAlignmentHorz = taRightJustify
GroupSummaryAlignment = taRightJustify
HeaderAlignmentHorz = taRightJustify
end
inherited cxGridViewPRECIO_PVP_TOTAL: TcxGridDBColumn
PropertiesClassName = 'TcxCurrencyEditProperties'
Properties.Alignment.Horz = taRightJustify
FooterAlignmentHorz = taRightJustify
GroupSummaryAlignment = taRightJustify
HeaderAlignmentHorz = taRightJustify
end
inherited cxGridViewID_ARTICULO: TcxGridDBColumn
Visible = False
VisibleForCustomization = False
end
end
end
inherited ToolBar1: TToolBar
Width = 891
@ -142,14 +187,15 @@ inherited fEditorArticulo: TfEditorArticulo
Left = 0
Top = 0
Width = 891
Height = 105
Height = 97
Align = alTop
TabOrder = 1
TabStop = False
AutoContentSizes = [acsWidth]
AutoContentSizes = [acsWidth, acsHeight]
LookAndFeel = dxLayoutOfficeLookAndFeel1
object eParamMargen: TcxDBSpinEdit
Left = 118
Top = 28
Top = 30
DataBinding.DataField = 'PARAM_MARGEN'
DataBinding.DataSource = dsDataTable
Properties.Alignment.Horz = taRightJustify
@ -174,7 +220,7 @@ inherited fEditorArticulo: TfEditorArticulo
end
object eTiempo: TcxDBSpinEdit
Left = 118
Top = 55
Top = 57
DataBinding.DataField = 'TIEMPO'
DataBinding.DataSource = dsDataTable
Properties.Alignment.Horz = taRightJustify
@ -197,7 +243,7 @@ inherited fEditorArticulo: TfEditorArticulo
end
object eParamTiempo: TcxDBCurrencyEdit
Left = 300
Top = 55
Top = 57
DataBinding.DataField = 'PARAM_TIEMPO'
DataBinding.DataSource = dsDataTable
Properties.Alignment.Horz = taRightJustify
@ -217,7 +263,7 @@ inherited fEditorArticulo: TfEditorArticulo
end
object eManoObra: TcxDBSpinEdit
Left = 545
Top = 55
Top = 57
DataBinding.DataField = 'MANO_OBRA'
DataBinding.DataSource = dsDataTable
Enabled = False
@ -247,7 +293,7 @@ inherited fEditorArticulo: TfEditorArticulo
LayoutDirection = ldHorizontal
ShowBorder = False
object dxLayoutControl1Group1: TdxLayoutGroup
AutoAligns = [aaVertical]
AutoAligns = []
AlignHorz = ahClient
Caption = 'Par'#225'metros de precio'
object dxLayoutControl1Item1: TdxLayoutItem
@ -825,8 +871,8 @@ inherited fEditorArticulo: TfEditorArticulo
Top = 152
end
object dxLayoutLookAndFeelList1: TdxLayoutLookAndFeelList
Left = 248
Top = 168
Left = 240
Top = 136
object dxLayoutOfficeLookAndFeel1: TdxLayoutOfficeLookAndFeel
GroupOptions.CaptionOptions.Font.Charset = DEFAULT_CHARSET
GroupOptions.CaptionOptions.Font.Color = clWindowText

35
Source/Modulos/Articulos/Views/uViewArticulo.dfm
View File

@ -1,6 +1,6 @@
inherited frViewArticulo: TfrViewArticulo
Width = 818
Height = 432
Width = 590
Height = 444
Align = alClient
OnCreate = CustomViewCreate
OnDestroy = CustomViewDestroy
@ -9,19 +9,20 @@ inherited frViewArticulo: TfrViewArticulo
object dxLayoutControlArticulo: TdxLayoutControl
Left = 0
Top = 0
Width = 818
Height = 432
Width = 590
Height = 444
Align = alClient
ParentBackground = True
TabOrder = 0
TabStop = False
AutoContentSizes = [acsWidth]
ExplicitHeight = 473
ExplicitWidth = 451
ExplicitHeight = 304
DesignSize = (
818
432)
590
444)
object PngSpeedButton2: TPngSpeedButton
Left = 773
Left = 545
Top = 304
Width = 23
Height = 22
@ -48,7 +49,7 @@ inherited frViewArticulo: TfrViewArticulo
PngOptions = [pngBlendOnDisabled, pngGrayscaleOnDisabled]
end
object PngSpeedButton1: TPngSpeedButton
Left = 773
Left = 545
Top = 332
Width = 23
Height = 22
@ -75,7 +76,7 @@ inherited frViewArticulo: TfrViewArticulo
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
TabOrder = 0
Width = 328
Width = 290
end
object eDescripcion: TcxDBTextEdit
Left = 122
@ -95,7 +96,7 @@ inherited frViewArticulo: TfrViewArticulo
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
TabOrder = 1
Width = 328
Width = 290
end
object eNoComisionable: TcxDBCheckBox
Left = 122
@ -119,7 +120,7 @@ inherited frViewArticulo: TfrViewArticulo
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
TabOrder = 5
Width = 328
Width = 290
end
object eImagen: TcxImage
Left = 28
@ -141,7 +142,7 @@ inherited frViewArticulo: TfrViewArticulo
StyleHot.LookAndFeel.NativeStyle = True
TabOrder = 8
Height = 98
Width = 403
Width = 355
end
object cbFamilia: TcxDBComboBox
Left = 122
@ -165,7 +166,7 @@ inherited frViewArticulo: TfrViewArticulo
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
TabOrder = 2
Width = 328
Width = 290
end
object cbNoInventariable: TcxDBCheckBox
Left = 122
@ -189,7 +190,7 @@ inherited frViewArticulo: TfrViewArticulo
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
TabOrder = 4
Width = 328
Width = 290
end
object cbUnidadMedida: TcxDBComboBox
Left = 122
@ -213,7 +214,7 @@ inherited frViewArticulo: TfrViewArticulo
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
TabOrder = 3
Width = 328
Width = 290
end
object cbFabricante: TcxDBComboBox
Left = 122
@ -237,7 +238,7 @@ inherited frViewArticulo: TfrViewArticulo
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
TabOrder = 6
Width = 328
Width = 290
end
object eReferenciaFabr: TcxDBTextEdit
Left = 122

40
Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm
View File

@ -224,7 +224,13 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
ExplicitTop = 0
ExplicitWidth = 136
end
inherited ToolButton13: TToolButton [7]
inherited UpDown1: TUpDown
Left = 680
Top = 0
ExplicitLeft = 680
ExplicitTop = 0
end
inherited ToolButton13: TToolButton
Left = 0
Top = 0
Wrap = True
@ -232,53 +238,47 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
ExplicitTop = 0
ExplicitHeight = 27
end
inherited UpDown1: TUpDown [8]
inherited ToolButton6: TToolButton [9]
Left = 0
Top = 27
ExplicitLeft = 0
ExplicitTop = 27
end
inherited ToolButton6: TToolButton [9]
Left = 17
Top = 27
ExplicitLeft = 17
ExplicitTop = 27
end
inherited ToolButton7: TToolButton [10]
Left = 83
Left = 66
Top = 27
ExplicitLeft = 83
ExplicitLeft = 66
ExplicitTop = 27
end
inherited ToolButton8: TToolButton [11]
Left = 150
Left = 133
Top = 27
ExplicitLeft = 150
ExplicitLeft = 133
ExplicitTop = 27
end
inherited ToolButton12: TToolButton [12]
Left = 233
Left = 216
Top = 27
ExplicitLeft = 233
ExplicitLeft = 216
ExplicitTop = 27
ExplicitHeight = 22
end
inherited ToolButton9: TToolButton [13]
Left = 241
Left = 224
Top = 27
ExplicitLeft = 241
ExplicitLeft = 224
ExplicitTop = 27
end
inherited ToolButton10: TToolButton [14]
Left = 386
Left = 369
Top = 27
ExplicitLeft = 386
ExplicitLeft = 369
ExplicitTop = 27
end
inherited ToolButton11: TToolButton [15]
Left = 511
Left = 494
Top = 27
ExplicitLeft = 511
ExplicitLeft = 494
ExplicitTop = 27
end
end

3
Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.pas
View File

@ -103,7 +103,8 @@ uses
procedure TfEditorPresupuestoCliente.actGenerarCertificadoExecute(
Sender: TObject);
begin
FController.GenerarCertificados(Presupuesto, False)
if FController.GenerarCertificados(Presupuesto, False) then
ShowInfoMessage('Generar certificado de trabajo', 'Se ha generado el certificado de trabajos.')
end;

BIN
Source/Servidor/FactuGES_Server.RES
View File

Binary file not shown.

4
Source/Servidor/FactuGES_Server.dproj
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectGuid>{ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1}</ProjectGuid>
@ -35,7 +35,7 @@
<Borland.Personality>Delphi.Personality</Borland.Personality>
<Borland.ProjectType />
<BorlandProject>
<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters><Parameters Name="RunParams">/standalone</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">2</VersionInfo><VersionInfo Name="Release">1</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.2.1.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.2.1.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">miércoles, 06 de agosto de 2008 17:51</VersionInfoKeys></VersionInfoKeys><Excluded_Packages/><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters><Parameters Name="RunParams">/standalone</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">2</VersionInfo><VersionInfo Name="Release">1</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.2.2.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.2.2.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">jueves, 07 de agosto de 2008 16:35</VersionInfoKeys></VersionInfoKeys><Excluded_Packages /><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
</ProjectExtensions>
<Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
<ItemGroup>