[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9823] property : update listing of obligations - and
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [9823] property : update listing of obligations - and fix link to orders and vouchers |
|
Date: |
Thu, 02 Aug 2012 12:21:37 +0000 |
Revision: 9823
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9823
Author: sigurdne
Date: 2012-08-02 12:21:37 +0000 (Thu, 02 Aug 2012)
Log Message:
-----------
property : update listing of obligations - and fix link to orders and vouchers
Modified Paths:
--------------
trunk/property/inc/class.bocommon.inc.php
trunk/property/inc/class.boinvoice.inc.php
trunk/property/inc/class.boworkorder.inc.php
trunk/property/inc/class.sobudget.inc.php
trunk/property/inc/class.soinvoice.inc.php
trunk/property/inc/class.soworkorder.inc.php
trunk/property/inc/class.uibudget.inc.php
trunk/property/inc/class.uiinvoice.inc.php
trunk/property/inc/class.uiworkorder.inc.php
trunk/property/js/yahoo/invoice.consume.js
Modified: trunk/property/inc/class.bocommon.inc.php
===================================================================
--- trunk/property/inc/class.bocommon.inc.php 2012-08-01 14:03:34 UTC (rev
9822)
+++ trunk/property/inc/class.bocommon.inc.php 2012-08-02 12:21:37 UTC (rev
9823)
@@ -1154,6 +1154,7 @@
$cols =
isset($data['cols'])?$data['cols']:'';
$entity_table =
isset($data['entity_table'])?$data['entity_table']:'';
+ $location_table =
isset($data['location_table'])?$data['location_table']:'';
$cols_return = isset($data['cols_return'])
&& $data['cols_return'] ? $data['cols_return']:array();
$uicols =
isset($data['uicols']) && $data['uicols'] ? $data['uicols']: array();
$joinmethod =
isset($data['joinmethod'])?$data['joinmethod']:'';
@@ -1172,7 +1173,7 @@
if($location_level || $force_location)
{
-
+ $_location_table = $location_table ?
$location_table : $entity_table;
if($location_level)
{
$type_id = $location_level;
@@ -1182,7 +1183,7 @@
$type_id =
count($location_types);
}
$cols.= ",fm_location1.loc1_name";
- $joinmethod .= " {$this->join} fm_location1 ON
($entity_table.loc1 = fm_location1.loc1))";
+ $joinmethod .= " {$this->join} fm_location1 ON
({$_location_table}.loc1 = fm_location1.loc1))";
$paranthesis .='(';
$joinmethod .= " {$this->join} fm_part_of_town
ON (fm_location1.part_of_town_id = fm_part_of_town.part_of_town_id))";
$paranthesis .='(';
Modified: trunk/property/inc/class.boinvoice.inc.php
===================================================================
--- trunk/property/inc/class.boinvoice.inc.php 2012-08-01 14:03:34 UTC (rev
9822)
+++ trunk/property/inc/class.boinvoice.inc.php 2012-08-02 12:21:37 UTC (rev
9823)
@@ -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 = '')
+ function
read_invoice($paid='',$start_date='',$end_date='',$vendor_id='',$loc1='',$workorder_id='',$voucher_id='',
$invoice_id = '',$ecodimb = '')
{
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));
+ 'district_id' => $this->district_id,
'invoice_id' => $invoice_id, 'ecodimb' => $ecodimb));
$soXport = CreateObject('property.soXport');
$soworkorder = CreateObject('property.soworkorder');
@@ -207,7 +207,7 @@
return $this->so->read_single_voucher(0, $line_id);
}
- function
read_consume($start_date='',$end_date='',$vendor_id='',$loc1='',$workorder_id='',$b_account_class='',$district_id='')
+ function
read_consume($start_date='',$end_date='',$vendor_id='',$loc1='',$workorder_id='',$b_account_class='',$district_id='',$ecodimb
= '')
{
$start_date =
$this->bocommon->date_to_timestamp($start_date);
$end_date =
$this->bocommon->date_to_timestamp($end_date);
@@ -216,7 +216,7 @@
'user_lid' => $this->user_lid,'cat_id' =>
$this->cat_id,
'start_date'=>$start_date,'end_date'=>$end_date,'vendor_id'=>$vendor_id,
'loc1'=>$loc1,'workorder_id'=>$workorder_id,'b_account_class'
=>$b_account_class,
- 'district_id' => $district_id, 'b_account' =>
$this->b_account ));
+ 'district_id' => $district_id, 'b_account' =>
$this->b_account,'ecodimb' => $ecodimb ));
$this->total_records = $this->so->total_records;
Modified: trunk/property/inc/class.boworkorder.inc.php
===================================================================
--- trunk/property/inc/class.boworkorder.inc.php 2012-08-01 14:03:34 UTC
(rev 9822)
+++ trunk/property/inc/class.boworkorder.inc.php 2012-08-02 12:21:37 UTC
(rev 9823)
@@ -77,6 +77,7 @@
$start_date =
phpgw::get_var('start_date');
$end_date =
phpgw::get_var('end_date');
$b_group =
phpgw::get_var('b_group');
+ $ecodimb =
phpgw::get_var('ecodimb');
$paid =
phpgw::get_var('paid', 'bool');
$b_account =
phpgw::get_var('b_account');
$district_id = phpgw::get_var('district_id',
'int');
@@ -86,23 +87,17 @@
$this->start = $start ? $start : 0;
$this->criteria_id = isset($criteria_id) &&
$criteria_id ? $criteria_id : '';
- if(array_key_exists('b_account',$_POST) ||
array_key_exists('b_account',$_GET) )
- {
- $this->b_account = $b_account;
- }
if(array_key_exists('district_id',$_POST) ||
array_key_exists('district_id',$_GET) )
{
$this->district_id = $district_id;
}
- if(isset($paid))
- {
- $this->paid = $paid;
- }
- if(isset($b_group))
- {
- $this->b_group = $b_group;
- }
+ $this->paid = $paid;
+
+ $this->b_group = $b_group;
+ $this->ecodimb = $ecodimb;
+ $this->b_account = $b_account;
+
if(array_key_exists('query',$_POST) ||
array_key_exists('query',$_GET) )
{
$this->query = $query;
@@ -153,11 +148,11 @@
$this->cat_id =
isset($data['cat_id']) ? $data['cat_id']: '';
$this->status_id =
isset($data['status_id']) ? $data['status_id']: '';
$this->wo_hour_cat_id =
isset($data['wo_hour_cat_id']) ? $data['wo_hour_cat_id']: '';
- $this->start_date =
isset($data['start_date']) ? $data['start_date']: '';
- $this->end_date =
isset($data['end_date']) ? $data['end_date']: '';
- $this->b_group =
isset($data['b_group']) ? $data['b_group']: '';
- $this->paid =
isset($data['paid']) ? $data['paid']: '';
- $this->b_account =
isset($data['b_account']) ? $data['b_account']: '';
+ // $this->start_date =
isset($data['start_date']) ? $data['start_date']: '';
+ // $this->end_date =
isset($data['end_date']) ? $data['end_date']: '';
+ // $this->b_group =
isset($data['b_group']) ? $data['b_group']: '';
+ // $this->paid =
isset($data['paid']) ? $data['paid']: '';
+ // $this->b_account =
isset($data['b_account']) ? $data['b_account']: '';
$this->district_id =
isset($data['district_id']) ? $data['district_id']: '';
$this->criteria_id =
isset($data['criteria_id'])?$data['criteria_id']:'';
}
@@ -466,7 +461,7 @@
'filter' => $this->filter,'cat_id' =>
$this->cat_id,'status_id' => $this->status_id,
'wo_hour_cat_id' => $this->wo_hour_cat_id,
'start_date'=>$start_date,'end_date'=>$end_date,'allrows'=>$data['allrows'],
-
'b_group'=>$this->b_group,'paid'=>$this->paid,'b_account' => $this->b_account,
+
'b_group'=>$this->b_group,'ecodimb'=>$this->ecodimb,
'paid'=>$this->paid,'b_account' => $this->b_account,
'district_id' =>
$this->district_id,'dry_run'=>$data['dry_run'], 'criteria' =>
$this->get_criteria($this->criteria_id)));
$this->total_records = $this->so->total_records;
Modified: trunk/property/inc/class.sobudget.inc.php
===================================================================
--- trunk/property/inc/class.sobudget.inc.php 2012-08-01 14:03:34 UTC (rev
9822)
+++ trunk/property/inc/class.sobudget.inc.php 2012-08-02 12:21:37 UTC (rev
9823)
@@ -1183,7 +1183,7 @@
{
$result[] =
array(
'grouping' => $details ? '' : $b_account,
-
'b_account' => $b_account,
+
'b_account' => $details ? $b_account : '',
'district_id' => $district_id,
'ecodimb' => $dimb,
'actual_cost' => isset($actual_cost[$b_account][$district_id][$dimb]) &&
$actual_cost[$b_account][$district_id][$dimb] ?
round($actual_cost[$b_account][$district_id][$dimb]) : 0,
Modified: trunk/property/inc/class.soinvoice.inc.php
===================================================================
--- trunk/property/inc/class.soinvoice.inc.php 2012-08-01 14:03:34 UTC (rev
9822)
+++ trunk/property/inc/class.soinvoice.inc.php 2012-08-02 12:21:37 UTC (rev
9823)
@@ -82,6 +82,7 @@
$b_account_class=
isset($data['b_account_class'])?$data['b_account_class']:'';
$district_id =
isset($data['district_id'])?$data['district_id']:'';
$invoice_id = $data['invoice_id'] ?
$data['invoice_id'] :'';
+ $ecodimb =
isset($data['ecodimb'])?$data['ecodimb']:'';
$join_tables = '';
$filtermethod = '';
@@ -121,6 +122,12 @@
$where= 'AND';
}
+ if($ecodimb)
+ {
+ $filtermethod .= " $where dimb = " .
(int)$ecodimb;
+ $where= 'AND';
+ }
+
if ($district_id > 0 && $paid)
{
$filtermethod .= " $where
district_id='$district_id' ";
@@ -618,6 +625,7 @@
$workorder_id = isset($data['workorder_id'])
&& $data['workorder_id'] ? $data['workorder_id']:0;
$b_account_class =
isset($data['b_account_class'])?$data['b_account_class']:'';
$b_account =
isset($data['b_account']) ? $data['b_account'] : '';
+ $ecodimb =
isset($data['ecodimb'])?$data['ecodimb']:'';
}
$where = 'AND';
@@ -675,6 +683,12 @@
$where= 'AND';
}
+ if($ecodimb)
+ {
+ $filtermethod .= " $where dimb = " .
(int)$ecodimb;
+ $where= 'AND';
+ }
+
$start_periode = date('Ym',$start_date);
$end_periode = date('Ym',$end_date);
Modified: trunk/property/inc/class.soworkorder.inc.php
===================================================================
--- trunk/property/inc/class.soworkorder.inc.php 2012-08-01 14:03:34 UTC
(rev 9822)
+++ trunk/property/inc/class.soworkorder.inc.php 2012-08-02 12:21:37 UTC
(rev 9823)
@@ -140,6 +140,7 @@
$allrows = isset($data['allrows']) ?
$data['allrows'] : '';
$wo_hour_cat_id = isset($data['wo_hour_cat_id']) ?
$data['wo_hour_cat_id'] : '';
$b_group = isset($data['b_group']) ?
$data['b_group'] : '';
+ $ecodimb = isset($data['ecodimb']) ?
$data['ecodimb'] : '';
$paid = isset($data['paid']) ?
$data['paid'] : '';
$b_account = isset($data['b_account']) ?
$data['b_account'] : '';
$district_id = isset($data['district_id']) ?
$data['district_id'] : '';
@@ -151,9 +152,7 @@
//echo $sql;
if(!$sql)
{
- $entity_table = 'fm_project';
-
- $cols = "$entity_table.id as project_id";
+ $cols = "fm_project.id as project_id";
$cols_return[] =
'project_id';
$uicols['input_type'][] = 'text';
$uicols['name'][] =
'project_id';
@@ -271,7 +270,7 @@
*/
$cols .= ",fm_project.user_id as project_owner";
- $joinmethod .= "{$this->join} fm_workorder ON
({$entity_table}.id = fm_workorder.project_id) {$this->join} phpgw_accounts ON
(fm_workorder.user_id = phpgw_accounts.account_id))";
+ $joinmethod .= "{$this->join} fm_workorder ON
(fm_project.id = fm_workorder.project_id) {$this->join} phpgw_accounts ON
(fm_workorder.user_id = phpgw_accounts.account_id))";
$paranthesis .='(';
$joinmethod .= " {$this->join}
fm_workorder_status ON (fm_workorder.status = fm_workorder_status.id))";
@@ -388,13 +387,21 @@
$uicols['formatter'][] = '';
$uicols['classname'][] = '';
$uicols['sortable'][] = true;
+
+ $joinmethod .=
"{$this->join} fm_locations ON (fm_workorder.location_code =
fm_locations.location_code))";
+ $paranthesis .='(';
+
+ $location_table = 'fm_locations';
}
else
{
- $cols .=
",{$entity_table}.location_code";
+ $cols .= ",fm_project.location_code";
+ $location_table = 'fm_project';
}
- $sql =
$this->bocommon->generate_sql(array('entity_table'=>$entity_table,'cols'=>$cols,'cols_return'=>$cols_return,
+ $entity_table = 'fm_project';
+
+ $sql =
$this->bocommon->generate_sql(array('entity_table'=>$entity_table,'location_table'=>$location_table,'cols'=>$cols,'cols_return'=>$cols_return,
'uicols'=>$uicols,'joinmethod'=>$joinmethod,'paranthesis'=>$paranthesis,'query'=>$query,
'force_location'=>true, 'no_address' =>
$no_address));
@@ -549,6 +556,12 @@
$where= 'AND';
}
+ if ($ecodimb)
+ {
+ $filtermethod .= " $where fm_workorder.ecodimb
=" . (int) $ecodimb;
+ $where= 'AND';
+ }
+
if ($b_account)
{
$filtermethod .= " {$where}
fm_workorder.account_id = '{$b_account}'";
@@ -681,7 +694,7 @@
}
$sql_end = str_replace('SELECT DISTINCT
fm_workorder.id',"SELECT DISTINCT fm_workorder.id {$order_field}",
$sql_minimized) . $ordermethod;
-// _debug_array($sql_end);die();
+ _debug_array($sql_end);
if(!$allrows)
{
Modified: trunk/property/inc/class.uibudget.inc.php
===================================================================
--- trunk/property/inc/class.uibudget.inc.php 2012-08-01 14:03:34 UTC (rev
9822)
+++ trunk/property/inc/class.uibudget.inc.php 2012-08-02 12:21:37 UTC (rev
9823)
@@ -1274,12 +1274,11 @@
$location_list = array();
}
- else
+ // else
{
- $location_list = $this->bo->read_obligations();
+ $location_list = $this->bo->read_obligations();
}
-
//_debug_array($location_list);
$entry = $content = array();
@@ -1314,10 +1313,10 @@
'budget_cost'
=> number_format($entry['budget_cost'], 0, ',', ' '),
'obligation_ex'
=> $entry['obligation'],
'obligation'
=> number_format($entry['obligation'], 0, ',', ' '),
- 'link_obligation'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uiworkorder.index', 'filter'=>'all', 'paid'=>1, 'district_id'=>
$entry['district_id'], 'b_group'=> $entry['grouping'], 'b_account'
=>$b_account, 'start_date'=> $start_date, 'end_date'=> $end_date)),
+ 'link_obligation'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uiworkorder.index', 'filter'=>'all', 'paid'=>1, 'district_id'=>
$entry['district_id'], 'b_group'=> $entry['grouping'], 'b_account'
=>$entry['b_account'], 'start_date'=> $start_date, 'end_date'=> $end_date,
'ecodimb' => $entry['ecodimb'], 'status_id' => 'all')),
'actual_cost_ex'
=> $entry['actual_cost'],
'actual_cost'
=> number_format($entry['actual_cost'], 0, ',', ' '),
- 'link_actual_cost'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uiinvoice.consume', 'district_id'=> $entry['district_id'],
'b_account_class'=> $entry['grouping'], 'b_account' =>$b_account,
'start_date'=> $start_date, 'end_date'=> $end_date, 'submit_search'=>true)),
+ 'link_actual_cost'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uiinvoice.consume', 'district_id'=> $entry['district_id'],
'b_account_class'=> $entry['grouping'], 'b_account' =>$entry['b_account'],
'start_date'=> $start_date, 'end_date'=> $end_date, 'ecodimb' =>
$entry['ecodimb'], 'submit_search'=>true)),
'diff_ex'
=> $entry['budget_cost'] - $entry['actual_cost'] - $entry['obligation'],
'diff'
=> number_format($entry['budget_cost'] - $entry['actual_cost'] -
$entry['obligation'], 0, ',', ' ')
);
Modified: trunk/property/inc/class.uiinvoice.inc.php
===================================================================
--- trunk/property/inc/class.uiinvoice.inc.php 2012-08-01 14:03:34 UTC (rev
9822)
+++ trunk/property/inc/class.uiinvoice.inc.php 2012-08-02 12:21:37 UTC (rev
9823)
@@ -211,7 +211,7 @@
$voucher_id = $this->query &&
ctype_digit($this->query) ? $this->query : phpgw::get_var('voucher_id');
$invoice_id = phpgw::get_var('invoice_id');
$b_account_class= phpgw::get_var('b_account_class',
'int');
-
+ $ecodimb = phpgw::get_var('ecodimb');
$this->save_sessiondata();
//-- ubica focus del menu derecho
@@ -282,6 +282,7 @@
'sub'
=> $this->sub,
// 'query'
=> $this->query,
'paid'
=> $paid,
+ 'ecodimb'
=> $ecodimb,
'vendor_id'
=> $vendor_id,
'workorder_id' =>
$workorder_id,
'start_date' =>
$start_date,
@@ -299,6 +300,7 @@
."sub:'{$this->sub}',"
."query:'{$this->query}',"
."paid:'{$paid}',"
+ ."ecodimb:'{$ecodimb}',"
."vendor_id:'{$vendor_id}',"
."workorder_id:'{$workorder_id}',"
."voucher_id:'{$voucher_id}',"
@@ -776,6 +778,7 @@
'end_date'
=> $end_date,
'filter'
=> $this->filter,
'b_account_class' => $b_account_class,
+ 'ecodimb'
=> $ecodimb,
'district_id'
=> $this->district_id
)
),
@@ -849,7 +852,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);
+ $content =
$this->bo->read_invoice($paid,$start_date,$end_date,$vendor_id,$loc1,$workorder_id,$voucher_id,$invoice_id,$ecodimb);
$uicols = array (
@@ -2482,6 +2485,7 @@
$loc1 = phpgw::get_var('loc1');
$district_id = phpgw::get_var('district_id', 'int');
$b_account_class= phpgw::get_var('b_account_class',
'int');
+ $ecodimb = phpgw::get_var('ecodimb');
//-- ubica focus del menu derecho
$GLOBALS['phpgw_info']['flags']['menu_selection'] .=
'::consume';
@@ -2519,7 +2523,8 @@
'sub' =>
$this->sub,
'query' =>
$this->query,
'start' =>
$this->start,
- 'filter' =>
$this->filter
+ 'filter' =>
$this->filter,
+ 'ecodimb' =>
$ecodimb
));
$datatable['config']['allow_allrows'] = false;
@@ -2533,8 +2538,8 @@
."query:'{$this->query}',"
."start:'{$this->start}',"
."filter:'{$this->filter}',"
- ."b_account_class:'{$b_account_class}'"
- ;
+ ."ecodimb:'{$ecodimb}',"
+ ."b_account_class:'{$b_account_class}'";
$values_combo_box[0] =
$this->bo->select_category('',$this->cat_id);
$default_value = array
('id'=>'','name'=>lang('no category'));
@@ -2548,13 +2553,17 @@
$default_value = array
('id'=>'','name'=>lang('No account'));
array_unshift
($values_combo_box[2],$default_value);
+ $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
( // imag calendar1
'type' =>
'img',
'id' =>
'start_date-trigger',
- 'src' =>
$GLOBALS['phpgw']->common->image('phpgwapi','cal'),
+ // 'src' =>
$GLOBALS['phpgw']->common->image('phpgwapi','cal'),
'alt' =>
lang('Select date'),
'tab_index' => 1,
'style' =>
'filter'
@@ -2574,7 +2583,7 @@
( // imag calendar2
'type' =>
'img',
'id' =>
'end_date-trigger',
- 'src' =>
$GLOBALS['phpgw']->common->image('phpgwapi','cal'),
+ // 'src' =>
$GLOBALS['phpgw']->common->image('phpgwapi','cal'),
'alt' =>
lang('Select date'),
'tab_index' => 3,
'style' =>
'filter'
@@ -2705,7 +2714,18 @@
'type' =>
'button',
'tab_index' => 14,
'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
+ ),
);
$datatable['actions']['form'] = array
@@ -2723,7 +2743,8 @@
'sub'
=> $this->sub,
'query'
=> $this->query,
'start'
=> $this->start,
- 'filter'
=> $this->filter
+ 'filter'
=> $this->filter,
+ 'ecodimb'
=> $ecodimb
)
),
'fields' => array
@@ -2802,7 +2823,7 @@
}
- $content =
$this->bo->read_consume($start_date,$end_date,$vendor_id,$loc1,$workorder_id,$b_account_class,$district_id);
+ $content =
$this->bo->read_consume($start_date,$end_date,$vendor_id,$loc1,$workorder_id,$b_account_class,$district_id,$ecodimb);
$sum = 0;
foreach ($content as & $entry)
@@ -2816,7 +2837,8 @@
'district_id' =>
$district_id,
'b_account_class' =>
$b_account_class,
'start_date' =>
$start_date,
- 'end_date'
=> $end_date
+ 'end_date'
=> $end_date,
+ 'ecodimb'
=> $ecodimb
)
);
$entry['consume'] =
number_format($entry['consume'], 0, ',', ' ');
Modified: trunk/property/inc/class.uiworkorder.inc.php
===================================================================
--- trunk/property/inc/class.uiworkorder.inc.php 2012-08-01 14:03:34 UTC
(rev 9822)
+++ trunk/property/inc/class.uiworkorder.inc.php 2012-08-02 12:21:37 UTC
(rev 9823)
@@ -99,6 +99,7 @@
$this->start_date =
$this->bo->start_date;
$this->end_date =
$this->bo->end_date;
$this->b_group =
$this->bo->b_group;
+ $this->ecodimb =
$this->bo->ecodimb;
$this->paid =
$this->bo->paid;
$this->b_account =
$this->bo->b_account;
$this->district_id =
$this->bo->district_id;
@@ -257,6 +258,9 @@
."start_date:'{$start_date}',"
."end_date:'{$end_date}',"
."wo_hour_cat_id:'{$this->wo_hour_cat_id}',"
+ ."b_group:'{$this->b_group}',"
+ ."b_account:'{$this->b_account}',"
+ ."ecodimb:'{$this->ecodimb}',"
."filter:'{$this->filter}',"
."status_id:'{$this->status_id}',"
."second_display:1,"
Modified: trunk/property/js/yahoo/invoice.consume.js
===================================================================
--- trunk/property/js/yahoo/invoice.consume.js 2012-08-01 14:03:34 UTC (rev
9822)
+++ trunk/property/js/yahoo/invoice.consume.js 2012-08-02 12:21:37 UTC (rev
9823)
@@ -41,6 +41,21 @@
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();
+ }
+
/********************************************************************************/
this.particular_setting = function()
{
@@ -48,29 +63,29 @@
{
//category
index =
locate_in_array_options(0,"value",path_values.cat_id);
- if(index)
- {
- oMenuButton_0.set("label", ("<em>" +
array_options[0][index][1] + "</em>"));
+ if(index)
+ {
+ oMenuButton_0.set("label", ("<em>" +
array_options[0][index][1] + "</em>"));
}
- //district
+ //district
index =
locate_in_array_options(1,"value",path_values.district_id);
- if(index)
- {
- oMenuButton_1.set("label", ("<em>" +
array_options[1][index][1] + "</em>"));
- }
- //account_class
+ if(index)
+ {
+ oMenuButton_1.set("label", ("<em>" +
array_options[1][index][1] + "</em>"));
+ }
+ //account_class
index =
locate_in_array_options(2,"value",path_values.b_account_class);
- if(index)
- {
- oMenuButton_2.set("label", ("<em>" +
array_options[2][index][1] + "</em>"));
- }
-
+ if(index)
+ {
+ oMenuButton_2.set("label", ("<em>" +
array_options[2][index][1] + "</em>"));
+ }
+
//locate (asign ID) to datatable
tableYUI =
YAHOO.util.Dom.getElementsByClassName("yui-dt-data","tbody")[0].parentNode;
tableYUI.setAttribute("id","tableYUI");
-
YAHOO.util.Dom.get("start_date-trigger").focus();
- // really needed?
+
YAHOO.util.Dom.get("start_date-trigger").focus();
+ // really needed?
onSearchClick();
}
else if(flag_particular_setting=='update')
@@ -156,4 +171,4 @@
//Insert JSON utility on the page
loader.insert();
- });
+ });
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9823] property : update listing of obligations - and fix link to orders and vouchers,
Sigurd Nes <=