web-erp-svn

[Web-erp-svn] SF.net SVN: web-erp:[7272] trunk/SelectOrderItems.php

[<ex...@us...>]

Revision: 7272
          http://sourceforge.net/p/web-erp/reponame/7272
Author:   exsonqu
Date:     2015-04-26 02:33:51 +0000 (Sun, 26 Apr 2015)
Log Message:
-----------
26/04/15 Exson: Fixed raw material sellable broken bug introduced by myself in 6720.

Modified Paths:
--------------
    trunk/SelectOrderItems.php

Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php	2015-04-23 14:00:44 UTC (rev 7271)
+++ trunk/SelectOrderItems.php	2015-04-26 02:33:51 UTC (rev 7272)
@@ -727,9 +727,9 @@
 						custitem.cust_part,
 						custitem.cust_description
 				FROM stockmaster INNER JOIN stockcategory
-				ON stockmaster.categoryid=stockcategory.categoryid
+				ON stockmaster.categoryid=stockcategory.categoryid 
 				" . $IncludeCustItem . "
-				WHERE (stockcategory.stocktype='F' OR stockcategory.stocktype='D' OR stockcategory.stocktype='L')
+				WHERE (stockcategory.stocktype='F' OR stockcategory.stocktype='D' OR stockcategory.stocktype='L' " . $RawMaterialSellable . ")
 				AND stockmaster.mbflag <>'G'
 				AND stockmaster.discontinued=0 ";
 
@@ -1850,4 +1850,4 @@
 		$result = DB_query($sql,$ErrMsg,$DbgMsg);
 		return $result;
 }
-?>
\ No newline at end of file
+?>

[Web-erp-svn] SF.net SVN: web-erp:[7363] trunk/SelectOrderItems.php

[<ex...@us...>]

Revision: 7363
          http://sourceforge.net/p/web-erp/reponame/7363
Author:   exsonqu
Date:     2015-10-06 10:03:50 +0000 (Tue, 06 Oct 2015)
Log Message:
-----------
06/10/15 Exson: Fixed the wrong unable to identify the selected customer warning at SelectOrderItems.php.

Modified Paths:
--------------
    trunk/SelectOrderItems.php

Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php	2015-09-30 12:36:52 UTC (rev 7362)
+++ trunk/SelectOrderItems.php	2015-10-06 10:03:50 UTC (rev 7363)
@@ -367,9 +367,9 @@
 			break;
 		}
 	}
-	if ($i==count($_POST)){
+	if ($i==count($_POST) AND !isset($SelectedCustomer)){//if there is ONLY one customer searched at above, the $SelectedCustomer already setup, then there is a wrong warning
 		prnMsg(_('Unable to identify the selected customer'),'error');
-	} else {
+	} elseif(!isset($SelectedCustomer)) {
 		$SelectedCustomer = $_POST['SelectedCustomer'.$i];
 		$SelectedBranch = $_POST['SelectedBranch'.$i];
 	}

[Web-erp-svn] SF.net SVN: web-erp:[7431] trunk/SelectOrderItems.php

[<ex...@us...>]

Revision: 7431
          http://sourceforge.net/p/web-erp/reponame/7431
Author:   exsonqu
Date:     2015-12-28 03:47:44 +0000 (Mon, 28 Dec 2015)
Log Message:
-----------
28/12/15 Exson: Fixed the bug that discount not modified for items whose discount is null in discount matrix in SelectOrderItems.php.

Modified Paths:
--------------
    trunk/SelectOrderItems.php

Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php	2015-12-28 02:56:23 UTC (rev 7430)
+++ trunk/SelectOrderItems.php	2015-12-28 03:47:44 UTC (rev 7431)
@@ -1131,7 +1131,7 @@
 				} else {
 					$DiscountMatrixRate = $myrow[0];
 				}
