Merge remote-tracking branch 'upstream/develop' into 14a32

htdocs/accountancy/admin/categories.php

@@ -32,9 +32,7 @@ $error = 0;
 // Load translation files required by the page
 $langs->loadLangs(array("bills", "accountancy"));
 
-$mesg = '';
 $id = GETPOST('id', 'int');
-$rowid = GETPOST('rowid', 'int');
 $cancel = GETPOST('cancel', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $cat_id = GETPOST('account_category', 'int');

htdocs/accountancy/admin/categories_list.php

@@ -247,7 +247,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
 			if ($_POST[$listfieldvalue[$i]] == '' && !$listfieldvalue[$i] == 'formula') {
 				$sql .= "null"; // For vat, we want/accept code = ''
 			} else {
-				$sql .= "'".$db->escape($_POST[$listfieldvalue[$i]])."'";
+				$sql .= "'".$db->escape(GETPOST($listfieldvalue[$i]))."'";
 			}
 			$i++;
 		}
@@ -787,7 +787,7 @@ if ($id) {
 							$class = 'tddict';
 							// Show value for field
 							if ($showfield) {
-								print '<!-- '.$fieldlist[$field].' --><td class="'.$class.'">'.$valuetoshow.'</td>';
+								print '<!-- '.$fieldlist[$field].' --><td class="'.$class.'">'.dol_escape_htmltag($valuetoshow).'</td>';
 							}
 						}
 					}

htdocs/accountancy/journal/bankjournal.php

