[Tutos-commits] CVS: tutos/php/invoice invoice.pinc,1.51,1.52

[Gero K. <gok...@us...>]

Update of /cvsroot/tutos/tutos/php/invoice
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17235/php/invoice

Modified Files:
	invoice.pinc 
Log Message:
fixes

Index: invoice.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/invoice/invoice.pinc,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- invoice.pinc	3 Apr 2005 18:32:13 -0000	1.51
+++ invoice.pinc	14 May 2005 18:29:15 -0000	1.52
@@ -1043,53 +1043,55 @@
   /**
    * get an header for overview tables that shows objects of type objtype
    */
-  function getOverviewHeader (&$user,$objtype) {
+  function get_overview_header (&$layout,$objtype) {
     global $lang;
 
-    if ( ! $user->feature_ok(useinvoice,PERM_SEE) ) {
-      return 0;
+	$r = '';
+    if ( ! $layout->user->feature_ok(useinvoice,PERM_SEE) ) {
+      return $r;
     }
     if ($objtype == "timetrack") {
-      echo $user->layout->orderHeader("",$lang['Invoice'],"");
-      return 1;
+      $r .= $layout->orderHeader("",$lang['Invoice'],"");
+      $layout->flds++;
     } else if ($objtype == "installation") {
-      echo $user->layout->orderHeader("",$lang['Invoice'],"");
-      return 1;
+      $r .= $layout->orderHeader("",$lang['Invoice'],"");
+      $layout->flds++;
     }
-    return 0;
+    return $r;
   }
   /**
    * get an data for overview tables that shows a line with obj info
    */
-  function getOverviewData (&$user,&$obj) {
+  function get_overview_data (&$layout,&$obj) {
     global $tutos,$lang;
 
-    if ( ! $user->feature_ok(useinvoice,PERM_SEE) ) {
-      return;
+	$r = '';
+    if ( ! $layout->user->feature_ok(useinvoice,PERM_SEE) ) {
+      return $r;
     }
     if ( ($obj->gettype() == "timetrack") ) {
-      echo "<td nowrap=\"nowrap\">";
+      $r .= "<td class=\"over1\">";
       if ( $obj->inv_id != -1 ) {
         $obj->invoice = new invoice($obj->dbconn);
         $obj->invoice = $obj->invoice->read($obj->inv_id,$obj->invoice);
         if ( $obj->inv_id == $obj->invoice->id ) {
-          echo $obj->invoice->getLink()." : ". $lang['InvoiceStates'][$obj->invoice->state] ;;
+          $r .= $obj->invoice->getLink()." : ". $lang['InvoiceStates'][$obj->invoice->state] ;;
         }
       }
-      echo "&nbsp;</td>\n";
+      $r .= "&nbsp;</td>\n";
     } else if ( ($obj->gettype() == "installation") ) {
-      echo "<td nowrap=\"nowrap\">\n";
+      $r .= "<td class=\"over1\">\n";
       invoice::obj_read($obj);
       if ( count($obj->invlist) > 0 ) {
         $pre = "";
         foreach ($obj->invlist as $i => $f) {
-          echo $pre . $f->getLink() ." : ". $lang['InvoiceStates'][$f->state] ;
+          $r .= $pre . $f->getLink() ." : ". $lang['InvoiceStates'][$f->state] ;
           $pre = "\n<br />";
         }
       }
-      echo "&nbsp;</td>\n";
+      $r .= "&nbsp;</td>\n";
     }
-    return;
+    return $r;
   }
 
   /**