Arreglo en factura para que cuando añadimos una nueva y cerramos sin hacer nada no de error

git-svn-id: https://192.168.0.254/svn/Proyectos.LuisLeon_FactuGES/trunk@313 c93665c3-c93d-084d-9b98-7d5f4a9c3376
This commit is contained in:
roberto 2009-03-03 18:52:06 +00:00
parent 0c1b87a136
commit 347c202cb3
9 changed files with 112 additions and 102 deletions

Binary file not shown.

View File

@ -1,7 +1,7 @@
MAINICON ICON "c:\Codigo Luis Leon\Source\Iconos\Factuges.ico"
1 VERSIONINFO
FILEVERSION 3,3,1,0
PRODUCTVERSION 3,3,1,0
FILEVERSION 3,3,2,0
PRODUCTVERSION 3,3,2,0
FILEFLAGSMASK 0x3FL
FILEFLAGS 0x00L
FILEOS 0x40004L
@ -13,9 +13,9 @@ BEGIN
BLOCK "0C0A04E4"
BEGIN
VALUE "CompanyName", "Rodax Software S.L.\0"
VALUE "FileVersion", "3.3.1.0\0"
VALUE "FileVersion", "3.3.2.0\0"
VALUE "InternalName", "FactuGES\0"
VALUE "ProductVersion", "3.3.1.0\0"
VALUE "ProductVersion", "3.3.2.0\0"
END
END
BLOCK "VarFileInfo"

Binary file not shown.

View File

@ -209,40 +209,40 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
ExplicitWidth = 58
end
inherited UpDown1: TUpDown
Left = 237
ExplicitLeft = 237
Left = 252
ExplicitLeft = 252
end
inherited ToolButton13: TToolButton
Left = 254
ExplicitLeft = 254
Left = 269
ExplicitLeft = 269
end
inherited ToolButton6: TToolButton
Left = 262
ExplicitLeft = 262
Left = 277
ExplicitLeft = 277
end
inherited ToolButton7: TToolButton
Left = 296
ExplicitLeft = 296
Left = 311
ExplicitLeft = 311
end
inherited ToolButton8: TToolButton
Left = 330
ExplicitLeft = 330
Left = 345
ExplicitLeft = 345
end
inherited ToolButton12: TToolButton
Left = 364
ExplicitLeft = 364
Left = 379
ExplicitLeft = 379
end
inherited ToolButton9: TToolButton
Left = 372
ExplicitLeft = 372
Left = 387
ExplicitLeft = 387
end
inherited ToolButton10: TToolButton
Left = 406
ExplicitLeft = 406
Left = 421
ExplicitLeft = 421
end
inherited ToolButton11: TToolButton
Left = 440
ExplicitLeft = 440
Left = 455
ExplicitLeft = 455
end
end
inherited cxGrid: TcxGrid
@ -299,18 +299,18 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
ExplicitWidth = 73
end
inherited Bevel3: TBevel
Left = 420
Left = 441
Top = 30
Height = 122
ExplicitLeft = 420
ExplicitLeft = 441
ExplicitTop = 30
ExplicitHeight = 122
end
inherited Bevel4: TBevel
Left = 532
Left = 553
Top = 111
Width = 186
ExplicitLeft = 532
ExplicitLeft = 553
ExplicitTop = 111
ExplicitWidth = 186
end
@ -322,19 +322,19 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
Width = 93
end
inherited ImporteIVA: TcxDBCurrencyEdit
Left = 603
Left = 624
Top = 57
Style.IsFontAssigned = True
ExplicitLeft = 603
ExplicitLeft = 624
ExplicitTop = 57
ExplicitWidth = 137
Width = 137
end
inherited ImporteTotal: TcxDBCurrencyEdit
Left = 533
Left = 554
Top = 131
Style.IsFontAssigned = True
ExplicitLeft = 533
ExplicitLeft = 554
ExplicitTop = 131
ExplicitWidth = 137
Width = 137
@ -346,34 +346,34 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
ExplicitTop = 131
end
inherited edtIVA: TcxDBSpinEdit
Left = 532
Left = 553
Top = 57
Style.IsFontAssigned = True
ExplicitLeft = 532
ExplicitLeft = 553
ExplicitTop = 57
end
inherited ImporteBase: TcxDBCurrencyEdit
Left = 532
Left = 553
Top = 30
Style.IsFontAssigned = True
ExplicitLeft = 532
ExplicitLeft = 553
ExplicitTop = 30
ExplicitWidth = 92
Width = 92
end
inherited edtRE: TcxDBSpinEdit
Left = 532
Left = 553
Top = 84
Properties.AssignedValues.MinValue = True
Style.IsFontAssigned = True
ExplicitLeft = 532
ExplicitLeft = 553
ExplicitTop = 84
end
inherited ImporteRE: TcxDBCurrencyEdit
Left = 603
Left = 624
Top = 84
Style.IsFontAssigned = True
ExplicitLeft = 603
ExplicitLeft = 624
ExplicitTop = 84
ExplicitWidth = 56
Width = 56
@ -404,18 +404,17 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
Width = 134
end
inherited bTiposIVA: TButton
Left = 272
Left = 293
Top = 57
OnClick = frViewTotales1bTiposIVAClick
ExplicitLeft = 272
ExplicitLeft = 293
ExplicitTop = 57
end
inherited cbRecargoEquivalencia: TcxDBCheckBox
Top = 84
Properties.OnEditValueChanged = frViewTotales1cbRecargoEquivalenciaPropertiesEditValueChanged
ExplicitTop = 84
ExplicitWidth = 219
Width = 219
ExplicitWidth = 314
Width = 314
end
inherited dxLayoutControl1Group_Root: TdxLayoutGroup
inherited dxLayoutControl1Group1: TdxLayoutGroup

