[Phpgroupware-cvs] property/inc class.soequipment.inc.php, 1.27, 1.28 class.soreport.inc.php, 1.11, 1.12

[Sigurd Nes <address@hidden>]

Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv24550/inc

Modified Files:
        class.soequipment.inc.php class.soreport.inc.php 
Log Message:
no message

Index: class.soreport.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soreport.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** class.soreport.inc.php      29 Sep 2003 17:53:51 -0000      1.11
--- class.soreport.inc.php      29 Sep 2003 21:29:18 -0000      1.12
***************
*** 370,375 ****
                function generate_id($report_type)
                {
-                       $year = 
$GLOBALS['phpgw']->common->show_date(time(),'Y');
- 
                        $this->db->query("select prefix from fm_report_type 
where id='$report_type' ");
                        $this->db->next_record();
--- 370,373 ----
***************
*** 382,385 ****
--- 380,389 ----
                                $this->db->next_record();
                                $num = substr($this->db->f('report_id'),$pos);
+                       }
+                       else
+                       {
+                               $this->db->query("select max(report_id) as 
report_id from fm_report");
+                               $this->db->next_record();
+                               $num = $this->db->f('report_id');
                        }
  

Index: class.soequipment.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soequipment.inc.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** class.soequipment.inc.php   29 Sep 2003 17:53:51 -0000      1.27
--- class.soequipment.inc.php   29 Sep 2003 21:29:18 -0000      1.28
***************
*** 374,377 ****
--- 374,383 ----
                                $num = 
substr($this->db->f('equipment_id'),$pos);
                        }
+                       else
+                       {
+                               $this->db->query("select max(equipment_id) as 
equipment_id from fm_equipment");
+                               $this->db->next_record();
+                               $num = $this->db->f('equipment_id');
+                       }
  
                        $max = $this->bocommon->add_leading_zero($num);