[Phpgroupware-cvs] CVS: property calculate_edithour.php,1.3,1.4 hours_addhour.php,1.3,1.4 list_vendors_activities.php,1.3,1.4 hours_addhour_test.php,1.2,NONE

[Sigurd Nes <address@hidden>]

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

Modified Files:
        calculate_edithour.php hours_addhour.php 
        list_vendors_activities.php 
Removed Files:
        hours_addhour_test.php 
Log Message:
no message

Index: calculate_edithour.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/calculate_edithour.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** calculate_edithour.php      2 Oct 2002 17:00:00 -0000       1.3
--- calculate_edithour.php      7 Oct 2002 15:49:09 -0000       1.4
***************
*** 116,126 ****
        // ---------------------end grouping ------------------------------
  
!       /*              if (!$grouping_id==$grouping_orig)
                        {
!                               $GLOBALS['phpgw']->db->query("SELECT 
max(record) as record FROM fm_wo_hours WHERE wrkorder_id ='$wrkorder_id' and 
grouping_id= '$grouping_id'");
                                $GLOBALS['phpgw']->db->next_record();
                                $record= $GLOBALS['phpgw']->db->f('record')+1;
                                echo 'record: '.$record .'<BR>';
- 
                        }
                        else
--- 116,126 ----
        // ---------------------end grouping ------------------------------
  
! 
!                       if (!$building_part_orig==$building_part)
                        {
!                               $GLOBALS['phpgw']->db->query("SELECT 
max(record) as record FROM fm_wo_hours WHERE wrkorder_id ='$wrkorder_id' and 
building_part= '$building_part'");
                                $GLOBALS['phpgw']->db->next_record();
                                $record= $GLOBALS['phpgw']->db->f('record')+1;
                                echo 'record: '.$record .'<BR>';
                        }
                        else
***************
*** 129,149 ****
                        }
  
!       */
! 
!                       $record=$record_orig;
  
                        if(!$grouping_id)
                        {
!                               $grouping_id_value= 'NULL';
!                               $record_value= 'NULL';
!                               if($record_orig==1)
!                               {
!                                       $record_delete='True';
!                               }
                        }
                        else
                        {
                                $grouping_id_value="'$grouping_id'";
-                               $record_value="'$record'";
                        }
  
--- 129,141 ----
                        }
  
!                       $record_value="'$record'";
  
                        if(!$grouping_id)
                        {
!                               $grouping_id_value= '0';
                        }
                        else
                        {
                                $grouping_id_value="'$grouping_id'";
                        }
  
***************
*** 157,161 ****
                        $GLOBALS['phpgw']->db->query("UPDATE  fm_wo_wrkorders 
set chapter_id='$chapter' WHERE id ='$wrkorder_id'");
  
!                       if($record_delete)
                        {
                                $GLOBALS['phpgw']->db->query("SELECT 
min(record) as record_min FROM fm_wo_hours WHERE wrkorder_id ='$wrkorder_id' 
and grouping_id= '$grouping_orig'");
--- 149,153 ----
                        $GLOBALS['phpgw']->db->query("UPDATE  fm_wo_wrkorders 
set chapter_id='$chapter' WHERE id ='$wrkorder_id'");
  
! /*                    if($record_delete)
                        {
                                $GLOBALS['phpgw']->db->query("SELECT 
min(record) as record_min FROM fm_wo_hours WHERE wrkorder_id ='$wrkorder_id' 
and grouping_id= '$grouping_orig'");
***************
*** 164,168 ****
--- 156,162 ----
  
                                $GLOBALS['phpgw']->db->query("UPDATE  
fm_wo_hours set record='1' WHERE grouping_id='$grouping_orig'and wrkorder_id 
='$wrkorder_id' and record= '$record_min'");
+ 
                        }
+ */
                }
        }
***************
*** 298,301 ****
--- 292,296 ----
                . '<input type="hidden" name="wrkorder_id" value="' . 
$wrkorder_id . '">' . "\n"
                . '<input type="hidden" name="record_orig" value="' . $record . 
'">' . "\n"
+               . '<input type="hidden" name="building_part_orig" value="' . 
$building_part . '">' . "\n"
                . '<input type="hidden" name="grouping_orig" value="' . 
$grouping_id . '">' . "\n"
                . '<input type="hidden" name="delivery_id" value="' . 
$delivery_id . '">' . "\n"

Index: hours_addhour.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/hours_addhour.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** hours_addhour.php   2 Oct 2002 17:00:00 -0000       1.3
--- hours_addhour.php   7 Oct 2002 15:49:09 -0000       1.4
***************
*** 142,151 ****
                {
                        $grouping_descr= '';
!                       $grouping_id_value='NULL';
  
                }
                if(!$grouping_id_value)
                {
!                       $grouping_id_value= 'NULL';
                }
        // ---------------------end grouping ------------------------------
--- 142,151 ----
                {
                        $grouping_descr= '';
!                       $grouping_id_value='0';
  
                }
                if(!$grouping_id_value)
                {
!                       $grouping_id_value= '0';
                }
        // ---------------------end grouping ------------------------------

Index: list_vendors_activities.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/list_vendors_activities.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** list_vendors_activities.php 28 Sep 2002 22:07:12 -0000      1.3
--- list_vendors_activities.php 7 Oct 2002 15:49:09 -0000       1.4
***************
*** 195,204 ****
                . " FROM (fm_wo_activities  $join fm_wo_activity_price_index ON 
fm_wo_activities.id = fm_wo_activity_price_index.activity_id) $join 
phpgw_addressbook ON fm_wo_activity_price_index.vendor_id = 
phpgw_addressbook.id "
                . " $join fm_wo_branch ON fm_wo_activities.branch_id = 
fm_wo_branch.id "
!               . " WHERE vendor_id='$vendor_id' and current_index = '1'"
                . " ORDER BY phpgw_addressbook.org_name,activity_id ";
  
  
        $db2->query($sql,__LINE__,__FILE__);
- //    $db2->query("select distinct fm_wo_activities.id from 
fm_wo_activities",__LINE__,__FILE__);
        $db2->next_record();
        $total_records = $db2->num_rows();
--- 195,204 ----
                . " FROM (fm_wo_activities  $join fm_wo_activity_price_index ON 
fm_wo_activities.id = fm_wo_activity_price_index.activity_id) $join 
phpgw_addressbook ON fm_wo_activity_price_index.vendor_id = 
phpgw_addressbook.id "
                . " $join fm_wo_branch ON fm_wo_activities.branch_id = 
fm_wo_branch.id "
!               . " WHERE vendor_id='$vendor_id' and current_index = '1' "
!               . " OR (fm_wo_activity_price_index.vendor_id = '$vendor_id') 
AND (fm_wo_activity_price_index.this_index IS NULL) "
                . " ORDER BY phpgw_addressbook.org_name,activity_id ";
  
  
        $db2->query($sql,__LINE__,__FILE__);
        $db2->next_record();
        $total_records = $db2->num_rows();

--- hours_addhour_test.php DELETED ---