Bladeren bron

JIRA: 389 some fixes

szollosil 1 jaar geleden
bovenliggende
commit
dff609cf58
3 gewijzigde bestanden met toevoegingen van 6 en 6 verwijderingen
  1. 1 1
      comm/action/card.php
  2. 2 2
      core/modules/modTicket.class.php
  3. 3 3
      ticket/class/ticketstats.class.php

+ 1 - 1
comm/action/card.php

@@ -2434,7 +2434,7 @@ if ($id > 0) {
 		if (!empty($object->fk_element) && !empty($object->elementtype) && !in_array($object->elementtype, array('societe', 'contact', 'project'))) {
 			include_once DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php';
 			print '<tr><td>' . $langs->trans("LinkedObject") . '</td>';
-			$link = ownDolGetElementUrl($object->fk_element, $object->elementtype, 1);
+			//$link = ownDolGetElementUrl($object->fk_element, $object->elementtype, 1);
 			print '<td>';
 			if (empty($link)) {
 				print '<span class="opacitymedium">' . $langs->trans("ObjectDeleted") . '</span>';

+ 2 - 2
core/modules/modTicket.class.php

@@ -292,7 +292,7 @@ class modTicket extends DolibarrModules
 			'user' => 0);
 		$r++;
 
-		/* $this->menu[$r] = array('fk_menu' => 'fk_mainmenu=ticket,fk_leftmenu=ticket',
+		$this->menu[$r] = array('fk_menu' => 'fk_mainmenu=ticket,fk_leftmenu=ticket',
 			'type' => 'left',
 			'titre' => 'Statistics',
 			'mainmenu' => 'ticket',
@@ -303,7 +303,7 @@ class modTicket extends DolibarrModules
 			'perms' => '$user->rights->ticket->read',
 			'target' => '',
 			'user' => 0);
-		$r++; */
+		$r++;
 
 		$this->menu[$r] = array('fk_menu' => 'fk_mainmenu=ticket,fk_leftmenu=ticket',
 			'type' => 'left',

+ 3 - 3
ticket/class/ticketstats.class.php

@@ -118,7 +118,7 @@ class TicketStats extends Stats
 	 */
 	public function getAmountByMonth($year, $format = 0)
 	{
-		$sql = "SELECT date_format(datec,'%m') as dm, sum(".$this->field.")";
+		$sql = "SELECT date_format(datec,'%m') as dm, sum(".$this->field."::numeric)";
 		$sql .= " FROM ".$this->from;
 		$sql .= " WHERE date_format(datec,'%Y') = '".$this->db->escape($year)."'";
 		$sql .= " AND ".$this->where;
@@ -138,7 +138,7 @@ class TicketStats extends Stats
 	 */
 	public function getAverageByMonth($year)
 	{
-		$sql = "SELECT date_format(datec,'%m') as dm, avg(".$this->field.")";
+		$sql = "SELECT date_format(datec,'%m') as dm, avg(".$this->field."::numeric)";
 		$sql .= " FROM ".$this->from;
 		$sql .= " WHERE date_format(datec,'%Y') = '".$this->db->escape($year)."'";
 		$sql .= " AND ".$this->where;
@@ -155,7 +155,7 @@ class TicketStats extends Stats
 	 */
 	public function getAllByYear()
 	{
-		$sql = "SELECT date_format(datec,'%Y') as year, count(*) as nb, sum(".$this->field.") as total, avg(".$this->field.") as avg";
+		$sql = "SELECT date_format(datec,'%Y') as year, count(*) as nb, sum(".$this->field."::numeric) as total, avg(".$this->field."::numeric) as avg";
 		$sql .= " FROM ".$this->from;
 		$sql .= " WHERE ".$this->where;
 		$sql .= " GROUP BY year";