vignesh/dolibarr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Automated merge from 18.0 to 19.0 by tool pullmerge.sh

Browse source
This commit is contained in:
Laurent Destailleur 2026-03-21 11:53:46 +01:00
commit 9db3575e9f
4 changed files with 1411 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1394
build/makepack-dolibarr.php Executable file
View file

File diff suppressed because it is too large Load diff

20
htdocs/core/lib/geturl.lib.php
View file

@ -28,15 +28,15 @@
* - you can set MAIN_SECURITY_ANTI_SSRF_SERVER_IP to set static ip of server
* - common local lookup ips like 127.*.*.* are automatically added
*
* @param string $url URL to call.
* @param string $postorget 'POST', 'GET', 'HEAD', 'PUT', 'PUTALREADYFORMATED', 'POSTALREADYFORMATED', 'DELETE'
* @param string $param Parameters of URL (x=value1&y=value2) or may be a formated content with $postorget='PUTALREADYFORMATED'
* @param integer $followlocation 0=Do not follow, 1=Follow location.
* @param string[] $addheaders Array of string to add into header. Example: ('Accept: application/xrds+xml', ....)
* @param string[] $allowedschemes List of schemes that are allowed ('http' + 'https' only by default)
* @param int $localurl 0=Only external URL are possible, 1=Only local URL, 2=Both external and local URL are allowed.
* @param int $ssl_verifypeer -1=Auto (no ssl check on dev, check on prod), 0=No ssl check, 1=Always ssl check
* @return array Returns an associative array containing the response from the server array('http_code'=>http response code, 'content'=>response, 'curl_error_no'=>errno, 'curl_error_msg'=>errmsg...)
* @param string $url URL to call.
* @param string $postorget 'POST', 'GET', 'HEAD', 'PUT', 'PUTALREADYFORMATED', 'POSTALREADYFORMATED', 'DELETE'
* @param string|array<mixed,mixed> $param Parameters of URL (x=value1&y=value2) or may be a formated content with $postorget='PUTALREADYFORMATED'
* @param integer $followlocation 0=Do not follow, 1=Follow location.
* @param string[] $addheaders Array of string to add into header. Example: ('Accept: application/xrds+xml', ....)
* @param string[] $allowedschemes List of schemes that are allowed ('http' + 'https' only by default)
* @param int $localurl 0=Only external URL are possible, 1=Only local URL, 2=Both external and local URL are allowed.
* @param int $ssl_verifypeer -1=Auto (no ssl check on dev, check on prod), 0=No ssl check, 1=Always ssl check
* @return array Returns an associative array containing the response from the server array('content'=>response, 'curl_error_no'=>errno, 'curl_error_msg'=>errmsg...)
*/
function getURLContent($url, $postorget = 'GET', $param = '', $followlocation = 1, $addheaders = array(), $allowedschemes = array('http', 'https'), $localurl = 0, $ssl_verifypeer = -1)
{
@ -48,7 +48,7 @@ function getURLContent($url, $postorget = 'GET', $param = '', $followlocation =
$PROXY_USER = !getDolGlobalString('MAIN_PROXY_USER') ? 0 : $conf->global->MAIN_PROXY_USER;
$PROXY_PASS = !getDolGlobalString('MAIN_PROXY_PASS') ? 0 : $conf->global->MAIN_PROXY_PASS;
dol_syslog("getURLContent postorget=".$postorget." URL=".$url." param=".$param);
dol_syslog("getURLContent postorget=".$postorget." URL=".$url." json_encode(param)=".json_encode($param));
//setting the curl parameters.
$ch = curl_init();

9
htdocs/fourn/class/fournisseur.facture-rec.class.php
View file

@ -715,7 +715,7 @@ class FactureFournisseurRec extends CommonInvoice
*/
$sql = 'SELECT l.rowid,';
$sql .= ' l.fk_facture_fourn, l.fk_parent_line, l.fk_product, l.ref, l.label, l.description,';
$sql .= ' l.fk_facture_fourn, l.fk_parent_line, l.fk_product, l.ref as ref_supplier, l.label, l.description,';
$sql .= ' l.pu_ht, l.pu_ttc, l.qty, l.remise_percent, l.fk_remise_except, l.vat_src_code, l.tva_tx,';
$sql .= ' l.localtax1_tx, l.localtax2_tx, l.localtax1_type, l.localtax2_type,';
$sql .= ' l.total_ht, l.total_tva, l.total_ttc, total_localtax1, total_localtax2,';
@ -744,10 +744,15 @@ class FactureFournisseurRec extends CommonInvoice
$line->fk_facture_fourn = $objp->fk_facture_fourn;
$line->fk_parent = $objp->fk_parent_line;
$line->fk_product = $objp->fk_product;
$line->ref_supplier = $objp->ref;
$line->ref = $objp->product_ref; // Ref of product
$line->product_ref = $objp->product_ref; // Ref of product
$line->product_label = $objp->product_label;
$line->product_desc = $objp->product_desc;
$line->ref_supplier = $objp->ref_supplier;
$line->label = $objp->label;
$line->description = $objp->description;
$line->pu_ht = $objp->pu_ht;
$line->subprice = $objp->pu_ht;
$line->pu_ttc = $objp->pu_ttc;
$line->qty = $objp->qty;
$line->remise_percent = $objp->remise_percent;

8
htdocs/fourn/facture/card-rec.php
View file

@ -1572,14 +1572,6 @@ if ($action == 'create') {
$object->fetch_lines();
// Show object lines
if (!empty($object->lines)) {
$canchangeproduct = 1;
// To set ref for getNomURL function
foreach ($object->lines as $line) {
$line->ref = $line->label;
$line->product_label = $line->label;
$line->subprice = $line->pu_ht;
}
global $canchangeproduct;
$canchangeproduct = 0;