|
@@ -323,11 +323,11 @@ if (empty($reshook)) {
|
|
|
$prod_batch->find(0, '', '', $line->batch, $line->fk_warehouse);
|
|
|
$mouvP = new MouvementStock($db);
|
|
|
$mouvP->origin = $invoice;
|
|
|
- $mouvP->livraison($user, $line->fk_product, $conf->global->$constantforkey, $line->qty, $line->price, 'TakePOS', '', '', '', $prod_batch->batch, $line->batch);
|
|
|
+ $mouvP->livraison($user, $line->fk_product, getDolGlobalString($constantforkey), $line->qty, $line->price, 'TakePOS', '', '', '', $prod_batch->batch, $line->batch);
|
|
|
} else {
|
|
|
$mouvP = new MouvementStock($db);
|
|
|
$mouvP->origin = $invoice;
|
|
|
- $mouvP->livraison($user, $line->fk_product, $conf->global->$constantforkey, $line->qty, $line->price, 'TakePOS', '', '', '');
|
|
|
+ $mouvP->livraison($user, $line->fk_product, getDolGlobalString($constantforkey), $line->qty, $line->price, 'TakePOS', '', '', '');
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -534,6 +534,7 @@ if (empty($reshook)) {
|
|
|
if (!empty($batch)) {
|
|
|
$action="setbatch";
|
|
|
} else {
|
|
|
+ $nbofsuggested = 0;
|
|
|
$prod->load_stock('warehouseopen');
|
|
|
$constantforkey = 'CASHDESK_ID_WAREHOUSE'.$_SESSION["takeposterminal"];
|
|
|
if ($prod->stock_warehouse[getDolGlobalString($constantforkey)]->detail_batch!="") {
|
|
@@ -561,7 +562,7 @@ if (empty($reshook)) {
|
|
|
print '<td class="left">';
|
|
|
$staticwarehouse = new Entrepot($db);
|
|
|
if ($warehouse_id > 0) {
|
|
|
- $staticwarehouse->fetch($conf->global->$constantforkey);
|
|
|
+ $staticwarehouse->fetch(getDolGlobalString($constantforkey));
|
|
|
}
|
|
|
$detail = '';
|
|
|
$detail .= $langs->trans("LotSerial").': '.$dbatch->batch;
|