[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpcompta-dev] r5246 - in phpcompta/trunk: html/js include
From: |
phpcompta-dev |
Subject: |
[Phpcompta-dev] r5246 - in phpcompta/trunk: html/js include |
Date: |
Sun, 12 May 2013 00:00:09 +0200 (CEST) |
Author: danydb
Date: 2013-05-12 00:00:07 +0200 (Sun, 12 May 2013)
New Revision: 5246
Modified:
phpcompta/trunk/html/js/infobulle.js
phpcompta/trunk/include/class_pdf.php
phpcompta/trunk/include/class_print_ledger_detail.php
phpcompta/trunk/include/class_print_ledger_fin.php
phpcompta/trunk/include/class_print_ledger_misc.php
phpcompta/trunk/include/class_print_ledger_simple.php
phpcompta/trunk/include/class_print_ledger_simple_without_vat.php
Log:
Bug #0000838: Bug : PDF Les lignes trop longues cassent le saut de page
Modified: phpcompta/trunk/html/js/infobulle.js
===================================================================
--- phpcompta/trunk/html/js/infobulle.js 2013-05-11 20:56:02 UTC (rev
5245)
+++ phpcompta/trunk/html/js/infobulle.js 2013-05-11 22:00:07 UTC (rev
5246)
@@ -54,7 +54,7 @@
content[24]="Donnez une partie du poste comptable ou du libellé pour filtrer";
content[25]="Donnez une partie du libellé, la date, le montant ou le numéro
d'opération pour filtrer, cela n'efface pas ce qui a déjà été sélectionné";
content[26]="Donnez une partie du quickcode, nom, description... pour filtrer";
-content[27]="Attention, <b>SI</b> la fiche a changé de poste comptable, c'est
seulement la dernière qui est affichée";
+content[27]="Attention, <b>SI</b> la fiche a changé de poste comptable, c'est
seulement le dernier qui est affiché";
function showBulle(p_ctl)
{
d=document.getElementById('bulle');
Modified: phpcompta/trunk/include/class_pdf.php
===================================================================
--- phpcompta/trunk/include/class_pdf.php 2013-05-11 20:56:02 UTC (rev
5245)
+++ phpcompta/trunk/include/class_pdf.php 2013-05-11 22:00:07 UTC (rev
5246)
@@ -91,6 +91,11 @@
$x_m=$this->GetX();
$y_m=$this->GetY();
$txt = str_replace("\\", "", $txt);
+ if ( $y_m > ($this->h-$this->bMargin-10 )) {
+ $this->AddPage ();
+ $y_m=$this->GetY();
+
+ }
$this->MultiCell($w,$h,$txt,$border,$align,$fill);
$x_m=$x_m+$w;
$tmp=$this->GetY()-$y_m;
Modified: phpcompta/trunk/include/class_print_ledger_detail.php
===================================================================
--- phpcompta/trunk/include/class_print_ledger_detail.php 2013-05-11
20:56:02 UTC (rev 5245)
+++ phpcompta/trunk/include/class_print_ledger_detail.php 2013-05-11
22:00:07 UTC (rev 5246)
@@ -93,7 +93,7 @@
$this->SetFont('DejaVuCond','B',7);
$row=$array[$i];
- $this->Cell(20,7,$row['pj']);
+ $this->LongLine(20,7,$row['pj']);
$this->Cell(15,7,$row['date_fmt']);
$this->Cell(20,7,$row['internal']);
$this->LongLine(170,7,$row['comment']);
Modified: phpcompta/trunk/include/class_print_ledger_fin.php
===================================================================
--- phpcompta/trunk/include/class_print_ledger_fin.php 2013-05-11 20:56:02 UTC
(rev 5245)
+++ phpcompta/trunk/include/class_print_ledger_fin.php 2013-05-11 22:00:07 UTC
(rev 5246)
@@ -75,7 +75,7 @@
for ( $i=0;$i<count($a_jrn);$i++)
{
$row=$a_jrn[$i];
- $this->Cell(30,5,$row['pj']);
+ $this->LongLine(30,5,$row['pj']);
$this->Cell(10,5,$row['date_fmt']);
$this->Cell(20,5,$row['internal']);
Modified: phpcompta/trunk/include/class_print_ledger_misc.php
===================================================================
--- phpcompta/trunk/include/class_print_ledger_misc.php 2013-05-11 20:56:02 UTC
(rev 5245)
+++ phpcompta/trunk/include/class_print_ledger_misc.php 2013-05-11 22:00:07 UTC
(rev 5246)
@@ -78,7 +78,7 @@
for ( $i=0;$i<count($a_jrn);$i++)
{
$row=$a_jrn[$i];
- $this->Cell(30,5,$row['pj']);
+ $this->LongLine(30,5,$row['pj']);
$this->Cell(10,5,$row['date_fmt']);
$this->Cell(20,5,$row['internal']);
$type=$this->cn->get_value("select jrn_def_type from jrn_def where
jrn_def_id=$1",array($a_jrn[$i]['jr_def_id']));
Modified: phpcompta/trunk/include/class_print_ledger_simple.php
===================================================================
--- phpcompta/trunk/include/class_print_ledger_simple.php 2013-05-11
20:56:02 UTC (rev 5245)
+++ phpcompta/trunk/include/class_print_ledger_simple.php 2013-05-11
22:00:07 UTC (rev 5246)
@@ -224,7 +224,7 @@
}
$row=$a_jrn[$i];
- $this->Cell(15,5,($row['pj']),0,0);
+ $this->LongLine(15,5,($row['pj']),0);
$this->Cell(10,5,$row['date_fmt'],0,0);
$this->Cell(13,5,$row['internal'],0,0);
list($qc,$name)=$this->get_tiers($row['id'],$this->jrn_type);
Modified: phpcompta/trunk/include/class_print_ledger_simple_without_vat.php
===================================================================
--- phpcompta/trunk/include/class_print_ledger_simple_without_vat.php
2013-05-11 20:56:02 UTC (rev 5245)
+++ phpcompta/trunk/include/class_print_ledger_simple_without_vat.php
2013-05-11 22:00:07 UTC (rev 5246)
@@ -157,7 +157,7 @@
{
$row=$a_jrn[$i];
- $this->Cell(15,5,($row['pj']),0,0);
+ $this->LongLine(15,5,($row['pj']),0);
$this->Cell(15,5,$row['date_fmt'],0,0);
$this->Cell(20,5,$row['internal'],0,0);
list($qc,$name)=$this->get_tiers($row['id'],$this->jrn_type);
---
PhpCompta est un logiciel de comptabilité libre en ligne (full web)
Projet opensource http://www.phpcompta.eu
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpcompta-dev] r5246 - in phpcompta/trunk: html/js include,
phpcompta-dev <=