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

ci

Browse source
This commit is contained in:
Laurent Destailleur 2026-05-22 08:41:28 +02:00
parent 97f51c1bc7
commit f17f5bcdd4
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
htdocs/ai/tools/thirdparty.class.php
View file

@ -25,6 +25,7 @@
require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
/**
* Class ToolThirdParty
*
@ -214,7 +215,7 @@ class ToolThirdParty extends McpTool
* - type: 'customer', 'prospect', 'supplier'
* - limit: Limit results (default 5)
* @param int $count If set to 1, returns only the count of results.
* @return array{error:string}|list<array{id:int,name:string,alias:string,code_cust:string,code_sup:string,email:string,type:string,url:string}>
* @return array{error:string}|array{count:int}|list<array{id:int,name:string,alias:string,code_cust:string,code_sup:string,email:string,type:string,url:string}>
*/
private function search(array $args, int $count = 0)
{

2
htdocs/core/lib/price.lib.php
View file

@ -202,7 +202,7 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
// amounts using this rule when building a XML file.
if ($remise_percent_ligne && getDolGlobalString('MAIN_APPLY_DISCOUNT_ON_UNIT_PRICE_THEN_ROUND_BEFORE_MULTIPLICATION_BY_QTY')) { // MAIN_APPLY_DISCOUNT_ON_UNIT_PRICE_THEN_ROUND_BEFORE_MULTIPLICATION_BY_QTY can be 'MU', 2, ...
$tot_sans_remise = $pu * $qty * ($progress / 100);
$pudiscount = price2num($pu * ((float) $remise_percent_ligne / 100), getDolGlobalString('MAIN_APPLY_DISCOUNT_ON_UNIT_PRICE_THEN_ROUND_BEFORE_MULTIPLICATION_BY_QTY'));
$pudiscount = (float) price2num($pu * ((float) $remise_percent_ligne / 100), getDolGlobalString('MAIN_APPLY_DISCOUNT_ON_UNIT_PRICE_THEN_ROUND_BEFORE_MULTIPLICATION_BY_QTY'));
$tot_avec_remise_ligne = (float) price2num($pu - $pudiscount, getDolGlobalString('MAIN_APPLY_DISCOUNT_ON_UNIT_PRICE_THEN_ROUND_BEFORE_MULTIPLICATION_BY_QTY')) * $qty * ($progress / 100);
} else {
$tot_sans_remise = $pu * $qty * ($progress / 100);