[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [13011]
From: |
Nelson Guerra |
Subject: |
[Fmsystem-commits] [13011] |
Date: |
Tue, 14 Apr 2015 23:24:40 +0000 |
Revision: 13011
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13011
Author: nelson224
Date: 2015-04-14 23:24:39 +0000 (Tue, 14 Apr 2015)
Log Message:
-----------
Modified Paths:
--------------
branches/dev-syncromind/property/inc/class.boinvoice.inc.php
Modified: branches/dev-syncromind/property/inc/class.boinvoice.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.boinvoice.inc.php
2015-04-14 23:24:21 UTC (rev 13010)
+++ branches/dev-syncromind/property/inc/class.boinvoice.inc.php
2015-04-14 23:24:39 UTC (rev 13011)
@@ -135,23 +135,46 @@
$this->district_id =
isset($data['district_id'])?$data['district_id']:'';
}
- function
read_invoice($paid='',$start_date='',$end_date='',$vendor_id='',$loc1='',$workorder_id='',$voucher_id='',
$invoice_id = '',$ecodimb = '',$project_id = 0)
+ function read_invoice($data)
{
if(!phpgw::get_var('paid', 'bool'))
{
// $voucher_id = $this->query &&
ctype_digit($this->query) ? $this->query : 0;
}
- $start_date =
$this->bocommon->date_to_timestamp($start_date);
- $end_date =
$this->bocommon->date_to_timestamp($end_date);
+ $start_date =
$this->bocommon->date_to_timestamp($data['start_date']);
+ $end_date =
$this->bocommon->date_to_timestamp($data['end_date']);
- $invoice = $this->so->read_invoice(array('start' =>
$this->start,'query' => $this->query,'sort' => $this->sort,'order' =>
$this->order,
+ /*$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,
'voucher_id'=>$voucher_id,'b_account_class'
=>$this->b_account_class,
- 'district_id' => $this->district_id,
'invoice_id' => $invoice_id, 'ecodimb' => $ecodimb, 'project_id' =>
$project_id));
+ 'district_id' => $this->district_id,
'invoice_id' => $invoice_id, 'ecodimb' => $ecodimb, 'project_id' =>
$project_id));*/
+ $invoice = $this->so->read_invoice(array(
+ 'start' => $data['start'],
+ 'query' => $data['query'],
+ 'sort' => $data['sort'],
+ 'order' => $data['order'],
+ 'user_lid' => $this->user_lid,
+ 'cat_id' => $this->cat_id,
+ 'paid' => $data['paid'],
+ 'start_date' => $start_date,
+ 'end_date' => $end_date,
+ 'vendor_id' => $data['vendor_id'],
+ 'loc1' => $data['loc1'],
+ 'workorder_id' => $data['workorder_id'],
+ 'allrows' => $data['allrows'],
+ 'voucher_id' => $data['voucher_id'],
+ 'b_account_class' => $this->b_account_class,
+ 'district_id' => $this->district_id,
+ 'invoice_id' => $data['invoice_id'],
+ 'ecodimb' => $data['ecodimb'],
+ 'project_id' => ($data['project_id']) ?
$data['project_id'] : 0
+ )
+ );
+
$soXport = CreateObject('property.soXport');
$soworkorder = CreateObject('property.soworkorder');
$sos_agreement = CreateObject('property.sos_agreement');
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [13011],
Nelson Guerra <=