From: <tim...@us...> - 2010-03-01 07:43:32
|
Revision: 3359 http://web-erp.svn.sourceforge.net/web-erp/?rev=3359&view=rev Author: tim_schofield Date: 2010-03-01 07:43:25 +0000 (Mon, 01 Mar 2010) Log Message: ----------- Harald: PcExpensesTypeTabv.php - Missing Gettext function Modified Paths: -------------- trunk/PcExpensesTypeTab.php trunk/doc/Change.log.html Modified: trunk/PcExpensesTypeTab.php =================================================================== --- trunk/PcExpensesTypeTab.php 2010-03-01 07:38:49 UTC (rev 3358) +++ trunk/PcExpensesTypeTab.php 2010-03-01 07:43:25 UTC (rev 3359) @@ -38,7 +38,7 @@ $checkresult = DB_query($checkSql,$db); $checkrow = DB_fetch_row($checkresult); - + if ( $checkrow[0] >0) { $InputError = 1; prnMsg( _('The Expense ') . $_POST['codeexpense'] . _(' already exist in this Type of Tab.'),'error'); @@ -52,7 +52,7 @@ VALUES ('" . $_POST['SelectedTabs'] . "', '" . $_POST['SelectedExpense'] . "')"; - $msg = _('Expense code:') . ' ' . $_POST["SelectedExpense"].' for Type of Tab:' . $_POST["SelectedTabs"] . ' ' . _('has been created'); + $msg = _('Expense code:') . ' ' . $_POST["SelectedExpense"].' '._('for Type of Tab:') . $_POST["SelectedTabs"] . ' ' . _('has been created'); $checkSql = "SELECT count(typetabcode) FROM pctypetabs"; $result = DB_query($checkSql, $db); @@ -65,14 +65,14 @@ //run the SQL from either of the above possibilites $result = DB_query($sql,$db); prnMsg($msg,'success'); - + unset($_POST['SelectedExpense']); } } elseif ( isset($_GET['delete']) ) { - $sql="DELETE FROM pctabexpenses + $sql="DELETE FROM pctabexpenses WHERE typetabcode='$SelectedTabs' AND codeexpense='$SelectedType'"; $ErrMsg = _('The Tab Type record could not be deleted because'); @@ -81,7 +81,7 @@ unset ($SelectedType); unset($_GET['delete']); - + } if (!isset($SelectedTabs)){ @@ -109,31 +109,31 @@ echo "<option VALUE='"; } echo $myrow['typetabcode'] . "'>" . $myrow['typetabcode'] . ' - ' . $myrow['typetabdescription']; - - } //end while loop - + + } //end while loop + echo '</select></td></tr>'; - + echo '</table>'; // close table in first column echo '</td></tr></table>'; // close main table echo '<p><div class="centre"><input type=submit name=process VALUE="' . _('Accept') . '"><input type=submit name=Cancel VALUE="' . _('Cancel') . '"></div>'; - + echo '</form>'; } //end of ifs and buts! if (isset($_POST['process'])OR isset($SelectedTabs)) { - + echo '<p><div class="centre"><a href="' . $_SERVER['PHP_SELF'] . '?' . SID . '">' . _('Expense Codes for Type of Tab ') . '' .$SelectedTabs. '<a/></div><p>'; - + $sql = "SELECT pctabexpenses.codeexpense, pcexpenses.description FROM pctabexpenses,pcexpenses WHERE pctabexpenses.codeexpense=pcexpenses.codeexpense AND pctabexpenses.typetabcode='$SelectedTabs' ORDER BY pctabexpenses.codeexpense ASC"; - + $result = DB_query($sql,$db); echo '<br><table BORDER=1>'; @@ -164,10 +164,10 @@ } //END WHILE LIST LOOP echo '</table>'; - - - - + + + + if (! isset($_GET['delete'])) { echo "<form method='post' action=" . $_SERVER['PHP_SELF'] . '?' . SID . '>'; @@ -191,14 +191,14 @@ echo "<option VALUE='"; } echo $myrow['codeexpense'] . "'>" . $myrow['codeexpense'] . ' - ' . $myrow['description']; - - } //end while loop - + + } //end while loop + echo '</select></td></tr>'; - - + + echo "<input type=hidden name='SelectedTabs' VALUE=" . $SelectedTabs . ">"; - + echo '</table>'; // close table in first column echo '</td></tr></table>'; // close main table @@ -207,8 +207,8 @@ echo '</form>'; } // end if user wish to delete - - + + } Modified: trunk/doc/Change.log.html =================================================================== --- trunk/doc/Change.log.html 2010-03-01 07:38:49 UTC (rev 3358) +++ trunk/doc/Change.log.html 2010-03-01 07:43:25 UTC (rev 3359) @@ -1,6 +1,7 @@ <p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p> <p></p> -<p>01/03/10 Tim: PcUathorizeExpenses.php - Remove blank line at the start of file, and correct for instance where $SelectedTabs is not set</p> +<p>01/03/10 Harald: PcExpensesTypeTabv.php - Missing Gettext function</p> +<p>01/03/10 Tim: PcAuthorizeExpenses.php - Remove blank line at the start of file, and correct for instance where $SelectedTabs is not set</p> <p>20/02/10 Lindsay: Bug fix and better description for API functions for SalesInvoiceEntry/Modify</p> <p>19/02/10 Lindsay: Bug fixing to make SalesOrder entry work for old and new API.</p> <p>18/02/10 Lindsay: API: date formatting in api_salesorders.php; added FormatDateWithTimeForSQL function to includes/DateFunctions.inc This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |