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

Fix credit note update on remove from cycle action

Browse Source
This commit is contained in:
John 2018-04-05 10:48:20 +02:00
parent e966d11356
commit b37a2f17bf
1 changed files with 35 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2165,7 +2165,7 @@ if (empty($reshook))
// Outing situation invoice from cycle // Outing situation invoice from cycle
elseif ($action == 'confirm_situationout' && $confirm == 'yes' && $user->rights->facture->creer) elseif ($action == 'confirm_situationout' && $confirm == 'yes' && $user->rights->facture->creer)
{ {
$object->fetch($id); $object->fetch($id,'', '','', TRUE);
if ($object->statut == Facture::STATUS_VALIDATED if ($object->statut == Facture::STATUS_VALIDATED
&& $user->rights->facture->creer && $user->rights->facture->creer
@ -2180,26 +2180,46 @@ if (empty($reshook))
$newCycle = $object->newCycle(); // we need to keep the "situation behavior" so we place it on a new situation cycle $newCycle = $object->newCycle(); // we need to keep the "situation behavior" so we place it on a new situation cycle
if($newCycle > 1) if($newCycle > 1)
{ {
// Search credit notes
$lastCycle = $object->situation_cycle_ref; $lastCycle = $object->situation_cycle_ref;
$lastSituationCounter = $object->situation_counter;
$linkedCreditNotesList = array();
if (count($object->tab_next_situation_invoice) > 0) {
foreach ($object->tab_next_situation_invoice as $next_invoice) {
if($next_invoice->type == Facture::TYPE_CREDIT_NOTE
&& $next_invoice->situation_counter == $object->situation_counter
&& $next_invoice->fk_facture_source == $object->id
)
{
$linkedCreditNotesList[] = $next_invoice->id ;
}
}
}
$object->situation_cycle_ref = $newCycle; $object->situation_cycle_ref = $newCycle;
$object->situation_counter = 1; $object->situation_counter = 1;
$object->situation_final = 1; $object->situation_final = 0;
if($object->update($user) > 0) if($object->update($user) > 0)
{ {
$errors = 0;
if(count($linkedCreditNotesList) > 0)
{
// now, credit note must follow // now, credit note must follow
$sql = 'UPDATE '.MAIN_DB_PREFIX.'facture '; $sql = 'UPDATE '.MAIN_DB_PREFIX.'facture ';
$sql.= ' SET situation_cycle_ref='.intval($newCycle); $sql.= ' SET situation_cycle_ref='.$newCycle;
$sql.= ' AND situation_counter='.$object->situation_counter; $sql.= ' , situation_final=0';
$sql.= ' WHERE situation_cycle_ref='.intval($lastCycle); $sql.= ' , situation_counter='.$object->situation_counter;
//$sql.= ' AND situation_counter='.$object->situation_counter; $sql.= ' WHERE rowid IN ('.implode(',',$linkedCreditNotesList).')';
$sql.= ' AND fk_facture_source='.$object->id;
$sql.= ' AND type='.Facture::TYPE_CREDIT_NOTE;
// TODO : change each progression persent on each lines // TODO : change each progression persent on each lines
$resql=$db->query($sql); $resql=$db->query($sql);
if ($resql) if (!$resql) $errors++;
}
if (!$errors)
{ {
setEventMessages($langs->trans('Updated')); setEventMessages($langs->trans('Updated'));
header("Location: ".$_SERVER['PHP_SELF']."?id=".$id); header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);