Se arreglan cosas para que todos los vendedores sean de la tienda rivas y no falle, se revisan referencias y se arregla consumo de logs

git-svn-id: https://192.168.0.254/svn/Proyectos.Acana_FactuGES2/trunk@594 f4e31baf-9722-1c47-927c-6f952f962d4b

Database/scripts/factuges.sql

@@ -8404,10 +8404,14 @@ begin
 /*           F_RTFTOTEXT(F_RTFTOTEXT(pre.CONCEPTO)) as CONCEPTO,*/
       pre.CONCEPTO,
       pre.cantidad,
+/*      
       case
       when (pre.descuento <> 0) then (pre.importe_total / pre.cantidad)
-      else pre.importe_unidad
+      else 
-      end as importe_unidad,
+      pre.importe_unidad
+      end as
+*/      
+      importe_unidad,
       pre.descuento, pre.importe_porte,
       pre.importe_total, coalesce(pre.visible, 1), coalesce(pre.visible2, 1)
       from presupuestos_cliente_detalles pre
@@ -8443,10 +8447,13 @@ begin
 /*           F_RTFTOTEXT(F_RTFTOTEXT(pre.CONCEPTO)) as CONCEPTO,*/
       pre.CONCEPTO,
       pre.cantidad,
+/*      
       case
       when (pre.descuento <> 0) then (pre.importe_total / pre.cantidad)
       else pre.importe_unidad
-      end as importe_unidad,
+      end as 
+*/      
+      importe_unidad,
       pre.descuento, pre.importe_porte,
       pre.importe_total, coalesce(pre.visible, 1), coalesce(pre.visible2, 1)
       from contratos_cliente_detalles pre

Source/Base/Base.dproj

@@ -50,6 +50,20 @@
       
       
       
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
       
       <Excluded_Packages Name="$(BDS)\Bin\dclintraweb_90_100.bpl">VCL for the Web Design Package for CodeGear RAD Studio</Excluded_Packages>
       <Excluded_Packages Name="$(BDS)\bin\dclwebsnap100.bpl">CodeGear WebSnap Components</Excluded_Packages>

Source/Base/uDMBase.pas

@@ -69,11 +69,13 @@ begin
   ALogFileName := ALogFileName + PathDelim + 'Rodax Software' + PathDelim + 'FactuGES' + PathDelim;
   if SysUtils.ForceDirectories(ALogFileName) then
   begin
+{SE COMENTA PORQUE TUESTA LA PARTE CLIENTE SI SE DESEA ARREGLAR ACTUALIZAR LAS JV de tecsitel
       JvLogFile.Active := False;
       JvLogFile.FileName := ALogFileName + 'ClientLog.txt';
       JvLogFile.AutoSave := True;
       JvLogFile.Active := True;
       JvLogFile.Clear;
+}      
   end
   else
     raise Exception.Create('Error al crear directorio para Log: ' + IntToStr(GetLastError));
@@ -141,12 +143,14 @@ end;
 
 procedure TdmBase.EscribirLog(const AMensaje: String);
 begin
+{
   FEscribirLog.Acquire;
   try
     JvLogFile.Add(AMensaje);
   finally
     FEscribirLog.Release;
   end;
+}
 end;
 
 end.

Source/Modulos/Contactos/Views/uEditorClientes.dfm

@@ -52,7 +52,7 @@ inherited fEditorClientes: TfEditorClientes
     Width = 786
     ExplicitWidth = 786
     inherited tbxMain: TTBXToolbar
-      ExplicitWidth = 632
+      ExplicitWidth = 775
     end
     inherited tbxMenu: TTBXToolbar
       ExplicitWidth = 786
@@ -84,6 +84,8 @@ inherited fEditorClientes: TfEditorClientes
     inherited cxGrid: TcxGrid
       Width = 786
       Height = 270
+      ExplicitWidth = 786
+      ExplicitHeight = 270
       inherited cxGridView: TcxGridDBTableView
         DataController.Summary.FooterSummaryItems = <
           item
@@ -102,15 +104,27 @@ inherited fEditorClientes: TfEditorClientes
           Width = 786
           ExplicitWidth = 786
           inherited txtFiltroTodo: TcxTextEdit
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
             ExplicitWidth = 457
             Width = 457
           end
           inherited edtFechaIniFiltro: TcxDateEdit
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
             ExplicitWidth = 240
             Width = 240
           end
           inherited edtFechaFinFiltro: TcxDateEdit
             Left = 564
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
             ExplicitLeft = 564
             ExplicitWidth = 121
             Width = 121

Source/Modulos/Relaciones/Contratos de cliente - Albaranes de cliente/uGenerarAlbaranesCliUtils.pas

@@ -72,7 +72,7 @@ begin
   AAlbaran.IVA := AContrato.IVA;
   AAlbaran.IMPORTE_IVA := AContrato.IMPORTE_IVA;
   AAlbaran.IMPORTE_TOTAL := AContrato.IMPORTE_TOTAL;
-  AAlbaran.ID_TIENDA := AContrato.ID_TIENDA;
+//  AAlbaran.ID_TIENDA := AContrato.ID_TIENDA;
   AAlbaran.ID_CONTRATO := AContrato.ID;
   
 //  AAlbaran.ID_VENDEDOR := AContrato.ID_VENDEDOR;

Source/Modulos/Relaciones/Contratos de cliente - Facturas de cliente/uGenerarFacturasCliUtils.pas

