Skip to content

Commit

Permalink
Merge pull request #11552 from aspangaro/10.0_FEC
Browse files Browse the repository at this point in the history 
Presentation nowrap on amount
  • Loading branch information
@eldy
eldy committed Jul 25, 2019
2 parents 1d7885b + 323d2df commit 2dc2af7
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 31 deletions.
38 changes: 19 additions & 19 deletions htdocs/compta/index.php
View file
Expand Up @@ -410,8 +410,8 @@
print '<td class="left">';
print $thirdpartystatic->getNomUrl(1, 'customer', 44);
print '</td>';
if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<td class="right">'.price($obj->total_ht).'</td>';
print '<td class="right">'.price($obj->total_ttc).'</td>';
if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<td class="nowrap right">'.price($obj->total_ht).'</td>';
print '<td class="nowrap right">'.price($obj->total_ttc).'</td>';
print '<td class="right">'.dol_print_date($db->jdate($obj->tms), 'day').'</td>';
print '<td>'.$facstatic->LibStatut($obj->paye, $obj->fk_statut, 3, $obj->am).'</td>';
print '</tr>';
Expand Down Expand Up @@ -510,7 +510,7 @@
print $thirdpartystatic->getNomUrl(1, 'supplier', 44);
print '</td>';
if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<td class="right">'.price($obj->total_ht).'</td>';
print '<td class="right">'.price($obj->total_ttc).'</td>';
print '<td class="nowrap right">'.price($obj->total_ttc).'</td>';
print '<td class="right">'.dol_print_date($db->jdate($obj->tms), 'day').'</td>';
print '<td>'.$facstatic->LibStatut($obj->paye, $obj->fk_statut, 3).'</td>';
print '</tr>';
Expand Down Expand Up @@ -591,7 +591,7 @@
print '<tr class="oddeven">';
print '<td>'.$donationstatic->getNomUrl(1).'</td>';
print '<td>'.$label.'</td>';
print '<td class="right">'.price($objp->amount).'</td>';
print '<td class="nowrap right">'.price($objp->amount).'</td>';
print '<td class="right">'.dol_print_date($db->jdate($objp->dm), 'day').'</td>';
print '<td>'.$donationstatic->LibStatut($objp->fk_statut, 3).'</td>';
print '</tr>';
Expand Down Expand Up @@ -662,16 +662,16 @@
print '<tr class="oddeven">';
print '<td>'.$chargestatic->getNomUrl(1).'</td>';
print '<td align="center">'.dol_print_date($db->jdate($obj->date_ech), 'day').'</td>';
print '<td class="right">'.price($obj->amount).'</td>';
print '<td class="right">'.price($obj->sumpaid).'</td>';
print '<td class="nowrap right">'.price($obj->amount).'</td>';
print '<td class="nowrap right">'.price($obj->sumpaid).'</td>';
print '<td align="center">'.$chargestatic->getLibStatut(3).'</td>';
print '</tr>';
$tot_ttc+=$obj->amount;
$i++;
}

print '<tr class="liste_total"><td class="left" colspan="2">'.$langs->trans("Total").'</td>';
print '<td class="right">'.price($tot_ttc).'</td>';
print '<td class="nowrap right">'.price($tot_ttc).'</td>';
print '<td class="right"></td>';
print '<td class="right">&nbsp;</td>';
print '</tr>';
Expand Down Expand Up @@ -784,8 +784,8 @@
print $societestatic->getNomUrl(1, 'customer', 44);
print '</td>';
if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<td class="right">'.price($obj->total_ht).'</td>';
print '<td class="right">'.price($obj->total_ttc).'</td>';
print '<td class="right">'.price($obj->total_ttc-$obj->tot_fttc).'</td>';
print '<td class="nowrap right">'.price($obj->total_ttc).'</td>';
print '<td class="nowrap right">'.price($obj->total_ttc-$obj->tot_fttc).'</td>';
print '<td>'.$commandestatic->LibStatut($obj->fk_statut, $obj->facture, 3).'</td>';
print '</tr>';
$tot_ht += $obj->total_ht;
Expand All @@ -797,8 +797,8 @@

print '<tr class="liste_total"><td colspan="2">'.$langs->trans("Total").' &nbsp; <font style="font-weight: normal">('.$langs->trans("RemainderToBill").': '.price($tot_tobill).')</font> </td>';
if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<td class="right">'.price($tot_ht).'</td>';
print '<td class="right">'.price($tot_ttc).'</td>';
print '<td class="right">'.price($tot_tobill).'</td>';
print '<td class="nowrap right">'.price($tot_ttc).'</td>';
print '<td class="nowrap right">'.price($tot_tobill).'</td>';
print '<td>&nbsp;</td>';
print '</tr>';
print '</table></div><br>';
Expand Down Expand Up @@ -909,8 +909,8 @@
print '</td>';
print '<td class="right">'.dol_print_date($db->jdate($obj->datelimite), 'day').'</td>';
if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<td class="right">'.price($obj->total_ht).'</td>';
print '<td class="right">'.price($obj->total_ttc).'</td>';
print '<td class="right">'.price($obj->am).'</td>';
print '<td class="nowrap right">'.price($obj->total_ttc).'</td>';
print '<td class="nowrap right">'.price($obj->am).'</td>';
print '<td>'.$facstatic->LibStatut($obj->paye, $obj->fk_statut, 3, $obj->am).'</td>';
print '</tr>';

