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

FIX #11506

Browse Source
This commit is contained in:
Laurent Destailleur 2019-07-15 22:59:18 +02:00
parent e396824133
commit 6c23154a91
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
htdocs/accountancy/admin/journals_list.php
View File

@ -162,7 +162,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
{ {
if ($fieldnamekey == 'libelle' || ($fieldnamekey == 'label')) $fieldnamekey='Label'; if ($fieldnamekey == 'libelle' || ($fieldnamekey == 'label')) $fieldnamekey='Label';
if ($fieldnamekey == 'code') $fieldnamekey = 'Code'; if ($fieldnamekey == 'code') $fieldnamekey = 'Code';
if ($fieldnamekey == 'nature') $fieldnamekey = 'Nature'; if ($fieldnamekey == 'nature') $fieldnamekey = 'NatureOfJournal';
} }
// Other checks // Other checks
if (isset($_POST["code"])) if (isset($_POST["code"]))
@ -437,7 +437,7 @@ if ($id)
$valuetoshow=$langs->trans("Label"); $valuetoshow=$langs->trans("Label");
} }
if ($fieldlist[$field]=='nature') { if ($fieldlist[$field]=='nature') {
$valuetoshow=$langs->trans("Nature"); $valuetoshow=$langs->trans("NatureOfJournal");
} }
if ($valuetoshow != '') { if ($valuetoshow != '') {
@ -516,7 +516,7 @@ if ($id)
} }
// Title line with search boxes // Title line with search boxes
print '<tr class="liste_titre_filter liste_titre_add">'; /*print '<tr class="liste_titre_filter liste_titre_add">';
print '<td class="liste_titre"></td>'; print '<td class="liste_titre"></td>';
print '<td class="liste_titre"></td>'; print '<td class="liste_titre"></td>';
print '<td class="liste_titre"></td>'; print '<td class="liste_titre"></td>';
@ -524,16 +524,14 @@ if ($id)
print '<td class="liste_titre"></td>'; print '<td class="liste_titre"></td>';
print '<td class="liste_titre"></td>'; print '<td class="liste_titre"></td>';
print '<td class="liste_titre center">'; print '<td class="liste_titre center">';
if ($filterfound) $searchpicto=$form->showFilterButtons();
{
$searchpicto=$form->showFilterAndCheckAddButtons(0);
print $searchpicto; print $searchpicto;
}
print '</td>'; print '</td>';
print '</tr>'; print '</tr>';
*/
// Title of lines // Title of lines
print '<tr class="liste_titre">'; print '<tr class="liste_titre liste_titre_add">';
foreach ($fieldlist as $field => $value) foreach ($fieldlist as $field => $value)
{ {
// Determine le nom du champ par rapport aux noms possibles // Determine le nom du champ par rapport aux noms possibles
@ -558,7 +556,7 @@ if ($id)
$valuetoshow=$langs->trans("Label"); $valuetoshow=$langs->trans("Label");
} }
if ($fieldlist[$field]=='nature') { if ($fieldlist[$field]=='nature') {
$valuetoshow=$langs->trans("Nature"); $valuetoshow=$langs->trans("NatureOfJournal");
} }
// Affiche nom du champ // Affiche nom du champ

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

@ -265,7 +265,7 @@ AccountingJournals=Accounting journals
AccountingJournal=Accounting journal AccountingJournal=Accounting journal
NewAccountingJournal=New accounting journal NewAccountingJournal=New accounting journal
ShowAccoutingJournal=Show accounting journal ShowAccoutingJournal=Show accounting journal
Nature=Nature NatureOfJournal=Nature of Journal
AccountingJournalType1=Miscellaneous operations AccountingJournalType1=Miscellaneous operations
AccountingJournalType2=Sales AccountingJournalType2=Sales
AccountingJournalType3=Purchases AccountingJournalType3=Purchases