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

Application patch Roland Mas

Browse Source
This commit is contained in:
Rodolphe Quiedeville 2003-10-29 12:39:13 +00:00
parent 274845f6a2
commit 44e91d96dd
2 changed files with 36 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
htdocs/includes/modules/facture/pdf_tourteau.modules.php
View File

@ -152,6 +152,25 @@ Class pdf_tourteau {
$pdf->SetXY (174, $tab2_top + 16); $pdf->SetXY (174, $tab2_top + 16);
$pdf->MultiCell(26, 8, price($fac->total_ttc), 1, 'R', 1); $pdf->MultiCell(26, 8, price($fac->total_ttc), 1, 'R', 1);
$deja_regle = $fac->getSommePaiement();
if ($deja_regle > 0)
{
$pdf->Rect(132, $tab2_top+$tab2_height, 68, 16);
$pdf->SetXY (132, $tab2_top + 24);
$pdf->MultiCell(42, 8, "Déjà réglé", 0, 'R', 0);
$pdf->SetXY (132, $tab2_top + 32);
$pdf->MultiCell(42, 8, "Reste à payer", 1, 'R', 1);
$pdf->SetXY (174, $tab2_top + 24);
$pdf->MultiCell(26, 8, price($deja_regle), 0, 'R', 0);
$pdf->SetXY (174, $tab2_top + 32);
$pdf->MultiCell(26, 8, price($fac->total_ttc - $deja_regle), 1, 'R', 1);
}
/* /*
* *
*/ */
@ -269,24 +288,24 @@ Class pdf_tourteau {
{ {
$pdf->SetTextColor(0,0,200); $pdf->SetTextColor(0,0,200);
$pdf->SetFont('Arial','B',14); $pdf->SetFont('Arial','B',14);
$pdf->MultiCell(60, 8, FAC_PDF_INTITULE, 0, 'L'); $pdf->MultiCell(76, 8, FAC_PDF_INTITULE, 0, 'L');
} }
$pdf->SetTextColor(70,70,170); $pdf->SetTextColor(70,70,170);
if (defined("FAC_PDF_ADRESSE")) if (defined("FAC_PDF_ADRESSE"))
{ {
$pdf->SetFont('Arial','',12); $pdf->SetFont('Arial','',12);
$pdf->MultiCell(40, 5, FAC_PDF_ADRESSE); $pdf->MultiCell(76, 5, FAC_PDF_ADRESSE);
} }
if (defined("FAC_PDF_TEL")) if (defined("FAC_PDF_TEL"))
{ {
$pdf->SetFont('Arial','',10); $pdf->SetFont('Arial','',10);
$pdf->MultiCell(40, 5, "Tél : ".FAC_PDF_TEL); $pdf->MultiCell(76, 5, "Tél : ".FAC_PDF_TEL);
} }
if (defined("FAC_PDF_SIREN")) if (defined("FAC_PDF_SIREN"))
{ {
$pdf->SetFont('Arial','',10); $pdf->SetFont('Arial','',10);
$pdf->MultiCell(40, 5, "SIREN : ".FAC_PDF_SIREN); $pdf->MultiCell(76, 5, "SIREN : ".FAC_PDF_SIREN);
} }
if (defined("FAC_PDF_INTITULE2")) if (defined("FAC_PDF_INTITULE2"))
@ -303,10 +322,10 @@ Class pdf_tourteau {
$pdf->SetFont('Arial','B',12); $pdf->SetFont('Arial','B',12);
$fac->fetch_client(); $fac->fetch_client();
$pdf->SetXY(102,42); $pdf->SetXY(102,42);
$pdf->MultiCell(66,5, $fac->client->nom); $pdf->MultiCell(96,5, $fac->client->nom);
$pdf->SetFont('Arial','B',11); $pdf->SetFont('Arial','B',11);
$pdf->SetXY(102,47); $pdf->SetXY(102,47);
$pdf->MultiCell(66,5, $fac->client->adresse . "\n" . $fac->client->cp . " " . $fac->client->ville); $pdf->MultiCell(96,5, $fac->client->adresse . "\n" . $fac->client->cp . " " . $fac->client->ville);
$pdf->rect(100, 40, 100, 40); $pdf->rect(100, 40, 100, 40);

13
htdocs/main.inc.php
View File

@ -409,8 +409,17 @@ function top_menu($head, $title="")
print '<td width="15%" class="menu" align="center">'.strftime(" %d %B - %H:%M",time()).'</TD>'; print '<td width="15%" class="menu" align="center">'.strftime(" %d %B - %H:%M",time()).'</TD>';
print '<td width="10%" class="menu" align="center"><a href="'.DOL_URL_ROOT.'/user/logout.php" title="logout">'.$user->login.'</a></td>'; print '<td width="10%" class="menu" align="center">' ;
print '</tr>';
if (empty ($GLOBALS["REMOTE_USER"]))
{
print '<a href="'.DOL_URL_ROOT.'/user/logout.php" title="logout">'.$user->login.'</a>' ;
}
else
{
print $user->login ;
}
print '</td></tr>';
// print '</table>'; // print '</table>';
/* /*