Arreglo para que no me toque los importes ni descuentos en aquellos conceptos de los detalles que no sean artículos , cuando cambio el cliente o proveedor de documento

git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@243 0c75b7a4-871f-7646-8a2f-f78d34cc349f
This commit is contained in:
roberto 2008-02-05 15:31:14 +00:00
parent f3baa44aab
commit 9fad9cefc3
12 changed files with 445 additions and 481 deletions

View File

@ -76,9 +76,9 @@ begin
AArticulos.DataTable.First;
try
if AArticulos.DataTable.Locate(CAMPO_ID, FieldByName(CAMPO_ID_ARTICULOS).AsVariant, []) then
RellenarDetalle(ADetalles, AArticulos)
else
RellenarDetalle(ADetalles, Nil);
RellenarDetalle(ADetalles, AArticulos);
// else
// RellenarDetalle(ADetalles, Nil);
except
on E: Exception do
ShowMessage(E.Message);

View File

@ -2,6 +2,7 @@ inherited fEditorArticulos: TfEditorArticulos
Left = 489
Top = 325
Caption = 'Lista de art'#237'culos'
ExplicitHeight = 471
PixelsPerInch = 96
TextHeight = 13
inherited JvNavPanelHeader: TJvNavPanelHeader

View File

@ -100,8 +100,8 @@ end;
procedure TfEditorArticulos.NuevoInterno;
begin
inherited;
{ FController.Anadir(Articulos);
FController.Ver(Articulos);}
FController.Anadir(Articulos);
FController.Ver(Articulos);
end;
procedure TfEditorArticulos.PonerTitulos(const ATitulo: string);

View File

@ -2,92 +2,95 @@ inherited frViewDetallesArticulos: TfrViewDetallesArticulos
ParentBiDiMode = False
OnShow = CustomViewShow
inherited ToolBar1: TToolBar
Height = 95
ExplicitHeight = 95
inherited ToolButton13: TToolButton [3]
Left = 0
Height = 73
ExplicitHeight = 73
inherited ToolButton3: TToolButton
Wrap = False
end
inherited ToolButton4: TToolButton
Left = 278
Top = 0
Wrap = True
ExplicitLeft = 0
ExplicitLeft = 278
ExplicitTop = 0
end
inherited ToolButton4: TToolButton [4]
Top = 30
inherited ToolButton14: TToolButton
Left = 334
Top = 0
ExplicitLeft = 334
ExplicitTop = 0
end
inherited ToolButton8: TToolButton [5]
Left = 56
Top = 30
ExplicitLeft = 56
ExplicitTop = 30
inherited FontName: TJvFontComboBox
Top = 22
ExplicitTop = 22
end
inherited ToolButton9: TToolButton [6]
Left = 139
Top = 30
ExplicitLeft = 139
ExplicitTop = 30
end
inherited ToolButton14: TToolButton [7]
Left = 284
Top = 30
ExplicitLeft = 284
ExplicitTop = 30
end
inherited ToolButton6: TToolButton [8]
Left = 0
Top = 52
ExplicitLeft = 0
ExplicitTop = 52
end
inherited FontName: TJvFontComboBox [9]
Left = 66
Top = 52
ExplicitLeft = 66
ExplicitTop = 52
end
inherited ToolButton7: TToolButton
Left = 211
Top = 52
Wrap = True
ExplicitLeft = 211
ExplicitTop = 52
end
inherited ToolButton11: TToolButton [11]
Left = 0
Top = 74
ExplicitLeft = 0
ExplicitTop = 74
end
inherited ToolButton12: TToolButton
Left = 141
Top = 74
ExplicitLeft = 141
ExplicitTop = 74
end
inherited FontSize: TEdit [13]
Left = 149
Top = 74
inherited FontSize: TEdit
Top = 22
Width = 42
ExplicitLeft = 149
ExplicitTop = 74
ExplicitTop = 22
ExplicitWidth = 42
end
inherited UpDown1: TUpDown [14]
Left = 191
Top = 74
inherited UpDown1: TUpDown
Left = 187
Top = 22
Width = 17
ExplicitLeft = 191
ExplicitTop = 74
ExplicitLeft = 187
ExplicitTop = 22
ExplicitWidth = 17
end
inherited ToolButton10: TToolButton [15]
Left = 208
Top = 74
ExplicitLeft = 208
ExplicitTop = 74
inherited ToolButton13: TToolButton
Left = 204
Top = 22
ExplicitLeft = 204
ExplicitTop = 22
end
inherited ToolButton6: TToolButton
Left = 212
Top = 22
ExplicitLeft = 212
ExplicitTop = 22
end
inherited ToolButton7: TToolButton
Left = 278
Top = 22
ExplicitLeft = 278
ExplicitTop = 22
end
inherited ToolButton8: TToolButton
Left = 345
Top = 22
ExplicitLeft = 345
ExplicitTop = 22
end
inherited ToolButton12: TToolButton
Left = 0
Top = 22
Wrap = True
ExplicitLeft = 0
ExplicitTop = 22
ExplicitHeight = 27
end
inherited ToolButton9: TToolButton
Left = 0
Top = 49
ExplicitLeft = 0
ExplicitTop = 49
end
inherited ToolButton10: TToolButton
Left = 145
Top = 49
ExplicitLeft = 145
ExplicitTop = 49
end
inherited ToolButton11: TToolButton
Left = 270
Top = 49
ExplicitLeft = 270
ExplicitTop = 49
end
end
inherited cxGrid: TcxGrid
Top = 121
Height = 183
Top = 99
Height = 205
ExplicitTop = 99
ExplicitHeight = 205
inherited cxGridView: TcxGridDBTableView
@ -135,21 +138,32 @@ inherited frViewDetallesArticulos: TfrViewDetallesArticulos
HeaderAlignmentHorz = taRightJustify
Width = 25
end
inherited cxGridViewIMPORTEPORTE: TcxGridDBColumn
end
inherited cxGridViewIMPORTETOTAL: TcxGridDBColumn
Width = 50
end
end
end
inherited TBXDock1: TTBXDock
Top = 95
ExplicitTop = 68
Top = 73
ExplicitTop = 73
inherited TBXToolbar1: TTBXToolbar
inherited TBXSubmenuItem1: TTBXSubmenuItem
object TBXSeparatorItem8: TTBXSeparatorItem [4]
end
inherited TBXItem12: TTBXItem
Enabled = False
Visible = False
end
object TBXItem17: TTBXItem
Action = actAnadirArticulos
end
end
end
end
inherited ActionListContenido: TActionList
object actAnadirArticulos: TAction [12]
Category = 'Operaciones'
Caption = 'A'#241'adir art'#237'culos'
Caption = 'Art'#237'culos del cat'#225'logo'
ImageIndex = 12
OnExecute = actAnadirArticulosExecute
OnUpdate = actAnadirArticulosUpdate

