Uecko/AbetoDesign_FactuGES2
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Version 2.7.3 se arregla fallo de los eventos en presupuesto de clietne con el lio de preciopunto

Browse Source 
git-svn-id: https://192.168.0.254/svn/Proyectos.AbetoDesign_FactuGES/trunk@132 93f398dd-4eb6-7a46-baf6-13f46f578da2
This commit is contained in:
roberto 2018-04-04 16:19:28 +00:00
parent 9869355c8d
commit a8336c59e1
9 changed files with 415 additions and 330 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Cliente/FactuGES.dproj
View File

@ -51,7 +51,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">2</VersionInfo><VersionInfo Name="MinorVer">7</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.7.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.7.2.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">2</VersionInfo><VersionInfo Name="MinorVer">7</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.7.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.7.3.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></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><Source><Source Name="MainSource">FactuGES.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></BorlandProject>

BIN
Source/Cliente/FactuGES.res
View File

Binary file not shown.

15
Source/Modulos/Presupuestos de cliente/Model/uBizPresupuestosCliente.pas
View File

@ -41,6 +41,7 @@ type
TBizPresupuestoCliente = class(TPresupuestosClienteDataTableRules, IBizPresupuestoCliente, ISeleccionable)
private
procedure CalcularPrecioPunto;
procedure CalcularBaseImponible;
procedure CalcularIVA;
procedure CalcularRE;
@ -75,6 +76,7 @@ type
procedure IMPORTE_NETOOnChange(Sender: TDACustomField);
procedure IMPORTE_PORTEOnChange(Sender: TDACustomField);
procedure DESCUENTOOnChange(Sender: TDACustomField);
procedure PRECIO_PUNTOOnChange(Sender: TDACustomField);
procedure IVAOnChange(Sender: TDACustomField);
procedure REOnChange(Sender: TDACustomField);
procedure SetID_TIPO_IVAValue(const aValue: Integer); override;
@ -163,6 +165,12 @@ begin
IMPORTE_IVA := (IVA / 100) * (BASE_IMPONIBLE);
end;
procedure TBizPresupuestoCliente.CalcularPrecioPunto;
begin
//ShowMessage('calcular precio punto');
//Self.FDetalles.
end;
procedure TBizPresupuestoCliente.CalcularRE;
begin
if not Self.DataTable.Editing then
@ -185,6 +193,7 @@ begin
FieldByName(fld_PresupuestosClienteDESCUENTO).OnChange := DESCUENTOOnChange;
FieldByName(fld_PresupuestosClienteIVA).OnChange := IVAOnChange;
FieldByName(fld_PresupuestosClienteRE).OnChange := REOnChange;
// FieldByName(fld_PresupuestosClientePRECIO_PUNTO).OnChange := PRECIO_PUNTOOnChange;
end;
FDetallesLink := TDADataSource.Create(NIL);
@ -301,6 +310,12 @@ begin
IniciarValoresPresupuestoNuevo;
end;
procedure TBizPresupuestoCliente.PRECIO_PUNTOOnChange(Sender: TDACustomField);
begin
CalcularPrecioPunto;
end;
procedure TBizPresupuestoCliente.RECARGO_EQUIVALENCIAOnChange(
Sender: TDACustomField);
begin

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

@ -210,45 +210,76 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
Height = 286
ExplicitWidth = 989
ExplicitHeight = 286
inherited edtFechaPresupuesto: TcxDBDateEdit
ExplicitWidth = 187
Width = 187
end
inherited memObservaciones: TcxDBMemo
Left = 471
ExplicitLeft = 471
Left = 472
ExplicitLeft = 472
ExplicitWidth = 793
Width = 793
end
inherited eReferencia: TcxDBTextEdit
ExplicitWidth = 122
Width = 122
end
inherited cbFormaPago: TcxDBLookupComboBox
ExplicitWidth = 122
Width = 122
end
inherited bFormasPago: TButton
Left = 309
ExplicitLeft = 309
Left = 310
ExplicitLeft = 310
end
inherited edtFechaDecision: TcxDBDateEdit
Left = 318
ExplicitLeft = 318
Left = 319
ExplicitLeft = 319
ExplicitWidth = 260
Width = 260
end
inherited edtFechaVigencia: TcxDBDateEdit
ExplicitWidth = 260
Width = 260
end
inherited cbSituacion: TcxDBImageComboBox
ExplicitWidth = 260
Width = 260
end
inherited frViewDatosYSeleccionClientePresupuesto1: TfrViewDatosYSeleccionClientePresupuesto
Left = 471
ExplicitLeft = 471
Left = 472
Width = 320
ExplicitLeft = 472
ExplicitWidth = 320
inherited dxLayoutControl1: TdxLayoutControl
Width = 320
inherited edtlNombre: TcxDBTextEdit
ExplicitWidth = 202
Width = 202
end
inherited edtNIFCIF: TcxDBTextEdit
Left = 364
ExplicitLeft = 364
Left = 363
ExplicitLeft = 363
end
inherited Button3: TBitBtn
Left = 275
ExplicitLeft = 275
Left = 274
ExplicitLeft = 274
end
inherited edtPersonaContacto: TcxDBTextEdit
ExplicitWidth = 329
Width = 329
end
inherited edtDireccion: TcxMemo
ExplicitWidth = 121
Width = 121
end
inherited Button4: TButton
Left = 444
ExplicitLeft = 444
Left = 443
ExplicitLeft = 443
end
inherited Button5: TButton
Left = 444
ExplicitLeft = 444
Left = 443
ExplicitLeft = 443
end
inherited edtTelefonos: TcxTextEdit
ExplicitWidth = 193
@ -256,13 +287,33 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
end
end
end
inherited memFormaPago: TcxDBMemo
ExplicitWidth = 475
ExplicitHeight = 44
Height = 44
Width = 475
end
inherited memPlazoEntrega: TcxDBMemo
Top = 303
ExplicitTop = 303
ExplicitWidth = 396
ExplicitHeight = 100
Height = 100
Width = 396
end
inherited cbVendedor: TcxDBLookupComboBox
ExplicitWidth = 27
Width = 27
end
inherited cbTipoPresupuesto: TcxDBComboBox
Left = 314
ExplicitLeft = 314
ExplicitWidth = 186
Width = 186
end
inherited edtlReferenciaCliente: TcxDBTextEdit
ExplicitWidth = 204
Width = 204
end
end
end
@ -392,7 +443,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
ExplicitWidth = 753
end
inherited edtPrecioPunto: TcxDBCurrencyEdit
DataBinding.DataSource = dsDataTable
DataBinding.DataSource = frViewPresupuestoCliente1.DADataSource
Style.IsFontAssigned = True
end
inherited bRecalcularPrecioPunto: TButton

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

