[Phpgroupware-cvs] CVS: property/inc class.boinvoice.inc.php,1.16,1.17 class.socommon.inc.php,1.20,1.21 class.uirequest.inc.php,1.13,1.14 class.uiXport.inc.php,1.27,1.28

[Sigurd Nes <address@hidden>]

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

Modified Files:
        class.boinvoice.inc.php class.socommon.inc.php 
        class.uirequest.inc.php class.uiXport.inc.php 
Log Message:
no message

Index: class.boinvoice.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.boinvoice.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** class.boinvoice.inc.php     21 May 2003 12:46:39 -0000      1.16
--- class.boinvoice.inc.php     22 May 2003 09:54:11 -0000      1.17
***************
*** 28,35 ****
                        $this->so              = 
CreateObject($this->currentapp.'.soinvoice',True);
                        $this->bocommon    = 
CreateObject($this->currentapp.'.bocommon');
-                       if($useacl)
-                       {
-                               $this->grants = 
$GLOBALS['phpgw']->acl->get_grants('property');
-                       }
                        $this->account_id = 
$GLOBALS['phpgw_info']['user']['account_id'];
  
--- 28,31 ----

Index: class.socommon.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.socommon.inc.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** class.socommon.inc.php      19 May 2003 11:04:36 -0000      1.20
--- class.socommon.inc.php      22 May 2003 09:54:11 -0000      1.21
***************
*** 16,20 ****
                        $this->db               = $GLOBALS['phpgw']->db;
                        $this->db2              = $this->db;
-                       $this->grants   = 
$GLOBALS['phpgw']->acl->get_grants('property');
                        $this->account  = 
$GLOBALS['phpgw_info']['user']['account_id'];
                        $this->acl2     = 
CreateObject($this->currentapp.'.acl2','##DEFAULT##','##DEFAULT##');
--- 16,19 ----

Index: class.uirequest.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uirequest.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** class.uirequest.inc.php     21 May 2003 12:46:40 -0000      1.13
--- class.uirequest.inc.php     22 May 2003 09:54:11 -0000      1.14
***************
*** 378,389 ****
                                        $action='edit';
                                }
-                               else
-                               {
-                                       
$values['request_id']=$this->bo->increment_request_id();
-                                       $id     = $values['request_id'];
-                               }
  
                                if(!$receipt['error'])
                                {
                                        if($values['copy_request'])
                                        {
--- 378,390 ----
                                        $action='edit';
                                }
  
                                if(!$receipt['error'])
                                {
+                                       if(!$id)
+                                       {
+                                               
$values['request_id']=$this->bo->increment_request_id();
+                                               $id     = $values['request_id'];
+                                       }
+ 
                                        if($values['copy_request'])
                                        {

Index: class.uiXport.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiXport.inc.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** class.uiXport.inc.php       21 May 2003 20:09:51 -0000      1.27
--- class.uiXport.inc.php       22 May 2003 09:54:11 -0000      1.28
***************
*** 44,47 ****
--- 44,50 ----
                {
  
+                       $receipt = 
$GLOBALS['phpgw']->session->appsession('session_data','import_receipt');
+                       
$GLOBALS['phpgw']->session->appsession('session_data','import_receipt','');
+ 
                        $art                            = 
get_var('art',array('POST','GET'));
                        $type                           = 
get_var('type',array('POST','GET'));
***************
*** 213,217 ****
                                        if(!$download)
                                        {
!                                               $message = $buffer;
                                                unlink ($tsvfile);
                                                unset($invoice_common);
--- 216,221 ----
                                        if(!$download)
                                        {
!                                               $receipt = $buffer;
!                                               
$GLOBALS['phpgw']->session->appsession('session_data','import_receipt',$receipt);
                                                unlink ($tsvfile);
                                                unset($invoice_common);
***************
*** 230,233 ****
--- 234,238 ----
                                                unset($payment_date);
                                                unset($conv_type);
+                                               
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uiXport.import');
                                        }
                                        else
***************
*** 545,549 ****
  
                                'lang_rollback_file'                    => 
lang('Roll back'),
!                               'link_rollback_file'                    => 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiXport.rollback&sub='.$sub),
  
                                'lang_export_to_file'                   => 
lang('Export to file'),
--- 550,554 ----
  
                                'lang_rollback_file'                    => 
lang('Roll back'),
!                               'link_rollback_file'                    => 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiXport.rollback'),
  
                                'lang_export_to_file'                   => 
lang('Export to file'),
***************
*** 577,601 ****
  //_debug_array($values);
  
!                       $sub = get_var('sub',array('POST','GET'));
! 
!                       $links = $this->bocommon->menu($sub);
  
                        if($values['submit'])
                        {
!                               if (!$values['conv_type'] && !$values['file'] ):
                                {
!                                       $receipt['error'][] = array('msg'=> 
lang('No conversion type could be located.'));
!                                       $receipt['error'][] = array('msg'=> 
lang('Please choose a conversion type from the list'));
!                                       echo '&nbsp<a 
href="'.$GLOBALS['phpgw']->link('/index.php','menuaction=property.uiXport.export')
 . '">' . lang('OK') . '</a>';
                                }
!                               elseif($values['conv_type'] && $values['file']):
                                {
!                                       $receipt = 
$this->bo->rollback($values['conv_type'],$values['file'],$date);
                                }
!                               elseif(!$values['conv_type'] && 
$values['file']):
                                {
!                                       $receipt['error'][] = 
array('msg'=>lang('Please choose a conversion type'));
                                }
-                               endif;
                        }
                        else
--- 582,603 ----
  //_debug_array($values);
  
!                       $links = $this->bocommon->menu();
  
                        if($values['submit'])
                        {
!                               if (!$values['conv_type'])
                                {
!                                       $receipt['error'][] = array('msg'=> 
lang('No conversion type could be located.') .' - ' . lang('Please choose a 
conversion type from the list'));
                                }
! 
!                               if(!$values['file'])
                                {
!                                       $receipt['error'][] = 
array('msg'=>lang('Please choose a file'));
                                }
! 
!                               if(!$receipt['error'])
                                {
!                                       $receipt = 
$this->bo->rollback($values['conv_type'],$values['file'],$date);
                                }
                        }
                        else
***************
*** 604,613 ****
                        }
  
! 
!                       $link_data = array
!                       (
!                               'menuaction'            => 
$this->currentapp.'.uiXport.export',
!                               'invoice_id'            => $invoice_id,
!                               'sub'                           => $sub);
  
                        $dateformat = 
strtolower($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
--- 606,610 ----
                        }
  
!                       $link_data = array('menuaction'         => 
$this->currentapp.'.uiXport.rollback');
  
                        $dateformat = 
strtolower($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
***************
*** 620,623 ****
--- 617,621 ----
                        $dateformat= (implode($sep,$dlarr));
  
+ //_debug_array($receipt);
                        $msgbox_data = $this->bocommon->msgbox_data($receipt);