View File

@ -25,6 +25,8 @@ type
actAnadirArticulos: TAction;
cxGridViewUNIDAD_MEDIDA: TcxGridDBColumn;
actBuscarArticulo: TAction;
TBXSeparatorItem8: TTBXSeparatorItem;
TBXItem17: TTBXItem;
procedure CustomViewCreate(Sender: TObject);
procedure CustomViewDestroy(Sender: TObject);
procedure actAnadirArticulosExecute(Sender: TObject);

View File

@ -43,6 +43,12 @@
<Borland.ProjectType>Package</Borland.ProjectType>
<BorlandProject>
<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="ImplicitBuild">True</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</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"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
<Excluded_Packages Name="c:\archivos de programa\borland\delphi10\Bin\dclIntraweb_80_100.bpl">Intraweb 8.0 Design Package for Borland Development Studio 2006</Excluded_Packages>
</Excluded_Packages><Source><Source Name="MainSource">PresupuestosCliente_view.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
</ProjectExtensions>
@ -51,11 +57,11 @@
<DelphiCompile Include="PresupuestosCliente_view.dpk">
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="..\..\..\Servidor\Articulos_view.dcp" />
<DCCReference Include="..\..\..\Servidor\Base.dcp" />
<DCCReference Include="..\..\..\Servidor\GUIBase.dcp" />
<DCCReference Include="..\..\..\Servidor\PresupuestosCliente_controller.dcp" />
<DCCReference Include="..\..\..\Servidor\PresupuestosCliente_model.dcp" />
<DCCReference Include="..\Articulos_view.dcp" />
<DCCReference Include="..\Base.dcp" />
<DCCReference Include="..\GUIBase.dcp" />
<DCCReference Include="..\PresupuestosCliente_controller.dcp" />
<DCCReference Include="..\PresupuestosCliente_model.dcp" />
<DCCReference Include="uEditorElegirArticulosPresupuestoCliente.pas">
<Form>fEditorElegirArticulosPresupuestoCliente</Form>
<DesignClass>TfEditorElegirArticulosPedidoCliente</DesignClass>

View File

@ -1,17 +1,17 @@
inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
Left = 332
Top = 147
Caption = 'Nuevo pedido de cliente'
Caption = 'Nuevo presupuesto de cliente'
ClientHeight = 615
ClientWidth = 749
OnClose = CustomEditorClose
ExplicitWidth = 757
ExplicitHeight = 649
ExplicitHeight = 642
PixelsPerInch = 96
TextHeight = 13
inherited JvNavPanelHeader: TJvNavPanelHeader
Width = 749
Caption = 'Nuevo pedido de cliente'
Caption = 'Nuevo presupuesto de cliente'
ExplicitWidth = 749
inherited Image1: TImage
Left = 722
@ -161,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
@ -181,89 +177,97 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
ParentFont = False
TabOrder = 0
ReadOnly = False
ExplicitWidth = 735
ExplicitHeight = 386
inherited ToolBar1: TToolBar
Width = 735
Height = 51
ExplicitWidth = 735
ExplicitHeight = 51
inherited ToolButton3: TToolButton
inherited ToolButton14: TToolButton
Wrap = False
end
inherited ToolButton4: TToolButton
ExplicitTop = 30
end
inherited ToolButton6: TToolButton
Wrap = False
inherited FontName: TJvFontComboBox
Left = 399
Top = 0
ExplicitLeft = 399
ExplicitTop = 0
end
inherited FontSize: TEdit
Left = 332
Top = 30
Width = 57
ExplicitLeft = 332
ExplicitTop = 30
ExplicitWidth = 57
Left = 544
Top = 0
ExplicitLeft = 544
ExplicitTop = 0
end
inherited ToolButton13: TToolButton [7]
Left = 0
Top = 0
Wrap = True
ExplicitLeft = 0
ExplicitTop = 0
ExplicitHeight = 27
end
inherited UpDown1: TUpDown [8]
Left = 0
Top = 27
ExplicitLeft = 0
ExplicitTop = 27
end
inherited ToolButton6: TToolButton
Left = 17
Top = 27
ExplicitLeft = 17
ExplicitTop = 27
end
inherited ToolButton7: TToolButton
Left = 389
Top = 30
ExplicitLeft = 389
ExplicitTop = 30
end
inherited ToolButton11: TToolButton
Left = 456
Top = 30
ExplicitLeft = 456
ExplicitTop = 30
end
inherited ToolButton10: TToolButton
Left = 597
Top = 30
Wrap = False
ExplicitLeft = 597
ExplicitTop = 30
end
inherited UpDown1: TUpDown
Left = 722
Top = 30
ExplicitLeft = 722
ExplicitTop = 30
end
inherited ToolButton9: TToolButton
Left = 738
Top = 30
ExplicitLeft = 738
ExplicitTop = 30
Left = 83
Top = 27
ExplicitLeft = 83
ExplicitTop = 27
end
inherited ToolButton8: TToolButton
Left = 883
Top = 30
ExplicitLeft = 883
ExplicitTop = 30
Left = 150
Top = 27
ExplicitLeft = 150
ExplicitTop = 27
end
inherited ToolButton12: TToolButton
Left = 966
Top = 30
ExplicitLeft = 966
ExplicitTop = 30
Left = 233
Top = 27
Wrap = False
ExplicitLeft = 233
ExplicitTop = 27
ExplicitHeight = 22
end
inherited ToolButton9: TToolButton
Left = 241
Top = 27
ExplicitLeft = 241
ExplicitTop = 27
end
inherited ToolButton10: TToolButton
Left = 386
Top = 27
ExplicitLeft = 386
ExplicitTop = 27
end
inherited ToolButton11: TToolButton
Left = 511
Top = 27
ExplicitLeft = 511
ExplicitTop = 27
end
end
inherited cxGrid: TcxGrid
Top = 77
Width = 735
Height = 309
ExplicitTop = 77
ExplicitWidth = 735
ExplicitHeight = 309
ExplicitTop = 99
ExplicitHeight = 205
end
inherited TBXDock1: TTBXDock
Top = 51
Width = 735
ExplicitTop = 51
ExplicitWidth = 735
inherited TBXToolbar1: TTBXToolbar
ExplicitWidth = 626
ExplicitWidth = 702
end
end
end
@ -271,10 +275,6 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
object pagPortada: TTabSheet
Caption = 'Portada'
ImageIndex = 3
ExplicitLeft = 0
ExplicitTop = 0
ExplicitWidth = 0
ExplicitHeight = 0
object Panel1: TPanel
Left = 0
Top = 0
@ -386,7 +386,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
Width = 590
ExplicitWidth = 590
inherited TBXToolbar1: TTBXToolbar
ExplicitWidth = 516
ExplicitWidth = 517
inherited TBXColorItem1: TTBXColorItem
Visible = False
end
@ -406,10 +406,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
@ -692,7 +688,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
Width = 590
ExplicitWidth = 590
inherited TBXToolbar1: TTBXToolbar
ExplicitWidth = 516
ExplicitWidth = 517
inherited TBXColorItem1: TTBXColorItem
Visible = False
end
@ -712,10 +708,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

