lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Debug code

Browse Source
This commit is contained in:
Laurent Destailleur 2019-12-16 12:38:51 +01:00
parent 646587a9cf
commit fdf4d86d81
15 changed files with 39 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
htdocs/accountancy/customer/index.html
View File

4
htdocs/accountancy/customer/index.php
View File

@ -212,8 +212,8 @@ $textnextyear = '&nbsp;<a href="'.$_SERVER["PHP_SELF"].'?year='.($year_current +
print load_fiche_titre($langs->trans("CustomersVentilation")." ".$textprevyear." ".$langs->trans("Year")." ".$year_start." ".$textnextyear, '', 'title_accountancy');
print '<span class="opacitymedium">'.$langs->trans("DescVentilCustomer").'<br>';
print $langs->trans("DescVentilMore", $langs->transnoentitiesnoconv("ValidateHistory"), $langs->transnoentitiesnoconv("ToBind")).'<br>';
print '<span class="opacitymedium">'.$langs->trans("DescVentilCustomer").'</span><br>';
print '<span class="opacitymedium hideonsmartphone">'.$langs->trans("DescVentilMore", $langs->transnoentitiesnoconv("ValidateHistory"), $langs->transnoentitiesnoconv("ToBind")).'<br>';
print '</span><br>';

4
htdocs/accountancy/customer/list.php
View File

@ -37,7 +37,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
// Load translation files required by the page
$langs->loadLangs(array("bills", "compta", "accountancy", "other", "productbatch"));
$langs->loadLangs(array("bills", "companies", "compta", "accountancy", "other", "productbatch"));
$action = GETPOST('action', 'alpha');
$massaction = GETPOST('massaction', 'alpha');
@ -363,7 +363,7 @@ if ($result) {
print '<tr class="liste_titre_filter">';
print '<td class="liste_titre"><input type="text" class="flat maxwidth25" name="search_lineid" value="'.dol_escape_htmltag($search_lineid).'""></td>';
print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_invoice" value="'.dol_escape_htmltag($search_invoice).'"></td>';
print '<td class="liste_titre center nowraponall">';
print '<td class="liste_titre center nowraponall minwidth100imp">';
if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_day" value="'.$search_day.'">';
}

0
htdocs/accountancy/expensereport/index.html
View File

4
htdocs/accountancy/expensereport/index.php
View File

@ -138,8 +138,8 @@ $textnextyear = '&nbsp;<a href="'.$_SERVER["PHP_SELF"].'?year='.($year_current +
print load_fiche_titre($langs->trans("ExpenseReportsVentilation")."&nbsp;".$textprevyear."&nbsp;".$langs->trans("Year")."&nbsp;".$year_start."&nbsp;".$textnextyear, '', 'title_accountancy');
print '<span class="opacitymedium">'.$langs->trans("DescVentilExpenseReport").'<br>';
print $langs->trans("DescVentilExpenseReportMore", $langs->transnoentitiesnoconv("ValidateHistory"), $langs->transnoentitiesnoconv("ToBind")).'<br>';
print '<span class="opacitymedium">'.$langs->trans("DescVentilExpenseReport").'</span><br>';
print '<span class="opacitymedium hideonsmartphone">'.$langs->trans("DescVentilExpenseReportMore", $langs->transnoentitiesnoconv("ValidateHistory"), $langs->transnoentitiesnoconv("ToBind")).'<br>';
print '</span><br>';

16
htdocs/accountancy/expensereport/list.php
View File

@ -35,7 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
// Load translation files required by the page
$langs->loadLangs(array("bills", "compta", "accountancy", "other", "trips", "productbatch"));
$langs->loadLangs(array("bills", "companies", "compta", "accountancy", "other", "trips", "productbatch"));
$action = GETPOST('action', 'alpha');
$massaction = GETPOST('massaction', 'alpha');
@ -47,6 +47,7 @@ $toselect = GETPOST('toselect', 'array');
$mesCasesCochees = GETPOST('toselect', 'array');
// Search Getpost
$search_lineid = GETPOST('search_lineid', 'alpha');
$search_expensereport = GETPOST('search_expensereport', 'alpha');
$search_label = GETPOST('search_label', 'alpha');
$search_desc = GETPOST('search_desc', 'alpha');
@ -57,8 +58,6 @@ $search_day = GETPOST("search_day", "int");
$search_month = GETPOST("search_month", "int");
$search_year = GETPOST("search_year", "int");
$btn_ventil = GETPOST('ventil', 'alpha');
// Load variable for pagination
$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : (empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION) ? $conf->liste_limit : $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
$sortfield = GETPOST('sortfield', 'alpha');
@ -123,7 +122,6 @@ if ($massaction == 'ventil') {
if (!empty($mesCasesCochees)) {
$msg = '<div>'.$langs->trans("SelectedLines").': '.count($mesCasesCochees).'</div>';
$msg .= '<div class="detail">';
$mesCodesVentilChoisis = $codeventil;
$cpt = 0;
$ok = 0;
$ko = 0;
@ -255,12 +253,8 @@ if ($result) {
if ($search_vat) $param .= '&search_vat='.urlencode($search_vat);
$arrayofmassactions = array(
'ventil'=>$langs->trans("Ventilate")
//'presend'=>$langs->trans("SendByMail"),
//'builddoc'=>$langs->trans("PDFMerge"),
'ventil' => $langs->trans("Ventilate")
);
//if ($user->rights->mymodule->supprimer) $arrayofmassactions['predelete']='<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
//if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
$massactionbutton = $form->selectMassAction('ventil', $arrayofmassactions, 1);
@ -294,7 +288,7 @@ if ($result) {
print '<tr class="liste_titre_filter">';
print '<td class="liste_titre"></td>';
print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_expensereport" value="'.dol_escape_htmltag($search_expensereport).'"></td>';
print '<td class="liste_titre center">';
print '<td class="liste_titre center nowraponall minwidth100imp">';
if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_day" value="'.$search_day.'">';
print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_month" value="'.$search_month.'">';
$formother->select_year($search_year, 'search_year', 1, 20, 5);
@ -372,7 +366,7 @@ if ($result) {
print '</td>';
// Current account
print '<td>';
print '<td class="center">';
print length_accountg(html_entity_decode($objp->code_buy));
print '</td>';

0
htdocs/accountancy/index.html
View File

0
htdocs/accountancy/supplier/index.html
View File

4
htdocs/accountancy/supplier/index.php
View File

@ -210,8 +210,8 @@ $textnextyear = '&nbsp;<a href="'.$_SERVER["PHP_SELF"].'?year='.($year_current +
print load_fiche_titre($langs->trans("SuppliersVentilation")." ".$textprevyear."&nbsp;".$langs->trans("Year")."&nbsp;".$year_start."&nbsp;".$textnextyear, '', 'title_accountancy');
print '<span class="opacitymedium">'.$langs->trans("DescVentilSupplier").'<br>';
print $langs->trans("DescVentilMore", $langs->transnoentitiesnoconv("ValidateHistory"), $langs->transnoentitiesnoconv("ToBind")).'<br>';
print '<span class="opacitymedium">'.$langs->trans("DescVentilSupplier").'</span><br>';
print '<span class="opacitymedium hideonsmartphone">'.$langs->trans("DescVentilMore", $langs->transnoentitiesnoconv("ValidateHistory"), $langs->transnoentitiesnoconv("ToBind")).'<br>';
print '</span><br>';
$y = $year_current;

4
htdocs/accountancy/supplier/list.php
View File

@ -37,7 +37,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
// Load translation files required by the page
$langs->loadLangs(array("bills", "compta", "accountancy", "other", "productbatch"));
$langs->loadLangs(array("bills", "companies", "compta", "accountancy", "other", "productbatch"));
$action = GETPOST('action', 'alpha');
$massaction = GETPOST('massaction', 'alpha');
@ -362,7 +362,7 @@ if ($result) {
print '<td class="liste_titre"><input type="text" class="flat maxwidth25" name="search_lineid" value="'.dol_escape_htmltag($search_lineid).'""></td>';
print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_invoice" value="'.dol_escape_htmltag($search_invoice).'"></td>';
print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_label" value="'.dol_escape_htmltag($search_label).'"></td>';
print '<td class="liste_titre center nowraponall">';
print '<td class="liste_titre center nowraponall minwidth100imp">';
if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_day" value="'.$search_day.'">';
print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_month" value="'.$search_month.'">';
$formother->select_year($search_year, 'search_year', 1, 20, 5);

2
htdocs/core/class/html.formaccounting.class.php
View File

@ -285,7 +285,7 @@ class FormAccounting extends Form
if ($usecache && ! empty($this->options_cache[$usecache]))
{
$options = array_merge($options, $this->options_cache[$usecache]);
$options = $options + $this->options_cache[$usecache]; // We use + instead of array_merge because we don't want to reindex key from 0
$selected=$selectid;
}
else

2
htdocs/core/lib/functions.lib.php
View File

@ -4237,7 +4237,7 @@ function print_barre_liste($titre, $page, $file, $options = '', $sortfield = '',
if ($totalnboflines) // If we know total nb of lines
{
// Define nb of extra page links before and after selected page + ... + first or last
$maxnbofpage = (empty($conf->dol_optimize_smallscreen) ? 4 : 1);
$maxnbofpage = (empty($conf->dol_optimize_smallscreen) ? 4 : 0);
if ($limit > 0) $nbpages = ceil($totalnboflines / $limit);
else $nbpages = 1;

2
htdocs/langs/en_US/accountancy.lang
View File

@ -240,7 +240,7 @@ DescVentilDoneCustomer=Consult here the list of the lines of invoices customers
DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
Vide=-
DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account
DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account (only record not already transfered in accountancy are visible)
DescVentilDoneSupplier=Consult here the list of the lines of vendor invoices and their accounting account
DescVentilTodoExpenseReport=Bind expense report lines not already bound with a fee accounting account
DescVentilExpenseReport=Consult here the list of expense report lines bound (or not) to a fee accounting account

18
htdocs/theme/eldy/global.inc.php
View File

@ -841,6 +841,7 @@ table[summary="list_of_modules"] .fa-cog {
.minwidth75imp { min-width: 75px !important; }
.minwidth100imp { min-width: 100px !important; }
.minwidth200imp { min-width: 200px !important; }
.minwidth250imp { min-width: 250px !important; }
.minwidth300imp { min-width: 300px !important; }
.minwidth400imp { min-width: 400px !important; }
.minwidth500imp { min-width: 500px !important; }
@ -892,6 +893,7 @@ table[summary="list_of_modules"] .fa-cog {
.minwidth100imp { min-width: 100px !important; }
.minwidth150imp { min-width: 150px !important; }
.minwidth200imp { min-width: 200px !important; }
.minwidth250imp { min-width: 250px !important; }
.minwidth300imp { min-width: 300px !important; }
.minwidth400imp { min-width: 300px !important; }
.minwidth500imp { min-width: 300px !important; }
@ -906,10 +908,11 @@ table[summary="list_of_modules"] .fa-cog {
{
.maxwidthonsmartphone { max-width: 100px; }
.minwidth50imp { min-width: 50px !important; }
.minwidth75imp { min-width: 70px !important; }
.minwidth100imp { min-width: 80px !important; }
.minwidth150imp { min-width: 100px !important; }
.minwidth75imp { min-width: 75px !important; }
.minwidth100imp { min-width: 100px !important; }
.minwidth150imp { min-width: 110px !important; }
.minwidth200imp { min-width: 110px !important; }
.minwidth250imp { min-width: 115px !important; }
.minwidth300imp { min-width: 120px !important; }
.minwidth400imp { min-width: 150px !important; }
.minwidth500imp { min-width: 250px !important; }
@ -994,10 +997,11 @@ table[summary="list_of_modules"] .fa-cog {
.maxwidth300onsmartphone { max-width: 300px; }
.maxwidth400onsmartphone { max-width: 400px; }
.minwidth50imp { min-width: 50px !important; }
.minwidth75imp { min-width: 60px !important; }
.minwidth100imp { min-width: 80px !important; }
.minwidth150imp { min-width: 90px !important; }
.minwidth200imp { min-width: 100px !important; }
.minwidth75imp { min-width: 75px !important; }
.minwidth100imp { min-width: 100px !important; }
.minwidth150imp { min-width: 110px !important; }
.minwidth200imp { min-width: 110px !important; }
.minwidth250imp { min-width: 115px !important; }
.minwidth300imp { min-width: 120px !important; }
.minwidth400imp { min-width: 150px !important; }
.minwidth500imp { min-width: 250px !important; }

17
htdocs/theme/md/style.css.php
View File

@ -1057,6 +1057,7 @@ table[summary="list_of_modules"] .fa-cog {
.minwidth75imp { min-width: 75px !important; }
.minwidth100imp { min-width: 100px !important; }
.minwidth200imp { min-width: 200px !important; }
.minwidth250imp { min-width: 250px !important; }
.minwidth300imp { min-width: 300px !important; }
.minwidth400imp { min-width: 400px !important; }
.minwidth500imp { min-width: 500px !important; }
@ -1108,11 +1109,11 @@ table[summary="list_of_modules"] .fa-cog {
.minwidth100imp { min-width: 100px !important; }
.minwidth150imp { min-width: 150px !important; }
.minwidth200imp { min-width: 200px !important; }
.minwidth250imp { min-width: 250px !important; }
.minwidth300imp { min-width: 300px !important; }
.minwidth400imp { min-width: 300px !important; }
.minwidth500imp { min-width: 300px !important; }
.linkedcol-element {
min-width: unset;
}
@ -1124,9 +1125,10 @@ table[summary="list_of_modules"] .fa-cog {
.maxwidthonsmartphone { max-width: 100px; }
.minwidth50imp { min-width: 50px !important; }
.minwidth75imp { min-width: 70px !important; }
.minwidth100imp { min-width: 80px !important; }
.minwidth150imp { min-width: 100px !important; }
.minwidth100imp { min-width: 100px !important; }
.minwidth150imp { min-width: 110px !important; }
.minwidth200imp { min-width: 110px !important; }
.minwidth250imp { min-width: 115px !important; }
.minwidth300imp { min-width: 120px !important; }
.minwidth400imp { min-width: 150px !important; }
.minwidth500imp { min-width: 250px !important; }
@ -1203,10 +1205,11 @@ table[summary="list_of_modules"] .fa-cog {
.maxwidth300onsmartphone { max-width: 300px; }
.maxwidth400onsmartphone { max-width: 400px; }
.minwidth50imp { min-width: 50px !important; }
.minwidth75imp { min-width: 60px !important; }
.minwidth100imp { min-width: 80px !important; }
.minwidth150imp { min-width: 90px !important; }
.minwidth200imp { min-width: 100px !important; }
.minwidth75imp { min-width: 75px !important; }
.minwidth100imp { min-width: 100px !important; }
.minwidth150imp { min-width: 110px !important; }
.minwidth200imp { min-width: 110px !important; }
.minwidth250imp { min-width: 115px !important; }
.minwidth300imp { min-width: 120px !important; }
.minwidth400imp { min-width: 150px !important; }
.minwidth500imp { min-width: 250px !important; }