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 2020-04-24 22:50:09 +02:00
commit d416edab1a
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1359,7 +1359,7 @@ abstract class CommonObject
}
if ($conf->{$modulename}->enabled) {
$libelle_element = $langs->trans('ContactDefault_'.$obj->element);
$transkey = "TypeContact_".$this->element."_".$source."_".$obj->code;
$transkey = "TypeContact_".$obj->element."_".$source."_".$obj->code;
$libelle_type = ($langs->trans($transkey) != $transkey ? $langs->trans($transkey) : $obj->libelle);
if (empty($option))
$tab[$obj->rowid] = $libelle_element.' - '.$libelle_type;

1
htdocs/fourn/class/fournisseur.facture.class.php
View File

@ -2678,6 +2678,7 @@ class FactureFournisseur extends CommonInvoice
if ($result < 0)
{
$this->error = $object->error;
$this->errors = $object->errors;
$error++;
}