Skip to content
Snippets Groups Projects
Commit e2797ddd authored by Marcos García de La Fuente's avatar Marcos García de La Fuente
Browse files

Merge branch '3.6' into bug-3342 

# Conflicts:
#	ChangeLog
parents 2f921b64 804aec3c
Branches
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
ChangeLog
+ 1
− 0
View file @ e2797ddd
...@@ -41,6 +41,7 @@ English Dolibarr ChangeLog ...@@ -41,6 +41,7 @@ English Dolibarr ChangeLog
- Fix: [ bug #2696 ] Adding complementary attribute fails if code is numerics - Fix: [ bug #2696 ] Adding complementary attribute fails if code is numerics
- Fix: [ bug #3074 ] Accruals accounting use payment date instead of commitment date in turnover reports for salaries - Fix: [ bug #3074 ] Accruals accounting use payment date instead of commitment date in turnover reports for salaries
- Fix: Not showing product supplier reference when page break - Fix: Not showing product supplier reference when page break
- Fix: [ bug #3341 ] Missing translation in /compta/paiement_charge.php
- Fix: [ bug #3342 ] Taxes dictionary page does not accept localized decimals for localtax2 rate - Fix: [ bug #3342 ] Taxes dictionary page does not accept localized decimals for localtax2 rate
***** ChangeLog for 3.6.2 compared to 3.6.1 ***** ***** ChangeLog for 3.6.2 compared to 3.6.1 *****
......
htdocs/compta/paiement_charge.php
+ 1
− 1
View file @ e2797ddd
...@@ -178,7 +178,7 @@ if ($_GET["action"] == 'create') ...@@ -178,7 +178,7 @@ if ($_GET["action"] == 'create')
print '<table cellspacing="0" class="border" width="100%" cellpadding="2">'; print '<table cellspacing="0" class="border" width="100%" cellpadding="2">';
print "<tr class=\"liste_titre\"><td colspan=\"3\">Charge</td>"; print "<tr class=\"liste_titre\"><td colspan=\"3\">".$langs->trans('Charge')."</td>";
print '<tr><td>'.$langs->trans("Ref").'</td><td colspan="2"><a href="'.DOL_URL_ROOT.'/compta/sociales/charges.php?id='.$chid.'">'.$chid.'</a></td></tr>'; print '<tr><td>'.$langs->trans("Ref").'</td><td colspan="2"><a href="'.DOL_URL_ROOT.'/compta/sociales/charges.php?id='.$chid.'">'.$chid.'</a></td></tr>';
print '<tr><td>'.$langs->trans("Type")."</td><td colspan=\"2\">".$charge->type_libelle."</td></tr>\n"; print '<tr><td>'.$langs->trans("Type")."</td><td colspan=\"2\">".$charge->type_libelle."</td></tr>\n";
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment