[Phpgroupware-cvs] property/inc/import/Import_fra_BKK, 1.3

[nomail]

Update of /property/inc/import
Modified Files:
        Branch: 
          Import_fra_BKK

date: 2004/07/14 13:49:25;  author: sigurdne;  state: Exp;  lines: +14 -15

Log Message:
no message
=====================================================================
Index: property/inc/import/Import_fra_BKK
diff -u property/inc/import/Import_fra_BKK:1.2 
property/inc/import/Import_fra_BKK:1.3
--- property/inc/import/Import_fra_BKK:1.2      Wed Jun  2 18:59:08 2004
+++ property/inc/import/Import_fra_BKK  Wed Jul 14 13:49:25 2004
@@ -207,30 +207,29 @@
                                        $loc1=$maalerinfo['loc1'];
 //                                     $maalernr=$maalerinfo['maalernr'];
                                        $omraade=$maalerinfo['district'];
-                               }
-                               if($name=='stedsnavn')
-                               {
-                                       $buffer[$this->id]['merknad'] .= "\r\n" 
. $value;
-                               }
-
-                               if($name=='dima' && 
$invoice_common['auto_tax']):
-                               {
-                                       
$mvakode=$this->soXport->auto_tax($value);
-                                       
-                                       if($mvakode)
+                                       if($invoice_common['auto_tax'])
                                        {
-                                               $buffer[$this->id]['mvakode'] = 
$mvakode;
+                                               
$mvakode=$this->soXport->auto_tax($dima);
+                                               
+                                               if($mvakode)
+                                               {
+                                                       
$buffer[$this->id]['mvakode'] = $mvakode;
+                                               }
+                                               else
+                                               {
+                                                       
$buffer[$this->id]['mvakode'] = $this->mvakode;
+                                               }
                                        }
                                        else
                                        {
                                                $buffer[$this->id]['mvakode'] = 
$this->mvakode;
                                        }
+
                                }
-                               elseif($name=='dima' && 
!$invoice_common['auto_tax']):
+                               if($name=='stedsnavn')
                                {
-                                       $buffer[$this->id]['mvakode'] = 
$this->mvakode;
+                                       $buffer[$this->id]['merknad'] .= "\r\n" 
. $value;
                                }
-                               endif;
 
                                $buffer[$this->id][$name] = $value;
                                $buffer[$this->id]['bilagsnr'] = 
$this->next_bilagsnr;