diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php index 75905d044c0..5f7ac1ed05e 100644 --- a/htdocs/accountancy/customer/list.php +++ b/htdocs/accountancy/customer/list.php @@ -136,7 +136,7 @@ $arrayfields = array( 'f.ref' => array('label' => "Invoice", 'position' => 1, 'checked' => '1', 'enabled' => '1'), 'f.datef' => array('label' => "Date", 'position' => 1, 'checked' => '1', 'enabled' => '1'), // f.datef, f.ref, l.rowid 'p.ref' => array('label' => "ProductRef", 'position' => 1, 'checked' => '1', 'enabled' => '1'), - 'l.description' => array('label' => "ProductDescription", 'position' => 1, 'checked' => '1', 'enabled' => '1'), + 'l.description' => array('label' => "ProductDescription", 'position' => 1, 'checked' => '-1', 'enabled' => '1'), 'l.total_ht' => array('label' => "Amount", 'position' => 1, 'checked' => '1', 'enabled' => '1'), 'l.tva_tx' => array('label' => "VATRate", 'position' => 1, 'checked' => '1', 'enabled' => '1'), 's.nom' => array('label' => "ThirdParty", 'position' => 1, 'checked' => '1', 'enabled' => '1'), @@ -556,7 +556,7 @@ if ($result) { } // Date if (!empty($arrayfields['f.datef']['checked'])) { - print ''; + print ''; print '
'; print $form->selectDate($search_date_start ? $search_date_start : -1, 'search_date_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From')); print '
'; @@ -571,13 +571,13 @@ if ($result) { print ''; print ''; } - // description + // Description if (!empty($arrayfields['l.description']['checked'])) { print ''; print ''; print ''; } - // amount + // Amount if (!empty($arrayfields['l.total_ht']['checked'])) { print ''; print ''; @@ -598,7 +598,7 @@ if ($result) { // Country if (!empty($arrayfields['co.label']['checked'])) { print ''; - print $form->select_country($search_country, 'search_country', '', 0, 'maxwidth150', 'code2', 1, 0, 1); + print $form->select_country($search_country, 'search_country', '', 0, 'maxwidth125', 'code2', 1, 0, 1); print ''; } // TVA Intracom diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php index 1af56d2dd96..8b9e85993ec 100644 --- a/htdocs/accountancy/supplier/list.php +++ b/htdocs/accountancy/supplier/list.php @@ -131,10 +131,10 @@ if (!$user->hasRight('accounting', 'bind', 'write')) { $arrayfields = array( 'l.rowid' => array('label' => "LineId", 'position' => 1, 'checked' => '1', 'enabled' => '1'), 'f.ref' => array('label' => "Invoice", 'position' => 1, 'checked' => '1', 'enabled' => '1'), - 'f.libelle' => array('label' => "InvoiceLabel", 'position' => 1, 'checked' => '1', 'enabled' => '1'), + 'f.libelle' => array('label' => "InvoiceLabel", 'position' => 1, 'checked' => '-1', 'enabled' => '1'), 'f.datef' => array('label' => "Date", 'position' => 1, 'checked' => '1', 'enabled' => '1'), // f.datef, f.ref, l.rowid 'p.ref' => array('label' => "ProductRef", 'position' => 1, 'checked' => '1', 'enabled' => '1'), - 'l.description' => array('label' => "ProducDescription", 'position' => 1, 'checked' => '1', 'enabled' => '1'), + 'l.description' => array('label' => "ProductDescription", 'position' => 1, 'checked' => '-1', 'enabled' => '1'), 'l.total_ht' => array('label' => "Amount", 'position' => 1, 'checked' => '1', 'enabled' => '1'), 'l.tva_tx' => array('label' => "VATRate", 'position' => 1, 'checked' => '1', 'enabled' => '1'), 's.nom' => array('label' => "ThirdParty", 'position' => 1, 'checked' => '1', 'enabled' => '1'), @@ -151,6 +151,8 @@ if (empty($search_date_start) && getDolGlobalInt('ACCOUNTING_DATE_START_BINDING' $search_date_start = $db->idate(getDolGlobalInt('ACCOUNTING_DATE_START_BINDING')); } +$object = null; + /* * Actions @@ -564,12 +566,12 @@ if ($result) { print ''; } // Invoice label - if (!empty($arrayfields['f.ref']['checked'])) { + if (!empty($arrayfields['f.label']['checked'])) { print ''; } // Date if (!empty($arrayfields['f.datef']['checked'])) { - print ''; + print ''; print '
'; print $form->selectDate($search_date_start ? $search_date_start : -1, 'search_date_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From')); print '
'; @@ -584,13 +586,13 @@ if ($result) { print ''; print ''; } - // description + // Description if (!empty($arrayfields['l.description']['checked'])) { print ''; print ''; print ''; } - // amount + // Amount if (!empty($arrayfields['l.total_ht']['checked'])) { print ''; print ''; @@ -611,7 +613,7 @@ if ($result) { // Country if (!empty($arrayfields['co.label']['checked'])) { print ''; - print $form->select_country($search_country, 'search_country', '', 0, 'maxwidth150', 'code2', 1, 0, 1); + print $form->select_country($search_country, 'search_country', '', 0, 'maxwidth125', 'code2', 1, 0, 1); print ''; } // TVA Intracom