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

Update sql image file for 7.0 stable

Browse Source
This commit is contained in:
Laurent Destailleur 2018-03-16 11:19:58 +01:00
parent fe94562a56
commit 96ff5b1b23
2 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

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

@ -96,7 +96,7 @@ class FormMargin
$pv = $line->qty * $line->subprice * (1 - $line->remise_percent / 100); $pv = $line->qty * $line->subprice * (1 - $line->remise_percent / 100);
$pa_ht = ($pv < 0 ? - $line->pa_ht : $line->pa_ht); // We choosed to have line->pa_ht always positive in database, so we guess the correct sign $pa_ht = ($pv < 0 ? - $line->pa_ht : $line->pa_ht); // We choosed to have line->pa_ht always positive in database, so we guess the correct sign
$pa = $line->qty * $pa_ht; $pa = $line->qty * $pa_ht;
// calcul des marges // calcul des marges
if (isset($line->fk_remise_except) && isset($conf->global->MARGIN_METHODE_FOR_DISCOUNT)) { // remise if (isset($line->fk_remise_except) && isset($conf->global->MARGIN_METHODE_FOR_DISCOUNT)) { // remise
if ($conf->global->MARGIN_METHODE_FOR_DISCOUNT == '1') { // remise globale considérée comme produit if ($conf->global->MARGIN_METHODE_FOR_DISCOUNT == '1') { // remise globale considérée comme produit
@ -214,7 +214,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>';
@ -273,6 +275,7 @@ class FormMargin
print '</tr>'; print '</tr>';
} }
print '</table>'; print '</table>';
print '</div>';
} }
} }