From fd3ba131307c9cc54f69d8f7186b2786e73da9a6 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 18 Oct 2015 21:33:47 +0200 Subject: [PATCH 01/31] FIX #3541 Bypass authentication when user was created using LDAP --- htdocs/core/login/functions_dolibarr.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/login/functions_dolibarr.php b/htdocs/core/login/functions_dolibarr.php index 36596165191..c421fdb1aeb 100644 --- a/htdocs/core/login/functions_dolibarr.php +++ b/htdocs/core/login/functions_dolibarr.php @@ -91,7 +91,7 @@ function check_user_password_dolibarr($usertotest,$passwordtotest,$entitytotest= if (! $passok) { if ((! $passcrypted || $passtyped) - && ($passtyped == $passclear)) + && ($passclear && ($passtyped == $passclear))) { $passok=true; dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ok - found pass in database"); From 6a90431cf1d4f0853041538203f461a05ff91d3b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 19 Oct 2015 14:04:47 +0200 Subject: [PATCH 02/31] Prepare 3.8.2 --- htdocs/filefunc.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php index ea369d8aff3..415a7addf4a 100644 --- a/htdocs/filefunc.inc.php +++ b/htdocs/filefunc.inc.php @@ -30,7 +30,7 @@ * \brief File that include conf.php file and commons lib like functions.lib.php */ -if (! defined('DOL_VERSION')) define('DOL_VERSION','3.8.1'); +if (! defined('DOL_VERSION')) define('DOL_VERSION','3.8.2'); if (! defined('EURO')) define('EURO',chr(128)); From 9e9f32e3bf848dc965de0a55c99c89ff6798d7bc Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Mon, 19 Oct 2015 15:38:28 +0200 Subject: [PATCH 03/31] FIX : project was not retrieved on invoice creation form --- htdocs/compta/facture.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index de0a591cf98..6368dd00831 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -1877,7 +1877,7 @@ if ($action == 'create') $objectsrc->fetch_lines(); $objectsrc->fetch_thirdparty(); - $projectid = (! empty($objectsrc->fk_project) ? $objectsrc->fk_project : ''); + $projectid = (! empty($projectid) ? $projectid : $objectsrc->fk_project); $ref_client = (! empty($objectsrc->ref_client) ? $objectsrc->ref_client : ''); $ref_int = (! empty($objectsrc->ref_int) ? $objectsrc->ref_int : ''); @@ -2257,9 +2257,6 @@ if ($action == 'create') // Project if (! empty($conf->projet->enabled) && $socid > 0) { - $projectid = GETPOST('projectid')?GETPOST('projectid'):0; - if ($origin == 'project') $projectid = ($originid ? $originid : 0); - $langs->load('projects'); print '' . $langs->trans('Project') . ''; $numprojet = $formproject->select_projects($soc->id, $projectid, 'projectid', 0); From 5fb6705b5c57e14523c71f655b3231d0ab394ece Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Mon, 19 Oct 2015 15:53:13 +0200 Subject: [PATCH 04/31] FIX : Search status not saved into list --- htdocs/compta/facture/list.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php index 2f87ff09e8b..2adab72dc1c 100644 --- a/htdocs/compta/facture/list.php +++ b/htdocs/compta/facture/list.php @@ -270,6 +270,7 @@ if ($resql) if ($search_user > 0) $param.='&search_user=' .$search_user; if ($search_montant_ht != '') $param.='&search_montant_ht='.$search_montant_ht; if ($search_montant_ttc != '') $param.='&search_montant_ttc='.$search_montant_ttc; + if ($search_status != '') $param.='&search_status='.$search_status; print_barre_liste($langs->trans('BillsCustomers').' '.($socid?' '.$soc->name:''),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords,'title_accountancy.png'); $i = 0; From 572be23fc1e2716b64ae584d5ea288b4b9831e72 Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Mon, 19 Oct 2015 15:57:23 +0200 Subject: [PATCH 05/31] FIX : filters on supplier invoices list are not used, search_status instead --- htdocs/fourn/facture/list.php | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php index dc8adddec39..a2b48c253df 100644 --- a/htdocs/fourn/facture/list.php +++ b/htdocs/fourn/facture/list.php @@ -81,7 +81,6 @@ $year = GETPOST("year","int"); $day_lim = GETPOST('day_lim','int'); $month_lim = GETPOST('month_lim','int'); $year_lim = GETPOST('year_lim','int'); -$filter = GETPOST("filtre"); if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test must be present to be compatible with all browsers { @@ -91,9 +90,9 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both $search_company=""; $search_amount_no_tax=""; $search_amount_all_tax=""; + $search_status=""; $year=""; $month=""; - $filter=""; } /* @@ -147,15 +146,6 @@ if ($socid) { $sql .= " AND s.rowid = ".$socid; } -if ($filter && $filter != -1) // GETPOST('filtre') may be a string -{ - $filtrearr = explode(",", $filter); - foreach ($filtrearr as $fil) - { - $filt = explode(":", $fil); - $sql .= " AND " . $filt[0] . " = " . $filt[1]; - } -} if ($search_ref) { @@ -214,7 +204,7 @@ if ($search_amount_all_tax != '') if ($search_status != '') { - $sql.= " AND fac.fk_statut = '".$db->escape($search_status)."'"; + $sql.= " AND fac.fk_statut = ".$search_status; } $nbtotalofrecords = 0; @@ -248,7 +238,7 @@ if ($resql) if ($search_company) $param.='&search_company='.urlencode($search_company); if ($search_amount_no_tax) $param.='&search_amount_no_tax='.urlencode($search_amount_no_tax); if ($search_amount_all_tax) $param.='&search_amount_all_tax='.urlencode($search_amount_all_tax); - if ($filter && $filter != -1) $param.='&filtre='.urlencode($filter); + if ($search_status >= 0) $param.="&search_status=".$search_status; print_barre_liste($langs->trans("BillsSuppliers").($socid?" $soc->name.":""),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords); print '
'; @@ -305,8 +295,8 @@ if ($resql) print ''; print ''; print ''; - $liststatus=array('fac.fk_statut:0'=>$langs->trans("Draft"),'fac.fk_statut:1,paye:0'=>$langs->trans("Unpaid"), 'paye:1'=>$langs->trans("Paid")); - print $form->selectarray('filtre', $liststatus, $filter, 1); + $liststatus=array('0'=>$langs->trans("Draft"),'1'=>$langs->trans("Unpaid"), '2'=>$langs->trans("Paid")); + print $form->selectarray('filtre', $liststatus, $search_status, 1); print ''; print ''; print ''; From d79fb7198762e09f0c07055f1086211878dc7f8b Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Mon, 19 Oct 2015 16:17:47 +0200 Subject: [PATCH 06/31] FIX : search_status not used in mergefusiontool --- htdocs/compta/facture/mergepdftool.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/htdocs/compta/facture/mergepdftool.php b/htdocs/compta/facture/mergepdftool.php index 5acca49d1b1..ea0eedfa36a 100644 --- a/htdocs/compta/facture/mergepdftool.php +++ b/htdocs/compta/facture/mergepdftool.php @@ -417,6 +417,7 @@ $search_societe = GETPOST("search_societe"); $search_paymentmode = GETPOST("search_paymentmode"); $search_montant_ht = GETPOST("search_montant_ht"); $search_montant_ttc = GETPOST("search_montant_ttc"); +$search_status = GETPOST("search_status"); $late = GETPOST("late"); // Do we click on purge search criteria ? @@ -428,6 +429,7 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both $search_paymentmode=''; $search_montant_ht=''; $search_montant_ttc=''; + $search_status=''; } $sortfield = GETPOST("sortfield",'alpha'); @@ -483,6 +485,7 @@ if ($search_paymentmode) $sql .= " AND f.fk_mode_reglement = ".$search_paymentmo if ($search_montant_ht) $sql .= " AND f.total = '".$db->escape($search_montant_ht)."'"; if ($search_montant_ttc) $sql .= " AND f.total_ttc = '".$db->escape($search_montant_ttc)."'"; if (GETPOST('sf_ref')) $sql .= " AND f.facnumber LIKE '%".$db->escape(GETPOST('sf_ref'))."%'"; +if ($search_status) $sql .= " AND f.fk_statut = ".$search_status; if ($month > 0) { if ($year > 0) @@ -528,6 +531,7 @@ if ($resql) if ($search_societe) $param.='&search_paymentmode='.urlencode($search_paymentmode); if ($search_montant_ht) $param.='&search_montant_ht='.urlencode($search_montant_ht); if ($search_montant_ttc) $param.='&search_montant_ttc='.urlencode($search_montant_ttc); + if ($search_status) $param.='&search_status='.urlencode($search_status); if ($late) $param.='&late='.urlencode($late); if ($mode) $param.='&mode='.urlencode($mode); $urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder; From 7d382f7997fec9d9fbdb5e199c8e5befb18dfa11 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 19 Oct 2015 18:16:28 +0200 Subject: [PATCH 07/31] FIX Revert option WORKFLOW_PROPAL_CAN_CLASSIFIED_BILLED_WITHOUT_INVOICES into option WORKFLOW_PROPAL_NEED_INVOICE_TO_BE_CLASSIFIED_BILLED for better compatibility with old versions --- htdocs/comm/propal.php | 2 +- htdocs/langs/en_US/workflow.lang | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index bcfaa747cab..fd6794c3d44 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -2223,7 +2223,7 @@ if ($action == 'create') } $arrayofinvoiceforpropal = $object->getInvoiceArrayList(); - if ((is_array($arrayofinvoiceforpropal) && count($arrayofinvoiceforpropal) > 0) || ! empty($conf->global->WORKFLOW_PROPAL_CAN_CLASSIFIED_BILLED_WITHOUT_INVOICES)) + if ((is_array($arrayofinvoiceforpropal) && count($arrayofinvoiceforpropal) > 0) || empty($conf->global->WORKFLOW_PROPAL_NEED_INVOICE_TO_BE_CLASSIFIED_BILLED)) { print '
socid . '">' . $langs->trans("ClassifyBilled") . '
'; } diff --git a/htdocs/langs/en_US/workflow.lang b/htdocs/langs/en_US/workflow.lang index 7414fcb7e62..14be1a6ade6 100644 --- a/htdocs/langs/en_US/workflow.lang +++ b/htdocs/langs/en_US/workflow.lang @@ -3,9 +3,9 @@ WorkflowSetup=Workflow module setup WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in. ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules. descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed -descWORKFLOW_PROPAL_AUTOCREATE_INVOICEAutomatically create a customer invoice after a commercial proposal is signed -descWORKFLOW_CONTRACT_AUTOCREATE_INVOICEAutomatically create a customer invoice after a contract is validated -descWORKFLOW_ORDER_AUTOCREATE_INVOICEAutomatically create a customer invoice after a customer order is closed +descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed +descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Automatically create a customer invoice after a contract is validated +descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a customer order is closed descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer order is set to paid descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated From 5237a2afc7bf155cbdc8a73bcaeefb90264084ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Tue, 20 Oct 2015 17:45:24 +0200 Subject: [PATCH 08/31] Fix lost searchstatus on next page list --- htdocs/compta/facture/list.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php index 2f87ff09e8b..87b27ef8199 100644 --- a/htdocs/compta/facture/list.php +++ b/htdocs/compta/facture/list.php @@ -69,7 +69,7 @@ $search_refcustomer=GETPOST('search_refcustomer','alpha'); $search_societe=GETPOST('search_societe','alpha'); $search_montant_ht=GETPOST('search_montant_ht','alpha'); $search_montant_ttc=GETPOST('search_montant_ttc','alpha'); -$search_status=GETPOST('search_status','alpha'); +$search_status=GETPOST('search_status','int'); $sortfield = GETPOST("sortfield",'alpha'); $sortorder = GETPOST("sortorder",'alpha'); @@ -270,6 +270,7 @@ if ($resql) if ($search_user > 0) $param.='&search_user=' .$search_user; if ($search_montant_ht != '') $param.='&search_montant_ht='.$search_montant_ht; if ($search_montant_ttc != '') $param.='&search_montant_ttc='.$search_montant_ttc; + if ($search_status > 0) $param.='&search_status='.$search_status; print_barre_liste($langs->trans('BillsCustomers').' '.($socid?' '.$soc->name:''),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords,'title_accountancy.png'); $i = 0; From 4689b0cc11846010f43b29aeb64db4d298994c39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 21 Oct 2015 17:31:51 +0200 Subject: [PATCH 09/31] Update fournisseur.commande.class.php --- htdocs/fourn/class/fournisseur.commande.class.php | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php index 492663295b8..51602cafe1c 100644 --- a/htdocs/fourn/class/fournisseur.commande.class.php +++ b/htdocs/fourn/class/fournisseur.commande.class.php @@ -1571,6 +1571,7 @@ class CommandeFournisseur extends CommonOrder $result=$this->call_trigger('ORDER_SUPPLIER_DELETE',$user); if ($result < 0) { + $this->errors[]='ErrorWhenRunningTrigger'; dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR); return -1; } @@ -1583,6 +1584,8 @@ class CommandeFournisseur extends CommonOrder dol_syslog(get_class($this)."::delete", LOG_DEBUG); if (! $this->db->query($sql) ) { + $this->error=$this->db->lasterror(); + $this->errors[]=$this->db->lasterror(); $error++; } @@ -1593,12 +1596,14 @@ class CommandeFournisseur extends CommonOrder if ($this->db->affected_rows($resql) < 1) { $this->error=$this->db->lasterror(); + $this->errors[]=$this->db->lasterror(); $error++; } } else { $this->error=$this->db->lasterror(); + $this->errors[]=$this->db->lasterror(); $error++; } @@ -1608,6 +1613,8 @@ class CommandeFournisseur extends CommonOrder $result=$this->deleteExtraFields(); if ($result < 0) { + $this->error='FailToDeleteExtraFields'; + $this->errors[]='FailToDeleteExtraFields'; $error++; dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR); } @@ -1615,7 +1622,11 @@ class CommandeFournisseur extends CommonOrder // Delete linked object $res = $this->deleteObjectLinked(); - if ($res < 0) $error++; + if ($res < 0) { + $this->error='FailToDeleteObjectLinked'; + $this->errors[]='FailToDeleteObjectLinked'; + $error++; + } if (! $error) { @@ -1630,6 +1641,7 @@ class CommandeFournisseur extends CommonOrder if (! dol_delete_file($file,0,0,0,$this)) // For triggers { $this->error='ErrorFailToDeleteFile'; + $this->errors[]='ErrorFailToDeleteFile'; $error++; } } @@ -1639,6 +1651,7 @@ class CommandeFournisseur extends CommonOrder if (! $res) { $this->error='ErrorFailToDeleteDir'; + $this->errors[]='ErrorFailToDeleteDir'; $error++; } } From 2a412af00b3ea57ed2e2d3e72a77044275d9a44f Mon Sep 17 00:00:00 2001 From: Sergio Sanchis Climent Date: Fri, 23 Oct 2015 13:04:33 +0200 Subject: [PATCH 10/31] Fix: Bug: if $this->employe no exist Fix: if this->employee no exist default 0 --- htdocs/install/mysql/tables/llx_user.sql | 3 +-- htdocs/user/class/user.class.php | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/htdocs/install/mysql/tables/llx_user.sql b/htdocs/install/mysql/tables/llx_user.sql index 796566fb638..c9673ceb360 100644 --- a/htdocs/install/mysql/tables/llx_user.sql +++ b/htdocs/install/mysql/tables/llx_user.sql @@ -26,7 +26,7 @@ create table llx_user ref_ext varchar(50), -- reference into an external system (not used by dolibarr) ref_int varchar(50), -- reference into an internal system (deprecated) - employee tinyint DEFAULT 0, -- employee 0/1 + employee tinyint DEFAULT 0, -- 1 if user is an employee datec datetime, tms timestamp, @@ -76,7 +76,6 @@ create table llx_user nb_holiday integer DEFAULT 0, thm double(24,8), tjm double(24,8), - employee tinyint DEFAULT 1, -- 1 if user is an employee salary double(24,8), salaryextra double(24,8), weeklyhours double(16,8) diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index 85a96ebe415..066da9c18da 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -1156,7 +1156,7 @@ class User extends CommonObject // Clean parameters $this->lastname = trim($this->lastname); $this->firstname = trim($this->firstname); - $this->employee = trim($this->employee); + $this->employee = $this->employee?$this->employee:0; $this->login = trim($this->login); $this->gender = trim($this->gender); $this->pass = trim($this->pass); From 8d24adc97ee54640a716258be36c9c5379246dc8 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 23 Oct 2015 13:52:51 +0200 Subject: [PATCH 11/31] Remove 2 other duplicated pages. There is only one page now for all list of thirdarties (with a parameter type to have it specialized per customer, prospect or supplier profile). --- htdocs/comm/list.php | 348 ------------ htdocs/comm/prospect/list.php | 613 --------------------- htdocs/core/class/html.formother.class.php | 2 +- htdocs/core/menus/init_menu_auguria.sql | 4 +- htdocs/core/menus/standard/eldy.lib.php | 14 +- htdocs/index.php | 5 +- htdocs/societe/index.php | 4 +- htdocs/societe/list.php | 251 +++++++-- 8 files changed, 233 insertions(+), 1008 deletions(-) delete mode 100644 htdocs/comm/list.php delete mode 100644 htdocs/comm/prospect/list.php diff --git a/htdocs/comm/list.php b/htdocs/comm/list.php deleted file mode 100644 index 1cc0f2fa968..00000000000 --- a/htdocs/comm/list.php +++ /dev/null @@ -1,348 +0,0 @@ - - * Copyright (C) 2004-2011 Laurent Destailleur - * Copyright (C) 2005-2012 Regis Houssin - * Copyright (C) 2013 Cédric Salvador - * Copyright (C) 2013-2015 Florian Henry - * Copyright (C) 2015 Jean-François Ferry - * Copyright (C) 2015 Marcos García - * - * This program is freei software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/** - * \file htdocs/comm/list.php - * \ingroup commercial societe - * \brief List of customers - */ - -require '../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; -require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; - -$langs->load("companies"); -$langs->load("customers"); -$langs->load("suppliers"); -$langs->load("commercial"); - -// Security check -$socid = GETPOST('socid','int'); -if ($user->societe_id) $socid=$user->societe_id; -$result = restrictedArea($user,'societe',$socid,''); - -$sortfield = GETPOST('sortfield','alpha'); -$sortorder = GETPOST('sortorder','alpha'); -$page=GETPOST('page','int'); -if ($page == -1) { $page = 0 ; } -$offset = $conf->liste_limit * $page; -$pageprev = $page - 1; -$pagenext = $page + 1; -if (! $sortorder) $sortorder="ASC"; -if (! $sortfield) $sortfield="s.nom"; - -$search_company = GETPOST("search_company"); -$search_zipcode = GETPOST("search_zipcode"); -$search_town = GETPOST("search_town"); -$search_code = GETPOST("search_code"); -$search_compta = GETPOST("search_compta"); -$search_status = GETPOST("search_status",'int'); -$search_country = GETPOST("search_country",'int'); -$search_type_thirdparty = GETPOST("search_type_thirdparty",'int'); -$optioncss = GETPOST('optioncss','alpha'); - -// Load sale and categ filters -$search_sale = GETPOST("search_sale",'int'); -$search_categ = GETPOST("search_categ",'int'); -$catid = GETPOST("catid",'int'); -// If the internal user must only see his customers, force searching by him -if (!$user->rights->societe->client->voir && !$socid) $search_sale = $user->id; - -// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array -$hookmanager->initHooks(array('customerlist')); -$extrafields = new ExtraFields($db); - - -/* - * Actions - */ - -$parameters=array(); -$reshook=$hookmanager->executeHooks('doActions',$parameters); // Note that $action and $object may have been modified by some hooks -if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); - -// Do we click on purge search criteria ? -if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers -{ - $search_sale=""; - $search_categ=""; - $catid=""; - $search_company=""; - $search_zipcode=""; - $search_town=""; - $search_code=''; - $search_compta=''; - $search_status=''; - $search_country=""; - $search_type_thirdparty=''; -} - -if ($search_status=='') $search_status=1; // always display activ customer first - - -/* - * view - */ - -$formother=new FormOther($db); -$form = new Form($db); -$thirdpartystatic=new Societe($db); -$formcompany=new FormCompany($db); - -$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas'; -llxHeader('',$langs->trans("ThirdParty"),$help_url); - -$sql = "SELECT s.rowid, s.nom as name, s.name_alias, s.client, s.zip, s.town, st.libelle as stcomm, s.prefix_comm, s.code_client, s.code_compta, s.status as status,"; -$sql.= " s.datec, s.canvas"; -$sql.= ",s.fk_pays"; -$sql.= ",typent.code as typent_code"; -if ((!$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects) -// Add fields for extrafields -foreach ($extrafields->attribute_list as $key => $val) $sql.=",ef.".$key.' as options_'.$key; -// Add fields from hooks -$parameters=array(); -$reshook=$hookmanager->executeHooks('printFieldListSelect',$parameters); // Note that $action and $object may have been modified by hook -$sql.=$hookmanager->resPrint; -$sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; -if (! empty($search_categ) || ! empty($catid)) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_soc"; // We need this table joined to the select in order to filter by categ -$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as country on (country.rowid = s.fk_pays) "; -$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_typent as typent on (typent.id = s.fk_typent) "; -if ((!$user->rights->societe->client->voir && !$socid) || $search_sale) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale -$sql.= ", ".MAIN_DB_PREFIX."c_stcomm as st"; -$sql.= " WHERE s.fk_stcomm = st.id"; -$sql.= " AND s.client IN (1, 3)"; -$sql.= ' AND s.entity IN ('.getEntity('societe', 1).')'; -if ((!$user->rights->societe->client->voir && !$socid) || $search_sale) $sql.= " AND s.rowid = sc.fk_soc"; -if ($socid) $sql.= " AND s.rowid = ".$socid; -if ($search_sale > 0) $sql.= " AND s.rowid = sc.fk_soc"; // Join for the needed table to filter by sale -if ($catid > 0) $sql.= " AND cs.fk_categorie = ".$catid; -if ($catid == -2) $sql.= " AND cs.fk_categorie IS NULL"; -if ($search_categ > 0) $sql.= " AND cs.fk_categorie = ".$search_categ; -if ($search_categ == -2) $sql.= " AND cs.fk_categorie IS NULL"; -if ($search_company) $sql.= natural_search(array('s.nom', 's.name_alias'), $search_company); -if ($search_zipcode) $sql.= natural_search("s.zip", $search_zipcode); -if ($search_town) $sql.= natural_search('s.town', $search_town); -if ($search_code) $sql.= natural_search("s.code_client", $search_code); -if ($search_compta) $sql.= natural_search("s.code_compta", $search_compta); -if ($search_status!='') $sql.= " AND s.status = ".$db->escape($search_status); -if ($search_country) $sql .= " AND s.fk_pays IN (".$search_country.')'; -if ($search_type_thirdparty) $sql .= " AND s.fk_typent IN (".$search_type_thirdparty.')'; -if ($search_sale > 0) $sql.= " AND sc.fk_user = ".$search_sale; -// Add where from hooks -$parameters=array(); -$reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters); // Note that $action and $object may have been modified by hook -$sql.=$hookmanager->resPrint; - -// Count total nb of records -$nbtotalofrecords = 0; -if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) -{ - $result = $db->query($sql); - $nbtotalofrecords = $db->num_rows($result); -} - -$sql.= $db->order($sortfield,$sortorder); -$sql.= $db->plimit($conf->liste_limit +1, $offset); - -dol_syslog('comm/list.php:', LOG_DEBUG); -$result = $db->query($sql); -if ($result) -{ - $num = $db->num_rows($result); - - $param = "&search_company=".htmlspecialchars($search_company); - $param.="&search_code=".htmlspecialchars($search_code); - $param.="&search_zipcode=".htmlspecialchars($search_zipcode); - $param.="&search_town=".htmlspecialchars($search_town); - if ($search_categ != '') $param.='&search_categ='.htmlspecialchars($search_categ); - if ($search_sale > 0) $param.='&search_sale='.htmlspecialchars($search_sale); - if ($search_status != '') $param.='&search_status='.htmlspecialchars($search_status); - if ($search_country != '') $param.='&search_country='.htmlspecialchars($search_country); - if ($search_type_thirdparty != '') $param.='&search_type_thirdparty='.htmlspecialchars($search_type_thirdparty); - if ($optioncss != '') $param.='&optioncss='.$optioncss; - - print_barre_liste($langs->trans("ListOfCustomers"), $page, $_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords,'title_companies.png'); - - $i = 0; - - print ''."\n"; - if ($optioncss != '') print ''; - - // Filter on categories - $moreforfilter=''; - if (! empty($conf->categorie->enabled)) - { - $moreforfilter.='
'; - $moreforfilter.=$langs->trans('Categories'). ': '; - $moreforfilter.=$formother->select_categories(2,$search_categ,'search_categ',1); - $moreforfilter.='
'; - } - // If the user can view prospects other than his' - if ($user->rights->societe->client->voir || $socid) - { - $moreforfilter.='
'; - $moreforfilter.=$langs->trans('SalesRepresentatives'). ': '; - $moreforfilter.=$formother->select_salesrepresentatives($search_sale,'search_sale',$user); - $moreforfilter.='
'; - } - if ($moreforfilter) - { - print '
'; - print $moreforfilter; - $parameters=array(); - $reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters); // Note that $action and $object may have been modified by hook - print $hookmanager->resPrint; - print '
'; - } - - print ''; - - print ''; - print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","",$param,"",$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Zip"),$_SERVER["PHP_SELF"],"s.zip","",$param,"",$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Town"),$_SERVER["PHP_SELF"],"s.town","",$param,"",$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Country"),$_SERVER["PHP_SELF"],"country.code_iso","",$param,'align="center"',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("ThirdPartyType"),$_SERVER["PHP_SELF"],"typent.code","",$param,'align="center"',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("CustomerCode"),$_SERVER["PHP_SELF"],"s.code_client","",$param,"",$sortfield,$sortorder); - print_liste_field_titre($langs->trans("AccountancyCode"),$_SERVER["PHP_SELF"],"s.code_compta","",$param,'align="left"',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("DateCreation"),$_SERVER["PHP_SELF"],"datec","",$param,'align="right"',$sortfield,$sortorder); - $parameters=array(); - $reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters); // Note that $action and $object may have been modified by hook - print $hookmanager->resPrint; - print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"s.status","",$param,'align="center"',$sortfield,$sortorder); - print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch '); - print "\n"; - - print ''; - - print ''; - - print ''; - - print ''; - - print ''; - - print ''; - - print ''; - - print ''; - - print ''; - - $parameters=array(); - $reshook=$hookmanager->executeHooks('printFieldListOption',$parameters); // Note that $action and $object may have been modified by hook - print $hookmanager->resPrint; - - print ''; - - print ''; - - print ''."\n"; - - - $var=True; - - while ($i < min($num,$conf->liste_limit)) - { - $obj = $db->fetch_object($result); - - $var=!$var; - - print ""; - print ''; - print ''; - print ''; - //Country - print ''; - //Type ent - print ''; - print ''; - print ''; - print ''; - - $parameters=array('obj' => $obj); - $reshook=$hookmanager->executeHooks('printFieldListValue',$parameters); // Note that $action and $object may have been modified by hook - print $hookmanager->resPrint; - - print ''; - - print ''; - - print "\n"; - $i++; - } - $db->free($result); - - $parameters=array('sql' => $sql); - $reshook=$hookmanager->executeHooks('printFieldListFooter',$parameters); // Note that $action and $object may have been modified by hook - print $hookmanager->resPrint; - - print "
'; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print $form->select_country($search_country,'search_country','',0,'maxwidth100'); - print ''; - print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT)?'ASC':$conf->global->SOCIETE_SORT_ON_TYPEENT)); - print ''; - print ''; - print ''; - print ''; - print ''; - print ' '; - print ''; - print $form->selectarray('search_status', array('0'=>$langs->trans('ActivityCeased'),'1'=>$langs->trans('InActivity')),$search_status); - print ''; - print ''; - print '
'; - $thirdpartystatic->id=$obj->rowid; - $thirdpartystatic->name=$obj->name; - $thirdpartystatic->client=$obj->client; - $thirdpartystatic->code_client=$obj->code_client; - $thirdpartystatic->canvas=$obj->canvas; - $thirdpartystatic->status=$obj->status; - $thirdpartystatic->name_alias=$obj->name_alias; - print $thirdpartystatic->getNomUrl(1); - print ''.$obj->zip.''.$obj->town.''; - $tmparray=getCountry($obj->fk_pays,'all'); - print $tmparray['label']; - print ''; - if (count($typenArray)==0) $typenArray = $formcompany->typent_array(1); - print $typenArray[$obj->typent_code]; - print ''.$obj->code_client.''.$obj->code_compta.''.dol_print_date($db->jdate($obj->datec),'day').''.$thirdpartystatic->getLibStatut(3); - print '
\n"; - print "\n"; -} -else -{ - dol_print_error($db); -} - -llxFooter(); -$db->close(); diff --git a/htdocs/comm/prospect/list.php b/htdocs/comm/prospect/list.php deleted file mode 100644 index 8ec43d955a4..00000000000 --- a/htdocs/comm/prospect/list.php +++ /dev/null @@ -1,613 +0,0 @@ - - * Copyright (C) 2004-2015 Laurent Destailleur - * Copyright (C) 2005-2012 Regis Houssin - * Copyright (C) 2011 Philippe Grand - * Copyright (C) 2013-2015 Florian Henry - * Copyright (C) 2013 Cédric Salvador - * Copyright (C) 2015 Jean-François Ferry - * Copyright (C) 2015 Raphaël Doursenaud - * Copyright (C) 2015 Marcos García - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/** - * \file htdocs/comm/prospect/list.php - * \ingroup prospect - * \brief Page to list prospects - */ - -require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/societe/class/client.class.php'; -require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; -require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; - -$langs->load("propal"); -$langs->load("companies"); - -// Security check -$socid = GETPOST("socid",'int'); -if ($user->societe_id) $socid=$user->societe_id; -$result = restrictedArea($user, 'societe',$socid,''); - -$action = GETPOST('action','alpha'); -$socname = GETPOST("socname",'alpha'); -$stcomm = GETPOST("stcomm",'alpha'); // code -$search_stcomm = GETPOST("search_stcomm",'int'); -$search_nom = GETPOST("search_nom"); -$search_zipcode = GETPOST("search_zipcode"); -$search_town = GETPOST("search_town"); -$search_state = GETPOST("search_state"); -$search_datec = GETPOST("search_datec"); -$search_categ = GETPOST("search_categ",'int'); -$search_status = GETPOST("search_status",'int'); -$catid = GETPOST("catid",'int'); -$search_country = GETPOST("search_country",'int'); -$search_type_thirdparty = GETPOST("search_type_thirdparty",'int'); - -$sortfield = GETPOST("sortfield",'alpha'); -$sortorder = GETPOST("sortorder",'alpha'); -$page = GETPOST("page",'int'); -if ($page == -1) { $page = 0; } -$offset = $conf->liste_limit * $page; -$pageprev = $page - 1; -$pagenext = $page + 1; -if (! $sortorder) $sortorder="ASC"; -if (! $sortfield) $sortfield="s.nom"; - -$search_level_from = GETPOST("search_level_from","alpha"); -$search_level_to = GETPOST("search_level_to","alpha"); - -// If both parameters are set, search for everything BETWEEN them -if ($search_level_from != '' && $search_level_to != '') -{ - // Ensure that these parameters are numbers - $search_level_from = (int) $search_level_from; - $search_level_to = (int) $search_level_to; - - // If from is greater than to, reverse orders - if ($search_level_from > $search_level_to) - { - $tmp = $search_level_to; - $search_level_to = $search_level_from; - $search_level_from = $tmp; - } - - // Generate the SQL request - $sortwhere = '(sortorder BETWEEN '.$search_level_from.' AND '.$search_level_to.') AS is_in_range'; -} -// If only "from" parameter is set, search for everything GREATER THAN it -else if ($search_level_from != '') -{ - // Ensure that this parameter is a number - $search_level_from = (int) $search_level_from; - - // Generate the SQL request - $sortwhere = '(sortorder >= '.$search_level_from.') AS is_in_range'; -} -// If only "to" parameter is set, search for everything LOWER THAN it -else if ($search_level_to != '') -{ - // Ensure that this parameter is a number - $search_level_to = (int) $search_level_to; - - // Generate the SQL request - $sortwhere = '(sortorder <= '.$search_level_to.') AS is_in_range'; -} -// If no parameters are set, dont search for anything -else -{ - $sortwhere = '0 as is_in_range'; -} - -// Select every potentiels, and note each potentiels which fit in search parameters -dol_syslog('prospects::prospects_prospect_level',LOG_DEBUG); -$sql = "SELECT code, label, sortorder, ".$sortwhere; -$sql.= " FROM ".MAIN_DB_PREFIX."c_prospectlevel"; -$sql.= " WHERE active > 0"; -$sql.= " ORDER BY sortorder"; - -$resql = $db->query($sql); -if ($resql) -{ - $tab_level = array(); - $search_levels = array(); - - while ($obj = $db->fetch_object($resql)) - { - // Compute level text - $level=$langs->trans($obj->code); - if ($level == $obj->code) $level=$langs->trans($obj->label); - - // Put it in the array sorted by sortorder - $tab_level[$obj->sortorder] = $level; - - // If this potentiel fit in parameters, add its code to the $search_levels array - if ($obj->is_in_range == 1) - { - $search_levels[] = '"'.preg_replace('[^A-Za-z0-9_-]', '', $obj->code).'"'; - } - } - - // Implode the $search_levels array so that it can be use in a "IN (...)" where clause. - // If no paramters was set, $search_levels will be empty - $search_levels = implode(',', $search_levels); -} -else dol_print_error($db); - -// Load sale and categ filters -$search_sale = GETPOST('search_sale','int'); -$search_categ = GETPOST('search_categ','int'); -// If the internal user must only see his prospect, force searching by him -if (!$user->rights->societe->client->voir && !$socid) $search_sale = $user->id; - -// List of available states; we'll need that for each lines (quick changing prospect states) and for search bar (filter by prospect state) -$sts = array(-1,0,1,2,3); - - -// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array -$contextpage='prospectlist'; -$hookmanager->initHooks(array($contextpage)); -$extrafields = new ExtraFields($db); - -// fetch optionals attributes and labels -$extralabels = $extrafields->fetch_name_optionals_label('thirdparty'); -$search_array_options=$extrafields->getOptionalsFromPost($extralabels,'','search_'); - -// Do we click on purge search criteria ? -if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers -{ - $socname=""; - $stcomm=""; - $search_stcomm=""; - $search_nom=""; - $search_zipcode=""; - $search_town=""; - $search_state=""; - $search_datec=""; - $search_categ=""; - $search_status=""; - $search_country=""; - $search_type_thirdparty=""; - $search_array_options=array(); -} - -if ($search_status=='') $search_status=1; // always display active customer first - - - -/* - * Actions - */ - -$parameters=array(); -$reshook=$hookmanager->executeHooks('doActions',$parameters); // Note that $action and $object may have been modified by some hooks -if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); - -if (empty($reshook)) -{ - if ($action == 'setstcomm') - { - $object = new Client($db); - $result=$object->fetch($socid); - $object->stcomm_id=dol_getIdFromCode($db, GETPOST('stcomm','alpha'), 'c_stcomm'); - $result=$object->set_commnucation_level($user); - if ($result < 0) setEventMessages($object->error,$object->errors,'errors'); - - $action=''; $socid=0; - } -} - - -/* - * View - */ - -$formother=new FormOther($db); -$form=new Form($db); -$formcompany=new FormCompany($db); -$prospectstatic=new Client($db); -$prospectstatic->client=2; -$prospectstatic->loadCacheOfProspStatus(); - -$sql = "SELECT s.rowid as socid, s.nom as name, s.name_alias, s.zip, s.town, s.datec, s.status as status, s.code_client, s.client,"; -$sql.= " s.prefix_comm, s.fk_prospectlevel, s.fk_stcomm as stcomm_id,"; -$sql.= " st.libelle as stcomm_label,"; -$sql.= " d.nom as departement"; -$sql.= " ,s.fk_pays"; -$sql.= " ,typent.code as typent_code"; -if ((!$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects) -// Add fields for extrafields -if (is_array($extrafields->attribute_list) && count($extrafields->attribute_list)) foreach ($extrafields->attribute_list as $key => $val) $sql.=",ef.".$key.' as options_'.$key; -// Add fields from hooks -$parameters=array(); -$reshook=$hookmanager->executeHooks('printFieldListSelect',$parameters); // Note that $action and $object may have been modified by hook -$sql.=$hookmanager->resPrint; -$sql .= " FROM ".MAIN_DB_PREFIX."c_stcomm as st"; -$sql.= ", ".MAIN_DB_PREFIX."societe as s"; -if (is_array($extrafields->attribute_list) && count($extrafields->attribute_list)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_extrafields as ef on (s.rowid = ef.fk_object)"; -$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as d on (d.rowid = s.fk_departement)"; -$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as country on (country.rowid = s.fk_pays) "; -$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_typent as typent on (typent.id = s.fk_typent) "; -if (! empty($search_categ) || ! empty($catid)) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_soc"; // We need this table joined to the select in order to filter by categ -if ((!$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale -$sql.= " WHERE s.fk_stcomm = st.id"; -$sql.= " AND s.client IN (2, 3)"; -$sql.= ' AND s.entity IN ('.getEntity('societe', 1).')'; -if ((!$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= " AND s.rowid = sc.fk_soc"; -if ($socid) $sql.= " AND s.rowid = " .$socid; -if ($search_stcomm != '' && $search_stcomm != -2) $sql.= natural_search("s.fk_stcomm",$search_stcomm,2); -if ($catid > 0) $sql.= " AND cs.fk_categorie = ".$catid; -if ($catid == -2) $sql.= " AND cs.fk_categorie IS NULL"; -if ($search_categ > 0) $sql.= " AND cs.fk_categorie = ".$search_categ; -if ($search_categ == -2) $sql.= " AND cs.fk_categorie IS NULL"; -if ($search_nom) $sql .= natural_search(array('s.nom','s.name_alias'), $search_nom); -if ($search_zipcode) $sql .= " AND s.zip LIKE '".$db->escape(strtolower($search_zipcode))."%'"; -if ($search_town) $sql .= natural_search('s.town', $search_town); -if ($search_state) $sql .= natural_search('d.nom', $search_state); -if ($search_datec) $sql .= " AND s.datec LIKE '%".$db->escape($search_datec)."%'"; -if ($search_status!='') $sql .= " AND s.status = ".$db->escape($search_status); -// Insert levels filters -if ($search_levels) $sql .= " AND s.fk_prospectlevel IN (".$search_levels.')'; -if ($search_country) $sql .= " AND s.fk_pays IN (".$search_country.')'; -if ($search_type_thirdparty) $sql .= " AND s.fk_typent IN (".$search_type_thirdparty.')'; -// Insert sale filter -if ($search_sale > 0) $sql .= " AND sc.fk_user = ".$db->escape($search_sale); -if ($socname) -{ - $sql .= natural_search('s.nom', $search_nom); - $sortfield = "s.nom"; - $sortorder = "ASC"; -} -// Add where from extra fields -foreach ($search_array_options as $key => $val) -{ - $crit=$val; - $tmpkey=preg_replace('/search_options_/','',$key); - $typ=$extrafields->attribute_type[$tmpkey]; - $mode=0; - if (in_array($typ, array('int'))) $mode=1; // Search on a numeric - if ($val && ( ($crit != '' && ! in_array($typ, array('select'))) || ! empty($crit))) - { - $sql .= natural_search('ef.'.$tmpkey, $crit, $mode); - } -} -// Add where from hooks -$parameters=array(); -$reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters); // Note that $action and $object may have been modified by hook -$sql.=$hookmanager->resPrint; -// Count total nb of records -$nbtotalofrecords = 0; -if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) -{ - $result = $db->query($sql); - $nbtotalofrecords = $db->num_rows($result); -} -$sql.= " ORDER BY $sortfield $sortorder, s.nom ASC"; -$sql.= $db->plimit($conf->liste_limit+1, $offset); -//print $sql; - -dol_syslog('comm/prospect/list.php', LOG_DEBUG); -$resql = $db->query($sql); -if ($resql) -{ - $num = $db->num_rows($resql); - - if ($num == 1 && $socname) - { - $obj = $db->fetch_object($resql); - header("Location: card.php?socid=".$obj->socid); - exit; - } - else - { - $help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas'; - llxHeader('',$langs->trans("ThirdParty"),$help_url); - } - - $param='&search_stcomm='.$search_stcomm; - $param.='&search_nom='.urlencode($search_nom); - $param.='&search_zipcode='.urlencode($search_zipcode); - $param.='&search_town='.urlencode($search_town); - // Store the status filter in the URL - if (isSet($search_setstcomm)) - { - foreach ($search_setstcomm as $key => $value) - { - if ($value == 'true') - $param.='&search_setstcomm['.((int) $key).']=true'; - else - $param.='&search_setstcomm['.((int) $key).']=false'; - } - } - if ($search_level_from != '') $param.='&search_level_from='.$search_level_from; - if ($search_level_to != '') $param.='&search_level_to='.$search_level_to; - if ($search_categ != '') $param.='&search_categ='.urlencode($search_categ); - if ($search_sale > 0) $param.='&search_sale='.$search_sale; - if ($search_status != '') $param.='&search_status='.$search_status; - if ($search_country != '') $param.='&search_country='.$search_country; - if ($search_type_thirdparty != '') $param.='&search_type_thirdparty='.$search_type_thirdparty; - // Add $param from extra fields - foreach ($search_array_options as $key => $val) - { - $crit=$val; - $tmpkey=preg_replace('/search_options_/','',$key); - $param.='&search_options_'.$tmpkey.'='.urlencode($val); - } - - print_barre_liste($langs->trans("ListOfProspects"), $page, $_SERVER["PHP_SELF"], $param, $sortfield,$sortorder,'',$num,$nbtotalofrecords,'title_companies.png'); - - - // Print the search-by-sale and search-by-categ filters - print '
'; - - // Filter on categories - $moreforfilter=''; - if (! empty($conf->categorie->enabled)) - { - require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php'; - $moreforfilter.='
'; - $moreforfilter.=$langs->trans('Categories'). ': '; - $moreforfilter.=$formother->select_categories(Categorie::TYPE_CUSTOMER,$search_categ,'search_categ',1); - $moreforfilter.='
'; - } - // If the user can view prospects other than his' - if ($user->rights->societe->client->voir || $socid) - { - $moreforfilter.='
'; - $moreforfilter.=$langs->trans('SalesRepresentatives'). ': '; - $moreforfilter.=$formother->select_salesrepresentatives($search_sale,'search_sale',$user); - $moreforfilter.='
'; - } - if ($moreforfilter) - { - print '
'; - print $moreforfilter; - $parameters=array(); - $reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters); // Note that $action and $object may have been modified by hook - print $hookmanager->resPrint; - print '
'; - } - - print ''; - - print ''; - print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","",$param,'',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Zip"),$_SERVER["PHP_SELF"],"s.zip","",$param,"",$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Town"),$_SERVER["PHP_SELF"],"s.town","",$param,"",$sortfield,$sortorder); - print_liste_field_titre($langs->trans("StateShort"),$_SERVER["PHP_SELF"],"s.fk_departement","",$param,'align="center"',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Country"),$_SERVER["PHP_SELF"],"country.code_iso","",$param,'align="center"',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("ThirdPartyType"),$_SERVER["PHP_SELF"],"typent.code","",$param,'align="center"',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("DateCreation"),$_SERVER["PHP_SELF"],"s.datec","",$param,'align="center"',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("ProspectLevelShort"),$_SERVER["PHP_SELF"],"s.fk_prospectlevel","",$param,'align="center"',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("StatusProsp"),$_SERVER["PHP_SELF"],"s.fk_stcomm","",$param,'align="center"',$sortfield,$sortorder); - print_liste_field_titre(''); - - // Extrafields - if (is_array($extrafields->attribute_list) && count($extrafields->attribute_list)) - { - foreach($extrafields->attribute_list as $key => $val) - { - if ($val) - { - print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,"",$sortfield,$sortorder); - } - } - } - // Hook fields - $parameters=array(); - $reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters); // Note that $action and $object may have been modified by hook - print $hookmanager->resPrint; - - print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"s.status","",$param,'align="right"',$sortfield,$sortorder); - print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch '); - print "\n"; - - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - - // Prospect level - print ''; - - // Prospect status - print ''; - - print ''; - - // Extrafields - if (is_array($extrafields->attribute_list) && count($extrafields->attribute_list)) - { - foreach($extrafields->attribute_list as $key => $val) - { - if ($val) - { - $crit=$search_array_options['search_options_'.$key]; - print ''; - } - } - } - // Hook fields - $parameters=array(); - $reshook=$hookmanager->executeHooks('printFieldListSearch',$parameters); // Note that $action and $object may have been modified by hook - print $hookmanager->resPrint; - - // Status - print ''; - - // Print the search button - print '\n"; - - print "\n"; - - $i = 0; - $var=true; - - while ($i < min($num,$conf->liste_limit)) - { - $obj = $db->fetch_object($resql); - - $var=!$var; - - print ''; - print ''; - print ""; - print ""; - print ''; - //Country - print ''; - //Type ent - print ''; - // Creation date - print ''; - // Level - print '"; - // Statut - print '"; - - print ''; - - // Extrafields - if (is_array($extrafields->attribute_list) && count($extrafields->attribute_list)) - { - foreach($extrafields->attribute_list as $key => $val) - { - if ($val) - { - print ''; - } - } - } - // Hook fields - $parameters=array('obj' => $obj); - $reshook=$hookmanager->executeHooks('printFieldListValue',$parameters); // Note that $action and $object may have been modified by hook - print $hookmanager->resPrint; - - print ''; - - print ''; - - print "\n"; - $i++; - } - - if ($num > $conf->liste_limit || $page > 0) print_barre_liste('', $page, $_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords); - - print "
'; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print $form->select_country($search_country,'search_country','',0,'maxwidth100'); - print ''; - print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT)?'ASC':$conf->global->SOCIETE_SORT_ON_TYPEENT)); - print ''; - print ''; - print ''; - $options_from = ''; // Generate in $options_from the list of each option sorted - foreach ($tab_level as $tab_level_sortorder => $tab_level_label) - { - $options_from .= ''; - } - array_reverse($tab_level, true); // Reverse the list - $options_to = ''; // Generate in $options_to the list of each option sorted in the reversed order - foreach ($tab_level as $tab_level_sortorder => $tab_level_label) - { - $options_to .= ''; - } - - // Print these two select - print $langs->trans("From").' '; - print ' '; - print $langs->trans("to").' '; - - print ''; - $arraystcomm=array(); - foreach($prospectstatic->cacheprospectstatus as $key => $val) - { - $arraystcomm[$val['id']]=$val['label']; - } - print $form->selectarray('search_stcomm', $arraystcomm, $search_stcomm, -2); - print ''; - print ' '; - print ''; - print $extrafields->showInputField($key, $crit, '', '', 'search_', 4); - print ''; - print $form->selectarray('search_status', array('0'=>$langs->trans('ActivityCeased'),'1'=>$langs->trans('InActivity')),$search_status); - print ''; - print ''; - print "
'; - $prospectstatic->id=$obj->socid; - $prospectstatic->name=$obj->name; - $prospectstatic->status=$obj->status; - $prospectstatic->code_client=$obj->code_client; - $prospectstatic->client=$obj->client; - $prospectstatic->fk_prospectlevel=$obj->fk_prospectlevel; - $prospectstatic->name_alias=$obj->name_alias; - print $prospectstatic->getNomUrl(1,'prospect'); - print '".$obj->zip."".$obj->town."'.$obj->departement.''; - $tmparray=getCountry($obj->fk_pays,'all'); - print $tmparray['label']; - print ''; - if (count($typenArray)==0) $typenArray = $formcompany->typent_array(1); - print $typenArray[$obj->typent_code]; - print ''.dol_print_date($db->jdate($obj->datec)).''; - print $prospectstatic->getLibProspLevel(); - print "'; - print $prospectstatic->LibProspCommStatut($obj->stcomm_id,2,$prospectstatic->cacheprospectstatus[$obj->stcomm_id]['label']); - print "'; - foreach($prospectstatic->cacheprospectstatus as $key => $val) - { - $titlealt='default'; - if (! empty($val['code']) && ! in_array($val['code'], array('ST_NO', 'ST_NEVER', 'ST_TODO', 'ST_PEND', 'ST_DONE'))) $titlealt=$val['label']; - if ($obj->stcomm_id != $val['id']) print ''.img_action($titlealt,$val['code']).''; - } - print ''; - $paramkey='options_'.$key; - print $extrafields->showOutputField($key, $obj->$paramkey); - print ''; - print $prospectstatic->LibStatut($prospectstatic->status,5); - print '
"; - - print "
"; - - $db->free($resql); - - $parameters=array('sql' => $sql); - $reshook=$hookmanager->executeHooks('printFieldListFooter',$parameters); // Note that $action and $object may have been modified by hook - print $hookmanager->resPrint; -} -else -{ - dol_print_error($db); -} - - -llxFooter(); -$db->close(); diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php index 7adabcf819b..51cf8a9c7a7 100644 --- a/htdocs/core/class/html.formother.class.php +++ b/htdocs/core/class/html.formother.class.php @@ -302,7 +302,7 @@ class FormOther /** * Return select list for categories (to use in form search selectors) * - * @param int $type Type of categories (0=product, 1=suppliers, 2=customers, 3=members) + * @param int $type Type of categories (0=product, 1=supplier, 2=customer, 3=member, 4=contact) * @param integer $selected Preselected value * @param string $htmlname Name of combo list * @param int $nocateg Show also an entry "Not categorized" diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql index ffcb21e6535..df0b9e46488 100644 --- a/htdocs/core/menus/init_menu_auguria.sql +++ b/htdocs/core/menus/init_menu_auguria.sql @@ -71,9 +71,9 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled', __HANDLER__, 'left', 502__+MAX_llx_menu__, 'companies', '', 500__+MAX_llx_menu__, '/societe/list.php?action=create', 'List', 1, 'companies', '$user->rights->societe->lire', '', 2, 0, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled && $conf->fournisseur->enabled', __HANDLER__, 'left', 503__+MAX_llx_menu__, 'companies', '', 500__+MAX_llx_menu__, '/societe/list.php?type=f&leftmenu=suppliers', 'ListSuppliersShort', 1, 'suppliers', '$user->rights->societe->lire && $user->rights->fournisseur->lire', '', 2, 5, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled && $conf->fournisseur->enabled', __HANDLER__, 'left', 504__+MAX_llx_menu__, 'companies', '', 503__+MAX_llx_menu__, '/societe/soc.php?leftmenu=supplier&action=create&type=f', 'NewSupplier', 2, 'suppliers', '$user->rights->societe->creer', '', 2, 0, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled', __HANDLER__, 'left', 506__+MAX_llx_menu__, 'companies', '', 500__+MAX_llx_menu__, '/comm/prospect/list.php?leftmenu=prospects', 'ListProspectsShort', 1, 'companies', '$user->rights->societe->lire', '', 2, 3, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled', __HANDLER__, 'left', 506__+MAX_llx_menu__, 'companies', '', 500__+MAX_llx_menu__, '/societe/list.php?type=p&leftmenu=prospects', 'ListProspectsShort', 1, 'companies', '$user->rights->societe->lire', '', 2, 3, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled', __HANDLER__, 'left', 507__+MAX_llx_menu__, 'companies', '', 506__+MAX_llx_menu__, '/societe/soc.php?leftmenu=prospects&action=create&type=p', 'MenuNewProspect', 2, 'companies', '$user->rights->societe->creer', '', 2, 0, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled', __HANDLER__, 'left', 509__+MAX_llx_menu__, 'companies', '', 500__+MAX_llx_menu__, '/comm/list.php?leftmenu=customers', 'ListCustomersShort', 1, 'companies', '$user->rights->societe->lire', '', 2, 4, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled', __HANDLER__, 'left', 509__+MAX_llx_menu__, 'companies', '', 500__+MAX_llx_menu__, '/societe/list.php?type=c&leftmenu=customers', 'ListCustomersShort', 1, 'companies', '$user->rights->societe->lire', '', 2, 4, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled', __HANDLER__, 'left', 510__+MAX_llx_menu__, 'companies', '', 509__+MAX_llx_menu__, '/societe/soc.php?leftmenu=customers&action=create&type=c', 'MenuNewCustomer', 2, 'companies', '$user->rights->societe->creer', '', 2, 0, __ENTITY__); -- Third parties - Contacts insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled', __HANDLER__, 'left', 600__+MAX_llx_menu__, 'companies', 'contacts', 2__+MAX_llx_menu__, '/contact/list.php?leftmenu=contacts', 'ContactsAddresses', 0, 'companies', '$user->rights->societe->lire', '', 2, 1, __ENTITY__); diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index 42701456c6e..49c076de4c8 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -590,13 +590,13 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu if (! empty($conf->societe->enabled) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) { $langs->load("commercial"); - $newmenu->add("/comm/prospect/list.php?leftmenu=prospects", $langs->trans("ListProspectsShort"), 1, $user->rights->societe->lire, '', $mainmenu, 'prospects'); + $newmenu->add("/societe/list.php?type=p&leftmenu=prospects", $langs->trans("ListProspectsShort"), 1, $user->rights->societe->lire, '', $mainmenu, 'prospects'); /* no more required, there is a filter that can do more - if (empty($leftmenu) || $leftmenu=="prospects") $newmenu->add("/comm/prospect/list.php?sortfield=s.datec&sortorder=desc&begin=&search_stcomm=-1", $langs->trans("LastProspectDoNotContact"), 2, $user->rights->societe->lire); - if (empty($leftmenu) || $leftmenu=="prospects") $newmenu->add("/comm/prospect/list.php?sortfield=s.datec&sortorder=desc&begin=&search_stcomm=0", $langs->trans("LastProspectNeverContacted"), 2, $user->rights->societe->lire); - if (empty($leftmenu) || $leftmenu=="prospects") $newmenu->add("/comm/prospect/list.php?sortfield=s.datec&sortorder=desc&begin=&search_stcomm=1", $langs->trans("LastProspectToContact"), 2, $user->rights->societe->lire); - if (empty($leftmenu) || $leftmenu=="prospects") $newmenu->add("/comm/prospect/list.php?sortfield=s.datec&sortorder=desc&begin=&search_stcomm=2", $langs->trans("LastProspectContactInProcess"), 2, $user->rights->societe->lire); - if (empty($leftmenu) || $leftmenu=="prospects") $newmenu->add("/comm/prospect/list.php?sortfield=s.datec&sortorder=desc&begin=&search_stcomm=3", $langs->trans("LastProspectContactDone"), 2, $user->rights->societe->lire); + if (empty($leftmenu) || $leftmenu=="prospects") $newmenu->add("/societe/list.php?type=p&sortfield=s.datec&sortorder=desc&begin=&search_stcomm=-1", $langs->trans("LastProspectDoNotContact"), 2, $user->rights->societe->lire); + if (empty($leftmenu) || $leftmenu=="prospects") $newmenu->add("/societe/list.php?type=p&sortfield=s.datec&sortorder=desc&begin=&search_stcomm=0", $langs->trans("LastProspectNeverContacted"), 2, $user->rights->societe->lire); + if (empty($leftmenu) || $leftmenu=="prospects") $newmenu->add("/societe/list.php?type=p&sortfield=s.datec&sortorder=desc&begin=&search_stcomm=1", $langs->trans("LastProspectToContact"), 2, $user->rights->societe->lire); + if (empty($leftmenu) || $leftmenu=="prospects") $newmenu->add("/societe/list.php?type=p&sortfield=s.datec&sortorder=desc&begin=&search_stcomm=2", $langs->trans("LastProspectContactInProcess"), 2, $user->rights->societe->lire); + if (empty($leftmenu) || $leftmenu=="prospects") $newmenu->add("/societe/list.php?type=p&sortfield=s.datec&sortorder=desc&begin=&search_stcomm=3", $langs->trans("LastProspectContactDone"), 2, $user->rights->societe->lire); */ $newmenu->add("/societe/soc.php?leftmenu=prospects&action=create&type=p", $langs->trans("MenuNewProspect"), 2, $user->rights->societe->creer); //$newmenu->add("/contact/list.php?leftmenu=customers&type=p", $langs->trans("Contacts"), 2, $user->rights->societe->contact->lire); @@ -606,7 +606,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu if (! empty($conf->societe->enabled) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) { $langs->load("commercial"); - $newmenu->add("/comm/list.php?leftmenu=customers", $langs->trans("ListCustomersShort"), 1, $user->rights->societe->lire, '', $mainmenu, 'customers'); + $newmenu->add("/societe/list.php?type=c&leftmenu=customers", $langs->trans("ListCustomersShort"), 1, $user->rights->societe->lire, '', $mainmenu, 'customers'); $newmenu->add("/societe/soc.php?leftmenu=customers&action=create&type=c", $langs->trans("MenuNewCustomer"), 2, $user->rights->societe->creer); //$newmenu->add("/contact/list.php?leftmenu=customers&type=c", $langs->trans("Contacts"), 2, $user->rights->societe->contact->lire); diff --git a/htdocs/index.php b/htdocs/index.php index 2e1d019d2e7..5db358aa34b 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -231,8 +231,9 @@ if (empty($user->societe_id)) "SuppliersInvoices", "ExpenseReports"); // Dashboard Link lines - $links=array(DOL_URL_ROOT.'/comm/list.php', - DOL_URL_ROOT.'/comm/prospect/list.php', + $links=array( + DOL_URL_ROOT.'/societe/list.php?type=c', + DOL_URL_ROOT.'/societe/list.php?type=p', DOL_URL_ROOT.'/societe/list.php?type=f', DOL_URL_ROOT.'/adherents/list.php?statut=1&mainmenu=members', DOL_URL_ROOT.'/product/list.php?type=0&mainmenu=products', diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php index 86de804c6a1..ebe4b4c0342 100644 --- a/htdocs/societe/index.php +++ b/htdocs/societe/index.php @@ -143,13 +143,13 @@ else if (! empty($conf->societe->enabled) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS)) { $statstring = ""; - $statstring.= ''.$langs->trans("Prospects").''.round($third['prospect']).''; + $statstring.= ''.$langs->trans("Prospects").''.round($third['prospect']).''; $statstring.= ""; } if (! empty($conf->societe->enabled) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS)) { $statstring.= ""; - $statstring.= ''.$langs->trans("Customers").''.round($third['customer']).''; + $statstring.= ''.$langs->trans("Customers").''.round($third['customer']).''; $statstring.= ""; } if (! empty($conf->fournisseur->enabled) && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_STATS)) diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php index 19301efd6e0..98795e27667 100644 --- a/htdocs/societe/list.php +++ b/htdocs/societe/list.php @@ -31,10 +31,12 @@ include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; +require_once DOL_DOCUMENT_ROOT.'/societe/class/client.class.php'; $langs->load("companies"); $langs->load("customers"); $langs->load("suppliers"); +$langs->load("bills"); // Security check $socid = GETPOST('socid','int'); @@ -64,10 +66,14 @@ $search_country=GETPOST("search_country",'int'); $search_type_thirdparty=GETPOST("search_type_thirdparty",'int'); $search_type=GETPOST('search_type','alpha'); $search_status=GETPOST("search_status",'int'); +$search_level_from = GETPOST("search_level_from","alpha"); +$search_level_to = GETPOST("search_level_to","alpha"); +$search_stcomm=GETPOST('search_stcomm','int'); $type=GETPOST('type'); $optioncss=GETPOST('optioncss','alpha'); $mode=GETPOST("mode"); +$action=GETPOST('action'); $sortfield=GETPOST("sortfield",'alpha'); $sortorder=GETPOST("sortorder",'alpha'); @@ -116,6 +122,7 @@ if (($tmp = $langs->transnoentities("ProfId6".$mysoc->country_code)) && $tmp != if (!empty($conf->barcode->enabled)) $fieldstosearchall['s.barcode']='Gencod'; + /* * Actions */ @@ -126,6 +133,20 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php'; +if (empty($reshook)) +{ + if ($action == 'setstcomm') + { + $object = new Client($db); + $result=$object->fetch(GETPOST('stcommsocid')); + $object->stcomm_id=dol_getIdFromCode($db, GETPOST('stcomm','alpha'), 'c_stcomm'); + $result=$object->set_commnucation_level($user); + if ($result < 0) setEventMessages($object->error,$object->errors,'errors'); + + $action=''; + } +} + // special search /*if ($mode == 'search') { @@ -176,20 +197,6 @@ include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php'; } */ - -/* - * View - */ - -$form=new Form($db); -$formother=new FormOther($db); -$companystatic=new Societe($db); -$formcompany=new FormCompany($db); - -$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas'; -llxHeader('',$langs->trans("ThirdParty"),$help_url); - - // Do we click on purge search criteria ? if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers { @@ -212,14 +219,18 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETP $search_country=''; $search_type_thirdparty=''; $search_status=''; + $search_stcomm=''; + $search_level_from=''; + $search_level_to=''; $search_array_options=array(); } if ($search_status=='') $search_status=1; // always display active thirdparty first + /* - * Mode List + * View */ /* @@ -230,13 +241,103 @@ if ($search_status=='') $search_status=1; // always display active thirdparty fi External user socid=x + Permission to see ALL customers => Can see only himself External user socid=x + No permission to see ALL customers => Can see only himself */ + +$form=new Form($db); +$formother=new FormOther($db); +$companystatic=new Societe($db); +$formcompany=new FormCompany($db); +$prospectstatic=new Client($db); +$prospectstatic->client=2; +$prospectstatic->loadCacheOfProspStatus(); + +$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas'; +llxHeader('',$langs->trans("ThirdParty"),$help_url); + + $title=$langs->trans("ListOfThirdParties"); if ($type == 'c' && (empty($search_type) || ($search_type == '1,3'))) $title=$langs->trans("ListOfCustomers"); if ($type == 'p' && (empty($search_type) || ($search_type == '2,3'))) $title=$langs->trans("ListOfProspects"); if ($type == 'f' && (empty($search_type) || ($search_type == '4'))) $title=$langs->trans("ListOfSuppliers"); -$sql = "SELECT s.rowid, s.nom as name, s.barcode, s.town, s.zip, s.datec, s.code_client, s.code_fournisseur, "; -$sql.= " st.libelle as stcomm, s.prefix_comm, s.client, s.fournisseur, s.canvas, s.status as status,"; +// If both parameters are set, search for everything BETWEEN them +if ($search_level_from != '' && $search_level_to != '') +{ + // Ensure that these parameters are numbers + $search_level_from = (int) $search_level_from; + $search_level_to = (int) $search_level_to; + + // If from is greater than to, reverse orders + if ($search_level_from > $search_level_to) + { + $tmp = $search_level_to; + $search_level_to = $search_level_from; + $search_level_from = $tmp; + } + + // Generate the SQL request + $sortwhere = '(sortorder BETWEEN '.$search_level_from.' AND '.$search_level_to.') AS is_in_range'; +} +// If only "from" parameter is set, search for everything GREATER THAN it +else if ($search_level_from != '') +{ + // Ensure that this parameter is a number + $search_level_from = (int) $search_level_from; + + // Generate the SQL request + $sortwhere = '(sortorder >= '.$search_level_from.') AS is_in_range'; +} +// If only "to" parameter is set, search for everything LOWER THAN it +else if ($search_level_to != '') +{ + // Ensure that this parameter is a number + $search_level_to = (int) $search_level_to; + + // Generate the SQL request + $sortwhere = '(sortorder <= '.$search_level_to.') AS is_in_range'; +} +// If no parameters are set, dont search for anything +else +{ + $sortwhere = '0 as is_in_range'; +} + +// Select every potentiels, and note each potentiels which fit in search parameters +dol_syslog('societe/list.php',LOG_DEBUG); +$sql = "SELECT code, label, sortorder, ".$sortwhere; +$sql.= " FROM ".MAIN_DB_PREFIX."c_prospectlevel"; +$sql.= " WHERE active > 0"; +$sql.= " ORDER BY sortorder"; + +$resql = $db->query($sql); +if ($resql) +{ + $tab_level = array(); + $search_levels = array(); + + while ($obj = $db->fetch_object($resql)) + { + // Compute level text + $level=$langs->trans($obj->code); + if ($level == $obj->code) $level=$langs->trans($obj->label); + + // Put it in the array sorted by sortorder + $tab_level[$obj->sortorder] = $level; + + // If this potentiel fit in parameters, add its code to the $search_levels array + if ($obj->is_in_range == 1) + { + $search_levels[] = '"'.preg_replace('[^A-Za-z0-9_-]', '', $obj->code).'"'; + } + } + + // Implode the $search_levels array so that it can be use in a "IN (...)" where clause. + // If no paramters was set, $search_levels will be empty + $search_levels = implode(',', $search_levels); +} +else dol_print_error($db); + +$sql = "SELECT s.rowid, s.nom as name, s.name_alias, s.barcode, s.town, s.zip, s.datec, s.code_client, s.code_fournisseur, "; +$sql.= " st.libelle as stcomm, s.fk_stcomm as stcomm_id, s.fk_prospectlevel, s.prefix_comm, s.client, s.fournisseur, s.canvas, s.status as status,"; $sql.= " s.siren as idprof1, s.siret as idprof2, ape as idprof3, idprof4 as idprof4,"; $sql.= " s.fk_pays, s.tms as date_update, s.datec as date_creation,"; $sql.= " typent.code as typent_code"; @@ -291,6 +392,8 @@ if ($search_status!='') $sql .= " AND s.status = ".$db->escape($search_status); if (!empty($conf->barcode->enabled) && $search_barcode) $sql.= " AND s.barcode LIKE '%".$db->escape($search_barcode)."%'"; if ($search_country) $sql .= " AND s.fk_pays IN (".$search_country.')'; if ($search_type_thirdparty) $sql .= " AND s.fk_typent IN (".$search_type_thirdparty.')'; +if ($search_levels) $sql .= " AND s.fk_prospectlevel IN (".$search_levels.')'; +if ($search_stcomm != '' && $search_stcomm != -2) $sql.= natural_search("s.fk_stcomm",$search_stcomm,2); // Add where from extra fields foreach ($search_array_options as $key => $val) { @@ -348,6 +451,9 @@ if ($resql) if ($search_type_thirdparty != '') $param.='&search_type_thirdparty='.urlencode($search_type_thirdparty); if ($optioncss != '') $param.='&optioncss='.urlencode($optioncss); if ($search_status != '') $param.='&search_status='.urlencode($search_status); + if ($search_stcomm != '') $param.='&search_stcomm='.$search_stcomm; + if ($search_level_from != '') $param.='&search_level_from='.$search_level_from; + if ($search_level_to != '') $param.='&search_level_to='.$search_level_to; if ($type != '') $param.='&type='.urlencode($type); // Add $param from extra fields foreach ($search_array_options as $key => $val) @@ -400,7 +506,7 @@ if ($resql) require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php'; $moreforfilter.='
'; $moreforfilter.=$langs->trans('Categories'). ': '; - $moreforfilter.=$formother->select_categories(Categorie::TYPE_CUSTOMER,$search_categ,'search_categ',1); + $moreforfilter.=$formother->select_categories('customer',$search_categ,'search_categ',1); $moreforfilter.='
'; } // If the user can view prospects other than his' @@ -419,7 +525,7 @@ if ($resql) require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php'; $moreforfilter.='
'; $moreforfilter.=$langs->trans('Categories'). ': '; - $moreforfilter.=$formother->select_categories(Categorie::TYPE_SUPPLIER,$search_categ,'search_categ',1); + $moreforfilter.=$formother->select_categories('supplier',$search_categ,'search_categ',1); $moreforfilter.='
'; } } @@ -436,16 +542,21 @@ if ($resql) // Define list of fields to show into list $checkedcustomercode=(in_array($contextpage, array('thirdpartylist', 'customerlist', 'prospectlist')) ? 1 : 0); $checkedsuppliercode=(in_array($contextpage, array('supplierlist')) ? 1 : 0); - $checkedcustomeraccountcode=(in_array($contextpage, array('thirdpartylist', 'customerlist', 'prospectlist')) ? 1 : 0); + $checkedcustomeraccountcode=(in_array($contextpage, array('customerlist')) ? 1 : 0); $checkedsupplieraccountcode=(in_array($contextpage, array('supplierlist')) ? 1 : 0); $checkedtypetiers=1; + $checkedprofid1=0; + $checkedprofid2=0; + $checkedprofid3=0; $checkedprofid4=0; $checkedprofid5=0; $checkedprofid6=0; //$checkedprofid4=((($tmp = $langs->transnoentities("ProfId4".$mysoc->country_code)) && $tmp != "ProfId4".$mysoc->country_code && $tmp != '-') ? 1 : 0); //$checkedprofid5=((($tmp = $langs->transnoentities("ProfId5".$mysoc->country_code)) && $tmp != "ProfId5".$mysoc->country_code && $tmp != '-') ? 1 : 0); //$checkedprofid6=((($tmp = $langs->transnoentities("ProfId6".$mysoc->country_code)) && $tmp != "ProfId6".$mysoc->country_code && $tmp != '-') ? 1 : 0); - $arrayfields=array( + $checkprospectlevel=(in_array($contextpage, array('prospectlist')) ? 1 : 0); + $checkstcomm=(in_array($contextpage, array('prospectlist')) ? 1 : 0); + $arrayfields=array( 's.nom'=>array('label'=>$langs->trans("Company"), 'checked'=>1), 's.barcode'=>array('label'=>$langs->trans("Gencod"), 'checked'=>1, 'enabled'=>(! empty($conf->barcode->enabled))), 's.code_client'=>array('label'=>$langs->trans("CustomerCodeShort"), 'checked'=>$checkedcustomercode), @@ -456,12 +567,14 @@ if ($resql) 's.zip'=>array('label'=>$langs->trans("Zip"), 'checked'=>1), 'country.code_iso'=>array('label'=>$langs->trans("Country"), 'checked'=>0), 'typent.code'=>array('label'=>$langs->trans("ThirdPartyType"), 'checked'=>$checkedtypetiers), - 's.siren'=>array('label'=>$langs->trans("ProfId1Short"), 'checked'=>1), - 's.siret'=>array('label'=>$langs->trans("ProfId2Short"), 'checked'=>1), - 's.ape'=>array('label'=>$langs->trans("ProfId3Short"), 'checked'=>1), + 's.siren'=>array('label'=>$langs->trans("ProfId1Short"), 'checked'=>$checkedprofid1), + 's.siret'=>array('label'=>$langs->trans("ProfId2Short"), 'checked'=>$checkedprofid2), + 's.ape'=>array('label'=>$langs->trans("ProfId3Short"), 'checked'=>$checkedprofid3), 's.idprof4'=>array('label'=>$langs->trans("ProfId4Short"), 'checked'=>$checkedprofid4), 's.idprof5'=>array('label'=>$langs->trans("ProfId5Short"), 'checked'=>$checkedprofid5), 's.idprof6'=>array('label'=>$langs->trans("ProfId6Short"), 'checked'=>$checkedprofid6), + 's.fk_prospectlevel'=>array('label'=>$langs->trans("ProspectLevelShort"), 'checked'=>$checkprospectlevel), + 's.fk_stcomm'=>array('label'=>$langs->trans("StatusProsp"), 'checked'=>$checkstcomm), 's.status'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>200), 's.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500), 's.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500), @@ -488,7 +601,9 @@ if ($resql) if (! empty($arrayfields['s.idprof5']['checked'])) print_liste_field_titre($form->textwithpicto($langs->trans("ProfId5Short"),$textprofid[4],1,0),$_SERVER["PHP_SELF"],"s.idprof5","",$param,'class="nowrap"',$sortfield,$sortorder); if (! empty($arrayfields['s.idprof6']['checked'])) print_liste_field_titre($form->textwithpicto($langs->trans("ProfId6Short"),$textprofid[4],1,0),$_SERVER["PHP_SELF"],"s.idprof6","",$param,'class="nowrap"',$sortfield,$sortorder); print_liste_field_titre(''); // type of customer - // Extra fields + if (! empty($arrayfields['s.fk_prospectlevel']['checked'])) print_liste_field_titre($arrayfields['s.fk_prospectlevel']['label'],$_SERVER["PHP_SELF"],"s.fk_prospectlevel","",$param,'align="center"',$sortfield,$sortorder); + if (! empty($arrayfields['s.fk_stcomm']['checked'])) print_liste_field_titre($arrayfields['s.fk_stcomm']['label'],$_SERVER["PHP_SELF"],"s.fk_stcomm","",$param,'align="center"',$sortfield,$sortorder); + // Extra fields if (is_array($extrafields->attribute_list) && count($extrafields->attribute_list)) { foreach($extrafields->attribute_list as $key => $val) @@ -623,6 +738,7 @@ if ($resql) print ''; print ''; } + // Type (customer/prospect/supplier) print ''; print ''; + + if (! empty($arrayfields['s.fk_prospectlevel']['checked'])) + { + // Prospect level + print ''; + $options_from = ''; // Generate in $options_from the list of each option sorted + foreach ($tab_level as $tab_level_sortorder => $tab_level_label) + { + $options_from .= ''; + } + array_reverse($tab_level, true); // Reverse the list + $options_to = ''; // Generate in $options_to the list of each option sorted in the reversed order + foreach ($tab_level as $tab_level_sortorder => $tab_level_label) + { + $options_to .= ''; + } + + // Print these two select + print $langs->trans("From").' '; + print ' '; + print $langs->trans("to").' '; + + print ''; + } + + if (! empty($arrayfields['s.fk_stcomm']['checked'])) + { + // Prospect status + print ''; + $arraystcomm=array(); + foreach($prospectstatic->cacheprospectstatus as $key => $val) + { + $arraystcomm[$val['id']]=$val['label']; + } + print $form->selectarray('search_stcomm', $arraystcomm, $search_stcomm, -2); + print ''; + } + // Fields from hook $parameters=array('arrayfields'=>$arrayfields); $reshook=$hookmanager->executeHooks('printFieldListOption',$parameters); // Note that $action and $object may have been modified by hook @@ -671,18 +829,22 @@ if ($resql) { $obj = $db->fetch_object($resql); $var=!$var; + + $companystatic->id=$obj->rowid; + $companystatic->name=$obj->name; + $companystatic->canvas=$obj->canvas; + $companystatic->client=$obj->client; + $companystatic->status=$obj->status; + $companystatic->fournisseur=$obj->fournisseur; + $companystatic->code_client=$obj->code_client; + $companystatic->code_fournisseur=$obj->code_fournisseur; + $companystatic->fk_prospectlevel=$obj->fk_prospectlevel; + $companystatic->name_alias=$obj->name_alias; + print ""; if (! empty($arrayfields['s.nom']['checked'])) { print ""; - $companystatic->id=$obj->rowid; - $companystatic->name=$obj->name; - $companystatic->canvas=$obj->canvas; - $companystatic->client=$obj->client; - $companystatic->status=$obj->status; - $companystatic->fournisseur=$obj->fournisseur; - $companystatic->code_client=$obj->code_client; - $companystatic->code_fournisseur=$obj->code_fournisseur; print $companystatic->getNomUrl(1,'',100); print "\n"; } @@ -761,6 +923,7 @@ if ($resql) { print "".$obj->idprof6."\n"; } + // Type print ''; $s=''; if (($obj->client==1 || $obj->client==3) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) @@ -782,6 +945,28 @@ if ($resql) } print $s; print ''; + if (! empty($arrayfields['s.fk_prospectlevel']['checked'])) + { + // Prospect level + print ''; + print $companystatic->getLibProspLevel(); + print ""; + } + if (! empty($arrayfields['s.fk_stcomm']['checked'])) + { + // Prospect status + print '
'; + print '
'.$companystatic->LibProspCommStatut($obj->stcomm_id,2,$prospectstatic->cacheprospectstatus[$obj->stcomm_id]['label']); + print '
-
'; + foreach($prospectstatic->cacheprospectstatus as $key => $val) + { + $titlealt='default'; + if (! empty($val['code']) && ! in_array($val['code'], array('ST_NO', 'ST_NEVER', 'ST_TODO', 'ST_PEND', 'ST_DONE'))) $titlealt=$val['label']; + if ($obj->stcomm_id != $val['id']) print ''.img_action($titlealt,$val['code']).''; + } + print '
'; + } + // Fields from hook $parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj); $reshook=$hookmanager->executeHooks('printFieldListValue',$parameters); // Note that $action and $object may have been modified by hook From f6d30d8b9e908c7d44ff9862ff7dbe19c990582c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 23 Oct 2015 14:40:45 +0200 Subject: [PATCH 12/31] Fix: W3C no form into table --- htdocs/admin/mailman.php | 30 +++++++++++----- htdocs/admin/spip.php | 66 +++++++++++++++++++++-------------- htdocs/core/lib/admin.lib.php | 6 ++-- 3 files changed, 63 insertions(+), 39 deletions(-) diff --git a/htdocs/admin/mailman.php b/htdocs/admin/mailman.php index 686da7fc68c..e3aab979a41 100644 --- a/htdocs/admin/mailman.php +++ b/htdocs/admin/mailman.php @@ -99,7 +99,7 @@ if (($action == 'testsubscribe' || $action == 'testunsubscribe') && ! empty($con if (! isValidEmail($email)) { $langs->load("errors"); - setEventMessage($langs->trans("ErrorBadEMail",$email),'errors'); + setEventMessages($langs->trans("ErrorBadEMail",$email), null, 'errors'); } else { @@ -118,11 +118,11 @@ if (($action == 'testsubscribe' || $action == 'testunsubscribe') && ! empty($con if ($result < 0) { $error++; - setEventMessage($mailmanspip->error,'errors'); + setEventMessages($mailmanspip->error,$mailmanspip->errors,'errors'); } else { - setEventMessage($langs->trans("MailmanCreationSuccess")); + setEventMessages($langs->trans("MailmanCreationSuccess"), null); } } if ($action == 'testunsubscribe') @@ -131,11 +131,11 @@ if (($action == 'testsubscribe' || $action == 'testunsubscribe') && ! empty($con if ($result < 0) { $error++; - setEventMessage($mailmanspip->error,'errors'); + setEventMessages($mailmanspip->error,$mailmanspip->errors,'errors'); } else { - setEventMessage($langs->trans("MailmanDeletionSuccess")); + setEventMessages($langs->trans("MailmanDeletionSuccess"), null); } } } @@ -156,12 +156,15 @@ print load_fiche_titre($langs->trans("MailmanSpipSetup"),$linkback,'title_setup' $head = mailmanspip_admin_prepare_head(); -dol_fiche_head($head, 'mailman', $langs->trans("Setup"), 0, 'user'); $var=true; if (! empty($conf->global->ADHERENT_USE_MAILMAN)) { + print '
'; + + dol_fiche_head($head, 'mailman', $langs->trans("Setup"), 0, 'user'); + //$link=img_picto($langs->trans("Active"),'tick').' '; $link=''; //$link.=$langs->trans("Disable"); @@ -200,21 +203,30 @@ if (! empty($conf->global->ADHERENT_USE_MAILMAN)) }); '; - form_constantes($constantes,1); - + form_constantes($constantes,2); + print '*'.$langs->trans("FollowingConstantsWillBeSubstituted").'
'; print '%LISTE%, %MAILMAN_ADMINPW%, %EMAIL%
'; + + dol_fiche_end(); + + print '
'; + + print ''; } else { + dol_fiche_head($head, 'mailman', $langs->trans("Setup"), 0, 'user'); + $link='
'; //$link.=img_$langs->trans("Activate") $link.=img_picto($langs->trans("Disabled"),'switch_off'); $link.=''; print load_fiche_titre($langs->trans('MailmanTitle'), $link,''); + + dol_fiche_end(); } -dol_fiche_end(); if (! empty($conf->global->ADHERENT_USE_MAILMAN)) { diff --git a/htdocs/admin/spip.php b/htdocs/admin/spip.php index e46d9b8f5b7..13d959eb38c 100644 --- a/htdocs/admin/spip.php +++ b/htdocs/admin/spip.php @@ -54,28 +54,30 @@ if ($action == 'update' || $action == 'add') $constname=GETPOST("constname"); $constvalue=GETPOST("constvalue"); - if (($constname=='ADHERENT_CARD_TYPE' || $constname=='ADHERENT_ETIQUETTE_TYPE') && $constvalue == -1) $constvalue=''; - if ($constname=='ADHERENT_LOGIN_NOT_REQUIRED') // Invert choice - { - if ($constvalue) $constvalue=0; - else $constvalue=1; - } + // Action mise a jour ou ajout d'une constante + if ($action == 'update' || $action == 'add') + { + foreach($_POST['constname'] as $key => $val) + { + $constname=$_POST["constname"][$key]; + $constvalue=$_POST["constvalue"][$key]; + $consttype=$_POST["consttype"][$key]; + $constnote=$_POST["constnote"][$key]; - if (in_array($constname,array('ADHERENT_MAIL_VALID','ADHERENT_MAIL_COTIS','ADHERENT_MAIL_RESIL'))) $constvalue=$_POST["constvalue".$constname]; - $consttype=$_POST["consttype"]; - $constnote=GETPOST("constnote"); - $res=dolibarr_set_const($db,$constname,$constvalue,$type[$consttype],0,$constnote,$conf->entity); - - if (! $res > 0) $error++; - - if (! $error) - { - setEventMessage($langs->trans("SetupSaved")); - } - else - { - setEventMessage($langs->trans("Error"),'errors'); - } + $res=dolibarr_set_const($db,$constname,$constvalue,$type[$consttype],0,$constnote,$conf->entity); + + if (! $res > 0) $error++; + } + + if (! $error) + { + setEventMessage($langs->trans("SetupSaved")); + } + else + { + setEventMessage($langs->trans("Error"),'errors'); + } + } } // Action activation d'un sous module du module adherent @@ -115,7 +117,6 @@ print load_fiche_titre($langs->trans("MailmanSpipSetup"),$linkback,'title_setup' $head = mailmanspip_admin_prepare_head(); -dol_fiche_head($head, 'spip', $langs->trans("Setup"), 0, 'user'); $var=true; @@ -124,6 +125,10 @@ $var=true; */ if (! empty($conf->global->ADHERENT_USE_SPIP)) { + print '
'; + + dol_fiche_head($head, 'spip', $langs->trans("Setup"), 0, 'user'); + //$link=img_picto($langs->trans("Active"),'tick').' '; $link=''; //$link.=$langs->trans("Disable"); @@ -139,21 +144,28 @@ if (! empty($conf->global->ADHERENT_USE_SPIP)) print load_fiche_titre($langs->trans('SPIPTitle'), $link, ''); print '
'; - form_constantes($constantes); - print '
'; + + form_constantes($constantes,2); + + dol_fiche_end(); + + print '
'; + + print ''; } else { + dol_fiche_head($head, 'spip', $langs->trans("Setup"), 0, 'user'); + $link='
'; //$link.=$langs->trans("Activate"); $link.=img_picto($langs->trans("Disabled"),'switch_off'); $link.=''; print load_fiche_titre($langs->trans('SPIPTitle'), $link, ''); + + dol_fiche_end(); } - -dol_fiche_end(); - llxFooter(); $db->close(); diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php index 3d887f1bd18..7b22a2e8dbe 100644 --- a/htdocs/core/lib/admin.lib.php +++ b/htdocs/core/lib/admin.lib.php @@ -1053,7 +1053,7 @@ function complete_elementList_with_modules(&$elementList) * Show array with constants to edit * * @param array $tableau Array of constants - * @param int $strictw3c Respect W3C (no form into table) + * @param int $strictw3c 0=Include form into table (deprecated), 1=Form is outside table to respect W3C (no form into table), 2=No form nor button at all * @return void */ function form_constantes($tableau,$strictw3c=0) @@ -1062,7 +1062,7 @@ function form_constantes($tableau,$strictw3c=0) $form = new Form($db); - if (! empty($strictw3c)) print "\n".'
'; + if (! empty($strictw3c) && $strictw3c == 1) print "\n".''; print ''; print ''; @@ -1199,7 +1199,7 @@ function form_constantes($tableau,$strictw3c=0) } print '
'; - if (! empty($strictw3c)) + if (! empty($strictw3c) && $strictw3c == 1) { print '
'; print "
\n"; From a01a85c3f6eb7afc589f7c666a2533647d8e9d32 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 23 Oct 2015 15:13:02 +0200 Subject: [PATCH 13/31] FIX tag object_total_vat_x need x to be a string with unknown decimal lenght. Now use for x the real vat real with no more decimal (x = 20 or x = 8.5 or x = 5.99, ...) --- htdocs/core/class/commondocgenerator.class.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php index 41ae45ef638..24c2fe34a93 100644 --- a/htdocs/core/class/commondocgenerator.class.php +++ b/htdocs/core/class/commondocgenerator.class.php @@ -388,11 +388,16 @@ abstract class CommonDocGenerator // Add vat by rates foreach ($object->lines as $line) { + // $line->tva_tx format depends on database field accuraty, no reliable. This is kept for backward comaptibility if (empty($resarray[$array_key.'_total_vat_'.$line->tva_tx])) $resarray[$array_key.'_total_vat_'.$line->tva_tx]=0; $resarray[$array_key.'_total_vat_'.$line->tva_tx]+=$line->total_tva; $resarray[$array_key.'_total_vat_locale_'.$line->tva_tx]=price($resarray[$array_key.'_total_vat_'.$line->tva_tx]); + // $vatformated is vat without not expected chars (so 20, or 8.5 or 5.99 for example) + $vatformated=vatrate($line->tva_tx); + if (empty($resarray[$array_key.'_total_vat_'.$vatformated])) $resarray[$array_key.'_total_vat_'.$vatformated]=0; + $resarray[$array_key.'_total_vat_'.$vatformated]+=$line->total_tva; + $resarray[$array_key.'_total_vat_locale_'.$vatformated]=price($resarray[$array_key.'_total_vat_'.$vatformated]); } - // Retrieve extrafields if (is_array($object->array_options) && count($object->array_options)) { From 016dbd39ee6535bb8099a9b2a2d3ed31305e951f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 23 Oct 2015 15:24:47 +0200 Subject: [PATCH 14/31] Fix sql phpunit regression --- htdocs/install/mysql/migration/3.9.0-4.0.0.sql | 2 -- htdocs/install/mysql/tables/llx_user.sql | 2 +- htdocs/user/class/user.class.php | 10 +++++++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql index 231b89ee507..accf65266c1 100644 --- a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql +++ b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql @@ -86,5 +86,3 @@ CREATE TABLE IF NOT EXISTS llx_establishment ( status tinyint DEFAULT 1 ) ENGINE=InnoDB; -ALTER TABLE llx_user ADD COLUMN employee tinyint DEFAULT 0 AFTER ref_int; - diff --git a/htdocs/install/mysql/tables/llx_user.sql b/htdocs/install/mysql/tables/llx_user.sql index c9673ceb360..e1fc421c911 100644 --- a/htdocs/install/mysql/tables/llx_user.sql +++ b/htdocs/install/mysql/tables/llx_user.sql @@ -26,7 +26,7 @@ create table llx_user ref_ext varchar(50), -- reference into an external system (not used by dolibarr) ref_int varchar(50), -- reference into an internal system (deprecated) - employee tinyint DEFAULT 0, -- 1 if user is an employee + employee tinyint DEFAULT 1, -- 1 if user is an employee datec datetime, tms timestamp, diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index 066da9c18da..ae56be28aec 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -126,13 +126,17 @@ class User extends CommonObject { $this->db = $db; - // Preference utilisateur + // User preference $this->liste_limit = 0; $this->clicktodial_loaded = 0; + // For cache usage $this->all_permissions_are_loaded = 0; - $this->admin=0; - + + // Force some default values + $this->admin = 0; + $this->employee = 1; + $this->conf = new stdClass(); $this->rights = new stdClass(); $this->rights->user = new stdClass(); From 2cbfb69f9b70c851cd2e13a25010d91ab472f843 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 23 Oct 2015 15:28:14 +0200 Subject: [PATCH 15/31] Update template --- .../invoices/template_invoice.odt | Bin 25534 -> 37996 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/htdocs/install/doctemplates/invoices/template_invoice.odt b/htdocs/install/doctemplates/invoices/template_invoice.odt index e9cd7c836fb0363394d73d3579ca7f84cb33cb01..dad29a292efcae907c1af651f8caae0fba453ec1 100644 GIT binary patch delta 36631 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 Q8tJGz?h?nUG7eGy0kU*u5&!@I literal 25534 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 Date: Sat, 24 Oct 2015 13:16:59 +0200 Subject: [PATCH 16/31] Fix php code not executed with some php version --- htdocs/theme/eldy/style.css.php | 2 +- htdocs/theme/md/style.css.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 45ca3a5b728..1307304d1d6 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -699,7 +699,7 @@ div#tmenu_tooltip { display:none; - padding-: px; + padding-: px; } diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 0fa988c16e8..4749d52f89c 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -731,7 +731,7 @@ div#tmenu_tooltip { display:none; - /* padding-: px; */ + /* padding-: px; */ } From 43c80bec7d81a61c4f38759e3232562a6826f9fb Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 24 Oct 2015 13:52:35 +0200 Subject: [PATCH 17/31] A better responsive menu for very small screen --- htdocs/main.inc.php | 12 ++++-------- htdocs/theme/eldy/style.css.php | 21 +++++++++++++++++---- htdocs/theme/md/style.css.php | 20 +++++++++++++++++--- htdocs/user/class/user.class.php | 31 +++++++++++++++++++++---------- 4 files changed, 59 insertions(+), 25 deletions(-) diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index ffc7d7c4777..4ece8af95c2 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -1485,14 +1485,10 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a // Add login user link $toprightmenu.=''; dol_fiche_end(); + + if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) { $prodcustprice = new Productcustomerprice($db); From b88a28b660f6073416575c2370b69c7ea88366d3 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 24 Oct 2015 19:45:41 +0200 Subject: [PATCH 21/31] Restore compatibility with old version --- htdocs/user/class/user.class.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index 965ac2544b8..2addea47f87 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -1862,6 +1862,7 @@ class User extends CommonObject $result = ''; $companylink = ''; + $link = ''; $label = '' . $langs->trans("User") . ''; $label.= '
'; @@ -1914,7 +1915,7 @@ class User extends CommonObject $link.= '>'; $linkend=''; - if (abs($withpictoimg) == 1) $result.='
'; + //if ($withpictoimg == -1) $result.='
'; $result.=$link; if ($withpictoimg) { @@ -1929,7 +1930,7 @@ class User extends CommonObject $result.='
'.$this->getFullName($langs,'',($mode == 'firstname' ? 2 : -1),$maxlen).'
'; } $result.=$linkend; - if (abs($withpictoimg) == 1) $result.='
'; + //if ($withpictoimg == -1) $result.='
'; $result.=$companylink; return $result; } From 9d26d0fa4d09bdd8289e7592d477628099c6cafa Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 24 Oct 2015 21:13:28 +0200 Subject: [PATCH 22/31] Restore compatibility with old version --- htdocs/core/class/html.form.class.php | 11 ++++++----- htdocs/user/class/user.class.php | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 7b472b2a163..bc26812bd29 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -5255,9 +5255,10 @@ class Form * @param int $caneditfield Add edit fields * @param string $cssclass CSS name to use on img for photo * @param int $genericifundef Use a generic image if no image avaiable + * @param int $addlinktofullsize Add link to fullsize image * @return string HTML code to output photo */ - static function showphoto($modulepart, $object, $width=100, $height=0, $caneditfield=0, $cssclass='photowithmargin', $genericifundef=0) + static function showphoto($modulepart, $object, $width=100, $height=0, $caneditfield=0, $cssclass='photowithmargin', $genericifundef=0,$addlinktofullsize=1) { global $conf,$langs; @@ -5303,15 +5304,15 @@ class Form $cache='0'; if ($file && file_exists($dir."/".$file)) { - $ret.=''; + if ($addlinktofullsize) $ret.=''; $ret.='Photo'; - $ret.=''; + if ($addlinktofullsize) $ret.=''; } else if ($altfile && file_exists($dir."/".$altfile)) { - $ret.=''; + if ($addlinktofullsize) $ret.=''; $ret.='Photo alt'; - $ret.=''; + if ($addlinktofullsize) $ret.=''; } else { diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index 2addea47f87..ae985b22be5 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -1922,7 +1922,7 @@ class User extends CommonObject $paddafterimage=''; if (abs($withpictoimg) == 1) $paddafterimage='style="padding-right: 3px;"'; if ($withpictoimg > 0) $picto='
'.img_object('', 'user', $paddafterimage.' '.($notooltip?'':'class="classfortooltip"')).'
'; - else $picto='
'.Form::showphoto('userphoto', $this, 0, 0, 0, 'loginphoto').'
'; + else $picto='
'.Form::showphoto('userphoto', $this, 0, 0, 0, 'loginphoto',0,0).'
'; $result.=$picto; } if (abs($withpictoimg) != 2) From 461771d4885892f26df470ce5357785d491f2f93 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 24 Oct 2015 21:13:28 +0200 Subject: [PATCH 23/31] Currency is on title only. --- htdocs/compta/bank/account.php | 8 ++++---- htdocs/core/class/html.form.class.php | 11 ++++++----- htdocs/user/class/user.class.php | 2 +- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php index 500cf63b021..e3bc2a3fc2c 100644 --- a/htdocs/compta/bank/account.php +++ b/htdocs/compta/bank/account.php @@ -952,7 +952,7 @@ if ($id > 0 || ! empty($ref)) if ($sep > 0) print ' '; // If we had at least one line in future else print $langs->trans("CurrentBalance"); print ' '.$object->currency_code.''; - print ''.price($total, 0, $langs, 0, 0, -1, $object->currency_code).''; + print ''.price($total).''; print ' '; print ''; } else { @@ -961,9 +961,9 @@ if ($id > 0 || ! empty($ref)) if ($sep > 0) print ' '; // If we had at least one line in future else print $langs->trans("Total"); print ' '.$object->currency_code.''; - print ''.price($total_deb*-1, 0, $langs, 0, 0, -1, $object->currency_code).''; - print ''.price($total_cred, 0, $langs, 0, 0, -1, $object->currency_code).''; - print ''.price($total_cred-($total_deb*-1), 0, $langs, 0, 0, -1, $object->currency_code).''; + print ''.price($total_deb*-1).''; + print ''.price($total_cred).''; + print ''.price($total_cred-($total_deb*-1)).''; print ' '; print ''; } diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 7b472b2a163..bc26812bd29 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -5255,9 +5255,10 @@ class Form * @param int $caneditfield Add edit fields * @param string $cssclass CSS name to use on img for photo * @param int $genericifundef Use a generic image if no image avaiable + * @param int $addlinktofullsize Add link to fullsize image * @return string HTML code to output photo */ - static function showphoto($modulepart, $object, $width=100, $height=0, $caneditfield=0, $cssclass='photowithmargin', $genericifundef=0) + static function showphoto($modulepart, $object, $width=100, $height=0, $caneditfield=0, $cssclass='photowithmargin', $genericifundef=0,$addlinktofullsize=1) { global $conf,$langs; @@ -5303,15 +5304,15 @@ class Form $cache='0'; if ($file && file_exists($dir."/".$file)) { - $ret.=''; + if ($addlinktofullsize) $ret.=''; $ret.='Photo'; - $ret.=''; + if ($addlinktofullsize) $ret.=''; } else if ($altfile && file_exists($dir."/".$altfile)) { - $ret.=''; + if ($addlinktofullsize) $ret.=''; $ret.='Photo alt'; - $ret.=''; + if ($addlinktofullsize) $ret.=''; } else { diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index 2addea47f87..ae985b22be5 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -1922,7 +1922,7 @@ class User extends CommonObject $paddafterimage=''; if (abs($withpictoimg) == 1) $paddafterimage='style="padding-right: 3px;"'; if ($withpictoimg > 0) $picto='
'.img_object('', 'user', $paddafterimage.' '.($notooltip?'':'class="classfortooltip"')).'
'; - else $picto='
'.Form::showphoto('userphoto', $this, 0, 0, 0, 'loginphoto').'
'; + else $picto='
'.Form::showphoto('userphoto', $this, 0, 0, 0, 'loginphoto',0,0).'
'; $result.=$picto; } if (abs($withpictoimg) != 2) From 1b8234d9fe416d531d7951ead1ef830893c672d7 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 25 Oct 2015 11:09:50 +0100 Subject: [PATCH 24/31] Bette behaviour for blind people --- htdocs/contact/class/contact.class.php | 11 +++++++++-- htdocs/core/boxes/box_contacts.php | 22 +++++++++++++++++----- htdocs/index.php | 4 ++-- htdocs/langs/en_US/companies.lang | 2 +- htdocs/societe/class/societe.class.php | 18 +++++++++++++++--- htdocs/user/class/user.class.php | 16 ++++++++++++++-- 6 files changed, 58 insertions(+), 15 deletions(-) diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php index 9a887bf9fdb..723784d9a5d 100644 --- a/htdocs/contact/class/contact.class.php +++ b/htdocs/contact/class/contact.class.php @@ -908,7 +908,7 @@ class Contact extends CommonObject */ function getNomUrl($withpicto=0,$option='',$maxlen=0,$moreparam='') { - global $langs; + global $conf, $langs; $result=''; $label = '' . $langs->trans("ShowContact") . ''; @@ -923,7 +923,14 @@ class Contact extends CommonObject $label.= '
' . $langs->trans("Phone") . ': '.join(', ',$phonelist); $label.= '
' . $langs->trans("Address") . ': '.dol_format_address($this, 1, ' ', $langs); - $link = ''; + $link = 'global->MAIN_OPTIMIZEFORTEXTBROWSER)) + { + $label=$langs->trans("ShowContact"); + $link.=' alt="'.dol_escape_htmltag($label, 1).'"'; + } + $link.= ' title="'.dol_escape_htmltag($label, 1).'"'; + $link.= ' class="classfortooltip">'; $linkend=''; if ($option == 'xxx') diff --git a/htdocs/core/boxes/box_contacts.php b/htdocs/core/boxes/box_contacts.php index 18a09af6ace..a1fc2768ba1 100644 --- a/htdocs/core/boxes/box_contacts.php +++ b/htdocs/core/boxes/box_contacts.php @@ -63,8 +63,9 @@ class box_contacts extends ModeleBoxes if ($user->rights->societe->lire) { $sql = "SELECT sp.rowid as id, sp.lastname, sp.firstname, sp.civility as civility_id, sp.datec, sp.tms, sp.fk_soc, sp.statut as status"; - $sql.= ", s.nom as socname"; - $sql.= ", s.code_client"; + $sql.= ", sp.address, sp.zip, sp.town, sp.phone, sp.phone_perso, sp.phone_mobile"; + $sql.= ", s.nom as socname, s.name_alias"; + $sql.= ", s.client, s.fournisseur, s.code_client, s.code_fournisseur"; $sql.= " FROM ".MAIN_DB_PREFIX."socpeople as sp"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON sp.fk_soc = s.rowid"; if (! $user->rights->societe->client->voir && ! $user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -93,10 +94,21 @@ class box_contacts extends ModeleBoxes $contactstatic->firstname=$objp->firstname; $contactstatic->civility_id=$objp->civility_id; $contactstatic->statut=$objp->status; - $societestatic->id = $objp->fk_soc; - $societestatic->code_client = $objp->code_client; + $contactstatic->phone_pro = $objp->phone; + $contactstatic->phone_perso = $objp->phone_perso; + $contactstatic->phone_mobile = $objp->phone_mobile; + $contactstatic->address = $objp->address; + $contactstatic->zip = $objp->zip; + $contactstatic->town = $objp->town; + + $societestatic->id = $objp->fk_soc; $societestatic->name = $objp->socname; - + $societestatic->name_alias = $objp->name_alias; + $societestatic->code_client = $objp->code_client; + $societestatic->code_fournisseur = $objp->code_fournisseur; + $societestatic->client = $objp->client; + $societestatic->fournisseur = $objp->fournisseur; + $this->info_box_contents[$line][] = array( 'td' => 'align="left"', 'text' => $contactstatic->getNomUrl(1), diff --git a/htdocs/index.php b/htdocs/index.php index 5db358aa34b..818da8f9ecd 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -103,7 +103,7 @@ print '
'; * Informations area */ -print ''; +print '
'; print ''; print ''; print ''; @@ -129,7 +129,7 @@ $langs->load("contracts"); if (empty($user->societe_id)) { print '
'; - print '
'.$langs->trans("Informations").'
'.$langs->trans("User").''.$user->getNomUrl(0).'
'; + print '
'; print ''; print ''; print ''; diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang index e3fd6fadeec..3e93a48d7b5 100644 --- a/htdocs/langs/en_US/companies.lang +++ b/htdocs/langs/en_US/companies.lang @@ -305,7 +305,7 @@ ListOfCustomersContacts=List of customer contacts ListOfSuppliersContacts=List of supplier contacts ListOfCompanies=List of companies ListOfThirdParties=List of third parties -ShowCompany=Show company +ShowCompany=Show thirdparty ShowContact=Show contact ContactsAllShort=All (No filter) ContactType=Contact type diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index 1f5f10c9178..fb99f819af2 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -1824,10 +1824,13 @@ class Societe extends CommonObject } if (! empty($this->name)) + { $label.= '
' . $langs->trans('Name') . ': '. $this->name; - if (! empty($this->code_client)) + if (! empty($this->name_alias)) $label.=' ('.$this->name_alias.')'; + } + if (! empty($this->code_client) && $this->client) $label.= '
' . $langs->trans('CustomerCode') . ': '. $this->code_client; - if (! empty($this->code_fournisseur)) + if (! empty($this->code_fournisseur) && $this->fournisseur) $label.= '
' . $langs->trans('SupplierCode') . ': '. $this->code_fournisseur; if (! empty($this->logo)) @@ -1841,7 +1844,16 @@ class Societe extends CommonObject // Add type of canvas $link.=(!empty($this->canvas)?'&canvas='.$this->canvas:'').'"'; - $link.=($notooltip?'':' title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip"'); + if (empty($notooltip)) + { + if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) + { + $label=$langs->trans("ShowCompany"); + $link.=' alt="'.dol_escape_htmltag($label, 1).'"'; + } + $link.= ' title="'.dol_escape_htmltag($label, 1).'"'; + $link.=' class="classfortooltip"'; + } $link.='>'; $linkend=''; diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index ae985b22be5..a165a735f84 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -1911,7 +1911,17 @@ class User extends CommonObject } $link.= 'global->MAIN_OPTIMIZEFORTEXTBROWSER)) + { + $langs->load("users"); + $label=$langs->trans("ShowUser"); + $link.=' alt="'.dol_escape_htmltag($label, 1).'"'; + } + $link.= ' title="'.dol_escape_htmltag($label, 1).'"'; + $link.= ' class="classfortooltip'.($morecss?' '.$morecss:'').'"'; + } $link.= '>'; $linkend=''; @@ -1927,7 +1937,9 @@ class User extends CommonObject } if (abs($withpictoimg) != 2) { - $result.='
'.$this->getFullName($langs,'',($mode == 'firstname' ? 2 : -1),$maxlen).'
'; + if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $result.='
'; + $result.=$this->getFullName($langs,'',($mode == 'firstname' ? 2 : -1),$maxlen); + if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $result.='
'; } $result.=$linkend; //if ($withpictoimg == -1) $result.=''; From 1261ad43a1d30bd3703083aad451bb9e4f52a6d9 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 25 Oct 2015 18:15:37 +0100 Subject: [PATCH 25/31] NEW Can select which field to show into list of users. --- htdocs/societe/list.php | 44 ++--- htdocs/user/index.php | 426 ++++++++++++++++++++++++++++++---------- 2 files changed, 340 insertions(+), 130 deletions(-) diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php index 98795e27667..0e102af33f9 100644 --- a/htdocs/societe/list.php +++ b/htdocs/societe/list.php @@ -338,8 +338,8 @@ else dol_print_error($db); $sql = "SELECT s.rowid, s.nom as name, s.name_alias, s.barcode, s.town, s.zip, s.datec, s.code_client, s.code_fournisseur, "; $sql.= " st.libelle as stcomm, s.fk_stcomm as stcomm_id, s.fk_prospectlevel, s.prefix_comm, s.client, s.fournisseur, s.canvas, s.status as status,"; -$sql.= " s.siren as idprof1, s.siret as idprof2, ape as idprof3, idprof4 as idprof4,"; -$sql.= " s.fk_pays, s.tms as date_update, s.datec as date_creation,"; +$sql.= " s.siren as idprof1, s.siret as idprof2, ape as idprof3, idprof4 as idprof4, s.fk_pays,"; +$sql.= " s.tms as date_update, s.datec as date_creation,"; $sql.= " typent.code as typent_code"; // We'll need these fields in order to filter by sale (including the case where the user can only see his prospects) if ($search_sale) $sql .= ", sc.fk_soc, sc.fk_user"; @@ -575,10 +575,10 @@ if ($resql) 's.idprof6'=>array('label'=>$langs->trans("ProfId6Short"), 'checked'=>$checkedprofid6), 's.fk_prospectlevel'=>array('label'=>$langs->trans("ProspectLevelShort"), 'checked'=>$checkprospectlevel), 's.fk_stcomm'=>array('label'=>$langs->trans("StatusProsp"), 'checked'=>$checkstcomm), - 's.status'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>200), 's.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500), 's.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500), - ); + 's.status'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000), + ); $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage; $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields print '
'.$langs->trans("DolibarrStateBoard").' 
'; @@ -618,9 +618,9 @@ if ($resql) $parameters=array('arrayfields'=>$arrayfields); $reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters); // Note that $action and $object may have been modified by hook print $hookmanager->resPrint; - if (! empty($arrayfields['s.status']['checked'])) print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"s.status","",$param,'align="center"',$sortfield,$sortorder); if (! empty($arrayfields['s.datec']['checked'])) print_liste_field_titre($langs->trans("DateCreationShort"),$_SERVER["PHP_SELF"],"s.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder); if (! empty($arrayfields['s.tms']['checked'])) print_liste_field_titre($langs->trans("DateModificationShort"),$_SERVER["PHP_SELF"],"s.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder); + if (! empty($arrayfields['s.status']['checked'])) print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"s.status","",$param,'align="center"',$sortfield,$sortorder); print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch '); print "\n"; @@ -795,25 +795,25 @@ if ($resql) $parameters=array('arrayfields'=>$arrayfields); $reshook=$hookmanager->executeHooks('printFieldListOption',$parameters); // Note that $action and $object may have been modified by hook print $hookmanager->resPrint; - if (! empty($arrayfields['s.status']['checked'])) - { - // Status - print ''; - } + // Date creation if (! empty($arrayfields['s.datec']['checked'])) { - // Date creation print ''; } + // Date modification if (! empty($arrayfields['s.tms']['checked'])) { - // Date modification print ''; } + // Status + if (! empty($arrayfields['s.status']['checked'])) + { + print ''; + } // Action column print ''; - } - if (! empty($arrayfields['s.datec']['checked'])) - { - // Date creation print ''; } + // Date modification if (! empty($arrayfields['s.tms']['checked'])) { - // Date modification print ''; + } + // Status + if (! empty($arrayfields['s.status']['checked'])) + { + print ''; } // Action column print ''; diff --git a/htdocs/user/index.php b/htdocs/user/index.php index 921697ade51..40fe8353093 100644 --- a/htdocs/user/index.php +++ b/htdocs/user/index.php @@ -47,6 +47,8 @@ $search_lastname=GETPOST('search_lastname','alpha'); $search_firstname=GETPOST('search_firstname','alpha'); $search_statut=GETPOST('search_statut','alpha'); $search_thirdparty=GETPOST('search_thirdparty','alpha'); +$search_supervisor=GETPOST('search_supervisor','alpha'); +$search_previousconn=GETPOST('search_previousconn','alpha'); $optioncss = GETPOST('optioncss','alpha'); if ($search_statut == '') $search_statut='1'; @@ -62,6 +64,14 @@ $limit = $conf->liste_limit; if (! $sortfield) $sortfield="u.login"; if (! $sortorder) $sortorder="ASC"; +// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array +$hookmanager->initHooks(array('userlist')); +$extrafields = new ExtraFields($db); + +// fetch optionals attributes and labels +$extralabels = $extrafields->fetch_name_optionals_label('user'); +$search_array_options=$extrafields->getOptionalsFromPost($extralabels,'','search_'); + $userstatic=new User($db); $companystatic = new Societe($db); $form = new Form($db); @@ -74,8 +84,35 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both $search_firstname=""; $search_statut=""; $search_thirdparty=""; + $search_supervisor=""; + $search_datelastlogin=""; + $search_datepreviouslogin=""; + $search_date_creation=""; + $search_date_update=""; } +// List of fields to search into when doing a "search in all" +$fieldstosearchall = array( + 'u.login'=>"Login", + 'u.firstname'=>"Firstname", + 'u.lastname'=>"Lastname", + 'u.accountancy_code'=>"AccountancyCode", + 'u.email'=>"EMail", + 'u.note'=>"Note" +); + + +/* + * Actions + */ + +$parameters=array(); +$reshook=$hookmanager->executeHooks('doActions',$parameters); // Note that $action and $object may have been modified by some hooks +if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); + +include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php'; + + /* * View @@ -88,12 +125,17 @@ $buttonviewhierarchy='attribute_list as $key => $val) $sql.=",ef.".$key.' as options_'.$key; +// Add fields from hooks +$parameters=array(); +$reshook=$hookmanager->executeHooks('printFieldListSelect',$parameters); // Note that $action and $object may have been modified by hook +$sql.=$hookmanager->resPrint; $sql.= " FROM ".MAIN_DB_PREFIX."user as u"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON u.fk_soc = s.rowid"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as u2 ON u.fk_user = u2.rowid"; @@ -106,14 +148,33 @@ else $sql.= " WHERE u.entity IN (".getEntity('user',1).")"; } if ($socid > 0) $sql.= " AND u.fk_soc = ".$socid; -if ($search_user != '') $sql.=natural_search(array('u.login', 'u.lastname', 'u.firstname'), $search_user); +if ($search_user != '') $sql.=natural_search(array('u.login', 'u.lastname', 'u.firstname'), $search_user); +if ($search_supervisor > 0) $sql.= " AND u.fk_user = ".$search_supervisor; if ($search_thirdparty != '') $sql.=natural_search(array('s.nom'), $search_thirdparty); -if ($search_login != '') $sql.= natural_search("u.login", $search_login); -if ($search_lastname != '') $sql.= natural_search("u.lastname", $search_lastname); -if ($search_firstname != '') $sql.= natural_search("u.firstname", $search_firstname); +if ($search_login != '') $sql.= natural_search("u.login", $search_login); +if ($search_lastname != '') $sql.= natural_search("u.lastname", $search_lastname); +if ($search_firstname != '') $sql.= natural_search("u.firstname", $search_firstname); if ($search_statut != '' && $search_statut >= 0) $sql.= " AND (u.statut=".$search_statut.")"; -if ($sall) $sql.= natural_search(array('u.login', 'u.lastname', 'u.firstname', 'u.email', 'u.note'), $sall); +if ($sall) $sql.= natural_search($fieldstosearchall, $sall); +// Add where from extra fields +foreach ($search_array_options as $key => $val) +{ + $crit=$val; + $tmpkey=preg_replace('/search_options_/','',$key); + $typ=$extrafields->attribute_type[$tmpkey]; + $mode=0; + if (in_array($typ, array('int'))) $mode=1; // Search on a numeric + if ($val && ( ($crit != '' && ! in_array($typ, array('select'))) || ! empty($crit))) + { + $sql .= natural_search('ef.'.$tmpkey, $crit, $mode); + } +} +// Add where from hooks +$parameters=array(); +$reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters); // Note that $action and $object may have been modified by hook +$sql.=$hookmanager->resPrint; $sql.=$db->order($sortfield,$sortorder); +//$sql.= $db->plimit($conf->liste_limit+1, $offset); $result = $db->query($sql); if ($result) @@ -121,54 +182,153 @@ if ($result) $num = $db->num_rows($result); $i = 0; + $param=''; + if ($sall != '') $param.='&sall='.urlencode($sall); + if ($search_user != '') $param.="&search_user=".$search_user; + if ($search_login != '') $param.="&search_login=".$search_login; + if ($search_lastname != '') $param.="&search_lastname=".$search_lastname; + if ($search_firstname != '') $param.="&search_firstname=".$search_firstname; + if ($search_supervisor > 0) $param.="&search_supervisor=".$search_supervisor; + if ($search_statut != '') $param.="&search_statut=".$search_statut; + if ($optioncss != '') $param.='&optioncss='.$optioncss; + // Add $param from extra fields + foreach ($search_array_options as $key => $val) + { + $crit=$val; + $tmpkey=preg_replace('/search_options_/','',$key); + if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val); + } + + print ''."\n"; if ($optioncss != '') print ''; - - $param="search_user=".$search_user."&sall=".$sall; - $param.="&search_statut=".$search_statut; - if ($optioncss != '') $param.='&optioncss='.$optioncss; - + print ''; + print ''; + print ''; + print ''; + + if ($sall) + { + foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val); + print $langs->trans("FilterOnInto", $sall, join(', ',$fieldstosearchall)); + } + + $arrayfields=array( + 'u.login'=>array('label'=>$langs->trans("Login"), 'checked'=>1), + 'u.lastname'=>array('label'=>$langs->trans("Lastname"), 'checked'=>1), + 'u.firstname'=>array('label'=>$langs->trans("Firstname"), 'checked'=>1), + 'u.fk_soc'=>array('label'=>$langs->trans("Company"), 'checked'=>1), + 'u.entity'=>array('label'=>$langs->trans("Entity"), 'checked'=>1, 'enabled'=>(! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode))), + 'u.fk_user'=>array('label'=>$langs->trans("HierarchicalResponsible"), 'checked'=>1), + 'u.datelastlogin'=>array('label'=>$langs->trans("LastConnexion"), 'checked'=>1, 'position'=>100), + 'u.datepreviouslogin'=>array('label'=>$langs->trans("PreviousConnexion"), 'checked'=>0, 'position'=>110), + 'u.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500), + 'u.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500), + 'u.statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000), + ); + $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage; + $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields print '
'; - print $form->selectarray('search_status', array('0'=>$langs->trans('ActivityCeased'),'1'=>$langs->trans('InActivity')),$search_status); - print ''; print ''; print ''; + print $form->selectarray('search_status', array('0'=>$langs->trans('ActivityCeased'),'1'=>$langs->trans('InActivity')),$search_status); + print ''; if ($type != '') print ''; @@ -971,24 +971,24 @@ if ($resql) $parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj); $reshook=$hookmanager->executeHooks('printFieldListValue',$parameters); // Note that $action and $object may have been modified by hook print $hookmanager->resPrint; - // Status - if (! empty($arrayfields['s.status']['checked'])) + // Date creation + if (! empty($arrayfields['s.datec']['checked'])) { - print ''.$companystatic->getLibStatut(3).''; print dol_print_date($obj->date_creation, 'dayhour'); print ''; print dol_print_date($obj->date_update, 'dayhour'); print ''.$companystatic->getLibStatut(3).'
'; print ''; - print_liste_field_titre($langs->trans("Login"),$_SERVER['PHP_SELF'],"u.login",$param,"","",$sortfield,$sortorder); - print_liste_field_titre($langs->trans("LastName"),$_SERVER['PHP_SELF'],"u.lastname",$param,"","",$sortfield,$sortorder); - print_liste_field_titre($langs->trans("FirstName"),$_SERVER['PHP_SELF'],"u.firstname",$param,"","",$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Company"),$_SERVER['PHP_SELF'],"u.fk_soc",$param,"","",$sortfield,$sortorder); - if (! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode)) - { - print_liste_field_titre($langs->trans("Entity"),$_SERVER['PHP_SELF'],"u.entity",$param,"","",$sortfield,$sortorder); - } - print_liste_field_titre($langs->trans("DateCreation"),$_SERVER['PHP_SELF'],"u.datec",$param,"",'align="center"',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("LastConnexion"),$_SERVER['PHP_SELF'],"u.datelastlogin",$param,"",'align="center"',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("HierarchicalResponsible"),$_SERVER['PHP_SELF'],"u2.login",$param,"",'align="center"',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Status"),$_SERVER['PHP_SELF'],"u.statut",$param,"",'align="right"',$sortfield,$sortorder); - print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch '); + if (! empty($arrayfields['u.login']['checked'])) print_liste_field_titre($langs->trans("Login"),$_SERVER['PHP_SELF'],"u.login",$param,"","",$sortfield,$sortorder); + if (! empty($arrayfields['u.lastname']['checked'])) print_liste_field_titre($langs->trans("Lastname"),$_SERVER['PHP_SELF'],"u.lastname",$param,"","",$sortfield,$sortorder); + if (! empty($arrayfields['u.firstname']['checked'])) print_liste_field_titre($langs->trans("FirstName"),$_SERVER['PHP_SELF'],"u.firstname",$param,"","",$sortfield,$sortorder); + if (! empty($arrayfields['u.fk_soc']['checked'])) print_liste_field_titre($langs->trans("Company"),$_SERVER['PHP_SELF'],"u.fk_soc",$param,"","",$sortfield,$sortorder); + if (! empty($arrayfields['u.entity']['checked'])) print_liste_field_titre($langs->trans("Entity"),$_SERVER['PHP_SELF'],"u.entity",$param,"","",$sortfield,$sortorder); + if (! empty($arrayfields['u.fk_user']['checked'])) print_liste_field_titre($langs->trans("HierarchicalResponsible"),$_SERVER['PHP_SELF'],"u.fk_user",$param,"","",$sortfield,$sortorder); + if (! empty($arrayfields['u.datelastlogin']['checked'])) print_liste_field_titre($langs->trans("LastConnexion"),$_SERVER['PHP_SELF'],"u.datelastlogin",$param,"",'align="center"',$sortfield,$sortorder); + if (! empty($arrayfields['u.datepreviouslogin']['checked'])) print_liste_field_titre($langs->trans("PreviousConnexion"),$_SERVER['PHP_SELF'],"u.datepreviouslogin",$param,"",'align="center"',$sortfield,$sortorder); + // Extra fields + if (is_array($extrafields->attribute_list) && count($extrafields->attribute_list)) + { + foreach($extrafields->attribute_list as $key => $val) + { + if ($val) + { + if (! empty($arrayfields["ef.".$key]['checked'])) print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,"",$sortfield,$sortorder); + } + } + } + // Hook fields + $parameters=array('arrayfields'=>$arrayfields); + $reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters); // Note that $action and $object may have been modified by hook + print $hookmanager->resPrint; + if (! empty($arrayfields['u.datec']['checked'])) print_liste_field_titre($langs->trans("DateCreationShort"),$_SERVER["PHP_SELF"],"u.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder); + if (! empty($arrayfields['u.tms']['checked'])) print_liste_field_titre($langs->trans("DateModificationShort"),$_SERVER["PHP_SELF"],"u.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder); + if (! empty($arrayfields['u.statut']['checked'])) print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"u.statut","",$param,'align="center"',$sortfield,$sortorder); + print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch '); print "\n"; // Search bar - $colspan=3; - if (! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode)) $colspan++; print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - - // Status - print ''; - - print ''; + } + if (! empty($arrayfields['u.lastname']['checked'])) + { + print ''; + } + if (! empty($arrayfields['u.firstname']['checked'])) + { + print ''; + } + if (! empty($arrayfields['u.fk_soc']['checked'])) + { + print ''; + } + if (! empty($arrayfields['u.entity']['checked'])) + { + print ''; + } + if (! empty($arrayfields['u.fk_user']['checked'])) + { + print ''; + } + if (! empty($arrayfields['u.datelastlogin']['checked'])) + { + print ''; + } + if (! empty($arrayfields['u.datepreviouslogin']['checked'])) + { + print ''; + } + + // 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; + if (! empty($arrayfields['u.datec']['checked'])) + { + // Date creation + print ''; + } + if (! empty($arrayfields['u.tms']['checked'])) + { + // Date modification + print ''; + } + if (! empty($arrayfields['u.statut']['checked'])) + { + // Status + print ''; + } + // Action column + print ''; - + print "\n"; $user2=new User($db); $var=True; + //while ($i < min($num,$conf->liste_limit)) while ($i < $num) { $obj = $db->fetch_object($result); @@ -183,87 +343,137 @@ if ($result) $userstatic->societe_id=$obj->fk_soc; $userstatic->firstname=''; $userstatic->lastname=$obj->login; - + $li=$userstatic->getNomUrl(1,'',0,0,24,1); print ""; - print ''; - print ''; - print ''; - print "'; - + if (! empty($arrayfields['u.login']['checked'])) + { + print ''; + } + if (! empty($arrayfields['u.lastname']['checked'])) + { + print ''; + } + if (! empty($arrayfields['u.firstname']['checked'])) + { + print ''; + } + if (! empty($arrayfields['u.fk_soc']['checked'])) + { + print "'; + } // Multicompany enabled if (! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode)) { - print ''; + if (! empty($arrayfields['u.entity']['checked'])) + { + print ''; + } } - - // Date creation - print ''; - + // Supervisor + if (! empty($arrayfields['u.fk_user']['checked'])) + { + // Resp + print ''; + } + // Date last login - print ''; - - // Resp - print ''; + } + // Date previous login + if (! empty($arrayfields['u.datepreviouslogin']['checked'])) + { + print ''; + } + + // Fields from hook + $parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj); + $reshook=$hookmanager->executeHooks('printFieldListValue',$parameters); // Note that $action and $object may have been modified by hook + print $hookmanager->resPrint; + // Date creation + if (! empty($arrayfields['u.datec']['checked'])) { - $user2->login=$obj->login2; - //$user2->lastname=$obj->lastname2; - //$user2->firstname=$obj->firstname2; - $user2->lastname=$user2->login; - $user2->firstname=''; - print $user2->getNomUrl(1); + print ''; } - print ''; + // Date modification + if (! empty($arrayfields['u.tms']['checked'])) + { + print ''; + } + // Status + if (! empty($arrayfields['u.statut']['checked'])) + { + $userstatic->statut=$obj->statut; + print ''; + } + // Action column + print ''; - // Statut - $userstatic->statut=$obj->statut; - print ''; - print ''; print "\n"; $i++; } + + $parameters=array('arrayfields'=>$arrayfields, 'sql'=>$sql); + $reshook=$hookmanager->executeHooks('printFieldListFooter',$parameters); // Note that $action and $object may have been modified by hook + print $hookmanager->resPrint; + print "
 '; - print $form->selectarray('search_statut', array('-1'=>'','0'=>$langs->trans('Disabled'),'1'=>$langs->trans('Enabled')),$search_statut); - print ''; + if (! empty($arrayfields['u.login']['checked'])) + { + print ''; + print ''; + print ''; + print $form->selectarray('search_statut', array('-1'=>'','0'=>$langs->trans('Disabled'),'1'=>$langs->trans('Enabled')),$search_statut); + print ''; + print ''; print ''; print '