@@ -997,8 +997,11 @@ if (empty($action) || $action == 'view') {
 	if (($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == "") || $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == '-1'
 		|| ($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER == "") || $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER == '-1'
 		|| empty($conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT) || $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT == '-1') {
-		print '<br>'.img_warning().' '.$langs->trans("SomeMandatoryStepsOfSetupWereNotDone");
+		print '<br><div class="warning">'.img_warning().' '.$langs->trans("SomeMandatoryStepsOfSetupWereNotDone");
-		print ' : '.$langs->trans("AccountancyAreaDescMisc", 4, '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong>');
+		$desc = ' : '.$langs->trans("AccountancyAreaDescMisc", 4, '{link}');
+		$desc = str_replace('{link}', '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong>', $desc);
+		print $desc;
+		print '</div>';
 	}
 
 

htdocs/accountancy/journal/expensereportsjournal.php

@@ -506,8 +506,11 @@ if (empty($action) || $action == 'view') {
 
 	// Button to write into Ledger
 	if (empty($conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT) || $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT == '-1') {
-		print '<br>'.img_warning().' '.$langs->trans("SomeMandatoryStepsOfSetupWereNotDone");
+		print '<br><div class="warning">'.img_warning().' '.$langs->trans("SomeMandatoryStepsOfSetupWereNotDone");
-		print ' : '.$langs->trans("AccountancyAreaDescMisc", 4, '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong>');
+		$desc = ' : '.$langs->trans("AccountancyAreaDescMisc", 4, '{link}');
+		$desc = str_replace('{link}', '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong>', $desc);
+		print $desc;
+		print '</div>';
 	}
 	print '<div class="tabsAction tabsActionNoBottom">';
 

htdocs/accountancy/journal/purchasesjournal.php

@@ -735,9 +735,11 @@ if (empty($action) || $action == 'view') {
 
 	// Button to write into Ledger
 	if (($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER == "") || $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER == '-1') {
-		print '<br>';
+		print '<br><div class="warning">'.img_warning().' '.$langs->trans("SomeMandatoryStepsOfSetupWereNotDone");
-		print img_warning().' '.$langs->trans("SomeMandatoryStepsOfSetupWereNotDone");
+		$desc = ' : '.$langs->trans("AccountancyAreaDescMisc", 4, '{link}');
-		print ' : '.$langs->trans("AccountancyAreaDescMisc", 4, '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong>');
+		$desc = str_replace('{link}', '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong>', $desc);
+		print $desc;
+		print '</div>';
 	}
 	print '<div class="tabsAction tabsActionNoBottom">';
 	if (!empty($conf->global->ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL) && $in_bookkeeping == 'notyet') {

htdocs/accountancy/journal/sellsjournal.php

@@ -688,9 +688,11 @@ if (empty($action) || $action == 'view') {
 
 	// Button to write into Ledger
 	if (($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == "") || $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == '-1') {
-		print '<br>';
+		print '<br><div class="warning">'.img_warning().' '.$langs->trans("SomeMandatoryStepsOfSetupWereNotDone");
-		print img_warning().' '.$langs->trans("SomeMandatoryStepsOfSetupWereNotDone");
+		$desc = ' : '.$langs->trans("AccountancyAreaDescMisc", 4, '{link}');
-		print ' : '.$langs->trans("AccountancyAreaDescMisc", 4, '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong>');
+		$desc = str_replace('{link}', '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong>', $desc);
+		print $desc;
+		print '</div>';
 	}
 	print '<div class="tabsAction tabsActionNoBottom">';
 	if (!empty($conf->global->ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL) && $in_bookkeeping == 'notyet') {

htdocs/admin/system/modules.php

@@ -228,26 +228,26 @@ print '<tr class="liste_titre_filter">';
 
 if ($arrayfields['name']['checked']) {
 	print '<td class="liste_titre left">';
-	print '<input class="flat" type="text" name="search_name" size="8" value="'.$search_name.'">';
+	print '<input class="flat" type="text" name="search_name" size="8" value="'.dol_escape_htmltag($search_name).'">';
 	print '</td>';
 }
 if ($arrayfields['version']['checked']) {
 	print '<td class="liste_titre left">';
-	print '<input class="flat" type="text" name="search_version" size="8" value="'.$search_version.'">';
+	print '<input class="flat" type="text" name="search_version" size="6" value="'.dol_escape_htmltag($search_version).'">';
 	print '</td>';
 }
 if ($arrayfields['id']['checked']) {
 	print '<td class="liste_titre left">';
-	print '<input class="flat" type="text" name="search_id" size="8" value="'.$search_id.'">';
+	print '<input class="flat" type="text" name="search_id" size="6 value="'.dol_escape_htmltag($search_id).'">';
-	print '</td>';
-}
-if ($arrayfields['module_position']['checked']) {
-	print '<td class="liste_titre left">';
 	print '</td>';
 }
 if ($arrayfields['permission']['checked']) {
 	print '<td class="liste_titre left">';
-	print '<input class="flat" type="text" name="search_permission" size="8" value="'.$search_permission.'">';
+	print '<input class="flat" type="text" name="search_permission" size="8" value="'.dol_escape_htmltag($search_permission).'">';
+	print '</td>';
+}
+if ($arrayfields['module_position']['checked']) {
+	print '<td class="liste_titre left">';
 	print '</td>';
 }
 
@@ -267,14 +267,14 @@ if ($arrayfields['version']['checked']) {
 	print_liste_field_titre($arrayfields['version']['label'], $_SERVER["PHP_SELF"], "version", "", "", "", $sortfield, $sortorder);
 }
 if ($arrayfields['id']['checked']) {
-	print_liste_field_titre($arrayfields['id']['label'], $_SERVER["PHP_SELF"], "id", "", "", "", $sortfield, $sortorder);
+	print_liste_field_titre($arrayfields['id']['label'], $_SERVER["PHP_SELF"], "id", "", "", "", $sortfield, $sortorder, 'nowraponall ');
-}
-if ($arrayfields['module_position']['checked']) {
-	print_liste_field_titre($arrayfields['module_position']['label'], $_SERVER["PHP_SELF"], "module_position", "", "", "", $sortfield, $sortorder);
 }
 if ($arrayfields['permission']['checked']) {
 	print_liste_field_titre($arrayfields['permission']['label'], $_SERVER["PHP_SELF"], "permission", "", "", "", $sortfield, $sortorder);
 }
+if ($arrayfields['module_position']['checked']) {
+	print_liste_field_titre($arrayfields['module_position']['label'], $_SERVER["PHP_SELF"], "module_position", "", "", "", $sortfield, $sortorder);
+}
 
 // Fields from hook
 $parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
@@ -289,36 +289,29 @@ if ($sortfield == "name" && $sortorder == "asc") {
 	usort($moduleList, function (stdClass $a, stdClass $b) {
 		return strcasecmp($a->name, $b->name);
 	});
-}
+} elseif ($sortfield == "name" && $sortorder == "desc") {
-if ($sortfield == "name" && $sortorder == "desc") {
 	usort($moduleList, function (stdClass $a, stdClass $b) {
 		return strcasecmp($b->name, $a->name);
 	});
-}
+} elseif ($sortfield == "version" && $sortorder == "asc") {
-if ($sortfield == "version" && $sortorder == "asc") {
 	usort($moduleList, function (stdClass $a, stdClass $b) {
 		return strcasecmp($a->version, $b->version);
 	});
-}
+} elseif ($sortfield == "version" && $sortorder == "desc") {
-if ($sortfield == "version" && $sortorder == "desc") {
 	usort($moduleList, function (stdClass $a, stdClass $b) {
 		return strcasecmp($b->version, $a->version);
 	});
-}
+} elseif ($sortfield == "id" && $sortorder == "asc") {
-if ($sortfield == "id" && $sortorder == "asc") {
 	usort($moduleList, "compareIdAsc");
-}
+} elseif ($sortfield == "id" && $sortorder == "desc") {
-if ($sortfield == "id" && $sortorder == "desc") {
 	usort($moduleList, "compareIdDesc");
-}
+} elseif ($sortfield == "permission" && $sortorder == "asc") {
-if ($sortfield == "permission" && $sortorder == "asc") {
 	usort($moduleList, "comparePermissionIdsAsc");
-}
+} elseif ($sortfield == "permission" && $sortorder == "desc") {
-if ($sortfield == "permission" && $sortorder == "desc") {
 	usort($moduleList, "comparePermissionIdsDesc");
-}
+} else {
-
 	$moduleList = dol_sort_array($moduleList, 'module_position');
+}
 
 foreach ($moduleList as $module) {
 	print '<tr class="oddeven">';
@@ -338,10 +331,6 @@ foreach ($moduleList as $module) {
 		print '<td class="center">'.$module->id.'</td>';
 	}
 
-	if ($arrayfields['module_position']['checked']) {
-		print '<td class="center">'.$module->module_position.'</td>';
-	}
-
 	if ($arrayfields['permission']['checked']) {
 		$idperms = '';
 
@@ -357,7 +346,11 @@ foreach ($moduleList as $module) {
 			}
 		}
 
-		print '<td>'.($idperms ? $idperms : "&nbsp;").'</td>';
+		print '<td><span class="opacitymedium">'.($idperms ? $idperms : "&nbsp;").'</span></td>';
+	}
+
+	if ($arrayfields['module_position']['checked']) {
+		print '<td class="center">'.$module->module_position.'</td>';
 	}
 
 	print '<td></td>';
@@ -394,11 +387,11 @@ $db->close();
   */
 function compareIdAsc(stdClass $a, stdClass $b)
 {
-	if ($a->id == $b->id) {
+	if ((int) $a->id == (int) $b->id) {
 		return 0;
 	}
 
-	return $a->id > $b->id ? -1 : 1;
+	return ((int) $a->id < (int) $b->id) ? -1 : 1;
 }
 
  /**
@@ -410,11 +403,11 @@ function compareIdAsc(stdClass $a, stdClass $b)
   */
 function compareIdDesc(stdClass $a, stdClass $b)
 {
-	if ($a->id == $b->id) {
+	if ((int) $a->id == (int) $b->id) {
 		return 0;
 	}
 
-	return $b->id > $a->id ? -1 : 1;
+	return ((int) $b->id < (int) $a->id) ? -1 : 1;
 }
 
  /**
@@ -441,7 +434,7 @@ function comparePermissionIdsAsc(stdClass $a, stdClass $b)
 		return 0;
 	}
 
-	return $a->permission[0] > $b->permission[0] ? -1 : 1;
+	return $a->permission[0] < $b->permission[0] ? -1 : 1;
 }
 
  /**
@@ -468,5 +461,5 @@ function comparePermissionIdsDesc(stdClass $a, stdClass $b)
 		return 0;
 	}
 
-	return $a->permission[0] > $b->permission[0] ? 1 : -1;
+	return $b->permission[0] < $a->permission[0] ? -1 : 1;
 }

htdocs/comm/index.php

@@ -28,7 +28,6 @@
  */
 
 require '../main.inc.php';
-
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';

htdocs/comm/mailing/card.php

@@ -524,15 +524,15 @@ if (empty($reshook)) {
 	}
 
 	/*
-	 * Add file in email form
+	 * Action of adding a file in email form
 	 */
-	if (!empty($_POST['addfile'])) {
+	if (GETPOST('addfile')) {
 		$upload_dir = $conf->mailing->dir_output."/".get_exdir($object->id, 2, 0, 1, $object, 'mailing');
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 		// Set tmp user directory
-		dol_add_file_process($upload_dir, 0, 0);
+		dol_add_file_process($upload_dir, 0, 0, 'addedfile', '', null, '', 0);
 
 		$action = "edit";
 	}
@@ -543,7 +543,7 @@ if (empty($reshook)) {
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-		dol_remove_file_process($_POST['removedfile'], 0, 0); // We really delete file linked to mailing
+		dol_remove_file_process(GETPOST('removedfile'), 0, 0); // We really delete file linked to mailing
 
 		$action = "edit";
 	}
@@ -1216,7 +1216,7 @@ if ($action == 'create') {
 					$out .= '<br></div>';
 				}
 			} else {
-				$out .= $langs->trans("NoAttachedFiles").'<br>';
+				$out .= '<span class="opacitymedium">'.$langs->trans("NoAttachedFiles").'</span><br>';
 			}
 			// Add link to add file
 			$out .= '<input type="file" class="flat" id="addedfile" name="addedfile" value="'.$langs->trans("Upload").'" />';

htdocs/compta/facture/index.php

@@ -25,6 +25,7 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php';
 
 // Security check
 restrictedArea($user, 'facture');
@@ -39,11 +40,14 @@ if (isset($user->socid) && $user->socid > 0) {
 	$socid = $user->socid;
 }
 
+$max = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
+
 // Maximum elements of the tables
 $maxDraftCount = empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD;
 $maxLatestEditCount = 5;
 $maxOpenCount = empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD;
 
+
 /*
  * View
  */
@@ -56,24 +60,18 @@ print '<div class="fichecenter">';
 
 print '<div class="fichethirdleft">';
 
-// This is useless due to the global search combo
+print getCustomerInvoicePieChart($socid);
-if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) {
-	print getAreaSearchFrom();
 print '<br>';
-}
+print getCustomerInvoiceDraftTable($max, $socid);
-
-print getPieChart($socid);
-print '<br>';
-print getDraftTable($maxDraftCount, $socid);
 
 print '</div>';
 
 print '<div class="fichetwothirdright">';
 print '<div class="ficheaddleft">';
 
-print getLatestEditTable($maxLatestEditCount, $socid);
+print getCustomerInvoiceLatestEditTable($maxLatestEditCount, $socid);
 print '<br>';
-print getOpenTable($maxOpenCount, $socid);
+print getCustomerInvoiceUnpaidOpenTable($max, $socid);
 
 print '</div>';
 print '</div>';
@@ -83,452 +81,3 @@ print '</div>';
 // End of page
 llxFooter();
 $db->close();
-
-/**
- * Return a HTML string that contains a additional search form
- *
- * @return string A HTML string that contains a additional search form
- */
-function getAreaSearchFrom()
-{
-	global $langs;
-
-	$result = '<form method="post" action="'.DOL_URL_ROOT.'/compta/facture/list.php">';
-	$result .= '<div class="div-table-responsive-no-min">';
-	$result .= '<input type="hidden" name="token" value="'.newToken().'">';
-	$result .= '<table class="noborder nohover centpercent">';
-
-	$result .= '<tr class="liste_titre">';
-	$result .= '<td colspan="3">'.$langs->trans("Search").'</td>';
-	$result .= '</tr>';
-
-	$result .= '<tr class="oddeven">';
-	$result .= '<td>'.$langs->trans("Invoice").':</td><td><input type="text" class="flat" name="sall" size=18></td>';
-	$result .= '<td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
-	$result .= '</tr>';
-
-	$result .= "</table>";
-	$result .= "</div>";
-	$result .= "</form>";
-
-	return $result;
-}
-
-/**
- * Return a HTML table that contains a pie chart of customer invoices
- *
- * @param	int		$socid		(Optional) Show only results from the customer with this id
- * @return	string				A HTML table that contains a pie chart of customer invoices
- */
-function getPieChart($socid = 0)
-{
-	global $conf, $db, $langs, $user;
-
-	$sql = "SELECT count(f.rowid), f.fk_statut";
-	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-	$sql .= ", ".MAIN_DB_PREFIX."facture as f";
-	if (!$user->rights->societe->client->voir && !$socid) {
-		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	}
-	$sql .= " WHERE f.fk_soc = s.rowid";
-	$sql .= " AND f.entity IN (".getEntity('facture').")";
-	if ($user->socid) {
-		$sql .= ' AND f.fk_soc = '.$user->socid;
-	}
-	if (!$user->rights->societe->client->voir && !$socid) {
-		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-	}
-	$sql .= " GROUP BY f.fk_statut";
-
-	$resql = $db->query($sql);
-	if (!$resql) {
-		dol_print_error($db);
-		return '';
-	}
-
-	$num = $db->num_rows($resql);
-	$i = 0;
-
-	$total = 0;
-	$vals = [];
-
-	while ($i < $num) {
-		$row = $db->fetch_row($resql);
-		if ($row) {
-			$vals[$row[1]] = $row[0];
-			$total += $row[0];
-		}
-
-		$i++;
-	}
-
-	$db->free($resql);
-
-	$result = '<div class="div-table-responsive-no-min">';
-	$result .= '<table class="noborder nohover centpercent">';
-	$result .= '<tr class="liste_titre">';
-	$result .= '<td colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("CustomerInvoice").'</td>';
-	$result .= '</tr>';
-
-	$objectstatic = new Facture($db);
-	$array = [Facture::STATUS_DRAFT, Facture::STATUS_VALIDATED, Facture::STATUS_CLOSED, Facture::STATUS_ABANDONED];
-	$dataseries = [];
-
-	foreach ($array as $status) {
-		$objectstatic->statut = $status;
-		$objectstatic->paye = $status == Facture::STATUS_CLOSED ? -1 : 0;
-
-		$dataseries[] = [$objectstatic->getLibStatut(1), (isset($vals[$status]) ? (int) $vals[$status] : 0)];
-		if (!$conf->use_javascript_ajax) {
-			$result .= '<tr class="oddeven">';
-			$result .= '<td>'.$objectstatic->getLibStatut(0).'</td>';
-			$result .= '<td class="right"><a href="list.php?statut='.$status.'">'.(isset($vals[$status]) ? $vals[$status] : 0).'</a></td>';
-			$result .= '</tr>';
-		}
-	}
-
-	if ($conf->use_javascript_ajax) {
-		$dolgraph = new DolGraph();
-		$dolgraph->SetData($dataseries);
-		$dolgraph->setShowLegend(2);
-		$dolgraph->setShowPercent(1);
-		$dolgraph->SetType(['pie']);
-		$dolgraph->setHeight('200');
-		$dolgraph->draw('idgraphthirdparties');
-
-		$result .= '<tr>';
-		$result .= '<td align="center" colspan="2">'.$dolgraph->show($total ? 0 : 1).'</td>';
-		$result .= '</tr>';
-	}
-
-	$result .= '<tr class="liste_total">';
-	$result .= '<td>'.$langs->trans("Total").'</td>';
-	$result .= '<td class="right">'.$total.'</td>';
-	$result .= '</tr>';
-
-	$result .= '</table>';
-	$result .= '</div>';
-	return $result;
-}
-
-/**
- * Return a HTML table that contains a list with customer invoice drafts
- *
- * @param	int		$maxCount	(Optional) The maximum count of elements inside the table
- * @param	int		$socid		(Optional) Show only results from the customer with this id
- * @return	string				A HTML table that contains a list with customer invoice drafts
- */
-function getDraftTable($maxCount = 500, $socid = 0)
-{
-	global $db, $langs, $user;
-
-	$sql = "SELECT f.rowid, f.ref, s.nom as socname, s.rowid as socid, s.canvas, s.client, f.total as total_ttc";
-	$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
-	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->rights->societe->client->voir && !$socid) {
-		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	}
-	$sql .= " WHERE f.fk_soc = s.rowid";
-	$sql .= " AND f.entity IN (".getEntity('facture').")";
-	$sql .= " AND f.fk_statut = ".Facture::STATUS_DRAFT;
-	if ($socid) {
-		$sql .= " AND f.fk_soc = ".((int) $socid);
-	}
-	if (!$user->rights->societe->client->voir && !$socid) {
-		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-	}
-	$sql .= $db->plimit($maxCount, 0);
-
-	$resql = $db->query($sql);
-	if (!$resql) {
-		dol_print_error($db);
-		return '';
-	}
-
-	$num = $db->num_rows($resql);
-
-	$result = '<div class="div-table-responsive-no-min">';
-	$result .= '<table class="noborder centpercent">';
-
-	$result .= '<tr class="liste_titre">';
-	$result .= '<td colspan="3">';
-	$result .= $langs->trans("CustomersDraftInvoices");
-	$result .= ' <a href="'.DOL_URL_ROOT.'/compta/facture/list.php?search_status=0">';
-	$result .= '<span class="badge">'.$num.'</span>';
-	$result .= '</a>';
-	$result .= '</td>';
-	$result .= '</tr>';
-
-	if ($num < 1) {
-		$result .= '</table>';
-		$result .= '</div>';
-		return $result;
-	}
-
-	$objectstatic = new Facture($db);
-	$companystatic = new Societe($db);
-	$nbofloop = min($num, $maxCount);
-	$total = 0;
-	$i = 0;
-
-	while ($i < $nbofloop) {
-		$obj = $db->fetch_object($resql);
-
-		$objectstatic->id = $obj->rowid;
-		$objectstatic->ref = $obj->ref;
-
-		$companystatic->id = $obj->socid;
-		$companystatic->name = $obj->socname;
-		$companystatic->client	= $obj->client;
-		$companystatic->canvas	= $obj->canvas;
-
-		$result .= '<tr class="oddeven">';
-		$result .= '<td class="nowrap">'.$objectstatic->getNomUrl(1).'</td>';
-		$result .= '<td>'.$companystatic->getNomUrl(1, 'customer', 24).'</td>';
-		$result .= '<td class="right"><span class="amount">'.price($obj->total_ttc).'</span></td>';
-		$result .= '</tr>';
-
-		$i++;
-		$total += $obj->total_ttc;
-	}
-
-	if ($num > $nbofloop) {
-		$result .= '<tr class="liste_total">';
-		$result .= '<td colspan="3" class="right">'.$langs->trans("XMoreLines", ($num - $nbofloop)).'</td>';
-		$result .= '</tr>';
-	} elseif ($total > 0) {
-		$result .= '<tr class="liste_total">';
-		$result .= '<td colspan="2" class="right">'.$langs->trans("Total").'</td>';
-		$result .= '<td class="right"><span class="amount">'.price($total).'</span></td>';
-		$result .= '</tr>';
-	}
-
-	$result .= '</table>';
-	$result .= '</div>';
-	return $result;
-}
-
-/**
- * Return a HTML table that contains a list with latest edited customer invoices
- *
- * @param	int		$maxCount	(Optional) The maximum count of elements inside the table
- * @param	int		$socid		(Optional) Show only results from the customer with this id
- * @return	string				A HTML table that contains a list with latest edited customer invoices
- */
-function getLatestEditTable($maxCount = 5, $socid = 0)
-{
-	global $conf, $db, $langs, $user;
-
-	$sql = "SELECT f.rowid, f.entity, f.ref, f.fk_statut as status, f.paye, s.nom as socname, s.rowid as socid, s.canvas, s.client,";
-	$sql .= " f.datec";
-	$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
-	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->rights->societe->client->voir && !$socid) {
-		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	}
-	$sql .= " WHERE f.fk_soc = s.rowid";
-	$sql .= " AND f.entity IN (".getEntity('facture').")";
-	if ($socid) {
-		$sql .= " AND f.fk_soc = ".((int) $socid);
-	}
-	if (!$user->rights->societe->client->voir && !$socid) {
-		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-	}
-	$sql .= " ORDER BY f.tms DESC";
-	$sql .= $db->plimit($maxCount, 0);
-
-	$resql = $db->query($sql);
-	if (!$resql) {
-		dol_print_error($db);
-	}
-
-	$num = $db->num_rows($resql);
-
-	$result = '<div class="div-table-responsive-no-min">';
-	$result .= '<table class="noborder centpercent">';
-
-	$result .= '<tr class="liste_titre">';
-	$result .= '<td colspan="4">'.$langs->trans("LastCustomersBills", $maxCount).'</td>';
-	$result .= '</tr>';
-
-	if ($num < 1) {
-		$result .= '</table>';
-		$result .= '</div>';
-		return $result;
-	}
-
-	$formfile = new FormFile($db);
-	$objectstatic = new Facture($db);
-	$companystatic = new Societe($db);
-	$i = 0;
-
-	while ($i < $num) {
-		$obj = $db->fetch_object($resql);
-
-		$objectstatic->id = $obj->rowid;
-		$objectstatic->ref = $obj->ref;
-		$objectstatic->paye = $obj->paye;
-		$objectstatic->statut = $obj->status;
-
-		$companystatic->id = $obj->socid;
-		$companystatic->name = $obj->socname;
-		$companystatic->client	= $obj->client;
-		$companystatic->canvas	= $obj->canvas;
-
-		$filename = dol_sanitizeFileName($obj->ref);
-		$filedir = $conf->propal->multidir_output[$obj->entity].'/'.$filename;
-
-		$result .= '<tr width="20%" class="nowrap">';
-
-		$result .= '<td class="oddeven">';
-		$result .= '<table class="nobordernopadding">';
-		$result .= '<tr class="nocellnopadd">';
-
-		$result .= '<td width="96" class="nobordernopadding nowrap">'.$objectstatic->getNomUrl(1).'</td>';
-		$result .= '<td width="16" class="nobordernopadding nowrap">&nbsp;</td>';
-		$result .= '<td width="16" class="nobordernopadding right">'.$formfile->getDocumentsLink($objectstatic->element, $filename, $filedir).'</td>';
-
-		$result .= '</tr>';
-		$result .= '</table>';
-		$result .= '</td>';
-
-		$result .= '<td>'.$companystatic->getNomUrl(1, 'customer').'</td>';
-		$result .= '<td>'.dol_print_date($db->jdate($obj->datec), 'day').'</td>';
-		$result .= '<td class="right">'.$objectstatic->getLibStatut(5).'</td>';
-
-		$result .= '</tr>';
-
-		$i++;
-	}
-
-	$result .= '</table>';
-	$result .= '</div>';
-	return $result;
-}
-
-/**
- * Return a HTML table that contains a list with open (unpaid) customer invoices
- *
- * @param	int		$maxCount	(Optional) The maximum count of elements inside the table
- * @param	int		$socid		(Optional) Show only results from the customer with this id
- * @return	string				A HTML table that conatins a list with open (unpaid) customer invoices
- */
-function getOpenTable($maxCount = 500, $socid = 0)
-{
-	global $conf, $db, $langs, $user;
-
-	$sql = "SELECT s.nom as socname, s.rowid as socid, s.canvas, s.client";
-	$sql .= ", f.rowid as id, f.entity, f.total as total_ttc, f.total as total_ht, f.ref, f.fk_statut";
-	$sql .= ", f.datef as df, f.date_lim_reglement as datelimite";
-	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-	$sql .= ", ".MAIN_DB_PREFIX."facture as f";
-	if (!$user->rights->societe->client->voir && !$socid) {
-		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	}
-	$sql .= " WHERE f.fk_soc = s.rowid";
-	$sql .= " AND f.entity IN (".getEntity('facture').")";
-	$sql .= " AND f.fk_statut = ".Facture::STATUS_VALIDATED;
-	if (!$user->rights->societe->client->voir && !$socid) {
-		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-	}
-	if ($socid) {
-		$sql .= " AND s.rowid = ".((int) $socid);
-	}
-	$sql .= " ORDER BY f.rowid DESC";
-	$sql .= $db->plimit($maxCount, 0);
-
-	$resql = $db->query($sql);
-	if (!$resql) {
-		dol_print_error($db);
-	}
-
-	$num = $db->num_rows($resql);
-
-	$result = '<div class="div-table-responsive-no-min">';
-	$result .= '<table class="noborder centpercent">';
-
-	$result .= '<tr class="liste_titre">';
-	$result .= '<td colspan="4">';
-	$result .= $langs->trans("BillsCustomersUnpaid");
-	$result .= ' <a href="'.DOL_URL_ROOT.'/compta/facture/list.php?search_status=1">';
-	$result .= '<span class="badge">'.$num.'</span>';
-	$result .= '</a>';
-	$result .= '</td>';
-	$result .= '</tr>';
-
-	if ($num < 1) {
-		$result .= '</table>';
-		$result .= '</div>';
-		return $result;
-	}
-
-	$objectstatic = new Facture($db);
-	$companystatic = new Societe($db);
-	$formfile		= new FormFile($db);
-	$nbofloop		= min($num, $maxCount);
-	$now = dol_now();
-	$total = 0;
-	$i = 0;
-
-	while ($i < $nbofloop) {
-		$obj = $db->fetch_object($resql);
-
-		$objectstatic->id = $obj->id;
-		$objectstatic->ref = $obj->ref;
-
-		$companystatic->id = $obj->socid;
-		$companystatic->name = $obj->socname;
-		$companystatic->client	= $obj->client;
-		$companystatic->canvas	= $obj->canvas;
-
-		$filename = dol_sanitizeFileName($obj->ref);
-		$filedir = $conf->propal->multidir_output[$obj->entity].'/'.dol_sanitizeFileName($obj->ref);
-
-		$result .= '<tr class="oddeven">';
-
-		$result .= '<td class="nowrap" width="140">';
-		$result .= '<table class="nobordernopadding">';
-		$result .= '<tr class="nocellnopadd">';
-
-		$result .= '<td class="nobordernopadding nowrap">'.$objectstatic->getNomUrl(1).'</td>';
-
-		$result .= '<td width="18" class="nobordernopadding nowrap">';
-
-		if ($db->jdate($obj->dfv) < ($now - $conf->propal->cloture->warning_delay)) {
-			$result .= img_warning($langs->trans("Late"));
-		}
-
-		$result .= '</td>';
-
-		$result .= '<td width="16" align="center" class="nobordernopadding">'.$formfile->getDocumentsLink($objectstatic->element, $filename, $filedir).'</td>';
-
-		$result .= '</tr>';
-		$result .= '</table>';
-		$result .= '</td>';
-
-		$result .= '<td class="left">'.$companystatic->getNomUrl(1, 'customer', 44).'</td>';
-		$result .= '<td class="right">'.dol_print_date($db->jdate($obj->df), 'day').'</td>';
-		$result .= '<td class="right"><span class="amount">'.price($obj->total_ttc).'</span></td>';
-
-		$result .= '</tr>';
-
-		$i++;
-		$total += $obj->total_ttc;
-	}
-
-	if ($num > $nbofloop) {
-		$result .= '<tr class="liste_total">';
-		$result .= '<td colspan="4" class="right">'.$langs->trans("XMoreLines", ($num - $nbofloop)).'</td>';
-		$result .= '</tr>';
-	} elseif ($total > 0) {
-		$result .= '<tr class="liste_total">';
-		$result .= '<td colspan="2" class="right">'.$langs->trans("Total").'</td>';
-		$result .= '<td align="right">'.price($total).'</td>';
-		$result .= '<td>&nbsp;</td>';
-		$result .= '</tr>';
-	}
-
-	$result .= '</table>';
-	$result .= '</div>';
-	return $result;
-}

htdocs/compta/index.php

@@ -38,6 +38,8 @@ require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php';
 
 // L'espace compta/treso doit toujours etre actif car c'est un espace partage
 // par de nombreux modules (banque, facture, commande a facturer, etc...) independamment
@@ -64,13 +66,21 @@ if ($user->socid > 0) {
 
 $max = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
 
+// Maximum elements of the tables
+$maxDraftCount = empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD;
+$maxLatestEditCount = 5;
+$maxOpenCount = empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD;
+
 // Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
 $hookmanager->initHooks(array('invoiceindex'));
 
+
 /*
  * Actions
  */
 
+// None
+
 
 /*
  * View
@@ -89,301 +99,19 @@ print load_fiche_titre($langs->trans("AccountancyTreasuryArea"), '', 'bill');
 
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
-
+print getCustomerInvoicePieChart($socid);
-if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) {     // This is useless due to the global search combo
-	// Search customer invoices
-	if (!empty($conf->facture->enabled) && $user->rights->facture->lire) {
-		$listofsearchfields['search_invoice'] = array('text'=>'CustomerInvoice');
-	}
-	// Search supplier invoices
-	if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) && $user->rights->fournisseur->lire) {
-		$listofsearchfields['search_supplier_invoice'] = array('text'=>'SupplierInvoice');
-	}
-	if (!empty($conf->don->enabled) && $user->rights->don->lire) {
-		$langs->load("donations");
-		$listofsearchfields['search_donation'] = array('text'=>'Donation');
-	}
-
-	if (count($listofsearchfields)) {
-		print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
-		print '<input type="hidden" name="token" value="'.newToken().'">';
-		print '<div class="div-table-responsive-no-min">';
-		print '<table class="noborder nohover centpercent">';
-		$i = 0;
-		foreach ($listofsearchfields as $key => $value) {
-			if ($i == 0) {
-				print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-			}
-			print '<tr '.$bc[false].'>';
-			print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'"></td>';
-			if ($i == 0) {
-				print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
-			}
-			print '</tr>';
-			$i++;
-		}
-		print '</table>';
-		print '</div>';
-		print '</form>';
 print '<br>';
-	}
+print getPurchaseInvoicePieChart($socid);
-}
+print '<br>';
-
+print getCustomerInvoiceDraftTable($max, $socid);
-
+print '<br>';
-/**
+print getDraftSupplierTable($max, $socid);
- * Draft customers invoices
- */
-if (!empty($conf->facture->enabled) && $user->rights->facture->lire) {
-	$tmpinvoice = new Facture($db);
-
-	$sql = "SELECT f.rowid, f.ref, f.datef as date, f.total as total_ht, f.tva as total_tva, f.total_ttc, f.ref_client";
-	$sql .= ", f.type, f.fk_statut as status, f.paye";
-	$sql .= ", s.nom as name";
-	$sql .= ", s.rowid as socid, s.email";
-	$sql .= ", s.code_client, s.code_compta, s.code_fournisseur, s.code_compta_fournisseur";
-	$sql .= ", cc.rowid as country_id, cc.code as country_code";
-	if (!$user->rights->societe->client->voir && !$socid) {
-		$sql .= ", sc.fk_soc, sc.fk_user ";
-	}
-	$sql .= " FROM ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."societe as s LEFT JOIN ".MAIN_DB_PREFIX."c_country as cc ON cc.rowid = s.fk_pays";
-	if (!$user->rights->societe->client->voir && !$socid) {
-		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	}
-	$sql .= " WHERE s.rowid = f.fk_soc AND f.fk_statut = ".Facture::STATUS_DRAFT;
-	$sql .= " AND f.entity IN (".getEntity('invoice').")";
-	if (!$user->rights->societe->client->voir && !$socid) {
-		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-	}
-
-	if ($socid) {
-		$sql .= " AND f.fk_soc = $socid";
-	}
-	// Add where from hooks
-	$parameters = array();
-	$reshook = $hookmanager->executeHooks('printFieldListWhereCustomerDraft', $parameters);
-	$sql .= $hookmanager->resPrint;
-
-	$sql .= " GROUP BY f.rowid, f.ref, f.datef, f.total, f.tva, f.total_ttc, f.ref_client, f.type, f.fk_statut, f.paye,";
-	$sql .= " s.nom, s.rowid, s.email, s.code_client, s.code_compta, s.code_fournisseur, s.code_compta_fournisseur,";
-	$sql .= " cc.rowid, cc.code";
-	if (!$user->rights->societe->client->voir && !$socid) {
-		$sql.= ", sc.fk_soc, sc.fk_user";
-	}
-
-	// Add Group from hooks
-	$parameters = array();
-	$reshook = $hookmanager->executeHooks('printFieldListGroupByCustomerDraft', $parameters);
-	$sql .= $hookmanager->resPrint;
-
-	$resql = $db->query($sql);
-
-	if ($resql) {
-		$num = $db->num_rows($resql);
-
-		print '<div class="div-table-responsive-no-min">';
-		print '<table class="noborder centpercent">';
-
-		print '<tr class="liste_titre">';
-		print '<th colspan="3">';
-		print $langs->trans("CustomersDraftInvoices").' ';
-		print '<a href="'.DOL_URL_ROOT.'/compta/facture/list.php?search_status='.Facture::STATUS_DRAFT.'">';
-		print '<span class="badge marginleftonlyshort">'.$num.'</span>';
-		print '</a>';
-		print '</th>';
-		print '</tr>';
-
-		if ($num) {
-			$companystatic = new Societe($db);
-
-			$i = 0;
-			$othernb = 0;
-			$tot_ttc = 0;
-			while ($i < $num && $i < $conf->liste_limit) {
-				$obj = $db->fetch_object($resql);
-
-				if ($i >= $max) {
-					$othernb += 1;
-					$i++;
-					$tot_ttc += $obj->total_ttc;
-					continue;
-				}
-
-				$tmpinvoice->id = $obj->rowid;
-				$tmpinvoice->ref = $obj->ref;
-				$tmpinvoice->date = $db->jdate($obj->date);
-				$tmpinvoice->type = $obj->type;
-				$tmpinvoice->total_ht = $obj->total_ht;
-				$tmpinvoice->total_tva = $obj->total_tva;
-				$tmpinvoice->total_ttc = $obj->total_ttc;
-				$tmpinvoice->ref_client = $obj->ref_client;
-				$tmpinvoice->statut = $obj->status;
-				$tmpinvoice->paye = $obj->paye;
-
-				$companystatic->id = $obj->socid;
-				$companystatic->name = $obj->name;
-				$companystatic->email = $obj->email;
-				$companystatic->country_id = $obj->country_id;
-				$companystatic->country_code = $obj->country_code;
-				$companystatic->client = 1;
-				$companystatic->code_client = $obj->code_client;
-				$companystatic->code_fournisseur = $obj->code_fournisseur;
-				$companystatic->code_compta = $obj->code_compta;
-				$companystatic->code_compta_fournisseur = $obj->code_compta_fournisseur;
-
-				print '<tr class="oddeven"><td class="nowrap tdoverflowmax100">';
-				print $tmpinvoice->getNomUrl(1, '');
-				print '</td>';
-				print '<td class="nowrap tdoverflowmax100">';
-				print $companystatic->getNomUrl(1, 'customer');
-				print '</td>';
-				print '<td class="nowrap right">'.price($obj->total_ttc).'</td>';
-				print '</tr>';
-				$tot_ttc += $obj->total_ttc;
-				$i++;
-			}
-
-			if ($othernb) {
-				print '<tr class="oddeven">';
-				print '<td class="nowrap" colspan="3">';
-				print '<span class="opacitymedium">'.$langs->trans("More").'... ('.$othernb.')</span>';
-				print '</td>';
-				print "</tr>\n";
-			}
-
-			print '<tr class="liste_total"><td class="left">'.$langs->trans("Total").'</td>';
-			print '<td colspan="2" class="right">'.price($tot_ttc).'</td>';
-			print '</tr>';
-		} else {
-			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("NoInvoice").'</td></tr>';
-		}
-		print "</table></div><br>";
-		$db->free($resql);
-	} else {
-		dol_print_error($db);
-	}
-}
-
-/**
- * Draft suppliers invoices
- */
-if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_invoice->enabled)) && $user->rights->fournisseur->facture->lire) {
-	$facturesupplierstatic = new FactureFournisseur($db);
-
-	$sql = "SELECT f.ref, f.rowid, f.total_ht, f.total_tva, f.total_ttc, f.type, f.ref_supplier, f.fk_statut as status, f.paye";
-	$sql .= ", s.nom as name";
-	$sql .= ", s.rowid as socid, s.email";
-	$sql .= ", s.code_client, s.code_compta";
-	$sql .= ", s.code_fournisseur, s.code_compta_fournisseur";
-	$sql .= ", cc.rowid as country_id, cc.code as country_code";
-	$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f, ".MAIN_DB_PREFIX."societe as s LEFT JOIN ".MAIN_DB_PREFIX."c_country as cc ON cc.rowid = s.fk_pays";
-	if (!$user->rights->societe->client->voir && !$socid) {
-		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	}
-	$sql .= " WHERE s.rowid = f.fk_soc AND f.fk_statut = ".FactureFournisseur::STATUS_DRAFT;
-	$sql .= " AND f.entity IN (".getEntity('invoice').')';
-	if (!$user->rights->societe->client->voir && !$socid) {
-		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-	}
-	if ($socid) {
-		$sql .= " AND f.fk_soc = ".$socid;
-	}
-	// Add where from hooks
-	$parameters = array();
-	$reshook = $hookmanager->executeHooks('printFieldListWhereSupplierDraft', $parameters);
-	$sql .= $hookmanager->resPrint;
-	$resql = $db->query($sql);
-
-	if ($resql) {
-		$num = $db->num_rows($resql);
-
-		print '<div class="div-table-responsive-no-min">';
-		print '<table class="noborder centpercent">';
-
-		print '<tr class="liste_titre">';
-		print '<th colspan="3">';
-		print $langs->trans("SuppliersDraftInvoices").' ';
-		print '<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?search_status='.FactureFournisseur::STATUS_DRAFT.'">';
-		print '<span class="badge marginleftonlyshort">'.$num.'</span>';
-		print '</a>';
-		print '</th>';
-		print '</tr>';
-
-		if ($num) {
-			$companystatic = new Societe($db);
-
-			$i = 0;
-			$othernb = 0;
-			$tot_ttc = 0;
-			while ($i < $num && $i < $conf->liste_limit) {
-				$obj = $db->fetch_object($resql);
-
-				if ($i >= $max) {
-					$othernb += 1;
-					$i++;
-					$tot_ttc += $obj->total_ttc;
-					continue;
-				}
-
-				$facturesupplierstatic->ref = $obj->ref;
-				$facturesupplierstatic->id = $obj->rowid;
-				$facturesupplierstatic->total_ht = $obj->total_ht;
-				$facturesupplierstatic->total_tva = $obj->total_tva;
-				$facturesupplierstatic->total_ttc = $obj->total_ttc;
-				$facturesupplierstatic->ref_supplier = $obj->ref_supplier;
-				$facturesupplierstatic->type = $obj->type;
-				$facturesupplierstatic->statut = $obj->status;
-				$facturesupplierstatic->paye = $obj->paye;
-
-				$companystatic->id = $obj->socid;
-				$companystatic->name = $obj->name;
-				$companystatic->email = $obj->email;
-				$companystatic->country_id = $obj->country_id;
-				$companystatic->country_code = $obj->country_code;
-				$companystatic->fournisseur = 1;
-				$companystatic->code_client = $obj->code_client;
-				$companystatic->code_fournisseur = $obj->code_fournisseur;
-				$companystatic->code_compta = $obj->code_compta;
-				$companystatic->code_compta_fournisseur = $obj->code_compta_fournisseur;
-
-				print '<tr class="oddeven"><td class="nowrap tdoverflowmax100">';
-				print $facturesupplierstatic->getNomUrl(1, '');
-				print '</td>';
-				print '<td class="nowrap tdoverflowmax100">';
-				print $companystatic->getNomUrl(1, 'supplier');
-				print '</td>';
-				print '<td class="right"><span class="amount">'.price($obj->total_ttc).'</span></td>';
-				print '</tr>';
-				$tot_ttc += $obj->total_ttc;
-				$i++;
-			}
-
-			if ($othernb) {
-				print '<tr class="oddeven">';
-				print '<td class="nowrap" colspan="3">';
-				print '<span class="opacitymedium">'.$langs->trans("More").'... ('.$othernb.')</span>';
-				print '</td>';
-				print "</tr>\n";
-			}
-
-			print '<tr class="liste_total"><td class="left">'.$langs->trans("Total").'</td>';
-			print '<td colspan="2" class="right">'.price($tot_ttc).'</td>';
-			print '</tr>';
-		} else {
-			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("NoInvoice").'</td></tr>';
-		}
-		print "</table></div><br>";
-		$db->free($resql);
-	} else {
-		dol_print_error($db);
-	}
-}
-
 
 print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 
 // Latest modified customer invoices
-if (!empty($conf->facture->enabled) && $user->rights->facture->lire) {
+if (!empty($conf->facture->enabled) && !empty($user->rights->facture->lire)) {
 	$langs->load("boxes");
 	$tmpinvoice = new Facture($db);
 
@@ -495,7 +223,7 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire) {
 				if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) {
 					print '<td class="nowrap right">'.price($obj->total_ht).'</td>';
 				}
-				print '<td class="nowrap right">'.price($obj->total_ttc).'</td>';
+				print '<td class="nowrap right"><span class="amount">'.price($obj->total_ttc).'</span></td>';
 				print '<td class="right">'.dol_print_date($db->jdate($obj->tms), 'day').'</td>';
 				print '<td>'.$tmpinvoice->getLibStatut(3, $obj->am).'</td>';
 				print '</tr>';
@@ -529,9 +257,8 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire) {
 }
 
 
-
 // Last modified supplier invoices
-if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_invoice->enabled)) && $user->rights->fournisseur->facture->lire) {
+if (((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_invoice->enabled)) && $user->rights->fournisseur->facture->lire) {
 	$langs->load("boxes");
 	$facstatic = new FactureFournisseur($db);
 
@@ -622,7 +349,7 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 				if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) {
 					print '<td class="right"><span class="amount">'.price($obj->total_ht).'</span></td>';
 				}
-				print '<td class="nowrap right">'.price($obj->total_ttc).'</td>';
+				print '<td class="nowrap right"><span class="amount">'.price($obj->total_ttc).'</span></td>';
 				print '<td class="right">'.dol_print_date($db->jdate($obj->tms), 'day').'</td>';
 				print '<td>'.$facstatic->getLibStatut(3).'</td>';
 				print '</tr>';
@@ -655,7 +382,7 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 
 
 // Latest donations
-if (!empty($conf->don->enabled) && $user->rights->don->lire) {
+if (!empty($conf->don->enabled) && !empty($user->rights->don->lire)) {
 	include_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
 
 	$langs->load("boxes");
@@ -718,7 +445,7 @@ if (!empty($conf->don->enabled) && $user->rights->don->lire) {
 				print '<tr class="oddeven tdoverflowmax100">';
 				print '<td>'.$donationstatic->getNomUrl(1).'</td>';
 				print '<td>'.$label.'</td>';
-				print '<td class="nowrap right">'.price($objp->amount).'</td>';
+				print '<td class="nowrap right"><span class="amount">'.price($objp->amount).'</span></td>';
 				print '<td class="right">'.dol_print_date($db->jdate($objp->dm), 'day').'</td>';
 				print '<td>'.$donationstatic->getLibStatut(3).'</td>';
 				print '</tr>';
@@ -745,7 +472,7 @@ if (!empty($conf->don->enabled) && $user->rights->don->lire) {
 /**
  * Social contributions to pay
  */
-if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire) {
+if (!empty($conf->tax->enabled) && !empty($user->rights->tax->charges->lire)) {
 	if (!$socid) {
 		$chargestatic = new ChargeSociales($db);
 
@@ -802,8 +529,8 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire) {
 					print '<tr class="oddeven">';
 					print '<td class="nowraponall">'.$chargestatic->getNomUrl(1).'</td>';
 					print '<td class="center">'.dol_print_date($db->jdate($obj->date_ech), 'day').'</td>';
-					print '<td class="nowrap right">'.price($obj->amount).'</td>';
+					print '<td class="nowrap right"><span class="amount">'.price($obj->amount).'</span></td>';
-					print '<td class="nowrap right">'.price($obj->sumpaid).'</td>';
+					print '<td class="nowrap right"><span class="amount">'.price($obj->sumpaid).'</span></td>';
 					print '<td class="center">'.$chargestatic->getLibStatut(3).'</td>';
 					print '</tr>';
 
@@ -953,8 +680,8 @@ if (!empty($conf->facture->enabled) && !empty($conf->commande->enabled) && $user
 				if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) {
 					print '<td class="right"><span class="amount">'.price($obj->total_ht).'</span></td>';
 				}
-				print '<td class="nowrap right">'.price($obj->total_ttc).'</td>';
+				print '<td class="nowrap right"><span class="amount">'.price($obj->total_ttc).'</span></td>';
-				print '<td class="nowrap right">'.price($obj->total_ttc - $obj->tot_fttc).'</td>';
+				print '<td class="nowrap right"><span class="amount">'.price($obj->total_ttc - $obj->tot_fttc).'</span></td>';
 				print '<td>'.$commandestatic->getLibStatut(3).'</td>';
 				print '</tr>';
 				$tot_ht += $obj->total_ht;
@@ -974,10 +701,10 @@ if (!empty($conf->facture->enabled) && !empty($conf->commande->enabled) && $user
 
 			print '<tr class="liste_total"><td colspan="2">'.$langs->trans("Total").' &nbsp; <font style="font-weight: normal">('.$langs->trans("RemainderToBill").': '.price($tot_tobill).')</font> </td>';
 			if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) {
-				print '<td class="right"><span class="amount">'.price($tot_ht).'</span></td>';
+				print '<td class="right">'.price($tot_ht).'</td>';
 			}
-			print '<td class="nowrap right"><span class="amount">'.price($tot_ttc).'</span></td>';
+			print '<td class="nowrap right">'.price($tot_ttc).'</td>';
-			print '<td class="nowrap right"><span class="amount">'.price($tot_tobill).'</span></td>';
+			print '<td class="nowrap right">'.price($tot_tobill).'</td>';
 			print '<td>&nbsp;</td>';
 			print '</tr>';
 			print '</table></div><br>';
@@ -988,328 +715,9 @@ if (!empty($conf->facture->enabled) && !empty($conf->commande->enabled) && $user
 	}
 }
 
-/*
- * Unpaid customers invoices
- */
-if (!empty($conf->facture->enabled) && $user->rights->facture->lire) {
-	$tmpinvoice = new Facture($db);
-
-	$sql = "SELECT f.rowid, f.ref, f.fk_statut as status, f.datef, f.type, f.total as total_ht, f.tva as total_tva, f.total_ttc, f.paye, f.tms";
-	$sql .= ", f.date_lim_reglement as datelimite";
-	$sql .= ", s.nom as name";
-	$sql .= ", s.rowid as socid, s.email";
-	$sql .= ", s.code_client, s.code_compta";
-	$sql .= ", s.code_fournisseur, s.code_compta_fournisseur";
-	$sql .= ", cc.rowid as country_id, cc.code as country_code";
-	$sql .= ", sum(pf.amount) as am";
-	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s LEFT JOIN ".MAIN_DB_PREFIX."c_country as cc ON cc.rowid = s.fk_pays,".MAIN_DB_PREFIX."facture as f";
-	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf on f.rowid=pf.fk_facture";
-	if (!$user->rights->societe->client->voir && !$socid) {
-		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	}
-	$sql .= " WHERE s.rowid = f.fk_soc AND f.paye = 0 AND f.fk_statut = ".Facture::STATUS_VALIDATED;
-	$sql .= " AND f.entity IN (".getEntity('invoice').')';
-	if (!$user->rights->societe->client->voir && !$socid) {
-		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-	}
-	if ($socid) {
-		$sql .= " AND f.fk_soc = ".$socid;
-	}
-	// Add where from hooks
-	$parameters = array();
-	$reshook = $hookmanager->executeHooks('printFieldListWhereCustomerUnpaid', $parameters);
-	$sql .= $hookmanager->resPrint;
-
-	$sql .= " GROUP BY f.rowid, f.ref, f.fk_statut, f.datef, f.type, f.total, f.tva, f.total_ttc, f.paye, f.tms, f.date_lim_reglement,";
-	$sql .= " s.nom, s.rowid, s.email, s.code_client, s.code_compta, cc.rowid, cc.code";
-	$sql .= ", s.code_fournisseur, s.code_compta_fournisseur";
-	$sql .= " ORDER BY f.datef ASC, f.ref ASC";
-
-	$resql = $db->query($sql);
-	if ($resql) {
-		$num = $db->num_rows($resql);
-		$i = 0;
-		$othernb = 0;
-
-		print '<div class="div-table-responsive-no-min">';
-		print '<table class="noborder centpercent">';
-
-		print '<tr class="liste_titre">';
-		print '<th colspan="2">';
-		print $langs->trans("BillsCustomersUnpaid", $num).' ';
-		print '<a href="'.DOL_URL_ROOT.'/compta/facture/list.php?search_status='.Facture::STATUS_VALIDATED.'">';
-		print '<span class="badge">'.$num.'</span>';
-		print '</a>';
-		print '</th>';
-
-		print '<th class="right">'.$langs->trans("DateDue").'</th>';
-		if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) {
-			print '<th class="right">'.$langs->trans("AmountHT").'</th>';
-		}
-		print '<th class="right">'.$langs->trans("AmountTTC").'</th>';
-		print '<th class="right">'.$langs->trans("Received").'</th>';
-		print '<th width="16">&nbsp;</th>';
-		print '</tr>';
-		if ($num) {
-			$societestatic = new Societe($db);
-			$total_ttc = $totalam = $total = 0;
-			while ($i < $num && $i < $conf->liste_limit) {
-				$obj = $db->fetch_object($resql);
-
-				if ($i >= $max) {
-					$othernb += 1;
-					$i++;
-					$total += $obj->total_ht;
-					$total_ttc += $obj->total_ttc;
-					continue;
-				}
-
-				$tmpinvoice->ref = $obj->ref;
-				$tmpinvoice->id = $obj->rowid;
-				$tmpinvoice->total_ht = $obj->total_ht;
-				$tmpinvoice->total_tva = $obj->total_tva;
-				$tmpinvoice->total_ttc = $obj->total_ttc;
-				$tmpinvoice->type = $obj->type;
-				$tmpinvoice->statut = $obj->status;
-				$tmpinvoice->paye = $obj->paye;
-				$tmpinvoice->date_lim_reglement = $db->jdate($obj->datelimite);
-
-				$societestatic->id = $obj->socid;
-				$societestatic->name = $obj->name;
-				$societestatic->email = $obj->email;
-				$societestatic->country_id = $obj->country_id;
-				$societestatic->country_code = $obj->country_code;
-				$societestatic->client = 1;
-				$societestatic->code_client = $obj->code_client;
-				$societestatic->code_fournisseur = $obj->code_fournisseur;
-				$societestatic->code_compta = $obj->code_compta;
-				$societestatic->code_compta_fournisseur = $obj->code_compta_fournisseur;
-
-				print '<tr class="oddeven">';
-				print '<td class="nowrap">';
-
-				print '<table class="nobordernopadding"><tr class="nocellnopadd">';
-				print '<td class="nobordernopadding nowrap">';
-				print $tmpinvoice->getNomUrl(1, '');
-				print '</td>';
-				print '<td width="20" class="nobordernopadding nowrap">';
-				if ($tmpinvoice->hasDelay()) {
-					print img_warning($langs->trans("Late"));
-				}
-				print '</td>';
-				print '<td width="16" class="nobordernopadding hideonsmartphone right">';
-				$filename = dol_sanitizeFileName($obj->ref);
-				$filedir = $conf->facture->dir_output.'/'.dol_sanitizeFileName($obj->ref);
-				$urlsource = $_SERVER['PHP_SELF'].'?facid='.$obj->rowid;
-				print $formfile->getDocumentsLink($tmpinvoice->element, $filename, $filedir);
-				print '</td></tr></table>';
-
-				print '</td>';
-				print '<td class="nowrap tdoverflowmax100">';
-				print $societestatic->getNomUrl(1, 'customer');
-				print '</td>';
-				print '<td class="right">'.dol_print_date($db->jdate($obj->datelimite), 'day').'</td>';
-				if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) {
-					print '<td class="right"><span class="amount">'.price($obj->total_ht).'</span></td>';
-				}
-				print '<td class="nowrap right"><span class="amount">'.price($obj->total_ttc).'</span></td>';
-				print '<td class="nowrap right"><span class="amount">'.price($obj->am).'</span></td>';
-				print '<td>'.$tmpinvoice->getLibStatut(3, $obj->am).'</td>';
-				print '</tr>';
-
-				$total_ttc += $obj->total_ttc;
-				$total += $obj->total_ht;
-				$totalam += $obj->am;
-
-				$i++;
-			}
-
-			if ($othernb) {
-				$colspan = 6;
-				if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) {
-					$colspan++;
-				}
-				print '<tr class="oddeven">';
-				print '<td class="nowrap" colspan="'.$colspan.'">';
-				print '<span class="opacitymedium">'.$langs->trans("More").'... ('.$othernb.')</span>';
-				print '</td>';
-				print "</tr>\n";
-			}
-
-			print '<tr class="liste_total"><td colspan="2">'.$langs->trans("Total").' &nbsp; <font style="font-weight: normal">('.$langs->trans("RemainderToTake").': '.price($total_ttc - $totalam).')</font> </td>';
-			print '<td>&nbsp;</td>';
-			if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) {
-				print '<td class="right"><span class="amount">'.price($total).'</span></td>';
-			}
-			print '<td class="nowrap right"><span class="amount">'.price($total_ttc).'</span></td>';
-			print '<td class="nowrap right"><span class="amount">'.price($totalam).'</span></td>';
-			print '<td>&nbsp;</td>';
-			print '</tr>';
-		} else {
-			$colspan = 6;
-			if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) {
-				$colspan++;
-			}
-			print '<tr class="oddeven"><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoInvoice").'</td></tr>';
-		}
-		print '</table></div><br>';
-		$db->free($resql);
-	} else {
-		dol_print_error($db);
-	}
-}
-
-/*
- * Unpaid supplier invoices
- */
-if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_invoice->enabled)) && $user->rights->fournisseur->facture->lire) {
-	$facstatic = new FactureFournisseur($db);
-
-	$sql = "SELECT ff.rowid, ff.ref, ff.fk_statut as status, ff.type, ff.libelle as label, ff.total_ht, ff.total_tva, ff.total_ttc, ff.paye";
-	$sql .= ", ff.date_lim_reglement";
-	$sql .= ", s.nom as name";
-	$sql .= ", s.rowid as socid, s.email";
-	$sql .= ", s.code_client, s.code_compta";
-	$sql .= ", s.code_fournisseur, s.code_compta_fournisseur";
-	$sql .= ", sum(pf.amount) as am";
-	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture_fourn as ff";
-	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiementfourn_facturefourn as pf on ff.rowid=pf.fk_facturefourn";
-	if (!$user->rights->societe->client->voir && !$socid) {
-		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	}
-	$sql .= " WHERE s.rowid = ff.fk_soc";
-	$sql .= " AND ff.entity = ".$conf->entity;
-	$sql .= " AND ff.paye = 0";
-	$sql .= " AND ff.fk_statut = ".FactureFournisseur::STATUS_VALIDATED;
-	if (!$user->rights->societe->client->voir && !$socid) {
-		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-	}
-	if ($socid) {
-		$sql .= " AND ff.fk_soc = ".$socid;
-	}
-	// Add where from hooks
-	$parameters = array();
-	$reshook = $hookmanager->executeHooks('printFieldListWhereSupplierUnpaid', $parameters);
-	$sql .= $hookmanager->resPrint;
-
-	$sql .= " GROUP BY ff.rowid, ff.ref, ff.fk_statut, ff.type, ff.libelle, ff.total_ht, ff.tva, ff.total_tva, ff.total_ttc, ff.paye, ff.date_lim_reglement,";
-	$sql .= " s.nom, s.rowid, s.email, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur";
-	$sql .= " ORDER BY ff.date_lim_reglement ASC";
-
-	$resql = $db->query($sql);
-	if ($resql) {
-		$num = $db->num_rows($resql);
-		$othernb = 0;
-
-		print '<div class="div-table-responsive-no-min">';
-		print '<table class="noborder centpercent">';
-
-		print '<tr class="liste_titre">';
-		print '<th colspan="2">';
-		print $langs->trans("BillsSuppliersUnpaid", $num).' ';
-		print '<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?search_status='.FactureFournisseur::STATUS_VALIDATED.'">';
-		print '<span class="badge">'.$num.'</span>';
-		print '</a>';
-		print '</th>';
-
-		print '<th class="right">'.$langs->trans("DateDue").'</th>';
-		if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) {
-			print '<th class="right">'.$langs->trans("AmountHT").'</th>';
-		}
-		print '<th class="right">'.$langs->trans("AmountTTC").'</th>';
-		print '<th class="right">'.$langs->trans("Paid").'</th>';
-		print '<th width="16">&nbsp;</th>';
-		print "</tr>\n";
-		$societestatic = new Societe($db);
-		if ($num) {
-			$i = 0;
-			$total = $total_ttc = $totalam = 0;
-			while ($i < $num) {
-				$obj = $db->fetch_object($resql);
-
-				if ($i >= $max) {
-					$othernb += 1;
-					$i++;
-					$total += $obj->total_ht;
-					$total_ttc += $obj->total_ttc;
-					continue;
-				}
-
-				$facstatic->ref = $obj->ref;
-				$facstatic->id = $obj->rowid;
-				$facstatic->type = $obj->type;
-				$facstatic->total_ht = $obj->total_ht;
-				$facstatic->total_tva = $obj->total_tva;
-				$facstatic->total_ttc = $obj->total_ttc;
-				$facstatic->statut = $obj->status;
-				$facstatic->paye = $obj->paye;
-
-				$societestatic->id = $obj->socid;
-				$societestatic->name = $obj->name;
-				$societestatic->email = $obj->email;
-				$societestatic->client = 0;
-				$societestatic->fournisseur = 1;
-				$societestatic->code_client = $obj->code_client;
-				$societestatic->code_fournisseur = $obj->code_fournisseur;
-				$societestatic->code_compta = $obj->code_compta;
-				$societestatic->code_compta_fournisseur = $obj->code_compta_fournisseur;
-
-				print '<tr class="oddeven"><td class="nowrap tdoverflowmax100">';
-				print $facstatic->getNomUrl(1, '');
-				print '</td>';
-				print '<td class="nowrap tdoverflowmax100">'.$societestatic->getNomUrl(1, 'supplier').'</td>';
-				print '<td class="right">'.dol_print_date($db->jdate($obj->date_lim_reglement), 'day').'</td>';
-				if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) {
-					print '<td class="right"><span class="amount">'.price($obj->total_ht).'</span></td>';
-				}
-				print '<td class="nowrap right"><span class="amount">'.price($obj->total_ttc).'</span></td>';
-				print '<td class="nowrap right"><span class="amount">'.price($obj->am).'</span></td>';
-				print '<td>'.$facstatic->getLibStatut(3, $obj->am).'</td>';
-				print '</tr>';
-				$total += $obj->total_ht;
-				$total_ttc += $obj->total_ttc;
-				$totalam += $obj->am;
-				$i++;
-			}
-
-			if ($othernb) {
-				$colspan = 6;
-				if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) {
-					$colspan++;
-				}
-				print '<tr class="oddeven">';
-				print '<td class="nowrap" colspan="'.$colspan.'">';
-				print '<span class="opacitymedium">'.$langs->trans("More").'... ('.$othernb.')</span>';
-				print '</td>';
-				print "</tr>\n";
-			}
-
-			print '<tr class="liste_total"><td colspan="2">'.$langs->trans("Total").' &nbsp; <font style="font-weight: normal">('.$langs->trans("RemainderToPay").': '.price($total_ttc - $totalam).')</font> </td>';
-			print '<td>&nbsp;</td>';
-			if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) {
-				print '<td class="right">'.price($total).'</td>';
-			}
-			print '<td class="nowrap right">'.price($total_ttc).'</td>';
-			print '<td class="nowrap right">'.price($totalam).'</td>';
-			print '<td>&nbsp;</td>';
-			print '</tr>';
-		} else {
-			$colspan = 6;
-			if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) {
-				$colspan++;
-			}
-			print '<tr class="oddeven"><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoInvoice").'</td></tr>';
-		}
-		print '</table></div><br>';
-	} else {
-		dol_print_error($db);
-	}
-}
-
-
 
 // TODO Mettre ici recup des actions en rapport avec la compta
