phpgroupware-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Phpgroupware-cvs] property inc/class.uiagreement.inc.php inc/clas...


From: Sigurd Nes
Subject: [Phpgroupware-cvs] property inc/class.uiagreement.inc.php inc/clas...
Date: Fri, 22 Dec 2006 14:43:54 +0000

CVSROOT:        /sources/phpgroupware
Module name:    property
Changes by:     Sigurd Nes <sigurdne>   06/12/22 14:43:54

Modified files:
        inc            : class.uiagreement.inc.php 
                         class.uiinvestment.inc.php 
                         class.uiinvoice.inc.php 
                         class.uipricebook.inc.php 
                         class.uir_agreement.inc.php 
                         class.uis_agreement.inc.php 
                         class.uiwo_hour.inc.php 
        templates/base : agreement.xsl investment.xsl invoice.xsl 
                         pricebook.xsl r_agreement.xsl s_agreement.xsl 
                         wo_hour.xsl 

Log message:
        styles and utf

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uiagreement.inc.php?cvsroot=phpgroupware&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uiinvestment.inc.php?cvsroot=phpgroupware&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uiinvoice.inc.php?cvsroot=phpgroupware&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uipricebook.inc.php?cvsroot=phpgroupware&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uir_agreement.inc.php?cvsroot=phpgroupware&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uis_agreement.inc.php?cvsroot=phpgroupware&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uiwo_hour.inc.php?cvsroot=phpgroupware&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/property/templates/base/agreement.xsl?cvsroot=phpgroupware&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/property/templates/base/investment.xsl?cvsroot=phpgroupware&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/property/templates/base/invoice.xsl?cvsroot=phpgroupware&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/property/templates/base/pricebook.xsl?cvsroot=phpgroupware&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/property/templates/base/r_agreement.xsl?cvsroot=phpgroupware&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/property/templates/base/s_agreement.xsl?cvsroot=phpgroupware&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/property/templates/base/wo_hour.xsl?cvsroot=phpgroupware&r1=1.9&r2=1.10

