Merge pull request #16526 from frederic34/patch-3

fix unknown constant and variable
This commit is contained in:
Laurent Destailleur 2021-03-03 15:10:38 +01:00 committed by GitHub
commit d22f929779
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 5 deletions

View File

@ -7519,7 +7519,7 @@ abstract class CommonObject
*/ */
public function getJSListDependancies($type = '_extra') public function getJSListDependancies($type = '_extra')
{ {
$out .= ' $out = '
<script> <script>
jQuery(document).ready(function() { jQuery(document).ready(function() {
function showOptions'.$type.'(child_list, parent_list, orig_select) function showOptions'.$type.'(child_list, parent_list, orig_select)

View File

@ -7714,8 +7714,8 @@ class Form
print '<td class="center">'.$objp->ref.'</td>'; print '<td class="center">'.$objp->ref.'</td>';
print '<td>'.$objp->ref_client.'</td>'; print '<td>'.$objp->ref_client.'</td>';
print '<td class="right">'; print '<td class="right">';
if ($possiblelink[label] == 'LinkToContract') { if ($possiblelink['label'] == 'LinkToContract') {
$form = new Form($db); $form = new Form($this->db);
print $form->textwithpicto('', $langs->trans("InformationOnLinkToContract")).' '; print $form->textwithpicto('', $langs->trans("InformationOnLinkToContract")).' ';
} }
print price($objp->total_ht).'</td>'; print price($objp->total_ht).'</td>';
@ -7732,8 +7732,6 @@ class Form
dol_print_error($this->db); dol_print_error($this->db);
} }
print '</div>'; print '</div>';
if ($num > 0) {
}
//$linktoelem.=($linktoelem?' &nbsp; ':''); //$linktoelem.=($linktoelem?' &nbsp; ':'');
if ($num > 0) { if ($num > 0) {