';
print '';
- print $ligne->LibStatut($obj->statut_ligne, 2);
+ print $line->LibStatut($obj->statut_ligne, 2);
print " ";
print '';
print substr('000000'.$obj->rowid_ligne, -6);
diff --git a/htdocs/compta/prelevement/rejets.php b/htdocs/compta/prelevement/rejets.php
index 602c57b5ad4..6d1994b7a4b 100644
--- a/htdocs/compta/prelevement/rejets.php
+++ b/htdocs/compta/prelevement/rejets.php
@@ -43,6 +43,7 @@ $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
$sortorder = GETPOST('sortorder', 'alpha');
$sortfield = GETPOST('sortfield', 'alpha');
$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+if (empty($page) || $page == -1) { $page = 0; } // If $page is not defined, or '' or -1
$offset = $limit * $page;
$pageprev = $page - 1;
$pagenext = $page + 1;
@@ -56,7 +57,10 @@ if ($sortorder == "") $sortorder = "DESC";
if ($sortfield == "") $sortfield = "p.datec";
$rej = new RejetPrelevement($db, $user);
-$ligne = new LignePrelevement($db, $user);
+$line = new LignePrelevement($db);
+
+$hookmanager->initHooks(array('withdrawalsreceiptsrejectedlist'));
+
/*
* Liste des factures
@@ -84,7 +88,7 @@ if ($result)
print_barre_liste($langs->trans("WithdrawsRefused"), $page, $_SERVER["PHP_SELF"], $urladd, $sortfield, $sortorder, '', $num);
print"\n\n";
- print ' ';
+ print '';
print '';
print_liste_field_titre("Line", $_SERVER["PHP_SELF"], "p.ref", '', $urladd);
print_liste_field_titre("ThirdParty", $_SERVER["PHP_SELF"], "s.nom", '', $urladd);
@@ -98,7 +102,7 @@ if ($result)
$obj = $db->fetch_object($result);
print ' ';
- print $ligne->LibStatut($obj->statut, 2).' ';
+ print $line->LibStatut($obj->statut, 2).' ';
print '';
print substr('000000'.$obj->rowid, -6)." ";
diff --git a/htdocs/compta/prelevement/stats.php b/htdocs/compta/prelevement/stats.php
index c19603df967..c6d1962ff46 100644
--- a/htdocs/compta/prelevement/stats.php
+++ b/htdocs/compta/prelevement/stats.php
@@ -73,7 +73,7 @@ if ($resql)
print '
* Copyright (C) 2014 Florian Henry
* Copyright (C) 2018 Frédéric France
+ * Copyright (C) 2020 Maxime DEMAREST
*
* 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
@@ -38,7 +39,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountancycategory.class.php';
// Load translation files required by the page
-$langs->loadLangs(array('compta', 'bills', 'donation', 'salaries', 'accountancy'));
+$langs->loadLangs(array('compta', 'bills', 'donation', 'salaries', 'accountancy', 'loan'));
$date_startmonth = GETPOST('date_startmonth', 'int');
$date_startday = GETPOST('date_startday', 'int');
@@ -953,6 +954,115 @@ else
print ' '.$langs->trans("VariousPayment").' ';
+ print "".$langs->trans("Debit")." \n";
+ if ($modecompta == 'CREANCES-DETTES') print ''.price(-$obj->amount).' ';
+ print ''.price(-$obj->amount)." \n";
+ print " ';
+ print "".$langs->trans("Credit")." \n";
+ if ($modecompta == 'CREANCES-DETTES') print ''.price($obj->amount).' ';
+ print ''.price($obj->amount)." \n";
+ print "';
+ if ($modecompta == 'CREANCES-DETTES')
+ print ''.price($subtotal_ht).' ';
+ print ''.price($subtotal_ttc).' ';
+ print ' ';
+ }
+ else dol_print_error($db);
+ }
+
+ /*
+ * Payement Loan
+ */
+
+ if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_LOAN) && !empty($conf->loan->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES"))
+ {
+ $subtotal_ht = 0;
+ $subtotal_ttc = 0;
+
+ print ''.$langs->trans("PaymentLoan").' ';
+ print "".$loan_static->getNomUrl(1).' - '.$obj->label." \n";
+ if ($modecompta == 'CREANCES-DETTES') print ''.price(-$obj->amount).' ';
+ print ''.price(-$obj->amount)." \n";
+ print "';
+ if ($modecompta == 'CREANCES-DETTES')
+ print ''.price($subtotal_ht).' ';
+ print ''.price($subtotal_ttc).' ';
+ print ' ';
+ }
+ else dol_print_error($db);
+ }
/*
* VAT
diff --git a/htdocs/compta/resultat/index.php b/htdocs/compta/resultat/index.php
index d462007d273..ad81a3943c1 100644
--- a/htdocs/compta/resultat/index.php
+++ b/htdocs/compta/resultat/index.php
@@ -6,6 +6,7 @@
* Copyright (C) 2014 Juanjo Menent
* Copyright (C) 2014 Florian Henry
* Copyright (C) 2018 Frédéric France
+ * Copyright (C) 2020 Maxime DEMAREST
*
* 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
@@ -794,6 +795,113 @@ elseif ($modecompta == 'BOOKKEEPING') {
// Nothing from this table
}
+/*
+ * Various Payments
+ */
+
+if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_VARPAY) && !empty($conf->banque->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES"))
+{
+ // decaiss
+
+ $sql = "SELECT date_format(p.datep, '%Y-%m') AS dm, SUM(p.amount) AS amount FROM ".MAIN_DB_PREFIX."payment_various as p";
+ $sql .= ' WHERE p.sens = 0';
+ if (!empty($date_start) && !empty($date_end))
+ $sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+ $sql .= ' GROUP BY dm';
+
+ dol_syslog("get various payments");
+ $result = $db->query($sql);
+ if ($result)
+ {
+ $num = $db->num_rows($result);
+ $i = 0;
+ if ($num)
+ {
+ while ($i < $num)
+ {
+ $obj = $db->fetch_object($result);
+ if (!isset($decaiss_ttc[$obj->dm])) $decaiss_ttc[$obj->dm] = 0;
+ if (isset($obj->amount)) $decaiss_ttc[$obj->dm] += $obj->amount;
+ $i++;
+ }
+ }
+ }
+ else
+ {
+ dol_print_error($db);
+ }
+
+ // encaiss
+
+ $sql = "SELECT date_format(p.datep, '%Y-%m') AS dm, SUM(p.amount) AS amount FROM ".MAIN_DB_PREFIX."payment_various AS p";
+ $sql .= ' WHERE p.sens = 1';
+ if (!empty($date_start) && !empty($date_end))
+ $sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+ $sql .= ' GROUP BY dm';
+
+ dol_syslog("get various payments");
+ $result = $db->query($sql);
+ if ($result)
+ {
+ $num = $db->num_rows($result);
+ $i = 0;
+ if ($num)
+ {
+ while ($i < $num)
+ {
+ $obj = $db->fetch_object($result);
+ if (!isset($encaiss_ttc[$obj->dm])) $encaiss_ttc[$obj->dm] = 0;
+ if (isset($obj->amount)) $encaiss_ttc[$obj->dm] += $obj->amount;
+ $i++;
+ }
+ }
+ }
+ else
+ {
+ dol_print_error($db);
+ }
+}
+// Useless with BOOKKEEPING
+//elseif ($modecompta == 'BOOKKEEPING') {
+//}
+
+/*
+ * Payement Loan
+ */
+
+if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_LOAN) && !empty($conf->loan->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES"))
+{
+ $sql = "SELECT date_format(p.datep, '%Y-%m') AS dm, SUM(p.amount_capital + p.amount_insurance + p.amount_interest) AS amount FROM ".MAIN_DB_PREFIX."payment_loan AS p";
+ $sql .= ' WHERE 1 = 1';
+ if (!empty($date_start) && !empty($date_end))
+ $sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+ $sql .= ' GROUP BY dm';
+
+ dol_syslog("get loan payments");
+ $result = $db->query($sql);
+ if ($result)
+ {
+ $num = $db->num_rows($result);
+ $i = 0;
+ if ($num)
+ {
+ while ($i < $num)
+ {
+ $obj = $db->fetch_object($result);
+ if (!isset($decaiss_ttc[$obj->dm])) $decaiss_ttc[$obj->dm] = 0;
+ if (isset($obj->amount)) $decaiss_ttc[$obj->dm] += $obj->amount;
+ $i++;
+ }
+ }
+ }
+ else
+ {
+ dol_print_error($db);
+ }
+}
+// Useless with BOOKKEEPING
+//elseif ($modecompta == 'BOOKKEEPING') {
+//}
/*
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 25242dc2185..9e7485d189f 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -939,7 +939,7 @@ while ($i < min($num, $limit))
// Extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
// Fields from hook
- $parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+ $parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
// Date creation
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 3c64b627a5c..9f825cdf009 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -521,7 +521,9 @@ if (empty($reshook))
}
$desc = $prod->description;
- $desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION));
+ if (!empty($product_desc) && !empty($conf->global->MAIN_NO_CONCAT_DESCRIPTION)) $desc = $product_desc;
+ else $desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION));
+
$fk_unit = $prod->fk_unit;
}
else
@@ -1450,7 +1452,7 @@ else
print '';
- // Ligne info remises tiers
+ // Line info of thirdparty discounts
print ''.$langs->trans('Discount').' ';
if ($object->thirdparty->remise_percent) print $langs->trans("CompanyHasRelativeDiscount", $object->thirdparty->remise_percent);
else print $langs->trans("CompanyHasNoRelativeDiscount");
@@ -1500,8 +1502,6 @@ else
}
- $colorb = '666666';
-
$arrayothercontracts = $object->getListOfContracts('others');
/*
@@ -1642,13 +1642,13 @@ else
}
if ($user->rights->contrat->creer && ($object->statut >= 0))
{
- print '';
+ print ' ';
print img_edit();
print ' ';
}
if ($user->rights->contrat->creer && ($object->statut >= 0))
{
- print '';
+ print ' ';
print img_delete();
print ' ';
}
@@ -1773,8 +1773,8 @@ else
print ' ';
}
print '';
- print ' ';
print '';
print '
';
-
print '
';
print ''.$langs->trans("NbOfAttachedFiles").' '.count($filearray).' '.$langs->trans("TotalSizeOfAttachedFiles").' '.dol_print_size($totalsize, 1, 1).' ';
- print '';
+ print ' ';
$staticcontrat->ref = ($obj->ref ? $obj->ref : $obj->cid);
$staticcontrat->id = $obj->cid;
print $staticcontrat->getNomUrl(1, 16);
@@ -425,7 +425,7 @@ if ($resql)
$obj = $db->fetch_object($resql);
print ' ';
- print '';
+ print ' ';
$staticcontrat->ref = ($obj->ref ? $obj->ref : $obj->fk_contrat);
$staticcontrat->id = $obj->fk_contrat;
print $staticcontrat->getNomUrl(1, 16);
@@ -506,7 +506,7 @@ if ($resql)
print ' ';
- print '';
+ print ' ';
$staticcontrat->ref = ($obj->ref ? $obj->ref : $obj->fk_contrat);
$staticcontrat->id = $obj->fk_contrat;
print $staticcontrat->getNomUrl(1, 16);
@@ -586,7 +586,7 @@ if ($resql)
print ' ';
- print '';
+ print ' ';
$staticcontrat->ref = ($obj->ref ? $obj->ref : $obj->fk_contrat);
$staticcontrat->id = $obj->fk_contrat;
print $staticcontrat->getNomUrl(1, 16);
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index 70ab37c0380..a7205730817 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -1,6 +1,6 @@
- * Copyright (C) 2004-2019 Laurent Destailleur
+ * Copyright (C) 2004-2020 Laurent Destailleur
* Copyright (C) 2005-2012 Regis Houssin
* Copyright (C) 2013 Cédric Salvador
* Copyright (C) 2014-2019 Juanjo Menent
@@ -612,9 +612,11 @@ while ($i < min($num, $limit))
}
print '';
+
+ // Ref
if (!empty($arrayfields['c.ref']['checked']))
{
- print '';
+ print ' ';
print $contracttmp->getNomUrl(1);
if ($obj->nb_late) print img_warning($langs->trans("Late"));
if (!empty($obj->note_private) || !empty($obj->note_public)) {
@@ -631,6 +633,7 @@ while ($i < min($num, $limit))
print ' ';
}
+
if (!empty($arrayfields['c.ref_customer']['checked']))
{
print ''.$contracttmp->getFormatedCustomerRef($obj->ref_customer).' ';
@@ -743,7 +746,7 @@ while ($i < min($num, $limit))
// Extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
// Fields from hook
- $parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+ $parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
// Date creation
diff --git a/htdocs/contrat/services_list.php b/htdocs/contrat/services_list.php
index b8ab4cfe1ce..2b81ceff5fa 100644
--- a/htdocs/contrat/services_list.php
+++ b/htdocs/contrat/services_list.php
@@ -247,22 +247,31 @@ if ($search_name) $sql .= " AND s.nom LIKE '%".$db->escape($search_name)."%'
if ($search_contract) $sql .= " AND c.ref LIKE '%".$db->escape($search_contract)."%' ";
if ($search_service) $sql .= " AND (p.ref LIKE '%".$db->escape($search_service)."%' OR p.description LIKE '%".$db->escape($search_service)."%' OR cd.description LIKE '%".$db->escape($search_service)."%')";
if ($socid > 0) $sql .= " AND s.rowid = ".$socid;
-$filter_dateouvertureprevue = dol_mktime(0, 0, 0, $opouvertureprevuemonth, $opouvertureprevueday, $opouvertureprevueyear);
-if ($filter_dateouvertureprevue != '' && $filter_opouvertureprevue == -1) $filter_opouvertureprevue = '=';
-$filter_date1 = dol_mktime(0, 0, 0, $op1month, $op1day, $op1year);
-if ($filter_date1 != '' && $filter_op1 == -1) $filter_op1 = '=';
+$filter_dateouvertureprevue_start=dol_mktime(0, 0, 0, $opouvertureprevuemonth, $opouvertureprevueday, $opouvertureprevueyear);
+$filter_dateouvertureprevue_end=dol_mktime(23, 59, 59, $opouvertureprevuemonth, $opouvertureprevueday, $opouvertureprevueyear);
+if ($filter_dateouvertureprevue_start != '' && $filter_opouvertureprevue == -1) $filter_opouvertureprevue = ' BETWEEN ';
-$filter_date2 = dol_mktime(0, 0, 0, $op2month, $op2day, $op2year);
-if ($filter_date2 != '' && $filter_op2 == -1) $filter_op2 = '=';
+$filter_date1_start =dol_mktime(0, 0, 0, $op1month, $op1day, $op1year);
+$filter_date1_end =dol_mktime(23, 59, 59, $op1month, $op1day, $op1year);
+if ($filter_date1_start != '' && $filter_op1 == -1) $filter_op1 = ' BETWEEN ';
-$filter_datecloture = dol_mktime(0, 0, 0, $opcloturemonth, $opclotureday, $opclotureyear);
-if ($filter_datecloture != '' && $filter_opcloture == -1) $filter_opcloture = '=';
+$filter_date2_start=dol_mktime(0, 0, 0, $op2month, $op2day, $op2year);
+$filter_date2_end=dol_mktime(23, 59, 59, $op2month, $op2day, $op2year);
+if ($filter_date2_start != '' && $filter_op2 == -1) $filter_op2 = ' BETWEEN ';
-if (!empty($filter_opouvertureprevue) && $filter_opouvertureprevue != -1 && $filter_dateouvertureprevue != '') $sql .= " AND cd.date_ouverture_prevue ".$filter_opouvertureprevue." '".$db->idate($filter_dateouvertureprevue)."'";
-if (!empty($filter_op1) && $filter_op1 != -1 && $filter_date1 != '') $sql .= " AND cd.date_ouverture ".$filter_op1." '".$db->idate($filter_date1)."'";
-if (!empty($filter_op2) && $filter_op2 != -1 && $filter_date2 != '') $sql .= " AND cd.date_fin_validite ".$filter_op2." '".$db->idate($filter_date2)."'";
-if (!empty($filter_opcloture) && $filter_opcloture != -1 && $filter_datecloture != '') $sql .= " AND cd.date_cloture ".$filter_opcloture." '".$db->idate($filter_datecloture)."'";
+$filter_datecloture_start=dol_mktime(0, 0, 0, $opcloturemonth, $opclotureday, $opclotureyear);
+$filter_datecloture_end=dol_mktime(23, 59, 59, $opcloturemonth, $opclotureday, $opclotureyear);
+if ($filter_datecloture_start != '' && $filter_opcloture == -1) $filter_opcloture = ' BETWEEN ';
+
+if (! empty($filter_opouvertureprevue) && $filter_opouvertureprevue != -1 && $filter_opouvertureprevue != ' BETWEEN ' && $filter_dateouvertureprevue_start != '') $sql.= " AND cd.date_ouverture_prevue ".$filter_opouvertureprevue." '".$db->idate($filter_dateouvertureprevue_start)."'";
+if (! empty($filter_opouvertureprevue) && $filter_opouvertureprevue == ' BETWEEN ') $sql.= " AND '".$db->idate($filter_dateouvertureprevue_end)."'";
+if (! empty($filter_op1) && $filter_op1 != -1 && $filter_op1 != ' BETWEEN ' && $filter_date1_start != '') $sql.= " AND cd.date_ouverture ".$filter_op1." '".$db->idate($filter_date1_start)."'";
+if (! empty($filter_op1) && $filter_op1==' BETWEEN ') $sql.= " AND '".$db->idate($filter_date1_end)."'";
+if (! empty($filter_op2) && $filter_op2 != -1 && $filter_op2 != ' BETWEEN ' && $filter_date2_start != '') $sql.= " AND cd.date_fin_validite ".$filter_op2." '".$db->idate($filter_date2_start)."'";
+if (! empty($filter_op2) && $filter_op2==' BETWEEN ') $sql.= " AND '".$db->idate($filter_date2_end)."'";
+if (! empty($filter_opcloture) && $filter_opcloture != ' BETWEEN ' && $filter_opcloture != -1 && $filter_datecloture_start != '') $sql.= " AND cd.date_cloture ".$filter_opcloture." '".$db->idate($filter_datecloture_start)."'";
+if (! empty($filter_opcloture) && $filter_opcloture==' BETWEEN ') $sql.= " AND '".$db->idate($filter_datecloture_end)."'";
// Add where from extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
$sql .= $db->order($sortfield, $sortorder);
@@ -688,7 +697,7 @@ while ($i < min($num, $limit))
// Extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
// Fields from hook
- $parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+ $parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
// Date creation
diff --git a/htdocs/core/ajax/ajaxdirtree.php b/htdocs/core/ajax/ajaxdirtree.php
index 04687b77829..3e54532668a 100644
--- a/htdocs/core/ajax/ajaxdirtree.php
+++ b/htdocs/core/ajax/ajaxdirtree.php
@@ -428,11 +428,11 @@ function treeOutputForAbsoluteDir($sqltree, $selecteddir, $fullpathselecteddir,
print (isset($val['cachenbofdoc']) && $val['cachenbofdoc'] >= 0) ? $val['cachenbofdoc'] : ' ';
print '';
print '';
- if ($nbofsubdir > 0 && $nboffilesinsubdir > 0) print '+'.$nboffilesinsubdir.' ';
+ if ($nbofsubdir > 0 && $nboffilesinsubdir > 0) print '+'.$nboffilesinsubdir.' ';
print ' ';
// Edit link
- print ''.img_edit($langs->trans("Edit").' - '.$langs->trans("View"), 0, 'class="valignmiddle opacitymedium"').' $1 ', $label, 1);
+ if (!empty($filterkey) && $filterkey != '') $label = preg_replace('/('.preg_quote($filterkey, '/').')/i', '$1 ', $label, 1);
$outkey = $objp->rowid;
$outref = $objp->ref;
@@ -2579,7 +2579,7 @@ class Form
if ($outorigin && !empty($conf->global->PRODUCT_SHOW_ORIGIN_IN_COMBO)) $opt .= ' ('.getCountry($outorigin, 1).')';
$objRef = $objp->ref;
- if (!empty($filterkey) && $filterkey != '') $objRef = preg_replace('/('.preg_quote($filterkey).')/i', '$1 ', $objRef, 1);
+ if (!empty($filterkey) && $filterkey != '') $objRef = preg_replace('/('.preg_quote($filterkey, '/').')/i', '$1 ', $objRef, 1);
$outval .= $objRef;
if ($outbarcode) $outval .= ' ('.$outbarcode.')';
$outval .= ' - '.dol_trunc($label, $maxlengtharticle);
@@ -2948,11 +2948,11 @@ class Form
}
$objRef = $objp->ref;
- if ($filterkey && $filterkey != '') $objRef = preg_replace('/('.preg_quote($filterkey).')/i', '$1 ', $objRef, 1);
+ if ($filterkey && $filterkey != '') $objRef = preg_replace('/('.preg_quote($filterkey, '/').')/i', '$1 ', $objRef, 1);
$objRefFourn = $objp->ref_fourn;
- if ($filterkey && $filterkey != '') $objRefFourn = preg_replace('/('.preg_quote($filterkey).')/i', '$1 ', $objRefFourn, 1);
+ if ($filterkey && $filterkey != '') $objRefFourn = preg_replace('/('.preg_quote($filterkey, '/').')/i', '$1 ', $objRefFourn, 1);
$label = $objp->label;
- if ($filterkey && $filterkey != '') $label = preg_replace('/('.preg_quote($filterkey).')/i', '$1 ', $label, 1);
+ if ($filterkey && $filterkey != '') $label = preg_replace('/('.preg_quote($filterkey, '/').')/i', '$1 ', $label, 1);
$optlabel = $objp->ref;
if (!empty($objp->idprodfournprice) && ($objp->ref != $objp->ref_fourn)) {
@@ -7676,10 +7676,11 @@ class Form
* @param int $enableonly Array list of groups id to be enabled. All other must be disabled
* @param string $force_entity '0' or Ids of environment to force
* @param bool $multiple add [] in the name of element and add 'multiple' attribut (not working with ajax_autocompleter)
+ * @param string $morecss More css to add to html component
* @return string
* @see select_dolusers()
*/
- public function select_dolgroups($selected = '', $htmlname = 'groupid', $show_empty = 0, $exclude = '', $disabled = 0, $include = '', $enableonly = '', $force_entity = '0', $multiple = false)
+ public function select_dolgroups($selected = '', $htmlname = 'groupid', $show_empty = 0, $exclude = '', $disabled = 0, $include = '', $enableonly = '', $force_entity = '0', $multiple = false, $morecss = '')
{
// phpcs:enable
global $conf, $user, $langs;
@@ -7722,7 +7723,7 @@ class Form
include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
$out .= ajax_combobox($htmlname);
- $out .= '';
+ $out .= '';
$num = $this->db->num_rows($resql);
$i = 0;
diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php
index b06877c8c3b..398e2b8a235 100644
--- a/htdocs/core/class/html.formactions.class.php
+++ b/htdocs/core/class/html.formactions.class.php
@@ -165,13 +165,12 @@ class FormActions
* @param string $morecss More css on table
* @param int $max Max number of record
* @param string $moreparambacktopage More param for the backtopage
- * @param string $morehtmlright More html text on right of title line
+ * @param string $morehtmlcenter More html text on center of title line
* @return int <0 if KO, >=0 if OK
*/
- public function showactions($object, $typeelement, $socid = 0, $forceshowtitle = 0, $morecss = 'listactions', $max = 0, $moreparambacktopage = '', $morehtmlright = '')
+ public function showactions($object, $typeelement, $socid = 0, $forceshowtitle = 0, $morecss = 'listactions', $max = 0, $moreparambacktopage = '', $morehtmlcenter = '')
{
global $langs, $conf, $user;
- global $bc;
require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
@@ -208,8 +207,9 @@ class FormActions
$newcardbutton .= dolGetButtonTitle($langs->trans("AddEvent"), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create&datep='.dol_print_date(dol_now(), 'dayhourlog').'&origin='.$typeelement.'&originid='.$object->id.($object->socid > 0 ? '&socid='.$object->socid : ($socid > 0 ? '&socid='.$socid : '')).($projectid > 0 ? '&projectid='.$projectid : '').'&backtopage='.urlencode($urlbacktopage));
}
+
print ''."\n";
- print load_fiche_titre($title, $newcardbutton, '', 0, 0, '', $morehtmlright);
+ print load_fiche_titre($title, $newcardbutton, '', 0, 0, '', $morehtmlcenter);
$page = 0; $param = '';
@@ -230,29 +230,29 @@ class FormActions
$cacheusers = array();
$cursorevent = 0;
- foreach ($listofactions as $action)
+ foreach ($listofactions as $actioncomm)
{
if ($max && $cursorevent >= $max) break;
- $ref = $action->getNomUrl(1, -1);
- $label = $action->getNomUrl(0, 38);
+ $ref = $actioncomm->getNomUrl(1, -1);
+ $label = $actioncomm->getNomUrl(0, 38);
print '';
// Ref
print ''.$ref.' ';
// Onwer
print '';
- if (!empty($action->userownerid))
+ if (!empty($actioncomm->userownerid))
{
- if (is_object($cacheusers[$action->userownerid]))
+ if (is_object($cacheusers[$actioncomm->userownerid]))
{
- $tmpuser = $cacheusers[$action->userownerid];
+ $tmpuser = $cacheusers[$actioncomm->userownerid];
}
else
{
$tmpuser = new User($this->db);
- $tmpuser->fetch($action->userownerid);
- $cacheusers[$action->userownerid] = $tmpuser;
+ $tmpuser->fetch($actioncomm->userownerid);
+ $cacheusers[$actioncomm->userownerid] = $tmpuser;
}
if ($tmpuser->id > 0)
{
@@ -260,41 +260,50 @@ class FormActions
}
}
print ' ';
+
// Type
print '';
+ // TODO Code common with code into comm/action/list.php
$imgpicto = '';
if (!empty($conf->global->AGENDA_USE_EVENT_TYPE))
{
- if ($action->type_picto) $imgpicto = img_picto('', $action->type_picto);
+ if ($actioncomm->type_picto) {
+ $imgpicto = img_picto('', $actioncomm->type_picto);
+ }
else {
- if ($action->type_code == 'AC_RDV') $imgpicto = img_picto('', 'object_group', '', false, 0, 0, '', 'paddingright').' ';
- elseif ($action->type_code == 'AC_TEL') $imgpicto = img_picto('', 'object_phoning', '', false, 0, 0, '', 'paddingright').' ';
- elseif ($action->type_code == 'AC_FAX') $imgpicto = img_picto('', 'object_phoning_fax', '', false, 0, 0, '', 'paddingright').' ';
- elseif ($action->type_code == 'AC_EMAIL') $imgpicto = img_picto('', 'object_email', '', false, 0, 0, '', 'paddingright').' ';
- elseif ($action->type_code == 'AC_INT') $imgpicto = img_picto('', 'object_intervention', '', false, 0, 0, '', 'paddingright').' ';
- elseif (!preg_match('/_AUTO/', $action->type_code)) $imgpicto = img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright').' ';
+ if ($actioncomm->type_code == 'AC_RDV') $imgpicto = img_picto('', 'object_group', '', false, 0, 0, '', 'paddingright').' ';
+ elseif ($actioncomm->type_code == 'AC_TEL') $imgpicto = img_picto('', 'object_phoning', '', false, 0, 0, '', 'paddingright').' ';
+ elseif ($actioncomm->type_code == 'AC_FAX') $imgpicto = img_picto('', 'object_phoning_fax', '', false, 0, 0, '', 'paddingright').' ';
+ elseif ($actioncomm->type_code == 'AC_EMAIL') $imgpicto = img_picto('', 'object_email', '', false, 0, 0, '', 'paddingright').' ';
+ elseif ($actioncomm->type_code == 'AC_INT') $imgpicto = img_picto('', 'object_intervention', '', false, 0, 0, '', 'paddingright').' ';
+ elseif ($actioncomm->type_code == 'AC_OTH' && $actioncomm->code == 'TICKET_MSG') $imgpicto = img_picto('', 'object_conversation', '', false, 0, 0, '', 'paddingright').' ';
+ elseif (!preg_match('/_AUTO/', $actioncomm->type_code)) $imgpicto = img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright').' ';
}
}
print $imgpicto;
- print $action->type_short ? $action->type_short : $action->type;
+ if ($actioncomm->type_code == 'AC_OTH' && $actioncomm->code == 'TICKET_MSG') {
+ print $langs->trans("Message");
+ } else {
+ print $actioncomm->type_short ? $actioncomm->type_short : $actioncomm->type;
+ }
print ' ';
// Label
print ''.$label.' ';
// Date
- print ''.dol_print_date($action->datep, 'dayhour', 'tzuserrel');
- if ($action->datef)
+ print ' '.dol_print_date($actioncomm->datep, 'dayhour', 'tzuserrel');
+ if ($actioncomm->datef)
{
- $tmpa = dol_getdate($action->datep);
- $tmpb = dol_getdate($action->datef);
+ $tmpa = dol_getdate($actioncomm->datep);
+ $tmpb = dol_getdate($actioncomm->datef);
if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year'])
{
- if ($tmpa['hours'] != $tmpb['hours'] || $tmpa['minutes'] != $tmpb['minutes'] && $tmpa['seconds'] != $tmpb['seconds']) print '-'.dol_print_date($action->datef, 'hour', 'tzuserrel');
+ if ($tmpa['hours'] != $tmpb['hours'] || $tmpa['minutes'] != $tmpb['minutes'] && $tmpa['seconds'] != $tmpb['seconds']) print '-'.dol_print_date($actioncomm->datef, 'hour', 'tzuserrel');
}
- else print '-'.dol_print_date($action->datef, 'dayhour', 'tzuserrel');
+ else print '-'.dol_print_date($actioncomm->datef, 'dayhour', 'tzuserrel');
}
print ' ';
print '';
- print $action->getLibStatut(3);
+ print $actioncomm->getLibStatut(3);
print ' ';
print ' ';
@@ -330,9 +339,10 @@ class FormActions
* @param int $hideinfohelp 1=Do not show info help, 0=Show, -1=Show+Add info to tell how to set default value
* @param int $multiselect 1=Allow multiselect of action type
* @param int $nooutput 1=No output
+ * @param string $morecss More css to add to SELECT component.
* @return string
*/
- public function select_type_actions($selected = '', $htmlname = 'actioncode', $excludetype = '', $onlyautoornot = 0, $hideinfohelp = 0, $multiselect = 0, $nooutput = 0)
+ public function select_type_actions($selected = '', $htmlname = 'actioncode', $excludetype = '', $onlyautoornot = 0, $hideinfohelp = 0, $multiselect = 0, $nooutput = 0, $morecss = '')
{
// phpcs:enable
global $langs, $user, $form, $conf;
@@ -343,10 +353,13 @@ class FormActions
require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
$caction = new CActionComm($this->db);
- // Suggest a list with manual events or all auto events
- $arraylist = $caction->liste_array(1, 'code', $excludetype, $onlyautoornot);
- array_unshift($arraylist, ' '); // Add empty line at start
- //asort($arraylist);
+ // Suggest a list with manual events or all auto events
+ $arraylist = $caction->liste_array(1, 'code', $excludetype, $onlyautoornot);
+ if (empty($multiselect)) {
+ // Add empty line at start only if no multiselect
+ array_unshift($arraylist, ' ');
+ }
+ //asort($arraylist);
if ($selected == 'manual') $selected = 'AC_OTH';
if ($selected == 'auto') $selected = 'AC_OTH_AUTO';
@@ -362,7 +375,7 @@ class FormActions
}
else
{
- $out .= $form->selectarray($htmlname, $arraylist, $selected, 0, 0, 0, '', 0, 0, 0, '', 'minwidth200', 1);
+ $out .= $form->selectarray($htmlname, $arraylist, $selected, 0, 0, 0, '', 0, 0, 0, '', 'minwidth200'.($morecss ? ' '.$morecss : ''), 1);
}
if ($user->admin && empty($onlyautoornot) && $hideinfohelp <= 0)
diff --git a/htdocs/core/class/html.formcategory.class.php b/htdocs/core/class/html.formcategory.class.php
index 4dd8bed247b..41e39cc93a2 100644
--- a/htdocs/core/class/html.formcategory.class.php
+++ b/htdocs/core/class/html.formcategory.class.php
@@ -23,6 +23,10 @@
require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
+
+/**
+ * Class to manage forms for categories
+ */
class FormCategory extends Form
{
/**
diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php
index 5f32f5063d6..6fb02454311 100644
--- a/htdocs/core/class/html.formcompany.class.php
+++ b/htdocs/core/class/html.formcompany.class.php
@@ -32,6 +32,10 @@
require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
+
+/**
+ * Class of forms component to manage companies
+ */
class FormCompany extends Form
{
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 075fb95066b..26abcf2e721 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -78,9 +78,10 @@ class FormFile
* @param string $accept Specifies the types of files accepted (This is not a security check but an user interface facility. eg '.pdf,image/*' or '.png,.jpg' or 'video/*')
* @param string $sectiondir If upload must be done inside a particular directory (if sectiondir defined, sectionid must not be)
* @param int $usewithoutform 0=Default, 1=Disable