[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property inc/class.boworkorder.inc.php inc/clas...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] property inc/class.boworkorder.inc.php inc/clas... |
|
Date: |
Tue, 09 May 2006 20:15:46 +0000 |
CVSROOT: /sources/phpgroupware
Module name: property
Branch:
Changes by: Sigurd Nes <address@hidden> 06/05/09 20:15:46
Modified files:
inc : class.boworkorder.inc.php
class.sobudget.inc.php
class.soworkorder.inc.php
class.uibudget.inc.php
class.uiworkorder.inc.php
inc/export : Agresso
setup : setup.inc.php tables_current.inc.php
tables_update.inc.php
Log message:
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/inc/class.boworkorder.inc.php.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/inc/class.sobudget.inc.php.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/inc/class.soworkorder.inc.php.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/inc/class.uibudget.inc.php.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/inc/class.uiworkorder.inc.php.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/inc/export/Agresso.diff?tr1=1.31&tr2=1.32&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/setup/setup.inc.php.diff?tr1=1.42&tr2=1.43&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/setup/tables_current.inc.php.diff?tr1=1.61&tr2=1.62&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/setup/tables_update.inc.php.diff?tr1=1.47&tr2=1.48&r1=text&r2=text
Patches:
Index: property/inc/class.boworkorder.inc.php
diff -u property/inc/class.boworkorder.inc.php:1.13
property/inc/class.boworkorder.inc.php:1.14
--- property/inc/class.boworkorder.inc.php:1.13 Fri May 5 09:26:10 2006
+++ property/inc/class.boworkorder.inc.php Tue May 9 20:15:45 2006
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage project
- * @version $Id: class.boworkorder.inc.php,v 1.13 2006/05/05 09:26:10
sigurdne Exp $
+ * @version $Id: class.boworkorder.inc.php,v 1.14 2006/05/09 20:15:45
sigurdne Exp $
*/
/**
@@ -27,10 +27,10 @@
var $public_functions = array
(
- 'read' => True,
+ 'read' => True,
'read_single' => True,
- 'save' => True,
- 'delete' => True,
+ 'save' => True,
+ 'delete' => True,
'check_perms' => True
);
@@ -58,7 +58,8 @@
$start_date =
get_var('start_date',array('POST','GET'));
$end_date =
get_var('end_date',array('POST','GET'));
$b_group =
get_var('b_group',array('POST','GET'));
-
+ $paid = get_var('paid',array('POST','GET'));
+
if ($start)
{
$this->start=$start;
@@ -68,6 +69,10 @@
$this->start=0;
}
+ if(isset($paid))
+ {
+ $this->paid = $paid;
+ }
if(isset($b_group))
{
$this->b_group = $b_group;
@@ -130,6 +135,7 @@
$this->start_date = $data['start_date'];
$this->end_date = $data['end_date'];
$this->b_group = $data['b_group'];
+ $this->paid = $data['paid'];
}
function save_sessiondata($data)
@@ -217,7 +223,7 @@
'filter' => $this->filter,'cat_id' => $this->cat_id,'status_id' =>
$this->status_id,
'search_vendor' => $this->search_vendor,'wo_hour_cat_id' =>
$this->wo_hour_cat_id,
'start_date'=>$start_date,'end_date'=>$end_date,'allrows'=>$allrows,
-
'b_group'=>$this->b_group));
+
'b_group'=>$this->b_group,'paid'=>$this->paid));
$this->total_records = $this->so->total_records;
$dateformat =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
Index: property/inc/class.sobudget.inc.php
diff -u property/inc/class.sobudget.inc.php:1.18
property/inc/class.sobudget.inc.php:1.19
--- property/inc/class.sobudget.inc.php:1.18 Tue May 9 13:41:25 2006
+++ property/inc/class.sobudget.inc.php Tue May 9 20:15:45 2006
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage budget
- * @version $Id: class.sobudget.inc.php,v 1.18 2006/05/09 13:41:25
sigurdne Exp $
+ * @version $Id: class.sobudget.inc.php,v 1.19 2006/05/09 20:15:45
sigurdne Exp $
*/
/**
@@ -422,7 +422,7 @@
$year = (isset($data['year'])?$data['year']:'');
}
- $filtermethod = " WHERE fm_workorder.status='Bestilt' ";
+ $filtermethod = " WHERE fm_workorder.paid is NULL ";
$where = 'AND';
if ($district_id > 0)
Index: property/inc/class.soworkorder.inc.php
diff -u property/inc/class.soworkorder.inc.php:1.18
property/inc/class.soworkorder.inc.php:1.19
--- property/inc/class.soworkorder.inc.php:1.18 Fri May 5 09:26:10 2006
+++ property/inc/class.soworkorder.inc.php Tue May 9 20:15:45 2006
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage project
- * @version $Id: class.soworkorder.inc.php,v 1.18 2006/05/05 09:26:10
sigurdne Exp $
+ * @version $Id: class.soworkorder.inc.php,v 1.19 2006/05/09 20:15:45
sigurdne Exp $
*/
/**
@@ -134,14 +134,9 @@
$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']:'');
+ $paid = (isset($data['paid'])?$data['paid']:'');
}
- if ($b_group && !$status_id)
- {
- $status_id = 'Bestilt';
- }
-
-
//_debug_array($data);
$sql =
$this->bocommon->fm_cache('sql_workorder'.!!$search_vendor . '_' .
!!$wo_hour_cat_id . '_' . !!$b_group);
@@ -301,6 +296,12 @@
$where= 'AND';
}
+ if ($paid)
+ {
+ $filtermethod .= " $where fm_workorder.paid
!='1' ";
+ $where= 'AND';
+ }
+
if ($filter=='all')
{
if (is_array($this->grants))
Index: property/inc/class.uibudget.inc.php
diff -u property/inc/class.uibudget.inc.php:1.17
property/inc/class.uibudget.inc.php:1.18
--- property/inc/class.uibudget.inc.php:1.17 Tue May 9 10:42:47 2006
+++ property/inc/class.uibudget.inc.php Tue May 9 20:15:45 2006
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage budget
- * @version $Id: class.uibudget.inc.php,v 1.17 2006/05/09 10:42:47
sigurdne Exp $
+ * @version $Id: class.uibudget.inc.php,v 1.18 2006/05/09 20:15:45
sigurdne Exp $
*/
/**
@@ -537,7 +537,7 @@
'grouping'
=> $entry['grouping'],
'district_id'
=> $entry['district_id'],
'obligation'
=> number_format($entry['obligation'], 0, ',', ' '),
- 'link_obligation'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.index&filter=all&status_id=Bestilt&district_id='
. $entry['district_id'] . '&b_group=' . $entry['grouping']),
+ 'link_obligation'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.index&filter=all&paid=true&district_id='
. $entry['district_id'] . '&b_group=' . $entry['grouping']),
'actual_cost'
=> number_format($entry['actual_cost'], 0, ',', ' '),
'link_actual_cost'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiinvoice.consume&district_id='
. $entry['district_id'] . '&b_account_class=' . $entry['grouping'] .
'&start_date=' . $start_date . '&end_date=' . $end_date .
'&submit_search=true'),
'diff'
=> number_format($entry['budget_cost'] - $entry['actual_cost'] -
$entry['obligation'], 0, ',', ' '),
Index: property/inc/class.uiworkorder.inc.php
diff -u property/inc/class.uiworkorder.inc.php:1.21
property/inc/class.uiworkorder.inc.php:1.22
--- property/inc/class.uiworkorder.inc.php:1.21 Fri May 5 07:43:34 2006
+++ property/inc/class.uiworkorder.inc.php Tue May 9 20:15:45 2006
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage project
- * @version $Id: class.uiworkorder.inc.php,v 1.21 2006/05/05 07:43:34
sigurdne Exp $
+ * @version $Id: class.uiworkorder.inc.php,v 1.22 2006/05/09 20:15:45
sigurdne Exp $
*/
/**
@@ -67,8 +67,8 @@
$this->wo_hour_cat_id =
$this->bo->wo_hour_cat_id;
$this->start_date =
$this->bo->start_date;
$this->end_date =
$this->bo->end_date;
-
$this->b_group =
$this->bo->b_group;
+ $this->paid =
$this->bo->paid;
$this->menu->sub ='project';
}
@@ -89,6 +89,7 @@
'start_date' =>
$this->start_date,
'end_date' =>
$this->end_date,
'b_group' =>
$this->b_group
+ 'paid' => $this->paid,
);
$this->bo->save_sessiondata($data);
}
@@ -228,7 +229,8 @@
'start_date'
=>$start_date,
'end_date'
=>$end_date,
'wo_hour_cat_id'=>$this->wo_hour_cat_id,
-
'b_group' =>
$this->b_group
+
'b_group' =>
$this->b_group,
+
'paid' =>
$this->paid
)
));
}
@@ -250,7 +252,8 @@
'start_date'
=>$start_date,
'end_date'
=>$end_date,
'wo_hour_cat_id'=>$this->wo_hour_cat_id,
-
'b_group' =>
$this->b_group
+
'b_group' =>
$this->b_group,
+
'paid' =>
$this->paid
)
));
}
if($uicols['name'][$i]=='workorder_id')
@@ -271,7 +274,8 @@
'start_date'
=>$start_date,
'end_date'
=>$end_date,
'wo_hour_cat_id'
=>$this->wo_hour_cat_id,
-
'b_group' =>
$this->b_group
+
'b_group' =>
$this->b_group,
+
'paid' =>
$this->paid
)
));
}
@@ -293,7 +297,8 @@
'start_date'
=>$start_date,
'end_date'
=>$end_date,
'wo_hour_cat_id'=>$this->wo_hour_cat_id,
-
'b_group' =>
$this->b_group
+
'b_group' =>
$this->b_group,
+
'paid' =>
$this->paid
)
));
}
@@ -362,7 +367,8 @@
'start_date'
=>$start_date,
'end_date'
=>$end_date,
'wo_hour_cat_id'
=>$this->wo_hour_cat_id,
- 'b_group' =>
$this->b_group
+ 'b_group' =>
$this->b_group,
+ 'paid' =>
$this->paid
);
$link_date_search
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.date_search');
@@ -382,7 +388,8 @@
'end_date'
=>$end_date,
'start'
=>$this->start,
'wo_hour_cat_id'
=>$this->wo_hour_cat_id,
- 'b_group' =>
$this->b_group
+ 'b_group' =>
$this->b_group,
+ 'paid' =>
$this->paid
);
@@ -408,7 +415,7 @@
'end_date'
=>$end_date,
'lang_none'
=>lang('None'),
'lang_date_search' =>
lang('Date search'),
- 'lang_date_search_help' => lang('Narrow
the search by dates'),
+ 'lang_date_search_help' =>
lang('Narrow the search by dates'),
'link_date_search' =>
$link_date_search,
'overlib_source' =>
'./'.$this->currentapp.'/inc/overlib.js',
Index: property/inc/export/Agresso
diff -u property/inc/export/Agresso:1.31 property/inc/export/Agresso:1.32
--- property/inc/export/Agresso:1.31 Sun Apr 23 10:07:45 2006
+++ property/inc/export/Agresso Tue May 9 20:15:45 2006
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage export
- * @version $Id: Agresso,v 1.31 2006/04/23 10:07:45 sigurdne Exp $
+ * @version $Id: Agresso,v 1.32 2006/05/09 20:15:45 sigurdne Exp $
*/
/**
@@ -286,8 +286,17 @@
function
correct_actual_cost($pmwrkord_code,$Belop,$actual_cost_field,$operator)
{
$Belop=$Belop/100;
+
+ if($operator == "-")
+ {
+ $update_paid = ", paid = NULL";
+ }
+ else
+ {
+ $update_paid = ", paid = 1";
+ }
- $sql="update fm_workorder set
$actual_cost_field=$actual_cost_field $operator $Belop where
id='$pmwrkord_code'";
+ $sql="UPDATE fm_workorder SET
$actual_cost_field=$actual_cost_field $operator $Belop $update_paid WHERE
id='$pmwrkord_code'";
$this->db->query($sql,__LINE__,__FILE__);
}
Index: property/setup/setup.inc.php
diff -u property/setup/setup.inc.php:1.42 property/setup/setup.inc.php:1.43
--- property/setup/setup.inc.php:1.42 Thu May 4 13:47:13 2006
+++ property/setup/setup.inc.php Tue May 9 20:15:45 2006
@@ -8,12 +8,12 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage setup
- * @version $Id: setup.inc.php,v 1.42 2006/05/04 13:47:13 sigurdne Exp $
+ * @version $Id: setup.inc.php,v 1.43 2006/05/09 20:15:45 sigurdne Exp $
*/
$setup_info['property']['name'] = 'property';
$setup_info['property']['title'] = 'Property';
- $setup_info['property']['version'] = '0.9.17.522';
+ $setup_info['property']['version'] = '0.9.17.523';
$setup_info['property']['app_order'] = 8;
$setup_info['property']['enable'] = 1;
$setup_info['property']['app_group'] = 'office';
Index: property/setup/tables_current.inc.php
diff -u property/setup/tables_current.inc.php:1.61
property/setup/tables_current.inc.php:1.62
--- property/setup/tables_current.inc.php:1.61 Thu May 4 13:47:13 2006
+++ property/setup/tables_current.inc.php Tue May 9 20:15:45 2006
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage setup
- * @version $Id: tables_current.inc.php,v 1.61 2006/05/04 13:47:13
sigurdne Exp $
+ * @version $Id: tables_current.inc.php,v 1.62 2006/05/09 20:15:45
sigurdne Exp $
*/
$phpgw_baseline = array(
@@ -569,7 +569,8 @@
'key_deliver' => array('type' =>
'int','precision' => '4','nullable' => True),
'integration' => array('type' =>
'int','precision' => '4','nullable' => True),
'charge_tenant' => array('type' =>
'int','precision' => '2','nullable' => True),
- 'claim_issued' => array('type' =>
'int','precision' => '2','nullable' => True)
+ 'claim_issued' => array('type' =>
'int','precision' => '2','nullable' => True),
+ 'paid' => array('type' => 'int','precision' =>
'2','nullable' => True)
),
'pk' => array('id'),
'fk' => array(),
Index: property/setup/tables_update.inc.php
diff -u property/setup/tables_update.inc.php:1.47
property/setup/tables_update.inc.php:1.48
--- property/setup/tables_update.inc.php:1.47 Fri May 5 08:27:41 2006
+++ property/setup/tables_update.inc.php Tue May 9 20:15:45 2006
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage setup
- * @version $Id: tables_update.inc.php,v 1.47 2006/05/05 08:27:41
sigurdne Exp $
+ * @version $Id: tables_update.inc.php,v 1.48 2006/05/09 20:15:45
sigurdne Exp $
*/
/**
@@ -1338,3 +1338,18 @@
return $GLOBALS['setup_info']['property']['currentver'];
}
+ /**
+ * Update property version from 0.9.17.522 to 0.9.17.523
+ */
+
+ $test[] = '0.9.17.522';
+ function property_upgrade0_9_17_522()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('fm_workorder','paid', array('type'
=> 'int','precision' => '2','nullable' => True));
+
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit();
+ $GLOBALS['setup_info']['property']['currentver'] = '0.9.17.523';
+ return $GLOBALS['setup_info']['property']['currentver'];
+ }
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property inc/class.boworkorder.inc.php inc/clas...,
Sigurd Nes <=