[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [11893] property: add project type maintenance
From: |
Sigurd Nes |
Subject: |
[Fmsystem-commits] [11893] property: add project type maintenance |
Date: |
Tue, 08 Apr 2014 07:19:53 +0000 |
Revision: 11893
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11893
Author: sigurdne
Date: 2014-04-08 07:19:48 +0000 (Tue, 08 Apr 2014)
Log Message:
-----------
property: add project type maintenance
Modified Paths:
--------------
trunk/property/inc/class.boproject.inc.php
trunk/property/inc/class.soproject.inc.php
trunk/property/inc/class.uiproject.inc.php
trunk/property/setup/phpgw_no.lang
Modified: trunk/property/inc/class.boproject.inc.php
===================================================================
--- trunk/property/inc/class.boproject.inc.php 2014-04-07 17:12:16 UTC (rev
11892)
+++ trunk/property/inc/class.boproject.inc.php 2014-04-08 07:19:48 UTC (rev
11893)
@@ -234,6 +234,11 @@
),
array
(
+ 'id' => 4,
+ 'name' => lang('maintenance')
+ ),
+ array
+ (
'id' => 2,
'name' => lang('investment')
),
Modified: trunk/property/inc/class.soproject.inc.php
===================================================================
--- trunk/property/inc/class.soproject.inc.php 2014-04-07 17:12:16 UTC (rev
11892)
+++ trunk/property/inc/class.soproject.inc.php 2014-04-08 07:19:48 UTC (rev
11893)
@@ -2256,6 +2256,16 @@
$budget_acc = 0;
}
+ /**
+ * maintenance: start over each year
+ */
+ if($project_type_id == 4 && $_year !=
$entry['year'])
+ {
+ $_year = $entry['year'];
+ $deviation_acc = 0;
+ $budget_acc = 0;
+ }
+
if(abs($entry['actual_cost']) > 0 )
{
$_diff_start =
abs($entry['budget']) > 0 ? $entry['budget'] : $entry['sum_orders'];
@@ -2570,7 +2580,7 @@
$this->update_budget($id, $year,
$periodization_id, $new_budget, true, 'update', true);
}
- else if($project_type_id == 1)//operation
+ else if($project_type_id == 1 || $project_type_id ==
4)//operation or maintenance
{
// if($budget['budget_amount'])
{
@@ -2731,9 +2741,10 @@
$project_types = array
(
- 1 => lang('operation'),
- 2 => lang('investment'),
- 3 => lang('buffer')
+ 1 => lang('operation'),
+ 2 => lang('investment'),
+ 3 => lang('buffer'),
+ 4 => lang('maintenance')
);
$this->db->query($sql, __LINE__, __FILE__);
@@ -3207,4 +3218,4 @@
}
}
- }
\ No newline at end of file
+ }
Modified: trunk/property/inc/class.uiproject.inc.php
===================================================================
--- trunk/property/inc/class.uiproject.inc.php 2014-04-07 17:12:16 UTC (rev
11892)
+++ trunk/property/inc/class.uiproject.inc.php 2014-04-08 07:19:48 UTC (rev
11893)
@@ -231,6 +231,7 @@
if( phpgw::get_var('phpgw_return_as') != 'json' )
{
$datatable['menu']
= $this->bocommon->get_menu();
+
$datatable['config']['base_url'] =
$GLOBALS['phpgw']->link('/index.php', array
(
'menuaction'
=> 'property.uiproject.index',
@@ -2622,7 +2623,7 @@
$_obligation = '';
$entry['new_budget'] = '';
- if($entry['project_type_id'] == 1 ||
$entry['continuous']) // operation or continuous
+ if($entry['project_type_id'] == 1 ||
$entry['project_type_id'] == 4 || $entry['continuous']) // operation or
continuous
{
$_obligation = 0;
$_order = 0;
Modified: trunk/property/setup/phpgw_no.lang
===================================================================
--- trunk/property/setup/phpgw_no.lang 2014-04-07 17:12:16 UTC (rev 11892)
+++ trunk/property/setup/phpgw_no.lang 2014-04-08 07:19:48 UTC (rev 11893)
@@ -1061,6 +1061,7 @@
lowest property no Lavest
mailing method is not chosen! (admin section) property no Mail
metode er ikke valgt! (admin seksjon)
main claim property no Hovedkrav
+maintenance property no Vedlikehold
make order property no Lag bestilling
manage property no Forvalte
manage groups property no Administrere grupper
@@ -2026,4 +2027,4 @@
cost investment property no Andel investering i kr.
grant category property no Tilskuddskategori
what property no Hva
-fictive periodization property no Periodiser løpende ut året
\ No newline at end of file
+fictive periodization property no Periodiser løpende ut året
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [11893] property: add project type maintenance,
Sigurd Nes <=