From a92081cf43e49e6f52ef82e2210d139646d48324 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 7 Mar 2023 22:04:40 +0100 Subject: [PATCH] Debug Kanban views --- htdocs/adherents/class/adherent_type.class.php | 6 +++++- htdocs/adherents/class/subscription.class.php | 3 +++ htdocs/bom/class/bom.class.php | 4 ++++ htdocs/comm/propal/class/propal.class.php | 4 ++++ htdocs/compta/bank/class/account.class.php | 4 ++++ htdocs/compta/bank/class/paymentvarious.class.php | 4 ++++ htdocs/compta/cashcontrol/class/cashcontrol.class.php | 4 ++++ htdocs/compta/facture/class/facture.class.php | 3 +++ htdocs/compta/localtax/class/localtax.class.php | 4 ++++ .../compta/paiement/cheque/class/remisecheque.class.php | 3 +++ htdocs/compta/prelevement/class/bonprelevement.class.php | 3 +++ htdocs/compta/sociales/class/chargesociales.class.php | 3 +++ htdocs/compta/tva/class/tva.class.php | 4 ++++ htdocs/contact/class/contact.class.php | 4 ++++ htdocs/contrat/class/contrat.class.php | 4 ++++ htdocs/core/class/commonorder.class.php | 3 +++ htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php | 1 - htdocs/don/class/don.class.php | 3 +++ htdocs/expensereport/class/expensereport.class.php | 8 ++++---- htdocs/expensereport/class/paymentexpensereport.class.php | 4 ++++ htdocs/fichinter/class/fichinter.class.php | 4 ++++ htdocs/fourn/class/fournisseur.commande.class.php | 4 ++++ htdocs/fourn/class/fournisseur.facture.class.php | 4 ++++ htdocs/holiday/class/holiday.class.php | 3 +++ htdocs/hrm/class/evaluation.class.php | 3 +++ htdocs/hrm/class/job.class.php | 2 ++ htdocs/hrm/class/position.class.php | 3 +++ htdocs/hrm/class/skill.class.php | 2 ++ .../knowledgemanagement/class/knowledgerecord.class.php | 8 ++++---- htdocs/loan/class/loan.class.php | 4 ++++ htdocs/modulebuilder/template/class/myobject.class.php | 4 +++- htdocs/mrp/class/mo.class.php | 4 ++++ htdocs/partnership/class/partnership.class.php | 4 +++- htdocs/product/class/product.class.php | 3 +++ htdocs/product/stock/class/entrepot.class.php | 2 ++ htdocs/projet/class/project.class.php | 6 +++++- htdocs/projet/class/task.class.php | 4 ++++ htdocs/recruitment/class/recruitmentcandidature.class.php | 8 ++++---- htdocs/recruitment/class/recruitmentjobposition.class.php | 8 ++++---- htdocs/salaries/class/paymentsalary.class.php | 6 +++++- htdocs/salaries/class/salary.class.php | 4 ++++ htdocs/societe/class/societe.class.php | 2 ++ .../supplier_proposal/class/supplier_proposal.class.php | 4 ++++ htdocs/ticket/class/ticket.class.php | 8 ++++---- htdocs/user/class/user.class.php | 3 +++ htdocs/user/class/usergroup.class.php | 4 ++++ 46 files changed, 161 insertions(+), 26 deletions(-) diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php index 396dea45b0e..141a2264113 100644 --- a/htdocs/adherents/class/adherent_type.class.php +++ b/htdocs/adherents/class/adherent_type.class.php @@ -991,7 +991,10 @@ class AdherentType extends CommonObject */ public function getKanbanView($option = '', $arraydata = null) { - global $langs,$user; + global $langs, $user; + + $selected = (empty($arraydata['selected']) ? 0 : $arraydata['selected']); + $return = '
'; $return .= '
'; $return .= ''; @@ -999,6 +1002,7 @@ class AdherentType extends CommonObject $return .= ''; $return .= '
'; $return .= ''.(method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref).''; + $return .= ''; if ($user->rights->adherent->configurer) { $return .= 'ref.'">'.img_edit().''; } else { diff --git a/htdocs/adherents/class/subscription.class.php b/htdocs/adherents/class/subscription.class.php index c8994283fe1..5f8dbf07249 100644 --- a/htdocs/adherents/class/subscription.class.php +++ b/htdocs/adherents/class/subscription.class.php @@ -515,6 +515,8 @@ class Subscription extends CommonObject */ public function getKanbanView($option = '', $arraydata = null) { + $selected = (empty($arraydata['selected']) ? 0 : $arraydata['selected']); + $return = '
'; $return .= '
'; $return .= ''; @@ -523,6 +525,7 @@ class Subscription extends CommonObject $return .= '
'; $return .= ''.(property_exists($this, 'fk_adherent')? $this->fk_adherent: $this->ref ).''; + $return .= ''; if (property_exists($this, 'dateh') || property_exists($this, 'datef')) { $return .= '
'.dol_print_date($this->dateh, 'day').' - '.dol_print_date($this->datef, 'day').''; } diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php index 361ac64928e..c00b9781756 100644 --- a/htdocs/bom/class/bom.class.php +++ b/htdocs/bom/class/bom.class.php @@ -1567,6 +1567,9 @@ class BOM extends CommonObject public function getKanbanView($option = '', $arraydata = null) { global $db,$langs; + + $selected = (empty($arraydata['selected']) ? 0 : $arraydata['selected']); + $prod = new Product($db); $prod->fetch($this->fk_product); @@ -1577,6 +1580,7 @@ class BOM extends CommonObject $return .= ''; $return .= '
'; $return .= ''.(method_exists($this, 'getNomUrl') ? $this->getNomUrl() : '').''; + $return .= ''; if (property_exists($this, 'fields') && !empty($this->fields['bomtype']['arrayofkeyval'])) { $return .= '
'.$langs->trans("Type").' : '; if ($this->bomtype == 0) { diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index b52e39a0088..75990668e5d 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -3964,6 +3964,9 @@ class Propal extends CommonObject public function getKanbanView($option = '', $arraydata = null) { global $langs; + + $selected = (empty($arraydata['selected']) ? 0 : $arraydata['selected']); + $return = '
'; $return .= '
'; $return .= ''; @@ -3972,6 +3975,7 @@ class Propal extends CommonObject $return .= ''; $return .= '
'; $return .= ''.(method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref).''; + $return .= ''; if (property_exists($this, 'fk_project')) { $return .= ' | '.$this->fk_project.''; } diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php index b29037778da..b20acb71da2 100644 --- a/htdocs/compta/bank/class/account.class.php +++ b/htdocs/compta/bank/class/account.class.php @@ -1832,6 +1832,9 @@ class Account extends CommonObject public function getKanbanView($option = '', $arraydata = null) { global $langs; + + $selected = (empty($arraydata['selected']) ? 0 : $arraydata['selected']); + $return = '
'; $return .= '
'; $return .= ''; @@ -1839,6 +1842,7 @@ class Account extends CommonObject $return .= ''; $return .= '
'; $return .= ''.(method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref).''; + $return .= ''; if (property_exists($this, 'type_lib')) { $return .= '
'.substr($this->type_lib[$this->type], 0, 24).'...'; diff --git a/htdocs/compta/bank/class/paymentvarious.class.php b/htdocs/compta/bank/class/paymentvarious.class.php index d5888e0e7a1..933ff6742b0 100644 --- a/htdocs/compta/bank/class/paymentvarious.class.php +++ b/htdocs/compta/bank/class/paymentvarious.class.php @@ -779,6 +779,9 @@ class PaymentVarious extends CommonObject public function getKanbanView($option = '', $arraydata = null) { global $langs; + + $selected = (empty($arraydata['selected']) ? 0 : $arraydata['selected']); + $return = '
'; $return .= '
'; $return .= ''; @@ -786,6 +789,7 @@ class PaymentVarious extends CommonObject $return .= ''; $return .= '
'; $return .= ''.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(1) : $this->ref).''; + $return .= ''; if (property_exists($this, 'fk_bank')) { $return .= ' | '.$this->fk_bank.''; } diff --git a/htdocs/compta/cashcontrol/class/cashcontrol.class.php b/htdocs/compta/cashcontrol/class/cashcontrol.class.php index deb86fba456..373bd6560cf 100644 --- a/htdocs/compta/cashcontrol/class/cashcontrol.class.php +++ b/htdocs/compta/cashcontrol/class/cashcontrol.class.php @@ -480,6 +480,9 @@ class CashControl extends CommonObject public function getKanbanView($option = '', $arraydata = null) { global $langs; + + $selected = (empty($arraydata['selected']) ? 0 : $arraydata['selected']); + $return = '
'; $return .= '
'; $return .= ''; @@ -488,6 +491,7 @@ class CashControl extends CommonObject $return .= ''; $return .= '
'; $return .= ''.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(1, 1) : $this->ref).''; + $return .= ''; if (property_exists($this, 'posmodule')) { $return .= '
'.substr($langs->trans("Module/Application"), 0, 12).' : '.$this->posmodule.''; } diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index 3396c7c518c..eadbe8efd05 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -5811,6 +5811,8 @@ class Facture extends CommonInvoice */ public function getKanbanView($option = '', $arraydata = null) { + $selected = (empty($arraydata['selected']) ? 0 : $arraydata['selected']); + $return = '
'; $return .= '
'; $return .= ''; @@ -5819,6 +5821,7 @@ class Facture extends CommonInvoice $return .= ''; $return .= '
'; $return .= ''.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(1) : $this->ref).''; + $return .= ''; if (property_exists($this, 'socid')) { $return .= '
'.$this->socid.''; } diff --git a/htdocs/compta/localtax/class/localtax.class.php b/htdocs/compta/localtax/class/localtax.class.php index a6db785b779..95647d0f65e 100644 --- a/htdocs/compta/localtax/class/localtax.class.php +++ b/htdocs/compta/localtax/class/localtax.class.php @@ -640,6 +640,9 @@ class Localtax extends CommonObject public function getKanbanView($option = '', $arraydata = null) { global $langs; + + $selected = (empty($arraydata['selected']) ? 0 : $arraydata['selected']); + $return = '
'; $return .= '
'; $return .= ''; @@ -647,6 +650,7 @@ class Localtax extends CommonObject $return .= ''; $return .= '
'; $return .= ''.(method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref).''; + $return .= ''; if (property_exists($this, 'label')) { $return .= ' | '.$this->label.''; } diff --git a/htdocs/compta/paiement/cheque/class/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php index 5c885267559..eb70c9cebaf 100644 --- a/htdocs/compta/paiement/cheque/class/remisecheque.class.php +++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php @@ -1032,6 +1032,8 @@ class RemiseCheque extends CommonObject { global $langs; + $selected = (empty($arraydata['selected']) ? 0 : $arraydata['selected']); + $return = '
'; $return .= '
'; $return .= ''; @@ -1039,6 +1041,7 @@ class RemiseCheque extends CommonObject $return .= ''; $return .= '
'; $return .= ''.(method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref).''; + $return .= ''; if (property_exists($this, 'date_bordereau')) { $return .= '
'.$langs->trans("DateCreation").' : '.dol_print_date($this->db->jdate($this->date_bordereau), 'day').''; diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php index c130c94ab09..deaa78397c8 100644 --- a/htdocs/compta/prelevement/class/bonprelevement.class.php +++ b/htdocs/compta/prelevement/class/bonprelevement.class.php @@ -2527,6 +2527,8 @@ class BonPrelevement extends CommonObject { global $langs; + $selected = (empty($arraydata['selected']) ? 0 : $arraydata['selected']); + $return = '
'; $return .= '
'; $return .= ''; @@ -2534,6 +2536,7 @@ class BonPrelevement extends CommonObject $return .= ''; $return .= '
'; $return .= ''.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(1) : $this->ref).''; + $return .= ''; if (property_exists($this, 'date_echeance')) { $return .= '
'.$langs->trans("Date").' : '.dol_print_date($this->db->jdate($this->date_echeance), 'day').''; diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php index 140f1cffec6..c9e9b6e561b 100644 --- a/htdocs/compta/sociales/class/chargesociales.class.php +++ b/htdocs/compta/sociales/class/chargesociales.class.php @@ -761,6 +761,8 @@ class ChargeSociales extends CommonObject { global $conf, $langs; + $selected = (empty($arraydata['selected']) ? 0 : $arraydata['selected']); + $return = '
'; $return .= '
'; $return .= ''; @@ -768,6 +770,7 @@ class ChargeSociales extends CommonObject $return .= ''; $return .= '
'; $return .= ''.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(0) : $this->ref).''; + $return .= ''; if (property_exists($this, 'label')) { $return .= '  
'.$this->label.'
'; } diff --git a/htdocs/compta/tva/class/tva.class.php b/htdocs/compta/tva/class/tva.class.php index 220863a0cb2..2be181d7350 100644 --- a/htdocs/compta/tva/class/tva.class.php +++ b/htdocs/compta/tva/class/tva.class.php @@ -917,6 +917,9 @@ class Tva extends CommonObject public function getKanbanView($option = '', $arraydata = null) { global $langs; + + $selected = (empty($arraydata['selected']) ? 0 : $arraydata['selected']); + $return = '
'; $return .= '
'; $return .= ''; @@ -925,6 +928,7 @@ class Tva extends CommonObject $return .= ''; $return .= '
'; $return .= ''.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(1) : $this->ref).''; + $return .= ''; if (property_exists($this, 'amount')) { $return .= ' | '.$langs->trans("Amount").' : '.price($this->amount).''; } diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php index 407eed06921..0984b6e212b 100644 --- a/htdocs/contact/class/contact.class.php +++ b/htdocs/contact/class/contact.class.php @@ -2177,6 +2177,9 @@ class Contact extends CommonObject public function getKanbanView($option = '', $arraydata = null) { global $langs; + + $selected = (empty($arraydata['selected']) ? 0 : $arraydata['selected']); + $return = '
'; $return .= '
'; $return .= ''; @@ -2189,6 +2192,7 @@ class Contact extends CommonObject $return .= ''; $return .= '
'; $return .= '
'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(1) : $this->ref).'
'; + $return .= ''; if (property_exists($this, 'thirdparty') && is_object($this->thirdparty)) { $return .= '
'.$this->thirdparty->getNomUrl(1).'
'; diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php index 14f5cb62bfa..4fd18a74f34 100644 --- a/htdocs/contrat/class/contrat.class.php +++ b/htdocs/contrat/class/contrat.class.php @@ -2829,6 +2829,9 @@ class Contrat extends CommonObject public function getKanbanView($option = '', $arraydata = null) { global $langs; + + $selected = (empty($arraydata['selected']) ? 0 : $arraydata['selected']); + $return = '
'; $return .= '
'; $return .= ''; @@ -2837,6 +2840,7 @@ class Contrat extends CommonObject $return .= ''; $return .= '
'; $return .= ''.(method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref).''; + $return .= ''; if (property_exists($this, 'societe')) { $return .= '
'.$this->societe.''; } diff --git a/htdocs/core/class/commonorder.class.php b/htdocs/core/class/commonorder.class.php index 8f2edc005ec..e624beae75b 100644 --- a/htdocs/core/class/commonorder.class.php +++ b/htdocs/core/class/commonorder.class.php @@ -44,6 +44,8 @@ abstract class CommonOrder extends CommonObject { global $langs, $conf; + $selected = (empty($arraydata['selected']) ? 0 : $arraydata['selected']); + $return = '
'; $return .= '
'; $return .= '
'; @@ -51,6 +53,7 @@ abstract class CommonOrder extends CommonObject $return .= '
'; $return .= '
'; $return .= ''.(method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref).''; + $return .= ''; if (property_exists($this, 'thirdparty') && is_object($this->thirdparty)) { $return .= '
'.$this->thirdparty->getNomUrl(1).'
'; diff --git a/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php b/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php index 00d57161e10..37bdd72fde0 100644 --- a/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php +++ b/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php @@ -504,7 +504,6 @@ class pdf_sepamandate extends ModeleBankAccountDoc } - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps /** diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php index 01b1e1bf6cc..76ddd7e67de 100644 --- a/htdocs/don/class/don.class.php +++ b/htdocs/don/class/don.class.php @@ -1154,6 +1154,8 @@ class Don extends CommonObject { global $langs; + $selected = (empty($arraydata['selected']) ? 0 : $arraydata['selected']); + $return = '
'; $return .= '
'; $return .= ''; @@ -1161,6 +1163,7 @@ class Don extends CommonObject $return .= ''; $return .= '
'; $return .= ''.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(1) : $this->ref).''; + $return .= ''; if (property_exists($this, 'date')) { $return .= ' | '.$langs->trans("Date").' : '.dol_print_date($this->date).''; } diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php index 4bac14b34f1..94fa12fd050 100644 --- a/htdocs/expensereport/class/expensereport.class.php +++ b/htdocs/expensereport/class/expensereport.class.php @@ -2772,7 +2772,10 @@ class ExpenseReport extends CommonObject */ public function getKanbanView($option = '', $arraydata = null) { - global $langs, $selected,$arrayofselected; + global $langs; + + $selected = (empty($arraydata['selected']) ? 0 : $arraydata['selected']); + $return = '
'; $return .= '
'; $return .= ''; @@ -2780,9 +2783,6 @@ class ExpenseReport extends CommonObject $return .= ''; $return .= '
'; $return .= ''.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(1) : $this->ref).''; - if (in_array($this->id, $arrayofselected)) { - $selected = 1; - } $return .= ''; if (property_exists($this, 'fk_user_author') && !empty($this->id)) { $return .= '
'.$this->fk_user_author.''; diff --git a/htdocs/expensereport/class/paymentexpensereport.class.php b/htdocs/expensereport/class/paymentexpensereport.class.php index 955181cf632..0d056a1f9e4 100644 --- a/htdocs/expensereport/class/paymentexpensereport.class.php +++ b/htdocs/expensereport/class/paymentexpensereport.class.php @@ -724,6 +724,9 @@ class PaymentExpenseReport extends CommonObject public function getKanbanView($option = '', $arraydata = null) { global $langs; + + $selected = (empty($arraydata['selected']) ? 0 : $arraydata['selected']); + $return = '
'; $return .= '
'; $return .= ''; @@ -731,6 +734,7 @@ class PaymentExpenseReport extends CommonObject $return .= ''; $return .= '
'; $return .= ''.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(1) : $this->ref).''; + $return .= ''; if (property_exists($this, 'datep')) { $return .= '
'.$langs->trans("Date").' : '.dol_print_date($this->db->jdate($this->datep), 'dayhour').''; } diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php index e739ee0806e..606a88c9d51 100644 --- a/htdocs/fichinter/class/fichinter.class.php +++ b/htdocs/fichinter/class/fichinter.class.php @@ -1488,6 +1488,9 @@ class Fichinter extends CommonObject public function getKanbanView($option = '', $arraydata = null) { global $langs; + + $selected = (empty($arraydata['selected']) ? 0 : $arraydata['selected']); + $return = '
'; $return .= '
'; $return .= ''; @@ -1496,6 +1499,7 @@ class Fichinter extends CommonObject $return .= ''; $return .= '
'; $return .= ''.(method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref).''; + $return .= ''; if (property_exists($this, 'socid')) { $return .= '
'.$this->socid.''; } diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php index 17033086e69..a93a8e5869d 100644 --- a/htdocs/fourn/class/fournisseur.commande.class.php +++ b/htdocs/fourn/class/fournisseur.commande.class.php @@ -3633,6 +3633,9 @@ class CommandeFournisseur extends CommonOrder public function getKanbanView($option = '', $arraydata = null) { global $langs; + + $selected = (empty($arraydata['selected']) ? 0 : $arraydata['selected']); + $return = '
'; $return .= '
'; $return .= ''; @@ -3641,6 +3644,7 @@ class CommandeFournisseur extends CommonOrder $return .= ''; $return .= '
'; $return .= ''.(method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref).''; + $return .= ''; if (property_exists($this, 'socid') || property_exists($this, 'total_tva')) { $return .='
'.$this->socid.''; } diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php index f635dcab2c5..066c5918742 100644 --- a/htdocs/fourn/class/fournisseur.facture.class.php +++ b/htdocs/fourn/class/fournisseur.facture.class.php @@ -3286,6 +3286,9 @@ class FactureFournisseur extends CommonInvoice public function getKanbanView($option = '', $arraydata = null) { global $langs; + + $selected = (empty($arraydata['selected']) ? 0 : $arraydata['selected']); + $return = '
'; $return .= '
'; $return .= ''; @@ -3293,6 +3296,7 @@ class FactureFournisseur extends CommonInvoice $return .= ''; $return .= '
'; $return .= ''.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(1) : $this->ref).''; + $return .= ''; if (property_exists($this, 'socid')) { $return .= ' | '.$this->socid.''; } diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php index 619d8a3fc85..341b0c700e1 100644 --- a/htdocs/holiday/class/holiday.class.php +++ b/htdocs/holiday/class/holiday.class.php @@ -2476,6 +2476,8 @@ class Holiday extends CommonObject { global $langs; + $selected = (empty($arraydata['selected']) ? 0 : $arraydata['selected']); + $return = '
'; $return .= '
'; $return .= ''; @@ -2483,6 +2485,7 @@ class Holiday extends CommonObject $return .= ''; $return .= '
'; $return .= ''.$arraydata['user']->getNomUrl(-1).''; + $return .= ''; if (property_exists($this, 'fk_type')) { $return .= '
'.$langs->trans("Type").' : '; $return .= ''.arraydata['labeltype'].''; diff --git a/htdocs/hrm/class/evaluation.class.php b/htdocs/hrm/class/evaluation.class.php index ab87aaeeef5..803963a27e2 100644 --- a/htdocs/hrm/class/evaluation.class.php +++ b/htdocs/hrm/class/evaluation.class.php @@ -1066,6 +1066,9 @@ class Evaluation extends CommonObject public function getKanbanView($option = '', $arraydata = null) { global $selected, $langs; + + $selected = (empty($arraydata['selected']) ? 0 : $arraydata['selected']); + $return = '
'; $return .= '
'; $return .= ''; diff --git a/htdocs/hrm/class/job.class.php b/htdocs/hrm/class/job.class.php index b0a1d263b65..bbcdcf4c1df 100644 --- a/htdocs/hrm/class/job.class.php +++ b/htdocs/hrm/class/job.class.php @@ -1066,6 +1066,8 @@ class Job extends CommonObject { global $selected, $langs; + $selected = (empty($arraydata['selected']) ? 0 : $arraydata['selected']); + $return = '
'; $return .= '
'; $return .= ''; diff --git a/htdocs/hrm/class/position.class.php b/htdocs/hrm/class/position.class.php index 4cb0eb670f8..d2e98a7f28b 100644 --- a/htdocs/hrm/class/position.class.php +++ b/htdocs/hrm/class/position.class.php @@ -1129,6 +1129,9 @@ class Position extends CommonObject public function getKanbanView($option = '', $arraydata = null) { global $selected, $langs; + + $selected = (empty($arraydata['selected']) ? 0 : $arraydata['selected']); + $return = '
'; $return .= '
'; $return .= ''; diff --git a/htdocs/hrm/class/skill.class.php b/htdocs/hrm/class/skill.class.php index 44cea026320..42be9146978 100644 --- a/htdocs/hrm/class/skill.class.php +++ b/htdocs/hrm/class/skill.class.php @@ -1125,6 +1125,8 @@ class Skill extends CommonObject { global $selected, $langs; + $selected = (empty($arraydata['selected']) ? 0 : $arraydata['selected']); + $return = '
'; $return .= '
'; $return .= ''; diff --git a/htdocs/knowledgemanagement/class/knowledgerecord.class.php b/htdocs/knowledgemanagement/class/knowledgerecord.class.php index 15682d00fc9..4af7cd2bd27 100644 --- a/htdocs/knowledgemanagement/class/knowledgerecord.class.php +++ b/htdocs/knowledgemanagement/class/knowledgerecord.class.php @@ -1125,7 +1125,10 @@ class KnowledgeRecord extends CommonObject */ public function getKanbanView($option = '', $arraydata = null) { - global $langs, $selected,$arrayofselected; + global $langs; + + $selected = (empty($arraydata['selected']) ? 0 : $arraydata['selected']); + $return = '
'; $return .= '
'; $return .= ''; @@ -1133,9 +1136,6 @@ class KnowledgeRecord extends CommonObject $return .= ''; $return .= '
'; $return .= ''.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(1) : $this->ref).''; - if (in_array($this->id, $arrayofselected)) { - $selected = 1; - } $return .= ''; if (property_exists($this, 'lang') && !empty($this->lang)) { //$return .= '
'.$langs->trans("Language").' : lang).'">'.$langs->trans("Language_".$this->lang, '', '', '', '', 12).''; diff --git a/htdocs/loan/class/loan.class.php b/htdocs/loan/class/loan.class.php index ef44b2fb196..5b807779634 100644 --- a/htdocs/loan/class/loan.class.php +++ b/htdocs/loan/class/loan.class.php @@ -733,6 +733,9 @@ class Loan extends CommonObject public function getKanbanView($option = '') { global $langs; + + $selected = (empty($arraydata['selected']) ? 0 : $arraydata['selected']); + $return = '
'; $return .= '
'; $return .= ''; @@ -740,6 +743,7 @@ class Loan extends CommonObject $return .= ''; $return .= '
'; $return .= ''.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(1) : $this->ref).''; + $return .= ''; if (property_exists($this, 'capital')) { $return .= ' | '.$langs->trans("Amount").' : '.price($this->capital).''; } diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php index 58c7d502d11..2a9b583b9e9 100644 --- a/htdocs/modulebuilder/template/class/myobject.class.php +++ b/htdocs/modulebuilder/template/class/myobject.class.php @@ -905,7 +905,9 @@ class MyObject extends CommonObject */ public function getKanbanView($option = '', $arraydata = null) { - global $conf, $langs, $selected; + global $conf, $langs; + + $selected = (empty($arraydata['selected']) ? 0 : $arraydata['selected']); $return = '
'; $return .= '
'; diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php index e5af1f2bddf..ee30c468358 100644 --- a/htdocs/mrp/class/mo.class.php +++ b/htdocs/mrp/class/mo.class.php @@ -1646,6 +1646,9 @@ class Mo extends CommonObject public function getKanbanView($option = '', $arraydata = null) { global $langs; + + $selected = (empty($arraydata['selected']) ? 0 : $arraydata['selected']); + $return = '
'; $return .= '
'; $return .= ''; @@ -1654,6 +1657,7 @@ class Mo extends CommonObject $return .= ''; $return .= '
'; $return .= ''.(method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref).''; + $return .= ''; if (property_exists($this, 'fk_bom')) { $return .= '
'.$this->fk_bom.''; } diff --git a/htdocs/partnership/class/partnership.class.php b/htdocs/partnership/class/partnership.class.php index fcec2935103..63f0374f77f 100644 --- a/htdocs/partnership/class/partnership.class.php +++ b/htdocs/partnership/class/partnership.class.php @@ -1334,7 +1334,8 @@ class Partnership extends CommonObject */ public function getKanbanView($option = '', $arraydata = null) { - global $conf, $langs; + $selected = (empty($arraydata['selected']) ? 0 : $arraydata['selected']); + $return = '
'; $return .= '
'; $return .= ''; @@ -1342,6 +1343,7 @@ class Partnership extends CommonObject $return .= ''; $return .= '
'; $return .= ''.(method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref).''; + $return .= ''; if (property_exists($this, 'label')) { $return .= '
'.$this->label.'
'; } diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index d4a30517068..28fa20a0083 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -6370,6 +6370,8 @@ class Product extends CommonObject { global $langs,$conf; + $selected = (empty($arraydata['selected']) ? 0 : $arraydata['selected']); + $return = '
'; $return .= '
'; $return .= '
'; @@ -6388,6 +6390,7 @@ class Product extends CommonObject $return .= '
'; $return .= '
'; $return .= ''.(method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref).''; + $return .= ''; if (property_exists($this, 'label')) { $return .= '
'.$this->label.''; } diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php index c76f8bb3d7e..8ecbce06cde 100644 --- a/htdocs/product/stock/class/entrepot.class.php +++ b/htdocs/product/stock/class/entrepot.class.php @@ -962,6 +962,7 @@ class Entrepot extends CommonObject */ public function getKanbanView($option = '', $arraydata = null) { + $selected = (empty($arraydata['selected']) ? 0 : $arraydata['selected']); $return = '
'; $return .= '
'; @@ -970,6 +971,7 @@ class Entrepot extends CommonObject $return .= '
'; $return .= '
'; $return .= ''.(method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref).''; + $return .= ''; if (property_exists($this, 'lieu') && (!empty($this->lieu))) { $return .= '
'.$this->lieu.''; } diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php index fc4f6acb426..5784e15040a 100644 --- a/htdocs/projet/class/project.class.php +++ b/htdocs/projet/class/project.class.php @@ -2384,7 +2384,10 @@ class Project extends CommonObject */ public function getKanbanView($option = '') { - global $langs,$user; + global $langs, $user; + + $selected = (empty($arraydata['selected']) ? 0 : $arraydata['selected']); + $return = '
'; $return .= '
'; $return .= ''; @@ -2397,6 +2400,7 @@ class Project extends CommonObject $return .= img_warning($langs->trans('Late')); } $return .= ''; + $return .= ''; if (property_exists($this, 'date_start') && $this->date_start) { $return .= '
'.dol_print_date($this->date_start, 'day').''; } diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php index 596d828ff97..5bd81b8e478 100644 --- a/htdocs/projet/class/task.class.php +++ b/htdocs/projet/class/task.class.php @@ -2371,6 +2371,9 @@ class Task extends CommonObjectLine public function getKanbanView($option = '', $arraydata = null) { global $langs, $conf; + + $selected = (empty($arraydata['selected']) ? 0 : $arraydata['selected']); + $return = '
'; $return .= '
'; $return .= ''; @@ -2379,6 +2382,7 @@ class Task extends CommonObjectLine $return .= ''; $return .= '
'; $return .= ''.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(1) : $this->ref).''; + $return .= ''; if (property_exists($this, 'fk_project') ) { $return .= '
'.$this->fk_project.''; } diff --git a/htdocs/recruitment/class/recruitmentcandidature.class.php b/htdocs/recruitment/class/recruitmentcandidature.class.php index 6dae3e08388..9d75781056a 100644 --- a/htdocs/recruitment/class/recruitmentcandidature.class.php +++ b/htdocs/recruitment/class/recruitmentcandidature.class.php @@ -1036,7 +1036,10 @@ class RecruitmentCandidature extends CommonObject */ public function getKanbanView($option = '', $arraydata = null) { - global $langs, $selected,$arrayofselected; + global $langs; + + $selected = (empty($arraydata['selected']) ? 0 : $arraydata['selected']); + $return = '
'; $return .= '
'; $return .= ''; @@ -1044,9 +1047,6 @@ class RecruitmentCandidature extends CommonObject $return .= ''; $return .= '
'; $return .= ''.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(1) : $this->ref).''; - if (in_array($this->id, $arrayofselected)) { - $selected = 1; - } $return .= ''; if (property_exists($this, 'fk_recruitmentjobposition')) { $return .= '
'.$langs->trans('Job').' : '.$this->fk_recruitmentjobposition.''; diff --git a/htdocs/recruitment/class/recruitmentjobposition.class.php b/htdocs/recruitment/class/recruitmentjobposition.class.php index b0ca58d6b8f..d44294ac9bd 100644 --- a/htdocs/recruitment/class/recruitmentjobposition.class.php +++ b/htdocs/recruitment/class/recruitmentjobposition.class.php @@ -1116,7 +1116,10 @@ class RecruitmentJobPosition extends CommonObject */ public function getKanbanView($option = '', $arraydata = null) { - global $langs, $selected,$arrayofselected,$obj; + global $langs, $obj; + + $selected = (empty($arraydata['selected']) ? 0 : $arraydata['selected']); + $return = '
'; $return .= '
'; $return .= ''; @@ -1124,9 +1127,6 @@ class RecruitmentJobPosition extends CommonObject $return .= ''; $return .= '
'; $return .= ''.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(1) : $this->ref).''; - if (in_array($this->id, $arrayofselected)) { - $selected = 1; - } $return .= ''; if (property_exists($this, 'date_planned')) { $return .= '
'.$langs->trans("Date").' : '.dol_print_date($this->db->jdate($this->date_planned), 'day').''; diff --git a/htdocs/salaries/class/paymentsalary.class.php b/htdocs/salaries/class/paymentsalary.class.php index 0f141bc3023..4294dd47478 100644 --- a/htdocs/salaries/class/paymentsalary.class.php +++ b/htdocs/salaries/class/paymentsalary.class.php @@ -772,7 +772,10 @@ class PaymentSalary extends CommonObject */ public function getKanbanView($option = '', $arraydata = null) { - global $langs, $db; + global $langs; + + $selected = (empty($arraydata['selected']) ? 0 : $arraydata['selected']); + $return = '
'; $return .= '
'; $return .= ''; @@ -780,6 +783,7 @@ class PaymentSalary extends CommonObject $return .= ''; $return .= '
'; $return .= ''.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(1) : $this->ref).''; + $return .= ''; if (property_exists($this, 'fk_bank')) { $return .= ' | '.$this->fk_bank.''; } diff --git a/htdocs/salaries/class/salary.class.php b/htdocs/salaries/class/salary.class.php index 7192a14e9d3..d45e2bf00d5 100644 --- a/htdocs/salaries/class/salary.class.php +++ b/htdocs/salaries/class/salary.class.php @@ -753,6 +753,9 @@ class Salary extends CommonObject public function getKanbanView($option = '', $arraydata = null) { global $langs; + + $selected = (empty($arraydata['selected']) ? 0 : $arraydata['selected']); + $return = '
'; $return .= '
'; $return .= ''; @@ -760,6 +763,7 @@ class Salary extends CommonObject $return .= ''; $return .= '
'; $return .= ''.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(1) : $this->ref).''; + $return .= ''; if (property_exists($this, 'fk_user')) { $return .= ' | '.$this->fk_user.''; } diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index 6ae3cad817a..1912bd74521 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -5212,6 +5212,7 @@ class Societe extends CommonObject */ public function getKanbanView($option = '', $arraydata = null) { + $selected = (empty($arraydata['selected']) ? 0 : $arraydata['selected']); $return = '
'; $return .= '
'; @@ -5220,6 +5221,7 @@ class Societe extends CommonObject $return .= ''; $return .= '
'; $return .= ''.(method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref).''; + $return .= ''; if (property_exists($this, 'code_client')) { $return .= '
'.$this->code_client.''; } diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php index fbcf04aacd2..aa82aaecb9c 100644 --- a/htdocs/supplier_proposal/class/supplier_proposal.class.php +++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php @@ -2771,6 +2771,9 @@ class SupplierProposal extends CommonObject public function getKanbanView($option = '', $arraydata = null) { global $langs; + + $selected = (empty($arraydata['selected']) ? 0 : $arraydata['selected']); + $return = '
'; $return .= '
'; $return .= ''; @@ -2779,6 +2782,7 @@ class SupplierProposal extends CommonObject $return .= ''; $return .= '
'; $return .= ''.(method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref).''; + $return .= ''; if (property_exists($this, 'socid')) { $return .= ' | '.$this->socid.''; } diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php index 889ab003b9d..7076b63d1d4 100644 --- a/htdocs/ticket/class/ticket.class.php +++ b/htdocs/ticket/class/ticket.class.php @@ -3010,7 +3010,10 @@ class Ticket extends CommonObject */ public function getKanbanView($option = '', $arraydata = null) { - global $langs, $selected,$arrayofselected; + global $langs; + + $selected = (empty($arraydata['selected']) ? 0 : $arraydata['selected']); + $return = '
'; $return .= '
'; $return .= ''; @@ -3018,9 +3021,6 @@ class Ticket extends CommonObject $return .= ''; $return .= '
'; $return .= ''.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(1) : $this->ref).''; - if (in_array($this->id, $arrayofselected)) { - $selected = 1; - } $return .= ''; if (!empty($arraydata['user_assignment'])) { $return .= '
'.$arraydata['user_assignment'].''; diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index 3fc11f9eadd..c4c0b4e2b92 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -3063,6 +3063,8 @@ class User extends CommonObject */ public function getKanbanView($option = '', $arraydata = null) { + $selected = (empty($arraydata['selected']) ? 0 : $arraydata['selected']); + $return = '
'; $return .= '
'; $return .= ''; @@ -3082,6 +3084,7 @@ class User extends CommonObject $return .= ''; $return .= '
'; $return .= ''.(method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref).''; + $return .= ''; if (property_exists($this, 'label')) { $return .= '
'.$this->label.''; } diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php index 60f92f0d40c..9bf322b49b6 100644 --- a/htdocs/user/class/usergroup.class.php +++ b/htdocs/user/class/usergroup.class.php @@ -980,6 +980,9 @@ class UserGroup extends CommonObject public function getKanbanView($option = '', $arraydata = null) { global $langs; + + $selected = (empty($arraydata['selected']) ? 0 : $arraydata['selected']); + $return = '
'; $return .= '
'; $return .= ''; @@ -987,6 +990,7 @@ class UserGroup extends CommonObject $return .= ''; $return .= '
'; $return .= ''.(method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref).''; + $return .= ''; if (property_exists($this, 'members')) { $return .= '
'.(empty($this->nb_users) ? 0 : $this->nb_users).' '.$langs->trans('Users').''; }