Acana_Interiorismo/FactuGES2
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Version Firma digital, plantillas, agrupacion por vendedor, arreglo duplicar presupupuesto fecha vencimiento recalculada, informe de pedido cambiar referencia segun indicaciones joseluis

Browse Source 
git-svn-id: https://192.168.0.254/svn/Proyectos.Acana_FactuGES2/trunk@691 f4e31baf-9722-1c47-927c-6f952f962d4b
This commit is contained in:
roberto 2024-09-19 19:17:21 +00:00
parent 4d991d0e50
commit 65d9717de3
21 changed files with 496 additions and 411 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Resources/Iconos/Facturas de cliente/16x16/Invoice-orange.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 617 B

BIN
Resources/Iconos/Facturas de cliente/16x16/Invoice-red.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 651 B

BIN
Source/Base/Base.res
View File

Binary file not shown.

56
Source/GUIBase/GUIBase.dproj
View File

@ -58,34 +58,34 @@
<DelphiCompile Include="GUIBase.dpk"> <DelphiCompile Include="GUIBase.dpk">
<MainSource>MainSource</MainSource> <MainSource>MainSource</MainSource>
</DelphiCompile> </DelphiCompile>
<DCCReference Include="..\Modulos\Presupuestos de cliente\Base.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\Base.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\ccpackD11.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\ccpackD11.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\cxDataD11.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\cxDataD11.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\cxEditorsD11.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\cxEditorsD11.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\cxExportD11.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\cxExportD11.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\cxLibraryD11.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\cxLibraryD11.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\dbrtl.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\dbrtl.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\dxGDIPlusD11.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\dxGDIPlusD11.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\dxLayoutControlD11.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\dxLayoutControlD11.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\dxPScxCommonD11.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\dxPScxCommonD11.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\dxPScxGrid6LnkD11.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\dxPScxGrid6LnkD11.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\dxThemeD11.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\dxThemeD11.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\frx11.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\frx11.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\frxe11.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\frxe11.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\fs11.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\fs11.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\JvAppFrmD11R.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\JvAppFrmD11R.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\JvCtrlsD11R.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\JvCtrlsD11R.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\JvGlobusD11R.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\JvGlobusD11R.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\PngComponentsD10.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\PngComponentsD10.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\PNG_D10.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\PNG_D10.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\rtl.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\rtl.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\tb2k_d10.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\tb2k_d10.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\tbx_d10.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\tbx_d10.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\vcl.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\vcl.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\vclactnband.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\vclactnband.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\vcldb.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\vcldb.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\vcljpg.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\vcljpg.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\vclx.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\vclx.dcp" />
<DCCReference Include="uDialogBase.pas"> <DCCReference Include="uDialogBase.pas">
<Form>fDialogBase</Form> <Form>fDialogBase</Form>
</DCCReference> </DCCReference>

7
Source/GUIBase/uEditorBase.dfm
View File

@ -19,7 +19,7 @@ object fEditorBase: TfEditorBase
TextHeight = 13 TextHeight = 13
object JvNavPanelHeader: TJvNavPanelHeader object JvNavPanelHeader: TJvNavPanelHeader
Left = 0 Left = 0
Top = 58 Top = 49
Width = 946 Width = 946
Align = alTop Align = alTop
Caption = 'Editor' Caption = 'Editor'
@ -34,6 +34,7 @@ object fEditorBase: TfEditorBase
ImageIndex = 0 ImageIndex = 0
StyleManager = dmBase.StyleManager StyleManager = dmBase.StyleManager
ParentStyleManager = False ParentStyleManager = False
ExplicitTop = 58
object Image1: TImage object Image1: TImage
Left = 919 Left = 919
Top = 0 Top = 0
@ -68,10 +69,10 @@ object fEditorBase: TfEditorBase
Left = 0 Left = 0
Top = 0 Top = 0
Width = 946 Width = 946
Height = 58 Height = 49
object tbxMain: TTBXToolbar object tbxMain: TTBXToolbar
Left = 0 Left = 0
Top = 29 Top = 23
Caption = 'tbxMain' Caption = 'tbxMain'
ChevronHint = 'M'#225's botones|' ChevronHint = 'M'#225's botones|'
DockMode = dmCannotFloatOrChangeDocks DockMode = dmCannotFloatOrChangeDocks

