[Fmsystem-commits] [16235] handle tax code

[sigurdne]

Revision: 16235
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16235
Author:   sigurdne
Date:     2017-02-02 08:10:32 -0500 (Thu, 02 Feb 2017)
Log Message:
-----------
handle tax code

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

Modified: trunk/property/inc/class.uiinvoice2.inc.php
===================================================================
--- trunk/property/inc/class.uiinvoice2.inc.php 2017-02-02 10:52:56 UTC (rev 
16234)
+++ trunk/property/inc/class.uiinvoice2.inc.php 2017-02-02 13:10:32 UTC (rev 
16235)
@@ -769,7 +769,7 @@
                                                break;
                                }
 
-                               $selected_tax_code = 
!empty($voucher[0]['tax_code']) ? $voucher[0]['tax_code'] : $default_tax_code;
+                               $selected_tax_code = 
isset($voucher[0]['tax_code'])  && ($voucher[0]['tax_code'] || 
$voucher[0]['tax_code'] === 0)? $voucher[0]['tax_code'] : $default_tax_code;
 
                                if 
(isset($this->config->config_data['invoice_acl']) && 
$this->config->config_data['invoice_acl'] == 'dimb')
                                {

Modified: trunk/property/inc/cron/default/Import_fra_agresso_X205.php
===================================================================
--- trunk/property/inc/cron/default/Import_fra_agresso_X205.php 2017-02-02 
10:52:56 UTC (rev 16234)
+++ trunk/property/inc/cron/default/Import_fra_agresso_X205.php 2017-02-02 
13:10:32 UTC (rev 16235)
@@ -37,7 +37,7 @@
        {
 
                protected $auto_tax = true;
-               protected $mvakode = 0;
+               protected $mvakode = '';
                protected $kildeid = 1;
                protected $splitt = 0;
                protected $soXport;