'.$langs->trans("Project").' ';
print img_picto('', 'project', 'class="pictofixedwidth"');
- print $formproject->select_projects((!empty($societe->id) ? $societe->id : -1), $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500 widthcentpercentminusxx');
+ print $formproject->select_projects((empty($societe->id) ? '' : $societe->id), $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500 widthcentpercentminusxx');
- print ' ';
+ print ' ';
print ' ';
$urloption = '?action=create&donotclearsession=1';
$url = dol_buildpath('comm/action/card.php', 2).$urloption;
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 9fac243ac86..cba52bf2384 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -59,6 +59,8 @@ if (empty($filtert) && empty($conf->global->AGENDA_ALL_CALENDARS)) {
$filtert = $user->id;
}
+$newparam = '';
+
$sortfield = GETPOST("sortfield", 'alpha');
$sortorder = GETPOST("sortorder", 'alpha');
$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
diff --git a/htdocs/contrat/services_list.php b/htdocs/contrat/services_list.php
index 5a93f3fde33..d4ab03b9800 100644
--- a/htdocs/contrat/services_list.php
+++ b/htdocs/contrat/services_list.php
@@ -292,6 +292,11 @@ if ($socid > 0) {
$sql .= " AND s.rowid = ".((int) $socid);
}
+$filter_dateouvertureprevue = '';
+$filter_date1 = '';
+$filter_date2 = '';
+$filter_opcloture = '';
+
$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) {
@@ -425,6 +430,7 @@ if ($filter_date2_start != '') {
if ($filter_datecloture_start != '') {
$param .= '&opclotureday='.$op2day.'&opcloturemonth='.$op2month.'&opclotureyear='.$op2year;
}
+
if ($optioncss != '') {
$param .= '&optioncss='.$optioncss;
}
@@ -468,7 +474,7 @@ if ($mode == "5") {
print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'contract', 0, '', '', $limit);
-if ($sall) {
+if (!empty($sall)) {
foreach ($fieldstosearchall as $key => $val) {
$fieldstosearchall[$key] = $langs->trans($val);
}
@@ -476,6 +482,7 @@ if ($sall) {
}
$morefilter = '';
+$moreforfilter = '';
// If the user can view categories of products
if ($conf->categorie->enabled && ($user->rights->produit->lire || $user->rights->service->lire)) {
diff --git a/htdocs/core/class/google.class.php b/htdocs/core/class/google.class.php
index ee122ff7cb5..4a91d548122 100644
--- a/htdocs/core/class/google.class.php
+++ b/htdocs/core/class/google.class.php
@@ -66,10 +66,12 @@ class GoogleAPI
$i = 0;
// Desired address
- $urladdress = "https://maps.google.com/maps/geo?q=".urlencode($address)."&output=xml&key=".$this->key;
+ $urladdress = "https://maps.google.com/maps/geo?q=".urlencode($address)."&output=xml&key=".urlencode($this->key);
// Retrieve the URL contents
- $page = file_get_contents($urladdress);
+ require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
+ $pagearray = getURLContent($urladdress, 'GET');
+ $page = $pagearray['content'];
$code = strstr($page, '');
$code = strstr($code, '>');
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index ef5b3eab061..ec12e397052 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -160,9 +160,10 @@ function versiondolibarrarray()
* @param int $linelengthlimit Limit for length of each line (Use 0 if unknown, may be faster if defined)
* @param int $nocommentremoval Do no try to remove comments (in such a case, we consider that each line is a request, so use also $linelengthlimit=0)
* @param int $offsetforchartofaccount Offset to use to load chart of account table to update sql on the fly to add offset to rowid and account_parent value
+ * @param int $colspan 2=Add a colspan=2 on td
* @return int <=0 if KO, >0 if OK
*/
-function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handler = '', $okerror = 'default', $linelengthlimit = 32768, $nocommentremoval = 0, $offsetforchartofaccount = 0)
+function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handler = '', $okerror = 'default', $linelengthlimit = 32768, $nocommentremoval = 0, $offsetforchartofaccount = 0, $colspan = 0)
{
global $db, $conf, $langs, $user;
@@ -282,13 +283,9 @@ function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handle
}
} else {
if (!$silent) {
- print '';
- }
- if (!$silent) {
- print ''.$langs->trans("Failed to get max rowid for ".$table)."
";
- }
- if (!$silent) {
- print '';
+ print ''.$langs->trans("Failed to get max rowid for ".$table)."
";
+ print ' '.$langs->trans("Request").' '.($i + 1)." sql='".dol_htmlentities($newsql, ENT_NOQUOTES)."' '.$langs->trans("Request").' '.($i + 1)." sql='".dol_htmlentities($newsql, ENT_NOQUOTES)."' ';
- }
- if (!$silent) {
- print ''.$langs->trans("FileIsNotCorrect")."
";
- }
- if (!$silent) {
- print '';
+ print ''.$langs->trans("FileIsNotCorrect")."
";
+ print ' ';
- }
- if (!$silent) {
- print ''.$langs->trans("Error")." ".$db->errno().": ".$newsql."
";
- }
- if (!$silent) {
- print '';
+ print ''.$langs->trans("Error")." ".$db->errno().": ".$newsql."
";
+ print ' ';
- print '';
- $tmpcode = '';
- if (!empty($modCodeProduct->code_auto)) {
- $tmpcode = $modCodeProduct->getNextValue($object, $type);
+ if (empty($conf->global->PRODUCT_GENERATE_REF_AFTER_FORM)) {
+ print ' ';
+ $tmpcode = '';
+ if (!empty($modCodeProduct->code_auto)) {
+ $tmpcode = $modCodeProduct->getNextValue($object, $type);
+ }
+ print ''.$langs->trans("Ref").' ';
}
- print ''.$langs->trans("Ref").' '.$langs->trans("Label").' ' . $langs->trans("Add") . ' ';
+ print '' . $langs->trans("Add") . ' ';
if ($cnt_trans > 0) {
- print '' . $langs->trans("Update") . ' ';
+ print '' . $langs->trans("Update") . ' ';
}
}
}
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 0947ae5da1d..11913957bc5 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -1333,7 +1333,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0) {
print '';
// Duration - Time spent
- print '';
+ print ' ';
$durationtouse = ($_POST['timespent_duration'] ? $_POST['timespent_duration'] : '');
if (GETPOSTISSET('timespent_durationhour') || GETPOSTISSET('timespent_durationmin')) {
$durationtouse = (GETPOST('timespent_durationhour') * 3600 + GETPOST('timespent_durationmin') * 60);
@@ -1600,7 +1600,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0) {
// Time spent
if (!empty($arrayfields['t.task_duration']['checked'])) {
- print ' ';
+ print ' ';
if ($action == 'editline' && $_GET['lineid'] == $task_time->rowid) {
print '
- * Copyright (C) 2004 Eric Seigne
- * Copyright (C) 2005 Marc Barilley / Ocebo
- * Copyright (C) 2005-2013 Regis Houssin
- * Copyright (C) 2006 Andre Cianfarani
- * Copyright (C) 2010-2011 Juanjo Menent
- * Copyright (C) 2010-2019 Philippe Grand
- * Copyright (C) 2012 Christophe Battarel
- * Copyright (C) 2013 Cédric Salvador
- * Copyright (C) 2016 Ferran Marcet
- * Copyright (C) 2018 Charlene Benke
+/* Copyright (C) 2001-2007 Rodolphe Quiedeville
+ * Copyright (C) 2004-2017 Laurent Destailleur
+ * Copyright (C) 2004 Eric Seigne
+ * Copyright (C) 2005 Marc Barilley / Ocebo
+ * Copyright (C) 2005-2013 Regis Houssin
+ * Copyright (C) 2006 Andre Cianfarani
+ * Copyright (C) 2010-2011 Juanjo Menent
+ * Copyright (C) 2010-2019 Philippe Grand
+ * Copyright (C) 2012 Christophe Battarel
+ * Copyright (C) 2013 Cédric Salvador
+ * Copyright (C) 2016 Ferran Marcet
+ * Copyright (C) 2018 Charlene Benke
+ * Copyright (C) 2021 Alexandre Spangaro
*
* 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
@@ -65,6 +66,22 @@ $search_town = GETPOST('search_town', 'alpha');
$search_zip = GETPOST('search_zip', 'alpha');
$search_state = GETPOST("search_state");
$search_country = GETPOST("search_country", 'int');
+$search_date_startday = GETPOST('search_date_startday', 'int');
+$search_date_startmonth = GETPOST('search_date_startmonth', 'int');
+$search_date_startyear = GETPOST('search_date_startyear', 'int');
+$search_date_endday = GETPOST('search_date_endday', 'int');
+$search_date_endmonth = GETPOST('search_date_endmonth', 'int');
+$search_date_endyear = GETPOST('search_date_endyear', 'int');
+$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver
+$search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
+$search_date_valid_startday = GETPOST('search_date_valid_startday', 'int');
+$search_date_valid_startmonth = GETPOST('search_date_valid_startmonth', 'int');
+$search_date_valid_startyear = GETPOST('search_date_valid_startyear', 'int');
+$search_date_valid_endday = GETPOST('search_date_valid_endday', 'int');
+$search_date_valid_endmonth = GETPOST('search_date_valid_endmonth', 'int');
+$search_date_valid_endyear = GETPOST('search_date_valid_endyear', 'int');
+$search_date_valid_start = dol_mktime(0, 0, 0, $search_date_valid_startmonth, $search_date_valid_startday, $search_date_valid_startyear); // Use tzserver
+$search_date_valid_end = dol_mktime(23, 59, 59, $search_date_valid_endmonth, $search_date_valid_endday, $search_date_valid_endyear);
$search_type_thirdparty = GETPOST("search_type_thirdparty", 'int');
$search_montant_ht = GETPOST('search_montant_ht', 'alpha');
$search_montant_vat = GETPOST('search_montant_vat', 'alpha');
@@ -83,12 +100,6 @@ $search_remove_btn = GETPOST('button_removefilter', 'alpha');
$sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
$mesg = (GETPOST("msg") ? GETPOST("msg") : GETPOST("mesg"));
-$year = GETPOST("year");
-$month = GETPOST("month");
-$day = GETPOST("day");
-$yearvalid = GETPOST("yearvalid");
-$monthvalid = GETPOST("monthvalid");
-$dayvalid = GETPOST("dayvalid");
$optioncss = GETPOST('optioncss', 'alpha');
$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
@@ -202,6 +213,8 @@ if ($reshook < 0) {
setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
}
+$search_product_category = 0;
+
include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
// Do we click on purge search criteria ?
@@ -227,12 +240,22 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
$search_type = '';
$search_country = '';
$search_type_thirdparty = '';
- $yearvalid = '';
- $monthvalid = '';
- $dayvalid = '';
- $year = '';
- $month = '';
- $day = '';
+ $search_date_startday = '';
+ $search_date_startmonth = '';
+ $search_date_startyear = '';
+ $search_date_endday = '';
+ $search_date_endmonth = '';
+ $search_date_endyear = '';
+ $search_date_start = '';
+ $search_date_end = '';
+ $search_date_valid_startday = '';
+ $search_date_valid_startmonth = '';
+ $search_date_valid_startyear = '';
+ $search_date_valid_endday = '';
+ $search_date_valid_endmonth = '';
+ $search_date_valid_endyear = '';
+ $search_date_valid_start = '';
+ $search_date_valid_end = '';
$search_status = '';
$object_statut = '';
}
@@ -376,8 +399,18 @@ if ($socid) {
if ($search_status >= 0 && $search_status != '') {
$sql .= ' AND sp.fk_statut IN ('.$db->sanitize($db->escape($search_status)).')';
}
-$sql .= dolSqlDateFilter("sp.date_livraison", $day, $month, $year);
-$sql .= dolSqlDateFilter("sp.date_valid", $dayvalid, $monthvalid, $yearvalid);
+if ($search_date_start) {
+ $sql .= " AND sp.date_livraison >= '".$db->idate($search_date_start)."'";
+}
+if ($search_date_end) {
+ $sql .= " AND sp.date_livraison <= '".$db->idate($search_date_end)."'";
+}
+if ($search_date_valid_start) {
+ $sql .= " AND sp.date_valid >= '".$db->idate($search_date_valid_start)."'";
+}
+if ($search_date_valid_end) {
+ $sql .= " AND sp.date_valid <= '".$db->idate($search_date_valid_end)."'";
+}
if ($search_sale > 0) {
$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $search_sale);
}
@@ -446,11 +479,41 @@ if ($resql) {
if ($sall) {
$param .= '&sall='.urlencode($sall);
}
- if ($month) {
- $param .= '&month='.urlencode($month);
+ if ($search_date_startday) {
+ $param .= '&search_date_startday='.urlencode($search_date_startday);
}
- if ($year) {
- $param .= '&year='.urlencode($year);
+ if ($search_date_startmonth) {
+ $param .= '&search_date_startmonth='.urlencode($search_date_startmonth);
+ }
+ if ($search_date_startyear) {
+ $param .= '&search_date_startyear='.urlencode($search_date_startyear);
+ }
+ if ($search_date_endday) {
+ $param .= '&search_date_endday='.urlencode($search_date_endday);
+ }
+ if ($search_date_endmonth) {
+ $param .= '&search_date_endmonth='.urlencode($search_date_endmonth);
+ }
+ if ($search_date_endyear) {
+ $param .= '&search_date_endyear='.urlencode($search_date_endyear);
+ }
+ if ($search_date_valid_startday) {
+ $param .= '&search_date_valid_startday='.urlencode($search_date_valid_startday);
+ }
+ if ($search_date_valid_startmonth) {
+ $param .= '&search_date_valid_startmonth='.urlencode($search_date_valid_startmonth);
+ }
+ if ($search_date_valid_startyear) {
+ $param .= '&search_date_valid_startyear='.urlencode($search_date_valid_startyear);
+ }
+ if ($search_date_valid_endday) {
+ $param .= '&search_date_valid_endday='.urlencode($search_date_valid_endday);
+ }
+ if ($search_date_valid_endmonth) {
+ $param .= '&search_date_valid_endmonth='.urlencode($search_date_valid_endmonth);
+ }
+ if ($search_date_valid_endyear) {
+ $param .= '&search_date_valid_endyear='.urlencode($search_date_valid_endyear);
}
if ($search_ref) {
$param .= '&search_ref='.urlencode($search_ref);
@@ -641,21 +704,23 @@ if ($resql) {
// Date
if (!empty($arrayfields['sp.date_valid']['checked'])) {
print '';
- //print $langs->trans('Month').': ';
- print '';
+ print $form->selectDate($search_date_valid_start ? $search_date_valid_start : -1, 'search_date_valid_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+ print '
';
+ print '';
+ print $form->selectDate($search_date_valid_end ? $search_date_valid_end : -1, 'search_date_valid_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
+ print '
';
print ' ';
}
// Date
if (!empty($arrayfields['sp.date_livraison']['checked'])) {
print '';
- //print $langs->trans('Month').': ';
- print '';
+ print $form->selectDate($search_date_start ? $search_date_start : -1, 'search_date_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+ print '
';
+ print '';
+ print $form->selectDate($search_date_end ? $search_date_end : -1, 'search_date_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
+ print '
';
print ' ';
}
diff --git a/htdocs/takepos/css/pos.css.php b/htdocs/takepos/css/pos.css.php
index e180dc33b3e..66c65edb622 100644
--- a/htdocs/takepos/css/pos.css.php
+++ b/htdocs/takepos/css/pos.css.php
@@ -21,8 +21,8 @@
*/
/**
- * \file htdocs/theme/eldy/style.css.php
- * \brief File for CSS style sheet Eldy
+ * \file htdocs/takepos/css/pos.css.php
+ * \brief File for CSS style for TakePOS
*/
//if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled because need to load personalized language
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 311f6a2e584..28d05964390 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -1387,6 +1387,7 @@ table[summary="list_of_modules"] .fa-cog {
.width400 { width: 400px; }
.width500 { width: 500px; }
.maxwidth25 { max-width: 25px; }
+.maxwidth40 { max-width: 40px; }
.maxwidth50 { max-width: 50px; }
.maxwidth75 { max-width: 75px; }
.maxwidthdate { max-width: 80px; }
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index dfa8b00f9eb..ef7e69c0538 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1427,6 +1427,7 @@ table[summary="list_of_modules"] .fa-cog {
.width400 { width: 400px; }
.width500 { width: 500px; }
.maxwidth25 { max-width: 25px; }
+.maxwidth40 { max-width: 40px; }
.maxwidth50 { max-width: 50px; }
.maxwidth75 { max-width: 75px; }
.maxwidth100 { max-width: 100px; }
diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php
index 32fa93cb8a6..5da92482785 100644
--- a/htdocs/user/passwordforgotten.php
+++ b/htdocs/user/passwordforgotten.php
@@ -97,7 +97,7 @@ if (empty($reshook)) {
if ($edituser->pass_temp && dol_verifyHash($edituser->pass_temp.'-'.$edituser->id.'-'.$dolibarr_main_instance_unique_id, $passworduidhash)) {
// Clear session
unset($_SESSION['dol_login']);
- $_SESSION['dol_loginmesg'] = $langs->trans('NewPasswordValidated'); // Save message for the session page
+ $_SESSION['dol_loginmesg'] = $langs->transnoentitiesnoconv('NewPasswordValidated'); // Save message for the session page
$newpassword = $edituser->setPassword($user, $edituser->pass_temp, 0);
dol_syslog("passwordforgotten.php new password for user->id=".$edituser->id." validated in database");