[Phpgroupware-cvs] property/inc class.uiinvoice.inc.php, 1.20 class.soinvoice.inc.php, 1.16 class.boinvoice.inc.php, 1.15

[sigurdne]

Update of property/inc

Modified Files:
     Branch: MAIN
            class.uiinvoice.inc.php lines: +17 -11
            class.soinvoice.inc.php lines: +8 -2
            class.boinvoice.inc.php lines: +4 -3

Log Message:
no message

====================================================
Index: property/inc/class.uiinvoice.inc.php
diff -u property/inc/class.uiinvoice.inc.php:1.19 
property/inc/class.uiinvoice.inc.php:1.20
--- property/inc/class.uiinvoice.inc.php:1.19   Wed Aug 17 07:18:50 2005
+++ property/inc/class.uiinvoice.inc.php        Fri Aug 26 12:03:56 2005
@@ -100,6 +100,7 @@
                        $vendor_id      = 
get_var('vendor_id',array('POST','GET'));
                        $workorder_id   = 
get_var('workorder_id',array('POST','GET'));
                        $loc1           = get_var('loc1',array('POST','GET'));
+                       $voucher_id     = 
get_var('voucher_id',array('POST','GET'));

                        $start_date=urldecode($start_date);
                        $end_date=urldecode($end_date);
@@ -110,7 +111,7 @@
                                $start_date = $end_date;
                        }

-                       $list = 
$this->bo->read_invoice($paid,$start_date,$end_date,$vendor_id,$loc1,$workorder_id);
+                       $list = 
$this->bo->read_invoice($paid,$start_date,$end_date,$vendor_id,$loc1,$workorder_id,$voucher_id);

                        while (is_array($list[0]) && list($name_entry,) = 
each($list[0]))
                        {
@@ -143,7 +144,8 @@
                        $vendor_id      = 
get_var('vendor_id',array('POST','GET'));
                        $workorder_id   = 
get_var('workorder_id',array('POST','GET'));
                        $loc1           = get_var('loc1',array('POST','GET'));
-
+                       $voucher_id     = 
get_var('voucher_id',array('POST','GET'));
+
                        $start_date=urldecode($start_date);
                        $end_date=urldecode($end_date);

@@ -163,7 +165,7 @@

                        }

-                       $content = 
$this->bo->read_invoice($paid,$start_date,$end_date,$vendor_id,$loc1,$workorder_id);
+                       $content = 
$this->bo->read_invoice($paid,$start_date,$end_date,$vendor_id,$loc1,$workorder_id,$voucher_id);

                        $i=0;
                        if(is_array($content))
@@ -171,11 +173,11 @@
                                foreach($content as $extra)
                                {

-                                       $sum                                    
                        = $sum + $extra['amount'];
-                                       $content[$i]['amount']                  
        = number_format($extra['amount'], 2, ',', '');
+                                       $sum                                    
= $sum + $extra['amount'];
+                                       $content[$i]['amount']                  
= number_format($extra['amount'], 2, ',', '');
                                        $content[$i]['lang_payment_date']       
= lang('Payment Date');
-                                       $content[$i]['link_sub']                
        = 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiinvoice.list_sub&user_lid='.$this->user_lid
 . '&query=' . $this->query);
-                                       $content[$i]['lang_sub']                
        = lang('Voucher ID');
+                                       $content[$i]['link_sub']                
= 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiinvoice.list_sub&user_lid='.$this->user_lid
 . '&query=' . $this->query);
+                                       $content[$i]['lang_sub']                
= lang('Voucher ID');
                                        $content[$i]['lang_sub_help']           
= lang('Klick this link to enter the list of sub-invoices');
                                        $content[$i]['link_period']             
= 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiinvoice.edit_period');
                                        $content[$i]['lang_period']             
= lang('Period');
@@ -378,14 +380,18 @@
                                $data['property_link']                          
        = 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uilocation.index&lookup=1&type_id=1&lookup_name=0');
                                $data['lang_select_property_statustext']= 
lang('Select the property by klicking this link');
                                $data['lang_property_statustext']               
= lang('Search by property');
-
                                $data['lang_property']                          
        = lang('property');