11
Source/GUIBase/uEditorBase.pas
View File

@ -477,7 +477,7 @@ begin
AWindowText := ATitulo; AWindowText := ATitulo;
end; end;
if ReadOnly then if Self.ReadOnly then
begin begin
AHeaderText := AHeaderText + ' (NO MODIFICABLE)'; AHeaderText := AHeaderText + ' (NO MODIFICABLE)';
AWindowText := AWindowText + ' (NO MODIFICABLE)'; AWindowText := AWindowText + ' (NO MODIFICABLE)';
@ -507,13 +507,14 @@ var
i: integer; i: integer;
begin begin
inherited; inherited;
if (csLoading in Self.ComponentState) then
Exit;
if ReadOnly then
for i:=0 to Self.ComponentCount-1 do for i:=0 to Self.ComponentCount-1 do
begin begin
If Self.Components[i] Is TfrViewBase then if Self.Components[i] is TfrViewBase then
(Self.Components[i] as TfrViewBase).ReadOnly := ReadOnly (Self.Components[i] as TfrViewBase).ReadOnly := Self.ReadOnly
end; end
end; end;
procedure TfEditorBase.SetWindowCaption(const Value: String); procedure TfEditorBase.SetWindowCaption(const Value: String);

33
Source/GUIBase/uEditorDBItem.dfm
View File

@ -10,12 +10,45 @@ inherited fEditorDBItem: TfEditorDBItem
TextHeight = 13 TextHeight = 13
inherited JvNavPanelHeader: TJvNavPanelHeader inherited JvNavPanelHeader: TJvNavPanelHeader
Width = 650 Width = 650
ExplicitTop = 49
ExplicitWidth = 650 ExplicitWidth = 650
inherited Image1: TImage inherited Image1: TImage
Left = 623 Left = 623
ExplicitLeft = 627 ExplicitLeft = 627
ExplicitHeight = 19 ExplicitHeight = 19
end end
object lblDesbloquear: TcxLabel
AlignWithMargins = True
Left = 525
Top = 0
Margins.Left = 8
Margins.Top = 0
Margins.Right = 8
Margins.Bottom = 0
Align = alRight
AutoSize = False
Caption = 'Desbloquear'
Enabled = False
ParentFont = False
Style.HotTrack = True
Style.LookAndFeel.NativeStyle = False
Style.TextColor = clWindow
StyleDisabled.LookAndFeel.NativeStyle = False
StyleFocused.BorderStyle = ebsNone
StyleFocused.LookAndFeel.NativeStyle = False
StyleHot.BorderStyle = ebsNone
StyleHot.LookAndFeel.NativeStyle = False
StyleHot.TextStyle = [fsUnderline]
Properties.Alignment.Horz = taCenter
Properties.Alignment.Vert = taVCenter
Transparent = True
Visible = False
OnClick = lblDesbloquearClick
Height = 27
Width = 90
AnchorX = 570
AnchorY = 14
end
end end
inherited TBXDock: TTBXDock inherited TBXDock: TTBXDock
Width = 650 Width = 650

25
Source/GUIBase/uEditorDBItem.pas
View File

