Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge branch 'develop' into qual/phan.2025.2.5-2

Browse Source
This commit is contained in:
Laurent Destailleur
2025-02-07 14:28:44 +01:00
committed by GitHub
parent f05bc70b2e 21530703d8
commit 9ef2ee4dcc
7 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/core/modules/project/modules_project.php
View File

@@ -68,10 +68,10 @@ abstract class ModelePDFProjects extends CommonDocGenerator
/**
* Function to build pdf project onto disk
*
* @param Project $object Object source to build document
* @param Translate $outputlangs Lang output object
* @param string $srctemplatepath Full path of source filename for generator using a template file
* @return int<-1,1> 1 if OK, <=0 if KO
* @param Project $object Object source to build document
* @param Translate $outputlangs Lang output object
* @param string $srctemplatepath Full path of source filename for generator using a template file
* @return int<-1,1> 1 if OK, <=0 if KO
*/
abstract public function write_file($object, $outputlangs, $srctemplatepath = '');
// phpcs:enable

2
htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
View File

@@ -606,6 +606,8 @@ class doc_generic_task_odt extends ModelePDFTask
}
}
/** @var Task $object */
// Replace tags of lines for tasks
try {
// Security check

2
htdocs/core/modules/project/task/modules_task.php
View File

@@ -60,7 +60,7 @@ abstract class ModelePDFTask extends CommonDocGenerator
/**
* Function to build a document on disk using the generic odt module.
*
* @param Project $object Object source to build document
* @param Task $object Object source to build document
* @param Translate $outputlangs Lang output object
* @param string $srctemplatepath Full path of source filename for generator using a template file
* @return int<-1,1> 1 if OK, <=0 if KO

4
htdocs/install/mysql/migration/repair.sql
View File

@@ -602,6 +602,10 @@ DELETE FROM llx_rights_def WHERE module = 'hrm' AND perms = 'employee';
-- UPDATE llx_bank as b SET b.amount_main_currency = -b.amount_main_currency WHERE b.amount IS NOT NULL AND b.amount_main_currency IS NOT NULL AND SIGN(b.amount_main_currency) <> SIGN(b.amount);
-- Sequence to fix the table llx_paiement_facture and llx_paiement for payment record on a bank account that does not exists anymore.
-- delete from llx_paiement_facture where fk_paiement in (select rowid from llx_paiement WHERE fk_bank is not null AND fk_bank not in (select rowid from llx_bank));
-- delete from llx_paiement WHERE fk_bank is not null AND fk_bank not in (select rowid from llx_bank);
-- Delete duplicate entries into llx_c_transport_mode
-- VMYSQL4.1 DELETE T1 FROM llx_c_transport_mode as T1, llx_c_transport_mode as T2 where T1.entity = T2.entity AND T1.code = T2.code and T1.rowid > T2.rowid;

1
htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
View File

@@ -445,6 +445,7 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
if ($foundtagforlines) {
$linenumber = 0;
foreach ($object->lines as $line) {
/** @var CommonObjectLine $line */
$linenumber++;
$tmparray = $this->get_substitutionarray_lines($line, $outputlangs, $linenumber);
complete_substitutions_array($tmparray, $outputlangs, $object, $line, "completesubstitutionarray_lines");

10
htdocs/product/stock/list.php
View File

@@ -679,7 +679,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
// Hook fields
$parameters = array('arrayfields' => $arrayfields, 'param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder);
$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
if (!empty($arrayfields['t.statut']['checked'])) {
@@ -898,11 +898,6 @@ while ($i < $imaxinloop) {
$i++;
}
if ($totalnboflines - $offset <= $limit) {
// Show total line
include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
}
// If no record found
if ($num == 0) {
$colspan = 1;
@@ -916,6 +911,9 @@ if ($num == 0) {
$db->free($resql);
// Unconditionally show the total line (modification: totals are now displayed on every page)
include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
$parameters = array('arrayfields' => $arrayfields, 'sql' => $sql);
$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;

1
htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php
View File

@@ -437,6 +437,7 @@ class doc_generic_recruitmentjobposition_odt extends ModelePDFRecruitmentJobPosi
if ($foundtagforlines) {
$linenumber = 0;
foreach ($object->lines as $line) {
/** @var CommonObjectLine $line */
$linenumber++;
$tmparray = $this->get_substitutionarray_lines($line, $outputlangs, $linenumber);
complete_substitutions_array($tmparray, $outputlangs, $object, $line, "completesubstitutionarray_lines");