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 2021-06-10 12:49:18 +02:00
commit 3a0b9b4511
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/comm/propal/card.php
View File

@ -2294,6 +2294,7 @@ if ($action == 'create') {
print $langs->trans('OutstandingBill'); print $langs->trans('OutstandingBill');
print '</td><td class="valuefield">'; print '</td><td class="valuefield">';
$arrayoutstandingbills = $soc->getOutstandingBills(); $arrayoutstandingbills = $soc->getOutstandingBills();
print ($arrayoutstandingbills['opened'] > $soc->outstanding_limit ? img_warning() : '');
print price($arrayoutstandingbills['opened']).' / '; print price($arrayoutstandingbills['opened']).' / ';
print price($soc->outstanding_limit, 0, $langs, 1, - 1, - 1, $conf->currency); print price($soc->outstanding_limit, 0, $langs, 1, - 1, - 1, $conf->currency);
print '</td>'; print '</td>';

2
htdocs/core/actions_sendmails.inc.php
View File

@ -345,7 +345,7 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
$subject = make_substitutions($subject, $substitutionarray); $subject = make_substitutions($subject, $substitutionarray);
$message = make_substitutions($message, $substitutionarray); $message = make_substitutions($message, $substitutionarray);
if (method_exists($object, 'makeSubstitution')) { if (is_object($object) && method_exists($object, 'makeSubstitution')) {
$subject = $object->makeSubstitution($subject); $subject = $object->makeSubstitution($subject);
$message = $object->makeSubstitution($message); $message = $object->makeSubstitution($message);
} }

2
htdocs/projet/document.php
View File

@ -164,7 +164,7 @@ if ($object->id > 0) {
print dol_get_fiche_end(); print dol_get_fiche_end();
$modulepart = 'project'; $modulepart = 'projet';
$permissiontoadd = ($userWrite > 0); $permissiontoadd = ($userWrite > 0);
$permtoedit = ($userWrite > 0); $permtoedit = ($userWrite > 0);
include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php'; include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';