View File

@ -26,7 +26,6 @@ type
dxLayoutLookAndFeelList1: TdxLayoutLookAndFeelList;
dxLayoutOfficeLookAndFeel1: TdxLayoutOfficeLookAndFeel;
frViewTotales1: TfrViewTotales;
frViewDetallesPresupuestoCliente1: TfrViewDetallesPresupuestoCliente;
pagPortada: TTabSheet;
pagMemoria: TTabSheet;
Panel1: TPanel;
@ -35,6 +34,7 @@ type
Image3: TImage;
frViewRichEditor1: TfrViewRichEditor;
frViewRichEditor2: TfrViewRichEditor;
frViewDetallesPresupuestoCliente1: TfrViewDetallesPresupuestoCliente;
procedure FormShow(Sender: TObject);
procedure CustomEditorClose(Sender: TObject; var Action: TCloseAction);

View File

@ -1,91 +1,49 @@
inherited frViewDetallesPresupuestoCliente: TfrViewDetallesPresupuestoCliente
inherited ToolBar1: TToolBar
Height = 100
ExplicitHeight = 100
inherited FontName: TJvFontComboBox [4]
Left = 56
Top = 22
ExplicitLeft = 56
ExplicitTop = 22
end
inherited ToolButton14: TToolButton [5]
Left = 201
Wrap = False
ExplicitLeft = 201
end
inherited FontSize: TEdit
Left = 266
Top = 22
ExplicitLeft = 266
ExplicitTop = 22
ExplicitLeft = 278
end
inherited UpDown1: TUpDown
Left = 308
Top = 22
ExplicitLeft = 308
ExplicitTop = 22
inherited UpDown1: TUpDown [4]
Left = 320
Top = 0
ExplicitLeft = 320
ExplicitTop = 0
end
inherited ToolButton11: TToolButton [8]
Left = 325
Top = 22
ExplicitLeft = 325
ExplicitTop = 22
end
inherited ToolButton12: TToolButton [9]
Left = 0
Top = 22
inherited ToolButton4: TToolButton [5]
Left = 337
Wrap = True
ExplicitLeft = 337
end
inherited ToolButton14: TToolButton [6]
Left = 0
Top = 22
ExplicitLeft = 0
ExplicitTop = 22
ExplicitHeight = 30
end
inherited ToolButton9: TToolButton [10]
Left = 0
Top = 52
ExplicitLeft = 0
ExplicitTop = 52
inherited FontName: TJvFontComboBox [7]
Left = 65
end
inherited ToolButton10: TToolButton [11]
Left = 145
Top = 52
ExplicitLeft = 145
ExplicitTop = 52
inherited ToolButton13: TToolButton
Left = 210
Wrap = False
ExplicitLeft = 210
end
inherited ToolButton13: TToolButton [12]
Left = 0
Top = 52
Wrap = True
ExplicitLeft = 0
ExplicitTop = 52
ExplicitHeight = 30
inherited ToolButton6: TToolButton
Left = 218
ExplicitLeft = 218
end
inherited ToolButton6: TToolButton [13]
Left = 0
Top = 82
ExplicitLeft = 0
ExplicitTop = 82
inherited ToolButton7: TToolButton
Left = 284
ExplicitLeft = 284
end
inherited ToolButton7: TToolButton [14]
Left = 66
Top = 82
ExplicitLeft = 66
ExplicitTop = 82
end
inherited ToolButton8: TToolButton [15]
Left = 133
Top = 82
ExplicitLeft = 133
ExplicitTop = 82
inherited ToolButton8: TToolButton
Left = 351
Wrap = False
ExplicitLeft = 351
end
end
inherited cxGrid: TcxGrid
Top = 126
Height = 178
ExplicitTop = 99
ExplicitHeight = 205
end
inherited TBXDock1: TTBXDock
Top = 100
ExplicitTop = 68
end
end

Binary file not shown.

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>
@ -36,15 +36,6 @@
<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">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</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"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion"></VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
<Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPSCoreD10.bpl">ExpressPrinting System by Developer Express Inc.</Excluded_Packages>
<Excluded_Packages Name="$(BDS)\bin\dcloffice2k100.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
<Excluded_Packages Name="$(BDS)\bin\dclofficexp100.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>

View File

@ -14,7 +14,7 @@ BEGIN
BEGIN
VALUE "FileVersion", "1.0.0.0\0"
VALUE "ProductVersion", "1.0.0.0\0"
VALUE "CompileDate", "martes, 05 de febrero de 2008 12:55\0"
VALUE "CompileDate", "martes, 05 de febrero de 2008 16:13\0"
END
END
BLOCK "VarFileInfo"