Patches:
Index: inc/class.uiagreement.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uiagreement.inc.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- inc/class.uiagreement.inc.php       15 Dec 2006 20:16:44 -0000      1.28
+++ inc/class.uiagreement.inc.php       22 Dec 2006 14:43:54 -0000      1.29
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage agreement
-       * @version $Id: class.uiagreement.inc.php,v 1.28 2006/12/15 20:16:44 
sigurdne Exp $
+       * @version $Id: class.uiagreement.inc.php,v 1.29 2006/12/22 14:43:54 
sigurdne Exp $
        */
 
        /**
@@ -530,6 +530,11 @@
                                }
                        }
 
+                       if(!isset($GLOBALS['phpgw']->js) || 
!is_object($GLOBALS['phpgw']->js))
+                       {
+                               $GLOBALS['phpgw']->js = 
CreateObject('phpgwapi.javascript');
+                       }
+                       
$GLOBALS['phpgw']->js->validate_file('core','check',$this->currentapp);
 
                        $data = array
                        (
@@ -541,7 +546,6 @@
                                'value_descr'                           => 
$agreement['descr'],
                                'lang_select_all'                       => 
lang('Select All'),
                                'img_check'                             => 
$GLOBALS['phpgw']->common->get_image_path($this->currentapp).'/check.png',
-                               'check_source'                          => 
'./'.$this->currentapp.'/inc/check.js',
                                'add_action'                            => 
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=> 
$this->currentapp.'.uiagreement.add_activity', 'group_id'=> $group_id, 
'agreement_id'=> $agreement_id)),
                                'agreement_id'                          => 
$agreement_id,
                                'table_header'                          => 
$table_header,
@@ -958,10 +962,10 @@
                                $GLOBALS['phpgw']->js = 
CreateObject('phpgwapi.javascript');
                        }
                        
$GLOBALS['phpgw']->js->validate_file('overlib','overlib',$this->currentapp);
+                       
$GLOBALS['phpgw']->js->validate_file('core','check',$this->currentapp);
 
                        $data = array
                        (
-
                                'allow_allrows'                         => True,
                                'allrows'                               => 
$this->allrows,
                                'start_record'                          => 
$this->start,
@@ -1054,8 +1058,6 @@
                                'update_action'                         => 
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=> 
$this->currentapp.'.uiagreement.edit', 'id'=> $id)),
                                'lang_select_all'                       => 
lang('Select All'),
                                'img_check'                             => 
$GLOBALS['phpgw']->common->get_image_path($this->currentapp).'/check.png',
-                               'check_source'                          => 
'./'.$this->currentapp.'/inc/check.js',
-                               'check_all_script'                      => 
$check_all_script,
                                'set_column'                            => 
$set_column,
 
                                'lang_agreement_group'                  => 
lang('Agreement group'),
@@ -1271,6 +1273,12 @@
                                'lang_update_statustext'        => lang('update 
selected investments')
                        );
 
+                       if(!isset($GLOBALS['phpgw']->js) || 
!is_object($GLOBALS['phpgw']->js))
+                       {
+                               $GLOBALS['phpgw']->js = 
CreateObject('phpgwapi.javascript');
+                       }
+                       
$GLOBALS['phpgw']->js->validate_file('core','check',$this->currentapp);
+
                        $data = array
                        (
                                'activity_descr'                        => 
$activity_descr,
@@ -1318,7 +1326,6 @@
                                'update_action'                         => 
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=> 
$this->currentapp.'.uiagreement.edit_item', 'agreement_id'=> $agreement_id, 
'id'=> $id)),
                                'lang_select_all'                       => 
lang('Select All'),
                                'img_check'                             => 
$GLOBALS['phpgw']->common->get_image_path($this->currentapp).'/check.png',
-                               'check_source'                          => 
'./'.$this->currentapp.'/inc/check.js',
 
                                'lang_m_cost'                           => 
lang('Material cost'),
                                'lang_m_cost_statustext'                => 
lang('Material cost'),
@@ -1380,6 +1387,12 @@
                        $content        = $list['content'];
                        $table_header=$list['table_header'];
 
+                       if(!isset($GLOBALS['phpgw']->js) || 
!is_object($GLOBALS['phpgw']->js))
+                       {
+                               $GLOBALS['phpgw']->js = 
CreateObject('phpgwapi.javascript');
+                       }
+                       
$GLOBALS['phpgw']->js->validate_file('core','check',$this->currentapp);
+
                        $data = array
                        (
                                'activity_descr'                        => 
$activity_descr,
@@ -1403,7 +1416,6 @@
                                'table_add'                             => 
$table_add,
                                'values'                                => 
$content,
                                'table_header'                          => 
$table_header,
-                               'check_source'                          => 
'./'.$this->currentapp.'/inc/check.js',
 
                                'lang_m_cost'                           => 
lang('Material cost'),
                                'value_m_cost'                          => 
$values['m_cost'],

Index: inc/class.uiinvestment.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uiinvestment.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- inc/class.uiinvestment.inc.php      5 Oct 2006 11:33:53 -0000       1.15
+++ inc/class.uiinvestment.inc.php      22 Dec 2006 14:43:54 -0000      1.16
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage eco
-       * @version $Id: class.uiinvestment.inc.php,v 1.15 2006/10/05 11:33:53 
sigurdne Exp $
+       * @version $Id: class.uiinvestment.inc.php,v 1.16 2006/12/22 14:43:54 
sigurdne Exp $
        */
 
        /**
@@ -229,9 +229,14 @@
                                $record_limit   = $this->bo->total_records;
                        }
 
-
                        $msgbox_data = $this->bocommon->msgbox_data($receipt);
 
+                       if(!isset($GLOBALS['phpgw']->js) || 
!is_object($GLOBALS['phpgw']->js))
+                       {
+                               $GLOBALS['phpgw']->js = 
CreateObject('phpgwapi.javascript');
+                       }
+                       
$GLOBALS['phpgw']->js->validate_file('core','check',$this->currentapp);
+
                        $data = array
                        (
                                'msgbox_data'                                   
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
@@ -242,7 +247,6 @@
                                'form_action'                                   
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=> 
$this->currentapp.'.uiinvestment.index')),
                                'lang_select_all'                               
=> lang('Select All'),
                                'img_check'                                     
=> $GLOBALS['phpgw']->common->get_image_path($this->currentapp).'/check.png',
-                               'check_source'                                  
=> './'.$this->currentapp.'/inc/check.js',
                                'allow_allrows'                                 
=> true,
                                'allrows'                                       
=> $this->allrows,
                                'start_record'                                  
=> $this->start,

Index: inc/class.uiinvoice.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uiinvoice.inc.php,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- inc/class.uiinvoice.inc.php 15 Dec 2006 20:16:44 -0000      1.42
+++ inc/class.uiinvoice.inc.php 22 Dec 2006 14:43:54 -0000      1.43
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage eco
-       * @version $Id: class.uiinvoice.inc.php,v 1.42 2006/12/15 20:16:44 
sigurdne Exp $
+       * @version $Id: class.uiinvoice.inc.php,v 1.43 2006/12/22 14:43:54 
sigurdne Exp $
        */
 
        /**
@@ -394,6 +394,7 @@
                                $GLOBALS['phpgw']->js = 
CreateObject('phpgwapi.javascript');
                        }
                        
$GLOBALS['phpgw']->js->validate_file('overlib','overlib',$this->currentapp);
+                       
$GLOBALS['phpgw']->js->validate_file('core','check',$this->currentapp);
 
                        $data['lang_excel']                                     
        = 'excel';
                        $data['link_excel']                                     
        = $GLOBALS['phpgw']->link('/index.php',$link_excel);
@@ -484,7 +485,6 @@
                                $data['cat_list']                               
                = $this->bo->select_category('filter',$this->cat_id);
                                $data['table_done']                             
                = $table_done;
                                $data['img_check']                              
                = 
$GLOBALS['phpgw']->common->get_image_path($this->currentapp).'/check.png';
-                               $data['check_source']                           
        = './'.$this->currentapp.'/inc/check.js';
                                $data['lang_save']                              
                = lang('save');
                                $data['done_action']                            
        = $GLOBALS['phpgw']->link('/index.php',array('menuaction'=> 
$this->currentapp.'.uiinvoice.index'));
                                $data['lang_done_statustext']                   
= lang('Back to the list');
@@ -665,6 +665,7 @@
                                $GLOBALS['phpgw']->js = 
CreateObject('phpgwapi.javascript');
                        }
                        
$GLOBALS['phpgw']->js->validate_file('overlib','overlib',$this->currentapp);
+                       
$GLOBALS['phpgw']->js->validate_file('core','check',$this->currentapp);
 
                        $data = array
                        (
@@ -674,7 +675,6 @@
                                'lang_excel_help'                               
=> lang('Download table to MS Excel'),
 
                                'img_check'                                     
=> $GLOBALS['phpgw']->common->get_image_path($this->currentapp).'/check.png',
-                               'check_source'                                  
=> './'.$this->currentapp.'/inc/check.js',
                                'msgbox_data'                                   
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
                                'sum'                                           
=> number_format($sum, 2, ',', ''),
                                'form_action'                                   
=> $GLOBALS['phpgw']->link('/index.php',$link_data),

Index: inc/class.uipricebook.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uipricebook.inc.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- inc/class.uipricebook.inc.php       27 Oct 2006 08:31:35 -0000      1.20
+++ inc/class.uipricebook.inc.php       22 Dec 2006 14:43:54 -0000      1.21
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage agreement
-       * @version $Id: class.uipricebook.inc.php,v 1.20 2006/10/27 08:31:35 
sigurdne Exp $
+       * @version $Id: class.uipricebook.inc.php,v 1.21 2006/12/22 14:43:54 
sigurdne Exp $
        */
 
        /**
@@ -266,6 +266,12 @@
                                'start'         => $this->start
                        );
 
+                       if(!isset($GLOBALS['phpgw']->js) || 
!is_object($GLOBALS['phpgw']->js))
+                       {
+                               $GLOBALS['phpgw']->js = 
CreateObject('phpgwapi.javascript');
+                       }
+                       
$GLOBALS['phpgw']->js->validate_file('core','check',$this->currentapp);
+
                        $data = array
                        (
                                'lang_excel'                                    
=> 'excel',
@@ -282,7 +288,6 @@
                                'all_records'                                   
=> $this->bo->total_records,
                                'lang_select_all'                               
=> lang('Select All'),
                                'img_check'                                     
=> $GLOBALS['phpgw']->common->get_image_path($this->currentapp).'/check.png',
-                               'check_source'                                  
=> './'.$this->currentapp.'/inc/check.js',
                                'link_url'                                      
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
                                'img_path'                                      
=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi','default'),
                                'lang_no_cat'                                   
=> lang('no category'),
@@ -389,6 +394,12 @@
                                $record_limit   = $this->bo->total_records;
                        }
 
+                       if(!isset($GLOBALS['phpgw']->js) || 
!is_object($GLOBALS['phpgw']->js))
+                       {
+                               $GLOBALS['phpgw']->js = 
CreateObject('phpgwapi.javascript');
+                       }
+                       
$GLOBALS['phpgw']->js->validate_file('core','check',$this->currentapp);
+
                        $data = array
                        (
                                'links'                                         
=> $links,
@@ -400,7 +411,6 @@
                                'all_records'                                   
=> $this->bo->total_records,
                                'lang_select_all'                               
=> lang('Select All'),
                                'img_check'                                     
=> $GLOBALS['phpgw']->common->get_image_path($this->currentapp).'/check.png',
-                               'check_source'                                  
=> './'.$this->currentapp.'/inc/check.js',
                                'link_url'                                      
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
                                'img_path'                                      
=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi','default'),
                                'lang_status_statustext'                        
=> lang('Select the status the agreement group belongs to. To do not use a 
category select NO STATUS'),

Index: inc/class.uir_agreement.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uir_agreement.inc.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- inc/class.uir_agreement.inc.php     15 Dec 2006 20:16:44 -0000      1.21
+++ inc/class.uir_agreement.inc.php     22 Dec 2006 14:43:54 -0000      1.22
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage agreement
-       * @version $Id: class.uir_agreement.inc.php,v 1.21 2006/12/15 20:16:44 
sigurdne Exp $
+       * @version $Id: class.uir_agreement.inc.php,v 1.22 2006/12/22 14:43:54 
sigurdne Exp $
        */
 
        /**
@@ -908,6 +908,7 @@
                                $GLOBALS['phpgw']->js = 
CreateObject('phpgwapi.javascript');
                        }
                        
$GLOBALS['phpgw']->js->validate_file('overlib','overlib',$this->currentapp);
+                       
$GLOBALS['phpgw']->js->validate_file('core','check',$this->currentapp);
 
                        $data = array
                        (
@@ -999,7 +1000,6 @@
                                'update_action'                         => 
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=> 
$this->currentapp.'.uir_agreement.edit', 'id'=> $id)),
                                'lang_select_all'                       => 
lang('Select All'),
                                'img_check'                             => 
$GLOBALS['phpgw']->common->get_image_path($this->currentapp).'/check.png',
-                               'check_source'                          => 
'./'.$this->currentapp.'/inc/check.js',
                                'check_all_script'                      => 
$check_all_script,
                                'set_column'                            => 
$set_column,
                                'lang_space'                            => 
lang('space'),
@@ -1272,6 +1272,11 @@
                                                'entity_data'   => 
False,//$values['p']
                                                ));
 
+                       if(!isset($GLOBALS['phpgw']->js) || 
!is_object($GLOBALS['phpgw']->js))
+                       {
+                               $GLOBALS['phpgw']->js = 
CreateObject('phpgwapi.javascript');
+                       }
+                       
$GLOBALS['phpgw']->js->validate_file('core','check',$this->currentapp);
 
                        $data = array
                        (
@@ -1316,7 +1321,6 @@
                                'update_action'                                 
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=> 
$this->currentapp.'.uir_agreement.edit_item', 'r_agreement_id'=> 
$r_agreement_id, 'id'=> $id)),
                                'lang_select_all'                               
=> lang('Select All'),
                                'img_check'                                     
=> $GLOBALS['phpgw']->common->get_image_path($this->currentapp).'/check.png',
-                               'check_source'                                  
=> './'.$this->currentapp.'/inc/check.js',
                                'location_data'                                 
=> $location_data,
 
                                'lang_cost'                                     
=> lang('cost'),
@@ -1405,6 +1409,12 @@
                                                'type'          => 'view')
                                                );
 
+                       if(!isset($GLOBALS['phpgw']->js) || 
!is_object($GLOBALS['phpgw']->js))
+                       {
+                               $GLOBALS['phpgw']->js = 
CreateObject('phpgwapi.javascript');
+                       }
+                       
$GLOBALS['phpgw']->js->validate_file('core','check',$this->currentapp);
+
                        $data = array
                        (
                                'msgbox_data'                                   
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
@@ -1425,7 +1435,6 @@
                                'table_add'                                     
=> $table_add,
                                'values'                                        
=> $content,
                                'table_header'                                  
=> $table_header,
-                               'check_source'                                  
=> './'.$this->currentapp.'/inc/check.js',
                                'location_data'                                 
=> $location_data,
 
                                'lang_cost'                                     
=> lang('cost'),

Index: inc/class.uis_agreement.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uis_agreement.inc.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- inc/class.uis_agreement.inc.php     15 Dec 2006 20:16:44 -0000      1.33
+++ inc/class.uis_agreement.inc.php     22 Dec 2006 14:43:54 -0000      1.34
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage agreement
-       * @version $Id: class.uis_agreement.inc.php,v 1.33 2006/12/15 20:16:44 
sigurdne Exp $
+       * @version $Id: class.uis_agreement.inc.php,v 1.34 2006/12/22 14:43:54 
sigurdne Exp $
        */
 
        /**
@@ -796,6 +796,7 @@
                                $GLOBALS['phpgw']->js = 
CreateObject('phpgwapi.javascript');
                        }
                        
$GLOBALS['phpgw']->js->validate_file('overlib','overlib',$this->currentapp);
+                       
$GLOBALS['phpgw']->js->validate_file('core','check',$this->currentapp);
 
                        $data = array
                        (
@@ -885,10 +886,7 @@
                                'update_action'                         => 
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=> 
$this->currentapp.'.uis_agreement.edit', 'id'=> $id)),
                                'lang_select_all'                       => 
lang('Select All'),
                                'img_check'                             => 
$GLOBALS['phpgw']->common->get_image_path($this->currentapp).'/check.png',
-                               'check_source'                          => 
'./'.$this->currentapp.'/inc/check.js',
-                               'check_all_script'                      => 
$check_all_script,
                                'set_column'                            => 
$set_column,
-
                        );
 
                        $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang('service agreement') . ': ' . ($id?lang('edit') . ' ' . 
lang($this->role):lang('add') . ' ' . lang($this->role));
@@ -1125,6 +1123,11 @@
                                                'entity_data'   => $values['p']
                                                ));
 
+                       if(!isset($GLOBALS['phpgw']->js) || 
!is_object($GLOBALS['phpgw']->js))
+                       {
+                               $GLOBALS['phpgw']->js = 
CreateObject('phpgwapi.javascript');
+                       }
+                       
$GLOBALS['phpgw']->js->validate_file('core','check',$this->currentapp);
 
                        $data = array
                        (
@@ -1169,7 +1172,6 @@
                                'update_action'                                 
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=> 
$this->currentapp.'.uis_agreement.edit_item', 's_agreement_id'=> 
$s_agreement_id, 'id'=> $id)),
                                'lang_select_all'                               
=> lang('Select All'),
                                'img_check'                                     
=> $GLOBALS['phpgw']->common->get_image_path($this->currentapp).'/check.png',
-                               'check_source'                                  
=> './'.$this->currentapp.'/inc/check.js',
                                'location_data'                                 
=> $location_data,
 
                                'lang_cost'                                     
=> lang('cost'),
@@ -1237,6 +1239,12 @@
                                                'entity_data'   => $values['p']
                                                ));
 
+                       if(!isset($GLOBALS['phpgw']->js) || 
!is_object($GLOBALS['phpgw']->js))
+                       {
+                               $GLOBALS['phpgw']->js = 
CreateObject('phpgwapi.javascript');
+                       }
+                       
$GLOBALS['phpgw']->js->validate_file('core','check',$this->currentapp);
+
                        $data = array
                        (
                                'msgbox_data'                                   
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
@@ -1256,7 +1264,6 @@
                                'table_add'                                     
=> $table_add,
                                'values'                                        
=> $content,
                                'table_header'                                  
=> $table_header,
-                               'check_source'                                  
=> './'.$this->currentapp.'/inc/check.js',
                                'location_data'                                 
=> $location_data,
 
                                'lang_cost'                                     
=> lang('cost'),

Index: inc/class.uiwo_hour.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uiwo_hour.inc.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- inc/class.uiwo_hour.inc.php 5 Oct 2006 11:33:53 -0000       1.29
+++ inc/class.uiwo_hour.inc.php 22 Dec 2006 14:43:54 -0000      1.30
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage project
-       * @version $Id: class.uiwo_hour.inc.php,v 1.29 2006/10/05 11:33:53 
sigurdne Exp $
+       * @version $Id: class.uiwo_hour.inc.php,v 1.30 2006/12/22 14:43:54 
sigurdne Exp $
        */
 
        /**
@@ -1412,12 +1412,17 @@
 
                        $msgbox_data = $this->bocommon->msgbox_data($receipt);
 
+                       if(!isset($GLOBALS['phpgw']->js) || 
!is_object($GLOBALS['phpgw']->js))
+                       {
+                               $GLOBALS['phpgw']->js = 
CreateObject('phpgwapi.javascript');
+                       }
+                       
$GLOBALS['phpgw']->js->validate_file('core','check',$this->currentapp);
+
                        $data = array
                        (
                                'msgbox_data'                           => 
$GLOBALS['phpgw']->common->msgbox($msgbox_data),
                                'lang_select_all'                       => 
lang('Select All'),
                                'img_check'                             => 
$GLOBALS['phpgw']->common->get_image_path($this->currentapp).'/check.png',
-                               'check_source'                          => 
'./'.$this->currentapp.'/inc/check.js',
 
                                'template_id'                           => 
$template_id,
                                'form_action'                           => 
$GLOBALS['phpgw']->link('/index.php',$link_data),

Index: templates/base/agreement.xsl
===================================================================
RCS file: /sources/phpgroupware/property/templates/base/agreement.xsl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- templates/base/agreement.xsl        15 Dec 2006 20:16:44 -0000      1.6
+++ templates/base/agreement.xsl        22 Dec 2006 14:43:54 -0000      1.7
@@ -141,8 +141,6 @@
                                        <xsl:call-template name="values4"/>
                                </xsl:when>
                        </xsl:choose>                                   
-                       <xsl:variable name="check_source"><xsl:value-of 
select="check_source"/></xsl:variable>
-                       <SCRIPT LANGUAGE="JavaScript" 
SRC="{$check_source}"></SCRIPT>
                        <tr>
                                <td></td>
                                <td></td>
@@ -797,8 +795,6 @@
                                                </tr>
                                                <xsl:call-template 
name="table_header"/>
                                                <xsl:call-template 
name="values3"/>
-                                               <xsl:variable 
name="check_source"><xsl:value-of select="check_source"/></xsl:variable>
-                                               <SCRIPT LANGUAGE="JavaScript" 
SRC="{$check_source}"></SCRIPT>
                                                <tr>
                                                        <xsl:for-each 
select="set_column" >
                                                                <td></td>

Index: templates/base/investment.xsl
===================================================================
RCS file: /sources/phpgroupware/property/templates/base/investment.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- templates/base/investment.xsl       17 Jan 2005 10:03:18 -0000      1.1
+++ templates/base/investment.xsl       22 Dec 2006 14:43:54 -0000      1.2
@@ -1,4 +1,4 @@
-<!-- $Id: investment.xsl,v 1.1 2005/01/17 10:03:18 sigurdne Exp $ -->
+<!-- $Id: investment.xsl,v 1.2 2006/12/22 14:43:54 sigurdne Exp $ -->
 
        <xsl:template name="app_data">
                <xsl:choose>
@@ -15,9 +15,6 @@
        </xsl:template>
        
        <xsl:template match="list">
-               <xsl:variable name="check_source"><xsl:value-of 
select="check_source"/></xsl:variable>
-               <SCRIPT LANGUAGE="JavaScript" SRC="{$check_source}"></SCRIPT>
-               
                <xsl:call-template name="menu"/> 
                <xsl:variable name="form_action"><xsl:value-of 
select="form_action"/></xsl:variable>
                <form method="post" name="form_search" action="{$form_action}">

Index: templates/base/invoice.xsl
===================================================================
RCS file: /sources/phpgroupware/property/templates/base/invoice.xsl,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- templates/base/invoice.xsl  15 Dec 2006 20:16:44 -0000      1.20
+++ templates/base/invoice.xsl  22 Dec 2006 14:43:54 -0000      1.21
@@ -1,4 +1,4 @@
-<!-- $Id: invoice.xsl,v 1.20 2006/12/15 20:16:44 sigurdne Exp $ -->
+<!-- $Id: invoice.xsl,v 1.21 2006/12/22 14:43:54 sigurdne Exp $ -->
 
        <xsl:template name="app_data">
                <xsl:choose>
@@ -125,8 +125,6 @@
 <!-- list_voucher -->
 
        <xsl:template match="list_voucher">
-               <xsl:variable name="check_source"><xsl:value-of 
select="check_source"/></xsl:variable>
-               <SCRIPT LANGUAGE="JavaScript" SRC="{$check_source}"></SCRIPT>
                <xsl:call-template name="menu"/> 
                <table width="100%" cellpadding="2" cellspacing="2" 
align="center">
                        <xsl:choose>
@@ -2258,8 +2256,6 @@
 <!--list_invoice_sub-->
 
        <xsl:template match="list_invoice_sub">
-               <SCRIPT LANGUAGE="JavaScript" SRC="{check_source}"></SCRIPT>
-
                <xsl:call-template name="menu"/> 
                <table width="80%" cellpadding="2" cellspacing="2" 
align="center">
                        <xsl:choose>

Index: templates/base/pricebook.xsl
===================================================================
RCS file: /sources/phpgroupware/property/templates/base/pricebook.xsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- templates/base/pricebook.xsl        2 Mar 2006 07:28:47 -0000       1.2
+++ templates/base/pricebook.xsl        22 Dec 2006 14:43:54 -0000      1.3
@@ -1,4 +1,4 @@
-<!-- $Id: pricebook.xsl,v 1.2 2006/03/02 07:28:47 sigurdne Exp $ -->
+<!-- $Id: pricebook.xsl,v 1.3 2006/12/22 14:43:54 sigurdne Exp $ -->
 
        <xsl:template name="app_data">
                <xsl:choose>
@@ -30,9 +30,6 @@
        </xsl:template>
        
        <xsl:template match="list">
-               <xsl:variable name="check_source"><xsl:value-of 
select="check_source"/></xsl:variable>
-               <SCRIPT LANGUAGE="JavaScript" SRC="{$check_source}"></SCRIPT>
-               
                <xsl:call-template name="menu"/> 
                <table width="100%" cellpadding="2" cellspacing="2" 
align="center">
                        <xsl:choose>
@@ -238,9 +235,6 @@
        </xsl:template>
 
        <xsl:template match="agreement_group">
-               <xsl:variable name="check_source"><xsl:value-of 
select="check_source"/></xsl:variable>
-               <SCRIPT LANGUAGE="JavaScript" SRC="{$check_source}"></SCRIPT>
-               
                <xsl:call-template name="menu"/> 
                <table width="100%" cellpadding="2" cellspacing="2" 
align="center">
                        <xsl:choose>
@@ -348,9 +342,6 @@
 
        <xsl:template match="prizing">
                <div align="left">
-               <xsl:variable name="check_source"><xsl:value-of 
select="check_source"/></xsl:variable>
-               <SCRIPT LANGUAGE="JavaScript" SRC="{$check_source}"></SCRIPT>
-               
                <xsl:call-template name="menu"/> 
                <table width="100%" cellpadding="2" cellspacing="2" 
align="center">
                        <xsl:choose>
@@ -509,8 +500,6 @@
        </xsl:template>
 
        <xsl:template match="list_activities">
-               <xsl:variable name="check_source"><xsl:value-of 
select="check_source"/></xsl:variable>
-               
                <xsl:call-template name="menu"/> 
                <table width="100%" cellpadding="2" cellspacing="2" 
align="center">
                        <xsl:choose>

Index: templates/base/r_agreement.xsl
===================================================================
RCS file: /sources/phpgroupware/property/templates/base/r_agreement.xsl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- templates/base/r_agreement.xsl      15 Dec 2006 20:16:44 -0000      1.15
+++ templates/base/r_agreement.xsl      22 Dec 2006 14:43:54 -0000      1.16
@@ -676,8 +676,6 @@
        
                                                        <xsl:call-template 
name="table_header"/>
                                                        <xsl:call-template 
name="values"/>
-                                                       <xsl:variable 
name="check_source"><xsl:value-of select="check_source"/></xsl:variable>
-                                                       <SCRIPT 
LANGUAGE="JavaScript" SRC="{$check_source}"></SCRIPT>
                                                        <tr>
                                                                <xsl:for-each 
select="set_column" >
                                                                        
<td></td>

Index: templates/base/s_agreement.xsl
===================================================================
RCS file: /sources/phpgroupware/property/templates/base/s_agreement.xsl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- templates/base/s_agreement.xsl      15 Dec 2006 20:16:44 -0000      1.5
+++ templates/base/s_agreement.xsl      22 Dec 2006 14:43:54 -0000      1.6
@@ -523,8 +523,6 @@
 
                                                <xsl:call-template 
name="table_header"/>
                                                <xsl:call-template 
name="values"/>
-                                               <xsl:variable 
name="check_source"><xsl:value-of select="check_source"/></xsl:variable>
-                                               <SCRIPT LANGUAGE="JavaScript" 
SRC="{$check_source}"></SCRIPT>
                                                <tr>
                                                        <xsl:for-each 
select="set_column" >
                                                                <td></td>

Index: templates/base/wo_hour.xsl
===================================================================
RCS file: /sources/phpgroupware/property/templates/base/wo_hour.xsl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- templates/base/wo_hour.xsl  21 Aug 2006 13:34:06 -0000      1.9
+++ templates/base/wo_hour.xsl  22 Dec 2006 14:43:54 -0000      1.10
@@ -1,4 +1,4 @@
-<!-- $Id: wo_hour.xsl,v 1.9 2006/08/21 13:34:06 sigurdne Exp $ -->
+<!-- $Id: wo_hour.xsl,v 1.10 2006/12/22 14:43:54 sigurdne Exp $ -->
 
        <xsl:template name="app_data">
                <xsl:choose>
@@ -854,9 +854,6 @@
 
 
        <xsl:template match="list_template_hour">
-               <xsl:variable name="check_source"><xsl:value-of 
select="check_source"/></xsl:variable>
-               <SCRIPT LANGUAGE="JavaScript" SRC="{$check_source}"></SCRIPT>
-               
                <xsl:call-template name="menu"/> 
                <table width="100%" cellpadding="2" cellspacing="2" 
align="center">
                        <xsl:choose>




reply via email to

[Prev in Thread] Current Thread [Next in Thread]