@ -9,7 +9,8 @@ uses
JvNavigationPane, DB, uDADataTable, uEditorDBBase, JvFormAutoSize, JvNavigationPane, DB, uDADataTable, uEditorDBBase, JvFormAutoSize,
StdCtrls, uDAScriptingProvider, uDACDSDataTable, AppEvnts, uCustomView, StdCtrls, uDAScriptingProvider, uDACDSDataTable, AppEvnts, uCustomView,
uViewBase, JvAppStorage, JvAppRegistryStorage, ExtCtrls, uDAInterfaces, uViewBase, JvAppStorage, JvAppRegistryStorage, ExtCtrls, uDAInterfaces,
JvComponentBase, JvFormPlacement, JvExComCtrls, JvStatusBar, pngimage; JvComponentBase, JvFormPlacement, JvExComCtrls, JvStatusBar, pngimage,
cxControls, cxContainer, cxEdit, cxLabel;
type type
IEditorDBItem = interface(IEditorDBBase) IEditorDBItem = interface(IEditorDBBase)
@ -25,6 +26,8 @@ type
imgStatus: TImage; imgStatus: TImage;
PnlComentario: TPanel; PnlComentario: TPanel;
lbComentario: TLabel; lbComentario: TLabel;
lblDesbloquear: TcxLabel;
procedure lblDesbloquearClick(Sender: TObject);
protected protected
FComentario: Variant; FComentario: Variant;
@ -42,7 +45,7 @@ type
implementation implementation
uses uses
uEditorBase, uDialogUtils; uEditorBase, uDialogUtils, uDataTableUtils;
{$R *.dfm} {$R *.dfm}
@ -51,6 +54,9 @@ begin
inherited; inherited;
if HayDatos then if HayDatos then
begin begin
if lblDesbloquear.Enabled then
lblDesbloquear.Visible := ReadOnly;
if (Self.Modified) and (dsDataTable.DataTable.State <> dsInsert) then if (Self.Modified) and (dsDataTable.DataTable.State <> dsInsert) then
begin begin
StatusBar.Panels[0].Text := ' Se han producido cambios'; StatusBar.Panels[0].Text := ' Se han producido cambios';
@ -80,6 +86,21 @@ begin
Result := FComentario; Result := FComentario;
end; end;
procedure TfEditorDBItem.lblDesbloquearClick(Sender: TObject);
begin
inherited;
if (ShowConfirmMessage('¿Desbloquear los datos para permitir cambios?', 'Actualmente, los datos de esta pantalla no se pueden modificar.' + #13#10 +
'Temporalmente puede desbloquear la ficha para realizar cambios puntuales. ¿Desea continuar?') = IDYES) then
begin
lblDesbloquear.Visible := False;
lblDesbloquear.Enabled := False;
SetDataTableReadOnly(dsDataTable.DataTable, False);
Self.ReadOnly := False;
ActualizarEstadoEditor;
end;
end;
procedure TfEditorDBItem.SetComentario(const Value: Variant); procedure TfEditorDBItem.SetComentario(const Value: Variant);
begin begin
FComentario := Value; FComentario := Value;

12
Source/GUIBase/uViewBase.pas
View File

@ -41,15 +41,17 @@ var
begin begin
inherited; inherited;
if ReadOnly then if (csLoading in Self.ComponentState) then
Exit;
for i:=0 to Self.ComponentCount-1 do for i:=0 to Self.ComponentCount-1 do
begin begin
If (Self.Components[i] Is TfrViewBase) then if (Self.Components[i] is TfrViewBase) then
(Self.Components[i] as TfrViewBase).ReadOnly := ReadOnly; (Self.Components[i] as TfrViewBase).ReadOnly := Self.ReadOnly;
If (Self.Components[i] Is TcxControl) if (Self.Components[i] is TcxControl)
and (not (Self.Components[i] Is TdxLayoutControl)) then and (not (Self.Components[i] Is TdxLayoutControl)) then
(Self.Components[i] as TcxControl).Enabled := not ReadOnly; (Self.Components[i] as TcxControl).Enabled := not Self.ReadOnly;
end; end;
end; end;

4
Source/Informes/5/3/InfPedidoProveedor.fr3
View File

File diff suppressed because one or more lines are too long

4
Source/Informes/InfPedidoProveedor.fr3
View File

File diff suppressed because one or more lines are too long

10
Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.dfm
View File

@ -284,6 +284,11 @@ inherited frViewContratosCliente: TfrViewContratosCliente
object TBXItem2: TTBXItem object TBXItem2: TTBXItem
Action = actTienda Action = actTienda
end end
object TBXSeparatorItem3: TTBXSeparatorItem
end
object TBXItem4: TTBXItem
Action = actVendedor
end
end end
end end
end end
@ -314,6 +319,11 @@ inherited frViewContratosCliente: TfrViewContratosCliente
OnExecute = actTiendaExecute OnExecute = actTiendaExecute
OnUpdate = actTiendaUpdate OnUpdate = actTiendaUpdate
end end
object actVendedor: TAction
Caption = 'Vendedor'
OnExecute = actVendedorExecute
OnUpdate = actVendedorUpdate
end
end end
inherited GridPNGImageList: TPngImageList inherited GridPNGImageList: TPngImageList
PngImages = < PngImages = <

26
Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.pas
View File

@ -54,6 +54,9 @@ type
TBXItem2: TTBXItem; TBXItem2: TTBXItem;
TBXSeparatorItem1: TTBXSeparatorItem; TBXSeparatorItem1: TTBXSeparatorItem;
cxGridViewFECHA_ULT_PRESENTACION_CLIENTE: TcxGridDBColumn; cxGridViewFECHA_ULT_PRESENTACION_CLIENTE: TcxGridDBColumn;
actVendedor: TAction;
TBXSeparatorItem3: TTBXSeparatorItem;
TBXItem4: TTBXItem;
procedure cxGridActiveTabChanged(Sender: TcxCustomGrid; ALevel: procedure cxGridActiveTabChanged(Sender: TcxCustomGrid; ALevel:
TcxGridLevel); TcxGridLevel);
procedure cxGridViewStylesGetContentStyle(Sender: TcxCustomGridTableView; procedure cxGridViewStylesGetContentStyle(Sender: TcxCustomGridTableView;
@ -75,6 +78,8 @@ type
procedure frViewFiltroBase1actQuitarFiltroExecute(Sender: TObject); procedure frViewFiltroBase1actQuitarFiltroExecute(Sender: TObject);
procedure actTiendaExecute(Sender: TObject); procedure actTiendaExecute(Sender: TObject);
procedure actTiendaUpdate(Sender: TObject); procedure actTiendaUpdate(Sender: TObject);
procedure actVendedorExecute(Sender: TObject);
procedure actVendedorUpdate(Sender: TObject);
private private
//Filtros relativos a la vista //Filtros relativos a la vista
@ -141,6 +146,27 @@ begin
(Sender as TAction).Checked := not (cxGridViewTIENDA.GroupIndex < 0); (Sender as TAction).Checked := not (cxGridViewTIENDA.GroupIndex < 0);
end; end;
procedure TfrViewContratosCliente.actVendedorExecute(Sender: TObject);
begin
inherited;
if (cxGridViewVENDEDOR.GroupIndex < 0) then
begin
cxGridViewVENDEDOR.GroupIndex := cxGridView.GroupedColumnCount;
cxGridViewVENDEDOR.Visible := False;
end
else
begin
cxGridViewVENDEDOR.GroupIndex := -1;
cxGridViewVENDEDOR.Visible := True;
end;
end;
procedure TfrViewContratosCliente.actVendedorUpdate(Sender: TObject);
begin
inherited;
(Sender as TAction).Checked := not (cxGridViewVENDEDOR.GroupIndex < 0);
end;
procedure TfrViewContratosCliente.AnadirFiltroFechas; procedure TfrViewContratosCliente.AnadirFiltroFechas;
var var
Columna: TcxGridDBColumn; Columna: TcxGridDBColumn;

43
Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm
View File

@ -13,7 +13,6 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
inherited JvNavPanelHeader: TJvNavPanelHeader inherited JvNavPanelHeader: TJvNavPanelHeader
Width = 860 Width = 860
Caption = 'Nueva factura de cliente' Caption = 'Nueva factura de cliente'
ExplicitTop = 49
ExplicitWidth = 860 ExplicitWidth = 860
inherited Image1: TImage inherited Image1: TImage
Left = 833 Left = 833
@ -38,6 +37,12 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
454E44AE426082} 454E44AE426082}
ExplicitLeft = 742 ExplicitLeft = 742
end end
inherited lblDesbloquear: TcxLabel
Left = 735
ExplicitLeft = 735
AnchorX = 780
AnchorY = 14
end
end end
inherited TBXDock: TTBXDock inherited TBXDock: TTBXDock
Width = 860 Width = 860
@ -256,57 +261,57 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
ExplicitWidth = 57 ExplicitWidth = 57
end end
inherited UpDown1: TUpDown inherited UpDown1: TUpDown
Left = 570 Left = 586
Top = 0 Top = 0
ExplicitLeft = 570 ExplicitLeft = 586
ExplicitTop = 0 ExplicitTop = 0
end end
inherited ToolButton13: TToolButton inherited ToolButton13: TToolButton
Left = 587 Left = 603
Top = 0 Top = 0
ExplicitLeft = 587 ExplicitLeft = 603
ExplicitTop = 0 ExplicitTop = 0
end end
inherited ToolButton6: TToolButton inherited ToolButton6: TToolButton
Left = 595 Left = 611
Top = 0 Top = 0
ExplicitLeft = 595 ExplicitLeft = 611
ExplicitTop = 0 ExplicitTop = 0
end end
inherited ToolButton7: TToolButton inherited ToolButton7: TToolButton
Left = 629 Left = 645
Top = 0 Top = 0
ExplicitLeft = 629 ExplicitLeft = 645
ExplicitTop = 0 ExplicitTop = 0
end end
inherited ToolButton8: TToolButton inherited ToolButton8: TToolButton
Left = 663 Left = 679
Top = 0 Top = 0
ExplicitLeft = 663 ExplicitLeft = 679
ExplicitTop = 0 ExplicitTop = 0
end end
inherited ToolButton12: TToolButton inherited ToolButton12: TToolButton
Left = 697 Left = 713
Top = 0 Top = 0
ExplicitLeft = 697 ExplicitLeft = 713
ExplicitTop = 0 ExplicitTop = 0
end end
inherited ToolButton9: TToolButton inherited ToolButton9: TToolButton
Left = 705 Left = 721
Top = 0 Top = 0
ExplicitLeft = 705 ExplicitLeft = 721
ExplicitTop = 0 ExplicitTop = 0
end end
inherited ToolButton10: TToolButton inherited ToolButton10: TToolButton
Left = 739 Left = 755
Top = 0 Top = 0
ExplicitLeft = 739 ExplicitLeft = 755
ExplicitTop = 0 ExplicitTop = 0
end end
inherited ToolButton11: TToolButton inherited ToolButton11: TToolButton
Left = 773 Left = 789
Top = 0 Top = 0
ExplicitLeft = 773 ExplicitLeft = 789
ExplicitTop = 0 ExplicitTop = 0
end end
end end

