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

Merge branch 'develop' into new-duplicate-pdf-configuration-for-order-in-sepcific-page

Browse Source
This commit is contained in:
Lucas Marcouiller
2025-02-13 11:42:52 +01:00
committed by GitHub
parent 64cbc2ca22 f1e6d4b7d6
commit 4b45e7ac64
64 changed files with 728 additions and 405 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/modules/commande/doc/pdf_proforma.modules.php
View File

@@ -47,7 +47,7 @@ class pdf_proforma extends pdf_eratosthene
*/
public function __construct($db)
{
global $conf, $langs, $mysoc;
global $langs;
parent::__construct($db);

4
htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
View File

@@ -195,8 +195,8 @@ class doc_generic_project_odt extends ModelePDFProjects
'task_label' => $task->label,
'task_description' => $task->description,
'task_fk_parent' => $task->fk_task_parent,
'task_duration' => $task->duration,
'task_duration_hour' => convertSecondToTime($task->duration, 'all'),
'task_duration' => $task->duration_effective,
'task_duration_hour' => convertSecondToTime($task->duration_effective, 'all'),
'task_planned_workload' => $task->planned_workload,
'task_planned_workload_hour' => convertSecondToTime($task->planned_workload, 'all'),
'task_progress' => $task->progress,

2
htdocs/core/modules/project/doc/pdf_timespent.modules.php
View File

@@ -307,7 +307,7 @@ class pdf_timespent extends ModelePDFProjects
//$progress=($object->lines[$i]->progress?$object->lines[$i]->progress.'%':'');
$datestart = dol_print_date($object->lines[$i]->date_start, 'day');
$dateend = dol_print_date($object->lines[$i]->date_end, 'day');
$duration = convertSecondToTime((int) $object->lines[$i]->duration, 'allhourmin');
$duration = convertSecondToTime((int) $object->lines[$i]->duration_effective, 'allhourmin');
$showpricebeforepagebreak = 1;