@@ -1163,7 +1163,9 @@ discard block |
||
| 1163 | 1163 | print '<td class="left">'.$langs->trans("Warehouse").' / '.$langs->trans("Batch").' ('.$langs->trans("Stock").')</td>'; |
| 1164 | 1164 | } |
| 1165 | 1165 | } |
| 1166 | - if (!empty($conf->global->SHIPPING_DISPLAY_STOCK_ENTRY_DATE)) print '<td class="left">'.$langs->trans('StockEntryDate').'</td>'; |
|
| 1166 | + if (!empty($conf->global->SHIPPING_DISPLAY_STOCK_ENTRY_DATE)) { |
|
| 1167 | + print '<td class="left">'.$langs->trans('StockEntryDate').'</td>'; |
|
| 1168 | + } |
|
| 1167 | 1169 | print "</tr>\n"; |
| 1168 | 1170 | } |
| 1169 | 1171 | |
@@ -1352,7 +1354,10 @@ discard block |
||
| 1352 | 1354 | } |
| 1353 | 1355 | print '</td>'; |
| 1354 | 1356 | } |
| 1355 | - if (!empty($conf->global->SHIPPING_DISPLAY_STOCK_ENTRY_DATE)) print '<td></td>'; //StockEntrydate |
|
| 1357 | + if (!empty($conf->global->SHIPPING_DISPLAY_STOCK_ENTRY_DATE)) { |
|
| 1358 | + print '<td></td>'; |
|
| 1359 | + } |
|
| 1360 | + //StockEntrydate |
|
| 1356 | 1361 | print "</tr>\n"; |
| 1357 | 1362 | |
| 1358 | 1363 | // Show subproducts of product |
@@ -1370,7 +1375,10 @@ discard block |
||
| 1370 | 1375 | <a href=\"".DOL_URL_ROOT."/product/card.php?id=".$value['id']."\">".$value['fullpath']." |
| 1371 | 1376 | </a> (".$value['nb'].")</td><td class=\"center\"> ".$value['nb_total']."</td><td> </td><td> </td> |
| 1372 | 1377 | <td class=\"center\">".$value['stock']." ".$img."</td>"; |
| 1373 | - if (!empty($conf->global->SHIPPING_DISPLAY_STOCK_ENTRY_DATE)) print '<td></td>'; //StockEntrydate |
|
| 1378 | + if (!empty($conf->global->SHIPPING_DISPLAY_STOCK_ENTRY_DATE)) { |
|
| 1379 | + print '<td></td>'; |
|
| 1380 | + } |
|
| 1381 | + //StockEntrydate |
|
| 1374 | 1382 | print "</tr>"; |
| 1375 | 1383 | } |
| 1376 | 1384 | } |
@@ -1378,7 +1386,10 @@ discard block |
||
| 1378 | 1386 | } else { |
| 1379 | 1387 | // Product need lot |
| 1380 | 1388 | print '<td></td><td></td>'; |
| 1381 | - if (!empty($conf->global->SHIPPING_DISPLAY_STOCK_ENTRY_DATE)) print '<td></td>'; //StockEntrydate |
|
| 1389 | + if (!empty($conf->global->SHIPPING_DISPLAY_STOCK_ENTRY_DATE)) { |
|
| 1390 | + print '<td></td>'; |
|
| 1391 | + } |
|
| 1392 | + //StockEntrydate |
|
| 1382 | 1393 | print '</tr>'; // end line and start a new one for lot/serial |
| 1383 | 1394 | print '<!-- Case product need lot -->'; |
| 1384 | 1395 | |
@@ -1445,7 +1456,10 @@ discard block |
||
| 1445 | 1456 | print '<td class="left">'; |
| 1446 | 1457 | print img_warning().' '.$langs->trans("NoProductToShipFoundIntoStock", $staticwarehouse->label); |
| 1447 | 1458 | print '</td>'; |
| 1448 | - if (getDolGlobalInt('SHIPPING_DISPLAY_STOCK_ENTRY_DATE')) print '<td></td>'; //StockEntrydate |
|
| 1459 | + if (getDolGlobalInt('SHIPPING_DISPLAY_STOCK_ENTRY_DATE')) { |
|
| 1460 | + print '<td></td>'; |
|
| 1461 | + } |
|
| 1462 | + //StockEntrydate |
|
| 1449 | 1463 | print '</tr>'; |
| 1450 | 1464 | } |
| 1451 | 1465 | } |
@@ -1454,7 +1468,10 @@ discard block |
||
| 1454 | 1468 | if (empty($conf->productbatch->enabled) || !$product->hasbatch()) { |
| 1455 | 1469 | print '<!-- Case warehouse not already known and product does not need lot -->'; |
| 1456 | 1470 | print '<td></td><td></td>'; |
| 1457 | - if (!empty($conf->global->SHIPPING_DISPLAY_STOCK_ENTRY_DATE)) print '<td></td>';//StockEntrydate |
|
| 1471 | + if (!empty($conf->global->SHIPPING_DISPLAY_STOCK_ENTRY_DATE)) { |
|
| 1472 | + print '<td></td>'; |
|
| 1473 | + } |
|
| 1474 | + //StockEntrydate |
|
| 1458 | 1475 | print '</tr>'."\n"; // end line and start a new one for each warehouse |
| 1459 | 1476 | |
| 1460 | 1477 | print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">'; |
@@ -1494,7 +1511,9 @@ discard block |
||
| 1494 | 1511 | $deliverableQty = min($quantityToBeDelivered, $stock); |
| 1495 | 1512 | } |
| 1496 | 1513 | |
| 1497 | - if ($deliverableQty < 0) $deliverableQty = 0; |
|
| 1514 | + if ($deliverableQty < 0) { |
|
| 1515 | + $deliverableQty = 0; |
|
| 1516 | + } |
|
| 1498 | 1517 | |
| 1499 | 1518 | $tooltip = ''; |
| 1500 | 1519 | if (!empty($alreadyQtySetted[$line->fk_product][intval($warehouse_id)])) { |
@@ -1539,7 +1558,10 @@ discard block |
||
| 1539 | 1558 | $quantityToBeDelivered = 0; |
| 1540 | 1559 | } |
| 1541 | 1560 | $subj++; |
| 1542 | - if (!empty($conf->global->SHIPPING_DISPLAY_STOCK_ENTRY_DATE)) print '<td></td>';//StockEntrydate |
|
| 1561 | + if (!empty($conf->global->SHIPPING_DISPLAY_STOCK_ENTRY_DATE)) { |
|
| 1562 | + print '<td></td>'; |
|
| 1563 | + } |
|
| 1564 | + //StockEntrydate |
|
| 1543 | 1565 | print "</tr>\n"; |
| 1544 | 1566 | } |
| 1545 | 1567 | } |
@@ -1559,7 +1581,10 @@ discard block |
||
| 1559 | 1581 | <a href=\"".DOL_URL_ROOT."/product/card.php?id=".$value['id']."\">".$value['fullpath']." |
| 1560 | 1582 | </a> (".$value['nb'].")</td><td class=\"center\"> ".$value['nb_total']."</td><td> </td><td> </td> |
| 1561 | 1583 | <td class=\"center\">".$value['stock']." ".$img."</td>"; |
| 1562 | - if (!empty($conf->global->SHIPPING_DISPLAY_STOCK_ENTRY_DATE)) print '<td></td>';//StockEntrydate |
|
| 1584 | + if (!empty($conf->global->SHIPPING_DISPLAY_STOCK_ENTRY_DATE)) { |
|
| 1585 | + print '<td></td>'; |
|
| 1586 | + } |
|
| 1587 | + //StockEntrydate |
|
| 1563 | 1588 | print "</tr>"; |
| 1564 | 1589 | } |
| 1565 | 1590 | } |
@@ -1567,7 +1592,10 @@ discard block |
||
| 1567 | 1592 | } else { |
| 1568 | 1593 | print '<!-- Case warehouse not already known and product need lot -->'; |
| 1569 | 1594 | print '<td></td><td></td>'; |
| 1570 | - if (!empty($conf->global->SHIPPING_DISPLAY_STOCK_ENTRY_DATE)) print '<td></td>';//StockEntrydate |
|
| 1595 | + if (!empty($conf->global->SHIPPING_DISPLAY_STOCK_ENTRY_DATE)) { |
|
| 1596 | + print '<td></td>'; |
|
| 1597 | + } |
|
| 1598 | + //StockEntrydate |
|
| 1571 | 1599 | print '</tr>'; // end line and start a new one for lot/serial |
| 1572 | 1600 | |
| 1573 | 1601 | $subj = 0; |
@@ -1609,7 +1637,9 @@ discard block |
||
| 1609 | 1637 | $deliverableQty = min($quantityToBeDelivered, $batchStock); |
| 1610 | 1638 | } |
| 1611 | 1639 | |
| 1612 | - if ($deliverableQty < 0) $deliverableQty = 0; |
|
| 1640 | + if ($deliverableQty < 0) { |
|
| 1641 | + $deliverableQty = 0; |
|
| 1642 | + } |
|
| 1613 | 1643 | |
| 1614 | 1644 | $inputName = 'qtyl'.$indiceAsked.'_'.$subj; |
| 1615 | 1645 | if (GETPOSTISSET($inputName)) { |
@@ -1703,7 +1733,10 @@ discard block |
||
| 1703 | 1733 | print '<span class="opacitymedium">('.$langs->trans("Service").')</span>'; |
| 1704 | 1734 | } |
| 1705 | 1735 | print '</td>'; |
| 1706 | - if (!empty($conf->global->SHIPPING_DISPLAY_STOCK_ENTRY_DATE)) print '<td></td>';//StockEntrydate |
|
| 1736 | + if (!empty($conf->global->SHIPPING_DISPLAY_STOCK_ENTRY_DATE)) { |
|
| 1737 | + print '<td></td>'; |
|
| 1738 | + } |
|
| 1739 | + //StockEntrydate |
|
| 1707 | 1740 | print '</tr>'; |
| 1708 | 1741 | } |
| 1709 | 1742 | } |
@@ -1015,7 +1015,9 @@ discard block |
||
| 1015 | 1015 | } |
| 1016 | 1016 | print '<td class="nowrap right">'.price(price2num($sous_total_debit, 'MT')).'</td>'; |
| 1017 | 1017 | print '<td class="nowrap right">'.price(price2num($sous_total_credit, 'MT')).'</td>'; |
| 1018 | - if ($colspanend > 0) print '<td colspan="'.$colspanend.'"></td>'; |
|
| 1018 | + if ($colspanend > 0) { |
|
| 1019 | + print '<td colspan="'.$colspanend.'"></td>'; |
|
| 1020 | + } |
|
| 1019 | 1021 | print '</tr>'; |
| 1020 | 1022 | // Show balance of last shown account |
| 1021 | 1023 | $balance = $sous_total_debit - $sous_total_credit; |
@@ -1032,7 +1034,9 @@ discard block |
||
| 1032 | 1034 | print price(price2num($sous_total_credit - $sous_total_debit, 'MT')); |
| 1033 | 1035 | print '</td>'; |
| 1034 | 1036 | } |
| 1035 | - if ($colspanend > 0) print '<td colspan="'.$colspanend.'"></td>'; |
|
| 1037 | + if ($colspanend > 0) { |
|
| 1038 | + print '<td colspan="'.$colspanend.'"></td>'; |
|
| 1039 | + } |
|
| 1036 | 1040 | print '</tr>'; |
| 1037 | 1041 | } |
| 1038 | 1042 | |
@@ -1303,7 +1307,9 @@ discard block |
||
| 1303 | 1307 | print '<td class="right" colspan="'.$colspan.'">'.$langs->trans("TotalForAccount").' '.$accountg.':</td>'; |
| 1304 | 1308 | print '<td class="nowrap right">'.price(price2num($sous_total_debit, 'MT')).'</td>'; |
| 1305 | 1309 | print '<td class="nowrap right">'.price(price2num($sous_total_credit, 'MT')).'</td>'; |
| 1306 | - if ($colspanend > 0) print '<td colspan="'.$colspanend.'"></td>'; |
|
| 1310 | + if ($colspanend > 0) { |
|
| 1311 | + print '<td colspan="'.$colspanend.'"></td>'; |
|
| 1312 | + } |
|
| 1307 | 1313 | print '</tr>'; |
| 1308 | 1314 | // Show balance of last shown account |
| 1309 | 1315 | $balance = $sous_total_debit - $sous_total_credit; |
@@ -1320,7 +1326,9 @@ discard block |
||
| 1320 | 1326 | print price(price2num($sous_total_credit - $sous_total_debit, 'MT')); |
| 1321 | 1327 | print '</td>'; |
| 1322 | 1328 | } |
| 1323 | - if ($colspanend > 0) print '<td colspan="'.$colspanend.'"></td>'; |
|
| 1329 | + if ($colspanend > 0) { |
|
| 1330 | + print '<td colspan="'.$colspanend.'"></td>'; |
|
| 1331 | + } |
|
| 1324 | 1332 | print '</tr>'; |
| 1325 | 1333 | } |
| 1326 | 1334 | |
@@ -682,8 +682,9 @@ discard block |
||
| 682 | 682 | $newlang = ''; |
| 683 | 683 | if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang)) { |
| 684 | 684 | $newlang = $object->thirdparty->default_lang; |
| 685 | - if (GETPOST('lang_id', 'aZ09')) |
|
| 686 | - $newlang = GETPOST('lang_id', 'aZ09'); |
|
| 685 | + if (GETPOST('lang_id', 'aZ09')) { |
|
| 686 | + $newlang = GETPOST('lang_id', 'aZ09'); |
|
| 687 | + } |
|
| 687 | 688 | } |
| 688 | 689 | if (!empty($newlang)) { |
| 689 | 690 | $outputlangs = new Translate("", $conf); |
@@ -2461,9 +2462,12 @@ discard block |
||
| 2461 | 2462 | |
| 2462 | 2463 | $parameters = array(); |
| 2463 | 2464 | $reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook |
| 2464 | - if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); |
|
| 2465 | - if (empty($reshook)) |
|
| 2466 | - $object->formAddObjectLine(1, $societe, $mysoc); |
|
| 2465 | + if ($reshook < 0) { |
|
| 2466 | + setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); |
|
| 2467 | + } |
|
| 2468 | + if (empty($reshook)) { |
|
| 2469 | + $object->formAddObjectLine(1, $societe, $mysoc); |
|
| 2470 | + } |
|
| 2467 | 2471 | } |
| 2468 | 2472 | } |
| 2469 | 2473 | print '</table>'; |