@@ -66,7 +66,7 @@ begin
   AFactura.IVA := AContrato.IVA;
   AFactura.IMPORTE_IVA := AContrato.IMPORTE_IVA;
   AFactura.IMPORTE_TOTAL := AContrato.IMPORTE_TOTAL;
-  AFactura.ID_TIENDA := AContrato.ID_TIENDA;
+//  AFactura.ID_TIENDA := AContrato.ID_TIENDA;
 //  AFactura.ID_VENDEDOR := AContrato.ID_VENDEDOR;
   AFactura.RECARGO_EQUIVALENCIA := AContrato.RECARGO_EQUIVALENCIA;
   AFactura.RE := AContrato.RE;

Source/Modulos/Relaciones/Presupuestos de cliente - Contratos de cliente/uGenerarContratosCliUtils.pas

@@ -118,7 +118,7 @@ begin
   AContrato.IVA := APresupuesto.IVA;
   AContrato.IMPORTE_IVA := APresupuesto.IMPORTE_IVA;
   AContrato.IMPORTE_TOTAL := APresupuesto.IMPORTE_TOTAL;
-  AContrato.ID_TIENDA := APresupuesto.ID_TIENDA;
+//  AContrato.ID_TIENDA := APresupuesto.ID_TIENDA;
   AContrato.ID_VENDEDOR := APresupuesto.ID_VENDEDOR;
   AContrato.RECARGO_EQUIVALENCIA := APresupuesto.RECARGO_EQUIVALENCIA;
   AContrato.RE := APresupuesto.RE;

Source/Modulos/Remesas de proveedor/Data/uDataModuleRemesasProveedor.dfm

@@ -14,12 +14,12 @@ inherited DataModuleRemesasProveedor: TDataModuleRemesasProveedor
     Top = 84
   end
   object rda_RemesasProveedor: TDARemoteDataAdapter
+    DataStreamer = Bin2DataStreamer
     GetSchemaCall.RemoteService = RORemoteService
     GetDataCall.RemoteService = RORemoteService
     UpdateDataCall.RemoteService = RORemoteService
     GetScriptsCall.RemoteService = RORemoteService
     RemoteService = RORemoteService
-    DataStreamer = Bin2DataStreamer
     Left = 49
     Top = 151
   end
@@ -147,8 +147,6 @@ inherited DataModuleRemesasProveedor: TDataModuleRemesasProveedor
     Params = <>
     StreamingOptions = [soDisableEventsWhileStreaming]
     RemoteDataAdapter = rda_RemesasProveedor
-    DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
-    MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
     LogicalName = 'RemesasProveedor'
     IndexDefs = <>
     Left = 192

Source/Modulos/Remesas de proveedor/Servidor/srvRemesasProveedor_Impl.dfm

@@ -473,7 +473,6 @@ object srvRemesasProveedor: TsrvRemesasProveedor
     InsertCommandName = 'Insert_RemesasProveedor'
     DeleteCommandName = 'Delete_RemesasProveedor'
     UpdateCommandName = 'Update_RemesasProveedor'
-    RefreshDatasetName = 'RemesasProveedor_Refresh'
     ReferencedDataset = 'RemesasProveedor'
     ProcessorOptions = [poPrepareCommands]
     UpdateMode = updWhereKeyOnly

Source/Servidor/FactuGES_Server.dproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ProjectGuid>{ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1}</ProjectGuid>
@@ -29,6 +29,11 @@
     <Borland.ProjectType />
     <BorlandProject>
 <BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">5</VersionInfo><VersionInfo Name="Release">8</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.5.8.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES (Servidor)</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.5.8.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">miércoles, 13 de noviembre de 2013 13:58</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
+      
+      
+      
+      
+      
       <Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl">File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found</Excluded_Packages>
     </Excluded_Packages><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
   </ProjectExtensions>

Source/Servidor/FactuGES_Server.rc

@@ -16,7 +16,7 @@ BEGIN
               VALUE "FileVersion", "2.5.8.0\0"
               VALUE "ProductName", "FactuGES (Servidor)\0"
               VALUE "ProductVersion", "2.5.8.0\0"
-              VALUE "CompileDate", "viernes, 23 de mayo de 2014 20:16\0"
+              VALUE "CompileDate", "lunes, 26 de mayo de 2014 18:31\0"
          END
     END
     BLOCK "VarFileInfo"

Source/Servidor/uDataModuleServer.pas

@@ -174,11 +174,13 @@ procedure TdmServer.IniciarLog;
 begin
   FEscribirLog := TCriticalSection.Create;
 
+{SE COMENTA PORQUE TUESTA LA PARTE SERVIDORA SI SE DESEA ARREGLAR ACTUALIZAR LAS JV de tecsitel
   JvLogFile1.Active := False;
   JvLogFile1.FileName := ExtractFilePath(Application.ExeName) + 'ServerLog.txt';
   JvLogFile1.AutoSave := True;
   JvLogFile1.Active := True;
   JvLogFile1.Clear;
+}  
 end;
 
 procedure TdmServer.DataModuleCreate(Sender: TObject);
@@ -278,12 +280,14 @@ end;
 
 procedure TdmServer.EscribirLog(const AMensaje: String);
 begin
+{
   FEscribirLog.Acquire;
   try
     JvLogFile1.Add(AMensaje);
   finally
     FEscribirLog.Release;
   end;
+}  
 end;
 
 procedure TdmServer.RefrescarConexion;