[Fmsystem-commits] [6514] merge 6512:6513 from trunk

[Sigurd Nes]

Revision: 6514
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6514
Author:   sigurdne
Date:     2010-10-27 12:14:21 +0000 (Wed, 27 Oct 2010)
Log Message:
-----------
merge 6512:6513 from trunk

Modified Paths:
--------------
    branches/Version-1_0-branch/property/inc/class.uiinvoice.inc.php
    branches/Version-1_0-branch/property/js/yahoo/invoice.index.js

Property Changed:
----------------
    branches/Version-1_0-branch/


Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511
   + 
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513

Modified: branches/Version-1_0-branch/property/inc/class.uiinvoice.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiinvoice.inc.php    
2010-10-27 12:12:30 UTC (rev 6513)
+++ branches/Version-1_0-branch/property/inc/class.uiinvoice.inc.php    
2010-10-27 12:14:21 UTC (rev 6514)
@@ -608,16 +608,16 @@
                        $content = 
$this->bo->read_invoice($paid,$start_date,$end_date,$vendor_id,$loc1,$workorder_id,$voucher_id);
                        //_debug_array($content);
                        $uicols = array (
-                               'input_type'    =>      array('hidden','hidden' 
,'hidden'       ,'hidden'       ,'hidden','hidden','hidden','hidden','hidden'   
,'link','link'          
,'hidden','hidden','hidden',$paid?'varchar':'input','varchar','link'  
,'hidden','varchar','varchar','varchar',$paid?'hidden':'input',$paid?'hidden':'input','special','special','special','special2'),
-                               'type'                  =>      
array('number',''               ,''             ,''             
,'number','number',''     ,'number',''  ,'url' ,'msg_box'       ,''    ,''    
,''    ,$paid?'':'text'           ,''     ,'msg_box',''    ,''     ,''     ,''  
   ,$paid?'':'checkbox' ,$paid?'':'radio'  ,''     ,''     ,''     ,''     ),
+                               'input_type'    =>      array('hidden','hidden' 
,'hidden'       ,'hidden'       ,'hidden','hidden','hidden','hidden','hidden'   
,'link','link'          
,'hidden','hidden','hidden',$paid?'varchar':'input','varchar','varchar'  
,'hidden','varchar','varchar','varchar',$paid?'hidden':'input',$paid?'hidden':'input','special','special','special','special2'),
+                               'type'                  =>      
array('number',''               ,''             ,''             
,'number','number',''     ,'number',''  ,'url' ,'msg_box'       ,''    ,''    
,''    ,$paid?'':'text'           ,''     ,'text',''    ,''     ,''     ,''     
,$paid?'':'checkbox' ,$paid?'':'radio'     ,''     ,''     ,''     ,''     ),
 
-                               'col_name'              =>      
array('payment_date','transfer','kreditnota','sign','vendor_name','counter_num','counter','voucher_id_num','voucher_id','voucher_id_lnk','voucher_date_lnk','sign_orig'
 
,'num_days_orig','timestamp_voucher_date','num_days','amount_lnk','vendor_id_lnk','invoice_count','invoice_count_lnk','type_lnk','period','kreditnota_tmp','sign_tmp'
 ,'janitor_lnk','supervisor_lnk','budget_responsible_lnk','transfer_lnk'),
-                               'name'                  =>      
array('payment_date','dummy','dummy','dummy','vendor','counter','counter','voucher_id'
    ,'voucher_id','voucher_id'    ,'voucher_date'    ,'sign_orig','num_days'    
 ,'timestamp_voucher_date','num_days','amount'    ,'vendor_id'    
,'invoice_count','invoice_count'    ,'type'    
,'period','kreditnota','empty_fild','janitor'    ,'supervisor'    
,'budget_responsible'    ,'transfer_id'),
+                               'col_name'              =>      
array('payment_date','transfer','kreditnota','sign','vendor_name','counter_num','counter','voucher_id_num','voucher_id','voucher_id_lnk','voucher_date_lnk','sign_orig'
 
,'num_days_orig','timestamp_voucher_date','num_days','amount_lnk','vendor','invoice_count','invoice_count_lnk','type_lnk','period','kreditnota_tmp','sign_tmp'
 ,'janitor_lnk','supervisor_lnk','budget_responsible_lnk','transfer_lnk'),
+                               'name'                  =>      
array('payment_date','dummy','dummy','dummy','vendor','counter','counter','voucher_id'
    ,'voucher_id','voucher_id'    ,'voucher_date'    ,'sign_orig','num_days'    
 ,'timestamp_voucher_date','num_days','amount'    ,'vendor'    
,'invoice_count','invoice_count'    ,'type'    
,'period','kreditnota','empty_fild','janitor'    ,'supervisor'    
,'budget_responsible'    ,'transfer_id'),
 
                                'formatter'             =>      
array('','','','','','','','','','','','','','','','myFormatDate','','','','',$paid?'':'myPeriodDropDown','','','','','',''),
 
                                'descr'                 =>      
array('dummy','dummy','dummy','dummy','dummy','dummy','dummy','dummy','dummy',lang('voucher'),lang('Voucher
 
Date'),'dummy','dummy','dummy',lang('Days'),lang('Sum'),lang('Vendor'),'dummy',lang('Count'),lang('Type'),lang('Period'),lang('KreditNota'),lang('None'),lang('Janitor'),lang('Supervisor'),lang('Budget
 Responsible'),lang('Transfer')),
-                               'className'             =>      
array('','','','','','','','','','','centerClasss','','','',$paid?'rightClasss':'','rightClasss','rightClasss','','rightClasss','',$paid?'centerClasss':'comboClasss','centerClasss','centerClasss','','','centerClasss','centerClasss')
+                               'className'             =>      
array('','','','','','','','','','','centerClasss','','','',$paid?'rightClasss':'','rightClasss','','','rightClasss','',$paid?'centerClasss':'comboClasss','centerClasss','centerClasss','','','centerClasss','centerClasss')
                                );
 
                        //url to detail of voucher

Modified: branches/Version-1_0-branch/property/js/yahoo/invoice.index.js
===================================================================
--- branches/Version-1_0-branch/property/js/yahoo/invoice.index.js      
2010-10-27 12:12:30 UTC (rev 6513)
+++ branches/Version-1_0-branch/property/js/yahoo/invoice.index.js      
2010-10-27 12:14:21 UTC (rev 6514)
@@ -25,7 +25,7 @@
 
        var toolTips = [
                {name:'voucher_id_lnk',title:'Voucher ID', description:'click 
this link to enter the list of sub-invoices',ColumnDescription:''},
-               {name:'vendor_id_lnk', title:'', 
description:'',ColumnDescription: 'vendor_name'},
+       //      {name:'vendor_id_lnk', title:'', 
description:'',ColumnDescription: 'vendor_name'},
                {name:'voucher_date_lnk', title:'Payment Date', 
description:'',ColumnDescription:'payment_date'},
                //{name:'period', title:'Period', description:'click this 
button to edit the period',ColumnDescription:''},
                {name:'btn_export', title:'download', description:'Download 
table to your browser',ColumnDescription:''}