Przeglądaj źródła

Fix regression in look and feel (if empty, we do not sho value)

Laurent Destailleur 6 lat temu
rodzic
commit
1a292839ca
2 zmienionych plików z 2 dodań i 2 usunięć
  1. 1 1
      htdocs/comm/card.php
  2. 1 1
      htdocs/societe/class/societe.class.php

+ 1 - 1
htdocs/comm/card.php

@@ -387,7 +387,7 @@ if ($object->id > 0)
 		print '<a href="'.DOL_URL_ROOT.'/comm/remise.php?id='.$object->id.'">'.img_edit($langs->trans("Modify")).'</a>';
 	}
 	print '</td></tr></table>';
-	print '</td><td>'.($object->remise_percent?'<a href="'.DOL_URL_ROOT.'/comm/remise.php?id='.$object->id.'">'.price2num($object->remise_percent).'%</a>':'').'</td>';
+	print '</td><td>'.($object->remise_percent?'<a href="'.DOL_URL_ROOT.'/comm/remise.php?id='.$object->id.'">'.$object->remise_percent.'%</a>':'').'</td>';
 	print '</tr>';
 
 	// Absolute discounts (Discounts-Drawbacks-Rebates)

+ 1 - 1
htdocs/societe/class/societe.class.php

@@ -1379,7 +1379,7 @@ class Societe extends CommonObject
 
 				$this->prefix_comm = $obj->prefix_comm;
 
-				$this->remise_percent		= $obj->remise_client;
+				$this->remise_percent		= price2num($obj->remise_client);        // 0.000000 must be 0
 				$this->remise_supplier_percent		= $obj->remise_supplier;
 				$this->mode_reglement_id 	= $obj->mode_reglement;
 				$this->cond_reglement_id 	= $obj->cond_reglement;