diff --git a/Source/Base/Base.res b/Source/Base/Base.res
index 1641339f..8b251f31 100644
Binary files a/Source/Base/Base.res and b/Source/Base/Base.res differ
diff --git a/Source/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj
index 44e841a0..def10699 100644
--- a/Source/Cliente/FactuGES.dproj
+++ b/Source/Cliente/FactuGES.dproj
@@ -53,7 +53,7 @@
Delphi.Personality
VCLApplication
-FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse1900FalseFalseFalseFalseFalse30821252Rodax Software S.L.1.9.0.0FactuGESFactuGES1.9.0.0FactuGES.dprFalse
+FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse1910FalseFalseFalseFalseFalse30821252Rodax Software S.L.1.9.1.0FactuGESFactuGES1.9.1.0FactuGES.dprFalse
diff --git a/Source/Cliente/FactuGES.rc b/Source/Cliente/FactuGES.rc
index d9fa81ce..cc314f9c 100644
--- a/Source/Cliente/FactuGES.rc
+++ b/Source/Cliente/FactuGES.rc
@@ -1,7 +1,7 @@
MAINICON ICON "C:\Codigo tecsitel\Resources\Iconos\Factuges.ico"
1 VERSIONINFO
-FILEVERSION 1,9,0,0
-PRODUCTVERSION 1,9,0,0
+FILEVERSION 1,9,1,0
+PRODUCTVERSION 1,9,1,0
FILEFLAGSMASK 0x3FL
FILEFLAGS 0x00L
FILEOS 0x40004L
@@ -13,10 +13,10 @@ BEGIN
BLOCK "0C0A04E4"
BEGIN
VALUE "CompanyName", "Rodax Software S.L.\0"
- VALUE "FileVersion", "1.9.0.0\0"
+ VALUE "FileVersion", "1.9.1.0\0"
VALUE "InternalName", "FactuGES\0"
VALUE "ProductName", "FactuGES\0"
- VALUE "ProductVersion", "1.9.0.0\0"
+ VALUE "ProductVersion", "1.9.1.0\0"
END
END
BLOCK "VarFileInfo"
diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res
index be2e7945..fa056cd8 100644
Binary files a/Source/Cliente/FactuGES.res and b/Source/Cliente/FactuGES.res differ
diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewDetallesAlbaranCliente.pas b/Source/Modulos/Albaranes de cliente/Views/uViewDetallesAlbaranCliente.pas
index 78f6ac0c..d5e07f38 100644
--- a/Source/Modulos/Albaranes de cliente/Views/uViewDetallesAlbaranCliente.pas
+++ b/Source/Modulos/Albaranes de cliente/Views/uViewDetallesAlbaranCliente.pas
@@ -11,7 +11,7 @@ uses
cxGrid, cxImageComboBox, cxTextEdit, cxMaskEdit, cxCheckBox, cxCurrencyEdit,
Grids, DBGrids, StdCtrls, ExtCtrls, cxRichEdit, ExtActns, StdActns,
JvExStdCtrls, JvCombobox, JvColorCombo, TB2Item, TBX, TB2Dock, TB2Toolbar,
- uControllerDetallesArticulos, uBizAlbaranesCliente, cxDropDownEdit,
+ uArticulosController, uBizAlbaranesCliente, cxDropDownEdit,
cxCalendar, cxDBEdit, dxLayoutControl, cxContainer, cxLookupEdit,
cxDBLookupEdit, cxDBLookupComboBox, uDAInterfaces, cxButtonEdit,
uViewDetallesArticulos, Menus, cxGridCustomPopupMenu, cxGridPopupMenu,
diff --git a/Source/Modulos/Albaranes de proveedor/Controller/uAlbaranesProveedorController.pas b/Source/Modulos/Albaranes de proveedor/Controller/uAlbaranesProveedorController.pas
index 69cd0418..8d62f02d 100644
--- a/Source/Modulos/Albaranes de proveedor/Controller/uAlbaranesProveedorController.pas
+++ b/Source/Modulos/Albaranes de proveedor/Controller/uAlbaranesProveedorController.pas
@@ -305,7 +305,7 @@ begin
if (APedido.Detalles.CANTIDAD <> 0) then
begin
ADetallesController.Add(ADetalles, TIPO_DETALLE_CONCEPTO);
- ADetallesController.AnadirArticulo(ADetalles, APedido.Detalles.REFERENCIA, tCliente);
+ ADetallesController.AnadirArticulo(ADetalles, APedido.Detalles.REFERENCIA, tReferenciaParaCompras);
ADetalles.Edit;
ADetalles.IMPORTE_UNIDAD := APedido.Detalles.IMPORTE_UNIDAD;
ADetalles.DESCUENTO := APedido.Detalles.DESCUENTO;
diff --git a/Source/Modulos/Albaranes de proveedor/Views/uViewDetallesAlbaranProveedor.dfm b/Source/Modulos/Albaranes de proveedor/Views/uViewDetallesAlbaranProveedor.dfm
index b57ac9e8..16a52cff 100644
--- a/Source/Modulos/Albaranes de proveedor/Views/uViewDetallesAlbaranProveedor.dfm
+++ b/Source/Modulos/Albaranes de proveedor/Views/uViewDetallesAlbaranProveedor.dfm
@@ -1,51 +1,43 @@
inherited frViewDetallesAlbaranProveedor: TfrViewDetallesAlbaranProveedor
inherited ToolBar1: TToolBar
- Height = 73
- ExplicitHeight = 73
- inherited ToolButton3: TToolButton
- Wrap = False
- end
- 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
+ Height = 95
+ ExplicitHeight = 95
+ 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
end
inherited UpDown1: TUpDown
+ Left = 308
Top = 22
+ ExplicitLeft = 308
ExplicitTop = 22
end
inherited ToolButton13: TToolButton
+ Left = 325
Top = 22
+ ExplicitLeft = 325
ExplicitTop = 22
end
- inherited ToolButton6: TToolButton
+ inherited ToolButton11: TToolButton [9]
+ Left = 333
Top = 22
+ ExplicitLeft = 333
ExplicitTop = 22
end
- inherited ToolButton7: TToolButton
- Top = 22
- ExplicitTop = 22
- end
- inherited ToolButton8: TToolButton
- Top = 22
- ExplicitTop = 22
- end
- inherited ToolButton12: TToolButton
+ inherited ToolButton12: TToolButton [10]
Left = 0
Top = 22
Wrap = True
@@ -53,28 +45,41 @@ inherited frViewDetallesAlbaranProveedor: TfrViewDetallesAlbaranProveedor
ExplicitTop = 22
ExplicitHeight = 27
end
- inherited ToolButton9: TToolButton
+ inherited ToolButton9: TToolButton [11]
Left = 0
Top = 49
ExplicitLeft = 0
ExplicitTop = 49
end
- inherited ToolButton10: TToolButton
+ inherited ToolButton10: TToolButton [12]
Left = 145
Top = 49
ExplicitLeft = 145
ExplicitTop = 49
end
- inherited ToolButton11: TToolButton
+ inherited ToolButton6: TToolButton [13]
Left = 270
Top = 49
ExplicitLeft = 270
ExplicitTop = 49
end
+ inherited ToolButton7: TToolButton [14]
+ Left = 336
+ Top = 49
+ Wrap = True
+ ExplicitLeft = 336
+ ExplicitTop = 49
+ end
+ inherited ToolButton8: TToolButton [15]
+ Left = 0
+ Top = 71
+ ExplicitLeft = 0
+ ExplicitTop = 71
+ end
end
inherited cxGrid: TcxGrid
- Top = 99
- Height = 205
+ Top = 121
+ Height = 183
inherited cxGridView: TcxGridDBTableView
inherited cxGridViewTIPO: TcxGridDBColumn
Visible = False
@@ -116,7 +121,7 @@ inherited frViewDetallesAlbaranProveedor: TfrViewDetallesAlbaranProveedor
end
end
inherited TBXDock1: TTBXDock
- Top = 73
+ Top = 95
inherited TBXToolbar1: TTBXToolbar
inherited TBXSubmenuItem1: TTBXSubmenuItem
Visible = False
diff --git a/Source/Modulos/Albaranes de proveedor/Views/uViewDetallesAlbaranProveedor.pas b/Source/Modulos/Albaranes de proveedor/Views/uViewDetallesAlbaranProveedor.pas
index 26238ce0..4325ea34 100644
--- a/Source/Modulos/Albaranes de proveedor/Views/uViewDetallesAlbaranProveedor.pas
+++ b/Source/Modulos/Albaranes de proveedor/Views/uViewDetallesAlbaranProveedor.pas
@@ -11,7 +11,7 @@ uses
cxGrid, cxImageComboBox, cxTextEdit, cxMaskEdit, cxCheckBox, cxCurrencyEdit,
Grids, DBGrids, StdCtrls, ExtCtrls, cxRichEdit, ExtActns, StdActns,
JvExStdCtrls, JvCombobox, JvColorCombo, TB2Item, TBX, TB2Dock, TB2Toolbar,
- uControllerDetallesArticulos, uBizAlbaranesProveedor, uDAInterfaces,
+ uArticulosController, uBizAlbaranesProveedor, uDAInterfaces,
cxButtonEdit, cxDropDownEdit, Menus, cxGridCustomPopupMenu, cxGridPopupMenu,
cxEditRepositoryItems, uViewDetallesArticulosParaVenta;
diff --git a/Source/Modulos/Articulos/Controller/uArticulosController.pas b/Source/Modulos/Articulos/Controller/uArticulosController.pas
index 1ae4c614..00024be2 100644
--- a/Source/Modulos/Articulos/Controller/uArticulosController.pas
+++ b/Source/Modulos/Articulos/Controller/uArticulosController.pas
@@ -9,16 +9,18 @@ uses
uBizContactos;
type
+ TEnumReferencia = (tReferenciaParaVentas, tRefProveedorParaVentas, tReferenciaParaCompras, tRefProveedorParaCompras);
+
IArticulosController = interface(IControllerBase)
['{C7EA6486-7BE4-468E-A27A-621E1BA13430}']
function Buscar(const ID: Integer; AClienteID: Integer = -1): IBizArticulo; overload;
function BuscarInventariables: IBizArticulo;
function BuscarTodos: IBizArticulo; overload;
- function BuscarTodosPorProveedor: IBizArticulo; overload;
+ function BuscarTodosPorProveedor: IBizArticulo; overload;
function BuscarTodos(ACliente: IBizCliente): IBizArticulo; overload;
function BuscarTodos(AProveedor: IBizProveedor): IBizArticulo; overload;
- function BuscarReferencia(const Ref: String; AClienteID: Integer): IBizArticulo;
- function BuscarReferenciaProveedor(const Ref: String; AClienteID: Integer): IBizArticulo;
+ function BuscarReferencia(const TipoReferencia: TEnumReferencia; const Ref: String; ACliProvID: Integer): IBizArticulo;
+// function BuscarReferenciaProveedor(const Ref: String; ACliProvID: Integer): IBizArticulo;
procedure Ver(AArticulo : IBizArticulo);
procedure VerTodos;
function Nuevo : IBizArticulo;
@@ -81,8 +83,8 @@ type
function BuscarTodos(ACliente: IBizCliente): IBizArticulo; overload;
function BuscarTodos(ACliente: Integer): IBizArticulo; overload;
function BuscarTodos(AProveedor: IBizProveedor): IBizArticulo; overload;
- function BuscarReferencia(const Ref: String; AClienteID: Integer = -1): IBizArticulo; virtual;
- function BuscarReferenciaProveedor(const Ref: String; AClienteID: Integer): IBizArticulo; virtual;
+ function BuscarReferencia(const TipoReferencia: TEnumReferencia; const Ref: String; ACliProvID: Integer = -1): IBizArticulo; virtual;
+
function Nuevo : IBizArticulo; virtual;
procedure Ver(AArticulo : IBizArticulo); virtual;
procedure VerTodos; virtual;
@@ -176,45 +178,84 @@ begin
end;
end;
-function TArticulosController.BuscarReferencia(const Ref: String; AClienteID: Integer = -1): IBizArticulo;
-{var
- Condicion: TDAWhereExpression;}
+function TArticulosController.BuscarReferencia(const TipoReferencia: TEnumReferencia; const Ref: String; ACliProvID: Integer = -1): IBizArticulo;
+var
+ Condicion: TDAWhereExpression;
begin
ShowHourglassCursor;
try
-//En tecsitel se desactiva el sacar una lista de articulos personalizada por cliente
-// if (AClienteID = -1) then
- Result := BuscarTodos;
-// else
-// Result := BuscarTodos(AClienteID);
- // Filtrar por referencia, se cambia por el where anterior porque luego no nos reconoce bien la cadena, al contener UPPER
- with Result.DataTable.Where do
- begin
- AddText(Format('UPPER(%s) = ''%s''', [fld_ArticulosREFERENCIA, UpperCase(Ref)]));
+ case TipoReferencia of
+ //Siempre que sea para ventas consultaremos la lista de articulos para ventas (BuscarTodos), en el caso hipotetico de que la lista de ventas
+ //sea propia para cada cliente se podria filtrar por cliente (ACliProvID)
+ tReferenciaParaVentas, tRefProveedorParaVentas: Result := BuscarTodos;
+
+ //Siempre que sea para compras consultaremos la lista de articulos para compras (BuscarTodosPorProveedor), en el caso hipotetico de que la lista de compras
+ //sea propia para cada proveedor se podria filtrar por proveedor (ACliProvID)
+ tReferenciaParaCompras, tRefProveedorParaCompras: Result := BuscarTodosPorProveedor;
end;
+ //FILTRO DE LOS CAMPOS REFERENCIA Y REFERENCIA_PROV
+ case TipoReferencia of
+ tReferenciaParaVentas, tReferenciaParaCompras: begin
+ // Filtrar por referencia, se cambia por el where anterior porque luego no nos reconoce bien la cadena, al contener UPPER
+ with Result.DataTable.DynamicWhere do
+ begin
+ if TipoReferencia = TipoReferencia then
- { with Result.DataTable.DynamicWhere do
- begin
- // (REFERENCIA >= Ref)
- Condicion := NewBinaryExpression(NewField('', fld_ArticulosREFERENCIA), NewConstant(UpperCase(Ref), datString), dboEqual);
+ Condicion := NewBinaryExpression(NewMacro('UpperCase('+fld_ArticulosREFERENCIA+')'),
+ NewConstant(UpperCase(Ref), datString),dboEqual);
+ if IsEmpty then
+ Expression := Condicion
+ else
+ Expression := NewBinaryExpression(Expression, Condicion, dboAnd);
+ end;
+ end;
- if IsEmpty then
- Expression := Condicion
- else
- Expression := NewBinaryExpression(Expression, Condicion, dboAnd);
- end;}
+ tRefProveedorParaVentas, tRefProveedorParaCompras: begin
+ // Filtrar por referencia, se cambia por el where anterior porque luego no nos reconoce bien la cadena, al contener UPPER
+ with Result.DataTable.DynamicWhere do
+ begin
+ Condicion := NewBinaryExpression(NewMacro('UpperCase('+fld_ArticulosREFERENCIA_PROV+')'),
+ NewConstant(UpperCase(Ref), datString),dboEqual);
+ if IsEmpty then
+ Expression := Condicion
+ else
+ Expression := NewBinaryExpression(Expression, Condicion, dboAnd);
+ end;
+ end;
+ end;
+
+ //FILTRO DE LOS CAMPOS CLIENTE Y PROVEEDOR
+ case TipoReferencia of
+ tReferenciaParaVentas, tRefProveedorParaVentas: begin
+ //NO SE IMPLEMENTA EN TECSITEL
+ end;
+
+ tReferenciaParaCompras, tRefProveedorParaCompras: begin
+ // Filtrar por proveedor
+ with Result.DataTable.DynamicWhere do
+ begin
+ Condicion := NewBinaryExpression(NewField('', fld_Articulos_ProveedoresID_PROVEEDOR),
+ NewConstant(ACliProvID, datInteger), dboEqual);
+
+ if IsEmpty then
+ Expression := Condicion
+ else
+ Expression := NewBinaryExpression(Expression, Condicion, dboAnd);
+ end;
+ end;
+ end;
finally
HideHourglassCursor;
end;
end;
-function TArticulosController.BuscarReferenciaProveedor(const Ref: String; AClienteID: Integer): IBizArticulo;
+{function TArticulosController.BuscarReferenciaProveedor(const Ref: String; ACliProvID: Integer): IBizArticulo;
{var
Condicion: TDAWhereExpression;}
-begin
+{begin
ShowHourglassCursor;
try
//En tecsitel se desactiva el sacar una lista de articulos personalizada por cliente
@@ -240,10 +281,11 @@ begin
Expression := NewBinaryExpression(Expression, Condicion, dboAnd);
end;}
- finally
+{ finally
HideHourglassCursor;
end;
end;
+}
function TArticulosController.BuscarTodos(ACliente: Integer): IBizArticulo;
begin
diff --git a/Source/Modulos/Articulos/Controller/uControllerDetallesArticulos.pas b/Source/Modulos/Articulos/Controller/uControllerDetallesArticulos.pas
index 7f2ab44c..d06f46eb 100644
--- a/Source/Modulos/Articulos/Controller/uControllerDetallesArticulos.pas
+++ b/Source/Modulos/Articulos/Controller/uControllerDetallesArticulos.pas
@@ -10,12 +10,10 @@ const
CAMPO_REFERENCIA_PROVEEDOR = 'REFERENCIA_PROVEEDOR'; //Campo ficticio
type
- TEnumReferencia = (tCliente, tProveedor);
-
IControllerDetallesArticulos = interface(IControllerDetallesBase)
['{6E156796-DB1F-4727-BBFB-FBAEF2E5C098}']
procedure AnadirArticulos(ADetalles: IDAStronglyTypedDataTable; const ANuevaFila :Boolean = True);
- function AnadirArticulo(ADetalles: IDAStronglyTypedDataTable; Referencia: String; TipoReferencia: TEnumReferencia; AClienteID: Integer = -1; const ACantidad: Float = 1): Boolean; overload;
+ function AnadirArticulo(ADetalles: IDAStronglyTypedDataTable; Referencia: String; TipoReferencia: TEnumReferencia; ACliProvID: Integer = -1; const ACantidad: Float = 1): Boolean; overload;
function AnadirArticulo(ADetalles: IDAStronglyTypedDataTable; IDArticulo: Integer; AClienteID: Integer = -1; const ACantidad: Float = 1): Boolean; overload;
procedure ActualizarDetalles(ADetalles: IDAStronglyTypedDataTable; AArticulos: IBizArticulo);
procedure CambiarSignoDetalles(ADetalles: IDAStronglyTypedDataTable; const AAll: Boolean = True);
@@ -39,7 +37,7 @@ type
procedure AsignarController; virtual;
public
- function AnadirArticulo(ADetalles: IDAStronglyTypedDataTable; Referencia: String; TipoReferencia: TEnumReferencia; AClienteID: Integer = -1; const ACantidad: Float = 1): Boolean; overload;
+ function AnadirArticulo(ADetalles: IDAStronglyTypedDataTable; Referencia: String; TipoReferencia: TEnumReferencia; ACliProvID: Integer = -1; const ACantidad: Float = 1): Boolean; overload;
function AnadirArticulo(ADetalles: IDAStronglyTypedDataTable; IDArticulo: Integer; AClienteID: Integer = -1; const ACantidad: Float = 1): Boolean; overload;
procedure AnadirArticulos(ADetalles: IDAStronglyTypedDataTable; const ANuevaFila :Boolean = True); virtual;
procedure ActualizarDetalles(ADetalles: IDAStronglyTypedDataTable; AArticulos: IBizArticulo);
@@ -300,23 +298,19 @@ begin
end;
end;
-function TControllerDetallesArticulos.AnadirArticulo(ADetalles: IDAStronglyTypedDataTable; Referencia: String; TipoReferencia: TEnumReferencia; AClienteID: Integer = -1; const ACantidad: Float = 1): Boolean;
+function TControllerDetallesArticulos.AnadirArticulo(ADetalles: IDAStronglyTypedDataTable; Referencia: String; TipoReferencia: TEnumReferencia; ACliProvID: Integer = -1; const ACantidad: Float = 1): Boolean;
var
AArticulo: IBizArticulo;
begin
{
Añade el artículo con la referencia pasada por parametro a los detalles pasados por parametro
- En el caso de asignar un AClienteID el articulo debe contener el descuento para ese cliente
+ En el caso de asignar un ACliProvVID el articulo debe contener el precio para ese cliente/Proveedor
}
Result := False;
BeginUpdate(ADetalles);
ShowHourglassCursor;
try
- case TipoReferencia of
- tCliente: AArticulo := FArticulosController.BuscarReferencia(Referencia, AClienteID);
- tProveedor: AArticulo := FArticulosController.BuscarReferenciaProveedor(Referencia, AClienteID)
- end;
-
+ AArticulo := FArticulosController.BuscarReferencia(TipoReferencia, Referencia, ACliProvID);
if Assigned(AArticulo) then
begin
AArticulo.DataTable.Active := True;
diff --git a/Source/Modulos/Articulos/Views/uViewDetallesArticulos.dfm b/Source/Modulos/Articulos/Views/uViewDetallesArticulos.dfm
index 5049d52e..b61e4e61 100644
--- a/Source/Modulos/Articulos/Views/uViewDetallesArticulos.dfm
+++ b/Source/Modulos/Articulos/Views/uViewDetallesArticulos.dfm
@@ -28,6 +28,22 @@ inherited frViewDetallesArticulos: TfrViewDetallesArticulos
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
+ end
+ inherited ToolButton11: TToolButton
+ Left = 706
+ ExplicitLeft = 706
+ end
end
inherited cxGrid: TcxGrid
inherited cxGridView: TcxGridDBTableView
diff --git a/Source/Modulos/Articulos/Views/uViewDetallesArticulos.pas b/Source/Modulos/Articulos/Views/uViewDetallesArticulos.pas
index bf864657..ab7b941c 100644
--- a/Source/Modulos/Articulos/Views/uViewDetallesArticulos.pas
+++ b/Source/Modulos/Articulos/Views/uViewDetallesArticulos.pas
@@ -10,7 +10,7 @@ uses
StdActns, ExtActns, ActnList, TB2Item, TBX, TB2Dock, TB2Toolbar, cxGridLevel,
cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxClasses,
cxControls, cxGridCustomView, cxGrid, ComCtrls, StdCtrls, JvExStdCtrls,
- JvCombobox, JvColorCombo, ToolWin, uControllerDetallesArticulos,
+ JvCombobox, JvColorCombo, ToolWin, uArticulosController,
cxTextEdit, uDAInterfaces, cxDropDownEdit, cxButtonEdit,
Menus, cxGridCustomPopupMenu,
cxGridPopupMenu, cxEditRepositoryItems;
@@ -36,8 +36,8 @@ type
procedure CustomViewDestroy(Sender: TObject);
procedure actAnadirArticulosExecute(Sender: TObject);
procedure actAnadirArticulosUpdate(Sender: TObject);
- 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 OnValidateReferencia(Sender: TObject; var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean); virtual;
+ procedure OnValidateReferenciaProveedor(Sender: TObject; var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean); virtual;
procedure CustomViewShow(Sender: TObject);
procedure cxGridViewREFERENCIAPropertiesButtonClick(Sender: TObject;
AButtonIndex: Integer);
@@ -63,7 +63,7 @@ implementation
{$R *.dfm}
uses
- uCalculosUtils, uViewDetallesBase, uControllerDetallesBase, uUnidadesMedidaController;
+ uCalculosUtils, uViewDetallesBase, uControllerDetallesBase, uControllerDetallesArticulos, uUnidadesMedidaController;
procedure TfrViewDetallesArticulos.actAnadirArticulosExecute(Sender: TObject);
begin
@@ -195,7 +195,7 @@ begin
Exit;
- if not AnadirArticulo(lsReferencia, tCliente) then
+ if not AnadirArticulo(lsReferencia, tReferenciaParaVentas) then
begin
ErrorText := 'La referencia introducida no exite en el catálogo';
Error := True;
@@ -214,7 +214,7 @@ begin
if (length(trim(lsReferencia)) = 0) then
Exit;
- if not AnadirArticulo(lsReferencia, tProveedor) then
+ if not AnadirArticulo(lsReferencia, tRefProveedorParaVentas) then
begin
ErrorText := 'La referencia introducida no exite en el catálogo';
Error := True;
diff --git a/Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.dfm
index 91fc112e..7e3e9096 100644
--- a/Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.dfm
+++ b/Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.dfm
@@ -1,51 +1,43 @@
inherited frViewDetallesFacturaCliente: TfrViewDetallesFacturaCliente
inherited ToolBar1: TToolBar
- Height = 73
- ExplicitHeight = 73
- inherited ToolButton3: TToolButton
- Wrap = False
- end
- 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
+ Height = 95
+ ExplicitHeight = 95
+ 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
end
inherited UpDown1: TUpDown
+ Left = 308
Top = 22
+ ExplicitLeft = 308
ExplicitTop = 22
end
inherited ToolButton13: TToolButton
+ Left = 325
Top = 22
+ ExplicitLeft = 325
ExplicitTop = 22
end
- inherited ToolButton6: TToolButton
+ inherited ToolButton11: TToolButton [9]
+ Left = 333
Top = 22
+ ExplicitLeft = 333
ExplicitTop = 22
end
- inherited ToolButton7: TToolButton
- Top = 22
- ExplicitTop = 22
- end
- inherited ToolButton8: TToolButton
- Top = 22
- ExplicitTop = 22
- end
- inherited ToolButton12: TToolButton
+ inherited ToolButton12: TToolButton [10]
Left = 0
Top = 22
Wrap = True
@@ -53,33 +45,46 @@ inherited frViewDetallesFacturaCliente: TfrViewDetallesFacturaCliente
ExplicitTop = 22
ExplicitHeight = 27
end
- inherited ToolButton9: TToolButton
+ inherited ToolButton9: TToolButton [11]
Left = 0
Top = 49
ExplicitLeft = 0
ExplicitTop = 49
end
- inherited ToolButton10: TToolButton
+ inherited ToolButton10: TToolButton [12]
Left = 145
Top = 49
ExplicitLeft = 145
ExplicitTop = 49
end
- inherited ToolButton11: TToolButton
+ inherited ToolButton6: TToolButton [13]
Left = 270
Top = 49
ExplicitLeft = 270
ExplicitTop = 49
end
+ inherited ToolButton7: TToolButton [14]
+ Left = 336
+ Top = 49
+ Wrap = True
+ ExplicitLeft = 336
+ ExplicitTop = 49
+ end
+ inherited ToolButton8: TToolButton [15]
+ Left = 0
+ Top = 71
+ ExplicitLeft = 0
+ ExplicitTop = 71
+ end
end
inherited cxGrid: TcxGrid
- Top = 99
- Height = 205
+ Top = 121
+ Height = 183
ExplicitTop = 99
- ExplicitHeight = 205
+ ExplicitHeight = 210
end
inherited TBXDock1: TTBXDock
- Top = 73
- ExplicitTop = 73
+ Top = 95
+ ExplicitTop = 68
end
end
diff --git a/Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.pas b/Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.pas
index 48cd5fce..b45d8973 100644
--- a/Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.pas
+++ b/Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.pas
@@ -11,7 +11,7 @@ uses
cxGrid, cxImageComboBox, cxTextEdit, cxMaskEdit, cxCheckBox, cxCurrencyEdit,
Grids, DBGrids, StdCtrls, ExtCtrls, cxRichEdit, StdActns, ExtActns,
JvExStdCtrls, JvCombobox, JvColorCombo, TB2Item, TBX, TB2Dock, TB2Toolbar,
- uControllerDetallesArticulos, uViewDetallesArticulos, uBizFacturasCliente,
+ uArticulosController, uViewDetallesArticulos, uBizFacturasCliente,
uDAInterfaces, cxDropDownEdit, cxButtonEdit, Menus, cxGridCustomPopupMenu,
cxGridPopupMenu, cxEditRepositoryItems, uViewDetallesArticulosParaVenta;
diff --git a/Source/Modulos/Facturas de proveedor/Views/uViewDetallesFacturaProveedor.dfm b/Source/Modulos/Facturas de proveedor/Views/uViewDetallesFacturaProveedor.dfm
index 07e7f884..9823a73d 100644
--- a/Source/Modulos/Facturas de proveedor/Views/uViewDetallesFacturaProveedor.dfm
+++ b/Source/Modulos/Facturas de proveedor/Views/uViewDetallesFacturaProveedor.dfm
@@ -1,51 +1,43 @@
inherited frViewDetallesFacturaProveedor: TfrViewDetallesFacturaProveedor
inherited ToolBar1: TToolBar
- Height = 73
- ExplicitHeight = 73
- inherited ToolButton3: TToolButton
- Wrap = False
- end
- 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
+ Height = 95
+ ExplicitHeight = 95
+ 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
end
inherited UpDown1: TUpDown
+ Left = 308
Top = 22
+ ExplicitLeft = 308
ExplicitTop = 22
end
inherited ToolButton13: TToolButton
+ Left = 325
Top = 22
+ ExplicitLeft = 325
ExplicitTop = 22
end
- inherited ToolButton6: TToolButton
+ inherited ToolButton11: TToolButton [9]
+ Left = 333
Top = 22
+ ExplicitLeft = 333
ExplicitTop = 22
end
- inherited ToolButton7: TToolButton
- Top = 22
- ExplicitTop = 22
- end
- inherited ToolButton8: TToolButton
- Top = 22
- ExplicitTop = 22
- end
- inherited ToolButton12: TToolButton
+ inherited ToolButton12: TToolButton [10]
Left = 0
Top = 22
Wrap = True
@@ -53,28 +45,42 @@ inherited frViewDetallesFacturaProveedor: TfrViewDetallesFacturaProveedor
ExplicitTop = 22
ExplicitHeight = 27
end
- inherited ToolButton9: TToolButton
+ inherited ToolButton9: TToolButton [11]
Left = 0
Top = 49
ExplicitLeft = 0
ExplicitTop = 49
end
- inherited ToolButton10: TToolButton
+ inherited ToolButton10: TToolButton [12]
Left = 145
Top = 49
ExplicitLeft = 145
ExplicitTop = 49
end
- inherited ToolButton11: TToolButton
+ inherited ToolButton6: TToolButton [13]
Left = 270
Top = 49
ExplicitLeft = 270
ExplicitTop = 49
end
+ inherited ToolButton7: TToolButton [14]
+ Left = 336
+ Top = 49
+ Wrap = True
+ ExplicitLeft = 336
+ ExplicitTop = 49
+ end
+ inherited ToolButton8: TToolButton [15]
+ Left = 0
+ Top = 71
+ ExplicitLeft = 0
+ ExplicitTop = 71
+ end
end
inherited cxGrid: TcxGrid
- Top = 99
- Height = 205
+ Top = 121
+ Height = 183
+ ExplicitHeight = 210
inherited cxGridView: TcxGridDBTableView
inherited cxGridViewREFERENCIA: TcxGridDBColumn
Properties.Buttons = <
@@ -124,7 +130,7 @@ inherited frViewDetallesFacturaProveedor: TfrViewDetallesFacturaProveedor
end
end
inherited TBXDock1: TTBXDock
- Top = 73
- ExplicitTop = 73
+ Top = 95
+ ExplicitTop = 68
end
end
diff --git a/Source/Modulos/Facturas de proveedor/Views/uViewDetallesFacturaProveedor.pas b/Source/Modulos/Facturas de proveedor/Views/uViewDetallesFacturaProveedor.pas
index 836e8d4c..6b67cddb 100644
--- a/Source/Modulos/Facturas de proveedor/Views/uViewDetallesFacturaProveedor.pas
+++ b/Source/Modulos/Facturas de proveedor/Views/uViewDetallesFacturaProveedor.pas
@@ -11,7 +11,7 @@ uses
cxGrid, cxImageComboBox, cxTextEdit, cxMaskEdit, cxCheckBox, cxCurrencyEdit,
Grids, DBGrids, StdCtrls, ExtCtrls, cxRichEdit, StdActns, ExtActns,
JvExStdCtrls, JvCombobox, JvColorCombo, TB2Item, TBX, TB2Dock, TB2Toolbar,
- uControllerDetallesArticulos, uViewDetallesArticulos, uBizFacturasProveedor,
+ uArticulosController, uViewDetallesArticulos, uBizFacturasProveedor,
uDAInterfaces, cxButtonEdit, cxDropDownEdit,
Menus, cxGridCustomPopupMenu,
cxGridPopupMenu, cxEditRepositoryItems;
@@ -48,9 +48,9 @@ uses uDetallesFacturaProveedorController;
function TfrViewDetallesFacturaProveedor.AnadirArticulo(pReferencia: String; TipoReferencia: TEnumReferencia): Boolean;
begin
if (Factura.TIPO = CTE_TIPO_ABONO) then
- Result := (Controller as IDetallesFacturaProveedorController).AnadirArticulo(Detalles, pReferencia, tProveedor, -1, -1)
+ Result := (Controller as IDetallesFacturaProveedorController).AnadirArticulo(Detalles, pReferencia, tRefProveedorParaCompras, -1, -1)
else
- Result := (Controller as IDetallesFacturaProveedorController).AnadirArticulo(Detalles, pReferencia, tProveedor, -1, -1);
+ Result := (Controller as IDetallesFacturaProveedorController).AnadirArticulo(Detalles, pReferencia, tRefProveedorParaCompras, -1, -1);
end;
procedure TfrViewDetallesFacturaProveedor.AnadirArticulosInterno;
diff --git a/Source/Modulos/Gestor de informes/Controller/GestorInformes_controller.res b/Source/Modulos/Gestor de informes/Controller/GestorInformes_controller.res
index 1641339f..8b251f31 100644
Binary files a/Source/Modulos/Gestor de informes/Controller/GestorInformes_controller.res and b/Source/Modulos/Gestor de informes/Controller/GestorInformes_controller.res differ
diff --git a/Source/Modulos/Gestor de informes/Views/GestorInformes_view.res b/Source/Modulos/Gestor de informes/Views/GestorInformes_view.res
index 1641339f..8b251f31 100644
Binary files a/Source/Modulos/Gestor de informes/Views/GestorInformes_view.res and b/Source/Modulos/Gestor de informes/Views/GestorInformes_view.res differ
diff --git a/Source/Modulos/Pedidos a proveedor/Views/uViewDetallesPedidoProveedor.pas b/Source/Modulos/Pedidos a proveedor/Views/uViewDetallesPedidoProveedor.pas
index 2a2049c8..b714d4ca 100644
--- a/Source/Modulos/Pedidos a proveedor/Views/uViewDetallesPedidoProveedor.pas
+++ b/Source/Modulos/Pedidos a proveedor/Views/uViewDetallesPedidoProveedor.pas
@@ -11,7 +11,7 @@ uses
cxGrid, cxImageComboBox, cxTextEdit, cxMaskEdit, cxCheckBox, cxCurrencyEdit,
Grids, DBGrids, StdCtrls, ExtCtrls, cxRichEdit, ExtActns, StdActns,
JvExStdCtrls, JvCombobox, JvColorCombo, TB2Item, TBX, TB2Dock, TB2Toolbar,
- uControllerDetallesArticulos, uBizPedidosProveedor, uDAInterfaces,
+ uArticulosController, uBizPedidosProveedor, uDAInterfaces,
cxButtonEdit, cxDropDownEdit, Menus, cxGridCustomPopupMenu, cxGridPopupMenu,
cxEditRepositoryItems;
@@ -27,7 +27,11 @@ type
TBXItem18: TTBXItem;
Artculosdelcatlogo1: TMenuItem;
N2: TMenuItem;
+ procedure CustomViewCreate(Sender: TObject);
procedure CustomViewDestroy(Sender: TObject);
+ procedure OnValidateReferencia(Sender: TObject; var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean); override;
+ procedure OnValidateReferenciaProveedor(Sender: TObject; var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean); virtual;
+
protected
FPedido: IBizPedidoProveedor;
function GetPedido: IBizPedidoProveedor;
@@ -56,15 +60,66 @@ begin
else (Controller as IDetallesPedidoProveedorController).AnadirArticulos(Detalles);
end;
+procedure TfrViewDetallesPedidoProveedor.CustomViewCreate(Sender: TObject);
+begin
+ inherited;
+ cxGridViewREFERENCIA.Properties.OnValidate := OnValidateReferencia;
+ cxGridViewREFERENCIA_PROVEEDOR.Properties.OnValidate := OnValidateReferenciaProveedor;
+end;
+
procedure TfrViewDetallesPedidoProveedor.CustomViewDestroy(Sender: TObject);
begin
FPedido := Nil;
+ cxGridViewREFERENCIA.Properties.OnValidate := Nil;
+ cxGridViewREFERENCIA_PROVEEDOR.Properties.OnValidate := Nil;
inherited;
end;
+procedure TfrViewDetallesPedidoProveedor.OnValidateReferencia(
+ Sender: TObject; var DisplayValue: Variant; var ErrorText: TCaption;
+ var Error: Boolean);
+var
+ lsReferencia : String;
+begin
+ //En el caso de cadena vacia no validamos
+ if (VarIsNull(DisplayValue)) then
+ Exit;
+
+ lsReferencia := VarToStr(DisplayValue);
+ if (length(trim(lsReferencia)) = 0) then
+ Exit;
+
+ if not AnadirArticulo(lsReferencia, tReferenciaParaCompras) then
+ begin
+ ErrorText := 'La referencia introducida no exite en el catálogo del proveedor';
+ Error := True;
+ end;
+end;
+
+procedure TfrViewDetallesPedidoProveedor.OnValidateReferenciaProveedor(
+ Sender: TObject; var DisplayValue: Variant; var ErrorText: TCaption;
+ var Error: Boolean);
+var
+ lsReferencia : String;
+begin
+ //En el caso de cadena vacia no validamos
+ if (VarIsNull(DisplayValue)) then
+ Exit;
+
+ lsReferencia := VarToStr(DisplayValue);
+ if (length(trim(lsReferencia)) = 0) then
+ Exit;
+
+ if not AnadirArticulo(lsReferencia, tRefProveedorParaCompras) then
+ begin
+ ErrorText := 'La referencia introducida no exite en el catálogo del proveedor';
+ Error := True;
+ end;
+end;
+
function TfrViewDetallesPedidoProveedor.AnadirArticulo(pReferencia: String; TipoReferencia: TEnumReferencia): Boolean;
begin
- Result := (Controller as IDetallesPedidoProveedorController).AnadirArticulo(Detalles, pReferencia, TipoReferencia);
+ Result := (Controller as IDetallesPedidoProveedorController).AnadirArticulo(Detalles, pReferencia, TipoReferencia, Pedido.ID_PROVEEDOR);
end;
function TfrViewDetallesPedidoProveedor.GetPedido: IBizPedidoProveedor;
diff --git a/Source/Modulos/Presupuestos de cliente/Views/uViewDetallesPresupuestoCliente.dfm b/Source/Modulos/Presupuestos de cliente/Views/uViewDetallesPresupuestoCliente.dfm
index 44225543..4c2cf356 100644
--- a/Source/Modulos/Presupuestos de cliente/Views/uViewDetallesPresupuestoCliente.dfm
+++ b/Source/Modulos/Presupuestos de cliente/Views/uViewDetallesPresupuestoCliente.dfm
@@ -1,11 +1,86 @@
inherited frViewDetallesPresupuestoCliente: TfrViewDetallesPresupuestoCliente
inherited ToolBar1: TToolBar
- inherited FontSize: TEdit
+ Height = 100
+ ExplicitHeight = 100
+ inherited ToolButton14: TToolButton
+ Wrap = False
+ end
+ inherited ToolButton9: TToolButton [5]
+ Left = 121
+ Top = 22
+ ExplicitLeft = 121
+ ExplicitTop = 22
+ end
+ inherited FontName: TJvFontComboBox [6]
+ Left = 266
+ Top = 22
+ ExplicitLeft = 266
+ ExplicitTop = 22
+ end
+ inherited UpDown1: TUpDown
+ Left = 411
+ Top = 22
+ ExplicitLeft = 411
+ ExplicitTop = 22
+ end
+ inherited ToolButton13: TToolButton
+ Left = 0
+ Top = 22
+ Wrap = True
+ ExplicitLeft = 0
+ ExplicitTop = 22
+ ExplicitHeight = 27
+ end
+ inherited ToolButton6: TToolButton
+ Left = 0
+ Top = 49
+ ExplicitLeft = 0
+ ExplicitTop = 49
+ end
+ inherited FontSize: TEdit [10]
+ Left = 66
+ Top = 49
Width = 58
+ ExplicitLeft = 66
+ ExplicitTop = 49
ExplicitWidth = 58
end
+ inherited ToolButton7: TToolButton [11]
+ Left = 124
+ Top = 49
+ ExplicitLeft = 124
+ ExplicitTop = 49
+ end
+ inherited ToolButton11: TToolButton [12]
+ Left = 191
+ Top = 49
+ ExplicitLeft = 191
+ 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
+ end
+ inherited ToolButton8: TToolButton [15]
+ Left = 125
+ Top = 76
+ ExplicitLeft = 125
+ ExplicitTop = 76
+ end
end
inherited cxGrid: TcxGrid
+ Top = 126
+ Height = 178
inherited cxGridView: TcxGridDBTableView
inherited cxGridViewREFERENCIA_PROVEEDOR: TcxGridDBColumn
DataBinding.FieldName = ''
@@ -19,6 +94,7 @@ inherited frViewDetallesPresupuestoCliente: TfrViewDetallesPresupuestoCliente
end
end
inherited TBXDock1: TTBXDock
+ Top = 100
inherited TBXToolbar1: TTBXToolbar
object TBXSeparatorItem9: TTBXSeparatorItem
end
diff --git a/Source/Modulos/Presupuestos de cliente/Views/uViewDetallesPresupuestoCliente.pas b/Source/Modulos/Presupuestos de cliente/Views/uViewDetallesPresupuestoCliente.pas
index 11d698aa..7a84603c 100644
--- a/Source/Modulos/Presupuestos de cliente/Views/uViewDetallesPresupuestoCliente.pas
+++ b/Source/Modulos/Presupuestos de cliente/Views/uViewDetallesPresupuestoCliente.pas
@@ -11,7 +11,7 @@ uses
cxGrid, cxImageComboBox, cxTextEdit, cxMaskEdit, cxCheckBox, cxCurrencyEdit,
Grids, DBGrids, StdCtrls, ExtCtrls, cxRichEdit, ExtActns, StdActns,
JvExStdCtrls, JvCombobox, JvColorCombo, TB2Item, TBX, TB2Dock, TB2Toolbar,
- uControllerDetallesArticulos, uBizPresupuestosCliente, uDAInterfaces, Buttons,
+ uArticulosController, uBizPresupuestosCliente, uDAInterfaces, Buttons,
Mask, DBCtrls, cxButtonEdit, cxDropDownEdit, Menus, cxGridCustomPopupMenu,
cxGridPopupMenu, cxDBLookupComboBox, cxCalc, cxEditRepositoryItems,
uViewDetallesArticulosParaVenta;
diff --git a/Source/Modulos/Recibos de cliente/Views/uEditorRecibosCliente.dfm b/Source/Modulos/Recibos de cliente/Views/uEditorRecibosCliente.dfm
index 6aa96bbf..f7c24a62 100644
--- a/Source/Modulos/Recibos de cliente/Views/uEditorRecibosCliente.dfm
+++ b/Source/Modulos/Recibos de cliente/Views/uEditorRecibosCliente.dfm
@@ -110,10 +110,6 @@ inherited fEditorRecibosCliente: TfEditorRecibosCliente
Column = frViewRecibosCliente1.cxGridViewIMPORTE
end>
DataController.Summary.FooterSummaryItems = <
- item
- Format = ',0.00 '#8364';-,0.00 '#8364
- Column = frViewRecibosCliente1.cxGridViewIMPORTE_TOTAL
- end
item
Format = '0 recibos'
Kind = skCount
@@ -128,6 +124,11 @@ inherited fEditorRecibosCliente: TfEditorRecibosCliente
Format = ',0.00 '#8364';-,0.00 '#8364
Kind = skSum
Column = frViewRecibosCliente1.cxGridViewOTROS_GASTOS
+ end
+ item
+ Format = ',0.00 '#8364';-,0.00 '#8364
+ Kind = skSum
+ Column = frViewRecibosCliente1.cxGridViewIMPORTE_TOTAL
end>
end
end
diff --git a/Source/Modulos/Recibos de proveedor/Views/uEditorRecibosProveedor.dfm b/Source/Modulos/Recibos de proveedor/Views/uEditorRecibosProveedor.dfm
index 5fc78301..bf02936f 100644
--- a/Source/Modulos/Recibos de proveedor/Views/uEditorRecibosProveedor.dfm
+++ b/Source/Modulos/Recibos de proveedor/Views/uEditorRecibosProveedor.dfm
@@ -41,7 +41,7 @@ inherited fEditorRecibosProveedor: TfEditorRecibosProveedor
Width = 638
ExplicitWidth = 638
inherited tbxMain: TTBXToolbar
- ExplicitWidth = 638
+ ExplicitWidth = 577
end
inherited tbxFiltro: TTBXToolbar
ExplicitWidth = 427
@@ -112,6 +112,7 @@ inherited fEditorRecibosProveedor: TfEditorRecibosProveedor
DataController.Summary.FooterSummaryItems = <
item
Format = ',0.00 '#8364';-,0.00 '#8364
+ Kind = skSum
Column = frViewRecibosProveedor1.cxGridViewIMPORTE_TOTAL
end
item
@@ -156,22 +157,22 @@ inherited fEditorRecibosProveedor: TfEditorRecibosProveedor
Width = 190
end
inherited edtFechaFinFiltro: TcxDateEdit
- Left = 294
+ Left = 216
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- ExplicitLeft = 294
+ ExplicitLeft = 216
ExplicitWidth = 334
Width = 334
end
inherited eLista: TcxComboBox
- Left = 665
+ Left = 486
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- ExplicitLeft = 665
+ ExplicitLeft = 486
ExplicitWidth = 215
Width = 215
end
diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES
index 573553b0..c74b85dd 100644
Binary files a/Source/Servidor/FactuGES_Server.RES and b/Source/Servidor/FactuGES_Server.RES differ
diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj
index d212ad5e..cce04961 100644
--- a/Source/Servidor/FactuGES_Server.dproj
+++ b/Source/Servidor/FactuGES_Server.dproj
@@ -1,343 +1,334 @@
-
+
-
- {ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1}
- FactuGES_Server.dpr
- Debug
- AnyCPU
- DCC32
- ..\..\Output\Debug\Servidor\FactuGES_Server.exe
- vcl;rtl;vclx;vclactnband;dbrtl;vcldb;vcldbx;bdertl;dsnap;dsnapcon;teeUI;teedb;tee;adortl;vclib;ibxpress;dbxcds;dbexpress;DbxCommonDriver;IndyCore;IndySystem;IndyProtocols;VclSmp;vclie;webdsnap;xmlrtl;inet;inetdbbde;inetdbxpress;RemObjects_BPDX_D11;RemObjects_RODX_D11;RemObjects_Indy_D11;RemObjects_Synapse_D11;RemObjects_WebBroker_D11;DataAbstract_Core_D11;DataAbstract_DBXDriver_D11;DataAbstract_IDE_D11;DataAbstract_Scripting_D11;DataAbstract_SDACDriver_D11;sdac105;dac105;DataAbstract_SQLiteDriver_D11;cxEditorsD10;cxLibraryD10;dxThemeD10;cxDataD10;cxExtEditorsD10;cxGridD10;cxPageControlD10;cxSchedulerD10;cxTreeListD10;cxVerticalGridD10;dxBarD10;dxComnD10;dxBarDBNavD10;dxBarExtDBItemsD10;dxBarExtItemsD10;dxDockingD10;dxLayoutControlD10;dxNavBarD10;dxPSCoreD10;dxsbD10;dxPScxCommonD10;dxPSLnksD10;vclshlctrls;dxPScxExtCommonD10;dxPScxGridLnkD10;dxPScxPCProdD10;dxPScxScheduler2LnkD10;dxPScxTLLnkD10;dxPSdxLCLnkD10;dxPsPrVwAdvD10;pckMD5;pckUCDataConnector;pckUserControl_RT;PluginSDK_D10R;PNG_D10;PngComponentsD10;tb2k_d10;tbx_d10;JclVcl;Jcl;JvXPCtrlsD11R;JvCoreD11R;JvSystemD11R;JvStdCtrlsD11R;JvAppFrmD11R;JvBandsD11R;JvDBD11R;JvDlgsD11R;JvBDED11R;JvCmpD11R;JvCryptD11R;JvCtrlsD11R;JvCustomD11R;JvDockingD11R;JvDotNetCtrlsD11R;JvEDID11R;JvGlobusD11R;JvHMID11R;JvInterpreterD11R;JvJansD11R;JvManagedThreadsD11R;JvMMD11R;JvNetD11R;JvPageCompsD11R;JvPluginD11R;JvPrintPreviewD11R;JvRuntimeDesignD11R;JvTimeFrameworkD11R;JvUIBD11R;JvValidatorsD11R;JvWizardD11R;pckUCADOConn;pckUCBDEConn;pckUCIBXConn;pckUCMidasConn;cxIntlPrintSys3D10;cxExportD10;cxIntl5D10;GUISDK_D11R;ccpackD11;JSDialog100;fsTee11;fs11;frx11;frxADO11;frxBDE11;frxDB11;frxDBX11;frxe11;frxIBX11;frxTee11;fsADO11;fsBDE11;fsDB11;fsIBX11;websnap;soaprtl;IntrawebDB_90_100;Intraweb_90_100
-
-
- 7.0
- False
- False
- 0
- 3
- ..\..\Output\Release\Servidor
- RELEASE
-
-
- 7.0
- 3
- ..\..\Output\Debug\Servidor
- DEBUG;
- True
- True
- True
- C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10
- C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10
- C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10
- C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10
-
-
- Delphi.Personality
-
-
-FalseTrueFalse/standaloneTrueFalse1900FalseFalseFalseFalseFalse308212521.9.0.01.9.0.0viernes, 25 de febrero de 2011 16:25
-
-
-
-
-
-
-
-
-
- ExpressPrinting System by Developer Express Inc.
- FactuGES_Server.dpr
-
-
-
-
- MainSource
-
-
-
-
-
-
- TDARemoteService
-
-
-
- TDataModule
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
-
-
-
-
- TDataModule
-
-
-
- TDataModule
-
-
-
- TDataAbstractService
-
-
-
-
-
-
- TDataModule
-
-
-
- TDataModule
-
-
-
- TDataAbstractService
-
-
-
-
-
- TDARemoteService
-
-
-
-
-
-
- TDARemoteService
-
-
-
-
-
-
-
-
-
- TDataModule
-
-
-
- TDataModule
-
-
-
- TDARemoteService
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
-
- TDataModule
-
-
-
- TDataModule
-
-
-
- TDataAbstractService
-
-
-
-
-
-
- TDataModule
-
-
-
- TDataAbstractService
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
- TDataAbstractService
-
-
-
- TDataAbstractService
-
-
-
- TDataAbstractService
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
-
- TDataModule
-
-
-
- TDataModule
-
-
-
- TDataAbstractService
-
-
-
-
-
-
- TDataModule
-
-
-
- TDataModule
-
-
-
- TDataModule
-
-
-
- TDataAbstractService
-
-
-
-
-
- TDataModule
-
-
-
- TDataAbstractService
-
-
-
-
-
- TDataModule
-
-
-
- TDataAbstractService
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
- TDataAbstractService
-
-
-
- TFrame
-
-
-
- TFrame
-
-
-
- TForm
-
-
-
- TFrame
-
-
-
- TDARemoteService
-
-
-
-
-
-
- TDataModule
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ {ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1}
+ FactuGES_Server.dpr
+ Debug
+ AnyCPU
+ DCC32
+ ..\..\Output\Debug\Servidor\FactuGES_Server.exe
+ vcl;rtl;vclx;vclactnband;dbrtl;vcldb;vcldbx;bdertl;dsnap;dsnapcon;teeUI;teedb;tee;adortl;vclib;ibxpress;dbxcds;dbexpress;DbxCommonDriver;IndyCore;IndySystem;IndyProtocols;VclSmp;vclie;webdsnap;xmlrtl;inet;inetdbbde;inetdbxpress;RemObjects_BPDX_D11;RemObjects_RODX_D11;RemObjects_Indy_D11;RemObjects_Synapse_D11;RemObjects_WebBroker_D11;DataAbstract_Core_D11;DataAbstract_DBXDriver_D11;DataAbstract_IDE_D11;DataAbstract_Scripting_D11;DataAbstract_SDACDriver_D11;sdac105;dac105;DataAbstract_SQLiteDriver_D11;cxEditorsD10;cxLibraryD10;dxThemeD10;cxDataD10;cxExtEditorsD10;cxGridD10;cxPageControlD10;cxSchedulerD10;cxTreeListD10;cxVerticalGridD10;dxBarD10;dxComnD10;dxBarDBNavD10;dxBarExtDBItemsD10;dxBarExtItemsD10;dxDockingD10;dxLayoutControlD10;dxNavBarD10;dxPSCoreD10;dxsbD10;dxPScxCommonD10;dxPSLnksD10;vclshlctrls;dxPScxExtCommonD10;dxPScxGridLnkD10;dxPScxPCProdD10;dxPScxScheduler2LnkD10;dxPScxTLLnkD10;dxPSdxLCLnkD10;dxPsPrVwAdvD10;pckMD5;pckUCDataConnector;pckUserControl_RT;PluginSDK_D10R;PNG_D10;PngComponentsD10;tb2k_d10;tbx_d10;JclVcl;Jcl;JvXPCtrlsD11R;JvCoreD11R;JvSystemD11R;JvStdCtrlsD11R;JvAppFrmD11R;JvBandsD11R;JvDBD11R;JvDlgsD11R;JvBDED11R;JvCmpD11R;JvCryptD11R;JvCtrlsD11R;JvCustomD11R;JvDockingD11R;JvDotNetCtrlsD11R;JvEDID11R;JvGlobusD11R;JvHMID11R;JvInterpreterD11R;JvJansD11R;JvManagedThreadsD11R;JvMMD11R;JvNetD11R;JvPageCompsD11R;JvPluginD11R;JvPrintPreviewD11R;JvRuntimeDesignD11R;JvTimeFrameworkD11R;JvUIBD11R;JvValidatorsD11R;JvWizardD11R;pckUCADOConn;pckUCBDEConn;pckUCIBXConn;pckUCMidasConn;cxIntlPrintSys3D10;cxExportD10;cxIntl5D10;GUISDK_D11R;ccpackD11;JSDialog100;fsTee11;fs11;frx11;frxADO11;frxBDE11;frxDB11;frxDBX11;frxe11;frxIBX11;frxTee11;fsADO11;fsBDE11;fsDB11;fsIBX11;websnap;soaprtl;IntrawebDB_90_100;Intraweb_90_100
+
+
+ 7.0
+ False
+ False
+ 0
+ 3
+ ..\..\Output\Release\Servidor
+ RELEASE
+
+
+ 7.0
+ 3
+ ..\..\Output\Debug\Servidor
+ DEBUG;
+ True
+ True
+ True
+ C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10
+ C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10
+ C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10
+ C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10
+
+
+ Delphi.Personality
+
+
+ FalseTrueFalse/standaloneTrueFalse1910FalseFalseFalseFalseFalse308212521.9.1.01.9.1.0jueves, 05 de mayo de 2011 16:36
+ ExpressPrinting System by Developer Express Inc.
+ FactuGES_Server.dpr
+
+
+
+
+ MainSource
+
+
+
+
+
+
+ TDARemoteService
+
+
+
+ TDataModule
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+
+
+
+ TDataModule
+
+
+
+ TDataModule
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+ TDataModule
+
+
+
+ TDataModule
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDARemoteService
+
+
+
+
+
+
+ TDARemoteService
+
+
+
+
+
+
+
+
+
+ TDataModule
+
+
+
+ TDataModule
+
+
+
+ TDARemoteService
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+ TDataModule
+
+
+
+ TDataModule
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+ TDataModule
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDataAbstractService
+
+
+
+ TDataAbstractService
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+ TDataModule
+
+
+
+ TDataModule
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+ TDataModule
+
+
+
+ TDataModule
+
+
+
+ TDataModule
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDataModule
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDataModule
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDataAbstractService
+
+
+
+ TFrame
+
+
+
+ TFrame
+
+
+
+ TForm
+
+
+
+ TFrame
+
+
+
+ TDARemoteService
+
+
+
+
+
+
+ TDataModule
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+