[Phpcompta-dev] r734 - trunk/invoicing/include

[phpcompta-dev]

Author: danydb
Date: 2014-08-03 11:56:54 +0200 (Sun, 03 Aug 2014)
New Revision: 734

Modified:
   trunk/invoicing/include/class_acc_ledger_sold_generate.php
Log:
Esth?\195?\169tique : ordre des colonnes

Modified: trunk/invoicing/include/class_acc_ledger_sold_generate.php
===================================================================
--- trunk/invoicing/include/class_acc_ledger_sold_generate.php  2014-07-29 
20:19:29 UTC (rev 733)
+++ trunk/invoicing/include/class_acc_ledger_sold_generate.php  2014-08-03 
09:56:54 UTC (rev 734)
@@ -114,15 +114,16 @@
         $r.='<th>' . $table->get_header(3) . '</th>';
         $r.='<th>' . $table->get_header(4) . '</th>';
         $r.='<th>' . $table->get_header(6) . '</th>';
+        $r.='<th>' . $table->get_header(5) . '</th>';
+        $r.="<th>" . _('Document') . "</th>";
         $r.=th('Notes', ' style="width:15%"');
-        $r.='<th>' . $table->get_header(5) . '</th>';
         // if $p_paid is not equal to 0 then we have a paid column
         if ($p_paid != 0)
         {
             $r.="<th> " . _('Payé') . "</th>";
         }
         $r.="<th>" . _('Concerne') . "</th>";
-        $r.="<th>" . _('Document') . "</th>";
+        
         $r.="</tr>";
         // Total Amount
         $tot = 0.0;
@@ -179,7 +180,7 @@
             $tmp_jr_comment = h($row['jr_comment']);
             $r.=$tmp_jr_comment;
             $r.="</TD>";
-            $r.=td(h($row['n_text']), ' style="font-size:0.87em%"');
+            
             // Amount
             // If the ledger is financial :
             // the credit must be negative and written in red
@@ -224,7 +225,19 @@
                 else
                     $amount_unpaid = bcadd($amount_unpaid, $t_amount);
             }
-
+            //document
+            if ($row['jr_pj_name'] != "")
+            {
+                
$r.='<td>'.HtmlInput::show_receipt_document($row['jr_id']).'</td>';
+            } else
+            {
+                $r.="<TD></TD>";
+            }
+            
+            // NOTE
+            $r.=td(h($row['n_text']), ' style="font-size:0.87em%"');
+            
+            
             // Rapprochement
             $rec = new Acc_Reconciliation($this->db);
             $rec->set_jr_id($row['jr_id']);
@@ -251,12 +264,8 @@
             {
                 
             } // else
-            //document
-            if ($row['jr_pj_name'] != "")
-            {
-                
$r.='<td>'.HtmlInput::show_receipt_document($row['jr_id']).'</td>';
-            } else
-                $r.="<TD></TD>";
+            
+            
 
             // end row
             $r.="</tr>";



---
PhpCompta est un logiciel de comptabilité libre en ligne (full web)
Projet opensource http://www.phpcompta.eu