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

Fix replenish wasn't caring about supplier price min quantity #9561

Browse Source
This commit is contained in:
Maxime Kohlhaas 2018-10-28 10:25:56 +01:00
parent d800fe9256
commit 46d3bec104
2 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/langs/en_US/errors.lang
View File

@ -88,6 +88,7 @@ ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the
ErrorSpecialCharNotAllowedForField=Special characters are not allowed for field "%s" ErrorSpecialCharNotAllowedForField=Special characters are not allowed for field "%s"
ErrorNumRefModel=A reference exists into database (%s) and is not compatible with this numbering rule. Remove record or renamed reference to activate this module. ErrorNumRefModel=A reference exists into database (%s) and is not compatible with this numbering rule. Remove record or renamed reference to activate this module.
ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this supplier ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this supplier
ErrorOrdersNotCreatedQtyTooLow=Some orders haven't been created beacuse of too low quantity
ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete. ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
ErrorBadMask=Error on mask ErrorBadMask=Error on mask
ErrorBadMaskFailedToLocatePosOfSequence=Error, mask without sequence number ErrorBadMaskFailedToLocatePosOfSequence=Error, mask without sequence number

45
htdocs/product/stock/replenish.php
View File

@ -106,12 +106,15 @@ if ($action == 'order' && isset($_POST['valid']))
{ {
$linecount = GETPOST('linecount', 'int'); $linecount = GETPOST('linecount', 'int');
$box = 0; $box = 0;
$errorQty = 0;
unset($_POST['linecount']); unset($_POST['linecount']);
if ($linecount > 0) if ($linecount > 0)
{ {
$db->begin(); $db->begin();
$suppliers = array(); $suppliers = array();
require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.product.class.php';
$productsupplier = new ProductFournisseur($db);
for ($i = 0; $i < $linecount; $i++) for ($i = 0; $i < $linecount; $i++)
{ {
if (GETPOST('choose' . $i, 'alpha') === 'on' && GETPOST('fourn' . $i, 'int') > 0) if (GETPOST('choose' . $i, 'alpha') === 'on' && GETPOST('fourn' . $i, 'int') > 0)
@ -121,13 +124,9 @@ if ($action == 'order' && isset($_POST['valid']))
$supplierpriceid = GETPOST('fourn'.$i, 'int'); $supplierpriceid = GETPOST('fourn'.$i, 'int');
//get all the parameters needed to create a line //get all the parameters needed to create a line
$qty = GETPOST('tobuy'.$i, 'int'); $qty = GETPOST('tobuy'.$i, 'int');
//$desc = GETPOST('desc'.$i, 'alpha'); $idprod=$productsupplier->get_buyprice($supplierpriceid, $qty);
$sql = 'SELECT fk_product, fk_soc, ref_fourn'; $res=$productsupplier->fetch($idprod);
$sql .= ', tva_tx, unitprice, remise_percent FROM '; if ($res && $idprod > 0)
$sql .= MAIN_DB_PREFIX . 'product_fournisseur_price';
$sql .= ' WHERE rowid = ' . $supplierpriceid;
$resql = $db->query($sql);
if ($resql && $db->num_rows($resql) > 0)
{ {
if ($qty) if ($qty)
{ {
@ -135,33 +134,37 @@ if ($action == 'order' && isset($_POST['valid']))
$obj = $db->fetch_object($resql); $obj = $db->fetch_object($resql);
$line = new CommandeFournisseurLigne($db); $line = new CommandeFournisseurLigne($db);
$line->qty = $qty; $line->qty = $qty;
$line->fk_product = $obj->fk_product; $line->fk_product = $idprod;
$product = new Product($db); //$product = new Product($db);
$product->fetch($obj->fk_product); //$product->fetch($obj->fk_product);
if (! empty($conf->global->MAIN_MULTILANGS)) if (! empty($conf->global->MAIN_MULTILANGS))
{ {
$product->getMultiLangs(); $productsupplier->getMultiLangs();
} }
$line->desc = $product->description; $line->desc = $productsupplier->description;
if (! empty($conf->global->MAIN_MULTILANGS)) if (! empty($conf->global->MAIN_MULTILANGS))
{ {
// TODO Get desc in language of thirdparty // TODO Get desc in language of thirdparty
} }
$line->tva_tx = $obj->tva_tx; $line->tva_tx = $productsupplier->vatrate_supplier;
$line->subprice = $obj->unitprice; $line->subprice = $productsupplier->fourn_pu;
$line->total_ht = $obj->unitprice * $qty; $line->total_ht = $productsupplier->fourn_pu * $qty;
$tva = $line->tva_tx / 100; $tva = $line->tva_tx / 100;
$line->total_tva = $line->total_ht * $tva; $line->total_tva = $line->total_ht * $tva;
$line->total_ttc = $line->total_ht + $line->total_tva; $line->total_ttc = $line->total_ht + $line->total_tva;
$line->remise_percent = $obj->remise_percent; $line->remise_percent = $productsupplier->remise_percent;
$line->ref_fourn = $obj->ref_fourn; $line->ref_fourn = $productsupplier->ref_supplier;
$line->type = $product->type; $line->type = $productsupplier->type;
$line->fk_unit = $product->fk_unit; $line->fk_unit = $productsupplier->fk_unit;
$suppliers[$obj->fk_soc]['lines'][] = $line; $suppliers[$productsupplier->fourn_socid]['lines'][] = $line;
} }
} }
elseif ($idprod == -1)
{
$errorQty++;
}
else else
{ {
$error=$db->lasterror(); $error=$db->lasterror();
@ -242,6 +245,8 @@ if ($action == 'order' && isset($_POST['valid']))
} }
} }
if($errorQty) setEventMessages($langs->trans('ErrorOrdersNotCreatedQtyTooLow'), null, 'warnings');
if (! $fail && $id) if (! $fail && $id)
{ {
$db->commit(); $db->commit();