-$resql = 0;
+$resql = '';
 if ($resql) {
 	print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder centpercent">';

htdocs/compta/resultat/result.php

@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2016-2017  Jamal Elbaz             <jamelbaz@gmail.com>
  * Copyright (C) 2016       Alexandre Spangaro      <aspangaro@open-dsi.fr>
- * Copyright (C) 2018       Laurent Destailleur     <eldy@destailleur.fr>
+ * Copyright (C) 2018-2020  Laurent Destailleur     <eldy@destailleur.fr>
  * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -318,9 +318,9 @@ if ($modecompta == 'CREANCES-DETTES') {
 
 				// Year NP
 				print '<td class="liste_total width200">';
-				print $cat['code'];
+				print dol_escape_htmltag($cat['code']);
 				print '</td><td>';
-				print $cat['label'];
+				print dol_escape_htmltag($cat['label']);
 				print '</td>';
 
 				$vars = array();
@@ -337,7 +337,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 				$r = dol_eval($result, 1);
 				//var_dump($r);
 
-				print '<td class="liste_total right">'.price($r).'</td>';
+				print '<td class="liste_total right"><span class="amount">'.price($r).'</span></td>';
 
 				// Year N
 				$code = $cat['code']; // code of categorie ('VTE', 'MAR', ...)
@@ -355,7 +355,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 				//$r = $AccCat->calculate($result);
 				$r = dol_eval($result, 1);
 
-				print '<td class="liste_total right">'.price($r).'</td>';
+				print '<td class="liste_total right"><span class="amount">'.price($r).'</span></td>';
 				$sommes[$code]['N'] += $r;
 
 				// Detail by month
@@ -369,7 +369,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 						//$r = $AccCat->calculate($result);
 						$r = dol_eval($result, 1);
 
-						print '<td class="liste_total right">'.price($r).'</td>';
+						print '<td class="liste_total right"><span class="amount">'.price($r).'</span></td>';
 						$sommes[$code]['M'][$k] += $r;
 					}
 				}
