Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts: htdocs/accountancy/index.php htdocs/compta/facture/class/facture.class.php
This commit is contained in:
commit
a221b17809
@ -187,7 +187,6 @@ if (!empty($conf->global->INVOICE_USE_SITUATION) && $conf->global->INVOICE_USE_S
|
||||
print $s;
|
||||
print "<br>\n";
|
||||
|
||||
|
||||
print '<br>';
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user