diff --git a/Build/Build.fbl6 b/Build/Build.fbl6
index 7108404..2f82293 100644
Binary files a/Build/Build.fbl6 and b/Build/Build.fbl6 differ
diff --git a/Database/scripts/factuges_sysdata.sql b/Database/scripts/factuges_sysdata.sql
index d6c8d4c..4a7505f 100644
--- a/Database/scripts/factuges_sysdata.sql
+++ b/Database/scripts/factuges_sysdata.sql
@@ -52,11 +52,7 @@ INSERT INTO REFERENCIAS (ID, CODIGO, VALOR, ID_EMPRESA, DESCRIPCION) VALUES (23,
INSERT INTO REFERENCIAS (ID, CODIGO, VALOR, ID_EMPRESA, DESCRIPCION) VALUES (24, 'REF_REMESAS_PROVEEDOR', 'NRP/0001', 2, 'Ref. remesas de proveedor');
INSERT INTO REFERENCIAS (ID, CODIGO, VALOR, ID_EMPRESA, DESCRIPCION) VALUES (25, 'REF_ABONOS_CLIENTE', 'NFAC/0001', 2, 'Ref. abonos de cliente');
INSERT INTO REFERENCIAS (ID, CODIGO, VALOR, ID_EMPRESA, DESCRIPCION) VALUES (26, 'REF_ABONOS_PROVEEDOR', 'NFAP/0001', 2, 'Ref. abonos de proveedor');
-INSERT INTO REFERENCIAS (ID, CODIGO, VALOR, ID_EMPRESA, DESCRIPCION) VALUES (27, 'REF_CLIENTES', '0000000001', NULL, 'Ref. clientes');
-INSERT INTO REFERENCIAS (ID, CODIGO, VALOR, ID_EMPRESA, DESCRIPCION) VALUES (28, 'REF_PROVEEDORES', '0000000001', NULL, 'Ref. proveedores');
-INSERT INTO REFERENCIAS (ID, CODIGO, VALOR, ID_EMPRESA, DESCRIPCION) VALUES (29, 'REF_AGENTES', '00001', NULL, 'Ref. agentes');
-INSERT INTO REFERENCIAS (ID, CODIGO, VALOR, ID_EMPRESA, DESCRIPCION) VALUES (30, 'REF_ARTICULOS', '1', NULL, 'Ref. artículos');
-SET GENERATOR GEN_REFERENCIAS_ID TO 31;
+SET GENERATOR GEN_REFERENCIAS_ID TO 27;
COMMIT WORK;
INSERT INTO TIPOS_IVA (ID, REFERENCIA, DESCRIPCION, IVA, RE) VALUES (2, 'IVA16', 'IVA16', 16, 4);
diff --git a/Source/ApplicationBase/Empresas/Views/uViewEmpresa.dfm b/Source/ApplicationBase/Empresas/Views/uViewEmpresa.dfm
index 203b486..e7586f1 100644
--- a/Source/ApplicationBase/Empresas/Views/uViewEmpresa.dfm
+++ b/Source/ApplicationBase/Empresas/Views/uViewEmpresa.dfm
@@ -583,6 +583,7 @@ inherited frViewEmpresa: TfrViewEmpresa
end
object dxLayoutControl1Group13: TdxLayoutGroup
Caption = 'Datos cat'#225'logo art'#237'culos'
+ Visible = False
LayoutDirection = ldHorizontal
object dxLayoutControl1Item18: TdxLayoutItem
Caption = 'Margen de venta:'
diff --git a/Source/ApplicationBase/uFactuGES_App.pas b/Source/ApplicationBase/uFactuGES_App.pas
index c094037..e912ad5 100644
--- a/Source/ApplicationBase/uFactuGES_App.pas
+++ b/Source/ApplicationBase/uFactuGES_App.pas
@@ -375,6 +375,13 @@ var
AEmpresas: IBizEmpresa;
AEmpresasController: IEmpresasController;
begin
+ //PARCHE
+ if (AppFactuGES.UsuarioActivo.ID = 2) then
+ begin
+ CambiarEmpresa(1);
+ exit;
+ end;
+
JsDialog := TJSDialog.Create(nil);
try
JsDialog.Content.Add('Selección de empresa');
diff --git a/Source/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj
index d17c615..7255bae 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\TrueFalse1830FalseFalseFalseFalseFalse30821252Rodax Software S.L.1.8.3.0FactuGESFactuGES1.8.3.0FactuGES.dprFalse
+FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse4000FalseFalseFalseFalseFalse30821252Rodax Software S.L.4.0.0.0FactuGESFactuGES4.0.0.0FactuGES.dprFalse
diff --git a/Source/Cliente/FactuGES.rc b/Source/Cliente/FactuGES.rc
index c2b38b0..f2b8471 100644
--- a/Source/Cliente/FactuGES.rc
+++ b/Source/Cliente/FactuGES.rc
@@ -1,7 +1,7 @@
MAINICON ICON "C:\Codigo\Resources\Iconos\Factuges.ico"
1 VERSIONINFO
-FILEVERSION 1,8,3,0
-PRODUCTVERSION 1,8,3,0
+FILEVERSION 4,0,0,0
+PRODUCTVERSION 4,0,0,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.8.3.0\0"
+ VALUE "FileVersion", "4.0.0.0\0"
VALUE "InternalName", "FactuGES\0"
VALUE "ProductName", "FactuGES\0"
- VALUE "ProductVersion", "1.8.3.0\0"
+ VALUE "ProductVersion", "4.0.0.0\0"
END
END
BLOCK "VarFileInfo"
diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res
index 9995434..96e35ec 100644
Binary files a/Source/Cliente/FactuGES.res and b/Source/Cliente/FactuGES.res differ
diff --git a/Source/Cliente/Utiles/uNavPaneUtils.pas b/Source/Cliente/Utiles/uNavPaneUtils.pas
index 7e9658c..3d8e881 100644
--- a/Source/Cliente/Utiles/uNavPaneUtils.pas
+++ b/Source/Cliente/Utiles/uNavPaneUtils.pas
@@ -28,7 +28,8 @@ begin
for ItemIndex := 0 to (AMenuItem.Count - 1) do
begin
if ((not AMenuItem[ItemIndex].IsLine) // que no sea una línea separadora
- and (AMenuItem[ItemIndex].Count = 0)) // y que no sea el padre de un submenú
+ and (AMenuItem[ItemIndex].Count = 0) // y que no sea el padre de un submenú
+ and AMenuItem[ItemIndex].Visible) // y que sea una operación visible
then
with TTBXLink.Create(Application) do
begin
diff --git a/Source/Cliente/uBootStrap.pas b/Source/Cliente/uBootStrap.pas
index 97411b7..cb07ed8 100644
--- a/Source/Cliente/uBootStrap.pas
+++ b/Source/Cliente/uBootStrap.pas
@@ -52,7 +52,7 @@ begin
LoadModule('Inventario_plugin.bpl');
LoadModule('HistoricoMovimientos_plugin.bpl');
- LoadModule('GestorInformes_plugin.bpl');
+// LoadModule('GestorInformes_plugin.bpl');
LoadModule('Comisiones_plugin.bpl');
LoadModule('TiendaWeb_plugin.bpl');
diff --git a/Source/Cliente/uNavPaneController.pas b/Source/Cliente/uNavPaneController.pas
index 0bcd3b2..06c233c 100644
--- a/Source/Cliente/uNavPaneController.pas
+++ b/Source/Cliente/uNavPaneController.pas
@@ -118,8 +118,10 @@ begin
// Guardar la lista de secciones (Ventas, Compras, etc...)
for ASeccionCount := 0 to MainMenuController.MainMenu.Items.Count - 1 do
begin
- if not EsUnModulo(MainMenuController.MainMenu.Items[ASeccionCount]) then
+ if not EsUnModulo(MainMenuController.MainMenu.Items[ASeccionCount])
+ or not MainMenuController.MainMenu.Items[ASeccionCount].Visible then
Continue;
+
AListaSecciones.AddObject(StringReplace(MainMenuController.MainMenu.Items[ASeccionCount].Caption, '&', '', []),
MainMenuController.MainMenu.Items[ASeccionCount])
end;
@@ -129,6 +131,46 @@ begin
try
AEmpresas.DataTable.Active := True;
+
+ //PARCHE
+ if (AppFactuGES.UsuarioActivo.ID = 2) then
+ begin
+ // Buscar la página si existe
+ AIndex := EncontrarPagina(FNavigationPane, AEmpresas.NOMBRE);
+ if AIndex > -1 then
+ ASeccionPadre := EncontrarSeccionPadre(FNavigationPane.NavPages[AIndex])
+ else begin
+ // Crear la página de la empresa
+ AIndex := CrearPagina(FNavigationPane, AEmpresas.NOMBRE, nil, -1);
+
+ ASeccionPadre := CrearSeccion(FNavigationPane.NavPages[AIndex]);
+ ASeccionPadre.Align := alClient;
+ ASeccionPadre.AutoScroll := True;
+ end;
+ FNavigationPane.NavPages[AIndex].Tag := AEmpresas.ID;
+
+
+ // Crear secciones
+ for ASeccionCount := 0 to AListaSecciones.Count - 1 do
+ begin
+ ASeccion := CrearSeccion(ASeccionPadre);
+ with ASeccion do
+ begin
+ Top := 100 * AEmpresasCount;
+ Align := alTop;
+ AutoScroll := False;
+ end;
+
+ ADivisor := CrearDivisor(ASeccion, AListaSecciones[ASeccionCount]);
+
+ PopulateNavPagePane(ASeccion, TMenuItem(AListaSecciones.Objects[ASeccionCount]),
+ FLargeImages, dmBase.StyleManager);
+ ASeccion.Height := ASeccion.Height + ADivisor.Height;
+ end;
+ end
+ else
+ //FIN PARCHE
+
{$IFDEF MULTIEMPRESA}
while not AEmpresas.DataTable.EOF do
begin
diff --git a/Source/Cliente/uPantallaPrincipal.dfm b/Source/Cliente/uPantallaPrincipal.dfm
index c0fcc47..bac03bb 100644
--- a/Source/Cliente/uPantallaPrincipal.dfm
+++ b/Source/Cliente/uPantallaPrincipal.dfm
@@ -318,6 +318,7 @@ object fPantallaPrincipal: TfPantallaPrincipal
Category = 'Empresa'
Caption = 'A'#241'adir empresa'
OnExecute = actAnadirEmpresaExecute
+ OnUpdate = actAnadirEmpresaUpdate
end
end
object ModulesSmallImageList: TPngImageList
@@ -671,6 +672,7 @@ object fPantallaPrincipal: TfPantallaPrincipal
object Informes1: TMenuItem
Tag = 6000
Action = actMenuInformes
+ Visible = False
end
end
object JvXPMenuItemPainter1: TJvXPMenuItemPainter
diff --git a/Source/Cliente/uPantallaPrincipal.pas b/Source/Cliente/uPantallaPrincipal.pas
index 474ac26..515e3a3 100644
--- a/Source/Cliente/uPantallaPrincipal.pas
+++ b/Source/Cliente/uPantallaPrincipal.pas
@@ -121,6 +121,7 @@ type
procedure Listadeempresas1_OLDClick(Sender: TObject);
procedure actInformacionEmpresaExecute(Sender: TObject);
procedure actAnadirEmpresaExecute(Sender: TObject);
+ procedure actAnadirEmpresaUpdate(Sender: TObject);
private
FContenido : TCustomEditor;
procedure ShowEmbedded(AEditor : ICustomEditor);
@@ -541,6 +542,12 @@ begin
ShowMessage('Empresa dada de alta, cierre la aplicación y vuelva a abrirla, para poder acceder a ella');
end;
+procedure TfPantallaPrincipal.actAnadirEmpresaUpdate(Sender: TObject);
+begin
+ //PARCHE
+ (Sender as TAction).Enabled := (AppFactuGES.UsuarioActivo.ID <> 2)
+end;
+
procedure TfPantallaPrincipal.actCambiarPassExecute(Sender: TObject);
begin
AppFactuGES.UsuariosController._ShowChangePassword;
diff --git a/Source/Informes/2/InfAlbaranCliente.fr3 b/Source/Informes/2/InfAlbaranCliente.fr3
index ff93322..c5729db 100644
--- a/Source/Informes/2/InfAlbaranCliente.fr3
+++ b/Source/Informes/2/InfAlbaranCliente.fr3
@@ -1,42 +1,58 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Source/Informes/2/InfAlbaranProveedor.fr3 b/Source/Informes/2/InfAlbaranProveedor.fr3
index 392bca2..4a6c7b0 100644
--- a/Source/Informes/2/InfAlbaranProveedor.fr3
+++ b/Source/Informes/2/InfAlbaranProveedor.fr3
@@ -1,59 +1,44 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Source/Informes/2/InfComisiones.fr3 b/Source/Informes/2/InfComisiones.fr3
new file mode 100644
index 0000000..9d4a951
--- /dev/null
+++ b/Source/Informes/2/InfComisiones.fr3
@@ -0,0 +1,50 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Source/Informes/2/InfComisionesDesglosado.fr3 b/Source/Informes/2/InfComisionesDesglosado.fr3
new file mode 100644
index 0000000..7ec3870
--- /dev/null
+++ b/Source/Informes/2/InfComisionesDesglosado.fr3
@@ -0,0 +1,56 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Source/Informes/2/InfEtiquetasAlbaranCliente.fr3 b/Source/Informes/2/InfEtiquetasAlbaranCliente.fr3
new file mode 100644
index 0000000..a2909ec
--- /dev/null
+++ b/Source/Informes/2/InfEtiquetasAlbaranCliente.fr3
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Source/Informes/2/InfFacturaCliente.fr3 b/Source/Informes/2/InfFacturaCliente.fr3
index 00e7244..189662a 100644
--- a/Source/Informes/2/InfFacturaCliente.fr3
+++ b/Source/Informes/2/InfFacturaCliente.fr3
@@ -1,74 +1,74 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
diff --git a/Source/Informes/2/InfFacturaProveedor.fr3 b/Source/Informes/2/InfFacturaProveedor.fr3
new file mode 100644
index 0000000..4f4a7e9
--- /dev/null
+++ b/Source/Informes/2/InfFacturaProveedor.fr3
@@ -0,0 +1,72 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Source/Informes/2/InfPedidoCliente.fr3 b/Source/Informes/2/InfPedidoCliente.fr3
new file mode 100644
index 0000000..6ac1fa2
--- /dev/null
+++ b/Source/Informes/2/InfPedidoCliente.fr3
@@ -0,0 +1,45 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Source/Informes/2/InfPedidoProveedor.fr3 b/Source/Informes/2/InfPedidoProveedor.fr3
index 08edb86..7c2f945 100644
--- a/Source/Informes/2/InfPedidoProveedor.fr3
+++ b/Source/Informes/2/InfPedidoProveedor.fr3
@@ -1,65 +1,46 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Source/Informes/2/InfPresupuestoCliente.fr3 b/Source/Informes/2/InfPresupuestoCliente.fr3
index 25e5644..8af18e3 100644
--- a/Source/Informes/2/InfPresupuestoCliente.fr3
+++ b/Source/Informes/2/InfPresupuestoCliente.fr3
@@ -1,114 +1,100 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
+
-
-
-
+
+
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
+
diff --git a/Source/Informes/2/InfReciboCliente.fr3 b/Source/Informes/2/InfReciboCliente.fr3
index abfe86e..d3540d9 100644
--- a/Source/Informes/2/InfReciboCliente.fr3
+++ b/Source/Informes/2/InfReciboCliente.fr3
@@ -1,70 +1,89 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
diff --git a/Source/Informes/2/InfRemesaCliente.fr3 b/Source/Informes/2/InfRemesaCliente.fr3
new file mode 100644
index 0000000..70b0d70
--- /dev/null
+++ b/Source/Informes/2/InfRemesaCliente.fr3
@@ -0,0 +1,55 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Source/Informes/2/InfRemesaProveedor.fr3 b/Source/Informes/2/InfRemesaProveedor.fr3
new file mode 100644
index 0000000..8471f2a
--- /dev/null
+++ b/Source/Informes/2/InfRemesaProveedor.fr3
@@ -0,0 +1,64 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Source/Modulos/Articulos/Model/uBizArticulosServer.pas b/Source/Modulos/Articulos/Model/uBizArticulosServer.pas
index a07bbf1..bb52a71 100644
--- a/Source/Modulos/Articulos/Model/uBizArticulosServer.pas
+++ b/Source/Modulos/Articulos/Model/uBizArticulosServer.pas
@@ -55,7 +55,7 @@ procedure TBizArticulosServer.BeforeProcessDelta(
Sender: TDABusinessProcessor; const aDelta: IDADelta);
begin
FReferenciaAutomatica := False;
-
+{
case Sender.CurrentChange.ChangeType of
ctInsert, ctUpdate: begin
//Si la referencia no ha sido asignada le asignamos una nosotros
@@ -66,6 +66,7 @@ begin
end;
end;
end;
+}
end;
function TBizArticulosServer.DarReferencia: String;
diff --git a/Source/Modulos/Articulos/Views/uViewArticulo.dfm b/Source/Modulos/Articulos/Views/uViewArticulo.dfm
index b641c12..1d70075 100644
--- a/Source/Modulos/Articulos/Views/uViewArticulo.dfm
+++ b/Source/Modulos/Articulos/Views/uViewArticulo.dfm
@@ -60,10 +60,9 @@ inherited frViewArticulo: TfrViewArticulo
Anchors = [akLeft, akTop, akRight]
DataBinding.DataField = 'REFERENCIA'
DataBinding.DataSource = dsViewArticulo
- Enabled = False
Style.BorderColor = clWindowFrame
Style.BorderStyle = ebs3D
- Style.Color = clWindow
+ Style.Color = 14745599
Style.HotTrack = False
Style.LookAndFeel.Kind = lfStandard
Style.LookAndFeel.NativeStyle = True
diff --git a/Source/Modulos/Contactos/Model/uBizContactos.pas b/Source/Modulos/Contactos/Model/uBizContactos.pas
index b779b21..8c5c3f7 100644
--- a/Source/Modulos/Contactos/Model/uBizContactos.pas
+++ b/Source/Modulos/Contactos/Model/uBizContactos.pas
@@ -556,7 +556,6 @@ end;
procedure TBizContacto.OnNewRecord(Sender: TDADataTable);
begin
inherited;
- ID := GetRecNo; // -1, -2, -3...
IniciarValoresContactoNuevo;
end;
diff --git a/Source/Modulos/Contactos/Model/uBizContactosServer.pas b/Source/Modulos/Contactos/Model/uBizContactosServer.pas
index 4489aa3..365037a 100644
--- a/Source/Modulos/Contactos/Model/uBizContactosServer.pas
+++ b/Source/Modulos/Contactos/Model/uBizContactosServer.pas
@@ -87,6 +87,7 @@ procedure TBizContactosServer.BeforeProcessDelta(Sender: TDABusinessProcessor;
begin
inherited;
FReferenciaAutomatica := False;
+{
case Sender.CurrentChange.ChangeType of
ctInsert, ctUpdate: begin
// Si la referencia no ha sido asignada le asignamos una nosotros
@@ -97,6 +98,7 @@ begin
end;
end;
end;
+}
end;
procedure TBizContactosServer.Delete_Categoria_Contacto(
diff --git a/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.dfm b/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.dfm
index ace274d..ccf3895 100644
--- a/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.dfm
+++ b/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.dfm
@@ -1849,7 +1849,7 @@ object RptFacturasCliente: TRptFacturasCliente
PrintOptions.Printer = 'Default'
PrintOptions.PrintOnSheet = 0
ReportOptions.CreateDate = 37871.995398692100000000
- ReportOptions.LastChange = 40408.653188761570000000
+ ReportOptions.LastChange = 40408.653188761600000000
ReportOptions.VersionBuild = '1'
ReportOptions.VersionMajor = '12'
ReportOptions.VersionMinor = '13'
diff --git a/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.pas b/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.pas
index 1c4d6f4..1eff499 100644
--- a/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.pas
+++ b/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.pas
@@ -685,14 +685,14 @@ begin
raise Exception.Create (('Error Servidor: _GenerarFactura, no encuentra informe ' + rptFacturaCliente));
frxReport.LoadFromFile(AInforme, True);
-{
- if VerSello then
- frxReport.Variables.Variables['VerSello'] := 1
- else
- frxReport.Variables.Variables['VerSello'] := 0;
+
+// if VerSello then
+// frxReport.Variables.Variables['ShowLogotipo'] := VerSello;
+// else
+// frxReport.Variables.Variables['ShowLogotipo'] := 0;
//La primera impresion siempre es sin la etiqueta copia
- frxReport.Variables.Variables['VerCopia'] := 0;
-}
+// frxReport.Variables.Variables['VerCopia'] := 0;
+
frxReport.PrepareReport(False);
{
if VerCopia then
diff --git a/Source/Modulos/Pedidos de cliente/Controller/PedidosCliente_controller.drc b/Source/Modulos/Pedidos de cliente/Controller/PedidosCliente_controller.drc
index 49f8c42..2642248 100644
--- a/Source/Modulos/Pedidos de cliente/Controller/PedidosCliente_controller.drc
+++ b/Source/Modulos/Pedidos de cliente/Controller/PedidosCliente_controller.drc
@@ -13,4 +13,4 @@ BEGIN
END
/* C:\Codigo\Source\Modulos\Pedidos de cliente\Controller\PedidosCliente_controller.RES */
-/* c:\temp\dtf8A.tmp */
+/* c:\temp\dtf3E7.tmp */
diff --git a/Source/Modulos/Pedidos de cliente/Data/PedidosCliente_data.drc b/Source/Modulos/Pedidos de cliente/Data/PedidosCliente_data.drc
index d960457..eb948ca 100644
--- a/Source/Modulos/Pedidos de cliente/Data/PedidosCliente_data.drc
+++ b/Source/Modulos/Pedidos de cliente/Data/PedidosCliente_data.drc
@@ -14,4 +14,4 @@ END
/* C:\Codigo\Source\Modulos\Pedidos de cliente\Data\uDataModulePedidosCliente.dfm */
/* C:\Codigo\Source\Modulos\Pedidos de cliente\Data\PedidosCliente_data.RES */
-/* c:\temp\dtf88.tmp */
+/* c:\temp\dtf3E5.tmp */
diff --git a/Source/Modulos/Pedidos de cliente/Model/PedidosCliente_model.drc b/Source/Modulos/Pedidos de cliente/Model/PedidosCliente_model.drc
index 58a74c3..19df105 100644
--- a/Source/Modulos/Pedidos de cliente/Model/PedidosCliente_model.drc
+++ b/Source/Modulos/Pedidos de cliente/Model/PedidosCliente_model.drc
@@ -13,4 +13,4 @@ BEGIN
END
/* C:\Codigo\Source\Modulos\Pedidos de cliente\Model\PedidosCliente_model.RES */
-/* c:\temp\dtf86.tmp */
+/* c:\temp\dtf3E3.tmp */
diff --git a/Source/Modulos/Pedidos de cliente/Plugin/PedidosCliente_plugin.drc b/Source/Modulos/Pedidos de cliente/Plugin/PedidosCliente_plugin.drc
index 2843f9c..cc078cd 100644
--- a/Source/Modulos/Pedidos de cliente/Plugin/PedidosCliente_plugin.drc
+++ b/Source/Modulos/Pedidos de cliente/Plugin/PedidosCliente_plugin.drc
@@ -14,4 +14,4 @@ END
/* C:\Codigo\Source\Modulos\Pedidos de cliente\Plugin\uPluginPedidosCliente.dfm */
/* C:\Codigo\Source\Modulos\Pedidos de cliente\Plugin\PedidosCliente_plugin.RES */
-/* c:\temp\dtfF2.tmp */
+/* c:\temp\dtf44B.tmp */
diff --git a/Source/Modulos/Pedidos de cliente/Views/PedidosCliente_view.drc b/Source/Modulos/Pedidos de cliente/Views/PedidosCliente_view.drc
index 4d912bb..2e88455 100644
--- a/Source/Modulos/Pedidos de cliente/Views/PedidosCliente_view.drc
+++ b/Source/Modulos/Pedidos de cliente/Views/PedidosCliente_view.drc
@@ -26,4 +26,4 @@ END
/* C:\Codigo\Source\Modulos\Pedidos de cliente\Views\uEditorElegirArticulosPedidoCliente.dfm */
/* C:\Codigo\Source\Modulos\Pedidos de cliente\Views\uEditorDireccionEntregaPedidoCliente.dfm */
/* C:\Codigo\Source\Modulos\Pedidos de cliente\Views\PedidosCliente_view.RES */
-/* c:\temp\dtfF0.tmp */
+/* c:\temp\dtf449.tmp */
diff --git a/Source/Modulos/Tienda web/Data/TiendaWeb_data.drc b/Source/Modulos/Tienda web/Data/TiendaWeb_data.drc
index ac2569a..1dc18e6 100644
--- a/Source/Modulos/Tienda web/Data/TiendaWeb_data.drc
+++ b/Source/Modulos/Tienda web/Data/TiendaWeb_data.drc
@@ -12,6 +12,6 @@ STRINGTABLE
BEGIN
END
-/* C:\Codigo\Source\Modulos\Tienda web\Data\uDataModuleTiendaWeb.DFM */
+/* C:\Codigo\Source\Modulos\Tienda web\Data\uDataModuleTiendaWeb.dfm */
/* C:\Codigo\Source\Modulos\Tienda web\Data\TiendaWeb_data.res */
-/* C:\Codigo\Source\Modulos\Tienda web\Data\TiendaWeb_data.drf */
+/* c:\temp\dtf3FD.tmp */
diff --git a/Source/Modulos/Tienda web/Model/schTiendaWebClient_Intf.pas b/Source/Modulos/Tienda web/Model/schTiendaWebClient_Intf.pas
index b22061a..46d7e9a 100644
--- a/Source/Modulos/Tienda web/Model/schTiendaWebClient_Intf.pas
+++ b/Source/Modulos/Tienda web/Model/schTiendaWebClient_Intf.pas
@@ -9,16 +9,16 @@ const
{ Data table rules ids
Feel free to change them to something more human readable
but make sure they are unique in the context of your application }
- RID_osc_Customers = '{A5013516-51B7-490F-A166-BA86DCCB7900}';
- RID_GetLastID = '{CA549BDC-0D35-46D9-B336-B88EAC4CF794}';
- RID_osc_AddressBook = '{A4D63486-CEFB-4F1D-9EAE-69151070707A}';
- RID_TiendaWeb = '{1E92A367-C80B-4F16-8603-8F386C3B7BAF}';
- RID_osc_Manufacturers = '{820CA527-F7B9-4D46-B466-99966E121CAD}';
- RID_osc_Languages = '{E8D690F7-B946-4AD6-B785-2CB44C9BC3E4}';
- RID_osc_Products = '{0ED0587B-155F-4723-A231-D69F4C6812D5}';
- RID_osc_Orders = '{00A80DB4-E5FA-4C7F-A7D3-8FF0F3648DAA}';
- RID_osc_Orders_products = '{38312591-C2B9-498F-B5E5-900542AFAF4A}';
- RID_osc_Orders_status_history = '{3563463D-B3DB-4A3C-A5B8-50EAEF76D51C}';
+ RID_osc_Customers = '{7B414787-7FB3-4C7E-B5F4-D6DC724C7986}';
+ RID_GetLastID = '{EC74F663-AF44-449F-A865-D6FC7DAA2984}';
+ RID_osc_AddressBook = '{92F1B476-62B9-48D5-B7FA-08FC8A878695}';
+ RID_TiendaWeb = '{EAB775DA-7B9A-4650-A698-63F246F755B3}';
+ RID_osc_Manufacturers = '{1D5AC5D5-FA39-47F6-B015-830C5D143002}';
+ RID_osc_Languages = '{74B3F68E-6D93-4EC3-A8E0-9EB54A9ABF17}';
+ RID_osc_Products = '{06950934-0858-4CDE-A2D6-D4D6CDA7C711}';
+ RID_osc_Orders = '{9AD7AD6E-41AF-44D6-97C7-56D7B7C874F6}';
+ RID_osc_Orders_products = '{F2D861B5-937C-443B-8C4D-77DDFEED0FBF}';
+ RID_osc_Orders_status_history = '{938F6829-DC4D-4551-918A-85D8833B18BC}';
{ Data table names }
nme_osc_Customers = 'osc_Customers';
@@ -263,7 +263,7 @@ const
type
{ Iosc_Customers }
Iosc_Customers = interface(IDAStronglyTypedDataTable)
- ['{63ADAA75-4BC5-490A-945C-F4340FEB2373}']
+ ['{D7E9BFB6-3910-4AAF-A23E-EEABE59CF6DD}']
{ Property getters and setters }
function Getcustomers_idValue: Integer;
procedure Setcustomers_idValue(const aValue: Integer);
@@ -418,7 +418,7 @@ type
{ IGetLastID }
IGetLastID = interface(IDAStronglyTypedDataTable)
- ['{F770082E-4DE9-4B18-A7C1-C2E35430D952}']
+ ['{2D8C65A9-8193-46BD-BFBC-D635D547978C}']
{ Property getters and setters }
function Getlast_idValue: Integer;
procedure Setlast_idValue(const aValue: Integer);
@@ -453,7 +453,7 @@ type
{ Iosc_AddressBook }
Iosc_AddressBook = interface(IDAStronglyTypedDataTable)
- ['{DAAF0DB8-C5C6-4982-87FB-B722733B69F2}']
+ ['{904D18A9-9DE6-44BD-87CC-04AEB4722ACC}']
{ Property getters and setters }
function Getaddress_book_idValue: Integer;
procedure Setaddress_book_idValue(const aValue: Integer);
@@ -656,7 +656,7 @@ type
{ ITiendaWeb }
ITiendaWeb = interface(IDAStronglyTypedDataTable)
- ['{021BB79F-EE5C-401C-A11A-273E731E005D}']
+ ['{49EC332D-5318-4E39-BD54-95C1D08BB4F7}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@@ -787,7 +787,7 @@ type
{ Iosc_Manufacturers }
Iosc_Manufacturers = interface(IDAStronglyTypedDataTable)
- ['{D7B85180-3E14-4B33-9251-F6F119E859BA}']
+ ['{56A9B8F8-7538-47E2-8C4D-AD569CE3C226}']
{ Property getters and setters }
function Getmanufacturers_idValue: Integer;
procedure Setmanufacturers_idValue(const aValue: Integer);
@@ -885,7 +885,7 @@ type
}
{ Iosc_Languages }
Iosc_Languages = interface(IDAStronglyTypedDataTable)
- ['{130286B4-1ED6-4005-B95B-9DEA687C3D34}']
+ ['{7C625C62-43EF-4340-A8E6-EC6B4EAA299B}']
{ Property getters and setters }
function Getlanguages_idValue: Integer;
procedure Setlanguages_idValue(const aValue: Integer);
@@ -980,7 +980,7 @@ type
{ Iosc_Products }
Iosc_Products = interface(IDAStronglyTypedDataTable)
- ['{5B6328C4-C79C-4DC5-AC5C-E0276D67F585}']
+ ['{C99FB025-828E-4D74-9270-D9A2C954B6D6}']
{ Property getters and setters }
function Getproducts_idValue: Integer;
procedure Setproducts_idValue(const aValue: Integer);
@@ -1111,7 +1111,7 @@ type
{ Iosc_Orders }
Iosc_Orders = interface(IDAStronglyTypedDataTable)
- ['{58ABD9FF-8C0D-4F96-9FF9-DC20061D72F9}']
+ ['{F120AB1C-A35E-4D24-B5E9-41A325E7081B}']
{ Property getters and setters }
function Getorders_idValue: Integer;
procedure Setorders_idValue(const aValue: Integer);
@@ -1374,7 +1374,7 @@ type
{ Iosc_Orders_products }
Iosc_Orders_products = interface(IDAStronglyTypedDataTable)
- ['{FBC00CDC-A530-4A23-A7E9-9505B9D77CE2}']
+ ['{CC27855E-2D28-4432-BA5F-D3C10BA8464D}']
{ Property getters and setters }
function Getorders_products_idValue: Integer;
procedure Setorders_products_idValue(const aValue: Integer);
@@ -1517,7 +1517,7 @@ type
{ Iosc_Orders_status_history }
Iosc_Orders_status_history = interface(IDAStronglyTypedDataTable)
- ['{57012918-00A1-4389-9EEE-36916520F737}']
+ ['{0EB347F2-296B-4A89-9611-FCE05DD7516F}']
{ Property getters and setters }
function Getorders_status_history_idValue: Integer;
procedure Setorders_status_history_idValue(const aValue: Integer);
diff --git a/Source/Modulos/Tienda web/Model/schTiendaWebServer_Intf.pas b/Source/Modulos/Tienda web/Model/schTiendaWebServer_Intf.pas
index 018aa8c..4e6406e 100644
--- a/Source/Modulos/Tienda web/Model/schTiendaWebServer_Intf.pas
+++ b/Source/Modulos/Tienda web/Model/schTiendaWebServer_Intf.pas
@@ -9,21 +9,21 @@ const
{ Delta rules ids
Feel free to change them to something more human readable
but make sure they are unique in the context of your application }
- RID_osc_CustomersDelta = '{C1412566-F9D7-4EAC-92B5-46C11F1FD693}';
- RID_GetLastIDDelta = '{59E14A54-D224-4088-8DA3-227AEEC2A9D0}';
- RID_osc_AddressBookDelta = '{0C32C009-F4AE-4EB3-952A-CD06A3FB45B8}';
- RID_TiendaWebDelta = '{3B0F4F81-AC65-4E5C-B4A5-D10207B5211F}';
- RID_osc_ManufacturersDelta = '{296EFE03-394F-4B6A-9F5E-5D49F125B9C5}';
- RID_osc_LanguagesDelta = '{9F575EF3-1DDC-4E46-B628-72D5A2669321}';
- RID_osc_ProductsDelta = '{184FE447-2217-4F22-BB69-1DD6E743CE0A}';
- RID_osc_OrdersDelta = '{6C5AF919-342A-4E96-AA97-99B06F4BBFBB}';
- RID_osc_Orders_productsDelta = '{4E6BBA89-53D6-4B91-8D4B-BC9E4B169CDD}';
- RID_osc_Orders_status_historyDelta = '{44219788-0AD2-4D35-AE03-653AF9E78717}';
+ RID_osc_CustomersDelta = '{231389E5-387B-485F-92BA-6A9D5A04B8C5}';
+ RID_GetLastIDDelta = '{297778AF-EA70-49C4-87B8-3A1872EB6864}';
+ RID_osc_AddressBookDelta = '{CA6AD7D9-BC5B-4928-8DF8-F2C4A41B1869}';
+ RID_TiendaWebDelta = '{F5C7B2A1-0B48-4C7D-B895-076D5824FFD5}';
+ RID_osc_ManufacturersDelta = '{6FF380D1-E143-4870-947A-581AAF9E9CF6}';
+ RID_osc_LanguagesDelta = '{CA42020F-6544-4029-BC84-51234090EB8F}';
+ RID_osc_ProductsDelta = '{6F4677C4-BDEF-43E8-BEE8-425AA74C13F5}';
+ RID_osc_OrdersDelta = '{E80B38F6-D0AA-4B8C-8110-427D492DDC37}';
+ RID_osc_Orders_productsDelta = '{2FCFD487-854D-420B-9586-E8F12C08F95D}';
+ RID_osc_Orders_status_historyDelta = '{8632B188-5EA5-4866-BFE4-90CB15C3A42B}';
type
{ Iosc_CustomersDelta }
Iosc_CustomersDelta = interface(Iosc_Customers)
- ['{C1412566-F9D7-4EAC-92B5-46C11F1FD693}']
+ ['{231389E5-387B-485F-92BA-6A9D5A04B8C5}']
{ Property getters and setters }
function GetOldcustomers_idValue : Integer;
function GetOldcustomers_firstnameValue : String;
@@ -177,7 +177,7 @@ type
{ IGetLastIDDelta }
IGetLastIDDelta = interface(IGetLastID)
- ['{59E14A54-D224-4088-8DA3-227AEEC2A9D0}']
+ ['{297778AF-EA70-49C4-87B8-3A1872EB6864}']
{ Property getters and setters }
function GetOldlast_idValue : Integer;
@@ -211,7 +211,7 @@ type
{ Iosc_AddressBookDelta }
Iosc_AddressBookDelta = interface(Iosc_AddressBook)
- ['{0C32C009-F4AE-4EB3-952A-CD06A3FB45B8}']
+ ['{CA6AD7D9-BC5B-4928-8DF8-F2C4A41B1869}']
{ Property getters and setters }
function GetOldaddress_book_idValue : Integer;
function GetOldcustomers_idValue : Integer;
@@ -413,7 +413,7 @@ type
{ ITiendaWebDelta }
ITiendaWebDelta = interface(ITiendaWeb)
- ['{3B0F4F81-AC65-4E5C-B4A5-D10207B5211F}']
+ ['{F5C7B2A1-0B48-4C7D-B895-076D5824FFD5}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldID_EMPRESAValue : Integer;
@@ -543,7 +543,7 @@ type
{ Iosc_ManufacturersDelta }
Iosc_ManufacturersDelta = interface(Iosc_Manufacturers)
- ['{296EFE03-394F-4B6A-9F5E-5D49F125B9C5}']
+ ['{6FF380D1-E143-4870-947A-581AAF9E9CF6}']
{ Property getters and setters }
function GetOldmanufacturers_idValue : Integer;
function GetOldmanufacturers_nameValue : String;
@@ -637,7 +637,7 @@ type
{ Iosc_LanguagesDelta }
Iosc_LanguagesDelta = interface(Iosc_Languages)
- ['{9F575EF3-1DDC-4E46-B628-72D5A2669321}']
+ ['{CA42020F-6544-4029-BC84-51234090EB8F}']
{ Property getters and setters }
function GetOldlanguages_idValue : Integer;
function GetOldnameValue : String;
@@ -731,7 +731,7 @@ type
{ Iosc_ProductsDelta }
Iosc_ProductsDelta = interface(Iosc_Products)
- ['{184FE447-2217-4F22-BB69-1DD6E743CE0A}']
+ ['{6F4677C4-BDEF-43E8-BEE8-425AA74C13F5}']
{ Property getters and setters }
function GetOldproducts_idValue : Integer;
function GetOldproducts_nameValue : String;
@@ -862,7 +862,7 @@ type
{ Iosc_OrdersDelta }
Iosc_OrdersDelta = interface(Iosc_Orders)
- ['{6C5AF919-342A-4E96-AA97-99B06F4BBFBB}']
+ ['{E80B38F6-D0AA-4B8C-8110-427D492DDC37}']
{ Property getters and setters }
function GetOldorders_idValue : Integer;
function GetOldrdx_orders_id_localValue : Integer;
@@ -1125,7 +1125,7 @@ type
{ Iosc_Orders_productsDelta }
Iosc_Orders_productsDelta = interface(Iosc_Orders_products)
- ['{4E6BBA89-53D6-4B91-8D4B-BC9E4B169CDD}']
+ ['{2FCFD487-854D-420B-9586-E8F12C08F95D}']
{ Property getters and setters }
function GetOldorders_products_idValue : Integer;
function GetOldorders_idValue : Integer;
@@ -1267,7 +1267,7 @@ type
{ Iosc_Orders_status_historyDelta }
Iosc_Orders_status_historyDelta = interface(Iosc_Orders_status_history)
- ['{44219788-0AD2-4D35-AE03-653AF9E78717}']
+ ['{8632B188-5EA5-4866-BFE4-90CB15C3A42B}']
{ Property getters and setters }
function GetOldorders_status_history_idValue : Integer;
function GetOldorders_idValue : Integer;
diff --git a/Source/Modulos/Tienda web/Servidor/srvTiendaWeb_Impl.dfm b/Source/Modulos/Tienda web/Servidor/srvTiendaWeb_Impl.dfm
index 8a2842e..6635baa 100644
--- a/Source/Modulos/Tienda web/Servidor/srvTiendaWeb_Impl.dfm
+++ b/Source/Modulos/Tienda web/Servidor/srvTiendaWeb_Impl.dfm
@@ -1207,7 +1207,7 @@ object srvTiendaWeb: TsrvTiendaWeb
Params = <
item
Name = 'ID'
- DataType = datInteger
+ DataType = datAutoInc
Value = ''
ParamType = daptInput
end
@@ -1397,7 +1397,7 @@ object srvTiendaWeb: TsrvTiendaWeb
end
item
Name = 'customers_default_address_id'
- DataType = datInteger
+ DataType = datAutoInc
Value = ''
ParamType = daptInput
end
@@ -1551,7 +1551,7 @@ object srvTiendaWeb: TsrvTiendaWeb
Params = <
item
Name = 'customers_info_id'
- DataType = datInteger
+ DataType = datAutoInc
Value = ''
ParamType = daptInput
end
@@ -1628,7 +1628,7 @@ object srvTiendaWeb: TsrvTiendaWeb
Params = <
item
Name = 'customers_id'
- DataType = datInteger
+ DataType = datAutoInc
Value = ''
ParamType = daptInput
end
@@ -2304,7 +2304,7 @@ object srvTiendaWeb: TsrvTiendaWeb
Params = <
item
Name = 'products_id'
- DataType = datInteger
+ DataType = datAutoInc
Value = ''
ParamType = daptInput
end
diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES
index a45acf6..ab1926c 100644
Binary files a/Source/Servidor/FactuGES_Server.RES and b/Source/Servidor/FactuGES_Server.RES differ
diff --git a/Source/Servidor/FactuGES_Server.dpr b/Source/Servidor/FactuGES_Server.dpr
index d64eff2..05eb226 100644
--- a/Source/Servidor/FactuGES_Server.dpr
+++ b/Source/Servidor/FactuGES_Server.dpr
@@ -160,10 +160,10 @@ uses
uBizOscProductServer in '..\Modulos\Tienda web\Model\uBizOscProductServer.pas',
uTiendaWebUtils in 'Utiles\uTiendaWebUtils.pas',
uConexionOSC in 'Configuracion\uConexionOSC.pas' {frConexionOSC: TFrame},
- schTiendaWebClient_Intf in '..\Modulos\Tienda web\Model\schTiendaWebClient_Intf.pas',
- schTiendaWebServer_Intf in '..\Modulos\Tienda web\Model\schTiendaWebServer_Intf.pas',
schFacturasProveedorClient_Intf in '..\Modulos\Facturas de proveedor\Model\schFacturasProveedorClient_Intf.pas',
- schFacturasProveedorServer_Intf in '..\Modulos\Facturas de proveedor\Model\schFacturasProveedorServer_Intf.pas';
+ schFacturasProveedorServer_Intf in '..\Modulos\Facturas de proveedor\Model\schFacturasProveedorServer_Intf.pas',
+ schTiendaWebClient_Intf in '..\Modulos\Tienda web\Model\schTiendaWebClient_Intf.pas',
+ schTiendaWebServer_Intf in '..\Modulos\Tienda web\Model\schTiendaWebServer_Intf.pas';
{$R *.res}
{$R ..\Servicios\RODLFile.res}
diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj
index e879b12..37dfcf2 100644
--- a/Source/Servidor/FactuGES_Server.dproj
+++ b/Source/Servidor/FactuGES_Server.dproj
@@ -35,7 +35,7 @@
Delphi.Personality
- FalseTrueFalse/standaloneTrueFalse1830FalseFalseFalseFalseFalse308212521.8.3.01.8.3.0jueves, 24 de junio de 2010 13:44
+ FalseTrueFalse/standaloneTrueFalse4000FalseFalseFalseFalseFalse308212524.0.0.04.0.0.0jueves, 23 de septiembre de 2010 16:45
ExpressPrinting System by Developer Express Inc.
FactuGES_Server.dpr
diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc
index 78ec4d4..9581252 100644
--- a/Source/Servidor/FactuGES_Server.rc
+++ b/Source/Servidor/FactuGES_Server.rc
@@ -1,7 +1,7 @@
MAINICON ICON "C:\Codigo\Resources\Iconos\Servidor.ico"
1 VERSIONINFO
-FILEVERSION 1,8,3,0
-PRODUCTVERSION 1,8,3,0
+FILEVERSION 4,0,0,0
+PRODUCTVERSION 4,0,0,0
FILEFLAGSMASK 0x3FL
FILEFLAGS 0x00L
FILEOS 0x40004L
@@ -12,9 +12,9 @@ BEGIN
BEGIN
BLOCK "0C0A04E4"
BEGIN
- VALUE "FileVersion", "1.8.3.0\0"
- VALUE "ProductVersion", "1.8.3.0\0"
- VALUE "CompileDate", "jueves, 23 de septiembre de 2010 12:05\0"
+ VALUE "FileVersion", "4.0.0.0\0"
+ VALUE "ProductVersion", "4.0.0.0\0"
+ VALUE "CompileDate", "viernes, 24 de septiembre de 2010 11:21\0"
END
END
BLOCK "VarFileInfo"