diff --git a/Source/Modulos/Articulos/Views/Articulos_view.dproj b/Source/Modulos/Articulos/Views/Articulos_view.dproj
index 2e90b61c..49949ac0 100644
--- a/Source/Modulos/Articulos/Views/Articulos_view.dproj
+++ b/Source/Modulos/Articulos/Views/Articulos_view.dproj
@@ -54,13 +54,13 @@
MainSource
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/Source/Modulos/Articulos/Views/uViewArticulos.dfm b/Source/Modulos/Articulos/Views/uViewArticulos.dfm
index 06408c47..5808c1bb 100644
--- a/Source/Modulos/Articulos/Views/uViewArticulos.dfm
+++ b/Source/Modulos/Articulos/Views/uViewArticulos.dfm
@@ -85,6 +85,12 @@ inherited frViewArticulos: TfrViewArticulos
DataBinding.FieldName = 'FABRICANTE'
BestFitMaxWidth = 80
end
+ object cxGridViewREFERENCIA_FABR: TcxGridDBColumn
+ Caption = 'Ref. fabricante'
+ DataBinding.FieldName = 'REFERENCIA_FABRICANTE'
+ BestFitMaxWidth = 60
+ Width = 60
+ end
object cxGridViewDESCRIPCION: TcxGridDBColumn
Caption = 'Descripci'#243'n'
DataBinding.FieldName = 'DESCRIPCION'
diff --git a/Source/Modulos/Articulos/Views/uViewArticulos.pas b/Source/Modulos/Articulos/Views/uViewArticulos.pas
index 1cec7bd8..1582a307 100644
--- a/Source/Modulos/Articulos/Views/uViewArticulos.pas
+++ b/Source/Modulos/Articulos/Views/uViewArticulos.pas
@@ -42,6 +42,7 @@ type
TBXItem4: TTBXItem;
TBXSeparatorItem3: TTBXSeparatorItem;
actFabricante: TAction;
+ cxGridViewREFERENCIA_FABR: TcxGridDBColumn;
procedure cxGridViewIDCustomDrawCell(
Sender: TcxCustomGridTableView; ACanvas: TcxCanvas;
AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
diff --git a/Source/Modulos/Articulos/Views/uViewDetallesArticulos.dfm b/Source/Modulos/Articulos/Views/uViewDetallesArticulos.dfm
index 4863f568..0599fe41 100644
--- a/Source/Modulos/Articulos/Views/uViewDetallesArticulos.dfm
+++ b/Source/Modulos/Articulos/Views/uViewDetallesArticulos.dfm
@@ -2,32 +2,66 @@ inherited frViewDetallesArticulos: TfrViewDetallesArticulos
ParentBiDiMode = False
OnShow = CustomViewShow
inherited ToolBar1: TToolBar
- Height = 100
- ExplicitHeight = 100
- inherited ToolButton14: TToolButton
+ Height = 73
+ ExplicitHeight = 73
+ inherited ToolButton3: TToolButton
Wrap = False
end
- inherited ToolButton9: TToolButton [5]
- Left = 121
+ inherited ToolButton4: TToolButton
+ Left = 278
+ Top = 0
+ ExplicitLeft = 278
+ ExplicitTop = 0
+ end
+ inherited ToolButton14: TToolButton
+ Left = 334
+ Top = 0
+ ExplicitLeft = 334
+ ExplicitTop = 0
+ end
+ inherited FontName: TJvFontComboBox
Top = 22
- ExplicitLeft = 121
ExplicitTop = 22
end
- inherited FontName: TJvFontComboBox [6]
- Left = 266
+ inherited FontSize: TEdit
Top = 22
- ExplicitLeft = 266
+ Width = 42
ExplicitTop = 22
+ ExplicitWidth = 42
end
inherited UpDown1: TUpDown
- Left = 411
+ Left = 187
Top = 22
Width = 17
- ExplicitLeft = 411
+ ExplicitLeft = 187
ExplicitTop = 22
ExplicitWidth = 17
end
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
@@ -35,56 +69,29 @@ inherited frViewDetallesArticulos: TfrViewDetallesArticulos
ExplicitTop = 22
ExplicitHeight = 27
end
- inherited ToolButton6: TToolButton
+ inherited ToolButton9: TToolButton
Left = 0
Top = 49
ExplicitLeft = 0
ExplicitTop = 49
end
- inherited ToolButton7: TToolButton
- Left = 66
- Top = 49
- ExplicitLeft = 66
- ExplicitTop = 49
- end
- inherited FontSize: TEdit [11]
- Left = 133
- Top = 49
- Width = 42
- ExplicitLeft = 133
- ExplicitTop = 49
- ExplicitWidth = 42
- end
- inherited ToolButton11: TToolButton [12]
- Left = 175
- Top = 49
- ExplicitLeft = 175
- ExplicitTop = 49
- end
- inherited ToolButton12: TToolButton [13]
- Left = 0
- Top = 49
- Wrap = True
- ExplicitLeft = 0
- ExplicitTop = 49
- ExplicitHeight = 27
- end
inherited ToolButton10: TToolButton
- Left = 0
- Top = 76
- ExplicitLeft = 0
- ExplicitTop = 76
+ Left = 145
+ Top = 49
+ ExplicitLeft = 145
+ ExplicitTop = 49
end
- inherited ToolButton8: TToolButton [15]
- Left = 125
- Top = 76
- ExplicitLeft = 125
- ExplicitTop = 76
+ inherited ToolButton11: TToolButton
+ Left = 270
+ Top = 49
+ ExplicitLeft = 270
+ ExplicitTop = 49
end
end
inherited cxGrid: TcxGrid
- Top = 126
- Height = 178
+ Top = 99
+ Height = 205
+ ExplicitTop = 99
ExplicitHeight = 205
inherited cxGridView: TcxGridDBTableView
inherited cxGridViewTIPO: TcxGridDBColumn
@@ -107,14 +114,33 @@ inherited frViewDetallesArticulos: TfrViewDetallesArticulos
end>
Properties.OnButtonClick = cxGridViewREFERENCIAPropertiesButtonClick
BestFitMaxWidth = 50
- Width = 90
+ Width = 50
end
object cxGridViewREFERENCIA_PROVEEDOR: TcxGridDBColumn [6]
Caption = 'Ref. proveedor'
DataBinding.FieldName = 'REFERENCIA_PROVEEDOR'
- PropertiesClassName = 'TcxTextEditProperties'
+ PropertiesClassName = 'TcxButtonEditProperties'
+ Properties.Buttons = <
+ item
+ Default = True
+ Kind = bkEllipsis
+ end>
+ Properties.OnButtonClick = cxGridViewREFERENCIA_PROVEEDORPropertiesButtonClick
BestFitMaxWidth = 50
- Width = 90
+ Width = 50
+ end
+ object cxGridViewREFERENCIA_FABRICANTE: TcxGridDBColumn [7]
+ Caption = 'Ref. fabricante'
+ DataBinding.FieldName = 'REFERENCIA_FABRICANTE'
+ PropertiesClassName = 'TcxButtonEditProperties'
+ Properties.Buttons = <
+ item
+ Default = True
+ Kind = bkEllipsis
+ end>
+ Properties.OnButtonClick = cxGridViewREFERENCIA_FABRICANTEPropertiesButtonClick
+ BestFitMaxWidth = 50
+ Width = 50
end
inherited cxGridViewDESCRIPCION: TcxGridDBColumn
Width = 298
@@ -123,7 +149,7 @@ inherited frViewDetallesArticulos: TfrViewDetallesArticulos
BestFitMaxWidth = 50
Width = 91
end
- object cxGridViewUNIDAD_MEDIDA: TcxGridDBColumn [9]
+ object cxGridViewUNIDAD_MEDIDA: TcxGridDBColumn [10]
Caption = 'Unid. medida'
PropertiesClassName = 'TcxComboBoxProperties'
Properties.ImmediatePost = True
@@ -154,7 +180,7 @@ inherited frViewDetallesArticulos: TfrViewDetallesArticulos
end
end
inherited TBXDock1: TTBXDock
- Top = 100
+ Top = 73
ExplicitWidth = 451
inherited TBXToolbar1: TTBXToolbar
inherited TBXSubmenuItem1: TTBXSubmenuItem
diff --git a/Source/Modulos/Articulos/Views/uViewDetallesArticulos.pas b/Source/Modulos/Articulos/Views/uViewDetallesArticulos.pas
index fd18a466..98436bf9 100644
--- a/Source/Modulos/Articulos/Views/uViewDetallesArticulos.pas
+++ b/Source/Modulos/Articulos/Views/uViewDetallesArticulos.pas
@@ -27,6 +27,7 @@ type
actBuscarArticulo: TAction;
TBXSeparatorItem8: TTBXSeparatorItem;
TBXItem17: TTBXItem;
+ cxGridViewREFERENCIA_FABRICANTE: TcxGridDBColumn;
procedure CustomViewCreate(Sender: TObject);
procedure CustomViewDestroy(Sender: TObject);
procedure actAnadirArticulosExecute(Sender: TObject);
@@ -41,6 +42,10 @@ type
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);
private
procedure RecuperarListaUnidadesMedida;
protected
@@ -110,6 +115,20 @@ begin
cxGridViewUNIDAD_MEDIDA.Visible := False;
cxGridViewUNIDAD_MEDIDA.VisibleForCustomization := False;
end;
+
+
+ if Assigned(FindField('REFERENCIA_FABRICANTE')) then
+ begin
+ cxGridViewREFERENCIA_FABRICANTE.DataBinding.FieldName := 'REFERENCIA_FABRICANTE';
+ cxGridViewREFERENCIA_FABRICANTE.Visible := True;
+ cxGridViewREFERENCIA_FABRICANTE.VisibleForCustomization := True;
+ end
+ else begin
+ cxGridViewREFERENCIA_FABRICANTE.DataBinding.FieldName := '';
+ cxGridViewREFERENCIA_FABRICANTE.Visible := False;
+ cxGridViewREFERENCIA_FABRICANTE.VisibleForCustomization := False;
+ end;
+
finally
cxGridView.EndUpdate;
end;
@@ -125,6 +144,20 @@ begin
actBuscarArticulo.Execute;
end;
+procedure TfrViewDetallesArticulos.cxGridViewREFERENCIA_FABRICANTEPropertiesButtonClick(
+ Sender: TObject; AButtonIndex: Integer);
+begin
+ inherited;
+ actBuscarArticulo.Execute;
+end;
+
+procedure TfrViewDetallesArticulos.cxGridViewREFERENCIA_PROVEEDORPropertiesButtonClick(
+ Sender: TObject; AButtonIndex: Integer);
+begin
+ inherited;
+ actBuscarArticulo.Execute;
+end;
+
function TfrViewDetallesArticulos.EsTipoEditable(
AItem: TcxCustomGridTableItem): Boolean;
var