[Phpgroupware-cvs] CVS: property add_workorder.php,1.10,1.10.2.1 calculate_addhour.php,1.1.1.1,1.1.1.1.2.1 edit_project.php,1.5,1.5.2.1 edit_workorder.php,1.9,1.9.2.1 invoice_period.php,1.1.1.1,1.1.1.1.2.1 list_vendors_activities.php,1.5,1.5.2.1 list_wo_template_hours.php,1.2,1.2.2.1

[Sigurd Nes <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_14-branch
        add_workorder.php calculate_addhour.php edit_project.php 
        edit_workorder.php invoice_period.php 
        list_vendors_activities.php list_wo_template_hours.php 
Log Message:
no message

Index: add_workorder.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/Attic/add_workorder.php,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -C2 -r1.10 -r1.10.2.1
*** add_workorder.php   8 Nov 2002 19:00:08 -0000       1.10
--- add_workorder.php   29 Jan 2003 22:16:12 -0000      1.10.2.1
***************
*** 271,275 ****
                        }
  
!                       
$GLOBALS['phpgw']->db->lock(array('fm_wo_wrkorders','boei_leietaker','fm_wo_wrkorderbranch'));
  
                        $num_last=$num-1;
--- 271,275 ----
                        }
  
!                       
$GLOBALS['phpgw']->db->lock(array('fm_wo_wrkorders','boei_leietaker','fm_wo_wrkorderbranch','idgenerator'));
  
                        $num_last=$num-1;

Index: calculate_addhour.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/Attic/calculate_addhour.php,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -C2 -r1.1.1.1 -r1.1.1.1.2.1
*** calculate_addhour.php       28 Aug 2002 16:43:06 -0000      1.1.1.1
--- calculate_addhour.php       29 Jan 2003 22:16:12 -0000      1.1.1.1.2.1
***************
*** 355,362 ****
  
        $sql = "SELECT fm_wo_activities.id AS activity_id, 
fm_wo_activities.num, fm_wo_activities.unit AS activity_unit, 
fm_wo_activities.dim_d, fm_wo_activities.base_descr AS base, 
fm_wo_activities.descr as activity_descr, total_cost as activity_billperae"
!               . " FROM fm_wo_activity_price_index JOIN "
!         . " fm_wo_activities ON fm_wo_activity_price_index.activity_id = 
fm_wo_activities.id JOIN "
          . " fm_wo_agreement ON fm_wo_activities.agreement_id = 
fm_wo_agreement.id"
!               . " WHERE fm_wo_activity_price_index.vendor_id = '$vendor_id' 
and current_index = '1' and fm_wo_agreement.status= 'active' "
                . " $ordermethod";
  
--- 355,362 ----
  
        $sql = "SELECT fm_wo_activities.id AS activity_id, 
fm_wo_activities.num, fm_wo_activities.unit AS activity_unit, 
fm_wo_activities.dim_d, fm_wo_activities.base_descr AS base, 
fm_wo_activities.descr as activity_descr, total_cost as activity_billperae"
!               . " FROM fm_wo_activity_price_index $join "
!         . " fm_wo_activities ON fm_wo_activity_price_index.activity_id = 
fm_wo_activities.id $join "
          . " fm_wo_agreement ON fm_wo_activities.agreement_id = 
fm_wo_agreement.id"
!               . " WHERE fm_wo_activity_price_index.vendor_id = '$vendor_id' 
and current_index is not null and fm_wo_agreement.status= 'active' "
                . " $ordermethod";
  

Index: edit_project.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/Attic/edit_project.php,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -C2 -r1.5 -r1.5.2.1
*** edit_project.php    15 Nov 2002 21:23:51 -0000      1.5
--- edit_project.php    29 Jan 2003 22:16:12 -0000      1.5.2.1
***************
*** 215,219 ****
                        }
  
!                       
$GLOBALS['phpgw']->db->lock(array('fm_wo_project','boei_leietaker','fm_wo_wrkorderactivities','fm_wo_wrkorderbranch'));
  
                        $GLOBALS['phpgw']->db->query("update fm_wo_project set 
access='$access', category='$cat_id', entry_date='" . time() . "', start_date='"
--- 215,219 ----
                        }
  
! //                    
$GLOBALS['phpgw']->db->lock(array('fm_wo_project','boei_leietaker','fm_wo_wrkorderactivities','fm_wo_wrkorderbranch'));
  
                        $GLOBALS['phpgw']->db->query("update fm_wo_project set 
access='$access', category='$cat_id', entry_date='" . time() . "', start_date='"
***************
*** 274,278 ****
                                }
                        }
!                       $GLOBALS['phpgw']->db->unlock();
                }
  //---------------------------end copy order----------------
--- 274,278 ----
                                }
                        }
! //                    $GLOBALS['phpgw']->db->unlock();
                }
  //---------------------------end copy order----------------

Index: edit_workorder.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/Attic/edit_workorder.php,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -C2 -r1.9 -r1.9.2.1
*** edit_workorder.php  8 Nov 2002 19:00:08 -0000       1.9
--- edit_workorder.php  29 Jan 2003 22:16:12 -0000      1.9.2.1
***************
*** 273,277 ****
                        }
  
