Merge pull request #14992 from TobiasSekan/SelectableColumnsOnSocialTaxesList

NEW Select-able columns on social taxes list

htdocs/compta/sociales/list.php

@@ -4,7 +4,8 @@
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2016      Frédéric France      <frederic.france@free.fr>
  * Copyright (C) 2020      Pierre Ardoin     	<mapiolca@me.com>
- *
+ * Copyright (C) 2020		Tobias Sekan		<tobias.sekan@startmail.com>
+
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 3 of the License, or
@@ -26,6 +27,12 @@
  */
 
 require '../../main.inc.php';
+
+// Security check
+$socid = isset($_GET["socid"]) ? $_GET["socid"] : '';
+if ($user->socid) $socid = $user->socid;
+$result = restrictedArea($user, 'tax', '', '', 'charges');
+
 require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formsocialcontrib.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
@@ -37,16 +44,10 @@ $langs->loadLangs(array('compta', 'banks', 'bills'));
 
 $action				= GETPOST('action', 'aZ09');
 $massaction			= GETPOST('massaction', 'alpha');
-$show_files = GETPOST('show_files', 'int');
 $confirm			= GETPOST('confirm', 'alpha');
-$toselect = GETPOST('toselect', 'array');
+$optioncss			= GETPOST('optioncss', 'alpha');
 $contextpage		= GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'sclist';
 
-// Security check
-$socid = isset($_GET["socid"]) ? $_GET["socid"] : '';
-if ($user->socid) $socid = $user->socid;
-$result = restrictedArea($user, 'tax', '', '', 'charges');
-
 $search_ref			= GETPOST('search_ref', 'int');
 $search_label		= GETPOST('search_label', 'alpha');
 $search_amount		= GETPOST('search_amount', 'alpha');
@@ -61,10 +62,12 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield			= GETPOST("sortfield", 'alpha');
 $sortorder			= GETPOST("sortorder", 'alpha');
 $page				= GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+
+if (empty($page) || $page == -1) $page = 0;				// If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
+
 if (!$sortfield) $sortfield = "cs.date_ech";
 if (!$sortorder) $sortorder = "DESC";
 
@@ -84,23 +87,50 @@ if (!GETPOSTISSET('search_typeid'))
 	$search_typeid = GETPOST('search_typeid', 'int');
 }
 
-if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All test are required to be compatible with all browsers
+$arrayfields = array(
-{
+	'cs.rowid'		=>array('label'=>"Ref",				'checked'=>1, 'position'=>10),
-	$search_ref = "";
+	'cs.libelle'	=>array('label'=>"Label",			'checked'=>1, 'position'=>20),
-	$search_label = "";
+	'cs.fk_type'	=>array('label'=>"Type",			'checked'=>1, 'position'=>30),
-	$search_amount = "";
+	'p.ref'			=>array('label'=>"ProjectRef",		'checked'=>1, 'position'=>40, 'enable'=>(!empty($conf->projet->enabled))),
+	'cs.date_ech'	=>array('label'=>"Date",			'checked'=>1, 'position'=>50),
+	'cs.periode'	=>array('label'=>"PeriodEndDate",	'checked'=>1, 'position'=>60),
+	'cs.amount'		=>array('label'=>"Amount",			'checked'=>1, 'position'=>70),
+	'cs.paye'		=>array('label'=>"Status",			'checked'=>1, 'position'=>80),
+);
+$arrayfields = dol_sort_array($arrayfields, 'position');
+
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('sclist'));
+$object = new ChargeSociales($db);
+
+/*
+ * Actions
+ */
+
+$parameters = array('socid'=>$socid);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+
+if (empty($reshook)) {
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
+	// All tests are required to be compatible with all browsers
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
+		$search_ref = '';
+		$search_label = '';
+		$search_amount = '';
 		$search_status = '';
-	$search_typeid = "";
+		$search_typeid = '';
-	$year = "";
+		$year = '';
 		$search_day_lim = '';
 		$search_year_lim = '';
 		$search_month_lim = '';
 		$search_project_ref = '';
 		$search_project = '';
-	$toselect = '';
 		$search_array_options = array();
 	}
