[Phpgroupware-cvs] projects/inc class.uibilling.inc.php, 1.18.2.6.2.7, 1.18.2.6.2.8 class.uideliveries.inc.php, 1.21.2.3.2.7, 1.21.2.3.2.8

[Bettina Gille <address@hidden>]

Update of /cvsroot/phpgroupware/projects/inc
In directory subversions:/tmp/cvs-serv18155/inc

Modified Files:
      Tag: Version-0_9_16-branch
        class.uibilling.inc.php class.uideliveries.inc.php 
Log Message:
update to the new contacts

Index: class.uideliveries.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uideliveries.inc.php,v
retrieving revision 1.21.2.3.2.7
retrieving revision 1.21.2.3.2.8
diff -C2 -d -r1.21.2.3.2.7 -r1.21.2.3.2.8
*** class.uideliveries.inc.php  20 Jun 2003 22:04:32 -0000      1.21.2.3.2.7
--- class.uideliveries.inc.php  1 Oct 2003 20:28:58 -0000       1.21.2.3.2.8
***************
*** 435,440 ****
                        {
                                $customer = 
$this->boprojects->read_single_contact($pro['customer']);
!                               if (!$customer[0]['org_name']) { $customername 
= $customer[0]['n_given'] . ' ' . $customer[0]['n_family']; }
!                               else { $customername = $customer[0]['org_name'] 
. ' [ ' . $customer[0]['n_given'] . ' ' . $customer[0]['n_family'] . ' ]'; }
                                
$GLOBALS['phpgw']->template->set_var('customer',$customername);
                        }
--- 435,440 ----
                        {
                                $customer = 
$this->boprojects->read_single_contact($pro['customer']);
!                               if (!$customer[0]['org_name']) { $customername 
= $customer[0]['per_first_name'] . ' ' . $customer[0]['per_last_name']; }
!                               else { $customername = $customer[0]['org_name'] 
. ' [ ' . $customer[0]['per_first_name'] . ' ' . $customer[0]['per_last_name'] 
. ' ]'; }
                                
$GLOBALS['phpgw']->template->set_var('customer',$customername);
                        }
***************
*** 720,725 ****
                                        {
                                                $customer = 
$this->boprojects->read_single_contact($note['customer']);
!                               if (!$customer[0]['org_name']) { $customerout = 
$customer[0]['n_given'] . ' ' . $customer[0]['n_family']; }
!                               else { $customerout = $customer[0]['org_name'] 
. ' [ ' . $customer[0]['n_given'] . ' ' . $customer[0]['n_family'] . ' ]'; }
                                        }
                                        else { $customerout = ' '; }
--- 720,725 ----
                                        {
                                                $customer = 
$this->boprojects->read_single_contact($note['customer']);
!                               if (!$customer[0]['org_name']) { $customerout = 
$customer[0]['per_first_name'] . ' ' . $customer[0]['per_last_name']; }
!                               else { $customerout = $customer[0]['org_name'] 
. ' [ ' . $customer[0]['per_first_name'] . ' ' . $customer[0]['per_last_name'] 
. ' ]'; }
                                        }
                                        else { $customerout = ' '; }

Index: class.uibilling.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uibilling.inc.php,v
retrieving revision 1.18.2.6.2.7
retrieving revision 1.18.2.6.2.8
diff -C2 -d -r1.18.2.6.2.7 -r1.18.2.6.2.8
*** class.uibilling.inc.php     20 Jun 2003 22:04:32 -0000      1.18.2.6.2.7
--- class.uibilling.inc.php     1 Oct 2003 20:28:58 -0000       1.18.2.6.2.8
***************
*** 447,452 ****
                                        {
                                                $customer = 
$this->boprojects->read_single_contact($inv['customer']);
!                               if (!$customer[0]['org_name']) { $customerout = 
$customer[0]['n_given'] . ' ' . $customer[0]['n_family']; }
!                               else { $customerout = $customer[0]['org_name'] 
. ' [ ' . $customer[0]['n_given'] . ' ' . $customer[0]['n_family'] . ' ]'; }
                                        }
                                        else { $customerout = ' '; }
--- 447,452 ----
                                        {
                                                $customer = 
$this->boprojects->read_single_contact($inv['customer']);
!                               if (!$customer[0]['org_name']) { $customerout = 
$customer[0]['per_first_name'] . ' ' . $customer[0]['per_last_name']; }
!                               else { $customerout = $customer[0]['org_name'] 
. ' [ ' . $customer[0]['per_first_name'] . ' ' . $customer[0]['per_last_name'] 
. ' ]'; }
                                        }
                                        else { $customerout = ' '; }
***************
*** 569,574 ****
                                $customer = 
$this->boprojects->read_single_contact($pro['customer']);
  
!                               if (!$customer[0]['org_name']) { $customername 
= $customer[0]['n_given'] . ' ' . $customer[0]['n_family']; }
!                               else { $customername = $customer[0]['org_name'] 
. ' [ ' . $customer[0]['n_given'] . ' ' . $customer[0]['n_family'] . ' ]'; }
                                
$GLOBALS['phpgw']->template->set_var('customer',$customername);
                        }
--- 569,574 ----
                                $customer = 
$this->boprojects->read_single_contact($pro['customer']);
  
!                               if (!$customer[0]['org_name']) { $customername 
= $customer[0]['per_first_name'] . ' ' . $customer[0]['per_last_name']; }
!                               else { $customername = $customer[0]['org_name'] 
. ' [ ' . $customer[0]['per_first_name'] . ' ' . $customer[0]['per_last_name'] 
. ' ]'; }
                                
$GLOBALS['phpgw']->template->set_var('customer',$customername);
                        }