Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-08 00:52:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/4.0' into develop

Browse Source
This commit is contained in:
Laurent Destailleur
2016-07-15 14:23:44 +02:00
parent 9a32fb2ac7 0f4f4ea61c
commit 1b070babc8
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/contact/card.php
View File

@@ -904,7 +904,7 @@ else
// Statut
print '<tr><td>'.$langs->trans("Status").'</td>';
print '<td>';
print '<td colspan="3">';
print $object->getLibStatut(4);
print '</td></tr>';

3
htdocs/core/class/hookmanager.class.php
View File

@@ -142,7 +142,8 @@ class HookManager
'formObjectOptions',
'formattachOptions',
'formBuilddocLineOptions',
'getIdProfUrl',
'getFormMail',
'getIdProfUrl',
'moveUploadedFile',
'pdf_build_address',
'pdf_writelinedesc',