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

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

Browse Source 
develop

Conflicts:
	htdocs/core/lib/functions2.lib.php
	htdocs/install/lib/repair.lib.php
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
This commit is contained in:
Laurent Destailleur
2012-07-25 12:20:45 +02:00
parent ea54523181 e12604cb71
commit dce9b96260
84 changed files with 2932 additions and 3005 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
htdocs/margin/lib/margins.lib.php
View File

@@ -23,6 +23,7 @@
/**
* Define head array for tabs of marges tools setup pages
*
* @return Array of head
*/
function marges_admin_prepare_head()
@@ -32,7 +33,7 @@ function marges_admin_prepare_head()
$h = 0;
$head = array();
$head[$h][0] = DOL_URL_ROOT."/admin/margin.php";
$head[$h][0] = DOL_URL_ROOT."/margin/admin/margin.php";
$head[$h][1] = $langs->trans("Parameters");
$head[$h][2] = 'parameters';
$h++;
@@ -72,7 +73,20 @@ function marges_prepare_head($user)
return $head;
}
function getMarginInfos($pvht, $remise_percent, $tva_tx, $localtax1_tx, $localtax2_tx, $fk_pa, $paht) {
/**
* getMarginInfos
*
* @param float $pvht Buying price with tax
* @param float $remise_percent Discount percent
* @param float $tva_tx Vat rate
* @param float $localtax1_tx Vat rate special 1
* @param float $localtax2_tx Vat rate special 2
* @param int $fk_pa ???
* @param float $paht Buying price without tax
* @return array Array of margin info
*/
function getMarginInfos($pvht, $remise_percent, $tva_tx, $localtax1_tx, $localtax2_tx, $fk_pa, $paht)
{
global $db, $conf;
$marge_tx_ret='';