Merge pull request #11925 from OPEN-DSI/new-product-fournisseurs-units

NEW add units fields in buying price tab of product card
This commit is contained in:
Laurent Destailleur 2019-09-27 14:17:52 +02:00 committed by GitHub
commit acfceecda5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -491,6 +491,13 @@ if ($id > 0 || $ref)
{ {
print '<input class="flat" name="qty" size="5" value="'.$quantity.'">'; print '<input class="flat" name="qty" size="5" value="'.$quantity.'">';
} }
// Units
if ($conf->global->PRODUCT_USE_UNITS) {
$unit = $object->getLabelOfUnit();
if ($unit !== '') {
print '&nbsp;&nbsp;' . $langs->trans($unit);
}
}
print '</td></tr>'; print '</td></tr>';
// Vat rate // Vat rate
@ -778,11 +785,11 @@ SCRIPT;
$num = count($product_fourn_list); $num = count($product_fourn_list);
if (($num + ($offset * $limit)) < $nbtotalofrecords) $num++; if (($num + ($offset * $limit)) < $nbtotalofrecords) $num++;
print_barre_liste($langs->trans('SupplierPrices'), $page, $_SERVER ['PHP_SELF'], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_accountancy.png', 0, '', '', $limit, 1); print_barre_liste($langs->trans('SupplierPrices'), $page, $_SERVER['PHP_SELF'], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_accountancy.png', 0, '', '', $limit, 1);
// Suppliers list title // Suppliers list title
print '<div class="div-table-responsive">'; print '<div class="div-table-responsive">';
print '<table class="noborder" width="100%">'; print '<table class="liste" width="100%">';
$param="&id=".$object->id; $param="&id=".$object->id;
@ -851,6 +858,13 @@ SCRIPT;
// Quantity // Quantity
print '<td class="right">'; print '<td class="right">';
print $productfourn->fourn_qty; print $productfourn->fourn_qty;
// Units
if ($conf->global->PRODUCT_USE_UNITS) {
$unit = $object->getLabelOfUnit();
if ($unit !== '') {
print '&nbsp;&nbsp;' . $langs->trans($unit);
}
}
print '</td>'; print '</td>';
// VAT rate // VAT rate