Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-06 09:02:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/3.7' into develop

Browse Source 
Conflicts:
	htdocs/compta/facture.php
	htdocs/product/stock/product.php
This commit is contained in:
Laurent Destailleur
2015-04-08 20:43:51 +02:00
parent aaef3a41c0 efb43a7015
commit ca7a7a9038
3 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/compta/facture.php
View File

@@ -1076,7 +1076,7 @@ if (empty($reshook))
$lines[$i]->fetch_optionals($lines[$i]->rowid);
$array_options = $lines[$i]->array_options;
}
// View third's localtaxes for now
$localtax1_tx = get_localtax($lines[$i]->tva_tx, 1, $object->client);
$localtax2_tx = get_localtax($lines[$i]->tva_tx, 2, $object->client);