Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

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

Browse Source 
Conflicts:
	build/debian/changelog
	htdocs/compta/facture.php
	htdocs/core/lib/price.lib.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/opensurvey/public/studs.php
	htdocs/projet/element.php
This commit is contained in:
Laurent Destailleur
2015-04-13 13:08:46 +02:00
parent 0e7f4db0bb 44f10ebec2
commit ae103e34b8
20 changed files with 176 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/lib/functions.lib.php
View File

@@ -3269,7 +3269,7 @@ function get_localtax_by_third($local)
/**
* Get type and rate of localtaxes for a particular vat rate/country fo thirdparty
* TODO
* This function is called to retrieve type for building PDF. Such call of function must be removed.
* This function is also called to retrieve type for building PDF. Such call of function must be removed.
* Instead this function must be called when adding a line to get (array of localtax and type) and
* provide it to the function calcul_price_total.
*