diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj
index 3505c4d0..5f786a82 100644
--- a/Source/Base/Base.dproj
+++ b/Source/Base/Base.dproj
@@ -44,8 +44,6 @@
Package
FalseTrueFalseLibreria base de FactuGESTrueFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0
-
-
Microsoft Office 2000 Sample Automation Server Wrapper Components
Microsoft Office XP Sample Automation Server Wrapper Components
Base.dpk
@@ -55,56 +53,56 @@
MainSource
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewDetallesAlbaranCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uViewDetallesAlbaranCliente.dfm
index a633777e..c90d6d2e 100644
--- a/Source/Modulos/Albaranes de cliente/Views/uViewDetallesAlbaranCliente.dfm
+++ b/Source/Modulos/Albaranes de cliente/Views/uViewDetallesAlbaranCliente.dfm
@@ -2,75 +2,29 @@ inherited frViewDetallesAlbaranCliente: TfrViewDetallesAlbaranCliente
inherited ToolBar1: TToolBar
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 ToolButton11: TToolButton [9]
- Left = 333
- Top = 22
- ExplicitLeft = 333
- ExplicitTop = 22
- end
inherited ToolButton12: TToolButton [10]
- Left = 0
- Top = 22
- Wrap = True
- ExplicitLeft = 0
- ExplicitTop = 22
- ExplicitHeight = 27
end
- inherited ToolButton9: TToolButton [11]
+ inherited ToolButton7: TToolButton [11]
Left = 0
Top = 49
- ExplicitLeft = 0
ExplicitTop = 49
end
- inherited ToolButton10: TToolButton [12]
- Left = 145
+ inherited ToolButton8: TToolButton [12]
+ Left = 67
Top = 49
- ExplicitLeft = 145
+ ExplicitLeft = 67
ExplicitTop = 49
end
- inherited ToolButton6: TToolButton [13]
- Left = 270
- Top = 49
- ExplicitLeft = 270
- ExplicitTop = 49
+ inherited ToolButton9: TToolButton
+ Left = 150
+ ExplicitLeft = 150
end
- inherited ToolButton7: TToolButton [14]
- Left = 336
- Top = 49
+ inherited ToolButton10: TToolButton
+ Left = 295
Wrap = True
- ExplicitLeft = 336
- ExplicitTop = 49
+ ExplicitLeft = 295
end
- inherited ToolButton8: TToolButton [15]
+ inherited ToolButton11: TToolButton
Left = 0
Top = 71
ExplicitLeft = 0
diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewDetallesAlbaranCliente.pas b/Source/Modulos/Albaranes de cliente/Views/uViewDetallesAlbaranCliente.pas
index fd007bca..4af2bb27 100644
--- a/Source/Modulos/Albaranes de cliente/Views/uViewDetallesAlbaranCliente.pas
+++ b/Source/Modulos/Albaranes de cliente/Views/uViewDetallesAlbaranCliente.pas
@@ -46,10 +46,10 @@ uses uDetallesAlbaranClienteController, uViewDetallesBase;
function TfrViewDetallesAlbaranCliente.AnadirArticulo(pReferencia: String; TipoReferencia: TEnumReferencia): Boolean;
begin
- Result := (Controller as IDetallesAlbaranClienteController).AnadirArticulo(Detalles, pReferencia, TipoReferencia);
+ Result := (Controller as IDetallesAlbaranClienteController).AnadirArticulo(Detalles, pReferencia, TipoReferencia, Albaran.Cliente.ID);
if (Albaran.TIPO = CTE_TIPO_ALBARAN_DEV) then
- (Controller as IDetallesAlbaranClienteController).CambiarSignoDetalles(Detalles);
+ (Controller as IDetallesAlbaranClienteController).CambiarSignoDetalles(Detalles, False);
end;
procedure TfrViewDetallesAlbaranCliente.AnadirArticulosInterno;
@@ -57,7 +57,7 @@ begin
(Controller as IDetallesAlbaranClienteController).AnadirArticulos(Detalles, Albaran.Cliente);
if (Albaran.TIPO = CTE_TIPO_ALBARAN_DEV) then
- (Controller as IDetallesAlbaranClienteController).CambiarSignoDetalles(Detalles);
+ (Controller as IDetallesAlbaranClienteController).CambiarSignoDetalles(Detalles, False);
end;
function TfrViewDetallesAlbaranCliente.GetAlbaran: IBizAlbaranCliente;
@@ -70,7 +70,7 @@ begin
(Controller as IDetallesAlbaranClienteController).AnadirArticulos(Detalles, Albaran.Cliente, False);
if (Albaran.TIPO = CTE_TIPO_ALBARAN_DEV) then
- (Controller as IDetallesAlbaranClienteController).CambiarSignoDetalles(Detalles);
+ (Controller as IDetallesAlbaranClienteController).CambiarSignoDetalles(Detalles, False);
end;
procedure TfrViewDetallesAlbaranCliente.SetAlbaran(const Value: IBizAlbaranCliente);
diff --git a/Source/Modulos/Albaranes de proveedor/AlbaranesProveedor_Group.groupproj b/Source/Modulos/Albaranes de proveedor/AlbaranesProveedor_Group.groupproj
index bf664b70..13a0ac7d 100644
--- a/Source/Modulos/Albaranes de proveedor/AlbaranesProveedor_Group.groupproj
+++ b/Source/Modulos/Albaranes de proveedor/AlbaranesProveedor_Group.groupproj
@@ -8,6 +8,7 @@
+
@@ -20,7 +21,7 @@
Default.Personality
-
+
@@ -49,6 +50,15 @@
+
+
+
+
+
+
+
+
+
@@ -122,13 +132,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/Source/Modulos/Albaranes de proveedor/Views/uViewDetallesAlbaranProveedor.dfm b/Source/Modulos/Albaranes de proveedor/Views/uViewDetallesAlbaranProveedor.dfm
index b9700f08..00cdae0c 100644
--- a/Source/Modulos/Albaranes de proveedor/Views/uViewDetallesAlbaranProveedor.dfm
+++ b/Source/Modulos/Albaranes de proveedor/Views/uViewDetallesAlbaranProveedor.dfm
@@ -80,7 +80,7 @@ inherited frViewDetallesAlbaranProveedor: TfrViewDetallesAlbaranProveedor
inherited cxGrid: TcxGrid
Top = 121
Height = 183
- ExplicitTop = 99
+ ExplicitHeight = 205
inherited cxGridView: TcxGridDBTableView
inherited cxGridViewIMPORTENETO: TcxGridDBColumn
Properties.ReadOnly = False
@@ -89,6 +89,7 @@ inherited frViewDetallesAlbaranProveedor: TfrViewDetallesAlbaranProveedor
end
inherited TBXDock1: TTBXDock
Top = 95
+ ExplicitTop = 68
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 a77c6084..c7ec0e0f 100644
--- a/Source/Modulos/Albaranes de proveedor/Views/uViewDetallesAlbaranProveedor.pas
+++ b/Source/Modulos/Albaranes de proveedor/Views/uViewDetallesAlbaranProveedor.pas
@@ -48,7 +48,7 @@ begin
Result := (Controller as IDetallesAlbaranProveedorController).AnadirArticulo(Detalles, pReferencia, TipoReferencia);
if (Albaran.TIPO = CTE_TIPO_ALBARAN_DEV) then
- (Controller as IDetallesAlbaranProveedorController).CambiarSignoDetalles(Detalles);
+ (Controller as IDetallesAlbaranProveedorController).CambiarSignoDetalles(Detalles, False);
end;
procedure TfrViewDetallesAlbaranProveedor.AnadirArticulosInterno;
diff --git a/Source/Modulos/Articulos/Controller/uArticulosController.pas b/Source/Modulos/Articulos/Controller/uArticulosController.pas
index 098981f7..84322050 100644
--- a/Source/Modulos/Articulos/Controller/uArticulosController.pas
+++ b/Source/Modulos/Articulos/Controller/uArticulosController.pas
@@ -78,7 +78,7 @@ type
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 = -1): IBizArticulo; virtual;
+ function BuscarReferenciaProveedor(const Ref: String; AClienteID: Integer): IBizArticulo; virtual;
function Nuevo : IBizArticulo; virtual;
procedure Ver(AArticulo : IBizArticulo); virtual;
procedure VerTodos(AArticulos: IBizArticulo); virtual;
@@ -201,7 +201,7 @@ begin
end;
end;
-function TArticulosController.BuscarReferenciaProveedor(const Ref: String; AClienteID: Integer = -1): IBizArticulo;
+function TArticulosController.BuscarReferenciaProveedor(const Ref: String; AClienteID: Integer): IBizArticulo;
var
Condicion: TDAWhereExpression;
begin
diff --git a/Source/Modulos/Articulos/Controller/uControllerDetallesArticulos.pas b/Source/Modulos/Articulos/Controller/uControllerDetallesArticulos.pas
index a4868c3e..7d4e0733 100644
--- a/Source/Modulos/Articulos/Controller/uControllerDetallesArticulos.pas
+++ b/Source/Modulos/Articulos/Controller/uControllerDetallesArticulos.pas
@@ -16,9 +16,8 @@ type
['{6E156796-DB1F-4727-BBFB-FBAEF2E5C098}']
procedure AnadirArticulos(ADetalles: IDAStronglyTypedDataTable; const ANuevaFila :Boolean = True);
function AnadirArticulo(ADetalles: IDAStronglyTypedDataTable; Referencia: String; TipoReferencia: TEnumReferencia; AClienteID: Integer = -1): Boolean; overload;
- function AnadirArticulo(ADetalles: IDAStronglyTypedDataTable; IDArticulo: Integer; AClienteID: Integer = -1): Boolean; overload;
procedure ActualizarDetalles(ADetalles: IDAStronglyTypedDataTable; AArticulos: IBizArticulo);
- procedure CambiarSignoDetalles(ADetalles: IDAStronglyTypedDataTable);
+ procedure CambiarSignoDetalles(ADetalles: IDAStronglyTypedDataTable; const AAll: Boolean = True);
procedure AnadirConceptoInicial(ADetalles: IDAStronglyTypedDataTable; AConcepto: String);
end;
@@ -38,10 +37,9 @@ type
public
function AnadirArticulo(ADetalles: IDAStronglyTypedDataTable; Referencia: String; TipoReferencia: TEnumReferencia; AClienteID: Integer = -1): Boolean; overload;
- function AnadirArticulo(ADetalles: IDAStronglyTypedDataTable; IDArticulo: Integer; AClienteID: Integer = -1): Boolean; overload;
procedure AnadirArticulos(ADetalles: IDAStronglyTypedDataTable; const ANuevaFila :Boolean = True); virtual;
procedure ActualizarDetalles(ADetalles: IDAStronglyTypedDataTable; AArticulos: IBizArticulo);
- procedure CambiarSignoDetalles(ADetalles: IDAStronglyTypedDataTable);
+ procedure CambiarSignoDetalles(ADetalles: IDAStronglyTypedDataTable; const AAll: Boolean = True);
procedure AnadirConceptoInicial(ADetalles: IDAStronglyTypedDataTable; AConcepto: String);
constructor Create; override;
@@ -77,8 +75,6 @@ begin
try
if AArticulos.DataTable.Locate(CAMPO_ID, FieldByName(CAMPO_ID_ARTICULOS).AsVariant, []) then
RellenarDetalle(ADetalles, AArticulos);
-// else
-// RellenarDetalle(ADetalles, Nil);
except
on E: Exception do
ShowMessage(E.Message);
@@ -125,36 +121,6 @@ begin
end;
end;
-function TControllerDetallesArticulos.AnadirArticulo(ADetalles: IDAStronglyTypedDataTable; IDArticulo: Integer; AClienteID: Integer = -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
-}
-
- Result := False;
- BeginUpdate(ADetalles);
- ShowHourglassCursor;
- try
- AArticulo := FArticulosController.Buscar(IDArticulo, AClienteID);
-
- if Assigned(AArticulo) then
- begin
- AArticulo.DataTable.Active := True;
- if (AArticulo.RecordCount > 0) then
- begin
- RellenarDetalle(ADetalles, AArticulo);
- Result := True;
- end;
- end;
- finally
- EndUpdate(ADetalles);
- HideHourglassCursor;
- end;
-end;
-
procedure TControllerDetallesArticulos.AnadirArticulos(ADetalles: IDAStronglyTypedDataTable; const ANuevaFila: Boolean);
var
AArticulos: IBizArticulo;
@@ -213,7 +179,7 @@ begin
//
end;
-procedure TControllerDetallesArticulos.CambiarSignoDetalles(ADetalles: IDAStronglyTypedDataTable);
+procedure TControllerDetallesArticulos.CambiarSignoDetalles(ADetalles: IDAStronglyTypedDataTable; const AAll: Boolean);
begin
//Cambia de signo los detalles de la pasados por parámetro
if Assigned(ADetalles) then
@@ -226,15 +192,28 @@ begin
with ADetalles.DataTable do
begin
- First;
- while not EOF do
+ //Cambia el signo a todos
+ if AAll then
+ begin
+ First;
+ while not EOF do
+ begin
+ if (FieldByName(CAMPO_CANTIDAD).AsInteger <> 0) then
+ begin
+ Edit;
+ FieldByName(CAMPO_CANTIDAD).AsInteger := (-1) * FieldByName(CAMPO_CANTIDAD).AsInteger;
+ end;
+ Next;
+ end;
+ end
+ //Solo cambia el signo al seleccionado
+ else
begin
if (FieldByName(CAMPO_CANTIDAD).AsInteger <> 0) then
begin
Edit;
FieldByName(CAMPO_CANTIDAD).AsInteger := (-1) * FieldByName(CAMPO_CANTIDAD).AsInteger;
end;
- Next;
end;
end;
finally
@@ -285,7 +264,7 @@ begin
try
case TipoReferencia of
tCliente: AArticulo := FArticulosController.BuscarReferencia(Referencia, AClienteID);
- tProveedor: AArticulo := FArticulosController.BuscarReferenciaProveedor(Referencia, AClienteID)
+ tProveedor: AArticulo := FArticulosController.BuscarReferenciaProveedor(Referencia, AClienteID)
end;
if Assigned(AArticulo) then
diff --git a/Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.dfm
index faf905a8..b24477e5 100644
--- a/Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.dfm
+++ b/Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.dfm
@@ -80,8 +80,10 @@ inherited frViewDetallesFacturaCliente: TfrViewDetallesFacturaCliente
inherited cxGrid: TcxGrid
Top = 121
Height = 183
+ ExplicitTop = 99
end
inherited TBXDock1: TTBXDock
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 ac1bd4e1..2f08ab6c 100644
--- a/Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.pas
+++ b/Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.pas
@@ -48,7 +48,7 @@ begin
Result := (Controller as IDetallesFacturaClienteController).AnadirArticulo(Detalles, pReferencia, TipoReferencia, Factura.Cliente.ID);
if (Factura.TIPO = CTE_TIPO_ABONO) then
- (Controller as IDetallesFacturaClienteController).CambiarSignoDetalles(Detalles);
+ (Controller as IDetallesFacturaClienteController).CambiarSignoDetalles(Detalles, False);
end;
procedure TfrViewDetallesFacturaCliente.AnadirArticulosInterno;
diff --git a/Source/Modulos/Facturas de proveedor/Views/uViewDetallesFacturaProveedor.dfm b/Source/Modulos/Facturas de proveedor/Views/uViewDetallesFacturaProveedor.dfm
index 8737039f..6f5d9215 100644
--- a/Source/Modulos/Facturas de proveedor/Views/uViewDetallesFacturaProveedor.dfm
+++ b/Source/Modulos/Facturas de proveedor/Views/uViewDetallesFacturaProveedor.dfm
@@ -80,6 +80,7 @@ inherited frViewDetallesFacturaProveedor: TfrViewDetallesFacturaProveedor
inherited cxGrid: TcxGrid
Top = 121
Height = 183
+ ExplicitTop = 99
inherited cxGridView: TcxGridDBTableView
inherited cxGridViewIMPORTENETO: TcxGridDBColumn
Properties.ReadOnly = False
@@ -89,5 +90,6 @@ inherited frViewDetallesFacturaProveedor: TfrViewDetallesFacturaProveedor
end
inherited TBXDock1: TTBXDock
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 41438274..ccc45d9e 100644
--- a/Source/Modulos/Facturas de proveedor/Views/uViewDetallesFacturaProveedor.pas
+++ b/Source/Modulos/Facturas de proveedor/Views/uViewDetallesFacturaProveedor.pas
@@ -48,7 +48,7 @@ begin
Result := (Controller as IDetallesFacturaProveedorController).AnadirArticulo(Detalles, pReferencia, tProveedor);
if (Factura.TIPO = CTE_TIPO_ABONO) then
- (Controller as IDetallesFacturaProveedorController).CambiarSignoDetalles(Detalles);
+ (Controller as IDetallesFacturaProveedorController).CambiarSignoDetalles(Detalles, False);
end;
procedure TfrViewDetallesFacturaProveedor.AnadirArticulosInterno;
diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES
index 2ffcb1ef..df3bd9a5 100644
Binary files a/Source/Servidor/FactuGES_Server.RES and b/Source/Servidor/FactuGES_Server.RES differ
diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc
index 40a243fa..408b930c 100644
--- a/Source/Servidor/FactuGES_Server.rc
+++ b/Source/Servidor/FactuGES_Server.rc
@@ -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 21:13\0"
+ VALUE "CompileDate", "miércoles, 06 de febrero de 2008 11:52\0"
END
END
BLOCK "VarFileInfo"