Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

FIX Debug calculation of the delay of purchase order

Browse Source
This commit is contained in:
Laurent Destailleur 2024-09-29 05:32:27 +02:00
parent fd9acdb94a
commit c5607dd212
5 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
htdocs/fourn/class/fournisseur.commande.class.php
View File

@ -3420,16 +3420,17 @@ class CommandeFournisseur extends CommonOrder
return '';
}
$obj = new ProductFournisseur($this->db);
$tmpproductfourn = new ProductFournisseur($this->db);
$nb = 0;
foreach ($this->lines as $line) {
if ($line->fk_product > 0) {
$idp = $obj->find_min_price_product_fournisseur($line->fk_product, $line->qty);
if ($idp) {
$obj->fetch($idp);
if ($obj->delivery_time_days > $nb) {
$nb = $obj->delivery_time_days;
// Load delivery_time_days, return id into product_fournisseur_price
$idp = $tmpproductfourn->find_min_price_product_fournisseur($line->fk_product, $line->qty, $this->thirdparty->id);
if ($idp > 0) {
//$tmpproductfourn->fetch_product_fournisseur_price($idp);
if ($tmpproductfourn->delivery_time_days > $nb) {
$nb = $tmpproductfourn->delivery_time_days;
}
}
}
@ -3438,7 +3439,7 @@ class CommandeFournisseur extends CommonOrder
if ($nb === 0) {
return '';
} else {
return $nb.' '.$langs->trans('Days');
return $nb.' '.$langs->trans('days');
}
}

19
htdocs/fourn/class/fournisseur.product.class.php
View File

@ -678,7 +678,7 @@ class ProductFournisseur extends Product
/**
* Loads the price information of a provider
*
* @param int $rowid Line id
* @param int $rowid Line id in product_fournisseur_price
* @param int $ignore_expression Ignores the math expression for calculating price and uses the db value instead
* @return int Return integer < 0 if KO, 0 if OK but not found, > 0 if OK
*/
@ -890,15 +890,13 @@ class ProductFournisseur extends Product
*
* @param int $prodid Product id
* @param float $qty Minimum quantity
* @param int $socid get min price for specific supplier
* @param int $socid Load min price for this specific supplier
* @return int Return integer <0 if KO, 0=Not found of no product id provided, >0 if OK
* @see list_product_fournisseur_price()
*/
public function find_min_price_product_fournisseur($prodid, $qty = 0, $socid = 0)
{
// phpcs:enable
global $conf;
if (empty($prodid)) {
dol_syslog("Warning function find_min_price_product_fournisseur were called with prodid empty. May be a bug.", LOG_WARNING);
return 0;
@ -926,8 +924,8 @@ class ProductFournisseur extends Product
$sql = "SELECT s.nom as supplier_name, s.rowid as fourn_id,";
$sql .= " pfp.rowid as product_fourn_price_id, pfp.ref_fourn,";
$sql .= " pfp.price, pfp.quantity, pfp.unitprice, pfp.tva_tx, pfp.charges,";
$sql .= " pfp.remise, pfp.remise_percent, pfp.fk_supplier_price_expression, pfp.delivery_time_days";
$sql .= " ,pfp.multicurrency_price, pfp.multicurrency_unitprice, pfp.multicurrency_tx, pfp.fk_multicurrency, pfp.multicurrency_code";
$sql .= " pfp.remise, pfp.remise_percent, pfp.fk_supplier_price_expression, pfp.delivery_time_days,";
$sql .= " pfp.multicurrency_price, pfp.multicurrency_unitprice, pfp.multicurrency_tx, pfp.fk_multicurrency, pfp.multicurrency_code";
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."product_fournisseur_price as pfp";
$sql .= " WHERE s.entity IN (".getEntity('societe').")";
$sql .= " AND pfp.entity IN (".getEntity('productsupplierprice').")";
@ -984,7 +982,9 @@ class ProductFournisseur extends Product
$fourn_unitprice_with_discount = (float) $fourn_unitprice * (1 - $record["remise_percent"] / 100);
}
}
if ($fourn_unitprice < $min || $min == -1) {
$this->id = $prodid;
$this->product_fourn_price_id = $record["product_fourn_price_id"];
$this->ref_supplier = $record["ref_fourn"];
$this->ref_fourn = $record["ref_fourn"]; // deprecated
@ -997,23 +997,24 @@ class ProductFournisseur extends Product
$this->fourn_unitprice_with_discount = $fourn_unitprice_with_discount;
$this->fourn_charges = $record["charges"]; // when getDolGlobalString('PRODUCT_CHARGES') is set
$this->fourn_tva_tx = $record["tva_tx"];
$this->fourn_id = $record["fourn_id"];
$this->fourn_id = $record["fourn_id"]; // thirdparty id
$this->fourn_name = $record["supplier_name"];
$this->delivery_time_days = $record["delivery_time_days"];
$this->fk_supplier_price_expression = $record["fk_supplier_price_expression"];
$this->id = $prodid;
$this->fourn_multicurrency_price = $record["multicurrency_price"];
$this->fourn_multicurrency_unitprice = $record["multicurrency_unitprice"];
$this->fourn_multicurrency_tx = $record["multicurrency_tx"];
$this->fourn_multicurrency_id = $record["fk_multicurrency"];
$this->fourn_multicurrency_code = $record["multicurrency_code"];
$min = $fourn_unitprice;
}
}
}
$this->db->free($resql);
return 1;
return $this->product_fourn_price_id;
} else {
$this->error = $this->db->error();
return -1;

2
htdocs/langs/en_US/suppliers.lang
View File

@ -36,7 +36,7 @@ ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b
SentToSuppliers=Sent to vendors
ListOfSupplierOrders=List of purchase orders
MenuOrdersSupplierToBill=Purchase orders to invoice
NbDaysToDelivery=Delivery delay (days)
NbDaysToDelivery=Delivery delay
DescNbDaysToDelivery=The longest delivery delay of the products from this order
SupplierReputation=Vendor reputation
ReferenceReputation=Reference reputation

2
htdocs/langs/fr_FR/suppliers.lang
View File

@ -36,7 +36,7 @@ ListOfSupplierProductForSupplier=Liste des produits et prix du fournisseur <b>%s
SentToSuppliers=Envoyés aux fournisseurs
ListOfSupplierOrders=Liste des commandes fournisseurs
MenuOrdersSupplierToBill=Commandes fournisseurs en facture
NbDaysToDelivery=Délai de livraison en jours
NbDaysToDelivery=Délai de livraison
DescNbDaysToDelivery=Le plus gros délai de livraison parmi les produits de cette commande
SupplierReputation=Réputation du fournisseur
ReferenceReputation=Réputation

2
htdocs/product/price_suppliers.php
View File

@ -792,7 +792,7 @@ if ($id > 0 || $ref) {
// Delivery delay in days
print '<tr>';
print '<td>'.$langs->trans('NbDaysToDelivery').'</td>';
print '<td><input class="flat" name="delivery_time_days" size="4" value="'.($rowid ? $object->delivery_time_days : '').'">&nbsp;'.$langs->trans('days').'</td>';
print '<td><input class="flat" name="delivery_time_days" size="4" value="'.(GETPOSTISSET('delivery_time_days') ? GETPOST('delivery_time_days') : ($rowid ? $object->delivery_time_days : '')).'">&nbsp;'.$langs->trans('days').'</td>';
print '</tr>';
// Reputation