2
Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.pas
View File

@ -17,7 +17,7 @@ uses
uViewDetallesFacturaCliente, dxLayoutLookAndFeels, JvExComCtrls, JvStatusBar, uViewDetallesFacturaCliente, dxLayoutLookAndFeels, JvExComCtrls, JvStatusBar,
uViewDetallesDTO, uViewDetallesArticulos, uTiposIVAController, uDAInterfaces, uViewDetallesDTO, uViewDetallesArticulos, uTiposIVAController, uDAInterfaces,
cxControls, cxContainer, cxEdit, cxTextEdit, cxDBEdit, Grids, DBGrids, cxControls, cxContainer, cxEdit, cxTextEdit, cxDBEdit, Grids, DBGrids,
cxCheckBox, uViewListaSubCuentas; cxCheckBox, uViewListaSubCuentas, cxLabel;
type type

5
Source/Modulos/Presupuestos de cliente/Controller/uPresupuestosClienteController.pas
View File

@ -475,7 +475,9 @@ begin
USUARIO := AppFactuGES.UsuarioActivo.UserName; USUARIO := AppFactuGES.UsuarioActivo.UserName;
ID_TIENDA := AppFactuGES.TiendaActiva.ID; ID_TIENDA := AppFactuGES.TiendaActiva.ID;
TIENDA := AppFactuGES.TiendaActiva.NOMBRE; TIENDA := AppFactuGES.TiendaActiva.NOMBRE;
FECHA_PRESUPUESTO := DateOf(Now); FECHA_PRESUPUESTO := DateOf(Date);
FECHA_VIGENCIA := IncMonth(Date, AppFactuGES.EmpresaActiva.VALIDEZ_PRESUPUESTOS);
FECHA_ULT_PRESENTACION_CLIENTE := DateOf(Date);
INCIDENCIAS_ACTIVAS := 0; INCIDENCIAS_ACTIVAS := 0;
INCIDENCIASIsNull := True; INCIDENCIASIsNull := True;
ID_CONTRATOIsNull := True; ID_CONTRATOIsNull := True;
@ -565,6 +567,7 @@ begin
//MODO CONSULTAR (Se deja la tabla como estaba) //MODO CONSULTAR (Se deja la tabla como estaba)
if AEditor.ReadOnly then if AEditor.ReadOnly then
SetDataTableReadOnly(APresupuesto.DataTable, False); SetDataTableReadOnly(APresupuesto.DataTable, False);
finally finally
AEditor.Release; AEditor.Release;
AEditor := NIL; AEditor := NIL;

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

