Arreglo para que en importe unidad de los detalles nos aparezcan los importe PVP (total/solo suministro)

git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@465 0c75b7a4-871f-7646-8a2f-f78d34cc349f
This commit is contained in:
roberto 2008-06-19 16:02:11 +00:00
parent a5c608d929
commit 2448e59b34
16 changed files with 370 additions and 286 deletions

View File

@ -64,7 +64,7 @@ inherited frViewDetallesBase: TfrViewDetallesBase
DroppedDownWidth = 145
MaxMRUCount = 0
FontName = 'Tahoma'
ItemIndex = 43
ItemIndex = 42
Options = [foTrueTypeOnly, foNoOEMFonts, foScalableOnly, foWysiWyg]
Sorted = True
TabOrder = 2
@ -309,7 +309,6 @@ inherited frViewDetallesBase: TfrViewDetallesBase
Caption = 'Importe unidad'
DataBinding.FieldName = 'IMPORTE_UNIDAD'
PropertiesClassName = 'TcxCurrencyEditProperties'
Properties.Alignment.Horz = taRightJustify
BestFitMaxWidth = 120
FooterAlignmentHorz = taRightJustify
HeaderAlignmentHorz = taRightJustify

View File

@ -19,7 +19,7 @@ uses
dxSkinOffice2007Green, dxSkinOffice2007Pink, dxSkinOffice2007Silver,
dxSkinSilver, dxSkinStardust, dxSkinsDefaultPainters, dxSkinValentine,
dxSkinXmas2008Blue, dxSkinscxPCPainter, cxGridCustomPopupMenu, cxGridPopupMenu,
Menus;
Menus, cxDBLookupComboBox, cxDropDownEdit;
type
IViewDetallesBase = interface(IViewBase)

View File

@ -3,23 +3,22 @@ inherited frViewDetallesDTO: TfrViewDetallesDTO
inherited ToolButton1: TToolButton
ExplicitWidth = 109
end
inherited ToolButton2: TToolButton
inherited ToolButton3: TToolButton [1]
Left = 109
ExplicitLeft = 109
end
inherited ToolButton4: TToolButton [2]
Left = 164
end
inherited ToolButton14: TToolButton [3]
Left = 220
Wrap = False
end
inherited ToolButton2: TToolButton [4]
Left = 285
ExplicitLeft = 285
ExplicitWidth = 114
end
inherited ToolButton3: TToolButton
Left = 223
ExplicitLeft = 223
end
inherited ToolButton4: TToolButton
Left = 278
ExplicitLeft = 278
end
inherited ToolButton14: TToolButton
Left = 334
ExplicitLeft = 334
end
inherited FontSize: TEdit
Width = 41
ExplicitWidth = 41
@ -46,9 +45,10 @@ inherited frViewDetallesDTO: TfrViewDetallesDTO
end
end
inherited cxGrid: TcxGrid
ExplicitTop = 126
ExplicitHeight = 210
inherited cxGridView: TcxGridDBTableView
inherited cxGridViewIMPORTEUNIDAD: TcxGridDBColumn
Properties.ImmediateDropDown = True
end
object cxGridViewDESCUENTO: TcxGridDBColumn [7]
Caption = 'Dto'
DataBinding.FieldName = 'DESCUENTO'
@ -87,9 +87,6 @@ inherited frViewDetallesDTO: TfrViewDetallesDTO
end
end
end
inherited TBXDock1: TTBXDock
ExplicitTop = 100
end
inherited ActionListContenido: TActionList
inherited actAnadir: TAction
Caption = 'A'#241'adir concepto'

View File

@ -17,7 +17,7 @@ uses
dxSkinOffice2007Green, dxSkinOffice2007Pink, dxSkinOffice2007Silver,
dxSkinSilver, dxSkinStardust, dxSkinsDefaultPainters, dxSkinValentine,
dxSkinXmas2008Blue, dxSkinscxPCPainter, Menus, cxGridCustomPopupMenu,
cxGridPopupMenu;
cxGridPopupMenu, cxDBLookupComboBox, cxDropDownEdit;
type
IViewDetallesDTO = interface(IViewDetallesBase)

View File

