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

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

Browse Source 
Conflicts:
	htdocs/filefunc.inc.php
This commit is contained in:
Laurent Destailleur 2018-03-16 12:20:42 +01:00
commit 9997a6c787
3 changed files with 1614 additions and 1347 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2956
dev/initdemo/mysqldump_dolibarr_7.0.0.sql
View File

File diff suppressed because one or more lines are too long

3
htdocs/core/class/html.formmargin.class.php
View File

@ -212,7 +212,9 @@ class FormMargin
if (!empty($hidemargininfos)) print '<script>$(document).ready(function() {$(".margininfos").hide();});</script>'; if (!empty($hidemargininfos)) print '<script>$(document).ready(function() {$(".margininfos").hide();});</script>';
} }
print '<div class="div-table-responsive-no-min">';
print '<!-- Margin table -->'."\n"; print '<!-- Margin table -->'."\n";
print '<table class="noborder margintable centpercent">'; print '<table class="noborder margintable centpercent">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td class="liste_titre">'.$langs->trans('Margins').'</td>'; print '<td class="liste_titre">'.$langs->trans('Margins').'</td>';
@ -271,6 +273,7 @@ class FormMargin
print '</tr>'; print '</tr>';
} }
print '</table>'; print '</table>';
print '</div>';
} }
} }

2
htdocs/langs/fr_FR/main.lang
View File

@ -555,7 +555,7 @@ MonthShort11=Nov.
MonthShort12=Déc. MonthShort12=Déc.
MonthVeryShort01=J MonthVeryShort01=J
MonthVeryShort02=F MonthVeryShort02=F
MonthVeryShort03=L MonthVeryShort03=M
MonthVeryShort04=A MonthVeryShort04=A
MonthVeryShort05=M MonthVeryShort05=M
MonthVeryShort06=J MonthVeryShort06=J