From fd3ba131307c9cc54f69d8f7186b2786e73da9a6 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 18 Oct 2015 21:33:47 +0200 Subject: [PATCH 01/45] 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/45] 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/45] 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/45] 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/45] 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/45] 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/45] 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/45] 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/45] 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 3767ab437e6ba5cc126977ac5419ef818c4b5819 Mon Sep 17 00:00:00 2001 From: philippe grand Date: Fri, 23 Oct 2015 12:58:30 +0200 Subject: [PATCH 10/45] [Qual] Uniformize code --- htdocs/accountancy/bookkeeping/card.php | 26 +++++----- htdocs/accountancy/bookkeeping/list.php | 4 +- htdocs/accountancy/customer/card.php | 2 +- htdocs/accountancy/customer/index.php | 4 +- htdocs/accountancy/customer/lines.php | 6 +-- htdocs/accountancy/journal/bankjournal.php | 6 +-- .../accountancy/journal/purchasesjournal.php | 8 +-- htdocs/accountancy/journal/sellsjournal.php | 8 +-- htdocs/accountancy/supplier/card.php | 2 +- htdocs/accountancy/supplier/index.php | 4 +- htdocs/accountancy/supplier/lines.php | 6 +-- htdocs/adherents/admin/adherent.php | 6 +-- htdocs/adherents/admin/public.php | 4 +- htdocs/adherents/card.php | 50 +++++++++---------- htdocs/adherents/card_subscriptions.php | 6 +-- htdocs/adherents/ldap.php | 4 +- htdocs/admin/agenda.php | 4 +- htdocs/admin/agenda_extsites.php | 6 +-- htdocs/admin/agenda_xcal.php | 4 +- htdocs/admin/askpricesupplier.php | 28 +++++------ htdocs/admin/bank.php | 4 +- htdocs/admin/barcode.php | 8 +-- htdocs/admin/boxes.php | 4 +- htdocs/admin/clicktodial.php | 4 +- htdocs/admin/commande.php | 34 ++++++------- htdocs/admin/company.php | 12 ++--- htdocs/admin/compta.php | 6 +-- htdocs/admin/const.php | 8 +-- htdocs/admin/contract.php | 18 +++---- htdocs/admin/dict.php | 18 +++---- htdocs/admin/menus/edit.php | 14 +++--- htdocs/admin/menus/index.php | 4 +- htdocs/admin/tools/dolibarr_export.php | 4 +- htdocs/admin/tools/export.php | 10 ++-- htdocs/admin/tools/update.php | 14 +++--- 35 files changed, 175 insertions(+), 175 deletions(-) diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php index d4c256dfbf2..0500ac4a0a7 100644 --- a/htdocs/accountancy/bookkeeping/card.php +++ b/htdocs/accountancy/bookkeeping/card.php @@ -52,7 +52,7 @@ if ($action == "confirm_update") { $error = 0; if ((floatval($debit)!=0.0) && (floatval($credit)!=0.0)) { - setEventMessage($langs->trans('ErrorDebitCredit'), 'errors'); + setEventMessages($langs->trans('ErrorDebitCredit'), null, 'errors'); $error ++; } @@ -61,7 +61,7 @@ if ($action == "confirm_update") { $result = $book->fetch($id); if ($result < 0) { - setEventMessage($book->errors, 'errors'); + setEventMessages($book->error, $book->errors, 'errors'); } else { $book->numero_compte = $numero_compte; $book->code_tiers = $code_tiers; @@ -80,9 +80,9 @@ if ($action == "confirm_update") { $result = $book->update(); if ($result < 0) { - setEventMessage($book->errors, 'errors'); + setEventMessages($book->error, $book->errors, 'errors'); } else { - setEventMessage($langs->trans('Saved'), 'mesgs'); + setEventMessages($langs->trans('Saved'), null, 'mesgs'); $action = ''; } } @@ -93,7 +93,7 @@ else if ($action == "add") { $error = 0; if ((intval($debit) != 0) && (intval($credit) != 0)) { - setEventMessage($langs->trans('ErrorDebitCredit'), 'errors'); + setEventMessages($langs->trans('ErrorDebitCredit'), null, 'errors'); $error ++; } @@ -124,9 +124,9 @@ else if ($action == "add") { $result = $book->create_std($user); if ($result < 0) { - setEventMessage($book->errors, 'errors'); + setEventMessages($book->error, $book->errors, 'errors'); } else { - setEventMessage($langs->trans('Saved'), 'mesgs'); + setEventMessages($langs->trans('Saved'), null, 'mesgs'); $action = ''; } } @@ -140,11 +140,11 @@ else if ($action == "confirm_delete") { $piece_num = $book->piece_num; if ($result < 0) { - setEventMessage($book->errors, 'errors'); + setEventMessages($book->error, $book->errors, 'errors'); } else { $result = $book->delete($user); if ($result < 0) { - setEventMessage($book->errors, 'errors'); + setEventMessages($book->error, $book->errors, 'errors'); } } $action = ''; @@ -168,9 +168,9 @@ else if ($action == "confirm_create") { $result = $book->create_std($user); if ($result < 0) { - setEventMessage($book->errors, 'errors'); + setEventMessages($book->error, $book->errors, 'errors'); } else { - setEventMessage($langs->trans('Saved'), 'mesgs'); + setEventMessages($langs->trans('Saved'), null, 'mesgs'); $action = ''; $piece_num = $book->piece_num; } @@ -246,7 +246,7 @@ if ($action == 'create') { $book = new BookKeeping($db); $result = $book->fetch_per_mvt($piece_num); if ($result < 0) { - setEventMessage($book->errors, 'errors'); + setEventMessages($book->error, $book->errors, 'errors'); } if (! empty($book->piece_num)) { @@ -277,7 +277,7 @@ if ($action == 'create') { $result = $book->fetch_all_per_mvt($piece_num); if ($result < 0) { - setEventMessage($book->errors, 'errors'); + setEventMessages($book->error, $book->errors, 'errors'); } else { print load_fiche_titre($langs->trans("ListeMvts")); diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php index d9b6d66b503..b9164329031 100644 --- a/htdocs/accountancy/bookkeeping/list.php +++ b/htdocs/accountancy/bookkeeping/list.php @@ -74,7 +74,7 @@ if ($action == 'delbookkeeping') { $result = $object->delete_by_importkey($import_key); Header("Location: list.php"); if ($result < 0) { - setEventMessage($object->errors, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } } } // Export @@ -86,7 +86,7 @@ else if ($action == 'export_csv') { $object = new BookKeeping($db); $result = $object->export_bookkeping('ebp'); if ($result < 0) { - setEventMessage($object->errors, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } foreach ( $object->linesexport as $line ) { diff --git a/htdocs/accountancy/customer/card.php b/htdocs/accountancy/customer/card.php index 09e8b24a8ea..a3e179c1701 100644 --- a/htdocs/accountancy/customer/card.php +++ b/htdocs/accountancy/customer/card.php @@ -54,7 +54,7 @@ if ($action == 'ventil' && $user->rights->accounting->ventilation->dispatch) { dol_syslog("/accounting/customer/card.php sql=" . $sql, LOG_DEBUG); $resql = $db->query($sql); if (! $resql) { - setEventMessage($db->lasterror(), 'errors'); + setEventMessages($db->lasterror(), null, 'errors'); } } else { header("Location: ./lines.php"); diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php index ea37f237455..5a6de05691a 100644 --- a/htdocs/accountancy/customer/index.php +++ b/htdocs/accountancy/customer/index.php @@ -83,10 +83,10 @@ if ($action == 'validatehistory') { if (! $resql1) { $error ++; $db->rollback(); - setEventMessage($db->lasterror(), 'errors'); + setEventMessages($db->lasterror(), null, 'errors'); } else { $db->commit(); - setEventMessage($langs->trans('Dispatched'), 'mesgs'); + setEventMessages($langs->trans('Dispatched'), null, 'mesgs'); } } diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php index 01f34e700cc..a505c91c1c7 100644 --- a/htdocs/accountancy/customer/lines.php +++ b/htdocs/accountancy/customer/lines.php @@ -109,14 +109,14 @@ if (is_array($changeaccount) && count($changeaccount) > 0) { $resql1 = $db->query($sql1); if (! $resql1) { $error ++; - setEventMessage($db->lasterror(), 'errors'); + setEventMessages($db->lasterror(), null, 'errors'); } if (! $error) { $db->commit(); - setEventMessage($langs->trans('Save'), 'mesgs'); + setEventMessages($langs->trans('Save'), null, 'mesgs'); } else { $db->rollback(); - setEventMessage($db->lasterror(), 'errors'); + setEventMessages($db->lasterror(), null, 'errors'); } } diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php index 01957fcedf5..cd0c5d06ce5 100644 --- a/htdocs/accountancy/journal/bankjournal.php +++ b/htdocs/accountancy/journal/bankjournal.php @@ -343,7 +343,7 @@ if ($action == 'writeBookKeeping') $result = $bookkeeping->create(); if ($result < 0) { $error ++; - setEventMessage($object->errors, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } } // Third party @@ -420,13 +420,13 @@ if ($action == 'writeBookKeeping') $result = $bookkeeping->create(); if ($result < 0) { $error ++; - setEventMessage($object->errors, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } } } if (empty($error)) { - setEventMessage($langs->trans("GeneralLedgerIsWritten"),'mesgs'); + setEventMessages($langs->trans("GeneralLedgerIsWritten"), null, 'mesgs'); } } // Export diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php index 28b2dc736b6..538edaa471d 100644 --- a/htdocs/accountancy/journal/purchasesjournal.php +++ b/htdocs/accountancy/journal/purchasesjournal.php @@ -185,7 +185,7 @@ if ($action == 'writebookkeeping') { $result = $bookkeeping->create(); if ($result < 0) { $error ++; - setEventMessage($object->errors, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } } @@ -215,7 +215,7 @@ if ($action == 'writebookkeeping') { $result = $bookkeeping->create(); if ($result < 0) { $error ++; - setEventMessage($object->errors, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } } } @@ -246,14 +246,14 @@ if ($action == 'writebookkeeping') { $result = $bookkeeping->create(); if ($result < 0) { $error ++; - setEventMessage($object->errors, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } } } } if (empty($error)) { - setEventMessage($langs->trans("GeneralLedgerIsWritten"),'mesgs'); + setEventMessages($langs->trans("GeneralLedgerIsWritten"), null, 'mesgs'); } } diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php index 4437535738a..aaf3beea8a1 100644 --- a/htdocs/accountancy/journal/sellsjournal.php +++ b/htdocs/accountancy/journal/sellsjournal.php @@ -220,7 +220,7 @@ if ($action == 'writebookkeeping') $result = $bookkeeping->create(); if ($result < 0) { $error ++; - setEventMessage($object->errors, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } } @@ -250,7 +250,7 @@ if ($action == 'writebookkeeping') $result = $bookkeeping->create(); if ($result < 0) { $error ++; - setEventMessage($object->errors, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } } } @@ -282,14 +282,14 @@ if ($action == 'writebookkeeping') $result = $bookkeeping->create(); if ($result < 0) { $error ++; - setEventMessage($object->errors, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } } } } if (empty($error)) { - setEventMessage($langs->trans("GeneralLedgerIsWritten"),'mesgs'); + setEventMessages($langs->trans("GeneralLedgerIsWritten"), null, 'mesgs'); } } diff --git a/htdocs/accountancy/supplier/card.php b/htdocs/accountancy/supplier/card.php index f0747c8d29c..61b225fbc16 100644 --- a/htdocs/accountancy/supplier/card.php +++ b/htdocs/accountancy/supplier/card.php @@ -55,7 +55,7 @@ if ($action == 'ventil' && $user->rights->accounting->ventilation->dispatch) { dol_syslog('accountancy/supplier/card.php:: $sql=' . $sql); $resql = $db->query($sql); if (! $resql) { - setEventMessage($db->lasterror(), 'errors'); + setEventMessages($db->lasterror(), null, 'errors'); } } else { header("Location: ./lines.php"); diff --git a/htdocs/accountancy/supplier/index.php b/htdocs/accountancy/supplier/index.php index 954eb60300c..ec18d8b1e23 100644 --- a/htdocs/accountancy/supplier/index.php +++ b/htdocs/accountancy/supplier/index.php @@ -79,10 +79,10 @@ if ($action == 'validatehistory') { if (! $resql1) { $error ++; $db->rollback(); - setEventMessage($db->lasterror(), 'errors'); + setEventMessages($db->lasterror(), null, 'errors'); } else { $db->commit(); - setEventMessage($langs->trans('Dispatched'), 'mesgs'); + setEventMessages($langs->trans('Dispatched'), null, 'mesgs'); } } diff --git a/htdocs/accountancy/supplier/lines.php b/htdocs/accountancy/supplier/lines.php index f475e7046ad..e703bca6f2d 100644 --- a/htdocs/accountancy/supplier/lines.php +++ b/htdocs/accountancy/supplier/lines.php @@ -115,14 +115,14 @@ if (is_array($changeaccount) && count($changeaccount) > 0) { $resql1 = $db->query($sql1); if (! $resql1) { $error ++; - setEventMessage($db->lasterror(), 'errors'); + setEventMessages($db->lasterror(), null, 'errors'); } if (! $error) { $db->commit(); - setEventMessage($langs->trans('Save'), 'mesgs'); + setEventMessages($langs->trans('Save'), null, 'mesgs'); } else { $db->rollback(); - setEventMessage($db->lasterror(), 'errors'); + setEventMessages($db->lasterror(), null, 'errors'); } } diff --git a/htdocs/adherents/admin/adherent.php b/htdocs/adherents/admin/adherent.php index 5827e1d22d7..8e265eb70f7 100644 --- a/htdocs/adherents/admin/adherent.php +++ b/htdocs/adherents/admin/adherent.php @@ -7,7 +7,7 @@ * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2011-2012 Juanjo Menent * Copyright (C) 2012 J. Fernando Lagrange - * Copyright (C) 2015 Jean-François Ferry + * Copyright (C) 2015 Jean-François Ferry * * 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 @@ -69,11 +69,11 @@ if ($action == 'update' || $action == 'add') if (! $error) { - setEventMessage($langs->trans("SetupSaved")); + setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); } else { - setEventMessage($langs->trans("Error"), 'errors'); + setEventMessages($langs->trans("Error"), null, 'errors'); } } diff --git a/htdocs/adherents/admin/public.php b/htdocs/adherents/admin/public.php index 58cb7bb2f41..6f5d1de5c87 100644 --- a/htdocs/adherents/admin/public.php +++ b/htdocs/adherents/admin/public.php @@ -60,11 +60,11 @@ if ($action == 'update') if (! $error) { - setEventMessage($langs->trans("SetupSaved")); + setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); } else { - setEventMessage($langs->trans("Error"), 'errors'); + setEventMessages($langs->trans("Error"), null, 'errors'); } } diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php index 355aedb3e68..f998c2f08a3 100644 --- a/htdocs/adherents/card.php +++ b/htdocs/adherents/card.php @@ -4,7 +4,7 @@ * Copyright (C) 2004-2012 Laurent Destailleur * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2012 Marcos García - * Copyright (C) 2012-2013 Philippe Grand + * Copyright (C) 2012-2015 Philippe Grand * Copyright (C) 2015 Alexandre Spangaro * * This program is free software; you can redistribute it and/or modify @@ -133,7 +133,7 @@ if (empty($reshook)) if ($userid != $user->id && $userid != $object->user_id) { $error++; - setEventMessage($langs->trans("ErrorUserPermissionAllowsToLinksToItselfOnly"), 'errors'); + setEventMessages($langs->trans("ErrorUserPermissionAllowsToLinksToItselfOnly"), null, 'errors'); } } @@ -169,7 +169,7 @@ if (empty($reshook)) $thirdparty=new Societe($db); $thirdparty->fetch($socid); $error++; - setEventMessage($langs->trans("ErrorMemberIsAlreadyLinkedToThisThirdParty",$othermember->getFullName($langs),$othermember->login,$thirdparty->name), 'errors'); + setEventMessages($langs->trans("ErrorMemberIsAlreadyLinkedToThisThirdParty",$othermember->getFullName($langs),$othermember->login,$thirdparty->name), null, 'errors'); } } @@ -195,12 +195,12 @@ if (empty($reshook)) if ($result < 0) { $langs->load("errors"); - setEventMessage($langs->trans($nuser->error), 'errors'); + setEventMessages($langs->trans($nuser->error), null, 'errors'); } } else { - setEventMessage($object->error, 'errors'); + setEventMessages($object->errors, $object->error, 'errors'); } } @@ -216,13 +216,13 @@ if (empty($reshook)) if ($result < 0) { $langs->load("errors"); - setEventMessage($langs->trans($company->error), 'errors'); - setEventMessage($company->errors, 'errors'); + setEventMessages($langs->trans($company->error), null, 'errors'); + setEventMessages($company->error, $company->errors, 'errors'); } } else { - setEventMessage($object->error, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } } @@ -236,7 +236,7 @@ if (empty($reshook)) $result=$object->send_an_email($langs->transnoentitiesnoconv("ThisIsContentOfYourCard")."\n\n%INFOS%\n\n",$langs->transnoentitiesnoconv("CardContent")); $langs->load("mails"); - setEventMessage($langs->trans("MailSuccessfulySent", $from, $object->email)); + setEventMessages($langs->trans("MailSuccessfulySent", $from, $object->email), null, 'mesgs'); } } @@ -352,7 +352,7 @@ if (empty($reshook)) $newfile=$dir.'/'.dol_sanitizeFileName($_FILES['photo']['name']); if (! dol_move_uploaded_file($_FILES['photo']['tmp_name'],$newfile,1,0,$_FILES['photo']['error']) > 0) { - setEventMessage($langs->trans("ErrorFailedToSaveFile"), 'errors'); + setEventMessages($langs->trans("ErrorFailedToSaveFile"), null, 'errors'); } else { @@ -368,7 +368,7 @@ if (empty($reshook)) } else { - setEventMessage("ErrorBadImageFormat", 'errors'); + setEventMessages("ErrorBadImageFormat", null, 'errors'); } } else @@ -397,9 +397,9 @@ if (empty($reshook)) else { if ($object->error) { - setEventMessage($object->error, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } else { - setEventMessage($object->errors, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } $action=''; } @@ -503,7 +503,7 @@ if (empty($reshook)) if ($num) { $error++; $langs->load("errors"); - setEventMessage($langs->trans("ErrorLoginAlreadyExists",$login), 'errors'); + setEventMessages($langs->trans("ErrorLoginAlreadyExists",$login), null, 'errors'); } } if (empty($pass)) { @@ -528,7 +528,7 @@ if (empty($reshook)) if ($conf->global->ADHERENT_MAIL_REQUIRED && ! isValidEMail($email)) { $error++; $langs->load("errors"); - setEventMessage($langs->trans("ErrorBadEMail",$email), 'errors'); + setEventMessages($langs->trans("ErrorBadEMail",$email), null, 'errors'); } $public=0; if (isset($public)) $public=1; @@ -554,9 +554,9 @@ if (empty($reshook)) $db->rollback(); if ($object->error) { - setEventMessage($object->error, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } else { - setEventMessage($object->errors, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } $action = 'create'; @@ -609,7 +609,7 @@ if (empty($reshook)) if ($result < 0) { $error++; - setEventMessage($object->error, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } } } @@ -617,9 +617,9 @@ if (empty($reshook)) { $error++; if ($object->error) { - setEventMessage($object->error, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } else { - setEventMessage($object->errors, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } } @@ -654,7 +654,7 @@ if (empty($reshook)) if ($result < 0) { $error++; - setEventMessage($object->error, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } } else @@ -662,9 +662,9 @@ if (empty($reshook)) $error++; if ($object->error) { - setEventMessage($object->error, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } else { - setEventMessage($object->errors, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } $action=''; } @@ -683,7 +683,7 @@ if (empty($reshook)) { if (!$mailmanspip->del_to_spip($object)) { - setEventMessage($langs->trans('DeleteIntoSpipError').': '.$mailmanspip->error, 'errors'); + setEventMessages($langs->trans('DeleteIntoSpipError').': '.$mailmanspip->error, null, 'errors'); } } } @@ -694,7 +694,7 @@ if (empty($reshook)) { if (!$mailmanspip->add_to_spip($object)) { - setEventMessage($langs->trans('AddIntoSpipError').': '.$mailmanspip->error, 'errors'); + setEventMessages($langs->trans('AddIntoSpipError').': '.$mailmanspip->error, null, 'errors'); } } } diff --git a/htdocs/adherents/card_subscriptions.php b/htdocs/adherents/card_subscriptions.php index fa440c3bac4..9d86f618618 100644 --- a/htdocs/adherents/card_subscriptions.php +++ b/htdocs/adherents/card_subscriptions.php @@ -110,7 +110,7 @@ if ($action == 'confirm_create_thirdparty' && $confirm == 'yes' && $user->rights { $langs->load("errors"); $errmsg=$langs->trans($company->error); - setEventMessage($company->errors, 'errors'); + setEventMessages($company->error, $company->errors, 'errors'); } else { @@ -131,7 +131,7 @@ if ($action == 'setuserid' && ($user->rights->user->self->creer || $user->rights if ($_POST["userid"] != $user->id && $_POST["userid"] != $object->user_id) { $error++; - setEventMessage($langs->trans("ErrorUserPermissionAllowsToLinksToItselfOnly"), 'errors'); + setEventMessages($langs->trans("ErrorUserPermissionAllowsToLinksToItselfOnly"), null, 'errors'); } } @@ -167,7 +167,7 @@ if ($action == 'setsocid') $thirdparty=new Societe($db); $thirdparty->fetch(GETPOST('socid','int')); $error++; - setEventMessage($langs->trans("ErrorMemberIsAlreadyLinkedToThisThirdParty",$othermember->getFullName($langs),$othermember->login,$thirdparty->name), 'errors'); + setEventMessages($langs->trans("ErrorMemberIsAlreadyLinkedToThisThirdParty",$othermember->getFullName($langs),$othermember->login,$thirdparty->name), null, 'errors'); } } diff --git a/htdocs/adherents/ldap.php b/htdocs/adherents/ldap.php index a2848b655b3..4d9a779d579 100644 --- a/htdocs/adherents/ldap.php +++ b/htdocs/adherents/ldap.php @@ -72,12 +72,12 @@ if ($action == 'dolibarr2ldap') if ($result >= 0) { - setEventMessage($langs->trans("MemberSynchronized")); + setEventMessages($langs->trans("MemberSynchronized"), null, 'mesgs'); $db->commit(); } else { - setEventMessage($ldap->error, 'errors'); + setEventMessages($ldap->errors, $ldap->error, 'errors'); $db->rollback(); } } diff --git a/htdocs/admin/agenda.php b/htdocs/admin/agenda.php index 287f2a897eb..c11cbeff3a4 100644 --- a/htdocs/admin/agenda.php +++ b/htdocs/admin/agenda.php @@ -86,12 +86,12 @@ if ($action == "save" && empty($cancel)) if (! $error) { - setEventMessage($langs->trans("SetupSaved")); + setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); $db->commit(); } else { - setEventMessage($langs->trans("Error"),'errors'); + setEventMessages($langs->trans("Error"),null, 'errors'); $db->rollback(); } } diff --git a/htdocs/admin/agenda_extsites.php b/htdocs/admin/agenda_extsites.php index 9356674921e..755d1eb23f9 100644 --- a/htdocs/admin/agenda_extsites.php +++ b/htdocs/admin/agenda_extsites.php @@ -72,7 +72,7 @@ if ($actionsave) if (! empty($src) && ! dol_is_url($src)) { - setEventMessage($langs->trans("ErrorParamMustBeAnUrl"),'errors'); + setEventMessages($langs->trans("ErrorParamMustBeAnUrl"), null, 'errors'); $error++; $errorsaved++; break; @@ -104,12 +104,12 @@ if ($actionsave) if (! $error) { $db->commit(); - setEventMessage($langs->trans("SetupSaved")); + setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); } else { $db->rollback(); - if (empty($errorsaved)) setEventMessage($langs->trans("Error"),'errors'); + if (empty($errorsaved)) setEventMessages($langs->trans("Error"), null, 'errors'); } } diff --git a/htdocs/admin/agenda_xcal.php b/htdocs/admin/agenda_xcal.php index dfdac2a8f0f..cd2406e6fdc 100644 --- a/htdocs/admin/agenda_xcal.php +++ b/htdocs/admin/agenda_xcal.php @@ -54,12 +54,12 @@ if ($actionsave) if ($i >= 4) { $db->commit(); - setEventMessage($langs->trans("SetupSaved")); + setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); } else { $db->rollback(); - setEventMessage($langs->trans("SaveFailed"), 'errors'); + setEventMessages($langs->trans("SaveFailed"), null, 'errors'); } } diff --git a/htdocs/admin/askpricesupplier.php b/htdocs/admin/askpricesupplier.php index 9bde4673ace..9afcd1a8f62 100644 --- a/htdocs/admin/askpricesupplier.php +++ b/htdocs/admin/askpricesupplier.php @@ -6,8 +6,8 @@ * Copyright (C) 2004 Eric Seigne * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2008 Raphael Bertrand (Resultic) - * Copyright (C) 2011-2013 Juanjo Menent - * Copyright (C) 2015 Jean-François Ferry + * Copyright (C) 2011-2013 Juanjo Menent + * Copyright (C) 2015 Jean-François Ferry * * 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 @@ -54,11 +54,11 @@ if ($action == 'updateMask') if (! $error) { - setEventMessage($langs->trans("SetupSaved")); + setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); } else { - setEventMessage($langs->trans("Error"),'errors'); + setEventMessages($langs->trans("Error"), null, 'errors'); } } @@ -96,13 +96,13 @@ if ($action == 'specimen') } else { - setEventMessage($module->error,'errors'); + setEventMessages($module->error, null, 'errors'); dol_syslog($module->error, LOG_ERR); } } else { - setEventMessage($langs->trans("ErrorModuleNotFound"),'errors'); + setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors'); dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR); } } @@ -116,11 +116,11 @@ if ($action == 'set_ASKPRICESUPPLIER_DRAFT_WATERMARK') if (! $error) { - setEventMessage($langs->trans("SetupSaved")); + setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); } else { - setEventMessage($langs->trans("Error"),'errors'); + setEventMessages($langs->trans("Error"), null, 'errors'); } } @@ -134,11 +134,11 @@ if ($action == 'set_ASKPRICESUPPLIER_FREE_TEXT') if (! $error) { - setEventMessage($langs->trans("SetupSaved")); + setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); } else { - setEventMessage($langs->trans("Error"),'errors'); + setEventMessages($langs->trans("Error"), null, 'errors'); } } @@ -150,11 +150,11 @@ if ($action == 'set_BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER') if (! $error) { - setEventMessage($langs->trans("SetupSaved")); + setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); } else { - setEventMessage($langs->trans("Error"),'errors'); + setEventMessages($langs->trans("Error"), null, 'errors'); } } @@ -178,12 +178,12 @@ if ($action == 'setModuleOptions') if (! $error) { $db->commit(); - setEventMessage($langs->trans("SetupSaved")); + setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); } else { $db->rollback(); - setEventMessage($langs->trans("Error"),'errors'); + setEventMessages($langs->trans("Error"), null, 'errors'); } } diff --git a/htdocs/admin/bank.php b/htdocs/admin/bank.php index 8214755fd2b..048e351044d 100644 --- a/htdocs/admin/bank.php +++ b/htdocs/admin/bank.php @@ -56,11 +56,11 @@ if ($action == 'set_BANK_CHEQUERECEIPT_FREE_TEXT') if (! $error) { - setEventMessage($langs->trans("SetupSaved")); + setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); } else { - setEventMessage($langs->trans("Error"),'errors'); + setEventMessages($langs->trans("Error"), null, 'errors'); } } diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php index b36a222c165..0a57508c271 100644 --- a/htdocs/admin/barcode.php +++ b/htdocs/admin/barcode.php @@ -97,11 +97,11 @@ if ($action == 'setModuleOptions') if (! $error) { - setEventMessage($langs->trans("SetupSaved")); + setEventMessages($langs->trans("SetupSaved"), null, 'msgs'); } else { - setEventMessage($langs->trans("Error"),'errors'); + setEventMessages($langs->trans("Error"), null, 'errors'); } } @@ -111,11 +111,11 @@ if ($action && $action != 'setcoder' && $action != 'setModuleOptions') if (! $error) { - setEventMessage($langs->trans("SetupSaved")); + setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); } else { - setEventMessage($langs->trans("Error"),'errors'); + setEventMessages($langs->trans("Error"), null, 'errors'); } } diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php index 6b1eb71fafe..5b6d64801b5 100644 --- a/htdocs/admin/boxes.php +++ b/htdocs/admin/boxes.php @@ -85,7 +85,7 @@ if ($action == 'add') { } else { - setEventMessage($db->lasterror(), 'errors'); + setEventMessages($db->lasterror(), null, 'errors'); $error++; } } @@ -121,7 +121,7 @@ if ($action == 'add') { $resql = $db->query($sql); if (! $resql) { - setEventMessage($db->lasterror(), 'errors'); + setEventMessages($db->lasterror(), null, 'errors'); $error++; } } diff --git a/htdocs/admin/clicktodial.php b/htdocs/admin/clicktodial.php index 1550c0ebef7..260a9514375 100644 --- a/htdocs/admin/clicktodial.php +++ b/htdocs/admin/clicktodial.php @@ -41,11 +41,11 @@ if ($action == 'setvalue' && $user->admin) $result=dolibarr_set_const($db, "CLICKTODIAL_URL", GETPOST("url"), 'chaine', 0, '', $conf->entity); if ($result >= 0) { - setEventMessage($langs->trans("SetupSaved")); + setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); } else { - setEventMessage($langs->trans("Error"),'errors'); + setEventMessages($langs->trans("Error"), null, 'errors'); } } diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php index f7e3812d74f..9e55369dac9 100644 --- a/htdocs/admin/commande.php +++ b/htdocs/admin/commande.php @@ -7,7 +7,7 @@ * Copyright (C) 2005-2014 Regis Houssin * Copyright (C) 2008 Raphael Bertrand (Resultic) * Copyright (C) 2011-2013 Juanjo Menent - * Copyright (C) 2011-2013 Philippe Grand + * Copyright (C) 2011-2015 Philippe Grand * Copyright (C) 2013 Florian Henry * * This program is free software; you can redistribute it and/or modify @@ -64,11 +64,11 @@ if ($action == 'updateMask') if (! $error) { - setEventMessage($langs->trans("SetupSaved")); + setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); } else { - setEventMessage($langs->trans("Error"),'errors'); + setEventMessages($langs->trans("Error"), null, 'errors'); } } @@ -106,13 +106,13 @@ else if ($action == 'specimen') } else { - setEventMessage($module->error,'errors'); + setEventMessages($module->error, null, 'errors'); dol_syslog($module->error, LOG_ERR); } } else { - setEventMessage($langs->trans("ErrorModuleNotFound"),'errors'); + setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors'); dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR); } } @@ -137,12 +137,12 @@ if ($action == 'setModuleOptions') if (! $error) { $db->commit(); - setEventMessage($langs->trans("SetupSaved")); + setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); } else { $db->rollback(); - setEventMessage($langs->trans("Error"),'errors'); + setEventMessages($langs->trans("Error"), null, 'errors'); } } @@ -196,11 +196,11 @@ else if ($action == 'set_COMMANDE_DRAFT_WATERMARK') if (! $error) { - setEventMessage($langs->trans("SetupSaved")); + setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); } else { - setEventMessage($langs->trans("Error"),'errors'); + setEventMessages($langs->trans("Error"), null, 'errors'); } } @@ -214,11 +214,11 @@ else if ($action == 'set_ORDER_FREE_TEXT') if (! $error) { - setEventMessage($langs->trans("SetupSaved")); + setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); } else { - setEventMessage($langs->trans("Error"),'errors'); + setEventMessages($langs->trans("Error"), null, 'errors'); } } @@ -228,9 +228,9 @@ else if ($action=="setshippableiconinlist") { $res = dolibarr_set_const($db, "SHIPPABLE_ORDER_ICON_IN_LIST", $setshippableiconinlist,'yesno',0,'',$conf->entity); if (! $res > 0) $error++; if (! $error) { - setEventMessage($langs->trans("SetupSaved")); + setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); } else { - setEventMessage($langs->trans("Error"), 'errors'); + setEventMessages($langs->trans("Error"), null, 'errors'); } } @@ -243,11 +243,11 @@ else if ($action == 'set_BANK_ASK_PAYMENT_BANK_DURING_ORDER') if (! $error) { - setEventMessage($langs->trans("SetupSaved")); + setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); } else { - setEventMessage($langs->trans("Error"),'errors'); + setEventMessages($langs->trans("Error"), null, 'errors'); } } @@ -260,11 +260,11 @@ else if ($action == 'set_WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER') if (! $error) { - setEventMessage($langs->trans("SetupSaved")); + setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); } else { - setEventMessage($langs->trans("Error"),'errors'); + setEventMessages($langs->trans("Error"), null, 'errors'); } } diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php index b9660c8a04d..e84bdf2a3fa 100644 --- a/htdocs/admin/company.php +++ b/htdocs/admin/company.php @@ -3,7 +3,7 @@ * Copyright (C) 2004-2013 Laurent Destailleur * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2010-2014 Juanjo Menent - * Copyright (C) 2011 Philippe Grand + * Copyright (C) 2011-2015 Philippe Grand * Copyright (C) 2015 Alexandre Spangaro * * This program is free software; you can redistribute it and/or modify @@ -125,19 +125,19 @@ if ( ($action == 'update' && empty($_POST["cancel"])) $error++; $langs->load("errors"); $tmparray=explode(':',$result); - setEventMessage($langs->trans('ErrorFileIsInfectedWithAVirus',$tmparray[1]),'errors'); + setEventMessages($langs->trans('ErrorFileIsInfectedWithAVirus',$tmparray[1]), null, 'errors'); } else { $error++; - setEventMessage($langs->trans("ErrorFailedToSaveFile"),'errors'); + setEventMessages($langs->trans("ErrorFailedToSaveFile"), null, 'errors'); } } else { $error++; $langs->load("errors"); - setEventMessage($langs->trans("ErrorBadImageFormat"),'errors'); + setEventMessages($langs->trans("ErrorBadImageFormat"), null, 'errors'); } } } @@ -230,7 +230,7 @@ if ($action == 'addthumb') { $error++; $langs->load("errors"); - setEventMessage($langs->trans("ErrorBadImageFormat"),'errors'); + setEventMessages($langs->trans("ErrorBadImageFormat"), null, 'errors'); dol_syslog($langs->transnoentities("ErrorBadImageFormat"),LOG_WARNING); } } @@ -238,7 +238,7 @@ if ($action == 'addthumb') { $error++; $langs->load("errors"); - setEventMessage($langs->trans("ErrorFileDoesNotExists",$_GET["file"]),'errors'); + setEventMessages($langs->trans("ErrorFileDoesNotExists",$_GET["file"]), null, 'errors'); dol_syslog($langs->transnoentities("ErrorFileDoesNotExists",$_GET["file"]),LOG_WARNING); } } diff --git a/htdocs/admin/compta.php b/htdocs/admin/compta.php index 633f88b9cfb..38ba28e9fa4 100644 --- a/htdocs/admin/compta.php +++ b/htdocs/admin/compta.php @@ -3,7 +3,7 @@ * Copyright (C) 2004-2008 Laurent Destailleur * Copyright (C) 2005-2009 Regis Houssin * Copyright (C) 2011-2013 Juanjo Menent - * Copyright (C) 2013 Philippe Grand + * Copyright (C) 2013-2015 Philippe Grand * Copyright (C) 2014 Marcos García * * This program is free software; you can redistribute it and/or modify @@ -87,11 +87,11 @@ if ($action == 'update') if (! $error) { - setEventMessage($langs->trans("SetupSaved")); + setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); } else { - setEventMessage($langs->trans("Error"),'errors'); + setEventMessages($langs->trans("Error"), null, 'errors'); } } diff --git a/htdocs/admin/const.php b/htdocs/admin/const.php index 62f6bbaaf2c..06e3279fa54 100644 --- a/htdocs/admin/const.php +++ b/htdocs/admin/const.php @@ -68,7 +68,7 @@ if ($action == 'add' || (GETPOST('add') && $action != 'update')) { if (dolibarr_set_const($db, $constname, $constvalue, 'chaine', 1, $constnote, $entity) >= 0) { - setEventMessage($langs->trans("RecordSaved")); + setEventMessages($langs->trans("RecordSaved"), null, 'mesgs'); $action=""; $constname=""; $constvalue=""; @@ -99,7 +99,7 @@ if (! empty($consts) && $action == 'update') } } } - if ($nbmodified > 0) setEventMessage($langs->trans("RecordSaved")); + if ($nbmodified > 0) setEventMessages($langs->trans("RecordSaved"), null, 'mesgs'); $action=''; } @@ -122,7 +122,7 @@ if (! empty($consts) && $action == 'delete') } } } - if ($nbdeleted > 0) setEventMessage($langs->trans("RecordDeleted")); + if ($nbdeleted > 0) setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs'); $action=''; } @@ -131,7 +131,7 @@ if ($action == 'delete') { if (dolibarr_del_const($db, $rowid, $entity) >= 0) { - setEventMessage($langs->trans("RecordDeleted")); + setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs'); } else { diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php index a45045a5381..3198ad51448 100644 --- a/htdocs/admin/contract.php +++ b/htdocs/admin/contract.php @@ -1,6 +1,6 @@ - * Copyright (C) 2011-2014 Philippe Grand + * Copyright (C) 2011-2015 Philippe Grand * * 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 @@ -59,11 +59,11 @@ if ($action == 'updateMask') if (! $error) { - setEventMessage($langs->trans("SetupSaved")); + setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); } else { - setEventMessage($langs->trans("Error"),'errors'); + setEventMessage($langs->trans("Error"), null, 'errors'); } } @@ -101,13 +101,13 @@ else if ($action == 'specimen') // For contract } else { - setEventMessage($obj->error,'errors'); + setEventMessages($obj->error, $obj->errors, 'errors'); dol_syslog($obj->error, LOG_ERR); } } else { - setEventMessage($langs->trans("ErrorModuleNotFound"),'errors'); + setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors'); dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR); } } @@ -132,12 +132,12 @@ if ($action == 'setModuleOptions') if (! $error) { $db->commit(); - setEventMessage($langs->trans("SetupSaved")); + setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); } else { $db->rollback(); - setEventMessage($langs->trans("Error"),'errors'); + setEventMessages($langs->trans("Error"), null, 'errors'); } } @@ -194,11 +194,11 @@ else if ($action == 'set_other') if (! $error) { - setEventMessage($langs->trans("SetupSaved")); + setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); } else { - setEventMessage($langs->trans("Error"),'errors'); + setEventMessages($langs->trans("Error"), null, 'errors'); } } diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php index 40b4676ba25..817019cc24b 100644 --- a/htdocs/admin/dict.php +++ b/htdocs/admin/dict.php @@ -4,7 +4,7 @@ * Copyright (C) 2004 Benoit Mortier * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2010-2013 Juanjo Menent - * Copyright (C) 2011 Philippe Grand + * Copyright (C) 2011-2015 Philippe Grand * Copyright (C) 2011 Remy Younes * Copyright (C) 2012-2015 Marcos García * Copyright (C) 2012 Christophe Battarel @@ -548,20 +548,20 @@ if (GETPOST('actionadd') || GETPOST('actionmodify')) if ($fieldnamekey == 'deductible') $fieldnamekey = 'Deductible'; if ($fieldnamekey == 'sortorder') $fieldnamekey = 'SortOrder'; - setEventMessage($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities($fieldnamekey)),'errors'); + setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities($fieldnamekey)), null, 'errors'); } } // Other checks if ($tabname[$id] == MAIN_DB_PREFIX."c_actioncomm" && isset($_POST["type"]) && in_array($_POST["type"],array('system','systemauto'))) { $ok=0; - setEventMessage($langs->transnoentities('ErrorReservedTypeSystemSystemAuto'),'errors'); + setEventMessages($langs->transnoentities('ErrorReservedTypeSystemSystemAuto'), null, 'errors'); } if (isset($_POST["code"])) { if ($_POST["code"]=='0') { $ok=0; - setEventMessage($langs->transnoentities('ErrorCodeCantContainZero'),'errors'); + setEventMessages($langs->transnoentities('ErrorCodeCantContainZero'), null, 'errors'); } /*if (!is_numeric($_POST['code'])) // disabled, code may not be in numeric base { @@ -578,7 +578,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify')) else { $ok=0; - setEventMessage($langs->transnoentities("ErrorFieldRequired",$langs->transnoentities("Country")),'errors'); + setEventMessages($langs->transnoentities("ErrorFieldRequired",$langs->transnoentities("Country")), null, 'errors'); } } @@ -637,13 +637,13 @@ if (GETPOST('actionadd') || GETPOST('actionmodify')) $result = $db->query($sql); if ($result) // Add is ok { - setEventMessage($langs->transnoentities("RecordSaved")); + setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs'); $_POST=array('id'=>$id); // Clean $_POST array, we keep only } else { if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') { - setEventMessage($langs->transnoentities("ErrorRecordAlreadyExists"),'errors'); + setEventMessages($langs->transnoentities("ErrorRecordAlreadyExists"), null, 'errors'); } else { dol_print_error($db); @@ -687,7 +687,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify')) $resql = $db->query($sql); if (! $resql) { - setEventMessage($db->error(),'errors'); + setEventMessage($db->error(), 'errors'); } } //$_GET["id"]=GETPOST('id', 'int'); // Force affichage dictionnaire en cours d'edition @@ -711,7 +711,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes') // delete { if ($db->errno() == 'DB_ERROR_CHILD_EXISTS') { - setEventMessage($langs->transnoentities("ErrorRecordIsUsedByChild"),'errors'); + setEventMessages($langs->transnoentities("ErrorRecordIsUsedByChild"), null, 'errors'); } else { diff --git a/htdocs/admin/menus/edit.php b/htdocs/admin/menus/edit.php index 7c60a2ee055..b7f4b8d5b73 100644 --- a/htdocs/admin/menus/edit.php +++ b/htdocs/admin/menus/edit.php @@ -78,16 +78,16 @@ if ($action == 'update') $result=$menu->update($user); if ($result > 0) { - setEventMessage($langs->trans("RecordModifiedSuccessfully")); + setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs'); } else { - setEventMessage($menu->error, 'errors'); + setEventMessages($menu->error, $menu->errors, 'errors'); } } else { - setEventMessage($menu->error, 'errors'); + setEventMessages($menu->error, $menu->errors, 'errors'); } $_GET["menuId"] = $_POST['menuId']; $action = "edit"; @@ -159,13 +159,13 @@ if ($action == 'add') } if (! $error && $_POST['menuId'] && $_POST['type'] == 'top') { - setEventMessage($langs->trans("ErrorTopMenuMustHaveAParentWithId0"), 'errors'); + setEventMessages($langs->trans("ErrorTopMenuMustHaveAParentWithId0"), null, 'errors'); $action = 'create'; $error++; } if (! $error && empty($_POST['menuId']) && $_POST['type'] == 'left') { - setEventMessage($langs->trans("ErrorLeftMenuMustHaveAParentId"), 'errors'); + setEventMessages($langs->trans("ErrorLeftMenuMustHaveAParentId"), null, 'errors'); $action = 'create'; $error++; } @@ -204,7 +204,7 @@ if ($action == 'add') else { $action = 'create'; - setEventMessage($menu->error, 'errors'); + setEventMessages($menu->error, $menu->errors, 'errors'); } } } @@ -222,7 +222,7 @@ if ($action == 'confirm_delete' && $_POST["confirm"] == 'yes') $this->db->commit(); llxHeader(); - setEventMessage($langs->trans("MenuDeleted")); + setEventMessages($langs->trans("MenuDeleted"), null, 'mesgs'); llxFooter(); exit ; } diff --git a/htdocs/admin/menus/index.php b/htdocs/admin/menus/index.php index c8699209268..7da0673b196 100644 --- a/htdocs/admin/menus/index.php +++ b/htdocs/admin/menus/index.php @@ -186,7 +186,7 @@ elseif ($action == 'confirm_delete' && $confirm == 'yes') { $db->commit(); - setEventMessage($langs->trans("MenuDeleted")); + setEventMessages($langs->trans("MenuDeleted"), null, 'mesgs'); header("Location: ".DOL_URL_ROOT.'/admin/menus/index.php?menu_handler='.$menu_handler); exit ; @@ -359,7 +359,7 @@ if ($conf->use_javascript_ajax) else { $langs->load("errors"); - setEventMessage($langs->trans("ErrorFeatureNeedJavascript"), 'errors'); + setEventMessages($langs->trans("ErrorFeatureNeedJavascript"), null, 'errors'); } print '
'; diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php index a460f667e2a..49d229898b8 100644 --- a/htdocs/admin/tools/dolibarr_export.php +++ b/htdocs/admin/tools/dolibarr_export.php @@ -52,8 +52,8 @@ if ($action == 'delete') { $file=$conf->admin->dir_output.'/'.GETPOST('urlfile'); $ret=dol_delete_file($file, 1); - if ($ret) setEventMessage($langs->trans("FileWasRemoved", GETPOST('urlfile'))); - else setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), 'errors'); + if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs'); + else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors'); $action=''; } diff --git a/htdocs/admin/tools/export.php b/htdocs/admin/tools/export.php index 500c766ed77..cddd42a8623 100644 --- a/htdocs/admin/tools/export.php +++ b/htdocs/admin/tools/export.php @@ -60,8 +60,8 @@ if ($action == 'delete') { $file=$conf->admin->dir_output.'/'.GETPOST('urlfile'); $ret=dol_delete_file($file, 1); - if ($ret) setEventMessage($langs->trans("FileWasRemoved", GETPOST('urlfile'))); - else setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), 'errors'); + if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs'); + else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors'); $action=''; } @@ -357,7 +357,7 @@ if ($what == 'postgresql') //{ if ($errormsg) { - setEventMessage($langs->trans("Error")." : ".$errormsg, 'errors'); + setEventMessages($langs->trans("Error")." : ".$errormsg, null, 'errors'); $resultstring=''; $resultstring.='
'.$langs->trans("Error")." : ".$errormsg.'
'; @@ -368,7 +368,7 @@ if ($what == 'postgresql') { if ($what) { - setEventMessage($langs->trans("BackupFileSuccessfullyCreated").'.
'.$langs->trans("YouCanDownloadBackupFile")); + setEventMessages($langs->trans("BackupFileSuccessfullyCreated").'.
'.$langs->trans("YouCanDownloadBackupFile"), null, 'mesgs'); $resultstring='
'; $resultstring.=$langs->trans("BackupFileSuccessfullyCreated").'.
'; @@ -379,7 +379,7 @@ if ($what == 'postgresql') } else { - setEventMessage($langs->trans("YouMustRunCommandFromCommandLineAfterLoginToUser",$dolibarr_main_db_user,$dolibarr_main_db_user)); + setEventMessages($langs->trans("YouMustRunCommandFromCommandLineAfterLoginToUser",$dolibarr_main_db_user,$dolibarr_main_db_user), null, 'mesgs'); } } //} diff --git a/htdocs/admin/tools/update.php b/htdocs/admin/tools/update.php index 54a6cab9cbd..e1166e96c3d 100644 --- a/htdocs/admin/tools/update.php +++ b/htdocs/admin/tools/update.php @@ -34,7 +34,7 @@ $action=GETPOST('action','alpha'); if (! $user->admin) accessforbidden(); if (GETPOST('msg','alpha')) { - setEventMessage(GETPOST('msg','alpha'), 'errors'); + setEventMessages(GETPOST('msg','alpha'), null, 'errors'); } @@ -63,7 +63,7 @@ if ($action=='install') if (! $original_file) { $langs->load("Error"); - setEventMessage($langs->trans("ErrorFileRequired"), 'warnings'); + setEventMessages($langs->trans("ErrorFileRequired"), null, 'warnings'); $error++; } else @@ -71,7 +71,7 @@ if ($action=='install') if (! preg_match('/\.zip/i',$original_file)) { $langs->load("errors"); - setEventMessage($langs->trans("ErrorFileMustBeADolibarrPackage",$original_file), 'errors'); + setEventMessages($langs->trans("ErrorFileMustBeADolibarrPackage",$original_file), null, 'errors'); $error++; } } @@ -99,7 +99,7 @@ if ($action=='install') if (! empty($result['error'])) { $langs->load("errors"); - setEventMessage($langs->trans($result['error'],$original_file), 'errors'); + setEventMessages($langs->trans($result['error'],$original_file), null, 'errors'); $error++; } else @@ -116,7 +116,7 @@ if ($action=='install') //var_dump($modulenamedir); if (! dol_is_dir($modulenamedir)) { - setEventMessage($langs->trans("ErrorModuleFileSeemsToHaveAWrongFormat"), 'errors'); + setEventMessages($langs->trans("ErrorModuleFileSeemsToHaveAWrongFormat"), null, 'errors'); $error++; } } @@ -128,7 +128,7 @@ if ($action=='install') $result=dolCopyDir($modulenamedir, $dirins.'/'.$modulename, '0444', 1); if ($result <= 0) { - setEventMessage($langs->trans("ErrorFailedToCopy"), 'errors'); + setEventMessages($langs->trans("ErrorFailedToCopy"), null, 'errors'); $error++; } } @@ -142,7 +142,7 @@ if ($action=='install') if (! $error) { - setEventMessage($langs->trans("SetupIsReadyForUse")); + setEventMessages($langs->trans("SetupIsReadyForUse"), null, 'mesgs'); } } From a01a85c3f6eb7afc589f7c666a2533647d8e9d32 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 23 Oct 2015 15:13:02 +0200 Subject: [PATCH 11/45] 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 2cbfb69f9b70c851cd2e13a25010d91ab472f843 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 23 Oct 2015 15:28:14 +0200 Subject: [PATCH 12/45] 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: Fri, 23 Oct 2015 19:01:50 +0200 Subject: [PATCH 13/45] Update index.php --- htdocs/accountancy/customer/index.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php index ea37f237455..5cf4dac19b1 100644 --- a/htdocs/accountancy/customer/index.php +++ b/htdocs/accountancy/customer/index.php @@ -86,7 +86,7 @@ if ($action == 'validatehistory') { setEventMessage($db->lasterror(), 'errors'); } else { $db->commit(); - setEventMessage($langs->trans('Dispatched'), 'mesgs'); + setEventMessages($langs->trans('Dispatched'), null, 'mesgs'); } } @@ -346,4 +346,4 @@ print "\n"; print ''; llxFooter(); -$db->close(); \ No newline at end of file +$db->close(); From 3015a0388a41458fabc27d3bd7e40b5bde42b7ba Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 24 Oct 2015 16:09:26 +0200 Subject: [PATCH 14/45] NEW List of projects of a thirdparty are visible on a project tab --- htdocs/core/lib/company.lib.php | 26 ++-- htdocs/projet/card.php | 4 +- htdocs/societe/agenda.php | 41 ++--- htdocs/societe/class/societe.class.php | 14 +- htdocs/societe/notify/card.php | 2 + htdocs/societe/price.php | 208 +++++++++++++------------ htdocs/societe/project.php | 156 +++++++++++++++++++ htdocs/societe/soc.php | 3 - 8 files changed, 318 insertions(+), 136 deletions(-) create mode 100644 htdocs/societe/project.php diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php index 86c5f717f4b..70988d7e330 100644 --- a/htdocs/core/lib/company.lib.php +++ b/htdocs/core/lib/company.lib.php @@ -91,6 +91,13 @@ function societe_prepare_head(Societe $object) $head[$h][2] = 'agenda'; $h++; } + if (! empty($conf->projet->enabled) && (!empty($user->rights->projet->lire) )) + { + $head[$h][0] = DOL_URL_ROOT.'/societe/project.php?socid='.$object->id; + $head[$h][1] = $langs->trans("Projects"); + $head[$h][2] = 'project'; + $h++; + } //show categorie tab /*if (! empty($conf->categorie->enabled) && ! empty($user->rights->categorie->lire)) { @@ -456,9 +463,10 @@ function getFormeJuridiqueLabel($code) * @param DoliDB $db Database handler * @param Object $object Third party object * @param string $backtopage Url to go once contact is created + * @param int $nocreatelink 1=Hide create project link * @return void */ -function show_projects($conf,$langs,$db,$object,$backtopage='') +function show_projects($conf, $langs, $db, $object, $backtopage='', $nocreatelink=0) { global $user; global $bc; @@ -470,7 +478,7 @@ function show_projects($conf,$langs,$db,$object,$backtopage='') $langs->load("projects"); $buttoncreate=''; - if (! empty($conf->projet->enabled) && $user->rights->projet->creer) + if (! empty($conf->projet->enabled) && $user->rights->projet->creer && empty($nocreatelink)) { //$buttoncreate=''.$langs->trans("AddProject").''; $buttoncreate=''.$langs->trans("AddProject"); @@ -864,13 +872,13 @@ function show_addresses($conf,$langs,$db,$object,$backtopage='') /** * Show html area with actions to do * - * @param Conf $conf Object conf - * @param Translate $langs Object langs - * @param DoliDB $db Object db - * @param Adherent|Societe $object Object third party or member - * @param Contact $objcon Object contact - * @param int $noprint Return string but does not output it - * @return mixed Return html part or void if noprint is 1 + * @param Conf $conf Object conf + * @param Translate $langs Object langs + * @param DoliDB $db Object db + * @param Adherent|Societe $object Object third party or member + * @param Contact $objcon Object contact + * @param int $noprint Return string but does not output it + * @return mixed Return html part or void if noprint is 1 */ function show_actions_todo($conf,$langs,$db,$object,$objcon='',$noprint=0) { diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php index e5000d008f2..748f91dbefe 100644 --- a/htdocs/projet/card.php +++ b/htdocs/projet/card.php @@ -624,7 +624,7 @@ else print ''.$langs->trans("Label").''; print ''; - // Customer + // Thirdparty print ''.$langs->trans("ThirdParty").''; $filteronlist=''; if (! empty($conf->global->PROJECT_FILTER_FOR_THIRDPARTY_LIST)) $filteronlist=$conf->global->PROJECT_FILTER_FOR_THIRDPARTY_LIST; @@ -713,7 +713,7 @@ else // Third party print ''.$langs->trans("ThirdParty").''; - if ($object->thirdparty->id > 0) print $object->thirdparty->getNomUrl(1); + if ($object->thirdparty->id > 0) print $object->thirdparty->getNomUrl(1, 'project'); else print' '; print ''; diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php index b35715ce1ab..3d72ad9d328 100644 --- a/htdocs/societe/agenda.php +++ b/htdocs/societe/agenda.php @@ -121,17 +121,34 @@ if ($socid) dol_fiche_end(); - /* + + + /* * Barre d'action */ - print '
'; + $objthirdparty=$object; + $objcon=new stdClass(); + + $out=''; + $permok=$user->rights->agenda->myactions->create; + if ((! empty($objthirdparty->id) || ! empty($objcon->id)) && $permok) + { + //$out.='trans("AddAnAction"),'filenew'); + //$out.=""; + } + + print '
'; if (! empty($conf->agenda->enabled)) { if (! empty($user->rights->agenda->myactions->create) || ! empty($user->rights->agenda->allactions->create)) { - print ''.$langs->trans("AddAction").''; + print ''.$langs->trans("AddAction").''; } else { @@ -143,25 +160,11 @@ if ($socid) print '
'; - $objthirdparty=$object; - $objcon=new stdClass(); - $out=''; - $permok=$user->rights->agenda->myactions->create; - if ((! empty($objthirdparty->id) || ! empty($objcon->id)) && $permok) - { - $out.=''; - $out.=$langs->trans("AddAnAction").' '; - $out.=img_picto($langs->trans("AddAnAction"),'filenew'); - $out.=""; - } - - print load_fiche_titre($langs->trans("ActionsOnCompany"),$out,''); + print load_fiche_titre($langs->trans("ActionsOnCompany"),'',''); // List of todo actions - show_actions_todo($conf,$langs,$db,$object); + show_actions_todo($conf,$langs,$db,$object,null,0,1); // List of done actions show_actions_done($conf,$langs,$db,$object); diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index 21de67bfcf7..1f5f10c9178 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -1747,12 +1747,12 @@ class Societe extends CommonObject * Return a link on thirdparty (with picto) * * @param int $withpicto Add picto into link (0=No picto, 1=Include picto with link, 2=Picto only) - * @param string $option Target of link ('', 'customer', 'prospect', 'supplier') + * @param string $option Target of link ('', 'customer', 'prospect', 'supplier', 'project') * @param int $maxlen Max length of name * @param integer $notooltip 1=Disable tooltip * @return string String with URL */ - function getNomUrl($withpicto=0,$option='',$maxlen=0,$notooltip=0) + function getNomUrl($withpicto=0, $option='', $maxlen=0, $notooltip=0) { global $conf,$langs; @@ -1795,6 +1795,16 @@ class Societe extends CommonObject $label.= '' . $langs->trans("ShowSupplier") . ''; $link = ''; + $link = ''; + $link = ''; diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php index 291f81a6fe8..6a6fb7ab1df 100644 --- a/htdocs/societe/notify/card.php +++ b/htdocs/societe/notify/card.php @@ -195,6 +195,8 @@ if ($result > 0) print "\n"; + print '
'; + // Add notification form print load_fiche_titre($langs->trans("AddNewNotification"),'',''); diff --git a/htdocs/societe/price.php b/htdocs/societe/price.php index e5f89779225..f739c0ac6fa 100644 --- a/htdocs/societe/price.php +++ b/htdocs/societe/price.php @@ -429,107 +429,8 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) { } else { + // View mode - // View mode - - // Count total nb of records - $nbtotalofrecords = 0; - if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) { - $nbtotalofrecords = $prodcustprice->fetch_all('', '', 0, 0, $filter); - } - - $result = $prodcustprice->fetch_all($sortorder, $sortfield, $conf->liste_limit, $offset, $filter); - if ($result < 0) { - setEventMessage($prodcustprice->error, 'errors'); - } - - $option = '&search_soc=' . $search_soc . '&id=' . $object->id; - - print_barre_liste($langs->trans('PriceForEachProduct'), $page, $_SERVEUR ['PHP_SELF'], $option, $sortfield, $sortorder, '', count($prodcustprice->lines), $nbtotalofrecords); - - print ''; - print ''; - - print ''; - - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - - if (count($prodcustprice->lines) > 0) { - - print ''; - print ''; - print ''; - // Print the search button - print ''; - print ''; - - $var = False; - - foreach($prodcustprice->lines as $line) - { - print ""; - - $staticprod = new Product($db); - $staticprod->fetch($line->fk_product); - - print ""; - print ""; - - print '"; - print '"; - print '"; - print '"; - print ''; - print ''; - - // User - $userstatic = new User($db); - $userstatic->fetch($line->fk_user); - print ''; - - // Todo Edit or delete button - // Action - if ($user->rights->produit->creer || $user->rights->service->creer) { - print ''; - } - - print "\n"; - } - } else { - print ''; - } - - print "
' . $langs->trans("Product") . '' . $langs->trans("AppliedPricesFrom") . '' . $langs->trans("PriceBase") . '' . $langs->trans("VAT") . '' . $langs->trans("HT") . '' . $langs->trans("TTC") . '' . $langs->trans("MinPrice") . ' ' . $langs->trans("HT") . '' . $langs->trans("MinPrice") . ' ' . $langs->trans("TTC") . '' . $langs->trans("ChangedBy") . ' 
 '; - print ''; - print '
" . $staticprod->getNomUrl(1) . "" . dol_print_date($line->datec, "dayhour") . "' . $langs->trans($line->price_base_type) . "' . vatrate($line->tva_tx, true, $line->recuperableonly) . "' . price($line->price) . "' . price($line->price_ttc) . "' . price($line->price_min) . '' . price($line->price_min_ttc) . ''; - print $userstatic->getLoginUrl(1); - print ''; - print 'id . '&prodid=' . $line->fk_product . '">'; - print img_info(); - print ''; - print ' '; - print 'id . '&lineid=' . $line->id . '">'; - print img_edit('default', 0, 'style="vertical-align: middle;"'); - print ''; - print ' '; - print 'id . '&lineid=' . $line->id . '">'; - print img_delete('default', 'style="vertical-align: middle;"'); - print ''; - print '
'.$langs->trans('NoPriceSpecificToCustomer').'
"; - - print ""; - /* ************************************************************************** */ /* */ /* Barre d'action */ @@ -541,7 +442,112 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) { if ($user->rights->produit->creer || $user->rights->service->creer) { print '
id . '">' . $langs->trans("AddCustomerPrice") . '
'; } - print "\n

\n"; + print "\n
\n"; + + + // Count total nb of records + $nbtotalofrecords = 0; + if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) + { + $nbtotalofrecords = $prodcustprice->fetch_all('', '', 0, 0, $filter); + } + + $result = $prodcustprice->fetch_all($sortorder, $sortfield, $conf->liste_limit, $offset, $filter); + if ($result < 0) + { + setEventMessage($prodcustprice->error, 'errors'); + } + + $option = '&search_soc=' . $search_soc . '&id=' . $object->id; + + print_barre_liste($langs->trans('PriceForEachProduct'), $page, $_SERVEUR['PHP_SELF'], $option, $sortfield, $sortorder, '', count($prodcustprice->lines), $nbtotalofrecords, ''); + + print '
'; + print ''; + + print ''; + + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + + if (count($prodcustprice->lines) > 0) + { + + print ''; + print ''; + print ''; + // Print the search button + print ''; + print ''; + + $var = False; + + foreach ($prodcustprice->lines as $line) + { + print ""; + + $staticprod = new Product($db); + $staticprod->fetch($line->fk_product); + + print ""; + print ""; + + print '"; + print '"; + print '"; + print '"; + print ''; + print ''; + + // User + $userstatic = new User($db); + $userstatic->fetch($line->fk_user); + print ''; + + // Todo Edit or delete button + // Action + if ($user->rights->produit->creer || $user->rights->service->creer) + { + print ''; + } + + print "\n"; + } + } else + { + print ''; + } + + print "
' . $langs->trans("Product") . '' . $langs->trans("AppliedPricesFrom") . '' . $langs->trans("PriceBase") . '' . $langs->trans("VAT") . '' . $langs->trans("HT") . '' . $langs->trans("TTC") . '' . $langs->trans("MinPrice") . ' ' . $langs->trans("HT") . '' . $langs->trans("MinPrice") . ' ' . $langs->trans("TTC") . '' . $langs->trans("ChangedBy") . ' 
 '; + print ''; + print '
" . $staticprod->getNomUrl(1) . "" . dol_print_date($line->datec, "dayhour") . "' . $langs->trans($line->price_base_type) . "' . vatrate($line->tva_tx, true, $line->recuperableonly) . "' . price($line->price) . "' . price($line->price_ttc) . "' . price($line->price_min) . '' . price($line->price_min_ttc) . ''; + print $userstatic->getLoginUrl(1); + print ''; + print 'id . '&prodid=' . $line->fk_product . '">'; + print img_info(); + print ''; + print ' '; + print 'id . '&lineid=' . $line->id . '">'; + print img_edit('default', 0, 'style="vertical-align: middle;"'); + print ''; + print ' '; + print 'id . '&lineid=' . $line->id . '">'; + print img_delete('default', 'style="vertical-align: middle;"'); + print ''; + print '
' . $langs->trans('NoPriceSpecificToCustomer') . '
"; + + print "
"; + } } diff --git a/htdocs/societe/project.php b/htdocs/societe/project.php new file mode 100644 index 00000000000..6eb9765d034 --- /dev/null +++ b/htdocs/societe/project.php @@ -0,0 +1,156 @@ + + * Copyright (C) 2005 Brice Davoleau + * Copyright (C) 2005-2012 Regis Houssin + * Copyright (C) 2006-2015 Laurent Destailleur + * Copyright (C) 2007 Patrick Raguin + * Copyright (C) 2010 Juanjo Menent + * 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/societe/project.php + * \ingroup societe + * \brief Page of third party projects + */ + +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; +require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; + +$langs->load("companies"); + +// Security check +$socid = GETPOST('socid','int'); +if ($user->societe_id) $socid=$user->societe_id; +$result = restrictedArea($user, 'societe', $socid, '&societe'); + +// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array +$hookmanager->initHooks(array('projectthirdparty')); + + +/* + * Actions + */ + +$parameters=array('id'=>$socid); +$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks +if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); + + + +/* + * View + */ + +$contactstatic = new Contact($db); + +$form = new Form($db); + +if ($socid) +{ + require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; + require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; + + $langs->load("companies"); + + + $object = new Societe($db); + $result = $object->fetch($socid); + + $title=$langs->trans("Agenda"); + if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title; + llxHeader('',$title); + + if (! empty($conf->notification->enabled)) $langs->load("mails"); + $head = societe_prepare_head($object); + + dol_fiche_head($head, 'project', $langs->trans("ThirdParty"),0,'company'); + + dol_banner_tab($object, 'socid', '', ($user->societe_id?0:1), 'rowid', 'nom'); + + print '
'; + + print '
'; + print ''; + + // Alias names (commercial, trademark or alias names) + print '"; + + if (! empty($conf->global->SOCIETE_USEPREFIX)) // Old not used prefix field + { + print ''; + } + + if ($object->client) + { + print ''; + } + + if ($object->fournisseur) + { + print ''; + } + + print '
'.$langs->trans('AliasNames').''; + print $object->name_alias; + print "
'.$langs->trans('Prefix').''.$object->prefix_comm.'
'; + print $langs->trans('CustomerCode').''; + print $object->code_client; + if ($object->check_codeclient() <> 0) print ' ('.$langs->trans("WrongCustomerCode").')'; + print '
'; + print $langs->trans('SupplierCode').''; + print $object->code_fournisseur; + if ($object->check_codefournisseur() <> 0) print ' ('.$langs->trans("WrongSupplierCode").')'; + print '
'; + + print '
'; + + dol_fiche_end(); + + + /* + * Barre d'action + */ + + print '
'; + + if (! empty($conf->projet->enabled)) + { + if (! empty($conf->projet->enabled) && ! empty($user->rights->projet->creer)) + { + print ''.$langs->trans("AddProject").''; + } + else + { + print ''.$langs->trans("AddProject").''; + } + } + + print '
'; + + + print '
'; + + + // Projects list + $result=show_projects($conf, $langs, $db, $object, $_SERVER["PHP_SELF"].'?socid='.$object->id, 1); +} + + +llxFooter(); + +$db->close(); diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index 9fa6e117279..93fff61d1f1 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -2481,9 +2481,6 @@ else { $result=show_addresses($conf,$langs,$db,$object,$_SERVER["PHP_SELF"].'?socid='.$object->id); } - - // Projects list - $result=show_projects($conf,$langs,$db,$object,$_SERVER["PHP_SELF"].'?socid='.$object->id); } } From 5181afd49d17a7f3c641fe5e03146096e0459a18 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 24 Oct 2015 19:29:41 +0200 Subject: [PATCH 15/45] Disable dead code --- htdocs/comm/card.php | 5 +++-- htdocs/societe/price.php | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php index 3e20d611785..fe164006a29 100644 --- a/htdocs/comm/card.php +++ b/htdocs/comm/card.php @@ -184,7 +184,7 @@ $help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas'; llxHeader('',$title,$help_url); - +/* if ($mode == 'search') { if ($modesearch == 'soc') @@ -209,7 +209,7 @@ if ($mode == 'search') $db->free($resql); } } - +*/ if ($id > 0) { @@ -1021,6 +1021,7 @@ if ($id > 0) // List of done actions show_actions_done($conf,$langs,$db,$object); } + } else { diff --git a/htdocs/societe/price.php b/htdocs/societe/price.php index f739c0ac6fa..159dcb69d18 100644 --- a/htdocs/societe/price.php +++ b/htdocs/societe/price.php @@ -172,6 +172,8 @@ print '
'; 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 16/45] 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 17/45] 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 18/45] 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 19/45] 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 20/45] 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 21/45] 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 22/45] 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 23/45] 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 24/45] 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 25/45] 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 26/45] 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) From 080ba15e0de42ec5477be20dfc72fec7f216d8f3 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 25 Oct 2015 22:50:05 +0100 Subject: [PATCH 27/45] FIX The price per level just never correctly manage the vat. Vat is not per level but depends on seller and supplyer. I kept a hidden option to keep old behaviour that was bugged. --- htdocs/compta/facture.php | 34 +++--- htdocs/langs/en_US/products.lang | 2 + htdocs/product/price.php | 192 +++++++++++++++++++++++-------- 3 files changed, 166 insertions(+), 62 deletions(-) diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index f2148f8e063..983331bd412 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -1283,7 +1283,8 @@ if (empty($reshook)) // Ecrase $txtva par celui du produit // Ecrase $base_price_type par celui du produit // Replaces $fk_unit with the product's - if (! empty($idprod)) { + if (! empty($idprod)) + { $prod = new Product($db); $prod->fetch($idprod); @@ -1304,8 +1305,11 @@ if (empty($reshook)) $pu_ttc = $prod->multiprices_ttc[$object->thirdparty->price_level]; $price_min = $prod->multiprices_min[$object->thirdparty->price_level]; $price_base_type = $prod->multiprices_base_type[$object->thirdparty->price_level]; - if (isset($prod->multiprices_tva_tx[$object->thirdparty->price_level])) $tva_tx=$prod->multiprices_tva_tx[$object->thirdparty->price_level]; - if (isset($prod->multiprices_recuperableonly[$object->thirdparty->price_level])) $tva_npr=$prod->multiprices_recuperableonly[$object->thirdparty->price_level]; + if (! empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL)) // using this option is a bug. kept for backward compatibility + { + if (isset($prod->multiprices_tva_tx[$object->thirdparty->price_level])) $tva_tx=$prod->multiprices_tva_tx[$object->thirdparty->price_level]; + if (isset($prod->multiprices_recuperableonly[$object->thirdparty->price_level])) $tva_npr=$prod->multiprices_recuperableonly[$object->thirdparty->price_level]; + } } elseif (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) { @@ -1318,26 +1322,30 @@ if (empty($reshook)) $result = $prodcustprice->fetch_all('', '', 0, 0, $filter); if ($result) { if (count($prodcustprice->lines) > 0) { - $pu_ht = price($prodcustprice->lines [0]->price); - $pu_ttc = price($prodcustprice->lines [0]->price_ttc); - $price_base_type = $prodcustprice->lines [0]->price_base_type; - $prod->tva_tx = $prodcustprice->lines [0]->tva_tx; + $pu_ht = price($prodcustprice->lines[0]->price); + $pu_ttc = price($prodcustprice->lines[0]->price_ttc); + $price_base_type = $prodcustprice->lines[0]->price_base_type; + $prod->tva_tx = $prodcustprice->lines[0]->tva_tx; } } } - // if price ht is forced (ie: calculated by margin rate and cost price) - if (! empty($price_ht)) { + // if price ht was forced (ie: from gui when calculated by margin rate and cost price) + if (! empty($price_ht)) + { $pu_ht = price2num($price_ht, 'MU'); $pu_ttc = price2num($pu_ht * (1 + ($tva_tx / 100)), 'MU'); } - // On reevalue prix selon taux tva car taux tva transaction peut etre different // de ceux du produit par defaut (par exemple si pays different entre vendeur et acheteur). - elseif ($tva_tx != $prod->tva_tx) { - if ($price_base_type != 'HT') { + elseif ($tva_tx != $prod->tva_tx) + { + if ($price_base_type != 'HT') + { $pu_ht = price2num($pu_ttc / (1 + ($tva_tx / 100)), 'MU'); - } else { + } + else + { $pu_ttc = price2num($pu_ht * (1 + ($tva_tx / 100)), 'MU'); } } diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang index e108dfff52b..1759eb12e9f 100644 --- a/htdocs/langs/en_US/products.lang +++ b/htdocs/langs/en_US/products.lang @@ -67,6 +67,8 @@ ProductStatusNotOnBuy=Not for purchase ProductStatusOnBuyShort=For purchase ProductStatusNotOnBuyShort=Not for purchase UpdatePrice=Update price +UpdateVAT=Update vat +UpdateDefaultPrice=Update default price AppliedPricesFrom=Applied prices from SellingPrice=Selling price SellingPriceHT=Selling price (net of tax) diff --git a/htdocs/product/price.php b/htdocs/product/price.php index 9c7defc4643..ac611faf5c3 100644 --- a/htdocs/product/price.php +++ b/htdocs/product/price.php @@ -84,8 +84,37 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e if (empty($reshook)) { - if ($action == 'update_price' && !$cancel && ($user->rights->produit->creer || $user->rights->service->creer)) + if (($action == 'update_vat') && !$cancel && ($user->rights->produit->creer || $user->rights->service->creer)) { + $object->tva_tx = GETPOST('tva_tx'); + + $db->begin(); + + $resql = $object->update($object->id, $user); + if (! $resql) + { + $error++; + } + + if ($error) + { + $object->updatePrice($newprice, $newpricebase, $user, $newvat, $newprice_min, $level, $newnpr, $newpsq); + } + + if (! $error) + { + $db->commit(); + } + else + { + $db->rollback(); + } + + $action=''; + } + + if (($action == 'update_price') && !$cancel && ($user->rights->produit->creer || $user->rights->service->creer)) + { $maxpricesupplier = $object->min_recommended_price(); $object->fk_price_expression = empty($eid) ? 0 : $eid; //0 discards expression @@ -399,6 +428,11 @@ if ($isphoto) { print ''; +// Status (to sell) +print '' . $langs->trans("Status") . ' (' . $langs->trans("Sell") . ')'; +print $object->getLibStatut(2, 0); +print ''; + // MultiPrix if (! empty($conf->global->PRODUIT_MULTIPRICES)) { @@ -433,14 +467,32 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES)) print price($object->multiprices_min["$soc->price_level"]) . ' ' . $langs->trans(empty($object->multiprices_base_type["$soc->price_level"])?'HT':$object->multiprices_base_type["$soc->price_level"]); } print ''; - - // TVA - print '' . $langs->trans("VATRate") . '' . vatrate($object->multiprices_tva_tx["$soc->price_level"], true) . ''; + + if (! empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL)) // using this option is a bug. kept for backward compatibility + { + // TVA + print '' . $langs->trans("VATRate") . '' . vatrate($object->multiprices_tva_tx["$soc->price_level"], true) . ''; + } + else + { + // TVA + print '' . $langs->trans("VATRate") . '' . vatrate($object->tva_tx . ($object->tva_npr ? '*' : ''), true) . ''; + } + } else { - // We show only vat for level 1 - print '' . $langs->trans("VATRate") . '' . vatrate($object->multiprices_tva_tx [1], true) . ''; + if (! empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL)) // using this option is a bug. kept for backward compatibility + { + // We show only vat for level 1 + print '' . $langs->trans("VATRate") . '' . vatrate($object->multiprices_tva_tx [1], true) . ''; + } + else + { + // TVA + print '' . $langs->trans("VATRate") . '' . vatrate($object->tva_tx . ($object->tva_npr ? '*' : ''), true) . ''; + } + print ''.$langs->trans("PriceLevel").''.$langs->trans("SellingPrice").''.$langs->trans("MinPrice").''; for($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i ++) @@ -551,7 +603,9 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES)) } } } -} else { +} +else +{ // TVA print '' . $langs->trans("VATRate") . '' . vatrate($object->tva_tx . ($object->tva_npr ? '*' : ''), true) . ''; @@ -649,11 +703,6 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES)) } } -// Status (to sell) -print '' . $langs->trans("Status") . ' (' . $langs->trans("Sell") . ')'; -print $object->getLibStatut(2, 0); -print ''; - print "\n"; dol_fiche_end(); @@ -669,16 +718,69 @@ if (! $action || $action == 'delete' || $action == 'showlog_customer_price' || $ { print "\n" . '
' . "\n"; - if ($user->rights->produit->creer || $user->rights->service->creer) { - print '
' . $langs->trans("UpdatePrice") . '
'; + if (empty($conf->global->PRODUIT_MULTIPRICES)) + { + if ($user->rights->produit->creer || $user->rights->service->creer) { + print '
' . $langs->trans("UpdateDefaultPrice") . '
'; + } } - + else + { + if ($user->rights->produit->creer || $user->rights->service->creer) { + print '
' . $langs->trans("UpdateVAT") . '
'; + } + + if ($user->rights->produit->creer || $user->rights->service->creer) { + print '
' . $langs->trans("UpdateDefaultPrice") . '
'; + } + } + if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) + { + if ($user->rights->produit->creer || $user->rights->service->creer) { + print '
id . '">' . $langs->trans("AddCustomerPrice") . '
'; + } + } + print "\n
\n"; } + + /* - * Edition du prix + * Edit price area */ + +if ($action == 'edit_vat' && ($user->rights->produit->creer || $user->rights->service->creer)) +{ + print load_fiche_titre($langs->trans("UpdateVAT"), ''); + + print ''; + print ''; + print ''; + print ''; + + dol_fiche_head(''); + + print ''; + + // VAT + print ''; + + print '
' . $langs->trans("VATRate") . ''; + print $form->load_tva("tva_tx", $object->tva_tx, $mysoc, '', $object->id, $object->tva_npr); + print '
'; + + dol_fiche_end(); + + print '
'; + print ''; + print '     '; + print ''; + print '
'; + + print '

'; +} + if ($action == 'edit_price' && ($user->rights->produit->creer || $user->rights->service->creer)) { print load_fiche_titre($langs->trans("NewPrice"), ''); @@ -785,26 +887,31 @@ if ($action == 'edit_price' && ($user->rights->produit->creer || $user->rights-> } else { - for($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i ++) + dol_fiche_head(''); + + for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i ++) { + if ($i > 1) print '
'; + print '
'; - print ''; + print ''; print ''; print ''; + if (empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL)) + { + print ''; + } - dol_fiche_head(''); - print ''; // VAT - if ($i == 1) { + if (! empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL)) + { print ''; - } else { // We always use the vat rate of price level 1 (A vat rate does not depends on customer) - print ''; } - + // Selling price print '
' . $langs->trans("VATRate") . ''; - print $form->load_tva("tva_tx_" . $i, $object->multiprices_tva_tx ["$i"], $mysoc, '', $object->id); + print $form->load_tva("tva_tx_" . $i, $object->multiprices_tva_tx["$i"], $mysoc, '', $object->id); print '
'; $text = $langs->trans('SellingPrice') . ' ' . $i; @@ -839,10 +946,10 @@ if ($action == 'edit_price' && ($user->rights->produit->creer || $user->rights-> print '
'; - dol_fiche_end(); - print '
'; } + + dol_fiche_end(); } } @@ -886,14 +993,14 @@ if ($result) print '' . $langs->trans("AppliedPricesFrom") . ''; if (! empty($conf->global->PRODUIT_MULTIPRICES)) { - print '' . $langs->trans("MultiPriceLevelsName") . ''; + print '' . $langs->trans("PriceLevel") . ''; } if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) { print '' . $langs->trans("Type") . ''; } print '' . $langs->trans("PriceBase") . ''; - print '' . $langs->trans("VAT") . ''; + if (! empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL) || ! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) print '' . $langs->trans("VATRate") . ''; print '' . $langs->trans("HT") . ''; print '' . $langs->trans("TTC") . ''; if (! empty($conf->dynamicprices->enabled)) { @@ -928,7 +1035,7 @@ if ($result) } print '' . $langs->trans($objp->price_base_type) . ""; - print '' . vatrate($objp->tva_tx, true, $objp->recuperableonly) . ""; + if (! empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL) || ! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) print '' . vatrate($objp->tva_tx, true, $objp->recuperableonly) . ""; //Price if (! empty($objp->fk_price_expression) && ! empty($conf->dynamicprices->enabled)) @@ -942,14 +1049,14 @@ if ($result) } else { - print '' . price($objp->price) . ""; - print '' . price($objp->price_ttc) . ""; + print '' . ($objp->price_base_type != 'TTC' ? price($objp->price) : ''). ""; + print '' . ($objp->price_base_type == 'TTC' ? price($objp->price_ttc) : '') . ""; if (! empty($conf->dynamicprices->enabled)) { //Only if module is enabled print ''; } } - print '' . price($objp->price_min) . ''; - print '' . price($objp->price_min_ttc) . ''; + print '' . ($objp->price_base_type != 'TTC' ? price($objp->price_min) : '') . ''; + print '' . ($objp->price_base_type == 'TTC' ? price($objp->price_min_ttc) : '') . ''; // User print '' . img_object($langs->trans("ShowUser"), 'user') . ' ' . $objp->login . ''; @@ -1202,7 +1309,7 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) print '' . $langs->trans("ThirdParty") . ''; print '' . $langs->trans("AppliedPricesFrom") . ''; print '' . $langs->trans("PriceBase") . ''; - print '' . $langs->trans("VAT") . ''; + print '' . $langs->trans("VATRate") . ''; print '' . $langs->trans("HT") . ''; print '' . $langs->trans("TTC") . ''; print '' . $langs->trans("MinPrice") . ' ' . $langs->trans("HT") . ''; @@ -1275,7 +1382,7 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) print '' . $langs->trans("ThirdParty") . ''; print '' . $langs->trans("AppliedPricesFrom") . ''; print '' . $langs->trans("PriceBase") . ''; - print '' . $langs->trans("VAT") . ''; + print '' . $langs->trans("VATRate") . ''; print '' . $langs->trans("HT") . ''; print '' . $langs->trans("TTC") . ''; print '' . $langs->trans("MinPrice") . ' ' . $langs->trans("HT") . ''; @@ -1355,19 +1462,6 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) print ""; print ""; - - /* ************************************************************************** */ - /* */ - /* Barre d'action */ - /* */ - /* ************************************************************************** */ - - print "\n" . '
' . "\n"; - - if ($user->rights->produit->creer || $user->rights->service->creer) { - print '
id . '">' . $langs->trans("AddCustomerPrice") . '
'; - } - print "\n

\n"; } } From 132bc610b6ccd5ba7a8616289454aba76315aa98 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 25 Oct 2015 23:32:49 +0100 Subject: [PATCH 28/45] Icon for contact contains a part of thirdparty icon to make things easier to understand --- htdocs/comm/card.php | 2 +- htdocs/societe/soc.php | 12 +++++++++++- htdocs/theme/eldy/img/object_contact.png | Bin 593 -> 666 bytes htdocs/theme/eldy/img/object_group.png | Bin 912 -> 655 bytes htdocs/theme/eldy/img/object_user.png | Bin 651 -> 581 bytes htdocs/theme/md/img/object_contact.png | Bin 593 -> 666 bytes htdocs/theme/md/img/object_group.png | Bin 912 -> 655 bytes htdocs/theme/md/img/object_user.png | Bin 607 -> 581 bytes 8 files changed, 12 insertions(+), 2 deletions(-) diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php index fe164006a29..b874eeefde5 100644 --- a/htdocs/comm/card.php +++ b/htdocs/comm/card.php @@ -226,7 +226,7 @@ if ($id > 0) print ''; // Alias name (commercial, trademark or alias name) - print '"; diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index 93fff61d1f1..71fa3b66a74 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -1908,7 +1908,17 @@ else print $object->name_alias; print ""; - // Prefix + // Prospect/Customer + print ''; + + // Prospect/Customer + print ''; + + // Prefix if (! empty($conf->global->SOCIETE_USEPREFIX)) // Old not used prefix field { print ''; diff --git a/htdocs/theme/eldy/img/object_contact.png b/htdocs/theme/eldy/img/object_contact.png index e98202b367d15cdb2509122e8d4f0e009396f2ba..d4272f367c6e5eae37c9ddc745fd8a9be7d05bb7 100644 GIT binary patch delta 653 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 delta 578 zcmV-I0=@mk1d9cbRDTg5A&eCHRR9127)eAyR4C7FlEF?BQ51&1duPg&rqBX{V2KNe zP+b(5q7XK+H*uq`T$s4RCvYcEz%%#&JOK}2Of=3y)EO{dwa3(`+o#M0D#*EeBY-~D7X(F zt?taumR^O;5R0(1TzM;E3&5K`1fcsx5CkkQFXcSXds%NZFtH)-b~!#dW`2Hd3&;;9 z(}PXt`Z_BjZXCzN#$b%Wm>8usW5uz#!C7~(IXgS+Dy^&{c51cSU&oD& zwf=4N!o7vEo5|cy(lk~|0bqDPY)ItNM{d1QaygQY5o2_=|;-a}FV#h&^pmbgoIZ&PkED|e`j##<0B9~gxo?DpbH}ES2oB*tC Q)c^nh07*qoM6N<$f(Stpr2qf` diff --git a/htdocs/theme/md/img/object_contact.png b/htdocs/theme/md/img/object_contact.png index e98202b367d15cdb2509122e8d4f0e009396f2ba..d4272f367c6e5eae37c9ddc745fd8a9be7d05bb7 100644 GIT binary patch delta 653 zcmV;80&@M)1eyhq8Gi-<0019IEztk~00v@9M??Vs0RI60puMM)00009a7bBm000XU z000XU0RWnu7ytkO2XskIMF-ys85SN9?nlG{0006fNklN=8P8; z^8?E@F+mzhZ3`l;h$*;~4qbGqNS6*yb@4B7@~?2If;cpTyMJATZZ?RJLb1I?nrvxo z^sXi)?_KV_*CC`-5Pjz7^ZkCGhp)kZrqMXk4X26cO0eMZ@?CD;EEwWnP`mAF$2q2) z&jFHlv(2m82aejVHpffz^Yhmh7Z+a^i^V5OsaUJkdi(nQM;_d+u)X6T<$$*5;klAp zb_Zi?YuDP`e18#EtJOE9Qt7Gdx@fJ*WHM+SV`=FTPV@LYMZS=w-f%Fn2p1L>uEgW< z^=`LI7=|dN==FM}(`okh4mmtJ1;CRomSs^WHa2YAwmV}eiXw)?A(NAn%*@;) z2+|A~0FcWjaGW+KK&R7@LWo{EoxU0b0bv*tMG>Cok$=hLI5|NSs54@nF4%5TlQt)Tl}G6#jD1Z-zW8T z&YspcYu2oFE0^xrx@rI3JspcK^{>3yvF3Tl#!uawKD2K9(YO2mqKzk4?!3Qu@1bS8 zKP@}-ebbSbyH3A5b>_<5>lg0czIp5JqeEA}AHDnk?&Hr-9^d`><;DO1zyJULZ<^0> z92h!bB|(0{KrZzGgO_j4O`r`0o-U3d9M_XMSeX@FT@B7MJj^<|uxRUqok@OvR*MSO zE!wtr+gu^}DcUO*EnT^6p{5$g!&MnAQqtNjuRb^JRIu)mIdXt!#mQygqCC{3ttBk9 zm3FkT{W0006UNklgsC0-EKb;k*p|+SJUaVzqz^T_>c0Pot?bf?Y?NY+mGwI z2B6dFJXh6Az|;SMW^ZrrVzb#SthISc2~{PfgoyC&-P@O)PUm4tk_`rfSHt13zrVll z0CMmBQlrtxV}Fc@2qHp^k>T(MH#d4u%1Mc!+_`)ExvHGCu+!;uURBkJh>%hu#z>5T za#AuX3cT~U`JC^E-&tQ@djgyXuvJw#RsFDlQc9ejR;Vh@Ih^-+@A2MYtYx{qyar&0 z!(oUqz7HYboTIL5@;ql$6hS26y~BG?2!Z3{W6DYS8-KuVZ*R+ZJboQQ_z^2kAqZo@2$2lwx%IW!$DEh;%UDLFVYFn=OOH7HIvDO*N6A3#1X zKr~B4H(g3UUPwkQO-3$LOes}LDqBh_Q&2xySUzfADrH|kZeBEVYd=pXaCvrrd~tbsd3$?%etv#pSb%Y9h;(d=cyWz=dWU&) zkb-e8iF-the@cmeRDpkRl!ZN(j8=hwaEXU@kB)zqkZ+-sR;!&^s-JASt!=WXd%3Z7 z!nJb2w|0ewhK7cQhlhuWiG_%Wh>DAfh>nbnjg5_on}3m!kCl~;n39T}osX85mXVv8 zo|%=No|l)CqMxd#mb9#&v83H>uCAr2 zsj925uCA`GudlDAp}L^Fw5zhQthKVUvaPeTv$L|bwzadhwYa*vx|+kdn#8!Cz_`-N zi_yrP*niTS+0&lf)||=1rO3yi#m2GD%&^qXqt?@;*wm!l*P!3prQ6!D;Mt(#+pXf> zso~zN<=w02;h^f}sOjXb=;W^K=%?=Jtnccz@a(tn=(zFhx$^G1^Y6R#?7YUs%gW2f z$jHvi%FfQr&(+$*+t$_L<<{ir+2-uo_V32^@_)i0C2-LI0004WQchC;>)nZ0z?nn{zFtXME>=G-g>h8gqM z?|oW5Z`sPV>vm6{&cG0#)X<$8zjgc09UFm?3@+J??UhctwbQadyzGRk`j*x>ql~-| zbs*O{xuChP$i_asx-J;#4Cj=>-ku!o#EuP{I!zcDtSqf<9V~*nHgDUur41+z0>MEL a5DWnIMoJ6<)(Eu#0000$5C=4EXOx<1JF^TNnK)5L4on>B6F9R^&}Z-g`UE_HF@MpNq;^cCR#EDu7o_Fh zb2#U0XAL$oanIJyTG=}*AMl?;*B6_2H%mL)+k2Ht<*Bt!cDvnoylAT6qx;LpU%t8ud5KZV|xiS+AHCjmAdW_xQa;YZ@Zfs;a#kp< zIKPV+?!Ny8xH~5c6McGZ7eoBO=Glej$G|^9Mvg*wk5w1(*N;002ovPDHLk FV1lvm^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= Date: Mon, 26 Oct 2015 05:40:34 +0100 Subject: [PATCH 29/45] Typo --- htdocs/societe/soc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index 71fa3b66a74..8b640040b80 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -1915,7 +1915,7 @@ else // Prospect/Customer print ''; // Prefix From 71da059ef09642143407e992e911acaab0810538 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 26 Oct 2015 11:23:31 +0100 Subject: [PATCH 30/45] NEW Add a new widget $form->selectArrayAjax() to use combo list with content coming from an Ajax URL. --- htdocs/core/ajax/selectsearchbox.php | 10 +++---- htdocs/core/class/html.form.class.php | 41 +++++++++++++++++---------- htdocs/public/test/test_forms.php | 4 +-- 3 files changed, 33 insertions(+), 22 deletions(-) diff --git a/htdocs/core/ajax/selectsearchbox.php b/htdocs/core/ajax/selectsearchbox.php index 4fe9b905eda..565866e2d90 100644 --- a/htdocs/core/ajax/selectsearchbox.php +++ b/htdocs/core/ajax/selectsearchbox.php @@ -44,14 +44,14 @@ if ((( ! empty($conf->societe->enabled) && (empty($conf->global->SOCIETE_DISABLE { $langs->load("companies"); //$searchform.=printSearchForm(DOL_URL_ROOT.'/societe/list.php', DOL_URL_ROOT.'/societe/list.php', $langs->trans("ThirdParties"), 'soc', 'sall', 'T', 'searchleftt', img_object('','company')); - $arrayresult['searchintothirdparty']=img_picto('','object_company').' '.$langs->trans("SearchIntoThirdparties", $search_boxvalue); + $arrayresult['searchintothirdparty']=array('text'=>img_picto('','object_company').' '.$langs->trans("SearchIntoThirdparties", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/societe/list.php?sall='.urlencode($search_boxvalue)); } if (! empty($conf->societe->enabled) && ! empty($conf->global->MAIN_SEARCHFORM_CONTACT) && $user->rights->societe->lire) { $langs->load("companies"); //$searchform.=printSearchForm(DOL_URL_ROOT.'/contact/list.php', DOL_URL_ROOT.'/contact/list.php', $langs->trans("Contacts"), 'contact', 'sall', 'A', 'searchleftc', img_object('','contact')); - $arrayresult['searchintocontact']=img_picto('','object_contact').' '.$langs->trans("SearchIntoContacts", $search_boxvalue); + $arrayresult['searchintocontact']=array('text'=>img_picto('','object_contact').' '.$langs->trans("SearchIntoContacts", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/contact/list.php?sall='.urlencode($search_boxvalue)); } if (((! empty($conf->product->enabled) && $user->rights->produit->lire) || (! empty($conf->service->enabled) && $user->rights->service->lire)) @@ -59,7 +59,7 @@ if (((! empty($conf->product->enabled) && $user->rights->produit->lire) || (! em { $langs->load("products"); //$searchform.=printSearchForm(DOL_URL_ROOT.'/product/list.php', DOL_URL_ROOT.'/product/list.php', $langs->trans("Products")."/".$langs->trans("Services"), 'products', 'sall', 'P', 'searchleftp', img_object('','product')); - $arrayresult['searchintoproduct']=img_picto('','object_product').' '.$langs->trans("SearchIntoProductsOrServices", $search_boxvalue); + $arrayresult['searchintoproduct']=array('text'=>img_picto('','object_product').' '.$langs->trans("SearchIntoProductsOrServices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/product/list.php?sall='.urlencode($search_boxvalue)); } /*if (((! empty($conf->product->enabled) && $user->rights->produit->lire) || (! empty($conf->service->enabled) && $user->rights->service->lire)) && ! empty($conf->fournisseur->enabled) @@ -73,14 +73,14 @@ if (! empty($conf->adherent->enabled) && ! empty($conf->global->MAIN_SEARCHFORM_ { $langs->load("members"); //$searchform.=printSearchForm(DOL_URL_ROOT.'/adherents/list.php', DOL_URL_ROOT.'/adherents/list.php', $langs->trans("Members"), 'member', 'sall', 'M', 'searchleftm', img_object('','user')); - $arrayresult['searchintomember']=img_picto('','object_user').' '.$langs->trans("SearchIntoMembers", $search_boxvalue); + $arrayresult['searchintomember']=array('text'=>img_picto('','object_user').' '.$langs->trans("SearchIntoMembers", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/adherents/list.php?sall='.urlencode($search_boxvalue)); } if (! empty($conf->projet->enabled) && ! empty($conf->global->MAIN_SEARCHFORM_PROJECT) && $user->rights->projet->lire) { $langs->load("projects"); //$searchform.=printSearchForm(DOL_URL_ROOT.'/projet/list.php', DOL_URL_ROOT.'/projet/list.php', $langs->trans("Projects"), 'project', 'search_all', 'Q', 'searchleftproj', img_object('','projectpub')); - $arrayresult['searchintoprojects']=img_picto('','object_projectpub').' '.$langs->trans("SearchIntoProjects", $search_boxvalue); + $arrayresult['searchintoprojects']=array('text'=>img_picto('','object_projectpub').' '.$langs->trans("SearchIntoProjects", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/projet/list.php?search_all='.urlencode($search_boxvalue)); } // Execute hook printSearchForm diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 5f714a85bcd..1e11f103a39 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -4504,16 +4504,17 @@ class Form * Note: Do not apply langs->trans function on returned content of Ajax service, content may be entity encoded twice. * * @param string $htmlname Name of html select area - * @param string $url Url + * @param string $url Url. Must return a json_encode of array(key=>array('text'=>'A text', 'url'=>'An url'), ...) * @param string $id Preselected key * @param string $moreparam Add more parameters onto the select tag * @param string $moreparamtourl Add more parameters onto the Ajax called URL * @param int $disabled Html select box is disabled * @param int $minimumInputLength Minimum Input Length * @param string $morecss Add more class to css styles + * @param int $callurlonselect If set to 1, some code is added so an url return by the ajax is called when value is selected. * @return string HTML select string. */ - static function selectArrayAjax($htmlname, $url, $id='', $moreparam='', $moreparamtourl='', $disabled=0, $minimumInputLength=1, $morecss='') + static function selectArrayAjax($htmlname, $url, $id='', $moreparam='', $moreparamtourl='', $disabled=0, $minimumInputLength=1, $morecss='', $callurlonselect=0) { $out = ''; @@ -4521,7 +4522,10 @@ class Form $out.=' '; diff --git a/htdocs/public/test/test_forms.php b/htdocs/public/test/test_forms.php index 5e7b2f2434f..a189ee836b1 100644 --- a/htdocs/public/test/test_forms.php +++ b/htdocs/public/test/test_forms.php @@ -64,11 +64,11 @@ print $form->selectarray('selectarray',$array); print '

'."\n"; -print "Test 4d: a select with ajax refresh
\n"; +print "Test 4d: a select with ajax refresh and with onchange call of url
\n"; //$array=array(0=>'',1=>'Search into xxx',2=>'Search into yyy',3=>'Search into zzz'); $array=array(); $selected=-1; -print $form->selectArrayAjax('testselectc', DOL_URL_ROOT.'/core/ajax/selectsearchbox.php', $selected, 'style="min-width: 250px;"', '', 0, 1, ''); +print $form->selectArrayAjax('testselectc', DOL_URL_ROOT.'/core/ajax/selectsearchbox.php', $selected, 'style="min-width: 250px;"', '', 0, 1, '', 1); print '

'."\n"; From 4fd0086862af66e5a67530ee9903088f8d24772b Mon Sep 17 00:00:00 2001 From: Sergio Sanchis Climent Date: Mon, 26 Oct 2015 11:33:43 +0100 Subject: [PATCH 31/45] Fix: error this.price > 0 if no parse this.price when compare this.price and 0 always false --- htdocs/core/tpl/objectline_create.tpl.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php index ccf63983539..e8bacede84a 100644 --- a/htdocs/core/tpl/objectline_create.tpl.php +++ b/htdocs/core/tpl/objectline_create.tpl.php @@ -521,6 +521,7 @@ jQuery(document).ready(function() { if (this.id != 'pmpprice') { i++; + this.price = parseFloat(this.price);//fix this.price >0 // If margin is calculated on best supplier price, we set it by defaut (but only if value is not 0) var defaultbuyprice = 'global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == '1')?'bestsupplierprice':''); ?>'; From 5c4ac0bf62d65b788a8add89953831346b95253a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 26 Oct 2015 12:16:40 +0100 Subject: [PATCH 32/45] NEW Merge all left menu search boxes into one. --- htdocs/core/ajax/selectsearchbox.php | 52 +++++++++++++++------------ htdocs/core/class/html.form.class.php | 6 +++- htdocs/langs/en_US/main.lang | 1 + htdocs/main.inc.php | 22 +++++++----- htdocs/public/test/test_forms.php | 2 -- htdocs/theme/eldy/style.css.php | 14 +++++--- htdocs/theme/md/style.css.php | 4 +++ htdocs/user/index.php | 44 ++++++++++++++++++----- 8 files changed, 99 insertions(+), 46 deletions(-) diff --git a/htdocs/core/ajax/selectsearchbox.php b/htdocs/core/ajax/selectsearchbox.php index 565866e2d90..a7149400f80 100644 --- a/htdocs/core/ajax/selectsearchbox.php +++ b/htdocs/core/ajax/selectsearchbox.php @@ -40,14 +40,14 @@ $search_boxvalue=GETPOST('q'); $arrayresult=array(); // Define $searchform -if ((( ! empty($conf->societe->enabled) && (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))) || ! empty($conf->fournisseur->enabled)) && ! empty($conf->global->MAIN_SEARCHFORM_SOCIETE) && $user->rights->societe->lire) +if ((( ! empty($conf->societe->enabled) && (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))) || ! empty($conf->fournisseur->enabled)) && empty($conf->global->MAIN_SEARCHFORM_SOCIETE_DISABLED) && $user->rights->societe->lire) { $langs->load("companies"); //$searchform.=printSearchForm(DOL_URL_ROOT.'/societe/list.php', DOL_URL_ROOT.'/societe/list.php', $langs->trans("ThirdParties"), 'soc', 'sall', 'T', 'searchleftt', img_object('','company')); $arrayresult['searchintothirdparty']=array('text'=>img_picto('','object_company').' '.$langs->trans("SearchIntoThirdparties", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/societe/list.php?sall='.urlencode($search_boxvalue)); } -if (! empty($conf->societe->enabled) && ! empty($conf->global->MAIN_SEARCHFORM_CONTACT) && $user->rights->societe->lire) +if (! empty($conf->societe->enabled) && empty($conf->global->MAIN_SEARCHFORM_CONTACT_DISABLED) && $user->rights->societe->lire) { $langs->load("companies"); //$searchform.=printSearchForm(DOL_URL_ROOT.'/contact/list.php', DOL_URL_ROOT.'/contact/list.php', $langs->trans("Contacts"), 'contact', 'sall', 'A', 'searchleftc', img_object('','contact')); @@ -55,42 +55,50 @@ if (! empty($conf->societe->enabled) && ! empty($conf->global->MAIN_SEARCHFORM_C } if (((! empty($conf->product->enabled) && $user->rights->produit->lire) || (! empty($conf->service->enabled) && $user->rights->service->lire)) -&& ! empty($conf->global->MAIN_SEARCHFORM_PRODUITSERVICE)) +&& empty($conf->global->MAIN_SEARCHFORM_PRODUITSERVICE_DISABLED)) { $langs->load("products"); //$searchform.=printSearchForm(DOL_URL_ROOT.'/product/list.php', DOL_URL_ROOT.'/product/list.php', $langs->trans("Products")."/".$langs->trans("Services"), 'products', 'sall', 'P', 'searchleftp', img_object('','product')); $arrayresult['searchintoproduct']=array('text'=>img_picto('','object_product').' '.$langs->trans("SearchIntoProductsOrServices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/product/list.php?sall='.urlencode($search_boxvalue)); } -/*if (((! empty($conf->product->enabled) && $user->rights->produit->lire) || (! empty($conf->service->enabled) && $user->rights->service->lire)) && ! empty($conf->fournisseur->enabled) -&& ! empty($conf->global->MAIN_SEARCHFORM_PRODUITSERVICE_SUPPLIER)) -{ - $langs->load("products"); - $searchform.=printSearchForm(DOL_URL_ROOT.'/fourn/product/list.php', DOL_URL_ROOT.'/fourn/product/list.php', $langs->trans("SupplierRef"), 'products', 'srefsupplier', '', 'searchlefts', img_object('','product')); -}*/ - -if (! empty($conf->adherent->enabled) && ! empty($conf->global->MAIN_SEARCHFORM_ADHERENT) && $user->rights->adherent->lire) -{ - $langs->load("members"); - //$searchform.=printSearchForm(DOL_URL_ROOT.'/adherents/list.php', DOL_URL_ROOT.'/adherents/list.php', $langs->trans("Members"), 'member', 'sall', 'M', 'searchleftm', img_object('','user')); - $arrayresult['searchintomember']=array('text'=>img_picto('','object_user').' '.$langs->trans("SearchIntoMembers", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/adherents/list.php?sall='.urlencode($search_boxvalue)); -} - -if (! empty($conf->projet->enabled) && ! empty($conf->global->MAIN_SEARCHFORM_PROJECT) && $user->rights->projet->lire) +if (! empty($conf->projet->enabled) && empty($conf->global->MAIN_SEARCHFORM_PROJECT_DISABLED) && $user->rights->projet->lire) { $langs->load("projects"); //$searchform.=printSearchForm(DOL_URL_ROOT.'/projet/list.php', DOL_URL_ROOT.'/projet/list.php', $langs->trans("Projects"), 'project', 'search_all', 'Q', 'searchleftproj', img_object('','projectpub')); $arrayresult['searchintoprojects']=array('text'=>img_picto('','object_projectpub').' '.$langs->trans("SearchIntoProjects", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/projet/list.php?search_all='.urlencode($search_boxvalue)); } -// Execute hook printSearchForm +if (! empty($conf->adherent->enabled) && empty($conf->global->MAIN_SEARCHFORM_ADHERENT_DISABLED) && $user->rights->adherent->lire) +{ + $langs->load("members"); + //$searchform.=printSearchForm(DOL_URL_ROOT.'/adherents/list.php', DOL_URL_ROOT.'/adherents/list.php', $langs->trans("Members"), 'member', 'sall', 'M', 'searchleftm', img_object('','user')); + $arrayresult['searchintomember']=array('text'=>img_picto('','object_user').' '.$langs->trans("SearchIntoMembers", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/adherents/list.php?sall='.urlencode($search_boxvalue)); +} + +if (! empty($conf->user->enabled) && empty($conf->global->MAIN_SEARCHFORM_PROJECT_DISABLED) && $user->rights->user->user->lire) +{ + $langs->load("users"); + //$searchform.=printSearchForm(DOL_URL_ROOT.'/projet/list.php', DOL_URL_ROOT.'/projet/list.php', $langs->trans("Projects"), 'project', 'search_all', 'Q', 'searchleftproj', img_object('','projectpub')); + $arrayresult['searchintouser']=array('text'=>img_picto('','object_user').' '.$langs->trans("SearchIntoUsers", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/user/index.php?sall='.urlencode($search_boxvalue)); +} + +/* Do we really need this. We already have a select for users, and we should be able to filter into user list on employee flag +if (! empty($conf->hrm->enabled) && ! empty($conf->global->MAIN_SEARCHFORM_EMPLOYEE) && $user->rights->hrm->employee->read) +{ + $langs->load("hrm"); + $searchform.=printSearchForm(DOL_URL_ROOT.'/hrm/employee/list.php', DOL_URL_ROOT.'/hrm/employee/list.php', $langs->trans("Employees"), 'employee', 'search_all', 'M', 'searchleftemployee', img_object('','user')); +} +*/ + +// Execute hook addSearchEntry $parameters=array(); -$reshook=$hookmanager->executeHooks('printSearchForm',$parameters); // Note that $action and $object may have been modified by some hooks +$reshook=$hookmanager->executeHooks('addSearchEntry',$parameters); if (empty($reshook)) { - $searchform.=$hookmanager->resPrint; + $arrayresult=array_merge($arrayresult, $hookmanager->resArray); } -else $searchform=$hookmanager->resPrint; +else $arrayresult=$hookmanager->resArray; diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 1e11f103a39..a9f66d80f22 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -4512,10 +4512,13 @@ class Form * @param int $minimumInputLength Minimum Input Length * @param string $morecss Add more class to css styles * @param int $callurlonselect If set to 1, some code is added so an url return by the ajax is called when value is selected. + * @param string $placeholder String to use as placeholder * @return string HTML select string. */ - static function selectArrayAjax($htmlname, $url, $id='', $moreparam='', $moreparamtourl='', $disabled=0, $minimumInputLength=1, $morecss='', $callurlonselect=0) + static function selectArrayAjax($htmlname, $url, $id='', $moreparam='', $moreparamtourl='', $disabled=0, $minimumInputLength=1, $morecss='', $callurlonselect=0, $placeholder='') { + global $langs; + $out = ''; $tmpplugin='select2'; @@ -4559,6 +4562,7 @@ class Form },*/ cache: true }, + placeholder: "'.dol_escape_js($placeholder).'", escapeMarkup: function (markup) { return markup; }, // let our custom formatter work minimumInputLength: '.$minimumInputLength.', formatResult: function(result, container, query, escapeMarkup) { diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index b8c6735be80..648ce25b9ce 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -755,5 +755,6 @@ SetRef=Set ref SearchIntoThirdparties=Search %s into thirdparties SearchIntoContacts=Search %s into contacts SearchIntoMembers=Search %s into members +SearchIntoUsers=Search %s into users SearchIntoProductsOrServices=Search %s into products or services SearchIntoProjects=Search %s into projects \ No newline at end of file diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 608957aa52d..8db9b6aa2ac 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -1551,7 +1551,7 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a */ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $menu_array_after='', $leftmenuwithoutmainarea=0, $title='') { - global $user, $conf, $langs, $db; + global $user, $conf, $langs, $db, $form; global $hookmanager, $menumanager; $searchform=''; @@ -1567,7 +1567,12 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me print "\n"; + if (! is_object($form)) $form=new Form($db); + $selected=-1; + $searchform.=$form->selectArrayAjax('searchselectcombo', DOL_URL_ROOT.'/core/ajax/selectsearchbox.php', $selected, '', '', 0, 1, 'vmenusearchselectcombo', 1, $langs->trans("Search")); + // Define $searchform + /* if ((( ! empty($conf->societe->enabled) && (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))) || ! empty($conf->fournisseur->enabled)) && ! empty($conf->global->MAIN_SEARCHFORM_SOCIETE) && $user->rights->societe->lire) { $langs->load("companies"); @@ -1594,18 +1599,18 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me $searchform.=printSearchForm(DOL_URL_ROOT.'/fourn/product/list.php', DOL_URL_ROOT.'/fourn/product/list.php', $langs->trans("SupplierRef"), 'products', 'srefsupplier', '', 'searchlefts', img_object('','product')); } + if (! empty($conf->projet->enabled) && ! empty($conf->global->MAIN_SEARCHFORM_PROJECT) && $user->rights->projet->lire) + { + $langs->load("projects"); + $searchform.=printSearchForm(DOL_URL_ROOT.'/projet/list.php', DOL_URL_ROOT.'/projet/list.php', $langs->trans("Projects"), 'project', 'search_all', 'Q', 'searchleftproj', img_object('','projectpub')); + } + if (! empty($conf->adherent->enabled) && ! empty($conf->global->MAIN_SEARCHFORM_ADHERENT) && $user->rights->adherent->lire) { $langs->load("members"); $searchform.=printSearchForm(DOL_URL_ROOT.'/adherents/list.php', DOL_URL_ROOT.'/adherents/list.php', $langs->trans("Members"), 'member', 'sall', 'M', 'searchleftm', img_object('','user')); } - if (! empty($conf->projet->enabled) && ! empty($conf->global->MAIN_SEARCHFORM_PROJECT) && $user->rights->projet->lire) - { - $langs->load("projects"); - $searchform.=printSearchForm(DOL_URL_ROOT.'/projet/list.php', DOL_URL_ROOT.'/projet/list.php', $langs->trans("Projects"), 'project', 'search_all', 'Q', 'searchleftproj', img_object('','projectpub')); - } - if (! empty($conf->hrm->enabled) && ! empty($conf->global->MAIN_SEARCHFORM_EMPLOYEE) && $user->rights->hrm->employee->read) { $langs->load("hrm"); @@ -1620,7 +1625,8 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me $searchform.=$hookmanager->resPrint; } else $searchform=$hookmanager->resPrint; - + */ + // Define $bookmarks if (! empty($conf->bookmark->enabled) && $user->rights->bookmark->lire) { diff --git a/htdocs/public/test/test_forms.php b/htdocs/public/test/test_forms.php index a189ee836b1..f1c00f94acf 100644 --- a/htdocs/public/test/test_forms.php +++ b/htdocs/public/test/test_forms.php @@ -65,8 +65,6 @@ print $form->selectarray('selectarray',$array); print '

'."\n"; print "Test 4d: a select with ajax refresh and with onchange call of url
\n"; -//$array=array(0=>'',1=>'Search into xxx',2=>'Search into yyy',3=>'Search into zzz'); -$array=array(); $selected=-1; print $form->selectArrayAjax('testselectc', DOL_URL_ROOT.'/core/ajax/selectsearchbox.php', $selected, 'style="min-width: 250px;"', '', 0, 1, '', 1); diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index c152e1d93a3..641b13030ee 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -1145,6 +1145,10 @@ div.vmenu, td.vmenu { } +.vmenusearchselectcombo { + width: 172px; +} + .menu_contenu { padding-top: 3px; padding-bottom: 2px; @@ -1219,17 +1223,17 @@ div.blockvmenusearch color: #000000; text-align: ; text-decoration: none; - padding-left: 5px; + /*padding-left: 5px; padding-right: 1px; padding-top: 3px; - padding-bottom: 3px; - margin: 1px 0px 8px 2px; + padding-bottom: 3px; */ + margin: 1px 0px 4px 2px; background: rgb(); - border-left: 1px solid #AAA; + /*border-left: 1px solid #AAA; border-right: 1px solid #BBB; border-bottom: 1px solid #BBB; - border-top: 1px solid #BBB; + border-top: 1px solid #BBB;*/ /*border-radius: 4px; -moz-border-radius: 4px; -moz-box-shadow: 3px 3px 4px #DDD; diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index db6cfa50f86..55ef8a3b991 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -1173,6 +1173,10 @@ div.vmenu, td.vmenu { } +.vmenusearchselectcombo { + width: 170px; +} + .menu_contenu { padding-top: 4px; padding-bottom: 3px;} #menu_contenu_logo { padding-right: 4px; } diff --git a/htdocs/user/index.php b/htdocs/user/index.php index 7688cadbe05..6b618552dc6 100644 --- a/htdocs/user/index.php +++ b/htdocs/user/index.php @@ -45,6 +45,8 @@ $search_user=GETPOST('search_user','alpha'); $search_login=GETPOST('search_login','alpha'); $search_lastname=GETPOST('search_lastname','alpha'); $search_firstname=GETPOST('search_firstname','alpha'); +$search_accountancy_code=GETPOST('search_accountancy_code','alpha'); +$search_email=GETPOST('search_email','alpha'); $search_statut=GETPOST('search_statut','alpha'); $search_thirdparty=GETPOST('search_thirdparty','alpha'); $search_supervisor=GETPOST('search_supervisor','alpha'); @@ -82,6 +84,8 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both $search_login=""; $search_lastname=""; $search_firstname=""; + $search_accountancy_code=""; + $search_email=""; $search_statut=""; $search_thirdparty=""; $search_supervisor=""; @@ -94,8 +98,8 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both // List of fields to search into when doing a "search in all" $fieldstosearchall = array( 'u.login'=>"Login", - 'u.firstname'=>"Firstname", 'u.lastname'=>"Lastname", + 'u.firstname'=>"Firstname", 'u.accountancy_code'=>"AccountancyCode", 'u.email'=>"EMail", 'u.note'=>"Note" @@ -124,7 +128,7 @@ $buttonviewhierarchy='
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_accountancy_code != '') $sql.= natural_search("u.accountancy_code", $search_accountancy_code); +if ($search_email != '') $sql.= natural_search("u.email", $search_email); if ($search_statut != '' && $search_statut >= 0) $sql.= " AND (u.statut=".$search_statut.")"; -if ($sall) $sql.= natural_search($fieldstosearchall, $sall); +if ($sall) $sql.= natural_search(array_keys($fieldstosearchall), $sall); // Add where from extra fields foreach ($search_array_options as $key => $val) { @@ -188,6 +194,8 @@ if ($result) 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_accountancy_code != '') $param.="&search_accountancy_code=".$search_accountancy_code; + if ($search_email != '') $param.="&search_email=".$search_email; if ($search_supervisor > 0) $param.="&search_supervisor=".$search_supervisor; if ($search_statut != '') $param.="&search_statut=".$search_statut; if ($optioncss != '') $param.='&optioncss='.$optioncss; @@ -217,7 +225,9 @@ if ($result) '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.accountancy_code'=>array('label'=>$langs->trans("AccountancyCode"), 'checked'=>0), + 'u.email'=>array('label'=>$langs->trans("EMail"), '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), @@ -233,6 +243,8 @@ if ($result) 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.accountancy_code']['checked'])) print_liste_field_titre($langs->trans("AccountancyCode"),$_SERVER['PHP_SELF'],"u.accountancy_code",$param,"","",$sortfield,$sortorder); + if (! empty($arrayfields['u.email']['checked'])) print_liste_field_titre($langs->trans("EMail"),$_SERVER['PHP_SELF'],"u.email",$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); @@ -273,6 +285,14 @@ if ($result) { print ''; } + if (! empty($arrayfields['u.accountancy_code']['checked'])) + { + print ''; + } + if (! empty($arrayfields['u.email']['checked'])) + { + print ''; + } if (! empty($arrayfields['u.fk_soc']['checked'])) { print ''; @@ -364,13 +384,21 @@ if ($result) } if (! empty($arrayfields['u.lastname']['checked'])) { - print ''; + print ''; } if (! empty($arrayfields['u.firstname']['checked'])) { - print ''; + print ''; } - if (! empty($arrayfields['u.fk_soc']['checked'])) + if (! empty($arrayfields['u.accountancy_code']['checked'])) + { + print ''; + } + if (! empty($arrayfields['u.email']['checked'])) + { + print ''; + } + if (! empty($arrayfields['u.fk_soc']['checked'])) { print "'; + print ''; print ''; print ''; @@ -357,20 +360,23 @@ else // Show print '
'; - // Liste des zone de recherches permanentes supportees - print '
'.$langs->trans('AliasNameShort').''; + print '
'.$langs->trans('AliasNames').''; print $object->name_alias; print "
'.$langs->trans('ProspectCustomer').''; + print $object->getLibCustProspStatut(); + print '
'.$langs->trans('Supplier').''; + print yn($object->fournsseur); + print '
'.$langs->trans('Prefix').''.$object->prefix_comm.'
'.$langs->trans('Supplier').''; - print yn($object->fournsseur); + print yn($object->fournisseur); print '
'.ucfirst($obj->lastname).''.$obj->lastname.''.ucfirst($obj->firstname).''.$obj->firstname.''.$obj->accountancy_code.''.$obj->email.'"; if ($obj->fk_soc) From d5e42478a999246a713de7ba0594ed211dbfa245 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 26 Oct 2015 12:37:36 +0100 Subject: [PATCH 33/45] Removed deprecated options to show or not forms. Such forms does not exists anymore. --- htdocs/admin/ihm.php | 40 ++++++++++++++++++++--------------- htdocs/langs/en_US/admin.lang | 3 ++- 2 files changed, 25 insertions(+), 18 deletions(-) diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php index 6e7a4f7d868..38d766e77fb 100644 --- a/htdocs/admin/ihm.php +++ b/htdocs/admin/ihm.php @@ -47,11 +47,12 @@ $action = GETPOST('action'); if (! defined("MAIN_MOTD")) define("MAIN_MOTD",""); // List of supported permanent search area +/* $searchform=array("MAIN_SEARCHFORM_SOCIETE", "MAIN_SEARCHFORM_CONTACT", "MAIN_SEARCHFORM_PRODUITSERVICE", "MAIN_SEARCHFORM_PRODUITSERVICE_SUPPLIER", "MAIN_SEARCHFORM_ADHERENT", "MAIN_SEARCHFORM_PROJECT", "MAIN_SEARCHFORM_EMPLOYEE"); $searchformconst=array($conf->global->MAIN_SEARCHFORM_SOCIETE,$conf->global->MAIN_SEARCHFORM_CONTACT,$conf->global->MAIN_SEARCHFORM_PRODUITSERVICE,$conf->global->MAIN_SEARCHFORM_PRODUITSERVICE_SUPPLIER,$conf->global->MAIN_SEARCHFORM_ADHERENT,$conf->global->MAIN_SEARCHFORM_PROJECT,$conf->global->MAIN_SEARCHFORM_EMPLOYEE); $searchformtitle=array($langs->trans("Companies"), $langs->trans("Contacts"), $langs->trans("ProductsAndServices"), $langs->trans("ProductsAndServices").' ('.$langs->trans("SupplierRef").')', $langs->trans("Members"), $langs->trans("Projects"), $langs->trans("Employees")); $searchformmodule=array('Module1Name','Module1Name','Module50Name','Module50Name','Module310Name','Module4000Name'); - +*/ if ($action == 'update') { @@ -78,6 +79,7 @@ if ($action == 'update') if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_BACKTITLE1', $conf->entity); else dolibarr_set_const($db, 'THEME_ELDY_BACKTITLE1', join(',',colorStringToArray(GETPOST('THEME_ELDY_BACKTITLE1'),array())),'chaine',0,'',$conf->entity); + /* dolibarr_set_const($db, "MAIN_SEARCHFORM_CONTACT", $_POST["MAIN_SEARCHFORM_CONTACT"],'chaine',0,'',$conf->entity); dolibarr_set_const($db, "MAIN_SEARCHFORM_SOCIETE", $_POST["MAIN_SEARCHFORM_SOCIETE"],'chaine',0,'',$conf->entity); dolibarr_set_const($db, "MAIN_SEARCHFORM_PRODUITSERVICE", $_POST["MAIN_SEARCHFORM_PRODUITSERVICE"],'chaine',0,'',$conf->entity); @@ -85,7 +87,8 @@ if ($action == 'update') dolibarr_set_const($db, "MAIN_SEARCHFORM_ADHERENT", $_POST["MAIN_SEARCHFORM_ADHERENT"],'chaine',0,'',$conf->entity); dolibarr_set_const($db, "MAIN_SEARCHFORM_PROJECT", $_POST["MAIN_SEARCHFORM_PROJECT"],'chaine',0,'',$conf->entity); dolibarr_set_const($db, "MAIN_SEARCHFORM_EMPLOYEE", $_POST["MAIN_SEARCHFORM_EMPLOYEE"],'chaine',0,'',$conf->entity); - + */ + dolibarr_set_const($db, "MAIN_HELPCENTER_DISABLELINK", $_POST["MAIN_HELPCENTER_DISABLELINK"],'chaine',0,'',0); // Param for all entities dolibarr_set_const($db, "MAIN_MOTD", dol_htmlcleanlastbr($_POST["main_motd"]),'chaine',0,'',$conf->entity); dolibarr_set_const($db, "MAIN_HOME", dol_htmlcleanlastbr($_POST["main_home"]),'chaine',0,'',$conf->entity); @@ -209,7 +212,7 @@ if ($action == 'edit') // Edit // Max size of short lists on customer card $var=!$var; - print '
'.$langs->trans("DefaultMaxSizeShortListCustomerCard").'
'.$langs->trans("DefaultMaxSizeShortList").' 
'; - print ''; - $var=true; - foreach ($searchform as $key => $value) + // List of search forms to show + /* + if (! empty($searchform)) { - $var=!$var; - print ''; - print ''; - } - print '
'.$langs->trans("PermanentLeftSearchForm").''.$langs->trans("Activated").' 
'.$searchformtitle[$key].''.yn($searchformconst[$key]).''.$langs->trans("IfModuleEnabled",$langs->transnoentitiesnoconv($searchformmodule[$key])); - print '
'; - print '
'; - + print ''; + print ''; + $var=true; + foreach ($searchform as $key => $value) + { + $var=!$var; + print ''; + print ''; + } + print '
'.$langs->trans("PermanentLeftSearchForm").''.$langs->trans("Activated").' 
'.$searchformtitle[$key].''.yn($searchformconst[$key]).''.$langs->trans("IfModuleEnabled",$langs->transnoentitiesnoconv($searchformmodule[$key])); + print '
'; + print '
'; + }*/ // Other $var=true; @@ -396,7 +402,7 @@ else // Show print ""; $var=!$var; - print ''.$langs->trans("DefaultMaxSizeShortListCustomerCard").'' . $conf->global->MAIN_SIZE_SHORTLISTE_LIMIT . ''; + print ''.$langs->trans("DefaultMaxSizeShortList").'' . $conf->global->MAIN_SIZE_SHORTLISTE_LIMIT . ''; print ' '; print ""; diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 9bf9233f76b..c924d80639e 100755 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -936,7 +936,8 @@ DefaultMenuSmartphoneManager=Smartphone menu manager Skin=Skin theme DefaultSkin=Default skin theme MaxSizeList=Max length for list -DefaultMaxSizeList=Default max length for list +DefaultMaxSizeList=Default max length for lists +DefaultMaxSizeShortList=Default max length for short lists (ie in customer card) MessageOfDay=Message of the day MessageLogin=Login page message PermanentLeftSearchForm=Permanent search form on left menu From 4b2db78c3ade9da7ecca14814c6ecc5005d4788d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 26 Oct 2015 12:50:32 +0100 Subject: [PATCH 34/45] Keep deprecated options to show or not forms for blind people. --- htdocs/admin/ihm.php | 45 +++++++++-------- htdocs/main.inc.php | 113 ++++++++++++++++++++++--------------------- 2 files changed, 83 insertions(+), 75 deletions(-) diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php index 38d766e77fb..6907e30f979 100644 --- a/htdocs/admin/ihm.php +++ b/htdocs/admin/ihm.php @@ -47,12 +47,14 @@ $action = GETPOST('action'); if (! defined("MAIN_MOTD")) define("MAIN_MOTD",""); // List of supported permanent search area -/* -$searchform=array("MAIN_SEARCHFORM_SOCIETE", "MAIN_SEARCHFORM_CONTACT", "MAIN_SEARCHFORM_PRODUITSERVICE", "MAIN_SEARCHFORM_PRODUITSERVICE_SUPPLIER", "MAIN_SEARCHFORM_ADHERENT", "MAIN_SEARCHFORM_PROJECT", "MAIN_SEARCHFORM_EMPLOYEE"); -$searchformconst=array($conf->global->MAIN_SEARCHFORM_SOCIETE,$conf->global->MAIN_SEARCHFORM_CONTACT,$conf->global->MAIN_SEARCHFORM_PRODUITSERVICE,$conf->global->MAIN_SEARCHFORM_PRODUITSERVICE_SUPPLIER,$conf->global->MAIN_SEARCHFORM_ADHERENT,$conf->global->MAIN_SEARCHFORM_PROJECT,$conf->global->MAIN_SEARCHFORM_EMPLOYEE); -$searchformtitle=array($langs->trans("Companies"), $langs->trans("Contacts"), $langs->trans("ProductsAndServices"), $langs->trans("ProductsAndServices").' ('.$langs->trans("SupplierRef").')', $langs->trans("Members"), $langs->trans("Projects"), $langs->trans("Employees")); -$searchformmodule=array('Module1Name','Module1Name','Module50Name','Module50Name','Module310Name','Module4000Name'); -*/ +$searchform=array(); +if (empty($conf->use_javascript_ajax)) +{ + $searchform=array("MAIN_SEARCHFORM_SOCIETE", "MAIN_SEARCHFORM_CONTACT", "MAIN_SEARCHFORM_PRODUITSERVICE", "MAIN_SEARCHFORM_PRODUITSERVICE_SUPPLIER", "MAIN_SEARCHFORM_ADHERENT", "MAIN_SEARCHFORM_PROJECT", "MAIN_SEARCHFORM_EMPLOYEE"); + $searchformconst=array($conf->global->MAIN_SEARCHFORM_SOCIETE,$conf->global->MAIN_SEARCHFORM_CONTACT,$conf->global->MAIN_SEARCHFORM_PRODUITSERVICE,$conf->global->MAIN_SEARCHFORM_PRODUITSERVICE_SUPPLIER,$conf->global->MAIN_SEARCHFORM_ADHERENT,$conf->global->MAIN_SEARCHFORM_PROJECT,$conf->global->MAIN_SEARCHFORM_EMPLOYEE); + $searchformtitle=array($langs->trans("Companies"), $langs->trans("Contacts"), $langs->trans("ProductsAndServices"), $langs->trans("ProductsAndServices").' ('.$langs->trans("SupplierRef").')', $langs->trans("Members"), $langs->trans("Projects"), $langs->trans("Users")); + $searchformmodule=array('Module1Name','Module1Name','Module50Name','Module50Name','Module310Name','Module400Name'); +} if ($action == 'update') { @@ -167,19 +169,22 @@ if ($action == 'edit') // Edit print '
'; // Liste des zone de recherche permanantes supportees - print ''; - print ''; - $var=True; - foreach ($searchform as $key => $value) + if (! empty($searchform)) { - $var=!$var; - print ''; + print '
'.$langs->trans("PermanentLeftSearchForm").''.$langs->trans("Activated").'
'.$searchformtitle[$key].''; - print $form->selectyesno($searchform[$key],$searchformconst[$key],1); - print '
'; + print ''; + $var=True; + foreach ($searchform as $key => $value) + { + $var=!$var; + print ''; + } + print '
'.$langs->trans("PermanentLeftSearchForm").''.$langs->trans("Activated").'
'.$searchformtitle[$key].''; + print $form->selectyesno($searchform[$key],$searchformconst[$key],1); + print '
'; + print '
'; } - print ''; - print '
'; - + // Other print ''; print ''; @@ -361,7 +366,6 @@ else // Show // List of search forms to show - /* if (! empty($searchform)) { print '
'.$langs->trans("Parameters").''.$langs->trans("Value").'
'; @@ -371,12 +375,13 @@ else // Show { $var=!$var; print ''; - print ''; } print '
'.$searchformtitle[$key].''.yn($searchformconst[$key]).''.$langs->trans("IfModuleEnabled",$langs->transnoentitiesnoconv($searchformmodule[$key])); + print ''; + if (! empty($searchformmodule[$key])) print $langs->trans("IfModuleEnabled",$langs->transnoentitiesnoconv($searchformmodule[$key])); print '
'; print '
'; - }*/ + } // Other $var=true; diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 8db9b6aa2ac..dd4cd684970 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -1567,65 +1567,68 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me print "\n"; - if (! is_object($form)) $form=new Form($db); - $selected=-1; - $searchform.=$form->selectArrayAjax('searchselectcombo', DOL_URL_ROOT.'/core/ajax/selectsearchbox.php', $selected, '', '', 0, 1, 'vmenusearchselectcombo', 1, $langs->trans("Search")); - - // Define $searchform - /* - if ((( ! empty($conf->societe->enabled) && (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))) || ! empty($conf->fournisseur->enabled)) && ! empty($conf->global->MAIN_SEARCHFORM_SOCIETE) && $user->rights->societe->lire) + if ($conf->use_javascript_ajax) { - $langs->load("companies"); - $searchform.=printSearchForm(DOL_URL_ROOT.'/societe/list.php', DOL_URL_ROOT.'/societe/list.php', $langs->trans("ThirdParties"), 'soc', 'sall', 'T', 'searchleftt', img_object('','company')); + if (! is_object($form)) $form=new Form($db); + $selected=-1; + $searchform.=$form->selectArrayAjax('searchselectcombo', DOL_URL_ROOT.'/core/ajax/selectsearchbox.php', $selected, '', '', 0, 1, 'vmenusearchselectcombo', 1, $langs->trans("Search")); } - - if (! empty($conf->societe->enabled) && ! empty($conf->global->MAIN_SEARCHFORM_CONTACT) && $user->rights->societe->lire) + else { - $langs->load("companies"); - $searchform.=printSearchForm(DOL_URL_ROOT.'/contact/list.php', DOL_URL_ROOT.'/contact/list.php', $langs->trans("Contacts"), 'contact', 'sall', 'A', 'searchleftc', img_object('','contact')); + // Define $searchform + if ((( ! empty($conf->societe->enabled) && (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))) || ! empty($conf->fournisseur->enabled)) && ! empty($conf->global->MAIN_SEARCHFORM_SOCIETE) && $user->rights->societe->lire) + { + $langs->load("companies"); + $searchform.=printSearchForm(DOL_URL_ROOT.'/societe/list.php', DOL_URL_ROOT.'/societe/list.php', $langs->trans("ThirdParties"), 'soc', 'sall', 'T', 'searchleftt', img_object('','company')); + } + + if (! empty($conf->societe->enabled) && ! empty($conf->global->MAIN_SEARCHFORM_CONTACT) && $user->rights->societe->lire) + { + $langs->load("companies"); + $searchform.=printSearchForm(DOL_URL_ROOT.'/contact/list.php', DOL_URL_ROOT.'/contact/list.php', $langs->trans("Contacts"), 'contact', 'sall', 'A', 'searchleftc', img_object('','contact')); + } + + if (((! empty($conf->product->enabled) && $user->rights->produit->lire) || (! empty($conf->service->enabled) && $user->rights->service->lire)) + && ! empty($conf->global->MAIN_SEARCHFORM_PRODUITSERVICE)) + { + $langs->load("products"); + $searchform.=printSearchForm(DOL_URL_ROOT.'/product/list.php', DOL_URL_ROOT.'/product/list.php', $langs->trans("Products")."/".$langs->trans("Services"), 'products', 'sall', 'P', 'searchleftp', img_object('','product')); + } + + if (((! empty($conf->product->enabled) && $user->rights->produit->lire) || (! empty($conf->service->enabled) && $user->rights->service->lire)) && ! empty($conf->fournisseur->enabled) + && ! empty($conf->global->MAIN_SEARCHFORM_PRODUITSERVICE_SUPPLIER)) + { + $langs->load("products"); + $searchform.=printSearchForm(DOL_URL_ROOT.'/fourn/product/list.php', DOL_URL_ROOT.'/fourn/product/list.php', $langs->trans("SupplierRef"), 'products', 'srefsupplier', '', 'searchlefts', img_object('','product')); + } + + if (! empty($conf->projet->enabled) && ! empty($conf->global->MAIN_SEARCHFORM_PROJECT) && $user->rights->projet->lire) + { + $langs->load("projects"); + $searchform.=printSearchForm(DOL_URL_ROOT.'/projet/list.php', DOL_URL_ROOT.'/projet/list.php', $langs->trans("Projects"), 'project', 'search_all', 'Q', 'searchleftproj', img_object('','projectpub')); + } + + if (! empty($conf->adherent->enabled) && ! empty($conf->global->MAIN_SEARCHFORM_ADHERENT) && $user->rights->adherent->lire) + { + $langs->load("members"); + $searchform.=printSearchForm(DOL_URL_ROOT.'/adherents/list.php', DOL_URL_ROOT.'/adherents/list.php', $langs->trans("Members"), 'member', 'sall', 'M', 'searchleftm', img_object('','user')); + } + + if (! empty($conf->user->enabled) && ! empty($conf->global->MAIN_SEARCHFORM_USER) && $user->rights->user->user->lire) + { + $langs->load("users"); + $searchform.=printSearchForm(DOL_URL_ROOT.'/user/list.php', DOL_URL_ROOT.'/user/list.php', $langs->trans("Users"), 'user', 'sall', 'M', 'searchleftuser', img_object('','user')); + } + + // Execute hook printSearchForm + $parameters=array(); + $reshook=$hookmanager->executeHooks('printSearchForm',$parameters); // Note that $action and $object may have been modified by some hooks + if (empty($reshook)) + { + $searchform.=$hookmanager->resPrint; + } + else $searchform=$hookmanager->resPrint; } - - if (((! empty($conf->product->enabled) && $user->rights->produit->lire) || (! empty($conf->service->enabled) && $user->rights->service->lire)) - && ! empty($conf->global->MAIN_SEARCHFORM_PRODUITSERVICE)) - { - $langs->load("products"); - $searchform.=printSearchForm(DOL_URL_ROOT.'/product/list.php', DOL_URL_ROOT.'/product/list.php', $langs->trans("Products")."/".$langs->trans("Services"), 'products', 'sall', 'P', 'searchleftp', img_object('','product')); - } - - if (((! empty($conf->product->enabled) && $user->rights->produit->lire) || (! empty($conf->service->enabled) && $user->rights->service->lire)) && ! empty($conf->fournisseur->enabled) - && ! empty($conf->global->MAIN_SEARCHFORM_PRODUITSERVICE_SUPPLIER)) - { - $langs->load("products"); - $searchform.=printSearchForm(DOL_URL_ROOT.'/fourn/product/list.php', DOL_URL_ROOT.'/fourn/product/list.php', $langs->trans("SupplierRef"), 'products', 'srefsupplier', '', 'searchlefts', img_object('','product')); - } - - if (! empty($conf->projet->enabled) && ! empty($conf->global->MAIN_SEARCHFORM_PROJECT) && $user->rights->projet->lire) - { - $langs->load("projects"); - $searchform.=printSearchForm(DOL_URL_ROOT.'/projet/list.php', DOL_URL_ROOT.'/projet/list.php', $langs->trans("Projects"), 'project', 'search_all', 'Q', 'searchleftproj', img_object('','projectpub')); - } - - if (! empty($conf->adherent->enabled) && ! empty($conf->global->MAIN_SEARCHFORM_ADHERENT) && $user->rights->adherent->lire) - { - $langs->load("members"); - $searchform.=printSearchForm(DOL_URL_ROOT.'/adherents/list.php', DOL_URL_ROOT.'/adherents/list.php', $langs->trans("Members"), 'member', 'sall', 'M', 'searchleftm', img_object('','user')); - } - - if (! empty($conf->hrm->enabled) && ! empty($conf->global->MAIN_SEARCHFORM_EMPLOYEE) && $user->rights->hrm->employee->read) - { - $langs->load("hrm"); - $searchform.=printSearchForm(DOL_URL_ROOT.'/hrm/employee/list.php', DOL_URL_ROOT.'/hrm/employee/list.php', $langs->trans("Employees"), 'employee', 'search_all', 'M', 'searchleftemployee', img_object('','user')); - } - - // Execute hook printSearchForm - $parameters=array(); - $reshook=$hookmanager->executeHooks('printSearchForm',$parameters); // Note that $action and $object may have been modified by some hooks - if (empty($reshook)) - { - $searchform.=$hookmanager->resPrint; - } - else $searchform=$hookmanager->resPrint; - */ // Define $bookmarks if (! empty($conf->bookmark->enabled) && $user->rights->bookmark->lire) From 07b277b23f262b5ef86c7928d8f4cb7a50902d7c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 26 Oct 2015 15:21:22 +0100 Subject: [PATCH 35/45] Prepare fields in dtabase to store if time spent was invoiced or not. --- htdocs/install/mysql/migration/3.8.0-3.9.0.sql | 5 +++++ htdocs/install/mysql/tables/llx_projet_task_time.sql | 2 ++ 2 files changed, 7 insertions(+) diff --git a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql index d426cd72105..92ab08d141d 100755 --- a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql +++ b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql @@ -105,3 +105,8 @@ ALTER TABLE llx_product ADD COLUMN onportal tinyint DEFAULT 0 after tobuy; ALTER TABLE llx_user ADD COLUMN employee tinyint DEFAULT 1; + +ALTER TABLE llx_projet_task_time ADD COLUMN invoice_id integer DEFAULT NULL; +ALTER TABLE llx_projet_task_time ADD COLUMN invoice_line_id integer DEFAULT NULL; + + diff --git a/htdocs/install/mysql/tables/llx_projet_task_time.sql b/htdocs/install/mysql/tables/llx_projet_task_time.sql index 6c34440a58b..3ca161ed07d 100644 --- a/htdocs/install/mysql/tables/llx_projet_task_time.sql +++ b/htdocs/install/mysql/tables/llx_projet_task_time.sql @@ -26,5 +26,7 @@ create table llx_projet_task_time task_duration double, fk_user integer, thm double(24,8), + invoice_id integer DEFAULT NULL, -- If we need to invoice each line of timespent, we can save invoice id here + invoice_line_id integer DEFAULT NULL, -- If we need to invoice each line of timespent, we can save invoice line id here note text )ENGINE=innodb; From 6493438e876168be2f31795d697197340125a591 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 26 Oct 2015 16:20:09 +0100 Subject: [PATCH 36/45] NEW The clicktodial module is now able to provide link "tel:" on phone numbers. So it is also possible to use clicktodial with a client solution like the "xivo" local client. --- htdocs/admin/clicktodial.php | 22 +++++++++++++++++----- htdocs/core/lib/functions.lib.php | 4 ++-- htdocs/langs/en_US/admin.lang | 4 +++- 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/htdocs/admin/clicktodial.php b/htdocs/admin/clicktodial.php index 1550c0ebef7..6b82c5237ea 100644 --- a/htdocs/admin/clicktodial.php +++ b/htdocs/admin/clicktodial.php @@ -36,10 +36,13 @@ $action = GETPOST("action"); /* * Actions */ + if ($action == 'setvalue' && $user->admin) { - $result=dolibarr_set_const($db, "CLICKTODIAL_URL", GETPOST("url"), 'chaine', 0, '', $conf->entity); - if ($result >= 0) + $result=dolibarr_set_const($db, "CLICKTODIAL_USE_TEL_LINK_ON_PHONE_NUMBERS", GETPOST("CLICKTODIAL_USE_TEL_LINK_ON_PHONE_NUMBERS"), 'chaine', 0, '', $conf->entity); + $result=dolibarr_set_const($db, "CLICKTODIAL_URL", GETPOST("CLICKTODIAL_URL"), 'chaine', 0, '', $conf->entity); + + if ($result1 >= 0 && $result2 >= 0) { setEventMessage($langs->trans("SetupSaved")); } @@ -73,13 +76,22 @@ $var=true; print ''; print ''; -print ''; +print ''; print ''; print "\n"; + $var=!$var; -print ''; + +$var=!$var; +print '"; +print ''; +print '"; - print ''; - print '\n\n"; - $found++; + print "\n"; } +else +{ + print $langs->trans("ModuleMustBeEnabledFirst", $langs->transnoentitiesnoconv("Module30Name")); +} +print "\n\n"; +$found++; +$var=!$var; +print ""; +print ''; +print '"; - print ''; - print '\n\n"; - $found++; + print "\n"; } +else +{ + print $langs->trans("ModuleMustBeEnabledFirst", $langs->transnoentitiesnoconv("Module25Name")); +} +print "\n\n"; +$found++; +//if (! empty($conf->expedition->enabled)) +//{ +$var=!$var; +print ""; +print ''; +print '"; - print ''; - print '\n\n"; - $found++; + print "\n"; } +else +{ + print $langs->trans("ModuleMustBeEnabledFirst", $langs->transnoentitiesnoconv("Module80Name")); +} +print "\n\n"; +$found++; -if (! $found) +/*if (! $found) { $var=!$var; print ""; - print ''; + print ''; print "\n"; -} +}*/ print '
'.$langs->trans("Name").''.$langs->trans("Name").''.$langs->trans("Value").'
'; +print '
'; +print $langs->trans("ClickToDialUseTelLink").''; +print $form->selectyesno("CLICKTODIAL_USE_TEL_LINK_ON_PHONE_NUMBERS", $conf->global->CLICKTODIAL_USE_TEL_LINK_ON_PHONE_NUMBERS, 1).'
'; +print '
'; +print $langs->trans("ClickToDialUseTelLinkDesc"); +print '
'; print $langs->trans("DefaultLink").''; -print '
'; +print 'global->CLICKTODIAL_USE_TEL_LINK_ON_PHONE_NUMBERS?' disabled="disabled"':'').' value="'.$conf->global->CLICKTODIAL_URL.'">
'; print '
'; print $langs->trans("ClickToDialUrlDesc").'
'; print $langs->trans("Example").':
http://myphoneserver/mypage?login=__LOGIN__&password=__PASS__&caller=__PHONEFROM__&called=__PHONETO__'; diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index b7db522458e..5b990ac509c 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -1544,9 +1544,9 @@ function dol_print_phone($phone,$countrycode='',$cid=0,$socid=0,$addlink='',$sep } } - if (! empty($addlink)) // Link on phone number + link to add action (if conf->global->AGENDA_ADDACTIONFORPHONE set) + if (! empty($addlink)) // Link on phone number (+ link to add action if conf->global->AGENDA_ADDACTIONFORPHONE set) { - if (! empty($conf->browser->phone)) // If phone, we use link of phone + if (! empty($conf->browser->phone) || (! empty($conf->clicktodial->enabled) && ! empty($conf->global->CLICKTODIAL_USE_TEL_LINK_ON_PHONE_NUMBERS))) // If phone or option for, we use link of phone { $newphone =''; diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index c924d80639e..f6399bffa6b 100755 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -1560,7 +1560,9 @@ AGENDA_DEFAULT_FILTER_TYPE=Set automatically this type of event into search filt AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into search filter of agenda view AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda ##### ClickToDial ##### -ClickToDialDesc=This module allows to add an icon after phone numbers. A click on this icon will call a server with a particular URL you define below. This can be used to call a call center system from Dolibarr that can call the phone number on a SIP system for example. +ClickToDialDesc=This module allows to make phone numbers clickable. A click on this icon will call make your phone to call the phone number. This can be used to call a call center system from Dolibarr that can call the phone number on a SIP system for example. +ClickToDialUseTelLink=Use just a link "tel:" on phone numbers +ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or an interface install on same computer than the browser, and called when you click on a link in your browser that start with "tel:". If you need a full server solution, you must set this to "No" and fill next field. ##### Point Of Sales (CashDesk) ##### CashDesk=Point of sales CashDeskSetup=Point of sales module setup From 6f1d758eaecd2105fab08f2f676a5f8e657baa24 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 26 Oct 2015 16:42:31 +0100 Subject: [PATCH 37/45] Fix print feature for md theme --- htdocs/theme/md/style.css.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 55ef8a3b991..a4da1e4205b 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -560,11 +560,16 @@ td.showDragHandle { } #id-right { /* This must stay id-right and not be replaced with echo $right */ width: 100%; + padding-left: 194px; padding-top: 12px; + } .side-nav { + + display: none; + background: #FFF; border-right: 1px solid rgba(0,0,0,0.2); bottom: 0; @@ -600,6 +605,7 @@ td.showDragHandle { -webkit-overflow-scrolling: touch; overflow-x: hidden; overflow-y: auto; + } .side-nav-vert { margin-left: 194px; From 24c3491ff74bb2a81dc32e49f5a75960aee3ae16 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 26 Oct 2015 22:56:54 +0100 Subject: [PATCH 38/45] Code comment --- htdocs/install/mysql/tables/llx_actioncomm_resources.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/install/mysql/tables/llx_actioncomm_resources.sql b/htdocs/install/mysql/tables/llx_actioncomm_resources.sql index 484cd39fb82..7632b1fd810 100644 --- a/htdocs/install/mysql/tables/llx_actioncomm_resources.sql +++ b/htdocs/install/mysql/tables/llx_actioncomm_resources.sql @@ -16,8 +16,8 @@ -- along with this program. If not, see . -- -- ============================================================================ --- Table used for relations between elements of different types: --- invoice-propal, propal-order, etc... +-- Table used for relations between an action event and a resource (in most cases +-- a 'user', but can also be a 'resource' like a room, or a hardware) -- ============================================================================ create table llx_actioncomm_resources From 0a3ba3a0c601afd5293d2124f920ada4f38cf0aa Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 26 Oct 2015 23:36:05 +0100 Subject: [PATCH 39/45] Fix picto --- htdocs/theme/md/img/search.png | Bin 432 -> 215 bytes htdocs/theme/md/img/searchclear.png | Bin 436 -> 356 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/htdocs/theme/md/img/search.png b/htdocs/theme/md/img/search.png index 4c52b1e401ebbd8410dce1b60d40fc1d3e8e8e18..f0d4e97577508554557c9073d1607218a48a9215 100644 GIT binary patch literal 215 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+0wn(&ce?|m=6Sj}hEy$!Cb2S zz#@wSU0t@Pto$0DvY0ANJfO+Jc_%@IDc0TTlGYW4ge=dxOQv65K9}b?`&LHRx8cR% ztCu6g?)Y}Lt=ngk@Z`Zl(KEKD3~YMen&xf}*ET;G_$_N8$FwfNh9@fAYVY{i6n=)3 zDh2b4Yjdk#-9FRh%B|g+o6h-co%%=f<|?zlxr?K|Z{I4PY&&VA`EOR~T>aDCXT#Nj PE@kj^^>bP0l+XkKwR2O_ literal 432 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJdx@v7EBjSec0Oh;MG5s+Kq1Zo zkH}&M25un`X1sK_?hjCqCEd~2k%3`jKlh(RRv>?SfKP}kkoJ<`2(q+{(&R|Clt_;1 zNltDlw&W=G(kw3SDPDT7c4>$Mgqj+X4~mbJ%P_P%d9 z_r2vB5dH6Q;^+x7?AiLfXYcc#Yu|hB{hxB|`IP7X=VV*XS-W@6-g|S--JA3L`<(ax zmma&e^!@*}*_vxxoYr2uw>4X0Ymd{`bN9A>|G)MB|Gnp~?fw3L@BjbDiY1Qy|9|fP z|7-vM-&-1V@BjbjYrURtje7q5|E#$=-+)eMED7=pW^j0RBMr#O_jGX#k+__kpupwP zeM&?5^Uk9wsi{u|Yw8SZm3c#XOLs6#Uo&yy#El!xVjLV|9Pghw6T`1}K%Grw!dk*Ar0Tg0#W>&W=bkYi;y X{D&*ed<(lF&}s%xS3j3^P6k44ofy`glX(f`FeQ1ryDPOuQjAy=R>RjeHIlm#&Bx0?Lj!2J-!4EEu9*0Yh+!B-dghS1mI!_+) z{TX@3;h*1^%pmx(qFq`qOR~OOQQ_ehFp<~e@qe;c9A07?}b@ew9jMY=B?C+a+-N@`}V1eSS8?&9w`Gg-g wX9vdq_`A$8HYB?Ds?F`luZoGLpWTn9*sC$qb+%OS+@4BLl<6e(pbstU&(u0G|+7Anhf=5oBo@rOAHGg{vo+VYIIX>QZ)>*1)*h#==k9I&{(tNL|9j6}+xz|h-v9rP6-ylZ|Nq?o z|JVNizqd5#-v9s4*LpqQ8uk49|5-qMG()Oq)nSPeR5#)aq+tE;T+0!F8#rzsYXVVjIOnDb988Xc+Q;p`XK9%BO*)A zEXkQNp=atP^UYHpiMT~5FIu$rh#IT0nAb+FsF@rKcl3o{k7}27ZHYY16xzopr0Dc3&>Hq)$ From b90c56fbb52d95e441df0aeeff5adc6d090be363 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Tue, 27 Oct 2015 06:29:18 +0100 Subject: [PATCH 40/45] HRM : move migration into 3.8 to 3.9 --- .../install/mysql/migration/3.8.0-3.9.0.sql | 68 ++++++++++++++ .../install/mysql/migration/3.9.0-4.0.0.sql | 88 ------------------- 2 files changed, 68 insertions(+), 88 deletions(-) delete mode 100644 htdocs/install/mysql/migration/3.9.0-4.0.0.sql diff --git a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql index 92ab08d141d..97ef7e3c1d4 100755 --- a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql +++ b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql @@ -105,6 +105,74 @@ ALTER TABLE llx_product ADD COLUMN onportal tinyint DEFAULT 0 after tobuy; ALTER TABLE llx_user ADD COLUMN employee tinyint DEFAULT 1; +CREATE TABLE IF NOT EXISTS llx_c_hrm_function +( + rowid integer PRIMARY KEY, + pos tinyint DEFAULT 0 NOT NULL, + code varchar(16) NOT NULL, + label varchar(50), + c_level tinyint DEFAULT 0 NOT NULL, + active tinyint DEFAULT 1 NOT NULL +)ENGINE=innodb; + +INSERT INTO llx_c_hrm_function (rowid, pos, code, label, c_level, active) VALUES(1, 5,'EXECBOARD', 'Executive board', 0, 1); +INSERT INTO llx_c_hrm_function (rowid, pos, code, label, c_level, active) VALUES(2, 10, 'MANAGDIR', 'Managing director', 1, 1); +INSERT INTO llx_c_hrm_function (rowid, pos, code, label, c_level, active) VALUES(3, 15, 'ACCOUNTMANAG', 'Account manager', 0, 1); +INSERT INTO llx_c_hrm_function (rowid, pos, code, label, c_level, active) VALUES(3, 20, 'ENGAGDIR', 'Engagement director', 1, 1); +INSERT INTO llx_c_hrm_function (rowid, pos, code, label, c_level, active) VALUES(4, 25, 'DIRECTOR', 'Director', 1, 1); +INSERT INTO llx_c_hrm_function (rowid, pos, code, label, c_level, active) VALUES(5, 30, 'PROJMANAG', 'Project manager', 0, 1); +INSERT INTO llx_c_hrm_function (rowid, pos, code, label, c_level, active) VALUES(6, 35, 'DEPHEAD', 'Department head', 0, 1); +INSERT INTO llx_c_hrm_function (rowid, pos, code, label, c_level, active) VALUES(7, 40, 'SECRETAR', 'Secretary', 0, 1); +INSERT INTO llx_c_hrm_function (rowid, pos, code, label, c_level, active) VALUES(8, 45, 'EMPLOYEE', 'Department employee', 0, 1); + +CREATE TABLE IF NOT EXISTS llx_c_hrm_department +( + rowid integer PRIMARY KEY, + pos tinyint DEFAULT 0 NOT NULL, + code varchar(16) NOT NULL, + label varchar(50), + active tinyint DEFAULT 1 NOT NULL +)ENGINE=innodb; + +INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(1, 5,'MANAGEMENT', 'Management', 1); +INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(2, 10,'GESTION', 'Gestion', 1); +INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(3, 15,'TRAINING', 'Training', 1); +INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(4, 20,'IT', 'Inform. Technology (IT)', 1); +INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(5, 25,'MARKETING', 'Marketing', 1); +INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(6, 30,'SALES', 'Sales', 1); +INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(7, 35,'LEGAL', 'Legal', 1); +INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(8, 40,'FINANCIAL', 'Financial accounting', 1); +INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(9, 45,'HUMANRES', 'Human resources', 1); +INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(10, 50,'PURCHASING', 'Purchasing', 1); +INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(11, 55,'SERVICES', 'Services', 1); +INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(12, 60,'CUSTOMSERV', 'Customer service', 1); +INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(13, 65,'CONSULTING', 'Consulting', 1); +INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(14, 70,'LOGISTIC', 'Logistics', 1); +INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(15, 75,'CONSTRUCT', 'Engineering/design', 1); +INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(16, 80,'PRODUCTION', 'Manufacturing', 1); +INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(17, 85,'QUALITY', 'Quality assurance', 1); +INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(18, 85,'MAINT', 'Plant assurance', 1); + +CREATE TABLE IF NOT EXISTS llx_establishment ( + rowid integer NOT NULL auto_increment PRIMARY KEY, + entity integer NOT NULL DEFAULT 1, + name varchar(50), + address varchar(255), + zip varchar(25), + town varchar(50), + fk_state integer DEFAULT 0, + fk_country integer DEFAULT 0, + profid1 varchar(20), + profid2 varchar(20), + profid3 varchar(20), + phone varchar(20), + fk_user_author integer NOT NULL, + fk_user_mod integer NOT NULL, + datec datetime NOT NULL, + tms timestamp NOT NULL, + status tinyint DEFAULT 1 +) ENGINE=InnoDB; + ALTER TABLE llx_projet_task_time ADD COLUMN invoice_id integer DEFAULT NULL; ALTER TABLE llx_projet_task_time ADD COLUMN invoice_line_id integer DEFAULT NULL; 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 deleted file mode 100644 index accf65266c1..00000000000 --- a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql +++ /dev/null @@ -1,88 +0,0 @@ --- --- Be carefull to requests order. --- This file must be loaded by calling /install/index.php page --- when current version is 3.9.0 or higher. --- --- To rename a table: ALTER TABLE llx_table RENAME TO llx_table_new; --- To add a column: ALTER TABLE llx_table ADD COLUMN newcol varchar(60) NOT NULL DEFAULT '0' AFTER existingcol; --- To rename a column: ALTER TABLE llx_table CHANGE COLUMN oldname newname varchar(60); --- To drop a column: ALTER TABLE llx_table DROP COLUMN oldname; --- To change type of field: ALTER TABLE llx_table MODIFY COLUMN name varchar(60); --- To drop a foreign key: ALTER TABLE llx_table DROP FOREIGN KEY fk_name; --- To restrict request to Mysql version x.y use -- VMYSQLx.y --- To restrict request to Pgsql version x.y use -- VPGSQLx.y --- To make pk to be auto increment (mysql): VMYSQL4.3 ALTER TABLE llx_c_shipment_mode CHANGE COLUMN rowid rowid INTEGER NOT NULL AUTO_INCREMENT; --- To make pk to be auto increment (postgres): VPGSQL8.2 NOT POSSIBLE. MUST DELETE/CREATE TABLE --- To set a field as NULL: VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name DROP NOT NULL; --- To set a field as default NULL: VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name SET DEFAULT NULL; --- -- VPGSQL8.2 DELETE FROM llx_usergroup_user WHERE fk_user NOT IN (SELECT rowid from llx_user); --- -- VMYSQL4.1 DELETE FROM llx_usergroup_user WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup); - -CREATE TABLE IF NOT EXISTS llx_c_hrm_function -( - rowid integer PRIMARY KEY, - pos tinyint DEFAULT 0 NOT NULL, - code varchar(16) NOT NULL, - label varchar(50), - c_level tinyint DEFAULT 0 NOT NULL, - active tinyint DEFAULT 1 NOT NULL -)ENGINE=innodb; - -INSERT INTO llx_c_hrm_function (rowid, pos, code, label, c_level, active) VALUES(1, 5,'EXECBOARD', 'Executive board', 0, 1); -INSERT INTO llx_c_hrm_function (rowid, pos, code, label, c_level, active) VALUES(2, 10, 'MANAGDIR', 'Managing director', 1, 1); -INSERT INTO llx_c_hrm_function (rowid, pos, code, label, c_level, active) VALUES(3, 15, 'ACCOUNTMANAG', 'Account manager', 0, 1); -INSERT INTO llx_c_hrm_function (rowid, pos, code, label, c_level, active) VALUES(3, 20, 'ENGAGDIR', 'Engagement director', 1, 1); -INSERT INTO llx_c_hrm_function (rowid, pos, code, label, c_level, active) VALUES(4, 25, 'DIRECTOR', 'Director', 1, 1); -INSERT INTO llx_c_hrm_function (rowid, pos, code, label, c_level, active) VALUES(5, 30, 'PROJMANAG', 'Project manager', 0, 1); -INSERT INTO llx_c_hrm_function (rowid, pos, code, label, c_level, active) VALUES(6, 35, 'DEPHEAD', 'Department head', 0, 1); -INSERT INTO llx_c_hrm_function (rowid, pos, code, label, c_level, active) VALUES(7, 40, 'SECRETAR', 'Secretary', 0, 1); -INSERT INTO llx_c_hrm_function (rowid, pos, code, label, c_level, active) VALUES(8, 45, 'EMPLOYEE', 'Department employee', 0, 1); - -CREATE TABLE IF NOT EXISTS llx_c_hrm_department -( - rowid integer PRIMARY KEY, - pos tinyint DEFAULT 0 NOT NULL, - code varchar(16) NOT NULL, - label varchar(50), - active tinyint DEFAULT 1 NOT NULL -)ENGINE=innodb; - -INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(1, 5,'MANAGEMENT', 'Management', 1); -INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(2, 10,'GESTION', 'Gestion', 1); -INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(3, 15,'TRAINING', 'Training', 1); -INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(4, 20,'IT', 'Inform. Technology (IT)', 1); -INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(5, 25,'MARKETING', 'Marketing', 1); -INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(6, 30,'SALES', 'Sales', 1); -INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(7, 35,'LEGAL', 'Legal', 1); -INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(8, 40,'FINANCIAL', 'Financial accounting', 1); -INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(9, 45,'HUMANRES', 'Human resources', 1); -INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(10, 50,'PURCHASING', 'Purchasing', 1); -INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(11, 55,'SERVICES', 'Services', 1); -INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(12, 60,'CUSTOMSERV', 'Customer service', 1); -INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(13, 65,'CONSULTING', 'Consulting', 1); -INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(14, 70,'LOGISTIC', 'Logistics', 1); -INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(15, 75,'CONSTRUCT', 'Engineering/design', 1); -INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(16, 80,'PRODUCTION', 'Manufacturing', 1); -INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(17, 85,'QUALITY', 'Quality assurance', 1); -INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(18, 85,'MAINT', 'Plant assurance', 1); - -CREATE TABLE IF NOT EXISTS llx_establishment ( - rowid integer NOT NULL auto_increment PRIMARY KEY, - entity integer NOT NULL DEFAULT 1, - name varchar(50), - address varchar(255), - zip varchar(25), - town varchar(50), - fk_state integer DEFAULT 0, - fk_country integer DEFAULT 0, - profid1 varchar(20), - profid2 varchar(20), - profid3 varchar(20), - phone varchar(20), - fk_user_author integer NOT NULL, - fk_user_mod integer NOT NULL, - datec datetime NOT NULL, - tms timestamp NOT NULL, - status tinyint DEFAULT 1 -) ENGINE=InnoDB; - From 93d340e4979b6e60b0710074571456b9377104e1 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Tue, 27 Oct 2015 07:26:57 +0100 Subject: [PATCH 41/45] HRM module : continue to work --- htdocs/hrm/admin/admin_establishment.php | 2 +- htdocs/hrm/admin/admin_hrm.php | 2 +- htdocs/hrm/class/employee.class.php | 226 +++++++++++++++++++++++ htdocs/hrm/employee/index.html | 0 htdocs/hrm/employee/list.php | 223 ++++++++++++++++++++++ htdocs/langs/en_US/admin.lang | 2 + htdocs/langs/en_US/hrm.lang | 1 + 7 files changed, 454 insertions(+), 2 deletions(-) create mode 100644 htdocs/hrm/class/employee.class.php create mode 100644 htdocs/hrm/employee/index.html create mode 100644 htdocs/hrm/employee/list.php diff --git a/htdocs/hrm/admin/admin_establishment.php b/htdocs/hrm/admin/admin_establishment.php index 6a9cf961960..771f2e243bc 100644 --- a/htdocs/hrm/admin/admin_establishment.php +++ b/htdocs/hrm/admin/admin_establishment.php @@ -53,7 +53,7 @@ dol_htmloutput_mesg($mesg); // Subheader $linkback = '' . $langs->trans("BackToModuleList") . ''; -print load_fiche_titre($langs->trans($page_name), $linkback); +print load_fiche_titre($langs->trans("HRMSetup"), $linkback); // Configuration header $head = hrm_admin_prepare_head(); diff --git a/htdocs/hrm/admin/admin_hrm.php b/htdocs/hrm/admin/admin_hrm.php index bc0487bad94..7dba4392740 100644 --- a/htdocs/hrm/admin/admin_hrm.php +++ b/htdocs/hrm/admin/admin_hrm.php @@ -48,7 +48,7 @@ dol_htmloutput_mesg($mesg); // Subheader $linkback = '' . $langs->trans("BackToModuleList") . ''; -print load_fiche_titre($langs->trans($page_name), $linkback); +print load_fiche_titre($langs->trans("HRMSetup"), $linkback); // Configuration header $head = hrm_admin_prepare_head(); diff --git a/htdocs/hrm/class/employee.class.php b/htdocs/hrm/class/employee.class.php new file mode 100644 index 00000000000..4014bb717f2 --- /dev/null +++ b/htdocs/hrm/class/employee.class.php @@ -0,0 +1,226 @@ + + * + * 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/hrm/class/employee.class.php + * \ingroup HRM + * \brief File of class to manage employees + */ + +require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php'; + +/** + * Class to manage establishments + */ +class Employee extends CommonObject +{ + public $element='employee'; + public $table_element='user'; + public $table_element_line = ''; + public $fk_element = 'fk_user'; + protected $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe + + var $rowid; + + var $name; + var $address; + var $zip; + var $town; + var $status; // 0=open, 1=closed + var $entity; + + var $statuts=array(); + var $statuts_short=array(); + + /** + * Constructor + * + * @param DoliDB $db Database handler + */ + function __construct($db) + { + $this->db = $db; + + $this->statuts_short = array(0 => 'Opened', 1 => 'Closed'); + $this->statuts = array(0 => 'Opened', 1 => 'Closed'); + + return 1; + } + + /** + * Load an object from database + * + * @param int $id Id of record to load + * @return int <0 if KO, >0 if OK + */ + function fetch($id) + { + $sql = "SELECT rowid, firstname, lastname, status, fk_user"; + $sql.= " FROM ".MAIN_DB_PREFIX."user"; + $sql.= " WHERE rowid = ".$id; + + dol_syslog(get_class($this)."::fetch", LOG_DEBUG); + $result = $this->db->query($sql); + if ( $result ) + { + $obj = $this->db->fetch_object($result); + + $this->id = $obj->rowid; + $this->name = $obj->name; + $this->address = $obj->address; + $this->zip = $obj->zip; + $this->town = $obj->town; + $this->status = $obj->status; + + return 1; + } + else + { + $this->error=$this->db->lasterror(); + return -1; + } + } + + /** + * Return a link to the employee card (with optionaly the picto) + * Use this->id,this->lastname, this->firstname + * + * @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 $notooltip 1=Disable tooltip on picto and name + * @param int $maxlen Max length of visible employee name + * @param int $hidethirdpartylogo Hide logo of thirdparty + * @param string $mode ''=Show firstname and lastname, 'firstname'=Show only firstname, 'login'=Show login + * @param string $morecss Add more css on link + * @return string String with URL + */ + function getNomUrl($withpictoimg=0, $option='', $notooltip=0, $maxlen=24, $hidethirdpartylogo=0, $mode='',$morecss='') + { + global $langs, $conf; + + if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && $withpictoimg) $withpictoimg=0; + + $result = ''; + $companylink = ''; + $link = ''; + + $label = '' . $langs->trans("Employee") . ''; + $label.= '
'; + $label.= '' . $langs->trans('Name') . ': ' . $this->getFullName($langs,'',''); + $label.= '
' . $langs->trans("EMail").': '.$this->email; + $label.='
'; + if (! empty($this->photo)) + { + $label.= '
'; + $label.= Form::showphoto('userphoto', $this, 80, 0, 0, 'photowithmargin photologintooltip', 'small', 0, 1); + $label.= '
'; + } + + $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=''; + + //if ($withpictoimg == -1) $result.='
'; + $result.=$link; + if ($withpictoimg) + { + $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', 'mini', 0, 1).'
'; + $result.=$picto; + } + if (abs($withpictoimg) != 2) + { + if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $result.='
'; + 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; + //if ($withpictoimg == -1) $result.='
'; + $result.=$companylink; + return $result; + } + + /** + * Return status label of an employee + * + * @param int $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto + * @return string Label of status + */ + function getLibStatut($mode=0) + { + return $this->LibStatut($this->statut,$mode); + } + + /** + * Return label of given status + * + * @param int $statut Id statut + * @param int $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto + * @return string Label of status + */ + function LibStatut($statut,$mode=0) + { + global $langs; + $langs->load('users'); + + if ($mode == 0) + { + $prefix=''; + if ($statut == 1) return $langs->trans('Enabled'); + if ($statut == 0) return $langs->trans('Disabled'); + } + if ($mode == 1) + { + if ($statut == 1) return $langs->trans('Enabled'); + if ($statut == 0) return $langs->trans('Disabled'); + } + if ($mode == 2) + { + if ($statut == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled'); + if ($statut == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled'); + } + if ($mode == 3) + { + if ($statut == 1) return img_picto($langs->trans('Enabled'),'statut4'); + if ($statut == 0) return img_picto($langs->trans('Disabled'),'statut5'); + } + if ($mode == 4) + { + if ($statut == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled'); + if ($statut == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled'); + } + if ($mode == 5) + { + if ($statut == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4'); + if ($statut == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5'); + } + } +} diff --git a/htdocs/hrm/employee/index.html b/htdocs/hrm/employee/index.html new file mode 100644 index 00000000000..e69de29bb2d diff --git a/htdocs/hrm/employee/list.php b/htdocs/hrm/employee/list.php new file mode 100644 index 00000000000..1635ba41cda --- /dev/null +++ b/htdocs/hrm/employee/list.php @@ -0,0 +1,223 @@ + + * Copyright (C) 2004-2015 Laurent Destailleur + * Copyright (C) 2005-2012 Regis Houssin + * Copyright (C) 2015 Alexandre Spangaro + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * 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/hrm/employee/list.php + * \ingroup core + * \brief Page of users + */ + +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/hrm/class/employee.class.php'; + +if (! $user->rights->hrm->employee->read) + accessforbidden(); + +$langs->load("users"); +$langs->load("companies"); +$langs->load("hrm"); + +// Security check (for external users) +$socid=0; +if ($user->societe_id > 0) + $socid = $user->societe_id; + +$sall=GETPOST('sall','alpha'); +$search_user=GETPOST('search_user','alpha'); +$search_login=GETPOST('search_login','alpha'); +$search_lastname=GETPOST('search_lastname','alpha'); +$search_firstname=GETPOST('search_firstname','alpha'); +$search_statut=GETPOST('search_statut','alpha'); +$search_thirdparty=GETPOST('search_thirdparty','alpha'); +$optioncss = GETPOST('optioncss','alpha'); + +if ($search_statut == '') $search_statut='1'; + +$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; +$limit = $conf->liste_limit; +if (! $sortfield) $sortfield="u.login"; +if (! $sortorder) $sortorder="ASC"; + +$employeestatic = new Employee($db); +$companystatic = new Societe($db); +$form = new Form($db); + +if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) +{ + $search_user=""; + $search_login=""; + $search_lastname=""; + $search_firstname=""; + $search_statut=""; + $search_thirdparty=""; +} + + +/* + * View + */ + +llxHeader('',$langs->trans("ListOfEmployees")); + +$buttonviewhierarchy=''; + +print load_fiche_titre($langs->trans("ListOfEmployees"), $buttonviewhierarchy); + +$sql = "SELECT u.rowid, u.lastname, u.firstname, u.email, u.gender,"; +$sql.= " u.datec,"; +$sql.= " u.tms as datem,"; +$sql.= " u.ldap_sid, u.statut, u.entity,"; +$sql.= " u2.login as login2, u2.firstname as firstname2, u2.lastname as lastname2,"; +$sql.= " s.nom as name, s.canvas"; +$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"; +$sql.= " WHERE u.employee >= '1'"; +$sql.= " AND 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_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_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); +$sql.=$db->order($sortfield,$sortorder); + +$result = $db->query($sql); +if ($result) +{ + $num = $db->num_rows($result); + $i = 0; + + 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_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); + 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("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="center"',$sortfield,$sortorder); + print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch '); + print "\n"; + + // Search bar + if (! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode)) $colspan++; + print ''; + print ''; + print ''; + print ''; + print ''; + + // Status + print ''; + + print ''; + + print "\n"; + + $employee2=new Employee($db); + + $var=True; + while ($i < $num) + { + $obj = $db->fetch_object($result); + $var=!$var; + + $employeestatic->id=$obj->rowid; + $employeestatic->ref=$obj->label; + $employeestatic->login=$obj->login; + $employeestatic->statut=$obj->statut; + $employeestatic->email=$obj->email; + $employeestatic->gender=$obj->gender; + $employeestatic->societe_id=$obj->fk_soc; + $employeestatic->firstname=''; + $employeestatic->lastname=$obj->login; + + $li=$employeestatic->getNomUrl(1,'',0,0,24,1); + + print ""; + print ''; + print ''; + print ''; + + // Resp + print ''; + + // Statut + $employeestatic->statut=$obj->statut; + print ''; + print ''; + print "\n"; + $i++; + } + print "
 '; + print $form->selectarray('search_statut', array('-1'=>'','0'=>$langs->trans('Disabled'),'1'=>$langs->trans('Enabled')),$search_statut); + 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->login2) + { + $employee2->login=$obj->login2; + //$employee2->lastname=$obj->lastname2; + //$employee2->firstname=$obj->firstname2; + $employee2->lastname=$employee2->login; + $employee2->firstname=''; + print $employee2->getNomUrl(1); + } + print ''.$employeestatic->getLibStatut(5).' 
"; + print "
\n"; + $db->free($result); +} +else +{ + dol_print_error($db); +} + +llxFooter(); + +$db->close(); diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index f6399bffa6b..cf1689031a4 100755 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -1126,6 +1126,8 @@ EncryptedPasswordInDatabase=To allow the encryption of the passwords in the data DisableForgetPasswordLinkOnLogonPage=Do not show the link "Forget password" on login page UsersSetup=Users module setup UserMailRequired=EMail required to create a new user +##### HRM setup ##### +HRMSetup=HRM module setup ##### Company setup ##### CompanySetup=Companies module setup CompanyCodeChecker=Module for third parties code generation and checking (customer or supplier) diff --git a/htdocs/langs/en_US/hrm.lang b/htdocs/langs/en_US/hrm.lang index 33c6c271261..b2e9387d62f 100644 --- a/htdocs/langs/en_US/hrm.lang +++ b/htdocs/langs/en_US/hrm.lang @@ -8,6 +8,7 @@ DeleteEstablishment=Delete establishment ConfirmDeleteEstablishment=Are-you sure to delete this establishment ? OpenEtablishment=Open establishment CloseEtablishment=Close establishment +ListOfEmployees=List of employees Employees=Employees Employee=Employee NewEmployee=New employee From 12e7c7b9e4aca2673ed136fa2ddafaae77a68993 Mon Sep 17 00:00:00 2001 From: philippe grand Date: Tue, 27 Oct 2015 13:42:00 +0100 Subject: [PATCH 42/45] [Qual] Uniformize code --- htdocs/admin/contract.php | 2 +- htdocs/admin/events.php | 2 +- htdocs/admin/expedition.php | 22 +++++++++++----------- htdocs/admin/expensereport.php | 24 ++++++++++++------------ htdocs/admin/facture.php | 32 ++++++++++++++++---------------- htdocs/admin/fckeditor.php | 6 +++--- 6 files changed, 44 insertions(+), 44 deletions(-) diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php index 3198ad51448..acfe7de156f 100644 --- a/htdocs/admin/contract.php +++ b/htdocs/admin/contract.php @@ -63,7 +63,7 @@ if ($action == 'updateMask') } else { - setEventMessage($langs->trans("Error"), null, 'errors'); + setEventMessages($langs->trans("Error"), null, 'errors'); } } diff --git a/htdocs/admin/events.php b/htdocs/admin/events.php index 04a46071142..a2b5a24c82a 100644 --- a/htdocs/admin/events.php +++ b/htdocs/admin/events.php @@ -61,7 +61,7 @@ if ($action == "save") } $db->commit(); - setEventMessage($langs->trans("SetupSaved")); + setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); } diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php index 9710929ee17..555badf11d8 100644 --- a/htdocs/admin/expedition.php +++ b/htdocs/admin/expedition.php @@ -6,7 +6,7 @@ * Copyright (C) 2004 Eric Seigne * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2011-2012 Juanjo Menent - * Copyright (C) 2011-2013 Philippe Grand + * Copyright (C) 2011-2015 Philippe Grand * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -65,9 +65,9 @@ if ($action == 'updateMask') if (isset($res)) { if ($res > 0) - setEventMessage($langs->trans("SetupSaved")); + setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); else - setEventMessage($langs->trans("Error"), 'errors'); + setEventMessages($langs->trans("Error"), null, 'errors'); } } @@ -77,9 +77,9 @@ else if ($action == 'set_SHIPPING_FREE_TEXT') $res = dolibarr_set_const($db, "SHIPPING_FREE_TEXT",$freetext,'chaine',0,'',$conf->entity); if ($res > 0) - setEventMessage($langs->trans("SetupSaved")); + setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); else - setEventMessage($langs->trans("Error"), 'errors'); + setEventMessages($langs->trans("Error"), null, 'errors'); } else if ($action == 'set_SHIPPING_DRAFT_WATERMARK') @@ -88,9 +88,9 @@ else if ($action == 'set_SHIPPING_DRAFT_WATERMARK') $res = dolibarr_set_const($db, "SHIPPING_DRAFT_WATERMARK",trim($draft),'chaine',0,'',$conf->entity); if ($res > 0) - setEventMessage($langs->trans("SetupSaved")); + setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); else - setEventMessage($langs->trans("Error"), 'errors'); + setEventMessages($langs->trans("Error"), null, 'errors'); } else if ($action == 'specimen') @@ -127,13 +127,13 @@ else if ($action == 'specimen') } else { - setEventMessage($module->error, 'errors'); + setEventMessages($module->error, $module->errors, 'errors'); dol_syslog($module->error, LOG_ERR); } } else { - setEventMessage($langs->trans("ErrorModuleNotFound"), 'errors'); + setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors'); dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR); } } @@ -158,12 +158,12 @@ else if ($action == 'setModuleOptions') if (! $error) { $db->commit(); - setEventMessage($langs->trans("SetupSaved")); + setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); } else { $db->rollback(); - setEventMessage($langs->trans("Error"),'errors'); + setEventMessages($langs->trans("Error"), null, 'errors'); } } diff --git a/htdocs/admin/expensereport.php b/htdocs/admin/expensereport.php index ab5f7fb013f..5c8fa9732e4 100644 --- a/htdocs/admin/expensereport.php +++ b/htdocs/admin/expensereport.php @@ -6,7 +6,7 @@ * Copyright (C) 2005-2014 Regis Houssin * Copyright (C) 2008 Raphael Bertrand (Resultic) * Copyright (C) 2011-2013 Juanjo Menent - * Copyright (C) 2011-2013 Philippe Grand + * Copyright (C) 2011-2015 Philippe Grand * * 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 @@ -60,11 +60,11 @@ if ($action == 'updateMask') if (! $error) { - setEventMessage($langs->trans("SetupSaved")); + setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); } else { - setEventMessage($langs->trans("Error"),'errors'); + setEventMessages($langs->trans("Error"), null, 'errors'); } } @@ -102,13 +102,13 @@ else if ($action == 'specimen') // For fiche inter } else { - setEventMessage($obj->error,'errors'); - dol_syslog($obj->error, LOG_ERR); + setEventMessages($module->error, $module->errors,'errors'); + dol_syslog($module->error, LOG_ERR); } } else { - setEventMessage($langs->trans("ErrorModuleNotFound"),'errors'); + setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors'); dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR); } } @@ -133,12 +133,12 @@ if ($action == 'setModuleOptions') if (! $error) { $db->commit(); - setEventMessage($langs->trans("SetupSaved")); + setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); } else { $db->rollback(); - setEventMessage($langs->trans("Error"),'errors'); + setEventMessages($langs->trans("Error"), null, 'errors'); } } @@ -196,11 +196,11 @@ else if ($action == 'set_EXPENSEREPORT_FREE_TEXT') if (! $error) { - setEventMessage($langs->trans("SetupSaved")); + setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); } else { - setEventMessage($langs->trans("Error"),'errors'); + setEventMessages($langs->trans("Error"), null, 'errors'); } } @@ -214,11 +214,11 @@ else if ($action == 'set_EXPENSEREPORT_DRAFT_WATERMARK') if (! $error) { - setEventMessage($langs->trans("SetupSaved")); + setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); } else { - setEventMessage($langs->trans("Error"),'errors'); + setEventMessages($langs->trans("Error"), null, 'errors'); } } diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php index 568cd5dca21..dee1789d6ec 100644 --- a/htdocs/admin/facture.php +++ b/htdocs/admin/facture.php @@ -69,11 +69,11 @@ if ($action == 'updateMask') if (! $error) { - setEventMessage($langs->trans("SetupSaved")); + setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); } else { - setEventMessage($langs->trans("Error"),'errors'); + setEventMessages($langs->trans("Error"), null, 'errors'); } } @@ -111,13 +111,13 @@ if ($action == 'specimen') } else { - setEventMessage($module->error,'errors'); + setEventMessages($module->error, $module->errors, 'errors'); dol_syslog($module->error, LOG_ERR); } } else { - setEventMessage($langs->trans("ErrorModuleNotFound"),'errors'); + setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors'); dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR); } } @@ -139,11 +139,11 @@ if ($action == 'setModuleOptions') if (! $error) { - setEventMessage($langs->trans("SetupSaved")); + setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); } else { - setEventMessage($langs->trans("Error"),'errors'); + setEventMessages($langs->trans("Error"), null, 'errors'); } } @@ -200,11 +200,11 @@ if ($action == 'setribchq') if (! $error) { - setEventMessage($langs->trans("SetupSaved")); + setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); } else { - setEventMessage($langs->trans("Error"),'errors'); + setEventMessages($langs->trans("Error"), null, 'errors'); } } @@ -218,11 +218,11 @@ if ($action == 'set_FACTURE_DRAFT_WATERMARK') if (! $error) { - setEventMessage($langs->trans("SetupSaved")); + setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); } else { - setEventMessage($langs->trans("Error"),'errors'); + setEventMessages($langs->trans("Error"), null, 'errors'); } } @@ -236,11 +236,11 @@ if ($action == 'set_INVOICE_FREE_TEXT') if (! $error) { - setEventMessage($langs->trans("SetupSaved")); + setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); } else { - setEventMessage($langs->trans("Error"),'errors'); + setEventMessages($langs->trans("Error"), null, 'errors'); } } @@ -254,11 +254,11 @@ if ($action == 'setforcedate') if (! $error) { - setEventMessage($langs->trans("SetupSaved")); + setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); } else { - setEventMessage($langs->trans("Error"),'errors'); + setEventMessages($langs->trans("Error"), null, 'errors'); } } @@ -272,11 +272,11 @@ if ($action == 'set_FAC_AUTO_FILLJS') if (! $error) { - setEventMessage($langs->trans("SetupSaved")); + setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); } else { - setEventMessage($langs->trans("Error"),'errors'); + setEventMessages($langs->trans("Error"), null, 'errors'); } } diff --git a/htdocs/admin/fckeditor.php b/htdocs/admin/fckeditor.php index b605da7e07b..b5bd4d045f6 100644 --- a/htdocs/admin/fckeditor.php +++ b/htdocs/admin/fckeditor.php @@ -121,11 +121,11 @@ if (GETPOST('save','alpha')) if (! $error) { - setEventMessage($langs->trans("SetupSaved")); + setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); } else { - setEventMessage($langs->trans("Error"),'errors'); + setEventMessages($langs->trans("Error"), null, 'errors'); } } @@ -143,7 +143,7 @@ $var=true; if (empty($conf->use_javascript_ajax)) { - setEventMessage(array($langs->trans("NotAvailable"), $langs->trans("JavascriptDisabled")), 'errors'); + setEventMessages(array($langs->trans("NotAvailable"), $langs->trans("JavascriptDisabled")), null, 'errors'); } else { From fb28586f3259708251f77250a1c05e447bbb8231 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 27 Oct 2015 19:18:22 +0100 Subject: [PATCH 43/45] Better visible of what is possible for stock management --- htdocs/admin/stock.php | 126 +++++++++++++++++++++------------ htdocs/langs/en_US/admin.lang | 2 +- htdocs/langs/en_US/stocks.lang | 4 +- 3 files changed, 83 insertions(+), 49 deletions(-) diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php index 2ed2f4f869e..b446f5355ad 100644 --- a/htdocs/admin/stock.php +++ b/htdocs/admin/stock.php @@ -141,58 +141,75 @@ $var=true; $found=0; +$var=!$var; +print "
'.$langs->trans("DeStockOnBill").''; if (! empty($conf->facture->enabled)) { - $var=!$var; - print "
'.$langs->trans("DeStockOnBill").''; - print "
"; + print ""; print ''; print ""; print $form->selectyesno("STOCK_CALCULATE_ON_BILL",$conf->global->STOCK_CALCULATE_ON_BILL,1,$disabled); print ''; - print "
\n
'.$langs->trans("DeStockOnValidateOrder").''; if (! empty($conf->commande->enabled)) { - $var=!$var; - print "
'.$langs->trans("DeStockOnValidateOrder").''; - print "
"; + print ""; print ''; print ""; print $form->selectyesno("STOCK_CALCULATE_ON_VALIDATE_ORDER",$conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER,1,$disabled); print ''; - print "
\n
'.$langs->trans("DeStockOnShipment").''; if (! empty($conf->expedition->enabled)) { - $var=!$var; - print "
'.$langs->trans("DeStockOnShipment").''; print "
"; print ''; print ""; print $form->selectyesno("STOCK_CALCULATE_ON_SHIPMENT",$conf->global->STOCK_CALCULATE_ON_SHIPMENT,1,$disabled); print ''; - print "
\n
'.$langs->trans("NoModueToManageStockDecrease").''.$langs->trans("NoModuleToManageStockDecrease").'
'; @@ -208,57 +225,74 @@ $var=true; $found=0; +$var=!$var; +print ""; +print ''.$langs->trans("ReStockOnBill").''; +print ''; if (! empty($conf->fournisseur->enabled)) { - $var=!$var; - print ""; - print ''.$langs->trans("ReStockOnBill").''; - print ''; - print "
"; + print ""; print ''; print ""; print $form->selectyesno("STOCK_CALCULATE_ON_SUPPLIER_BILL",$conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL,1,$disabled); print ''; - print "
\n\n\n"; - $found++; + print "\n"; } +else +{ + print $langs->trans("ModuleMustBeEnabledFirst", $langs->transnoentitiesnoconv("Module40Name")); +} +print "\n\n"; +$found++; + +$var=!$var; +print ""; +print ''.$langs->trans("ReStockOnValidateOrder").''; +print ''; if (! empty($conf->fournisseur->enabled)) { - $var=!$var; - print ""; - print ''.$langs->trans("ReStockOnValidateOrder").''; - print ''; - print "
"; + print ""; print ''; print ""; print $form->selectyesno("STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER",$conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER,1,$disabled); print ''; - print "
\n\n\n"; - $found++; + print "\n"; } +else +{ + print $langs->trans("ModuleMustBeEnabledFirst", $langs->transnoentitiesnoconv("Module40Name")); +} +print "\n\n"; +$found++; + +$var=!$var; +print ""; +print ''.$langs->trans("ReStockOnDispatchOrder").''; +print ''; if (! empty($conf->fournisseur->enabled)) { - $var=!$var; - print ""; - print ''.$langs->trans("ReStockOnDispatchOrder").''; - print ''; - print "
"; + print ""; print ''; print ""; print $form->selectyesno("STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER",$conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER,1,$disabled); print ''; - print "
\n\n\n"; - $found++; + print "\n"; } +else +{ + print $langs->trans("ModuleMustBeEnabledFirst", $langs->transnoentitiesnoconv("Module40Name")); +} +print "\n\n"; +$found++; -if (! $found) +/*if (! $found) { $var=!$var; print ""; print ''.$langs->trans("NoModueToManageStockIncrease").''; print "\n"; -} +}*/ print ''; diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index f6399bffa6b..f53df55b6c5 100755 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -356,7 +356,7 @@ ThemeDir=Skins directory ConnectionTimeout=Connexion timeout ResponseTimeout=Response timeout SmsTestMessage=Test message from __PHONEFROM__ to __PHONETO__ -ModuleMustBeEnabledFirst=Module %s must be enabled first before using this feature. +ModuleMustBeEnabledFirst=Module %s must be enabled first if you need this feature. SecurityToken=Key to secure URLs NoSmsEngine=No SMS sender manager available. SMS sender manager are not installed with default distribution (because they depends on an external supplier) but you can find some on %s PDF=PDF diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang index 8a46433ff9c..2ac77f8a489 100644 --- a/htdocs/langs/en_US/stocks.lang +++ b/htdocs/langs/en_US/stocks.lang @@ -53,8 +53,8 @@ QtyDispatched=Quantity dispatched QtyDispatchedShort=Qty dispatched QtyToDispatchShort=Qty to dispatch OrderDispatch=Stock dispatching -RuleForStockManagementDecrease=Rule for stock management decrease -RuleForStockManagementIncrease=Rule for stock management increase +RuleForStockManagementDecrease=Rule for automatic stock management decrease (manual decrease is always possible, even if an automatic decrease rule is activated) +RuleForStockManagementIncrease=Rule for automatic stock management increase (manual increase is always possible, even if an automatic increase rule is activated) DeStockOnBill=Decrease real stocks on customers invoices/credit notes validation DeStockOnValidateOrder=Decrease real stocks on customers orders validation DeStockOnShipment=Decrease real stocks on shipping validation From 76ded0aceadbad8843b80619ae6f83f5648fa780 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 27 Oct 2015 19:26:33 +0100 Subject: [PATCH 44/45] Fix using DATE_FORMAT is forbidden --- htdocs/core/boxes/box_task.php | 35 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/htdocs/core/boxes/box_task.php b/htdocs/core/boxes/box_task.php index d6a65884ffb..97767dd15d1 100644 --- a/htdocs/core/boxes/box_task.php +++ b/htdocs/core/boxes/box_task.php @@ -82,52 +82,51 @@ class box_task extends ModeleBoxes $sql = "SELECT pt.fk_statut, count(pt.rowid) as nb, sum(ptt.task_duration) as durationtot, sum(pt.planned_workload) as plannedtot"; $sql.= " FROM ".MAIN_DB_PREFIX."projet_task as pt, ".MAIN_DB_PREFIX."projet_task_time as ptt"; - $sql.= " WHERE DATE_FORMAT(pt.datec,'%Y') = '".date("Y")."' "; + $sql.= " WHERE pt.datec BETWEEN '".$this->db->idate(dol_get_first_day(date("Y"), 1))."' AND '".$this->db->idate(dol_get_last_day(date("Y"), 12))."'"; $sql.= " AND pt.rowid = ptt.fk_task"; $sql.= " GROUP BY pt.fk_statut "; $sql.= " ORDER BY pt.fk_statut DESC"; $sql.= $db->plimit($max, 0); $result = $db->query($sql); - - if ($result) { + if ($result) + { $num = $db->num_rows($result); $i = 0; - while ($i < $num) { - $this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"','logo' => 'object_projecttask'); - + while ($i < $num) + { $objp = $db->fetch_object($result); - $this->info_box_contents[$i][1] = array( + $this->info_box_contents[$i][] = array( 'td' => 'align="left"', - 'text' =>$langs->trans("Task")." ".$taskstatic->LibStatut($objp->fk_statut,0), + 'text' =>$langs->trans("Task")." ".$taskstatic->LibStatut($objp->fk_statut,0), ); - $this->info_box_contents[$i][2] = array( + $this->info_box_contents[$i][] = array( 'td' => 'align="right"', 'text' => $objp->nb." ".$langs->trans("Tasks"), 'url' => DOL_URL_ROOT."/projet/tasks/index.php?leftmenu=projects&viewstatut=".$objp->fk_statut, ); $totalnb += $objp->nb; - $this->info_box_contents[$i][3] = array('td' => 'align="right"', 'text' => ConvertSecondToTime($objp->plannedtot,'all',25200,5)); + $this->info_box_contents[$i][] = array('td' => 'align="right"', 'text' => ConvertSecondToTime($objp->plannedtot,'all',25200,5)); $totalplannedtot += $objp->plannedtot; - $this->info_box_contents[$i][4] = array('td' => 'align="right"', 'text' => ConvertSecondToTime($objp->durationtot,'all',25200,5)); + $this->info_box_contents[$i][] = array('td' => 'align="right"', 'text' => ConvertSecondToTime($objp->durationtot,'all',25200,5)); $totaldurationtot += $objp->durationtot; - $this->info_box_contents[$i][5] = array('td' => 'align="right" width="18"', 'text' => $taskstatic->LibStatut($objp->fk_statut,3)); + $this->info_box_contents[$i][] = array('td' => 'align="right" width="18"', 'text' => $taskstatic->LibStatut($objp->fk_statut,3)); $i++; } } + else dol_print_error($this->db); } // Add the sum à the bottom of the boxes - $this->info_box_contents[$i][0] = array('tr' => 'class="liste_total"', 'td' => 'align="left"', 'text' => $langs->trans("Total")." ".$textHead); - $this->info_box_contents[$i][1] = array('td' => '', 'text' => ""); - $this->info_box_contents[$i][2] = array('td' => 'align="right" ', 'text' => number_format($totalnb, 0, ',', ' ')." ".$langs->trans("Tasks")); - $this->info_box_contents[$i][3] = array('td' => 'align="right" ', 'text' => ConvertSecondToTime($totalplannedtot,'all',25200,5)); - $this->info_box_contents[$i][4] = array('td' => 'align="right" ', 'text' => ConvertSecondToTime($totaldurationtot,'all',25200,5)); - $this->info_box_contents[$i][5] = array('td' => '', 'text' => ""); + $this->info_box_contents[$i][] = array('tr' => 'class="liste_total"', 'td' => 'align="left"', 'text' => $langs->trans("Total")." ".$textHead); + $this->info_box_contents[$i][] = array('td' => 'align="right" ', 'text' => number_format($totalnb, 0, ',', ' ')." ".$langs->trans("Tasks")); + $this->info_box_contents[$i][] = array('td' => 'align="right" ', 'text' => ConvertSecondToTime($totalplannedtot,'all',25200,5)); + $this->info_box_contents[$i][] = array('td' => 'align="right" ', 'text' => ConvertSecondToTime($totaldurationtot,'all',25200,5)); + $this->info_box_contents[$i][] = array('td' => '', 'text' => ""); } From f9c9c58cba2d8aae545756e3cea906252be2419e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 27 Oct 2015 20:36:27 +0100 Subject: [PATCH 45/45] Label must be cheque or transfer --- htdocs/langs/en_US/bills.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang index 94e1fa60251..8ff109b2b09 100644 --- a/htdocs/langs/en_US/bills.lang +++ b/htdocs/langs/en_US/bills.lang @@ -351,7 +351,7 @@ ExtraInfos=Extra infos RegulatedOn=Regulated on ChequeNumber=Check N° ChequeOrTransferNumber=Check/Transfer N° -ChequeMaker=Check transmitter +ChequeMaker=Check/Transfer transmitter ChequeBank=Bank of Check CheckBank=Check NetToBePaid=Net to be paid