[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [6975] Merge 6972:6974 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [6975] Merge 6972:6974 from trunk |
|
Date: |
Fri, 11 Feb 2011 14:37:22 +0000 |
Revision: 6975
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6975
Author: sigurdne
Date: 2011-02-11 14:37:21 +0000 (Fri, 11 Feb 2011)
Log Message:
-----------
Merge 6972:6974 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/property/inc/class.sogab.inc.php
branches/Version-1_0-branch/property/inc/class.uiwo_hour.inc.php
branches/Version-1_0-branch/rental/inc/class.uibilling.inc.php
Property Changed:
----------------
branches/Version-1_0-branch/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971
+
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974
Modified: branches/Version-1_0-branch/property/inc/class.sogab.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.sogab.inc.php
2011-02-11 14:34:32 UTC (rev 6974)
+++ branches/Version-1_0-branch/property/inc/class.sogab.inc.php
2011-02-11 14:37:21 UTC (rev 6975)
@@ -71,9 +71,11 @@
$check_payments =
isset($data['check_payments']) ? $data['check_payments'] : '';
}
+
+
if ($order)
{
- $ordermethod = " order by
fm_gab_location.$order $sort";
+ $ordermethod = " order by
fm_gab_location.{$order} {$sort}";
}
else
{
@@ -85,39 +87,52 @@
if ($cat_id > 0)
{
- $filtermethod .= " $where
fm_gab_location.category='$cat_id' ";
+ $filtermethod .= " {$where}
fm_gab_location.category='{$cat_id}' ";
$where = 'AND';
}
if ($address)
{
- $filtermethod .= " $where
fm_gab_location.address $this->like '%$address%' ";
+ $filtermethod .= " {$where}
fm_gab_location.address {$this->like} '%{$address}%' ";
$where = 'AND';
}
if ($location_code)
{
- $filtermethod .= " $where
fm_gab_location.location_code $this->like '$location_code%' ";
+ $location_code = explode('-',$location_code);
+ $i = 1;
+ foreach($location_code as $_loc)
+ {
+ $loc[] = $_loc;
+ if($i == $this->gab_insert_level)
+ {
+ break;
+ }
+ $i++;
+ }
+ $location_code = implode('-', $loc);
+
+ $filtermethod .= " {$where}
fm_gab_location.location_code {$this->like} '{$location_code}%' ";
$where = 'AND';
}
if ($gaards_nr)
{
- $filtermethod .= " $where SUBSTRING(gab_id,5,5)
$this->like '%$gaards_nr' ";
+ $filtermethod .= " {$where}
SUBSTRING(gab_id,5,5) {$this->like} '%$gaards_nr' ";
$where = 'AND';
}
if ($bruksnr)
{
- $filtermethod .= " $where
SUBSTRING(gab_id,10,4) $this->like '%$bruksnr' ";
+ $filtermethod .= " {$where}
SUBSTRING(gab_id,10,4) {$this->like} '%$bruksnr' ";
$where = 'AND';
}
if ($feste_nr)
{
- $filtermethod .= " $where
SUBSTRING(gab_id,14,4) $this->like '%$feste_nr' ";
+ $filtermethod .= " {$where}
SUBSTRING(gab_id,14,4) {$this->like} '%$feste_nr' ";
$where = 'AND';
}
if ($seksjons_nr)
{
- $filtermethod .= " $where
SUBSTRING(gab_id,18,3) $this->like '%$seksjons_nr' ";
+ $filtermethod .= " {$where}
SUBSTRING(gab_id,18,3) {{$this->like}} '%$seksjons_nr' ";
$where = 'AND';
}
Modified: branches/Version-1_0-branch/property/inc/class.uiwo_hour.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiwo_hour.inc.php
2011-02-11 14:34:32 UTC (rev 6974)
+++ branches/Version-1_0-branch/property/inc/class.uiwo_hour.inc.php
2011-02-11 14:37:21 UTC (rev 6975)
@@ -1339,22 +1339,7 @@
$location_code =
isset($common_data['workorder']['location_code']) &&
$common_data['workorder']['location_code'] ?
$common_data['workorder']['location_code'] : $project['location_code'];
- $location_code = explode('-',$location_code);
-
- $gab_insert_level =
isset($this->config->config_data['gab_insert_level']) &&
$this->config->config_data['gab_insert_level'] ?
$this->config->config_data['gab_insert_level'] : 3;
- $i = 1;
- foreach($location_code as $_loc)
- {
- $loc[] = $_loc;
- if($i == $gab_insert_level)
- {
- break;
- }
- $i++;
- }
- $location_code = implode('-', $loc);
-
$gabinfos = execMethod('property.sogab.read',
array('location_code' => $location_code, 'allrows' => true));
if($gabinfos != null && is_array($gabinfos) &&
count($gabinfos) == 1)
{
Modified: branches/Version-1_0-branch/rental/inc/class.uibilling.inc.php
===================================================================
--- branches/Version-1_0-branch/rental/inc/class.uibilling.inc.php
2011-02-11 14:34:32 UTC (rev 6974)
+++ branches/Version-1_0-branch/rental/inc/class.uibilling.inc.php
2011-02-11 14:37:21 UTC (rev 6975)
@@ -133,7 +133,7 @@
}
}
else if($billing_term == '3'){ // half year
- if($billing_moth == '1'){
+ if($billing_month == '1'){
$month = 6;
$billing_term_label =
lang('first_half');
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [6975] Merge 6972:6974 from trunk,
Sigurd Nes <=