diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php index 1363d9bd953..22afe05725f 100644 --- a/htdocs/commande/list.php +++ b/htdocs/commande/list.php @@ -1075,7 +1075,7 @@ if ($resql) { exit; } - llxHeader('', $title, $help_url); + llxHeader('', $title, $help_url); $param = ''; @@ -1361,7 +1361,7 @@ if ($resql) { $moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$form->selectarray('search_product_category', $cate_arbo, $search_product_category, $tmptitle, 0, 0, '', 0, 0, 0, 0, 'maxwidth300 widthcentpercentminusx', 1); $moreforfilter .= ''; } - // If Categories are enabled & user has rights to see + // If Categories are enabled & user has rights to see if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire) { require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; $moreforfilter .= '
'; @@ -1533,9 +1533,8 @@ if ($resql) { print ''; print ''; } - // Total Amount (TTC / gross) + // Total Amount (TTC / gross) if (!empty($arrayfields['c.total_ttc']['checked'])) { - print ''; print ''; print ''; @@ -1554,7 +1553,6 @@ if ($resql) { } // Amount HT/net in foreign currency if (!empty($arrayfields['c.multicurrency_total_ht']['checked'])) { - print ''; print ''; print ''; @@ -1597,15 +1595,15 @@ if ($resql) { print ''; print ''; } - + // Extra fields include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php'; - + // 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; - + // Date creation if (!empty($arrayfields['c.datec']['checked'])) { print ''; @@ -1793,10 +1791,10 @@ if ($resql) { ), 'pos' => array(), ); - + // Extra fields include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php'; - + // Hook fields $parameters = array( 'arrayfields' => $arrayfields, @@ -1996,7 +1994,7 @@ if ($resql) { $totalarray['nbfield']++; } } - + // Alias name if (!empty($arrayfields['s.name_alias']['checked'])) { print ''; @@ -2006,7 +2004,7 @@ if ($resql) { $totalarray['nbfield']++; } } - + // Town if (!empty($arrayfields['s.town']['checked'])) { print ''; @@ -2016,7 +2014,7 @@ if ($resql) { $totalarray['nbfield']++; } } - + // Zip if (!empty($arrayfields['s.zip']['checked'])) { print ''; @@ -2026,7 +2024,7 @@ if ($resql) { $totalarray['nbfield']++; } } - + // State if (!empty($arrayfields['state.nom']['checked'])) { print "".$obj->state_name."\n"; @@ -2034,7 +2032,7 @@ if ($resql) { $totalarray['nbfield']++; } } - + // Country if (!empty($arrayfields['country.code_iso']['checked'])) { print ''; @@ -2045,7 +2043,7 @@ if ($resql) { $totalarray['nbfield']++; } } - + // Type ent if (!empty($arrayfields['typent.code']['checked'])) { print ''; @@ -2072,7 +2070,7 @@ if ($resql) { $totalarray['nbfield']++; } } - + // Plannned date of delivery if (!empty($arrayfields['c.date_delivery']['checked'])) { print ''; @@ -2082,7 +2080,7 @@ if ($resql) { $totalarray['nbfield']++; } } - + // Shipping Method if (!empty($arrayfields['c.fk_shipping_method']['checked'])) { print ''; @@ -2092,7 +2090,7 @@ if ($resql) { $totalarray['nbfield']++; } } - + // Payment terms if (!empty($arrayfields['c.fk_cond_reglement']['checked'])) { print ''; @@ -2102,7 +2100,7 @@ if ($resql) { $totalarray['nbfield']++; } } - + // Payment mode if (!empty($arrayfields['c.fk_mode_reglement']['checked'])) { print ''; @@ -2112,7 +2110,7 @@ if ($resql) { $totalarray['nbfield']++; } } - + // Channel if (!empty($arrayfields['c.fk_input_reason']['checked'])) { print ''; @@ -2122,7 +2120,7 @@ if ($resql) { $totalarray['nbfield']++; } } - + // Amount HT/net if (!empty($arrayfields['c.total_ht']['checked'])) { print ''.price($obj->total_ht)."\n"; @@ -2138,7 +2136,7 @@ if ($resql) { $totalarray['val']['c.total_ht'] = $obj->total_ht; } } - + // Amount VAT if (!empty($arrayfields['c.total_vat']['checked'])) { print ''.price($obj->total_tva)."\n"; @@ -2150,7 +2148,7 @@ if ($resql) { } $totalarray['val']['c.total_tva'] += $obj->total_tva; } - + // Amount TTC / gross if (!empty($arrayfields['c.total_ttc']['checked'])) { print ''.price($obj->total_ttc)."\n"; @@ -2180,7 +2178,7 @@ if ($resql) { $totalarray['nbfield']++; } } - + // Amount HT/net in foreign currency if (!empty($arrayfields['c.multicurrency_total_ht']['checked'])) { print ''.price($obj->multicurrency_total_ht)."\n"; @@ -2285,7 +2283,7 @@ if ($resql) { $totalarray['nbfield']++; } } - + // Total margin if (!empty($arrayfields['total_margin']['checked'])) { print ''.price($marginInfo['total_margin']).''; @@ -2297,7 +2295,7 @@ if ($resql) { } $totalarray['val']['total_margin'] += $marginInfo['total_margin']; } - + // Total margin rate if (!empty($arrayfields['total_margin_rate']['checked'])) { print ''.(($marginInfo['total_margin_rate'] == '') ? '' : price($marginInfo['total_margin_rate'], null, null, null, null, 2).'%').''; @@ -2305,7 +2303,7 @@ if ($resql) { $totalarray['nbfield']++; } } - + // Total mark rate if (!empty($arrayfields['total_mark_rate']['checked'])) { print ''.(($marginInfo['total_mark_rate'] == '') ? '' : price($marginInfo['total_mark_rate'], null, null, null, null, 2).'%').''; @@ -2494,7 +2492,7 @@ if ($resql) { $totalarray['nbfield']++; } } - + // Import key if (!empty($arrayfields['c.import_key']['checked'])) { print ''.$obj->import_key.''; @@ -2502,7 +2500,7 @@ if ($resql) { $totalarray['nbfield']++; } } - + // Status if (!empty($arrayfields['c.fk_statut']['checked'])) { print ''.$generic_commande->LibStatut($obj->fk_statut, $obj->billed, 5, 1).'';