-                               $data['loc1']                                   
                = $loc1;
+                               $data['loc1']                                   
        = $loc1;
                                $data['lang_search']                            
        = lang('Search');
                                $data['lang_search_statustext']                 
= lang('Search for paid invoices');

-                               $data['table_header_list_voucher_paid'] = 
$table_header;
+                               $data['table_header_list_voucher_paid'] =       
$table_header;
                                $data['values_list_voucher_paid']               
= $content;
+
+                               $data['lang_voucher_id_statustext']             
= lang('Search for voucher id');
+                               $data['lang_voucher_id']                        
= lang('Voucher ID');
+                               $data['voucher_id']                             
= $voucher_id;
+
                                
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list_voucher_paid' => 
$data));
                        //      $GLOBALS['phpgw']->xslttpl->pp();
                        }

====================================================
Index: property/inc/class.soinvoice.inc.php
diff -u property/inc/class.soinvoice.inc.php:1.15 
property/inc/class.soinvoice.inc.php:1.16
--- property/inc/class.soinvoice.inc.php:1.15   Thu May 26 11:51:01 2005
+++ property/inc/class.soinvoice.inc.php        Fri Aug 26 12:03:56 2005
@@ -59,6 +59,7 @@
                                $loc1                   = 
(isset($data['loc1'])?$data['loc1']:'');
                                $workorder_id   = 
(isset($data['workorder_id'])?$data['workorder_id']:'');
                                $allrows                = 
(isset($data['allrows'])?$data['allrows']:'');
+                               $voucher_id             = 
(isset($data['voucher_id'])?$data['voucher_id']:'');
                        }

 //_debug_array($data);
@@ -112,6 +113,11 @@
                                $filtermethod .= " $where  pmwrkord_code 
='$workorder_id' ";
                                $where= 'AND';
                        }
+                       if ($voucher_id)
+                       {
+                               $filtermethod .= " $where  bilagsnr $this->like 
'%$voucher_id%' ";
+                               $where= 'AND';
+                       }


                        if ($paid)
@@ -138,7 +144,7 @@
                                $start_date = 
date($this->bocommon->dateformat,mktime(2,0,0,$smonth,$sday,$syear));
                                $end_date = 
date($this->bocommon->dateformat,mktime(2,0,0,$emonth,$eday,$eyear));

-                               if (!$workorder_id)
+                               if (!$workorder_id && !$voucher_id)
                                {
                                        $filtermethod .= " $where  overftid 
>'$start_date' and overftid < '$end_date'";
                                }

====================================================
Index: property/inc/class.boinvoice.inc.php
diff -u property/inc/class.boinvoice.inc.php:1.14 
property/inc/class.boinvoice.inc.php:1.15
--- property/inc/class.boinvoice.inc.php:1.14   Thu May 12 21:26:28 2005
+++ property/inc/class.boinvoice.inc.php        Fri Aug 26 12:03:56 2005
@@ -108,12 +108,13 @@
                        $this->allrows          = $data['allrows'];
                }

-               function 
read_invoice($paid='',$start_date='',$end_date='',$vendor_id='',$loc1='',$workorder_id='')
+               function 
read_invoice($paid='',$start_date='',$end_date='',$vendor_id='',$loc1='',$workorder_id='',$voucher_id='')
                {
                        $invoice = $this->so->read_invoice(array('start' => 
$this->start,'query' => $this->query,'sort' => $this->sort,'order' => 
$this->order,
                                                                                
        'user_lid' => $this->user_lid,'cat_id' => $this->cat_id, 'paid' => 
$paid,
                                                                                
        'start_date'=>$start_date,'end_date'=>$end_date,'vendor_id'=>$vendor_id,
-                                                                               
        'loc1'=>$loc1,'workorder_id'=>$workorder_id,'allrows'=>$this->allrows));
+                                                                               
        'loc1'=>$loc1,'workorder_id'=>$workorder_id,'allrows'=>$this->allrows,
+                                                                               
        'voucher_id'=>$voucher_id));

                        $this->total_records = $this->so->total_records;
                        $this->end_time = $this->so->end_time;