From: <dai...@us...> - 2011-06-07 10:03:10
|
Revision: 4590 http://web-erp.svn.sourceforge.net/web-erp/?rev=4590&view=rev Author: daintree Date: 2011-06-07 10:03:04 +0000 (Tue, 07 Jun 2011) Log Message: ----------- various Modified Paths: -------------- trunk/EmailCustTrans.php trunk/doc/Change.log Modified: trunk/EmailCustTrans.php =================================================================== --- trunk/EmailCustTrans.php 2011-06-06 08:15:59 UTC (rev 4589) +++ trunk/EmailCustTrans.php 2011-06-07 10:03:04 UTC (rev 4590) @@ -1,9 +1,7 @@ <?php -/* $Revision: 1.8 $ */ + /* $Id$*/ -//$PageSecurity = 2; - include ('includes/session.inc'); include ('includes/SQL_CommonFunctions.inc'); @@ -19,13 +17,13 @@ if (isset($_POST['DoIt']) AND IsEmailAddress($_POST['EmailAddr'])){ if ($_SESSION['InvoicePortraitFormat']==0){ - echo "<meta http-equiv='Refresh' content='0; url=" . $rootpath . '/PrintCustTrans.php?' . SID . '&FromTransNo=' . $_POST['TransNo'] . '&PrintPDF=Yes&InvOrCredit=' . $_POST['InvOrCredit'] .'&Email=' . $_POST['EmailAddr'] . "'>"; + echo '<meta http-equiv="Refresh" content="0; url=' . $rootpath . '/PrintCustTrans.php?FromTransNo=' . $_POST['TransNo'] . '&PrintPDF=Yes&InvOrCredit=' . $_POST['InvOrCredit'] .'&Email=' . $_POST['EmailAddr'] . '">'; - prnMsg(_('The transaction should have been emailed off') . '. ' . _('If this does not happen') . ' (' . _('if the browser does not support META Refresh') . ')' . "<a href='" . $rootpath . '/PrintCustTrans.php?' . SID . '&FromTransNo=' . $_POST['FromTransNo'] . '&PrintPDF=Yes&InvOrCredit=' . $_POST['InvOrCredit'] .'&Email=' . $_POST['EmailAddr'] . "'>" . _('click here') . '</a> ' . _('to email the customer transaction'),'success'); + prnMsg(_('The transaction should have been emailed off') . '. ' . _('If this does not happen') . ' (' . _('if the browser does not support META Refresh') . ')' . '<a href="' . $rootpath . '/PrintCustTrans.php?FromTransNo=' . $_POST['FromTransNo'] . '&PrintPDF=Yes&InvOrCredit=' . $_POST['InvOrCredit'] .'&Email=' . $_POST['EmailAddr'] . '">' . _('click here') . '</a> ' . _('to email the customer transaction'),'success'); } else { - echo "<meta http-equiv='Refresh' content='0; url=" . $rootpath . '/PrintCustTransPortrait.php?' . SID . '&FromTransNo=' . $_POST['TransNo'] . '&PrintPDF=Yes&InvOrCredit=' . $_POST['InvOrCredit'] .'&Email=' . $_POST['EmailAddr'] . "'>"; + echo '<meta http-equiv="Refresh" content="0; url=' . $rootpath . '/PrintCustTransPortrait.php?FromTransNo=' . $_POST['TransNo'] . '&PrintPDF=Yes&InvOrCredit=' . $_POST['InvOrCredit'] .'&Email=' . $_POST['EmailAddr'] . '">'; - prnMsg(_('The transaction should have been emailed off. If this does not happen (perhaps the browser does not support META Refresh)') . '<a href="' . $rootpath . '/PrintCustTransPortrait.php?' . SID . '&FromTransNo=' . $_POST['FromTransNo'] . '&PrintPDF=Yes&InvOrCredit=' . $_POST['InvOrCredit'] .'&Email=' . $_POST['EmailAddr'] . '">' . _('click here') . '</a> ' . _('to email the customer transaction'),'success'); + prnMsg(_('The transaction should have been emailed off. If this does not happen (perhaps the browser does not support META Refresh)') . '<a href="' . $rootpath . '/PrintCustTransPortrait.php?FromTransNo=' . $_POST['FromTransNo'] . '&PrintPDF=Yes&InvOrCredit=' . $_POST['InvOrCredit'] .'&Email=' . $_POST['EmailAddr'] . '">' . _('click here') . '</a> ' . _('to email the customer transaction'),'success'); } exit; } elseif (isset($_POST['DoIt'])) { @@ -40,8 +38,8 @@ echo '<form action="' . $_SERVER['PHP_SELF'] . '" method=post>'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; -echo '<input type=hidden name="TransNo" VALUE="' . $_GET['FromTransNo'] . '">'; -echo '<input type=hidden name="InvOrCredit" VALUE="' . $_GET['InvOrCredit'] . '>'; +echo '<input type=hidden name="TransNo" value="' . $_GET['FromTransNo'] . '">'; +echo '<input type=hidden name="InvOrCredit" value="' . $_GET['InvOrCredit'] . '">'; echo '<br /><table>'; @@ -49,8 +47,8 @@ FROM custbranch INNER JOIN debtortrans ON custbranch.debtorno= debtortrans.debtorno AND custbranch.branchcode=debtortrans.branchcode - WHERE debtortrans.type=$TypeCode - AND debtortrans.transno=" .$_GET['FromTransNo']; + WHERE debtortrans.type='" . $TypeCode . "' + AND debtortrans.transno='" .$_GET['FromTransNo'] . "'"; $ErrMsg = _('There was a problem retrieving the contact details for the customer'); $ContactResult=DB_query($SQL,$db,$ErrMsg); @@ -63,10 +61,10 @@ } echo '<tr><td>' . _('Email') . ' ' . $_GET['InvOrCredit'] . ' ' . _('number') . ' ' . $_GET['FromTransNo'] . ' ' . _('to') . ':</td> - <td><input type=TEXT name="EmailAddr" maxlength=60 size=60 VALUE="' . $EmailAddress . '"></td> + <td><input type="text" name="EmailAddr" maxlength=60 size=60 value="' . $EmailAddress . '"></td> </table>'; -echo '<br><div class="centre"><input type=submit name="DoIt" VALUE="' . _('OK') . '">'; +echo '<br><div class="centre"><input type=submit name="DoIt" value="' . _('OK') . '">'; echo '</div></form>'; include ('includes/footer.inc'); ?> \ No newline at end of file Modified: trunk/doc/Change.log =================================================================== --- trunk/doc/Change.log 2011-06-06 08:15:59 UTC (rev 4589) +++ trunk/doc/Change.log 2011-06-07 10:03:04 UTC (rev 4590) @@ -1,5 +1,6 @@ webERP Change Log +7/6/11 Phil: EmailCustTrans.php missing closing quote off input hidden InvOrCredit value 6/6/11 Phil: Currencies table included 2 x in SQL for getting invoice details in Credit_Invoice.php 6/6/11 Phil: AddSerialItems.php from Stock Adjustment was not picking up single entries because of error in for loop condition fixed 5/6/11 Phil: BankMatching typo pprintf fixed This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |