[Phpcompta-dev] r4544 - in phpcompta/trunk/include: . template

[phpcompta-dev]

Author: danydb
Date: 2011-12-02 00:10:20 +0100 (Fri, 02 Dec 2011)
New Revision: 4544

Modified:
   phpcompta/trunk/include/class_acc_ledger_purchase.php
   phpcompta/trunk/include/class_acc_ledger_sold.php
   phpcompta/trunk/include/template/module.php
Log:

Improve look for ANC + Add payment method + card name




Modified: phpcompta/trunk/include/class_acc_ledger_purchase.php
===================================================================
--- phpcompta/trunk/include/class_acc_ledger_purchase.php       2011-12-01 
23:09:32 UTC (rev 4543)
+++ phpcompta/trunk/include/class_acc_ledger_purchase.php       2011-12-01 
23:10:20 UTC (rev 4544)
@@ -1471,16 +1471,7 @@
         $r.=HtmlInput::hidden('e_mp',$e_mp);
         /* Paid by */
         /* if the paymethod is not 0 and if a quick code is given */
-        if ( $e_mp!=0 && strlen (trim (${'e_mp_qcode_'.$e_mp})) != 0 )
-        {
-            $r.=HtmlInput::hidden('e_mp_qcode_'.$e_mp,${'e_mp_qcode_'.$e_mp});
 
-            /* needed for generating a invoice */
-            $r.=HtmlInput::hidden('qcode_benef',${'e_mp_qcode_'.$e_mp});
-
-            $r.="Payé par ".${'e_mp_qcode_'.$e_mp};
-            $r.='<br>';
-        }
         for ($i=0;$i < $nb_item;$i++)
         {
             $r.=HtmlInput::hidden("e_march".$i,${"e_march".$i});
@@ -1493,9 +1484,22 @@
             $r.=HtmlInput::hidden("e_quant".$i,${"e_quant".$i});
 
         }
+               if ( ! $p_summary ) $r.=$this->extra_info();
+               if ( $e_mp!=0 && strlen (trim (${'e_mp_qcode_'.$e_mp})) != 0 )
+        {
+            $r.=HtmlInput::hidden('e_mp_qcode_'.$e_mp,${'e_mp_qcode_'.$e_mp});
+
+            /* needed for generating a invoice */
+            $r.=HtmlInput::hidden('qcode_benef', ${'e_mp_qcode_' . $e_mp});
+                       $fname = new Fiche($this->db);
+                       $fname->get_by_qcode(${'e_mp_qcode_' . $e_mp});
+                       $r.='<div style="float:left"><h2 class="info">' . "Payé 
par " . ${'e_mp_qcode_' . $e_mp} .
+                                       " ".$fname->getName() . '</h2></div>';
+            $r.='<br>';
+        }
         // check for upload piece
-        if ( ! $p_summary ) $r.=$this->extra_info();
 
+
         return $r;
     }
 

Modified: phpcompta/trunk/include/class_acc_ledger_sold.php
===================================================================
--- phpcompta/trunk/include/class_acc_ledger_sold.php   2011-12-01 23:09:32 UTC 
(rev 4543)
+++ phpcompta/trunk/include/class_acc_ledger_sold.php   2011-12-01 23:10:20 UTC 
(rev 4544)
@@ -865,7 +865,10 @@
             /* needed for generating a invoice */
             $r.=HtmlInput::hidden('qcode_benef',${'e_mp_qcode_'.$e_mp});
 
-            $r.=_("Payé par ").${'e_mp_qcode_'.$e_mp};
+                       $fname=new Fiche($this->db);
+                       $fname->get_by_qcode(${'e_mp_qcode_'.$e_mp});
+                       $r.='<div style="float:left"><h2 class="info">'."Payé 
par ".${'e_mp_qcode_'.$e_mp}.
+                                  " ".$fname->getName().'</h2></div>';
             $r.='<br>';
         }
 

Modified: phpcompta/trunk/include/template/module.php
===================================================================
--- phpcompta/trunk/include/template/module.php 2011-12-01 23:09:32 UTC (rev 
4543)
+++ phpcompta/trunk/include/template/module.php 2011-12-01 23:10:20 UTC (rev 
4544)
@@ -47,6 +47,7 @@
        <H2 class="dossier"> Dossier : <?=h(dossier::name())?></h2>
        </div>
     </div>
+
     <div class="module">
        <table>
            <tr>
@@ -85,4 +86,5 @@
        </table>
 
     </div>
-</div>
\ No newline at end of file
+</div>
+<div style="clear:both;"></div>
\ No newline at end of file