Debug v20
This commit is contained in:
parent
1ee9e83265
commit
eee2df38d4
2 changed files with 14 additions and 12 deletions
|
|
@ -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 '<td class="liste_titre center nowraponall">';
|
||||
print '<td class="liste_titre center">';
|
||||
print '<div class="nowrapfordate">';
|
||||
print $form->selectDate($search_date_start ? $search_date_start : -1, 'search_date_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
|
||||
print '</div>';
|
||||
|
|
@ -571,13 +571,13 @@ if ($result) {
|
|||
print '<input type="text" class="flat maxwidth50" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
|
||||
print '</td>';
|
||||
}
|
||||
// description
|
||||
// Description
|
||||
if (!empty($arrayfields['l.description']['checked'])) {
|
||||
print '<td class="liste_titre" data-key="desc">';
|
||||
print '<input type="text" class="flat maxwidth50" name="search_desc" value="'.dol_escape_htmltag($search_desc).'">';
|
||||
print '</td>';
|
||||
}
|
||||
// amount
|
||||
// Amount
|
||||
if (!empty($arrayfields['l.total_ht']['checked'])) {
|
||||
print '<td class="liste_titre" data-key="amount">';
|
||||
print '<input type="text" class="right flat maxwidth50" name="search_amount" value="'.dol_escape_htmltag($search_amount).'">';
|
||||
|
|
@ -598,7 +598,7 @@ if ($result) {
|
|||
// Country
|
||||
if (!empty($arrayfields['co.label']['checked'])) {
|
||||
print '<td class="liste_titre" data-key="country">';
|
||||
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 '</td>';
|
||||
}
|
||||
// TVA Intracom
|
||||
|
|
|
|||
|
|
@ -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 '</td>';
|
||||
}
|
||||
// Invoice label
|
||||
if (!empty($arrayfields['f.ref']['checked'])) {
|
||||
if (!empty($arrayfields['f.label']['checked'])) {
|
||||
print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_label" value="'.dol_escape_htmltag($search_label).'"></td>';
|
||||
}
|
||||
// Date
|
||||
if (!empty($arrayfields['f.datef']['checked'])) {
|
||||
print '<td class="liste_titre center nowraponall">';
|
||||
print '<td class="liste_titre center">';
|
||||
print '<div class="nowrapfordate">';
|
||||
print $form->selectDate($search_date_start ? $search_date_start : -1, 'search_date_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
|
||||
print '</div>';
|
||||
|
|
@ -584,13 +586,13 @@ if ($result) {
|
|||
print '<input type="text" class="flat maxwidth50" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
|
||||
print '</td>';
|
||||
}
|
||||
// description
|
||||
// Description
|
||||
if (!empty($arrayfields['l.description']['checked'])) {
|
||||
print '<td class="liste_titre" data-key="desc">';
|
||||
print '<input type="text" class="flat maxwidth50" name="search_desc" value="'.dol_escape_htmltag($search_desc).'">';
|
||||
print '</td>';
|
||||
}
|
||||
// amount
|
||||
// Amount
|
||||
if (!empty($arrayfields['l.total_ht']['checked'])) {
|
||||
print '<td class="liste_titre" data-key="amount">';
|
||||
print '<input type="text" class="right flat maxwidth50" name="search_amount" value="'.dol_escape_htmltag($search_amount).'">';
|
||||
|
|
@ -611,7 +613,7 @@ if ($result) {
|
|||
// Country
|
||||
if (!empty($arrayfields['co.label']['checked'])) {
|
||||
print '<td class="liste_titre" data-key="country">';
|
||||
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 '</td>';
|
||||
}
|
||||
// TVA Intracom
|
||||
|
|
|
|||
Loading…
Reference in a new issue