[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8776] property: invoice handling, ACL
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [8776] property: invoice handling, ACL |
|
Date: |
Fri, 03 Feb 2012 07:53:28 +0000 |
Revision: 8776
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8776
Author: sigurdne
Date: 2012-02-03 07:53:28 +0000 (Fri, 03 Feb 2012)
Log Message:
-----------
property: invoice handling, ACL
Modified Paths:
--------------
trunk/property/inc/class.uiinvoice.inc.php
trunk/property/setup/phpgw_no.lang
Modified: trunk/property/inc/class.uiinvoice.inc.php
===================================================================
--- trunk/property/inc/class.uiinvoice.inc.php 2012-02-02 18:05:00 UTC (rev
8775)
+++ trunk/property/inc/class.uiinvoice.inc.php 2012-02-03 07:53:28 UTC (rev
8776)
@@ -713,8 +713,8 @@
$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);
-
+
$uicols = array (
'input_type' => array
(
@@ -1351,7 +1351,7 @@
}
else
{
-
$json_row[$column['name']] = "<a target='".$column['target']."'
href='".$column['link']."' >".$column['value']."</a>";
+
$json_row[$column['name']] = "<a target='".$column['target']."'
href='".$column['link']."' >".$column['value']."</a>";
}
}
else if($column['format']==
"input")
@@ -1605,7 +1605,14 @@
if( phpgw::get_var('phpgw_return_as') == 'json' &&
is_array($values) && isset($values))
{
- $receipt =
$this->bo->update_invoice_sub($values);
+ if($this->get_approve_role())
+ {
+ $receipt =
$this->bo->update_invoice_sub($values);
+ }
+ else
+ {
+
$receipt['error'][]=array('msg'=>lang('you are not approved for this task'));
+ }
}
if ($voucher_id)
@@ -1912,15 +1919,15 @@
else if($i == 16)
{
$json_row[$uicols[$i]['col_name']] = $invoices['counter'];
- }
+ }
else if($i == 17)
{
$json_row[$uicols[$i]['col_name']] = $invoices['id'];
- }
+ }
else if($i == 18)
{
$json_row[$uicols[$i]['col_name']] = $invoices['external_ref'];
- }
+ }
}
if($invoices['workorder_id'])
@@ -2153,22 +2160,8 @@
'is_budget_responsible' => lang('b -
responsible')
);
- $roles = $this->bo->check_role();
+ $approve = $this->get_approve_role();
- $approve = array();
- foreach ($roles as $role => $role_value)
- {
- if ($role_value && isset($role_check[$role]))
- {
- $approve[] = array
- (
- 'id' => $role,
- 'name' =>
$role_check[$role],
- 'selected' => 0
- );
- }
- }
-
$values = phpgw::get_var('values');
$receipt = array();
@@ -2182,7 +2175,7 @@
if(!$approve)
{
-
$receipt['error'][]=array('msg'=>lang('you are not approved for this task'));
+
$receipt['error'][]=array('msg'=>lang('you are not approved for this task'));
}
if(!isset($values['process_log']) ||
!$values['process_log'])
@@ -2196,7 +2189,7 @@
$values['approved_amount']
= str_replace(',','.',$values['approved_amount']);
if( isset($values['order_id']) &&
$values['order_id'] &&
!execMethod('property.soXport.check_order',$values['order_id']) )
{
-
$receipt['error'][]=array('msg'=>lang('no such order:
%1',$values['order_id']));
+
$receipt['error'][]=array('msg'=>lang('no such order: %1',$values['order_id']));
}
}
else
@@ -2228,7 +2221,7 @@
// _debug_array($line);
$approved_list = array();
-
+
$approved_list[] = array
(
'role' => $role_check['is_janitor'],
@@ -2338,13 +2331,13 @@
$paid = phpgw::get_var('paid', 'bool');
$text = $this->bo->read_remark($id,$paid);
-
+
$html = '';
if(stripos($text, '<table') )
{
$html = 1;
}
-
+
$data = array
(
'remark' => $text,
@@ -3693,7 +3686,7 @@
if($values)
{
// _debug_array($values);die();
-
+
if(isset($values['export_reconciliation']) &&
$values['export_reconciliation'])
{
if(!isset($values['periods']))
@@ -3704,7 +3697,7 @@
else
{
$this->bo->export_historical_transactions_at_periods($values['periods']);
-
+
}
}
else if(isset($values['export_deposition']) &&
$values['export_deposition'])
@@ -3768,22 +3761,8 @@
'is_budget_responsible' => lang('b -
responsible')
);
- $roles = $this->bo->check_role();
+ $approve = $this->get_approve_role();
- $approve = array();
- foreach ($roles as $role => $role_value)
- {
- if ($role_value && isset($role_check[$role]))
- {
- $approve[] = array
- (
- 'id' => $role,
- 'name' =>
$role_check[$role],
- 'selected' => 0
- );
- }
- }
-
$values = phpgw::get_var('values');
$receipt = array();
@@ -3796,7 +3775,7 @@
if(!$approve)
{
-
$receipt['error'][]=array('msg'=>lang('you are not approved for this task'));
+
$receipt['error'][]=array('msg'=>lang('you are not approved for this task'));
}
if (!$receipt['error'])
@@ -3821,7 +3800,7 @@
$_orders[] = $line['order_id'];
}
}
-
+
$_orders = array_unique($_orders);
foreach ($_orders as $_order)
@@ -3925,4 +3904,31 @@
$GLOBALS['phpgw']->xslttpl->add_file('invoice');
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',
array('forward' => $data));
}
+
+ function get_approve_role()
+ {
+ $role_check = array
+ (
+ 'is_janitor' =>
lang('janitor'),
+ 'is_supervisor' =>
lang('supervisor'),
+ 'is_budget_responsible' => lang('b -
responsible')
+ );
+
+ $roles = $this->bo->check_role();
+
+ $approve = array();
+ foreach ($roles as $role => $role_value)
+ {
+ if ($role_value && isset($role_check[$role]))
+ {
+ $approve[] = array
+ (
+ 'id' => $role,
+ 'name' =>
$role_check[$role],
+ 'selected' => 0
+ );
+ }
+ }
+ return $approve;
+ }
}
Modified: trunk/property/setup/phpgw_no.lang
===================================================================
--- trunk/property/setup/phpgw_no.lang 2012-02-02 18:05:00 UTC (rev 8775)
+++ trunk/property/setup/phpgw_no.lang 2012-02-03 07:53:28 UTC (rev 8776)
@@ -1885,6 +1885,7 @@
write off period property no avskrivningsperiode
year property no År
yearly property no Årlig
+you are not approved for this task property no Du mangler
rettigheter for denne oppgaven
you have entered an invalid end date ! property no Du har angitt
en ugyldig slutt dato
you have entered an invalid start date ! property no Du har
angitt en ugyldig start dato
you have no edit right for this project property no Du har
ikke editeringsrettigheter for dette prosjektet
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8776] property: invoice handling, ACL,
Sigurd Nes <=