[Fmsystem-commits] [9036] registration: approve pending users

[Sigurd Nes]

Revision: 9036
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9036
Author:   sigurdne
Date:     2012-03-27 07:27:09 +0000 (Tue, 27 Mar 2012)
Log Message:
-----------
registration: approve pending users

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

Modified: trunk/property/inc/cron/default/Import_fra_basware_X205.php
===================================================================
--- trunk/property/inc/cron/default/Import_fra_basware_X205.php 2012-03-26 
19:26:35 UTC (rev 9035)
+++ trunk/property/inc/cron/default/Import_fra_basware_X205.php 2012-03-27 
07:27:09 UTC (rev 9036)
@@ -507,7 +507,6 @@
 
                                $bilagsnr_ut = isset($_data['VOUCHERID']) ? 
$_data['VOUCHERID'] : ''; // FIXME: innkommende bilagsnummer?
 
-                               $order_id               = 
$_data['PURCHASEORDERNO'];
                                $fakturanr              = 
$_data['SUPPLIERREF'];//$_data['KEY'];
                                $fakturadato    = 
date($this->dateformat,strtotime(str_replace('.', '-', $_data['INVOICEDATE'])));
                                $forfallsdato   = 
date($this->dateformat,strtotime(str_replace('.', '-', $_data['MATURITY'])));
@@ -523,12 +522,29 @@
                                        $buffer[$i]['artid'] = 1;
                                }
 
-                               $kidnr  = $_data['KIDNO'];
+                               $kidnr                                          
= $_data['KIDNO'];
+                               $_order_id                                      
= $_data['PURCHASEORDERNO'];
+                               $merknad                                        
= '';
+                               $order_id                                       
= '';
+                               $buffer[$i]['project_id']       = '';
 
-                               if($order_id)
+                               if(!$_order_id)
                                {
-                                       $buffer[$i]['project_id'] = 
$this->soXport->get_project($order_id);
+                                       $merknad = 'Mangler bestillingsnummer';
                                }
+                               else if (!ctype_digit($_order_id))
+                               {
+                                       $merknad = 'bestillingsnummeret er på 
feil format: ' . $_order_id;                              
+                               }
+                               else if (!$order_info = 
$this->get_order_info($_order_id))
+                               {
+                                       $merknad = 'bestillingsnummeret ikke 
gyldig: ' . $_order_id;
+                               }
+                               else
+                               {
+                                       $buffer[$i]['project_id'] = 
$this->soXport->get_project($_order_id);
+                                       $order_id = $_order_id;
+                               }
 
                                $buffer[$i]['external_ref']             = 
$_data['SCANNINGNO'];
                                $buffer[$i]['pmwrkord_code']    = $order_id;
@@ -544,8 +560,8 @@
                                $buffer[$i]['bilagsnr_ut']              = 
$bilagsnr_ut;
                                $buffer[$i]['referanse']                = 
"ordre: {$order_id}";
 
-                               $order_info = $this->get_order_info($order_id);
 
+
                                $buffer[$i]['dimb'] = $order_info['dimb'];
                                $buffer[$i]['dima'] = $order_info['dima'];
                                $buffer[$i]['loc1'] = $order_info['loc1'];
@@ -653,8 +669,6 @@
 
                                $buffer[$i]['kostra_id'] = 
$this->default_kostra_id;//$this->soXport->get_kostra_id($buffer[$i]['loc1']);
 
-                               $merknad = '';
-
                                $buffer[$i]['merknad'] = $merknad;
                                $buffer[$i]['splitt'] = $this->splitt;
                                $buffer[$i]['kildeid'] = $this->kildeid;