[Phpgroupware-cvs] sms/bin config_SD config_VASK receipt_service_a...

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    sms
Changes by:     Sigurd Nes <sigurdne>   07/08/13 18:41:15

Modified files:
        bin            : config_SD config_VASK 
                         receipt_service_agreement.php 

Log message:
        Clean up

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/sms/bin/config_SD?cvsroot=phpgroupware&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/sms/bin/config_VASK?cvsroot=phpgroupware&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/sms/bin/receipt_service_agreement.php?cvsroot=phpgroupware&r1=1.1&r2=1.2

Patches:
Index: config_SD
===================================================================
RCS file: /sources/phpgroupware/sms/bin/config_SD,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- config_SD   13 Aug 2007 12:52:32 -0000      1.1
+++ config_SD   13 Aug 2007 18:41:15 -0000      1.2
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package sms
        * @subpackage sms
-       * @version $Id: config_SD,v 1.1 2007/08/13 12:52:32 sigurdne Exp $
+       * @version $Id: config_SD,v 1.2 2007/08/13 18:41:15 sigurdne Exp $
        */
 
        /**
@@ -22,9 +22,4 @@
        $target_field = 'kvittering';
 
        $filter = "WHERE agreement_id = $agreement_id AND location_code ilike 
'" . $param[0] . "%'";
-       
-       $this->db->query("SELECT id FROM fm_s_agreement_attribute WHERE 
column_name = '$target_field' AND attrib_detail=2",__LINE__,__FILE__);
-       $this->db->next_record();
-       $attrib_id = $this->db->f('id');
-       
 ?>

Index: config_VASK
===================================================================
RCS file: /sources/phpgroupware/sms/bin/config_VASK,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- config_VASK 13 Aug 2007 12:52:32 -0000      1.1
+++ config_VASK 13 Aug 2007 18:41:15 -0000      1.2
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package sms
        * @subpackage sms
-       * @version $Id: config_VASK,v 1.1 2007/08/13 12:52:32 sigurdne Exp $
+       * @version $Id: config_VASK,v 1.2 2007/08/13 18:41:15 sigurdne Exp $
        */
 
        /**
@@ -22,9 +22,4 @@
        $target_field = 'kvittering';
 
        $filter = "WHERE agreement_id = $agreement_id AND location_code ilike 
'" . $param[0] . "%'";
-       
-       $this->db->query("SELECT id FROM fm_s_agreement_attribute WHERE 
column_name = '$target_field' AND attrib_detail=2",__LINE__,__FILE__);
-       $this->db->next_record();
-       $attrib_id = $this->db->f('id');
-       
 ?>

Index: receipt_service_agreement.php
===================================================================
RCS file: /sources/phpgroupware/sms/bin/receipt_service_agreement.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- receipt_service_agreement.php       13 Aug 2007 12:52:32 -0000      1.1
+++ receipt_service_agreement.php       13 Aug 2007 18:41:15 -0000      1.2
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package sms
        * @subpackage sms
-       * @version $Id: receipt_service_agreement.php,v 1.1 2007/08/13 12:52:32 
sigurdne Exp $
+       * @version $Id: receipt_service_agreement.php,v 1.2 2007/08/13 18:41:15 
sigurdne Exp $
        */
 
        /**
@@ -19,6 +19,11 @@
        $param          = explode(' ' , $command_param);        
 
        include(PHPGW_SERVER_ROOT . SEP . 'sms' . SEP . 'bin'  . SEP .  
'config_' . strtoupper(basename($command_code)));
+
+       $this->db->query("SELECT id FROM fm_s_agreement_attribute WHERE 
column_name = '$target_field' AND attrib_detail=2",__LINE__,__FILE__);
+       $this->db->next_record();
+       $attrib_id = $this->db->f('id');
+
        $sql = "SELECT id from fm_s_agreement_detail $filter";
 
        $this->db->query($sql,__LINE__,__FILE__);