Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[4676] trunk
|
From: <dai...@us...> - 2011-09-04 03:12:27
|
Revision: 4676
http://web-erp.svn.sourceforge.net/web-erp/?rev=4676&view=rev
Author: daintree
Date: 2011-09-04 03:12:20 +0000 (Sun, 04 Sep 2011)
Log Message:
-----------
4/9/11 Marcos Skambraks: SelectOrderItems.php and CounterSales.php removed incorrect !== comparisons sh/been != comparisons
4/9/11 Marcos Skambraks: modified tcpdf.php to just send the pdf header - was causing issues with apache fastcgi module
Modified Paths:
--------------
trunk/CounterSales.php
trunk/SelectOrderItems.php
trunk/doc/Change.log
trunk/includes/tcpdf/tcpdf.php
Modified: trunk/CounterSales.php
===================================================================
--- trunk/CounterSales.php 2011-09-03 11:07:57 UTC (rev 4675)
+++ trunk/CounterSales.php 2011-09-04 03:12:20 UTC (rev 4676)
@@ -85,7 +85,11 @@
exit;
}
if (isset($_GET['DebtorNo'])) {
- $_SESSION['Items'.$identifier]->DebtorNo = $_GET['DebtorNo'];
+ $_SESSION['Items'.$identifier]->DebtorNo = $_GET['DebtorNo'];tcpdf.php line 5826:
+// header('Content-Type: application/force-download');
+// header('Content-Type: application/octet-stream',false);
+// header('Content-Type: application/download',false);
+
$_SESSION['Items'.$identifier]->Branch = $_GET['BranchNo'];
} else {
$_SESSION['Items'.$identifier]->Branch = $myrow['cashsalebranch'];
@@ -221,9 +225,9 @@
if (isset($_POST['Search']) or isset($_POST['Next']) or isset($_POST['Prev'])){
- if ($_POST['Keywords']!=='' AND $_POST['StockCode']=='') {
+ if ($_POST['Keywords']!='' AND $_POST['StockCode']=='') {
$msg='<div class="page_help_text">' . _('Item description has been used in search') . '.</div>';
- } else if ($_POST['StockCode']!=='' AND $_POST['Keywords']=='') {
+ } else if ($_POST['StockCode']!='' AND $_POST['Keywords']=='') {
$msg='<div class="page_help_text">' . _('Item Code has been used in search') . '.</div>';
} else if ($_POST['Keywords']=='' AND $_POST['StockCode']=='') {
$msg='<div class="page_help_text">' . _('Stock Category has been used in search') . '.</div>';
Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php 2011-09-03 11:07:57 UTC (rev 4675)
+++ trunk/SelectOrderItems.php 2011-09-04 03:12:20 UTC (rev 4676)
@@ -757,9 +757,9 @@
$msg ='';
if (isset($_POST['Search']) or isset($_POST['Next']) or isset($_POST['Prev'])){
- if ($_POST['Keywords']!=='' AND $_POST['StockCode']=='') {
+ if ($_POST['Keywords']!='' AND $_POST['StockCode']=='') {
$msg='</b><div class="page_help_text">' . _('Order Item description has been used in search') . '.</div>';
- } elseif ($_POST['StockCode']!=='' AND $_POST['Keywords']=='') {
+ } elseif ($_POST['StockCode']!='' AND $_POST['Keywords']=='') {
$msg='</b><div class="page_help_text">' . _('Stock Code has been used in search') . '.</div>';
} elseif ($_POST['Keywords']=='' AND $_POST['StockCode']=='') {
$msg='</b><div class="page_help_text">' . _('Stock Category has been used in search') . '.</div>';
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-09-03 11:07:57 UTC (rev 4675)
+++ trunk/doc/Change.log 2011-09-04 03:12:20 UTC (rev 4676)
@@ -1,5 +1,7 @@
webERP Change Log
+4/9/11 Marcos Skambraks: SelectOrderItems.php and CounterSales.php removed incorrect !== comparisons sh/been != comparisons
+4/9/11 Marcos Skambraks: modified tcpdf.php to just send the pdf header - was causing issues with apache fastcgi module
3/9/11 Ricard: Changed SelectProduct.php to show just current prices
3/9/11 Phil: Changed SelectCustomer to use %% around each parameter to use just a single SQL statement rather than several which ignored other inputs - as suggested by Marcos Skambraks
2/9/11 Phil: Made locale_number_format() as per Tim's instruction that displays numbers in the format of the locale in includes/LanguageSetup.php and replaced all occurrences of number_format() with locale_number_format()
@@ -14,7 +16,7 @@
21/8/11 Phil: Fixed bug that duplicated purchase order items when more than one item was added to an existing purchase order
21/8/11 Phil: BackupDatabase.php Delete link now deletes any backup files in the company directory in case any were left there before - as this is a serious security issue if files are left on the web-server
19/8/11 Phil: Fixed bug in Stocks.php should have used Date($_SESSION['DefaultDateFormat']) instead of Date('Y-m-d') inside GetPeriod function as pointed out by Ricard
-16/8/11 Tim: SelectCustomer.php fixed selection of customer where the first one was selected needed to kick off count at 0.
+16/8/11 Tim: SelectCustomer.php fixed selection of customer where the first one was selected needed /to kick off count at 0.
19/8/11 Phil: Remove redundant field stockmaster.lastcurcostdate
19/8/11 Ricard: Fine tuning formatting PDFStockNegatives.php
19/8/11 Carlos Urbieta Cabrera: security.png image was missing now added
Modified: trunk/includes/tcpdf/tcpdf.php
===================================================================
--- trunk/includes/tcpdf/tcpdf.php 2011-09-03 11:07:57 UTC (rev 4675)
+++ trunk/includes/tcpdf/tcpdf.php 2011-09-04 03:12:20 UTC (rev 4676)
@@ -5823,9 +5823,9 @@
header('Expires: Sat, 26 Jul 1997 05:00:00 GMT'); // Date in the past
header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
// force download dialog
- header('Content-Type: application/force-download');
- header('Content-Type: application/octet-stream', false);
- header('Content-Type: application/download', false);
+ //header('Content-Type: application/force-download');
+ //header('Content-Type: application/octet-stream', false);
+ //header('Content-Type: application/download', false);
header('Content-Type: application/pdf', false);
// use the Content-Disposition header to supply a recommended filename
header('Content-Disposition: attachment; filename="'.basename($name).'";');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
