[Phpgroupware-cvs] property/inc class.soworkorder.inc.php, 1.9 class.soproject.inc.php, 1.22

[sigurdne]

Update of property/inc

Modified Files:
     Branch: MAIN
            class.soworkorder.inc.php lines: +5 -5
            class.soproject.inc.php lines: +2 -5

Log Message:
no message

====================================================
Index: property/inc/class.soworkorder.inc.php
diff -u property/inc/class.soworkorder.inc.php:1.8 
property/inc/class.soworkorder.inc.php:1.9
--- property/inc/class.soworkorder.inc.php:1.8  Thu May 12 21:26:28 2005
+++ property/inc/class.soworkorder.inc.php      Fri Jun 10 09:47:52 2005
@@ -472,12 +472,12 @@

                        $this->db->query("INSERT INTO fm_orders (id,type) 
VALUES (" . $workorder['workorder_id'] . ",'workorder')");

-
+/*
                        if($workorder['charge_tenant'])
                        {
                                $this->db->query("UPDATE fm_project set 
charge_tenant = 1 WHERE id =" . $workorder['project_id']);
                        }
-
+*/
                        if($this->db->transaction_commit())
                        {
                                $this->increment_workorder_id();
@@ -525,11 +525,11 @@

                        $this->db->query("UPDATE fm_workorder set $value_set 
WHERE id=" . $workorder['workorder_id'] ,__LINE__,__FILE__);

-                       if($workorder['charge_tenant'])
+/*                     if($workorder['charge_tenant'])
                        {
                                $this->db->query("UPDATE fm_project set 
charge_tenant = 1 WHERE id =" . $workorder['project_id']);
                        }
-
+*/
                        if($this->db->transaction_commit())
                        {
                                if ($old_status != $workorder['status'])

====================================================
Index: property/inc/class.soproject.inc.php
diff -u property/inc/class.soproject.inc.php:1.21 
property/inc/class.soproject.inc.php:1.22
--- property/inc/class.soproject.inc.php:1.21   Thu May 12 21:26:28 2005
+++ property/inc/class.soproject.inc.php        Fri Jun 10 09:47:52 2005
@@ -323,7 +323,6 @@
                                $project['key_deliver']                 = 
$this->db->f('key_deliver');
                                $project['other_branch']                = 
$this->db->f('other_branch');
                                $project['key_responsible']             = 
$this->db->f('key_responsible');
-                               $project['charge_tenant']               = 
$this->db->f('charge_tenant');
                                $project['descr']                               
= $this->db->f('descr');
                                $project['status']                              
= $this->db->f('status');
                                $project['budget']                              
= (int)$this->db->f('budget');
@@ -504,7 +503,6 @@
                                $project['key_fetch'],
                                $project['other_branch'],
                                $project['key_responsible'],
-                               $project['charge_tenant'],
                                $this->account);

                        $values = $this->bocommon->validate_db_insert($values);
@@ -512,7 +510,7 @@
                        $this->db->transaction_begin();

                        $this->db->query("INSERT INTO fm_project 
(id,name,access,category,entry_date,start_date,end_date,coordinator,status,"
-                               . 
"descr,budget,reserve,location_code,address,key_deliver,key_fetch,other_branch,key_responsible,charge_tenant,user_id
 $cols) "
+                               . 
"descr,budget,reserve,location_code,address,key_deliver,key_fetch,other_branch,key_responsible,user_id
 $cols) "
                                . "VALUES ($values $vals )",__LINE__,__FILE__);

                        if($project['extra']['contact_phone'] && 
$project['extra']['tenant_id'])
@@ -677,7 +675,6 @@
                                'key_fetch'                     => 
$project['key_fetch'],
                                'other_branch'          => 
$project['other_branch'],
                                'key_responsible'       => 
$project['key_responsible'],
-                               'charge_tenant'         => 
$project['charge_tenant'],
                                'location_code'         => 
$project['location_code'],
                                'address'                       => $address
                                );