diff --git a/Source/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj
index 54867474..ec15edc5 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\TrueFalse2120FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.1.2.0FactuGESFactuGES2.1.2.0FactuGES.dprFalse
+FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse2130FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.1.3.0FactuGESFactuGES2.1.3.0FactuGES.dprFalse
diff --git a/Source/Cliente/FactuGES.rc b/Source/Cliente/FactuGES.rc
index 0003ed10..53906622 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 2,1,2,0
-PRODUCTVERSION 2,1,2,0
+FILEVERSION 2,1,3,0
+PRODUCTVERSION 2,1,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.1.2.0\0"
+ VALUE "FileVersion", "2.1.3.0\0"
VALUE "InternalName", "FactuGES\0"
VALUE "ProductName", "FactuGES\0"
- VALUE "ProductVersion", "2.1.2.0\0"
+ VALUE "ProductVersion", "2.1.3.0\0"
END
END
BLOCK "VarFileInfo"
diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res
index f70a9a98..d9581d15 100644
Binary files a/Source/Cliente/FactuGES.res and b/Source/Cliente/FactuGES.res differ
diff --git a/Source/GUIBase/uViewDetallesBase.dfm b/Source/GUIBase/uViewDetallesBase.dfm
index 03b8add7..d74bd075 100644
--- a/Source/GUIBase/uViewDetallesBase.dfm
+++ b/Source/GUIBase/uViewDetallesBase.dfm
@@ -10,7 +10,7 @@ inherited frViewDetallesBase: TfrViewDetallesBase
Left = 0
Top = 0
Width = 451
- Height = 68
+ Height = 73
AutoSize = True
ButtonWidth = 141
Caption = 'ToolBar1'
@@ -42,30 +42,29 @@ inherited frViewDetallesBase: TfrViewDetallesBase
Top = 0
Action = actSubir
AutoSize = True
- Wrap = True
end
object ToolButton4: TToolButton
- Left = 0
- Top = 22
+ Left = 184
+ Top = 0
Action = actBajar
AutoSize = True
end
object ToolButton14: TToolButton
- Left = 56
- Top = 22
+ Left = 240
+ Top = 0
Action = FontEdit1
AutoSize = True
Wrap = True
end
object FontName: TJvFontComboBox
Left = 0
- Top = 44
+ Top = 22
Width = 145
Height = 22
DroppedDownWidth = 145
MaxMRUCount = 0
FontName = 'Tahoma'
- ItemIndex = 39
+ ItemIndex = 42
Options = [foTrueTypeOnly, foNoOEMFonts, foScalableOnly, foWysiWyg]
Sorted = True
TabOrder = 2
@@ -75,7 +74,7 @@ inherited frViewDetallesBase: TfrViewDetallesBase
end
object FontSize: TEdit
Left = 145
- Top = 44
+ Top = 22
Width = 26
Height = 22
Hint = 'Font Size|Select font size'
@@ -86,7 +85,7 @@ inherited frViewDetallesBase: TfrViewDetallesBase
end
object UpDown1: TUpDown
Left = 171
- Top = 44
+ Top = 22
Width = 16
Height = 22
Associate = FontSize
@@ -95,7 +94,7 @@ inherited frViewDetallesBase: TfrViewDetallesBase
end
object ToolButton13: TToolButton
Left = 187
- Top = 44
+ Top = 22
Width = 8
Caption = 'ToolButton13'
ImageIndex = 10
@@ -103,54 +102,55 @@ inherited frViewDetallesBase: TfrViewDetallesBase
end
object ToolButton6: TToolButton
Left = 195
- Top = 44
+ Top = 22
Action = RichEditBold1
AutoSize = True
end
object ToolButton7: TToolButton
Left = 261
- Top = 44
+ Top = 22
Action = RichEditItalic1
AutoSize = True
end
object ToolButton8: TToolButton
Left = 328
- Top = 44
+ Top = 22
Action = RichEditUnderline1
AutoSize = True
end
object ToolButton12: TToolButton
- Left = 411
- Top = 44
+ Left = 0
+ Top = 22
Width = 8
Caption = 'ToolButton12'
ImageIndex = 10
+ Wrap = True
Style = tbsSeparator
end
object ToolButton9: TToolButton
- Left = 419
- Top = 44
+ Left = 0
+ Top = 49
Action = RichEditAlignLeft1
AutoSize = True
end
object ToolButton10: TToolButton
- Left = 564
- Top = 44
+ Left = 145
+ Top = 49
Action = RichEditAlignCenter1
AutoSize = True
end
object ToolButton11: TToolButton
- Left = 689
- Top = 44
+ Left = 270
+ Top = 49
Action = RichEditAlignRight1
AutoSize = True
end
end
object cxGrid: TcxGrid
Left = 0
- Top = 94
+ Top = 99
Width = 451
- Height = 210
+ Height = 205
Align = alClient
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
@@ -161,8 +161,6 @@ inherited frViewDetallesBase: TfrViewDetallesBase
TabOrder = 1
LookAndFeel.Kind = lfStandard
LookAndFeel.NativeStyle = True
- ExplicitTop = 99
- ExplicitHeight = 205
object cxGridView: TcxGridDBTableView
OnKeyDown = cxGridViewKeyDown
NavigatorButtons.ConfirmDelete = False
@@ -351,16 +349,16 @@ inherited frViewDetallesBase: TfrViewDetallesBase
end
object TBXDock1: TTBXDock
Left = 0
- Top = 68
+ Top = 73
Width = 451
Height = 26
BackgroundOnToolbars = False
UseParentBackground = True
- ExplicitTop = 73
object TBXToolbar1: TTBXToolbar
Left = 0
Top = 0
Caption = 'TBXToolbar1'
+ DockPos = 0
DragHandleStyle = dhNone
Images = ContenidoImageList
TabOrder = 0
@@ -372,12 +370,16 @@ inherited frViewDetallesBase: TfrViewDetallesBase
Action = actAnadirCapitulo
Images = ContenidoImageList
end
+ object TBXItem20: TTBXItem
+ end
object TBXSeparatorItem7: TTBXSeparatorItem
end
object TBXItem15: TTBXItem
Action = actAnadirTitulo
Images = ContenidoImageList
end
+ object TBXItem19: TTBXItem
+ end
object TBXItem14: TTBXItem
Action = actAnadirSubtotal
Images = ContenidoImageList
@@ -571,6 +573,13 @@ inherited frViewDetallesBase: TfrViewDetallesBase
OnExecute = actAnadirCapituloExecute
OnUpdate = actAnadirCapituloUpdate
end
+ object actAnadirCapituloOpcional: TAction
+ Category = 'Operaciones'
+ Caption = 'Un capitulo opcional'
+ ImageIndex = 12
+ OnExecute = actAnadirCapituloOpcionalExecute
+ OnUpdate = actAnadirCapituloOpcionalUpdate
+ end
object actAnadirTitulo: TAction
Category = 'Operaciones'
Caption = 'T'#237'tulo de cap'#237'tulo'
@@ -578,6 +587,13 @@ inherited frViewDetallesBase: TfrViewDetallesBase
OnExecute = actAnadirTituloExecute
OnUpdate = actAnadirTituloUpdate
end
+ object actAnadirTituloOpcional: TAction
+ Category = 'Operaciones'
+ Caption = 'Titulo de capitulo opcional'
+ ImageIndex = 13
+ OnExecute = actAnadirTituloOpcionalExecute
+ OnUpdate = actAnadirTituloOpcionalUpdate
+ end
object actAnadirSubtotal: TAction
Category = 'Operaciones'
Caption = 'Subtotal de cap'#237'tulo'
diff --git a/Source/GUIBase/uViewDetallesBase.pas b/Source/GUIBase/uViewDetallesBase.pas
index 371f9815..a195c8ec 100644
--- a/Source/GUIBase/uViewDetallesBase.pas
+++ b/Source/GUIBase/uViewDetallesBase.pas
@@ -146,6 +146,10 @@ type
Seleccionartodo1: TMenuItem;
cxStyle_TITULO_OPCIONAL: TcxStyle;
TBXItem17: TTBXItem;
+ TBXItem19: TTBXItem;
+ TBXItem20: TTBXItem;
+ actAnadirCapituloOpcional: TAction;
+ actAnadirTituloOpcional: TAction;
procedure actAnadirExecute(Sender: TObject);
procedure actEliminarExecute(Sender: TObject);
procedure actSubirExecute(Sender: TObject);
@@ -179,11 +183,15 @@ type
procedure actAnchoAutomaticoExecute(Sender: TObject);
procedure actAnchoAutomaticoUpdate(Sender: TObject);
procedure actAnadirCapituloUpdate(Sender: TObject);
+ procedure actAnadirCapituloOpcionalUpdate(Sender: TObject);
procedure actAnadirTituloUpdate(Sender: TObject);
+ procedure actAnadirTituloOpcionalUpdate(Sender: TObject);
procedure actAnadirSubtotalUpdate(Sender: TObject);
procedure actAnadirDescuentoUpdate(Sender: TObject);
procedure actAnadirCapituloExecute(Sender: TObject);
+ procedure actAnadirCapituloOpcionalExecute(Sender: TObject);
procedure actAnadirTituloExecute(Sender: TObject);
+ procedure actAnadirTituloOpcionalExecute(Sender: TObject);
procedure actAnadirSubtotalExecute(Sender: TObject);
procedure actAnadirDescuentoExecute(Sender: TObject);
procedure actDetallesCopiarExecute(Sender: TObject);
@@ -333,6 +341,46 @@ begin
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);
begin
inherited;
@@ -463,6 +511,40 @@ begin
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);
begin
inherited;
@@ -871,7 +953,7 @@ begin
else
begin
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
begin
IndiceCol := cxGridView.GetColumnByFieldName(CAMPO_CONCEPTO).Index;
diff --git a/Source/Informes/CertificadoTrabajos.rdx b/Source/Informes/1/CertificadoTrabajos.rdx
similarity index 100%
rename from Source/Informes/CertificadoTrabajos.rdx
rename to Source/Informes/1/CertificadoTrabajos.rdx
diff --git a/Source/Informes/2/CertificadoTrabajos.rdx b/Source/Informes/2/CertificadoTrabajos.rdx
new file mode 100644
index 00000000..473290a3
Binary files /dev/null and b/Source/Informes/2/CertificadoTrabajos.rdx differ
diff --git a/Source/Informes/3/CertificadoTrabajos.rdx b/Source/Informes/3/CertificadoTrabajos.rdx
new file mode 100644
index 00000000..d2ef3f73
Binary files /dev/null and b/Source/Informes/3/CertificadoTrabajos.rdx differ
diff --git a/Source/Modulos/Presupuestos de cliente/Views/uViewDetallesPresupuestoCliente.dfm b/Source/Modulos/Presupuestos de cliente/Views/uViewDetallesPresupuestoCliente.dfm
index bfb611fd..d79b6009 100644
--- a/Source/Modulos/Presupuestos de cliente/Views/uViewDetallesPresupuestoCliente.dfm
+++ b/Source/Modulos/Presupuestos de cliente/Views/uViewDetallesPresupuestoCliente.dfm
@@ -1,7 +1,7 @@
inherited frViewDetallesPresupuestoCliente: TfrViewDetallesPresupuestoCliente
inherited ToolBar1: TToolBar
- Height = 73
- ExplicitHeight = 73
+ Height = 100
+ ExplicitHeight = 100
inherited ToolButton3: TToolButton
Wrap = False
end
@@ -23,77 +23,73 @@ inherited frViewDetallesPresupuestoCliente: TfrViewDetallesPresupuestoCliente
end
inherited FontSize: TEdit
Top = 22
- Width = 58
+ Width = 74
ExplicitTop = 22
- ExplicitWidth = 58
+ ExplicitWidth = 74
end
- inherited UpDown1: TUpDown
- Left = 203
+ inherited ToolButton13: TToolButton [7]
+ Left = 0
Top = 22
- ExplicitLeft = 203
+ ExplicitLeft = 0
ExplicitTop = 22
end
- inherited ToolButton13: TToolButton
- Left = 220
- Top = 22
- ExplicitLeft = 220
- ExplicitTop = 22
+ inherited UpDown1: TUpDown [8]
+ Left = 0
+ Top = 49
+ ExplicitLeft = 0
+ ExplicitTop = 49
end
inherited ToolButton6: TToolButton
- Left = 228
- Top = 22
- ExplicitLeft = 228
- ExplicitTop = 22
+ Left = 17
+ Top = 49
+ ExplicitLeft = 17
+ ExplicitTop = 49
end
inherited ToolButton7: TToolButton
- Left = 294
- Top = 22
- ExplicitLeft = 294
- ExplicitTop = 22
+ Left = 83
+ Top = 49
+ ExplicitLeft = 83
+ ExplicitTop = 49
end
inherited ToolButton8: TToolButton
- Left = 361
- Top = 22
- ExplicitLeft = 361
- ExplicitTop = 22
+ Left = 150
+ Top = 49
+ ExplicitLeft = 150
+ ExplicitTop = 49
end
inherited ToolButton12: TToolButton
Left = 0
- Top = 22
+ Top = 49
Wrap = True
ExplicitLeft = 0
- ExplicitTop = 22
+ ExplicitTop = 49
ExplicitHeight = 27
end
inherited ToolButton9: TToolButton
Left = 0
- Top = 49
+ Top = 76
ExplicitLeft = 0
- ExplicitTop = 49
+ ExplicitTop = 76
end
inherited ToolButton10: TToolButton
Left = 145
- Top = 49
+ Top = 76
ExplicitLeft = 145
- ExplicitTop = 49
+ ExplicitTop = 76
end
inherited ToolButton11: TToolButton
Left = 270
- Top = 49
+ Top = 76
ExplicitLeft = 270
- ExplicitTop = 49
+ ExplicitTop = 76
end
end
inherited cxGrid: TcxGrid
- Top = 99
- Height = 205
+ Top = 126
+ Height = 178
ExplicitTop = 99
ExplicitHeight = 205
inherited cxGridView: TcxGridDBTableView
- inherited cxGridViewTIPO: TcxGridDBColumn
- Visible = False
- VisibleForCustomization = False
- end
inherited cxGridViewREFERENCIA_PROVEEDOR: TcxGridDBColumn
DataBinding.FieldName = ''
end
@@ -106,9 +102,19 @@ inherited frViewDetallesPresupuestoCliente: TfrViewDetallesPresupuestoCliente
end
end
inherited TBXDock1: TTBXDock
- Top = 73
+ Top = 100
ExplicitTop = 73
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
end
object TBXItem18: TTBXItem
@@ -120,7 +126,7 @@ inherited frViewDetallesPresupuestoCliente: TfrViewDetallesPresupuestoCliente
inherited actAnadirDescuento: TAction
Caption = 'Linea de descuento'
end
- object actVariarPrecios: TAction
+ object actVariarPrecios: TAction [23]
Category = 'Operaciones'
Caption = 'Variar precios'
OnExecute = actVariarPreciosExecute
diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES
index 5ee9b2db..b9df60a7 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 17d385ef..8499e319 100644
--- a/Source/Servidor/FactuGES_Server.dproj
+++ b/Source/Servidor/FactuGES_Server.dproj
@@ -35,7 +35,7 @@
Delphi.Personality
- FalseTrueFalse/standaloneTrueFalse2120FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.1.2.0FactuGES Servidor2.1.2.0jueves, 11 de febrero de 2016 11:43
+ FalseTrueFalse/standaloneTrueFalse2130FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.1.3.0FactuGES Servidor2.1.3.0lunes, 07 de marzo de 2016 13:00
ExpressPrinting System by Developer Express Inc.
FactuGES_Server.dpr
diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc
index e4e2f67c..4c21114f 100644
--- a/Source/Servidor/FactuGES_Server.rc
+++ b/Source/Servidor/FactuGES_Server.rc
@@ -1,7 +1,7 @@
MAINICON ICON "C:\Codigo tecsitel\Resources\Iconos\Servidor.ico"
1 VERSIONINFO
-FILEVERSION 2,1,2,0
-PRODUCTVERSION 2,1,2,0
+FILEVERSION 2,1,3,0
+PRODUCTVERSION 2,1,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.1.2.0\0"
+ VALUE "FileVersion", "2.1.3.0\0"
VALUE "ProductName", "FactuGES Servidor\0"
- VALUE "ProductVersion", "2.1.2.0\0"
- VALUE "CompileDate", "jueves, 03 de marzo de 2016 13:10\0"
+ VALUE "ProductVersion", "2.1.3.0\0"
+ VALUE "CompileDate", "lunes, 07 de marzo de 2016 13:16\0"
END
END
BLOCK "VarFileInfo"