[Fmsystem-commits] [8795] property: invoice handling

[Sigurd Nes]

Revision: 8795
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8795
Author:   sigurdne
Date:     2012-02-06 15:45:40 +0000 (Mon, 06 Feb 2012)
Log Message:
-----------
property: invoice handling

Modified Paths:
--------------
    trunk/property/inc/class.soXport.inc.php
    trunk/property/inc/cron/default/Import_fra_basware_X205.php

Modified: trunk/property/inc/class.soXport.inc.php
===================================================================
--- trunk/property/inc/class.soXport.inc.php    2012-02-06 10:59:49 UTC (rev 
8794)
+++ trunk/property/inc/class.soXport.inc.php    2012-02-06 15:45:40 UTC (rev 
8795)
@@ -749,11 +749,22 @@
                        $amount = $amount/100;
                        if(!$table)
                        {
-                               throw new Exception('ERROR: the order id seems 
to not correspond with any order type');
+                               $message = 
'property_soXport::correct_actual_cost() ERROR: the order id %1 seems to not 
correspond with any order type';
+                               $GLOBALS['phpgw']->log->error(array(
+                                               'text'  => $message,
+                                               'p1'    => $order_id,
+                                               'p2'    => '',
+                                               'line'  => __LINE__,
+                                               'file'  => __FILE__
+                                       ));
+
+                               echo $message . "\n";
                        }
-
-                       $sql="UPDATE {$table} SET 
{$actual_cost_field}={$actual_cost_field} {$operator} {$amount} {$update_paid} 
WHERE id='{$order_id}'";
-                       $this->db->query($sql,__LINE__,__FILE__);
+                       else
+                       {
+                               $sql="UPDATE {$table} SET 
{$actual_cost_field}={$actual_cost_field} {$operator} {$amount} {$update_paid} 
WHERE id='{$order_id}'";
+                               $this->db->query($sql,__LINE__,__FILE__);
+                       }
                }
 
                public function check_voucher_id($voucher_id)

Modified: trunk/property/inc/cron/default/Import_fra_basware_X205.php
===================================================================
--- trunk/property/inc/cron/default/Import_fra_basware_X205.php 2012-02-06 
10:59:49 UTC (rev 8794)
+++ trunk/property/inc/cron/default/Import_fra_basware_X205.php 2012-02-06 
15:45:40 UTC (rev 8795)
@@ -581,9 +581,7 @@
                        $order_info['spbudact_code']            = 
$this->db->f('account_id');
                        $order_info['dimb']                                     
= $this->db->f('ecodimb');
 
-//                     $criteria_janitor                                       
= array('ecodimb' => $order_info['dimb'], 'cat_id' => $this->bestiller ); 
//bestiller
-//                     $janitor_contact_id                                     
= $this->responsible->get_responsible($criteria_janitor);
-//                     $janitor_user_id                                        
= $this->responsible->get_contact_user_id($janitor_contact_id);
+/*
                        $janitor_user_id                                        
= $this->db->f('user_id');
                        $order_info['janitor']                          = 
$GLOBALS['phpgw']->accounts->get($janitor_user_id)->lid;
 
@@ -592,7 +590,7 @@
                        {
                                $toarray[] = $prefs['email'];
                        }
-
+*/
                        $criteria_supervisor                            = 
array('ecodimb' => $order_info['dimb'], 'cat_id' => $this->attestant); // 
attestere
                        $supervisor_contact_id                          = 
$this->responsible->get_responsible($criteria_supervisor);
                        if($supervisor_contact_id)