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

Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0

Browse Source
This commit is contained in:
Laurent Destailleur 2021-08-19 16:12:26 +02:00
commit 03d2d24244
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
htdocs/langs/nl_NL/main.lang
View File

@ -8,21 +8,21 @@ FONTFORPDF=helvetica
FONTSIZEFORPDF=10 FONTSIZEFORPDF=10
SeparatorDecimal=, SeparatorDecimal=,
SeparatorThousand=Space SeparatorThousand=Space
FormatDateShort=%m/%d/%Y FormatDateShort=%d-%m-%Y
FormatDateShortInput=%m/%d/%Y FormatDateShortInput=%d-%m-%Y
FormatDateShortJava=MM/dd/yyyy FormatDateShortJava=dd-MM-yyyy
FormatDateShortJavaInput=MM/dd/yyyy FormatDateShortJavaInput=dd-MM-yyyy
FormatDateShortJQuery=mm/dd/yy FormatDateShortJQuery=dd-mm-yy
FormatDateShortJQueryInput=mm/dd/yy FormatDateShortJQueryInput=dd-mm-yy
FormatHourShortJQuery=HH:MI FormatHourShortJQuery=HH:MI
FormatHourShort=%I:%M %p FormatHourShort=%I:%M %p
FormatHourShortDuration=%H:%M FormatHourShortDuration=%H:%M
FormatDateTextShort=%b %d, %Y FormatDateTextShort=%d %b, %Y
FormatDateText=%B %d, %Y FormatDateText=%d %B, %Y
FormatDateHourShort=%m/%d/%Y %I:%M %p FormatDateHourShort=%d-%m-%Y %I:%M %p
FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p FormatDateHourSecShort=%d-%m-%Y %I:%M:%S %p
FormatDateHourTextShort=%b %d, %Y, %I:%M %p FormatDateHourTextShort=%d %m, %Y, %I:%M %p
FormatDateHourText=%B %d, %Y, %I:%M %p FormatDateHourText=%d %B, %Y, %I:%M %p
DatabaseConnection=Databaseverbinding DatabaseConnection=Databaseverbinding
NoTemplateDefined=Geen sjabloon beschikbaar voor dit e-mailtype NoTemplateDefined=Geen sjabloon beschikbaar voor dit e-mailtype
AvailableVariables=Beschikbare substitutievariabelen AvailableVariables=Beschikbare substitutievariabelen

4
htdocs/product/traduction.php
View File

@ -231,9 +231,9 @@ $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $obj
if (empty($reshook)) { if (empty($reshook)) {
if ($action == '') { if ($action == '') {
if ($user->rights->produit->creer || $user->rights->service->creer) { if ($user->rights->produit->creer || $user->rights->service->creer) {
print '<a class="butAction" href="' . DOL_URL_ROOT . '/product/traduction.php?action=add&id=' . $object->id . '">' . $langs->trans("Add") . '</a>'; print '<a class="butAction" href="' . DOL_URL_ROOT . '/product/traduction.php?action=add&token='.newToken().'&id=' . $object->id . '">' . $langs->trans("Add") . '</a>';
if ($cnt_trans > 0) { if ($cnt_trans > 0) {
print '<a class="butAction" href="' . DOL_URL_ROOT . '/product/traduction.php?action=edit&id=' . $object->id . '">' . $langs->trans("Update") . '</a>'; print '<a class="butAction" href="' . DOL_URL_ROOT . '/product/traduction.php?action=edit&token='.newToken().'&id=' . $object->id . '">' . $langs->trans("Update") . '</a>';
} }
} }
} }