From f417c85186a22661cd05264ad98f74aab98b9d81 Mon Sep 17 00:00:00 2001 From: ptibogxiv Date: Mon, 5 Aug 2019 20:49:41 +0200 Subject: [PATCH 1/2] NEW list by date_cloture on order list --- htdocs/commande/list.php | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php index f64aadf0e53..cbc5ffc04e7 100644 --- a/htdocs/commande/list.php +++ b/htdocs/commande/list.php @@ -143,6 +143,7 @@ $arrayfields=array( 'c.total_ttc'=>array('label'=>"AmountTTC", 'checked'=>0), 'c.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>500), 'c.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500), + 'c.date_cloture'=>array('label'=>"DateClosing", 'checked'=>0, 'position'=>500), 'c.fk_statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000), 'c.facture'=>array('label'=>"Billed", 'checked'=>1, 'position'=>1000, 'enabled'=>(empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) ); @@ -247,7 +248,7 @@ $sql.= " typent.code as typent_code,"; $sql.= " state.code_departement as state_code, state.nom as state_name,"; $sql.= ' c.rowid, c.ref, c.total_ht, c.tva as total_tva, c.total_ttc, c.ref_client,'; $sql.= ' c.date_valid, c.date_commande, c.note_private, c.date_livraison as date_delivery, c.fk_statut, c.facture as billed,'; -$sql.= ' c.date_creation as date_creation, c.tms as date_update,'; +$sql.= ' c.date_creation as date_creation, c.tms as date_update, c.date_cloture as date_cloture,'; $sql.= " p.rowid as project_id, p.ref as project_ref, p.title as project_label"; if ($search_categ_cus) $sql .= ", cc.fk_categorie, cc.fk_soc"; // Add fields from extrafields @@ -748,7 +749,8 @@ if ($resql) print $hookmanager->resPrint; if (! empty($arrayfields['c.datec']['checked'])) print_liste_field_titre($arrayfields['c.datec']['label'], $_SERVER["PHP_SELF"], "c.date_creation", "", $param, '', $sortfield, $sortorder, 'center nowrap '); if (! empty($arrayfields['c.tms']['checked'])) print_liste_field_titre($arrayfields['c.tms']['label'], $_SERVER["PHP_SELF"], "c.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap '); - if (! empty($arrayfields['c.fk_statut']['checked'])) print_liste_field_titre($arrayfields['c.fk_statut']['label'], $_SERVER["PHP_SELF"], "c.fk_statut", "", $param, '', $sortfield, $sortorder, 'right '); + if (! empty($arrayfields['c.date_cloture']['checked'])) print_liste_field_titre($arrayfields['c.date_cloture']['label'], $_SERVER["PHP_SELF"], "c.date_cloture", "", $param, '', $sortfield, $sortorder, 'center nowrap '); + if (! empty($arrayfields['c.fk_statut']['checked'])) print_liste_field_titre($arrayfields['c.fk_statut']['label'], $_SERVER["PHP_SELF"], "c.fk_statut", "", $param, '', $sortfield, $sortorder, 'right '); if (! empty($arrayfields['c.facture']['checked'])) print_liste_field_titre($arrayfields['c.facture']['label'], $_SERVER["PHP_SELF"], 'c.facture', '', $param, '', $sortfield, $sortorder, 'center '); print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'maxwidthsearch center '); print ''."\n"; @@ -1092,6 +1094,14 @@ if ($resql) print ''; if (! $i) $totalarray['nbfield']++; } + // Date cloture + if (! empty($arrayfields['c.date_cloture']['checked'])) + { + print ''; + print dol_print_date($db->jdate($obj->date_cloture), 'dayhour', 'tzuser'); + print ''; + if (! $i) $totalarray['nbfield']++; + } // Status if (! empty($arrayfields['c.fk_statut']['checked'])) { From 0cbb14462899e1632397e60eb4b24649e26aa355 Mon Sep 17 00:00:00 2001 From: ptibogxiv Date: Mon, 5 Aug 2019 20:52:27 +0200 Subject: [PATCH 2/2] Update list.php sometimes we need to get last update or closed order --- htdocs/commande/list.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php index cbc5ffc04e7..a25d863176e 100644 --- a/htdocs/commande/list.php +++ b/htdocs/commande/list.php @@ -694,6 +694,12 @@ if ($resql) print ''; print ''; } + // Date cloture + if (! empty($arrayfields['c.date_cloture']['checked'])) + { + print ''; + print ''; + } // Status if (! empty($arrayfields['c.fk_statut']['checked'])) {