-
+}
 
 /*
  *	View
@@ -114,8 +144,8 @@ if (!empty($conf->projet->enabled)) $projectstatic = new Project($db);
 
 llxHeader('', $langs->trans("SocialContributions"));
 
-$sql = "SELECT cs.rowid as id, cs.fk_type as type, ";
+$sql = "SELECT cs.rowid, cs.fk_type as type, ";
-$sql .= " cs.amount, cs.date_ech, cs.libelle as label, cs.paye, cs.periode,";
+$sql .= " cs.amount, cs.date_ech, cs.libelle, cs.paye, cs.periode,";
 if (!empty($conf->projet->enabled)) $sql .= " p.rowid as project_id, p.ref as project_ref, p.title as project_label,";
 $sql .= " c.libelle as type_label,";
 $sql .= " SUM(pc.amount) as alreadypayed";
@@ -162,8 +192,14 @@ if ($result)
 $sql .= $db->plimit($limit + 1, $offset);
 
 $resql = $db->query($sql);
-if ($resql)
+if (!$resql)
 {
+	dol_print_error($db);
+	llxFooter();
+	$db->close();
+	exit;
+}
+
 $num = $db->num_rows($resql);
 $i = 0;
 
@@ -188,14 +224,18 @@ if ($resql)
 if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="list">';
+print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="search_status" value="'.$search_status.'">';
+print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
 $center = '';
 if ($year)
 {
-	    $center = ($year ? "<a href='list.php?year=".($year - 1)."'>".img_previous()."</a> ".$langs->trans("Year")." $year <a href='list.php?year=".($year + 1)."'>".img_next()."</a>" : "");
+	$center = '<a href="list.php?year='.($year - 1).'">'.img_previous().'</a>';
+	$center .= ' '.$langs->trans("Year").' '.$year;
+	$center .= ' <a href="list.php?year='.($year + 1).'">'.img_next().'</a>';
 }
 
 print_barre_liste($langs->trans("SocialContributions"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $center, $num, $totalnboflines, 'bill', 0, $newcardbutton, '', $limit, 0, 0, 1);
@@ -207,58 +247,115 @@ if ($resql)
 	$countrynotdefined = $langs->trans("ErrorSetACountryFirst");
 	print $countrynotdefined;
 	print '</div>';
-	} else {
+
+	print '</form>';
+	llxFooter();
+	$db->close();
+}
+
+$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+if ($massactionbutton) $selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
+
 print '<div class="div-table-responsive">';
-	    print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : '').'">'."\n";
 
 print '<tr class="liste_titre_filter">';
-		// Ref
+
+// Filters: Line number (placeholder)
+if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
+	print '<td class="liste_titre">';
+	print '</td>';
+}
+
+// Filter: Ref
+if (!empty($arrayfields['cs.rowid']['checked'])) {
 	print '<td class="liste_titre" align="left">';
 	print '<input class="flat maxwidth75" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
 	print '</td>';
-		// Label
+}
-		print '<td class="liste_titre"><input type="text" class="flat maxwidth100" name="search_label" value="'.dol_escape_htmltag($search_label).'"></td>';
+
-		// Type
+// Filter: Label
+if (!empty($arrayfields['cs.rowid']['checked'])) {
+	print '<td class="liste_titre">';
+	print '<input type="text" class="flat maxwidth100" name="search_label" value="'.dol_escape_htmltag($search_label).'">';
+	print '</td>';
+}
+
+// Filter: Type
+if (!empty($arrayfields['cs.fk_type']['checked'])) {
 	print '<td class="liste_titre" align="left">';
 	$formsocialcontrib->select_type_socialcontrib($search_typeid, 'search_typeid', 1, 0, 0, 'maxwidth100onsmartphone', 1);
 	print '</td>';
-		// Ref Project
+}
-	   	if (!empty($conf->projet->enabled)) print '<td class="liste_titre"><input type="text" class="flat" size="6" name="search_project_ref" value="'.$search_project_ref.'"></td>';
+
-	    // Date
+// Filter: Project ref
-	    print '<td class="liste_titre">&nbsp;</td>';
+if (!empty($arrayfields['p.ref']['checked'])) {
-	    // Period end date
+	print '<td class="liste_titre">';
+	print '<input type="text" class="flat" size="6" name="search_project_ref" value="'.$search_project_ref.'">';
+	print '</td>';
+}
+
+// Filter: Date (placeholder)
+if (!empty($arrayfields['cs.date_ech']['checked'])) {
+	print '<td class="liste_titre">';
+	print '</td>';
+}
+
+// Filter: Period end date
+if (!empty($arrayfields['cs.periode']['checked'])) {
 	print '<td class="liste_titre center">';
 	if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_day_lim" value="'.dol_escape_htmltag($search_day_lim).'">';
 	print '<input class="flat valignmiddle width25" type="text" size="1" maxlength="2" name="search_month_lim" value="'.dol_escape_htmltag($search_month_lim).'">';
 	$formother->select_year($search_year_lim ? $search_year_lim : -1, 'search_year_lim', 1, 20, 5, 0, 0, '', 'widthauto valignmiddle');
 	print '</td>';
-	    // Amount
+}
+
+// Filter: Amount
+if (!empty($arrayfields['cs.amount']['checked'])) {
 	print '<td class="liste_titre right">';
 	print '<input class="flat maxwidth75" type="text" name="search_amount" value="'.dol_escape_htmltag($search_amount).'">';
 	print '</td>';
-		// Status
+}
+
+// Filter: Status
+if (!empty($arrayfields['cs.paye']['checked'])) {
 	print '<td class="liste_titre maxwidthonsmartphone right">';
 	$liststatus = array('0'=>$langs->trans("Unpaid"), '1'=>$langs->trans("Paid"));
 	print $form->selectarray('search_status', $liststatus, $search_status, 1);
 	print '</td>';
+}
 
+// Fields from hook
+$parameters = array('arrayfields'=>$arrayfields);
+$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+
+// Filter: Buttons
 print '<td class="liste_titre maxwidthsearch">';
-        $searchpicto = $form->showFilterAndCheckAddButtons(0);
+print $form->showFilterAndCheckAddButtons(0);
-        print $searchpicto;
 print '</td>';
-		print "</tr>\n";
+
+print '</tr>';
 
 print '<tr class="liste_titre">';
-		print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "id", "", $param, "", $sortfield, $sortorder);
+if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST))	print_liste_field_titre('#', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder);
-		print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "cs.libelle", "", $param, 'class="left"', $sortfield, $sortorder);
+if (!empty($arrayfields['cs.rowid']['checked']))			print_liste_field_titre($arrayfields['cs.rowid']['label'], $_SERVER["PHP_SELF"], "cs.rowid", '', $param, '', $sortfield, $sortorder);
-		print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "type", "", $param, 'class="left"', $sortfield, $sortorder);
+if (!empty($arrayfields['cs.libelle']['checked']))			print_liste_field_titre($arrayfields['cs.libelle']['label'], $_SERVER["PHP_SELF"], "cs.libelle", '', $param, 'class="left"', $sortfield, $sortorder);
-		if (!empty($conf->projet->enabled)) print_liste_field_titre('ProjectRef', $_SERVER["PHP_SELF"], "p.ref", "", $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['cs.fk_type']['checked']))			print_liste_field_titre($arrayfields['cs.fk_type']['label'], $_SERVER["PHP_SELF"], "cs.fk_type", '', $param, 'class="left"', $sortfield, $sortorder);
-		print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "cs.date_ech", "", $param, 'align="center"', $sortfield, $sortorder);
+if (!empty($arrayfields['p.ref']['checked']))				print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER["PHP_SELF"], "p.ref", '', $param, '', $sortfield, $sortorder);
-		print_liste_field_titre("PeriodEndDate", $_SERVER["PHP_SELF"], "periode", "", $param, 'align="center"', $sortfield, $sortorder);
+if (!empty($arrayfields['cs.date_ech']['checked']))			print_liste_field_titre($arrayfields['cs.date_ech']['label'], $_SERVER["PHP_SELF"], "cs.date_ech", '', $param, 'align="center"', $sortfield, $sortorder);
-		print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "cs.amount", "", $param, 'class="right"', $sortfield, $sortorder);
+if (!empty($arrayfields['cs.periode']['checked']))			print_liste_field_titre($arrayfields['cs.periode']['label'], $_SERVER["PHP_SELF"], "cs.periode", '', $param, 'align="center"', $sortfield, $sortorder);
-		print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "cs.paye", "", $param, 'class="right"', $sortfield, $sortorder);
+if (!empty($arrayfields['cs.amount']['checked']))			print_liste_field_titre($arrayfields['cs.amount']['label'], $_SERVER["PHP_SELF"], "cs.amount", '', $param, 'class="right"', $sortfield, $sortorder);
-		print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'maxwidthsearch ');
+if (!empty($arrayfields['cs.paye']['checked']))				print_liste_field_titre($arrayfields['cs.paye']['label'], $_SERVER["PHP_SELF"], "cs.paye", '', $param, 'class="right"', $sortfield, $sortorder);
-		print "</tr>\n";
+
+// Hook fields
+$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+
+print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'maxwidthsearch ');
+print '</tr>';
 
 $i = 0;
 $totalarray = array();
@@ -266,9 +363,9 @@ if ($resql)
 {
 	$obj = $db->fetch_object($resql);
 
-			$chargesociale_static->id = $obj->id;
+	$chargesociale_static->id = $obj->rowid;
-			$chargesociale_static->ref = $obj->id;
+	$chargesociale_static->ref = $obj->rowid;
-			$chargesociale_static->label = $obj->label;
+	$chargesociale_static->label = $obj->libelle;
 	$chargesociale_static->type_label = $obj->type_label;
 	if (!empty($conf->projet->enabled)) {
 		$projectstatic->id = $obj->project_id;
@@ -278,23 +375,34 @@ if ($resql)
 
 	print '<tr class="oddeven">';
 
-			// Ref
+	// Line number
-			print "<td>".$chargesociale_static->getNomUrl(1, '20')."</td>\n";
+	if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
+		print '<td>'.(($offset * $limit) + $i).'</td>';
 		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Ref
+	if (!empty($arrayfields['cs.rowid']['checked'])) {
+		print '<td>'.$chargesociale_static->getNomUrl(1, '20').'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
 
 	// Label
-			print "<td>".dol_trunc($obj->label, 42)."</td>\n";
+	if (!empty($arrayfields['cs.libelle']['checked'])) {
+		print '<td>'.dol_trunc($obj->libelle, 42).'</td>';
 		if (!$i) $totalarray['nbfield']++;
+	}
 
 	// Type
-			print "<td>".$obj->type_label."</td>\n";
+	if (!empty($arrayfields['cs.fk_type']['checked'])) {
+		print '<td>'.$obj->type_label.'</td>';
 		if (!$i) $totalarray['nbfield']++;
+	}
 
-			// Project Ref
+	// Project ref
-			if (!empty($conf->projet->enabled)) {
+	if (!empty($arrayfields['p.ref']['checked'])) {
 		print '<td class="nowrap">';
-				if ($obj->project_id > 0)
+		if ($obj->project_id > 0) {
-				{
 			print $projectstatic->getNomUrl(1);
 		}
 		print '</td>';
@@ -302,31 +410,39 @@ if ($resql)
 	}
 
 	// Date
+	if (!empty($arrayfields['cs.date_ech']['checked'])) {
 		print '<td width="110" align="center">'.dol_print_date($db->jdate($obj->date_ech), 'day').'</td>';
 		if (!$i) $totalarray['nbfield']++;
+	}
 
 	// Date end period
+	if (!empty($arrayfields['cs.periode']['checked'])) {
 		print '<td class="center">';
-			if ($obj->periode)
+		if ($obj->periode) {
-			{
+			print '<a href="list.php?year='.strftime("%Y", $db->jdate($obj->periode)).'">';
-				print '<a href="list.php?year='.strftime("%Y", $db->jdate($obj->periode)).'">'.dol_print_date($db->jdate($obj->periode), 'day').'</a>';
+			print dol_print_date($db->jdate($obj->periode), 'day');
-			} else {
+			print '</a>';
-				print '&nbsp;';
 		}
-			print "</td>\n";
+		print '</td>';
 		if (!$i) $totalarray['nbfield']++;
+	}
 
 	// Amount
+	if (!empty($arrayfields['cs.amount']['checked'])) {
 		print '<td class="nowrap right">'.price($obj->amount).'</td>';
 		if (!$i) $totalarray['nbfield']++;
 		if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'totalttcfield';
 		$totalarray['val']['totalttcfield'] += $obj->amount;
+	}
 
+	// Status
+	if (!empty($arrayfields['cs.paye']['checked'])) {
 		print '<td class="nowrap right">'.$chargesociale_static->LibStatut($obj->paye, 5, $obj->alreadypayed).'</td>';
 		if (!$i) $totalarray['nbfield']++;
+	}
 
+	// Buttons
 	print '<td></td>';
-
 	if (!$i) $totalarray['nbfield']++;
 
 	print '</tr>';
@@ -338,11 +454,7 @@ if ($resql)
 
 print '</table>';
 print '</div>';
-	}
 print '</form>';
-} else {
-	dol_print_error($db);
-}
 
 // End of page
 llxFooter();