Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[6693] trunk
|
From: <aga...@us...> - 2014-04-24 13:57:08
|
Revision: 6693
http://sourceforge.net/p/web-erp/reponame/6693
Author: agaluski
Date: 2014-04-24 13:57:05 +0000 (Thu, 24 Apr 2014)
Log Message:
-----------
Add new DB Table to store customer items. Added new script to maintain customer items. Added call to CustItem.php in SelectProduct.php. Added option to show only Customer Items for selected customer in SelectOrderItems.php while creating a new order
Modified Paths:
--------------
trunk/SelectOrderItems.php
trunk/SelectProduct.php
trunk/sql/mysql/upgrade4.11-4.12.sql
Added Paths:
-----------
trunk/CustItem.php
Added: trunk/CustItem.php
===================================================================
--- trunk/CustItem.php (rev 0)
+++ trunk/CustItem.php 2014-04-24 13:57:05 UTC (rev 6693)
@@ -0,0 +1,479 @@
+<?php
+/* $Id: CustItem.php 1 2014-04-23 05:10:46Z agaluski $*/
+
+include ('includes/session.inc');
+
+$Title = _('Customer Item Data');
+
+include ('includes/header.inc');
+
+if (isset($_GET['DebtorNo'])) {
+ $DebtorNo = trim(mb_strtoupper($_GET['DebtorNo']));
+} elseif (isset($_POST['DebtorNo'])) {
+ $DebtorNo = trim(mb_strtoupper($_POST['DebtorNo']));
+}
+
+if (isset($_GET['StockID'])) {
+ $StockID = trim(mb_strtoupper($_GET['StockID']));
+} elseif (isset($_POST['StockID'])) {
+ $StockID = trim(mb_strtoupper($_POST['StockID']));
+}
+
+if (isset($_GET['Edit'])) {
+ $Edit = true;
+} elseif (isset($_POST['Edit'])) {
+ $Edit = true;
+} else {
+ $Edit = false;
+}
+
+if (isset($_POST['StockUOM'])) {
+ $StockUOM=$_POST['StockUOM'];
+}
+
+$NoCustItemData=0;
+
+echo '<a href="' . $RootPath . '/SelectProduct.php">' . _('Back to Items') . '</a><br />';
+
+if (isset($_POST['cust_description'])) {
+ $_POST['cust_description'] = trim($_POST['cust_description']);
+}
+if (isset($_POST['cust_part'])) {
+ $_POST['cust_part'] = trim($_POST['cust_part']);
+}
+
+if ((isset($_POST['AddRecord']) OR isset($_POST['UpdateRecord'])) AND isset($DebtorNo)) { /*Validate Inputs */
+ $InputError = 0; /*Start assuming the best */
+
+ if ($StockID == '' OR !isset($StockID)) {
+ $InputError = 1;
+ prnMsg(_('There is no stock item set up enter the stock code or select a stock item using the search page'), 'error');
+ }
+
+ if (!is_numeric(filter_number_format($_POST['ConversionFactor']))) {
+ $InputError = 1;
+ unset($_POST['ConversionFactor']);
+ prnMsg(_('The conversion factor entered was not numeric') . ' (' . _('a number is expected') . '). ' . _('The conversion factor is the number which the price must be divided by to get the unit price in our unit of measure') . '. <br />' . _('E.g.') . ' ' . _('The customer sells an item by the tonne and we hold stock by the kg') . '. ' . _('The debtorsmaster.price must be divided by 1000 to get to our cost per kg') . '. ' . _('The conversion factor to enter is 1000') . '. <br /><br />' . _('No changes will be made to the database'), 'error');
+ }
+
+ if ($InputError == 0 AND isset($_POST['AddRecord'])) {
+ $sql = "INSERT INTO custitem (debtorno,
+ stockid,
+ customersuom,
+ conversionfactor,
+ cust_description,
+ cust_part)
+ VALUES ('" . $DebtorNo . "',
+ '" . $StockID . "',
+ '" . $_POST['customersUOM'] . "',
+ '" . filter_number_format($_POST['ConversionFactor']) . "',
+ '" . $_POST['cust_description'] . "',
+ '" . $_POST['cust_part'] . "')";
+ $ErrMsg = _('The customer Item details could not be added to the database because');
+ $DbgMsg = _('The SQL that failed was');
+ $AddResult = DB_query($sql, $db, $ErrMsg, $DbgMsg);
+ prnMsg(_('This customer data has been added to the database'), 'success');
+ unset($debtorsmasterResult);
+ }
+ if ($InputError == 0 AND isset($_POST['UpdateRecord'])) {
+ $sql = "UPDATE custitem SET customersuom='" . $_POST['customersUOM'] . "',
+ conversionfactor='" . filter_number_format($_POST['ConversionFactor']) . "',
+ cust_description='" . $_POST['cust_description'] . "',
+ custitem.cust_part='" . $_POST['cust_part'] . "'
+ WHERE custitem.stockid='" . $StockID . "'
+ AND custitem.debtorno='" . $DebtorNo . "'";
+ $ErrMsg = _('The customer details could not be updated because');
+ $DbgMsg = _('The SQL that failed was');
+ $UpdResult = DB_query($sql, $db, $ErrMsg, $DbgMsg);
+ prnMsg(_('customer data has been updated'), 'success');
+ unset($Edit);
+ unset($debtorsmasterResult);
+ unset($DebtorNo);
+ }
+
+ if ($InputError == 0 AND isset($_POST['AddRecord'])) {
+ /* insert took place and need to clear the form */
+ unset($DebtorNo);
+ unset($_POST['customersUOM']);
+ unset($_POST['ConversionFactor']);
+ unset($_POST['cust_description']);
+ unset($_POST['cust_part']);
+
+ }
+}
+
+if (isset($_GET['Delete'])) {
+ $sql = "DELETE FROM custitem
+ WHERE custitem.debtorno='" . $DebtorNo . "'
+ AND custitem.stockid='" . $StockID . "'";
+ $ErrMsg = _('The customer details could not be deleted because');
+ $DelResult = DB_query($sql, $db, $ErrMsg);
+ prnMsg(_('This customer data record has been successfully deleted'), 'success');
+ unset($DebtorNo);
+}
+
+
+if ($Edit == false) {
+
+ $ItemResult = DB_query("SELECT description FROM stockmaster WHERE stockid='" . $StockID . "'",$db);
+ $DescriptionRow = DB_fetch_array($ItemResult);
+ echo '<p class="page_title_text"><img src="' . $RootPath . '/css/' . $Theme . '/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title . ' ' . _('For Stock Code') . ' - ' . $StockID . ' - ' . $DescriptionRow['description'] . '</p><br />';
+
+ $sql = "SELECT custitem.debtorno,
+ debtorsmaster.name,
+ debtorsmaster.currcode,
+ custitem.customersUOM,
+ custitem.conversionfactor,
+ custitem.cust_description,
+ custitem.cust_part,
+ currencies.decimalplaces AS currdecimalplaces
+ FROM custitem INNER JOIN debtorsmaster
+ ON custitem.debtorno=debtorsmaster.DebtorNo
+ INNER JOIN currencies
+ ON debtorsmaster.currcode=currencies.currabrev
+ WHERE custitem.stockid = '" . $StockID . "'";
+ $ErrMsg = _('The customer details for the selected part could not be retrieved because');
+ $custitemResult = DB_query($sql, $db, $ErrMsg);
+ if (DB_num_rows($custitemResult) == 0 and $StockID != '') {
+ prnMsg(_('There is no customer data set up for the part selected'), 'info');
+ $NoCustItemData=1;
+ } else if ($StockID != '') {
+
+ echo '<table cellpadding="2" class="selection">';
+ $TableHeader = '<tr>
+ <th class="ascending">' . _('Customer') . '</th>
+ <th>' . _('Customer Unit') . '</th>
+ <th>' . _('Conversion Factor') . '</th>
+ <th class="ascending">' . _('Customer Item') . '</th>
+ <th class="ascending">' . _('Customer Description') . '</th>
+
+ </tr>';
+ echo $TableHeader;
+ $CountPreferreds = 0;
+ $k = 0; //row colour counter
+ while ($myrow = DB_fetch_array($custitemResult)) {
+ if ($myrow['preferred'] == 1) {
+ echo '<tr class="EvenTableRows">';
+ } elseif ($k == 1) {
+ echo '<tr class="EvenTableRows">';
+ $k = 0;
+ } else {
+ echo '<tr class="OddTableRows">';
+ $k++;
+ }
+ if ($myrow['preferred'] == 1) {
+ $DisplayPreferred = _('Yes');
+ $CountPreferreds++;
+ } else {
+ $DisplayPreferred = _('No');
+ }
+ printf('<td>%s</td>
+ <td>%s</td>
+ <td class="number">%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td><a href="%s?StockID=%s&DebtorNo=%s&Edit=1">' . _('Edit') . '</a></td>
+ <td><a href="%s?StockID=%s&DebtorNo=%s&Delete=1" onclick=\'return confirm("' . _('Are you sure you wish to delete this customer data?') . '");\'>' . _('Delete') . '</a></td>
+ </tr>',
+ $myrow['name'],
+ $myrow['customersUOM'],
+ locale_number_format($myrow['conversionfactor'],'Variable'),
+ $myrow['cust_part'],
+ $myrow['cust_description'],
+ htmlspecialchars($_SERVER['PHP_SELF']),
+ $StockID,
+ $myrow['debtorno'],
+ htmlspecialchars($_SERVER['PHP_SELF']),
+ $StockID,
+ $myrow['debtorno']);
+ } //end of while loop
+ echo '</table><br/>';
+ } // end of there are rows to show
+ echo '<br/>';
+} /* Only show the existing records if one is not being edited */
+
+if (isset($DebtorNo) AND $DebtorNo != '' AND !isset($_POST['Searchcustomer'])) {
+ /*NOT EDITING AN EXISTING BUT customer selected OR ENTERED*/
+
+ $sql = "SELECT debtorsmaster.name,
+ debtorsmaster.currcode,
+ currencies.decimalplaces AS currdecimalplaces
+ FROM debtorsmaster
+ INNER JOIN currencies
+ ON debtorsmaster.currcode=currencies.currabrev
+ WHERE DebtorNo='".$DebtorNo."'";
+ $ErrMsg = _('The customer details for the selected customer could not be retrieved because');
+ $DbgMsg = _('The SQL that failed was');
+ $SuppSelResult = DB_query($sql, $db, $ErrMsg, $DbgMsg);
+ if (DB_num_rows($SuppSelResult) == 1) {
+ $myrow = DB_fetch_array($SuppSelResult);
+ $name = $myrow['name'];
+ $CurrCode = $myrow['currcode'];
+ $CurrDecimalPlaces = $myrow['currdecimalplaces'];
+ } else {
+ prnMsg(_('The customer code') . ' ' . $DebtorNo . ' ' . _('is not an existing customer in the database') . '. ' . _('You must enter an alternative customer code or select a customer using the search facility below'), 'error');
+ unset($DebtorNo);
+ }
+} else {
+ if ($NoCustItemData==0) {
+ echo '<p class="page_title_text"><img src="' . $RootPath . '/css/' . $Theme . '/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title . ' ' . _('For Stock Code') . ' - ' . $StockID . '</p><br />';
+ }
+ if (!isset($_POST['Searchcustomer'])) {
+ echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
+ <table cellpadding="3" colspan="4" class="selection">
+ <tr>
+ <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
+ <input type="hidden" name="StockID" value="' . $StockID . '" />
+ <td>' . _('Text in the customer') . ' <b>' . _('NAME') . '</b>:</td>
+ <td><input type="text" name="Keywords" size="20" maxlength="25" /></td>
+ <td><b>' . _('OR') . '</b></td>
+ <td>' . _('Text in customer') . ' <b>' . _('CODE') . '</b>:</td>
+ <td><input type="text" name="cust_no" data-type="no-illegal-chars" size="20" maxlength="50" /></td>
+ </tr>
+ </table>
+ <br />
+ <div class="centre">
+ <input type="submit" name="Searchcustomer" value="' . _('Find Customers Now') . '" />
+ </div>
+ </form>';
+ include ('includes/footer.inc');
+ exit;
+ };
+}
+
+if ($Edit == true) {
+ $ItemResult = DB_query("SELECT description FROM stockmaster WHERE stockid='" . $StockID . "'",$db);
+ $DescriptionRow = DB_fetch_array($ItemResult);
+ echo '<p class="page_title_text"><img src="' . $RootPath . '/css/' . $Theme . '/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title . ' ' . _('For Stock Code') . ' - ' . $StockID . ' - ' . $DescriptionRow['description'] . '</p><br />';
+}
+
+if (isset($_POST['Searchcustomer'])) {
+ if (isset($_POST['Keywords']) AND isset($_POST['cust_no'])) {
+ prnMsg( _('Customer Name keywords have been used in preference to the customer Code extract entered') . '.', 'info' );
+ echo '<br />';
+ }
+ if ($_POST['Keywords'] == '' AND $_POST['cust_no'] == '') {
+ $_POST['Keywords'] = ' ';
+ }
+ if (mb_strlen($_POST['Keywords']) > 0) {
+ //insert wildcard characters in spaces
+ $SearchString = '%' . str_replace(' ', '%', $_POST['Keywords']) . '%';
+
+ $SQL = "SELECT debtorsmaster.DebtorNo,
+ debtorsmaster.name,
+ debtorsmaster.currcode,
+ debtorsmaster.address1,
+ debtorsmaster.address2,
+ debtorsmaster.address3
+ FROM debtorsmaster
+ WHERE debtorsmaster.name " . LIKE . " '".$SearchString."'";
+
+ } elseif (mb_strlen($_POST['cust_no']) > 0) {
+ $SQL = "SELECT debtorsmaster.DebtorNo,
+ debtorsmaster.name,
+ debtorsmaster.currcode,
+ debtorsmaster.address1,
+ debtorsmaster.address2,
+ debtorsmaster.address3
+ FROM debtorsmaster
+ WHERE debtorsmaster.DebtorNo " . LIKE . " '%" . $_POST['cust_no'] . "%'";
+
+ } //one of keywords or cust_part was more than a zero length string
+ $ErrMsg = _('The cuswtomer matching the criteria entered could not be retrieved because');
+ $DbgMsg = _('The SQL to retrieve customer details that failed was');
+ $debtorsmasterResult = DB_query($SQL, $db, $ErrMsg, $DbgMsg);
+} //end of if search
+if (isset($debtorsmasterResult) AND DB_num_rows($debtorsmasterResult) > 0) {
+ if (isset($StockID)) {
+ $result = DB_query("SELECT stockmaster.description,
+ stockmaster.units,
+ stockmaster.mbflag
+ FROM stockmaster
+ WHERE stockmaster.stockid='".$StockID."'", $db);
+ $myrow = DB_fetch_row($result);
+ $StockUOM = $myrow[1];
+ if (DB_num_rows($result) <> 1) {
+ prnMsg(_('Stock Item') . ' - ' . $StockID . ' ' . _('is not defined in the database'), 'warn');
+ }
+ } else {
+ $StockID = '';
+ $StockUOM = 'each';
+ }
+ echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF']) . '" method="post">
+ <table cellpadding="2" colspan="7" class="selection">';
+ echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+ $TableHeader = '<tr>
+ <th class="ascending">' . _('Code') . '</th>
+ <th class="ascending">' . _('Customer Name') . '</th>
+ <th class="ascending">' . _('Currency') . '</th>
+ <th class="ascending">' . _('Address 1') . '</th>
+ <th class="ascending">' . _('Address 2') . '</th>
+ <th class="ascending">' . _('Address 3') . '</th>
+ </tr>';
+ echo $TableHeader;
+ $k = 0;
+ while ($myrow = DB_fetch_array($debtorsmasterResult)) {
+ if ($k==1){
+ echo '<tr class="EvenTableRows">';
+ $k=0;
+ } else {
+ echo '<tr class="OddTableRows">';
+ $k++;
+ }
+ printf('<td><input type="submit" name="DebtorNo" value="%s" /></td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ </tr>',
+ $myrow['DebtorNo'],
+ $myrow['name'],
+ $myrow['currcode'],
+ $myrow['address1'],
+ $myrow['address2'],
+ $myrow['address3']);
+
+ echo '<input type="hidden" name="StockID" value="' . $StockID . '" />';
+ echo '<input type="hidden" name="StockUOM" value="' . $StockUOM . '" />';
+
+ }
+ //end of while loop
+ echo '</table>
+ <br/>
+ </form>';
+}
+//end if results to show
+
+/*Show the input form for new customer details */
+if (!isset($debtorsmasterResult)) {
+ if ($Edit == true OR isset($_GET['Copy'])) {
+
+ $sql = "SELECT custitem.debtorno,
+ debtorsmaster.name,
+ debtorsmaster.currcode,
+ custitem.customersUOM,
+ custitem.cust_description,
+ custitem.conversionfactor,
+ custitem.cust_part,
+ currencies.decimalplaces AS currdecimalplaces
+ FROM custitem INNER JOIN debtorsmaster
+ ON custitem.debtorno=debtorsmaster.DebtorNo
+ INNER JOIN stockmaster
+ ON custitem.stockid=stockmaster.stockid
+ INNER JOIN currencies
+ ON debtorsmaster.currcode = currencies.currabrev
+ WHERE custitem.debtorno='" . $DebtorNo . "'
+ AND custitem.stockid='" . $StockID . "'";
+
+ $ErrMsg = _('The customer purchasing details for the selected customer and item could not be retrieved because');
+ $EditResult = DB_query($sql, $db, $ErrMsg);
+ $myrow = DB_fetch_array($EditResult);
+ $name = $myrow['name'];
+
+ $CurrCode = $myrow['currcode'];
+ $CurrDecimalPlaces = $myrow['currdecimalplaces'];
+ $_POST['customersUOM'] = $myrow['customersUOM'];
+ $_POST['cust_description'] = $myrow['cust_description'];
+ $_POST['ConversionFactor'] = locale_number_format($myrow['conversionfactor'],'Variable');
+ $_POST['cust_part'] = $myrow['cust_part'];
+ $StockUOM=$myrow['units'];
+ }
+ echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF']) . '" method="post">
+ <table class="selection">';
+ echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+ if (!isset($DebtorNo)) {
+ $DebtorNo = '';
+ }
+ if ($Edit == true) {
+ echo '<tr>
+ <td>' . _('Customer Name') . ':</td>
+ <td><input type="hidden" name="DebtorNo" value="' . $DebtorNo . '" />' . $DebtorNo . ' - ' . $name . '</td>
+ </tr>';
+ } else {
+ echo '<tr>
+ <td>' . _('Customer Name') . ':</td>
+ <input type="hidden" name="DebtorNo" maxlength="10" size="11" value="' . $DebtorNo . '" />';
+
+ if ($DebtorNo!='') {
+ echo '<td>' . $name;
+ }
+ if (!isset($name) OR $name = '') {
+ echo '(' . _('A search facility is available below if necessary') . ')';
+ } else {
+ echo '<td>' . $name;
+ }
+ echo '</td></tr>';
+ }
+ echo '<td><input type="hidden" name="StockID" maxlength="10" size="11" value="' . $StockID . '" />';
+ if (!isset($CurrCode)) {
+ $CurrCode = '';
+ }
+
+ if (!isset($_POST['customersUOM'])) {
+ $_POST['customersUOM'] = '';
+ }
+ if (!isset($_POST['cust_description'])) {
+ $_POST['cust_description'] = '';
+ }
+ if (!isset($_POST['cust_part'])) {
+ $_POST['cust_part'] = '';
+ }
+ echo '<tr>
+ <td>' . _('Currency') . ':</td>
+ <td><input type="hidden" name="CurrCode" . value="' . $CurrCode . '" />' . $CurrCode . '</td>
+ </tr>
+ <tr>
+ <td>' . _('Our Unit of Measure') . ':</td>';
+
+ if (isset($DebtorNo)) {
+ echo '<td>' . $StockUOM . '</td></tr>';
+ }
+ echo '<tr>
+ <td>' . _('Customer Unit of Measure') . ':</td>
+ <td><input type="text" name="customersUOM" size="20" maxlength="20" value ="' . $_POST['customersUOM'] . '"/></td>
+ </tr>';
+
+ if (!isset($_POST['ConversionFactor']) OR $_POST['ConversionFactor'] == '') {
+ $_POST['ConversionFactor'] = 1;
+ }
+
+ echo '<tr>
+ <td>' . _('Conversion Factor (to our UOM)') . ':</td>
+ <td><input type="text" class="number" name="ConversionFactor" maxlength="12" size="12" value="' . $_POST['ConversionFactor'] . '" /></td>
+ </tr>
+ <tr>
+ <td>' . _('Customer Stock Code') . ':</td>
+ <td><input type="text" name="cust_part" maxlength="20" size="20" value="' . $_POST['cust_part'] . '" /></td>
+ </tr>
+ <tr>
+ <td>' . _('Customer Stock Description') . ':</td>
+ <td><input type="text" name="cust_description" maxlength="30" size="30" value="' . $_POST['cust_description'] . '" /></td>
+ </tr>';
+
+
+ echo '</table>
+ <br />
+ <div class="centre">';
+
+ if ($Edit == true) {
+ echo '<input type="submit" name="UpdateRecord" value="' . _('Update') . '" />';
+ echo '<input type="hidden" name="Edit" value="1" />';
+ } else {
+ echo '<input type="submit" name="AddRecord" value="' . _('Add') . '" />';
+ }
+
+ echo '</div>
+ <div class="centre">';
+
+ if (isset($StockLocation) AND isset($StockID) AND mb_strlen($StockID) != 0) {
+ echo '<br /><a href="' . $RootPath . '/StockStatus.php?StockID=' . $StockID . '">' . _('Show Stock Status') . '</a>';
+ echo '<br /><a href="' . $RootPath . '/StockMovements.php?StockID=' . $StockID . '&StockLocation=' . $StockLocation . '">' . _('Show Stock Movements') . '</a>';
+ echo '<br /><a href="' . $RootPath . '/SelectSalesOrder.php?SelectedStockItem=' . $StockID . '&StockLocation=' . $StockLocation . '">' . _('Search Outstanding Sales Orders') . '</a>';
+ echo '<br /><a href="' . $RootPath . '/SelectCompletedOrder.php?SelectedStockItem=' . $StockID . '">' . _('Search Completed Sales Orders') . '</a>';
+ }
+ echo '</form></div>';
+}
+
+include ('includes/footer.inc');
+?>
Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php 2014-04-24 06:07:22 UTC (rev 6692)
+++ trunk/SelectOrderItems.php 2014-04-24 13:57:05 UTC (rev 6693)
@@ -112,8 +112,8 @@
salesorders.printedpackingslip,
salesorders.datepackingslipprinted,
salesorders.quotation,
+ salesorders.quotation,
salesorders.quotedate,
- salesorders.confirmeddate,
salesorders.deliverblind,
debtorsmaster.customerpoline,
locations.locationname,
@@ -148,7 +148,7 @@
}
$_SESSION['Items'.$identifier]->OrderNo = $_GET['ModifyOrderNumber'];
$_SESSION['Items'.$identifier]->DebtorNo = $myrow['debtorno'];
- $_SESSION['Items'.$identifier]->CreditAvailable = GetCreditAvailable($_SESSION['Items'.$identifier]->DebtorNo,$db);
+ $_SESSION['Items'.$identifier]->CreditAvailable = GetCreditAvailable($_SESSION['Items'.$identifier]->DebtorNo,$db);
/*CustomerID defined in header.inc */
$_SESSION['Items'.$identifier]->Branch = $myrow['branchcode'];
$_SESSION['Items'.$identifier]->CustomerName = $myrow['name'];
@@ -373,6 +373,7 @@
$SelectedBranch = $_POST['SelectedBranch'.$i];
}
}
+
/* will only be true if page called from customer selection form or set because only one customer
record returned from a search so parse the $SelectCustomer string into customer code and branch code */
if (isset($SelectedCustomer)) {
@@ -492,7 +493,6 @@
prnMsg($_SESSION['Items'.$identifier]->SpecialInstructions,'warn');
if ($_SESSION['CheckCreditLimits'] > 0){ /*Check credit limits is 1 for warn and 2 for prohibit sales */
-
$_SESSION['Items'.$identifier]->CreditAvailable = GetCreditAvailable($_SESSION['Items'.$identifier]->DebtorNo,$db);
if ($_SESSION['CheckCreditLimits']==1 AND $_SESSION['Items'.$identifier]->CreditAvailable <=0){
@@ -752,7 +752,14 @@
}else{
$RawMaterialSellable = '';
}
-
+ if(!empty($_POST['CustItemFlag'])){
+ $IncludeCustItem = " INNER JOIN custitem ON custitem.stockid=stockmaster.stockid
+ AND custitem.debtorno='" . $_SESSION['Items'.$identifier]->DebtorNo . "'";
+ }else{
+ $IncludeCustItem = " LEFT OUTER JOIN custitem ON custitem.stockid=stockmaster.stockid
+ AND custitem.debtorno='" . $_SESSION['Items'.$identifier]->DebtorNo . "'";
+ }
+
if ($_POST['Keywords']!='' AND $_POST['StockCode']=='') {
$msg='<div class="page_help_text">' . _('Order Item description has been used in search') . '.</div>';
} elseif ($_POST['StockCode']!='' AND $_POST['Keywords']=='') {
@@ -769,9 +776,11 @@
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
stockmaster.longdescription,
- stockmaster.units
+ stockmaster.units,
+ custitem.cust_part,
+ custitem.cust_description
FROM stockmaster INNER JOIN stockcategory
- ON stockmaster.categoryid=stockcategory.categoryid
+ ON stockmaster.categoryid=stockcategory.categoryid" . $IncludeCustItem . "
WHERE (stockcategory.stocktype='F' OR stockcategory.stocktype='D' OR stockcategory.stocktype='L'".$RawMaterialSellable.")
AND stockmaster.mbflag <>'G'
AND stockmaster.description " . LIKE . " '" . $SearchString . "'
@@ -781,9 +790,11 @@
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
stockmaster.longdescription,
- stockmaster.units
+ stockmaster.units,
+ custitem.cust_part,
+ custitem.cust_description
FROM stockmaster INNER JOIN stockcategory
- ON stockmaster.categoryid=stockcategory.categoryid
+ ON stockmaster.categoryid=stockcategory.categoryid" . $IncludeCustItem . "
WHERE (stockcategory.stocktype='F' OR stockcategory.stocktype='D' OR stockcategory.stocktype='L'".$RawMaterialSellable.")
AND stockmaster.mbflag <>'G'
AND stockmaster.discontinued=0
@@ -801,9 +812,11 @@
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
stockmaster.longdescription,
- stockmaster.units
+ stockmaster.units,
+ custitem.cust_part,
+ custitem.cust_description
FROM stockmaster INNER JOIN stockcategory
- ON stockmaster.categoryid=stockcategory.categoryid
+ ON stockmaster.categoryid=stockcategory.categoryid" . $IncludeCustItem . "
WHERE (stockcategory.stocktype='F' OR stockcategory.stocktype='D' OR stockcategory.stocktype='L'".$RawMaterialSellable.")
AND stockmaster.stockid " . LIKE . " '" . $SearchString . "'
AND stockmaster.mbflag <>'G'
@@ -813,9 +826,11 @@
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
stockmaster.longdescription,
- stockmaster.units
+ stockmaster.units,
+ custitem.cust_part,
+ custitem.cust_description
FROM stockmaster INNER JOIN stockcategory
- ON stockmaster.categoryid=stockcategory.categoryid
+ ON stockmaster.categoryid=stockcategory.categoryid" . $IncludeCustItem . "
WHERE (stockcategory.stocktype='F' OR stockcategory.stocktype='D' OR stockcategory.stocktype='L'".$RawMaterialSellable.")
AND stockmaster.stockid " . LIKE . " '" . $SearchString . "'
AND stockmaster.mbflag <>'G'
@@ -829,9 +844,11 @@
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
stockmaster.longdescription,
- stockmaster.units
+ stockmaster.units,
+ custitem.cust_part,
+ custitem.cust_description
FROM stockmaster INNER JOIN stockcategory
- ON stockmaster.categoryid=stockcategory.categoryid
+ ON stockmaster.categoryid=stockcategory.categoryid" . $IncludeCustItem . "
WHERE (stockcategory.stocktype='F' OR stockcategory.stocktype='D' OR stockcategory.stocktype='L'".$RawMaterialSellable.")
AND stockmaster.mbflag <>'G'
AND stockmaster.discontinued=0
@@ -840,9 +857,11 @@
$SQL = "SELECT stockmaster.stockid,
stockmaster.description,
stockmaster.longdescription,
- stockmaster.units
+ stockmaster.units,
+ custitem.cust_part,
+ custitem.cust_description
FROM stockmaster INNER JOIN stockcategory
- ON stockmaster.categoryid=stockcategory.categoryid
+ ON stockmaster.categoryid=stockcategory.categoryid" . $IncludeCustItem . "
WHERE (stockcategory.stocktype='F' OR stockcategory.stocktype='D' OR stockcategory.stocktype='L'".$RawMaterialSellable.")
AND stockmaster.mbflag <>'G'
AND stockmaster.discontinued=0
@@ -1159,7 +1178,6 @@
if ($_SESSION['CheckCreditLimits'] > 0 AND $AlreadyWarnedAboutCredit==false){
/*Check credit limits is 1 for warn breach their credit limit and 2 for prohibit sales */
$DifferenceInOrderValue = ($Quantity*$Price*(1-$DiscountPercentage/100)) - ($OrderLine->Quantity*$OrderLine->Price*(1-$OrderLine->DiscountPercent));
-
$_SESSION['Items'.$identifier]->CreditAvailable -= $DifferenceInOrderValue;
if ($_SESSION['CheckCreditLimits']==1 AND $_SESSION['Items'.$identifier]->CreditAvailable <=0){
@@ -1697,7 +1715,8 @@
}
echo '" /></td>
- <td><input type="checkbox" name="RawMaterialFlag" value="M" />'._('Raw material flag').' <br/><span class="dpTbl">'._('If checked, Raw material will be show on search result').'</span> </td>
+ <td><input type="checkbox" name="RawMaterialFlag" value="M" />'._('Raw material flag').' <br/><span class="dpTbl">'._('If checked, Raw material will be shown on search result').'</span> </td>
+ <td><input type="checkbox" name="CustItemFlag" value="C" />'._('Customer Item flag').' <br/><span class="dpTbl">'._('If checked, only items for this customer will show').'</span> </td>
</tr>';
echo '<tr>
@@ -1727,6 +1746,7 @@
echo '<tr>
<th class="ascending" >' . _('Code') . '</th>
<th class="ascending" >' . _('Description') . '</th>
+ <th class="ascending" >' . _('Customer Item') . '</th>
<th>' . _('Units') . '</th>
<th class="ascending" >' . _('On Hand') . '</th>
<th class="ascending" >' . _('On Demand') . '</th>
@@ -1818,6 +1838,7 @@
printf('<td>%s</td>
<td title="%s">%s</td>
<td>%s</td>
+ <td>%s</td>
<td class="number">%s</td>
<td class="number">%s</td>
<td class="number">%s</td>
@@ -1829,6 +1850,7 @@
$myrow['stockid'],
$myrow['longdescription'],
$myrow['description'],
+ $myrow['cust_part'] . '-' . $myrow['cust_description'],
$myrow['units'],
locale_number_format($QOH,$QOHRow['decimalplaces']),
locale_number_format($DemandQty,$QOHRow['decimalplaces']),
Modified: trunk/SelectProduct.php
===================================================================
--- trunk/SelectProduct.php 2014-04-24 06:07:22 UTC (rev 6692)
+++ trunk/SelectProduct.php 2014-04-24 13:57:05 UTC (rev 6693)
@@ -487,6 +487,7 @@
echo '<a href="' . $RootPath . '/StockReorderLevel.php?StockID=' . $StockID . '">' . _('Maintain Reorder Levels') . '</a><br />';
echo '<a href="' . $RootPath . '/StockCostUpdate.php?StockID=' . $StockID . '">' . _('Maintain Standard Cost') . '</a><br />';
echo '<a href="' . $RootPath . '/PurchData.php?StockID=' . $StockID . '">' . _('Maintain Purchasing Data') . '</a><br />';
+ echo '<a href="' . $RootPath . '/CustItem.php?StockID=' . $StockID . '">' . _('Maintain Customer Item Data') . '</a><br />';
}
if ($Its_A_Labour_Item == True) {
echo '<a href="' . $RootPath . '/StockCostUpdate.php?StockID=' . $StockID . '">' . _('Maintain Standard Cost') . '</a><br />';
@@ -827,4 +828,4 @@
/* end display list if there is more than one record */
include ('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/sql/mysql/upgrade4.11-4.12.sql
===================================================================
--- trunk/sql/mysql/upgrade4.11-4.12.sql 2014-04-24 06:07:22 UTC (rev 6692)
+++ trunk/sql/mysql/upgrade4.11-4.12.sql 2014-04-24 13:57:05 UTC (rev 6693)
@@ -4,7 +4,20 @@
INSERT INTO `scripts` (`script` ,`pagesecurity` ,`description` ) VALUES ('PDFWOPrint.php', '11', 'Produces W/O Paperwork');
INSERT INTO `scripts` (`script` ,`pagesecurity` ,`description` ) VALUES ('PDFFGLabel.php', '11', 'Produces FG Labels');
INSERT INTO `scripts` (`script` ,`pagesecurity` ,`description` ) VALUES ('PDFQALabel.php', '2', 'Produces a QA label on receipt of stock');
+INSERT INTO `scripts` (`script` ,`pagesecurity` ,`description` ) VALUES ('CustItem.php', '11', 'Customer Items');
ALTER TABLE `woitems` ADD `comments` LONGBLOB NULL DEFAULT NULL ;
ALTER TABLE `www_users` CHANGE `modulesallowed` `modulesallowed` VARCHAR( 25 ) NOT NULL;
+CREATE TABLE `custitem` (
+ `debtorno` char(10) NOT NULL DEFAULT '',
+ `stockid` varchar(20) NOT NULL DEFAULT '',
+ `cust_part` varchar(20) NOT NULL DEFAULT '',
+ `cust_description` varchar(30) NOT NULL DEFAULT '',
+ `customersuom` char(50) NOT NULL DEFAULT '',
+ `conversionfactor` double NOT NULL DEFAULT '1',
+ PRIMARY KEY (`debtorno`,`stockid`),
+ KEY `StockID` (`stockid`),
+ KEY `Debtorno` (`debtorno`),
+ CONSTRAINT ` custitem _ibfk_1` FOREIGN KEY (`stockid`) REFERENCES `stockmaster` (`stockid`),
+ CONSTRAINT ` custitem _ibfk_2` FOREIGN KEY (`debtorno`) REFERENCES `debtorsmaster` (`debtorno`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
UPDATE config SET confvalue='4.12' WHERE confname='VersionNumber';
-
|
