Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Debug v21

Browse Source
This commit is contained in:
Laurent Destailleur 2024-10-26 21:09:09 +02:00
parent e25800c042
commit c41274dbd1
11 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/accountancy/admin/categories_list.php
View File

@ -635,7 +635,7 @@ if ($resql) {
}
// Title line with search boxes
print '<tr class="liste_titre liste_titre_add liste_titre_filter">';
print '<tr class="liste_titre liste_titre_filter">';
// Action column
if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
@ -954,7 +954,7 @@ $db->close();
*/
function fieldListAccountingCategories($fieldlist, $obj = null, $tabname = '', $context = '')
{
global $conf, $langs, $db;
global $db;
global $form, $mysoc;
$formadmin = new FormAdmin($db);

5
htdocs/accountancy/admin/closure.php
View File

@ -121,6 +121,11 @@ print '<input type="hidden" name="action" value="update">';
// Define main accounts for closure
print '<table class="noborder centpercent">';
print '<tr class="liste_titre">';
print '<th>'.$langs->trans("Parameter").'</th>';
print '<th>';
print '</th></tr>';
foreach ($list_account_main as $key) {
print '<tr class="oddeven value">';
// Param

2
htdocs/accountancy/admin/fiscalyear.php
View File

@ -130,7 +130,7 @@ if ($result) {
print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'calendar', 0, $newcardbutton, '', $limit, 1);
print '<div class="div-table-responsive">';
print '<table class="tagtable liste centpercent">';
print '<table class="tagtable liste centpercent noborder">';
print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Ref").'</td>';
print '<td>'.$langs->trans("Label").'</td>';

2
htdocs/accountancy/bookkeeping/listbyaccount.php
View File

@ -858,7 +858,7 @@ print $moreforfilter;
print '</div>';
print '<div class="div-table-responsive">';
print '<table class="tagtable liste centpercent">';
print '<table class="tagtable liste centpercent listwithfilterbefore">';
// Filters lines
print '<tr class="liste_titre_filter">';

5
htdocs/admin/dict.php
View File

@ -658,6 +658,7 @@ foreach ($tabcomplete as $key => $value) {
continue;
}
$tabcomplete[$key]['id'] = $i;
// TODO Comment this lines when data is stored into the tabcomplete array
$tabcomplete[$key]['cond'] = $tabcond[$i];
$tabcomplete[$key]['rowid'] = $tabrowid[$i];
@ -1825,13 +1826,13 @@ if ($id > 0) {
}
print '<div class="div-table-responsive">';
print '<table class="noborder centpercent">';
print '<table class="noborder centpercent noborder">';
$colspan = 0;
// Title line with search input fields
print '<!-- line title to search record -->'."\n";
print '<tr class="liste_titre_filter">';
print '<tr class="liste_titre liste_titre_filter">';
// Action button
if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {

2
htdocs/asset/list.php
View File

@ -457,7 +457,7 @@ $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfi
$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
print '<table class="tagtable nobottomiftotal noborder liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
// Fields title search

2
htdocs/asset/model/list.php
View File

@ -461,7 +461,7 @@ $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfi
$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
print '<table class="tagtable nobottomiftotal noborder liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
// Fields title search

23
htdocs/compta/bank/various_payment/list.php
View File

@ -164,7 +164,7 @@ $arrayfields = array(
'datep' => array('label' => "DatePayment", 'checked' => 1, 'position' => 120),
'datev' => array('label' => "DateValue", 'checked' => -1, 'position' => 130),
'type' => array('label' => "PaymentMode", 'checked' => 1, 'position' => 140),
'project' => array('label' => "Project", 'checked' => 1, 'position' => 200, "enabled" => isModEnabled('project')),
'project' => array('label' => "Project", 'checked' => -1, 'position' => 200, "enabled" => isModEnabled('project')),
'bank' => array('label' => "BankAccount", 'checked' => 1, 'position' => 300, "enabled" => isModEnabled("bank")),
'entry' => array('label' => "BankTransactionLine", 'checked' => 1, 'position' => 310, "enabled" => isModEnabled("bank")),
'account' => array('label' => "AccountAccountingShort", 'checked' => 1, 'position' => 400, "enabled" => isModEnabled('accounting')),
@ -306,8 +306,12 @@ if ($search_bank_entry > 0) {
if ($search_accountancy_account > 0) {
$sql .= " AND v.accountancy_code = ".((int) $search_accountancy_account);
}
if ($search_accountancy_subledger > 0) {
$sql .= " AND v.subledger_account = ".((int) $search_accountancy_subledger);
if (getDolGlobalString('ACCOUNTANCY_COMBO_FOR_AUX')) {
$sql .= " AND v.subledger_account = '".$db->escape($search_accountancy_subledger)."'";
} else {
if ($search_accountancy_subledger != '' && $search_accountancy_subledger != '-1') {
$sql .= natural_search("v.subledger_account", $search_accountancy_subledger);
}
}
if ($search_type_id > 0) {
$sql .= " AND v.fk_typepayment=".((int) $search_type_id);
@ -315,6 +319,7 @@ if ($search_type_id > 0) {
if ($search_all) {
$sql .= natural_search(array_keys($fieldstosearchall), $search_all);
}
//$sql.= dolSqlDateFilter("t.field", $search_xxxday, $search_xxxmonth, $search_xxxyear);
// Add where from extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
@ -475,11 +480,11 @@ $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('che
print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
print '<table class="tagtable nobottomiftotal noborder liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
// Fields title search
// --------------------------------------------------------------------
print '<tr class="liste_titre_filter">';
print '<tr class="liste_titre liste_titre_filter">';
// Action column
if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
print '<td class="liste_titre center maxwidthsearch">';
@ -572,7 +577,13 @@ if (!empty($arrayfields['account']['checked'])) {
if (!empty($arrayfields['subledger']['checked'])) {
print '<td class="liste_titre">';
print '<div class="nowrap">';
print $formaccounting->select_auxaccount($search_accountancy_subledger, 'search_accountancy_subledger', 1, 'maxwidth200');
if (getDolGlobalString('ACCOUNTANCY_COMBO_FOR_AUX')) {
print $formaccounting->select_auxaccount($search_accountancy_subledger, 'search_accountancy_subledger', 1, 'maxwidth150');
} else {
print '<input type="text" class="maxwidth150 maxwidthonsmartphone" name="search_accountancy_subledger" value="'.$search_accountancy_subledger.'">';
}
print '</div>';
print '</td>';
}

2
htdocs/compta/cashcontrol/cashcontrol_list.php
View File

@ -446,7 +446,7 @@ $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfi
$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
print '<table class="tagtable nobottomiftotal noborder liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
// Fields title search

1
htdocs/langs/en_US/categories.lang
View File

@ -17,6 +17,7 @@ ContactsCategoriesArea=Contact tags/categories area
AccountsCategoriesArea=Bank account tags/categories area
ProjectsCategoriesArea=Project tags/categories area
UsersCategoriesArea=User tags/categories area
Bank_linesCategoriesArea==Bank lines tags/categories area
SubCats=Sub-categories
CatList=List of tags/categories
CatListAll=List of tags/categories (all types)

2
htdocs/stripe/payout.php
View File

@ -106,7 +106,7 @@ if (!$rowid) {
print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'title_accountancy.png', 0, '', '', $limit);
print '<div class="div-table-responsive">';
print '<table class="tagtable liste'.(!empty($moreforfilter) ? " listwithfilterbefore" : "").'">'."\n";
print '<table class="tagtable noborder liste'.(!empty($moreforfilter) ? " listwithfilterbefore" : "").'">'."\n";
print '<tr class="liste_titre">';
print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);