|
From: <Ex...@us...> - 2012-02-24 10:35:25
|
Revision: 4967
http://web-erp.svn.sourceforge.net/web-erp/?rev=4967&view=rev
Author: ExsonQu
Date: 2012-02-24 10:35:15 +0000 (Fri, 24 Feb 2012)
Log Message:
-----------
Fixed bug that Warning message overlap with page header. Reported by James Dupin and Fixed by Exson
Modified Paths:
--------------
trunk/PO_Header.php
Modified: trunk/PO_Header.php
===================================================================
--- trunk/PO_Header.php 2012-02-24 10:09:32 UTC (rev 4966)
+++ trunk/PO_Header.php 2012-02-24 10:35:15 UTC (rev 4967)
@@ -306,6 +306,7 @@
prnMsg(_('Supplier name keywords have been used in preference to the supplier code extract entered'),'warn');
}
if ($_POST['Keywords']=='' AND $_POST['SuppCode']=='') {
+ echo '<div><br /><br /></div>';
prnMsg(_('At least one Supplier Name keyword OR an extract of a Supplier Code must be entered for the search'),'error');
} else {
if (mb_strlen($_POST['Keywords'])>0) {
@@ -1133,4 +1134,4 @@
echo '</form>';
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Ex...@us...> - 2012-02-24 10:35:25
|
Revision: 4967
http://web-erp.svn.sourceforge.net/web-erp/?rev=4967&view=rev
Author: ExsonQu
Date: 2012-02-24 10:35:15 +0000 (Fri, 24 Feb 2012)
Log Message:
-----------
Fixed bug that Warning message overlap with page header. Reported by James Dupin and Fixed by Exson
Modified Paths:
--------------
trunk/PO_Header.php
Modified: trunk/PO_Header.php
===================================================================
--- trunk/PO_Header.php 2012-02-24 10:09:32 UTC (rev 4966)
+++ trunk/PO_Header.php 2012-02-24 10:35:15 UTC (rev 4967)
@@ -306,6 +306,7 @@
prnMsg(_('Supplier name keywords have been used in preference to the supplier code extract entered'),'warn');
}
if ($_POST['Keywords']=='' AND $_POST['SuppCode']=='') {
+ echo '<div><br /><br /></div>';
prnMsg(_('At least one Supplier Name keyword OR an extract of a Supplier Code must be entered for the search'),'error');
} else {
if (mb_strlen($_POST['Keywords'])>0) {
@@ -1133,4 +1134,4 @@
echo '</form>';
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Ex...@us...> - 2012-04-26 09:16:27
|
Revision: 5283
http://web-erp.svn.sourceforge.net/web-erp/?rev=5283&view=rev
Author: ExsonQu
Date: 2012-04-26 09:16:16 +0000 (Thu, 26 Apr 2012)
Log Message:
-----------
04/26/2012 Exson: Fixed PO header that does not display user's default warehous when iusse a new PO in PO_Header.php.
Modified Paths:
--------------
trunk/PO_Header.php
Modified: trunk/PO_Header.php
===================================================================
--- trunk/PO_Header.php 2012-04-26 09:04:57 UTC (rev 5282)
+++ trunk/PO_Header.php 2012-04-26 09:16:16 UTC (rev 5283)
@@ -878,8 +878,8 @@
$LocnResult = DB_query($sql,$db);
while ($LocnRow=DB_fetch_array($LocnResult)){
- if (isset($_POST['StkLocation']) AND ($_POST['StkLocation'] == $LocnRow['loccode'] OR
- ($_POST['StkLocation']=='' AND $LocnRow['loccode']==$_SESSION['UserStockLocation']))){
+ if (isset($_POST['StkLocation']) AND ($_POST['StkLocation'] == $LocnRow['loccode']) OR
+ (empty($_POST['StkLocation']) AND $LocnRow['loccode']==$_SESSION['UserStockLocation'])){
echo '<option selected="selected" value="' . $LocnRow['loccode'] . '">' . $LocnRow['locationname'] . '</option>';
} else {
echo '<option value="' . $LocnRow['loccode'] . '">' . $LocnRow['locationname'] . '</option>';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Ex...@us...> - 2012-04-26 09:16:27
|
Revision: 5283
http://web-erp.svn.sourceforge.net/web-erp/?rev=5283&view=rev
Author: ExsonQu
Date: 2012-04-26 09:16:16 +0000 (Thu, 26 Apr 2012)
Log Message:
-----------
04/26/2012 Exson: Fixed PO header that does not display user's default warehous when iusse a new PO in PO_Header.php.
Modified Paths:
--------------
trunk/PO_Header.php
Modified: trunk/PO_Header.php
===================================================================
--- trunk/PO_Header.php 2012-04-26 09:04:57 UTC (rev 5282)
+++ trunk/PO_Header.php 2012-04-26 09:16:16 UTC (rev 5283)
@@ -878,8 +878,8 @@
$LocnResult = DB_query($sql,$db);
while ($LocnRow=DB_fetch_array($LocnResult)){
- if (isset($_POST['StkLocation']) AND ($_POST['StkLocation'] == $LocnRow['loccode'] OR
- ($_POST['StkLocation']=='' AND $LocnRow['loccode']==$_SESSION['UserStockLocation']))){
+ if (isset($_POST['StkLocation']) AND ($_POST['StkLocation'] == $LocnRow['loccode']) OR
+ (empty($_POST['StkLocation']) AND $LocnRow['loccode']==$_SESSION['UserStockLocation'])){
echo '<option selected="selected" value="' . $LocnRow['loccode'] . '">' . $LocnRow['locationname'] . '</option>';
} else {
echo '<option value="' . $LocnRow['loccode'] . '">' . $LocnRow['locationname'] . '</option>';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rc...@us...> - 2013-06-17 15:12:20
|
Revision: 6028
http://sourceforge.net/p/web-erp/reponame/6028
Author: rchacon
Date: 2013-06-17 15:12:18 +0000 (Mon, 17 Jun 2013)
Log Message:
-----------
Adjust warehouse and supplier addresses maxlength.
Modified Paths:
--------------
trunk/PO_Header.php
Modified: trunk/PO_Header.php
===================================================================
--- trunk/PO_Header.php 2013-06-16 04:12:54 UTC (rev 6027)
+++ trunk/PO_Header.php 2013-06-17 15:12:18 UTC (rev 6028)
@@ -363,8 +363,8 @@
if ((!isset($_POST['SearchSuppliers']) or $_POST['SearchSuppliers'] == '') AND (isset($_SESSION['PO' . $identifier]->SupplierID) AND $_SESSION['PO' . $identifier]->SupplierID != '')) {
- /*The session variables are set but the form variables could have been lost
- * need to restore the form variables from the session */
+ /* The session variables are set but the form variables could have been lost
+ need to restore the form variables from the session */
$_POST['SupplierID'] = $_SESSION['PO' . $identifier]->SupplierID;
$_POST['SupplierName'] = $_SESSION['PO' . $identifier]->SupplierName;
$_POST['CurrCode'] = $_SESSION['PO' . $identifier]->CurrCode;
@@ -983,11 +983,11 @@
</tr>
<tr>
<td>' . _('Address') . ' 4 :</td>
- <td><input type="text" name="DelAdd4" size="21" maxlength="20" value="' . $_POST['DelAdd4'] . '" /></td>
+ <td><input type="text" name="DelAdd4" size="41" maxlength="40" value="' . $_POST['DelAdd4'] . '" /></td>
</tr>
<tr>
<td>' . _('Address') . ' 5 :</td>
- <td><input type="text" name="DelAdd5" size="16" maxlength="15" value="' . $_POST['DelAdd5'] . '" /></td>
+ <td><input type="text" name="DelAdd5" size="21" maxlength="20" value="' . $_POST['DelAdd5'] . '" /></td>
</tr>
<tr>
<td>' . _('Address') . ' 6 :</td>
@@ -1071,9 +1071,13 @@
</tr>
<tr>
<td>' . _('Address') . ' 5 :</td>
- <td><input type="text" name="SuppDelAdd5" size="41" maxlength="40" value="' . $_POST['SuppDelAdd5'] . '" /></td>
+ <td><input type="text" name="SuppDelAdd5" size="41" maxlength="20" value="' . $_POST['SuppDelAdd5'] . '" /></td>
</tr>
<tr>
+ <td>' . _('Address') . ' 6 :</td>
+ <td><input type="text" name="SuppDelAdd5" size="16" maxlength="15" value="' . $_POST['SuppDelAdd6'] . '" /></td>
+ </tr>
+ <tr>
<td>' . _('Phone') . ':</td>
<td><input type="text" name="SuppTel" size="31" maxlength="30" value="' . $_SESSION['PO' . $identifier]->SuppTel . '" /></td>
</tr>';
|
|
From: <ex...@us...> - 2014-06-09 01:44:42
|
Revision: 6744
http://sourceforge.net/p/web-erp/reponame/6744
Author: exsonqu
Date: 2014-06-09 01:44:38 +0000 (Mon, 09 Jun 2014)
Log Message:
-----------
09/06/2014 Exson: Fixed the Delivery Date lossing bugs when change Warehouse. Reported by akits from minghao.hk(weberp) bbs.
Modified Paths:
--------------
trunk/PO_Header.php
Modified: trunk/PO_Header.php
===================================================================
--- trunk/PO_Header.php 2014-06-02 03:40:49 UTC (rev 6743)
+++ trunk/PO_Header.php 2014-06-09 01:44:38 UTC (rev 6744)
@@ -382,7 +382,9 @@
$_POST['SuppDelAdd4'] = $_SESSION['PO' . $identifier]->SuppDelAdd4;
$_POST['SuppDelAdd5'] = $_SESSION['PO' . $identifier]->SuppDelAdd5;
$_POST['SuppDelAdd6'] = $_SESSION['PO' . $identifier]->SuppDelAdd6;
- $_POST['DeliveryDate'] = $_SESSION['PO' . $identifier]->DeliveryDate;
+ if(!isset($_POST['DeliveryDate'])){
+ $_POST['DeliveryDate'] = $_SESSION['PO' . $identifier]->DeliveryDate;
+ }
}
@@ -1171,4 +1173,4 @@
echo '</div>
</form>';
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
|
|
From: <ex...@us...> - 2014-07-27 00:27:11
|
Revision: 6795
http://sourceforge.net/p/web-erp/reponame/6795
Author: exsonqu
Date: 2014-07-27 00:27:04 +0000 (Sun, 27 Jul 2014)
Log Message:
-----------
27/07/14 Exson: Fixed the PO header lost initiator bugs when locations changed. Report by Akits from www.minghao.hk/bbs/.
Modified Paths:
--------------
trunk/PO_Header.php
Modified: trunk/PO_Header.php
===================================================================
--- trunk/PO_Header.php 2014-07-26 01:01:16 UTC (rev 6794)
+++ trunk/PO_Header.php 2014-07-27 00:27:04 UTC (rev 6795)
@@ -767,6 +767,9 @@
$_POST['InitiatorName'] = $_SESSION['UsersRealName'];
$_POST['Requisition'] = '';
}
+ if (!isset($_POST['InitiatorName'])){
+ $_POST['InitiatorName'] = $_SESSION['UsersRealName'];
+ }
echo '<tr>
<td>' . _('Initiated By') . ':</td>
@@ -1173,4 +1176,4 @@
echo '</div>
</form>';
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
|
|
From: <ex...@us...> - 2014-09-30 08:54:37
|
Revision: 6903
http://sourceforge.net/p/web-erp/reponame/6903
Author: exsonqu
Date: 2014-09-30 08:54:33 +0000 (Tue, 30 Sep 2014)
Log Message:
-----------
30/09/14 Exson: Fixed the purchase order details status to be right when the PO is recovered from Cancelled status.
Modified Paths:
--------------
trunk/PO_Header.php
Modified: trunk/PO_Header.php
===================================================================
--- trunk/PO_Header.php 2014-09-29 10:54:14 UTC (rev 6902)
+++ trunk/PO_Header.php 2014-09-30 08:54:33 UTC (rev 6903)
@@ -154,6 +154,9 @@
if ($_POST['Status']=='Completed' OR $_POST['Status']=='Cancelled' OR $_POST['Status']=='Rejected') {
$SQL = "UPDATE purchorderdetails SET completed=1 WHERE orderno='" . $_SESSION['ExistingOrder'] . "'";
$UpdateResult =DB_query($SQL,$db,$ErrMsg);
+ } else {//To ensure that the purchorderdetails status is correct when it is recovered from a cancelled orders
+ $SQL = "UPDATE purchorderdetails SET completed=0 WHERE orderno='" . $_SESSION['ExistingOrder'] . "'";
+ $UpdateResult = DB_query($SQL,$db,$ErrMsg);
}
} //$OKToUpdateStatus == 1
} //end if there is actually a status change the class Status != the POST['Status']
|
|
From: <tu...@us...> - 2015-02-23 02:59:20
|
Revision: 7174
http://sourceforge.net/p/web-erp/reponame/7174
Author: turbopt
Date: 2015-02-23 02:59:13 +0000 (Mon, 23 Feb 2015)
Log Message:
-----------
change input name reference: SuppDelAdd5 was duplicated, made the 2nd one SuppDelAdd6.
Modified Paths:
--------------
trunk/PO_Header.php
Modified: trunk/PO_Header.php
===================================================================
--- trunk/PO_Header.php 2015-02-22 19:45:21 UTC (rev 7173)
+++ trunk/PO_Header.php 2015-02-23 02:59:13 UTC (rev 7174)
@@ -1104,7 +1104,7 @@
</tr>
<tr>
<td>' . _('Address') . ' 6 :</td>
- <td><input type="text" name="SuppDelAdd5" size="16" maxlength="15" value="' . $_POST['SuppDelAdd6'] . '" /></td>
+ <td><input type="text" name="SuppDelAdd6" size="16" maxlength="15" value="' . $_POST['SuppDelAdd6'] . '" /></td>
</tr>
<tr>
<td>' . _('Phone') . ':</td>
|
|
From: <ex...@us...> - 2015-03-09 02:30:59
|
Revision: 7210
http://sourceforge.net/p/web-erp/reponame/7210
Author: exsonqu
Date: 2015-03-09 02:30:52 +0000 (Mon, 09 Mar 2015)
Log Message:
-----------
09/03/15 Exson: Fixed undefined index noise of $_POST['SupplierContact'] in PO_Header.php.
Modified Paths:
--------------
trunk/PO_Header.php
Modified: trunk/PO_Header.php
===================================================================
--- trunk/PO_Header.php 2015-03-08 22:44:47 UTC (rev 7209)
+++ trunk/PO_Header.php 2015-03-09 02:30:52 UTC (rev 7210)
@@ -195,7 +195,7 @@
* ensure session variables updated then meta refresh to PO_Items.php*/
$_SESSION['PO' . $identifier]->Location = $_POST['StkLocation'];
- $_SESSION['PO' . $identifier]->SupplierContact = $_POST['SupplierContact'];
+ $_SESSION['PO' . $identifier]->SupplierContact = isset($_POST['SupplierContact'])?$_POST['SupplierContact']:'';
$_SESSION['PO' . $identifier]->DelAdd1 = $_POST['DelAdd1'];
$_SESSION['PO' . $identifier]->DelAdd2 = $_POST['DelAdd2'];
$_SESSION['PO' . $identifier]->DelAdd3 = $_POST['DelAdd3'];
|
|
From: <ex...@us...> - 2015-12-24 07:01:46
|
Revision: 7419
http://sourceforge.net/p/web-erp/reponame/7419
Author: exsonqu
Date: 2015-12-24 07:01:43 +0000 (Thu, 24 Dec 2015)
Log Message:
-----------
2015/12/24 Exson: Add Completed option for PO printed to allowed the order details can be completed in PO_Header.php.
Modified Paths:
--------------
trunk/PO_Header.php
Modified: trunk/PO_Header.php
===================================================================
--- trunk/PO_Header.php 2015-12-20 00:49:16 UTC (rev 7418)
+++ trunk/PO_Header.php 2015-12-24 07:01:43 UTC (rev 7419)
@@ -846,7 +846,8 @@
case 'Printed':
echo '<option value="Pending">' . _('Pending') . '</option>
<option selected="selected" value="Printed">' . _('Printed') . '</option>
- <option value="Cancelled">' . _('Cancelled') . '</option>';
+ <option value="Cancelled">' . _('Cancelled') . '</option>
+ <option value="Completed">' . _('Completed') . '</option>';
break;
case 'Completed':
echo '<option selected="selected" value="Completed">' . _('Completed') . '</option>';
|