[Web-erp-svn] SF.net SVN: web-erp:[7534] trunk

[<dai...@us...>]

Revision: 7534
          http://sourceforge.net/p/web-erp/reponame/7534
Author:   daintree
Date:     2016-05-20 05:19:41 +0000 (Fri, 20 May 2016)
Log Message:
-----------
Paul Harness: sorting customerallocations.php

Modified Paths:
--------------
    trunk/CustomerAllocations.php
    trunk/doc/Change.log
    trunk/includes/Z_POSDataCreation.php

Modified: trunk/CustomerAllocations.php
===================================================================
--- trunk/CustomerAllocations.php	2016-05-19 14:55:28 UTC (rev 7533)
+++ trunk/CustomerAllocations.php	2016-05-20 05:19:41 UTC (rev 7534)
@@ -273,7 +273,7 @@
 		$SQL .= " AND debtortrans.salesperson='" . $_SESSION['SalesmanLogin'] . "'";
 	}
 
-	$SQL .= " ORDER BY debtortrans.trandate";
+	$SQL .= " ORDER BY debtortrans.trandate, debtortrans.transno";
 
 	$Result = DB_query($SQL);
 
@@ -314,7 +314,7 @@
 		$SQL .= " AND debtortrans.salesperson='" . $_SESSION['SalesmanLogin'] . "'";
 	}
 
-	$SQL .= " ORDER BY debtortrans.trandate";
+	$SQL .= " ORDER BY debtortrans.trandate, debtortrans.transno";
 
 	$Result=DB_query($SQL);
 
@@ -484,7 +484,7 @@
 		$SQL .= " AND debtortrans.salesperson='" . $_SESSION['SalesmanLogin'] . "'";
 	}
 
-	$SQL .= " ORDER BY debtortrans.id";
+	$SQL .= " ORDER BY debtortrans.trandate, debtortrans.transno";
 
 	$result = DB_query($SQL);
 
@@ -548,7 +548,7 @@
 		$SQL .= " AND debtortrans.salesperson='" . $_SESSION['SalesmanLogin'] . "'";
 	}
 
-	$SQL .= " ORDER BY debtorsmaster.name";
+	$SQL .= " ORDER BY debtortrans.trandate, debtortrans.transno";
 
 	$result = DB_query($SQL);
 	$NoOfUnallocatedTrans = DB_num_rows($result);
@@ -598,15 +598,15 @@
 		}
 
 		echo '<td>' . _($myrow['typename']) . '</td>
-			<td>' . $myrow['name'] . '</td>
-			<td>' . $myrow['debtorno'] . '</td>
-			<td>' . $myrow['transno'] . '</td>
-			<td>' . ConvertSQLDate($myrow['trandate']) . '</td>
-			<td class="number">' . locale_number_format($myrow['total'],$CurrDecimalPlaces) . '</td>
-			<td class="number">' . locale_number_format($myrow['total']-$myrow['alloc'],$CurrDecimalPlaces) . '</td>
-			<td>' . $CurrCode . '</td>
-			<td>' . $AllocateLink . '</td>
-		</tr>';
+				<td>' . $myrow['name'] . '</td>
+				<td>' . $myrow['debtorno'] . '</td>
+				<td>' . $myrow['transno'] . '</td>
+				<td>' . ConvertSQLDate($myrow['trandate']) . '</td>
+				<td class="number">' . locale_number_format($myrow['total'],$CurrDecimalPlaces) . '</td>
+				<td class="number">' . locale_number_format($myrow['total']-$myrow['alloc'],$CurrDecimalPlaces) . '</td>
+				<td>' . $CurrCode . '</td>
+				<td>' . $AllocateLink . '</td>
+			</tr>';
 
 	} //end loop around unallocated receipts and credit notes
 

Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log	2016-05-19 14:55:28 UTC (rev 7533)
+++ trunk/doc/Change.log	2016-05-20 05:19:41 UTC (rev 7534)
@@ -1,7 +1,8 @@
 webERP Change Log
 
-16/5/16 Release 4.13
+22/5/16 Release 4.13
 
+20/5/16 Paul Harness: CustomerAllocations.php consistent sort order adding by date and transno sorting for transactions on the same date
 15/05/16 RChacon: In SelectCustomer.php, use a default map host if $map_host is empty.
 15/05/16 RChacon: In AccountGroups.php, hide no printing elements.
 15/05/16 Exson: Add sequence digitals to make BOM sequences can be adjusted flexible and avoid any uncertainty of the number stored in SQL. Thanks Tim's suggestion.

Modified: trunk/includes/Z_POSDataCreation.php
===================================================================
--- trunk/includes/Z_POSDataCreation.php	2016-05-19 14:55:28 UTC (rev 7533)
+++ trunk/includes/Z_POSDataCreation.php	2016-05-20 05:19:41 UTC (rev 7534)
@@ -122,7 +122,7 @@
 	fwrite($FileHandle,"DELETE FROM stockmaster;\n");
 
 
-	$result = DB_query("SELECT stockid, categoryid, description, longdescription, units, barcode, taxcatid, decimalplaces, discountcategory FROM stockmaster WHERE (mbflag='B' OR mbflag='M' OR mbflag='D') AND discontinued=0 AND controlled=0");
+	$result = DB_query("SELECT stockid, categoryid, description, longdescription, units, barcode, taxcatid, decimalplaces, discountcategory FROM stockmaster WHERE (mbflag='B' OR mbflag='M' OR mbflag='D' OR mbflag='A') AND discontinued=0 AND controlled=0");
 
 	while ($myrow = DB_fetch_array($result)) {