diff --git a/htdocs/compta/tva/card.php b/htdocs/compta/tva/card.php index dcf5d5b3248..99710575723 100644 --- a/htdocs/compta/tva/card.php +++ b/htdocs/compta/tva/card.php @@ -112,7 +112,6 @@ $resteapayer = 0; * Actions */ - $parameters = array('socid' => $socid); $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks if ($reshook < 0) { @@ -857,6 +856,7 @@ if ($id > 0) { $urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id; $genallowed = 0; $delallowed = $user->hasRight('tax', 'charges', 'creer'); // If you can create/edit, you can remove a file on card + print $formfile->showdocuments('tax-vat', $objref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $langs->defaultlang); } diff --git a/htdocs/core/boxes/box_factures_fourn_imp.php b/htdocs/core/boxes/box_factures_fourn_imp.php index cd5a8c98eae..c57dc8f1148 100644 --- a/htdocs/core/boxes/box_factures_fourn_imp.php +++ b/htdocs/core/boxes/box_factures_fourn_imp.php @@ -229,7 +229,7 @@ class box_factures_fourn_imp extends ModeleBoxes 'text' => " ", ); $this->info_box_contents[$line][] = array( - 'td' => 'class="right liste_total" ', + 'td' => 'class="nowraponall right liste_total"', 'text' => price($totalamount, 0, $langs, 0, -1, -1, $conf->currency), ); $this->info_box_contents[$line][] = array( diff --git a/htdocs/core/boxes/box_factures_imp.php b/htdocs/core/boxes/box_factures_imp.php index a4f91c30985..c59f62a80d9 100644 --- a/htdocs/core/boxes/box_factures_imp.php +++ b/htdocs/core/boxes/box_factures_imp.php @@ -235,7 +235,7 @@ class box_factures_imp extends ModeleBoxes // Add the sum à the bottom of the boxes $this->info_box_contents[$line][] = array( - 'tr' => 'class="liste_total_wrap"', + 'tr' => 'class="liste_total"', 'td' => 'class="liste_total"', 'text' => $langs->trans("Total"), ); @@ -244,7 +244,7 @@ class box_factures_imp extends ModeleBoxes 'text' => " ", ); $this->info_box_contents[$line][] = array( - 'td' => 'class="right liste_total" ', + 'td' => 'class="nowraponall right liste_total" ', 'text' => price($totalamount, 0, $langs, 0, -1, -1, $conf->currency), ); $this->info_box_contents[$line][] = array( diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 08a27e4861b..cb19a6e2df1 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -7384,7 +7384,7 @@ class Form $retstring .= ' onChange="dpChangeDay(\'' . dol_escape_js($prefix) . '\',\'' . dol_escape_js($langs->trans("FormatDateShortJavaInput")) . '\'); "'; // FormatDateShortInput for dol_print_date / FormatDateShortJavaInput that is same for javascript $retstring .= ' autocomplete="off">'; - // Icone calendrier + // Icon calendar if ($disabled) { $retstringbutton = ''; $retstring = $retstringbutton . $retstring; diff --git a/htdocs/ecm/class/ecmfiles.class.php b/htdocs/ecm/class/ecmfiles.class.php index 0bd44eceb31..91cf29374b4 100644 --- a/htdocs/ecm/class/ecmfiles.class.php +++ b/htdocs/ecm/class/ecmfiles.class.php @@ -1012,6 +1012,8 @@ class EcmFiles extends CommonObject $tmppath = preg_replace('/^(\d+\/)?fournisseur\/facture\//', '', $this->filepath); } elseif ($option == 'commande_fournisseur') { $tmppath = preg_replace('/^(\d+\/)?fournisseur\/commande\//', '', $this->filepath); + } elseif ($option == 'tax-vat') { // Remove part "tax/vat/" + $tmppath = preg_replace('/^(\d+\/)?tax\/vat\//', '', $this->filepath); } else { if ((int) $this->entity > 1) { // Remove the part "entityid/commande/" into "entityid/commande/REFXXX" to get only the ref diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index 6f10003a874..5318c2ea9ab 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -1989,7 +1989,7 @@ maxscreenheightless200 { .maxwidth40 { max-width: 40px; } .maxwidth50 { max-width: 50px; } .maxwidth75 { max-width: 75px; } -.maxwidthdate { max-width: 85px; } +.maxwidthdate { max-width: 95px; } .maxwidth100 { max-width: 100px; } .maxwidth125 { max-width: 125px; } .maxwidth150 { max-width: 150px; } diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index cb3bbfdee00..af6996962a4 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -2135,7 +2135,7 @@ tr.nobottom td { .maxwidth40 { max-width: 40px; } .maxwidth50 { max-width: 50px; } .maxwidth75 { max-width: 75px; } -.maxwidthdate { max-width: 85px; } +.maxwidthdate { max-width: 95px; } .maxwidth100 { max-width: 100px; } .maxwidth125 { max-width: 125px; } .maxwidth150 { max-width: 150px; }