[Phpgroupware-cvs] projects/inc/class.uiprojects.inc.php, 1.139

[nomail]

Update of /projects/inc
Modified Files:
        Branch: 
          class.uiprojects.inc.php

date: 2004/04/20 12:42:14;  author: ceb;  state: Exp;  lines: +19 -6

Log Message:
update
=====================================================================
No syntax errors detected in -
=====================================================================
Index: projects/inc/class.uiprojects.inc.php
diff -u projects/inc/class.uiprojects.inc.php:1.138 
projects/inc/class.uiprojects.inc.php:1.139
--- projects/inc/class.uiprojects.inc.php:1.138 Wed Mar 24 16:35:15 2004
+++ projects/inc/class.uiprojects.inc.php       Tue Apr 20 12:42:14 2004
@@ -590,7 +590,7 @@
 
 // ---------------- list header variable template-declarations 
--------------------------
 
-                       
$this->t->set_var('sort_number',$this->nextmatchs->show_sort_order($this->sort,'num',$this->order,'/index.php',lang('Project
 ID'),$link_data));
+                       
$this->t->set_var('sort_number',$this->nextmatchs->show_sort_order($this->sort,'p_number',$this->order,'/index.php',lang('Project
 ID'),$link_data));
                        $this->t->set_var('lang_milestones',lang('milestones'));
                        
$this->t->set_var('sort_title',$this->nextmatchs->show_sort_order($this->sort,'title',$this->order,'/index.php',lang('Title'),$link_data));
                        
$this->t->set_var('sort_end_date',$this->nextmatchs->show_sort_order($this->sort,'end_date',$this->order,'/index.php',lang('Date
 due'),$link_data));
@@ -776,6 +776,7 @@
                                                
$GLOBALS['phpgw']->template->set_var('message',lang('project %1 has been 
saved',$values['title']));
                                        }
                                }
+                               $radio_acc_factor = $values['radio_acc_factor'];
                        }
 
                        if($_POST['cancel'])
@@ -876,6 +877,18 @@
                        if ($project_id)
                        {
                                $values = 
$this->boprojects->read_single_project($project_id);
+                               $values['radio_acc_factor'] = $radio_acc_factor;
+
+                               if(($_POST['save'] || $_POST['apply']) && 
$error)
+                               {
+                                       $values['coordinator']          = 
$_POST['accountid'];
+                                       $values['employees']            = 
$_POST['employees'];
+
+                                       $values['customer']                     
= $_POST['abid'];
+                                       $values['book_activities']      = 
$book_activities;
+                                       $values['bill_activities']      = 
$bill_activities;
+                               }
+
                                
$GLOBALS['phpgw']->template->set_var('old_status',$values['status']);
                                
$GLOBALS['phpgw']->template->set_var('old_parent',$values['parent']);
                                
$GLOBALS['phpgw']->template->set_var('old_edate',$values['edate']);
@@ -1077,6 +1090,8 @@
                                
$GLOBALS['phpgw']->template->set_var('project_accounting_factor',$values['project_accounting_factor']);
                                
$GLOBALS['phpgw']->template->set_var('project_accounting_factor_d',$values['project_accounting_factor_d']);
                                
$GLOBALS['phpgw']->template->set_var('acc_billable_checked',($values['billable']=='N'?'
 checked':''));
+                               
$GLOBALS['phpgw']->template->set_var('acc_factor_hour',$values['radio_acc_factor']=='hour'?'checked':'');
+                               
$GLOBALS['phpgw']->template->set_var('acc_factor_day',$values['radio_acc_factor']=='day'?'checked':'');
 
                                
$GLOBALS['phpgw']->template->fp('accounting_ownhandle','accounting_own',True);
                        }
@@ -1101,9 +1116,6 @@
                                }
                        }
 
-                       
$GLOBALS['phpgw']->template->set_var('acc_factor_hour',$values['radio_acc_factor']=='hour'?'checked':'');
-                       
$GLOBALS['phpgw']->template->set_var('acc_factor_day',$values['radio_acc_factor']=='day'?'checked':'');
-
                        
$GLOBALS['phpgw']->template->set_var('discount',$values['discount']);
                        
$GLOBALS['phpgw']->template->set_var('dt_amount',$values['discount_type']=='amount'?'checked':'');
                        
$GLOBALS['phpgw']->template->set_var('dt_percent',$values['discount_type']=='percent'?'checked':'');
@@ -1150,7 +1162,8 @@
                                                
$GLOBALS['phpgw']->template->set_var('cfieldhandle','');
                                                
$GLOBALS['phpgw']->template->fp('clisthandle','clist',True);
 
-                                       
$GLOBALS['phpgw']->template->set_var('employee_list',$this->employee_format(array('project_id'
 => ($project_id?$project_id:$parent['project_id']),'action' => 
$action,'pro_parent' => $parent['project_id'])));
+                                       
$GLOBALS['phpgw']->template->set_var('employee_list',$this->employee_format(array('project_id'
 => ($project_id?$project_id:$parent['project_id']),'action' => $action,
+                                                                               
                                                                                
                                        'pro_parent' => 
$parent['project_id'],'selected' => $values['employees'])));
                                                
$GLOBALS['phpgw']->template->set_var('efieldhandle','');
                                                
$GLOBALS['phpgw']->template->fp('elisthandle','elist',True);
                                        break;