[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [11351] Add filter for paid invoices
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [11351] Add filter for paid invoices |
|
Date: |
Sat, 05 Oct 2013 15:39:04 +0000 |
Revision: 11351
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11351
Author: sigurdne
Date: 2013-10-05 15:39:03 +0000 (Sat, 05 Oct 2013)
Log Message:
-----------
Add filter for paid invoices
Modified Paths:
--------------
trunk/property/inc/class.boinvoice.inc.php
trunk/property/inc/class.soinvoice.inc.php
trunk/property/inc/class.uiinvoice.inc.php
trunk/property/js/yahoo/invoice.paid.index.js
Modified: trunk/property/inc/class.boinvoice.inc.php
===================================================================
--- trunk/property/inc/class.boinvoice.inc.php 2013-10-04 13:26:41 UTC (rev
11350)
+++ trunk/property/inc/class.boinvoice.inc.php 2013-10-05 15:39:03 UTC (rev
11351)
@@ -129,7 +129,7 @@
$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 = '')
+ function
read_invoice($paid='',$start_date='',$end_date='',$vendor_id='',$loc1='',$workorder_id='',$voucher_id='',
$invoice_id = '',$ecodimb = '',$project_id = 0)
{
if(!phpgw::get_var('paid', 'bool'))
{
@@ -144,7 +144,7 @@
'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));
+ 'district_id' => $this->district_id,
'invoice_id' => $invoice_id, 'ecodimb' => $ecodimb, 'project_id' =>
$project_id));
$soXport = CreateObject('property.soXport');
$soworkorder = CreateObject('property.soworkorder');
Modified: trunk/property/inc/class.soinvoice.inc.php
===================================================================
--- trunk/property/inc/class.soinvoice.inc.php 2013-10-04 13:26:41 UTC (rev
11350)
+++ trunk/property/inc/class.soinvoice.inc.php 2013-10-05 15:39:03 UTC (rev
11351)
@@ -77,6 +77,7 @@
$vendor_id =
isset($data['vendor_id'])?$data['vendor_id']:'';
$loc1 =
isset($data['loc1'])?$data['loc1']:'';
$workorder_id =
isset($data['workorder_id'])?$data['workorder_id']:'';
+ $project_id =
isset($data['project_id'])?$data['project_id']:'';
$allrows =
isset($data['allrows'])?$data['allrows']:'';
$voucher_id =
isset($data['voucher_id'])?$data['voucher_id']:'';
$b_account_class=
isset($data['b_account_class'])?$data['b_account_class']:'';
@@ -190,7 +191,20 @@
$filtermethod = " WHERE pmwrkord_code
='$workorder_id' ";
$no_q = true;
}
+ else if ($project_id)
+ {
+ $this->db->query("SELECT id FROM fm_workorder
WHERE project_id='{$project_id}'",__LINE__,__FILE__);
+ $_workorders = array(-1);
+ while($this->db->next_record())
+ {
+ $_workorders[] = $this->db->f('id');
+ }
+ $filtermethod = ' WHERE pmwrkord_code IN (' .
implode(',', $_workorders) . ')';
+ $filtermethod .= " AND (periode
>='$start_periode' AND periode <= '$end_periode')";
+ $no_q = true;
+ }
+
if($query && !$no_q)
{
$query = (int) $query;
Modified: trunk/property/inc/class.uiinvoice.inc.php
===================================================================
--- trunk/property/inc/class.uiinvoice.inc.php 2013-10-04 13:26:41 UTC (rev
11350)
+++ trunk/property/inc/class.uiinvoice.inc.php 2013-10-05 15:39:03 UTC (rev
11351)
@@ -207,6 +207,7 @@
$submit_search = phpgw::get_var('submit_search',
'bool');
$vendor_id = phpgw::get_var('vendor_id',
'int');
$workorder_id = phpgw::get_var('workorder_id', 'int');
+ $project_id = phpgw::get_var('project_id', 'int');
$loc1 = phpgw::get_var('loc1');
$voucher_id = $this->query &&
ctype_digit($this->query) ? $this->query : phpgw::get_var('voucher_id');
$invoice_id = phpgw::get_var('invoice_id');
@@ -285,6 +286,7 @@
'ecodimb'
=> $ecodimb,
'vendor_id'
=> $vendor_id,
'workorder_id' =>
$workorder_id,
+ 'project_id' =>
$project_id,
'start_date' =>
$start_date,
'end_date'
=> $end_date,
'filter'
=> $this->filter,
@@ -303,6 +305,7 @@
."ecodimb:'{$ecodimb}',"
."vendor_id:'{$vendor_id}',"
."workorder_id:'{$workorder_id}',"
+ ."project_id:'{$project_id}',"
."voucher_id:'{$voucher_id}',"
."start_date:'{$start_date}',"
."end_date:'{$end_date}',"
@@ -549,6 +552,11 @@
}
else
{
+
+ $values_combo_box[3] =
$this->bocommon->select_category_list(array('type'=>'dimb', 'selected' =>
$ecodimb));
+ $default_value = array
('id'=>'','name'=>lang('no dimb'));
+ array_unshift
($values_combo_box[3],$default_value);
+
$field_invoice = array
(
array
@@ -594,6 +602,26 @@
'style' =>
'filter'
),
array
+ ( // project
+ 'type' =>
'link',
+ 'id' =>
'lnk_project',
+ 'url' => "",
+ 'value' =>
lang('project id'),
+ 'tab_index' =>
5,
+ 'style' =>
'filter'
+ ),
+ array
+ ( // project box
+ 'name' =>
'project_id',
+ 'id' =>
'txt_project',
+ 'value' =>
$project_id,
+ 'type' =>
'text',
+ 'onkeypress' =>
'return pulsar(event)',
+ 'size' => 10,
+ 'tab_index' =>
6,
+ 'style' =>
'filter'
+ ),
+ array
( //vendor link
'type' =>
'link',
'id' =>
'lnk_vendor',
@@ -752,7 +780,18 @@
'name' =>
'paid',
'value' =>
$paid,
'style' =>
'filter'
- )
+ ),
+ array
+ (
+ 'id' =>
'sel_ecodimb',
+ 'name' =>
'ecodimb',
+ 'value' =>
lang('dimb'),
+ 'type' =>
'select',
+ 'style' =>
'filter',
+ 'values' =>
$values_combo_box[3],
+ 'onchange'=>
'onChangeSelect("ecodimb");',
+ 'tab_index' => 5
+ ),
);
}
@@ -774,6 +813,7 @@
'paid'
=> $paid,
'vendor_id'
=> $vendor_id,
'workorder_id'
=> $workorder_id,
+ 'project_id'
=> $project_id,
'start_date'
=> $start_date,
'end_date'
=> $end_date,
'filter'
=> $this->filter,
@@ -852,7 +892,7 @@
$content = array();
//the first time, $content is empty, because
$user_lid=''.In the seconfd time, user_lid=all; It is done using base_java_url.
- $content =
$this->bo->read_invoice($paid,$start_date,$end_date,$vendor_id,$loc1,$workorder_id,$voucher_id,$invoice_id,$ecodimb);
+ $content =
$this->bo->read_invoice($paid,$start_date,$end_date,$vendor_id,$loc1,$workorder_id,$voucher_id,$invoice_id,$ecodimb,$project_id);
$uicols = array (
Modified: trunk/property/js/yahoo/invoice.paid.index.js
===================================================================
--- trunk/property/js/yahoo/invoice.paid.index.js 2013-10-04 13:26:41 UTC
(rev 11350)
+++ trunk/property/js/yahoo/invoice.paid.index.js 2013-10-05 15:39:03 UTC
(rev 11351)
@@ -21,6 +21,7 @@
var linktoolTips =
[
{name:'lnk_workorder', title:'Workorder ID',
description:'enter the Workorder ID to search by workorder - at any Date'},
+ {name:'lnk_project', title:'Project ID', description:'enter
the project ID to search by project - at any Date'},
{name:'lnk_vendor', title:'Vendor', description:'Select the
vendor by clicking this link'},
{name:'lnk_invoice', title:'Invoice', description:'Enter the
invoice id - any Date'},
{name:'lnk_property', title:'Facilities Managements',
description:'Select the property by clicking this link'},
@@ -29,10 +30,11 @@
var textImput = [
{order:0, name:'workorder_id', id:'txt_workorder'},
- {order:1, name:'vendor_id',
id:'txt_vendor'},
- {order:2, name:'invoice_id', id:'txt_invoice'},
- {order:3, name:'loc1', id:'txt_loc1'},
- {order:4, name:'voucher_id', id:'txt_voucher'}
+ {order:1, name:'project_id', id:'txt_project'},
+ {order:2, name:'vendor_id',
id:'txt_vendor'},
+ {order:3, name:'invoice_id', id:'txt_invoice'},
+ {order:4, name:'loc1', id:'txt_loc1'},
+ {order:5, name:'voucher_id', id:'txt_voucher'}
]
var toolTips = [
@@ -53,6 +55,22 @@
}
var tableYUI;
+
+ this.onChangeSelect = function(type)
+ {
+ var myselect=document.getElementById("sel_"+ type);
+ for (var i=0; i<myselect.options.length; i++)
+ {
+ if (myselect.options[i].selected==true)
+ {
+ break;
+ }
+ }
+ eval("path_values." +type
+"='"+myselect.options[i].value+"'");
+ execute_ds();
+ }
+
+
/********************************************************************************
* Delete all message un DIV 'message'
*/
@@ -70,7 +88,7 @@
path_values.user_lid='all';
//oMenuButton_0.focus();
-
YAHOO.util.Dom.get("start_date-trigger").focus();
+
//YAHOO.util.Dom.get("start_date-trigger").focus();
}
else if(flag_particular_setting=='update')
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [11351] Add filter for paid invoices,
Sigurd Nes <=