@ -12,7 +12,6 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
inherited JvNavPanelHeader: TJvNavPanelHeader inherited JvNavPanelHeader: TJvNavPanelHeader
Width = 848 Width = 848
Caption = 'Nuevo presupuesto de cliente' Caption = 'Nuevo presupuesto de cliente'
ExplicitTop = 49
ExplicitWidth = 848 ExplicitWidth = 848
inherited Image1: TImage inherited Image1: TImage
Left = 821 Left = 821
@ -125,6 +124,14 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
960000000049454E44AE426082} 960000000049454E44AE426082}
ExplicitLeft = 735 ExplicitLeft = 735
end end
inherited lblDesbloquear: TcxLabel
Left = 723
Enabled = True
Visible = True
ExplicitLeft = 723
AnchorX = 768
AnchorY = 14
end
end end
inherited TBXDock: TTBXDock inherited TBXDock: TTBXDock
Width = 848 Width = 848
@ -183,8 +190,6 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
ExplicitWidth = 842 ExplicitWidth = 842
ExplicitHeight = 442 ExplicitHeight = 442
inherited pagGeneral: TTabSheet inherited pagGeneral: TTabSheet
ExplicitLeft = 4
ExplicitTop = 24
ExplicitWidth = 834 ExplicitWidth = 834
ExplicitHeight = 414 ExplicitHeight = 414
inline frViewPresupuestoCliente1: TfrViewPresupuestoCliente inline frViewPresupuestoCliente1: TfrViewPresupuestoCliente
@ -218,7 +223,6 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
Left = 403 Left = 403
ExplicitLeft = 403 ExplicitLeft = 403
inherited dxLayoutControl1: TdxLayoutControl inherited dxLayoutControl1: TdxLayoutControl
ExplicitWidth = 320
inherited edtNIFCIF: TcxDBTextEdit inherited edtNIFCIF: TcxDBTextEdit
Left = 279 Left = 279
ExplicitLeft = 279 ExplicitLeft = 279
@ -273,30 +277,21 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
Width = 834 Width = 834
Height = 24 Height = 24
ExplicitWidth = 834 ExplicitWidth = 834
inherited ToolButton14: TToolButton [1] ExplicitHeight = 24
Left = 109 inherited ToolButton4: TToolButton
Top = 0
Enabled = True
ExplicitLeft = 109
ExplicitTop = 0
end
inherited ToolButton2: TToolButton [2]
Left = 143
end
inherited FontName: TJvFontComboBox [3]
Left = 257
Top = 0
ExplicitLeft = 257
ExplicitTop = 0
end
inherited ToolButton3: TToolButton [4]
Left = 402
ExplicitLeft = 402
end
inherited ToolButton4: TToolButton [5]
Left = 457
Wrap = False Wrap = False
ExplicitLeft = 457 end
inherited ToolButton14: TToolButton
Left = 334
Top = 0
ExplicitLeft = 334
ExplicitTop = 0
end
inherited FontName: TJvFontComboBox
Left = 368
Top = 0
ExplicitLeft = 368
ExplicitTop = 0
end end
inherited FontSize: TEdit inherited FontSize: TEdit
Left = 513 Left = 513
@ -365,12 +360,14 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
Top = 50 Top = 50
Width = 834 Width = 834
Height = 364 Height = 364
ExplicitTop = 50
ExplicitWidth = 834 ExplicitWidth = 834
ExplicitHeight = 364 ExplicitHeight = 364
end end
inherited TBXDock1: TTBXDock inherited TBXDock1: TTBXDock
Top = 24 Top = 24
Width = 834 Width = 834
ExplicitTop = 24
ExplicitWidth = 834 ExplicitWidth = 834
inherited TBXToolbar1: TTBXToolbar inherited TBXToolbar1: TTBXToolbar
ExplicitWidth = 665 ExplicitWidth = 665
@ -516,7 +513,6 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
ExplicitWidth = 848 ExplicitWidth = 848
inherited lbComentario: TLabel inherited lbComentario: TLabel
Width = 838 Width = 838
Height = 25
end end
end end
inline frViewTotales1: TfrViewTotalesPresupuesto [5] inline frViewTotales1: TfrViewTotalesPresupuesto [5]

