From: <dai...@us...> - 2017-01-12 09:16:33
|
Revision: 7722 http://sourceforge.net/p/web-erp/reponame/7722 Author: daintree Date: 2017-01-12 09:16:31 +0000 (Thu, 12 Jan 2017) Log Message: ----------- reverse adding of superflous intermediary variable Modified Paths: -------------- trunk/Credit_Invoice.php Modified: trunk/Credit_Invoice.php =================================================================== --- trunk/Credit_Invoice.php 2017-01-12 09:09:25 UTC (rev 7721) +++ trunk/Credit_Invoice.php 2017-01-12 09:16:31 UTC (rev 7722) @@ -219,7 +219,7 @@ $myrow = DB_fetch_array($NewDispatchTaxProvResult); $_SESSION['CreditItems' . $identifier]->DispatchTaxProvince = $myrow['taxprovinceid']; - + $TotalQtyCredited = 0; foreach($_SESSION['CreditItems' . $identifier]->LineItems as $LineItem) { @@ -244,13 +244,11 @@ } } foreach ($_SESSION['CreditItems'.$identifier]->FreightTaxes as $FreightTaxKey=>$FreightTaxLine) { - $tmp=filter_number_format($_POST['FreightTaxRate' . $FreightTaxLine->TaxCalculationOrder]); - if (is_numeric($tmp)){ - $_SESSION['CreditItems'.$identifier]->FreightTaxes[$FreightTaxKey]->TaxRate = $tmp/100; + if (is_numeric(filter_number_format($_POST['FreightTaxRate' . $FreightTaxLine->TaxCalculationOrder]))){ + $_SESSION['CreditItems'.$identifier]->FreightTaxes[$FreightTaxKey]->TaxRate = filter_number_format($_POST['FreightTaxRate' . $FreightTaxLine->TaxCalculationOrder])/100; } } - if($_SESSION['CreditItems' . $identifier]->ItemsOrdered > 0 OR isset($_POST['NewItem'])) { if(isset($_GET['Delete'])) { @@ -275,9 +273,8 @@ $_SESSION['CreditItems' . $identifier]->LineItems[$LineItem->LineNumber]->Narrative=$Narrative; } foreach ($LineItem->Taxes as $TaxKey=>$TaxLine) { - $tmp=filter_number_format($_POST[$LineItem->LineNumber . $TaxLine->TaxCalculationOrder . '_TaxRate']); - if (is_numeric($tmp)){ - $_SESSION['CreditItems'.$identifier]->LineItems[$LineItem->LineNumber]->Taxes[$TaxKey]->TaxRate = $tmp/100; + if (is_numeric(filter_number_format($_POST[$LineItem->LineNumber . $TaxLine->TaxCalculationOrder . '_TaxRate']))){ + $_SESSION['CreditItems'.$identifier]->LineItems[$LineItem->LineNumber]->Taxes[$TaxKey]->TaxRate = filter_number_format($_POST[$LineItem->LineNumber . $TaxLine->TaxCalculationOrder . '_TaxRate'])/100; } } } |