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

Fix: Regression suite a modif sur modele propal azur

Browse Source
This commit is contained in:
Laurent Destailleur 2005-08-21 16:33:38 +00:00
parent 4c3e511fcc
commit a93a901969
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/comm/propal.php
View File

@ -361,7 +361,7 @@ llxHeader();
* Affichage fiche propal en mode visu * Affichage fiche propal en mode visu
* *
*/ */
if ($_GET['propalid']) if ($_GET['propalid'] > 0)
{ {
if ($msg) print "$msg<br>"; if ($msg) print "$msg<br>";
$html = new Form($db); $html = new Form($db);

7
htdocs/includes/modules/facture/pdf_crabe.modules.php
View File

@ -73,6 +73,8 @@ class pdf_crabe extends ModelePDFFactures
} }
$this->db->free($result); $this->db->free($result);
$this->tva=array();
// Defini position des colonnes // Defini position des colonnes
$this->posxdesc=11; $this->posxdesc=11;
$this->posxtva=121; $this->posxtva=121;
@ -543,7 +545,6 @@ class pdf_crabe extends ModelePDFFactures
$index++; $index++;
$pdf->SetXY ($col1x, $tab2_top + $tab2_hl * $index); $pdf->SetXY ($col1x, $tab2_top + $tab2_hl * $index);
$pdf->SetTextColor(0,0,60); $pdf->SetTextColor(0,0,60);
// $pdf->SetFont('Arial','B', 9);
$pdf->SetFillColor(224,224,224); $pdf->SetFillColor(224,224,224);
$pdf->MultiCell($col2x-$col1x, $tab2_hl, $langs->trans("TotalTTC"), $useborder, 'L', 1); $pdf->MultiCell($col2x-$col1x, $tab2_hl, $langs->trans("TotalTTC"), $useborder, 'L', 1);
@ -778,11 +779,11 @@ class pdf_crabe extends ModelePDFFactures
$ligne=""; $ligne="";
if ($conf->global->MAIN_INFO_SOCIETE_FORME_JURIDIQUE) if ($conf->global->MAIN_INFO_SOCIETE_FORME_JURIDIQUE)
{ {
$ligne=($ligne?" - ":"").$html->forme_juridique_name($conf->global->MAIN_INFO_SOCIETE_FORME_JURIDIQUE); $ligne=.($ligne?" - ":"").$html->forme_juridique_name($conf->global->MAIN_INFO_SOCIETE_FORME_JURIDIQUE);
} }
if ($conf->global->MAIN_INFO_CAPITAL) if ($conf->global->MAIN_INFO_CAPITAL)
{ {
$ligne=($ligne?" - ":"")."Capital de " . MAIN_INFO_CAPITAL." ".$langs->trans("Currency".$conf->monnaie); $ligne=.($ligne?" - ":"")."Capital de " . MAIN_INFO_CAPITAL." ".$langs->trans("Currency".$conf->monnaie);
} }
if ($conf->global->MAIN_INFO_SIREN) if ($conf->global->MAIN_INFO_SIREN)
{ {