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

FIX phpcs nestling too high level

Browse Source
This commit is contained in:
VESSILLER 2020-02-21 12:00:16 +01:00
parent 71c9b94b22
commit ec19b2feef
1 changed files with 37 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
htdocs/compta/facture/class/facture.class.php
View File

@ -2594,7 +2594,9 @@ class Facture extends CommonInvoice
if (!is_array($resBatchList)) { if (!is_array($resBatchList)) {
$error++; $error++;
$this->error = $this->db->lasterror(); $this->error = $this->db->lasterror();
} else { }
if (!$error) {
$batchList = $resBatchList; $batchList = $resBatchList;
if (empty($batchList)) { if (empty($batchList)) {
$error++; $error++;
@ -2602,15 +2604,15 @@ class Facture extends CommonInvoice
$warehouseStatic->fetch($idwarehouse); $warehouseStatic->fetch($idwarehouse);
$this->error = $langs->trans('ErrorBatchNoFoundForProductInWarehouse', $productStatic->label, $warehouseStatic->ref); $this->error = $langs->trans('ErrorBatchNoFoundForProductInWarehouse', $productStatic->label, $warehouseStatic->ref);
dol_syslog(__METHOD__ . ' Error: ' . $langs->transnoentitiesnoconv('ErrorBatchNoFoundForProductInWarehouse', $productStatic->label, $warehouseStatic->ref), LOG_ERR); dol_syslog(__METHOD__ . ' Error: ' . $langs->transnoentitiesnoconv('ErrorBatchNoFoundForProductInWarehouse', $productStatic->label, $warehouseStatic->ref), LOG_ERR);
} else { }
foreach ($batchList as $batch) { foreach ($batchList as $batch) {
if ($batch->qty <= 0) continue; // try to decrement only batches have positive quantity first if ($batch->qty <= 0) continue; // try to decrement only batches have positive quantity first
// enough quantity in this batch // enough quantity in this batch
if ($batch->qty >= $product_qty_remain) { if ($batch->qty >= $product_qty_remain) {
$product_batch_qty = $product_qty_remain; $product_batch_qty = $product_qty_remain;
} } // not enough (take all in batch)
// not enough (take all in batch)
else { else {
$product_batch_qty = $batch->qty; $product_batch_qty = $batch->qty;
} }
@ -2626,7 +2628,7 @@ class Facture extends CommonInvoice
if ($product_qty_remain <= 0) break; if ($product_qty_remain <= 0) break;
} }
if (!$error && $product_qty_remain>0) { if (!$error && $product_qty_remain > 0) {
if ($conf->global->STOCK_ALLOW_NEGATIVE_TRANSFER) { if ($conf->global->STOCK_ALLOW_NEGATIVE_TRANSFER) {
// take in the first batch // take in the first batch
$batch = $batchList[0]; $batch = $batchList[0];
@ -2646,7 +2648,6 @@ class Facture extends CommonInvoice
} }
} }
} }
}
if (!$is_batch_line) { if (!$is_batch_line) {
$result = $mouvP->livraison($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $this->lines[$i]->subprice, $langs->trans("InvoiceValidatedInDolibarr", $num)); $result = $mouvP->livraison($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $this->lines[$i]->subprice, $langs->trans("InvoiceValidatedInDolibarr", $num));