2
0
forked from Wavyzz/dolibarr

Merge pull request #5886 from simnandez/3.8

Fix: Bad localtaxes calc for Spain if VAT is 0
This commit is contained in:
Laurent Destailleur
2016-10-24 01:01:04 +02:00
committed by GitHub

View File

@@ -7,7 +7,7 @@
* Copyright (C) 2004 Christophe Combelles <ccomb@free.fr>
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2008 Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
* Copyright (C) 2010-2014 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2010-2016 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2013 Cédric Salvador <csalvador@gpcsolutions.fr>
* Copyright (C) 2013 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2014 Cédric GROSS <c.gross@kreiz-it.fr>
@@ -3170,7 +3170,7 @@ function get_localtax($tva, $local, $thirdparty_buyer="", $thirdparty_seller="")
{
if ($local == 1)
{
if(! $mysoc->localtax1_assuj) return 0;
if(! $mysoc->localtax1_assuj || $tva=="0") return 0;
if ($thirdparty_seller->id==$mysoc->id)
{
if (! $thirdparty_buyer->localtax1_assuj) return 0;
@@ -3183,7 +3183,7 @@ function get_localtax($tva, $local, $thirdparty_buyer="", $thirdparty_seller="")
if ($local == 2)
{
if(! $mysoc->localtax2_assuj) return 0;
if(! $mysoc->localtax2_assuj || $tva=="0") return 0;
if ($thirdparty_seller->id==$mysoc->id )
{
if (! $thirdparty_buyer->localtax2_assuj) return 0;