From: <dai...@us...> - 2010-03-16 09:17:43
|
Revision: 3388 http://web-erp.svn.sourceforge.net/web-erp/?rev=3388&view=rev Author: daintree Date: 2010-03-16 09:17:37 +0000 (Tue, 16 Mar 2010) Log Message: ----------- mods to requirements in install.txt and upgrading.txt also format of romalpa clause on portrait invoices Modified Paths: -------------- trunk/PrintCustTransPortrait.php trunk/companies/weberpdemo/FormDesigns/SalesInvoice.xml trunk/doc/INSTALL.txt trunk/doc/UPGRADING.txt Modified: trunk/PrintCustTransPortrait.php =================================================================== --- trunk/PrintCustTransPortrait.php 2010-03-16 08:37:07 UTC (rev 3387) +++ trunk/PrintCustTransPortrait.php 2010-03-16 09:17:37 UTC (rev 3388) @@ -466,11 +466,11 @@ if ($InvOrCredit=='Invoice'){ $pdf->addText($Page_Width-$Right_Margin-220, $YPos - ($line_height*3)-6,$FontSize, _('TOTAL INVOICE')); $FontSize=8; - $LeftOvers = $pdf->addTextWrap($Left_Margin+5,$YPos-48,280,$FontSize,$_SESSION['RomalpaClause']); -// while (strlen($LeftOvers)>0 AND $YPos > $Bottom_Margin){ -// $YPos -=25; - $LeftOvers = $pdf->addTextWrap($Left_Margin+5,$YPos-58,280,$FontSize,$LeftOvers); -// } + $LeftOvers = $pdf->addTextWrap($Left_Margin+5,$YPos-18,280,$FontSize,$_SESSION['RomalpaClause']); + while (strlen($LeftOvers)>0 AND $YPos > $Bottom_Margin){ + $YPos -=10; + $LeftOvers = $pdf->addTextWrap($Left_Margin+5,$YPos-18,280,$FontSize,$LeftOvers); + } /* Add Images for Visa / Mastercard / Paypal */ if (file_exists('companies/' . $_SESSION['DatabaseName'] . '/payment.jpg')) { $pdf->addJpegFromFile('companies/' . $_SESSION['DatabaseName'] . '/payment.jpg',$Page_Width/2 -60,$YPos-15,0,20); Modified: trunk/companies/weberpdemo/FormDesigns/SalesInvoice.xml =================================================================== --- trunk/companies/weberpdemo/FormDesigns/SalesInvoice.xml 2010-03-16 08:37:07 UTC (rev 3387) +++ trunk/companies/weberpdemo/FormDesigns/SalesInvoice.xml 2010-03-16 09:17:37 UTC (rev 3388) @@ -479,7 +479,7 @@ </TotalLine> <RomalpaLine type="Line" name="Romalpa Line" id="RomalpaLine"> <startx>590</startx> - <starty>501</starty> + <starty>490</starty> <endx>590</endx> <endy>565</endy> </RomalpaLine> Modified: trunk/doc/INSTALL.txt =================================================================== --- trunk/doc/INSTALL.txt 2010-03-16 08:37:07 UTC (rev 3387) +++ trunk/doc/INSTALL.txt 2010-03-16 09:17:37 UTC (rev 3388) @@ -32,10 +32,10 @@ Pre-requisites: -- A working PHP web server - v 5.0 or later is recommended but it also works with later 4.x releases - with support for mysql databases, gd, gettext and ftp +- A working PHP web server - v 5.0 or later is required (it no longer works with versions prior) PHP must have support for mysql databases (either mysql or mysqli), gd, gettext and ftp - A working MySQL server (MySql version 4.1 or above - innodb tables MUST be enabled - check your my.cnf file to ensure innodb tables are enabled (normally under /etc/my.cnf or the mysql data directory - see the MySQL manual). -Installing these components are well covered elsewhere - but if you need to install these components the recommended solution under windows would be to download and install apache2triad - http://apache2triad.net/ or under windows or *nix download and install XAMP - http://www.apachefriends.org/en/xampp.html +Installing these components are well covered elsewhere - but if you need to install these components the recommended solution under windows would be to download and install apache2triad - http://apache2triad.net/ or under windows or *nix download and install XAMPP - http://www.apachefriends.org/en/xampp.html PHP must have the register globals configuration parameter set to off. This is the default (now). This flag can be set in the php.ini on the server. If it can't be changed on the server's php.ini, it is possibe for apache web servers to alter the configuration using a file called .htaccess. A .htaccess file is included in the webERP directory that ensures the register_globals flag is set to off for those web-servers that support .htaccess files. Modified: trunk/doc/UPGRADING.txt =================================================================== --- trunk/doc/UPGRADING.txt 2010-03-16 08:37:07 UTC (rev 3387) +++ trunk/doc/UPGRADING.txt 2010-03-16 09:17:37 UTC (rev 3388) @@ -69,4 +69,8 @@ NOTES ON UPGRADING FROM 3.04 to 3.05 3.05 now has Dave Premo's report writer scripts included in the distribution - additional tables are required for this functionality. Also, 3.05 allows for weighted average stock valuation - using the existing data fields and retaining integrated general ledger stock values. This requires cost information to be copied over into the grns table. -The upgrade script Z_Upgrade_3.04-3.05.php applies all the additional tables to the database and does the data conversions required wihtout any manual intervention. \ No newline at end of file +The upgrade script Z_Upgrade_3.04-3.05.php applies all the additional tables to the database and does the data conversions required wihtout any manual intervention. + +NOTES ON UPGRADING FROM 3.11 to 3.12 + +PHP 5 is now required because of the simpleXML module of PHP only comes with PHP 5. This is used on the new XML definition of report formats. \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |