[Web-erp-svn] SF.net SVN: web-erp:[7819] trunk/CustomerBranches.php

[<ex...@us...>]

Revision: 7819
          http://sourceforge.net/p/web-erp/reponame/7819
Author:   exsonqu
Date:     2017-08-30 05:51:31 +0000 (Wed, 30 Aug 2017)
Log Message:
-----------
17/08/30 Exson: Fixed the default shipper does not work in CustomerBranches.php reported by Steven.

Modified Paths:
--------------
    trunk/CustomerBranches.php

Modified: trunk/CustomerBranches.php
===================================================================
--- trunk/CustomerBranches.php	2017-08-15 16:45:01 UTC (rev 7818)
+++ trunk/CustomerBranches.php	2017-08-30 05:51:31 UTC (rev 7819)
@@ -916,7 +916,7 @@
 			<td>' . _('Default freight/shipper method') . ':</td>
 			<td><select tabindex="21" name="DefaultShipVia">';
 	while ($myrow=DB_fetch_array($ShipperResults)){
-		if (isset($_POST['DefaultShipVia'])and $myrow['shipper_id']==$_POST['DefaultShipVia']) {
+		if ((isset($_POST['DefaultShipVia'])and $myrow['shipper_id']==$_POST['DefaultShipVia']) OR ($_SESSION['Default_Shipper'] == $myrow['shipper_id'])) {
 			echo '<option selected="selected" value="' . $myrow['shipper_id'] . '">' . $myrow['shippername'] . '</option>';
 		} else {
 			echo '<option value="' . $myrow['shipper_id'] . '">' . $myrow['shippername'] . '</option>';