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

[<vv...@us...>]

Revision: 7213
          http://sourceforge.net/p/web-erp/reponame/7213
Author:   vvs2012
Date:     2015-03-09 20:53:48 +0000 (Mon, 09 Mar 2015)
Log Message:
-----------
Page refresh when credit type changes in Credit_Invoce.php

Modified Paths:
--------------
    trunk/Credit_Invoice.php
    trunk/doc/Change.log

Modified: trunk/Credit_Invoice.php
===================================================================
--- trunk/Credit_Invoice.php	2015-03-09 04:20:16 UTC (rev 7212)
+++ trunk/Credit_Invoice.php	2015-03-09 20:53:48 UTC (rev 7213)
@@ -166,7 +166,7 @@
 														$myrow['controlled'],
 														$myrow['serialised'],
 														$myrow['decimalplaces'],
-														$myrow['narrative'],
+														str_replace("\\r\\n", " ", $myrow['narrative']),
 														'No',
 														-1,
 														$myrow['taxcatid'],
@@ -275,13 +275,12 @@
 NB QtyDispatched in the LineItems array is used for the quantity to credit */
 echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/credit.png" title="' . _('Search') . '" alt="" />' . $Title . '</p>';
 
+echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier=' . $identifier . '" method="post">';
+echo '<div>';
+echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+
 if(!isset($_POST['ProcessCredit'])) {
 
-	echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier=' . $identifier . '" method="post">';
-    echo '<div>';
-	echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-
-
 	echo '<table cellpadding="2" class="selection">';
 	echo '<tr><th colspan="13">';
 	echo '<div class="centre"><b>' . _('Credit Invoice') . ' ' . $_SESSION['ProcessingCredit'] . '</b>
@@ -1517,7 +1516,7 @@
 		<table class="selection">
 		<tr>
 			<td>' . _('Credit Note Type') . '</td>
-			<td><select name="CreditType" tabindex="'.$tabindex++.'">';
+			<td><select name="CreditType" tabindex="'.$tabindex++.'" onchange="ReloadForm(Update)">';
 
 	if(!isset($_POST['CreditType']) OR $_POST['CreditType']=='Return') {
 		echo '<option selected="selected" value="Return">' . _('Goods returned to store') . '</option>';

Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log	2015-03-09 04:20:16 UTC (rev 7212)
+++ trunk/doc/Change.log	2015-03-09 20:53:48 UTC (rev 7213)
@@ -1,5 +1,6 @@
 webERP Change Log
 
+09/03/15 Vitaly: Page refresh when credit type changes in Credit_Invoce.php
 09/03/15 RChacon: In DailyBankTransactions.php: Improves page_title_text. Orders by banktrans.transdate ascending and banktrans.banktransid ascending. Adds division to identify the report block. Groups table-header cells inside thead tags. Groups table-data cells inside tbody tags. Adds th.text class to left align. Adds "Print This" and "Return" buttons with icon.
 09/03/15 Exson: Fixed undefined index noise of $_POST['SupplierContact'] in PO_Header.php. 
 08/03/15 Vitaly: Fit HTML view of invoices to one screen