@ -13,6 +13,7 @@
<Projects Include="..\Facturas de cliente\Model\FacturasCliente_model.dproj" />
<Projects Include="..\Facturas de cliente\Views\FacturasCliente_view.dproj" />
<Projects Include="..\Inventario\Views\Inventario_view.dproj" />
<Projects Include="..\Presupuestos de cliente\Views\PresupuestosCliente_view.dproj" />
<Projects Include="Controller\Articulos_controller.dproj" />
<Projects Include="Data\Articulos_data.dproj" />
<Projects Include="Model\Articulos_model.dproj" />
@ -151,14 +152,23 @@
<Target Name="Inventario_view:Make">
<MSBuild Projects="..\Inventario\Views\Inventario_view.dproj" Targets="Make" />
</Target>
<Target Name="PresupuestosCliente_view">
<MSBuild Projects="..\Presupuestos de cliente\Views\PresupuestosCliente_view.dproj" Targets="" />
</Target>
<Target Name="PresupuestosCliente_view:Clean">
<MSBuild Projects="..\Presupuestos de cliente\Views\PresupuestosCliente_view.dproj" Targets="Clean" />
</Target>
<Target Name="PresupuestosCliente_view:Make">
<MSBuild Projects="..\Presupuestos de cliente\Views\PresupuestosCliente_view.dproj" Targets="Make" />
</Target>
<Target Name="Build">
<CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_view;Articulos_model;Articulos_data;Articulos_controller;Articulos_view;Articulos_plugin;FactuGES;FactuGES_Server;FacturasCliente_view;FacturasCliente_model;Inventario_view" />
<CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_view;Articulos_model;Articulos_data;Articulos_controller;Articulos_view;Articulos_plugin;FactuGES;FactuGES_Server;FacturasCliente_view;FacturasCliente_model;Inventario_view;PresupuestosCliente_view" />
</Target>
<Target Name="Clean">
<CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_view:Clean;Articulos_model:Clean;Articulos_data:Clean;Articulos_controller:Clean;Articulos_view:Clean;Articulos_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean;FacturasCliente_view:Clean;FacturasCliente_model:Clean;Inventario_view:Clean" />
<CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_view:Clean;Articulos_model:Clean;Articulos_data:Clean;Articulos_controller:Clean;Articulos_view:Clean;Articulos_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean;FacturasCliente_view:Clean;FacturasCliente_model:Clean;Inventario_view:Clean;PresupuestosCliente_view:Clean" />
</Target>
<Target Name="Make">
<CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_view:Make;Articulos_model:Make;Articulos_data:Make;Articulos_controller:Make;Articulos_view:Make;Articulos_plugin:Make;FactuGES:Make;FactuGES_Server:Make;FacturasCliente_view:Make;FacturasCliente_model:Make;Inventario_view:Make" />
<CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_view:Make;Articulos_model:Make;Articulos_data:Make;Articulos_controller:Make;Articulos_view:Make;Articulos_plugin:Make;FactuGES:Make;FactuGES_Server:Make;FacturasCliente_view:Make;FacturasCliente_model:Make;Inventario_view:Make;PresupuestosCliente_view:Make" />
</Target>
<Import Condition="Exists('$(MSBuildBinPath)\Borland.Group.Targets')" Project="$(MSBuildBinPath)\Borland.Group.Targets" />
</Project>

View File

@ -42,6 +42,7 @@ type
function GetProveedoresController: IProveedoresController;
property ProveedoresController: IProveedoresController read GetProveedoresController;
function DarPrecioPVPVenta(IdArticulo: Integer): TStringList;
end;
TArticulosController = class(TObservador, IArticulosController)
@ -94,6 +95,7 @@ type
procedure AnadirProveedor(AArticulo : IBizArticulo);
procedure VerProveedor(AArticulo : IBizArticulo);
function DarListaProveedoresConArticulos: TStringList;
function DarPrecioPVPVenta(IdArticulo: Integer): TStringList;
end;
implementation
@ -329,6 +331,24 @@ begin
Result := (FDataModule as IDataModuleArticulos).DarListaProveedoresConArticulos(AppFactuGES.EmpresaActiva.ID);
end;
function TArticulosController.DarPrecioPVPVenta(IdArticulo: Integer): TStringList;
var
AArticulo: IBizArticulo;
begin
AArticulo := Buscar(IdArticulo);
AArticulo.DataTable.Active := True;
Result := TStringList.Create;
try
with Result do
begin
Add(CurrToStr(AArticulo.PRECIO_PVP_TOTAL));
Add(CurrToStr(AArticulo.PRECIO_PVP_VENTA));
end;
finally
AArticulo := NIL;
end;
end;
procedure TArticulosController.DescartarCambios(AArticulo: IBizArticulo);
begin
if not Assigned(AArticulo) then

View File

