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

Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2022-12-31 15:01:24 +01:00
commit 0f763d2606
24 changed files with 81 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
View File

@ -945,7 +945,7 @@ class pdf_espadon extends ModelePdfExpedition
* @param Expedition $object Object to show
* @param int $showaddress 0=no, 1=yes
* @param Translate $outputlangs Object lang for output
* @return void
* @return int <0 if KO, > if OK
*/
protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
{
@ -1078,6 +1078,14 @@ class pdf_espadon extends ModelePdfExpedition
}
}
$top_shift = 0;
// Show list of linked objects
/*$current_y = $pdf->getY();
$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, $w, 3, 'R', $default_font_size);
if ($current_y < $pdf->getY()) {
$top_shift = $pdf->getY() - $current_y;
}*/
if ($showaddress) {
// Sender properties
$carac_emetteur = '';
@ -1183,6 +1191,7 @@ class pdf_espadon extends ModelePdfExpedition
}
$pdf->SetTextColor(0, 0, 0);
return $top_shift;
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore

14
htdocs/core/modules/expedition/doc/pdf_merou.modules.php
View File

@ -520,7 +520,7 @@ class pdf_merou extends ModelePdfExpedition
* @param Expedition $object Object to show
* @param int $showaddress 0=no, 1=yes
* @param Translate $outputlangs Object lang for output
* @return void
* @return int <0 if KO, > if OK
*/
protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
{
@ -700,6 +700,16 @@ class pdf_merou extends ModelePdfExpedition
$widthrecbox = $blW;
$top_shift = 0;
// Show list of linked objects
/*
$current_y = $pdf->getY();
$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, $w, 3, 'R', $default_font_size);
if ($current_y < $pdf->getY()) {
$top_shift = $pdf->getY() - $current_y;
}
*/
// Show Recipient frame
$pdf->SetFont('', 'B', $default_font_size - 3);
$pdf->SetXY($blDestX, $Yoff - 4);
@ -717,5 +727,7 @@ class pdf_merou extends ModelePdfExpedition
$pdf->SetFont('', '', $default_font_size - 3);
$pdf->SetXY($blDestX, $posy);
$pdf->MultiCell($widthrecbox, 4, $carac_client, 0, 'L');
return $top_shift;
}
}

13
htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
View File

@ -890,7 +890,7 @@ class pdf_rouget extends ModelePdfExpedition
* @param Expedition $object Object to show
* @param int $showaddress 0=no, 1=yes
* @param Translate $outputlangs Object lang for output
* @return void
* @return int <0 if KO, > if OK
*/
protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
{
@ -1023,6 +1023,16 @@ class pdf_rouget extends ModelePdfExpedition
}
}
$top_shift = 0;
// Show list of linked objects
/*
$current_y = $pdf->getY();
$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, $w, 3, 'R', $default_font_size);
if ($current_y < $pdf->getY()) {
$top_shift = $pdf->getY() - $current_y;
}
*/
if ($showaddress) {
// Sender properties
$carac_emetteur = '';
@ -1128,6 +1138,7 @@ class pdf_rouget extends ModelePdfExpedition
}
$pdf->SetTextColor(0, 0, 0);
return $top_shift;
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore

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

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

5
htdocs/eventorganization/class/conferenceorbooth.class.php
View File

