diff --git a/htdocs/compta/bank/fiche.php b/htdocs/compta/bank/fiche.php index 35c9b4001da..f477db47a92 100644 --- a/htdocs/compta/bank/fiche.php +++ b/htdocs/compta/bank/fiche.php @@ -148,7 +148,7 @@ $form = new Form($db); /* ************************************************************************** */ /* */ -/* Affichage page en mode cr�ation */ +/* Affichage page en mode creation */ /* */ /* ************************************************************************** */ diff --git a/htdocs/includes/modules/commande/pdf_einstein.modules.php b/htdocs/includes/modules/commande/pdf_einstein.modules.php index 75548f3e485..a27d9c55237 100644 --- a/htdocs/includes/modules/commande/pdf_einstein.modules.php +++ b/htdocs/includes/modules/commande/pdf_einstein.modules.php @@ -536,46 +536,12 @@ class pdf_einstein extends ModelePDFCommandes $account = new Account($this->db); $account->fetch($conf->global->FACTURE_RIB_NUMBER); - $this->marges['g']=$this->marge_gauche; + $curx=$this->marge_gauche; + $cury=$posy; - $cury=$posy; - $pdf->SetXY ($this->marges['g'], $cury); - $pdf->SetFont('Arial','B',8); - $pdf->MultiCell(90, 3, $outputlangs->transnoentities('PaymentByTransferOnThisBankAccount').':', 0, 'L', 0); - $cury+=4; - $pdf->SetFont('Arial','B',6); - $pdf->line($this->marges['g']+1, $cury, $this->marges['g']+1, $cury+10 ); - $pdf->SetXY ($this->marges['g'], $cury); - $pdf->MultiCell(18, 3, $outputlangs->transnoentities("BankCode"), 0, 'C', 0); - $pdf->line($this->marges['g']+18, $cury, $this->marges['g']+18, $cury+10 ); - $pdf->SetXY ($this->marges['g']+18, $cury); - $pdf->MultiCell(18, 3, $outputlangs->transnoentities("DeskCode"), 0, 'C', 0); - $pdf->line($this->marges['g']+36, $cury, $this->marges['g']+36, $cury+10 ); - $pdf->SetXY ($this->marges['g']+36, $cury); - $pdf->MultiCell(24, 3, $outputlangs->transnoentities("BankAccountNumber"), 0, 'C', 0); - $pdf->line($this->marges['g']+60, $cury, $this->marges['g']+60, $cury+10 ); - $pdf->SetXY ($this->marges['g']+60, $cury); - $pdf->MultiCell(13, 3, $outputlangs->transnoentities("BankAccountNumberKey"), 0, 'C', 0); - $pdf->line($this->marges['g']+73, $cury, $this->marges['g']+73, $cury+10 ); + $posy=pdf_bank($pdf,$outputlangs,$curx,$cury,$account); - $pdf->SetFont('Arial','',8); - $pdf->SetXY ($this->marges['g'], $cury+5); - $pdf->MultiCell(18, 3, $account->code_banque, 0, 'C', 0); - $pdf->SetXY ($this->marges['g']+18, $cury+5); - $pdf->MultiCell(18, 3, $account->code_guichet, 0, 'C', 0); - $pdf->SetXY ($this->marges['g']+36, $cury+5); - $pdf->MultiCell(24, 3, $account->number, 0, 'C', 0); - $pdf->SetXY ($this->marges['g']+60, $cury+5); - $pdf->MultiCell(13, 3, $account->cle_rib, 0, 'C', 0); - - $pdf->SetXY ($this->marges['g'], $cury+12); - $pdf->MultiCell(90, 3, $outputlangs->transnoentities("Residence").' : ' . $account->domiciliation, 0, 'L', 0); - $pdf->SetXY ($this->marges['g'], $cury+22); - $pdf->MultiCell(90, 3, $outputlangs->transnoentities("IbanPrefix").' : ' . $account->iban_prefix, 0, 'L', 0); - $pdf->SetXY ($this->marges['g'], $cury+25); - $pdf->MultiCell(90, 3, $outputlangs->transnoentities("BIC").' : ' . $account->bic, 0, 'L', 0); - - $posy=$pdf->GetY()+2; + $posy+=2; } } } diff --git a/htdocs/includes/modules/facture/pdf_crabe.modules.php b/htdocs/includes/modules/facture/pdf_crabe.modules.php index bca7030cc46..bcfd7fc0479 100644 --- a/htdocs/includes/modules/facture/pdf_crabe.modules.php +++ b/htdocs/includes/modules/facture/pdf_crabe.modules.php @@ -696,46 +696,12 @@ class pdf_crabe extends ModelePDFFactures $account = new Account($this->db); $account->fetch($conf->global->FACTURE_RIB_NUMBER); - $this->marges['g']=$this->marge_gauche; - + $curx=$this->marge_gauche; $cury=$posy; - $pdf->SetXY ($this->marges['g'], $cury); - $pdf->SetFont('Arial','B',8); - $pdf->MultiCell(90, 3, $outputlangs->transnoentities('PaymentByTransferOnThisBankAccount').':', 0, 'L', 0); - $cury+=4; - $pdf->SetFont('Arial','B',6); - $pdf->line($this->marges['g']+1, $cury, $this->marges['g']+1, $cury+10 ); - $pdf->SetXY ($this->marges['g'], $cury); - $pdf->MultiCell(18, 3, $outputlangs->transnoentities("BankCode"), 0, 'C', 0); - $pdf->line($this->marges['g']+18, $cury, $this->marges['g']+18, $cury+10 ); - $pdf->SetXY ($this->marges['g']+18, $cury); - $pdf->MultiCell(18, 3, $outputlangs->transnoentities("DeskCode"), 0, 'C', 0); - $pdf->line($this->marges['g']+36, $cury, $this->marges['g']+36, $cury+10 ); - $pdf->SetXY ($this->marges['g']+36, $cury); - $pdf->MultiCell(24, 3, $outputlangs->transnoentities("BankAccountNumber"), 0, 'C', 0); - $pdf->line($this->marges['g']+60, $cury, $this->marges['g']+60, $cury+10 ); - $pdf->SetXY ($this->marges['g']+60, $cury); - $pdf->MultiCell(13, 3, $outputlangs->transnoentities("BankAccountNumberKey"), 0, 'C', 0); - $pdf->line($this->marges['g']+73, $cury, $this->marges['g']+73, $cury+10 ); - - $pdf->SetFont('Arial','',8); - $pdf->SetXY ($this->marges['g'], $cury+5); - $pdf->MultiCell(18, 3, $outputlangs->convToOutputCharset($account->code_banque), 0, 'C', 0); - $pdf->SetXY ($this->marges['g']+18, $cury+5); - $pdf->MultiCell(18, 3, $outputlangs->convToOutputCharset($account->code_guichet), 0, 'C', 0); - $pdf->SetXY ($this->marges['g']+36, $cury+5); - $pdf->MultiCell(24, 3, $outputlangs->convToOutputCharset($account->number), 0, 'C', 0); - $pdf->SetXY ($this->marges['g']+60, $cury+5); - $pdf->MultiCell(13, 3, $outputlangs->convToOutputCharset($account->cle_rib), 0, 'C', 0); - - $pdf->SetXY ($this->marges['g'], $cury+12); - $pdf->MultiCell(90, 3, $outputlangs->transnoentities("Residence").' : ' . $outputlangs->convToOutputCharset($account->domiciliation), 0, 'L', 0); - $pdf->SetXY ($this->marges['g'], $cury+22); - $pdf->MultiCell(90, 3, $outputlangs->transnoentities("IbanPrefix").' : ' . $outputlangs->convToOutputCharset($account->iban_prefix), 0, 'L', 0); - $pdf->SetXY ($this->marges['g'], $cury+25); - $pdf->MultiCell(90, 3, $outputlangs->transnoentities("BIC").' : ' . $outputlangs->convToOutputCharset($account->bic), 0, 'L', 0); - - $posy=$pdf->GetY()+2; + + $posy=pdf_bank($pdf,$outputlangs,$curx,$cury,$account); + + $posy+=2; } } } diff --git a/htdocs/includes/modules/facture/pdf_huitre.modules.php b/htdocs/includes/modules/facture/pdf_huitre.modules.php index 6f81bffa072..97055910593 100644 --- a/htdocs/includes/modules/facture/pdf_huitre.modules.php +++ b/htdocs/includes/modules/facture/pdf_huitre.modules.php @@ -227,17 +227,10 @@ class pdf_huitre extends ModelePDFFactures $account = new Account($this->db); $account->fetch(FACTURE_RIB_NUMBER); - $pdf->SetXY (10, 40); - $pdf->SetFont('Arial','U',8); - $pdf->MultiCell(40, 4, $outputlangs->transnoentities("BankDetails"), 0, 'L', 0); - $pdf->SetFont('Arial','',8); - $pdf->MultiCell(40, 4, $outputlangs->transnoentities("BankCode").' : ' . $outputlangs->convToOutputCharset($account->code_banque), 0, 'L', 0); - $pdf->MultiCell(40, 4, $outputlangs->transnoentities("DeskCode").' : ' . $outputlangs->convToOutputCharset($account->code_guichet), 0, 'L', 0); - $pdf->MultiCell(50, 4, $outputlangs->transnoentities("BankAccountNumber").' : ' . $outputlangs->convToOutputCharset($account->number), 0, 'L', 0); - $pdf->MultiCell(40, 4, $outputlangs->transnoentities("BankAccountNumberKey").' : ' . $outputlangs->convToOutputCharset($account->cle_rib), 0, 'L', 0); - $pdf->MultiCell(40, 4, $outputlangs->transnoentities("Residence").' : ' . $outputlangs->convToOutputCharset($account->domiciliation), 0, 'L', 0); - $pdf->MultiCell(40, 4, $outputlangs->transnoentities("IbanPrefix").' : ' . $outputlangs->convToOutputCharset($account->iban_prefix), 0, 'L', 0); - $pdf->MultiCell(40, 4, $outputlangs->transnoentities("BIC").' : ' . $outputlangs->convToOutputCharset($account->bic), 0, 'L', 0); + $curx=10; + $cury=40; + + $posy=pdf_bank($pdf,$outputlangs,$curx,$cury,$account); } } diff --git a/htdocs/includes/modules/facture/pdf_oursin.modules.php b/htdocs/includes/modules/facture/pdf_oursin.modules.php index 8739d14a7e4..2cf09dc1b87 100644 --- a/htdocs/includes/modules/facture/pdf_oursin.modules.php +++ b/htdocs/includes/modules/facture/pdf_oursin.modules.php @@ -270,7 +270,7 @@ class pdf_oursin extends ModelePDFFactures $pdf->SetTextColor(0,0,0); } - // Propose mode r�glement par CHQ + // Propose mode reglement par CHQ if (defined("FACTURE_CHQ_NUMBER")) { if (FACTURE_CHQ_NUMBER > 0) @@ -287,7 +287,7 @@ class pdf_oursin extends ModelePDFFactures } } - // Propose mode r�glement par RIB + // Propose mode reglement par RIB if (defined("FACTURE_RIB_NUMBER")) { if (FACTURE_RIB_NUMBER > 0) @@ -296,45 +296,13 @@ class pdf_oursin extends ModelePDFFactures $account->fetch(FACTURE_RIB_NUMBER); $cury=240; - $pdf->SetXY ($this->marges['g'], $cury); - $pdf->SetFont('Arial','B',8); - $pdf->MultiCell(90, 3, $outputlangs->transnoentities('PaymentByTransferOnThisBankAccount').':', 0, 'L', 0); - $cury=245; - $pdf->SetFont('Arial','B',6); - $pdf->line($this->marges['g'], $cury, $this->marges['g'], $cury+10 ); - $pdf->SetXY ($this->marges['g'], $cury); - $pdf->MultiCell(18, 3, $outputlangs->transnoentities("BankCode"), 0, 'C', 0); - $pdf->line($this->marges['g']+18, $cury, $this->marges['g']+18, $cury+10 ); - $pdf->SetXY ($this->marges['g']+18, $cury); - $pdf->MultiCell(18, 3, $outputlangs->transnoentities("DeskCode"), 0, 'C', 0); - $pdf->line($this->marges['g']+36, $cury, $this->marges['g']+36, $cury+10 ); - $pdf->SetXY ($this->marges['g']+36, $cury); - $pdf->MultiCell(24, 3, $outputlangs->transnoentities("BankAccountNumber"), 0, 'C', 0); - $pdf->line($this->marges['g']+60, $cury, $this->marges['g']+60, $cury+10 ); - $pdf->SetXY ($this->marges['g']+60, $cury); - $pdf->MultiCell(13, 3, $outputlangs->transnoentities("BankAccountNumberKey"), 0, 'C', 0); - $pdf->line($this->marges['g']+73, $cury, $this->marges['g']+73, $cury+10 ); + $curx=$this->marges['g']; - $pdf->SetFont('Arial','',8); - $pdf->SetXY ($this->marges['g'], $cury+5); - $pdf->MultiCell(18, 3, $account->code_banque, 0, 'C', 0); - $pdf->SetXY ($this->marges['g']+18, $cury+5); - $pdf->MultiCell(18, 3, $account->code_guichet, 0, 'C', 0); - $pdf->SetXY ($this->marges['g']+36, $cury+5); - $pdf->MultiCell(24, 3, $account->number, 0, 'C', 0); - $pdf->SetXY ($this->marges['g']+60, $cury+5); - $pdf->MultiCell(13, 3, $account->cle_rib, 0, 'C', 0); - - $pdf->SetXY ($this->marges['g'], $cury+14); - $pdf->MultiCell(90, 3, $outputlangs->transnoentities("Residence").' : ' . $outputlangs->convToOutputCharset($account->domiciliation), 0, 'L', 0); - $pdf->SetXY ($this->marges['g'], $cury+19); - $pdf->MultiCell(90, 3, $outputlangs->transnoentities("IbanPrefix").' : ' . $outputlangs->convToOutputCharset($account->iban_prefix), 0, 'L', 0); - $pdf->SetXY ($this->marges['g'], $cury+24); - $pdf->MultiCell(90, 3, $outputlangs->transnoentities("BIC").' : ' . $outputlangs->convToOutputCharset($account->bic), 0, 'L', 0); + $posy=pdf_bank($pdf,$outputlangs,$curx,$cury,$account); } } - // Conditions de r�glements + // Conditions de reglements if ($fac->cond_reglement_code) { $pdf->SetFont('Arial','B',10); @@ -729,10 +697,10 @@ class pdf_oursin extends ModelePDFFactures $pdf->SetFont('Arial','B',11); $fac->fetch_client(); $pdf->SetXY($this->marges['g']+100,$posy+4); - $pdf->MultiCell(86,4, $fac->client->nom, 0, 'L'); + $pdf->MultiCell(86,4, $outputlangs->transnoentities($fac->client->nom), 0, 'L'); $pdf->SetFont('Arial','B',10); $pdf->SetXY($this->marges['g']+100,$posy+12); - $pdf->MultiCell(86,4, $fac->client->adresse . "\n\n" . $fac->client->cp . " " . $fac->client->ville); + $pdf->MultiCell(86,4, $outputlangs->transnoentities($fac->client->adresse) . "\n\n" . $outputlangs->transnoentities($fac->client->cp) . " " . $outputlangs->transnoentities($fac->client->ville)); /* * ref facture @@ -745,7 +713,7 @@ class pdf_oursin extends ModelePDFFactures $pdf->SetFont('Arial','B',11); $pdf->SetXY($this->marges['g'],$posy+6); $pdf->SetTextColor(22,137,210); - $pdf->MultiCell(100, 10, $outputlangs->transnoentities("RefBill")." : " . $fac->ref, '', 'L'); + $pdf->MultiCell(100, 10, $outputlangs->transnoentities("RefBill")." : " . $outputlangs->transnoentities($fac->ref), '', 'L'); $pdf->SetTextColor(0,0,0); /* diff --git a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php index 9a82b0cb0af..c353b26db69 100644 --- a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php +++ b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php @@ -546,46 +546,12 @@ class pdf_propale_azur extends ModelePDFPropales $account = new Account($this->db); $account->fetch($conf->global->FACTURE_RIB_NUMBER); - $this->marges['g']=$this->marge_gauche; + $curx=$this->marge_gauche; + $cury=$posy; - $cury=$posy; - $pdf->SetXY ($this->marges['g'], $cury); - $pdf->SetFont('Arial','B',8); - $pdf->MultiCell(90, 3, $outputlangs->transnoentities('PaymentByTransferOnThisBankAccount').':', 0, 'L', 0); - $cury+=4; - $pdf->SetFont('Arial','B',6); - $pdf->line($this->marges['g']+1, $cury, $this->marges['g']+1, $cury+10 ); - $pdf->SetXY ($this->marges['g'], $cury); - $pdf->MultiCell(18, 3, $outputlangs->transnoentities("BankCode"), 0, 'C', 0); - $pdf->line($this->marges['g']+18, $cury, $this->marges['g']+18, $cury+10 ); - $pdf->SetXY ($this->marges['g']+18, $cury); - $pdf->MultiCell(18, 3, $outputlangs->transnoentities("DeskCode"), 0, 'C', 0); - $pdf->line($this->marges['g']+36, $cury, $this->marges['g']+36, $cury+10 ); - $pdf->SetXY ($this->marges['g']+36, $cury); - $pdf->MultiCell(24, 3, $outputlangs->transnoentities("BankAccountNumber"), 0, 'C', 0); - $pdf->line($this->marges['g']+60, $cury, $this->marges['g']+60, $cury+10 ); - $pdf->SetXY ($this->marges['g']+60, $cury); - $pdf->MultiCell(13, 3, $outputlangs->transnoentities("BankAccountNumberKey"), 0, 'C', 0); - $pdf->line($this->marges['g']+73, $cury, $this->marges['g']+73, $cury+10 ); + $posy=pdf_bank($pdf,$outputlangs,$curx,$cury,$account); - $pdf->SetFont('Arial','',8); - $pdf->SetXY ($this->marges['g'], $cury+5); - $pdf->MultiCell(18, 3, $outputlangs->convToOutputCharset($account->code_banque), 0, 'C', 0); - $pdf->SetXY ($this->marges['g']+18, $cury+5); - $pdf->MultiCell(18, 3, $outputlangs->convToOutputCharset($account->code_guichet), 0, 'C', 0); - $pdf->SetXY ($this->marges['g']+36, $cury+5); - $pdf->MultiCell(24, 3, $outputlangs->convToOutputCharset($account->number), 0, 'C', 0); - $pdf->SetXY ($this->marges['g']+60, $cury+5); - $pdf->MultiCell(13, 3, $outputlangs->convToOutputCharset($account->cle_rib), 0, 'C', 0); - - $pdf->SetXY ($this->marges['g'], $cury+12); - $pdf->MultiCell(90, 3, $outputlangs->transnoentities("Residence").' : ' . $outputlangs->convToOutputCharset($account->domiciliation), 0, 'L', 0); - $pdf->SetXY ($this->marges['g'], $cury+22); - $pdf->MultiCell(90, 3, $outputlangs->transnoentities("IbanPrefix").' : ' . $outputlangs->convToOutputCharset($account->iban_prefix), 0, 'L', 0); - $pdf->SetXY ($this->marges['g'], $cury+25); - $pdf->MultiCell(90, 3, $outputlangs->transnoentities("BIC").' : ' . $outputlangs->convToOutputCharset($account->bic), 0, 'L', 0); - - $posy=$pdf->GetY()+2; + $posy+=2; } } } diff --git a/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php b/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php index 72c9804687e..cb09527cc8b 100644 --- a/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php +++ b/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php @@ -368,7 +368,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders */ /* - * Propose mode r�glement par RIB + * Propose mode reglement par RIB */ /* if (defined("FACTURE_RIB_NUMBER")) @@ -378,45 +378,10 @@ class pdf_muscadet extends ModelePDFSuppliersOrders $account = new Account($this->db); $account->fetch(FACTURE_RIB_NUMBER); - $this->marges['g']=$this->marge_gauche; - + $curx=$this->marge_gauche; $cury=242; - $pdf->SetXY ($this->marges['g'], $cury); - $pdf->SetFont('Arial','B',8); - $pdf->MultiCell(90, 3, "R�glement par virement sur le compte bancaire suivant:", 0, 'L', 0); - $cury+=4; - $pdf->SetFont('Arial','B',6); - $pdf->line($this->marges['g']+1, $cury, $this->marges['g']+1, $cury+10 ); - $pdf->SetXY ($this->marges['g'], $cury); - $pdf->MultiCell(18, 3, "Code banque", 0, 'C', 0); - $pdf->line($this->marges['g']+18, $cury, $this->marges['g']+18, $cury+10 ); - $pdf->SetXY ($this->marges['g']+18, $cury); - $pdf->MultiCell(18, 3, "Code guichet", 0, 'C', 0); - $pdf->line($this->marges['g']+36, $cury, $this->marges['g']+36, $cury+10 ); - $pdf->SetXY ($this->marges['g']+36, $cury); - $pdf->MultiCell(24, 3, "Num�ro compte", 0, 'C', 0); - $pdf->line($this->marges['g']+60, $cury, $this->marges['g']+60, $cury+10 ); - $pdf->SetXY ($this->marges['g']+60, $cury); - $pdf->MultiCell(13, 3, "Cl� RIB", 0, 'C', 0); - $pdf->line($this->marges['g']+73, $cury, $this->marges['g']+73, $cury+10 ); - - $pdf->SetFont('Arial','',8); - $pdf->SetXY ($this->marges['g'], $cury+5); - $pdf->MultiCell(18, 3, $account->code_banque, 0, 'C', 0); - $pdf->SetXY ($this->marges['g']+18, $cury+5); - $pdf->MultiCell(18, 3, $account->code_guichet, 0, 'C', 0); - $pdf->SetXY ($this->marges['g']+36, $cury+5); - $pdf->MultiCell(24, 3, $account->number, 0, 'C', 0); - $pdf->SetXY ($this->marges['g']+60, $cury+5); - $pdf->MultiCell(13, 3, $account->cle_rib, 0, 'C', 0); - - $pdf->SetXY ($this->marges['g'], $cury+12); - $pdf->MultiCell(90, 3, "Domiciliation : " . $account->domiciliation, 0, 'L', 0); - $pdf->SetXY ($this->marges['g'], $cury+22); - $pdf->MultiCell(90, 3, $outputlangs->trans("IBAN")." : " . $account->iban_prefix, 0, 'L', 0); - $pdf->SetXY ($this->marges['g'], $cury+25); - $pdf->MultiCell(90, 3, $outputlangs->trans("BIC")." : " . $account->bic, 0, 'L', 0); + pdf_bank($pdf,$outputlangs,$curx,$cury,$account); } } */ @@ -602,7 +567,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders { global $conf; - // Montants exprim�s en (en tab_top - 1) + // Montants exprim�s en (en tab_top - 1 $pdf->SetTextColor(0,0,0); $pdf->SetFont('Arial','',8); $titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentities("Currency".$conf->monnaie)); diff --git a/htdocs/lib/company.lib.php b/htdocs/lib/company.lib.php index d957b2b4938..d68881fd54e 100644 --- a/htdocs/lib/company.lib.php +++ b/htdocs/lib/company.lib.php @@ -241,7 +241,7 @@ function getFormeJuridiqueLabel($code) * \param conf Object conf * \param lang Object lang * \param db Database handler - * \param objsoc Third party object + * \param objsoc Third party object */ function show_contacts($conf,$langs,$db,$objsoc) { @@ -286,7 +286,7 @@ function show_contacts($conf,$langs,$db,$objsoc) $var = !$var; print ""; - + print ''; $contactstatic->id = $obj->rowid; $contactstatic->name = $obj->name; @@ -324,7 +324,7 @@ function show_contacts($conf,$langs,$db,$objsoc) print img_object($langs->trans("Rendez-Vous"),"action"); print ''; } - + print "\n"; $i++; } @@ -359,7 +359,7 @@ function show_actions_todo($conf,$langs,$db,$objsoc,$objcon='') $actionstatic=new ActionComm($db); $userstatic=new User($db); $contactstatic = new Contact($db); - + if (is_object($objcon) && $objcon->id) print_titre($langs->trans("TasksHistoryForThisContact")); else print_titre($langs->trans("ActionsOnCompany")); @@ -390,7 +390,7 @@ function show_actions_todo($conf,$langs,$db,$objsoc,$objcon='') $i = 0 ; $num = $db->num_rows($result); $var=true; - + if ($num) { while ($i < $num) @@ -401,7 +401,7 @@ function show_actions_todo($conf,$langs,$db,$objsoc,$objcon='') print ""; print ''.dolibarr_print_date($obj->dp,'dayhour')."\n"; - + // Picto warning print ''; if ($obj->dp && date("U",$obj->dp) < time()) print ' '.img_warning("Late"); @@ -423,7 +423,7 @@ function show_actions_todo($conf,$langs,$db,$objsoc,$objcon='') $actionstatic->id=$obj->id; print ''.$actionstatic->getNomUrl(1,16).''; } - + print ''.$obj->label.''; // Contact pour cette action @@ -438,7 +438,7 @@ function show_actions_todo($conf,$langs,$db,$objsoc,$objcon='') { print ' '; } - + print ''; $userstatic->id=$obj->fk_user_author; $userstatic->login=$obj->login; @@ -504,7 +504,7 @@ function show_actions_done($conf,$langs,$db,$objsoc,$objcon='') $sql.= " AND c.id=a.fk_action"; $sql.= " AND a.percent = 100"; $sql.= " ORDER BY a.datea DESC, a.id DESC"; - + dolibarr_syslog("company.lib::show_actions_done sql=".$sql, LOG_DEBUG); $resql=$db->query($sql); if ($resql) @@ -529,11 +529,11 @@ function show_actions_done($conf,$langs,$db,$objsoc,$objcon='') dolibarr_print_error($db); } } - + if ($conf->mailing->enabled && $objcon->email) { $langs->load("mails"); - + // Recherche histo sur mailing $sql = "SELECT m.rowid as id, ".$db->pdate("mc.date_envoi")." as da, m.titre as note, '100' as percentage,"; $sql.= " 'AC_EMAILING' as acode,"; @@ -569,7 +569,7 @@ function show_actions_done($conf,$langs,$db,$objsoc,$objcon='') } } - + if ($conf->agenda->enabled || ($conf->mailing->enabled && $objcon->email)) { require_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php"); @@ -582,7 +582,7 @@ function show_actions_done($conf,$langs,$db,$objsoc,$objcon='') $propalstatic=new Propal($db); $orderstatic=new Commande($db); $facturestatic=new Facture($db); - + print ''; print ''; print ''; @@ -619,7 +619,7 @@ function show_actions_done($conf,$langs,$db,$objsoc,$objcon='') // Note print ''; - + // Objet lie print ''; } - + // Auteur print '
'.$langs->trans("ActionsDoneShort").''.dolibarr_trunc($histo[$key]['note'], 30).''; if ($histo[$key]['pid'] && $conf->propal->enabled) @@ -656,7 +656,7 @@ function show_actions_done($conf,$langs,$db,$objsoc,$objcon='') { print ' '; $userstatic->id=$histo[$key]['userid']; @@ -679,6 +679,50 @@ function show_actions_done($conf,$langs,$db,$objsoc,$objcon='') } +/** + * \brief Show bank informations for PDF generation + */ +function pdf_bank(&$pdf,$outputlangs,$curx,$cury,$account) +{ + $pdf->SetXY ($curx, $cury); + $pdf->SetFont('Arial','B',8); + $pdf->MultiCell(90, 3, $outputlangs->transnoentities('PaymentByTransferOnThisBankAccount').':', 0, 'L', 0); + $cury+=4; + $pdf->SetFont('Arial','B',6); + $pdf->line($curx+1, $cury, $curx+1, $cury+10 ); + $pdf->SetXY ($curx, $cury); + $pdf->MultiCell(18, 3, $outputlangs->transnoentities("BankCode"), 0, 'C', 0); + $pdf->line($curx+18, $cury, $curx+18, $cury+10 ); + $pdf->SetXY ($curx+18, $cury); + $pdf->MultiCell(18, 3, $outputlangs->transnoentities("DeskCode"), 0, 'C', 0); + $pdf->line($curx+36, $cury, $curx+36, $cury+10 ); + $pdf->SetXY ($curx+36, $cury); + $pdf->MultiCell(24, 3, $outputlangs->transnoentities("BankAccountNumber"), 0, 'C', 0); + $pdf->line($curx+60, $cury, $curx+60, $cury+10 ); + $pdf->SetXY ($curx+60, $cury); + $pdf->MultiCell(13, 3, $outputlangs->transnoentities("BankAccountNumberKey"), 0, 'C', 0); + $pdf->line($curx+73, $cury, $curx+73, $cury+10 ); + + $pdf->SetFont('Arial','',8); + $pdf->SetXY ($curx, $cury+5); + $pdf->MultiCell(18, 3, $outputlangs->convToOutputCharset($account->code_banque), 0, 'C', 0); + $pdf->SetXY ($curx+18, $cury+5); + $pdf->MultiCell(18, 3, $outputlangs->convToOutputCharset($account->code_guichet), 0, 'C', 0); + $pdf->SetXY ($curx+36, $cury+5); + $pdf->MultiCell(24, 3, $outputlangs->convToOutputCharset($account->number), 0, 'C', 0); + $pdf->SetXY ($curx+60, $cury+5); + $pdf->MultiCell(13, 3, $outputlangs->convToOutputCharset($account->cle_rib), 0, 'C', 0); + + $pdf->SetXY ($curx, $cury+12); + $pdf->MultiCell(90, 3, $outputlangs->transnoentities("Residence").' : ' . $outputlangs->convToOutputCharset($account->domiciliation), 0, 'L', 0); + $pdf->SetXY ($curx, $cury+22); + $pdf->MultiCell(90, 3, $outputlangs->transnoentities("IbanPrefix").' : ' . $outputlangs->convToOutputCharset($account->iban_prefix), 0, 'L', 0); + $pdf->SetXY ($curx, $cury+25); + $pdf->MultiCell(90, 3, $outputlangs->transnoentities("BIC").' : ' . $outputlangs->convToOutputCharset($account->bic), 0, 'L', 0); + + return $pdf->getY(); +} + /** * \brief Show footer of page for PDF generation @@ -695,7 +739,7 @@ function pdf_pagefoot(&$pdf,$outputlangs,$paramfreetext,$fromcompany,$marge_bass global $conf; $outputlangs->load("dict"); - + // Line of free text $ligne=(! empty($conf->global->$paramfreetext))?$outputlangs->convToOutputCharset($conf->global->$paramfreetext):"";