diff --git a/Build/BuildRoberto.fbl5 b/Build/BuildRoberto.fbl5 index c6cebd7e..43428c5b 100644 Binary files a/Build/BuildRoberto.fbl5 and b/Build/BuildRoberto.fbl5 differ diff --git a/Build/BuildRoberto.fbp5 b/Build/BuildRoberto.fbp5 index c35d20a1..eef5f919 100644 --- a/Build/BuildRoberto.fbp5 +++ b/Build/BuildRoberto.fbp5 @@ -17229,6 +17229,663 @@ Comments= + + + False + %modules_dcp_path% + True + + True + + False + True + False + False + True + 4194304 + False + False + False + True + %library_path% + 0 + True + 0 + 1048576 + 16384 + + True + True + %output_path% + False + + False + fa8 + True + False + %search_path% + True + True + False + False + WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE; + + False + False + True + + + + + Referencias + 0 + + Referencias + True + True + False + True + False + + 0 + False + 0 + 1000 + False + + + + 0 + + True + False + False + True + True + 0 + 1252 + 11 + Release + False + + + True + True + + False + + False + False + False + True + False + False + False + False + False + False + False + False + 3081 + + 0 + 0 + 0 + False + 0 + %source_path%\Modulos\Referencias\Model\Referencias_model.dpk + True + 0 + + + rcBorland + 1000 + + False + False + False + False + [] + False + False + + + + False + False + False + True + True + True + False + False + %package_path% + + + + False + %modules_dcp_path% + True + + True + + False + True + False + False + True + 4194304 + False + False + False + True + %library_path% + 0 + True + 0 + 1048576 + 16384 + + True + True + %output_path% + False + + False + fa8 + True + False + %search_path% + True + True + False + False + WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE; + + False + False + True + + + + + + 0 + + True + False + False + True + True + 0 + 1252 + 11 + Release + False + + + True + True + + False + + False + False + False + True + False + False + False + False + False + False + False + False + 3081 + + 0 + 0 + 0 + False + 0 + %source_path%\Modulos\Referencias\Data\Referencias_data.dpk + True + 0 + + + rcBorland + 1000 + + False + False + False + False + [] + False + False + + + + False + False + False + True + True + True + False + False + %package_path% + + + + False + %modules_dcp_path% + True + + True + + False + True + False + False + True + 4194304 + False + False + False + True + %library_path% + 0 + True + 0 + 1048576 + 16384 + + True + True + %output_path% + False + + False + fa8 + True + False + %search_path% + True + True + False + False + WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE; + + False + False + True + + + + + + 0 + + True + False + False + True + True + 0 + 1252 + 11 + Release + False + + + True + True + + False + + False + False + False + True + False + False + False + False + False + False + False + False + 3081 + + 0 + 0 + 0 + False + 0 + %source_path%\Modulos\Referencias\Controller\Referencias_controller.dpk + True + 0 + + + rcBorland + 1000 + + False + False + False + False + [] + False + False + + + + False + False + False + True + True + True + False + False + %package_path% + + + + False + %modules_dcp_path% + True + + True + + False + True + False + False + True + 4194304 + False + False + False + True + %library_path% + 0 + True + 0 + 1048576 + 16384 + + True + True + %output_path% + False + + False + fa8 + True + False + %search_path% + True + True + False + False + WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE; + + False + False + True + + + + + + 0 + + True + False + False + True + True + 0 + 1252 + 11 + Release + False + + + True + True + + False + + False + False + False + True + False + False + False + False + False + False + False + False + 3081 + + 0 + 0 + 0 + False + 0 + %source_path%\Modulos\Referencias\Views\Referencias_view.dpk + True + 0 + + + rcBorland + 1000 + + False + False + False + False + [] + False + False + + + + False + False + False + True + True + True + False + False + %package_path% + + + + False + %modules_dcp_path% + True + + True + + False + True + False + False + True + 4194304 + False + False + False + True + %library_path% + 0 + True + 0 + 1048576 + 16384 + + True + True + %output_path% + False + + False + fa8 + True + False + %search_path% + True + True + False + False + WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE; + + False + False + True + + + + + + 0 + + True + False + False + True + True + 0 + 1252 + 11 + Release + False + + + True + True + + False + + False + False + False + True + False + False + False + False + False + False + False + False + 3081 + + 0 + 0 + 0 + False + 0 + %source_path%\Modulos\Referencias\Plugin\Referencias_plugin.dpk + True + 0 + + + rcBorland + 1000 + + False + False + False + False + [] + False + False + + + + False + False + False + True + True + True + False + False + %package_path% + @@ -17337,7 +17994,7 @@ Comments= 0 %source_path%\Cliente\FactuGES.dpr True - 6 + 7 rcBorland @@ -17352,7 +18009,7 @@ Comments= False True True - %output_path% + %output_path%\Cliente False pluginsdk_d10r;guisdk_d10;dataabstract_d10;base;guibase;usuarios;contactos_plugin;empresas_plugin;empresas_controller;empresas_model;rtl False diff --git a/Database/FACTUGES.FDB b/Database/FACTUGES.FDB index 3007ad1b..70ab42ff 100644 Binary files a/Database/FACTUGES.FDB and b/Database/FACTUGES.FDB differ diff --git a/Source/Base/GUIBase/GUIBase.res b/Source/Base/GUIBase/GUIBase.res index 86c94e6a..36f26e23 100644 Binary files a/Source/Base/GUIBase/GUIBase.res and b/Source/Base/GUIBase/GUIBase.res differ diff --git a/Source/Cliente/FactuGES.bdsproj b/Source/Cliente/FactuGES.bdsproj index 89c0f63e..3eb6f2f0 100644 --- a/Source/Cliente/FactuGES.bdsproj +++ b/Source/Cliente/FactuGES.bdsproj @@ -149,7 +149,7 @@ False 2 0 - 6 + 7 0 False False @@ -162,7 +162,7 @@ Rodax Software S.L. - 2.0.6.0 + 2.0.7.0 FactuGES diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res index b6fffcb5..5564f3d9 100644 Binary files a/Source/Cliente/FactuGES.res and b/Source/Cliente/FactuGES.res differ diff --git a/Source/Modulos/Albaranes de cliente/Controller/uAlbaranesClienteController.pas b/Source/Modulos/Albaranes de cliente/Controller/uAlbaranesClienteController.pas index 1a700519..2e142150 100644 --- a/Source/Modulos/Albaranes de cliente/Controller/uAlbaranesClienteController.pas +++ b/Source/Modulos/Albaranes de cliente/Controller/uAlbaranesClienteController.pas @@ -472,9 +472,10 @@ begin try AAlbaran.USUARIO := dmUsuarios.LoginInfo.Usuario; - if Assigned(AAlbaran.Cliente) - and (AAlbaran.ID_CLIENTE <> AAlbaran.Cliente.ID) then - AAlbaran.ID_CLIENTE := AAlbaran.Cliente.ID; +// Lo quitamos temporalmente si no hay mas fallos de cambio de cliente se quita en todos los sitios +// if Assigned(AAlbaran.Cliente) +// and (AAlbaran.ID_CLIENTE <> AAlbaran.Cliente.ID) then +// AAlbaran.ID_CLIENTE := AAlbaran.Cliente.ID; Result := True; finally diff --git a/Source/Modulos/Referencias/Controller/Referencias_controller.res b/Source/Modulos/Referencias/Controller/Referencias_controller.res index 86c94e6a..36f26e23 100644 Binary files a/Source/Modulos/Referencias/Controller/Referencias_controller.res and b/Source/Modulos/Referencias/Controller/Referencias_controller.res differ diff --git a/Source/Modulos/Referencias/Data/Referencias_data.res b/Source/Modulos/Referencias/Data/Referencias_data.res index 86c94e6a..36f26e23 100644 Binary files a/Source/Modulos/Referencias/Data/Referencias_data.res and b/Source/Modulos/Referencias/Data/Referencias_data.res differ diff --git a/Source/Modulos/Referencias/Model/Referencias_model.res b/Source/Modulos/Referencias/Model/Referencias_model.res index 86c94e6a..36f26e23 100644 Binary files a/Source/Modulos/Referencias/Model/Referencias_model.res and b/Source/Modulos/Referencias/Model/Referencias_model.res differ diff --git a/Source/Modulos/Referencias/Plugin/Referencias_plugin.res b/Source/Modulos/Referencias/Plugin/Referencias_plugin.res index 86c94e6a..36f26e23 100644 Binary files a/Source/Modulos/Referencias/Plugin/Referencias_plugin.res and b/Source/Modulos/Referencias/Plugin/Referencias_plugin.res differ diff --git a/Source/Modulos/Referencias/Views/Referencias_view.res b/Source/Modulos/Referencias/Views/Referencias_view.res index 86c94e6a..36f26e23 100644 Binary files a/Source/Modulos/Referencias/Views/Referencias_view.res and b/Source/Modulos/Referencias/Views/Referencias_view.res differ diff --git a/Source/Servidor/FactuGES_Server.bdsproj b/Source/Servidor/FactuGES_Server.bdsproj index bd0141d5..dfd0f2c2 100644 --- a/Source/Servidor/FactuGES_Server.bdsproj +++ b/Source/Servidor/FactuGES_Server.bdsproj @@ -1,4 +1,4 @@ - + + + RemObjects Pascal Script - RemObjects SDK 3.0 Integration + + False -