Expand All @@ -924,8 +924,8 @@
print '<tr class="liste_total"><td colspan="2">'.$langs->trans("Total").' &nbsp; <font style="font-weight: normal">('.$langs->trans("RemainderToTake").': '.price($total_ttc-$totalam).')</font> </td>';
print '<td>&nbsp;</td>';
if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<td class="right">'.price($total).'</td>';
print '<td class="right">'.price($total_ttc).'</td>';
print '<td class="right">'.price($totalam).'</td>';
print '<td class="nowrap right">'.price($total_ttc).'</td>';
print '<td class="nowrap right">'.price($totalam).'</td>';
print '<td>&nbsp;</td>';
print '</tr>';
}
Expand Down Expand Up @@ -1021,8 +1021,8 @@
print '<td>'.$societestatic->getNomUrl(1, 'supplier', 44).'</td>';
print '<td class="right">'.dol_print_date($db->jdate($obj->date_lim_reglement), 'day').'</td>';
if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<td class="right">'.price($obj->total_ht).'</td>';
print '<td class="right">'.price($obj->total_ttc).'</td>';
print '<td class="right">'.price($obj->am).'</td>';
print '<td class="nowrap right">'.price($obj->total_ttc).'</td>';
print '<td class="nowrap right">'.price($obj->am).'</td>';
print '<td>'.$facstatic->LibStatut($obj->paye, $obj->fk_statut, 3).'</td>';
print '</tr>';
$total += $obj->total_ht;
Expand All @@ -1034,8 +1034,8 @@
print '<tr class="liste_total"><td colspan="2">'.$langs->trans("Total").' &nbsp; <font style="font-weight: normal">('.$langs->trans("RemainderToPay").': '.price($total_ttc-$totalam).')</font> </td>';
print '<td>&nbsp;</td>';
if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<td class="right">'.price($total).'</td>';
print '<td class="right">'.price($total_ttc).'</td>';
print '<td class="right">'.price($totalam).'</td>';
print '<td class="nowrap right">'.price($total_ttc).'</td>';
print '<td class="nowrap right">'.price($totalam).'</td>';
print '<td>&nbsp;</td>';
print '</tr>';
}
Expand Down
25 changes: 13 additions & 12 deletions htdocs/product/index.php
View file
Expand Up @@ -357,7 +357,7 @@
$objp->price = $price_result;
}
}
print '<td class="right">';
print '<td class="nowrap right">';
if (isset($objp->price_base_type) && $objp->price_base_type == 'TTC') print price($objp->price_ttc).' '.$langs->trans("TTC");
else print price($objp->price).' '.$langs->trans("HT");
print '</td>';
Expand Down Expand Up @@ -442,6 +442,7 @@ function activitytrim($product_type)

if ($num > 0 )
{
print '<div class="div-table-responsive-no-min">';
print '<table class="noborder" width="75%">';

if ($product_type==0)
Expand All @@ -465,11 +466,11 @@ function activitytrim($product_type)
if ($trim1+$trim2+$trim3+$trim4 > 0)
{
print '<tr class="oddeven"><td class=left>'.$tmpyear.'</td>';
print '<td class=right>'.price($trim1).'</td>';
print '<td class=right>'.price($trim2).'</td>';
print '<td class=right>'.price($trim3).'</td>';
print '<td class=right>'.price($trim4).'</td>';
print '<td class=right>'.price($trim1+$trim2+$trim3+$trim4).'</td>';
print '<td class="nowrap right">'.price($trim1).'</td>';
print '<td class="nowrap right">'.price($trim2).'</td>';
print '<td class="nowrap right">'.price($trim3).'</td>';
print '<td class="nowrap right">'.price($trim4).'</td>';
print '<td class="nowrap right">'.price($trim1+$trim2+$trim3+$trim4).'</td>';
print '</tr>';
$lgn++;
}
Expand Down Expand Up @@ -498,14 +499,14 @@ function activitytrim($product_type)
if ($trim1+$trim2+$trim3+$trim4 > 0)
{
print '<tr class="oddeven"><td class=left>'.$tmpyear.'</td>';
print '<td class=right>'.price($trim1).'</td>';
print '<td class=right>'.price($trim2).'</td>';
print '<td class=right>'.price($trim3).'</td>';
print '<td class=right>'.price($trim4).'</td>';
print '<td class=right>'.price($trim1+$trim2+$trim3+$trim4).'</td>';
print '<td class="nowrap right">'.price($trim1).'</td>';
print '<td class="nowrap right">'.price($trim2).'</td>';
print '<td class="nowrap right">'.price($trim3).'</td>';
print '<td class="nowrap right">'.price($trim4).'</td>';
print '<td class="nowrap right">'.price($trim1+$trim2+$trim3+$trim4).'</td>';
print '</tr>';
}
if ($num > 0 )
print '</table>';
print '</table></div>';
}
}

0 comments on commit 2dc2af7

Please sign in to comment.