*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -662,13 +663,14 @@ class doc_generic_task_odt extends ModelePDFTask
}
// Time ressources
- $sql = "SELECT t.rowid, t.task_date, t.task_duration, t.fk_user, t.note";
+ $sql = "SELECT t.rowid, t.element_date as task_date, t.element_duration as task_duration, t.fk_user, t.note";
$sql .= ", u.lastname, u.firstname";
- $sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t";
+ $sql .= " FROM ".MAIN_DB_PREFIX."element_time as t";
$sql .= " , ".MAIN_DB_PREFIX."user as u";
- $sql .= " WHERE t.fk_task =".((int) $object->id);
+ $sql .= " WHERE t.fk_element =".((int) $object->id);
+ $sql .= " AND t.elementtype = 'task'";
$sql .= " AND t.fk_user = u.rowid";
- $sql .= " ORDER BY t.task_date DESC";
+ $sql .= " ORDER BY t.element_date DESC";
$resql = $this->db->query($sql);
if ($resql) {
diff --git a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
index 162575f8850..0fec1c99997 100644
--- a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
@@ -386,6 +386,13 @@ class pdf_aurore extends ModelePDFSupplierProposal
}
}
}
+
+ // Extrafields in note
+ $extranote = $this->getExtrafieldsInHtml($object, $outputlangs);
+ if (!empty($extranote)) {
+ $notetoshow = dol_concatdesc($notetoshow, $extranote);
+ }
+
if ($notetoshow) {
$tab_top -= 2;
diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index 52761509890..36b9cf6d9f2 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -412,7 +412,7 @@ if ($nolinesbefore) {
diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php
index d9c8a09a384..a0bf235c0eb 100644
--- a/htdocs/core/tpl/objectline_edit.tpl.php
+++ b/htdocs/core/tpl/objectline_edit.tpl.php
@@ -228,9 +228,13 @@ $coldisplay++;
print ' '.$langs->trans('PriceUHTCurrency', $this->multicurrency_code).' ';
}
-if ($inputalsopricewithtax) {
+if (!empty($inputalsopricewithtax) && !getDolGlobalInt('MAIN_NO_INPUT_PRICE_WITH_TAX')) {
print ''.$langs->trans('PriceUTTC').' ';
}
diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php
index 0f7dc25152b..153773a6519 100644
--- a/htdocs/core/tpl/objectline_view.tpl.php
+++ b/htdocs/core/tpl/objectline_view.tpl.php
@@ -325,8 +325,14 @@ print $tooltiponpriceend;
multicurrency_subprice); ?>
- pu_ttc) ? price($sign * $line->pu_ttc) : price($sign * $line->subprice)); ?>
+if (!empty($inputalsopricewithtax) && !getDolGlobalInt('MAIN_NO_INPUT_PRICE_WITH_TAX')) { ?>
+ pu_ttc) ? $line->pu_ttc : null;
+ if (getDolGlobalInt('MAIN_UNIT_PRICE_WITH_TAX_IS_FOR_ALL_TAXES')) {
+ $upinctax = price2num($line->total_ttc / $line->qty, 'MU');
+ }
+ print (isset($upinctax) ? price($sign * $upinctax) : price($sign * $line->subprice));
+ ?>
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 417ac943493..7b1c8ae6df7 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -530,6 +530,7 @@ class Expedition extends CommonObject
foreach ($tab as $detbatch) {
if ($detbatch->entrepot_id == $stockLocation) {
if (!($detbatch->create($line_id) > 0)) { // Create an ExpeditionLineBatch
+ $this->errors = $detbatch->errors;
$error++;
}
}
@@ -3020,7 +3021,7 @@ class ExpeditionLigne extends CommonObjectLine
$shipmentLot->qty = $this->detail_batch->qty;
$shipmentLot->fk_origin_stock = $batch_id;
if ($shipmentLot->create($this->id) < 0) {
- $this->errors[] = $shipmentLot->errors;
+ $this->errors = $shipmentLot->errors;
$error++;
}
}
diff --git a/htdocs/expedition/class/expeditionlinebatch.class.php b/htdocs/expedition/class/expeditionlinebatch.class.php
index ab1d9123830..b010564768f 100644
--- a/htdocs/expedition/class/expeditionlinebatch.class.php
+++ b/htdocs/expedition/class/expeditionlinebatch.class.php
@@ -103,11 +103,16 @@ class ExpeditionLineBatch extends CommonObject
* Create an expeditiondet_batch DB record link to an expedtiondet record
*
* @param int $id_line_expdet rowid of expedtiondet record
+ * @param User $f_user User that create
+ * @param int $notrigger 1 = disable triggers
* @return int <0 if KO, Id of record (>0) if OK
*/
- public function create($id_line_expdet)
+ public function create($id_line_expdet, $f_user = null, $notrigger = 0)
{
+ global $user;
+
$error = 0;
+ if (!is_object($f_user)) $f_user = $user;
$id_line_expdet = (int) $id_line_expdet;
@@ -137,13 +142,24 @@ class ExpeditionLineBatch extends CommonObject
$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
$this->fk_expeditiondet = $id_line_expdet;
+ }
+
+ if (!$error && !$notrigger) {
+ // Call trigger
+ $result = $this->call_trigger('EXPEDITIONLINEBATCH_CREATE', $f_user);
+ if ($result < 0) {
+ $error++;
+ }
+ // End call triggers
+ }
+
+ if (!$error) {
return $this->id;
} else {
foreach ($this->errors as $errmsg) {
dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
}
- $this->db->rollback();
return -1 * $error;
}
}
diff --git a/htdocs/expensereport/class/expensereport_ik.class.php b/htdocs/expensereport/class/expensereport_ik.class.php
index 503fa92b108..3bff859b847 100644
--- a/htdocs/expensereport/class/expensereport_ik.class.php
+++ b/htdocs/expensereport/class/expensereport_ik.class.php
@@ -197,9 +197,9 @@ class ExpenseReportIk extends CommonObject
$default_range = (int) $userauthor->default_range; // if not defined, then 0
$ranges = $this->getRangesByCategory($fk_c_exp_tax_cat);
// prevent out of range -1 indice
- $indice = $default_range > 0 ? $default_range - 1 : 0;
+ $indice = $default_range - 1;
// substract 1 because array start from 0
- if (empty($ranges) || !isset($ranges[$indice])) {
+ if (empty($ranges) || $indice < 0 || !isset($ranges[$indice])) {
return false;
} else {
return $ranges[$indice];
diff --git a/htdocs/fichinter/agenda.php b/htdocs/fichinter/agenda.php
new file mode 100644
index 00000000000..4b4ef9a7215
--- /dev/null
+++ b/htdocs/fichinter/agenda.php
@@ -0,0 +1,256 @@
+
+ * Copyright (C) ---Put here your own copyright and developer email---
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see '.$langs->trans("BackToList").' ';
+
+ $morehtmlref = '';
+ // Ref customer
+ $morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
+ $morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
+ // Thirdparty
+ $morehtmlref .= '
'.$object->thirdparty->getNomUrl(1);
+ // Project
+ if (isModEnabled('project')) {
+ $langs->load("projects");
+ $morehtmlref .= '
';
+ if (0) {
+ $morehtmlref .= img_picto($langs->trans("Project"), 'project', 'class="pictofixedwidth"');
+ if ($action != 'classify') {
+ $morehtmlref .= '
'.img_edit($langs->transnoentitiesnoconv('SetProject')).' ';
+ }
+ $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
+ } else {
+ if (!empty($object->fk_project)) {
+ $proj = new Project($db);
+ $proj->fetch($object->fk_project);
+ $morehtmlref .= $proj->getNomUrl(1);
+ if ($proj->title) {
+ $morehtmlref .= '
- '.dol_escape_htmltag($proj->title).' ';
+ }
+ }
+ }
+ }
+ $morehtmlref .= '
';
+ print '
';
+
+ $object->info($object->id);
+ dol_print_object_info($object, 1);
+
+ print '
trans("AddAnAction"),'filenew');
+ //$out.=" ";
+ }
+
+ $morehtmlright = '';
+
+ //$messagingUrl = DOL_URL_ROOT.'/societe/messaging.php?socid='.$object->id;
+ //$morehtmlright .= dolGetButtonTitle($langs->trans('ShowAsConversation'), '', 'fa fa-comments imgforviewmode', $messagingUrl, '', 1);
+ //$messagingUrl = DOL_URL_ROOT.'/societe/agenda.php?socid='.$object->id;
+ //$morehtmlright .= dolGetButtonTitle($langs->trans('MessageListViewType'), '', 'fa fa-bars imgforviewmode', $messagingUrl, '', 2);
+
+ if (isModEnabled('agenda')) {
+ if ($user->hasRight('agenda', 'myactions', 'create') || $user->hasRight('agenda', 'allactions', 'create')) {
+ $morehtmlright .= dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/fichinter/card.php?action=create'.$out);
+ } else {
+ $morehtmlright .= dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/fichinter/card.php?action=create'.$out, '', 0);
+ }
+ }
+
+
+ if (isModEnabled('agenda') && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
+ print '('.$nbEvent.') ': ''), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlright, '', 0, 1, 1);
+ //print_barre_liste($langs->trans("ActionsOnPropal"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlright, '', 0, 1, 1);
+
+ // List of all actions
+ $filters = array();
+ $filters['search_agenda_label'] = $search_agenda_label;
+ $filters['search_rowid'] = $search_rowid;
+
+ // TODO Replace this with same code than into list.php
+ show_actions_done($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder, property_exists($object, 'module') ? $object->module : '');
+ }
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index f5aa06d48d5..0f18d024671 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -102,10 +102,12 @@ if ($user->socid) {
}
$result = restrictedArea($user, 'ficheinter', $id, 'fichinter');
-$permissionnote = $user->rights->ficheinter->creer; // Used by the include of actions_setnotes.inc.php
-$permissiondellink = $user->rights->ficheinter->creer; // Used by the include of actions_dellink.inc.php
+$permissionnote = $user->hasRight('ficheinter', 'creer'); // Used by the include of actions_setnotes.inc.php
+$permissiondellink = $user->hasRight('ficheinter', 'creer'); // Used by the include of actions_dellink.inc.php
$permissiontodelete = (($object->statut == Fichinter::STATUS_DRAFT && $user->hasRight('ficheinter', 'creer')) || $user->rights->ficheinter->supprimer);
+$usercancreate = $user->hasRight('ficheinter', 'creer');
+
/*
* Actions
@@ -1163,32 +1165,21 @@ if ($action == 'create') {
// Project
if (isModEnabled('project')) {
$langs->load("projects");
- $morehtmlref .= ''.img_edit($langs->transnoentitiesnoconv('SetProject')).' : ';
- }
- if ($action == 'classify') {
- //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
- $morehtmlref .= '';
- } else {
- $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
+ $morehtmlref .= ''.img_edit($langs->transnoentitiesnoconv('SetProject')).' ';
}
+ $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
} else {
if (!empty($object->fk_project)) {
$proj = new Project($db);
$proj->fetch($object->fk_project);
- $morehtmlref .= ' : '.$proj->getNomUrl(1);
+ $morehtmlref .= $proj->getNomUrl(1);
if ($proj->title) {
- $morehtmlref .= ' - '.$proj->title;
+ $morehtmlref .= ' - '.dol_escape_htmltag($proj->title).' ';
}
- } else {
- $morehtmlref .= '';
}
}
}
@@ -1729,10 +1720,14 @@ if ($action == 'create') {
print '';
+ $MAXEVENT = 10;
+
+ $morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-bars imgforviewmode', DOL_URL_ROOT.'/fichinter/agenda.php?id='.$object->id);
+
// List of actions on element
include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
$formactions = new FormActions($db);
- $somethingshown = $formactions->showactions($object, 'fichinter', $socid, 1);
+ $somethingshown = $formactions->showactions($object, 'fichinter', $socid, 1, '', $MAXEVENT, '', $morehtmlcenter); // Show all action for thirdparty
print '
';
}
diff --git a/htdocs/fichinter/class/api_interventions.class.php b/htdocs/fichinter/class/api_interventions.class.php
index 98cb04368a1..6609ce03786 100644
--- a/htdocs/fichinter/class/api_interventions.class.php
+++ b/htdocs/fichinter/class/api_interventions.class.php
@@ -16,9 +16,15 @@
* along with this program. If not, see ';
// Ref customer
- //$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
- //$morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
+ //$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, $user->rights->ficheinter->creer, 'string', '', 0, 1);
+ //$morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, $user->rights->ficheinter->creer, 'string', '', null, null, '', 1);
+ $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
+ $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
// Thirdparty
- $morehtmlref .= $langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
+ $morehtmlref .= '
'.$object->thirdparty->getNomUrl(1, 'customer');
// Project
if (isModEnabled('project')) {
$langs->load("projects");
- $morehtmlref .= '
'.$langs->trans('Project').' ';
- if ($user->rights->ficheinter->creer) {
+ $morehtmlref .= '
';
+ if ($usercancreate && 0) {
+ $morehtmlref .= img_picto($langs->trans("Project"), 'project', 'class="pictofixedwidth"');
if ($action != 'classify') {
- //$morehtmlref.='
' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
- $morehtmlref .= ' : ';
- }
- if ($action == 'classify') {
- //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
- $morehtmlref .= '
';
- } else {
- $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
+ $morehtmlref .= '
'.img_edit($langs->transnoentitiesnoconv('SetProject')).' ';
}
+ $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
} else {
if (!empty($object->fk_project)) {
$proj = new Project($db);
$proj->fetch($object->fk_project);
- $morehtmlref .= ' : '.$proj->getNomUrl(1);
+ $morehtmlref .= $proj->getNomUrl(1);
if ($proj->title) {
- $morehtmlref .= ' - '.$proj->title;
+ $morehtmlref .= '
- '.dol_escape_htmltag($proj->title).' ';
}
- } else {
- $morehtmlref .= '';
}
}
}
diff --git a/htdocs/fichinter/document.php b/htdocs/fichinter/document.php
index 52d1019d755..32495a8b9ad 100644
--- a/htdocs/fichinter/document.php
+++ b/htdocs/fichinter/document.php
@@ -119,40 +119,30 @@ if ($object->id) {
$morehtmlref = '
';
// Ref customer
- //$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
- //$morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
+ //$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, $user->rights->ficheinter->creer, 'string', '', 0, 1);
+ //$morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, $user->rights->ficheinter->creer, 'string', '', null, null, '', 1);
+ $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
+ $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
// Thirdparty
- $morehtmlref .= $langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
+ $morehtmlref .= '
'.$object->thirdparty->getNomUrl(1, 'customer');
// Project
if (isModEnabled('project')) {
$langs->load("projects");
- $morehtmlref .= '
'.$langs->trans('Project').' ';
- if ($user->hasRight('commande', 'creer')) {
+ $morehtmlref .= '
';
+ if ($usercancreate && 0) {
+ $morehtmlref .= img_picto($langs->trans("Project"), 'project', 'class="pictofixedwidth"');
if ($action != 'classify') {
- //$morehtmlref.='
' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
- $morehtmlref .= ' : ';
- }
- if ($action == 'classify') {
- //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
- $morehtmlref .= '
';
- } else {
- $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
+ $morehtmlref .= '
'.img_edit($langs->transnoentitiesnoconv('SetProject')).' ';
}
+ $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
} else {
if (!empty($object->fk_project)) {
$proj = new Project($db);
$proj->fetch($object->fk_project);
- $morehtmlref .= ' : '.$proj->getNomUrl(1);
+ $morehtmlref .= $proj->getNomUrl(1);
if ($proj->title) {
- $morehtmlref .= ' - '.$proj->title;
+ $morehtmlref .= '
- '.dol_escape_htmltag($proj->title).' ';
}
- } else {
- $morehtmlref .= '';
}
}
}
diff --git a/htdocs/fichinter/info.php b/htdocs/fichinter/info.php
deleted file mode 100644
index 77e31705790..00000000000
--- a/htdocs/fichinter/info.php
+++ /dev/null
@@ -1,132 +0,0 @@
-
- * Copyright (C) 2009-2016 Laurent Destailleur
- * Copyright (C) 2011 Juanjo Menent
- * Copyright (C) 2017 Ferran Marcet
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see '.$langs->trans("BackToList").' ';
-
-
-$morehtmlref = '';
-// Ref customer
-//$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
-//$morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
-// Thirdparty
-$morehtmlref .= $langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
-// Project
-if (isModEnabled('project')) {
- $langs->load("projects");
- $morehtmlref .= '
'.$langs->trans('Project').' ';
- if ($user->hasRight('commande', 'creer')) {
- if ($action != 'classify') {
- //$morehtmlref.='
' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
- $morehtmlref .= ' : ';
- }
- if ($action == 'classify') {
- //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
- $morehtmlref .= '
';
- } else {
- $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
- }
- } else {
- if (!empty($object->fk_project)) {
- $proj = new Project($db);
- $proj->fetch($object->fk_project);
- $morehtmlref .= ' : '.$proj->getNomUrl(1);
- if ($proj->title) {
- $morehtmlref .= ' - '.$proj->title;
- }
- } else {
- $morehtmlref .= '';
- }
- }
-}
-$morehtmlref .= '
';
-print '
';
-
-print '
';
-
-print '
';
-dol_print_object_info($object);
-print '
';
-
-print '
';
// Ref customer
- //$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
- //$morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
+ //$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, $user->rights->ficheinter->creer, 'string', '', 0, 1);
+ //$morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, $user->rights->ficheinter->creer, 'string', '', null, null, '', 1);
+ $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
+ $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
// Thirdparty
- $morehtmlref .= $langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
+ $morehtmlref .= '
'.$object->thirdparty->getNomUrl(1, 'customer');
// Project
if (isModEnabled('project')) {
$langs->load("projects");
- $morehtmlref .= '
'.$langs->trans('Project').' ';
- if ($user->hasRight('commande', 'creer')) {
+ $morehtmlref .= '
';
+ if ($usercancreate && 0) {
+ $morehtmlref .= img_picto($langs->trans("Project"), 'project', 'class="pictofixedwidth"');
if ($action != 'classify') {
- //$morehtmlref.='
' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
- $morehtmlref .= ' : ';
- }
- if ($action == 'classify') {
- //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
- $morehtmlref .= '
';
- } else {
- $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
+ $morehtmlref .= '
'.img_edit($langs->transnoentitiesnoconv('SetProject')).' ';
}
+ $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
} else {
if (!empty($object->fk_project)) {
$proj = new Project($db);
$proj->fetch($object->fk_project);
- $morehtmlref .= ' : '.$proj->getNomUrl(1);
+ $morehtmlref .= $proj->getNomUrl(1);
if ($proj->title) {
- $morehtmlref .= ' - '.$proj->title;
+ $morehtmlref .= '
- '.dol_escape_htmltag($proj->title).' ';
}
- } else {
- $morehtmlref .= '';
}
}
}
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 066c5918742..4be37fe4130 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -649,7 +649,7 @@ class FactureFournisseur extends CommonInvoice
$res = $this->updateline(
$idligne,
$this->lines[$i]->description,
- $this->lines[$i]->pu_ht,
+ $this->lines[$i]->subprice,
$this->lines[$i]->tva_tx.($this->lines[$i]->vat_src_code ? ' ('.$this->lines[$i]->vat_src_code.')' : ''),
$this->lines[$i]->localtax1_tx,
$this->lines[$i]->localtax2_tx,
@@ -1824,12 +1824,11 @@ class FactureFournisseur extends CommonInvoice
$cpt = count($this->lines);
for ($i = 0; $i < $cpt; $i++) {
if ($this->lines[$i]->fk_product > 0) {
- $this->line = $this->lines[$i];
$mouvP = new MouvementStock($this->db);
$mouvP->origin = &$this;
$mouvP->setOrigin($this->element, $this->id);
// We increase stock for product
- $up_ht_disc = $this->lines[$i]->pu_ht;
+ $up_ht_disc = $this->lines[$i]->subprice;
if (!empty($this->lines[$i]->remise_percent) && empty($conf->global->STOCK_EXCLUDE_DISCOUNT_FOR_PMP)) {
$up_ht_disc = price2num($up_ht_disc * (100 - $this->lines[$i]->remise_percent) / 100, 'MU');
}
@@ -1841,7 +1840,6 @@ class FactureFournisseur extends CommonInvoice
if ($result < 0) {
$error++;
}
- unset($this->line);
}
}
}
@@ -2174,61 +2172,61 @@ class FactureFournisseur extends CommonInvoice
}
// Insert line
- $this->line = new SupplierInvoiceLine($this->db);
+ $supplierinvoiceline = new SupplierInvoiceLine($this->db);
- $this->line->context = $this->context;
+ $supplierinvoiceline->context = $this->context;
- $this->line->fk_facture_fourn = $this->id;
- //$this->line->label=$label; // deprecated
- $this->line->desc = $desc;
- $this->line->ref_supplier = $ref_supplier;
+ $supplierinvoiceline->fk_facture_fourn = $this->id;
+ //$supplierinvoiceline->label=$label; // deprecated
+ $supplierinvoiceline->desc = $desc;
+ $supplierinvoiceline->ref_supplier = $ref_supplier;
- $this->line->qty = ($this->type == self::TYPE_CREDIT_NOTE ? abs($qty) : $qty); // For credit note, quantity is always positive and unit price negative
- $this->line->subprice = ($this->type == self::TYPE_CREDIT_NOTE ? -abs($pu_ht) : $pu_ht); // For credit note, unit price always negative, always positive otherwise
+ $supplierinvoiceline->qty = ($this->type == self::TYPE_CREDIT_NOTE ? abs($qty) : $qty); // For credit note, quantity is always positive and unit price negative
+ $supplierinvoiceline->subprice = ($this->type == self::TYPE_CREDIT_NOTE ? -abs($pu_ht) : $pu_ht); // For credit note, unit price always negative, always positive otherwise
- $this->line->vat_src_code = $vat_src_code;
- $this->line->tva_tx = $txtva;
- $this->line->localtax1_tx = ($total_localtax1 ? $localtaxes_type[1] : 0);
- $this->line->localtax2_tx = ($total_localtax2 ? $localtaxes_type[3] : 0);
- $this->line->localtax1_type = empty($localtaxes_type[0]) ? '' : $localtaxes_type[0];
- $this->line->localtax2_type = empty($localtaxes_type[2]) ? '' : $localtaxes_type[2];
+ $supplierinvoiceline->vat_src_code = $vat_src_code;
+ $supplierinvoiceline->tva_tx = $txtva;
+ $supplierinvoiceline->localtax1_tx = ($total_localtax1 ? $localtaxes_type[1] : 0);
+ $supplierinvoiceline->localtax2_tx = ($total_localtax2 ? $localtaxes_type[3] : 0);
+ $supplierinvoiceline->localtax1_type = empty($localtaxes_type[0]) ? '' : $localtaxes_type[0];
+ $supplierinvoiceline->localtax2_type = empty($localtaxes_type[2]) ? '' : $localtaxes_type[2];
- $this->line->total_ht = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ? -abs($total_ht) : $total_ht); // For credit note and if qty is negative, total is negative
- $this->line->total_tva = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ? -abs($total_tva) : $total_tva); // For credit note and if qty is negative, total is negative
- $this->line->total_localtax1 = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ? -abs($total_localtax1) : $total_localtax1); // For credit note and if qty is negative, total is negative
- $this->line->total_localtax2 = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ? -abs($total_localtax2) : $total_localtax2); // For credit note and if qty is negative, total is negative
- $this->line->total_ttc = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ? -abs($total_ttc) : $total_ttc); // For credit note and if qty is negative, total is negative
+ $supplierinvoiceline->total_ht = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ? -abs($total_ht) : $total_ht); // For credit note and if qty is negative, total is negative
+ $supplierinvoiceline->total_tva = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ? -abs($total_tva) : $total_tva); // For credit note and if qty is negative, total is negative
+ $supplierinvoiceline->total_localtax1 = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ? -abs($total_localtax1) : $total_localtax1); // For credit note and if qty is negative, total is negative
+ $supplierinvoiceline->total_localtax2 = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ? -abs($total_localtax2) : $total_localtax2); // For credit note and if qty is negative, total is negative
+ $supplierinvoiceline->total_ttc = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ? -abs($total_ttc) : $total_ttc); // For credit note and if qty is negative, total is negative
- $this->line->fk_product = $fk_product;
- $this->line->product_type = $type;
- $this->line->remise_percent = $remise_percent;
- $this->line->date_start = $date_start;
- $this->line->date_end = $date_end;
- $this->line->fk_code_ventilation = $ventil;
- $this->line->rang = $rang;
- $this->line->info_bits = $info_bits;
- $this->line->fk_remise_except = $fk_remise_except;
+ $supplierinvoiceline->fk_product = $fk_product;
+ $supplierinvoiceline->product_type = $type;
+ $supplierinvoiceline->remise_percent = $remise_percent;
+ $supplierinvoiceline->date_start = $date_start;
+ $supplierinvoiceline->date_end = $date_end;
+ $supplierinvoiceline->fk_code_ventilation = $ventil;
+ $supplierinvoiceline->rang = $rang;
+ $supplierinvoiceline->info_bits = $info_bits;
+ $supplierinvoiceline->fk_remise_except = $fk_remise_except;
- $this->line->special_code = ((string) $special_code != '' ? $special_code : $this->special_code);
- $this->line->fk_parent_line = $fk_parent_line;
- $this->line->origin = $this->origin;
- $this->line->origin_id = $origin_id;
- $this->line->fk_unit = $fk_unit;
+ $supplierinvoiceline->special_code = ((string) $special_code != '' ? $special_code : $this->special_code);
+ $supplierinvoiceline->fk_parent_line = $fk_parent_line;
+ $supplierinvoiceline->origin = $this->origin;
+ $supplierinvoiceline->origin_id = $origin_id;
+ $supplierinvoiceline->fk_unit = $fk_unit;
// Multicurrency
- $this->line->fk_multicurrency = $this->fk_multicurrency;
- $this->line->multicurrency_code = $this->multicurrency_code;
- $this->line->multicurrency_subprice = ($this->type == self::TYPE_CREDIT_NOTE ? -abs($pu_ht_devise) : $pu_ht_devise); // For credit note, unit price always negative, always positive otherwise
+ $supplierinvoiceline->fk_multicurrency = $this->fk_multicurrency;
+ $supplierinvoiceline->multicurrency_code = $this->multicurrency_code;
+ $supplierinvoiceline->multicurrency_subprice = ($this->type == self::TYPE_CREDIT_NOTE ? -abs($pu_ht_devise) : $pu_ht_devise); // For credit note, unit price always negative, always positive otherwise
- $this->line->multicurrency_total_ht = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ? -abs($multicurrency_total_ht) : $multicurrency_total_ht); // For credit note and if qty is negative, total is negative
- $this->line->multicurrency_total_tva = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ? -abs($multicurrency_total_tva) : $multicurrency_total_tva); // For credit note and if qty is negative, total is negative
- $this->line->multicurrency_total_ttc = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ? -abs($multicurrency_total_ttc) : $multicurrency_total_ttc); // For credit note and if qty is negative, total is negative
+ $supplierinvoiceline->multicurrency_total_ht = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ? -abs($multicurrency_total_ht) : $multicurrency_total_ht); // For credit note and if qty is negative, total is negative
+ $supplierinvoiceline->multicurrency_total_tva = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ? -abs($multicurrency_total_tva) : $multicurrency_total_tva); // For credit note and if qty is negative, total is negative
+ $supplierinvoiceline->multicurrency_total_ttc = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ? -abs($multicurrency_total_ttc) : $multicurrency_total_ttc); // For credit note and if qty is negative, total is negative
if (is_array($array_options) && count($array_options) > 0) {
- $this->line->array_options = $array_options;
+ $supplierinvoiceline->array_options = $array_options;
}
- $result = $this->line->insert($notrigger);
+ $result = $supplierinvoiceline->insert($notrigger);
if ($result > 0) {
// Reorder if child line
if (!empty($fk_parent_line)) {
@@ -2244,15 +2242,15 @@ class FactureFournisseur extends CommonInvoice
$result = $this->update_price(1, 'auto', 0, $this->thirdparty); // The addline method is designed to add line from user input so total calculation with update_price must be done using 'auto' mode.
if ($result > 0) {
$this->db->commit();
- return $this->line->id;
+ return $supplierinvoiceline->id;
} else {
$this->error = $this->db->error();
$this->db->rollback();
return -1;
}
} else {
- $this->error = $this->line->error;
- $this->errors = $this->line->errors;
+ $this->error = $supplierinvoiceline->error;
+ $this->errors = $supplierinvoiceline->errors;
$this->db->rollback();
return -2;
}
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index 341b0c700e1..f3c7130e7f8 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -1497,9 +1497,11 @@ class Holiday extends CommonObject
}
$out .= ''."\n";
- $out .= ajax_combobox($htmlname);
- print $out;
+ $showempty= 0;
+ $out .= ajax_combobox($htmlname, array(), 0, 0, 'resolve', ($showempty < 0 ? (string) $showempty : '-1'), $morecss);
+
+ return $out;
}
/**
@@ -2488,7 +2490,7 @@ class Holiday extends CommonObject
$return .= '
';
if (property_exists($this, 'fk_type')) {
$return .= '
'.$langs->trans("Type").' : ';
- $return .= '
'.arraydata['labeltype'].' ';
+ $return .= '
'.$arraydata['labeltype'].' ';
}
if (property_exists($this, 'date_debut') && property_exists($this, 'date_fin')) {
$return .= '
'.dol_print_date($this->date_debut, 'day').' ';
diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php
index 2eb69145254..6ff31497a57 100644
--- a/htdocs/holiday/define_holiday.php
+++ b/htdocs/holiday/define_holiday.php
@@ -363,6 +363,7 @@ if (count($typeleaves) == 0) {
print_liste_field_titre((empty($user->rights->holiday->define_holiday) ? '' : 'Note'), $_SERVER["PHP_SELF"]);
print_liste_field_titre('');
+ $selectedfields = '';
if ($massactionbutton) {
$selectedfields = $form->showCheckAddButtons('checkforselect', 1);
}
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index 3f8f9d69131..0be113d8205 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -143,7 +143,13 @@ if ($user->socid > 0) { // Protection if external user
accessforbidden();
}
-if (empty($conf->holiday->enabled)) accessforbidden('Module not enabled');
+$permissiontoread = $user->hasRight('holiday', 'read');
+$permissiontodelete = $user->hasRight('holiday', 'delete');
+$permissiontoapprove = $user->hasRight('holiday', 'approve');
+
+if (!ismodEnabled('holiday')) {
+ accessforbidden('Module holiday not enabled');
+}
$result = restrictedArea($user, 'holiday', '', '');
// If we are on the view of a specific user
@@ -152,10 +158,10 @@ if ($id > 0) {
if ($id == $user->id) {
$canread = 1;
}
- if (!empty($user->rights->holiday->readall)) {
+ if ($user->hasRight('holiday', 'readall')) {
$canread = 1;
}
- if (!empty($user->rights->holiday->read) && in_array($id, $childids)) {
+ if ($user->hasRight('holiday', 'read') && in_array($id, $childids)) {
$canread = 1;
}
if (!$canread) {
@@ -165,13 +171,13 @@ if ($id > 0) {
-
/*
* Actions
*/
if (GETPOST('cancel', 'alpha')) {
- $action = 'list'; $massaction = '';
+ $action = 'list';
+ $massaction = '';
}
if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
$massaction = '';
@@ -211,9 +217,6 @@ if (empty($reshook)) {
// Mass actions
$objectclass = 'Holiday';
$objectlabel = 'Holiday';
- $permissiontoread = $user->hasRight('holiday', 'read');
- $permissiontodelete = $user->hasRight('holiday', 'delete');
- $permissiontoapprove = $user->hasRight('holiday', 'approve');
$uploaddir = $conf->holiday->dir_output;
include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
}
@@ -236,6 +239,8 @@ $holidaystatic = new Holiday($db);
$result = $object->updateBalance();
$title = $langs->trans('CPTitreMenu');
+$help_url = '';
+
llxHeader('', $title);
$max_year = 5;
@@ -304,7 +309,8 @@ if (!empty($extrafields->attributes[$object->table_element]['label'])) {
// Add fields from hooks
$parameters = array();
$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
-$sql .= $hookmanager->resPrint;
+$sql .= preg_replace('/^,/', '', $hookmanager->resPrint);
+$sql = preg_replace('/,\s*$/', '', $sql);
$sqlfields = $sql; // $sql fields to remove for count total
@@ -357,7 +363,7 @@ if ($id > 0) {
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
// Add where from hooks
$parameters = array();
-$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
$sql .= $hookmanager->resPrint;
// Count total nb of records
@@ -374,7 +380,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
dol_print_error($db);
}
- if (($page * $limit) > $nbtotalofrecords) { // if total resultset is smaller then paging size (filtering), goto and load page 0
+ if (($page * $limit) > $nbtotalofrecords) { // if total resultset is smaller than the paging size (filtering), goto and load page 0
$page = 0;
$offset = 0;
}
@@ -389,656 +395,703 @@ if ($limit) {
//print $sql;
$resql = $db->query($sql);
-if ($resql) {
- $num = $db->num_rows($resql);
+if (!$resql) {
+ dol_print_error($db);
+ exit;
+}
- $arrayofselected = is_array($toselect) ? $toselect : array();
+$num = $db->num_rows($resql);
- $param = '';
- if (!empty($mode)) {
- $param .= '&mode='.urlencode($mode);
- }
- if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
- $param .= '&contextpage='.urlencode($contextpage);
- }
- if ($limit > 0 && $limit != $conf->liste_limit) {
- $param .= '&limit='.urlencode($limit);
- }
- if ($optioncss != '') {
- $param .= '&optioncss='.urlencode($optioncss);
- }
- if ($search_ref) {
- $param .= '&search_ref='.urlencode($search_ref);
- }
- if ($search_day_create) {
- $param .= '&search_day_create='.urlencode($search_day_create);
- }
- if ($search_month_create) {
- $param .= '&search_month_create='.urlencode($search_month_create);
- }
- if ($search_year_create) {
- $param .= '&search_year_create='.urlencode($search_year_create);
- }
- if ($search_day_start) {
- $param .= '&search_day_start='.urlencode($search_day_start);
- }
- if ($search_month_start) {
- $param .= '&search_month_start='.urlencode($search_month_start);
- }
- if ($search_year_start) {
- $param .= '&search_year_start='.urlencode($search_year_start);
- }
- if ($search_day_end) {
- $param .= '&search_day_end='.urlencode($search_day_end);
- }
- if ($search_month_end) {
- $param .= '&search_month_end='.urlencode($search_month_end);
- }
- if ($search_year_end) {
- $param .= '&search_year_end='.urlencode($search_year_end);
- }
- if ($search_employee > 0) {
- $param .= '&search_employee='.urlencode($search_employee);
- }
- if ($search_valideur > 0) {
- $param .= '&search_valideur='.urlencode($search_valideur);
- }
- if ($search_type > 0) {
- $param .= '&search_type='.urlencode($search_type);
- }
- if ($search_status > 0) {
- $param .= '&search_status='.urlencode($search_status);
- }
- // Add $param from extra fields
- include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
+$arrayofselected = is_array($toselect) ? $toselect : array();
- // List of mass actions available
- $arrayofmassactions = array(
- //'generate_doc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("ReGeneratePDF"),
- //'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
- //'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
- );
- if (!empty($user->rights->holiday->delete)) {
- $arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
- }
- if (!empty($user->rights->holiday->approve)) {
- $arrayofmassactions['preapproveleave'] = img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans("Approve");
- }
- if (in_array($massaction, array('presend', 'predelete'))) {
- $arrayofmassactions = array();
- }
- $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
+$param = '';
+if (!empty($mode)) {
+ $param .= '&mode='.urlencode($mode);
+}
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+ $param .= '&contextpage='.urlencode($contextpage);
+}
+if ($limit > 0 && $limit != $conf->liste_limit) {
+ $param .= '&limit='.((int) $limit);
+}
+if ($optioncss != '') {
+ $param .= '&optioncss='.urlencode($optioncss);
+}
+if ($search_ref) {
+ $param .= '&search_ref='.urlencode($search_ref);
+}
+if ($search_day_create) {
+ $param .= '&search_day_create='.urlencode($search_day_create);
+}
+if ($search_month_create) {
+ $param .= '&search_month_create='.urlencode($search_month_create);
+}
+if ($search_year_create) {
+ $param .= '&search_year_create='.urlencode($search_year_create);
+}
+if ($search_day_start) {
+ $param .= '&search_day_start='.urlencode($search_day_start);
+}
+if ($search_month_start) {
+ $param .= '&search_month_start='.urlencode($search_month_start);
+}
+if ($search_year_start) {
+ $param .= '&search_year_start='.urlencode($search_year_start);
+}
+if ($search_day_end) {
+ $param .= '&search_day_end='.urlencode($search_day_end);
+}
+if ($search_month_end) {
+ $param .= '&search_month_end='.urlencode($search_month_end);
+}
+if ($search_year_end) {
+ $param .= '&search_year_end='.urlencode($search_year_end);
+}
+if ($search_employee > 0) {
+ $param .= '&search_employee='.urlencode($search_employee);
+}
+if ($search_valideur > 0) {
+ $param .= '&search_valideur='.urlencode($search_valideur);
+}
+if ($search_type > 0) {
+ $param .= '&search_type='.urlencode($search_type);
+}
+if ($search_status > 0) {
+ $param .= '&search_status='.urlencode($search_status);
+}
+// Add $param from extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
- // Lines of title fields
- print '
'."\n";
+
// End of page
llxFooter();
$db->close();
diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php
index 9dc12b18277..636f365683f 100644
--- a/htdocs/install/inc.php
+++ b/htdocs/install/inc.php
@@ -6,6 +6,7 @@
* Copyright (C) 2012 Marcos García
* Copyright (C) 2016 Raphaël Doursenaud
* Copyright (C) 2021 Charlene Benke
+ * Copyright (C) 2023 Alexandre Janniaux
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -70,6 +71,92 @@ $conffiletoshow = "htdocs/conf/conf.php";
//$conffile = "/etc/dolibarr/conf.php";
//$conffiletoshow = "/etc/dolibarr/conf.php";
+$short_options = "c:h";
+$long_options = array(
+ "config:",
+ "help",
+);
+
+/**
+ * Print the usage when executing scripts from install/.
+ *
+ * Print the help text exposing the available options when executing
+ * update or install script (ie. from htdocs/install/) from CLI with
+ * the `php` executable. This function does not `exit` the program and
+ * the caller should then call `exit` themselves since they should
+ * determine whether it was an error or not.
+ *
+ * @param string $program the script that was originally run
+ * @param string $header the message to signal to the user
+ * @return void
+ */
+function usage($program, $header)
+{
+ echo $header."\n";
+ echo " php ".$program." [options] previous_version new_version [script options]\n";
+ echo "\n";
+ echo "Script options when using upgrade.php:\n";
+ echo "\n";
+ echo " dirmodule:\n";
+ echo " Specify dirmodule to provide a path for an external module\n";
+ echo " so the migration is done using a script from a module.\n";
+ echo "\n";
+ echo " ignoredbversion:\n";
+ echo " Allow to run migration even if database version does\n";
+ echo " not match start version of migration.\n";
+ echo "\n";
+ echo "Script options when using upgrade2.php:\n";
+ echo "\n";
+ echo " MODULE_NAME1_TO_ENABLE,MODULE_NAME2_TO_ENABLE:\n";
+ echo " Specify a list of module-name to enable, joined by comma.\n";
+ echo "\n";
+ echo "Options:\n";
+ echo " -c, --config :\n";
+ echo " Provide a different conf.php file to use.\n";
+ echo "\n";
+ echo " -h, --help:\n";
+ echo " Display this help message.\n";
+}
+
+if (php_sapi_name() === "cli") {
+ $rest_index = 0;
+ $opts = getopt($short_options, $long_options, $rest_index);
+
+ foreach ($opts as $opt => $arg) switch ($opt) {
+ case 'c':
+ case 'config':
+ $conffile = $arg;
+ $conffiletoshow = $arg;
+ break;
+ case 'h':
+ case 'help':
+ usage($argv[0], "Usage:");
+ exit(0);
+ }
+
+ // In the following test, only dash-prefixed arguments will trigger an
+ // error, given that scripts options can allow a variable number of
+ // additional non-prefixed argument and we mostly want to check for
+ // typo right now.
+ if ($rest_index < $argc && $argv[$rest_index][0] == "-") {
+ usage($argv[0], "Unknown option ".$argv[$rest_index]. ", usage:");
+ exit(1);
+ }
+
+ // Currently, scripts using inc.php will require addtional arguments,
+ // see help above for more details.
+ if ($rest_index > $argc - 2) {
+ usage($argv[0], "Missing mandatory arguments, usage:");
+ exit(1);
+ }
+
+ // Tricky argument list hack, should be removed someday.
+ // Reset argv to remove the argument that were parsed. This is needed
+ // currently because some install code, like in upgrade.php, are using
+ // $argv[] directly with fixed index to fetch some arguments.
+ $argv = array_merge(array($argv[0]), array_slice($argv, $rest_index));
+ $argc = count($argv);
+}
// Load conf file if it is already defined
if (!defined('DONOTLOADCONF') && file_exists($conffile) && filesize($conffile) > 8) { // Test on filesize is to ensure that conf file is more that an empty template with just 0 a
UPDATE llx_actioncomm set fk_user_action = fk_user_author where fk_user_author > 0 and (fk_user_action is null or fk_user_action = 0);
-UPDATE llx_projet_task_time set task_datehour = task_date where task_datehour IS NULL and task_date IS NOT NULL;
+UPDATE llx_element_time set element_datehour = element_date where element_datehour IS NULL and element_date IS NOT NULL;
UPDATE llx_projet set fk_opp_status = NULL where fk_opp_status = -1;
UPDATE llx_projet set fk_opp_status = (SELECT rowid FROM llx_c_lead_status WHERE code='PROSP') where fk_opp_status IS NULL and opp_amount > 0;
@@ -389,8 +389,8 @@ update llx_expedition set date_valid = date_creation where fk_statut = 1 and dat
update llx_expedition set date_valid = NOW() where fk_statut = 1 and date_valid IS NULL;
-- Detect bad consistency between duraction_effective of a task and sum of time of tasks
--- select pt.rowid, pt.duration_effective, SUM(ptt.task_duration) as y from llx_projet_task as pt, llx_projet_task_time as ptt where ptt.fk_task = pt.rowid group by pt.rowid, pt.duration_effective having pt.duration_effective <> y;
-update llx_projet_task as pt set pt.duration_effective = (select SUM(ptt.task_duration) as y from llx_projet_task_time as ptt where ptt.fk_task = pt.rowid) where pt.duration_effective <> (select SUM(ptt.task_duration) as y from llx_projet_task_time as ptt where ptt.fk_task = pt.rowid);
+-- select pt.rowid, pt.duration_effective, SUM(ptt.element_duration) as y from llx_projet_task as pt, llx_element_time as ptt where ptt.fk_element = pt.rowid and ptt.elementtype = 'task' group by pt.rowid, pt.duration_effective having pt.duration_effective <> y;
+update llx_projet_task as pt set pt.duration_effective = (select SUM(ptt.element_duration) as y from llx_element_time as ptt where ptt.fk_element = pt.rowid and ptt.elementtype = 'task') where pt.duration_effective <> (select SUM(ptt.element_duration) as y from llx_element_time as ptt where ptt.fk_element = pt.rowid and ptt.elementtype = 'task');
-- Remove duplicate of shipment mode (keep the one with tracking defined)
@@ -422,7 +422,7 @@ UPDATE llx_facture_fourn_det SET fk_code_ventilation = 0 WHERE fk_code_ventilati
UPDATE llx_expensereport_det SET fk_code_ventilation = 0 WHERE fk_code_ventilation > 0 AND fk_code_ventilation NOT IN (select rowid FROM llx_accounting_account);
--- VMYSQL4.1 update llx_projet_task_time set task_datehour = task_date where task_datehour < task_date or task_datehour > DATE_ADD(task_date, interval 1 day);
+-- VMYSQL4.1 update llx_element_time set element_datehour = element_date where element_datehour < element_date or element_datehour > DATE_ADD(element_date, interval 1 day);
-- Clean product prices
@@ -487,7 +487,7 @@ UPDATE llx_chargesociales SET date_creation = tms WHERE date_creation IS NULL;
-- Backport a change of value into the hourly rate.
--- update llx_projet_task_time as ptt set ptt.thm = (SELECT thm from llx_user as u where ptt.fk_user = u.rowid) where (ptt.thm is null)
+-- update llx_element_time as ptt set ptt.thm = (SELECT thm from llx_user as u where ptt.fk_user = u.rowid) where (ptt.thm is null)
-- select * from llx_facturedet as fd, llx_product as p where fd.fk_product = p.rowid AND fd.product_type != p.fk_product_type;
diff --git a/htdocs/install/mysql/tables/llx_c_country.sql b/htdocs/install/mysql/tables/llx_c_country.sql
index 7419b68c26d..f17d93ecdbd 100644
--- a/htdocs/install/mysql/tables/llx_c_country.sql
+++ b/htdocs/install/mysql/tables/llx_c_country.sql
@@ -21,11 +21,14 @@
create table llx_c_country
(
- rowid integer PRIMARY KEY,
- code varchar(2) NOT NULL,
- code_iso varchar(3) ,
- label varchar(128) NOT NULL,
- eec tinyint DEFAULT 0 NOT NULL,
- active tinyint DEFAULT 1 NOT NULL,
- favorite tinyint DEFAULT 0 NOT NULL
+ rowid integer PRIMARY KEY,
+ code varchar(2) NOT NULL, -- the iso 2 alpha code
+ code_iso varchar(3), -- the iso 3 alpha code
+ numeric_code varchar(3), -- the iso numeric number
+ label varchar(128) NOT NULL,
+ eec tinyint DEFAULT 0 NOT NULL,
+ active tinyint DEFAULT 1 NOT NULL,
+ favorite tinyint DEFAULT 0 NOT NULL
)ENGINE=innodb;
+
+
diff --git a/htdocs/install/mysql/tables/llx_projet_task_time.key.sql b/htdocs/install/mysql/tables/llx_element_time.key.sql
similarity index 73%
rename from htdocs/install/mysql/tables/llx_projet_task_time.key.sql
rename to htdocs/install/mysql/tables/llx_element_time.key.sql
index 5acb17bb712..5de06450e75 100644
--- a/htdocs/install/mysql/tables/llx_projet_task_time.key.sql
+++ b/htdocs/install/mysql/tables/llx_element_time.key.sql
@@ -1,5 +1,6 @@
-- ===========================================================================
-- Copyright (C) 2014 Laurent Destailleur
+-- Copyright (C) 2023 Gauthier VERDOL
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
@@ -16,7 +17,7 @@
--
-- ===========================================================================
-ALTER TABLE llx_projet_task_time ADD INDEX idx_projet_task_time_task (fk_task);
-ALTER TABLE llx_projet_task_time ADD INDEX idx_projet_task_time_date (task_date);
-ALTER TABLE llx_projet_task_time ADD INDEX idx_projet_task_time_datehour (task_datehour);
+ALTER TABLE llx_element_time ADD INDEX idx_element_time_task (fk_element);
+ALTER TABLE llx_element_time ADD INDEX idx_element_time_date (element_date);
+ALTER TABLE llx_element_time ADD INDEX idx_element_time_datehour (element_datehour);
diff --git a/htdocs/install/mysql/tables/llx_element_time.sql b/htdocs/install/mysql/tables/llx_element_time.sql
new file mode 100644
index 00000000000..cf346a48ec0
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_element_time.sql
@@ -0,0 +1,38 @@
+-- Copyright (C) 2023 Gauthier VERDOL
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see https://www.gnu.org/licenses/.
+
+
+CREATE TABLE llx_element_time(
+ -- BEGIN MODULEBUILDER FIELDS
+ rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
+ fk_element integer NOT NULL,
+ elementtype varchar(32) NOT NULL,
+ element_date date,
+ element_datehour datetime,
+ element_date_withhour integer,
+ element_duration double,
+ fk_product integer,
+ fk_user integer,
+ thm double(24,8),
+ invoice_id integer DEFAULT NULL,
+ invoice_line_id integer DEFAULT NULL,
+ intervention_id integer DEFAULT NULL,
+ intervention_line_id integer DEFAULT NULL,
+ import_key varchar(14),
+ datec datetime,
+ tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+ note text
+ -- END MODULEBUILDER FIELDS
+) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_projet_task_time.sql b/htdocs/install/mysql/tables/llx_projet_task_time.sql
deleted file mode 100644
index e91e50b5721..00000000000
--- a/htdocs/install/mysql/tables/llx_projet_task_time.sql
+++ /dev/null
@@ -1,38 +0,0 @@
--- ===========================================================================
--- Copyright (C) 2005 Rodolphe Quiedeville
---
--- This program is free software; you can redistribute it and/or modify
--- it under the terms of the GNU General Public License as published by
--- the Free Software Foundation; either version 3 of the License, or
--- (at your option) any later version.
---
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--- GNU General Public License for more details.
---
--- You should have received a copy of the GNU General Public License
--- along with this program. If not, see
-- Copyright (C) 2010 Laurent Destailleur
+-- Copyright (C) 2023 Gauthier VERDOL
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
@@ -150,7 +151,7 @@ CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_projet FOR EACH ROW
CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_projet_extrafields FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_projet_task FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_projet_task_extrafields FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
-CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_projet_task_time FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
+CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_element_time FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_propal FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_propal_extrafields FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_propal_merge_pdf_product FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
diff --git a/htdocs/install/repair.php b/htdocs/install/repair.php
index c40f4a69e89..70be057b7b8 100644
--- a/htdocs/install/repair.php
+++ b/htdocs/install/repair.php
@@ -4,6 +4,7 @@
* Copyright (C) 2005-2012 Regis Houssin
* Copyright (C) 2015 Raphaël Doursenaud
* Copyright (C) 2021 Frédéric France
+ * Copyright (C) 2023 Gauthier VERDOL
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -1030,7 +1031,7 @@ if ($ok && GETPOST('set_empty_time_spent_amount', 'alpha')) {
print '
* Copyright (C) 2010 Juanjo Menent
* Copyright (C) 2015-2016 Raphaël Doursenaud
+ * Copyright (C) 2023 Gauthier VERDOL
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -339,7 +340,7 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
$afterversionarray = explode('.', '2.8.9');
$beforeversionarray = explode('.', '2.9.9');
if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0) {
- migrate_project_task_time($db, $langs, $conf);
+ migrate_element_time($db, $langs, $conf);
migrate_customerorder_shipping($db, $langs, $conf);
@@ -2901,9 +2902,9 @@ function migrate_relationship_tables($db, $langs, $conf, $table, $fk_source, $so
* @param Conf $conf Object conf
* @return void
*/
-function migrate_project_task_time($db, $langs, $conf)
+function migrate_element_time($db, $langs, $conf)
{
- dolibarr_install_syslog("upgrade2::migrate_project_task_time");
+ dolibarr_install_syslog("upgrade2::migrate_element_time");
print '';
@@ -2914,8 +2915,8 @@ function migrate_project_task_time($db, $langs, $conf)
$db->begin();
- $sql = "SELECT rowid, fk_task, task_duration";
- $sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time";
+ $sql = "SELECT rowid, fk_element, element_duration";
+ $sql .= " FROM ".MAIN_DB_PREFIX."element_time";
$resql = $db->query($sql);
if ($resql) {
$i = 0;
@@ -2928,16 +2929,16 @@ function migrate_project_task_time($db, $langs, $conf)
while ($i < $num) {
$obj = $db->fetch_object($resql);
- if ($obj->task_duration > 0) {
+ if ($obj->element_duration > 0) {
// convert to second
// only for int time and float time ex: 1,75 for 1h45
- list($hour, $min) = explode('.', $obj->task_duration);
+ list($hour, $min) = explode('.', $obj->element_duration);
$hour = $hour * 60 * 60;
$min = ($min / 100) * 60 * 60;
$newtime = $hour + $min;
- $sql2 = "UPDATE ".MAIN_DB_PREFIX."projet_task_time SET";
- $sql2 .= " task_duration = ".((int) $newtime);
+ $sql2 = "UPDATE ".MAIN_DB_PREFIX."element_time SET";
+ $sql2 .= " element_duration = ".((int) $newtime);
$sql2 .= " WHERE rowid = ".((int) $obj->rowid);
$resql2 = $db->query($sql2);
@@ -2947,16 +2948,16 @@ function migrate_project_task_time($db, $langs, $conf)
}
print ". ";
$oldtime++;
- if (!empty($totaltime[$obj->fk_task])) {
- $totaltime[$obj->fk_task] += $newtime;
+ if (!empty($totaltime[$obj->fk_element])) {
+ $totaltime[$obj->fk_element] += $newtime;
} else {
- $totaltime[$obj->fk_task] = $newtime;
+ $totaltime[$obj->fk_element] = $newtime;
}
} else {
- if (!empty($totaltime[$obj->fk_task])) {
- $totaltime[$obj->fk_task] += $obj->task_duration;
+ if (!empty($totaltime[$obj->fk_element])) {
+ $totaltime[$obj->fk_element] += $obj->element_duration;
} else {
- $totaltime[$obj->fk_task] = $obj->task_duration;
+ $totaltime[$obj->fk_element] = $obj->element_duration;
}
}
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index a5176383d69..2c72878d40e 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -41,6 +41,7 @@ AlreadyInGeneralLedger=Already transferred to accounting journals and ledger
NotYetInGeneralLedger=Not yet transferred to accouting journals and ledger
GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group
DetailByAccount=Show detail by account
+DetailBy=Detail by
AccountWithNonZeroValues=Accounts with non-zero values
ListOfAccounts=List of accounts
CountriesInEEC=Countries in EEC
diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang
index 0d286fb3104..1112d4647bb 100644
--- a/htdocs/langs/en_US/compta.lang
+++ b/htdocs/langs/en_US/compta.lang
@@ -159,9 +159,10 @@ ConfirmDeleteVariousPayment=Are you sure you want to delete this various payment
ExportDataset_tax_1=Social and fiscal taxes and payments
CalcModeVATDebt=Mode %sVAT on commitment accounting%s .
CalcModeVATEngagement=Mode %sVAT on incomes-expenses%s .
-CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
-CalcModeEngagement=Analysis of known recorded payments, even if they are not yet accounted in Ledger.
+CalcModeDebt=Analysis of known recorded documents
+CalcModeEngagement=Analysis of known recorded payments
CalcModeBookkeeping=Analysis of data journalized in Bookkeeping Ledger table.
+CalcModeNoBookKeeping=Even if they are not yet accounted in Ledger
CalcModeLT1= Mode %sRE on customer invoices - suppliers invoices%s
CalcModeLT1Debt=Mode %sRE on customer invoices%s
CalcModeLT1Rec= Mode %sRE on suppliers invoices%s
diff --git a/htdocs/langs/fr_FR/boxes.lang b/htdocs/langs/fr_FR/boxes.lang
index 6e237c8692e..bf80ff0a874 100644
--- a/htdocs/langs/fr_FR/boxes.lang
+++ b/htdocs/langs/fr_FR/boxes.lang
@@ -52,7 +52,7 @@ BoxTitleOldestActionsToDo=Événements %s les plus anciens à faire, non termin
BoxTitleLastContracts=Les %s derniers contrats modifiés
BoxTitleLastModifiedDonations=Les %s derniers dons modifiés
BoxTitleLastModifiedExpenses=Les %s dernières notes de frais modifiées
-BoxTitleLatestModifiedBoms=Les %s derières BOMS modifiées
+BoxTitleLatestModifiedBoms=Les %s dernières BOMS modifiées
BoxTitleLatestModifiedMos=Les %s derniers ordres de fabrication modifiés
BoxTitleLastOutstandingBillReached=Clients dont l'en-cours autorisé est dépassé
BoxGlobalActivity=Activité globale (factures, propositions, commandes)
diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index 8cf649148a6..a3a6da38951 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -222,6 +222,12 @@ if (!defined('NOREQUIREDB') && !defined('NOREQUIRESOC')) {
// For FR, default value of option to show category of operations is on by default. Decret n°2099-1299 2022-10-07
$conf->global->INVOICE_CATEGORY_OF_OPERATION = 1;
}
+
+ if ($mysoc->localtax1_assuj || $mysoc->localtax2_assuj) {
+ // For countries using the 2nd or 3rd tax, we disable input/edit of lines using the price including tax (because 2nb and 3rd tax not yet taken into account).
+ // Work In Progress to support all taxes into unit price entry when MAIN_UNIT_PRICE_WITH_TAX_IS_FOR_ALL_TAXES is set.
+ $conf->global->MAIN_NO_INPUT_PRICE_WITH_TAX = 1;
+ }
}
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index ec5d8c979ed..7a3aae33d9c 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -554,7 +554,7 @@ if (!empty($moreforfilter)) {
}
$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
+$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
print ''; // You can use div-table-responsive-no-min if you dont need reserved height for your table
@@ -631,7 +631,7 @@ $totalarray['nbfield'] = 0;
// --------------------------------------------------------------------
print '
';
if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
- print getTitleFieldOfList(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+ print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
$totalarray['nbfield']++;
}
foreach ($object->fields as $key => $val) {
@@ -663,7 +663,7 @@ print $hookmanager->resPrint;
}*/
// Action column
if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
- print getTitleFieldOfList(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+ print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
$totalarray['nbfield']++;
}
print ' '."\n";
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 241aec60d8e..b42384e934d 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -207,7 +207,7 @@ if ($cancel) {
$action = '';
}
-$createbarcode = empty($conf->barcode->enabled) ? 0 : 1;
+$createbarcode = isModEnabled('barcode');
if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->creer_advance)) {
$createbarcode = 0;
}
@@ -1419,7 +1419,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
}
}
- $showbarcode = empty($conf->barcode->enabled) ? 0 : 1;
+ $showbarcode = isModEnabled('barcode');
if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) {
$showbarcode = 0;
}
@@ -1984,7 +1984,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
}
// Barcode
- $showbarcode = empty($conf->barcode->enabled) ? 0 : 1;
+ $showbarcode = isModEnabled('barcode');
if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) {
$showbarcode = 0;
}
@@ -2312,7 +2312,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
} else {
// Fiche en mode visu
- $showbarcode = empty($conf->barcode->enabled) ? 0 : 1;
+ $showbarcode = isModEnabled('barcode');
if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) {
$showbarcode = 0;
}
diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php
index 62526483542..f8c075b228c 100644
--- a/htdocs/product/stock/class/mouvementstock.class.php
+++ b/htdocs/product/stock/class/mouvementstock.class.php
@@ -368,6 +368,8 @@ class MouvementStock extends CommonObject
}
} else { // If not found, we add record
$productlot = new Productlot($this->db);
+ $productlot->origin = !empty($this->origin) ? (empty($this->origin->origin_type) ? $this->origin->element : $this->origin->origin_type) : '';
+ $productlot->origin_id = !empty($this->origin) ? $this->origin->id : 0;
$productlot->entity = $conf->entity;
$productlot->fk_product = $fk_product;
$productlot->batch = $batch;
diff --git a/htdocs/projet/activity/index.php b/htdocs/projet/activity/index.php
index bbd9442f876..8f69a8afada 100644
--- a/htdocs/projet/activity/index.php
+++ b/htdocs/projet/activity/index.php
@@ -3,6 +3,7 @@
* Copyright (C) 2006-2015 Laurent Destailleur
* Copyright (C) 2010 Regis Houssin
* Copyright (C) 2019 Nicolas ZABOURI
+ * Copyright (C) 2023 Gauthier VERDOL
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -116,15 +117,16 @@ print ''.$langs->trans('ActivityOnProjectToday').' ';
print ''.$langs->trans("Time").' ';
print " \n";
-$sql = "SELECT p.rowid, p.ref, p.title, p.public, SUM(tt.task_duration) as nb";
+$sql = "SELECT p.rowid, p.ref, p.title, p.public, SUM(tt.element_duration) as nb";
$sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
$sql .= ", ".MAIN_DB_PREFIX."projet_task as t";
-$sql .= ", ".MAIN_DB_PREFIX."projet_task_time as tt";
+$sql .= ", ".MAIN_DB_PREFIX."element_time as tt";
$sql .= " WHERE t.fk_projet = p.rowid";
$sql .= " AND p.entity = ".((int) $conf->entity);
-$sql .= " AND tt.fk_task = t.rowid";
+$sql .= " AND tt.fk_element = t.rowid";
+$sql .= " AND tt.elementtype = 'task'";
$sql .= " AND tt.fk_user = ".((int) $user->id);
-$sql .= " AND task_date BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."' AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."'";
+$sql .= " AND element_date BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."' AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."'";
$sql .= " AND p.rowid in (".$db->sanitize($projectsListId).")";
$sql .= " GROUP BY p.rowid, p.ref, p.title, p.public";
@@ -169,15 +171,16 @@ print ''.$langs->trans('ActivityOnProjectYesterday').' ';
print ''.$langs->trans("Time").' ';
print "