Merge pull request #8412 from atm-florian/dev_scrunit

fix scrutinizer
Dolibarr · Mar 19, 2018 · 928d428 · 928d428
2 parents ce39753 + 5a98958
commit 928d428
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
@@ -1509,7 +1509,7 @@ function subscriptionComplementaryActions($subscriptionid, $option, $accountid,
 					$vattouse=get_default_tva($mysoc, $mysoc, $idprodsubscription);
 				}
 				//print xx".$vattouse." - ".$mysoc." - ".$customer;exit;
-				$result=$invoice->addline($label,0,1,$vattouse,0,0,$idprodsubscription,0,$datesubscription,$datesubend,0,0,'','TTC',$amount,1);
+				$result=$invoice->addline($label,0,1,$vattouse,0,0,$idprodsubscription,0,$datesubscription,'',0,0,'','TTC',$amount,1);
 				if ($result <= 0)
 				{
 					$this->error=$invoice->error;
@@ -1577,7 +1577,7 @@ function subscriptionComplementaryActions($subscriptionid, $option, $accountid,
 					}
 				}
 
-				if (! $error)
+				if (! $error && !empty($bank_line_id))
 				{
 					// Update fk_bank into subscription table
 					$sql = 'UPDATE '.MAIN_DB_PREFIX.'subscription SET fk_bank='.$bank_line_id;
@@ -1614,7 +1614,7 @@ function subscriptionComplementaryActions($subscriptionid, $option, $accountid,
 				// Generate PDF (whatever is option MAIN_DISABLE_PDF_AUTOUPDATE) so we can include it into email
 				//if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
 
-				$invoice->generateDocument($invoice->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+				$invoice->generateDocument($invoice->modelpdf, $outputlangs);
 			}
 		}