lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Debug v17

Browse Source
This commit is contained in:
Laurent Destailleur 2022-12-31 14:37:33 +01:00
parent 751f79b672
commit 1934db2dd1
6 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/modules/import/import_csv.modules.php
View File

@ -579,7 +579,7 @@ class ImportCsv extends ModeleImports
}
} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsuppliercodeifauto') {
if (strtolower($newval) == 'auto') {
$newval = $this->thirdpartyobject->get_codefournisseur(0, 1);
$this->thirdpartyobject->get_codefournisseur(0, 1);
$newval = $this->thirdpartyobject->code_fournisseur;
//print 'code_fournisseur='.$newval;
}

2
htdocs/core/modules/import/import_xlsx.modules.php
View File

@ -624,7 +624,7 @@ class ImportXlsx extends ModeleImports
}
} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsuppliercodeifauto') {
if (strtolower($newval) == 'auto') {
$newval = $this->thirdpartyobject->get_codefournisseur(0, 1);
$this->thirdpartyobject->get_codefournisseur(0, 1);
$newval = $this->thirdpartyobject->code_fournisseur;
//print 'code_fournisseur='.$newval;
}

8
htdocs/core/modules/movement/doc/pdf_standard.modules.php
View File

@ -941,7 +941,7 @@ class pdf_standard extends ModelePDFMovement
* @param int $showaddress 0=no, 1=yes
* @param Translate $outputlangs Object lang for output
* @param string $titlekey Translation key to show as title of document
* @return void
* @return int Return topshift value
*/
protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $titlekey = "")
{
@ -1108,8 +1108,13 @@ class pdf_standard extends ModelePDFMovement
$posy += 2;
$top_shift = 0;
// Show list of linked objects
$current_y = $pdf->getY();
//$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size);
//if ($current_y < $pdf->getY()) {
// $top_shift = $pdf->getY() - $current_y;
//}
if ($showaddress) {
/*
@ -1146,6 +1151,7 @@ class pdf_standard extends ModelePDFMovement
}
$pdf->SetTextColor(0, 0, 0);
return $top_shift;
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore

2
htdocs/debugbar/class/TraceableDB.php
View File

@ -661,7 +661,7 @@ class TraceableDB extends DoliDB
*/
public function free($resultset = null)
{
return $this->db->free($resultset);
$this->db->free($resultset);
}
/**

4
htdocs/install/upgrade2.php
View File

@ -4485,7 +4485,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
* @param DoliDB $db Database handler
* @param Translate $langs Object langs
* @param Conf $conf Object conf
* @return void
* @return int <0 if KO, >0 if OK
*/
function migrate_reload_menu($db, $langs, $conf)
{
@ -4515,6 +4515,8 @@ function migrate_reload_menu($db, $langs, $conf)
print '</td></tr>';
}
return 1;
}
/**

2
htdocs/projet/tasks/task.php
View File

@ -467,7 +467,7 @@ if ($id > 0 || !empty($ref)) {
// Task parent
print '<tr><td>'.$langs->trans("ChildOfProjectTask").'</td><td>';
print $formother->selectProjectTasks($object->fk_task_parent, $projectstatic->id, 'task_parent', ($user->admin ? 0 : 1), 0, 0, 0, $object->id);
$formother->selectProjectTasks($object->fk_task_parent, $projectstatic->id, 'task_parent', ($user->admin ? 0 : 1), 0, 0, 0, $object->id);
print '</td></tr>';
// Date start