Changeset 901d2de

Timestamp:

Apr 14, 2011, 3:40:30 PM (12 years ago)

Author:

Blacklight <blacklight@…>

Branches:

master

Children:

fb26fde

Parents:

f2000c1

Message:

• Исправление форматирования в акте сверки

File:

• web/doc_otchet.php (modified) (5 diffs)

web/doc_otchet.php

@@ -873 +873 @@
                         $agent_id=rcv('agent_id');
                         
-                        
                         if($firm_id)
                         {
@@ -912 +911 @@
                         
                         $pdf->Ln(8);
-                        
+                        $y=$pdf->GetY();
+                        $base_x=$pdf->GetX();
                         $pdf->SetLineWidth(0.5);
-                        $t_width=array(15,50,15,15,15,50,15,0);
+                        $t_width=array(17,44,17,17,17,44,17,0);
                         $t_text=array('Дата', 'Операция', 'Дебет', 'Кредит', 'Дата', 'Операция', 'Дебет', 'Кредит');
-                        $str=iconv('UTF-8', 'windows-1251', "По данным {$firm_vars['firm_name']}");
-                        $pdf->Cell($t_width[0]+$t_width[1]+$t_width[2]+$t_width[3],5,$str,1,0,'L',0);
-                        $str=iconv('UTF-8', 'windows-1251', "По данным {$agent['fullname']}");
-                        $pdf->Cell(0,5,$str,1,0,'L',0);
+                        
+                        $h_width=$t_width[0]+$t_width[1]+$t_width[2]+$t_width[3];
+                        $str1=iconv('UTF-8', 'windows-1251', "По данным {$firm_vars['firm_name']}");
+                        $str2=iconv('UTF-8', 'windows-1251', "По данным {$agent['fullname']}");
+                                                
+                        $pdf->MultiCell($h_width,5,$str1,0,'L',0);
+                        $max_h=$pdf->GetY()-$y;
+                        $pdf->SetY($y);
+                        $pdf->SetX($base_x+$h_width);
+                        $pdf->MultiCell(0,5,$str2,0,'L',0);
+                        if( ($pdf->GetY()-$y) > $max_h) $max_h=$pdf->GetY()-$y;
+                        //$pdf->Cell(0,5,$str2,1,0,'L',0);
+                        $pdf->SetY($y);
+                        $pdf->SetX($base_x);
+                        $pdf->Cell($h_width,$max_h,'',1,0,'L',0);
+                        $pdf->Cell(0,$max_h,'',1,0,'L',0);
                         $pdf->Ln();
                         foreach($t_width as $i => $w)
@@ -963 +975 @@
                                         $str=iconv('UTF-8', 'windows-1251', "Сальдо на начало периода");
                                         $pdf->Cell($t_width[0]+$t_width[1],4,$str,1,0,'L',0);
-                                        $pdf->Cell($t_width[2],4,$ras,1,0,'L',0);
-                                        $pdf->Cell($t_width[3],4,$pr,1,0,'L',0);
+                                        $pdf->Cell($t_width[2],4,$ras,1,0,'R',0);
+                                        $pdf->Cell($t_width[3],4,$pr,1,0,'R',0);
                                         $pdf->Cell($t_width[4]+$t_width[5],4,'',1,0,'L',0);
                                         $pdf->Cell($t_width[6],4,'',1,0,'L',0);
@@ -1015 +1027 @@
                                         $pdf->Cell($t_width[0],4,$dt,1,0,'L',0);
                                         $pdf->Cell($t_width[1],4,$str,1,0,'L',0);
-                                        $pdf->Cell($t_width[2],4,$deb,1,0,'L',0);
-                                        $pdf->Cell($t_width[3],4,$kr,1,0,'L',0);
+                                        $pdf->Cell($t_width[2],4,$deb,1,0,'R',0);
+                                        $pdf->Cell($t_width[3],4,$kr,1,0,'R',0);
                                         $pdf->Cell($t_width[4],4,'',1,0,'L',0);
                                         $pdf->Cell($t_width[5],4,'',1,0,'L',0);
@@ -1034 +1046 @@
                         $str=iconv('UTF-8', 'windows-1251', "Обороты за период");
                         $pdf->Cell($t_width[0]+$t_width[1],4,$str,1,0,'L',0);
-                        $pdf->Cell($t_width[2],4,$ras,1,0,'L',0);
-                        $pdf->Cell($t_width[3],4,$pr,1,0,'L',0);
+                        $pdf->Cell($t_width[2],4,$ras,1,0,'R',0);
+                        $pdf->Cell($t_width[3],4,$pr,1,0,'R',0);
                         $pdf->Cell($t_width[4]+$t_width[5],4,'',1,0,'L',0);
                         $pdf->Cell($t_width[6],4,'',1,0,'L',0);