[Phpcompta-dev] r4761 - in phpcompta/tags/rel600/include: . template

[phpcompta-dev]

Author: danydb
Date: 2012-02-07 16:50:24 +0100 (Tue, 07 Feb 2012)
New Revision: 4761

Modified:
   phpcompta/tags/rel600/include/class_acc_ledger_fin.php
   phpcompta/tags/rel600/include/template/form_ledger_fin.php
Log:
FIN : cosmetic show name of the card + align col.

Modified: phpcompta/tags/rel600/include/class_acc_ledger_fin.php
===================================================================
--- phpcompta/tags/rel600/include/class_acc_ledger_fin.php      2012-02-04 
22:35:13 UTC (rev 4760)
+++ phpcompta/tags/rel600/include/class_acc_ledger_fin.php      2012-02-07 
15:50:24 UTC (rev 4761)
@@ -327,7 +327,7 @@
             $W1->set_attribute('ipopup','ipopcard');
 
             // name of the field to update with the name of the card
-            $W1->set_attribute('label','e_other'.$i.'_comment');
+            $W1->set_attribute('label','e_other_name'.$i);
             // name of the field to update with the name of the card
             $W1->set_attribute('typecard','filter');
             // Add the callback function to filter the card on the jrn
@@ -339,6 +339,21 @@
             $array[$i]['qcode']=$W1->input();
             $array[$i]['search']=$W1->search();
 
+           // Card name
+           //
+           $card_name="";
+           if ( $tiers !="" )
+             {
+               $fiche=new Fiche($this->db);
+               $fiche->get_by_qcode($tiers);
+               $card_name=$this->db->get_value("Select ad_value from 
fiche_detail where ad_id=$1 and f_id=$2",
+                                               
array(ATTR_DEF_NAME,$fiche->id));
+             }
+
+           $wcard_name=new IText("e_other_name".$i,$card_name);
+           $wcard_name->readOnly=true;
+           $array[$i]['cname']=$wcard_name->input();
+
             // Comment
             $wComment=new IText("e_other$i"."_comment",$tiers_comment);
 
@@ -463,8 +478,8 @@
         //-------------------------------------------------
         $r.='<TABLE style="width:100%" id="fin_item">';
         $r.="<TR>";
-        $r.="<th colspan=\"2\">Nom</TH>";
-        $r.="<th>Commentaire</TH>";
+        $r.="<th style=\"width:auto;text-align:left\" colspan=\"2\">Nom</TH>";
+        $r.="<th style=\"text-align:left\" >Commentaire</TH>";
         $r.="<th style=\"text-align:right\">Montant</TH>";
         $r.='<th colspan="2"> Op. Concern&eacute;e(s)</th>';
 

Modified: phpcompta/tags/rel600/include/template/form_ledger_fin.php
===================================================================
--- phpcompta/tags/rel600/include/template/form_ledger_fin.php  2012-02-04 
22:35:13 UTC (rev 4760)
+++ phpcompta/tags/rel600/include/template/form_ledger_fin.php  2012-02-07 
15:50:24 UTC (rev 4761)
@@ -21,7 +21,8 @@
    <fieldset><legend><?=_('Opérations')?></legend>
 <table id="fin_item" width="100%" border="0">
 <tr>
-<th style="text-align: left;width: 
auto"colspan="2">code<?HtmlInput::infobulle(0)?></TH>
+<th style="text-align: left;width: auto">code<?HtmlInput::infobulle(0)?></TH>
+   <th style="text-align: left"><?=_('Fiche')?></TH>
    <th style="text-align: left"><?=_('Commentaire')?></TH>
    <th style="text-align: left"><?=_('Montant')?></TH>
    <th style="text-align: left;width:auto"colspan="2"> <?=_('Op. 
Concernée(s)')?></th>
@@ -30,6 +31,7 @@
 <? foreach ($array as $item) {
 echo '<tr>';
 echo td($item['qcode'].$item['search']);
+echo td($item['cname']);
 echo td($item['comment']);
 echo td($item['amount']);
 echo td($item['concerned']);



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