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

[<rc...@us...>]

Revision: 7873
          http://sourceforge.net/p/web-erp/reponame/7873
Author:   rchacon
Date:     2017-12-06 21:10:14 +0000 (Wed, 06 Dec 2017)
Log Message:
-----------
Order by transaction date and add link to debtors.

Modified Paths:
--------------
    trunk/Dashboard.php
    trunk/doc/Change.log
    trunk/sql/mysql/upgrade4.14.1-4.14.2.sql

Modified: trunk/Dashboard.php
===================================================================
--- trunk/Dashboard.php	2017-12-05 05:55:16 UTC (rev 7872)
+++ trunk/Dashboard.php	2017-12-06 21:10:14 UTC (rev 7873)
@@ -183,7 +183,8 @@
 			$TotDue += ($AgedAnalysis['due']-$AgedAnalysis['overdue1']);
 			$TotOD1 += ($AgedAnalysis['overdue1']-$AgedAnalysis['overdue2']);
 			$TotOD2 += $AgedAnalysis['overdue2'];
-			echo '<td class="text" colspan="4"><b>', $AgedAnalysis['debtorno'], ' - ', $AgedAnalysis['name'], '</b></td>
+			echo '	<td class="text" colspan="4"><a href="CustomerInquiry.php?CustomerID=', $AgedAnalysis['debtorno'],'"><b>',
+						$AgedAnalysis['debtorno'], ' - ', $AgedAnalysis['name'], '</b></a></td>
 					<td class="number"><b>', $DisplayBalance, '</b></td>
 					<td class="number"><b>', $DisplayCurrent, '</b></td>
 					<td class="number" style="color:orange;"><b>', $DisplayDue, '</b></td>
@@ -233,7 +234,8 @@
 						AND debtorsmaster.paymentterms = paymentterms.termsindicator
 						AND debtorsmaster.debtorno = debtortrans.debtorno
 						AND debtortrans.debtorno = '" . $AgedAnalysis['debtorno'] . "'
-						AND ABS(debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc)>0.004";
+						AND ABS(debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc)>0.004
+					ORDER BY debtortrans.trandate";
 
 			if($_SESSION['SalesmanLogin'] != '') {
 				$Sql .= " AND debtortrans.salesperson='" . $_SESSION['SalesmanLogin'] . "'";

Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log	2017-12-05 05:55:16 UTC (rev 7872)
+++ trunk/doc/Change.log	2017-12-06 21:10:14 UTC (rev 7873)
@@ -1,6 +1,6 @@
 webERP Change Log
 
-
+6/12/17 RChacon: Order by transaction date and add link to debtors in Dashboard.php script.
 3/12/17 Phil commited Tim's BankAccountBalances.php script
 2/12/17 Exson: Fixed the outstanding quantity is not right in PO_SelectOSPurchOrder.php.
 2/12/17 Phil committed Tim Schofield's fix for javascript date picker for US date formats

Modified: trunk/sql/mysql/upgrade4.14.1-4.14.2.sql
===================================================================
--- trunk/sql/mysql/upgrade4.14.1-4.14.2.sql	2017-12-05 05:55:16 UTC (rev 7872)
+++ trunk/sql/mysql/upgrade4.14.1-4.14.2.sql	2017-12-06 21:10:14 UTC (rev 7873)
@@ -1,16 +1,17 @@
-ALTER table supptrans ADD chequeno varchar(16) NOT NULL DEFAULT '';
-ALTER table supptrans ADD void tinyint(1) NOT NULL DEFAULT 0;
-ALTER table banktrans ADD chequeno varchar(16) NOT NULL DEFAULT '';
-INSERT INTO `scripts` (`script` ,`pagesecurity` ,`description`) VALUES ('Z_RemovePurchaseBackOrders.php',  '1',  'Removes all purchase order back orders');
-ALTER table supptrans DROP KEY `TypeTransNo`;
-ALTER table supptrans ADD KEY `TypeTransNo`(`transno`,`type`);
-ALTER TABLE pcexpenses ADD COLUMN taxcatid TINYINT(4) NOT NULL DEFAULT 1 AFTER tag;
-ALTER TABLE pctabs ADD COLUMN defaulttag TINYINT(4) NOT NULL DEFAULT 0 AFTER glaccountpcash;
-ALTER TABLE pctabs ADD COLUMN taxgroupid TINYINT(4) NOT NULL DEFAULT 1 AFTER defaulttag;
-ALTER TABLE pctabs ADD COLUMN authorizerexpenses VARCHAR(20) NOT NULL AFTER authorizer;
-UPDATE pctabs SET authorizerexpenses=authorizer
-ALTER TABLE pcashdetails ADD COLUMN tag INT(11) NOT NULL DEFAULT 0 AFTER tabcode;
-INSERT INTO `scripts` (`script` ,`pagesecurity` ,`description`) VALUES ('PcAuthorizeCash.php',  '6',  'Authorisation of assigned cash');
+ALTER TABLE `banktrans` ADD `chequeno` VARCHAR(16) NOT NULL DEFAULT '' AFTER `currcode`;
+ALTER TABLE `supptrans` ADD `chequeno` VARCHAR(16) NOT NULL DEFAULT '' AFTER `hold`;
+ALTER TABLE `supptrans` ADD `void` TINYINT(1) NOT NULL DEFAULT 0 AFTER `chequeno`;
+ALTER table `supptrans` DROP KEY `TypeTransNo`;
+ALTER table `supptrans` ADD KEY `TypeTransNo`(`transno`,`type`);
+
+ALTER TABLE `pcexpenses` ADD COLUMN `taxcatid` TINYINT(4) NOT NULL DEFAULT 1 AFTER `tag`;
+ALTER TABLE `pctabs` ADD COLUMN `defaulttag` TINYINT(4) NOT NULL DEFAULT 0 AFTER `glaccountpcash`;
+ALTER TABLE `pctabs` ADD COLUMN `taxgroupid` TINYINT(4) NOT NULL DEFAULT 1 AFTER `defaulttag`;
+ALTER TABLE `pctabs` ADD COLUMN `authorizerexpenses` VARCHAR(20) NOT NULL AFTER `authorizer`;
+UPDATE `pctabs` SET authorizerexpenses=authorizer;
+ALTER TABLE `pcashdetails` ADD COLUMN `tag` INT(11) NOT NULL DEFAULT 0 AFTER `tabcode`;
+INSERT INTO `scripts` (`script`, `pagesecurity`, `description`) VALUES ('PcAuthorizeCash.php', '6', 'Authorisation of assigned cash');
+INSERT INTO `scripts` (`script`, `pagesecurity`, `description`) VALUES ('Z_RemovePurchaseBackOrders.php', '1', 'Removes all purchase order back orders');
 CREATE TABLE `pcashdetailtaxes` (
 	`counterindex` INT(20) NOT NULL AUTO_INCREMENT,
 	`pccashdetail` INT(20) NOT NULL DEFAULT 0,
@@ -30,3 +31,6 @@
 ALTER TABLE pcashdetails MODIFY receipt text COMMENT 'Column redundant. Replaced by receipt file upload. Nov 2017.';
 INSERT INTO `scripts` (`script` ,`pagesecurity` ,`description`) VALUES ('BankAccountBalances.php',  '1',  'Shows bank accounts authorised for with balances');
 
+
+UPDATE config SET confvalue='4.15' WHERE confname='VersionNumber';
+