Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop
This commit is contained in:
commit
6b6631fe22
3 changed files with 6 additions and 2 deletions
|
|
@ -589,8 +589,10 @@ class Documents extends DolibarrApi
|
|||
} elseif (is_array($ecmfile->lines) && count($ecmfile->lines) > 0) {
|
||||
$count = count($filearray);
|
||||
for ($i = 0 ; $i < $count ; $i++) {
|
||||
if ($filearray[$i]['name'] == $ecmfile->lines[$i]->filename) {
|
||||
$filearray[$i] = array_merge($filearray[$i], (array) $ecmfile->lines[0]);
|
||||
foreach ($ecmfile->lines as $line) {
|
||||
if ($filearray[$i]['name'] == $line->filename) {
|
||||
$filearray[$i] = array_merge($filearray[$i], (array) $line);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -47,6 +47,7 @@ DateContract=Contract date
|
|||
DateServiceActivate=Service activation date
|
||||
ListOfServices=List of services
|
||||
ListOfInactiveServices=List of not active services
|
||||
ListOfNotExpiredServices=List of unexpired active services
|
||||
ListOfExpiredServices=List of expired active services
|
||||
ListOfClosedServices=List of closed services
|
||||
ListOfRunningServices=List of running services
|
||||
|
|
|
|||
|
|
@ -47,6 +47,7 @@ DateContract=Date contrat
|
|||
DateServiceActivate=Date activation du service
|
||||
ListOfServices=Liste des services
|
||||
ListOfInactiveServices=Liste des services inactifs
|
||||
ListOfNotExpiredServices=Liste des services actifs non expirés
|
||||
ListOfExpiredServices=Liste des services actifs expirés
|
||||
ListOfClosedServices=Liste des services fermés
|
||||
ListOfRunningServices=Liste des services actifs
|
||||
|
|
|
|||
Loading…
Reference in a new issue