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

[phpcompta-dev]

Author: danydb
Date: 2012-02-04 21:24:27 +0100 (Sat, 04 Feb 2012)
New Revision: 4751

Modified:
   phpcompta/trunk/
   phpcompta/trunk/include/class_acc_ledger_fin.php
Log:
Merged revisions 4740 via svnmerge from 
file:///home/developper/svn/phpcompta/tags/rel600

........
  r4740 | danydb | 2012-02-04 14:45:39 +0100 (Sat, 04 Feb 2012) | 1 line
  
  More details after inserting in FIN
........



Property changes on: phpcompta/trunk
___________________________________________________________________
Name: svnmerge-integrated
   - /phpcompta/tags/rel600:1-4736,4738-4739
   + /phpcompta/tags/rel600:1-4736,4738-4740

Modified: phpcompta/trunk/include/class_acc_ledger_fin.php
===================================================================
--- phpcompta/trunk/include/class_acc_ledger_fin.php    2012-02-04 20:24:17 UTC 
(rev 4750)
+++ phpcompta/trunk/include/class_acc_ledger_fin.php    2012-02-04 20:24:27 UTC 
(rev 4751)
@@ -635,7 +635,7 @@
             $amount=0.0;
             $idx_operation=0;
             $ret='<table class="result" style="width:75%">';
-            $ret.=tr(th('Quick Code').th('Nom').th('Libellé').th('Montant',' 
style="text-align:right"'));
+            $ret.=tr(th('n° interne').th('Quick 
Code').th('Nom').th('Libellé').th('Montant',' style="text-align:right"'));
             // Credit = goods
             for ( $i = 0; $i < $nb_item;$i++)
             {
@@ -648,10 +648,7 @@
                 // round it
                 ${"e_other$i"."_amount"}=round( ${"e_other$i"."_amount"},2);
 
-                // Compute display
-                
$row=td(${"e_other$i"}).td($fPoste->strAttribut(ATTR_DEF_NAME)).td(${"e_other".$i."_comment"}).td(nbm(${"e_other$i"."_amount"}),'class="num"');
 
-                $ret.=tr($row);
 
                 $amount+=${"e_other$i"."_amount"};
                 // Record a line for the bank
@@ -796,7 +793,7 @@
                 {
                     // for each item, insert into operation_analytique */
                     $op=new Anc_Operation($this->db);
-                   $op->oa_group=$this->db->get_next_seq("s_oa_group"); /* for 
analytic */
+                                       
$op->oa_group=$this->db->get_next_seq("s_oa_group"); /* for analytic */
                     $op->j_id=$j_id;
                     $op->oa_date=$e_date;
                     $op->oa_debit=($amount < 0 )?'t':'f';
@@ -807,8 +804,13 @@
 
                 $this->update_internal_code($internal);
 
+                               $js_detail=  HtmlInput::detail_op($jr_id, 
$internal);
+                               // Compute display
+                
$row=td($js_detail).td(${"e_other$i"}).td($fPoste->strAttribut(ATTR_DEF_NAME)).td(${"e_other".$i."_comment"}).td(nbm(${"e_other$i"."_amount"}),'class="num"');
 
+                $ret.=tr($row);
 
+
                 if ( $i == 0 )
                 {
                     // first record we upload the files and



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