diff --git a/htdocs/html.formproduct.class.php b/htdocs/html.formproduct.class.php index e71a11c2477..77ae6cd2ec7 100644 --- a/htdocs/html.formproduct.class.php +++ b/htdocs/html.formproduct.class.php @@ -159,13 +159,6 @@ class FormProduct $measuring_units[-6] = $langs->trans("VolumeUnitcm3"); $measuring_units[-9] = $langs->trans("VolumeUnitmm3"); } - else if ($measuring_style == 'volume_liquide') - { - $measuring_units[0] = $langs->trans("VolumeUnitm3"); - $measuring_units[-3] = $langs->trans("VolumeUnitl"); - $measuring_units[-4] = $langs->trans("VolumeUnitdl"); - $measuring_units[-6] = $langs->trans("VolumeUnitml"); - } print ''; if ($adddefault) print ''.$langs->trans("Default").''; diff --git a/htdocs/langs/fr_FR/other.lang b/htdocs/langs/fr_FR/other.lang index 48be61010de..3952c1d5810 100644 --- a/htdocs/langs/fr_FR/other.lang +++ b/htdocs/langs/fr_FR/other.lang @@ -87,15 +87,11 @@ SurfaceUnitdm2=dm2 SurfaceUnitcm2=cm2 SurfaceUnitmm2=mm2 Volume=Volume -Volume_liquide=Volume liquide -VolumeUnitl=l -VolumeUnitdl=dl -VolumeUnitml=ml TotalVolume=Volume total VolumeUnitm3=m3 -VolumeUnitdm3=dm3 -VolumeUnitcm3=cm3 -VolumeUnitmm3=mm3 +VolumeUnitdm3=dm3 (l) +VolumeUnitcm3=cm3 (ml) +VolumeUnitmm3=mm3 (µl) Size=taille SizeUnitm=m SizeUnitdm=dm diff --git a/htdocs/lib/product.lib.php b/htdocs/lib/product.lib.php index 7079f12b024..a00694e4015 100644 --- a/htdocs/lib/product.lib.php +++ b/htdocs/lib/product.lib.php @@ -315,13 +315,6 @@ function measuring_units_string($unit,$measuring_style='') $measuring_units[-6] = $langs->trans("VolumeUnitcm3"); $measuring_units[-9] = $langs->trans("VolumeUnitmm3"); } - else if ($measuring_style == 'volume_liquide') - { - $measuring_units[0] = $langs->trans("VolumeUnitm3"); - $measuring_units[-3] = $langs->trans("VolumeUnitl"); - $measuring_units[-4] = $langs->trans("VolumeUnitdl"); - $measuring_units[-6] = $langs->trans("VolumeUnitml"); - } return $measuring_units[$unit]; } diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index b33e4fb369a..fea457f2b5d 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -155,8 +155,6 @@ if ($_POST["action"] == 'add' && ($user->rights->produit->creer || $user->rights $product->surface_units = $_POST["surface_units"]; $product->volume = $_POST["volume"]; $product->volume_units = $_POST["volume_units"]; - $product->volume_liquide = $_POST["volume_liquide"]; - $product->volume_l_units = $_POST["volume_l_units"]; $product->finished = $_POST["finished"]; $product->hidden = $_POST["hidden"]=='yes'?1:0; @@ -225,8 +223,6 @@ if ($_POST["action"] == 'update' && ($user->rights->produit->creer || $user->rig $product->surface_units = $_POST["surface_units"]; $product->volume = $_POST["volume"]; $product->volume_units = $_POST["volume_units"]; - $product->volume_liquide = $_POST["volume_liquide"]; - $product->volume_l_units = $_POST["volume_l_units"]; $product->finished = $_POST["finished"]; $product->hidden = $_POST["hidden"]=='yes'?1:0; @@ -763,11 +759,6 @@ if ($_GET["action"] == 'create' && ($user->rights->produit->creer || $user->righ print ''; print $formproduct->select_measuring_units("volume_units","volume"); print ''; - // Volume liquide - print ''.$langs->trans("Volume_liquide").''; - print ''; - print $formproduct->select_measuring_units("volume_l_units","volume_liquide"); - print ''; } // Hidden @@ -1024,17 +1015,6 @@ if ($_GET["id"] || $_GET["ref"]) print ' '; } print "\n"; - // Volume liquide - print ''.$langs->trans("Volume_liquide").''; - if ($product->volume_liquide != '') - { - print $product->volume_liquide." ".measuring_units_string($product->volume_l_units,"volume_liquide"); - } - else - { - print ' '; - } - print "\n"; } // Hidden @@ -1180,11 +1160,6 @@ if ($_GET["id"] || $_GET["ref"]) print ' '; print $formproduct->select_measuring_units("volume_units", "volume", $product->volume_units); print ''; - // Volume liquide - print ''.$langs->trans("Volume_liquide").''; - print ' '; - print $formproduct->select_measuring_units("volume_l_units", "volume_liquide", $product->volume_l_units); - print ''; } // Hidden diff --git a/htdocs/product/product.class.php b/htdocs/product/product.class.php index 42d492156b7..d54a68e04c9 100644 --- a/htdocs/product/product.class.php +++ b/htdocs/product/product.class.php @@ -94,8 +94,6 @@ class Product extends CommonObject var $surface_units; var $volume; var $volume_units; - var $volume_liquide; - var $volume_l_units; var $accountancy_code_buy; var $accountancy_code_sell; @@ -411,8 +409,6 @@ class Product extends CommonObject $this->surface_units = trim($this->surface_units); $this->volume = price2num($this->volume); $this->volume_units = trim($this->volume_units); - $this->volume_liquide = price2num($this->volume_liquide); - $this->volume_l_units = trim($this->volume_l_units); if (empty($this->tva_tx)) $this->tva_tx = 0; if (empty($this->finished)) $this->finished = 0; if (empty($this->hidden)) $this->hidden = 0; @@ -434,8 +430,6 @@ class Product extends CommonObject $sql.= ",surface_units = " . ($this->surface_units!='' ? "'".$this->surface_units."'" : 'null'); $sql.= ",volume = " . ($this->volume!='' ? "'".$this->volume."'" : 'null'); $sql.= ",volume_units = " . ($this->volume_units!='' ? "'".$this->volume_units."'" : 'null'); - $sql .= ",volume_liquide = " . ($this->volume_liquide!='' ? "'".$this->volume_liquide."'" : 'null'); - $sql .= ",volume_l_units = " . ($this->volume_l_units!='' ? "'".$this->volume_l_units."'" : 'null'); $sql.= ",seuil_stock_alerte = " . ((isset($this->seuil_stock_alerte) && $this->seuil_stock_alerte != '') ? "'".$this->seuil_stock_alerte."'" : "null"); $sql.= ",description = '" . addslashes($this->description) ."'"; $sql.= ",note = '" . addslashes($this->note) ."'"; @@ -932,7 +926,7 @@ class Product extends CommonObject $sql = "SELECT rowid, ref, label, description, note, price, price_ttc,"; $sql.= " price_min, price_min_ttc, price_base_type, tva_tx, envente,"; $sql.= " fk_product_type, duration, seuil_stock_alerte, canvas,"; - $sql.= " weight, weight_units, length, length_units, surface, surface_units, volume, volume_units, volume_liquide, volume_l_units, barcode, fk_barcode_type, finished, hidden,"; + $sql.= " weight, weight_units, length, length_units, surface, surface_units, volume, volume_units, barcode, fk_barcode_type, finished, hidden,"; $sql.= " accountancy_code_buy, accountancy_code_sell, stock, pmp,"; $sql.= " import_key"; $sql.= " FROM ".MAIN_DB_PREFIX."product"; @@ -973,8 +967,6 @@ class Product extends CommonObject $this->surface_units = $result["surface_units"]; $this->volume = $result["volume"]; $this->volume_units = $result["volume_units"]; - $this->volume_liquide = $result["volume_liquide"]; - $this->volume_l_units = $result["volume_l_units"]; $this->barcode = $result["barcode"]; $this->barcode_type = $result["fk_barcode_type"];