[Fmsystem-commits] [11786] property: fix import

[Sigurd Nes]

Revision: 11786
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11786
Author:   sigurdne
Date:     2014-03-05 15:31:20 +0000 (Wed, 05 Mar 2014)
Log Message:
-----------
property: fix import

Modified Paths:
--------------
    trunk/property/inc/import/default/Import_fra_Service_EBF

Modified: trunk/property/inc/import/default/Import_fra_Service_EBF
===================================================================
--- trunk/property/inc/import/default/Import_fra_Service_EBF    2014-03-04 
14:37:47 UTC (rev 11785)
+++ trunk/property/inc/import/default/Import_fra_Service_EBF    2014-03-05 
15:31:20 UTC (rev 11786)
@@ -64,6 +64,8 @@
                        $this->dateformat = 
$GLOBALS['phpgw']->db->date_format();
                        $this->datetimeformat = 
$GLOBALS['phpgw']->db->datetime_format();
                        $this->next_bilagsnr = $this->invoice->next_bilagsnr();
+                       $this->cats                     = 
CreateObject('phpgwapi.categories', -1,  'property', '.project');
+                       $this->cats->supress_info       = true;
                }
 
                function import($invoice_common, $download)
@@ -146,14 +148,8 @@
                                {
                                        if(!$workorder = $workorders[(int) 
$value]['order'])
                                        {
-                                               
if(!$this->soXport->check_order((int) $value))
+                                               
if($this->soXport->check_order((int) $value))
                                                {
-                                                       $workorders[(int) 
$value]['order']['cat_id'] = '';
-                                                       $workorders[(int) 
$value]['order']['ecodimb'] = '';
-                                                       $workorders[(int) 
$value]['project_id'] = '';
-                                               }
-                                               else
-                                               {
                                                        $workorder = 
execMethod('property.soworkorder.read_single', (int) $value);
                                                        $workorders[(int) 
$value]['order'] = $workorder;
                                                        $workorders[(int) 
$value]['project_id'] = $this->soXport->get_project((int) $value);//Agresso 
prosjekt
@@ -310,10 +306,21 @@
                                }
                                else
                                {
-                                       $buffer[$this->id]['spbudact_code'] = 
$_spbudact_code ? $_spbudact_code : '123014';
+                                       $category       = 
$this->cats->return_single((int)$this->currentrecord['dimd']);
+                                       if(isset($category[0]) && 
$category[0]['active'] == 1)
+                                       {
+                                               $buffer[$this->id]['dime'] = 
$this->currentrecord['dimd']; // Dim 6
+                                       }
+                                       
+                                       $buffer[$this->id]['spbudact_code'] = 
$_spbudact_code ? $_spbudact_code : '';
                                }
                        }
 
+                       
if(!$this->invoice->check_valid_b_account($buffer[$this->id]['spbudact_code']))
+                       {
+                               $buffer[$this->id]['spbudact_code'] = '';
+                       }
+
                        $buffer[$this->id]['dimd'] = $buffer[$this->id]['dime'];
 
                        if($invoice_common['auto_tax'])