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

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

Revision: 6792
          http://sourceforge.net/p/web-erp/reponame/6792
Author:   daintree
Date:     2014-07-19 05:22:40 +0000 (Sat, 19 Jul 2014)
Log Message:
-----------
Gilberto key duplication removed

Modified Paths:
--------------
    trunk/StockCategories.php
    trunk/includes/class.pdf.php
    trunk/sql/mysql/upgrade4.11-4.12.sql

Modified: trunk/StockCategories.php
===================================================================
--- trunk/StockCategories.php	2014-07-17 17:15:33 UTC (rev 6791)
+++ trunk/StockCategories.php	2014-07-19 05:22:40 UTC (rev 6792)
@@ -168,7 +168,7 @@
 											purchpricevaract,
 											materialuseagevarac,
 											wipact)
-										VALUES ('" . 
+										VALUES ('" .
 											$_POST['CategoryID'] . "','" .
 											$_POST['StockType'] . "','" .
 											$_POST['CategoryDescription'] . "','" .
@@ -253,16 +253,16 @@
 	echo '<br />
 		<table class="selection">
 			<tr>
-				<th>' . _('Code') . '</th>
-				<th>' . _('Category Description') . '</th>' . '
-				<th>' . _('Stock Type') . '</th>' . '
-				<th>' . _('Default Tax Category') . '</th>' . '
-				<th>' . _('Stock GL') . '</th>' . '
-				<th>' . _('Adjts GL') . '</th>
-				<th>' . _('Issues GL') . '</th>
-				<th>' . _('Price Var GL') . '</th>
-				<th>' . _('Usage Var GL') . '</th>
-				<th>' . _('WIP GL') . '</th>
+				<th class="ascending">' . _('Code') . '</th>
+				<th class="ascending">' . _('Category Description') . '</th>' . '
+				<th class="ascending">' . _('Stock Type') . '</th>' . '
+				<th class="ascending">' . _('Default Tax Category') . '</th>' . '
+				<th class="ascending">' . _('Stock GL') . '</th>' . '
+				<th class="ascending">' . _('Adjts GL') . '</th>
+				<th class="ascending">' . _('Issues GL') . '</th>
+				<th class="ascending">' . _('Price Var GL') . '</th>
+				<th class="ascending">' . _('Usage Var GL') . '</th>
+				<th class="ascending">' . _('WIP GL') . '</th>
 				<th colspan="2">' . _('Maintenance') . '</th>
 			</tr>';
 
@@ -463,7 +463,7 @@
 	}
 	echo ' value="' . $myrow['accountcode'] . '">' .
 		htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8', false) .
-		' ('.$myrow['accountcode'].')' . '</option>';	 
+		' ('.$myrow['accountcode'].')' . '</option>';
 }
 echo '</select></td></tr>';
 DB_data_seek($BSAccountsResult,0);

Modified: trunk/includes/class.pdf.php
===================================================================
--- trunk/includes/class.pdf.php	2014-07-17 17:15:33 UTC (rev 6791)
+++ trunk/includes/class.pdf.php	2014-07-19 05:22:40 UTC (rev 6792)
@@ -221,7 +221,7 @@
 		function RoundRectangle($XPos, $YPos, $Width, $Height, $RadiusX, $RadiusY) {
 			$this->line($XPos, $YPos-$RadiusY, $XPos, $YPos-$Height+$RadiusY);// Left side
 			$this->line($XPos+$RadiusX, $YPos, $XPos+$Width-$RadiusX, $YPos);// Top side
-			$this->line($XPos+$RadiusX, $YPos-$Height-$Radius, $XPos+$Width-$RadiusX, $YPos-$Height-$Radius);// Bottom side
+			$this->line($XPos+$RadiusX, $YPos-$Height-$RadiusX, $XPos+$Width-$RadiusX, $YPos-$Height-$RadiusX);// Bottom side
 			$this->line($XPos+$Width, $YPos-$RadiusY, $XPos+$Width, $YPos-$Height+$RadiusY);// Right side
 			$this->partEllipse($XPos+$RadiusX, $YPos-$RadiusY, 90, 180, $RadiusX, $RadiusY);// Top left corner
 			$this->partEllipse($XPos+$RadiusX, $YPos-$Height+$RadiusY, 180, 270, $RadiusX, $RadiusY);// Bottom left corner
@@ -296,7 +296,9 @@
 					$ls=$l;
 					$ns++;
 				}
-				$l += $cw[$i];
+				if (isset($cw[$i])) {
+					$l += $cw[$i];
+				}
 				if($l>$wmax){
 					break;
 				} else {

Modified: trunk/sql/mysql/upgrade4.11-4.12.sql
===================================================================
--- trunk/sql/mysql/upgrade4.11-4.12.sql	2014-07-17 17:15:33 UTC (rev 6791)
+++ trunk/sql/mysql/upgrade4.11-4.12.sql	2014-07-19 05:22:40 UTC (rev 6792)
@@ -42,6 +42,17 @@
 INSERT INTO  `scripts` (`script` ,`pagesecurity` ,`description`) VALUES ('RelatedItemsUpdate.php',  '2',  'Maintains Related Items');
 INSERT INTO scripts VALUES('Z_ImportDebtors.php',15,'Import debtors by csv file');
 ALTER table purchorders MODIFY tel varchar(30) NOT NULL DEFAULT '';
+
+ALTER TABLE banktrans DROP KEY ref_10, DROP KEY ref_9, DROP KEY ref_8, DROP KEY ref_7;
+ALTER TABLE banktrans DROP KEY ref_6, DROP KEY ref_5, DROP KEY ref_4, DROP KEY ref_3, DROP KEY ref_2;
+ALTER TABLE gltrans DROP KEY tag_2, DROP KEY tag_3, DROP KEY tag_4;
+ALTER TABLE mrpdemandtypes DROP KEY mrpdemandtype;
+ALTER TABLE salescatprod DROP KEY manufacturers_id_2;
+ALTER TABLE salescatprod DROP KEY manufacturers_id;
+ALTER TABLE stockrequest DROP KEY departmentid_2;
+ALTER TABLE stockrequest DROP KEY loccode_2;
+ALTER TABLE stockrequestitems DROP KEY stockid_2, DROP KEY dispatchid_2;
+
 UPDATE config SET confvalue='4.12' WHERE confname='VersionNumber';