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

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2022-11-13 00:22:48 +01:00
commit 8ca7e6744e
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/boxes/box_services_contracts.php
View File

@ -124,7 +124,7 @@ class box_services_contracts extends ModeleBoxes
$contractlinestatic->label = $objp->label;
$contractlinestatic->description = $objp->description;
$contractlinestatic->type = $objp->type;
$contractlinestatic->product_id = $objp->product_id;
$contractlinestatic->fk_product = $objp->product_id;
$contractlinestatic->product_ref = $objp->product_ref;
$contractlinestatic->product_type = $objp->product_type;
$contractlinestatic->statut = $objp->contractline_status;

2
htdocs/core/class/extrafields.class.php
View File

@ -1942,7 +1942,7 @@ class ExtraFields
* Return HTML string to print separator extrafield
*
* @param string $key Key of attribute
* @param string $object Object
* @param object $object Object
* @param int $colspan Value of colspan to use (it must includes the first column with title)
* @param string $display_type "card" for form display, "line" for document line display (extrafields on propal line, order line, etc...)
* @param string $mode Show output ('view') or input ('create' or 'edit') for extrafield

8
htdocs/core/class/html.form.class.php
View File

@ -3679,7 +3679,11 @@ class Form
$sql .= " AND p.tobuy = 1";
$sql .= " AND s.fournisseur = 1";
$sql .= " AND p.rowid = ".((int) $productid);
$sql .= " ORDER BY s.nom, pfp.ref_fourn DESC";
if (empty($conf->global->PRODUCT_BEST_SUPPLIER_PRICE_PRESELECTED)) {
$sql .= " ORDER BY s.nom, pfp.ref_fourn DESC";
} else {
$sql .= " ORDER BY pfp.unitprice ASC";
}
dol_syslog(get_class($this)."::select_product_fourn_price", LOG_DEBUG);
$result = $this->db->query($sql);
@ -3701,7 +3705,7 @@ class Form
$opt = '<option value="'.$objp->idprodfournprice.'"';
//if there is only one supplier, preselect it
if ($num == 1 || ($selected_supplier > 0 && $objp->fk_soc == $selected_supplier)) {
if ($num == 1 || ($selected_supplier > 0 && $objp->fk_soc == $selected_supplier) || ($i == 0 && !empty($conf->global->PRODUCT_BEST_SUPPLIER_PRICE_PRESELECTED))) {
$opt .= ' selected';
}
$opt .= '>'.$objp->name.' - '.$objp->ref_fourn.' - ';