Tecistel/Tecsitel_FactuGES2
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Se arreglan las ordenes de devolucion para que puedan meter una dirección de salida del material en lugar de un almacen u obra

Browse Source 
git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@844 0c75b7a4-871f-7646-8a2f-f78d34cc349f
This commit is contained in:
roberto 2009-01-16 15:21:51 +00:00
parent 95567d6c28
commit 984971d58f
4 changed files with 125 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Modulos/Albaranes de proveedor/Controller/uAlbaranesProveedorController.pas
View File

@ -639,8 +639,8 @@ begin
raise Exception.Create('Una orden de devolución no puede tener un importe total positivo'); raise Exception.Create('Una orden de devolución no puede tener un importe total positivo');
//Una orden de devolución debe tener relleno el almacén de salida de material //Una orden de devolución debe tener relleno el almacén de salida de material
if (AAlbaran.ID_ALMACEN < 0) or (AAlbaran.ID_ALMACEN = 0) then if (Length(AAlbaran.CALLE) = 0) and (AAlbaran.ID_ALMACEN = 0) then
raise Exception.Create('Debe indicar el almacén de salida de esta orden de devolución'); raise Exception.Create('Debe indicar una dirección de salida o almacén para esta orden de devolución');
end; end;
{ Asegurarse de valores en campos "automáticos" tanto { Asegurarse de valores en campos "automáticos" tanto

161
Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranDevProveedor.dfm
View File

@ -6,11 +6,21 @@ inherited frViewAlbaranDevProveedor: TfrViewAlbaranDevProveedor
ExplicitHeight = 470 ExplicitHeight = 470
inherited edtFechaAlbaran: TcxDBDateEdit inherited edtFechaAlbaran: TcxDBDateEdit
Left = 114 Left = 114
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 114 ExplicitLeft = 114
ExplicitWidth = 330 ExplicitWidth = 330
Width = 330 Width = 330
end end
inherited memObservaciones: TcxDBMemo inherited memObservaciones: TcxDBMemo
Left = 444
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 444
ExplicitWidth = 186 ExplicitWidth = 186
ExplicitHeight = 172 ExplicitHeight = 172
Height = 172 Height = 172
@ -18,37 +28,14 @@ inherited frViewAlbaranDevProveedor: TfrViewAlbaranDevProveedor
end end
inherited eReferencia: TcxDBTextEdit inherited eReferencia: TcxDBTextEdit
Left = 114 Left = 114
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 114 ExplicitLeft = 114
ExplicitWidth = 330 ExplicitWidth = 330
Width = 330 Width = 330
end end
inherited frViewProveedorAlbaran: TfrViewDatosYSeleccionProveedor
Width = 350
ExplicitWidth = 350
inherited dxLayoutControl1: TdxLayoutControl
Width = 350
inherited edtlNombre: TcxDBTextEdit
ExplicitWidth = 224
Width = 224
end
inherited edtNIFCIF: TcxDBTextEdit
ExplicitWidth = 562
Width = 562
end
inherited edtCalle: TcxDBTextEdit
ExplicitWidth = 562
Width = 562
end
inherited edtPoblacion: TcxDBTextEdit
ExplicitWidth = 177
Width = 177
end
inherited edtProvincia: TcxDBTextEdit
ExplicitWidth = 327
Width = 327
end
end
end
inherited frViewDireccionEntregaAlbaranProv1: TfrViewDireccionEntregaAlbaranProv inherited frViewDireccionEntregaAlbaranProv1: TfrViewDireccionEntregaAlbaranProv
Width = 445 Width = 445
Height = 199 Height = 199
@ -57,16 +44,30 @@ inherited frViewAlbaranDevProveedor: TfrViewAlbaranDevProveedor
inherited dxLayoutControl1: TdxLayoutControl inherited dxLayoutControl1: TdxLayoutControl
Width = 445 Width = 445
Height = 199 Height = 199
ExplicitHeight = 78 ExplicitWidth = 445
ExplicitHeight = 199
inherited rdxDestino1: TRadioButton inherited rdxDestino1: TRadioButton
Width = 402
Caption = 'Salida del albar'#225'n del almac'#233'n:' Caption = 'Salida del albar'#225'n del almac'#233'n:'
ExplicitWidth = 402
end end
inherited rdxDestino2: TRadioButton inherited rdxDestino2: TRadioButton
Width = 287 Width = 287
Caption = 'Salida del albar'#225'n desde esta otra direcci'#243'n:'
ExplicitWidth = 287 ExplicitWidth = 287
end end
inherited cbLista: TcxDBLookupComboBox
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 402
Width = 402
end
inherited bModificar: TBitBtn inherited bModificar: TBitBtn
Left = 254
Top = 164 Top = 164
ExplicitLeft = 254
ExplicitTop = 164 ExplicitTop = 164
end end
inherited txtDireccion: TStaticText inherited txtDireccion: TStaticText
@ -75,19 +76,18 @@ inherited frViewAlbaranDevProveedor: TfrViewAlbaranDevProveedor
ExplicitWidth = 765 ExplicitWidth = 765
ExplicitHeight = 25 ExplicitHeight = 25
end end
inherited RadioButton1: TRadioButton inherited cbListaObras: TcxDBLookupComboBox
Caption = 'Salida del albar'#225'n de la obra:' Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 402
Width = 402
end end
inherited dxLayoutGroup1: TdxLayoutGroup inherited RadioButton1: TRadioButton
inherited dxLayoutControl1Item2: TdxLayoutItem Width = 402
Visible = False Caption = 'Salida del albar'#225'n de la obra:'
end ExplicitWidth = 402
inherited dxLayoutControl1Item4: TdxLayoutItem
Visible = False
end
inherited dxLayoutControl1Item1: TdxLayoutItem
Visible = False
end
end end
end end
inherited ActionList1: TActionList inherited ActionList1: TActionList
@ -109,34 +109,115 @@ inherited frViewAlbaranDevProveedor: TfrViewAlbaranDevProveedor
end end
inherited cbFormaPago: TcxDBLookupComboBox inherited cbFormaPago: TcxDBLookupComboBox
Left = 114 Left = 114
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 114 ExplicitLeft = 114
ExplicitWidth = 192 ExplicitWidth = 192
Width = 192 Width = 192
end end
inherited bFormasPago: TButton
Left = 282
ExplicitLeft = 282
end
inherited eReferenciaPedidoCli: TcxTextEdit inherited eReferenciaPedidoCli: TcxTextEdit
Left = 114 Left = 114
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 114 ExplicitLeft = 114
ExplicitWidth = 192 ExplicitWidth = 192
Width = 192 Width = 192
end end
inherited Button1: TButton
Left = 282
ExplicitLeft = 282
end
inherited eRefFactura: TcxDBTextEdit inherited eRefFactura: TcxDBTextEdit
Left = 114 Left = 114
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 114 ExplicitLeft = 114
ExplicitWidth = 330 ExplicitWidth = 330
Width = 330 Width = 330
end end
inherited eReferenciaProveedor: TcxDBTextEdit inherited eReferenciaProveedor: TcxDBTextEdit
Left = 114 Left = 114
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 114 ExplicitLeft = 114
ExplicitWidth = 330 ExplicitWidth = 330
Width = 330 Width = 330
end end
inherited eReferenciaFacturaProveedor: TcxDBTextEdit inherited eReferenciaFacturaProveedor: TcxDBTextEdit
Left = 114 Left = 114
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 114 ExplicitLeft = 114
ExplicitWidth = 330 ExplicitWidth = 330
Width = 330 Width = 330
end end
inherited frViewDatosYSeleccionProveedorAlbaran1: TfrViewDatosYSeleccionProveedorAlbaran
Left = 444
Width = 411
ExplicitLeft = 444
ExplicitWidth = 411
inherited dxLayoutControl1: TdxLayoutControl
Width = 411
inherited edtlNombre: TcxDBTextEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 224
Width = 224
end
inherited edtNIFCIF: TcxDBTextEdit
Left = 248
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 248
end
inherited edtPersonaContacto: TcxDBTextEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 283
Width = 283
end
inherited edtDireccion: TcxTextEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 121
Width = 121
end
inherited Button4: TButton
Left = 328
ExplicitLeft = 328
end
inherited Button5: TButton
Left = 328
ExplicitLeft = 328
end
inherited Button3: TBitBtn
Left = 153
ExplicitLeft = 153
end
end
end
inherited dxLayoutControl1Group_Root: TdxLayoutGroup inherited dxLayoutControl1Group_Root: TdxLayoutGroup
inherited dxLayoutControl1Group6: TdxLayoutGroup inherited dxLayoutControl1Group6: TdxLayoutGroup
inherited dxLayoutControl1Group1: TdxLayoutGroup inherited dxLayoutControl1Group1: TdxLayoutGroup

2
Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranDevProveedor.pas
View File

@ -9,7 +9,7 @@ uses
cxDBLookupEdit, cxDBLookupComboBox, uViewDireccionEntregaAlbaranProv, cxDBLookupEdit, cxDBLookupComboBox, uViewDireccionEntregaAlbaranProv,
uCustomView, uViewBase, uViewDatosYSeleccionProveedor, cxDBEdit, cxMemo, uCustomView, uViewBase, uViewDatosYSeleccionProveedor, cxDBEdit, cxMemo,
cxContainer, cxEdit, cxMaskEdit, cxCalendar, cxControls, cxContainer, cxEdit, cxMaskEdit, cxCalendar, cxControls,
uDAInterfaces; uDAInterfaces, uViewDatosYSeleccionProveedorAlbaran;
type type
IViewAlbaranDevProveedor = interface(IViewAlbaranProveedor) IViewAlbaranDevProveedor = interface(IViewAlbaranProveedor)

2
Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.pas
View File

@ -363,7 +363,7 @@ begin
ATabla.Active := True; ATabla.Active := True;
showmessage(inttostr(ATabla.RecordCount)); // showmessage(inttostr(ATabla.RecordCount));
AInforme := DarRutaFichero(DarRutaInformes, TipoInforme, IntToStr(IdEmpresa)); AInforme := DarRutaFichero(DarRutaInformes, TipoInforme, IntToStr(IdEmpresa));
if VarIsNull(AInforme) then if VarIsNull(AInforme) then