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

[sigurdne]

Update of property/inc/export

Modified Files:
     Branch: MAIN
            Agresso lines: +21 -1

Log Message:
no message

====================================================
Index: property/inc/export/Agresso
diff -u property/inc/export/Agresso:1.16 property/inc/export/Agresso:1.17
--- property/inc/export/Agresso:1.16    Thu Jan 13 16:52:48 2005
+++ property/inc/export/Agresso Wed Feb  2 13:09:36 2005
@@ -172,6 +172,9 @@
                                $invoice_roleback[$i]['dimb']   = 
$this->db->f('dimb');
                                $invoice_roleback[$i]['mvakode']        = 
$this->db->f('mvakode');
                                $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');
+
                                if($this->db->f('oppsynsmannid'))
                                {
                                        $invoice_roleback[$i]['oppsynsmannid']  
= $this->db->f('oppsynsmannid');
@@ -208,6 +211,8 @@
                function bilag_update_overf($BilagOverf)
                {
                        $values= array(
+                               $BilagOverf['project_id'],
+                               $BilagOverf['kostra_id'],
                                $BilagOverf['pmwrkord_code'],
                                $BilagOverf['bilagsnr'],
                                $BilagOverf['splitt'],
@@ -240,7 +245,7 @@

                        $values = $this->bocommon->validate_db_insert($values);

-                       $sql= "INSERT INTO fm_ecobilag 
(pmwrkord_code,bilagsnr,splitt,kildeid,kidnr,typeid,"
+                       $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)"
@@ -697,6 +702,21 @@
                                        
$oRsOverfBilag['ordrebelop']=$oRsUnderbilag[$i][$BelopFelt];


+                                       //dersom det mangler budsjett konto - 
kun aktuelt for ikke godkjent - sett konto til 2899999
+
+                                       if(!$oRsOverfBilag['spbudact_code'] && 
$pre_transfer)
+                                       {
+                                               $oRsOverfBilag['spbudact_code'] 
= 2899999;
+                                       }
+
+
+                                       //dersom ikke gyldig objekt - kun 
aktuelt for ikke godkjent - sett objekt til 9999
+
+                                       if(!($oRsOverfBilag['kostra_id']>0) && 
$pre_transfer)
+                                       {
+                                               $oRsOverfBilag['dima'] = 9999;
+                                       }
+
                                        $Konto          = 
sprintf("%-8s",$oRsOverfBilag['spbudact_code']);// verdi: Art, type: c8, plass: 
21 - 28
                                        $Dim_1          = sprintf("%-8s",'');// 
verdi: Ansvarssted, type: c8, plass: 29 - 36
                                        $Dim_2          = 
sprintf("%-8s",$oRsOverfBilag['kostra_id']);// verdi: Tjeneste, type: c8, 
plass: 37 - 44