[Fmsystem-commits] [11394] property: tune import

[Sigurd Nes]

Revision: 11394
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11394
Author:   sigurdne
Date:     2013-10-25 08:52:59 +0000 (Fri, 25 Oct 2013)
Log Message:
-----------
property: tune import

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

Modified: trunk/property/inc/cron/default/Import_fra_agresso_X205.php
===================================================================
--- trunk/property/inc/cron/default/Import_fra_agresso_X205.php 2013-10-25 
08:43:55 UTC (rev 11393)
+++ trunk/property/inc/cron/default/Import_fra_agresso_X205.php 2013-10-25 
08:52:59 UTC (rev 11394)
@@ -256,7 +256,7 @@
                                $subject = 'Du har faktura til behandling';
 
 
-                               $from = "Ikke svar<nlsh.no>";
+                               $from = "Ikke svar<address@hidden>";
 
                                foreach ($toarray as $lid => $dummy)
                                {
@@ -661,7 +661,7 @@
 
                                        if($to && !$this->skip_email)
                                        {
-                                               $from = "Ikke svar<nlsh.no>";
+                                               $from = "Ikke 
svar<address@hidden>";
                                                $body = "Ikke gyldig 
leverandør, id: {$_data['SUPPLIER.CODE']}</br>";
                                                $body .= '<a href ="' . 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uigeneric.edit', 'appname' => 'property', 'type' => 
'vendor'),false,true).'">Link til å legge inn ny leverandør</a>';
 
@@ -738,7 +738,7 @@
                                if($order_info['toarray'] && !$this->skip_email)
                                {
 
-                                       $from = "Ikke svar<nlsh.no>";
+                                       $from = "Ikke svar<address@hidden>";
 
                                        $to = 
implode(';',$order_info['toarray']);
 

Modified: trunk/property/inc/cron/default/Import_fra_basware_X205.php
===================================================================
--- trunk/property/inc/cron/default/Import_fra_basware_X205.php 2013-10-25 
08:43:55 UTC (rev 11393)
+++ trunk/property/inc/cron/default/Import_fra_basware_X205.php 2013-10-25 
08:52:59 UTC (rev 11394)
@@ -253,7 +253,7 @@
                                }
 
                                //$from = "Ikke svar 
<{$GLOBALS['phpgw_info']['user']['preferences']['email']['address']}>";
-                               $from = "Ikke svar<nlsh.no>";
+                               $from = "Ikke svar<address@hidden>";
 
                                $subject = 'Du har faktura til behandling';
 
@@ -660,7 +660,7 @@
 
                                        if($to && !$this->skip_email)
                                        {
-                                               $from = "Ikke svar<nlsh.no>";
+                                               $from = "Ikke 
svar<address@hidden>";
                                                $body = "Ikke gyldig 
leverandør, id: {$_data['SUPPLIER.CODE']}</br>";
                                                $body .= '<a href ="' . 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uigeneric.edit', 'appname' => 'property', 'type' => 
'vendor'),false,true).'">Link til å legge inn ny leverandør</a>';
 
@@ -736,7 +736,7 @@
 
                                if($order_info['toarray'] && !$this->skip_email)
                                {
-                                       $from = "Ikke svar<nlsh.no>";
+                                       $from = "Ikke svar<address@hidden>";
                                        $to = 
implode(';',$order_info['toarray']);
 
                                        if 
(isset($GLOBALS['phpgw_info']['server']['smtp_server']) && 
$GLOBALS['phpgw_info']['server']['smtp_server'])