diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index e2291c16e55..ea49b4acf66 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -2211,7 +2211,9 @@ class Form $outarray2[$userstatic->id] = array( 'id'=>$userstatic->id, 'label'=>$labeltoshow, - 'labelhtml'=>$labeltoshowhtml + 'labelhtml'=>$labeltoshowhtml, + 'color'=>'', + 'picto'=>'' ); $i++; diff --git a/htdocs/core/modules/modFournisseur.class.php b/htdocs/core/modules/modFournisseur.class.php index c1d50648b24..81a8e6224cf 100644 --- a/htdocs/core/modules/modFournisseur.class.php +++ b/htdocs/core/modules/modFournisseur.class.php @@ -466,7 +466,7 @@ class modFournisseur extends DolibarrModules 'f.note_public'=>"NotePublic", 'f.note_private'=>"NotePrivate", 'uv.login'=>'UserValidation', 'ua1.login'=>'ApprovedBy', 'ua2.login'=>'ApprovedBy2', 'fd.rowid'=>'LineId', 'fd.description'=>"LineDescription", 'fd.tva_tx'=>"LineVATRate", 'fd.qty'=>"LineQty", 'fd.remise_percent'=>"Discount", 'fd.total_ht'=>"LineTotalHT", 'fd.total_ttc'=>"LineTotalTTC", 'fd.total_tva'=>"LineTotalVAT", 'fd.date_start'=>"DateStart", 'fd.date_end'=>"DateEnd", 'fd.special_code'=>'SpecialCode', - 'fd.product_type'=>'TypeOfLineServiceOrProduct', 'fd.ref'=>'RefSupplier', 'fd.fk_product'=>'ProductId', + 'fd.product_type'=>'TypeOfLineServiceOrProduct', 'fd.ref'=>'SupplierRef', 'fd.fk_product'=>'ProductId', 'p.ref'=>'ProductRef', 'p.label'=>'ProductLabel', 'project.rowid'=>'ProjectId', 'project.ref'=>'ProjectRef', 'project.title'=>'ProjectLabel' ); if (isModEnabled("multicurrency")) { @@ -814,6 +814,7 @@ class modFournisseur extends DolibarrModules 'cd.fk_commande' => 'PurchaseOrder*', 'cd.fk_parent_line' => 'ParentLine', 'cd.fk_product' => 'IdProduct', + 'cd.ref' => 'SupplierRef', 'cd.description' => 'LineDescription', 'cd.tva_tx' => 'LineVATRate', 'cd.qty' => 'LineQty', diff --git a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php index e3f2a54c6bc..a0c52ba3b8f 100644 --- a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php +++ b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php @@ -2,7 +2,7 @@ /* Copyright (C) 2010-2012 Laurent Destailleur * Copyright (C) 2012 Juanjo Menent * Copyright (C) 2013 Florian Henry - * Copyright (C) 2016 Charlie Benke + * Copyright (C) 2016-2023 Charlene Benke * Copyright (C) 2018 Frédéric France * Copyright (C) 2023 Gauthier VERDOL * @@ -195,6 +195,8 @@ class doc_generic_project_odt extends ModelePDFProjects 'task_fk_parent'=>$task->fk_parent, 'task_duration'=>$task->duration, 'task_duration_hour'=>convertSecondToTime($task->duration, 'all'), + 'task_planned_workload'=>$task->planned_workload, + 'task_planned_workload_hour'=>convertSecondToTime($task->planned_workload, 'all'), 'task_progress'=>$task->progress, 'task_public'=>$task->public, 'task_date_start'=>dol_print_date($task->date_start, 'day'), diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php index a2846f63ddf..c3f4b63d85f 100644 --- a/htdocs/takepos/index.php +++ b/htdocs/takepos/index.php @@ -54,6 +54,7 @@ $action = GETPOST('action', 'aZ09'); $setterminal = GETPOST('setterminal', 'int'); $setcurrency = GETPOST('setcurrency', 'aZ09'); +$hookmanager->initHooks(array('takeposfrontend')); if (empty($_SESSION["takeposterminal"])) { if (getDolGlobalInt('TAKEPOS_NUM_TERMINALS') == 1) { $_SESSION["takeposterminal"] = 1; // Use terminal 1 if there is only 1 terminal @@ -1060,15 +1061,20 @@ if (empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) { ?>
- +