12
Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestoCliente.dfm
View File

@ -232,10 +232,6 @@ inherited frViewPresupuestoCliente: TfrViewPresupuestoCliente
Height = 224 Height = 224
ExplicitWidth = 320 ExplicitWidth = 320
ExplicitHeight = 224 ExplicitHeight = 224
inherited edtlNombre: TcxDBTextEdit
ExplicitWidth = 224
Width = 224
end
inherited edtNIFCIF: TcxDBTextEdit inherited edtNIFCIF: TcxDBTextEdit
Left = 320 Left = 320
ExplicitLeft = 320 ExplicitLeft = 320
@ -244,10 +240,6 @@ inherited frViewPresupuestoCliente: TfrViewPresupuestoCliente
Left = 231 Left = 231
ExplicitLeft = 231 ExplicitLeft = 231
end end
inherited edtPersonaContacto: TcxDBTextEdit
ExplicitWidth = 283
Width = 283
end
inherited edtDireccion: TcxMemo inherited edtDireccion: TcxMemo
ExplicitWidth = 121 ExplicitWidth = 121
Width = 121 Width = 121
@ -260,10 +252,6 @@ inherited frViewPresupuestoCliente: TfrViewPresupuestoCliente
Left = 400 Left = 400
ExplicitLeft = 400 ExplicitLeft = 400
end end
inherited edtTelefonos: TcxTextEdit
ExplicitWidth = 363
Width = 363
end
end end
end end
object memFormaPago: TcxDBMemo object memFormaPago: TcxDBMemo

3
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"> <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<ProjectGuid>{ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1}</ProjectGuid> <ProjectGuid>{ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1}</ProjectGuid>
@ -29,7 +29,6 @@
<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><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">4</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</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">4.0.0.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">4.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">jueves, 01 de agosto de 2024 15:42</VersionInfoKeys></VersionInfoKeys><Excluded_Packages> <BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">4</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</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">4.0.0.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">4.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">jueves, 01 de agosto de 2024 15:42</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
<Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl">File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found</Excluded_Packages> <Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl">File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found</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>

2
Source/Servidor/FactuGES_Server.rc
View File

@ -16,7 +16,7 @@ BEGIN
VALUE "FileVersion", "4.0.0.0\0" VALUE "FileVersion", "4.0.0.0\0"
VALUE "ProductName", "FactuGES (Servidor)\0" VALUE "ProductName", "FactuGES (Servidor)\0"
VALUE "ProductVersion", "4.0.0.0\0" VALUE "ProductVersion", "4.0.0.0\0"
VALUE "CompileDate", "domingo, 04 de agosto de 2024 18:59\0" VALUE "CompileDate", "jueves, 19 de septiembre de 2024 18:07\0"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

BIN
Source/Servidor/FactuGES_Server.res
View File

Binary file not shown.