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

fix percent

Browse Source
This commit is contained in:
John 2018-03-23 12:24:47 +01:00
parent b4983d0e6d
commit 6a676ea49e
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
htdocs/compta/facture/card.php
View File

@ -914,19 +914,25 @@ if (empty($reshook))
$object->fk_facture_source = $sourceinvoice > 0 ? $sourceinvoice : ''; $object->fk_facture_source = $sourceinvoice > 0 ? $sourceinvoice : '';
$object->type = Facture::TYPE_CREDIT_NOTE; $object->type = Facture::TYPE_CREDIT_NOTE;
$facture_source = new Facture($db); // fetch origin object
if ($facture_source->fetch($object->fk_facture_source)>0)
{
if ($facture_source->type == Facture::TYPE_SITUATION)
{
$object->situation_counter = $facture_source->situation_counter;
$object->situation_cycle_ref = $facture_source->situation_cycle_ref;
$facture_source->fetchPreviousNextSituationInvoice();
}
}
$id = $object->create($user); $id = $object->create($user);
if (GETPOST('invoiceAvoirWithLines', 'int')==1 && $id>0) if (GETPOST('invoiceAvoirWithLines', 'int')==1 && $id>0)
{ {
$facture_source = new Facture($db); // fetch origin object
if ($facture_source->fetch($object->fk_facture_source)>0) if (!empty($facture_source->lines))
{ {
$fk_parent_line = 0; $fk_parent_line = 0;
if ($facture_source->type == Facture::TYPE_SITUATION)
{
$facture_source->fetchPreviousNextSituationInvoice();
}
foreach($facture_source->lines as $line) foreach($facture_source->lines as $line)
{ {
@ -946,6 +952,7 @@ if (empty($reshook))
if($facture_source->type == Facture::TYPE_SITUATION) if($facture_source->type == Facture::TYPE_SITUATION)
{ {
if(!empty($facture_source->tab_previous_situation_invoice)) if(!empty($facture_source->tab_previous_situation_invoice))
{ {
$lineIndex = count($facture_source->tab_previous_situation_invoice) - 1; $lineIndex = count($facture_source->tab_previous_situation_invoice) - 1;
@ -973,7 +980,7 @@ if (empty($reshook))
} }
// prorata // prorata
$line->qty = $line->qty * $maxPrevSituationPercent / 100; $line->situation_percent = $maxPrevSituationPercent - $line->situation_percent;
} }