diff --git a/htdocs/accountancy/customer/index.html b/htdocs/accountancy/customer/index.html deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php index 49bda732640..782b151a5a4 100644 --- a/htdocs/accountancy/customer/index.php +++ b/htdocs/accountancy/customer/index.php @@ -212,8 +212,8 @@ $textnextyear = ' '.$langs->trans("DescVentilCustomer").'
'; -print $langs->trans("DescVentilMore", $langs->transnoentitiesnoconv("ValidateHistory"), $langs->transnoentitiesnoconv("ToBind")).'
'; +print ''.$langs->trans("DescVentilCustomer").'
'; +print ''.$langs->trans("DescVentilMore", $langs->transnoentitiesnoconv("ValidateHistory"), $langs->transnoentitiesnoconv("ToBind")).'
'; print '

'; diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php index 867c79099a6..66e0daa065a 100644 --- a/htdocs/accountancy/customer/list.php +++ b/htdocs/accountancy/customer/list.php @@ -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 ''; print ''; print ''; - print ''; + print ''; if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) { print ''; } diff --git a/htdocs/accountancy/expensereport/index.html b/htdocs/accountancy/expensereport/index.html deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/htdocs/accountancy/expensereport/index.php b/htdocs/accountancy/expensereport/index.php index 2f22344e8fb..387cfd0fb8e 100644 --- a/htdocs/accountancy/expensereport/index.php +++ b/htdocs/accountancy/expensereport/index.php @@ -138,8 +138,8 @@ $textnextyear = ' 
'.$langs->trans("DescVentilExpenseReport").'
'; -print $langs->trans("DescVentilExpenseReportMore", $langs->transnoentitiesnoconv("ValidateHistory"), $langs->transnoentitiesnoconv("ToBind")).'
'; +print ''.$langs->trans("DescVentilExpenseReport").'
'; +print ''.$langs->trans("DescVentilExpenseReportMore", $langs->transnoentitiesnoconv("ValidateHistory"), $langs->transnoentitiesnoconv("ToBind")).'
'; print '

'; diff --git a/htdocs/accountancy/expensereport/list.php b/htdocs/accountancy/expensereport/list.php index 29b58d76c78..93baeb78b2b 100644 --- a/htdocs/accountancy/expensereport/list.php +++ b/htdocs/accountancy/expensereport/list.php @@ -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 = '
'.$langs->trans("SelectedLines").': '.count($mesCasesCochees).'
'; $msg .= '
'; - $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']=''.$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 ''; print ''; print ''; - print ''; + print ''; if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print ''; print ''; $formother->select_year($search_year, 'search_year', 1, 20, 5); @@ -372,7 +366,7 @@ if ($result) { print ''; // Current account - print ''; + print ''; print length_accountg(html_entity_decode($objp->code_buy)); print ''; diff --git a/htdocs/accountancy/index.html b/htdocs/accountancy/index.html deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/htdocs/accountancy/supplier/index.html b/htdocs/accountancy/supplier/index.html deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/htdocs/accountancy/supplier/index.php b/htdocs/accountancy/supplier/index.php index 2955ddec881..1a0844436b6 100644 --- a/htdocs/accountancy/supplier/index.php +++ b/htdocs/accountancy/supplier/index.php @@ -210,8 +210,8 @@ $textnextyear = ' '.$langs->trans("DescVentilSupplier").'
'; -print $langs->trans("DescVentilMore", $langs->transnoentitiesnoconv("ValidateHistory"), $langs->transnoentitiesnoconv("ToBind")).'
'; +print ''.$langs->trans("DescVentilSupplier").'
'; +print ''.$langs->trans("DescVentilMore", $langs->transnoentitiesnoconv("ValidateHistory"), $langs->transnoentitiesnoconv("ToBind")).'
'; print '

'; $y = $year_current; diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php index bf27dcf650d..3ef3e25e031 100644 --- a/htdocs/accountancy/supplier/list.php +++ b/htdocs/accountancy/supplier/list.php @@ -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 ''; print ''; print ''; - print ''; + print ''; if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print ''; print ''; $formother->select_year($search_year, 'search_year', 1, 20, 5); diff --git a/htdocs/core/class/html.formaccounting.class.php b/htdocs/core/class/html.formaccounting.class.php index 461a6a12947..dc864b2440d 100644 --- a/htdocs/core/class/html.formaccounting.class.php +++ b/htdocs/core/class/html.formaccounting.class.php @@ -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 diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 1ec0bda3017..1e6e8d2fc41 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -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; diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang index a86c89aef09..8ef93053ce9 100644 --- a/htdocs/langs/en_US/accountancy.lang +++ b/htdocs/langs/en_US/accountancy.lang @@ -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 diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index a773c34d765..8c73a914f40 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -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; } diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 16498e9e736..bc00bd1c147 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -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; }