View File

@ -40,14 +40,15 @@ type
procedure frViewTotales1bTiposIVAClick(Sender: TObject);
procedure frViewTotales1eIVAPropertiesValidate(Sender: TObject;
var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean);
procedure frViewTotales1cbRecargoEquivalenciaPropertiesEditValueChanged(
Sender: TObject);
procedure frViewTotales1ePortePropertiesValidate(Sender: TObject;
var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean);
procedure frViewTotales1ePorteEditing(Sender: TObject;
var CanEdit: Boolean);
procedure actEnviarEMailExecute(Sender: TObject);
procedure actEnviarEMailUpdate(Sender: TObject);
procedure OnRecargoEquivalenciaPropertiesValidate(
Sender: TObject; var DisplayValue: Variant; var ErrorText: TCaption;
var Error: Boolean);
private
procedure RecalcularPortePorUnidad;
@ -121,14 +122,15 @@ begin
inherited;
dsDataTable.DataTable := NIL;
frViewTotales1.DADataSource.DataTable := NIL;
frViewTotales1.cbRecargoEquivalencia.Properties.OnValidate := Nil;
FViewFactura := NIL;
FFactura := NIL;
FTiposIVAController := NIL;
end;
destructor TfEditorFacturaCliente.Destroy;
begin
FTiposIVAController := NIL;
inherited;
end;
@ -167,6 +169,7 @@ begin
if not Assigned(Factura) then
raise Exception.Create('No hay ninguna factura asignada');
frViewTotales1.cbRecargoEquivalencia.Properties.OnValidate := OnRecargoEquivalenciaPropertiesValidate;
Factura.DataTable.Active := True;
end;
@ -190,14 +193,15 @@ begin
FTiposIVAController.VerTodos((frViewTotales1.dsTiposIVA.DataTable) as IBizTipoIVA);
end;
procedure TfEditorFacturaCliente.frViewTotales1cbRecargoEquivalenciaPropertiesEditValueChanged(
Sender: TObject);
procedure TfEditorFacturaCliente.OnRecargoEquivalenciaPropertiesValidate(
Sender: TObject; var DisplayValue: Variant; var ErrorText: TCaption;
var Error: Boolean);
begin
inherited;
{ if frViewTotales1.cbRecargoEquivalencia.Checked then
if frViewTotales1.cbRecargoEquivalencia.Checked then
Factura.RECARGO_EQUIVALENCIA := 1
else
Factura.RECARGO_EQUIVALENCIA := 0;}
Factura.RECARGO_EQUIVALENCIA := 0;
end;
procedure TfEditorFacturaCliente.frViewTotales1edtDescuentoPropertiesValidate(

View File

@ -71,7 +71,6 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
inherited pgPaginas: TPageControl
Width = 788
Height = 315
ActivePage = pagContenido
OnChanging = pgPaginasChanging
ExplicitWidth = 788
ExplicitHeight = 315
@ -102,22 +101,22 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
ExplicitWidth = 780
ExplicitHeight = 287
inherited eReferencia: TcxDBTextEdit
ExplicitWidth = 159
Width = 159
ExplicitWidth = 230
Width = 230
end
inherited edtFecha: TcxDBDateEdit
ExplicitWidth = 159
Width = 159
ExplicitWidth = 230
Width = 230
end
inherited memObservaciones: TcxDBMemo
ExplicitWidth = 301
ExplicitHeight = 159
Height = 159
Width = 301
ExplicitWidth = 344
ExplicitHeight = 107
Height = 107
Width = 344
end
inherited cbFormaPago: TcxDBLookupComboBox
ExplicitWidth = 78
Width = 78
ExplicitWidth = 92
Width = 92
end
inherited bFormasPago: TButton
Left = 234
@ -125,35 +124,35 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
end
inherited frViewProveedorFactura: TfrViewDatosYSeleccionProveedor
Left = 394
Width = 350
Width = 364
ExplicitLeft = 394
ExplicitWidth = 350
ExplicitWidth = 364
inherited dxLayoutControl1: TdxLayoutControl
Width = 350
Width = 364
inherited edtlNombre: TcxDBTextEdit
DataBinding.DataSource = frViewFacturaProveedor1.DADataSource
ExplicitWidth = 276
Width = 276
ExplicitWidth = 290
Width = 290
end
inherited edtNIFCIF: TcxDBTextEdit
DataBinding.DataSource = frViewFacturaProveedor1.DADataSource
ExplicitWidth = 562
Width = 562
ExplicitWidth = 290
Width = 290
end
inherited edtCalle: TcxDBTextEdit
DataBinding.DataSource = frViewFacturaProveedor1.DADataSource
ExplicitWidth = 562
Width = 562
ExplicitWidth = 290
Width = 290
end
inherited edtPoblacion: TcxDBTextEdit
DataBinding.DataSource = frViewFacturaProveedor1.DADataSource
ExplicitWidth = 177
Width = 177
ExplicitWidth = 172
Width = 172
end
inherited edtProvincia: TcxDBTextEdit
DataBinding.DataSource = frViewFacturaProveedor1.DADataSource
ExplicitWidth = 327
Width = 327
ExplicitWidth = 290
Width = 290
end
inherited edtCodigoPostal: TcxDBTextEdit
Left = 272
@ -166,6 +165,10 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
end
end
end
inherited eReferenciaProveedor: TcxDBTextEdit
ExplicitWidth = 230
Width = 230
end
end
end
end
@ -303,18 +306,18 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
ExplicitWidth = 73
end
inherited Bevel3: TBevel
Left = 420
Left = 441
Top = 30
Height = 122
ExplicitLeft = 420
ExplicitLeft = 441
ExplicitTop = 30
ExplicitHeight = 122
end
inherited Bevel4: TBevel
Left = 532
Left = 553
Top = 111
Width = 186
ExplicitLeft = 532
ExplicitLeft = 553
ExplicitTop = 111
ExplicitWidth = 186
end
@ -326,19 +329,19 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
Width = 93
end
inherited ImporteIVA: TcxDBCurrencyEdit
Left = 603
Left = 624
Top = 57
Style.IsFontAssigned = True
ExplicitLeft = 603
ExplicitLeft = 624
ExplicitTop = 57
ExplicitWidth = 137
Width = 137
end
inherited ImporteTotal: TcxDBCurrencyEdit
Left = 533
Left = 554
Top = 131
Style.IsFontAssigned = True
ExplicitLeft = 533
ExplicitLeft = 554
ExplicitTop = 131
ExplicitWidth = 137
Width = 137
@ -350,34 +353,34 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
ExplicitTop = 131
end
inherited edtIVA: TcxDBSpinEdit
Left = 532
Left = 553
Top = 57
Style.IsFontAssigned = True
ExplicitLeft = 532
ExplicitLeft = 553
ExplicitTop = 57
end
inherited ImporteBase: TcxDBCurrencyEdit
Left = 532
Left = 553
Top = 30
Style.IsFontAssigned = True
ExplicitLeft = 532
ExplicitLeft = 553
ExplicitTop = 30
ExplicitWidth = 92
Width = 92
end
inherited edtRE: TcxDBSpinEdit
Left = 532
Left = 553
Top = 84
Properties.AssignedValues.MinValue = True
Style.IsFontAssigned = True
ExplicitLeft = 532
ExplicitLeft = 553
ExplicitTop = 84
end
inherited ImporteRE: TcxDBCurrencyEdit
Left = 603
Left = 624
Top = 84
Style.IsFontAssigned = True
ExplicitLeft = 603
ExplicitLeft = 624
ExplicitTop = 84
ExplicitWidth = 56
Width = 56
@ -408,18 +411,17 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
Width = 134
end
inherited bTiposIVA: TButton
Left = 272
Left = 293
Top = 57
OnClick = frViewTotales1bTiposIVAClick
ExplicitLeft = 272
ExplicitLeft = 293
ExplicitTop = 57
end
inherited cbRecargoEquivalencia: TcxDBCheckBox
Top = 84
Properties.OnEditValueChanged = frViewTotales1cbRecargoEquivalenciaPropertiesEditValueChanged
ExplicitTop = 84
ExplicitWidth = 219
Width = 219
ExplicitWidth = 314
Width = 314
end
inherited dxLayoutControl1Group_Root: TdxLayoutGroup
LookAndFeel = frViewFacturaProveedor1.dxLayoutOfficeLookAndFeel1

View File

@ -33,10 +33,12 @@ type
procedure frViewTotales1bTiposIVAClick(Sender: TObject);
procedure frViewTotales1eIVAPropertiesValidate(Sender: TObject;
var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean);
procedure frViewTotales1cbRecargoEquivalenciaPropertiesEditValueChanged(Sender: TObject);
procedure frViewTotales1ePortePropertiesValidate(Sender: TObject;
var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean);
procedure frViewTotales1ePorteEditing(Sender: TObject; var CanEdit: Boolean);
procedure OnRecargoEquivalenciaPropertiesValidate(
Sender: TObject; var DisplayValue: Variant; var ErrorText: TCaption;
var Error: Boolean);
private
procedure RecalcularPortePorUnidad;
@ -98,14 +100,15 @@ begin
inherited;
dsDataTable.DataTable := NIL;
frViewTotales1.DADataSource.DataTable := NIL;
frViewTotales1.cbRecargoEquivalencia.Properties.OnValidate := Nil;
FViewFactura := NIL;
FFactura := NIL;
FTiposIVAController := NIL;
end;
destructor TfEditorFacturaProveedor.Destroy;
begin
FTiposIVAController := NIL;
inherited;
end;
@ -144,6 +147,7 @@ begin
if not Assigned(Factura) then
raise Exception.Create('No hay ninguna factura asignada');
frViewTotales1.cbRecargoEquivalencia.Properties.OnValidate := OnRecargoEquivalenciaPropertiesValidate;
Factura.DataTable.Active := True;
end;
@ -167,14 +171,15 @@ begin
FTiposIVAController.VerTodos((frViewTotales1.dsTiposIVA.DataTable) as IBizTipoIVA);
end;
procedure TfEditorFacturaProveedor.frViewTotales1cbRecargoEquivalenciaPropertiesEditValueChanged(
Sender: TObject);
procedure TfEditorFacturaProveedor.OnRecargoEquivalenciaPropertiesValidate(
Sender: TObject; var DisplayValue: Variant; var ErrorText: TCaption;
var Error: Boolean);
begin
inherited;
{ if frViewTotales1.cbRecargoEquivalencia.Checked then
if frViewTotales1.cbRecargoEquivalencia.Checked then
Factura.RECARGO_EQUIVALENCIA := 1
else
Factura.RECARGO_EQUIVALENCIA := 0;}
Factura.RECARGO_EQUIVALENCIA := 0;
end;
procedure TfEditorFacturaProveedor.frViewTotales1edtDescuentoPropertiesValidate(

View File

@ -16,7 +16,7 @@ BEGIN
VALUE "FileVersion", "3.3.1.0\0"
VALUE "ProductName", "FactuGES Server\0"
VALUE "ProductVersion", "3.3.1.0\0"
VALUE "CompileDate", "jueves, 26 de febrero de 2009 16:23\0"
VALUE "CompileDate", "martes, 03 de marzo de 2009 19:36\0"
END
END
BLOCK "VarFileInfo"

Binary file not shown.