lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add volume unit and measure within products

Browse Source
This commit is contained in:
Philippe Grand 2010-03-22 13:32:55 +00:00
parent 5fe215cf40
commit 435ef3594a
3 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/html.formproduct.class.php
View File

@ -159,6 +159,13 @@ 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 '<select class="flat" name="'.$name.'">';
if ($adddefault) print '<option value="0">'.$langs->trans("Default").'</option>';

4
htdocs/langs/fr_FR/other.lang
View File

@ -87,6 +87,10 @@ 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

10
htdocs/product.class.php
View File

@ -94,6 +94,8 @@ 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;
@ -409,6 +411,8 @@ 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;
@ -430,6 +434,8 @@ 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) ."'";
@ -926,7 +932,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, barcode, fk_barcode_type, finished, hidden,";
$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.= " accountancy_code_buy, accountancy_code_sell, stock, pmp,";
$sql.= " import_key";
$sql.= " FROM ".MAIN_DB_PREFIX."product";
@ -967,6 +973,8 @@ 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"];