Versión 2.1.3: Se arreglan los informaes de CertificadoTrabajos.rdx y se dejan ver los tipos de conceptos en los presupuestos para mayor claridad
git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@1128 0c75b7a4-871f-7646-8a2f-f78d34cc349f
This commit is contained in:
parent
f0ced2ce2e
commit
67f95fee9c
@ -53,7 +53,7 @@
|
|||||||
<Borland.Personality>Delphi.Personality</Borland.Personality>
|
<Borland.Personality>Delphi.Personality</Borland.Personality>
|
||||||
<Borland.ProjectType>VCLApplication</Borland.ProjectType>
|
<Borland.ProjectType>VCLApplication</Borland.ProjectType>
|
||||||
<BorlandProject>
|
<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">2</VersionInfo><VersionInfo Name="MinorVer">1</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">2.1.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">2.1.2.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages></Excluded_Packages><Source><Source Name="MainSource">FactuGES.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></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">2</VersionInfo><VersionInfo Name="MinorVer">1</VersionInfo><VersionInfo Name="Release">3</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">2.1.3.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">2.1.3.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages></Excluded_Packages><Source><Source Name="MainSource">FactuGES.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></BorlandProject>
|
||||||
</ProjectExtensions>
|
</ProjectExtensions>
|
||||||
<Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
|
<Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
MAINICON ICON "C:\Codigo tecsitel\Resources\Iconos\Factuges.ico"
|
MAINICON ICON "C:\Codigo tecsitel\Resources\Iconos\Factuges.ico"
|
||||||
1 VERSIONINFO
|
1 VERSIONINFO
|
||||||
FILEVERSION 2,1,2,0
|
FILEVERSION 2,1,3,0
|
||||||
PRODUCTVERSION 2,1,2,0
|
PRODUCTVERSION 2,1,3,0
|
||||||
FILEFLAGSMASK 0x3FL
|
FILEFLAGSMASK 0x3FL
|
||||||
FILEFLAGS 0x00L
|
FILEFLAGS 0x00L
|
||||||
FILEOS 0x40004L
|
FILEOS 0x40004L
|
||||||
@ -13,10 +13,10 @@ BEGIN
|
|||||||
BLOCK "0C0A04E4"
|
BLOCK "0C0A04E4"
|
||||||
BEGIN
|
BEGIN
|
||||||
VALUE "CompanyName", "Rodax Software S.L.\0"
|
VALUE "CompanyName", "Rodax Software S.L.\0"
|
||||||
VALUE "FileVersion", "2.1.2.0\0"
|
VALUE "FileVersion", "2.1.3.0\0"
|
||||||
VALUE "InternalName", "FactuGES\0"
|
VALUE "InternalName", "FactuGES\0"
|
||||||
VALUE "ProductName", "FactuGES\0"
|
VALUE "ProductName", "FactuGES\0"
|
||||||
VALUE "ProductVersion", "2.1.2.0\0"
|
VALUE "ProductVersion", "2.1.3.0\0"
|
||||||
END
|
END
|
||||||
END
|
END
|
||||||
BLOCK "VarFileInfo"
|
BLOCK "VarFileInfo"
|
||||||
|
|||||||
Binary file not shown.
@ -10,7 +10,7 @@ inherited frViewDetallesBase: TfrViewDetallesBase
|
|||||||
Left = 0
|
Left = 0
|
||||||
Top = 0
|
Top = 0
|
||||||
Width = 451
|
Width = 451
|
||||||
Height = 68
|
Height = 73
|
||||||
AutoSize = True
|
AutoSize = True
|
||||||
ButtonWidth = 141
|
ButtonWidth = 141
|
||||||
Caption = 'ToolBar1'
|
Caption = 'ToolBar1'
|
||||||
@ -42,30 +42,29 @@ inherited frViewDetallesBase: TfrViewDetallesBase
|
|||||||
Top = 0
|
Top = 0
|
||||||
Action = actSubir
|
Action = actSubir
|
||||||
AutoSize = True
|
AutoSize = True
|
||||||
Wrap = True
|
|
||||||
end
|
end
|
||||||
object ToolButton4: TToolButton
|
object ToolButton4: TToolButton
|
||||||
Left = 0
|
Left = 184
|
||||||
Top = 22
|
Top = 0
|
||||||
Action = actBajar
|
Action = actBajar
|
||||||
AutoSize = True
|
AutoSize = True
|
||||||
end
|
end
|
||||||
object ToolButton14: TToolButton
|
object ToolButton14: TToolButton
|
||||||
Left = 56
|
Left = 240
|
||||||
Top = 22
|
Top = 0
|
||||||
Action = FontEdit1
|
Action = FontEdit1
|
||||||
AutoSize = True
|
AutoSize = True
|
||||||
Wrap = True
|
Wrap = True
|
||||||
end
|
end
|
||||||
object FontName: TJvFontComboBox
|
object FontName: TJvFontComboBox
|
||||||
Left = 0
|
Left = 0
|
||||||
Top = 44
|
Top = 22
|
||||||
Width = 145
|
Width = 145
|
||||||
Height = 22
|
Height = 22
|
||||||
DroppedDownWidth = 145
|
DroppedDownWidth = 145
|
||||||
MaxMRUCount = 0
|
MaxMRUCount = 0
|
||||||
FontName = 'Tahoma'
|
FontName = 'Tahoma'
|
||||||
ItemIndex = 39
|
ItemIndex = 42
|
||||||
Options = [foTrueTypeOnly, foNoOEMFonts, foScalableOnly, foWysiWyg]
|
Options = [foTrueTypeOnly, foNoOEMFonts, foScalableOnly, foWysiWyg]
|
||||||
Sorted = True
|
Sorted = True
|
||||||
TabOrder = 2
|
TabOrder = 2
|
||||||
@ -75,7 +74,7 @@ inherited frViewDetallesBase: TfrViewDetallesBase
|
|||||||
end
|
end
|
||||||
object FontSize: TEdit
|
object FontSize: TEdit
|
||||||
Left = 145
|
Left = 145
|
||||||
Top = 44
|
Top = 22
|
||||||
Width = 26
|
Width = 26
|
||||||
Height = 22
|
Height = 22
|
||||||
Hint = 'Font Size|Select font size'
|
Hint = 'Font Size|Select font size'
|
||||||
@ -86,7 +85,7 @@ inherited frViewDetallesBase: TfrViewDetallesBase
|
|||||||
end
|
end
|
||||||
object UpDown1: TUpDown
|
object UpDown1: TUpDown
|
||||||
Left = 171
|
Left = 171
|
||||||
Top = 44
|
Top = 22
|
||||||
Width = 16
|
Width = 16
|
||||||
Height = 22
|
Height = 22
|
||||||
Associate = FontSize
|
Associate = FontSize
|
||||||
@ -95,7 +94,7 @@ inherited frViewDetallesBase: TfrViewDetallesBase
|
|||||||
end
|
end
|
||||||
object ToolButton13: TToolButton
|
object ToolButton13: TToolButton
|
||||||
Left = 187
|
Left = 187
|
||||||
Top = 44
|
Top = 22
|
||||||
Width = 8
|
Width = 8
|
||||||
Caption = 'ToolButton13'
|
Caption = 'ToolButton13'
|
||||||
ImageIndex = 10
|
ImageIndex = 10
|
||||||
@ -103,54 +102,55 @@ inherited frViewDetallesBase: TfrViewDetallesBase
|
|||||||
end
|
end
|
||||||
object ToolButton6: TToolButton
|
object ToolButton6: TToolButton
|
||||||
Left = 195
|
Left = 195
|
||||||
Top = 44
|
Top = 22
|
||||||
Action = RichEditBold1
|
Action = RichEditBold1
|
||||||
AutoSize = True
|
AutoSize = True
|
||||||
end
|
end
|
||||||
object ToolButton7: TToolButton
|
object ToolButton7: TToolButton
|
||||||
Left = 261
|
Left = 261
|
||||||
Top = 44
|
Top = 22
|
||||||
Action = RichEditItalic1
|
Action = RichEditItalic1
|
||||||
AutoSize = True
|
AutoSize = True
|
||||||
end
|
end
|
||||||
object ToolButton8: TToolButton
|
object ToolButton8: TToolButton
|
||||||
Left = 328
|
Left = 328
|
||||||
Top = 44
|
Top = 22
|
||||||
Action = RichEditUnderline1
|
Action = RichEditUnderline1
|
||||||
AutoSize = True
|
AutoSize = True
|
||||||
end
|
end
|
||||||
object ToolButton12: TToolButton
|
object ToolButton12: TToolButton
|
||||||
Left = 411
|
Left = 0
|
||||||
Top = 44
|
Top = 22
|
||||||
Width = 8
|
Width = 8
|
||||||
Caption = 'ToolButton12'
|
Caption = 'ToolButton12'
|
||||||
ImageIndex = 10
|
ImageIndex = 10
|
||||||
|
Wrap = True
|
||||||
Style = tbsSeparator
|
Style = tbsSeparator
|
||||||
end
|
end
|
||||||
object ToolButton9: TToolButton
|
object ToolButton9: TToolButton
|
||||||
Left = 419
|
Left = 0
|
||||||
Top = 44
|
Top = 49
|
||||||
Action = RichEditAlignLeft1
|
Action = RichEditAlignLeft1
|
||||||
AutoSize = True
|
AutoSize = True
|
||||||
end
|
end
|
||||||
object ToolButton10: TToolButton
|
object ToolButton10: TToolButton
|
||||||
Left = 564
|
Left = 145
|
||||||
Top = 44
|
Top = 49
|
||||||
Action = RichEditAlignCenter1
|
Action = RichEditAlignCenter1
|
||||||
AutoSize = True
|
AutoSize = True
|
||||||
end
|
end
|
||||||
object ToolButton11: TToolButton
|
object ToolButton11: TToolButton
|
||||||
Left = 689
|
Left = 270
|
||||||
Top = 44
|
Top = 49
|
||||||
Action = RichEditAlignRight1
|
Action = RichEditAlignRight1
|
||||||
AutoSize = True
|
AutoSize = True
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
object cxGrid: TcxGrid
|
object cxGrid: TcxGrid
|
||||||
Left = 0
|
Left = 0
|
||||||
Top = 94
|
Top = 99
|
||||||
Width = 451
|
Width = 451
|
||||||
Height = 210
|
Height = 205
|
||||||
Align = alClient
|
Align = alClient
|
||||||
Font.Charset = DEFAULT_CHARSET
|
Font.Charset = DEFAULT_CHARSET
|
||||||
Font.Color = clWindowText
|
Font.Color = clWindowText
|
||||||
@ -161,8 +161,6 @@ inherited frViewDetallesBase: TfrViewDetallesBase
|
|||||||
TabOrder = 1
|
TabOrder = 1
|
||||||
LookAndFeel.Kind = lfStandard
|
LookAndFeel.Kind = lfStandard
|
||||||
LookAndFeel.NativeStyle = True
|
LookAndFeel.NativeStyle = True
|
||||||
ExplicitTop = 99
|
|
||||||
ExplicitHeight = 205
|
|
||||||
object cxGridView: TcxGridDBTableView
|
object cxGridView: TcxGridDBTableView
|
||||||
OnKeyDown = cxGridViewKeyDown
|
OnKeyDown = cxGridViewKeyDown
|
||||||
NavigatorButtons.ConfirmDelete = False
|
NavigatorButtons.ConfirmDelete = False
|
||||||
@ -351,16 +349,16 @@ inherited frViewDetallesBase: TfrViewDetallesBase
|
|||||||
end
|
end
|
||||||
object TBXDock1: TTBXDock
|
object TBXDock1: TTBXDock
|
||||||
Left = 0
|
Left = 0
|
||||||
Top = 68
|
Top = 73
|
||||||
Width = 451
|
Width = 451
|
||||||
Height = 26
|
Height = 26
|
||||||
BackgroundOnToolbars = False
|
BackgroundOnToolbars = False
|
||||||
UseParentBackground = True
|
UseParentBackground = True
|
||||||
ExplicitTop = 73
|
|
||||||
object TBXToolbar1: TTBXToolbar
|
object TBXToolbar1: TTBXToolbar
|
||||||
Left = 0
|
Left = 0
|
||||||
Top = 0
|
Top = 0
|
||||||
Caption = 'TBXToolbar1'
|
Caption = 'TBXToolbar1'
|
||||||
|
DockPos = 0
|
||||||
DragHandleStyle = dhNone
|
DragHandleStyle = dhNone
|
||||||
Images = ContenidoImageList
|
Images = ContenidoImageList
|
||||||
TabOrder = 0
|
TabOrder = 0
|
||||||
@ -372,12 +370,16 @@ inherited frViewDetallesBase: TfrViewDetallesBase
|
|||||||
Action = actAnadirCapitulo
|
Action = actAnadirCapitulo
|
||||||
Images = ContenidoImageList
|
Images = ContenidoImageList
|
||||||
end
|
end
|
||||||
|
object TBXItem20: TTBXItem
|
||||||
|
end
|
||||||
object TBXSeparatorItem7: TTBXSeparatorItem
|
object TBXSeparatorItem7: TTBXSeparatorItem
|
||||||
end
|
end
|
||||||
object TBXItem15: TTBXItem
|
object TBXItem15: TTBXItem
|
||||||
Action = actAnadirTitulo
|
Action = actAnadirTitulo
|
||||||
Images = ContenidoImageList
|
Images = ContenidoImageList
|
||||||
end
|
end
|
||||||
|
object TBXItem19: TTBXItem
|
||||||
|
end
|
||||||
object TBXItem14: TTBXItem
|
object TBXItem14: TTBXItem
|
||||||
Action = actAnadirSubtotal
|
Action = actAnadirSubtotal
|
||||||
Images = ContenidoImageList
|
Images = ContenidoImageList
|
||||||
@ -571,6 +573,13 @@ inherited frViewDetallesBase: TfrViewDetallesBase
|
|||||||
OnExecute = actAnadirCapituloExecute
|
OnExecute = actAnadirCapituloExecute
|
||||||
OnUpdate = actAnadirCapituloUpdate
|
OnUpdate = actAnadirCapituloUpdate
|
||||||
end
|
end
|
||||||
|
object actAnadirCapituloOpcional: TAction
|
||||||
|
Category = 'Operaciones'
|
||||||
|
Caption = 'Un capitulo opcional'
|
||||||
|
ImageIndex = 12
|
||||||
|
OnExecute = actAnadirCapituloOpcionalExecute
|
||||||
|
OnUpdate = actAnadirCapituloOpcionalUpdate
|
||||||
|
end
|
||||||
object actAnadirTitulo: TAction
|
object actAnadirTitulo: TAction
|
||||||
Category = 'Operaciones'
|
Category = 'Operaciones'
|
||||||
Caption = 'T'#237'tulo de cap'#237'tulo'
|
Caption = 'T'#237'tulo de cap'#237'tulo'
|
||||||
@ -578,6 +587,13 @@ inherited frViewDetallesBase: TfrViewDetallesBase
|
|||||||
OnExecute = actAnadirTituloExecute
|
OnExecute = actAnadirTituloExecute
|
||||||
OnUpdate = actAnadirTituloUpdate
|
OnUpdate = actAnadirTituloUpdate
|
||||||
end
|
end
|
||||||
|
object actAnadirTituloOpcional: TAction
|
||||||
|
Category = 'Operaciones'
|
||||||
|
Caption = 'Titulo de capitulo opcional'
|
||||||
|
ImageIndex = 13
|
||||||
|
OnExecute = actAnadirTituloOpcionalExecute
|
||||||
|
OnUpdate = actAnadirTituloOpcionalUpdate
|
||||||
|
end
|
||||||
object actAnadirSubtotal: TAction
|
object actAnadirSubtotal: TAction
|
||||||
Category = 'Operaciones'
|
Category = 'Operaciones'
|
||||||
Caption = 'Subtotal de cap'#237'tulo'
|
Caption = 'Subtotal de cap'#237'tulo'
|
||||||
|
|||||||
@ -146,6 +146,10 @@ type
|
|||||||
Seleccionartodo1: TMenuItem;
|
Seleccionartodo1: TMenuItem;
|
||||||
cxStyle_TITULO_OPCIONAL: TcxStyle;
|
cxStyle_TITULO_OPCIONAL: TcxStyle;
|
||||||
TBXItem17: TTBXItem;
|
TBXItem17: TTBXItem;
|
||||||
|
TBXItem19: TTBXItem;
|
||||||
|
TBXItem20: TTBXItem;
|
||||||
|
actAnadirCapituloOpcional: TAction;
|
||||||
|
actAnadirTituloOpcional: TAction;
|
||||||
procedure actAnadirExecute(Sender: TObject);
|
procedure actAnadirExecute(Sender: TObject);
|
||||||
procedure actEliminarExecute(Sender: TObject);
|
procedure actEliminarExecute(Sender: TObject);
|
||||||
procedure actSubirExecute(Sender: TObject);
|
procedure actSubirExecute(Sender: TObject);
|
||||||
@ -179,11 +183,15 @@ type
|
|||||||
procedure actAnchoAutomaticoExecute(Sender: TObject);
|
procedure actAnchoAutomaticoExecute(Sender: TObject);
|
||||||
procedure actAnchoAutomaticoUpdate(Sender: TObject);
|
procedure actAnchoAutomaticoUpdate(Sender: TObject);
|
||||||
procedure actAnadirCapituloUpdate(Sender: TObject);
|
procedure actAnadirCapituloUpdate(Sender: TObject);
|
||||||
|
procedure actAnadirCapituloOpcionalUpdate(Sender: TObject);
|
||||||
procedure actAnadirTituloUpdate(Sender: TObject);
|
procedure actAnadirTituloUpdate(Sender: TObject);
|
||||||
|
procedure actAnadirTituloOpcionalUpdate(Sender: TObject);
|
||||||
procedure actAnadirSubtotalUpdate(Sender: TObject);
|
procedure actAnadirSubtotalUpdate(Sender: TObject);
|
||||||
procedure actAnadirDescuentoUpdate(Sender: TObject);
|
procedure actAnadirDescuentoUpdate(Sender: TObject);
|
||||||
procedure actAnadirCapituloExecute(Sender: TObject);
|
procedure actAnadirCapituloExecute(Sender: TObject);
|
||||||
|
procedure actAnadirCapituloOpcionalExecute(Sender: TObject);
|
||||||
procedure actAnadirTituloExecute(Sender: TObject);
|
procedure actAnadirTituloExecute(Sender: TObject);
|
||||||
|
procedure actAnadirTituloOpcionalExecute(Sender: TObject);
|
||||||
procedure actAnadirSubtotalExecute(Sender: TObject);
|
procedure actAnadirSubtotalExecute(Sender: TObject);
|
||||||
procedure actAnadirDescuentoExecute(Sender: TObject);
|
procedure actAnadirDescuentoExecute(Sender: TObject);
|
||||||
procedure actDetallesCopiarExecute(Sender: TObject);
|
procedure actDetallesCopiarExecute(Sender: TObject);
|
||||||
@ -333,6 +341,46 @@ begin
|
|||||||
end;
|
end;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
procedure TfrViewDetallesBase.actAnadirCapituloOpcionalExecute(Sender: TObject);
|
||||||
|
var
|
||||||
|
bEsMultiSelect : Boolean;
|
||||||
|
begin
|
||||||
|
// Debo quitar el multiselect porque provoca que se quede seleccionado
|
||||||
|
// el registro actual y no el nuevo registro que voy a añadir
|
||||||
|
bEsMultiSelect := _FocusedView.OptionsSelection.MultiSelect;
|
||||||
|
if bEsMultiSelect then
|
||||||
|
_FocusedView.OptionsSelection.MultiSelect := False;
|
||||||
|
|
||||||
|
ShowHourglassCursor;
|
||||||
|
_FocusedView.BeginUpdate;
|
||||||
|
try
|
||||||
|
if _FocusedView.Controller.EditingController.IsEditing then
|
||||||
|
_FocusedView.Controller.EditingController.Edit.PostEditValue;
|
||||||
|
|
||||||
|
if Assigned(Controller) and Assigned(FDetalles) then
|
||||||
|
begin
|
||||||
|
Controller.Add(FDetalles, TIPO_DETALLE_TITULO_OPCIONAL);
|
||||||
|
Controller.Add(FDetalles, TIPO_DETALLE_CONCEPTO);
|
||||||
|
Controller.Add(FDetalles, TIPO_DETALLE_CONCEPTO);
|
||||||
|
Controller.Add(FDetalles, TIPO_DETALLE_SUBTOTAL);
|
||||||
|
// Controller.add(FDetalles, TIPO_DETALLE_DESCUENTO);
|
||||||
|
end;
|
||||||
|
finally
|
||||||
|
_FocusedView.EndUpdate;
|
||||||
|
HideHourglassCursor;
|
||||||
|
|
||||||
|
// Dejo la propiedad MultiSelect como estaba
|
||||||
|
if bEsMultiSelect then
|
||||||
|
_FocusedView.OptionsSelection.MultiSelect := bEsMultiSelect;
|
||||||
|
end;
|
||||||
|
end;
|
||||||
|
|
||||||
|
procedure TfrViewDetallesBase.actAnadirCapituloOpcionalUpdate(Sender: TObject);
|
||||||
|
begin
|
||||||
|
inherited;
|
||||||
|
(Sender as TAction).Enabled := not ReadOnly;
|
||||||
|
end;
|
||||||
|
|
||||||
procedure TfrViewDetallesBase.actAnadirCapituloUpdate(Sender: TObject);
|
procedure TfrViewDetallesBase.actAnadirCapituloUpdate(Sender: TObject);
|
||||||
begin
|
begin
|
||||||
inherited;
|
inherited;
|
||||||
@ -463,6 +511,40 @@ begin
|
|||||||
end;
|
end;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
procedure TfrViewDetallesBase.actAnadirTituloOpcionalExecute(Sender: TObject);
|
||||||
|
var
|
||||||
|
bEsMultiSelect : Boolean;
|
||||||
|
begin
|
||||||
|
// Debo quitar el multiselect porque provoca que se quede seleccionado
|
||||||
|
// el registro actual y no el nuevo registro que voy a añadir
|
||||||
|
bEsMultiSelect := cxGridView.OptionsSelection.MultiSelect;
|
||||||
|
if bEsMultiSelect then
|
||||||
|
cxGridView.OptionsSelection.MultiSelect := False;
|
||||||
|
|
||||||
|
ShowHourglassCursor;
|
||||||
|
_FocusedView.BeginUpdate;
|
||||||
|
try
|
||||||
|
if _FocusedView.Controller.EditingController.IsEditing then
|
||||||
|
_FocusedView.Controller.EditingController.Edit.PostEditValue;
|
||||||
|
|
||||||
|
if Assigned(Controller) and Assigned(FDetalles) then
|
||||||
|
Controller.Add(FDetalles, TIPO_DETALLE_TITULO_OPCIONAL);
|
||||||
|
finally
|
||||||
|
_FocusedView.EndUpdate;
|
||||||
|
HideHourglassCursor;
|
||||||
|
|
||||||
|
// Dejo la propiedad MultiSelect como estaba
|
||||||
|
if bEsMultiSelect then
|
||||||
|
_FocusedView.OptionsSelection.MultiSelect := bEsMultiSelect;
|
||||||
|
end;
|
||||||
|
end;
|
||||||
|
|
||||||
|
procedure TfrViewDetallesBase.actAnadirTituloOpcionalUpdate(Sender: TObject);
|
||||||
|
begin
|
||||||
|
inherited;
|
||||||
|
(Sender as TAction).Enabled := not ReadOnly;
|
||||||
|
end;
|
||||||
|
|
||||||
procedure TfrViewDetallesBase.actAnadirTituloUpdate(Sender: TObject);
|
procedure TfrViewDetallesBase.actAnadirTituloUpdate(Sender: TObject);
|
||||||
begin
|
begin
|
||||||
inherited;
|
inherited;
|
||||||
@ -871,7 +953,7 @@ begin
|
|||||||
else
|
else
|
||||||
begin
|
begin
|
||||||
if (AItem.GridView.Items[IndiceCol].EditValue = TIPO_DETALLE_SUBTOTAL)
|
if (AItem.GridView.Items[IndiceCol].EditValue = TIPO_DETALLE_SUBTOTAL)
|
||||||
or (AItem.GridView.Items[IndiceCol].EditValue = TIPO_DETALLE_TITULO_OPCIONAL)
|
or (AItem.GridView.Items[IndiceCol].EditValue = TIPO_DETALLE_TITULO_OPCIONAL)
|
||||||
or (AItem.GridView.Items[IndiceCol].EditValue = TIPO_DETALLE_TITULO) then
|
or (AItem.GridView.Items[IndiceCol].EditValue = TIPO_DETALLE_TITULO) then
|
||||||
begin
|
begin
|
||||||
IndiceCol := cxGridView.GetColumnByFieldName(CAMPO_CONCEPTO).Index;
|
IndiceCol := cxGridView.GetColumnByFieldName(CAMPO_CONCEPTO).Index;
|
||||||
|
|||||||
BIN
Source/Informes/2/CertificadoTrabajos.rdx
Normal file
BIN
Source/Informes/2/CertificadoTrabajos.rdx
Normal file
Binary file not shown.
BIN
Source/Informes/3/CertificadoTrabajos.rdx
Normal file
BIN
Source/Informes/3/CertificadoTrabajos.rdx
Normal file
Binary file not shown.
@ -1,7 +1,7 @@
|
|||||||
inherited frViewDetallesPresupuestoCliente: TfrViewDetallesPresupuestoCliente
|
inherited frViewDetallesPresupuestoCliente: TfrViewDetallesPresupuestoCliente
|
||||||
inherited ToolBar1: TToolBar
|
inherited ToolBar1: TToolBar
|
||||||
Height = 73
|
Height = 100
|
||||||
ExplicitHeight = 73
|
ExplicitHeight = 100
|
||||||
inherited ToolButton3: TToolButton
|
inherited ToolButton3: TToolButton
|
||||||
Wrap = False
|
Wrap = False
|
||||||
end
|
end
|
||||||
@ -23,77 +23,73 @@ inherited frViewDetallesPresupuestoCliente: TfrViewDetallesPresupuestoCliente
|
|||||||
end
|
end
|
||||||
inherited FontSize: TEdit
|
inherited FontSize: TEdit
|
||||||
Top = 22
|
Top = 22
|
||||||
Width = 58
|
Width = 74
|
||||||
ExplicitTop = 22
|
ExplicitTop = 22
|
||||||
ExplicitWidth = 58
|
ExplicitWidth = 74
|
||||||
end
|
end
|
||||||
inherited UpDown1: TUpDown
|
inherited ToolButton13: TToolButton [7]
|
||||||
Left = 203
|
Left = 0
|
||||||
Top = 22
|
Top = 22
|
||||||
ExplicitLeft = 203
|
ExplicitLeft = 0
|
||||||
ExplicitTop = 22
|
ExplicitTop = 22
|
||||||
end
|
end
|
||||||
inherited ToolButton13: TToolButton
|
inherited UpDown1: TUpDown [8]
|
||||||
Left = 220
|
Left = 0
|
||||||
Top = 22
|
Top = 49
|
||||||
ExplicitLeft = 220
|
ExplicitLeft = 0
|
||||||
ExplicitTop = 22
|
ExplicitTop = 49
|
||||||
end
|
end
|
||||||
inherited ToolButton6: TToolButton
|
inherited ToolButton6: TToolButton
|
||||||
Left = 228
|
Left = 17
|
||||||
Top = 22
|
Top = 49
|
||||||
ExplicitLeft = 228
|
ExplicitLeft = 17
|
||||||
ExplicitTop = 22
|
ExplicitTop = 49
|
||||||
end
|
end
|
||||||
inherited ToolButton7: TToolButton
|
inherited ToolButton7: TToolButton
|
||||||
Left = 294
|
Left = 83
|
||||||
Top = 22
|
Top = 49
|
||||||
ExplicitLeft = 294
|
ExplicitLeft = 83
|
||||||
ExplicitTop = 22
|
ExplicitTop = 49
|
||||||
end
|
end
|
||||||
inherited ToolButton8: TToolButton
|
inherited ToolButton8: TToolButton
|
||||||
Left = 361
|
Left = 150
|
||||||
Top = 22
|
Top = 49
|
||||||
ExplicitLeft = 361
|
ExplicitLeft = 150
|
||||||
ExplicitTop = 22
|
ExplicitTop = 49
|
||||||
end
|
end
|
||||||
inherited ToolButton12: TToolButton
|
inherited ToolButton12: TToolButton
|
||||||
Left = 0
|
Left = 0
|
||||||
Top = 22
|
Top = 49
|
||||||
Wrap = True
|
Wrap = True
|
||||||
ExplicitLeft = 0
|
ExplicitLeft = 0
|
||||||
ExplicitTop = 22
|
ExplicitTop = 49
|
||||||
ExplicitHeight = 27
|
ExplicitHeight = 27
|
||||||
end
|
end
|
||||||
inherited ToolButton9: TToolButton
|
inherited ToolButton9: TToolButton
|
||||||
Left = 0
|
Left = 0
|
||||||
Top = 49
|
Top = 76
|
||||||
ExplicitLeft = 0
|
ExplicitLeft = 0
|
||||||
ExplicitTop = 49
|
ExplicitTop = 76
|
||||||
end
|
end
|
||||||
inherited ToolButton10: TToolButton
|
inherited ToolButton10: TToolButton
|
||||||
Left = 145
|
Left = 145
|
||||||
Top = 49
|
Top = 76
|
||||||
ExplicitLeft = 145
|
ExplicitLeft = 145
|
||||||
ExplicitTop = 49
|
ExplicitTop = 76
|
||||||
end
|
end
|
||||||
inherited ToolButton11: TToolButton
|
inherited ToolButton11: TToolButton
|
||||||
Left = 270
|
Left = 270
|
||||||
Top = 49
|
Top = 76
|
||||||
ExplicitLeft = 270
|
ExplicitLeft = 270
|
||||||
ExplicitTop = 49
|
ExplicitTop = 76
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
inherited cxGrid: TcxGrid
|
inherited cxGrid: TcxGrid
|
||||||
Top = 99
|
Top = 126
|
||||||
Height = 205
|
Height = 178
|
||||||
ExplicitTop = 99
|
ExplicitTop = 99
|
||||||
ExplicitHeight = 205
|
ExplicitHeight = 205
|
||||||
inherited cxGridView: TcxGridDBTableView
|
inherited cxGridView: TcxGridDBTableView
|
||||||
inherited cxGridViewTIPO: TcxGridDBColumn
|
|
||||||
Visible = False
|
|
||||||
VisibleForCustomization = False
|
|
||||||
end
|
|
||||||
inherited cxGridViewREFERENCIA_PROVEEDOR: TcxGridDBColumn
|
inherited cxGridViewREFERENCIA_PROVEEDOR: TcxGridDBColumn
|
||||||
DataBinding.FieldName = ''
|
DataBinding.FieldName = ''
|
||||||
end
|
end
|
||||||
@ -106,9 +102,19 @@ inherited frViewDetallesPresupuestoCliente: TfrViewDetallesPresupuestoCliente
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
inherited TBXDock1: TTBXDock
|
inherited TBXDock1: TTBXDock
|
||||||
Top = 73
|
Top = 100
|
||||||
ExplicitTop = 73
|
ExplicitTop = 73
|
||||||
inherited TBXToolbar1: TTBXToolbar
|
inherited TBXToolbar1: TTBXToolbar
|
||||||
|
inherited TBXSubmenuItem1: TTBXSubmenuItem
|
||||||
|
inherited TBXItem20: TTBXItem
|
||||||
|
Action = actAnadirCapituloOpcional
|
||||||
|
end
|
||||||
|
inherited TBXItem19: TTBXItem [4]
|
||||||
|
Action = actAnadirTituloOpcional
|
||||||
|
end
|
||||||
|
inherited TBXSeparatorItem8: TTBXSeparatorItem [5]
|
||||||
|
end
|
||||||
|
end
|
||||||
object TBXSeparatorItem9: TTBXSeparatorItem
|
object TBXSeparatorItem9: TTBXSeparatorItem
|
||||||
end
|
end
|
||||||
object TBXItem18: TTBXItem
|
object TBXItem18: TTBXItem
|
||||||
@ -120,7 +126,7 @@ inherited frViewDetallesPresupuestoCliente: TfrViewDetallesPresupuestoCliente
|
|||||||
inherited actAnadirDescuento: TAction
|
inherited actAnadirDescuento: TAction
|
||||||
Caption = 'Linea de descuento'
|
Caption = 'Linea de descuento'
|
||||||
end
|
end
|
||||||
object actVariarPrecios: TAction
|
object actVariarPrecios: TAction [23]
|
||||||
Category = 'Operaciones'
|
Category = 'Operaciones'
|
||||||
Caption = 'Variar precios'
|
Caption = 'Variar precios'
|
||||||
OnExecute = actVariarPreciosExecute
|
OnExecute = actVariarPreciosExecute
|
||||||
|
|||||||
Binary file not shown.
@ -35,7 +35,7 @@
|
|||||||
<Borland.Personality>Delphi.Personality</Borland.Personality>
|
<Borland.Personality>Delphi.Personality</Borland.Personality>
|
||||||
<Borland.ProjectType/>
|
<Borland.ProjectType/>
|
||||||
<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">2</VersionInfo><VersionInfo Name="MinorVer">1</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">2.1.2.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES Servidor</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.1.2.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">jueves, 11 de febrero de 2016 11:43</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
|
<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">2</VersionInfo><VersionInfo Name="MinorVer">1</VersionInfo><VersionInfo Name="Release">3</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">2.1.3.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES Servidor</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.1.3.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">lunes, 07 de marzo de 2016 13:00</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
|
||||||
<Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPSCoreD11.bpl">ExpressPrinting System by Developer Express Inc.</Excluded_Packages>
|
<Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPSCoreD11.bpl">ExpressPrinting System by Developer Express Inc.</Excluded_Packages>
|
||||||
</Excluded_Packages><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
|
</Excluded_Packages><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
|
||||||
</ProjectExtensions>
|
</ProjectExtensions>
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
MAINICON ICON "C:\Codigo tecsitel\Resources\Iconos\Servidor.ico"
|
MAINICON ICON "C:\Codigo tecsitel\Resources\Iconos\Servidor.ico"
|
||||||
1 VERSIONINFO
|
1 VERSIONINFO
|
||||||
FILEVERSION 2,1,2,0
|
FILEVERSION 2,1,3,0
|
||||||
PRODUCTVERSION 2,1,2,0
|
PRODUCTVERSION 2,1,3,0
|
||||||
FILEFLAGSMASK 0x3FL
|
FILEFLAGSMASK 0x3FL
|
||||||
FILEFLAGS 0x00L
|
FILEFLAGS 0x00L
|
||||||
FILEOS 0x40004L
|
FILEOS 0x40004L
|
||||||
@ -13,10 +13,10 @@ BEGIN
|
|||||||
BLOCK "0C0A04E4"
|
BLOCK "0C0A04E4"
|
||||||
BEGIN
|
BEGIN
|
||||||
VALUE "CompanyName", "Rodax Software S.L.\0"
|
VALUE "CompanyName", "Rodax Software S.L.\0"
|
||||||
VALUE "FileVersion", "2.1.2.0\0"
|
VALUE "FileVersion", "2.1.3.0\0"
|
||||||
VALUE "ProductName", "FactuGES Servidor\0"
|
VALUE "ProductName", "FactuGES Servidor\0"
|
||||||
VALUE "ProductVersion", "2.1.2.0\0"
|
VALUE "ProductVersion", "2.1.3.0\0"
|
||||||
VALUE "CompileDate", "jueves, 03 de marzo de 2016 13:10\0"
|
VALUE "CompileDate", "lunes, 07 de marzo de 2016 13:16\0"
|
||||||
END
|
END
|
||||||
END
|
END
|
||||||
BLOCK "VarFileInfo"
|
BLOCK "VarFileInfo"
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user