lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source 
Conflicts:
	htdocs/compta/tva/clients.php
This commit is contained in:
Laurent Destailleur 2019-03-24 15:06:16 +01:00
commit 28abf5663b
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/compta/tva/clients.php
View File

@ -377,7 +377,7 @@ if (! is_array($x_coll) || ! is_array($x_paye))
$subtot_coll_total_ht = 0; $subtot_coll_total_ht = 0;
$subtot_coll_vat = 0; $subtot_coll_vat = 0;
if ($min == 0 || ($min > 0 && $x_both[$thirdparty_id]['coll']['totalht'] > $min)) if ($min == 0 || ($min > 0 && $x_both[$thirdparty_id]['coll']['totalht'] > $min))
{ {
if (is_array($x_both[$thirdparty_id]['coll']['detail'])) if (is_array($x_both[$thirdparty_id]['coll']['detail']))
{ {
@ -408,7 +408,6 @@ if (! is_array($x_coll) || ! is_array($x_paye))
$type = 1; $type = 1;
} }
print '<tr class="oddeven">'; print '<tr class="oddeven">';
// Ref // Ref