[Phpcompta-dev] r373 - trunk/tva

[phpcompta-dev]

Author: danydb
Date: 2012-05-27 23:33:08 +0200 (Sun, 27 May 2012)
New Revision: 373

Modified:
   trunk/tva/class_ext_list_assujetti.php
   trunk/tva/class_ext_list_intra.php
Log:
Fix bug : do show button in display readonly and compute tot

Modified: trunk/tva/class_ext_list_assujetti.php
===================================================================
--- trunk/tva/class_ext_list_assujetti.php      2012-05-27 21:09:34 UTC (rev 
372)
+++ trunk/tva/class_ext_list_assujetti.php      2012-05-27 21:33:08 UTC (rev 
373)
@@ -102,7 +102,7 @@
     $r= '<form class="print" id="readonly">';
        $r.=HtmlInput::request_to_hidden(array('ac'));
     $r.=$this->display_info();
-    $r.=$this->display_declaration_amount();
+    $r.=$this->display_declaration_amount(true);
     $r.='</form>';
     $js_remove=sprintf("onclick=\"if ( 
confirm('%s')){remove_form('%s',%d,%d,'lc');}\"",
                       "Vous confirmez vouloir effacer ?",
@@ -246,10 +246,10 @@
   /**
    address@hidden finish it
    */
-  function display_declaration_amount() {
+  function display_declaration_amount($readonly=false) {
     $res='<fieldset><legend>Listing</legend>';
     $res.= '<table id="tb_dsp" class="result" style="width:80%;">';
-    $clean=new IButton();
+    $clean=new IButton('rm_b');
     $clean->label='Efface ligne';
     $clean->javascript="deleteRow('tb_dsp',this);";
 
@@ -276,10 +276,20 @@
       $r.=td($c->input());
       $r.=td($e->input());
       $r.=td($d->input());
-      $r.=td($clean->input());
+     if (! $readonly) $r.=td($clean->input());
       $res.=tr($r);
 
     }
+       if ( $readonly )
+       {
+               $r=td('');
+               $r.=td('');
+               $r.=td(hb('Total'));
+               $r.=td(hb(sprintf('%.02f',$amount)));
+               $r.=td(hb(sprintf('%.02f',$amount_vat)));
+       }
+
+    $res.=tr($r);
     $res.='</table>';
     $res.='</fieldset>';
     return $res;

Modified: trunk/tva/class_ext_list_intra.php
===================================================================
--- trunk/tva/class_ext_list_intra.php  2012-05-27 21:09:34 UTC (rev 372)
+++ trunk/tva/class_ext_list_intra.php  2012-05-27 21:33:08 UTC (rev 373)
@@ -168,7 +168,7 @@
     $code_customer=new Acc_Parm_Code($this->db);
     $code_customer->p_code='CUSTOMER';
     $code_customer->load();
-    $a=$this->find_tva_code('LINTRA');
+    $a=$this->find_tva_code('CLINTRA');
 
     if (trim($a)=='') $a=-1;
     $sql=<<<EOF
@@ -224,7 +224,7 @@
   /**
    address@hidden finish it
    */
-  function display_declaration_amount() {
+  function display_declaration_amount($p_readonly=false) {
     $res='<fieldset><legend>Listing</legend>';
 
     $res.= '<table id="tb_dsp" class="result" style="width:80%;">';
@@ -257,19 +257,22 @@
       $r.=td($d->input());
       $r.=td($e->input());
       $r.=td($f->input());
-      $r.=td($clean->input());
+      if (! $p_readonly) $r.=td($clean->input());
       $res.=tr($r);
 
     }
-    $r=td('');
-    $r.=td('');
-    $r.=td('');
-    $r.=td(hb('Total'));
-    $r.=td(hb(sprintf('%.02f',$amount)));
-    $r.=td('');
-    $r.=td('');
-    $res.=tr($r);
-    $res.='</table>';
+       if ( $p_readonly)
+       {
+               $r=td('');
+               $r.=td('');
+               $r.=td('');
+               $r.=td(hb('Total'));
+               $r.=td(hb(sprintf('%.02f',$amount)));
+               $r.=td('');
+               $r.=td('');
+               $res.=tr($r);
+       }
+       $res.='</table>';
     $res.='</fieldset>';
     return $res;
   }



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