diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 6f2cbcd1955..97c26954bf7 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -3892,7 +3892,7 @@ class Form
 	 *      @param	int		$showempty		Add a nempty line
 	 * 		@return	string                  HTML select
 	 */
-	public function selectUnits($selected = '', $htmlname = 'units', $showempty = 0)
+	public function selectUnits($selected = '', $htmlname = 'units', $showempty = 0, $unit_type = false)
 	{
 		global $langs;
 
@@ -3902,6 +3902,9 @@ class Form
 
 		$sql = 'SELECT rowid, label, code from '.MAIN_DB_PREFIX.'c_units';
 		$sql .= ' WHERE active > 0';
+		if(!empty($unit_type)){
+			$sql .= ' AND unit_type = "'.$this->db->escape($unit_type).'" ';
+		}
 
 		$resql = $this->db->query($sql);
 		if ($resql && $this->db->num_rows($resql) > 0)
diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php
index bc6b87a3353..4546cb7d089 100644
--- a/htdocs/core/tpl/objectline_edit.tpl.php
+++ b/htdocs/core/tpl/objectline_edit.tpl.php
@@ -191,9 +191,20 @@ $coldisplay++;
 	<?php
 	if (!empty($conf->global->PRODUCT_USE_UNITS))
 	{
+		$unit_type = false;
+		// limit unit select to unit type
+		if(!empty($line->fk_unit) && empty($conf->global->MAIN_EDIT_LINE_ALLOW_ALL_UNIT_TYPE)){
+			if(!class_exists('CUnits')) include_once DOL_DOCUMENT_ROOT . '/core/class/cunits.class.php';
+			$cUnit = new CUnits($line->db);
+			if($cUnit->fetch($line->fk_unit) > 0){
+				if(!empty($cUnit->unit_type)){
+					$unit_type = $cUnit->unit_type;
+				}
+			}
+		}
 		$coldisplay++;
 		print '<td class="left">';
-		print $form->selectUnits($line->fk_unit, "units");
+		print $form->selectUnits($line->fk_unit, "units", 0, $unit_type);
 		print '</td>';
 	}
 	?>