From 689b3e3b64cf44ac54c2b2c33a0681aea30bba11 Mon Sep 17 00:00:00 2001
From: John <john.botella@atm-consulting.fr>
Date: Thu, 5 Apr 2018 11:25:11 +0200
Subject: [PATCH] Fix outing invoice ligne progress

---
 htdocs/compta/facture/card.php | 47 +++++++++++++++++++++++++++++++---
 1 file changed, 44 insertions(+), 3 deletions(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 0cc3db47e68..5fa4dbc918a 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -2168,12 +2168,12 @@ if (empty($reshook))
 	    $object->fetch($id,'', '','', TRUE);
 	    
 	    if ($object->statut == Facture::STATUS_VALIDATED
+	        && $object->type == Facture::TYPE_SITUATION
 	        && $user->rights->facture->creer
 	        && !$objectidnext
 	        && $object->is_last_in_cycle()
 	        && ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->facture->creer))
 	            || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->facture->invoice_advance->unvalidate)))
-	        //&& ($object->total_ttc - $totalcreditnotes) == 0
 	        ) 
 	    {
 	        $outingError = 0;
@@ -2212,11 +2212,52 @@ if (empty($reshook))
 	                    $sql.= ' , situation_counter='.$object->situation_counter;
 	                    $sql.= ' WHERE rowid IN ('.implode(',',$linkedCreditNotesList).')';
 	                    
-	                    // TODO : change each progression persent on each lines
-	                    
 	                    $resql=$db->query($sql);
 	                    if (!$resql) $errors++;
 	                    
+	                    // Change each progression persent on each lines
+	                    foreach($object->lines as $line)
+	                    {
+	                        
+	                        // no traitement for special product
+	                        if ($line->product_type == 9 )  continue;
+	                        
+	                        
+	                        if(!empty($object->tab_previous_situation_invoice))
+	                        {
+                                // search the last invoice in cycle
+	                            $lineIndex = count($object->tab_previous_situation_invoice) - 1;
+                                $searchPreviousInvoice = true;
+                                while( $searchPreviousInvoice )
+                                {
+                                    if($object->tab_previous_situation_invoice[$lineIndex]->type  == Facture::TYPE_SITUATION || $lineIndex < 1)
+                                    {
+                                        $searchPreviousInvoice=false; // find, exit;
+                                        break;
+                                    }
+                                    else
+                                    {
+                                        $lineIndex--; // go to previous invoice in cycle
+                                    }
+                                }
+	                                
+	                                
+                                $maxPrevSituationPercent = 0;
+                                foreach($object->tab_previous_situation_invoice[$lineIndex]->lines as $prevLine)
+                                {
+                                    if($prevLine->id == $line->fk_prev_id)
+                                    {
+                                        $maxPrevSituationPercent = max($maxPrevSituationPercent,$prevLine->situation_percent);
+                                    }
+                                }
+                                
+                                
+                                $line->situation_percent = $line->situation_percent - $maxPrevSituationPercent;
+                                
+                                if($line->update()<0) $errors++;
+	                                
+	                        }
+	                    }
 	                }
 	                
                     if (!$errors)