[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/inc/import Import_fra_Service_xml, 1.12 Impo
From: |
sigurdne |
Subject: |
[Phpgroupware-cvs] property/inc/import Import_fra_Service_xml, 1.12 Import_fra_Service, 1.12 |
Date: |
Thu, 24 Feb 2005 15:27:46 -0000 |
Update of property/inc/import
Modified Files:
Branch: MAIN
Import_fra_Service_xml lines: +6 -2
Import_fra_Service lines: +6 -2
Log Message:
no message
====================================================
Index: property/inc/import/Import_fra_Service_xml
diff -u property/inc/import/Import_fra_Service_xml:1.11
property/inc/import/Import_fra_Service_xml:1.12
--- property/inc/import/Import_fra_Service_xml:1.11 Thu Jan 13 16:52:48 2005
+++ property/inc/import/Import_fra_Service_xml Tue Feb 8 13:12:53 2005
@@ -241,7 +241,7 @@
$loc1=substr($id,0,4);
$loc2=substr($id,4,2);
- $this->db->query("select loc1 from fm_location1 where
loc1='$loc1'");
+ $this->db->query("select loc1 from fm_location1 where
loc1='$loc1' AND ((fm_location1.category <> 99) OR (fm_location1.category IS
NULL))");
$this->db->next_record();
if ($this->db->f('loc1'))
{
@@ -249,12 +249,16 @@
if ($loc2)
{
- $this->db->query("select location_code
from fm_location2 where loc1='$loc1' AND loc2='$loc2'");
+ $this->db->query("select location_code
from fm_location2 where loc1='$loc1' AND loc2='$loc2' AND
((fm_location2.category <> 99) OR (fm_location2.category IS NULL))");
$this->db->next_record();
if ($this->db->f('location_code'))
{
$dima =
str_replace('-','',$this->db->f('location_code'));
}
+ else
+ {
+ unset($dima);
+ }
}
}
====================================================
Index: property/inc/import/Import_fra_Service
diff -u property/inc/import/Import_fra_Service:1.11
property/inc/import/Import_fra_Service:1.12
--- property/inc/import/Import_fra_Service:1.11 Thu Jan 13 16:52:48 2005
+++ property/inc/import/Import_fra_Service Tue Feb 8 13:12:53 2005
@@ -227,7 +227,7 @@
$loc1=substr($id,0,4);
$loc2=substr($id,4,2);
- $this->db->query("select loc1 from fm_location1 where
loc1='$loc1'");
+ $this->db->query("select loc1 from fm_location1 where
loc1='$loc1' AND ((fm_location1.category <> 99) OR (fm_location1.category IS
NULL))");
$this->db->next_record();
if ($this->db->f('loc1'))
{
@@ -235,12 +235,16 @@
if ($loc2)
{
- $this->db->query("select location_code
from fm_location2 where loc1='$loc1' AND loc2='$loc2'");
+ $this->db->query("select location_code
from fm_location2 where loc1='$loc1' AND loc2='$loc2' AND
((fm_location2.category <> 99) OR (fm_location2.category IS NULL))");
$this->db->next_record();
if ($this->db->f('location_code'))
{
$dima =
str_replace('-','',$this->db->f('location_code'));
}
+ else
+ {
+ unset($dima);
+ }
}
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property/inc/import Import_fra_Service_xml, 1.12 Import_fra_Service, 1.12,
sigurdne <=
- Prev by Date:
[Phpgroupware-cvs] property/inc class.soproject.inc.php,1.12
- Next by Date:
[Phpgroupware-cvs] email/templates/base/images/moz customize-24.png, 1.2 delete-message.png, 1.2 filters-16.png, 1.2 trash-24.png, 1.2 customize-16.png, 1.2 arrow-right-no-16.png, 1.2 arrow-right-no-24.png, 1.2 compose-message-16.png, 1.2 filters-24.png, 1.2 compose-message-24.png, 1.2 send-16.png, 1.2 spellcheck-16.png, 1.2 spellcheck-24.png, 1.2 trash-16.png, 1.2 arrow-right-24.png, 1.2 send-24.png, 1.2 reply.png, 1.2 folder-24.png, 1.2 forward.png, 1.2 reply-all.png, 1.2 folder-16.png, 1.2 arrow-2left-24.png, 1.2 add-attachment-24.png, 1.2 address-conduit-16.png, 1.2 address-conduit-24.png, 1.2 arrow-2left-16.png, 1.2 add-attachment-16.png, 1.2 accounts-24.png, 1.2 accounts-16.png, 1.2 arrow-2left-no-16.png, 1.2 arrow-left-16.png, 1.2 arrow-left-24.png, 1.2 arrow-left-no-16.png, 1.2 arrow-left-no-24.png, 1.2 arrow-2right-no-24.png, 1.2 arrow-2right-no-16.png, 1.2 arrow-2left-no-24.png, 1.2 arrow-2right-16.png, 1.2 arrow-2right-24.png, 1.2 arrow-right-16.png, 1.2
- Previous by thread:
[Phpgroupware-cvs] property/inc class.soproject.inc.php,1.12
- Next by thread:
[Phpgroupware-cvs] email/templates/base/images/moz customize-24.png, 1.2 delete-message.png, 1.2 filters-16.png, 1.2 trash-24.png, 1.2 customize-16.png, 1.2 arrow-right-no-16.png, 1.2 arrow-right-no-24.png, 1.2 compose-message-16.png, 1.2 filters-24.png, 1.2 compose-message-24.png, 1.2 send-16.png, 1.2 spellcheck-16.png, 1.2 spellcheck-24.png, 1.2 trash-16.png, 1.2 arrow-right-24.png, 1.2 send-24.png, 1.2 reply.png, 1.2 folder-24.png, 1.2 forward.png, 1.2 reply-all.png, 1.2 folder-16.png, 1.2 arrow-2left-24.png, 1.2 add-attachment-24.png, 1.2 address-conduit-16.png, 1.2 address-conduit-24.png, 1.2 arrow-2left-16.png, 1.2 add-attachment-16.png, 1.2 accounts-24.png, 1.2 accounts-16.png, 1.2 arrow-2left-no-16.png, 1.2 arrow-left-16.png, 1.2 arrow-left-24.png, 1.2 arrow-left-no-16.png, 1.2 arrow-left-no-24.png, 1.2 arrow-2right-no-24.png, 1.2 arrow-2right-no-16.png, 1.2 arrow-2left-no-24.png, 1.2 arrow-2right-16.png, 1.2 arrow-2right-24.png, 1.2 arrow-right-16.png, 1.2
- Index(es):