'; - print $li; - if (! empty($conf->multicompany->enabled) && $obj->admin && ! $obj->entity) - { - print img_picto($langs->trans("SuperAdministrator"),'redstar'); - } - else if ($obj->admin) - { - print img_picto($langs->trans("Administrator"),'star'); - } - print ''.ucfirst($obj->lastname).''.ucfirst($obj->firstname).'"; - if ($obj->fk_soc) - { - $companystatic->id=$obj->fk_soc; - $companystatic->name=$obj->name; - $companystatic->canvas=$obj->canvas; - print $companystatic->getNomUrl(1); - } - else if ($obj->ldap_sid) - { - print $langs->trans("DomainUser"); - } - else - { - print $langs->trans("InternalUser"); - } - print ''; + print $li; + if (! empty($conf->multicompany->enabled) && $obj->admin && ! $obj->entity) + { + print img_picto($langs->trans("SuperAdministrator"),'redstar'); + } + else if ($obj->admin) + { + print img_picto($langs->trans("Administrator"),'star'); + } + print ''.ucfirst($obj->lastname).''.ucfirst($obj->firstname).'"; + if ($obj->fk_soc) + { + $companystatic->id=$obj->fk_soc; + $companystatic->name=$obj->name; + $companystatic->canvas=$obj->canvas; + print $companystatic->getNomUrl(1); + } + else if ($obj->ldap_sid) + { + print $langs->trans("DomainUser"); + } + else + { + print $langs->trans("InternalUser"); + } + print ''; - if (! $obj->entity) - { - print $langs->trans("AllEntities"); - } - else - { - // $mc is defined in conf.class.php if multicompany enabled. - if (is_object($mc)) - { - $mc->getInfo($obj->entity); - print $mc->label; - } - } - print ''; + if (! $obj->entity) + { + print $langs->trans("AllEntities"); + } + else + { + // $mc is defined in conf.class.php if multicompany enabled. + if (is_object($mc)) + { + $mc->getInfo($obj->entity); + print $mc->label; + } + } + print ''.dol_print_date($db->jdate($obj->datec),"dayhour").''; + if ($obj->login2) + { + $user2->login=$obj->login2; + //$user2->lastname=$obj->lastname2; + //$user2->firstname=$obj->firstname2; + $user2->lastname=$user2->login; + $user2->firstname=''; + print $user2->getNomUrl(1); + } + print ''.dol_print_date($db->jdate($obj->datelastlogin),"dayhour").''; - if ($obj->login2) + if (! empty($arrayfields['u.datelastlogin']['checked'])) + { + print ''.dol_print_date($db->jdate($obj->datelastlogin),"dayhour").''.dol_print_date($db->jdate($obj->datepreviouslogin),"dayhour").''; + print dol_print_date($obj->date_creation, 'dayhour'); + print ''; + print dol_print_date($obj->date_update, 'dayhour'); + print ''.$userstatic->getLibStatut(3).''.$userstatic->getLibStatut(5).' 
"; print "\n"; $db->free($result); From b49d63c12f2389d310c03d9908f528feae4062a5 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 25 Oct 2015 19:31:13 +0100 Subject: [PATCH 26/31] NEW Show photo of user into user list. A new function getImageFileNameForSize was also introduced to choose image best size according to usage to save bandwith. --- htdocs/core/class/html.form.class.php | 39 ++++++++++++++++++++------ htdocs/core/lib/functions.lib.php | 30 ++++++++++++++++++++ htdocs/core/lib/images.lib.php | 4 +-- htdocs/theme/eldy/img/object_user.png | Bin 607 -> 651 bytes htdocs/user/class/user.class.php | 12 ++++---- htdocs/user/group/index.php | 2 +- htdocs/user/hierarchy.php | 8 ++++-- htdocs/user/index.php | 33 +++++++++++++++------- 8 files changed, 99 insertions(+), 29 deletions(-) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index bc26812bd29..6bb8049f6f6 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -5254,11 +5254,11 @@ class Form * @param int $height Height of photo (auto if 0) * @param int $caneditfield Add edit fields * @param string $cssclass CSS name to use on img for photo - * @param int $genericifundef Use a generic image if no image avaiable + * @param string $imagesize 'mini', 'small' or '' (original) * @param int $addlinktofullsize Add link to fullsize image * @return string HTML code to output photo */ - static function showphoto($modulepart, $object, $width=100, $height=0, $caneditfield=0, $cssclass='photowithmargin', $genericifundef=0,$addlinktofullsize=1) + static function showphoto($modulepart, $object, $width=100, $height=0, $caneditfield=0, $cssclass='photowithmargin', $imagesize='',$addlinktofullsize=1) { global $conf,$langs; @@ -5272,29 +5272,52 @@ class Form $dir=$conf->societe->multidir_output[$entity]; $smallfile=$object->logo; $smallfile=preg_replace('/(\.png|\.gif|\.jpg|\.jpeg|\.bmp)/i','_small\\1',$smallfile); - if (! empty($object->logo)) $file=$id.'/logos/thumbs/'.$smallfile; + if (! empty($object->logo)) + { + if ($imagesize == 'mini') $file=$id.'/logos/thumbs/'.getImageFileNameForSize($object->logo, '_mini'); + else if ($imagesize == 'small') $file=$id.'/logos/thumbs/'.getImageFileNameForSize($object->logo, '_small'); + else $file=$id.'/logos/thumbs/'.$smallfile; + } } else if ($modulepart=='contact') { $dir=$conf->societe->multidir_output[$entity].'/contact'; - $file=$id.'/photos/'.$object->photo; + if (! empty($object->photo)) + { + if ($imagesize == 'mini') $file=$id.'/photos/thumbs/'.getImageFileNameForSize($object->photo, '_mini'); + else if ($imagesize == 'small') $file=$id.'/photos/thumbs/'.getImageFileNameForSize($object->photo, '_small'); + else $file=$id.'/photos/'.$object->photo; + } } else if ($modulepart=='userphoto') { $dir=$conf->user->dir_output; - if (! empty($object->photo)) $file=get_exdir($id, 2, 0, 0, $object, 'user').$object->photo; + if (! empty($object->photo)) + { + //var_dump(getImageFileNameForSize($object->photo, '_mini')); + if ($imagesize == 'mini') $file=get_exdir($id, 2, 0, 0, $object, 'user').getImageFileNameForSize($object->photo, '_mini'); + else if ($imagesize == 'small') $file=get_exdir($id, 2, 0, 0, $object, 'user').getImageFileNameForSize($object->photo, '_small'); + else $file=get_exdir($id, 2, 0, 0, $object, 'user').$object->photo; + } if (! empty($conf->global->MAIN_OLD_IMAGE_LINKS)) $altfile=$object->id.".jpg"; // For backward compatibility $email=$object->email; } else if ($modulepart=='memberphoto') { $dir=$conf->adherent->dir_output; - if (! empty($object->photo)) $file=get_exdir($id, 2, 0, 0, $object, 'invoice_supplier').'photos/'.$object->photo; + if (! empty($object->photo)) + { + if ($imagesize == 'mini') $file=get_exdir($id, 2, 0, 0, $object, 'member').'photos/'.getImageFileNameForSize($object->photo, '_mini'); + else if ($imagesize == 'small') $file=get_exdir($id, 2, 0, 0, $object, 'member').'photos/'.getImageFileNameForSize($object->photo, '_small'); + else $file=get_exdir($id, 2, 0, 0, $object, 'member').'photos/'.$object->photo; + } if (! empty($conf->global->MAIN_OLD_IMAGE_LINKS)) $altfile=$object->id.".jpg"; // For backward compatibility $email=$object->email; - } else { + } + else + { $dir=$conf->$modulepart->dir_output; - if (! empty($object->photo)) $file=get_exdir($id, 2, 0, 0, $object, 'member').'photos/'.$object->photo; + if (! empty($object->photo)) $file=get_exdir($id, 2, 0, 0, $object, $modulepart).'photos/'.$object->photo; if (! empty($conf->global->MAIN_OLD_IMAGE_LINKS)) $altfile=$object->id.".jpg"; // For backward compatibility $email=$object->email; } diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 896cc0824d0..0750d1d24b0 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -5223,3 +5223,33 @@ function natural_search($fields, $value, $mode=0, $nofirstand=0) return $res; } + +/** + * Return the filename of file to get the thumbs + * + * @param string $file Original filename + * @param string $extName Extension to differenciate thumb file name ('', '_small', '_mini') + * @param string $extImgTarget Force image format for thumbs. Use '' to keep same extension than original image. + * @return string New file name + */ +function getImageFileNameForSize($file, $extName, $extImgTarget='') +{ + $dirName = dirname($file); + if ($dirName == '.') $dirName=''; + + $fileName = preg_replace('/(\.gif|\.jpeg|\.jpg|\.png|\.bmp)$/i','',$file); // On enleve extension quelquesoit la casse + $fileName = basename($fileName); + + if (empty($extImgTarget)) $extImgTarget = (preg_match('/\.jpg$/i',$file)?'.jpg':''); + if (empty($extImgTarget)) $extImgTarget = (preg_match('/\.jpeg$/i',$file)?'.jpeg':''); + if (empty($extImgTarget)) $extImgTarget = (preg_match('/\.gif$/i',$file)?'.gif':''); + if (empty($extImgTarget)) $extImgTarget = (preg_match('/\.png$/i',$file)?'.png':''); + if (empty($extImgTarget)) $extImgTarget = (preg_match('/\.bmp$/i',$file)?'.bmp':''); + + if (! $extImgTarget) return $file; + + $subdir=''; + if ($extName) $subdir = 'thumbs/'; + + return $dirName.$subdir.$fileName.$extName.$extImgTarget; // New filename for thumb +} diff --git a/htdocs/core/lib/images.lib.php b/htdocs/core/lib/images.lib.php index 7e47f755a7e..e61dc22eeb0 100644 --- a/htdocs/core/lib/images.lib.php +++ b/htdocs/core/lib/images.lib.php @@ -483,7 +483,7 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName='_small', $ break; case IMAGETYPE_JPEG: // 2 $trans_colour = imagecolorallocatealpha($imgThumb, 255, 255, 255, 0); - $extImgTarget = (preg_match('/\.jpeg$/',$file)?'.jpeg':'.jpg'); + $extImgTarget = (preg_match('/\.jpeg$/i',$file)?'.jpeg':'.jpg'); $newquality=$quality; break; case IMAGETYPE_PNG: // 3 @@ -512,7 +512,7 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName='_small', $ $fileName = preg_replace('/(\.gif|\.jpeg|\.jpg|\.png|\.bmp)$/i','',$file); // On enleve extension quelquesoit la casse $fileName = basename($fileName); - $imgThumbName = $dirthumb.'/'.$fileName.$extName.$extImgTarget; // Chemin complet du fichier de la vignette + $imgThumbName = $dirthumb.'/'.getImageFileNameForSize($file, $extName, $extImgTarget); // Chemin complet du fichier de la vignette // Check if permission are ok //$fp = fopen($imgThumbName, "w"); diff --git a/htdocs/theme/eldy/img/object_user.png b/htdocs/theme/eldy/img/object_user.png index d26d8899ee80f1e4976260b265a3e7d75ebab61d..6452b94da6803fa598cfacb8c6bbe0b61232a0b1 100644 GIT binary patch delta 637 zcmV-@0)qYD1d9cb8Gi-<0019IEztk~00v@9M??Vs0RI60puMM)00009a7bBm000XU z000XU0RWnu7ytkO2XskIMF-ys84(~Mj1>7*0006QNkl$@!A=uV6o$WhXUdeO z&;o*Bi3^BOT@;w25H_+maigwWn7G0xa3@c|Gxz{J0S{nIG=I)Q)EO{dwa3(`vgG%fZGRr z-=|P0xDOw#?##}XUWLsNi?Fm@c`ITIz?(h8usW5uz#!C7~(IXgS+Dy^&{ zc51cSU&oD&wf=4N!o7vEo5|cy(lk~|0bqyp?yGt#;?)qPZnv$3cytbY2uWP@V=X5-X98Sh=(!ms-)DTbSoJ X@GAtI0IY4*00000NkvXXu0mjfk?J6G literal 607 zcmb`C&ubGw6vwx=AvHCnNGddzqJm)cVo^$q7qcXqge1h6Rtz3m7V$@{s9Or@s-SGu z+713-5yjDiFhbKzAmD&0OfSMvQT8CXD&k&R9MjA6)Zh<@v;GZ!c<=jt?;RfR&8AaF z{l1`2k|cjD8qNssbhEux=$=R4R)l#cW66m3i??^{?tMO1d@DwqFGWwPlH^-=vqdf+ zd@P1-XF|!4BvtQq{2BL%el4BIMuz+2@<2u&$i;{Axww+cXo`~0E1Ih4YTi^;O;dGE zH4R-ibi>ers7%BB2Lgr$OdYsD2y_Sx2oQ7;iV-xCs}#9lgeZnU7{($5gg}E}NH8VD zBm@ycDAXx|lv2wAmSx#Cwr$(7f#YDuaTrpWLl}dMA;vIcqP7@goFUFI=a6%ugmcQd z%{gyy+~Bm)5YcEho5dixD85cjW>UvR`~Q&2$={aP{5%#8W!pa~>z+;ioep)mIc>bvd1gCc@!dZp*SqI`po8=photo)) { $label.= '
'; - $label.= Form::showphoto('userphoto', $this, 80, 0, 0, 'photowithmargin photologintooltip'); + $label.= Form::showphoto('userphoto', $this, 80, 0, 0, 'photowithmargin photologintooltip', 'small'); $label.= '
'; } @@ -1932,13 +1932,14 @@ class User extends CommonObject $paddafterimage=''; if (abs($withpictoimg) == 1) $paddafterimage='style="padding-right: 3px;"'; if ($withpictoimg > 0) $picto='
'.img_object('', 'user', $paddafterimage.' '.($notooltip?'':'class="classfortooltip"')).'
'; - else $picto='
'.Form::showphoto('userphoto', $this, 0, 0, 0, 'loginphoto',0,0).'
'; + else $picto='
'.Form::showphoto('userphoto', $this, 0, 0, 0, 'loginphoto', 0, 0, 'mini').'
'; $result.=$picto; } if (abs($withpictoimg) != 2) { if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $result.='
'; - $result.=$this->getFullName($langs,'',($mode == 'firstname' ? 2 : -1),$maxlen); + if ($mode == 'login') $result.=dol_trunc($this->login, $maxlen); + else $result.=$this->getFullName($langs,'',($mode == 'firstname' ? 2 : -1),$maxlen); if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $result.='
'; } $result.=$linkend; @@ -2398,7 +2399,7 @@ class User extends CommonObject $this->load_parentof(); // Init $this->users array - $sql = "SELECT DISTINCT u.rowid, u.firstname, u.lastname, u.fk_user, u.fk_soc, u.login, u.email, u.gender, u.admin, u.statut, u.entity"; // Distinct reduce pb with old tables with duplicates + $sql = "SELECT DISTINCT u.rowid, u.firstname, u.lastname, u.fk_user, u.fk_soc, u.login, u.email, u.gender, u.admin, u.statut, u.photo, u.entity"; // Distinct reduce pb with old tables with duplicates $sql.= " FROM ".MAIN_DB_PREFIX."user as u"; if(! empty($conf->multicompany->enabled) && $conf->entity == 1 && (! empty($conf->multicompany->transverse_mode) || (! empty($user->admin) && empty($user->entity)))) { @@ -2429,6 +2430,7 @@ class User extends CommonObject $this->users[$obj->rowid]['email'] = $obj->email; $this->users[$obj->rowid]['gender'] = $obj->gender; $this->users[$obj->rowid]['admin'] = $obj->admin; + $this->users[$obj->rowid]['photo'] = $obj->photo; $i++; } } diff --git a/htdocs/user/group/index.php b/htdocs/user/group/index.php index 058f3ac92e2..f515c8307e7 100644 --- a/htdocs/user/group/index.php +++ b/htdocs/user/group/index.php @@ -94,7 +94,7 @@ if ($resql) print_liste_field_titre($langs->trans("Entity"),$_SERVER["PHP_SELF"],"g.entity",$param,"",'align="center"',$sortfield,$sortorder); } print_liste_field_titre($langs->trans("NbOfUsers"),$_SERVER["PHP_SELF"],"nb",$param,"",'align="center"',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("DateCreation"),$_SERVER["PHP_SELF"],"g.datec",$param,"",'align="right"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("DateCreationShort"),$_SERVER["PHP_SELF"],"g.datec",$param,"",'align="right"',$sortfield,$sortorder); print "\n"; $var=True; while ($i < $num) diff --git a/htdocs/user/hierarchy.php b/htdocs/user/hierarchy.php index a9aef6ed783..14b8ec4265b 100644 --- a/htdocs/user/hierarchy.php +++ b/htdocs/user/hierarchy.php @@ -82,6 +82,7 @@ foreach($fulltree as $key => $val) { $userstatic->id=$val['id']; $userstatic->ref=$val['label']; + $userstatic->login=$val['login']; $userstatic->firstname=$val['firstname']; $userstatic->lastname=$val['lastname']; $userstatic->statut=$val['statut']; @@ -90,6 +91,7 @@ foreach($fulltree as $key => $val) $userstatic->societe_id=$val['fk_soc']; $userstatic->admin=$val['admin']; $userstatic->entity=$val['entity']; + $userstatic->photo=$val['photo']; $entity=$val['entity']; $entitystring=''; @@ -111,7 +113,7 @@ foreach($fulltree as $key => $val) } } - $li=$userstatic->getNomUrl(1,'',0,1); + $li=$userstatic->getNomUrl(-1,'',0,1); if (! empty($conf->multicompany->enabled) && $userstatic->admin && ! $userstatic->entity) { $li.=img_picto($langs->trans("SuperAdministrator"),'redstar'); @@ -121,12 +123,12 @@ foreach($fulltree as $key => $val) $li.=img_picto($langs->trans("Administrator"),'star'); } $li.=' ('.$val['login'].($entitystring?' - '.$entitystring:'').')'; - + $data[] = array( 'rowid'=>$val['rowid'], 'fk_menu'=>$val['fk_user'], 'statut'=>$val['statut'], - 'entry'=>'
'.$li.''.$userstatic->getLibStatut(5).'
' + 'entry'=>'
'.$li.''.$userstatic->getLibStatut(3).'
' ); } diff --git a/htdocs/user/index.php b/htdocs/user/index.php index 40fe8353093..7688cadbe05 100644 --- a/htdocs/user/index.php +++ b/htdocs/user/index.php @@ -124,11 +124,11 @@ $buttonviewhierarchy='
attribute_list as $key => $val) $sql.=",ef.".$key.' as options_'.$key; @@ -341,10 +341,11 @@ if ($result) $userstatic->email=$obj->email; $userstatic->gender=$obj->gender; $userstatic->societe_id=$obj->fk_soc; - $userstatic->firstname=''; - $userstatic->lastname=$obj->login; + $userstatic->firstname=$obj->firstname; + $userstatic->lastname=$obj->lastname; + $userstatic->photo=$obj->photo; - $li=$userstatic->getNomUrl(1,'',0,0,24,1); + $li=$userstatic->getNomUrl(-1,'',0,0,24,1,'login'); print ""; if (! empty($arrayfields['u.login']['checked'])) @@ -418,12 +419,24 @@ if ($result) print ''; if ($obj->login2) { + $user2->id=$obj->id2; $user2->login=$obj->login2; - //$user2->lastname=$obj->lastname2; - //$user2->firstname=$obj->firstname2; - $user2->lastname=$user2->login; - $user2->firstname=''; - print $user2->getNomUrl(1); + $user2->lastname=$obj->lastname2; + $user2->firstname=$obj->firstname2; + $user2->gender=$obj->gender2; + $user2->photo=$obj->photo2; + $user2->admin=$obj->admin2; + $user2->email=$obj->email2; + $user2->societe_id=$obj->fk_soc2; + print $user2->getNomUrl(-1,'',0,0,24,0,''); + if (! empty($conf->multicompany->enabled) && $obj->admin2 && ! $obj->entity2) + { + print img_picto($langs->trans("SuperAdministrator"),'redstar'); + } + else if ($obj->admin2) + { + print img_picto($langs->trans("Administrator"),'star'); + } } print ''; } From 48ed8d440869b64f532c079055660bbb42fefe8b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 25 Oct 2015 19:42:00 +0100 Subject: [PATCH 27/31] FIX The thumb of user into top menu was using the image in full size. This make a large download at each page call. We must use the mini thumbs. --- htdocs/core/class/html.form.class.php | 10 +++++++-- htdocs/core/lib/functions.lib.php | 29 +++++++++++++++++++++++++++ htdocs/main.inc.php | 2 +- htdocs/user/class/user.class.php | 5 +++-- 4 files changed, 41 insertions(+), 5 deletions(-) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index b75bd01d2aa..9b0ef17b465 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -5134,10 +5134,11 @@ class Form * @param int $width Width of photo * @param int $height Height of photo (auto if 0) * @param int $caneditfield Add edit fields + * @param string $imagesize 'mini', 'small' or '' (original) * @param string $cssclass CSS name to use on img for photo * @return string HTML code to output photo */ - static function showphoto($modulepart, $object, $width=100, $height=0, $caneditfield=0, $cssclass='photowithmargin') + static function showphoto($modulepart, $object, $width=100, $height=0, $caneditfield=0, $cssclass='photowithmargin', $imagesize='') { global $conf,$langs; @@ -5156,7 +5157,12 @@ class Form else if ($modulepart=='userphoto') { $dir=$conf->user->dir_output; - if ($object->photo) $file=get_exdir($id, 2, 0, 0, $object, 'user').$object->photo; + if (! empty($object->photo)) + { + if ($imagesize == 'mini') $file=get_exdir($id, 2, 0, 0, $object, 'user').getImageFileNameForSize($object->photo, '_mini'); + else if ($imagesize == 'small') $file=get_exdir($id, 2, 0, 0, $object, 'user').getImageFileNameForSize($object->photo, '_small'); + else $file=get_exdir($id, 2, 0, 0, $object, 'user').$object->photo; + } if (! empty($conf->global->MAIN_OLD_IMAGE_LINKS)) $altfile=$object->id.".jpg"; // For backward compatibility $email=$object->email; } diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 290cdb2300b..04c2c02a7d5 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -5118,3 +5118,32 @@ function natural_search($fields, $value, $mode=0, $nofirstand=0) return $res; } +/** + * Return the filename of file to get the thumbs + * + * @param string $file Original filename + * @param string $extName Extension to differenciate thumb file name ('', '_small', '_mini') + * @param string $extImgTarget Force image format for thumbs. Use '' to keep same extension than original image. + * @return string New file name + */ +function getImageFileNameForSize($file, $extName, $extImgTarget='') +{ + $dirName = dirname($file); + if ($dirName == '.') $dirName=''; + + $fileName = preg_replace('/(\.gif|\.jpeg|\.jpg|\.png|\.bmp)$/i','',$file); // On enleve extension quelquesoit la casse + $fileName = basename($fileName); + + if (empty($extImgTarget)) $extImgTarget = (preg_match('/\.jpg$/i',$file)?'.jpg':''); + if (empty($extImgTarget)) $extImgTarget = (preg_match('/\.jpeg$/i',$file)?'.jpeg':''); + if (empty($extImgTarget)) $extImgTarget = (preg_match('/\.gif$/i',$file)?'.gif':''); + if (empty($extImgTarget)) $extImgTarget = (preg_match('/\.png$/i',$file)?'.png':''); + if (empty($extImgTarget)) $extImgTarget = (preg_match('/\.bmp$/i',$file)?'.bmp':''); + + if (! $extImgTarget) return $file; + + $subdir=''; + if ($extName) $subdir = 'thumbs/'; + + return $dirName.$subdir.$fileName.$extName.$extImgTarget; // New filename for thumb +} diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 51147a03a9c..92d421d42cb 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -1443,7 +1443,7 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a // User photo $toprightmenu.='
'; // Login name with tooltip diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index e375a3c3d80..4459dfc3fc0 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -1813,14 +1813,15 @@ class User extends CommonObject * @param int $width Width of image * @param int $height Height of image * @param string $cssclass Force a css class + * @param string $imagesize 'mini', 'small' or '' (original) * @return string String with URL link */ - function getPhotoUrl($width, $height, $cssclass='') + function getPhotoUrl($width, $height, $cssclass='', $imagesize='') { $result=''; $result.=''; - $result.=Form::showphoto('userphoto', $this, $width, $height, 0, $cssclass); + $result.=Form::showphoto('userphoto', $this, $width, $height, 0, $cssclass, $imagesize); $result.=''; return $result; From d7761ece58ea0cfaf8ede926b3e3a5dc42427cdd Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 25 Oct 2015 19:42:54 +0100 Subject: [PATCH 28/31] FIX The thumb of user into top menu was using the image in full size. This make a large download at each page call. We must use the mini thumbs. --- htdocs/core/class/html.form.class.php | 3 +-- htdocs/user/class/user.class.php | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 6bb8049f6f6..a192b54c200 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -5258,7 +5258,7 @@ class Form * @param int $addlinktofullsize Add link to fullsize image * @return string HTML code to output photo */ - static function showphoto($modulepart, $object, $width=100, $height=0, $caneditfield=0, $cssclass='photowithmargin', $imagesize='',$addlinktofullsize=1) + static function showphoto($modulepart, $object, $width=100, $height=0, $caneditfield=0, $cssclass='photowithmargin', $imagesize='', $addlinktofullsize=1) { global $conf,$langs; @@ -5294,7 +5294,6 @@ class Form $dir=$conf->user->dir_output; if (! empty($object->photo)) { - //var_dump(getImageFileNameForSize($object->photo, '_mini')); if ($imagesize == 'mini') $file=get_exdir($id, 2, 0, 0, $object, 'user').getImageFileNameForSize($object->photo, '_mini'); else if ($imagesize == 'small') $file=get_exdir($id, 2, 0, 0, $object, 'user').getImageFileNameForSize($object->photo, '_small'); else $file=get_exdir($id, 2, 0, 0, $object, 'user').$object->photo; diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index dd63a144226..e281f4002f3 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -1825,14 +1825,15 @@ class User extends CommonObject * @param int $width Width of image * @param int $height Height of image * @param string $cssclass Force a css class + * @param string $imagesize 'mini', 'small' or '' (original) * @return string String with URL link */ - function getPhotoUrl($width, $height, $cssclass='') + function getPhotoUrl($width, $height, $cssclass='', $imagesize='') { $result=''; $result.=''; - $result.=Form::showphoto('userphoto', $this, $width, $height, 0, $cssclass); + $result.=Form::showphoto('userphoto', $this, $width, $height, 0, $cssclass, $imagesize); $result.=''; return $result; From 24732cf454405793f35ddae77d02f343bb4824bf Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 25 Oct 2015 20:01:39 +0100 Subject: [PATCH 29/31] Fix to avoid duplicate tooltip --- htdocs/adherents/class/adherent.class.php | 2 +- htdocs/user/class/user.class.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php index e828117327b..77437667c33 100644 --- a/htdocs/adherents/class/adherent.class.php +++ b/htdocs/adherents/class/adherent.class.php @@ -1575,7 +1575,7 @@ class Adherent extends CommonObject $picto='user'; - if ($withpicto) $result.=($link.img_object($label, $picto, 'class="classfortooltip"').$linkend); + if ($withpicto) $result.=($link.img_object('', $picto, 'class="classfortooltip"').$linkend); if ($withpicto && $withpicto != 2) $result.=' '; $result.=$link.($maxlen?dol_trunc($this->ref,$maxlen):$this->ref).$linkend; return $result; diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index e281f4002f3..d4358bb2b0a 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -1845,7 +1845,7 @@ class User extends CommonObject * * @param int $withpictoimg Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto, -1=Include photo into link, -2=Only picto photo) * @param string $option On what the link point to - * @param integer $infologin Add connection info to the tooltip + * @param integer $infologin Add complete info tooltip * @param integer $notooltip 1=Disable tooltip on picto and name * @param int $maxlen Max length of visible user name * @param int $hidethirdpartylogo Hide logo of thirdparty if user is external user From 54883f2d84c788182fadf10a4c11f1bcf990b604 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 25 Oct 2015 20:14:57 +0100 Subject: [PATCH 30/31] FIX Bad picto for expense report --- htdocs/expensereport/class/expensereport.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php index 920c6aa16d7..0dba68b5b5c 100644 --- a/htdocs/expensereport/class/expensereport.class.php +++ b/htdocs/expensereport/class/expensereport.class.php @@ -1534,7 +1534,7 @@ class ExpenseReport extends CommonObject $response->warning_delay=$conf->expensereport->payment->warning_delay/60/60/24; $response->label=$langs->trans("ExpenseReportsToPay"); $response->url=DOL_URL_ROOT.'/expensereport/list.php?mainmenu=hrm&statut=5'; - $response->img=img_object($langs->trans("ExpenseReports"),"user"); + $response->img=img_object($langs->trans("ExpenseReports"),"trip"); while ($obj=$this->db->fetch_object($resql)) { From 9a4b62c279dc0c16c1457c787ea0c7a5fdeb67a2 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 25 Oct 2015 20:15:52 +0100 Subject: [PATCH 31/31] NEW Introduce use of cache for thumbs images of users --- htdocs/core/class/html.form.class.php | 27 ++++++++++++++++----------- htdocs/user/class/user.class.php | 4 ++-- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index a192b54c200..5f714a85bcd 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -5256,9 +5256,10 @@ class Form * @param string $cssclass CSS name to use on img for photo * @param string $imagesize 'mini', 'small' or '' (original) * @param int $addlinktofullsize Add link to fullsize image + * @param int $cache 1=Accept to use image in cache * @return string HTML code to output photo */ - static function showphoto($modulepart, $object, $width=100, $height=0, $caneditfield=0, $cssclass='photowithmargin', $imagesize='', $addlinktofullsize=1) + static function showphoto($modulepart, $object, $width=100, $height=0, $caneditfield=0, $cssclass='photowithmargin', $imagesize='', $addlinktofullsize=1, $cache=0) { global $conf,$langs; @@ -5274,8 +5275,8 @@ class Form $smallfile=preg_replace('/(\.png|\.gif|\.jpg|\.jpeg|\.bmp)/i','_small\\1',$smallfile); if (! empty($object->logo)) { - if ($imagesize == 'mini') $file=$id.'/logos/thumbs/'.getImageFileNameForSize($object->logo, '_mini'); - else if ($imagesize == 'small') $file=$id.'/logos/thumbs/'.getImageFileNameForSize($object->logo, '_small'); + if ((string) $imagesize == 'mini') $file=$id.'/logos/thumbs/'.getImageFileNameForSize($object->logo, '_mini'); + else if ((string) $imagesize == 'small') $file=$id.'/logos/thumbs/'.getImageFileNameForSize($object->logo, '_small'); else $file=$id.'/logos/thumbs/'.$smallfile; } } @@ -5284,8 +5285,8 @@ class Form $dir=$conf->societe->multidir_output[$entity].'/contact'; if (! empty($object->photo)) { - if ($imagesize == 'mini') $file=$id.'/photos/thumbs/'.getImageFileNameForSize($object->photo, '_mini'); - else if ($imagesize == 'small') $file=$id.'/photos/thumbs/'.getImageFileNameForSize($object->photo, '_small'); + if ((string) $imagesize == 'mini') $file=$id.'/photos/thumbs/'.getImageFileNameForSize($object->photo, '_mini'); + else if ((string) $imagesize == 'small') $file=$id.'/photos/thumbs/'.getImageFileNameForSize($object->photo, '_small'); else $file=$id.'/photos/'.$object->photo; } } @@ -5294,8 +5295,8 @@ class Form $dir=$conf->user->dir_output; if (! empty($object->photo)) { - if ($imagesize == 'mini') $file=get_exdir($id, 2, 0, 0, $object, 'user').getImageFileNameForSize($object->photo, '_mini'); - else if ($imagesize == 'small') $file=get_exdir($id, 2, 0, 0, $object, 'user').getImageFileNameForSize($object->photo, '_small'); + if ((string) $imagesize == 'mini') $file=get_exdir($id, 2, 0, 0, $object, 'user').getImageFileNameForSize($object->photo, '_mini'); + else if ((string) $imagesize == 'small') $file=get_exdir($id, 2, 0, 0, $object, 'user').getImageFileNameForSize($object->photo, '_small'); else $file=get_exdir($id, 2, 0, 0, $object, 'user').$object->photo; } if (! empty($conf->global->MAIN_OLD_IMAGE_LINKS)) $altfile=$object->id.".jpg"; // For backward compatibility @@ -5306,8 +5307,8 @@ class Form $dir=$conf->adherent->dir_output; if (! empty($object->photo)) { - if ($imagesize == 'mini') $file=get_exdir($id, 2, 0, 0, $object, 'member').'photos/'.getImageFileNameForSize($object->photo, '_mini'); - else if ($imagesize == 'small') $file=get_exdir($id, 2, 0, 0, $object, 'member').'photos/'.getImageFileNameForSize($object->photo, '_small'); + if ((string) $imagesize == 'mini') $file=get_exdir($id, 2, 0, 0, $object, 'member').'photos/'.getImageFileNameForSize($object->photo, '_mini'); + else if ((string) $imagesize == 'small') $file=get_exdir($id, 2, 0, 0, $object, 'member').'photos/'.getImageFileNameForSize($object->photo, '_small'); else $file=get_exdir($id, 2, 0, 0, $object, 'member').'photos/'.$object->photo; } if (! empty($conf->global->MAIN_OLD_IMAGE_LINKS)) $altfile=$object->id.".jpg"; // For backward compatibility @@ -5316,14 +5317,18 @@ class Form else { $dir=$conf->$modulepart->dir_output; - if (! empty($object->photo)) $file=get_exdir($id, 2, 0, 0, $object, $modulepart).'photos/'.$object->photo; + if (! empty($object->photo)) + { + if ((string) $imagesize == 'mini') $file=get_exdir($id, 2, 0, 0, $object, $modulepart).'photos/'.getImageFileNameForSize($object->photo, '_mini'); + else if ((string) $imagesize == 'small') $file=get_exdir($id, 2, 0, 0, $object, $modulepart).'photos/'.getImageFileNameForSize($object->photo, '_small'); + else $file=get_exdir($id, 2, 0, 0, $object, $modulepart).'photos/'.$object->photo; + } if (! empty($conf->global->MAIN_OLD_IMAGE_LINKS)) $altfile=$object->id.".jpg"; // For backward compatibility $email=$object->email; } if ($dir) { - $cache='0'; if ($file && file_exists($dir."/".$file)) { if ($addlinktofullsize) $ret.=''; diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index d4358bb2b0a..f16af2ee72d 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -1886,7 +1886,7 @@ class User extends CommonObject if (! empty($this->photo)) { $label.= '
'; - $label.= Form::showphoto('userphoto', $this, 80, 0, 0, 'photowithmargin photologintooltip', 'small'); + $label.= Form::showphoto('userphoto', $this, 80, 0, 0, 'photowithmargin photologintooltip', 'small', 0, 1); $label.= '
'; } @@ -1933,7 +1933,7 @@ class User extends CommonObject $paddafterimage=''; if (abs($withpictoimg) == 1) $paddafterimage='style="padding-right: 3px;"'; if ($withpictoimg > 0) $picto='
'.img_object('', 'user', $paddafterimage.' '.($notooltip?'':'class="classfortooltip"')).'
'; - else $picto='
'.Form::showphoto('userphoto', $this, 0, 0, 0, 'loginphoto', 0, 0, 'mini').'
'; + else $picto='
'.Form::showphoto('userphoto', $this, 0, 0, 0, 'loginphoto', 'mini', 0, 1).'
'; $result.=$picto; } if (abs($withpictoimg) != 2)