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

Merge pull request #14743 from cfoellmann/minor-fix-bydates

Browse Source 
fix for broken table on dispatch when hiding sellby/eatby dates
This commit is contained in:
Laurent Destailleur 2020-09-16 00:53:03 +02:00 committed by GitHub
commit 81d71589d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/fourn/commande/dispatch.php
View File

@ -923,6 +923,9 @@ if ($id > 0 || !empty($ref)) {
print '<td colspan="3">&nbsp</td>'; // Supplier ref + Qty ordered + qty already dispatched
} else {
$type = 'dispatch';
$colspan = 7;
$colspan = (!empty($conf->global->PRODUCT_DISABLE_EATBY)) ? --$colspan : $colspan;
$colspan = (!empty($conf->global->PRODUCT_DISABLE_SELLBY)) ? --$colspan : $colspan;
print '<td class="right">';
print '</td>'; // Qty to dispatch
print '<td>';
@ -949,7 +952,7 @@ if ($id > 0 || !empty($ref)) {
print '</tr>';
print '<tr class="oddeven" name="'.$type.$suffix.'">';
print '<td colspan="7">';
print '<td colspan="'.$colspan.'">';
print '<input name="fk_commandefourndet'.$suffix.'" type="hidden" value="'.$objp->rowid.'">';
print '<input name="product'.$suffix.'" type="hidden" value="'.$objp->fk_product.'">';
@ -1086,7 +1089,7 @@ if ($id > 0 || !empty($ref)) {
var fk_default_warehouse = $("option:selected", this).val();
$("select[name^=entrepot_]").val(fk_default_warehouse).change();
});
jQuery("#autoreset").click(function() {';
$i = 0;
while ($i < $nbproduct) {