@ -170,11 +170,15 @@ end;
procedure TfEditorPresupuestoCliente.CustomEditorClose(Sender: TObject;
var Action: TCloseAction);
begin
inherited;
frViewTotales1.cbRecargoEquivalencia.Properties.OnValidate := Nil;
//PRECIO_PUNTO EVENTOS
frViewDetallesPresupuestoCliente1.edtPrecioPunto.Properties.OnValidate := Nil;
frViewDetallesPresupuestoCliente1.edtPrecioPunto.Properties.OnEditValueChanged := Nil;
inherited;
//GESTION_DOCUMENTOS
//Este método eliminará el directorio temporal si se ha creado
frViewDocumentosPresupuestoCliente1.actEliminarTodo.Execute;
@ -193,11 +197,16 @@ end;
procedure TfEditorPresupuestoCliente.EliminarInterno;
begin
//PRECIO_PUNTO EVENTOS
frViewDetallesPresupuestoCliente1.edtPrecioPunto.Properties.OnValidate := Nil;
frViewDetallesPresupuestoCliente1.edtPrecioPunto.Properties.OnEditValueChanged := Nil;
if (ShowConfirmMessage('¿Desea borrar este presupuesto de cliente?', '') = IDYES) then
begin
FController.Eliminar(FPresupuesto);
inherited
end
end;
procedure TfEditorPresupuestoCliente.FormShow(Sender: TObject);
@ -212,6 +221,7 @@ begin
frViewTotales1.cbRecargoEquivalencia.Properties.OnValidate := OnRecargoEquivalenciaPropertiesValidate;
//PRECIO_PUNTO EVENTOS
frViewDetallesPresupuestoCliente1.edtPrecioPunto.Properties.OnValidate := onPrecioPuntoPropertiesValidate;
frViewDetallesPresupuestoCliente1.edtPrecioPunto.Properties.OnEditValueChanged := OnPrecioPuntoPropertiesEditValueChanged;
@ -296,6 +306,10 @@ procedure TfEditorPresupuestoCliente.GuardarInterno;
var
bEsNuevo : Boolean;
begin
//PRECIO_PUNTO EVENTOS
frViewDetallesPresupuestoCliente1.edtPrecioPunto.Properties.OnValidate := Nil;
frViewDetallesPresupuestoCliente1.edtPrecioPunto.Properties.OnEditValueChanged := Nil;
inherited;
ShowHourglassCursor;
@ -316,6 +330,10 @@ begin
ShowInfoMessage('El presupuesto se ha dado de alta con el código ' + FPresupuesto.REFERENCIA);
Modified := False;
//PRECIO_PUNTO EVENTOS
frViewDetallesPresupuestoCliente1.edtPrecioPunto.Properties.OnValidate := onPrecioPuntoPropertiesValidate;
frViewDetallesPresupuestoCliente1.edtPrecioPunto.Properties.OnEditValueChanged := OnPrecioPuntoPropertiesEditValueChanged;
end;
procedure TfEditorPresupuestoCliente.ImprimirInterno;
@ -367,6 +385,7 @@ end;
procedure TfEditorPresupuestoCliente.OnPrecioPuntoPropertiesEditValueChanged(Sender: TObject);
begin
if not FPresupuesto.EsNuevo then
actRecalcularPrecioPunto.Execute;
end;
@ -374,7 +393,6 @@ procedure TfEditorPresupuestoCliente.OnRecargoEquivalenciaPropertiesValidate(
Sender: TObject; var DisplayValue: Variant; var ErrorText: TCaption;
var Error: Boolean);
begin
if frViewTotales1.cbRecargoEquivalencia.Checked then
Presupuesto.RECARGO_EQUIVALENCIA := 1
else

2
Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestosCliente.pas
View File

@ -402,7 +402,7 @@ begin
inherited;
APresupuesto := FController.Duplicar(Presupuestos);
//Recalculamos el presupuesto copiado con el precio punto actual
FController.DetallesController.RecalcularPrecioPuntoDetalles(APresupuesto.PRECIO_PUNTO, APresupuesto.Detalles);
// FController.DetallesController.RecalcularPrecioPuntoDetalles(APresupuesto.PRECIO_PUNTO, APresupuesto.Detalles);
FController.Ver(APresupuesto);
finally
HideHourglassCursor;

5
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>
@ -28,7 +28,8 @@
<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><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">7</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.7.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.7.2.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">lunes, 26 de marzo de 2018 17:23</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">2</VersionInfo><VersionInfo Name="MinorVer">7</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.7.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.7.3.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">martes, 03 de abril de 2018 17:53</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><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
</ProjectExtensions>

BIN
Source/Servidor/FactuGES_Server.res
View File

Binary file not shown.