[Phpgroupware-cvs] CVS: property/inc class.bocommon.inc.php,1.29,1.30 class.uiproject.inc.php,1.4,1.5 class.uiwo_hour.inc.php,1.5,1.6 class.uiworkorder.inc.php,1.10,1.11

[Sigurd Nes <address@hidden>]

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

Modified Files:
        class.bocommon.inc.php class.uiproject.inc.php 
        class.uiwo_hour.inc.php class.uiworkorder.inc.php 
Log Message:
no message

Index: class.bocommon.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.bocommon.inc.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** class.bocommon.inc.php      18 Mar 2003 10:51:28 -0000      1.29
--- class.bocommon.inc.php      1 Apr 2003 16:37:37 -0000       1.30
***************
*** 474,479 ****
                                'link_helpdesk'         =>      
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uitts.index'),
                                'lang_helpdesk'         =>      
lang('Helpdesk'),
!                               'link_workorder'        =>      
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiproject.index'),
!                               'lang_workorder'        =>      
lang('Workorder'),
                                'link_invoice'          =>      
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiinvoice.index'),
                                'lang_invoice'          =>      lang('Invoice'),
--- 474,479 ----
                                'link_helpdesk'         =>      
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uitts.index'),
                                'lang_helpdesk'         =>      
lang('Helpdesk'),
!                               'link_project'          =>      
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiproject.index'),
!                               'lang_project'          =>      lang('Project'),
                                'link_invoice'          =>      
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiinvoice.index'),
                                'lang_invoice'          =>      lang('Invoice'),
***************
*** 603,607 ****
                        $menu['sublang_agreement']='';
                        }
!                       if ($sub == workorder)
                        {
                                
$menu['sub_workorder_list']=$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiworkorder.index');
--- 603,607 ----
                        $menu['sublang_agreement']='';
                        }
!                       if ($sub == project)
                        {
                                
$menu['sub_workorder_list']=$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiworkorder.index');
***************
*** 615,619 ****
                                
$menu['sublang_workorder_archive']=lang('Archive');
                                
$menu['sublang_workorder_template']=lang('Workorder template');
!                               if($this->acl2->check('.workorder',16))
                                {
                                        
$menu['sub_workorder_event']=$GLOBALS['phpgw']->link('/property/list_event.php','sub=workorder');
--- 615,619 ----
                                
$menu['sublang_workorder_archive']=lang('Archive');
                                
$menu['sublang_workorder_template']=lang('Workorder template');
!                               if($this->acl2->check('.project',16))
                                {
                                        
$menu['sub_workorder_event']=$GLOBALS['phpgw']->link('/property/list_event.php','sub=workorder');

Index: class.uiproject.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiproject.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** class.uiproject.inc.php     1 Apr 2003 08:51:20 -0000       1.4
--- class.uiproject.inc.php     1 Apr 2003 16:37:37 -0000       1.5
***************
*** 50,54 ****
                        $this->status_id                        = 
$this->bo->status_id;
  
!                       
$GLOBALS['phpgw']->session->appsession('sub',$this->currentapp,'workorder');
                }
  
--- 50,54 ----
                        $this->status_id                        = 
$this->bo->status_id;
  
!                       
$GLOBALS['phpgw']->session->appsession('sub',$this->currentapp,'project');
                }
  

Index: class.uiwo_hour.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiwo_hour.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** class.uiwo_hour.inc.php     31 Mar 2003 21:14:14 -0000      1.5
--- class.uiwo_hour.inc.php     1 Apr 2003 16:37:37 -0000       1.6
***************
*** 64,68 ****
                        $this->allrows                          = 
$this->bo->allrows;
  
!                       
$GLOBALS['phpgw']->session->appsession('sub',$this->currentapp,'workorder');
                }
  
--- 64,68 ----
                        $this->allrows                          = 
$this->bo->allrows;
  
!                       
$GLOBALS['phpgw']->session->appsession('sub',$this->currentapp,'project');
                }
  
***************
*** 264,267 ****
--- 264,274 ----
  
  
+               function tender_()
+               {
+ echo 'hei';
+                       define('PHPGW_FOOTER_RAN',True);
+ 
+               }
+ 
                function tender()
                {
***************
*** 270,273 ****
--- 277,282 ----
                        $workorder_id = 
get_var('workorder_id',array('POST','GET'));
                        $show_cost = get_var('show_cost',array('POST','GET'));
+                       $mark_draft = get_var('mark_draft',array('POST','GET'));
+ 
  
  
***************
*** 336,339 ****
--- 345,355 ----
                        $this->pdf->addText(50,823,6,lang('Chapter') . ' ' 
.$common_data['workorder']['chapter_id'] . ' ' . 
$common_data['workorder']['chapter'] );
                        $this->pdf->addText(50,34,6,'BBB');
+                       if($mark_draft)
+                       {
+                               $this->pdf->setColor(1,0,0);
+               //              $this->pdf->setColor(66,66,99);
+                               
$this->pdf->addText(200,400,40,lang('DRAFT'),-10);
+                               $this->pdf->setColor(1,0,0);
+                       }
                        $this->pdf->restoreState();
                        $this->pdf->closeObject();
***************
*** 414,417 ****
--- 430,436 ----
                                'lang_show_cost'                                
        => lang('Show calculated cost'),
                                'lang_show_cost_statustext'                     
=> lang('Show calculated cost on the printview'),
+ 
+                               'lang_mark_draft'                               
        => lang('Mark as DRAFT'),
+                               'lang_mark_draft_statustext'            => 
lang('Mark the tender as DRAFT')
  
                        );

Index: class.uiworkorder.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiworkorder.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** class.uiworkorder.inc.php   31 Mar 2003 21:14:14 -0000      1.10
--- class.uiworkorder.inc.php   1 Apr 2003 16:37:37 -0000       1.11
***************
*** 52,56 ****
                        $this->status_id                        = 
$this->bo->status_id;
  
!                       
$GLOBALS['phpgw']->session->appsession('sub',$this->currentapp,'workorder');
                }
  
--- 52,56 ----
                        $this->status_id                        = 
$this->bo->status_id;
  
!                       
$GLOBALS['phpgw']->session->appsession('sub',$this->currentapp,'project');
                }