Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[4667] trunk
|
From: <dai...@us...> - 2011-08-24 10:29:58
|
Revision: 4667
http://web-erp.svn.sourceforge.net/web-erp/?rev=4667&view=rev
Author: daintree
Date: 2011-08-24 10:29:52 +0000 (Wed, 24 Aug 2011)
Log Message:
-----------
Added buyername to be captured at order entry
Modified Paths:
--------------
trunk/DeliveryDetails.php
trunk/doc/Change.log
trunk/includes/DefineCartClass.php
Modified: trunk/DeliveryDetails.php
===================================================================
--- trunk/DeliveryDetails.php 2011-08-23 06:27:45 UTC (rev 4666)
+++ trunk/DeliveryDetails.php 2011-08-24 10:29:52 UTC (rev 4667)
@@ -187,6 +187,7 @@
$_SESSION['Items'.$identifier]->Quotation = $_POST['Quotation'];
} else {
$_SESSION['Items'.$identifier]->DeliverTo = $_POST['DeliverTo'];
+ $_SESSION['Items'.$identifier]->BuyerName = $_POST['BuyerName'];
$_SESSION['Items'.$identifier]->DelAdd1 = $_POST['BrAdd1'];
$_SESSION['Items'.$identifier]->DelAdd2 = $_POST['BrAdd2'];
$_SESSION['Items'.$identifier]->DelAdd3 = $_POST['BrAdd3'];
@@ -333,6 +334,7 @@
ordertype,
shipvia,
deliverto,
+ buyername,
deladd1,
deladd2,
deladd3,
@@ -354,10 +356,11 @@
'" . $_SESSION['Items'.$identifier]->Branch . "',
'". DB_escape_string($_SESSION['Items'.$identifier]->CustRef) ."',
'". DB_escape_string($_SESSION['Items'.$identifier]->Comments) ."',
- '" . Date("Y-m-d H:i") . "',
+ '" . Date('Y-m-d H:i') . "',
'" . $_SESSION['Items'.$identifier]->DefaultSalesType . "',
'" . $_POST['ShipVia'] ."',
'". DB_escape_string($_SESSION['Items'.$identifier]->DeliverTo) . "',
+ '" . DB_escape_string($_SESSION['Items'.$identifier]->BuyerName) . "',
'" . DB_escape_string($_SESSION['Items'.$identifier]->DelAdd1) . "',
'" . DB_escape_string($_SESSION['Items'.$identifier]->DelAdd2) . "',
'" . DB_escape_string($_SESSION['Items'.$identifier]->DelAdd3) . "',
@@ -717,6 +720,7 @@
quotedate = '" . FormatDateForSQL(DB_escape_string($_SESSION['Items'.$identifier]->QuoteDate)) . "',
confirmeddate = '" . FormatDateForSQL(DB_escape_string($_SESSION['Items'.$identifier]->ConfirmedDate)) . "',
deliverto = '" . DB_escape_string($_SESSION['Items'.$identifier]->DeliverTo) . "',
+ buyername = '" . DB_escape_string($_SESSION['Items'.$identifier]->BuyerName) . "',
deladd1 = '" . DB_escape_string($_SESSION['Items'.$identifier]->DelAdd1) . "',
deladd2 = '" . DB_escape_string($_SESSION['Items'.$identifier]->DelAdd2) . "',
deladd3 = '" . DB_escape_string($_SESSION['Items'.$identifier]->DelAdd3) . "',
@@ -881,13 +885,14 @@
/*Display the order without discount */
echo '<div class="centre"><b>' . _('Order Summary') . '</b></div>
- <table cellpadding=2 colspan=7 border=1><tr>
- <th>'. _('Item Description') .'</th>
- <th>'. _('Quantity') .'</th>
- <th>'. _('Unit') .'</th>
- <th>'. _('Price') .'</th>
- <th>'. _('Total') .'</th>
- </tr>';
+ <table cellpadding="2" colspan="7" border="1">
+ <tr>
+ <th>'. _('Item Description') .'</th>
+ <th>'. _('Quantity') .'</th>
+ <th>'. _('Unit') .'</th>
+ <th>'. _('Price') .'</th>
+ <th>'. _('Total') .'</th>
+ </tr>';
$_SESSION['Items'.$identifier]->total = 0;
$_SESSION['Items'.$identifier]->totalVolume = 0;
@@ -921,28 +926,33 @@
}
$DisplayTotal = number_format($_SESSION['Items'.$identifier]->total,$_SESSION['Items'.$identifier]->CurrDecimalPlaces);
- echo '<table class=selection><tr>
- <td>'. _('Total Weight') .':</td>
- <td>'.$DisplayWeight .'</td>
- <td>'. _('Total Volume') .':</td>
- <td>'.$DisplayVolume .'</td>
- </tr></table>';
+ echo '<table class="selection">
+ <tr>
+ <td>'. _('Total Weight') .':</td>
+ <td>'.$DisplayWeight .'</td>
+ <td>'. _('Total Volume') .':</td>
+ <td>'.$DisplayVolume .'</td>
+ </tr>
+ </table>';
$DisplayVolume = number_format($_SESSION['Items'.$identifier]->totalVolume,2);
$DisplayWeight = number_format($_SESSION['Items'.$identifier]->totalWeight,2);
- echo '<table class=selection><tr>
- <td>'. _('Total Weight') .':</td>
- <td>'. $DisplayWeight .'</td>
- <td>'. _('Total Volume') .':</td>
- <td>'. $DisplayVolume .'</td>
- </tr></table>';
+ echo '<table class="selection">
+ <tr>
+ <td>'. _('Total Weight') .':</td>
+ <td>'. $DisplayWeight .'</td>
+ <td>'. _('Total Volume') .':</td>
+ <td>'. $DisplayVolume .'</td>
+ </tr>
+ </table>';
}
-echo '<br /><table class=selection><tr>
- <td>'. _('Deliver To') .':</td>
- <td><input type="text" size=42 maxlength=40 name="DeliverTo" value="' . $_SESSION['Items'.$identifier]->DeliverTo . '"></td>
-</tr>';
+echo '<br /><table class="selection">
+ <tr>
+ <td>'. _('Deliver To') .':</td>
+ <td><input type="text" size=42 maxlength=40 name="DeliverTo" value="' . $_SESSION['Items'.$identifier]->DeliverTo . '"></td>
+ </tr>';
echo '<tr>
<td>'. _('Deliver from the warehouse at') .':</td>
@@ -995,6 +1005,11 @@
</tr>';
echo '<tr>
+ <td>'. _('Buyer Name') . ':</td>
+ <td><input type="text" size=30 maxlength=30 name="BuyerName" value="' . $_SESSION['Items'.$identifier]->BuyerName . '"></td>
+</tr>';
+
+echo '<tr>
<td>'. _('Delivery Address 1') . ':</td>
<td><input type="text" size=42 maxlength=40 name="BrAdd1" value="' . $_SESSION['Items'.$identifier]->DelAdd1 . '"></td>
</tr>';
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-08-23 06:27:45 UTC (rev 4666)
+++ trunk/doc/Change.log 2011-08-24 10:29:52 UTC (rev 4667)
@@ -1,5 +1,6 @@
webERP Change Log
+23/8/11 Phil: Added BuyerName to Delivery Details and the cart class
23/8/11 Ricard: PDFPrintLabel Does Not display discontinued items and now allows printing of future price labels
21/8/11 Phil: Fixed bug that duplicated purchase order items when more than one item was added to an existing purchase order
21/8/11 Phil: BackupDatabase.php Delete link now deletes any backup files in the company directory in case any were left there before - as this is a serious security issue if files are left on the web-server
Modified: trunk/includes/DefineCartClass.php
===================================================================
--- trunk/includes/DefineCartClass.php 2011-08-23 06:27:45 UTC (rev 4666)
+++ trunk/includes/DefineCartClass.php 2011-08-24 10:29:52 UTC (rev 4667)
@@ -59,6 +59,7 @@
Var $DeliveryDays;
var $TaxTotals;
var $TaxGLCodes;
+ var $BuyerName;
function Cart(){
/*Constructor function initialises a new shopping cart */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
