[Phpgroupware-cvs] property/inc class.soXport.inc.php, 1.19 class.uiXport.inc.php, 1.13

[sigurdne]

Update of property/inc

Modified Files:
     Branch: MAIN
            class.soXport.inc.php lines: +11 -5
            class.uiXport.inc.php lines: +2 -2

Log Message:
no message

====================================================
Index: property/inc/class.soXport.inc.php
diff -u property/inc/class.soXport.inc.php:1.18 
property/inc/class.soXport.inc.php:1.19
--- property/inc/class.soXport.inc.php:1.18     Thu Oct 20 08:55:38 2005
+++ property/inc/class.soXport.inc.php  Mon Oct 31 18:58:12 2005
@@ -223,7 +223,9 @@
                                                False,
                                                False,
                                                False,
-                                               False
+                                               False,
+                                               $fields['item_type'],
+                                               $fields['item_id']
                                                );

                                        $bilagsnr       = $fields['bilagsnr'];
@@ -233,7 +235,7 @@
                                        $sql= "INSERT INTO fm_ecobilag 
(project_id,kostra_id,pmwrkord_code,bilagsnr,splitt,kildeid,kidnr,typeid,fakturadato,"
                                        . " 
forfallsdato,regtid,artid,spvend_code,dimb,oppsynsmannid,saksbehandlerid,budsjettansvarligid,"
                                        . " 
fakturanr,spbudact_code,loc1,dima,dimd,mvakode,periode,merknad,oppsynsigndato,saksigndato,"
-                                       . " 
budsjettsigndato,utbetalingsigndato,belop,godkjentbelop)"
+                                       . " 
budsjettsigndato,utbetalingsigndato,item_type,item_id,belop,godkjentbelop)"
                                        . " VALUES ($values," . 
$this->bocommon->moneyformat($fields['belop']) . "," . 
$this->bocommon->moneyformat($fields['godkjentbelop']) . ")";

                                        
$this->db->query($sql,__LINE__,__FILE__);
@@ -284,7 +286,9 @@
                                $data['utbetalingid'],
                                $data['utbetalingsigndato'],
                                $data['filnavn'],
-                               date("Y-m-d G:i:s")
+                               date("Y-m-d G:i:s"),
+                               $data['item_type'],
+                               $data['item_id'],
                                );

                        $values = $this->bocommon->validate_db_insert($values);
@@ -292,7 +296,7 @@
                        $sql="INSERT INTO fm_ecobilagoverf 
(id,bilagsnr,kidnr,typeid,kildeid,project_id,kostra_id,pmwrkord_code,fakturadato,"
                                . " 
periode,forfallsdato,fakturanr,spbudact_code,regtid,artid,spvend_code,dima,loc1,"
                                . " 
dimb,mvakode,dimd,oppsynsmannid,saksbehandlerid,budsjettansvarligid,oppsynsigndato,saksigndato,"
-                               . " 
budsjettsigndato,merknad,splitt,utbetalingid,utbetalingsigndato,filnavn,overftid,"
+                               . " 
budsjettsigndato,merknad,splitt,utbetalingid,utbetalingsigndato,filnavn,overftid,item_type,item_id,"
                                . " belop,godkjentbelop,ordrebelop)"
                                . "values ($values, "
                                . $this->bocommon->moneyformat($data['belop']) 
. ","
@@ -457,6 +461,8 @@
                                $underbilag[$i]['utbetalingid'] = 
$this->db->f('utbetalingid');
                                $underbilag[$i]['utbetalingsigndato']   = 
$this->db->f('utbetalingsigndato');
                                $underbilag[$i]['district_id']  = 
$this->db->f('district_id');
+                               $underbilag[$i]['item_type']    = 
$this->db->f('item_type');
+                               $underbilag[$i]['item_id']      = 
$this->db->f('item_id');
                                $i++;

                        }

====================================================
Index: property/inc/class.uiXport.inc.php
diff -u property/inc/class.uiXport.inc.php:1.12 
property/inc/class.uiXport.inc.php:1.13
--- property/inc/class.uiXport.inc.php:1.12     Wed Aug 10 19:39:42 2005
+++ property/inc/class.uiXport.inc.php  Mon Oct 31 18:58:12 2005
@@ -235,7 +235,7 @@
                                                unset($payment_date);
                                                unset($conv_type);
                                                unset($auto_tax);
-                                               
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uiXport.import');
+//                                             
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uiXport.import');
                                        }
                                        else
                                        {