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-14 15:29:40 +01:00
commit 54a6dc5545
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/compta/sociales/payments.php
View File

@ -270,7 +270,7 @@ while ($i < min($num, $limit)) {
$payment_sc_static->id = $obj->pid;
$payment_sc_static->ref = $obj->pid;
$payment_sc_static->date = $db->jdate($obj->datep);
$payment_sc_static->datep = $db->jdate($obj->datep);
$socialcontrib->id = $obj->rowid;
$socialcontrib->ref = empty($obj->label_sc) ? $obj->type_label : $obj->label_sc;

2
htdocs/core/modules/barcode/modules_barcode.class.php
View File

@ -75,7 +75,7 @@ abstract class ModeleNumRefBarCode
*/
public function getNom($langs)
{
return empty($this->name) ? $this->nom : $this->name;
return empty($this->name) ? get_class($this) : $this->name;
}
/** Return a numbering example