@ -20,6 +20,7 @@ type
procedure ActualizarDetalles(ADetalles: IDAStronglyTypedDataTable; AArticulos: IBizArticulo);
procedure CambiarSignoDetalles(ADetalles: IDAStronglyTypedDataTable; const AAll: Boolean = True);
procedure AnadirConceptoInicial(ADetalles: IDAStronglyTypedDataTable; AConcepto: String);
function DarPrecioPVPVenta(IdArticulo: Integer): TStringList;
end;
TControllerDetallesArticulos = class (TControllerDetallesBase, IControllerDetallesArticulos)
@ -44,6 +45,7 @@ type
procedure ActualizarDetalles(ADetalles: IDAStronglyTypedDataTable; AArticulos: IBizArticulo);
procedure CambiarSignoDetalles(ADetalles: IDAStronglyTypedDataTable; const AAll: Boolean = True);
procedure AnadirConceptoInicial(ADetalles: IDAStronglyTypedDataTable; AConcepto: String);
function DarPrecioPVPVenta(IdArticulo: Integer): TStringList;
constructor Create; override;
destructor Destroy; override;
@ -267,6 +269,11 @@ begin
AsignarController;
end;
function TControllerDetallesArticulos.DarPrecioPVPVenta(IdArticulo: Integer): TStringList;
begin
Result := FArticulosController.DarPrecioPVPVenta(IdArticulo);
end;
destructor TControllerDetallesArticulos.Destroy;
begin
FArticulosController := Nil;

View File

@ -55,13 +55,13 @@
<DelphiCompile Include="Articulos_view.dpk">
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="..\..\Facturas de cliente\Articulos_controller.dcp" />
<DCCReference Include="..\..\Facturas de cliente\Articulos_model.dcp" />
<DCCReference Include="..\..\Facturas de cliente\Contactos_view.dcp" />
<DCCReference Include="..\..\Facturas de cliente\Fabricantes_controller.dcp" />
<DCCReference Include="..\..\Facturas de cliente\Familias_controller.dcp" />
<DCCReference Include="..\..\Facturas de cliente\GUIBase.dcp" />
<DCCReference Include="..\..\Facturas de cliente\UnidadesMedida_controller.dcp" />
<DCCReference Include="..\Articulos_controller.dcp" />
<DCCReference Include="..\Articulos_model.dcp" />
<DCCReference Include="..\Contactos_view.dcp" />
<DCCReference Include="..\Fabricantes_controller.dcp" />
<DCCReference Include="..\Familias_controller.dcp" />
<DCCReference Include="..\GUIBase.dcp" />
<DCCReference Include="..\UnidadesMedida_controller.dcp" />
<DCCReference Include="uArticulosViewRegister.pas" />
<DCCReference Include="uEditorArticulo.pas">
<Form>fEditorArticulo</Form>

View File

@ -2,53 +2,98 @@ inherited frViewDetallesArticulos: TfrViewDetallesArticulos
ParentBiDiMode = False
OnShow = CustomViewShow
inherited ToolBar1: TToolBar
inherited FontSize: TEdit
Width = 42
ExplicitWidth = 42
Height = 122
ExplicitHeight = 122
inherited ToolButton13: TToolButton [3]
Left = 0
Top = 0
Wrap = True
ExplicitLeft = 0
ExplicitTop = 0
ExplicitHeight = 27
end
inherited UpDown1: TUpDown
Left = 187
inherited ToolButton4: TToolButton [4]
Top = 27
end
inherited ToolButton7: TToolButton [5]
Left = 56
Top = 27
ExplicitLeft = 56
ExplicitTop = 27
end
inherited FontName: TJvFontComboBox [6]
Left = 123
Top = 27
ExplicitLeft = 123
ExplicitTop = 27
end
inherited ToolButton14: TToolButton [7]
Left = 268
Top = 27
ExplicitLeft = 268
ExplicitTop = 27
end
inherited ToolButton9: TToolButton [8]
Left = 0
Top = 49
ExplicitLeft = 0
ExplicitTop = 49
end
inherited ToolButton12: TToolButton [9]
Left = 0
Top = 49
Wrap = True
ExplicitLeft = 0
ExplicitTop = 49
ExplicitHeight = 27
end
inherited FontSize: TEdit [10]
Left = 0
Top = 76
Width = 106
ExplicitLeft = 0
ExplicitTop = 76
ExplicitWidth = 106
end
inherited UpDown1: TUpDown [11]
Left = 106
Top = 76
Width = 17
ExplicitLeft = 187
ExplicitLeft = 106
ExplicitTop = 76
ExplicitWidth = 17
end
inherited ToolButton13: TToolButton
Left = 204
ExplicitLeft = 204
inherited ToolButton6: TToolButton [12]
Left = 123
Top = 76
ExplicitLeft = 123
ExplicitTop = 76
end
inherited ToolButton6: TToolButton
Left = 212
ExplicitLeft = 212
inherited ToolButton10: TToolButton [13]
Left = 189
Top = 76
Wrap = True
ExplicitLeft = 189
ExplicitTop = 76
end
inherited ToolButton7: TToolButton
Left = 278
ExplicitLeft = 278
end
inherited ToolButton8: TToolButton
Left = 345
ExplicitLeft = 345
end
inherited ToolButton12: TToolButton
Left = 428
ExplicitLeft = 428
end
inherited ToolButton9: TToolButton
Left = 436
ExplicitLeft = 436
end
inherited ToolButton10: TToolButton
Left = 581
ExplicitLeft = 581
inherited ToolButton8: TToolButton [14]
Left = 0
Top = 98
ExplicitLeft = 0
ExplicitTop = 98
end
inherited ToolButton11: TToolButton
Left = 706
ExplicitLeft = 706
Left = 83
Top = 98
ExplicitLeft = 83
ExplicitTop = 98
end
end
inherited cxGrid: TcxGrid
ExplicitTop = 99
ExplicitWidth = 935
ExplicitHeight = 205
Top = 148
Height = 156
ExplicitTop = 126
ExplicitHeight = 178
inherited cxGridView: TcxGridDBTableView
inherited cxGridViewTIPO: TcxGridDBColumn
MinWidth = 69
@ -56,6 +101,7 @@ inherited frViewDetallesArticulos: TfrViewDetallesArticulos
end
object cxGridViewID_ARTICULO: TcxGridDBColumn [4]
DataBinding.FieldName = 'ID_ARTICULO'
PropertiesClassName = 'TcxCalcEditProperties'
Visible = False
VisibleForCustomization = False
Width = 31
@ -116,6 +162,7 @@ inherited frViewDetallesArticulos: TfrViewDetallesArticulos
Width = 60
end
inherited cxGridViewIMPORTEUNIDAD: TcxGridDBColumn
OnGetProperties = cxGridViewIMPORTEUNIDADGetProperties
BestFitMaxWidth = 50
Width = 80
end
@ -137,8 +184,8 @@ inherited frViewDetallesArticulos: TfrViewDetallesArticulos
end
end
inherited TBXDock1: TTBXDock
ExplicitTop = 73
ExplicitWidth = 935
Top = 122
ExplicitTop = 68
inherited TBXToolbar1: TTBXToolbar
inherited TBXSubmenuItem1: TTBXSubmenuItem
object TBXSeparatorItem8: TTBXSeparatorItem [4]
@ -400,4 +447,12 @@ inherited frViewDetallesArticulos: TfrViewDetallesArticulos
end>
Bitmap = {}
end
object cxEditRepository1: TcxEditRepository
Left = 128
Top = 184
object cxEditRepository1ComboBoxItem1: TcxEditRepositoryComboBoxItem
end
object cxEditRepository1CurrencyItem1: TcxEditRepositoryCurrencyItem
end
end
end

