Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0
This commit is contained in:
commit
b085145cc5
7 changed files with 9 additions and 7 deletions
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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(
|
||||
|
|
|
|||
|
|
@ -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(
|
||||
|
|
|
|||
|
|
@ -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 = '<button id="' . $prefix . 'Button" type="button" class="dpInvisibleButtons">' . img_object($langs->trans("Disabled"), 'calendarday', 'class="datecallink"') . '</button>';
|
||||
$retstring = $retstringbutton . $retstring;
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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; }
|
||||
|
|
|
|||
|
|
@ -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; }
|
||||
|
|
|
|||
Loading…
Reference in a new issue