@@ -383,7 +383,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 						//$r = $AccCat->calculate($result);
 						$r = dol_eval($result, 1);
 
-						print '<td class="liste_total right">'.price($r).'</td>';
+						print '<td class="liste_total right"><span class="amount">'.price($r).'</span></td>';
 						$sommes[$code]['M'][$k] += $r;
 					}
 				}
@@ -471,12 +471,12 @@ if ($modecompta == 'CREANCES-DETTES') {
 
 				// Column group
 				print '<td class="width200">';
-				print $cat['code'];
+				print dol_escape_htmltag($cat['code']);
 				print '</td>';
 
 				// Label of group
 				print '<td>';
-				print $cat['label'];
+				print dol_escape_htmltag($cat['label']);
 				if (count($cpts) > 0) {    // Show example of 5 first accounting accounts
 					$i = 0;
 					foreach ($cpts as $cpt) {
@@ -489,7 +489,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 						} else {
 							print ' (';
 						}
-						print $cpt['account_number'];
+						print dol_escape_htmltag($cpt['account_number']);
 						$i++;
 					}
 					if ($i <= 5) {

htdocs/contrat/card.php

@@ -1530,7 +1530,7 @@ if ($action == 'create') {
 					print '<td class="nowrap right">';
 					if ($user->rights->contrat->creer && count($arrayothercontracts) && ($object->statut >= 0)) {
 						print '<!-- link to move service line into another contract -->';
-						print '<a class="reposition" style="padding-left: 5px;" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=move&amp;rowid='.$objp->rowid.'">';
+						print '<a class="reposition marginrightonly" style="padding-left: 5px;" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=move&amp;rowid='.$objp->rowid.'">';
 						print img_picto($langs->trans("MoveToAnotherContract"), 'uparrow');
 						print '</a>';
 					}

htdocs/core/class/html.formaccounting.class.php

@@ -275,8 +275,10 @@ class FormAccounting extends Form
 					if ($obj->rowid == $selected) {
 						$out .= ' selected';
 					}
-					$out .= '>'.($maxlen ? dol_trunc($obj->type, $maxlen) : $obj->type);
+					$out .= '>';
-					$out .= ' ('.$obj->range_account.')';
+					$titletoshow = dol_string_nohtmltag(($maxlen ? dol_trunc($obj->type, $maxlen) : $obj->type).' ('.$obj->range_account.')');
+					$out .= dol_escape_htmltag($titletoshow);
+					$out .= '</option>';
 					$i++;
 				}
 				$out .= '</select>';

htdocs/core/lib/files.lib.php

@@ -1544,7 +1544,9 @@ function dol_add_file_process($upload_dir, $allowoverwrite = 0, $donotupdatesess
 	if (!empty($_FILES[$varfiles])) { // For view $_FILES[$varfiles]['error']
 		dol_syslog('dol_add_file_process upload_dir='.$upload_dir.' allowoverwrite='.$allowoverwrite.' donotupdatesession='.$donotupdatesession.' savingdocmask='.$savingdocmask, LOG_DEBUG);
 
-		if (dol_mkdir($upload_dir) >= 0) {
+		$result = dol_mkdir($upload_dir);
+		//      var_dump($result);exit;
+		if ($result >= 0) {
 			$TFile = $_FILES[$varfiles];
 			if (!is_array($TFile['name'])) {
 				foreach ($TFile as $key => &$val) {
@@ -1647,6 +1649,8 @@ function dol_add_file_process($upload_dir, $allowoverwrite = 0, $donotupdatesess
 				$res = 1;
 				setEventMessages($langs->trans("FileTransferComplete"), null, 'mesgs');
 			}
+		} else {
+			setEventMessages($langs->trans("ErrorFailedToCreateDir", $upload_dir), null, 'errors');
 		}
 	} elseif ($link) {
 		require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';

htdocs/core/lib/functions.lib.php

@@ -3525,7 +3525,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'object_recruitmentjobposition', 'object_recruitmentcandidature',
 				'object_salary', 'object_shipment', 'object_share-alt', 'object_supplier_invoice', 'object_supplier_invoicea', 'object_supplier_invoiced', 'object_supplier_order', 'object_supplier_proposal', 'object_service', 'object_stock',
 				'object_technic', 'object_ticket', 'object_trip', 'object_user', 'object_group', 'object_member',
-				'object_phoning', 'object_phoning_mobile', 'object_phoning_fax', 'object_email', 'object_website', 'object_movement',
+				'object_phoning', 'object_phoning_mobile', 'object_phoning_fax', 'object_email', 'object_website', 'object_movement', 'object_workstation',
 				'off', 'on', 'order',
 				'paiment', 'play', 'pdf', 'phone', 'playdisabled', 'previous', 'poll', 'pos', 'printer', 'product', 'propal', 'stock', 'resize', 'service', 'stats', 'trip',
 				'setup', 'share-alt', 'sign-out', 'split', 'stripe', 'stripe-s', 'switch_off', 'switch_on', 'tools', 'unlink', 'uparrow', 'user', 'vcard', 'wrench',
@@ -3537,7 +3537,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'recruitmentcandidature', 'recruitmentjobposition', 'resource',
 				'shapes', 'supplier_proposal', 'supplier_order', 'supplier_invoice',
 				'timespent', 'title_setup', 'title_accountancy', 'title_bank', 'title_hrm', 'title_agenda',
-				'user-cog', 'website',
+				'user-cog', 'website', 'workstation',
 				'conferenceorbooth', 'eventorganization'
 			))) {
 			$pictowithouttext = str_replace('object_', '', $pictowithouttext);
@@ -3585,7 +3585,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'title_agenda'=>'calendar-alt',
 				'uparrow'=>'share', 'vcard'=>'address-card',
 				'jabber'=>'comment-o',
-				'website'=>'globe-americas',
+				'website'=>'globe-americas', 'workstation'=>'pallet',
 				'conferenceorbooth'=>'chalkboard-teacher', 'eventorganization'=>'project-diagram'
 			);
 			if ($pictowithouttext == 'off') {
@@ -3619,7 +3619,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 			if (in_array($pictowithouttext, array('dollyrevert', 'member', 'members', 'contract', 'group', 'resource', 'shipment'))) {
 				$morecss = 'em092';
 			}
-			if (in_array($pictowithouttext, array('conferenceorbooth', 'collab', 'eventorganization', 'holiday', 'project'))) {
+			if (in_array($pictowithouttext, array('conferenceorbooth', 'collab', 'eventorganization', 'holiday', 'project', 'workstation'))) {
 				$morecss = 'em088';
 			}
 			if (in_array($pictowithouttext, array('intervention', 'info', 'payment', 'loan', 'stock', 'technic'))) {
@@ -3676,7 +3676,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'other'=>'#ddd',
 				'playdisabled'=>'#ccc', 'printer'=>'#444', 'projectpub'=>'#986c6a', 'resize'=>'#444', 'rss'=>'#cba',
 				'shipment'=>'#a69944', 'stats'=>'#444', 'switch_off'=>'#999', 'technic'=>'#999', 'timespent'=>'#555', 'uparrow'=>'#555', 'user-cog'=>'#999', 'country'=>'#aaa', 'globe-americas'=>'#aaa',
-				'website'=>'#304'
+				'website'=>'#304', 'workstation'=>'#a69944'
 			);
 			if (isset($arrayconvpictotocolor[$pictowithouttext])) {
 				$facolor = $arrayconvpictotocolor[$pictowithouttext];

htdocs/core/modules/modBlockedLog.class.php

@@ -113,7 +113,7 @@ class modBlockedLog extends DolibarrModules
 		// -----------------
 		$this->rights = array(); // Permission array used by this module
 
-		$r = 0;
+		$r = 1;
 		$this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used)
 		$this->rights[$r][1] = 'Read archived events and fingerprints'; // Permission label
 		$this->rights[$r][3] = 0; // Permission by default for new user (0/1)

htdocs/core/modules/modBom.class.php

@@ -205,7 +205,7 @@ class modBom extends DolibarrModules
 		// Permissions provided by this module
 		$this->rights = array(); // Permission array used by this module
 
-		$r = 0;
+		$r = 1;
 		$this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used)
 		$this->rights[$r][1] = 'Read bom of Bom'; // Permission label
 		$this->rights[$r][3] = 0; // Permission by default for new user (0/1)

htdocs/core/modules/modDebugBar.class.php

@@ -79,7 +79,7 @@ class modDebugBar extends DolibarrModules
 		// Permissions
 		$this->rights = array();
 
-		$this->rights[1][0] = 430; // id de la permission
+		$this->rights[1][0] = 431; // id de la permission
 		$this->rights[1][1] = 'Use Debug Bar'; // libelle de la permission
 		$this->rights[1][2] = 'u'; // type de la permission (deprecie a ce jour)
 		$this->rights[1][3] = 1; // La permission est-elle une permission par defaut

htdocs/core/modules/modEventOrganization.class.php

@@ -224,7 +224,8 @@ class modEventOrganization extends DolibarrModules
 
 		// Permissions provided by this module
 		$this->rights = array();
-		$r = 0;
+		$r = 1;
+
 		// Add here entries to declare new permissions
 		/* BEGIN MODULEBUILDER PERMISSIONS */
 		$this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used)

htdocs/core/modules/modLoan.class.php

@@ -97,7 +97,7 @@ class modLoan extends DolibarrModules
 		$r = 0;
 
 		$r++;
-		$this->rights[$r][0] = 520;
+		$this->rights[$r][0] = 521;
 		$this->rights[$r][1] = 'Read loans';
 		$this->rights[$r][2] = 'r';
 		$this->rights[$r][3] = 0;

htdocs/core/modules/modMailing.class.php

@@ -48,7 +48,7 @@ class modMailing extends DolibarrModules
 		// It is used to group modules by family in module setup page
 		$this->family = "interface";
 		// Module position in the family on 2 digits ('01', '10', '20', ...)
-		$this->module_position = '22';
+		$this->module_position = '23';
 
 		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
 		$this->name = preg_replace('/^mod/i', '', get_class($this));

htdocs/core/modules/modMrp.class.php

@@ -236,7 +236,7 @@ class modMrp extends DolibarrModules
 
 		// Permissions provided by this module
 		$this->rights = array();
-		$r = 0;
+		$r = 1;
 		// Add here entries to declare new permissions
 		/* BEGIN MODULEBUILDER PERMISSIONS */
 		$this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used)

htdocs/core/modules/modNotification.class.php

@@ -45,7 +45,7 @@ class modNotification extends DolibarrModules
 		// It is used to group modules in module setup page
 		$this->family = "interface";
 		// Module position in the family on 2 digits ('01', '10', '20', ...)
-		$this->module_position = '01';
+		$this->module_position = '22';
 		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
 		$this->name = preg_replace('/^mod/i', '', get_class($this));
 		$this->description = "EMail notifications (push) on business Dolibarr events";

htdocs/core/modules/modReceiptPrinter.class.php

@@ -95,7 +95,7 @@ class modReceiptPrinter extends DolibarrModules
 		// $this->rights[$r][5]     Niveau 2 pour nommer permission dans code
 
 		$r++;
-		$this->rights[$r][0] = 67000;
+		$this->rights[$r][0] = 67001;
 		$this->rights[$r][1] = 'ReceiptPrinter';
 		$this->rights[$r][2] = 'r';
 		$this->rights[$r][3] = 0;

htdocs/core/modules/modWorkstation.class.php

@@ -45,12 +45,12 @@ class modWorkstation extends DolibarrModules
 
 		// Id for module (must be unique).
 		// Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
-		$this->numero = 500000; // TODO Go on page https://wiki.dolibarr.org/index.php/List_of_modules_id to reserve an id number for your module
+		$this->numero = 690;
 		// Key text used to identify module (for permissions, menus, etc...)
 		$this->rights_class = 'workstation';
 		// Family can be 'base' (core modules),'crm','financial','hr','projects','products','ecm','technic' (transverse modules),'interface' (link with external tools),'other','...'
 		// It is used to group modules by family in module setup page
-		$this->family = "other";
+		$this->family = "products";
 		// Module position in the family on 2 digits ('01', '10', '20', ...)
 		$this->module_position = '90';
 		// Gives the possibility for the module, to provide his own family info and position of this family (Overwrite $this->family and $this->module_position. Avoid this)
@@ -71,7 +71,7 @@ class modWorkstation extends DolibarrModules
 		// Name of image file used for this module.
 		// If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
 		// If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
-		$this->picto = 'mrp';
+		$this->picto = 'workstation';
 		// Define some features supported by module (triggers, login, substitutions, menus, css, etc...)
 		$this->module_parts = array(
 			// Set this to 1 if module has its own trigger directory (core/triggers)
@@ -239,7 +239,7 @@ class modWorkstation extends DolibarrModules
 
 		// Permissions provided by this module
 		$this->rights = array();
-		$r = 0;
+		$r = 1;
 		// Add here entries to declare new permissions
 		/* BEGIN MODULEBUILDER PERMISSIONS */
 		$this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used)
@@ -330,6 +330,7 @@ class modWorkstation extends DolibarrModules
 			// This is a Left menu entry
 			'type'=>'left',
 			'titre'=>$langs->trans('Workstations'),
+			'prefix' => img_picto('', $this->picto, 'class="paddingright pictofixedwidth"'),
 			'mainmenu'=>'mrp',
 			'leftmenu'=>'workstation_workstation',
 			'url'=>'',

htdocs/core/modules/modZapier.class.php

@@ -242,7 +242,7 @@ class modZapier extends DolibarrModules
 		// Permission array used by this module
 		$this->rights = array();
 
-		$r = 0;
+		$r = 1;
 		// Permission id (must not be already used)
 		$this->rights[$r][0] = $this->numero + $r;
 		// Permission label

htdocs/fourn/facture/index.php

@@ -25,6 +25,7 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php';
 
 // Security check
 restrictedArea($user, 'fournisseur', 0, '', 'facture');
@@ -39,6 +40,8 @@ if (isset($user->socid) && $user->socid > 0) {
 	$socid = $user->socid;
 }
 
+$max = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
+
 // Maximum elements of the tables
 $maxDraftCount = empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD;
 $maxLatestEditCount = 5;
@@ -56,24 +59,18 @@ print '<div class="fichecenter">';
 
 print '<div class="fichethirdleft">';
 
-// This is useless due to the global search combo
+print getPurchaseInvoicePieChart($socid);
-if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) {
-	print getAreaSearchFrom();
 print '<br>';
-}
+print getDraftSupplierTable($maxDraftCount, $socid);
-
-print getPieChart($socid);
-print '<br>';
-print getDraftTable($maxDraftCount, $socid);
 
 print '</div>';
 
 print '<div class="fichetwothirdright">';
 print '<div class="ficheaddleft">';
 
-print getLatestEditTable($maxLatestEditCount, $socid);
+print getPurchaseInvoiceLatestEditTable($maxLatestEditCount, $socid);
 print '<br>';
-print getOpenTable($maxOpenCount, $socid);
+print getPurchaseInvoiceUnpaidOpenTable($max, $socid);
 
 print '</div>';
 print '</div>';
@@ -83,453 +80,3 @@ print '</div>';
 // End of page
 llxFooter();
 $db->close();
-
-/**
- * Return a HTML string that contains a additional search form
- *
- * @return string A HTML string that contains a additional search form
- */
-function getAreaSearchFrom()
-{
-	global $langs;
-
-	$result = '<form method="post" action="'.DOL_URL_ROOT.'/compta/facture/list.php">';
-	$result .= '<div class="div-table-responsive-no-min">';
-	$result .= '<input type="hidden" name="token" value="'.newToken().'">';
-	$result .= '<table class="noborder nohover centpercent">';
-
-	$result .= '<tr class="liste_titre">';
-	$result .= '<td colspan="3">'.$langs->trans("Search").'</td>';
-	$result .= '</tr>';
-
-	$result .= '<tr class="oddeven">';
-	$result .= '<td>'.$langs->trans("Invoice").':</td><td><input type="text" class="flat" name="sall" size=18></td>';
-	$result .= '<td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
-	$result .= '</tr>';
-
-	$result .= "</table>";
-	$result .= "</div>";
-	$result .= "</form>";
-
-	return $result;
-}
-
-/**
- * Return a HTML table that contains a pie chart of supplier invoices
- *
- * @param	int		$socid		(Optional) Show only results from the supplier with this id
- * @return	string				A HTML table that contains a pie chart of supplier invoices
- */
-function getPieChart($socid = 0)
-{
-	global $conf, $db, $langs, $user;
-
-	$sql = "SELECT count(f.rowid), f.fk_statut";
-	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-	$sql .= ", ".MAIN_DB_PREFIX."facture_fourn as f";
-	if (!$user->rights->societe->client->voir && !$socid) {
-		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	}
-	$sql .= " WHERE f.fk_soc = s.rowid";
-	$sql .= " AND f.entity IN (".getEntity('facture_fourn').")";
-	if ($user->socid) {
-		$sql .= ' AND f.fk_soc = '.$user->socid;
-	}
-	if (!$user->rights->societe->client->voir && !$socid) {
-		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-	}
-	$sql .= " GROUP BY f.fk_statut";
-
-	$resql = $db->query($sql);
-	if (!$resql) {
-		dol_print_error($db);
-		return '';
-	}
-
-	$num = $db->num_rows($resql);
-	$i = 0;
-
-	$total = 0;
-	$vals = [];
-
-	while ($i < $num) {
-		$row = $db->fetch_row($resql);
-		if ($row) {
-			$vals[$row[1]] = $row[0];
-			$total += $row[0];
-		}
-
-		$i++;
-	}
-
-	$db->free($resql);
-
-	$result = '<div class="div-table-responsive-no-min">';
-	$result .= '<table class="noborder nohover centpercent">';
-
-	$result .= '<tr class="liste_titre">';
-	$result .= '<td colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("SupplierInvoice").'</td>';
-	$result .= '</tr>';
-
-	$objectstatic = new FactureFournisseur($db);
-	$array = [FactureFournisseur::STATUS_DRAFT, FactureFournisseur::STATUS_VALIDATED, FactureFournisseur::STATUS_CLOSED, FactureFournisseur::STATUS_ABANDONED];
-	$dataseries = [];
-
-	foreach ($array as $status) {
-		$objectstatic->statut = $status;
-		$objectstatic->paye = $status == FactureFournisseur::STATUS_CLOSED ? -1 : 0;
-
-		$dataseries[] = [$objectstatic->getLibStatut(1), (isset($vals[$status]) ? (int) $vals[$status] : 0)];
-		if (!$conf->use_javascript_ajax) {
-			$result .= '<tr class="oddeven">';
-			$result .= '<td>'.$objectstatic->getLibStatut(0).'</td>';
-			$result .= '<td class="right"><a href="list.php?statut='.$status.'">'.(isset($vals[$status]) ? $vals[$status] : 0).'</a></td>';
-			$result .= '</tr>';
-		}
-	}
-
-	if ($conf->use_javascript_ajax) {
-		$dolgraph = new DolGraph();
-		$dolgraph->SetData($dataseries);
-		$dolgraph->setShowLegend(2);
-		$dolgraph->setShowPercent(1);
-		$dolgraph->SetType(['pie']);
-		$dolgraph->setHeight('200');
-		$dolgraph->draw('idgraphthirdparties');
-
-		$result .= '<tr>';
-		$result .= '<td align="center" colspan="2">'.$dolgraph->show($total ? 0 : 1).'</td>';
-		$result .= '</tr>';
-	}
-
-	$result .= '<tr class="liste_total">';
-	$result .= '<td>'.$langs->trans("Total").'</td>';
-	$result .= '<td class="right">'.$total.'</td>';
-	$result .= '</tr>';
-
-	$result .= '</table>';
-	$result .= '</div>';
-
-	return $result;
-}
-
-/**
- * Return a HTML table that contains a list with supplier invoice drafts
- *
- * @param	int		$maxCount	(Optional) The maximum count of elements inside the table
- * @param	int		$socid		(Optional) Show only results from the supplier with this id
- * @return	string				A HTML table that contains a list with supplier invoice drafts
- */
-function getDraftTable($maxCount = 500, $socid = 0)
-{
-	global $db, $langs, $user;
-
-	$sql = "SELECT f.rowid, f.ref, s.nom as socname, s.rowid as socid, s.canvas, s.client, f.total_ttc";
-	$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
-	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->rights->societe->client->voir && !$socid) {
-		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	}
-	$sql .= " WHERE f.fk_soc = s.rowid";
-	$sql .= " AND f.entity IN (".getEntity('facture_fourn').")";
-	$sql .= " AND f.fk_statut = ".FactureFournisseur::STATUS_DRAFT;
-	if ($socid) {
-		$sql .= " AND f.fk_soc = ".$socid;
-	}
-	if (!$user->rights->societe->client->voir && !$socid) {
-		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-	}
-	$sql .= $db->plimit($maxCount, 0);
-
-	$resql = $db->query($sql);
-	if (!$resql) {
-		dol_print_error($db);
-		return '';
-	}
-
-	$num = $db->num_rows($resql);
-
-	$result = '<div class="div-table-responsive-no-min">';
-	$result .= '<table class="noborder centpercent">';
-
-	$result .= '<tr class="liste_titre">';
-	$result .= '<td colspan="3">';
-	$result .= $langs->trans("SuppliersDraftInvoices");
-	$result .= ' <a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?search_status=0">';
-	$result .= '<span class="badge">'.$num.'</span>';
-	$result .= '</a>';
-	$result .= '</td>';
-	$result .= '</tr>';
-
-	if ($num < 1) {
-		$result .= '</table>';
-		$result .= '</div>';
-		return $result;
-	}
-
-	$objectstatic = new FactureFournisseur($db);
-	$companystatic = new Societe($db);
-	$nbofloop = min($num, $maxCount);
-	$total = 0;
-	$i = 0;
-
-	while ($i < $nbofloop) {
-		$obj = $db->fetch_object($resql);
-
-		$objectstatic->id = $obj->rowid;
-		$objectstatic->ref = $obj->ref;
-
-		$companystatic->id = $obj->socid;
-		$companystatic->name = $obj->socname;
-		$companystatic->client = $obj->client;
-		$companystatic->canvas = $obj->canvas;
-
-		$result .= '<tr class="oddeven">';
-		$result .= '<td class="nowrap">'.$objectstatic->getNomUrl(1).'</td>';
-		$result .= '<td>'.$companystatic->getNomUrl(1, 'supplier', 24).'</td>';
-		$result .= '<td class="right">'.price($obj->total_ttc).'</td>';
-		$result .= '</tr>';
-
-		$i++;
-		$total += $obj->total_ttc;
-	}
-
-	if ($num > $nbofloop) {
-		$result .= '<tr class="liste_total">';
-		$result .= '<td colspan="3" class="right">'.$langs->trans("XMoreLines", ($num - $nbofloop)).'</td>';
-		$result .= '</tr>';
-	} elseif ($total > 0) {
-		$result .= '<tr class="liste_total">';
-		$result .= '<td colspan="2" class="right">'.$langs->trans("Total").'</td>';
-		$result .= '<td class="right">'.price($total).'</td>';
-		$result .= '</tr>';
-	}
-
-	$result .= '</table>';
-	$result .= '</div>';
-	return $result;
-}
-
-/**
- * Return a HTML table that contains a list with latest edited supplier invoices
- *
- * @param	int		$maxCount	(Optional) The maximum count of elements inside the table
- * @param	int		$socid		(Optional) Show only results from the supplier with this id
- * @return	string				A HTML table that contains a list with latest edited supplier invoices
- */
-function getLatestEditTable($maxCount = 5, $socid = 0)
-{
-	global $conf, $db, $langs, $user;
-
-	$sql = "SELECT f.rowid, f.entity, f.ref, f.fk_statut as status, f.paye, s.nom as socname, s.rowid as socid, s.canvas, s.client,";
-	$sql .= " f.datec";
-	$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
-	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->rights->societe->client->voir && !$socid) {
-		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	}
-	$sql .= " WHERE f.fk_soc = s.rowid";
-	$sql .= " AND f.entity IN (".getEntity('facture_fourn').")";
-	if ($socid) {
-		$sql .= " AND f.fk_soc = ".$socid;
-	}
-	if (!$user->rights->societe->client->voir && !$socid) {
-		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-	}
-	$sql .= " ORDER BY f.tms DESC";
-	$sql .= $db->plimit($maxCount, 0);
-
-	$resql = $db->query($sql);
-	if (!$resql) {
-		dol_print_error($db);
-		return '';
-	}
-
-	$num = $db->num_rows($resql);
-
-	$result = '<div class="div-table-responsive-no-min">';
-	$result .= '<table class="noborder centpercent">';
-	$result .= '<tr class="liste_titre">';
-	$result .= '<td colspan="4">'.$langs->trans("BoxTitleLastSupplierBills", $maxCount).'</td>';
-	$result .= '</tr>';
-
-	if ($num < 1) {
-		$result .= '</table>';
-		$result .= '</div>';
-		return $result;
-	}
-
-	$objectstatic = new FactureFournisseur($db);
-	$companystatic = new Societe($db);
-	$formfile = new FormFile($db);
-	$i = 0;
-
-	while ($i < $num) {
-		$obj = $db->fetch_object($resql);
-
-		$objectstatic->id = $obj->rowid;
-		$objectstatic->ref = $obj->ref;
-		$objectstatic->paye = $obj->paye;
-		$objectstatic->statut = $obj->status;
-
-		$companystatic->id = $obj->socid;
-		$companystatic->name = $obj->socname;
-		$companystatic->client = $obj->client;
-		$companystatic->canvas = $obj->canvas;
-
-		$filename = dol_sanitizeFileName($obj->ref);
-		$filedir = $conf->propal->multidir_output[$obj->entity].'/'.$filename;
-
-		$result .= '<tr width="20%" class="nowrap">';
-
-		$result .= '<td class="oddeven">';
-		$result .= '<table class="nobordernopadding">';
-		$result .= '<tr class="nocellnopadd">';
-
-		$result .= '<td width="96" class="nobordernopadding nowrap">'.$objectstatic->getNomUrl(1).'</td>';
-		$result .= '<td width="16" class="nobordernopadding nowrap">&nbsp;</td>';
-		$result .= '<td width="16" class="nobordernopadding right">'.$formfile->getDocumentsLink($objectstatic->element, $filename, $filedir).'</td>';
-
-		$result .= '</tr>';
-		$result .= '</table>';
-		$result .= '</td>';
-
-		$result .= '<td>'.$companystatic->getNomUrl(1, 'supplier').'</td>';
-		$result .= '<td>'.dol_print_date($db->jdate($obj->datec), 'day').'</td>';
-		$result .= '<td class="right">'.$objectstatic->getLibStatut(5).'</td>';
-
-		$result .= '</tr>';
-
-		$i++;
-	}
-
-	$result .= '</table>';
-	$result .= '</div>';
-	return $result;
-}
-
-/**
- * Return a HTML table that contains a list with open (unpaid) supplier invoices
- *
- * @param	int		$maxCount	(Optional) The maximum count of elements inside the table
- * @param	int		$socid		(Optional) Show only results from the supplier with this id
- * @return	string				A HTML table that conatins a list with open (unpaid) supplier invoices
- */
-function getOpenTable($maxCount = 500, $socid = 0)
-{
-	global $conf, $db, $langs, $user;
-
-	$sql = "SELECT s.nom as socname, s.rowid as socid, s.canvas, s.client";
-	$sql .= ", f.rowid as id, f.entity, f.total_ttc, f.total_ht, f.ref, f.fk_statut";
-	$sql .= ", f.datef as df, f.date_lim_reglement as datelimite";
-	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-	$sql .= ", ".MAIN_DB_PREFIX."facture_fourn as f";
-	if (!$user->rights->societe->client->voir && !$socid) {
-		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	}
-	$sql .= " WHERE f.fk_soc = s.rowid";
-	$sql .= " AND f.entity IN (".getEntity('facture_fourn').")";
-	$sql .= " AND f.fk_statut = ".FactureFournisseur::STATUS_VALIDATED;
-	if (!$user->rights->societe->client->voir && !$socid) {
-		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-	}
-	if ($socid) {
-		$sql .= " AND s.rowid = ".$socid;
-	}
-	$sql .= " ORDER BY f.rowid DESC";
-	$sql .= $db->plimit($maxCount, 0);
-
-	$resql = $db->query($sql);
-	if (!$resql) {
-		dol_print_error($db);
-		return '';
-	}
-
-	$num = $db->num_rows($resql);
-
-	$result = '<div class="div-table-responsive-no-min">';
-	$result .= '<table class="noborder centpercent">';
-	$result .= '<tr class="liste_titre">';
-	$result .= '<td colspan="4">';
-	$result .= $langs->trans("BillsCustomersUnpaid");
-	$result .= ' <a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?search_status=1">';
-	$result .= '<span class="badge">'.$num.'</span>';
-	$result .= '</a>';
-	$result .= '</td>';
-	$result .= '</tr>';
-
-	if ($num < 1) {
-		$result .= '</table>';
-		$result .= '</div>';
-		return $result;
-	}
-
-	$objectstatic = new FactureFournisseur($db);
-	$companystatic = new Societe($db);
-	$formfile		= new FormFile($db);
-	$nbofloop		= min($num, $maxCount);
-	$now = dol_now();
-	$total = 0;
-	$i = 0;
-
-	while ($i < $nbofloop) {
-		$obj = $db->fetch_object($resql);
-
-		$objectstatic->id = $obj->id;
-		$objectstatic->ref = $obj->ref;
-
-		$companystatic->id = $obj->socid;
-		$companystatic->name = $obj->socname;
-		$companystatic->client = $obj->client;
-		$companystatic->canvas = $obj->canvas;
-
-		$filename = dol_sanitizeFileName($obj->ref);
-		$filedir = $conf->propal->multidir_output[$obj->entity].'/'.$filename;
-
-		$result .= '<tr class="oddeven">';
-
-		$result .= '<td class="nowrap" width="140">';
-		$result .= '<table class="nobordernopadding">';
-		$result .= '<tr class="nocellnopadd">';
-
-		$result .= '<td class="nobordernopadding nowrap">'.$objectstatic->getNomUrl(1).'</td>';
-		$result .= '<td width="18" class="nobordernopadding nowrap">';
-
-		if ($db->jdate($obj->dfv) < ($now - $conf->propal->cloture->warning_delay)) {
-			$result .= img_warning($langs->trans("Late"));
-		}
-
-		$result .= '</td>';
-
-		$result .= '<td width="16" align="center" class="nobordernopadding">'.$formfile->getDocumentsLink($objectstatic->element, $filename, $filedir).'</td>';
-
-		$result .= '</tr>';
-		$result .= '</table>';
-		$result .= '</td>';
-
-		$result .= '<td class="left">'.$companystatic->getNomUrl(1, 'customer', 44).'</td>';
-		$result .= '<td class="right">'.dol_print_date($db->jdate($obj->df), 'day').'</td>';
-		$result .= '<td class="right">'.price($obj->total_ttc).'</td>';
-
-		$result .= '</tr>';
-
-		$i++;
-		$total += $obj->total_ttc;
-	}
-
-	if ($num > $nbofloop) {
-		$result .= '<tr class="liste_total">';
-		$result .= '<td colspan="4" class="right">'.$langs->trans("XMoreLines", ($num - $nbofloop)).'</td>';
-		$result .= '</tr>';
-	} elseif ($total > 0) {
-		$result .= '<tr class="liste_total">';
-		$result .= '<td colspan="2" class="right">'.$langs->trans("Total").'</td>';
-		$result .= '<td align="right">'.price($total).'</td>';
-		$result .= '<td>&nbsp;</td>';
-		$result .= '</tr>';
-	}
-
-	$result .= '</table>';
-	$result .= '</div>';
-	return $result;
-}

