Arreglos varios
git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@503 0c75b7a4-871f-7646-8a2f-f78d34cc349f
This commit is contained in:
parent
bbba3636d8
commit
d47378da68
@ -147,6 +147,7 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor
|
||||
inherited pgPaginas: TPageControl
|
||||
Width = 759
|
||||
Height = 454
|
||||
ActivePage = pagContenido
|
||||
TabOrder = 1
|
||||
OnChanging = pgPaginasChanging
|
||||
ExplicitWidth = 759
|
||||
@ -207,18 +208,12 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor
|
||||
inherited FontSize: TEdit
|
||||
Left = 544
|
||||
Top = 0
|
||||
Width = 58
|
||||
Width = 74
|
||||
ExplicitLeft = 544
|
||||
ExplicitTop = 0
|
||||
ExplicitWidth = 58
|
||||
ExplicitWidth = 74
|
||||
end
|
||||
inherited UpDown1: TUpDown
|
||||
Left = 602
|
||||
Top = 0
|
||||
ExplicitLeft = 602
|
||||
ExplicitTop = 0
|
||||
end
|
||||
inherited ToolButton13: TToolButton
|
||||
inherited ToolButton13: TToolButton [7]
|
||||
Left = 0
|
||||
Top = 0
|
||||
Wrap = True
|
||||
@ -226,47 +221,53 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor
|
||||
ExplicitTop = 0
|
||||
ExplicitHeight = 27
|
||||
end
|
||||
inherited ToolButton6: TToolButton [9]
|
||||
inherited UpDown1: TUpDown [8]
|
||||
Left = 0
|
||||
Top = 27
|
||||
ExplicitLeft = 0
|
||||
ExplicitTop = 27
|
||||
end
|
||||
inherited ToolButton7: TToolButton [10]
|
||||
Left = 66
|
||||
inherited ToolButton6: TToolButton [9]
|
||||
Left = 17
|
||||
Top = 27
|
||||
ExplicitLeft = 66
|
||||
ExplicitLeft = 17
|
||||
ExplicitTop = 27
|
||||
end
|
||||
inherited ToolButton7: TToolButton [10]
|
||||
Left = 83
|
||||
Top = 27
|
||||
ExplicitLeft = 83
|
||||
ExplicitTop = 27
|
||||
end
|
||||
inherited ToolButton8: TToolButton [11]
|
||||
Left = 133
|
||||
Left = 150
|
||||
Top = 27
|
||||
ExplicitLeft = 133
|
||||
ExplicitLeft = 150
|
||||
ExplicitTop = 27
|
||||
end
|
||||
inherited ToolButton12: TToolButton [12]
|
||||
Left = 216
|
||||
Left = 233
|
||||
Top = 27
|
||||
ExplicitLeft = 216
|
||||
ExplicitLeft = 233
|
||||
ExplicitTop = 27
|
||||
ExplicitHeight = 22
|
||||
end
|
||||
inherited ToolButton9: TToolButton [13]
|
||||
Left = 224
|
||||
Left = 241
|
||||
Top = 27
|
||||
ExplicitLeft = 224
|
||||
ExplicitLeft = 241
|
||||
ExplicitTop = 27
|
||||
end
|
||||
inherited ToolButton10: TToolButton [14]
|
||||
Left = 369
|
||||
Left = 386
|
||||
Top = 27
|
||||
ExplicitLeft = 369
|
||||
ExplicitLeft = 386
|
||||
ExplicitTop = 27
|
||||
end
|
||||
inherited ToolButton11: TToolButton [15]
|
||||
Left = 494
|
||||
Left = 511
|
||||
Top = 27
|
||||
ExplicitLeft = 494
|
||||
ExplicitLeft = 511
|
||||
ExplicitTop = 27
|
||||
end
|
||||
end
|
||||
@ -277,16 +278,11 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor
|
||||
ExplicitTop = 77
|
||||
ExplicitWidth = 751
|
||||
ExplicitHeight = 349
|
||||
inherited cxGridView: TcxGridDBTableView
|
||||
inherited cxGridViewIMPORTENETO: TcxGridDBColumn
|
||||
Options.Editing = True
|
||||
end
|
||||
end
|
||||
end
|
||||
inherited TBXDock1: TTBXDock
|
||||
Top = 51
|
||||
Width = 751
|
||||
ExplicitTop = 46
|
||||
ExplicitTop = 51
|
||||
ExplicitWidth = 751
|
||||
inherited TBXToolbar1: TTBXToolbar
|
||||
ExplicitWidth = 745
|
||||
|
||||
@ -89,6 +89,7 @@ inherited frViewDetallesAlbaranProveedor: TfrViewDetallesAlbaranProveedor
|
||||
end>
|
||||
Properties.ReadOnly = True
|
||||
Properties.OnButtonClick = nil
|
||||
Options.Editing = False
|
||||
end
|
||||
inherited cxGridViewREFERENCIA_PROVEEDOR: TcxGridDBColumn
|
||||
Properties.Buttons = <
|
||||
@ -99,6 +100,7 @@ inherited frViewDetallesAlbaranProveedor: TfrViewDetallesAlbaranProveedor
|
||||
end>
|
||||
Properties.ReadOnly = True
|
||||
Properties.OnButtonClick = nil
|
||||
Options.Editing = False
|
||||
end
|
||||
inherited cxGridViewREFERENCIA_FABRICANTE: TcxGridDBColumn
|
||||
Properties.Buttons = <
|
||||
@ -109,6 +111,7 @@ inherited frViewDetallesAlbaranProveedor: TfrViewDetallesAlbaranProveedor
|
||||
end>
|
||||
Properties.ReadOnly = True
|
||||
Properties.OnButtonClick = nil
|
||||
Options.Editing = False
|
||||
end
|
||||
inherited cxGridViewIMPORTEUNIDAD: TcxGridDBColumn
|
||||
Visible = False
|
||||
|
||||
@ -46,7 +46,8 @@ implementation
|
||||
{ TDetallesFacturaProveedorController }
|
||||
|
||||
uses uDAInterfaces, Variants, uDataModuleFacturasProveedor, uArticulosFacturaProveedorController,
|
||||
uControllerDetallesBase, Dialogs, SysUtils, uDialogUtils, uCalculosUtils, schArticulosClient_Intf;
|
||||
uControllerDetallesBase, Dialogs, SysUtils, uDialogUtils, uCalculosUtils, schArticulosClient_Intf,
|
||||
schFacturasProveedorClient_Intf;
|
||||
|
||||
procedure TDetallesFacturaProveedorController.ActualizarDetalles(ADetalles: IDAStronglyTypedDataTable; AProveedor: IBizProveedor);
|
||||
var
|
||||
@ -150,7 +151,7 @@ begin
|
||||
|
||||
AField := AArticulos.DataTable.FindField(fld_ArticulosREFERENCIA_FABR);
|
||||
if Assigned(AField) then
|
||||
ADetalles.DataTable.FieldByName(fld_ArticulosREFERENCIA_FABR).AsVariant := AField.AsVariant;
|
||||
ADetalles.DataTable.FieldByName(fld_FacturasProveedor_DetallesREFERENCIA_FABRICANTE).AsVariant := AField.AsVariant;
|
||||
end;
|
||||
|
||||
procedure TDetallesFacturaProveedorController.ValidarCampos(DataTable: TDADataTable);
|
||||
|
||||
@ -11,6 +11,7 @@
|
||||
<Projects Include="..\..\Servidor\FactuGES_Server.dproj" />
|
||||
<Projects Include="..\Albaranes de proveedor\Controller\AlbaranesProveedor_controller.dproj" />
|
||||
<Projects Include="..\Albaranes de proveedor\Views\AlbaranesProveedor_view.dproj" />
|
||||
<Projects Include="..\Articulos\Controller\Articulos_controller.dproj" />
|
||||
<Projects Include="..\Articulos\Views\Articulos_view.dproj" />
|
||||
<Projects Include="..\Contactos\Views\Contactos_view.dproj" />
|
||||
<Projects Include="..\Pedidos a proveedor\Controller\PedidosProveedor_controller.dproj" />
|
||||
@ -191,14 +192,23 @@
|
||||
<Target Name="AlbaranesProveedor_controller:Make">
|
||||
<MSBuild Projects="..\Albaranes de proveedor\Controller\AlbaranesProveedor_controller.dproj" Targets="Make" />
|
||||
</Target>
|
||||
<Target Name="Articulos_controller">
|
||||
<MSBuild Projects="..\Articulos\Controller\Articulos_controller.dproj" Targets="" />
|
||||
</Target>
|
||||
<Target Name="Articulos_controller:Clean">
|
||||
<MSBuild Projects="..\Articulos\Controller\Articulos_controller.dproj" Targets="Clean" />
|
||||
</Target>
|
||||
<Target Name="Articulos_controller:Make">
|
||||
<MSBuild Projects="..\Articulos\Controller\Articulos_controller.dproj" Targets="Make" />
|
||||
</Target>
|
||||
<Target Name="Build">
|
||||
<CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_view;Articulos_view;FacturasProveedor_model;FacturasProveedor_data;FacturasProveedor_controller;FacturasProveedor_view;FacturasProveedor_plugin;FactuGES;FactuGES_Server;AlbProv_FacProv_relation;AlbaranesProveedor_view;PedProv_AlbProv_relation;PedidosProveedor_view;PedidosProveedor_controller;AlbaranesProveedor_controller" />
|
||||
<CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_view;Articulos_view;FacturasProveedor_model;FacturasProveedor_data;FacturasProveedor_controller;FacturasProveedor_view;FacturasProveedor_plugin;FactuGES;FactuGES_Server;AlbProv_FacProv_relation;AlbaranesProveedor_view;PedProv_AlbProv_relation;PedidosProveedor_view;PedidosProveedor_controller;AlbaranesProveedor_controller;Articulos_controller" />
|
||||
</Target>
|
||||
<Target Name="Clean">
|
||||
<CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_view:Clean;Articulos_view:Clean;FacturasProveedor_model:Clean;FacturasProveedor_data:Clean;FacturasProveedor_controller:Clean;FacturasProveedor_view:Clean;FacturasProveedor_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean;AlbProv_FacProv_relation:Clean;AlbaranesProveedor_view:Clean;PedProv_AlbProv_relation:Clean;PedidosProveedor_view:Clean;PedidosProveedor_controller:Clean;AlbaranesProveedor_controller:Clean" />
|
||||
<CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_view:Clean;Articulos_view:Clean;FacturasProveedor_model:Clean;FacturasProveedor_data:Clean;FacturasProveedor_controller:Clean;FacturasProveedor_view:Clean;FacturasProveedor_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean;AlbProv_FacProv_relation:Clean;AlbaranesProveedor_view:Clean;PedProv_AlbProv_relation:Clean;PedidosProveedor_view:Clean;PedidosProveedor_controller:Clean;AlbaranesProveedor_controller:Clean;Articulos_controller:Clean" />
|
||||
</Target>
|
||||
<Target Name="Make">
|
||||
<CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_view:Make;Articulos_view:Make;FacturasProveedor_model:Make;FacturasProveedor_data:Make;FacturasProveedor_controller:Make;FacturasProveedor_view:Make;FacturasProveedor_plugin:Make;FactuGES:Make;FactuGES_Server:Make;AlbProv_FacProv_relation:Make;AlbaranesProveedor_view:Make;PedProv_AlbProv_relation:Make;PedidosProveedor_view:Make;PedidosProveedor_controller:Make;AlbaranesProveedor_controller:Make" />
|
||||
<CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_view:Make;Articulos_view:Make;FacturasProveedor_model:Make;FacturasProveedor_data:Make;FacturasProveedor_controller:Make;FacturasProveedor_view:Make;FacturasProveedor_plugin:Make;FactuGES:Make;FactuGES_Server:Make;AlbProv_FacProv_relation:Make;AlbaranesProveedor_view:Make;PedProv_AlbProv_relation:Make;PedidosProveedor_view:Make;PedidosProveedor_controller:Make;AlbaranesProveedor_controller:Make;Articulos_controller:Make" />
|
||||
</Target>
|
||||
<Import Condition="Exists('$(MSBuildBinPath)\Borland.Group.Targets')" Project="$(MSBuildBinPath)\Borland.Group.Targets" />
|
||||
</Project>
|
||||
@ -85,6 +85,7 @@ inherited frViewDetallesFacturaProveedor: TfrViewDetallesFacturaProveedor
|
||||
end>
|
||||
Properties.ReadOnly = True
|
||||
Properties.OnButtonClick = nil
|
||||
Options.Editing = False
|
||||
end
|
||||
inherited cxGridViewREFERENCIA_PROVEEDOR: TcxGridDBColumn
|
||||
Properties.Buttons = <
|
||||
@ -95,6 +96,7 @@ inherited frViewDetallesFacturaProveedor: TfrViewDetallesFacturaProveedor
|
||||
end>
|
||||
Properties.ReadOnly = True
|
||||
Properties.OnButtonClick = nil
|
||||
Options.Editing = False
|
||||
end
|
||||
inherited cxGridViewREFERENCIA_FABRICANTE: TcxGridDBColumn
|
||||
Properties.Buttons = <
|
||||
@ -105,6 +107,7 @@ inherited frViewDetallesFacturaProveedor: TfrViewDetallesFacturaProveedor
|
||||
end>
|
||||
Properties.ReadOnly = True
|
||||
Properties.OnButtonClick = nil
|
||||
Options.Editing = False
|
||||
end
|
||||
inherited cxGridViewIMPORTEUNIDAD: TcxGridDBColumn
|
||||
Visible = False
|
||||
@ -112,9 +115,7 @@ inherited frViewDetallesFacturaProveedor: TfrViewDetallesFacturaProveedor
|
||||
end
|
||||
inherited cxGridViewIMPORTENETO: TcxGridDBColumn
|
||||
Caption = 'Importe coste'
|
||||
Properties.ReadOnly = False
|
||||
Visible = True
|
||||
Options.Editing = True
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@ -64,6 +64,7 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
|
||||
inherited pgPaginas: TPageControl
|
||||
Width = 873
|
||||
Height = 486
|
||||
ActivePage = pagContenido
|
||||
TabOrder = 1
|
||||
OnChanging = pgPaginasChanging
|
||||
ExplicitWidth = 873
|
||||
@ -100,22 +101,10 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
|
||||
Height = 51
|
||||
ExplicitWidth = 865
|
||||
ExplicitHeight = 51
|
||||
inherited ToolButton3: TToolButton
|
||||
inherited ToolButton14: TToolButton
|
||||
Wrap = False
|
||||
end
|
||||
inherited ToolButton4: TToolButton
|
||||
Left = 278
|
||||
Top = 0
|
||||
ExplicitLeft = 278
|
||||
ExplicitTop = 0
|
||||
end
|
||||
inherited ToolButton14: TToolButton [4]
|
||||
Left = 334
|
||||
Top = 0
|
||||
ExplicitLeft = 334
|
||||
ExplicitTop = 0
|
||||
end
|
||||
inherited FontName: TJvFontComboBox [5]
|
||||
inherited FontName: TJvFontComboBox
|
||||
Left = 399
|
||||
Top = 0
|
||||
ExplicitLeft = 399
|
||||
@ -129,13 +118,7 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
|
||||
ExplicitTop = 0
|
||||
ExplicitWidth = 134
|
||||
end
|
||||
inherited UpDown1: TUpDown
|
||||
Left = 678
|
||||
Top = 0
|
||||
ExplicitLeft = 678
|
||||
ExplicitTop = 0
|
||||
end
|
||||
inherited ToolButton13: TToolButton
|
||||
inherited ToolButton13: TToolButton [7]
|
||||
Left = 0
|
||||
Top = 0
|
||||
Wrap = True
|
||||
@ -143,47 +126,54 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
|
||||
ExplicitTop = 0
|
||||
ExplicitHeight = 27
|
||||
end
|
||||
inherited ToolButton6: TToolButton [9]
|
||||
inherited UpDown1: TUpDown [8]
|
||||
Left = 0
|
||||
Top = 27
|
||||
ExplicitLeft = 0
|
||||
ExplicitTop = 27
|
||||
end
|
||||
inherited ToolButton7: TToolButton [10]
|
||||
Left = 66
|
||||
inherited ToolButton6: TToolButton
|
||||
Left = 17
|
||||
Top = 27
|
||||
ExplicitLeft = 66
|
||||
ExplicitLeft = 17
|
||||
ExplicitTop = 27
|
||||
end
|
||||
inherited ToolButton8: TToolButton [11]
|
||||
Left = 133
|
||||
inherited ToolButton7: TToolButton
|
||||
Left = 83
|
||||
Top = 27
|
||||
ExplicitLeft = 133
|
||||
ExplicitLeft = 83
|
||||
ExplicitTop = 27
|
||||
end
|
||||
inherited ToolButton12: TToolButton [12]
|
||||
Left = 216
|
||||
inherited ToolButton8: TToolButton
|
||||
Left = 150
|
||||
Top = 27
|
||||
ExplicitLeft = 216
|
||||
ExplicitLeft = 150
|
||||
ExplicitTop = 27
|
||||
end
|
||||
inherited ToolButton12: TToolButton
|
||||
Left = 233
|
||||
Top = 27
|
||||
Wrap = False
|
||||
ExplicitLeft = 233
|
||||
ExplicitTop = 27
|
||||
ExplicitHeight = 22
|
||||
end
|
||||
inherited ToolButton9: TToolButton [13]
|
||||
Left = 224
|
||||
inherited ToolButton9: TToolButton
|
||||
Left = 241
|
||||
Top = 27
|
||||
ExplicitLeft = 224
|
||||
ExplicitLeft = 241
|
||||
ExplicitTop = 27
|
||||
end
|
||||
inherited ToolButton10: TToolButton [14]
|
||||
Left = 369
|
||||
inherited ToolButton10: TToolButton
|
||||
Left = 386
|
||||
Top = 27
|
||||
ExplicitLeft = 369
|
||||
ExplicitLeft = 386
|
||||
ExplicitTop = 27
|
||||
end
|
||||
inherited ToolButton11: TToolButton [15]
|
||||
Left = 494
|
||||
inherited ToolButton11: TToolButton
|
||||
Left = 511
|
||||
Top = 27
|
||||
ExplicitLeft = 494
|
||||
ExplicitLeft = 511
|
||||
ExplicitTop = 27
|
||||
end
|
||||
end
|
||||
@ -195,9 +185,6 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
|
||||
ExplicitWidth = 865
|
||||
ExplicitHeight = 381
|
||||
inherited cxGridView: TcxGridDBTableView
|
||||
inherited cxGridViewIMPORTENETO: TcxGridDBColumn
|
||||
Options.Editing = True
|
||||
end
|
||||
end
|
||||
end
|
||||
inherited TBXDock1: TTBXDock
|
||||
|
||||
@ -89,6 +89,7 @@ inherited frViewDetallesPedidoProveedor: TfrViewDetallesPedidoProveedor
|
||||
end>
|
||||
Properties.ReadOnly = True
|
||||
Properties.OnButtonClick = nil
|
||||
Options.Editing = False
|
||||
end
|
||||
inherited cxGridViewREFERENCIA_PROVEEDOR: TcxGridDBColumn
|
||||
Properties.Buttons = <
|
||||
@ -99,6 +100,7 @@ inherited frViewDetallesPedidoProveedor: TfrViewDetallesPedidoProveedor
|
||||
end>
|
||||
Properties.ReadOnly = True
|
||||
Properties.OnButtonClick = nil
|
||||
Options.Editing = False
|
||||
end
|
||||
inherited cxGridViewREFERENCIA_FABRICANTE: TcxGridDBColumn
|
||||
Properties.Buttons = <
|
||||
@ -109,6 +111,7 @@ inherited frViewDetallesPedidoProveedor: TfrViewDetallesPedidoProveedor
|
||||
end>
|
||||
Properties.ReadOnly = True
|
||||
Properties.OnButtonClick = nil
|
||||
Options.Editing = False
|
||||
end
|
||||
inherited cxGridViewIMPORTEUNIDAD: TcxGridDBColumn
|
||||
Visible = False
|
||||
|
||||
@ -52,11 +52,15 @@ inherited frViewRecibosProveedor: TfrViewRecibosProveedor
|
||||
object cxGridViewID_RECIBO_COMPENSADO: TcxGridDBColumn
|
||||
Caption = 'Compensado'
|
||||
DataBinding.FieldName = 'ID_RECIBO_COMPENSADO'
|
||||
Visible = False
|
||||
OnCustomDrawCell = cxGridViewID_RECIBO_COMPENSADOCustomDrawCell
|
||||
VisibleForCustomization = False
|
||||
end
|
||||
object cxGridViewREFERENCIA_REC_COMPENSADO: TcxGridDBColumn
|
||||
Caption = 'Ref. recibo compensado'
|
||||
DataBinding.FieldName = 'REFERENCIA_REC_COMPENSADO'
|
||||
Visible = False
|
||||
VisibleForCustomization = False
|
||||
end
|
||||
object cxGridViewREFERENCIA_FACTURA_PROV: TcxGridDBColumn
|
||||
Caption = 'Ref. factura prov.'
|
||||
@ -161,8 +165,8 @@ inherited frViewRecibosProveedor: TfrViewRecibosProveedor
|
||||
Width = 531
|
||||
ExplicitWidth = 531
|
||||
inherited txtFiltroTodo: TcxTextEdit
|
||||
ExplicitWidth = 434
|
||||
Width = 434
|
||||
ExplicitWidth = 491
|
||||
Width = 491
|
||||
end
|
||||
inherited edtFechaIniFiltro: TcxDateEdit
|
||||
ExplicitWidth = 201
|
||||
@ -174,6 +178,10 @@ inherited frViewRecibosProveedor: TfrViewRecibosProveedor
|
||||
ExplicitWidth = 216
|
||||
Width = 216
|
||||
end
|
||||
inherited eLista: TcxComboBox
|
||||
Left = 558
|
||||
ExplicitLeft = 558
|
||||
end
|
||||
end
|
||||
inherited TBXAlignmentPanel1: TTBXAlignmentPanel
|
||||
Width = 531
|
||||
|
||||
Binary file not shown.
@ -14,7 +14,7 @@ BEGIN
|
||||
BEGIN
|
||||
VALUE "FileVersion", "1.2.0.0\0"
|
||||
VALUE "ProductVersion", "1.2.0.0\0"
|
||||
VALUE "CompileDate", "lunes, 04 de agosto de 2008 11:48\0"
|
||||
VALUE "CompileDate", "lunes, 04 de agosto de 2008 15:56\0"
|
||||
END
|
||||
END
|
||||
BLOCK "VarFileInfo"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user