[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [11131] stripslashes from vendor names
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [11131] stripslashes from vendor names |
|
Date: |
Fri, 24 May 2013 13:15:30 +0000 |
Revision: 11131
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11131
Author: sigurdne
Date: 2013-05-24 13:15:23 +0000 (Fri, 24 May 2013)
Log Message:
-----------
stripslashes from vendor names
Modified Paths:
--------------
trunk/property/inc/class.boproject.inc.php
trunk/property/inc/class.socondition_survey.inc.php
trunk/property/inc/class.sogeneric.inc.php
trunk/property/inc/class.soinvoice.inc.php
Modified: trunk/property/inc/class.boproject.inc.php
===================================================================
--- trunk/property/inc/class.boproject.inc.php 2013-05-24 11:33:12 UTC (rev
11130)
+++ trunk/property/inc/class.boproject.inc.php 2013-05-24 13:15:23 UTC (rev
11131)
@@ -597,7 +597,7 @@
$sum_deviation+= $entry['deviation'];
$entry['cost'] = $entry['combined_cost'];
-
$entry['title']=htmlspecialchars_decode($entry['title']);
+ //
$entry['title']=htmlspecialchars_decode($entry['title']);
if(isset($entry['vendor_id']) &&
$entry['vendor_id'])
{
Modified: trunk/property/inc/class.socondition_survey.inc.php
===================================================================
--- trunk/property/inc/class.socondition_survey.inc.php 2013-05-24 11:33:12 UTC
(rev 11130)
+++ trunk/property/inc/class.socondition_survey.inc.php 2013-05-24 13:15:23 UTC
(rev 11131)
@@ -299,6 +299,12 @@
$config = CreateObject('phpgwapi.config','property');
$config->read();
+ if(!$survey['location_code'])
+ {
+ throw new
Exception('property_socondition_survey::import - condition survey location_code
not configured');
+ }
+
+ //FIXME
if(!isset($config->config_data['condition_survey_import_cat']) ||
!is_array($config->config_data['condition_survey_import_cat']))
{
throw new
Exception('property_socondition_survey::import - condition survey import
categories not configured');
@@ -314,6 +320,19 @@
throw new
Exception('property_socondition_survey::import - condition survey hidden status
not configured');
}
+ /**
+ * Park old request on the location and below as obsolete
+ */
+
if(isset($config->config_data['condition_survey_obsolete_status']) &&
$config->config_data['condition_survey_obsolete_status'])
+ {
+ $this->_db->query("UPDATE_ fm_request SET
status = '{$config->config_data['condition_survey_obsolete_status']}'"
+ . "WHERE location_code {$this->_db->like}
'{$survey['location_code']}%'",__LINE__,__FILE__);
+ }
+ else
+ {
+ throw new
Exception('property_socondition_survey::import - condition survey obsolete
status not configured');
+ }
+
$cats = CreateObject('phpgwapi.categories', -1,
'property', '.project');
$cats->supress_info = true;
$categories = $cats->return_sorted_array(0, false, '',
'', '', $globals = true, '', $use_acl = false);
Modified: trunk/property/inc/class.sogeneric.inc.php
===================================================================
--- trunk/property/inc/class.sogeneric.inc.php 2013-05-24 11:33:12 UTC (rev
11130)
+++ trunk/property/inc/class.sogeneric.inc.php 2013-05-24 13:15:23 UTC (rev
11131)
@@ -2664,7 +2664,7 @@
{
foreach ( $values['attributes'] as
&$attr )
{
- $attr['value'] =
$this->_db->f($attr['column_name']);
+ $attr['value'] =
$this->_db->f($attr['column_name'], true);
}
}
}
Modified: trunk/property/inc/class.soinvoice.inc.php
===================================================================
--- trunk/property/inc/class.soinvoice.inc.php 2013-05-24 11:33:12 UTC (rev
11130)
+++ trunk/property/inc/class.soinvoice.inc.php 2013-05-24 13:15:23 UTC (rev
11131)
@@ -309,7 +309,7 @@
$invoice[$i]['voucher_out_id']
= $invoice_temp['voucher_out_id'];
$invoice[$i]['invoice_count']
= $invoice_temp['invoice_count'];
$invoice[$i]['vendor_id']
= $this->db->f('spvend_code');
- $invoice[$i]['vendor']
= $this->db->f('org_name');
+ $invoice[$i]['vendor']
= $this->db->f('org_name',true);
$invoice[$i]['is_janitor']
= $role['is_janitor'];
$invoice[$i]['is_supervisor']
= $role['is_supervisor'];
$invoice[$i]['is_budget_responsible']
= $role['is_budget_responsible'];
@@ -471,7 +471,7 @@
// 'project_id'
=> $this->db->f('project_id'),
'workorder_id'
=> $this->db->f('pmwrkord_code'),
'order_id'
=> $this->db->f('pmwrkord_code'),
- 'status'
=> $this->db->f('status'),
+ 'status'
=> $this->db->f('status',true),
'closed'
=> !!$this->db->f('closed'),
'project_type_id'
=> $this->db->f('project_type_id'),
'periodization_id'
=> $this->db->f('periodization_id'),
@@ -484,12 +484,12 @@
'dimb'
=> $this->db->f('dimb'),
'dimd'
=> $this->db->f('dimd'),
'dime'
=> $this->db->f('dime'),
- 'remark'
=> !!$this->db->f('merknad'),
+ 'remark'
=> !!$this->db->f('merknad',true),
'tax_code'
=> $this->db->f('mvakode'),
'amount'
=> $this->db->f('belop'),
'approved_amount'
=> $this->db->f('godkjentbelop'),
'charge_tenant'
=> $this->db->f('charge_tenant'),
- 'vendor'
=> $this->db->f('org_name'),
+ 'vendor'
=> $this->db->f('org_name',true),
// 'paid_percent'
=> $this->db->f('paid_percent'),
'project_group'
=> $this->db->f('project_id'),
'external_ref'
=> $this->db->f('external_ref'),
@@ -594,7 +594,7 @@
'invoice_id' =>
$this->db->f('fakturanr'),
'amount'
=> $this->db->f('belop'),
'approved_amount' =>
$this->db->f('godkjentbelop'),
- 'vendor'
=> $this->db->f('org_name'),
+ 'vendor'
=> $this->db->f('org_name',true),
'currency'
=> $this->db->f('currency'),
'period'
=> $this->db->f('periode'),
'budget_responsible' =>
$this->db->f('budsjettansvarligid')
@@ -2449,7 +2449,7 @@
$bilagsnr = $this->db->f('bilagsnr');
$values[$bilagsnr]['bilagsnr_ut']
= $this->db->f('bilagsnr_ut');
- $values[$bilagsnr]['org_name']
= $this->db->f('org_name');
+ $values[$bilagsnr]['org_name']
= $this->db->f('org_name', true);
$values[$bilagsnr]['currency']
= $this->db->f('currency');
$values[$bilagsnr]['kreditnota']
= $this->db->f('kreditnota');
$values[$bilagsnr]['type']
= $this->db->f('type');
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [11131] stripslashes from vendor names,
Sigurd Nes <=