[Phpgroupware-cvs] property/inc/export Agresso,1.27

[sigurdne]

Update of property/inc/export

Modified Files:
     Branch: MAIN
            Agresso lines: +8 -4

Log Message:
no message

====================================================
Index: property/inc/export/Agresso
diff -u property/inc/export/Agresso:1.26 property/inc/export/Agresso:1.27
--- property/inc/export/Agresso:1.26    Thu Oct 20 13:26:09 2005
+++ property/inc/export/Agresso Mon Oct 31 18:58:12 2005
@@ -138,7 +138,7 @@
                }


-               function select_invoice_roleback($day,$month,$year,$Filnavn)
+               function select_invoice_rollback($day,$month,$year,$Filnavn)
                {

                        switch($GLOBALS['phpgw_info']['server']['db_type'])
@@ -190,6 +190,8 @@
                                $invoice_roleback[$i]['dimd']   = 
$this->db->f('dimd');
                                $invoice_roleback[$i]['project_id']     = 
$this->db->f('project_id');
                                $invoice_roleback[$i]['kostra_id']      = 
$this->db->f('kostra_id');
+                               $invoice_roleback[$i]['item_type']      = 
$this->db->f('item_type');
+                               $invoice_roleback[$i]['item_id']        = 
$this->db->f('item_id');

                                if($this->db->f('oppsynsmannid'))
                                {
@@ -257,6 +259,8 @@
                                $BilagOverf['saksigndato'],
                                $BilagOverf['budsjettsigndato'],
                                $BilagOverf['utbetalingsigndato'],
+                               $BilagOverf['item_type'],
+                               $BilagOverf['item_id'],
                                );

                        $values = $this->bocommon->validate_db_insert($values);
@@ -264,7 +268,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,dima,loc1,dimd,mvakode,"
-                       . " 
periode,merknad,utbetalingid,oppsynsigndato,saksigndato,budsjettsigndato,utbetalingsigndato,belop,godkjentbelop)"
+                       . " 
periode,merknad,utbetalingid,oppsynsigndato,saksigndato,budsjettsigndato,utbetalingsigndato,item_type,item_id,belop,godkjentbelop)"
                        . " values ($values,"
                        . $this->bocommon->moneyformat($BilagOverf['belop']) . 
","
                        . 
$this->bocommon->moneyformat($BilagOverf['godkjentbelop']) . ")";
@@ -372,7 +376,7 @@
                        $Dato= date("M d Y",$Dato);
        */

-                       
$BilagOverf=$this->select_invoice_roleback($day,$month,$year,$Filnavn);
+                       
$BilagOverf=$this->select_invoice_rollback($day,$month,$year,$Filnavn);
                        $this->db->transaction_begin();

                        for ($i=0;$i<count($BilagOverf);$i++)