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

Merge pull request #27784 from thibdrev/patch-3

Browse source 
qual: phpstan for htdocs/compta/facture/class/facture.class.php
This commit is contained in:
Laurent Destailleur 2024-01-26 02:27:43 +01:00 committed by GitHub
commit 3a22fb28e3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
htdocs/compta/facture/class/facture.class.php
View file

@ -4424,7 +4424,7 @@ class Facture extends CommonInvoice
* Set percent discount
*
* @param User $user User that set discount
* @param double $remise Discount
* @param float $remise Discount
* @param int $notrigger 1=Does not execute triggers, 0= execute triggers
* @return int Return integer <0 if KO, >0 if OK
* @deprecated remise_percent is a deprecated field for object parent
@ -4437,16 +4437,16 @@ class Facture extends CommonInvoice
}
if ($user->hasRight('facture', 'creer')) {
$remise = price2num($remise, 2);
$remise = (float) price2num($remise, 2);
$error = 0;
$this->db->begin();
$sql = 'UPDATE '.MAIN_DB_PREFIX.'facture';
$sql .= ' SET remise_percent = '.((float) $remise);
$sql = "UPDATE ".MAIN_DB_PREFIX."facture";
$sql .= " SET remise_percent = ".((float) $remise);
$sql .= " WHERE rowid = ".((int) $this->id);
$sql .= ' AND fk_statut = '.self::STATUS_DRAFT;
$sql .= " AND fk_statut = ".((int) self::STATUS_DRAFT);
dol_syslog(__METHOD__, LOG_DEBUG);
$resql = $this->db->query($sql);
@ -6295,7 +6295,8 @@ class FactureLigne extends CommonInvoiceLine
// if buy price not defined, define buyprice as configured in margin admin
if ($this->pa_ht == 0 && $pa_ht_isemptystring) {
if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0) {
$result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product);
if ($result < 0) {
return $result;
} else {
$this->pa_ht = $result;
@ -6734,7 +6735,7 @@ class FactureLigne extends CommonInvoiceLine
*
* @param int $invoiceid Invoice id
* @param bool $include_credit_note Include credit note or not
* @return int >= 0
* @return float|int Reurrn previous situation percent, 0 or -1 if error
*/
public function get_prev_progress($invoiceid, $include_credit_note = true)
{

2
htdocs/core/class/commonobject.class.php
View file

@ -8964,7 +8964,7 @@ abstract class CommonObject
* @param float $unitPrice Product unit price
* @param float $discountPercent Line discount percent
* @param int $fk_product Product id
* @return float Return integer <0 if KO, buyprice if OK
* @return float|int Return buy price if OK, integer <0 if KO
*/
public function defineBuyPrice($unitPrice = 0.0, $discountPercent = 0.0, $fk_product = 0)
{