[Weberp-cvs] SF.net SVN: web-erp:[3267] trunk

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

Revision: 3267
          http://web-erp.svn.sourceforge.net/web-erp/?rev=3267&view=rev
Author:   daintree
Date:     2010-01-03 07:28:17 +0000 (Sun, 03 Jan 2010)

Log Message:
-----------
Sales Analysis PDFs fixed for TCPDF Javier missed a bracket

Modified Paths:
--------------
    trunk/SalesAnalysis_UserDefined.php
    trunk/doc/Change.log.html
    trunk/sql/mysql/upgrade3.11.1-3.12.sql
    trunk/sql/mysql/weberp-new.sql

Modified: trunk/SalesAnalysis_UserDefined.php
===================================================================
--- trunk/SalesAnalysis_UserDefined.php	2010-01-02 09:54:35 UTC (rev 3266)
+++ trunk/SalesAnalysis_UserDefined.php	2010-01-03 07:28:17 UTC (rev 3267)
@@ -17,17 +17,8 @@
 	include ('includes/PDFSalesAnalysis.inc');
 
 	if ($Counter >0) {
-// Javier: 
-/*		if ($ListCount == 0) {
-			$title = _('Printing Sales Analysis Error');
-			include('includes/header.inc');
-			echo '<br /><a href="' . $rootpath . '/index.php?' . SID . '">' . _('Back to the menu') . '</a>';
-			include('includes/footer.inc');
-			exit;
-        	} else {
-*/			$pdf->OutputD('SalesAnalysis_' . date('Y-m-d') . '.pdf');
-			$pdf-> __destruct();
-		}
+		$pdf->OutputD('SalesAnalysis_' . date('Y-m-d') . '.pdf');
+		$pdf-> __destruct();
 	} else {
 		$pdf-> __destruct();
 		$title = _('User Defined Sales Analysis Problem');

Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html	2010-01-02 09:54:35 UTC (rev 3266)
+++ trunk/doc/Change.log.html	2010-01-03 07:28:17 UTC (rev 3267)
@@ -1,5 +1,6 @@
 <p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
 <p>
+<p>3/1/10 Phil: Fix SalesAnalysis_UserDefined.php - one too many brackets and indentation
 <p>02/01/10 Tim: Allow pdf output of the asset register.
 <p>24/12/09 Tim: Move the purchase ordering printing parameters to a separate file for the form designer.
 <p>23/12/09 Tim: Rename rtl theme to remove the space.

Modified: trunk/sql/mysql/upgrade3.11.1-3.12.sql
===================================================================
--- trunk/sql/mysql/upgrade3.11.1-3.12.sql	2010-01-02 09:54:35 UTC (rev 3266)
+++ trunk/sql/mysql/upgrade3.11.1-3.12.sql	2010-01-03 07:28:17 UTC (rev 3267)
@@ -2,7 +2,7 @@
   `locationid` char(6) NOT NULL default '',
   `locationdescription` char(20) NOT NULL default '',
   PRIMARY KEY  (`locationid`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 DROP TABLE `assetmanager`;
 
@@ -15,7 +15,7 @@
   `depn` double NOT NULL default '0',
   `datepurchased` date NOT NULL default '0000-00-00',
   PRIMARY KEY  (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 UPDATE `www_users` SET `modulesallowed`=(SELECT insert(`modulesallowed`, 15,0,"1,"));
 INSERT INTO `config` (`confname`, `confvalue`) VALUES ('FrequentlyOrderedItems',0);

Modified: trunk/sql/mysql/weberp-new.sql
===================================================================
--- trunk/sql/mysql/weberp-new.sql	2010-01-02 09:54:35 UTC (rev 3266)
+++ trunk/sql/mysql/weberp-new.sql	2010-01-03 07:28:17 UTC (rev 3267)
@@ -2153,7 +2153,7 @@
   `password` text NOT NULL,
   `realname` varchar(35) NOT NULL DEFAULT '',
   `customerid` varchar(10) NOT NULL DEFAULT '',
-  `salesman` char(3) NOT NULL,
+  `salesman` char(3) NOT NULL DEFAULT '',
   `phone` varchar(30) NOT NULL DEFAULT '',
   `email` varchar(55) DEFAULT NULL,
   `defaultlocation` varchar(5) NOT NULL DEFAULT '',


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.