!                       
$GLOBALS['phpgw']->db->lock(array('fm_wo_wrkorders','boei_leietaker','fm_wo_wrkorderbranch'));
  
                        $GLOBALS['phpgw']->db->query("update fm_wo_wrkorders 
set project_id=$project_id_value, access='$access', category='$cat_id', 
entry_date='" . time() . "', start_date='"
--- 273,277 ----
                        }
  
! //                    
$GLOBALS['phpgw']->db->lock(array('fm_wo_wrkorders','boei_leietaker','fm_wo_wrkorderbranch'));
  
                        $GLOBALS['phpgw']->db->query("update fm_wo_wrkorders 
set project_id=$project_id_value, access='$access', category='$cat_id', 
entry_date='" . time() . "', start_date='"
***************
*** 336,340 ****
                                }
                        }
!                       $GLOBALS['phpgw']->db->unlock();
                }
  
--- 336,340 ----
                                }
                        }
! //                    $GLOBALS['phpgw']->db->unlock();
                }
  
***************
*** 361,365 ****
                        $title = addslashes($title);
  
!                       
$GLOBALS['phpgw']->db->lock(array('fm_wo_wrkorders','boei_leietaker','fm_wo_wrkorderactivities','fm_wo_wrkorderbranch'));
  
                        $num_last=$num-1;
--- 361,365 ----
                        $title = addslashes($title);
  
! //                    
$GLOBALS['phpgw']->db->lock(array('fm_wo_wrkorders','boei_leietaker','fm_wo_wrkorderactivities','fm_wo_wrkorderbranch'));
  
                        $num_last=$num-1;
***************
*** 492,496 ****
                        }
                //      $GLOBALS['phpgw']->db->transaction_abort();
!                       $GLOBALS['phpgw']->db->unlock();
                }
  
--- 492,496 ----
                        }
                //      $GLOBALS['phpgw']->db->transaction_abort();
! //                    $GLOBALS['phpgw']->db->unlock();
                }
  
***************
*** 976,980 ****
                
$t->set_var('jobs',$GLOBALS['phpgw']->link('/property/calculate_listhours.php','wrkorder_id='
 . $id));
                $t->set_var('lang_jobs',lang('Calculation'));
!               
$t->set_var('print_view',$GLOBALS['phpgw']->link('/property/view_workorder.php','id='
 . $id));
                $t->set_var('lang_print_view',lang('Print view'));
                
$t->set_var('check_requirements_link',$GLOBALS['phpgw']->link('/property/list_wrkorder_request.php','location_code='
 . $objekt_id));
--- 976,980 ----
                
$t->set_var('jobs',$GLOBALS['phpgw']->link('/property/calculate_listhours.php','wrkorder_id='
 . $id));
                $t->set_var('lang_jobs',lang('Calculation'));
!               
$t->set_var('print_view',$GLOBALS['phpgw']->link('/property/view_workorder.php','id='
 . $id.'&view_one_page=1'));
                $t->set_var('lang_print_view',lang('Print view'));
                
$t->set_var('check_requirements_link',$GLOBALS['phpgw']->link('/property/list_wrkorder_request.php','location_code='
 . $objekt_id));

Index: invoice_period.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/Attic/invoice_period.php,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -C2 -r1.1.1.1 -r1.1.1.1.2.1
*** invoice_period.php  28 Aug 2002 16:43:11 -0000      1.1.1.1
--- invoice_period.php  29 Jan 2003 22:16:12 -0000      1.1.1.1.2.1
***************
*** 9,14 ****
  
  $GLOBALS['phpgw_info']["flags"] = array('currentapp' => 'property',
!                                       'noheader'                      => True,
!                                       'nonavbar'                      => 
True);
  
        include('../header.inc.php');
--- 9,14 ----
  
  $GLOBALS['phpgw_info']["flags"] = array('currentapp' => 'property',
!                                       'noheader'                      => true,
!                                       'nonavbar'                      => 
true);
  
        include('../header.inc.php');

Index: list_vendors_activities.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/Attic/list_vendors_activities.php,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -C2 -r1.5 -r1.5.2.1
*** list_vendors_activities.php 16 Oct 2002 15:27:09 -0000      1.5
--- list_vendors_activities.php 29 Jan 2003 22:16:12 -0000      1.5.2.1
***************
*** 195,199 ****
                . " 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 ";
--- 195,199 ----
                . " 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 is not null "
                . " 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 ";

Index: list_wo_template_hours.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/Attic/list_wo_template_hours.php,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** list_wo_template_hours.php  16 Sep 2002 16:05:44 -0000      1.2
--- list_wo_template_hours.php  29 Jan 2003 22:16:12 -0000      1.2.2.1
***************
*** 74,78 ****
        //      . " dim_d,hours_descr,fm_wo_ns3420.id";
  
!       $ordermethod = "order by grouping_id asc, record asc";
        }
  
--- 74,78 ----
        //      . " dim_d,hours_descr,fm_wo_ns3420.id";
  
!       $ordermethod = " order by grouping_id asc, record asc";
        }