[Phpgroupware-cvs] CVS: property invoice_paid.php,1.8,1.9 edit_project.php,1.4,1.5 add_project.php,1.3,1.4 list_drawing.php,1.2,1.3

[Sigurd Nes <address@hidden>]

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

Modified Files:
        invoice_paid.php edit_project.php add_project.php 
        list_drawing.php 
Log Message:
no message

Index: invoice_paid.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/invoice_paid.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** invoice_paid.php    8 Nov 2002 19:00:08 -0000       1.8
--- invoice_paid.php    15 Nov 2002 21:23:51 -0000      1.9
***************
*** 81,84 ****
--- 81,85 ----
        $t->set_var('lang_to_date',lang('To'));
        $t->set_var('lang_invoice',lang('Invoice'));
+       $t->set_var('lang_workorder',lang('Workorder'));
        $t->set_var('query',$query);
  
***************
*** 208,228 ****
  
  
- 
- 
- /*    if ($coordinator_lid)
-       {
- //            $GLOBALS['phpgw']->common->appsession($coordinator_lid);
-               
$GLOBALS['phpgw']->session->appsession('coordinator_lid','property',$coordinator_lid);
- 
-       }
-       else
-       {
- //            $coordinator_lid =$GLOBALS['phpgw']->common->appsession();
-               $coordinator_lid 
=$GLOBALS['phpgw']->session->appsession('coordinator_lid','property');
-               echo 'coordinator_lid: '.$coordinator_lid .'<BR>';
-       }
- 
- */
- 
        if ($coordinator_lid=='all')
        {
--- 209,212 ----
***************
*** 231,235 ****
        else
        {
- //            $coordinator= (" $where_1 (oppsynsmannid like " . 
"'%$coordinator_lid%'"." or saksbehandlerid like " . "'%$coordinator_lid%'" . " 
or budsjettansvarligid like " . "'%$coordinator_lid%')");
                $coordinator= (" $where_1 (oppsynsmannid=" . 
"'$coordinator_lid'"." or saksbehandlerid = " . "'$coordinator_lid'" . " or 
budsjettansvarligid = " . "'$coordinator_lid')");
        }
--- 215,218 ----
***************
*** 249,252 ****
--- 232,244 ----
        }
  
+       if($wrkorder)
+       {
+               $querymethod=" where pmwrkord_code= $wrkorder ";
+               $filtermethod = '';
+               $timesearch = '';
+               $coordinator='';
+       }
+ 
+ 
        $GLOBALS['phpgw']->db->query(" SELECT * from fm_admin  where account_id 
= $user_id");
        $GLOBALS['phpgw']->db->next_record();
***************
*** 261,265 ****
  //    echo 'query: '.$query .'<BR>';
  
!       if ($coordinator_lid || $ab_id || $objekt_id)
        {
  
--- 253,257 ----
  //    echo 'query: '.$query .'<BR>';
  
!       if ($coordinator_lid || $ab_id || $objekt_id || $wrkorder)
        {
  

Index: edit_project.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/edit_project.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** edit_project.php    26 Oct 2002 09:03:38 -0000      1.4
--- edit_project.php    15 Nov 2002 21:23:51 -0000      1.5
***************
*** 392,396 ****
                $to_approval_from_email = $prefs['email']['address'];
                $field_size= strlen($to_approval_from_email)+3;
!               $t->set_var('to_approval_from_email','<input type="text" 
size="'. $field_size .'" name="coordinator_email" value="' 
.$to_approval_from_email .'">');
  
  //            echo 'to: '.$to_approval_from_email .'<BR>';
--- 392,396 ----
                $to_approval_from_email = $prefs['email']['address'];
                $field_size= strlen($to_approval_from_email)+3;
!               $t->set_var('to_approval_from_email','<input type="text" 
size="'. $field_size .'" name="to_approval_from_email" value="' 
.$to_approval_from_email .'">');
  
  //            echo 'to: '.$to_approval_from_email .'<BR>';

Index: add_project.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/add_project.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** add_project.php     26 Oct 2002 09:03:38 -0000      1.3
--- add_project.php     15 Nov 2002 21:23:51 -0000      1.4
***************
*** 310,314 ****
        $t->set_var('lang_num',lang('Project ID'));
        $t->set_var('num',$num);
! 
  
        if (! $submit)
--- 310,317 ----
        $t->set_var('lang_num',lang('Project ID'));
        $t->set_var('num',$num);
!       $t->set_var('wrkorder_header','');
!       $t->set_var('wrkorder','');
!       $t->set_var('lang_sum_calculation','');
!       $t->set_var('sum_calculation','');
  
        if (! $submit)
***************
*** 339,343 ****
                $to_approval_from_email = $prefs['email']['address'];
                $field_size= strlen($to_approval_from_email)+3;
!               $t->set_var('to_approval_from_email','<input type="text" 
size="'. $field_size .'" name="coordinator_email" value="' 
.$to_approval_from_email .'">');
  
  //            echo 'to: '.$to_approval_from_email .'<BR>';
--- 342,346 ----
                $to_approval_from_email = $prefs['email']['address'];
                $field_size= strlen($to_approval_from_email)+3;
!               $t->set_var('to_approval_from_email','<input type="text" 
size="'. $field_size .'" name="to_approval_from_email" value="' 
.$to_approval_from_email .'">');
  
  //            echo 'to: '.$to_approval_from_email .'<BR>';

Index: list_drawing.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/list_drawing.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** list_drawing.php    1 Sep 2002 19:43:49 -0000       1.2
--- list_drawing.php    15 Nov 2002 21:23:51 -0000      1.3
***************
*** 22,25 ****
--- 22,30 ----
        $c->app_name = 'property';
  
+       $config = CreateObject('phpgwapi.config','property');
+       $config->read_repository();
+ 
+       $katalog= $config->config_data['drawing_path'];
+ 
        $GLOBALS['phpgw']->session->appsession('sub','property','p_property');
  
***************
*** 233,240 ****
                                                'street'        => $street
                                                ));
-               $katalog="//172.20.35.179/phpgroupware/tegninger/";
  
! //            
$t->set_var('link_drawing_dwg',$GLOBALS['phpgw']->link('/tegninger/'.$drawing));
!               $t->set_var('link_drawing_dwg',$katalog.$drawing);
  
                $t->parse('list','drawing_list',true);
--- 238,243 ----
                                                'street'        => $street
                                                ));
  
!               $t->set_var('link_drawing_dwg',$katalog.SEP.$drawing);
  
                $t->parse('list','drawing_list',true);