[Globalstore-code] [Global-Store Repo] Global Store branch, master, updated. 6e804f5ae69310fc78af1139b9514f9a36dc1d28

[Rómulo Rodríg. <elt...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Global Store".

The branch, master has been updated
       via  6e804f5ae69310fc78af1139b9514f9a36dc1d28 (commit)
      from  b946ddf057f7af31e2b7550da38dcf1909a1908d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6e804f5ae69310fc78af1139b9514f9a36dc1d28
Author: Rómulo Rodriguez <rod...@gm...>
Date:   Fri Jan 23 18:37:53 2015 -0430

    Retorno al estado Anterior
    
    Signed-off-by: Rómulo Rodriguez <rod...@gm...>

diff --git a/src/php/protocol/userp.class.php b/src/php/protocol/userp.class.php
index 5fb8d30..f1b0743 100644
--- a/src/php/protocol/userp.class.php
+++ b/src/php/protocol/userp.class.php
@@ -151,12 +151,11 @@ class Userp implements Protocol {
 						SET fk_sr=2, su_employee=false
 						WHERE su_nick='".$_GET["id"]."'";
 						$sql1="
-						update employe
-						SET Emp_fired_Date=(current_date)
-						WHERE su_nick='".$_GET["id"]."'";
+						DELETE FROM employee
+						WHERE fk_sys_user='".$_GET["id"]."'";
 						try {
 							Core::$db->query($sql);
-							//Core::$db->query($sql1);
+							Core::$db->query($sql1);
 							Log::sysLog(5004,"su_nick=".$_GET["id"].",razon=".$_GET["text"],$_GET["id"],Core::$user->getNick());
 							ProtocolController::createPacket($_GET["pid"],true,true);
 						} catch (Exception $e) {

-----------------------------------------------------------------------

Summary of changes:
 src/php/protocol/userp.class.php |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Global Store