[Phpgroupware-cvs] property/inc class.sowo_hour.inc.php,1.5

[sigurdne]

Update of property/inc

Modified Files:
     Branch: MAIN
            class.sowo_hour.inc.php lines: +7 -15

Log Message:
no message

====================================================
Index: property/inc/class.sowo_hour.inc.php
diff -u property/inc/class.sowo_hour.inc.php:1.4 
property/inc/class.sowo_hour.inc.php:1.5
--- property/inc/class.sowo_hour.inc.php:1.4    Mon Apr 11 11:59:02 2005
+++ property/inc/class.sowo_hour.inc.php        Wed Apr 13 06:43:15 2005
@@ -180,8 +180,6 @@
                        }
 //_debug_array($deviation);
                        return $deviation;
-
-
                }


@@ -269,12 +267,10 @@

                function next_record($workorder_id)
                {
-
                        $this->db->query("SELECT  max(record) as record FROM 
fm_wo_hours where workorder_id='$workorder_id'",__LINE__,__FILE__);
                        $this->db->next_record();
                        $record = $this->db->f('record')+1;
                        return $record;
-
                }

                function add_template($values,$workorder_id)
@@ -283,7 +279,6 @@
                        $values['name'] = 
$this->db->db_addslashes($values['name']);
                        $soworkorder    = 
CreateObject($this->currentapp.'.soworkorder');
                        $workorder              = 
$soworkorder->read_single($workorder_id);
-//_debug_array($workorder);

                        $this->db->transaction_begin();

@@ -306,11 +301,10 @@

                        $hour = $this->read(array('workorder_id' => 
$workorder_id));

-                       $record = $this->next_record($hour[0]['workorder_id']);
+                       $record = $this->next_record($workorder_id);

                        for ($i=0; $i<count($hour); $i++)
                        {
-
                                $values_insert= array(
                                        $hour[$i]['activity_id'],
                                        $hour[$i]['activity_num'],
@@ -348,12 +342,10 @@

                function add_hour($hour)
                {
-
                        $record = $this->next_record($hour[0]['workorder_id']);

                        for ($i=0; $i<count($hour); $i++)
                        {
-
                                $values= array(
                                        $hour[$i]['activity_id'],
                                        $hour[$i]['activity_num'],
@@ -382,18 +374,18 @@
                        $receipt['hour_id'] = 
$this->db->get_last_insert_id('fm_wo_hours','id');

                        return $receipt;
-
                }

                function add_hour_from_template($hour,$workorder_id)
                {
-//_debug_array($hour);

                        $record = $this->next_record($workorder_id);

-                       $this->db->query("UPDATE fm_workorder set
-                               chapter_id      ='" . $hour[0]['chapter_id'] . 
"' WHERE id= '$workorder_id'",__LINE__,__FILE__);
-
+                       if($hour[0]['chapter_id'])
+                       {
+                               $this->db->query("UPDATE fm_workorder set
+                                       chapter_id      ='" . 
$hour[0]['chapter_id'] . "' WHERE id= '$workorder_id'",__LINE__,__FILE__);
+                       }

                        for ($i=0; $i<count($hour); $i++)
                        {