View File

@ -18,7 +18,7 @@ uses
dxSkinOffice2007Green, dxSkinOffice2007Pink, dxSkinOffice2007Silver,
dxSkinSilver, dxSkinStardust, dxSkinsDefaultPainters, dxSkinValentine,
dxSkinXmas2008Blue, dxSkinscxPCPainter, Menus, cxGridCustomPopupMenu,
cxGridPopupMenu;
cxGridPopupMenu, cxDBLookupComboBox, cxCalc, cxEditRepositoryItems;
type
IViewDetallesArticulos = interface(IViewDetallesDTO)
@ -35,6 +35,9 @@ type
TBXSeparatorItem8: TTBXSeparatorItem;
TBXItem17: TTBXItem;
cxGridViewREFERENCIA_FABRICANTE: TcxGridDBColumn;
cxEditRepository1: TcxEditRepository;
cxEditRepository1ComboBoxItem1: TcxEditRepositoryComboBoxItem;
cxEditRepository1CurrencyItem1: TcxEditRepositoryCurrencyItem;
procedure CustomViewCreate(Sender: TObject);
procedure CustomViewDestroy(Sender: TObject);
procedure actAnadirArticulosExecute(Sender: TObject);
@ -42,24 +45,26 @@ type
procedure OnValidateReferencia(Sender: TObject; var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean);
procedure OnValidateReferenciaProveedor(Sender: TObject; var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean);
procedure CustomViewShow(Sender: TObject);
procedure cxGridViewREFERENCIAPropertiesButtonClick(Sender: TObject;
AButtonIndex: Integer);
procedure cxGridViewREFERENCIAPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
procedure actBuscarArticuloExecute(Sender: TObject);
procedure actBuscarArticuloUpdate(Sender: TObject);
procedure actDetalleCopiarExecute(Sender: TObject);
procedure actDetallePegarExecute(Sender: TObject);
procedure actDetalleCortarExecute(Sender: TObject);
procedure cxGridViewREFERENCIA_PROVEEDORPropertiesButtonClick(
Sender: TObject; AButtonIndex: Integer);
procedure cxGridViewREFERENCIA_FABRICANTEPropertiesButtonClick(
Sender: TObject; AButtonIndex: Integer);
procedure cxGridViewREFERENCIA_PROVEEDORPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
procedure cxGridViewREFERENCIA_FABRICANTEPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
procedure OnGetPropertiesForEditIMPORTE_UNIDAD(Sender: TcxCustomGridTableItem; ARecord: TcxCustomGridRecord;
var AProperties: TcxCustomEditProperties);
procedure cxGridViewIMPORTEUNIDADGetProperties(
Sender: TcxCustomGridTableItem; ARecord: TcxCustomGridRecord;
var AProperties: TcxCustomEditProperties);
private
procedure RecuperarListaUnidadesMedida;
procedure RecuperarListaUnidadesMedida;
protected
procedure AnadirArticulosInterno; virtual;
procedure RellenarArticulosInterno; virtual;
function AnadirArticulo(pReferencia: String; TipoReferencia: TEnumReferencia): Boolean; virtual;
function EsTipoEditable(AItem: TcxCustomGridTableItem): Boolean; override;
function EsTipoEditable(AItem: TcxCustomGridTableItem): Boolean; override;
end;
implementation
@ -91,6 +96,7 @@ end;
procedure TfrViewDetallesArticulos.CustomViewCreate(Sender: TObject);
begin
inherited;
cxGridViewIMPORTEUNIDAD.OnGetPropertiesForEdit := OnGetPropertiesForEditIMPORTE_UNIDAD;
cxGridViewREFERENCIA.Properties.OnValidate := OnValidateReferencia;
cxGridViewREFERENCIA_PROVEEDOR.Properties.OnValidate := OnValidateReferenciaProveedor;
end;
@ -98,6 +104,7 @@ end;
procedure TfrViewDetallesArticulos.CustomViewDestroy(Sender: TObject);
begin
inherited;
cxGridViewIMPORTEUNIDAD.OnGetPropertiesForEdit := Nil;
cxGridViewREFERENCIA.Properties.OnValidate := Nil;
cxGridViewREFERENCIA_PROVEEDOR.Properties.OnValidate := Nil;
end;
@ -144,6 +151,92 @@ begin
SeleccionarFilaActual;
end;
procedure TfrViewDetallesArticulos.OnGetPropertiesForEditIMPORTE_UNIDAD(Sender: TcxCustomGridTableItem; ARecord: TcxCustomGridRecord;
var AProperties: TcxCustomEditProperties);
var
IndiceCol: Integer;
IdArticulo: Variant;
begin
inherited;
{
DADataSource.DataTable.DisableControls;
try
IndiceCol := cxGridView.DataController.GetItemByFieldName('ID_ARTICULO').Index;
IdArticulo := cxGridView.DataController.Values[Sender.DataBinding.DataController.FocusedRecordIndex, IndiceCol];
if not VarIsNull(IdArticulo)
and (IdArticulo > 0) then
begin
//Lo tratamos como combox
AProperties := cxEditRepository1ComboBoxItem1.Properties;
with TcxComboBoxProperties(cxGridViewIMPORTEUNIDAD.Properties).Items do
begin
ShowHourglassCursor;
BeginUpdate;
try
Clear;
AddStrings((Controller as IControllerDetallesArticulos).DarPrecioPVPVenta(IdArticulo));
finally
EndUpdate;
HideHourglassCursor;
end;
end
end
else
AProperties := cxEditRepository1CurrencyItem1.properties;
// cxGridViewIMPORTEUNIDAD.PropertiesClassName := 'TcxCurrencyEditProperties';
finally
DADataSource.DataTable.EnableControls;
end;
}
end;
procedure TfrViewDetallesArticulos.cxGridViewIMPORTEUNIDADGetProperties(
Sender: TcxCustomGridTableItem; ARecord: TcxCustomGridRecord;
var AProperties: TcxCustomEditProperties);
var
IndiceCol: Integer;
IdArticulo: Variant;
begin
inherited;
{
DADataSource.DataTable.DisableControls;
try
IndiceCol := cxGridView.DataController.GetItemByFieldName('ID_ARTICULO').Index;
IdArticulo := cxGridView.DataController.Values[Sender.DataBinding.DataController.FocusedRecordIndex, IndiceCol];
if not VarIsNull(IdArticulo)
and (IdArticulo > 0) then
begin
//Lo tratamos como combox
AProperties := cxEditRepository1ComboBoxItem1.Properties;
{ with TcxComboBoxProperties(cxGridViewIMPORTEUNIDAD.Properties).Items do
begin
ShowHourglassCursor;
BeginUpdate;
try
Clear;
AddStrings((Controller as IControllerDetallesArticulos).DarPrecioPVPVenta(IdArticulo));
finally
EndUpdate;
HideHourglassCursor;
end;
end
}
{ end
else
AProperties := cxEditRepository1CurrencyItem1.properties;
// cxGridViewIMPORTEUNIDAD.PropertiesClassName := 'TcxCurrencyEditProperties';
finally
DADataSource.DataTable.EnableControls;
end;
}
end;
procedure TfrViewDetallesArticulos.cxGridViewREFERENCIAPropertiesButtonClick(
Sender: TObject; AButtonIndex: Integer);
begin

View File

@ -49,13 +49,13 @@
<DelphiCompile Include="PresupuestosCliente_view.dpk">
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\Articulos_view.dcp" />
<DCCReference Include="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\Base.dcp" />
<DCCReference Include="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\GUIBase.dcp" />
<DCCReference Include="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\PreCli_AlbCli_relation.dcp" />
<DCCReference Include="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\PreCli_FacCli_relation.dcp" />
<DCCReference Include="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\PresupuestosCliente_controller.dcp" />
<DCCReference Include="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\PresupuestosCliente_model.dcp" />
<DCCReference Include="..\Articulos_view.dcp" />
<DCCReference Include="..\Base.dcp" />
<DCCReference Include="..\GUIBase.dcp" />
<DCCReference Include="..\PreCli_AlbCli_relation.dcp" />
<DCCReference Include="..\PreCli_FacCli_relation.dcp" />
<DCCReference Include="..\PresupuestosCliente_controller.dcp" />
<DCCReference Include="..\PresupuestosCliente_model.dcp" />
<DCCReference Include="uEditorElegirArticulosPresupuestoCliente.pas">
<Form>fEditorElegirArticulosPresupuestoCliente</Form>
<DesignClass>TfEditorElegirArticulosPedidoCliente</DesignClass>
@ -81,7 +81,10 @@
<Form>frViewDetallesPresupuestoCliente</Form>
<DesignClass>TFrame</DesignClass>
</DCCReference>
<DCCReference Include="uViewDireccionEntregaPresupuestoCliente.pas" />
<DCCReference Include="uViewDireccionEntregaPresupuestoCliente.pas">
<Form>frViewElegirArticulosPresupuestosCliente</Form>
<DesignClass>TFrame</DesignClass>
</DCCReference>
<DCCReference Include="uViewElegirArticulosPresupuestosCliente.pas">
<Form>frViewElegirArticulosPresupuestosCliente</Form>
<DesignClass>TFrame</DesignClass>

View File

@ -6,7 +6,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
ClientWidth = 749
OnClose = CustomEditorClose
ExplicitWidth = 757
ExplicitHeight = 642
ExplicitHeight = 649
PixelsPerInch = 96
TextHeight = 13
inherited JvNavPanelHeader: TJvNavPanelHeader
@ -147,6 +147,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
inherited pgPaginas: TPageControl
Width = 743
Height = 414
ActivePage = pagContenido
TabOrder = 1
OnChange = pgPaginasChange
ExplicitWidth = 743
@ -160,10 +161,6 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
object pagContenido: TTabSheet
Caption = 'Contenido'
ImageIndex = 1
ExplicitLeft = 0
ExplicitTop = 0
ExplicitWidth = 0
ExplicitHeight = 0
inline frViewDetallesPresupuestoCliente1: TfrViewDetallesPresupuestoCliente
Left = 0
Top = 0
@ -189,7 +186,9 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
ExplicitHeight = 51
inherited ToolButton2: TToolButton [1]
Left = 109
Top = 0
ExplicitLeft = 109
ExplicitTop = 0
end
inherited ToolButton3: TToolButton [2]
Left = 223
@ -199,86 +198,91 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
end
inherited ToolButton4: TToolButton [3]
Left = 278
Top = 0
ExplicitLeft = 278
ExplicitTop = 0
end
inherited FontName: TJvFontComboBox [4]
inherited ToolButton14: TToolButton [4]
Left = 334
Top = 0
ExplicitLeft = 334
ExplicitTop = 0
end
inherited FontSize: TEdit [5]
Left = 479
Top = 0
Width = 72
ExplicitLeft = 479
ExplicitTop = 0
ExplicitWidth = 72
inherited ToolButton13: TToolButton [5]
Left = 399
Wrap = False
ExplicitLeft = 399
ExplicitHeight = 22
end
inherited UpDown1: TUpDown [6]
Left = 551
inherited ToolButton7: TToolButton
Left = 407
Top = 0
ExplicitLeft = 551
ExplicitLeft = 407
ExplicitTop = 0
end
inherited ToolButton13: TToolButton [7]
inherited ToolButton9: TToolButton
Left = 474
Top = 0
ExplicitLeft = 474
ExplicitTop = 0
end
inherited ToolButton12: TToolButton
Top = 0
ExplicitTop = 0
end
inherited ToolButton6: TToolButton [8]
inherited FontName: TJvFontComboBox [9]
Left = 0
Top = 30
Top = 27
ExplicitLeft = 0
ExplicitTop = 27
end
inherited ToolButton7: TToolButton [9]
Left = 66
Top = 30
ExplicitLeft = 66
ExplicitTop = 30
inherited ToolButton6: TToolButton [10]
Left = 145
Top = 27
ExplicitLeft = 145
ExplicitTop = 27
end
inherited ToolButton8: TToolButton [10]
Left = 133
Top = 30
ExplicitLeft = 133
ExplicitTop = 30
inherited ToolButton10: TToolButton
Left = 211
Top = 27
Wrap = False
ExplicitLeft = 211
ExplicitTop = 27
end
inherited ToolButton12: TToolButton [11]
Left = 216
Top = 30
ExplicitLeft = 216
ExplicitTop = 30
inherited FontSize: TEdit [12]
Left = 336
Top = 27
Width = 104
ExplicitLeft = 336
ExplicitTop = 27
ExplicitWidth = 104
end
inherited ToolButton9: TToolButton [12]
Left = 224
Top = 30
ExplicitLeft = 224
ExplicitTop = 30
inherited UpDown1: TUpDown [13]
Left = 440
Top = 27
ExplicitLeft = 440
ExplicitTop = 27
end
inherited ToolButton10: TToolButton [13]
Left = 369
Top = 30
ExplicitLeft = 369
ExplicitTop = 30
end
inherited ToolButton14: TToolButton [14]
Left = 494
Top = 30
ExplicitLeft = 494
inherited ToolButton8: TToolButton [14]
Left = 457
Top = 27
ExplicitLeft = 457
ExplicitTop = 27
end
inherited ToolButton11: TToolButton [15]
Left = 559
Top = 30
ExplicitLeft = 559
ExplicitTop = 30
Left = 540
Top = 27
ExplicitLeft = 540
ExplicitTop = 27
end
end
inherited cxGrid: TcxGrid
Top = 77
Width = 735
Height = 309
ExplicitTop = 72
ExplicitTop = 77
ExplicitWidth = 735
ExplicitHeight = 314
ExplicitHeight = 309
end
inherited TBXDock1: TTBXDock
Top = 51
@ -289,15 +293,20 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
ExplicitWidth = 702
end
end
inherited cxGridPopupMenu: TcxGridPopupMenu
PopupMenus = <
item
GridView = frViewDetallesPresupuestoCliente1.cxGridView
HitTypes = [gvhtNone, gvhtCell, gvhtRecord, gvhtRowIndicator]
Index = 0
PopupMenu = frViewDetallesPresupuestoCliente1.GridGeneralPopupMenu
end>
end
end
end
object pagPortada: TTabSheet
Caption = 'Portada'
ImageIndex = 3
ExplicitLeft = 0
ExplicitTop = 0
ExplicitWidth = 0
ExplicitHeight = 0
object Panel1: TPanel
Left = 0
Top = 0
@ -409,7 +418,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
Width = 590
ExplicitWidth = 590
inherited TBXToolbar1: TTBXToolbar
ExplicitWidth = 516
ExplicitWidth = 518
inherited TBXColorItem1: TTBXColorItem
Visible = False
end
@ -429,10 +438,6 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
object pagMemoria: TTabSheet
Caption = 'Memoria'
ImageIndex = 4
ExplicitLeft = 0
ExplicitTop = 0
ExplicitWidth = 0
ExplicitHeight = 0
object Panel2: TPanel
Left = 0
Top = 0
@ -715,7 +720,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
Width = 590
ExplicitWidth = 590
inherited TBXToolbar1: TTBXToolbar
ExplicitWidth = 516
ExplicitWidth = 518
inherited TBXColorItem1: TTBXColorItem
Visible = False
end
@ -735,10 +740,6 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
object pagInicidencias: TTabSheet
Caption = 'Incidencias'
ImageIndex = 2
ExplicitLeft = 0
ExplicitTop = 0
ExplicitWidth = 0
ExplicitHeight = 0
inline frViewIncidenciasCli: TfrViewIncidencias
Left = 0
Top = 0
@ -813,10 +814,8 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
inherited Bevel1: TBevel
Left = 93
Top = 92
Width = 73
ExplicitLeft = 93
ExplicitTop = 92
ExplicitWidth = 73
end
inherited Bevel3: TBevel
Left = 368
@ -839,87 +838,59 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
inherited ImporteDto: TcxDBCurrencyEdit
Left = 164
Top = 112
Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 164
ExplicitTop = 112
ExplicitWidth = 93
Width = 93
ExplicitWidth = 188
Width = 188
end
inherited ImporteIVA: TcxDBCurrencyEdit
Left = 556
Top = 38
Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 556
ExplicitTop = 38
ExplicitWidth = 137
Width = 137
ExplicitWidth = 182
Width = 182
end
inherited ImporteTotal: TcxDBCurrencyEdit
Left = 486
Top = 112
Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 486
ExplicitTop = 112
ExplicitWidth = 137
Width = 137
ExplicitWidth = 252
Width = 252
end
inherited edtDescuento: TcxDBSpinEdit
Left = 93
Top = 112
Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 93
ExplicitTop = 112
end
inherited edtIVA: TcxDBSpinEdit
Left = 485
Top = 38
Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 485
ExplicitTop = 38
end
inherited ImporteBase: TcxDBCurrencyEdit
Left = 485
Top = 11
Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 485
ExplicitTop = 11
ExplicitWidth = 92
Width = 92
ExplicitWidth = 253
Width = 253
end
inherited edtRE: TcxDBSpinEdit
Left = 485
Top = 65
DataBinding.DataField = ''
DataBinding.DataSource = nil
Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 485
ExplicitTop = 65
end
@ -928,56 +899,40 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
Top = 65
DataBinding.DataField = ''
DataBinding.DataSource = nil
Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 556
ExplicitTop = 65
ExplicitWidth = 56
Width = 56
ExplicitWidth = 182
Width = 182
end
inherited eImporteNeto: TcxDBCurrencyEdit
Left = 93
Top = 11
Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 93
ExplicitTop = 11
ExplicitWidth = 147
Width = 147
ExplicitWidth = 259
Width = 259
end
inherited ePorte: TcxDBCurrencyEdit
Left = 93
Top = 139
Properties.OnValidate = frViewTotales1ePortePropertiesValidate
Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 93
ExplicitTop = 139
ExplicitWidth = 147
Width = 147
ExplicitWidth = 259
Width = 259
end
inherited eIVA: TcxDBLookupComboBox
Left = 93
Top = 38
DataBinding.DataField = ''
DataBinding.DataSource = nil
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 93
ExplicitTop = 38
ExplicitWidth = 81
Width = 81
ExplicitWidth = 121
Width = 121
end
inherited bTiposIVA: TButton
Left = 220
@ -989,14 +944,10 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
Left = 93
Top = 65
DataBinding.DataField = ''
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 93
ExplicitTop = 65
ExplicitWidth = 219
Width = 219
ExplicitWidth = 259
Width = 259
end
inherited dxLayoutControl1Group_Root: TdxLayoutGroup
inherited dxLayoutControl1Group1: TdxLayoutGroup

View File

@ -1,68 +1,17 @@
inherited frViewDetallesPresupuestoCliente: TfrViewDetallesPresupuestoCliente
inherited ToolBar1: TToolBar
inherited ToolButton13: TToolButton [1]
Left = 65
Wrap = False
ExplicitLeft = 65
end
inherited UpDown1: TUpDown [2]
Left = 73
ExplicitLeft = 73
end
inherited ToolButton12: TToolButton [3]
Left = 0
Wrap = True
ExplicitLeft = 0
ExplicitHeight = 30
end
inherited ToolButton11: TToolButton
inherited ToolButton3: TToolButton
Wrap = False
end
inherited ToolButton9: TToolButton [6]
Left = 250
Top = 30
Wrap = True
ExplicitLeft = 250
ExplicitTop = 30
end
inherited ToolButton2: TToolButton [7]
end
inherited ToolButton4: TToolButton [8]
Left = 114
ExplicitLeft = 114
end
inherited FontSize: TEdit [9]
Left = 170
ExplicitLeft = 170
end
inherited ToolButton6: TToolButton [10]
Left = 212
Wrap = False
ExplicitLeft = 212
end
inherited ToolButton3: TToolButton [11]
Left = 278
end
inherited ToolButton7: TToolButton
Left = 333
Wrap = True
ExplicitLeft = 333
end
inherited FontName: TJvFontComboBox [13]
Left = 0
Top = 74
ExplicitLeft = 0
ExplicitTop = 74
end
inherited ToolButton10: TToolButton [14]
Left = 145
Top = 74
ExplicitLeft = 145
ExplicitTop = 74
end
inherited ToolButton8: TToolButton
Left = 270
ExplicitLeft = 270
inherited ToolButton4: TToolButton
ExplicitTop = 27
end
end
inherited cxGrid: TcxGrid
ExplicitTop = 148
ExplicitHeight = 156
end
inherited TBXDock1: TTBXDock
ExplicitTop = 122
end
end

View File

@ -19,7 +19,7 @@ uses
dxSkinOffice2007Green, dxSkinOffice2007Pink, dxSkinOffice2007Silver,
dxSkinSilver, dxSkinStardust, dxSkinsDefaultPainters, dxSkinValentine,
dxSkinXmas2008Blue, dxSkinscxPCPainter, Menus, cxGridCustomPopupMenu,
cxGridPopupMenu;
cxGridPopupMenu, cxDBLookupComboBox, cxCalc, cxEditRepositoryItems;
type
IViewDetallesPresupuestoCliente = interface(IViewDetallesArticulos)