[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property inc/class.boproject.inc.php inc/class....
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] property inc/class.boproject.inc.php inc/class.... |
|
Date: |
Tue, 20 Mar 2007 12:57:35 +0000 |
CVSROOT: /sources/phpgroupware
Module name: property
Changes by: Sigurd Nes <sigurdne> 07/03/20 12:57:35
Modified files:
inc : class.boproject.inc.php class.soproject.inc.php
class.uiproject.inc.php
templates/base : project.xsl
Log message:
workorder status in project
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.boproject.inc.php?cvsroot=phpgroupware&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.soproject.inc.php?cvsroot=phpgroupware&r1=1.41&r2=1.42
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uiproject.inc.php?cvsroot=phpgroupware&r1=1.53&r2=1.54
http://cvs.savannah.gnu.org/viewcvs/property/templates/base/project.xsl?cvsroot=phpgroupware&r1=1.11&r2=1.12
Patches:
Index: inc/class.boproject.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.boproject.inc.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- inc/class.boproject.inc.php 16 Mar 2007 14:14:56 -0000 1.23
+++ inc/class.boproject.inc.php 20 Mar 2007 12:57:35 -0000 1.24
@@ -24,7 +24,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage project
- * @version $Id: class.boproject.inc.php,v 1.23 2007/03/16 14:14:56
sigurdne Exp $
+ * @version $Id: class.boproject.inc.php,v 1.24 2007/03/20 12:57:35
sigurdne Exp $
*/
/**
@@ -269,6 +269,7 @@
$project['workorder_budget'][$i]['budget']=number_format($workorder_data[$i]['budget'],
2, ',', '');
$project['workorder_budget'][$i]['calculation']=number_format($workorder_data[$i]['calculation']*$tax,
2, ',', '');
$project['workorder_budget'][$i]['charge_tenant'] =
$workorder_data[$i]['charge_tenant'];
+ $project['workorder_budget'][$i]['status'] =
$workorder_data[$i]['status'];
$vendor =
$contacts->read_single(array('actor_id'=>(int)$workorder_data[$i]['vendor_id']));
if(is_array($vendor))
{
Index: inc/class.soproject.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.soproject.inc.php,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- inc/class.soproject.inc.php 20 Feb 2007 22:22:20 -0000 1.41
+++ inc/class.soproject.inc.php 20 Mar 2007 12:57:35 -0000 1.42
@@ -24,7 +24,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage project
- * @version $Id: class.soproject.inc.php,v 1.41 2007/02/20 22:22:20
sigurdne Exp $
+ * @version $Id: class.soproject.inc.php,v 1.42 2007/03/20 12:57:35
sigurdne Exp $
*/
/**
@@ -434,7 +434,8 @@
function project_workorder_data($project_id = '')
{
$budget = array();
- $this->db->query("SELECT act_mtrl_cost,
act_vendor_cost, budget, id as workorder_id, vendor_id,
calculation,rig_addition,addition,deviation,charge_tenant from fm_workorder
where project_id='$project_id'");
+ $this->db->query("SELECT act_mtrl_cost,
act_vendor_cost, budget, fm_workorder.id as workorder_id, vendor_id,
calculation,rig_addition,addition,deviation,charge_tenant,fm_workorder_status.descr
as status"
+ ." FROM fm_workorder $this->join fm_workorder_status ON
fm_workorder.status = fm_workorder_status.id WHERE project_id='$project_id'");
while ($this->db->next_record())
{
$budget[] = array(
@@ -445,7 +446,8 @@
'vendor_id' =>
$this->db->f('vendor_id'),
'act_mtrl_cost' =>
$this->db->f('act_mtrl_cost'),
'act_vendor_cost' =>
$this->db->f('act_vendor_cost'),
- 'charge_tenant' =>
$this->db->f('charge_tenant')
+ 'charge_tenant' =>
$this->db->f('charge_tenant'),
+ 'status' =>
$this->db->f('status')
);
}
return $budget;
Index: inc/class.uiproject.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uiproject.inc.php,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- inc/class.uiproject.inc.php 19 Mar 2007 18:44:06 -0000 1.53
+++ inc/class.uiproject.inc.php 20 Mar 2007 12:57:35 -0000 1.54
@@ -24,7 +24,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage project
- * @version $Id: class.uiproject.inc.php,v 1.53 2007/03/19 18:44:06
sigurdne Exp $
+ * @version $Id: class.uiproject.inc.php,v 1.54 2007/03/20 12:57:35
sigurdne Exp $
*/
/**
@@ -811,7 +811,8 @@
'lang_workorder_id' => lang('Workorder'),
'lang_budget' => lang('Budget'),
'lang_calculation' => lang('Calculation'),
- 'lang_vendor' => lang('Vendor')
+ 'lang_vendor' => lang('Vendor'),
+ 'lang_status' => lang('status')
);
if ($id)
Index: templates/base/project.xsl
===================================================================
RCS file: /sources/phpgroupware/property/templates/base/project.xsl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- templates/base/project.xsl 8 Mar 2007 14:12:41 -0000 1.11
+++ templates/base/project.xsl 20 Mar 2007 12:57:35 -0000 1.12
@@ -1,4 +1,4 @@
-<!-- $Id: project.xsl,v 1.11 2007/03/08 14:12:41 sigurdne Exp $ -->
+<!-- $Id: project.xsl,v 1.12 2007/03/20 12:57:35 sigurdne Exp $ -->
<xsl:template name="app_data">
<xsl:choose>
@@ -497,6 +497,8 @@
</td>
<td>
</td>
+ <td>
+ </td>
</tr>
</table>
</td>
@@ -737,6 +739,9 @@
<td align="left">
<xsl:value-of select="vendor_name"/>
</td>
+ <td align="left">
+ <xsl:value-of select="status"/>
+ </td>
</tr>
</xsl:template>
@@ -851,6 +856,9 @@
<td class="th_text" width="10%" align="right">
<xsl:value-of select="lang_vendor"/>
</td>
+ <td class="th_text" width="10%" align="right">
+ <xsl:value-of select="lang_status"/>
+ </td>
</tr>
</xsl:template>
@@ -1003,6 +1011,8 @@
</td>
<td>
</td>
+ <td>
+ </td>
</tr>
</table>
</td>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property inc/class.boproject.inc.php inc/class....,
Sigurd Nes <=