@ -217,7 +217,6 @@ class ConferenceOrBooth extends ActionComm
$this->socid = $this->fk_soc;
$this->datef = $this->datep2;
$this->note_private = $this->note;
$this->fk_user_author = $this->fk_user_author;
}
/**
@ -716,8 +715,8 @@ class ConferenceOrBooth extends ActionComm
$result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql'=>'fk_conferenceorbooth = '.((int) $this->id)));
if (is_numeric($result)) {
$this->error = $this->error;
$this->errors = $this->errors;
$this->error = $objectline->error;
$this->errors = $objectline->errors;
return $result;
} else {
$this->lines = $result;

4
htdocs/hrm/class/evaluation.class.php
View File

@ -923,8 +923,8 @@ class Evaluation extends CommonObject
$result = $objectline->fetchAll('ASC', '', 0, 0, array('customsql'=>'fk_evaluation = '.$this->id));
if (is_numeric($result)) {
$this->error = $this->error;
$this->errors = $this->errors;
$this->error = $objectline->error;
$this->errors = $objectline->errors;
return $result;
} else {
$this->lines = $result;

7
htdocs/hrm/class/evaluationdet.class.php
View File

@ -561,7 +561,8 @@ class Evaluationline extends CommonObject
$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'evaluationline/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
$resql = $this->db->query($sql);
if (!$resql) {
$error++; $this->error = $this->db->lasterror();
$error++;
$this->error = $this->db->lasterror();
}
// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
@ -891,8 +892,8 @@ class Evaluationline extends CommonObject
$result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql'=>'fk_evaluationdet = '.$this->id));
if (is_numeric($result)) {
$this->error = $this->error;
$this->errors = $this->errors;
$this->error = $objectline->error;
$this->errors = $objectline->errors;
return $result;
} else {
$this->lines = $result;

4
htdocs/hrm/class/job.class.php
View File

@ -925,8 +925,8 @@ class Job extends CommonObject
$result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql'=>'fk_job = '.$this->id));
if (is_numeric($result)) {
$this->error = $this->error;
$this->errors = $this->errors;
$this->error = $objectline->error;
$this->errors = $objectline->errors;
return $result;
} else {
$this->lines = $result;

4
htdocs/hrm/class/position.class.php
View File

@ -971,8 +971,8 @@ class Position extends CommonObject
$result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql' => 'fk_position = ' . $this->id));
if (is_numeric($result)) {
$this->error = $this->error;
$this->errors = $this->errors;
$this->error = $objectline->error;
$this->errors = $objectline->errors;
return $result;
} else {
$this->lines = $result;

4
htdocs/hrm/class/skill.class.php
View File

@ -965,8 +965,8 @@ class Skill extends CommonObject
$result = $objectline->fetchAll('ASC', 'rankorder', 0, 0, array('customsql'=>'fk_skill = '.$this->id));
if (is_numeric($result)) {
$this->error = $this->error;
$this->errors = $this->errors;
$this->error = $objectline->error;
$this->errors = $objectline->errors;
return $result;
} else {
$this->lines = $result;

4
htdocs/hrm/class/skillrank.class.php
View File

@ -919,8 +919,8 @@ class SkillRank extends CommonObject
$result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql'=>'fk_skillrank = '.((int) $this->id)));
if (is_numeric($result)) {
$this->error = $this->error;
$this->errors = $this->errors;
$this->error = $objectline->error;
$this->errors = $objectline->errors;
return $result;
} else {
$this->lines = $result;

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;
}
/**

4
htdocs/knowledgemanagement/class/knowledgerecord.class.php
View File

@ -918,8 +918,8 @@ class KnowledgeRecord extends CommonObject
$result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql'=>'fk_knowledgerecord = '.((int) $this->id)));
if (is_numeric($result)) {
$this->error = $this->error;
$this->errors = $this->errors;
$this->error = $objectline->error;
$this->errors = $objectline->errors;
return $result;
} else {
$this->lines = $result;

4
htdocs/mrp/class/mo.class.php
View File

@ -1275,8 +1275,8 @@ class Mo extends CommonObject
$result = $objectline->fetchAll('ASC', 'position', 0, 0, $TFilters);
if (is_numeric($result)) {
$this->error = $this->error;
$this->errors = $this->errors;
$this->error = $objectline->error;
$this->errors = $objectline->errors;
return $result;
} else {
$this->lines = $result;

4
htdocs/partnership/class/partnership.class.php
View File

@ -1158,8 +1158,8 @@ class Partnership extends CommonObject
$result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql'=>'fk_partnership = '.((int) $this->id)));
if (is_numeric($result)) {
$this->error = $this->error;
$this->errors = $this->errors;
$this->error = $objectline->error;
$this->errors = $objectline->errors;
return $result;
} else {
$this->lines = $result;

4
htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
View File

@ -911,8 +911,8 @@ class StockTransfer extends CommonObject
$result = $objectline->fetchAll('ASC', 'rang', 0, 0, array('customsql'=>'fk_stocktransfer = '.$this->id));
if (is_numeric($result)) {
$this->error = $this->error;
$this->errors = $this->errors;
$this->error = $objectline->error;
$this->errors = $objectline->errors;
return $result;
} else {
$this->lines = $result;

4
htdocs/product/stock/stocktransfer/class/stocktransferline.class.php
View File

@ -915,8 +915,8 @@ class StockTransferLine extends CommonObjectLine
$result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql'=>'fk_stocktransferline = '.((int) $this->id)));
if (is_numeric($result)) {
$this->error = $this->error;
$this->errors = $this->errors;
$this->error = $objectline->error;
$this->errors = $objectline->errors;
return $result;
} else {
$this->lines = $result;

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

4
htdocs/recruitment/class/recruitmentcandidature.class.php
View File

@ -894,8 +894,8 @@ class RecruitmentCandidature extends CommonObject
$result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql'=>'fk_recruitmentcandidature = '.((int) $this->id)));
if (is_numeric($result)) {
$this->error = $this->error;
$this->errors = $this->errors;
$this->error = $objectline->error;
$this->errors = $objectline->errors;
return $result;
} else {
$this->lines = $result;

4
htdocs/webhook/class/target.class.php
View File

@ -912,8 +912,8 @@ class Target extends CommonObject
$result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql'=>'fk_target = '.((int) $this->id)));
if (is_numeric($result)) {
$this->error = $this->error;
$this->errors = $this->errors;
$this->error = $objectline->error;
$this->errors = $objectline->errors;
return $result;
} else {
$this->lines = $result;

4
htdocs/workstation/class/workstation.class.php
View File

@ -919,8 +919,8 @@ class Workstation extends CommonObject
$result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql'=>'fk_workstation = '.((int) $this->id)));
if (is_numeric($result)) {
$this->error = $this->error;
$this->errors = $this->errors;
$this->error = $objectline->error;
$this->errors = $objectline->errors;
return $result;
}