-				if ($myrow[0]!=0){ /* need to update the lines affected */
+				if ($DiscountMatrixRate!=0){ /* need to update the lines affected */
 					foreach ($_SESSION['Items'.$identifier]->LineItems as $OrderLine_2) {
 						if ($OrderLine_2->DiscCat==$OrderLine->DiscCat){
 							$_SESSION['Items'.$identifier]->LineItems[$OrderLine_2->LineNumber]->DiscountPercent = $DiscountMatrixRate;
@@ -1270,9 +1270,11 @@
 			} else {
 				$DiscountMatrixRate = $myrow[0];
 			}
-			foreach ($_SESSION['Items'.$identifier]->LineItems as $StkItems_2) {
-				if ($StkItems_2->DiscCat==$OrderLine->DiscCat){
-					$_SESSION['Items'.$identifier]->LineItems[$StkItems_2->LineNumber]->DiscountPercent = $DiscountMatrixRate;
+			if ($DiscountMatrixRate != 0) {
+				foreach ($_SESSION['Items'.$identifier]->LineItems as $StkItems_2) {
+					if ($StkItems_2->DiscCat==$OrderLine->DiscCat){
+						$_SESSION['Items'.$identifier]->LineItems[$StkItems_2->LineNumber]->DiscountPercent = $DiscountMatrixRate;
+					}
 				}
 			}
 		}

[Web-erp-svn] SF.net SVN: web-erp:[7807] trunk/SelectOrderItems.php

[<ex...@us...>]

Revision: 7807
          http://sourceforge.net/p/web-erp/reponame/7807
Author:   exsonqu
Date:     2017-07-10 01:31:55 +0000 (Mon, 10 Jul 2017)
Log Message:
-----------
10/07/17 Exson: Fixed the wrong price bug and GP not updated correctly in SelectOrderItems.php. Report by Robert from MHHK forum. 

Modified Paths:
--------------
    trunk/SelectOrderItems.php

Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php	2017-07-08 05:22:08 UTC (rev 7806)
+++ trunk/SelectOrderItems.php	2017-07-10 01:31:55 UTC (rev 7807)
@@ -1052,15 +1052,19 @@
 
 				if (ABS($OrderLine->Price - filter_number_format($_POST['Price_' . $OrderLine->LineNumber]))>0.01){
 					/*There is a new price being input for the line item */
-
 					$Price = filter_number_format($_POST['Price_' . $OrderLine->LineNumber]);
-					if ($_POST['Discount_' . $OrderLine->LineNumber] < 100) {//to avoid divided by zero error
-						$_POST['GPPercent_' . $OrderLine->LineNumber] = (($Price*(1-(filter_number_format($_POST['Discount_' . $OrderLine->LineNumber])/100))) - $OrderLine->StandardCost*$ExRate)/($Price *(1-filter_number_format($_POST['Discount_' . $OrderLine->LineNumber])/100)/100);
+					if (isset($_POST['Discount_' . $OrderLine->LineNumber]) AND is_numeric(filter_number_format($_POST['Discount_' . $OrderLine->LineNumber]))) {
+							if ($_POST['Discount_' . $OrderLine->LineNumber] < 100) {//to avoid divided by zero error
+								$_POST['GPPercent_' . $OrderLine->LineNumber] = (($Price*(1-(filter_number_format($_POST['Discount_' . $OrderLine->LineNumber])/100))) - $OrderLine->StandardCost*$ExRate)/($Price *(1-filter_number_format($_POST['Discount_' . $OrderLine->LineNumber])/100)/100);
+							} else {
+								$_POST['GPPercent_' . $OrderLine->LineNumber] = 0;
+							}
 					} else {
-						$_POST['GPPercent_' . $OrderLine->LineNumber] = 0;
+							$_POST['GPPercent_' . $OrderLine->LineNumber] = ($Price - $OrderLine->StandardCost*$ExRate)*100/$Price;
 					}
 
-				} elseif (ABS($OrderLine->GPPercent - filter_number_format($_POST['GPPercent_' . $OrderLine->LineNumber]))>=0.01) {
+
+				} elseif (isset($_POST['GPPercent_'.$OrderLine->LineNumber]) AND ABS($OrderLine->GPPercent - filter_number_format($_POST['GPPercent_' . $OrderLine->LineNumber]))>=0.01) {
 					/* A GP % has been input so need to do a recalculation of the price at this new GP Percentage */
 
 
@@ -1070,8 +1074,17 @@
 					$Price = ($OrderLine->StandardCost*$ExRate)/(1 -((filter_number_format($_POST['GPPercent_' . $OrderLine->LineNumber]) + filter_number_format($_POST['Discount_' . $OrderLine->LineNumber]))/100));
 				} else {
 					$Price = filter_number_format($_POST['Price_' . $OrderLine->LineNumber]);
+					if (isset($_POST['Discount_' . $OrderLine->LineNumber]) AND is_numeric(filter_number_format($_POST['Discount_' . $OrderLine->LineNumber]))) {
+							if ($_POST['Discount_' . $OrderLine->LineNumber] < 100) {//to avoid divided by zero error
+								$_POST['GPPercent_' . $OrderLine->LineNumber] = (($Price*(1-(filter_number_format($_POST['Discount_' . $OrderLine->LineNumber])/100))) - $OrderLine->StandardCost*$ExRate)/($Price *(1-filter_number_format($_POST['Discount_' . $OrderLine->LineNumber])/100)/100);
+							} else {
+								$_POST['GPPercent_' . $OrderLine->LineNumber] = 0;
+							}
+					} else {
+							$_POST['GPPercent_' . $OrderLine->LineNumber] = ($Price - $OrderLine->StandardCost*$ExRate)*100/$Price;
+					}
 				}
-				$DiscountPercentage = filter_number_format($_POST['Discount_' . $OrderLine->LineNumber]);
+				$DiscountPercentage = isset($_POST['Discount_' . $OrderLine->LineNumber])?filter_number_format($_POST['Discount_' . $OrderLine->LineNumber]):0;
 				if ($_SESSION['AllowOrderLineItemNarrative'] == 1) {
 					$Narrative = $_POST['Narrative_' . $OrderLine->LineNumber];
 				} else {