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

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

Revision: 7068
          http://sourceforge.net/p/web-erp/reponame/7068
Author:   daintree
Date:     2015-01-06 07:52:25 +0000 (Tue, 06 Jan 2015)
Log Message:
-----------
missing SQL and config.distrib.php fix for multi coy setup

Modified Paths:
--------------
    trunk/PDFPriceList.php
    trunk/config.distrib.php
    trunk/sql/mysql/upgrade4.11-4.12.sql

Modified: trunk/PDFPriceList.php
===================================================================
--- trunk/PDFPriceList.php	2015-01-05 03:41:43 UTC (rev 7067)
+++ trunk/PDFPriceList.php	2015-01-06 07:52:25 UTC (rev 7068)
@@ -292,8 +292,8 @@
 			<tr>
 				<td>' . _('Select Inventory Categories') . ':</td>
 				<td><select autofocus="autofocus" required="required" minlength="1" size="12" name="Categories[]"multiple="multiple">';
-	$SQL = 'SELECT categoryid, categorydescription 
-			FROM stockcategory 
+	$SQL = 'SELECT categoryid, categorydescription
+			FROM stockcategory
 			ORDER BY categorydescription';
 	$CatResult = DB_query($SQL);
 	while ($MyRow = DB_fetch_array($CatResult)) {
@@ -395,9 +395,7 @@
 		_('Printed') . ': ' . date($_SESSION['DefaultDateFormat']), 'right');// Date printed.
 
 	$YPos -= $FontSize;
-	$pdf->addText($Left_Margin, $YPos, $FontSize,
-		_('Categories') . ': ' . $_POST['FromCriteria'] . ' - ' . $_POST['ToCriteria'] . '. ' .
-		_('Effective As At') . ' ' . $_POST['EffectiveDate']);// Categories and effective date.
+	$pdf->addText($Left_Margin, $YPos, $FontSize, _('Effective As At') . ' ' . $_POST['EffectiveDate']);
 	$pdf->addTextWrap($Page_Width-$Right_Margin-140, $YPos-$FontSize, 140, $FontSize,
 		date('H:i:s'), 'right');// Time printed.
 

Modified: trunk/config.distrib.php
===================================================================
--- trunk/config.distrib.php	2015-01-05 03:41:43 UTC (rev 7067)
+++ trunk/config.distrib.php	2015-01-06 07:52:25 UTC (rev 7068)
@@ -109,5 +109,8 @@
 /* For Development Use */
 //error_reporting (-1);
 
+//Installed companies
+$CompanyList[0] = array('database'=>'weberpdemo' ,'company'=>'WebERP Demo Company' );
+$CompanyList[1] = array('database'=>'your_db' ,'company'=>'Your Company inc' );
 /*Make sure there is nothing - not even spaces after this last ?> */
 ?>

Modified: trunk/sql/mysql/upgrade4.11-4.12.sql
===================================================================
--- trunk/sql/mysql/upgrade4.11-4.12.sql	2015-01-05 03:41:43 UTC (rev 7067)
+++ trunk/sql/mysql/upgrade4.11-4.12.sql	2015-01-06 07:52:25 UTC (rev 7068)
@@ -137,7 +137,7 @@
 -- Add a field to mark if a description needs revision:
 ALTER TABLE `stockdescriptiontranslations` ADD `needsrevision` TINYINT(1) NOT NULL DEFAULT '0';
 -- 
-INSERT INTO `config` (`confname` ,`confvalue`) VALUES ('GoogleTranslatorAPIKey',  '');  
+INSERT INTO `config` (`confname` ,`confvalue`) VALUES ('GoogleTranslatorAPIKey',  '');
 -- Assign a Page Security value to each translation script:
 INSERT INTO `scripts` (`script`, `pagesecurity`, `description`) VALUES 
 	('AutomaticTranslationDescriptions.php', '15', 'Translates via Google Translator all empty translated descriptions'), 
@@ -147,6 +147,23 @@
 -- Insert default theme value for login screen
 --
 INSERT INTO `config` (`confname`, `confvalue`) VALUES ('DefaultTheme', 'xenos');
+INSERT INTO  scripts (`script`,`pagesecurity`,`description`) VALUES ('SalesTopCustomersInquiry.php',  '2',  'Shows the top customers sales for a selected date range');
 
 
+CREATE TABLE IF NOT EXISTS `supplierdiscounts` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `supplierno` varchar(10) NOT NULL,
+  `stockid` varchar(20) NOT NULL,
+  `discountnarrative` varchar(20) NOT NULL,
+  `discountpercent` double NOT NULL,
+  `discountamount` double NOT NULL,
+  `effectivefrom` date NOT NULL,
+  `effectiveto` date NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `supplierno` (`supplierno`),
+  KEY `effectivefrom` (`effectivefrom`),
+  KEY `effectiveto` (`effectiveto`),
+  KEY `stockid` (`stockid`)
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;
+
 UPDATE config SET confvalue='4.12' WHERE confname='VersionNumber';