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

Add hidden option PRODUCT_DISABLE_LENGTH and PRODUCT_DISABLE_SURFACE

Browse Source
This commit is contained in:
Laurent Destailleur 2016-02-22 13:11:46 +01:00
parent b591ba1280
commit 2a6009096d
1 changed files with 55 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
htdocs/product/card.php
View File

@ -975,15 +975,21 @@ else
print $formproduct->select_measuring_units("weight_units","weight"); print $formproduct->select_measuring_units("weight_units","weight");
print '</td></tr>'; print '</td></tr>';
// Length // Length
print '<tr><td>'.$langs->trans("Length").'</td><td colspan="3">'; if (empty($conf->global->PRODUCT_DISABLE_LENGTH))
print '<input name="size" size="4" value="'.GETPOST('size').'">'; {
print $formproduct->select_measuring_units("size_units","size"); print '<tr><td>'.$langs->trans("Length").'</td><td colspan="3">';
print '</td></tr>'; print '<input name="size" size="4" value="'.GETPOST('size').'">';
// Surface print $formproduct->select_measuring_units("size_units","size");
print '<tr><td>'.$langs->trans("Surface").'</td><td colspan="3">'; print '</td></tr>';
print '<input name="surface" size="4" value="'.GETPOST('surface').'">'; }
print $formproduct->select_measuring_units("surface_units","surface"); if (empty($conf->global->PRODUCT_DISABLE_SURFACE))
print '</td></tr>'; {
// Surface
print '<tr><td>'.$langs->trans("Surface").'</td><td colspan="3">';
print '<input name="surface" size="4" value="'.GETPOST('surface').'">';
print $formproduct->select_measuring_units("surface_units","surface");
print '</td></tr>';
}
// Volume // Volume
print '<tr><td>'.$langs->trans("Volume").'</td><td colspan="3">'; print '<tr><td>'.$langs->trans("Volume").'</td><td colspan="3">';
print '<input name="volume" size="4" value="'.GETPOST('volume').'">'; print '<input name="volume" size="4" value="'.GETPOST('volume').'">';
@ -1275,16 +1281,22 @@ else
print '<input name="weight" size="5" value="'.$object->weight.'"> '; print '<input name="weight" size="5" value="'.$object->weight.'"> ';
print $formproduct->select_measuring_units("weight_units", "weight", $object->weight_units); print $formproduct->select_measuring_units("weight_units", "weight", $object->weight_units);
print '</td></tr>'; print '</td></tr>';
// Length if (empty($conf->global->PRODUCT_DISABLE_LENGTH))
print '<tr><td>'.$langs->trans("Length").'</td><td colspan="3">'; {
print '<input name="size" size="5" value="'.$object->length.'"> '; // Length
print $formproduct->select_measuring_units("size_units", "size", $object->length_units); print '<tr><td>'.$langs->trans("Length").'</td><td colspan="3">';
print '</td></tr>'; print '<input name="size" size="5" value="'.$object->length.'"> ';
// Surface print $formproduct->select_measuring_units("size_units", "size", $object->length_units);
print '<tr><td>'.$langs->trans("Surface").'</td><td colspan="3">'; print '</td></tr>';
print '<input name="surface" size="5" value="'.$object->surface.'"> '; }
print $formproduct->select_measuring_units("surface_units", "surface", $object->surface_units); if (empty($conf->global->PRODUCT_DISABLE_SURFACE))
print '</td></tr>'; {
// Surface
print '<tr><td>'.$langs->trans("Surface").'</td><td colspan="3">';
print '<input name="surface" size="5" value="'.$object->surface.'"> ';
print $formproduct->select_measuring_units("surface_units", "surface", $object->surface_units);
print '</td></tr>';
}
// Volume // Volume
print '<tr><td>'.$langs->trans("Volume").'</td><td colspan="3">'; print '<tr><td>'.$langs->trans("Volume").'</td><td colspan="3">';
print '<input name="volume" size="5" value="'.$object->volume.'"> '; print '<input name="volume" size="5" value="'.$object->volume.'"> ';
@ -1565,28 +1577,34 @@ else
print '&nbsp;'; print '&nbsp;';
} }
print "</td></tr>\n"; print "</td></tr>\n";
// Length if (empty($conf->global->PRODUCT_DISABLE_LENGTH))
print '<tr><td>'.$langs->trans("Length").'</td><td colspan="2">';
if ($object->length != '')
{ {
print $object->length." ".measuring_units_string($object->length_units,"size"); // Length
print '<tr><td>'.$langs->trans("Length").'</td><td colspan="2">';
if ($object->length != '')
{
print $object->length." ".measuring_units_string($object->length_units,"size");
}
else
{
print '&nbsp;';
}
print "</td></tr>\n";
} }
else if (empty($conf->global->PRODUCT_DISABLE_SURFACE))
{ {
print '&nbsp;'; // Surface
print '<tr><td>'.$langs->trans("Surface").'</td><td colspan="2">';
if ($object->surface != '')
{
print $object->surface." ".measuring_units_string($object->surface_units,"surface");
}
else
{
print '&nbsp;';
}
print "</td></tr>\n";
} }
print "</td></tr>\n";
// Surface
print '<tr><td>'.$langs->trans("Surface").'</td><td colspan="2">';
if ($object->surface != '')
{
print $object->surface." ".measuring_units_string($object->surface_units,"surface");
}
else
{
print '&nbsp;';
}
print "</td></tr>\n";
// Volume // Volume
print '<tr><td>'.$langs->trans("Volume").'</td><td colspan="2">'; print '<tr><td>'.$langs->trans("Volume").'</td><td colspan="2">';
if ($object->volume != '') if ($object->volume != '')