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

Mark file as bugged (seriously)

Browse Source
This commit is contained in:
Laurent Destailleur 2013-12-10 17:53:12 +01:00
parent c78fc504af
commit b1e6ac5631
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -90,15 +90,23 @@ function marges_prepare_head()
* @param float $localtax2_tx Vat rate special 2 * @param float $localtax2_tx Vat rate special 2
* @param int $fk_pa ??? * @param int $fk_pa ???
* @param float $paht Buying price without tax * @param float $paht Buying price without tax
* @param int $type Type of line (product or service)
* @param Societe $seller Object of seller
* @param array $localtaxes_array Array of localtaxes
* @return array Array of margin info * @return array Array of margin info
*
* FIXME This function is called too frequently without type, seller and without localtaxes_array defined. This make vat rate detection wrong.
*/ */
function getMarginInfos($pvht, $remise_percent, $tva_tx, $localtax1_tx, $localtax2_tx, $fk_pa, $paht) function getMarginInfos($pvht, $remise_percent, $tva_tx, $localtax1_tx, $localtax2_tx, $fk_pa, $paht, $type=0, $seller='', $localtaxes_array='')
{ {
global $db, $conf; global $db, $conf, $mysoc;
$marge_tx_ret=''; $marge_tx_ret='';
$marque_tx_ret=''; $marque_tx_ret='';
if (empty($seller) || ! is_object($seller)) $seller=$mysoc;
if (empty($localtaxes_array) || ! is_array($localtaxes_array)) $localtaxes_array=array();
if($fk_pa > 0) { if($fk_pa > 0) {
require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php'; require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
$product = new ProductFournisseur($db); $product = new ProductFournisseur($db);
@ -115,7 +123,7 @@ function getMarginInfos($pvht, $remise_percent, $tva_tx, $localtax1_tx, $localta
require_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
// calcul pu_ht remisés // calcul pu_ht remisés
$tabprice=calcul_price_total(1, $pvht, $remise_percent, $tva_tx, $localtax1_tx, $localtax2_tx, 0, 'HT', 0, 0); // FIXME Parameter type is missing, i put 0 to avoid blocking error $tabprice=calcul_price_total(1, $pvht, $remise_percent, $tva_tx, $localtax1_tx, $localtax2_tx, 0, 'HT', 0, $type, $seller, $localtaxes_array);
$pu_ht_remise = $tabprice[0]; $pu_ht_remise = $tabprice[0];
// calcul marge // calcul marge
if ($pu_ht_remise < 0) if ($pu_ht_remise < 0)