[Fmsystem-commits] [8841] property: tax-code

[Sigurd Nes]

Revision: 8841
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8841
Author:   sigurdne
Date:     2012-02-13 09:18:52 +0000 (Mon, 13 Feb 2012)
Log Message:
-----------
property: tax-code

Modified Paths:
--------------
    trunk/property/inc/import/default/Import_fra_Service
    trunk/property/inc/import/default/import_fra_Service_xls

Modified: trunk/property/inc/import/default/Import_fra_Service
===================================================================
--- trunk/property/inc/import/default/Import_fra_Service        2012-02-13 
09:16:15 UTC (rev 8840)
+++ trunk/property/inc/import/default/Import_fra_Service        2012-02-13 
09:18:52 UTC (rev 8841)
@@ -191,14 +191,17 @@
                                        $buffer[$this->id]['loc1'] = 
$loc1=substr($value,0,4);
                                }
 
-                               if($name=='mvakode' && 
$invoice_common['auto_tax'])
+                               if($name=='mvakode')
                                {
-                                       $value = 
(int)$this->soXport->auto_tax($buffer[$this->id]['loc1']);
+                                       if( $invoice_common['auto_tax'])
+                                       {
+                                               $value = 
(int)$this->soXport->auto_tax($buffer[$this->id]['loc1']);
+                                       }
+                                       else
+                                       {
+                                               $value = (int) $value;
+                                       }
                                }
-                               else
-                               {
-                                       $value = (int) $value;
-                               }
                                
                                $buffer[$this->id][$name] = $value;
                                $buffer[$this->id]['bilagsnr'] = 
$this->next_bilagsnr;

Modified: trunk/property/inc/import/default/import_fra_Service_xls
===================================================================
--- trunk/property/inc/import/default/import_fra_Service_xls    2012-02-13 
09:16:15 UTC (rev 8840)
+++ trunk/property/inc/import/default/import_fra_Service_xls    2012-02-13 
09:18:52 UTC (rev 8841)
@@ -185,14 +185,17 @@
                                        $buffer[$this->id]['loc1'] = 
$loc1=substr($value,0,4);
                                }
 
-                               if($name=='mvakode' && 
$invoice_common['auto_tax'])
+                               if($name=='mvakode')
                                {
-                                       $value = 
(int)$this->soXport->auto_tax($buffer[$this->id]['loc1']);
+                                       if( $invoice_common['auto_tax'])
+                                       {
+                                               $value = 
(int)$this->soXport->auto_tax($buffer[$this->id]['loc1']);
+                                       }
+                                       else
+                                       {
+                                               $value = (int) $value;
+                                       }
                                }
-                               else
-                               {
-                                       $value = (int) $value;
-                               }
 
                                $buffer[$this->id][$name] = $value;
                                $buffer[$this->id]['bilagsnr'] = 
$this->next_bilagsnr;