[Phpgroupware-cvs] CVS: inv/inc class.boinvoice.inc.php,1.2,1.3 class.uiinvoice.inc.php,1.3,1.4

[Bettina Gille <address@hidden>]

Update of /cvsroot/phpgroupware/inv/inc
In directory subversions:/tmp/cvs-serv25651/inc

Modified Files:
        class.boinvoice.inc.php class.uiinvoice.inc.php 
Log Message:
update

Index: class.boinvoice.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/inv/inc/class.boinvoice.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.boinvoice.inc.php     15 Apr 2002 23:03:39 -0000      1.2
--- class.boinvoice.inc.php     16 Apr 2002 23:25:26 -0000      1.3
***************
*** 203,207 ****
                                'org_unit'              => 
$values['department'],
                                'n_given'               => $values['firstname'],
!                               'n_family'              => $values'[lastname'],
                                'industry_type' => $values['industry_type'],
                                'software'              => $values['software'],
--- 203,207 ----
                                'org_unit'              => 
$values['department'],
                                'n_given'               => $values['firstname'],
!                               'n_family'              => $values['lastname'],
                                'industry_type' => $values['industry_type'],
                                'software'              => $values['software'],
***************
*** 220,224 ****
                        if ($values['url_mirror'] != 'http://')
                        {
!                               $fields['url_mirror'] = $values['url_mirror';
                        }
  
--- 220,224 ----
                        if ($values['url_mirror'] != 'http://')
                        {
!                               $fields['url_mirror'] = $values['url_mirror'];
                        }
  
***************
*** 250,253 ****
--- 250,258 ----
                                
$this->contacts->add($this->account,$fields,$access,$values['cat_id'],$tid='n');
                        }
+               }
+ 
+               function delete_dist($dist_id)
+               {
+                       $this->contacts->delete($dist_id);
                }
        }

Index: class.uiinvoice.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/inv/inc/class.uiinvoice.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** class.uiinvoice.inc.php     15 Apr 2002 23:03:39 -0000      1.3
--- class.uiinvoice.inc.php     16 Apr 2002 23:25:26 -0000      1.4
***************
*** 38,42 ****
                        'abook'                 => True,
                        'preferences'   => True,
!                       'list_dist'             => True
                );
  
--- 38,45 ----
                        'abook'                 => True,
                        'preferences'   => True,
!                       'list_dist'             => True,
!                       'edit_dist'             => True,
!                       'view_dist'             => True,
!                       'delete_dist'   => True
                );
  
***************
*** 416,422 ****
                                $this->t->set_var('ftp',$ftp);
  
-                               $cat_id         = $entries[$i]['cat_id'];
-                               $dist_id        = $entries[$i]['id'];
- 
  // --------------- template declaration for list records 
---------------------------- 
  
--- 419,422 ----
***************
*** 429,438 ****
                                
$this->t->set_var('products',$GLOBALS['phpgw']->link('/index.php','menuaction=inv.uiinventory.list_products&action=subproduct&status=receipt&selection=dist'));
  
!                               
$this->t->set_var('edit',$GLOBALS['phpgw']->link('/index.php','menuaction=inv.uiinvoice.edit_dist&dist_id='
 . $dist_id . '&cat_id=' . $cat_id));
!                               
$this->t->set_var('view',$GLOBALS['phpgw']->link('/index.php','menuaction=inv.uiinvoice.view_dist&dist_id='
 . $dist_id . '&cat_id=' . $cat_id));
                                $this->t->fp('list','distlist_list',True);
                        }
  
!                       
$this->t->set_var('add_action',$GLOBALS['phpgw']->link('/index.php','menuaction=inv.uiinvoice.edit_dist&cat_id='
 . $cat_id));
                        $this->t->pfp('out','distlist_list_t',True);
                        $this->save_sessiondata('inv_dist');
--- 429,446 ----
                                
$this->t->set_var('products',$GLOBALS['phpgw']->link('/index.php','menuaction=inv.uiinventory.list_products&action=subproduct&status=receipt&selection=dist'));
  
!                               $link_data['dist_id']           = 
$entries[$i]['id'];
! 
!                               $link_data['menuaction']        = 
'inv.uiinvoice.view_dist';
!                               
$this->t->set_var('view',$GLOBALS['phpgw']->link('/index.php',$link_data));
! 
!                               $link_data['menuaction']        = 
'inv.uiinvoice.edit_dist';
!                               
$this->t->set_var('edit',$GLOBALS['phpgw']->link('/index.php',$link_data));
! 
                                $this->t->fp('list','distlist_list',True);
                        }
  
!                       $link_data['dist_id']   = '';
!                       $link_data['cat_id']    = $this->cat_id;
!                       
$this->t->set_var('add_action',$GLOBALS['phpgw']->link('/index.php',$link_data));
                        $this->t->pfp('out','distlist_list_t',True);
                        $this->save_sessiondata('inv_dist');
