Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[4499] trunk
|
From: <dai...@us...> - 2011-02-27 04:53:41
|
Revision: 4499
http://web-erp.svn.sourceforge.net/web-erp/?rev=4499&view=rev
Author: daintree
Date: 2011-02-27 04:53:34 +0000 (Sun, 27 Feb 2011)
Log Message:
-----------
Delete Units of measure fix as reported by Exson
Modified Paths:
--------------
trunk/UnitsOfMeasure.php
trunk/doc/Change.log.html
trunk/doc/Manual/ManualContributors.html
Modified: trunk/UnitsOfMeasure.php
===================================================================
--- trunk/UnitsOfMeasure.php 2011-02-25 21:15:29 UTC (rev 4498)
+++ trunk/UnitsOfMeasure.php 2011-02-27 04:53:34 UTC (rev 4499)
@@ -1,8 +1,6 @@
<?php
/* $Id$*/
-//$PageSecurity = 15;
-
include('includes/session.inc');
$title = _('Units Of Measure');
@@ -141,19 +139,10 @@
prnMsg( _('Cannot delete this unit of measure because inventory items have been created using this unit of measure'),'warn');
echo '<br>' . _('There are') . ' ' . $myrow[0] . ' ' . _('inventory items that refer to this unit of measure') . '</font>';
} else {
- $sql= "SELECT COUNT(*) FROM contracts WHERE units ".LIKE." '" . $OldMeasureName . "'";
+ $sql="DELETE FROM unitsofmeasure WHERE unitname ".LIKE."'" . $OldMeasureName . "'";
$result = DB_query($sql,$db);
- $myrow = DB_fetch_row($result);
- if ($myrow[0]>0) {
- prnMsg( _('Cannot delete this unit of measure because contracts have been created using this unit of measure'),'warn');
- echo '<br>' . _('There are') . ' ' . $myrow[0] . ' ' . _('contracts that refer to this unit of measure') . '</font>';
- } else {
- $sql="DELETE FROM unitsofmeasure WHERE unitname ".LIKE."'" . $OldMeasureName . "'";
- $result = DB_query($sql,$db);
- prnMsg( $OldMeasureName . ' ' . _('unit of measure has been deleted') . '!','success');
- }
+ prnMsg( $OldMeasureName . ' ' . _('unit of measure has been deleted') . '!','success');
}
-
} //end if account group used in GL accounts
unset ($SelectedMeasureID);
unset ($_GET['SelectedMeasureID']);
Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html 2011-02-25 21:15:29 UTC (rev 4498)
+++ trunk/doc/Change.log.html 2011-02-27 04:53:34 UTC (rev 4499)
@@ -1,5 +1,6 @@
<p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
<p>
+<p>27/2/11: Phil fix units deletion issue reported by Exson in UnitsOfMeasure.php script - checked for none existant units field in contracts table - removed the check</p>
<p>22/2/11: Phil fix PDFTopItems.php for changed variable names - now using CamelCase tried to rework to conform</p>
<p>22/2/11: Phil remove options for PDFLanguage that are not unique in WWW_Users.php - make it default to the users settings in the SESSION for UserSettings.php</p>
<p>18/2/11: Phil/Don Change PageSecurity array variable name to PageSecurityArray - caused problems with conflict with PageSecurity variable where register_globals = on; </p>
Modified: trunk/doc/Manual/ManualContributors.html
===================================================================
--- trunk/doc/Manual/ManualContributors.html 2011-02-25 21:15:29 UTC (rev 4498)
+++ trunk/doc/Manual/ManualContributors.html 2011-02-27 04:53:34 UTC (rev 4499)
@@ -1,185 +1,187 @@
-<br><br>
+<br /><br />
<a name="Contributors"><font size="+3"><b>Contributors - Acknowledgements</b></font></a>
-<br><br>
+<br /><br />
The following is a list of known contributors. Many of these people can usually be contacted by posting
to the appropriate mailing list.
-<br><br>
+<br /><br />
<table width="100%">
<tr>
<td width="50%" valign="top">
<b>Development (sorted by last name)</b>
-<br><br>
+<br /><br />
Nicola Asuni (TCPDF)
-<br><br>
+<br /><br />
Shane Barnaby
-<br><br>
+<br /><br />
Chris Bice
-<br><br>
+<br /><br />
Danie Brink
-<br><br>
+<br /><br />
Phil Daintree
-<br><br>
+<br /><br />
Murray Dancey
-<br><br>
+<br /><br />
Gilles Deacur
-<br><br>
+<br /><br />
Miguel de Benito Delgado (phplot)
-<br><br>
+<br /><br />
Javier de Lorenzo-Cáceres
-<br><br>
+<br /><br />
Janusz Dobrowolski
-<br><br>
+<br /><br />
Edd Dumbill (phpxmlrpc)
-<br><br>
+<br /><br />
Tom Fox
-<br><br>
+<br /><br />
Braian Gomez
-<br><br>
+<br /><br />
Lindsay Harris
-<br><br>
+<br /><br />
David Hawke
-<br><br>
+<br /><br />
Richard Heyes (html.mime.mail)
-<br><br>
+<br /><br />
Hindra Joshua
-<br><br>
+<br /><br />
Alan Jones
-<br><br>
+<br /><br />
Steve Kaill - bugfixes
-<br><br>
+<br /><br />
Nico Kaiser (php-gettext)
-<br><br>
+<br /><br />
Mo Kelly - due dates and customer po by sales order line
-<br><br>
+<br /><br />
Meraj Khattak - database diagram
-<br><br>
+<br /><br />
Steve Kitchen
-<br><br>
+<br /><br />
Ditesh Kumar
-<br><br>
+<br /><br />
David Luo
-<br><br>
+<br /><br />
Wayne McDougall
-<br><br>
+<br /><br />
Greg Morehead
-<br><br>
+<br /><br />
Clay Mokus
-<br><br>
+<br /><br />
Suren Naidu
-<br><br>
+<br /><br />
Hani Naguib
-<br><br>
+<br /><br />
Harold Naparst
-<br><br>
+<br /><br />
Sherif Omar
-<br><br>
+<br /><br />
Simon Peter Otandeka
-<br><br>
+<br /><br />
Afan Ottenheimer (phplot)
-<br><br>
+<br /><br />
Ricardo Pedroso
-<br><br>
+<br /><br />
Jesse Peterson
-<br><br>
+<br /><br />
Kalmer Piiskop
-<br><br>
+<br /><br />
Olivier Plathey (FPDF - from which TCPDF was derived)
-<br><br>
+<br /><br />
Renier du Plessis
-<BR><BR>
+<br /><br />
Dave Premo (report writer)
-<BR><BR>
+<br /><br />
+Exson Qu
+<br /><br />
Pak Ricard
-<BR><BR>
+<br /><br />
Harald Ringehahn
-<BR><BR>
+<br /><br />
Gunnar Rikardsson
-<BR><BR>
+<br /><br />
Scott Rosa
-<br><br>
+<br /><br />
Tim Schofield
-<br><br>
+<br /><br />
Jurgen Schopenhouer
-<br><br>
+<br /><br />
Danilo Segan (php-gettext)
-<BR><BR>
+<br /><br />
Gjergj Sheldija
-<br><br>
+<br /><br />
Matthew Sibson
-<BR><BR>
+<br /><br />
Vitaliy Shevkunov
-<br><br>
+<br /><br />
Jake Stride
-<br><br>
+<br /><br />
Matt Taylor
-<BR><BR>
+<br /><br />
Paul Thursby
-<br><br>
+<br /><br />
Marcos Garcia Trejo
-<br><br>
+<br /><br />
Mark Yeager (MRP)
-<br><br>
+<br /><br />
Zhiguo Yuan
</td>
<td valign="top">
<b>Translation </b>
-<br><br>
+<br /><br />
Csillag Péter Hungarian
-<br><br>
+<br /><br />
Danu Satrio Pratomo Djojosoemarto and his cousin - Indonesian
-<br><br>
+<br /><br />
Janusz Dobrowolski - Polish
-<br><br>
+<br /><br />
Matt Elbrecht - Estonian
-<br><br>
+<br /><br />
Igor Felix - Portuguese Brazilian
-<br><br>
+<br /><br />
Karel van der Esch - Dutch
-<br><br>
+<br /><br />
Thiago Figueiredo - Portuguese
-<br><br>
+<br /><br />
Romel Den - Chinese Traditional - UTF-8
-<br><br>
+<br /><br />
Thiago Mansinho de Lima - Portuguese Brazilian
-<br><br>
+<br /><br />
Roberto del Pino - Spanish
-<br><br>
+<br /><br />
Alejandro E Fernández E Spanish (Venezuelan)
-<br><br>
+<br /><br />
Javier de Lorenzo-Cáceres - Spanish
-<br><br>
+<br /><br />
Juan L Grassi - Spanish
-<br><br>
+<br /><br />
Tanya Komarova - Russian
-<br><br>
+<br /><br />
Eddie Molina - Spanish
-<br><br>
-Exson Qu - Chinese
-<br><br>
+<br /><br />
+Exson Qu - Chinese (and Manual)
+<br /><br />
J. Hernán Ramírez R. - Spanish (Venezuelan)
-<br><br>
+<br /><br />
Harald Ringehahn - German
-<br><br>
+<br /><br />
Manel Sanchez Maulini - Spanish
-<br><br>
+<br /><br />
Melvin Sequera - Spanish
-<br><br>
+<br /><br />
Efren Yevale - Spanish
-<br><br>
+<br /><br />
Carlos F. Castillo - Spanish
-<br><br>
+<br /><br />
Wilson Almeida - Spanish
-<br><br>
+<br /><br />
Carlos Vera - Spanish
-<BR><BR>
+<br /><br />
Zhiguo Yuan - Chinese
-<BR><BR>
+<br /><br />
</td>
</tr>
</table>
-<br>
+<br />
Some Icons sourced via Creative Commons Attribution 2.5 License. http://www.famfamfam.com/lab/icons/silk/
-<br>
-<br>
+<br />
+<br />
If anyone has been overlooked or should have their entry modified please email in...@we...
-<br><br>
+<br /><br />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