htdocs/install/upgrade2.php

@@ -456,6 +456,7 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
 		$listofmodule = array(
 			'MAIN_MODULE_ACCOUNTING'=>'newboxdefonly',
 			'MAIN_MODULE_AGENDA'=>'newboxdefonly',
+			'MAIN_MODULE_BOM'=>'menuonly',
 			'MAIN_MODULE_BANQUE'=>'menuonly',
 			'MAIN_MODULE_BARCODE'=>'newboxdefonly',
 			'MAIN_MODULE_CRON'=>'newboxdefonly',
@@ -470,6 +471,7 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
 			'MAIN_MODULE_FOURNISSEUR'=>'newboxdefonly',
 			'MAIN_MODULE_HOLIDAY'=>'newboxdefonly',
 			'MAIN_MODULE_MARGIN'=>'menuonly',
+			'MAIN_MODULE_MRP'=>'menuonly',
 			'MAIN_MODULE_OPENSURVEY'=>'newboxdefonly',
 			'MAIN_MODULE_PAYBOX'=>'newboxdefonly',
 			'MAIN_MODULE_PRINTING'=>'newboxdefonly',

htdocs/langs/en_US/admin.lang

@@ -1977,7 +1977,7 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
-EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
 SeveralLangugeVariatFound=Several language variants found
 RemoveSpecialChars=Remove special characters
 COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)

