JIRA: 385, 384

core/class/html.formactions.class.php

@@ -241,7 +241,7 @@ class FormActions
 				$url .= ($projectid > 0 ? '&projectid='.((int) $projectid) : '').($taskid > 0 ? '&taskid='.((int) $taskid) : '');
 				$url .= ($assignedtouser > 0 ? '&assignedtouser='.$assignedtouser : '');
 				$url .= '&backtopage='.urlencode($urlbacktopage);
-				$newcardbutton .= dolGetButtonTitle($langs->trans("AddEvent"), '', 'fa fa-plus-circle', $url);
+				//$newcardbutton .= dolGetButtonTitle($langs->trans("AddEvent"), '', 'fa fa-plus-circle', $url);
 			}
 
 			print '<!-- formactions->showactions -->'."\n";

core/modules/modAgenda.class.php

@@ -262,7 +262,7 @@ class modAgenda extends DolibarrModules
 			'user'=>2
 		);
 		$r++;
-		$this->menu[$r] = array(
+		/* $this->menu[$r] = array(
 			'fk_menu'=>'r=3',
 			'type'=>'left',
 			'titre'=>'MenuToDoMyActions',
@@ -316,10 +316,10 @@ class modAgenda extends DolibarrModules
 			'enabled'=>'$user->rights->agenda->allactions->read',
 			'target'=>'',
 			'user'=>2
-		);
+		); */
 
 		// List
-		$r++;
+		//$r++;
 		$this->menu[$r] = array(
 			'fk_menu'=>'r=1',
 			'type'=>'left',
@@ -334,7 +334,7 @@ class modAgenda extends DolibarrModules
 			'user'=>2
 		);
 		$r++;
-		$this->menu[$r] = array(
+		/* $this->menu[$r] = array(
 			'fk_menu'=>'r=8',
 			'type'=>'left',
 			'titre'=>'MenuToDoMyActions',
@@ -389,7 +389,7 @@ class modAgenda extends DolibarrModules
 			'target'=>'',
 			'user'=>2
 		);
-		$r++;
+		$r++; */
 		// Reports
 		$this->menu[$r] = array(
 			'fk_menu'=>'r=1',

custom/financialreport/class/helper.class.php

@@ -931,6 +931,16 @@ class HelperUserInvoice
     {
         $usersOfGroup = [];
         $date = date('Y-m-d', strtotime("-20 day", strtotime($date)));
+        /* $sqlLastLogin = "SELECT date_creation FROM llx_settlements_usernaplo WHERE status = 1 AND user_id = $id ORDER BY date_creation DESC LIMIT 1";
+        $result = $db->query($sqlLastLogin);
+        if($db->num_rows($result) > 0){
+            while($row = $db->fetch_object($result)){
+                $date = $row->date_creation;
+            }
+        }else{
+            $date = date('Y-m-d', strtotime("-20 day", dol_now()));
+            $date = $date . ' 00:00:00';
+        } */
         $dateNow = date('Y-m-d H:i:s', dol_now());
         if (isset($id)) {
             $sql = "SELECT un.user_id, u.firstname as firstname, u.lastname as lastname, u.login as login FROM " . MAIN_DB_PREFIX . "settlements_usernaplo AS un