[Phpgroupware-cvs] CVS: property addressbook.php,1.1.1.1,1.2 csv_invoice_import.php,1.1.1.1,1.2

[Sigurd Nes <address@hidden>]

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

Modified Files:
        addressbook.php csv_invoice_import.php 
Log Message:
no message

Index: addressbook.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/addressbook.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** addressbook.php     28 Aug 2002 16:43:04 -0000      1.1.1.1
--- addressbook.php     16 Oct 2002 15:32:15 -0000      1.2
***************
*** 98,101 ****
--- 98,102 ----
  
        $t->set_var('th_bg',$GLOBALS['phpgw_info']['theme']['th_bg']);
+       
$t->set_var('sort_id',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'id',$order,'/property/addressbook.php',lang('ID')));
        
$t->set_var('sort_company',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'org_name',$order,'/property/addressbook.php',lang('Company')));
        
$t->set_var('sort_firstname',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'n_given',$order,'/property/addressbook.php',lang('Firstname')));

Index: csv_invoice_import.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/csv_invoice_import.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** csv_invoice_import.php      28 Aug 2002 16:43:07 -0000      1.1.1.1
--- csv_invoice_import.php      16 Oct 2002 15:32:15 -0000      1.2
***************
*** 152,174 ****
                                                        '<input type="hidden" 
name="fieldsep" value="'.$fieldsep."\">\n";
  
!               $info_names = array(    'type'          => 'Type: 
task,phone,note,confirm,reject,email,fax',
!                                                                       'from'  
        => 'From: text(64) free text if no Addressbook-entry assigned',
!                                                                       'addr'  
        => 'Addr: text(64) phone-nr/email-address',
!                                                                       
'subject'       =>      'Subject: text(64)',
!                                                                       'des'   
                =>      'Description: text long free text',
!                                                                       'owner' 
        =>      'Owner: int(11) user-id of owner, if empty current user',
!                                                                       
'responsible' => 'Responsible: int(11) user-id of resp. person',
!                                                                       
'access'                =>      'Access: public,private',
!                                                                       'cat'   
                =>      'Cathegory: int(11) cathegory-id',
!                                                                       
'datecreated' => 'Date Created: DateTime if empty = Start Date or now',
!                                                                       
'startdate' => 'Start Date: DateTime',
!                                                                       
'enddate'       =>      'End Date: DateTime',
!                                                                       'pri'   
                => 'Priority: urgent,high,normal,low',
!                                                                       'time'  
        => 'Time: int(11) time used in min',
!                                                                       
'bill_cat'      => 'Billing Cathegory: int(11)',
!                                                                       
'status'                => 'Status: offer,ongoing,call,will-call,done,billed',
!                                                                       
'confirm'       => 'Confirmation: not,accept,finish,both when to confirm',
!                                                                       
'cat_id'        => 'Categorie id(s), to set use @cat_id(Cat1,Cat2)',
!                                                                       
'addr_id'       =>      'Addressbook id, to set use @addr_id(nlast,nfirst,org)' 
);
  
                // the next line is used in the help-text too
--- 152,162 ----
                                                        '<input type="hidden" 
name="fieldsep" value="'.$fieldsep."\">\n";
  
!               $info_names = array(    'pmwrkord_code'                 => 
'Order ID: int(4) reference to order',
!                                                                       
'fakturanr'             => 'Invoice id: varchar(50) Vendors reference id',
!                                                                       
'spbudact_code'                 => 'Budget Account: varchar(50)',
!                                                                       'dima'  
=>      'Dima: varchar(50) Property or projekt',
!                                                                       'dimd'  
                =>      'Dimd: varchar(50) Labour/Material-code',
!                                                                       
'mvakode'               =>      'Tax Code: int(2)',
!                                                                       'belop' 
=> 'Amount: decimal(20)' );
  
                // the next line is used in the help-text too
***************
*** 192,195 ****
--- 180,185 ----
                        $info_name_options .= "<option 
value=\"$field\">".$GLOBALS['phpgw']->strip_html($name)."\n";
                }
+ 
+               for ($i = 1; $i < 16 && fgetcsv($fp,8000,$fieldsep); ++$i) ; // 
gå forbi header
                $csv_fields = fgetcsv($fp,8000,$fieldsep);
                $csv_fields[] = 'no CSV 1';                                     
        // eg. for static assignments