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

FIX ##5263

Browse Source
This commit is contained in:
Laurent Destailleur 2016-06-03 22:20:58 +02:00
parent f81a4c56b7
commit 149c6916f8
5 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/comm/propal/class/propal.class.php
View File

@ -2674,9 +2674,12 @@ class Propal extends CommonObject
$line->remise_percent=00;
}
$prodid = mt_rand(1, $num_prods);
$line->fk_product=$prodids[$prodid];
if ($num_prods > 0)
{
$prodid = mt_rand(1, $num_prods);
$line->fk_product=$prodids[$prodid];
}
$this->lines[$xnbp]=$line;
$this->total_ht += $line->total_ht;

9
htdocs/commande/class/commande.class.php
View File

@ -3278,9 +3278,12 @@ class Commande extends CommonOrder
$line->total_tva=19.6;
$line->remise_percent=0;
}
$prodid = mt_rand(1, $num_prods);
$line->fk_product=$prodids[$prodid];
if ($num_prods > 0)
{
$prodid = mt_rand(1, $num_prods);
$line->fk_product=$prodids[$prodid];
}
$this->lines[$xnbp]=$line;
$this->total_ht += $line->total_ht;

7
htdocs/contrat/class/contrat.class.php
View File

@ -2147,8 +2147,11 @@ class Contrat extends CommonObject
$line->total_ht=90;
$line->total_ttc=107.64; // 90 * 1.196
$line->total_tva=17.64;
$prodid = mt_rand(1, $num_prods);
$line->fk_product=$prodids[$prodid];
if ($num_prods > 0)
{
$prodid = mt_rand(1, $num_prods);
$line->fk_product=$prodids[$prodid];
}
$this->lines[$xnbp]=$line;
$xnbp++;
}

7
htdocs/fourn/class/fournisseur.facture.class.php
View File

@ -1708,8 +1708,11 @@ class FactureFournisseur extends CommonInvoice
$line->remise_percent=0;
}
$prodid = mt_rand(1, $num_prods);
$line->fk_product=$prodids[$prodid];
if ($num_prods > 0)
{
$prodid = mt_rand(1, $num_prods);
$line->fk_product=$prodids[$prodid];
}
$line->product_type=0;
$this->lines[$xnbp]=$line;

9
htdocs/supplier_proposal/class/supplier_proposal.class.php
View File

@ -2244,9 +2244,12 @@ class SupplierProposal extends CommonObject
$line->remise_percent=00;
}
$prodid = mt_rand(1, $num_prods);
$line->fk_product=$prodids[$prodid];
if ($num_prods > 0)
{
$prodid = mt_rand(1, $num_prods);
$line->fk_product=$prodids[$prodid];
}
$this->lines[$xnbp]=$line;
$this->total_ht += $line->total_ht;