[Fmsystem-commits] [16165] nlsh hardcoded tax values

[sigurdne]

Revision: 16165
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16165
Author:   sigurdne
Date:     2017-01-16 03:32:27 -0500 (Mon, 16 Jan 2017)
Log Message:
-----------
nlsh hardcoded tax values

Modified Paths:
--------------
    branches/Version-1_0-branch/property/inc/class.uiinvoice2.inc.php
    branches/Version-1_0-branch/property/inc/export/default/Agresso_X114

Modified: branches/Version-1_0-branch/property/inc/class.uiinvoice2.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiinvoice2.inc.php   
2017-01-16 08:31:36 UTC (rev 16164)
+++ branches/Version-1_0-branch/property/inc/class.uiinvoice2.inc.php   
2017-01-16 08:32:27 UTC (rev 16165)
@@ -793,11 +793,35 @@
                        {
 
 //---------start forward
-//                             if(!empty($voucher[0]['b_account_id']) && 
$voucher[0]['b_account_id'] = '4100')
-//                             {
-//                                     $default_tax_code = 22;
-//                             }
+                               //temporary hardcoded for NLSH
+                               switch ($voucher[0]['b_account_id'])
+                               {
+                                       case '5900':
+                                       case '5930':
+                                       case '6300':
+                                       case '6420':
+                                       case '6490':
+                                       case '6840':
+                                       case '6841':
+                                       case '7040':
+                                       case '7140':
+                                       case '7149':
+                                       case '7400':
+                                       case '7500':
+                                       case '7710':
+                                       case '7794':
+                                               $default_tax_code = 0;
+                                               break;
 
+                                       case '4100':
+                                               $default_tax_code = 23;
+                                               break;
+
+                                       default:
+                                               $default_tax_code = 22;
+                                               break;
+                               }
+
                                $selected_tax_code = 
!empty($voucher[0]['tax_code']) ? $voucher[0]['tax_code'] : $default_tax_code;
 
                                
if(isset($this->config->config_data['invoice_acl']) && 
$this->config->config_data['invoice_acl'] == 'dimb')

Modified: branches/Version-1_0-branch/property/inc/export/default/Agresso_X114
===================================================================
--- branches/Version-1_0-branch/property/inc/export/default/Agresso_X114        
2017-01-16 08:31:36 UTC (rev 16164)
+++ branches/Version-1_0-branch/property/inc/export/default/Agresso_X114        
2017-01-16 08:32:27 UTC (rev 16165)
@@ -893,7 +893,7 @@
                                        'ACCOUNTLINK.CODE'              => 
$line['spbudact_code'], // 4180
                                        'CURRENCY'                              
=> $line['currency'],
                                        'AMOUNT'                                
=> $amount, // 312500
-                                       'TAXCODE'                               
=> !empty($line['mvakode']) ? $line['mvakode'] : 22,
+                                       'TAXCODE'                               
=> $line['mvakode'],
                                        'APPROVER.FULLNAME'             => 
$line['budsjettansvarligid'], //Batch 04 - 14
                                        'DIMENSION.D1.CODE'             => 
$line['dimb'], // 1111
                                        'DIMENSION.D2.CODE'             => 
'',//$line['dima'], // 62000
@@ -944,7 +944,7 @@
                                        'ACCOUNTLINK.CODE'              => 
$reskontroart,
                                        'CURRENCY'                              
=> $oRsBilag[0]['currency'],
                                        'AMOUNT'                                
=> (-1 * $sum_amount),
-                                       'TAXCODE'                               
=> !empty($oRsBilag[0]['mvakode']) ? $oRsBilag[0]['mvakode'] : 22,
+                                       'TAXCODE'                               
=> $oRsBilag[0]['mvakode'],
                                        'APPROVER.FULLNAME'             => '',
                                        'DIMENSION.D1.CODE'             => '',
                                        'DIMENSION.D2.CODE'             => '',