***************
*** 444,451 ****
                        $values         = $GLOBALS['HTTP_POST_VARS']['values'];
  
                        if ($GLOBALS['HTTP_POST_VARS']['submit'])
                        {
                                $this->bo->save_dist($values);
!                               Header('Location: ' . 
$phpgw->link('/index.php','menuaction=inv.uiinvoice.list_dist&action=inv_dist'));
                                $GLOBALS['phpgw']->common->phpgw_exit();
                        }
--- 452,470 ----
                        $values         = $GLOBALS['HTTP_POST_VARS']['values'];
  
+                       $link_data = array
+                       (
+                               'menuaction'    => 'inv.uiinvoice.list_dist',
+                               'action'                => 'inv_dist'
+                       );
+ 
+                       if (!$dist_id)
+                       {
+                               Header('Location: ' . 
$GLOBALS['phpgw']->link('/index.php',$link_data));
+                       }
+ 
                        if ($GLOBALS['HTTP_POST_VARS']['submit'])
                        {
                                $this->bo->save_dist($values);
!                               Header('Location: ' . 
$phpgw->link('/index.php',$link_data));
                                $GLOBALS['phpgw']->common->phpgw_exit();
                        }
***************
*** 455,459 ****
                        $this->t->set_block('form','edit','edithandle');
  
!                       
$this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php','menuaction=inv.uiinvoice.edit_dist&dist_id='
 . $dist_id));
  
                        if ($dist_id)
--- 474,482 ----
                        $this->t->set_block('form','edit','edithandle');
  
!                       $this->display_app_header();
! 
!                       $link_data['menuaction']        = 
'inv.uiinvoice.edit_dist';
!                       $link_data['dist_id']           = $dist_id;
!                       
$this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php',$link_data));
  
                        if ($dist_id)
***************
*** 473,477 ****
  
                        $this->t->set_var('dist_id',$dist_id);
!                       
$this->t->set_var('company',$GLOBALS['phpgw']->strip_html(($values[0]['org_name']));
                        
$this->t->set_var('department',$GLOBALS['phpgw']->strip_html($values[0]['org_unit']));
                        
$this->t->set_var('firstname',$GLOBALS['phpgw']->strip_html($values[0]['n_given']));
--- 496,500 ----
  
                        $this->t->set_var('dist_id',$dist_id);
!                       
$this->t->set_var('company',$GLOBALS['phpgw']->strip_html($values[0]['org_name']));
                        
$this->t->set_var('department',$GLOBALS['phpgw']->strip_html($values[0]['org_unit']));
                        
$this->t->set_var('firstname',$GLOBALS['phpgw']->strip_html($values[0]['n_given']));
***************
*** 525,528 ****
--- 548,593 ----
                                $this->t->pfp('edithandle','edit');
                        }
+               }
+ 
+               function delete_dist()
+               {
+                       $dist_id = $GLOBALS['HTTP_POST_VARS']['dist_id'] ? 
$GLOBALS['HTTP_POST_VARS']['dist_id'] : $GLOBALS['HTTP_GET_VARS']['dist_id'];
+ 
+                       $link_data = array
+                       (
+                               'menuaction'    => 'inv.uiinvoice.list_dist',
+                               'action'                => 'inv_dist'
+                       );
+ 
+                       if (!$dist_id)
+                       {
+                               Header('Location: ' . 
$GLOBALS['phpgw']->link('/index.php',$link_data));
+                       }
+ 
+                       if ($GLOBALS['HTTP_POST_VARS']['confirm'])
+                       {
+                               $this->bo->delete_dist($dist_id);
+ 
+                               Header('Location: ' . 
$GLOBALS['phpgw']->link('/index.php',$link_data));
+                               $GLOBALS['phpgw']->common->phpgw_exit();
+                       }
+ 
+                       $this->t->set_file(array('dist_delete' => 
'delete.tpl'));
+ 
+                       $this->display_app_header();
+ 
+                       $this->t->set_var('deleteheader',lang('Are you sure you 
want to delete this entry ?'));
+ 
+                       $hidden_vars = '<input type="hidden" name="dist_id" 
value="' . $dist_id . '">' . "\n";
+                       $this->t->set_var('hidden_vars',$hidden_vars);
+                       
$this->t->set_var('nolink',$GLOBALS['phpgw']->link('/index.php',$link_data));
+                       $this->t->set_var('lang_no',lang('No'));
+ 
+                       $link_data['menuaction']        = 
'inv.uiinvoice.delete_dist';
+                       $link_data['dist_id']           = $dist_id;
+ 
+                       
$this->t->set_var('action_url',$GLOBALS['phpgw']->link('/index.php',$link_data));
+                       $this->t->set_var('lang_yes',lang('Yes'));
+                       $this->t->pfp('out','dist_delete');
                }
        }