htdocs/langs/en_US/stocks.lang

@@ -62,7 +62,7 @@ EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
 RuleForWarehouse=Rule for warehouses
-WarehouseAskWarehouseOnThirparty=Set a warehouse on thirparty
+WarehouseAskWarehouseOnThirparty=Set a warehouse on third-party
 WarehouseAskWarehouseDuringPropal=Set a warehouse on Commercial proposals
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users

htdocs/user/class/user.class.php

@@ -673,8 +673,7 @@ class User extends CommonObject
 		if (!empty($rid)) {
 			$module = $perms = $subperms = '';
 
-			// Si on a demande ajout d'un droit en particulier, on recupere
+			// Si on a demande ajout d'un droit en particulier, on recupere les caracteristiques (module, perms et subperms) de ce droit.
-			// les caracteristiques (module, perms et subperms) de ce droit.
 			$sql = "SELECT module, perms, subperms";
 			$sql .= " FROM ".MAIN_DB_PREFIX."rights_def";
 			$sql .= " WHERE id = ".((int) $rid);
@@ -718,7 +717,7 @@ class User extends CommonObject
 			}
 		}
 
-		// Ajout des droits trouves grace au critere whereforadd
+		// Add automatically other permission using the criteria whereforadd
 		if (!empty($whereforadd)) {
 			//print "$module-$perms-$subperms";
 			$sql = "SELECT id";

htdocs/user/perms.php

@@ -105,7 +105,7 @@ if (empty($reshook)) {
 			setEventMessages($edituser->error, $edituser->errors, 'errors');
 		}
 
-		// If we are changing our own permissions, we reload
+		// If we are changing our own permissions, we reload permissions and menu
 		if ($object->id == $user->id) {
 			$user->clearrights();
 			$user->getrights();
@@ -124,7 +124,7 @@ if (empty($reshook)) {
 			setEventMessages($edituser->error, $edituser->errors, 'errors');
 		}
 
-		// If we are changing our own permissions, we reload
+		// If we are changing our own permissions, we reload permissions and menu
 		if ($object->id == $user->id) {
 			$user->clearrights();
 			$user->getrights();
@@ -288,7 +288,7 @@ if (($caneditperms && empty($objMod->rights_admin_allowed)) || empty($object->ad
 }
 print '<td>'.$langs->trans("Permissions").'</td>';
 if ($user->admin) {
-	print '<td class="right">'.$langs->trans("ID").'</td>';
+	print '<td class="right"></td>';
 }
 print '</tr>'."\n";
 
@@ -438,7 +438,12 @@ if ($result) {
 
 		// Permission id
 		if ($user->admin) {
-			print '<td class="right"><span class="opacitymedium">'.$obj->id.'</span></td>';
+			print '<td class="right">';
+			$htmltext = $langs->trans("ID").': '.$obj->id;
+			$htmltext .= '<br>'.$langs->trans("Permission").': user->rights->'.$obj->module.'->'.$obj->perms.($obj->subperms ? '->'.$obj->subperms : '');
+			print $form->textwithpicto('', $htmltext);
+			//print '<span class="opacitymedium">'.$obj->id.'</span>';
+			print '</td>';
 		}
 
 		print '</tr>'."\n";

htdocs/website/index.php

@@ -895,6 +895,7 @@ if ($action == 'addcontainer' && $usercanedit) {
 
 						getAllImages($object, $objectpage, $urltograbbis, $tmpgeturl['content'], $action, 1, $grabimages, $grabimagesinto);
 
+						// We try to convert the CSS we got by adding a prefix .bodywebsite with lessc to avoid conflicit with CSS of Dolibarr.
 						include_once DOL_DOCUMENT_ROOT.'/core/class/lessc.class.php';
 						$lesscobj = new Lessc();
 						try {

htdocs/workstation/class/workstation.class.php

@@ -61,7 +61,7 @@ class Workstation extends CommonObject
 	/**
 	 * @var string String with name of icon for workstation. Must be the part after the 'object_' into object_workstation.png
 	 */
-	public $picto = 'mrp';
+	public $picto = 'workstation';
 
 
 	const STATUS_DISABLED = 0;
@@ -100,7 +100,7 @@ class Workstation extends CommonObject
 	 */
 	public $fields=array(
 		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
-		'ref' => array('type'=>'varchar(128)', 'picto'=>'mrp', 'label'=>'Ref', 'enabled'=>'1', 'position'=>10, 'notnull'=>1, 'visible'=>1, 'noteditable'=>'0', 'default'=>'', 'index'=>1, 'searchall'=>1, 'showoncombobox'=>'1', 'comment'=>"Reference of object"),
+		'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>'1', 'position'=>10, 'notnull'=>1, 'visible'=>1, 'noteditable'=>'0', 'default'=>'', 'index'=>1, 'searchall'=>1, 'showoncombobox'=>'1', 'comment'=>"Reference of object"),
 		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth300', 'showoncombobox'=>'1',),
 		'type' => array('type'=>'select', 'label'=>'Type', 'enabled'=>'1', 'position'=>32, 'default'=>1, 'notnull'=>1, 'visible'=>1, 'arrayofkeyval'=>array('HUMAN'=>'Human', 'MACHINE'=>'Machine', 'BOTH'=>'HumanMachine'),),
 		'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>'1', 'position'=>61, 'notnull'=>0, 'visible'=>0,),

htdocs/workstation/workstation_agenda.php

@@ -82,13 +82,11 @@ if ($id > 0 || !empty($ref)) {
 	$upload_dir = $conf->workstation->multidir_output[$object->entity]."/".$object->id;
 }
 
-// Security check - Protection if external user
-//if ($user->socid > 0) accessforbidden();
-//if ($user->socid > 0) $socid = $user->socid;
-//$result = restrictedArea($user, 'workstation', $object->id);
-
 $permissiontoadd = $user->rights->workstation->workstation->write; // Used by the include of actions_addupdatedelete.inc.php
 
+// Security check
+restrictedArea($user, $object->element, $object->id, '', 'workstation');
+
 
 /*
  *  Actions
@@ -134,7 +132,7 @@ if ($object->id > 0) {
 	$head = workstationPrepareHead($object);
 
 
-	print dol_get_fiche_head($head, 'agenda', $langs->trans("Workstation"), -1, 'mrp');
+	print dol_get_fiche_head($head, 'agenda', $langs->trans("Workstation"), -1, 'workstation');
 
 	// Object card
 	// ------------------------------------------------------------

htdocs/workstation/workstation_card.php

@@ -82,15 +82,8 @@ $permissionnote = $user->rights->workstation->workstation->write; // Used by the
 $permissiondellink = $user->rights->workstation->workstation->write; // Used by the include of actions_dellink.inc.php
 $upload_dir = $conf->workstation->multidir_output[isset($object->entity) ? $object->entity : 1];
 
-// Security check - Protection if external user
+// Security check
-//if ($user->socid > 0) accessforbidden();
+restrictedArea($user, $object->element, $object->id, '', 'workstation');
-//if ($user->socid > 0) $socid = $user->socid;
-//$isdraft = (($object->statut == $object::STATUS_DRAFT) ? 1 : 0);
-//$result = restrictedArea($user, 'workstation', $object->id, '', '', 'fk_soc', 'rowid', $isdraft);
-
-if (!$permissiontoread) {
-	accessforbidden();
-}
 
 
 /*
@@ -219,7 +212,7 @@ if ($action == 'create') {
 	print '</td>';
 	print '<td>';
 	print img_picto('', 'group');
-	print $form->select_dolgroups($groups, 'groups', 1, '', 0, '', '', $object->entity, true);
+	print $form->select_dolgroups($groups, 'groups', 1, '', 0, '', '', $object->entity, true, 'minwidth200');
 	print '</td></tr>';
 
 	print '<tr id="wsresources"><td>';
@@ -227,7 +220,7 @@ if ($action == 'create') {
 	print '</td>';
 	print '<td>';
 	print img_picto('', 'resource');
-	print $formresource->select_resource_list($resources, 'resources', '', '', 0, '', '', $object->entity, true, 0, '', true);
+	print $formresource->select_resource_list($resources, 'resources', '', '', 0, '', '', $object->entity, true, 0, 'minwidth200', true);
 	print '</td></tr>';
 
 	// Other attributes
@@ -343,7 +336,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	// Object card
 	// ------------------------------------------------------------
-	$linkback = '<a href="'.dol_buildpath('/workstation/workstation_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.dol_buildpath('/workstation/workstation_list.php', 1).'?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
 	$morehtmlref = '<div class="refidno">';
 	/*

htdocs/workstation/workstation_document.php

@@ -74,13 +74,10 @@ if ($id > 0 || !empty($ref)) {
 	$upload_dir = $conf->workstation->multidir_output[$object->entity ? $object->entity : $conf->entity]."/workstation/".get_exdir(0, 0, 0, 1, $object);
 }
 
-// Security check - Protection if external user
-//if ($user->socid > 0) accessforbidden();
-//if ($user->socid > 0) $socid = $user->socid;
-//$result = restrictedArea($user, 'workstation', $object->id);
-
 $permissiontoadd = $user->rights->workstation->workstation->write; // Used by the include of actions_addupdatedelete.inc.php
 
+// Security check
+restrictedArea($user, $object->element, $object->id, '', 'workstation');
 
 
 /*

htdocs/workstation/workstation_list.php

@@ -28,9 +28,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/resource/class/html.formresource.class.php';
-
+require_once DOL_DOCUMENT_ROOT.'/workstation/class/workstation.class.php';
-// load workstation libraries
-require_once __DIR__.'/class/workstation.class.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array("workstation", "other"));
@@ -87,8 +85,9 @@ foreach ($object->fields as $key => $val) {
 	if (GETPOST('search_'.$key, 'alpha') !== '') {
 		$search[$key] = GETPOST('search_'.$key, 'alpha');
 	}
-	if (in_array($key, array('type', 'status')) && GETPOST('search_'.$key, 'alpha') == -1) {
+	if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
-		$search[$key] = '';
+		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOST('search_'.$key.'_dtstartmonth', 'int'), GETPOST('search_'.$key.'_dtstartday', 'int'), GETPOST('search_'.$key.'_dtstartyear', 'int'));
+		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOST('search_'.$key.'_dtendmonth', 'int'), GETPOST('search_'.$key.'_dtendday', 'int'), GETPOST('search_'.$key.'_dtendyear', 'int'));
 	}
 }
 
@@ -108,7 +107,7 @@ $arrayfields = array();
 foreach ($object->fields as $key => $val) {
 	// If $val['visible']==0, then we never show the field
 	if (!empty($val['visible'])) {
-		$visible = dol_eval($val['visible'], 1);
+		$visible = (int) dol_eval($val['visible'], 1);
 		$arrayfields['t.'.$key] = array(
 			'label'=>$val['label'],
 			'checked'=>(($visible < 0) ? 0 : 1),
@@ -146,18 +145,7 @@ $permissiontoadd = $user->rights->workstation->workstation->write;
 $permissiontodelete = $user->rights->workstation->workstation->delete;
 
 // Security check
-if (empty($conf->workstation->enabled)) {
+restrictedArea($user, $object->element, 0, '', 'workstation');
-	accessforbidden('Module not enabled');
-}
-$socid = 0;
-if ($user->socid > 0) {
-	// Protection if external user
-	//$socid = $user->socid;
-	accessforbidden();
-}
-//$result = restrictedArea($user, 'workstation', $id, '');
-//if (!$permissiontoread) accessforbidden();
-
 
 
 /*
@@ -165,7 +153,8 @@ if ($user->socid > 0) {
  */
 
 if (GETPOST('cancel', 'alpha')) {
-	$action = 'list'; $massaction = '';
+	$action = 'list';
+	$massaction = '';
 }
 if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
 	$massaction = '';
@@ -185,6 +174,10 @@ if (empty($reshook)) {
 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
 		foreach ($object->fields as $key => $val) {
 			$search[$key] = '';
+			if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
+				$search[$key.'_dtstart'] = '';
+				$search[$key.'_dtend'] = '';
+			}
 		}
 		$groups=$resources=array();
 		$toselect = '';
@@ -214,19 +207,15 @@ $formresource = new FormResource($db);
 $now = dol_now();
 
 $title = $langs->trans('ListOf', $langs->transnoentitiesnoconv("Workstations"));
-
-//$help_url="EN:Module_Workstation|FR:Module_Workstation_FR|ES:Módulo_Workstation";
 $help_url = 'EN:Module_Workstation';
-
+$morejs = array();
-llxHeader('', $title, $help_url);
+$morecss = array();
 
 
 // Build and execute select
 // --------------------------------------------------------------------
 $sql = 'SELECT ';
-foreach ($object->fields as $key => $val) {
+$sql .= $object->getFieldList('t');
-	$sql .= 't.'.$key.', ';
-}
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
@@ -258,12 +247,13 @@ if ($object->ismultientitymanaged == 1) {
 	$sql .= " WHERE 1 = 1";
 }
 foreach ($search as $key => $val) {
+	if (array_key_exists($key, $object->fields)) {
 		if ($key == 'status' && $search[$key] == -1) {
 			continue;
 		}
 		$mode_search = (($object->isInt($object->fields[$key]) || $object->isFloat($object->fields[$key])) ? 1 : 0);
-	if (strpos($object->fields[$key]['type'], 'integer:') === 0) {
+		if ((strpos($object->fields[$key]['type'], 'integer:') === 0) || (strpos($object->fields[$key]['type'], 'sellist:') === 0)) {
-		if ($search[$key] == '-1') {
+			if ($search[$key] == '-1' || $search[$key] === '0') {
 				$search[$key] = '';
 			}
 			$mode_search = 2;
@@ -271,6 +261,19 @@ foreach ($search as $key => $val) {
 		if ($search[$key] != '') {
 			$sql .= natural_search($key, $search[$key], (($key == 'status') ? 2 : $mode_search));
 		}
+	} else {
+		if (preg_match('/(_dtstart|_dtend)$/', $key) && $search[$key] != '') {
+			$columnName=preg_replace('/(_dtstart|_dtend)$/', '', $key);
+			if (preg_match('/^(date|timestamp|datetime)/', $object->fields[$columnName]['type'])) {
+				if (preg_match('/_dtstart$/', $key)) {
+					$sql .= " AND t." . $columnName . " >= '" . $db->idate($search[$key]) . "'";
+				}
+				if (preg_match('/_dtend$/', $key)) {
+					$sql .= " AND t." . $columnName . " <= '" . $db->idate($search[$key]) . "'";
+				}
+			}
+		}
+	}
 }
 if ($search_all) {
 	$sql .= natural_search(array_keys($fieldstosearchall), $search_all);
@@ -294,10 +297,8 @@ $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 
-/* If a group by is required
 $sql.= " GROUP BY ";
-foreach($object->fields as $key => $val)
+foreach ($object->fields as $key => $val) {
-{
 	$sql.='t.'.$key.', ';
 }
 // Add fields from extrafields
@@ -309,8 +310,6 @@ $parameters=array();
 $reshook=$hookmanager->executeHooks('printFieldListGroupBy', $parameters, $object);    // Note that $action and $object may have been modified by hook
 $sql.=$hookmanager->resPrint;
 $sql=preg_replace('/,\s*$/', '', $sql);
-*/
-$sql.= ' GROUP BY t.rowid';
 $sql .= $db->order($sortfield, $sortorder);
 
 // Count total nb of records
@@ -352,7 +351,7 @@ if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $
 // Output page
 // --------------------------------------------------------------------
 
-llxHeader('', $title, $help_url);
+llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'classforhorizontalscrolloftabs');
 
 // Example : Adding jquery code
 print '<script type="text/javascript" language="javascript">
@@ -487,10 +486,17 @@ foreach ($object->fields as $key => $val) {
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
 		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
 			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
-		} elseif (strpos($val['type'], 'integer:') === 0) {
+		} elseif ((strpos($val['type'], 'integer:') === 0) || (strpos($val['type'], 'sellist:')=== 0)) {
 			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth125', 1);
-		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) {
+		} elseif (!preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
 			print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
+		} elseif (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
+			print '<div class="nowrap">';
+			print $form->selectDate($search[$key.'_dtstart'] ? $search[$key.'_dtstart'] : '', "search_".$key."_dtstart", 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+			print '</div>';
+			print '<div class="nowrap">';
+			print $form->selectDate($search[$key.'_dtend'] ? $search[$key.'_dtend'] : '', "search_".$key."_dtend", 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
+			print '</div>';
 		}
 		print '</td>';
 	}
@@ -594,7 +600,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 	// Show here line of result
 	print '<tr class="oddeven">';
 	foreach ($object->fields as $key => $val) {
-		$cssforfield = (empty($val['css']) ? '' : $val['css']);
+		$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 		if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
 			$cssforfield .= ($cssforfield ? ' ' : '').'center';
 		} elseif ($key == 'status') {

htdocs/workstation/workstation_note.php

@@ -60,6 +60,8 @@ if ($id > 0 || !empty($ref)) {
 $permissionnote = $user->rights->workstation->workstation->write; // Used by the include of actions_setnotes.inc.php
 $permissiontoadd = $user->rights->workstation->workstation->write; // Used by the include of actions_addupdatedelete.inc.php
 
+// Security check
+restrictedArea($user, $object->element, $object->id, '', 'workstation');
 
 
 /*

test/phpunit/ImagesLibTest.php

@@ -163,9 +163,9 @@ class ImagesLibTest extends PHPUnit\Framework\TestCase
 		global $conf;
 
 		$file=dirname(__FILE__).'/img250x20.png';
-		$filetarget=$conf->admin->dir_temp.'/img250x20.webp';
+		$filetarget=$conf->admin->dir_temp.'/img250x20.jpg';
 		$result = dol_imageResizeOrCrop($file, 0, 0, 0, 0, 0, $filetarget);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals($filetarget, $result, 'Failed to convert into webp');
+		$this->assertEquals($filetarget, $result, 'Failed to convert into '.$filetarget);
 	}
 }