Menu
▾
▴
web-erp-svn
|
From: <dai...@us...> - 2014-04-19 03:09:56
|
Revision: 6686
http://sourceforge.net/p/web-erp/reponame/6686
Author: daintree
Date: 2014-04-19 03:09:52 +0000 (Sat, 19 Apr 2014)
Log Message:
-----------
fix mods Andrew Galuski
Modified Paths:
--------------
trunk/ConfirmDispatch_Invoice.php
trunk/FormDesigner.php
trunk/GoodsReceived.php
Modified: trunk/ConfirmDispatch_Invoice.php
===================================================================
--- trunk/ConfirmDispatch_Invoice.php 2014-04-17 11:51:26 UTC (rev 6685)
+++ trunk/ConfirmDispatch_Invoice.php 2014-04-19 03:09:52 UTC (rev 6686)
@@ -1217,20 +1217,18 @@
salesanalysis.periodno,
salesanalysis.typeabbrev,
salesanalysis.salesperson
- FROM salesanalysis,
- custbranch,
- stockmaster
- WHERE salesanalysis.stkcategory=stockmaster.categoryid
- AND salesanalysis.stockid=stockmaster.stockid
- AND salesanalysis.cust=custbranch.debtorno
- AND salesanalysis.custbranch=custbranch.branchcode
- AND salesanalysis.area=custbranch.area
- AND salesanalysis.salesperson='" . $_SESSION['Items'.$identifier]->SalesPerson . "'
+ FROM salesanalysis INNER JOIN custbranch
+ ON salesanalysis.cust=custbranch.debtorno
+ AND salesanalysis.custbranch=custbranch.branchcode
+ AND salesanalysis.area=custbranch.area
+ INNER JOIN stockmaster
+ ON salesanalysis.stkcategory=stockmaster.categoryid
+ WHERE salesanalysis.salesperson='" . $_SESSION['Items'.$identifier]->SalesPerson . "'
AND salesanalysis.typeabbrev ='" . $_SESSION['Items'.$identifier]->DefaultSalesType . "'
AND salesanalysis.periodno='" . $PeriodNo . "'
- AND salesanalysis.cust " . LIKE . " '" . $_SESSION['Items'.$identifier]->DebtorNo . "'
- AND salesanalysis.custbranch " . LIKE . " '" . $_SESSION['Items'.$identifier]->Branch . "'
- AND salesanalysis.stockid " . LIKE . " '" . $OrderLine->StockID . "'
+ AND salesanalysis.cust='" . $_SESSION['Items'.$identifier]->DebtorNo . "'
+ AND salesanalysis.custbranch='" . $_SESSION['Items'.$identifier]->Branch . "'
+ AND salesanalysis.stockid='" . $OrderLine->StockID . "'
AND salesanalysis.budgetoractual=1
GROUP BY salesanalysis.stockid,
salesanalysis.stkcategory,
@@ -1239,7 +1237,8 @@
salesanalysis.area,
salesanalysis.periodno,
salesanalysis.typeabbrev,
- salesanalysis.salesperson";
+ salesanalysis.salesperson,
+ salesanalysis.budgetoractual";
$ErrMsg = _('The count of existing Sales analysis records could not run because');
$DbgMsg = '<br />' . _('SQL to count the no of sales analysis records');
Modified: trunk/FormDesigner.php
===================================================================
--- trunk/FormDesigner.php 2014-04-17 11:51:26 UTC (rev 6685)
+++ trunk/FormDesigner.php 2014-04-19 03:09:52 UTC (rev 6686)
@@ -194,8 +194,7 @@
while (false !== ($file = readdir($handle))) {
if ($file[0]!='.') {
$FormDesign = simplexml_load_file($PathPrefix.'companies/'.$_SESSION['DatabaseName'].'/FormDesigns/'.$file);
- //echo "name is". $FormDesign['name'];
- echo '<option value="'.$file.'">' . /*_(*/ $FormDesign['name'] /*)*/ . '</option>';
+ echo '<option value="'.$file.'">' . _($FormDesign['name']) . '</option>';
}
}
closedir($handle);
Modified: trunk/GoodsReceived.php
===================================================================
--- trunk/GoodsReceived.php 2014-04-17 11:51:26 UTC (rev 6685)
+++ trunk/GoodsReceived.php 2014-04-19 03:09:52 UTC (rev 6686)
@@ -304,7 +304,18 @@
$Changes=0;
$LineNo=1;
-
+ if(DB_num_rows($Result)==0){//Those goods must have been received by another user. So should destroy the session data and show warning to users
+ prnMsg(_('This order has been changed or invoiced since this delivery was started to be actioned').' . '._('Processing halted'),'error');
+ echo '<div class="centre"><a href="' . $RootPath . '/PO_SelectOSPurchOrder.php">' .
+ _('Select a different purchase order for receiving goods against') . '</a></div>';
+ unset($_SESSION['PO'.$identifier]->LineItems);
+ unset($_SESSION['PO'.$identifier]);
+ unset($_POST['ProcessGoodsReceived']);
+ echo '</div>';
+ echo '</form>';
+ include ('includes/footer.inc');
+ exit;
+ }
while ($myrow = DB_fetch_array($Result)) {
if ($_SESSION['PO'.$identifier]->LineItems[$LineNo]->GLCode != $myrow['glcode'] OR
|
|
From: <ex...@us...> - 2014-04-20 02:49:39
|
Revision: 6688
http://sourceforge.net/p/web-erp/reponame/6688
Author: exsonqu
Date: 2014-04-20 02:49:36 +0000 (Sun, 20 Apr 2014)
Log Message:
-----------
20/04/14 Exson: Fixed undefined variable bugs in PDFWOPageHeader.inc and PDFWOPrint.php and remove some redundant codes in PDFWOPrint.php
Modified Paths:
--------------
trunk/PDFWOPrint.php
trunk/includes/PDFWOPageHeader.inc
Modified: trunk/PDFWOPrint.php
===================================================================
--- trunk/PDFWOPrint.php 2014-04-19 03:44:45 UTC (rev 6687)
+++ trunk/PDFWOPrint.php 2014-04-20 02:49:36 UTC (rev 6688)
@@ -1,7 +1,7 @@
<?php
/* $Id: PDFWOPrint.php 6146 $*/
-
+/* Currently this file only support one finished items produced work orders. Multiple items not supported yet */
include('includes/session.inc');
include('includes/SQL_CommonFunctions.inc');
if (isset($_GET['WO'])) {
@@ -22,70 +22,13 @@
if (isset($_GET['PrintLabels'])) {
$PrintLabels = $_GET['PrintLabels'];
} elseif (isset($_POST['PrintLabels'])){
- $PrintLabels = $_POST['LabelItem'];
-} else {
- unset($LabelItem);
-}
-
-if (isset($_GET['LabelItem'])) {
- $LabelItem = $_GET['LabelItem'];
-} elseif (isset($_POST['LabelItem'])){
- $LabelItem = $_POST['LabelItem'];
-} else {
- unset($LabelItem);
-}
-if (isset($_GET['LabelDesc'])) {
- $LabelDesc = $_GET['LabelDesc'];
-} elseif (isset($_POST['LabelDesc'])){
- $LabelDesc = $_POST['LabelDesc'];
-} else {
- unset($LabelDesc);
-}
-if (isset($_GET['LabelLot'])) {
- $LabelLot = $_GET['LabelLot'];
-} elseif (isset($_POST['LabelLot'])){
- $LabelLot = $_POST['LabelLot'];
-} else {
- unset($LabelLot);
-}
-if (isset($_GET['NoOfBoxes'])) {
- $NoOfBoxes = $_GET['NoOfBoxes'];
-} elseif (isset($_POST['NoOfBoxes'])){
- $NoOfBoxes = $_POST['NoOfBoxes'];
-} else {
- unset($NoOfBoxes);
-}
-if (isset($_GET['LabelsPerBox'])) {
- $LabelsPerBox = $_GET['LabelsPerBox'];
-} elseif (isset($_POST['LabelsPerBox'])){
- $LabelsPerBox = $_POST['LabelsPerBox'];
-} else {
- unset($LabelsPerBox);
-}
-if (isset($_GET['QtyPerBox'])) {
- $QtyPerBox = $_GET['QtyPerBox'];
-} elseif (isset($_POST['QtyPerBox'])){
- $QtyPerBox = $_POST['QtyPerBox'];
-} else {
- unset($QtyPerBox);
-}
-if (isset($_GET['LeftOverQty'])) {
- $LeftOverQty = $_GET['LeftOverQty'];
-} elseif (isset($_POST['LeftOverQty'])){
- $LeftOverQty = $_POST['LeftOverQty'];
-} else {
- unset($LeftOverQty);
-}
-if (isset($_GET['PrintLabels'])) {
- $PrintLabels = $_GET['PrintLabels'];
-} elseif (isset($_POST['PrintLabels'])){
$PrintLabels = $_POST['PrintLabels'];
} else {
$PrintLabels="Yes";
}
-
-if (!isset($_GET['WO']) AND !isset($_POST['WO'])) {
+
+if (!isset($SelectedWO)) {
$Title = _('Select a Work Order');
include('includes/header.inc');
echo '<div class="centre"><br /><br /><br />';
@@ -109,12 +52,7 @@
echo '<br /><a href="' . $RootPath . '/index.php">' . _('Back to the menu') . '</a></div>';
exit;
}
-if (isset($_GET['WO'])) {
- $SelectedWO = $_GET['WO'];
-}
-elseif (isset($_POST['WO'])) {
- $SelectedWO = $_POST['WO'];
-}
+
$Title = _('Print Work Order Number') . ' ' . $SelectedWO;
if (isset($_POST['PrintOrEmail']) AND isset($_POST['EmailTo'])) {
if ($_POST['PrintOrEmail'] == 'Email' AND !IsEmailAddress($_POST['EmailTo'])) {
@@ -241,6 +179,8 @@
$WOHeader['deladd6'] = str_pad('', 15, 'x');
$WOHeader['stockid'] = str_pad('', 15, 'x');
$WOHeader['description'] = str_pad('', 50, 'x');
+ $WOHeader['wo'] = '99999999';
+ $WOHeader['loccode'] = str_pad('',5,'x');
} // end of If we are previewing the order
@@ -340,7 +280,7 @@
$WOLine[$i]['issued'] = 9999999.99;
$WOLine[$i]['decimalplaces'] = 2;
}
- if ($WOLine['decimalplaces'] != NULL) {
+ if ($WOLine[$i]['decimalplaces'] != NULL) {
$DecimalPlaces = $WOLine[$i]['decimalplaces'];
}
else {
@@ -444,6 +384,7 @@
include('includes/PDFWOPageHeader.inc');
} //end if need a new page headed up
} /*end if there are order details to show on the order - or its a preview*/
+ $FooterPrintedInPage = 0;
if($FooterPrintedInPage == 0){
$LeftOvers = $pdf->addText($FormDesign->SignedDate->x,$Page_Height-$FormDesign->SignedDate->y,$FormDesign->SignedDate->FontSize, _('Date : ') . '______________');
$LeftOvers = $pdf->addText($FormDesign->SignedBy->x,$Page_Height-$FormDesign->SignedBy->y,$FormDesign->SignedBy->FontSize, _('Signed for: ').'____________________________________');
@@ -568,7 +509,7 @@
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post">';
echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- if ($ViewingOnly == 1) {
+ if (isset($ViewingOnly) and $ViewingOnly == 1) {
echo '<input type="hidden" name="ViewingOnly" value="1" />';
} //$ViewingOnly == 1
echo '<br /><br />';
@@ -582,7 +523,7 @@
if (!isset($_POST['PrintOrEmail'])) {
$_POST['PrintOrEmail'] = 'Print';
}
- if ($ViewingOnly != 0) {
+ if (isset($ViewingOnly) and $ViewingOnly != 0) {
echo '<option selected="selected" value="Print">' . _('Print') . '</option>';
}
else {
@@ -643,9 +584,12 @@
echo '<form action="PDFFGLabel.php" method="post">';
echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- if ($ViewingOnly == 1) {
+ if (isset($ViewOnly) and $ViewingOnly == 1) {
echo '<input type="hidden" name="ViewingOnly" value="1" />';
} //$ViewingOnly == 1
+ if(!isset($EmailTo)){
+ $EmailTo='';
+ }
echo '<br /><br />';
echo '<input type="hidden" name="WO" value="' . $SelectedWO . '" />';
echo '<input type="hidden" name="StockID" value="' . $StockID . '" />';
@@ -665,7 +609,7 @@
if (!isset($_POST['PrintOrEmail'])) {
$_POST['PrintOrEmail'] = 'Print';
}
- if ($ViewingOnly != 0) {
+ if (isset($ViewingOnly) and $ViewingOnly != 0) {
echo '<option selected="selected" value="Print">' . _('Print') . '</option>';
}
else {
@@ -709,4 +653,4 @@
}
include('includes/footer.inc');
}
-?>
+?>
\ No newline at end of file
Modified: trunk/includes/PDFWOPageHeader.inc
===================================================================
--- trunk/includes/PDFWOPageHeader.inc 2014-04-19 03:44:45 UTC (rev 6687)
+++ trunk/includes/PDFWOPageHeader.inc 2014-04-20 02:49:36 UTC (rev 6688)
@@ -58,7 +58,7 @@
$pdf->addTextWrap($FormDesign->PackageQty->x,$Page_Height - $FormDesign->PackageQty->y, $FormDesign->PackageQty->Length, $FormDesign->PackageQty->FontSize, $PackQty,'right' );
$pdf->setFont('','');
-if ($PrintingComments ==true) {
+if (!empty($PrintingComments)) {
return;
}
$pdf->addText($FormDesign->MatReqTitle->x,$Page_Height - $FormDesign->MatReqTitle->y,$FormDesign->MatReqTitle->FontSize, _('Material Requirements for this Work Order'));
@@ -72,4 +72,4 @@
$pdf->addText($FormDesign->Headings->Column5->x,$Page_Height - $FormDesign->Headings->Column5->y, $FormDesign->Headings->Column5->FontSize, _('Qty Issued') );
/*draw a rectangle to hold the data lines */
$pdf->Rectangle($FormDesign->DataRectangle->x, $Page_Height - $FormDesign->DataRectangle->y, $FormDesign->DataRectangle->width,$FormDesign->DataRectangle->height);
-?>
+?>
\ No newline at end of file
|
|
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', 'Custo...
[truncated message content] |
|
From: <aga...@us...> - 2014-04-24 14:08:00
|
Revision: 6694
http://sourceforge.net/p/web-erp/reponame/6694
Author: agaluski
Date: 2014-04-24 14:07:56 +0000 (Thu, 24 Apr 2014)
Log Message:
-----------
Removed blank lines at end of scripts. Put back ConfirmedDate (Removed on last commit)
Modified Paths:
--------------
trunk/CustItem.php
trunk/SelectOrderItems.php
trunk/SelectProduct.php
Modified: trunk/CustItem.php
===================================================================
--- trunk/CustItem.php 2014-04-24 13:57:05 UTC (rev 6693)
+++ trunk/CustItem.php 2014-04-24 14:07:56 UTC (rev 6694)
@@ -476,4 +476,4 @@
}
include ('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php 2014-04-24 13:57:05 UTC (rev 6693)
+++ trunk/SelectOrderItems.php 2014-04-24 14:07:56 UTC (rev 6694)
@@ -112,8 +112,8 @@
salesorders.printedpackingslip,
salesorders.datepackingslipprinted,
salesorders.quotation,
- salesorders.quotation,
salesorders.quotedate,
+ salesorders.confirmeddate,
salesorders.deliverblind,
debtorsmaster.customerpoline,
locations.locationname,
Modified: trunk/SelectProduct.php
===================================================================
--- trunk/SelectProduct.php 2014-04-24 13:57:05 UTC (rev 6693)
+++ trunk/SelectProduct.php 2014-04-24 14:07:56 UTC (rev 6694)
@@ -828,4 +828,4 @@
/* end display list if there is more than one record */
include ('includes/footer.inc');
-?>
+?>
\ No newline at end of file
|
|
From: <aga...@us...> - 2014-04-24 17:16:22
|
Revision: 6695
http://sourceforge.net/p/web-erp/reponame/6695
Author: agaluski
Date: 2014-04-24 17:16:19 +0000 (Thu, 24 Apr 2014)
Log Message:
-----------
Removed Company Name from variables and labels
Modified Paths:
--------------
trunk/PDFFGLabel.php
trunk/PDFQALabel.php
trunk/companies/weberpdemo/FormDesigns/FGLabel.xml
trunk/companies/weberpdemo/FormDesigns/QALabel.xml
Modified: trunk/PDFFGLabel.php
===================================================================
--- trunk/PDFFGLabel.php 2014-04-24 14:07:56 UTC (rev 6694)
+++ trunk/PDFFGLabel.php 2014-04-24 17:16:19 UTC (rev 6695)
@@ -164,7 +164,7 @@
$pdf->addText($FormDesign->Box->x,$Page_Height-$FormDesign->Box->y,$FormDesign->Box->FontSize,'Box' . ': ' . $myrow['box']);
if ($ControlledRow[0]==1) { /*Then its a controlled item */
- $pdf->addText($FormDesign->ResMartLot->x,$Page_Height-$FormDesign->ResMartLot->y,$FormDesign->ResMartLot->FontSize,'Lot: ' . $myrow['serialno']);
+ $pdf->addText($FormDesign->Lot->x,$Page_Height-$FormDesign->Lot->y,$FormDesign->Lot->FontSize,'Lot: ' . $myrow['serialno']);
} //controlled item*/
} //end of loop around GRNs to print
Modified: trunk/PDFQALabel.php
===================================================================
--- trunk/PDFQALabel.php 2014-04-24 14:07:56 UTC (rev 6694)
+++ trunk/PDFQALabel.php 2014-04-24 17:16:19 UTC (rev 6695)
@@ -83,7 +83,7 @@
$LeftOvers = $pdf->addText($FormDesign->ItemDesc->x,$Page_Height-$FormDesign->ItemDesc->y,$FormDesign->ItemDesc->FontSize,'Description: ' . $myrow['itemdescription']);
$LeftOvers = $pdf->addText($FormDesign->SupplierName->x,$Page_Height-$FormDesign->SupplierName->y,$FormDesign->SupplierName->FontSize,'Supplier: ' . $SuppRow['suppname']);
$LeftOvers = $pdf->addText($FormDesign->SupplierLot->x,$Page_Height-$FormDesign->SupplierLot->y,$FormDesign->SupplierLot->FontSize,'Supplier Lot: ' . $SerialStockMoves['serialno']);
- $LeftOvers = $pdf->addText($FormDesign->ResMartLot->x,$Page_Height-$FormDesign->ResMartLot->y,$FormDesign->ResMartLot->FontSize,'ResMart Lot: ' . $SerialStockMoves['serialno']);
+ $LeftOvers = $pdf->addText($FormDesign->Lot->x,$Page_Height-$FormDesign->Lot->y,$FormDesign->Lot->FontSize,'Lot: ' . $SerialStockMoves['serialno']);
$LeftOvers = $pdf->addText($FormDesign->ReceiptDate->x,$Page_Height-$FormDesign->ReceiptDate->y,$FormDesign->ReceiptDate->FontSize,'Receipt Date: ' . $myrow['deliverydate']);
$LeftOvers = $pdf->addText($FormDesign->OrderNumber->x,$Page_Height-$FormDesign->OrderNumber->y,$FormDesign->OrderNumber->FontSize,'P/O: ' . $myrow['orderno']);
$PageNumber++;
@@ -96,7 +96,7 @@
$LeftOvers = $pdf->addText($FormDesign->ItemDesc->x,$Page_Height-$FormDesign->ItemDesc->y,$FormDesign->ItemDesc->FontSize,'Description: ' . $myrow['itemdescription']);
$LeftOvers = $pdf->addText($FormDesign->SupplierName->x,$Page_Height-$FormDesign->SupplierName->y,$FormDesign->SupplierName->FontSize,'Supplier: ' . $SuppRow['suppname']);
//$LeftOvers = $pdf->addText($FormDesign->SupplierLot->x,$Page_Height-$FormDesign->SupplierLot->y,$FormDesign->SupplierLot->FontSize,'Supplier Lot: ' . $myrow['serialno']);
- //$LeftOvers = $pdf->addText($FormDesign->ResMartLot->x,$Page_Height-$FormDesign->ResMartLot->y,$FormDesign->ResMartLot->FontSize,'ResMart Lot: ' . $myrow['serialno']);
+ //$LeftOvers = $pdf->addText($FormDesign->Lot->x,$Page_Height-$FormDesign->Lot->y,$FormDesign->Lot->FontSize,'Lot: ' . $myrow['serialno']);
$LeftOvers = $pdf->addText($FormDesign->ReceiptDate->x,$Page_Height-$FormDesign->ReceiptDate->y,$FormDesign->ReceiptDate->FontSize,'Receipt Date: ' . $myrow['deliverydate']);
$LeftOvers = $pdf->addText($FormDesign->OrderNumber->x,$Page_Height-$FormDesign->OrderNumber->y,$FormDesign->OrderNumber->FontSize,'P/O: ' . $myrow['orderno']);
if ($PageNumber>1){
Modified: trunk/companies/weberpdemo/FormDesigns/FGLabel.xml
===================================================================
--- trunk/companies/weberpdemo/FormDesigns/FGLabel.xml 2014-04-24 14:07:56 UTC (rev 6694)
+++ trunk/companies/weberpdemo/FormDesigns/FGLabel.xml 2014-04-24 17:16:19 UTC (rev 6695)
@@ -51,11 +51,11 @@
<x>20</x>
<y>125</y>
</ItemDesc>
- <ResMartLot type="SimpleText" name="ResMart Lot" id="ResMartLot">
+ <Lot type="SimpleText" name="Lot" id="Lot">
<FontSize>20</FontSize>
<x>20</x>
<y>175</y>
- </ResMartLot>
+ </Lot>
<Weight type="SimpleText" name="Weight" id="Weight">
<FontSize>20</FontSize>
<x>20</x>
Modified: trunk/companies/weberpdemo/FormDesigns/QALabel.xml
===================================================================
--- trunk/companies/weberpdemo/FormDesigns/QALabel.xml 2014-04-24 14:07:56 UTC (rev 6694)
+++ trunk/companies/weberpdemo/FormDesigns/QALabel.xml 2014-04-24 17:16:19 UTC (rev 6695)
@@ -23,11 +23,11 @@
<x>20</x>
<y>125</y>
</SupplierLot>
- <ResMartLot type="SimpleText" name="ResMart Lot" id="ResMartLot">
+ <Lot type="SimpleText" name="Lot" id="Lot">
<FontSize>20</FontSize>
<x>20</x>
<y>150</y>
- </ResMartLot>
+ </Lot>
<SupplierName type="SimpleText" name="Supplier name" id="SupplierName">
<FontSize>20</FontSize>
<x>20</x>
|
|
From: <te...@us...> - 2014-04-26 03:49:52
|
Revision: 6699
http://sourceforge.net/p/web-erp/reponame/6699
Author: tehonu
Date: 2014-04-26 03:49:49 +0000 (Sat, 26 Apr 2014)
Log Message:
-----------
Change consignment field to VARCHAR(20) as some carriers need 20 char for AWN
Modified Paths:
--------------
trunk/ConfirmDispatch_Invoice.php
trunk/sql/mysql/upgrade4.11-4.12.sql
Modified: trunk/ConfirmDispatch_Invoice.php
===================================================================
--- trunk/ConfirmDispatch_Invoice.php 2014-04-25 14:36:49 UTC (rev 6698)
+++ trunk/ConfirmDispatch_Invoice.php 2014-04-26 03:49:49 UTC (rev 6699)
@@ -1670,7 +1670,7 @@
$j++;
echo '<tr>
<td>' . _('Consignment Note Ref'). ':</td>
- <td><input tabindex="'.$j.'" type="text" data-type="no-illegal-chars" title="' . _('Enter the consignment note reference to enable tracking of the delivery in the event of customer proof of delivery issues') . '" maxlength="15" size="15" name="Consignment" value="' . $_POST['Consignment'] . '" /></td>
+ <td><input tabindex="'.$j.'" type="text" data-type="no-illegal-chars" title="' . _('Enter the consignment note reference to enable tracking of the delivery in the event of customer proof of delivery issues') . '" maxlength="20" size="20" name="Consignment" value="' . $_POST['Consignment'] . '" /></td>
</tr>';
$j++;
echo '<tr>
Modified: trunk/sql/mysql/upgrade4.11-4.12.sql
===================================================================
--- trunk/sql/mysql/upgrade4.11-4.12.sql 2014-04-25 14:36:49 UTC (rev 6698)
+++ trunk/sql/mysql/upgrade4.11-4.12.sql 2014-04-26 03:49:49 UTC (rev 6699)
@@ -21,3 +21,5 @@
CONSTRAINT ` custitem _ibfk_2` FOREIGN KEY (`debtorno`) REFERENCES `debtorsmaster` (`debtorno`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
UPDATE config SET confvalue='4.12' WHERE confname='VersionNumber';
+
+ALTER TABLE `debtortrans` CHANGE `consignment` `consignment` VARCHAR( 20 ) NOT NULL DEFAULT '';
|
|
From: <ex...@us...> - 2014-04-29 12:54:59
|
Revision: 6700
http://sourceforge.net/p/web-erp/reponame/6700
Author: exsonqu
Date: 2014-04-29 12:54:54 +0000 (Tue, 29 Apr 2014)
Log Message:
-----------
29/4/2014 Exson: Make price matrix workable including GetPrice.inc, MainMenuLinksArray.php,SelectOrderItems_IntoCart.inc,PriceMatrix.php, SelectProduct.php,StockDispatch.php.
Modified Paths:
--------------
trunk/PriceMatrix.php
trunk/SelectProduct.php
trunk/StockDispatch.php
trunk/includes/GetPrice.inc
trunk/includes/MainMenuLinksArray.php
trunk/includes/SelectOrderItems_IntoCart.inc
trunk/sql/mysql/upgrade4.11-4.12.sql
Modified: trunk/PriceMatrix.php
===================================================================
--- trunk/PriceMatrix.php 2014-04-26 03:49:49 UTC (rev 6699)
+++ trunk/PriceMatrix.php 2014-04-29 12:54:54 UTC (rev 6700)
@@ -19,48 +19,112 @@
//initialise no input errors assumed initially before we test
$InputError = 0;
-
+ if(isset($_POST['StockID'])){
+ $StockID = trim(strtoupper($_POST['StockID']));
+ }
if (!is_numeric(filter_number_format($_POST['QuantityBreak']))){
prnMsg( _('The quantity break must be entered as a positive number'),'error');
$InputError =1;
- $Errors[$i] = 'QuantityBreak';
- $i++;
}
if (filter_number_format($_POST['QuantityBreak'])<=0){
- prnMsg( _('The quantity of all items on an order in the discount category') . ' ' . $_POST['StockID'] . ' ' . _('at which the price will apply is 0 or less than 0') . '. ' . _('Positive numbers are expected for this entry'),'warn');
+ prnMsg( _('The quantity of all items on an order in the discount category') . ' ' . $StockID . ' ' . _('at which the price will apply is 0 or less than 0') . '. ' . _('Positive numbers are expected for this entry'),'warn');
$InputError =1;
- $Errors[$i] = 'QuantityBreak';
- $i++;
}
if (!is_numeric(filter_number_format($_POST['Price']))){
prnMsg( _('The price must be entered as a positive number'),'warn');
$InputError =1;
- $Errors[$i] = 'Price';
- $i++;
}
+ if (!Is_Date($_POST['StartDate'])){
+ $InputError = 1;
+ prnMsg(_('The date this price is to take effect from must be entered in the format') . ' ' . $_SESSION['DefaultDateFormat'],'error');
+ }
+ if (!Is_Date($_POST['EndDate'])){
+ $InputError = 1;
+ prnMsg(_('The date this price is be in effect to must be entered in the format') . ' ' . $_SESSION['DefaultDateFormat'],'error');
+ if (Date1GreaterThanDate2($_POST['StartDate'],$_POST['EndDate'])){
+ $InputError = 1;
+ prnMsg(_('The end date is expected to be after the start date, enter an end date after the start date for this price'),'error');
+ }
+ }
+
+ if(Is_Date($_POST['EndDate'])){
+ $SQLEndDate = FormatDateForSQL($_POST['EndDate']);
+ }
+ if(Is_Date($_POST['StartDate'])){
+ $SQLStartDate = FormatDateForSQL($_POST['StartDate']);
+ }
+ $sql = "SELECT COUNT(salestype)
+ FROM pricematrix
+ WHERE stockid='".$StockID."'
+ AND startdate='".$SQLStartDate."'
+ AND enddate='".$SQLEndDate."'
+ AND salestype='".$_POST['TypeAbbrev']."'
+ AND currabrev='".$_POST['currabrev']."'
+ AND quantitybreak='".$_POST['quantitybreak']."'";
+ $result = DB_query($sql,$db);
+ $myrow = DB_fetch_row($result);
+ if ($myrow[0]!=0 AND !isset($_POST['OldTypeAbbrev']) AND !isset($_POST['OldCurrAbrev'])){
+ prnMsg(_('This price has already been entered. To change it you should edit it'),'warn');
+ $InputError = 1;
+ }
+
+ if (isset($_POST['OldTypeAbbrev']) AND isset($_POST['OldCurrAbrev']) AND mb_strlen($StockID)>1 AND $InputError !=1){
+
+ /* Update existing prices */
+ $sql = "UPDATE pricematrix SET
+ salestype='" . $_POST['SalesType'] . "',
+ currabrev='" . $_POST['CurrAbrev'] . "',
+ price='" . filter_number_format($_POST['Price']) . "',
+ startdate='" . $SQLStartDate . "',
+ enddate='" . $SQLEndDate . "',
+ quantitybreak='" . filter_number_format($_POST['QuantityBreak']) . "'
+ WHERE stockid='" . $StockID . "'
+ AND startdate='" . $_POST['OldStartDate'] . "'
+ AND enddate='" . $_POST['OldEndDate'] . "'
+ AND salestype='" . $_POST['OldTypeAbbrev'] . "'
+ AND currabrev='" . $_POST['OldCurrAbrev'] . "'
+ AND quantitybreak='" . filter_number_format($_POST['OldQuantityBreak']) . "'";
+
+ $ErrMsg = _('Could not be update the existing prices');
+ $result = DB_query($sql,$db,$ErrMsg);
+
+ ReSequenceEffectiveDates ($StockID, $_POST['SalesType'],$_POST['CurrAbrev'],$_POST['QuantityBreak'],$db);
+
+ prnMsg(_('The price has been updated'),'success');
+ } elseif ($InputError != 1) {
+
/* actions to take once the user has clicked the submit button
ie the page has called itself with some user input */
- if ($InputError !=1) {
-
$sql = "INSERT INTO pricematrix (salestype,
stockid,
quantitybreak,
- price)
+ price,
+ currabrev,
+ startdate,
+ enddate)
VALUES('" . $_POST['SalesType'] . "',
'" . $_POST['StockID'] . "',
'" . filter_number_format($_POST['QuantityBreak']) . "',
- '" . filter_number_format($_POST['Price']) . "')";
-
- $result = DB_query($sql,$db);
+ '" . filter_number_format($_POST['Price']) . "',
+ '" . $_POST['CurrAbrev'] . "',
+ '" . $SQLStartDate . "',
+ '" . $SQLEndDate . "')";
+ $ErrMsg = _('Failed to insert price data');
+ $result = DB_query($sql,$db,$ErrMsg);
prnMsg( _('The price matrix record has been added'),'success');
echo '<br />';
unset($_POST['StockID']);
unset($_POST['SalesType']);
unset($_POST['QuantityBreak']);
unset($_POST['Price']);
+ unset($_POST['CurrAbrev']);
+ unset($_POST['StartDate']);
+ unset($_POST['EndDate']);
+ unset($SQLEndDate);
+ unset($SQLStartDate);
}
} elseif (isset($_GET['Delete']) and $_GET['Delete']=='yes') {
/*the link to delete a selected record was clicked instead of the submit button */
@@ -68,9 +132,12 @@
$sql="DELETE FROM pricematrix
WHERE stockid='" .$_GET['StockID'] . "'
AND salestype='" . $_GET['SalesType'] . "'
- AND quantitybreak='" . $_GET['QuantityBreak']."'";
-
- $result = DB_query($sql,$db);
+ AND quantitybreak='" . $_GET['QuantityBreak']."'
+ AND price='" . $_GET['Price'] . "'
+ AND startdate='" . $_GET['StartDate'] . "'
+ AND enddate='" . $_GET['EndDate'] . "'";
+ $ErrMsg = _('Failed to delete price data');
+ $result = DB_query($sql,$db,$ErrMsg);
prnMsg( _('The price matrix record has been deleted'),'success');
echo '<br />';
}
@@ -78,9 +145,35 @@
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-
-
+if (isset($_GET['Edit'])){
+ echo '<input type="hidden" name="OldTypeAbbrev" value="' . $_GET['TypeAbbrev'] . '" />';
+ echo '<input type="hidden" name="OldCurrAbrev" value="' . $_GET['CurrAbrev'] . '" />';
+ echo '<input type="hidden" name="OldStartDate" value="' . $_GET['StartDate'] . '" />';
+ echo '<input type="hidden" name="OldEndDate" value="' . $_GET['EndDate'] . '" />';
+ echo '<input type="hidden" name="OldQuantityBreak" value="' . $_GET['QuantityBreak'] . '" />';
+ $_POST['StartDate'] = $_GET['StartDate'];
+ $_POST['TypeAbbrev'] = $_GET['TypeAbbrev'];
+ $_POST['Price'] = $_GET['Price'];
+ $_POST['CurrAbrev'] = $_GET['CurrAbrev'];
+ $_POST['StartDate'] = ConvertSQLDate($_GET['StartDate']);
+ $_POST['EndDate'] = ConvertSQLDate($_GET['EndDate']);
+ $_POST['QuantityBreak'] = $_GET['QuantityBreak'];
+}
+$SQL = "SELECT currabrev FROM currencies";
+$result = DB_query($SQL,$db);
+require_once('includes/CurrenciesArray.php');
echo '<table class="selection">';
+echo '<tr><td>' . _('Currency') . ':</td>
+ <td><select name="CurrAbrev">';
+while ($myrow = DB_fetch_array($result)){
+ echo '<option';
+ if ($myrow['currabrev']==$_POST['CurrAbrev']){
+ echo ' selected="selected"';
+ }
+ echo ' value="' . $myrow['currabrev'] . '">' . $CurrencyName[$myrow['currabrev']] . '</option>';
+} // End while loop
+DB_free_result($result);
+echo '</select></td>';
$sql = "SELECT typeabbrev,
sales_type
@@ -101,31 +194,35 @@
}
echo '</select></td></tr>';
+if(isset($_GET['StockID'])){
+ $StockID = trim($_GET['StockID']);
+}elseif(isset($_POST['StockID'])){
+ $StockID = trim(strtoupper($_POST['StockID']));
+}elseif(!isset($StockID)){
+ prnMsg(_('You must select a stock item first before set a price maxtrix'),'error');
+ include('includes/footer.inc');
+ exit;
+}
+echo '<input type="hidden" name="StockID" value="' . $StockID . '" />';
+if (!isset($_POST['StartDate'])){
+ $_POST['StartDate'] = Date($_SESSION['DefaultDateFormat']);
+}
+if (!isset($_POST['EndDate'])){
+ $_POST['EndDate'] = GetMySQLMaxDate();
+}
+echo '<tr><td>'. _('Price Effective From Date') . ':</td>
+ <td><input type="text" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" name="StartDate" required="required" size="10" maxlength="10" title="' . _('Enter the date from which this price should take effect.') . '" value="' . $_POST['StartDate'] . '" /></td></tr>';
+echo '<tr><td>' . _('Price Effective To Date') . ':</td>
+ <td><input type="text" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" name="EndDate" size="10" maxlength="10" title="' . _('Enter the date to which this price should be in effect to, or leave empty if the price should continue indefinitely') . '" value="' . $_POST['EndDate'] . '" />';
-$sql = "SELECT stockid FROM stockmaster WHERE stockid <>'' LIMIT 300";//if the quantity is over, users have to input it himselves
-$result = DB_query($sql, $db);
-if (DB_num_rows($result) > 0) {
- echo '<tr>
- <td>' . _('Stock Code') .': </td>
- <td><input type="text" name="StockID" list="StockList" /></td>';
- echo '<datalist id="StockList">';
-
- while ($myrow = DB_fetch_array($result)){
- echo '<option value="' . $myrow['stockid'] . '">' . $myrow['stockid'] . '</option>';
- }
- echo '</datalist>';
-} else {
- echo '<tr><td><input type="hidden" name="StockID" value="" /></td></tr>';
-}
-
echo '<tr>
<td>' . _('Quantity Break') . '</td>
- <td><input class="integer' . (in_array('QuantityBreak',$Errors) ? ' inputerror' : '') . '" tabindex="3" required="required" type="number" name="QuantityBreak" size="10" maxlength="10" /></td>
+ <td><input class="integer' . (in_array('QuantityBreak',$Errors) ? ' inputerror' : '') . '" tabindex="3" required="required" type="number" name="QuantityBreak" size="10" value="'. $_POST['QuantityBreak'].'" maxlength="10" /></td>
</tr>
<tr>
<td>' . _('Price') . ' :</td>
- <td><input class="number' . (in_array('Price',$Errors) ? ' inputerror' : '') . '" tabindex="4" type="text" required="required" name="Price" title="' . _('The price to apply to orders where the quantity exceeds the specified quantity') . '" size="5" maxlength="5" /></td>
+ <td><input class="number' . (in_array('Price',$Errors) ? ' inputerror' : '') . '" tabindex="4" type="text" required="required" name="Price" value="'.$_POST['Price'].'" title="' . _('The price to apply to orders where the quantity exceeds the specified quantity') . '" size="5" maxlength="5" /></td>
</tr>
</table>
<br />
@@ -137,11 +234,20 @@
$sql = "SELECT sales_type,
salestype,
stockid,
+ startdate,
+ enddate,
quantitybreak,
- price
+ price,
+ currencies.currabrev,
+ currencies.currency,
+ currencies.decimalplaces AS currdecimalplace
FROM pricematrix INNER JOIN salestypes
ON pricematrix.salestype=salestypes.typeabbrev
- ORDER BY salestype,
+ INNER JOIN currencies
+ ON pricematrix.currabrev=currencies.currabrev
+ WHERE pricematrix.stockid='" . $StockID . "'
+ ORDER BY pricematrix.currabrev,
+ salestype,
stockid,
quantitybreak";
@@ -149,10 +255,12 @@
echo '<table class="selection">';
echo '<tr>
+ <th>' . _('Currency') . '</th>
<th>' . _('Sales Type') . '</th>
- <th>' . _('Price Matrix Category') . '</th>
+ <th>' . _('Price Effective From Date') . '</th>
+ <th>' . _('Price Effective To Date') .'</th>
<th>' . _('Quantity Break') . '</th>
- <th>' . _('Sell Price') . ' %' . '</th>
+ <th>' . _('Sell Price') . '</th>
</tr>';
$k=0; //row colour counter
@@ -165,20 +273,44 @@
echo '<tr class="OddTableRows">';
$k=1;
}
- $DeleteURL = htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?Delete=yes&SalesType=' . $myrow['salestype'] . '&StockID=' . $myrow['stockid'] . '&QuantityBreak=' . $myrow['quantitybreak'];
+ $DeleteURL = htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?Delete=yes&SalesType=' . $myrow['salestype'] . '&StockID=' . $myrow['stockid'] . '&QuantityBreak=' . $myrow['quantitybreak'].'&Price=' . $myrow['price'] . '&currabrev=' . $myrow['currabrev'].'&StartDate='.$myrow['startdate'].'&EndDate='.$myrow['enddate'];
+ $EditURL = htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?Edit=yes&StockID=' . $myrow['stockid'] . '&TypeAbbrev=' . $myrow['salestype'] . '&CurrAbrev=' . $myrow['currabrev'] . '&Price=' . locale_number_format($myrow['price'], $myrow['currdecimalplaces']) . '&StartDate=' . $myrow['startdate'] . '&EndDate=' . $myrow['enddate'].'&QuantityBreak=' . $myrow['quantitybreak'];
- printf('<td>%s</td>
+ if (in_array(5, $_SESSION['AllowedPageSecurityTokens'])){
+ printf('<td>%s</td>
+ <td>%s</td>
<td>%s</td>
+ <td>%s</td>
<td class="number">%s</td>
<td class="number">%s</td>
<td><a href="%s" onclick="return confirm(\'' . _('Are you sure you wish to delete this discount matrix record?') . '\');">' . _('Delete') . '</a></td>
+ <td><a href="%s">'._('Edit').'</a></td>
</tr>',
+ $myrow['currency'],
$myrow['sales_type'],
- $myrow['stockid'],
+ ConvertSQLDate($myrow['startdate']),
+ ConvertSQLDate($myrow['enddate']),
$myrow['quantitybreak'],
$myrow['price'] ,
- $DeleteURL);
+ $DeleteURL,
+ $EditURL);
+ }else {
+ printf('<td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td class="number">%s</td>
+ <td class="number">%s</td>
+ </tr>',
+ $myrow['currency'],
+ $myrow['sales_type'],
+ ConvertSQLDate($myrow['startdate']),
+ ConvertSQLDate($myrow['enddate']),
+ $myrow['quantitybreak'],
+ $myrow['price']);
+ }
+
}
echo '</table>
@@ -186,4 +318,68 @@
</form>';
include('includes/footer.inc');
+
+function GetMySQLMaxDate () {
+ switch ($_SESSION['DefaultDateFormat']){
+ case 'd/m/Y':
+ return '31/12/9999';
+ case 'd.m.Y':
+ return '31.12.9999';
+ case 'm/d/Y':
+ return '12/31/9999';
+ case 'Y-m-d':
+ return '9999-12-31';
+ case 'Y/m/d':
+ return '9999/12/31';
+ }
+}
+function ReSequenceEffectiveDates ($Item, $PriceList, $CurrAbbrev, $QuantityBreak,$db) {
+
+ /*This is quite complicated - the idea is that prices set up should be unique and there is no way two prices could be returned as valid - when getting a price in includes/GetPrice.inc the logic is to first look for a price of the salestype/currency within the effective start and end dates - then if not get the price with a start date prior but a blank end date (the default price). We would not want two prices where one price falls inside another effective date range except in the case of a blank end date - ie no end date - the default price for the currency/salestype.
+ I first thought that we would need to update the previous default price (blank end date), when a new default price is entered, to have an end date of the startdate of this new default price less 1 day - but this is converting a default price into a special price which could result in having two special prices over the same date range - best to leave it unchanged and use logic in the GetPrice.inc to ensure the correct default price is returned
+ *
+ * After further discussion (Ricard) if the new price has a blank end date - i.e. no end then the pre-existing price with no end date should be changed to have an end date just prior to the new default (no end date) price commencing
+ */
+ //this is just the case where debtorno='' - see the Prices_Customer.php script for customer special prices
+ $SQL = "SELECT price,
+ startdate,
+ enddate
+ FROM pricematrix
+ WHERE stockid='" . $Item . "'
+ AND currabrev='" . $CurrAbbrev . "'
+ AND salestype='" . $PriceList . "'
+ AND quantitybreak='".$QuantityBreak."'
+ ORDER BY startdate, enddate";
+ $result = DB_query($SQL,$db);
+
+ while ($myrow = DB_fetch_array($result)){
+ if (isset($NextStartDate)){
+ if (Date1GreaterThanDate2(ConvertSQLDate($myrow['startdate']),$NextStartDate)){
+ $NextStartDate = ConvertSQLDate($myrow['startdate']);
+ //Only if the previous enddate is after the new start date do we need to look at updates
+ if (Date1GreaterThanDate2(ConvertSQLDate($EndDate),ConvertSQLDate($myrow['startdate']))) {
+ /*Need to make the end date the new start date less 1 day */
+ $SQL = "UPDATE pricematrix SET enddate = '" . FormatDateForSQL(DateAdd($NextStartDate,'d',-1)) . "'
+ WHERE stockid ='" .$Item . "'
+ AND currabrev='" . $CurrAbbrev . "'
+ AND salestype='" . $PriceList . "'
+ AND startdate ='" . $StartDate . "'
+ AND enddate = '" . $EndDate . "'
+ AND quantitybreak ='" . $QuantityBreak . "'";
+ $UpdateResult = DB_query($SQL,$db);
+ }
+ } //end of if startdate after NextStartDate - we have a new NextStartDate
+ } //end of if set NextStartDate
+ else {
+ $NextStartDate = ConvertSQLDate($myrow['startdate']);
+ }
+ $StartDate = $myrow['startdate'];
+ $EndDate = $myrow['enddate'];
+ $Price = $myrow['price'];
+ } // end of loop around all prices
+
+
+
+} // end function ReSequenceEffectiveDates
+
?>
\ No newline at end of file
Modified: trunk/SelectProduct.php
===================================================================
--- trunk/SelectProduct.php 2014-04-26 03:49:49 UTC (rev 6699)
+++ trunk/SelectProduct.php 2014-04-29 12:54:54 UTC (rev 6700)
@@ -501,6 +501,7 @@
}
echo '<a href="' . $RootPath . '/DiscountCategories.php?StockID=' . $StockID . '">' . _('Maintain Discount Category') . '</a><br />';
echo '<a href="' . $RootPath . '/StockClone.php?OldStockID=' . $StockID . '">' . _('Clone This Item') . '</a><br />';
+ echo '<a href="' . $RootPath . '/PriceMatrix.php?StockID=' . $StockID . '">' . _('Maintain Price Matrix') . '</a><br />';
}
echo '</td></tr></table>';
} else {
Modified: trunk/StockDispatch.php
===================================================================
--- trunk/StockDispatch.php 2014-04-26 03:49:49 UTC (rev 6699)
+++ trunk/StockDispatch.php 2014-04-29 12:54:54 UTC (rev 6700)
@@ -233,7 +233,7 @@
$pdf->addTextWrap(510,$YPos,40,$FontSize,'_________','right',0,$fill);
if($template=='fullprices'){
// looking for price info
- $DefaultPrice = GetPrice($myrow['stockid'], $ToCustomer, $ToBranch, $db, false);
+ $DefaultPrice = GetPrice($myrow['stockid'],$ToCustomer, $ToBranch, $db,$ShipQty, false);
if ($myrow['discountcategory'] != "")
{
$DiscountLine = ' -> ' . _('Discount Category') . ':' . $myrow['discountcategory'];
Modified: trunk/includes/GetPrice.inc
===================================================================
--- trunk/includes/GetPrice.inc 2014-04-26 03:49:49 UTC (rev 6699)
+++ trunk/includes/GetPrice.inc 2014-04-29 12:54:54 UTC (rev 6700)
@@ -1,16 +1,8 @@
<?php
/* $Id$*/
-function GetPrice ($StockID, $DebtorNo, $BranchCode, $db, $ReportZeroPrice=1){
+function GetPrice ($StockID, $DebtorNo, $BranchCode, $db, $OrderLineQty,$ReportZeroPrice=1){
$Price = 0;
- //get the price from price matrix
- $sql = "SELECT pricematrix.price FROM pricematrix,debtorsmaster
- WHERE debtorsmaster.salestype=pricematrix.salestype
- AND debtorsmaster.debtorno = '".$DebtorNo."'
- AND pricematrix.stockid = '".$StockID."'";
- $ErrorMsg = _('Failed to retrieve price from price matrix');
- $result = DB_query($sql,$db,$ErrMsg);
- if (DB_num_rows($result) == 0){
/*Search by branch and customer for a date specified price */
$sql="SELECT prices.price
@@ -27,7 +19,6 @@
$ErrMsg = _('There is a problem in retrieving the pricing information for part') . ' ' . $StockID . ' ' . _('and for Customer') . ' ' . $DebtorNo . ' ' . _('the error message returned by the SQL server was');
$result = DB_query($sql, $db,$ErrMsg);
- }
if (DB_num_rows($result)==0){
/*Need to try same specific search but for a default price with a zero end date */
$sql="SELECT prices.price,
@@ -149,6 +140,19 @@
$result = DB_query($sql, $db,$ErrMsg);
if (DB_num_rows($result)==0){
+ /* Now check the price matrix */
+ $sql = "SELECT max(pricematrix.price) FROM pricematrix,
+ debtorsmaster
+ WHERE pricematrix.stockid = '".$StockID . "'
+ AND pricematrix.currabrev = debtorsmaster.currcode
+ AND pricematrix.salestype = debtorsmaster.salestype
+ AND pricematrix.quantitybreak >= '".$OrderLineQty."'
+ AND pricematrix.startdate <= '" . Date('Y-m-d') . "'
+ AND pricematrix.enddate >='" . Date('Y-m-d')."'";
+ $ErrMsg = _('There is an error to retrieve price from price matrix for stock '.$StockID.' and the error message returned by SQL server is ');
+ $result = DB_query($sql,$db,$ErrMsg);
+ }
+ if (DB_num_rows($result)==0){
/*Not even a price set up in the default price list so return 0 */
if ($ReportZeroPrice ==1){
prnMsg(_('There are no prices set up for') . ' ' . $StockID,'warn');
Modified: trunk/includes/MainMenuLinksArray.php
===================================================================
--- trunk/includes/MainMenuLinksArray.php 2014-04-26 03:49:49 UTC (rev 6699)
+++ trunk/includes/MainMenuLinksArray.php 2014-04-29 12:54:54 UTC (rev 6700)
@@ -483,8 +483,7 @@
_('Sales GL Interface Postings'),
_('COGS GL Interface Postings'),
_('Freight Costs Maintenance'),
- _('Discount Matrix'),
- _('Price Matrix'));
+ _('Discount Matrix'));
$MenuItems['system']['Reports']['URL'] = array( '/SalesTypes.php',
'/CustomerTypes.php',
@@ -499,8 +498,7 @@
'/SalesGLPostings.php',
'/COGSGLPostings.php',
'/FreightCosts.php',
- '/DiscountMatrix.php',
- '/PriceMatrix.php');
+ '/DiscountMatrix.php');
$MenuItems['system']['Maintenance']['Caption'] = array( _('Inventory Categories Maintenance'),
_('Inventory Locations Maintenance'),
@@ -579,4 +577,4 @@
'/Z_RePostGLFromPeriod.php',
'/Z_DeleteOldPrices.php',
'/Z_ImportPriceList.php');
-?>
+?>
\ No newline at end of file
Modified: trunk/includes/SelectOrderItems_IntoCart.inc
===================================================================
--- trunk/includes/SelectOrderItems_IntoCart.inc 2014-04-26 03:49:49 UTC (rev 6699)
+++ trunk/includes/SelectOrderItems_IntoCart.inc 2014-04-29 12:54:54 UTC (rev 6700)
@@ -109,7 +109,7 @@
$Discount = 0;
}
- $Price = GetPrice($NewItem, $_SESSION['Items'.$identifier]->DebtorNo,$_SESSION['Items'.$identifier]->Branch, $db);
+ $Price = GetPrice($NewItem, $_SESSION['Items'.$identifier]->DebtorNo,$_SESSION['Items'.$identifier]->Branch, $db,$NewItemQty);
/* Need to check for sell through support deals */
Modified: trunk/sql/mysql/upgrade4.11-4.12.sql
===================================================================
--- trunk/sql/mysql/upgrade4.11-4.12.sql 2014-04-26 03:49:49 UTC (rev 6699)
+++ trunk/sql/mysql/upgrade4.11-4.12.sql 2014-04-29 12:54:54 UTC (rev 6700)
@@ -20,6 +20,15 @@
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;
+ALTER table pricematrix ADD column currabrev char(3) NOT NULL DEFAULT '';
+ALTER table pricematrix ADD column startdate date NOT NULL DEFAULT '0000-00-00';
+ALTER table pricematrix ADD column enddate date NOT NULL DEFAULT '9999-12-31';
+ALTER table pricematrix DROP PRIMARY KEY;
+ALTER table pricematrix ADD PRIMARY KEY (`salestype`,`stockid`,`currabrev`,`quantitybreak`,`startdate`,`enddate`);
+ALTER table pricematrix DROP KEY `DiscountCategory`;
+ALTER table pricematrix ADD KEY currabrev(`currabrev`);
+ALTER table pricematrix ADD KEY stockid(`stockid`);
+ALTER TABLE `debtortrans` CHANGE `consignment` `consignment` VARCHAR( 20 ) NOT NULL DEFAULT '';
UPDATE config SET confvalue='4.12' WHERE confname='VersionNumber';
-ALTER TABLE `debtortrans` CHANGE `consignment` `consignment` VARCHAR( 20 ) NOT NULL DEFAULT '';
+
|
|
From: <aga...@us...> - 2014-04-30 17:31:12
|
Revision: 6702
http://sourceforge.net/p/web-erp/reponame/6702
Author: agaluski
Date: 2014-04-30 17:31:08 +0000 (Wed, 30 Apr 2014)
Log Message:
-----------
Add new field to workorders table to store closing comments
Allow updates to comments in WorkOrderEntry.php even if other edits are not allowed
Allow closecomments to be entered and viewed in WorkOrderCosting.php
Modified Paths:
--------------
trunk/WorkOrderCosting.php
trunk/WorkOrderEntry.php
trunk/sql/mysql/upgrade4.11-4.12.sql
Modified: trunk/WorkOrderCosting.php
===================================================================
--- trunk/WorkOrderCosting.php 2014-04-29 12:57:39 UTC (rev 6701)
+++ trunk/WorkOrderCosting.php 2014-04-30 17:31:08 UTC (rev 6702)
@@ -44,7 +44,8 @@
locations.locationname,
workorders.requiredby,
workorders.startdate,
- workorders.closed
+ workorders.closed,
+ closecomments
FROM workorders INNER JOIN locations
ON workorders.loccode=locations.loccode
WHERE workorders.wo='" . $_POST['WO'] . "'",
@@ -516,7 +517,7 @@
} //end of standard costing section
} // end loop around the items on the work order
- $CloseWOResult =DB_query("UPDATE workorders SET closed=1 WHERE wo='" .$_POST['WO'] . "'",
+ $CloseWOResult =DB_query("UPDATE workorders SET closed=1, closecomments = '". $_POST['CloseComments'] ."' WHERE wo='" .$_POST['WO'] . "'",
$db,
_('Could not update the work order to closed because:'),
_('The SQL used to close the work order was:'),
@@ -543,7 +544,24 @@
$WorkOrderRow['closed']=1;
}//end close button hit by user
+if ($WorkOrderRow['closed']==0){
+ $ReadOnly='';
+} else{
+ $ReadOnly='readonly';
+ if (!isset($_POST['CloseComments'])) {
+ $_POST['CloseComments'] = $WorkOrderRow['closecomments'];
+ }
+}
+echo '<tr>
+ <td colspan="9">
+
+ <div class="centre">
+ <textarea ' . $ReadOnly . ' style="width:100%" rows="5" cols="80" name="CloseComments" >' . $_POST['CloseComments'] . '</textarea>
+ </div>
+ </td>
+ </tr>';
+
if ($WorkOrderRow['closed']==0){
echo '<tr>
<td colspan="9">
Modified: trunk/WorkOrderEntry.php
===================================================================
--- trunk/WorkOrderEntry.php 2014-04-29 12:57:39 UTC (rev 6701)
+++ trunk/WorkOrderEntry.php 2014-04-30 17:31:08 UTC (rev 6702)
@@ -196,8 +196,12 @@
if (!isset($Offset)) {
$Offset=0;
}
- if($Offset<0)$Offset=0;
- if($Offset>$ListPageMax)$Offset=$ListPageMax;
+ if($Offset<0){
+ $Offset=0;
+ }
+ if($Offset>$ListPageMax){
+ $Offset=$ListPageMax;
+ }
$sql = $sql . ' LIMIT ' . $_SESSION['DisplayRecordsMax'].' OFFSET ' . strval($_SESSION['DisplayRecordsMax']*$Offset);
@@ -355,6 +359,9 @@
if (!isset($_POST['WOComments'.$i])) {
$_POST['WOComments'.$i]='';
}
+ $sql[] = "UPDATE woitems SET comments = '". $_POST['WOComments'.$i] ."'
+ WHERE wo='" . $_POST['WO'] . "'
+ AND stockid='" . $_POST['OutputItem'.$i] . "'";
if (isset($_POST['QtyRecd'.$i]) AND $_POST['QtyRecd'.$i]>$_POST['OutputQty'.$i]){
$_POST['OutputQty'.$i]=$_POST['QtyRecd'.$i]; //OutputQty must be >= Qty already reced
}
@@ -376,14 +383,12 @@
}
$sql[] = "UPDATE woitems SET qtyreqd = '". $_POST['OutputQty' . $i] . "',
nextlotsnref = '". $_POST['NextLotSNRef'.$i] ."',
- stdcost ='" . $Cost . "',
- comments = '". $_POST['WOComments'.$i] ."'
+ stdcost ='" . $Cost . "'
WHERE wo='" . $_POST['WO'] . "'
AND stockid='" . $_POST['OutputItem'.$i] . "'";
} elseif (isset($_POST['HasWOSerialNos'.$i]) AND $_POST['HasWOSerialNos'.$i]==false) {
$sql[] = "UPDATE woitems SET qtyreqd = '". $_POST['OutputQty' . $i] . "',
- nextlotsnref = '". $_POST['NextLotSNRef'.$i] ."',
- comments = '". $_POST['WOComments'.$i] ."'
+ nextlotsnref = '". $_POST['NextLotSNRef'.$i] ."'
WHERE wo='" . $_POST['WO'] . "'
AND stockid='" . $_POST['OutputItem'.$i] . "'";
}
Modified: trunk/sql/mysql/upgrade4.11-4.12.sql
===================================================================
--- trunk/sql/mysql/upgrade4.11-4.12.sql 2014-04-29 12:57:39 UTC (rev 6701)
+++ trunk/sql/mysql/upgrade4.11-4.12.sql 2014-04-30 17:31:08 UTC (rev 6702)
@@ -29,6 +29,7 @@
ALTER table pricematrix ADD KEY currabrev(`currabrev`);
ALTER table pricematrix ADD KEY stockid(`stockid`);
ALTER TABLE `debtortrans` CHANGE `consignment` `consignment` VARCHAR( 20 ) NOT NULL DEFAULT '';
+ALTER TABLE `workorders` ADD `closecomments` LONGBLOB NULL DEFAULT NULL ;
UPDATE config SET confvalue='4.12' WHERE confname='VersionNumber';
|
|
From: <dai...@us...> - 2014-05-03 00:12:45
|
Revision: 6703
http://sourceforge.net/p/web-erp/reponame/6703
Author: daintree
Date: 2014-05-03 00:12:42 +0000 (Sat, 03 May 2014)
Log Message:
-----------
StockCost update now allows manufactured item cost updates
Modified Paths:
--------------
trunk/StockCostUpdate.php
trunk/doc/Change.log
trunk/includes/FreightCalculation.inc
trunk/sql/mysql/upgrade4.11-4.12.sql
Modified: trunk/StockCostUpdate.php
===================================================================
--- trunk/StockCostUpdate.php 2014-04-30 17:31:08 UTC (rev 6702)
+++ trunk/StockCostUpdate.php 2014-05-03 00:12:42 UTC (rev 6703)
@@ -117,17 +117,23 @@
$myrow = DB_fetch_array($result);
-echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
-echo '<div>';
-echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
+ <div>
+ <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
+ <table cellpadding="2" class="selection">
+ <tr>
+ <th colspan="2">' . _('Item Code') . ':<input type="text" name="StockID" value="' . $StockID . '" maxlength="20" /><input type="submit" name="Show" value="' . _('Show Cost Details') . '" /></th>
+ </tr>
+ <tr>
+ <th colspan="2">' . $StockID . ' - ' . $myrow['description'] . '</th>
+ </tr>
+ <tr>
+ <th colspan="2">' . _('Total Quantity On Hand') . ': ' . $myrow['totalqoh'] . ' ' . $myrow['units'] . '</th>
+ </tr>
+ <tr>
+ <th colspan="2">' . _('Last Cost update on') . ': ' . ConvertSQLDate($myrow['lastcostupdate']) . '</th>
+ </tr>';
-echo '<table cellpadding="2" class="selection">';
-echo '<tr><th colspan="2">' . _('Item Code') . ':<input type="text" name="StockID" value="' . $StockID . '" maxlength="20" />';
-echo '<input type="submit" name="Show" value="' . _('Show Cost Details') . '" /></th></tr>';
-echo '<tr><th colspan="2">' . $StockID . ' - ' . $myrow['description'] . '</th></tr>';
-echo '<tr><th colspan="2">' . _('Total Quantity On Hand') . ': ' . $myrow['totalqoh'] . ' ' . $myrow['units'] . '</th></tr>';
-echo '<tr><th colspan="2">' . _('Last Cost update on') . ': ' . ConvertSQLDate($myrow['lastcostupdate']) . '</th></tr>';
-
if (($myrow['mbflag']=='D' AND $myrow['stocktype'] != 'L')
OR $myrow['mbflag']=='A'
OR $myrow['mbflag']=='K'){
@@ -153,23 +159,24 @@
echo _('Last Cost') .':</td>
<td class="number">' . locale_number_format($myrow['lastcost'],$_SESSION['StandardCostDecimalPlaces']) . '</td></tr>';
-if (! in_array($UpdateSecurity,$_SESSION['AllowedPageSecurityTokens'])){
- echo '<tr><td>' . _('Cost') . ':</td>
+if (! in_array($_SESSION['PageSecurityArray']['CostUpdate'],$_SESSION['AllowedPageSecurityTokens'])){
+ echo '<tr>
+ <td>' . _('Cost') . ':</td>
<td class="number">' . locale_number_format($myrow['materialcost']+$myrow['labourcost']+$myrow['overheadcost'],$_SESSION['StandardCostDecimalPlaces']) . '</td>
</tr>
</table>';
} else {
if ($myrow['mbflag']=='M'){
- echo '<tr><td><input type="hidden" name="MaterialCost" value="' . $myrow['materialcost'] . '" />';
- echo _('Standard Material Cost Per Unit') .':</td>
- <td class="number">' . locale_number_format($myrow['materialcost'],$_SESSION['StandardCostDecimalPlaces']) . '</td>
- </tr>';
echo '<tr>
+ <td>' . _('Standard Material Cost Per Unit') .':</td>
+ <td class="number"><input type="text" class="number" name="MaterialCost" value="' . locale_number_format($myrow['materialcost'],$_SESSION['StandardCostDecimalPlaces']) . '" /></td>
+ </tr>
+ <tr>
<td>' . _('Standard Labour Cost Per Unit') . ':</td>
<td class="number"><input type="text" class="number" name="LabourCost" value="' . locale_number_format($myrow['labourcost'],$_SESSION['StandardCostDecimalPlaces']) . '" /></td>
- </tr>';
- echo '<tr>
+ </tr>
+ <tr>
<td>' . _('Standard Overhead Cost Per Unit') . ':</td>
<td class="number"><input type="text" class="number" name="OverheadCost" value="' . locale_number_format($myrow['overheadcost'],$_SESSION['StandardCostDecimalPlaces']) . '" /></td>
</tr>';
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2014-04-30 17:31:08 UTC (rev 6702)
+++ trunk/doc/Change.log 2014-05-03 00:12:42 UTC (rev 6703)
@@ -1,5 +1,7 @@
webERP Change Log
-29/4/2014 Exson: Make price matrix workable including GetPrice.inc, MainMenuLinksArray.php,SelectOrderItems_IntoCart.inc,PriceMatrix.php, SelectProduct.php,StockDispatch.php.
+
+3/5/14 Phil: StockCostUpdate.php now allows updates to manufactured items.
+29/4/14 Exson: Make price matrix workable including GetPrice.inc, MainMenuLinksArray.php,SelectOrderItems_IntoCart.inc,PriceMatrix.php, SelectProduct.php,StockDispatch.php.
20/04/14 Exson: Fixed undefined variable bugs in PDFWOPageHeader.inc and PDFWOPrint.php and remove some redundant codes in PDFWOPrint.php
17/04/14 Exson: Update zh_CN.utf8 translation.
09/04/14 Tim: Fixed the table sort failure bugs in SelectSalesOrder.php reported by Andrew Agaluski.
Modified: trunk/includes/FreightCalculation.inc
===================================================================
--- trunk/includes/FreightCalculation.inc 2014-04-30 17:31:08 UTC (rev 6702)
+++ trunk/includes/FreightCalculation.inc 2014-05-03 00:12:42 UTC (rev 6703)
@@ -5,21 +5,28 @@
Function CalcFreightCost ($TotalValue,
- $BrAdd2,
- $BrAdd3,
- $BrAdd4,
- $BrAdd5,
- $BrAddCountry,
- $TotalVolume,
- $TotalWeight,
- $FromLocation,
- $Currency,
- $db){
-
+ $BrAdd2,
+ $BrAdd3,
+ $BrAdd4,
+ $BrAdd5,
+ $BrAddCountry,
+ $TotalVolume,
+ $TotalWeight,
+ $FromLocation,
+ $Currency,
+ $db){
+
+
$ParameterError = FALSE;
if ((!isset($BrAdd2)) AND (!isset($BrAdd3)) AND (!isset($BrAdd4)) AND (!isset($BrAdd5)) AND (!isset($BrAddCountry))){
// No address field to detect destination ==> ERROR
$ParameterError = TRUE;
+ //echo '<br />Branch address 2 : ' . $BrAdd2;
+ //echo '<br />Branch address 3 : ' . $BrAdd3;
+ //echo '<br />Branch address 4 : ' . $BrAdd4;
+ //echo '<br />Branch address 5 : ' . $BrAdd5;
+ //echo '<br />Branch address country : ' . $BrAddCountry;
+
}
if ((!isset($TotalVolume)) AND (!isset($TotalWeight))){
// No weight AND no volume ==> ERROR
@@ -27,19 +34,23 @@
}
if (!isset($FromLocation)){
// No location FROM ==> ERROR
+ //echo '<br />From Location : ' . $FromLocation;
+
$ParameterError = TRUE;
}
if (!isset($Currency)){
// No Currency ==> ERROR
+ //echo '<br />Currency : ' . $Currency;
+
$ParameterError = TRUE;
}
if($ParameterError){
- return array ("NOT AVAILABLE", "NOT AVAILABLE");
+ return array ("NOT AVAILABLE", "NOT AVAILABLE");
}
// All parameters are OK, so we move ahead...
// make an array of all the words that could be the name of the destination zone (city, state or ZIP)
- $FindCity = explode(' ', $BrAdd2 . ' ' . $BrAdd3 . ' ' . $BrAdd4 . ' ' . $BrAdd5);
+ $FindCity = array($BrAdd2, $BrAdd3, $BrAdd4, $BrAdd5);
$sql = "SELECT shipperid,
kgrate * " . $TotalWeight . " AS kgcost,
@@ -48,24 +59,25 @@
minimumchg
FROM freightcosts
WHERE locationfrom = '" . $FromLocation . "'
- AND destinationcountry = '" . $BrAddCountry . "'
+ AND destinationcountry = '" . strtoupper($BrAddCountry) . "'
AND maxkgs > " . $TotalWeight . "
- AND maxcub >" . $TotalVolume . " ";
- if (($BrAdd2 != '') OR ($BrAdd3 != '') OR ($BrAdd4 != '') OR ($BrAdd5 != '')){
- // if there is some details of the address besides the country
- $sql .= " AND (";
- foreach ($FindCity as $City) {
- if (ucwords($City) != ''){
- $sql = $sql . " destination LIKE '" . ucwords($City) . "%' OR";
- }
- }
- if ($BrAddCountry != $CountriesArray[$_SESSION['CountryOfOperation']]){
- /* For international shipments empty destination (ANY) is allowed */
- $sql = $sql . " destination = '' OR";
- }
- $sql = mb_substr($sql, 0, mb_strrpos($sql,' OR')) . ')';
- }
-// echo ($sql);
+ AND maxcub >" . $TotalVolume . " AND (";
+
+ //ALL suburbs and cities are compared in upper case - so data in freight tables must be in upper case too
+ foreach ($FindCity as $City) {
+ if ( strtoupper($City) != ''){
+ $sql .= " destination LIKE '" . strtoupper($City) . "%' OR";
+ }
+ }
+ if ($BrAddCountry != $CountriesArray[$_SESSION['CountryOfOperation']]){
+ /* For international shipments empty destination (ANY) is allowed */
+ $sql .= " destination = '' OR";
+ }
+ $sql = mb_substr($sql, 0, mb_strrpos($sql,' OR')) . ')';
+
+ //echo $sql;
+
+
$CalcFreightCostResult = DB_query($sql,$db);
if (DB_error_no($db) !=0) {
echo _('The freight calculation for the destination city cannot be performed because') . ' - ' . DB_error_msg($db) . ' - ' . $sql;
@@ -84,27 +96,31 @@
$CalcFreightCost=$myrow['fixedprice'];
$CalcBestShipper =$myrow['shipperid'];
}
- } elseif ($myrow['cubcost'] > $myrow['kgcost'] && $myrow['cubcost'] > $myrow['minimumchg'] && $myrow['cubcost'] < $CalcFreightCost) {
+ } elseif ($myrow['cubcost'] > $myrow['kgcost'] && $myrow['cubcost'] > $myrow['minimumchg'] && $myrow['cubcost'] <= $CalcFreightCost) {
$CalcFreightCost=$myrow['cubcost'];
$CalcBestShipper =$myrow['shipperid'];
- } elseif ($myrow['kgcost']>$myrow['cubcost'] && $myrow['kgcost'] > $myrow['minimumchg'] && $myrow['kgcost'] < $CalcFreightCost) {
+ } elseif ($myrow['kgcost']>$myrow['cubcost'] && $myrow['kgcost'] > $myrow['minimumchg'] && $myrow['kgcost'] <= $CalcFreightCost) {
$CalcFreightCost=$myrow['kgcost'];
$CalcBestShipper =$myrow['shipperid'];
- } elseif ($myrow['minimumchg']< $CalcFreightCost){
+ } elseif ($myrow['minimumchg'] < $CalcFreightCost){
$CalcFreightCost=$myrow['minimumchg'];
$CalcBestShipper =$myrow['shipperid'];
}
+ //echo '<br /> calculated freight cost = ' . $CalcFreightCost;
}
} else {
$CalcFreightCost = "NOT AVAILABLE";
}
- if ($TotalValue >= $_SESSION['FreightChargeAppliesIfLessThan']){
+ if ($TotalValue >= $_SESSION['FreightChargeAppliesIfLessThan'] AND $_SESSION['FreightChargeAppliesIfLessThan']!=0){
+
+ //echo '<br />Freight should be charged on orders less than ' . $_SESSION['FreightChargeAppliesIfLessThan'];
+
/*Even though the order is over the freight free threshold - still need to calculate the best shipper to ensure get best deal*/
$CalcFreightCost =0;
}
@@ -118,7 +134,7 @@
$ExRate =1;
}
if ($CalcFreightCost != "NOT AVAILABLE"){
- $CalcFreightCost = $CalcFreightCost * $ExRate;
+ $CalcFreightCost *= $ExRate;
}
}
Modified: trunk/sql/mysql/upgrade4.11-4.12.sql
===================================================================
--- trunk/sql/mysql/upgrade4.11-4.12.sql 2014-04-30 17:31:08 UTC (rev 6702)
+++ trunk/sql/mysql/upgrade4.11-4.12.sql 2014-05-03 00:12:42 UTC (rev 6703)
@@ -7,6 +7,7 @@
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;
+INSERT INTO scripts VALUES ('CostUpdate','10','NB Not a script but allows users to maintain item costs from withing StockCostUpdate.php');
CREATE TABLE `custitem` (
`debtorno` char(10) NOT NULL DEFAULT '',
`stockid` varchar(20) NOT NULL DEFAULT '',
@@ -30,6 +31,7 @@
ALTER table pricematrix ADD KEY stockid(`stockid`);
ALTER TABLE `debtortrans` CHANGE `consignment` `consignment` VARCHAR( 20 ) NOT NULL DEFAULT '';
ALTER TABLE `workorders` ADD `closecomments` LONGBLOB NULL DEFAULT NULL ;
+
UPDATE config SET confvalue='4.12' WHERE confname='VersionNumber';
|
|
From: <dai...@us...> - 2014-05-03 09:51:57
|
Revision: 6704
http://sourceforge.net/p/web-erp/reponame/6704
Author: daintree
Date: 2014-05-03 09:51:53 +0000 (Sat, 03 May 2014)
Log Message:
-----------
Khwunchai J.: New Xenos theme
Modified Paths:
--------------
trunk/doc/Change.log
Added Paths:
-----------
trunk/css/xenos/
trunk/css/xenos/.goutputstream-RI22EX
trunk/css/xenos/bullet.gif
trunk/css/xenos/default.css
trunk/css/xenos/images/
trunk/css/xenos/images/Graphique-32.png
trunk/css/xenos/images/allocation.gif
trunk/css/xenos/images/allocation.png
trunk/css/xenos/images/ar.gif
trunk/css/xenos/images/ar.png
trunk/css/xenos/images/back.png
trunk/css/xenos/images/bank.gif
trunk/css/xenos/images/bar.png
trunk/css/xenos/images/button_bg.png
trunk/css/xenos/images/company.gif
trunk/css/xenos/images/company.png
trunk/css/xenos/images/contract.png
trunk/css/xenos/images/credit.gif
trunk/css/xenos/images/currency.gif
trunk/css/xenos/images/customer.png
trunk/css/xenos/images/email.gif
trunk/css/xenos/images/error.png
trunk/css/xenos/images/folder_add.png
trunk/css/xenos/images/folders.gif
trunk/css/xenos/images/gelblue.png
trunk/css/xenos/images/gelbluebutton.png
trunk/css/xenos/images/gelblueh.png
trunk/css/xenos/images/gl.png
trunk/css/xenos/images/group_add.png
trunk/css/xenos/images/help.png
trunk/css/xenos/images/hoverbuttonblue.png
trunk/css/xenos/images/input.png
trunk/css/xenos/images/input_bg.png
trunk/css/xenos/images/inputh.png
trunk/css/xenos/images/inputhtxt.png
trunk/css/xenos/images/inputtxt.png
trunk/css/xenos/images/inquiries.png
trunk/css/xenos/images/inventory.gif
trunk/css/xenos/images/inventory.png
trunk/css/xenos/images/magnifier.png
trunk/css/xenos/images/maintenance.gif
trunk/css/xenos/images/maintenance.png
trunk/css/xenos/images/menu_bg.png
trunk/css/xenos/images/menu_bg_blue.png
trunk/css/xenos/images/menu_bg_dblue.png
trunk/css/xenos/images/menu_bg_grey.png
trunk/css/xenos/images/menu_bg_indigo.png
trunk/css/xenos/images/menu_bg_white.png
trunk/css/xenos/images/menucurve.gif
trunk/css/xenos/images/money_add.png
trunk/css/xenos/images/money_delete.png
trunk/css/xenos/images/note_add.png
trunk/css/xenos/images/pdf.png
trunk/css/xenos/images/preview.gif
trunk/css/xenos/images/printer.png
trunk/css/xenos/images/reports.gif
trunk/css/xenos/images/reports.png
trunk/css/xenos/images/sales.png
trunk/css/xenos/images/security.png
trunk/css/xenos/images/stripe.png
trunk/css/xenos/images/supplier.png
trunk/css/xenos/images/tick.png
trunk/css/xenos/images/transactions.gif
trunk/css/xenos/images/transactions.png
trunk/css/xenos/images/user.png
trunk/css/xenos/login.css
Added: trunk/css/xenos/.goutputstream-RI22EX
===================================================================
--- trunk/css/xenos/.goutputstream-RI22EX (rev 0)
+++ trunk/css/xenos/.goutputstream-RI22EX 2014-05-03 09:51:53 UTC (rev 6704)
@@ -0,0 +1,544 @@
+/***
+
+Xenos Theme
+by Khwunchai J.
+
+Xenos is a very clean and elegant theme design for WebERP
+based on the theme "Fresh" credited for the original designer.
+
+NOTE:
+This CSS is not yet optimized. Some styles maybe redundant and not supported by some browser.
+
+***/
+
+body {
+ font-family:Arial, Verdana, Helvetica, sans-serif;
+ font-size:10pt;
+ margin:0;
+ padding:0;
+ background:#F1F1F1;
+}
+
+/*** Default Styles ***/
+a {
+ color:#0088CD;
+ text-decoration:none;
+}
+a:hover {
+ color:#0088CD;
+ text-decoration:underline;
+}
+
+img {
+ border:none;
+ vertical-align:middle;
+}
+p.page_title_text {
+ padding-top:2px;
+ padding-bottom:2px;
+ font-size:18px;
+ color:black;
+ width:60%;
+ text-align:center;
+ margin:10px auto;
+}
+p.good {
+ font-weight:bold;
+ color:green;
+}
+p.bad {
+ font-weight:bold;
+ color:red;
+}
+table {
+ background-color:white;
+ margin:0 auto;
+ width:100%
+ border-collapse:collapse;
+ border-spacing:0;
+ border:thin solid #B3B3B3;
+ -webkit-border-radius:4px;
+ -moz-border-radius:4px;
+ border-radius:4px;
+ background-color:white;
+}
+table.selection {
+}
+th {
+ font-weight:bold;
+ color:#2C2C2C;
+ text-align:center;
+ border-bottom:thin solid #B3B3B3;
+}
+th.number {
+ text-align:right;
+ font-weight:normal;
+ background-color:#800000;
+ color:white;
+}
+th.ascending {
+ cursor:s-resize;
+}
+th.descending {
+ cursor:n-resize;
+}
+th:after {
+ content:"";
+ float:right;
+ margin-top:7px;
+ visibility:hidden;
+}
+th.ascending:after {
+ border-width:0 4px 4px;
+ border-style:solid;
+ border-color:#000 transparent;
+ visibility:visible;
+}
+th.descending:after {
+ border-bottom:none;
+ border-left:4px solid transparent;
+ border-right:4px solid transparent;
+ border-top:4px solid #000;
+ visibility:visible;
+}
+td {
+ text-align:left;
+ color:#575757;
+}
+td.select {
+ /*background-color:#eee;*/
+}
+td.number {
+ text-align:right;
+}
+div.centre {
+ margin:0 auto;
+ text-align:center;
+}
+input {
+}
+input.number{
+ text-align:right;
+}
+input.image {
+ border-width:0px;
+ background-color:transparent;
+}
+input:hover{
+}
+select {
+ font-family:Arial, Verdana, Helvetica, sans-serif;;
+ font-size:12px;
+ border:thin solid #C3C3C3;
+ -webkit-border-radius:4px;
+ -moz-border-radius:4px;
+ border-radius:4px;
+ padding:4px 8px;
+}
+input.inputerror, input.error, select.error, select.selecterror, label.error {
+ color:red;
+ border:2px solid red;
+}
+input:required, select:required, textarea:required {
+ background-color:lightyellow;
+}
+input[type='text'], input[type='tel'], input[type='password'] {
+ border:thin solid #C3C3C3;
+ -webkit-border-radius:4px;
+ -moz-border-radius:4px;
+ border-radius:4px;
+ padding:4px 8px;
+}
+input[type='submit'] {
+ background-color:#34a7e8;
+ border:thin outset #1992DA;
+ -webkit-border-radius:4px;
+ -moz-border-radius:4px;
+ border-radius:4px;
+ padding:6px 24px;
+ vertical-align:middle;
+ font-weight:bold;
+ color:#FFFFFF;
+ box-shadow:1px 1px 1px #64BEF1 inset;
+}
+textarea{
+ border:thin solid #C3C3C3;
+ -webkit-border-radius:4px;
+ -moz-border-radius:4px;
+ border-radius:4px;
+ padding:4px 8px;
+}
+textarea:hover{
+}
+.EvenTableRows {
+ background-color:#72824D;
+}
+.OddTableRows {
+ background-color:#CAF17C;
+}
+
+div.error {
+ color:red;
+}
+div.warn {
+ color:maroon;
+}
+div.success {
+ color:darkgreen;
+}
+div.info {
+ color:navy;
+}
+div.page_help_text {
+ background:lightgrey url(images/help.png) top left no-repeat;
+ border:#a52a2a 1px solid;
+ padding-top:2px;
+ padding-bottom:2px;
+ padding-left:10px;
+ z-index:1;
+ width:80%;
+ float:none;
+ visibility:visible;
+ margin:0 auto;
+ position:static;
+ font-weight:normal;
+ color:black;
+ text-align:center;
+}
+
+/*** Calendar picker ***/
+#calendar{
+
+}
+.dpTbl {
+ border: solid navy 1px;
+}
+.dpTD {
+ border: 0;
+ width:20px;
+ background-color: #EEEEEE;
+ text-align:right;
+ cursor:pointer;
+}
+.dpDayHighlight {
+ border: 0;
+ width:20px;
+ background-color: yellow;
+ text-align:right;
+ cursor:pointer;
+}
+.dpTDHover {
+ border: 0;
+ width:20px;
+ background-color: #CCCCCC;
+ text-align:right;
+ cursor:pointer;
+}
+
+/* Table type is used for UI tables type 1 */
+.table1 {
+ width:90%;
+ background: #eee;
+ border: 0px 0px 2px 2px #222 solid;
+ margin: 0 auto;
+}
+/* Table type is used for UI tables type 2 */
+.table2 {
+ width:90%;
+ background: #eee;
+ border: 0px 0px 2px 2px #222 solid;
+ margin: 0 auto;
+}
+.tableheader {
+ font-weight: normal;
+ background-color: #777C59;
+ color: white;
+}
+.notavailable {
+ font-weight:lighter;
+ font-style:italic;
+ color:#555555;
+}
+.label {
+ font-weight:bold;
+ font-style:normal;
+ font-size:120%;
+ color: #575757;
+}
+.table_index {
+ background-color: #F1FFDD;
+}
+
+
+.header {
+ background-image: url("");
+ background-repeat: no-repeat;
+ background-attachment: fixed;
+ border: none;
+ margin: 0px;
+ padding: 0px;
+}
+input.inputerror {
+ background-color: #fddbdb;
+}
+textarea.texterror {
+ background-color: #fddbdb;
+}
+select.selecterror {
+ background-color: #fddbdb;
+}
+.OsRow {
+ background-color: #234567;
+ color: white;
+}
+
+/*** CANVAS ***/
+
+#CanvasDiv{
+ background:#F1F1F1;
+ margin:0;
+}
+
+/*** HEADER ***/
+
+#HeaderDiv {
+ overflow:hidden; /* REQUIRED: height according to items contained */
+ color:white;
+ font-weight:bold;
+ padding-left:3px;
+ background:#949494;
+ border-bottom:thin solid #7C7C7C;
+ height:40px;
+}
+#HeaderWrapDiv{
+}
+
+/*** HEADER - APP INFO ***/
+
+#AppInfoDiv{
+ float:left; /* REQUIRED: to the left */
+}
+#AppInfoDiv img{
+ vertical-align:middle; /* center image and text vertically */
+}
+#AppInfoCompanyDiv{
+ display:table-cell; /* REQUIRED: as a cell */
+}
+#AppInfoUserDiv{
+ display:table-cell; /* REQUIRED: as a cell */
+}
+#AppInfoUserDiv a{
+ color:white;
+ font-weight:bold;
+}
+#AppInfoUserDiv a:hover{
+ text-decoration:none;
+}
+#AppInfoModuleDiv{
+}
+
+/*** HEADER - QUICK MENU ***/
+
+#QuickMenuDiv{
+ float:right; /* to the right side */
+ margin-top:0.1em;
+}
+#QuickMenuDiv ul{
+ list-style:none; /* hide the bullets */
+ margin:0;
+}
+#QuickMenuDiv li{
+ display:inline-block; /* items are inline */
+ height:40px;
+}
+
+/*** links as buttons!!! clicking anywhere in the button will activate
+ the link!!! ***HJ***/
+
+#QuickMenuDiv li a{
+ border-left:thin outset #5C5C5C;
+ color:white;
+ font-weight:bold;
+ padding:11px 8px;
+ height:40px;
+ display:block;
+}
+#QuickMenuDiv li a:hover{
+ background:#444444;
+ border-left:thin outset #5C5C5C;
+ text-decoration:none;
+}
+
+/*** BODY ***/
+
+#BodyDiv {
+ clear:both; /* REQUIRED */
+ overflow:hidden; /* REQUIRED */
+ color:black;
+ background:#F1F1F1;
+ padding:5px;
+ text-align:center;
+}
+#BodyDiv table {
+ width:auto; /* automatic width */
+ margin:0 auto;
+ margin-bottom:10px;
+}
+#BodyDiv table.selection {
+ background:white;
+ border:thin outset #D2D2D2;
+ -webkit-border-radius:4px;
+ -moz-border-radius:4px;
+ border-radius:4px;
+ padding:5px;
+}
+/*#BodyDiv .centre{
+ margin:0 auto 10px;
+ text-align:center;
+}*/
+
+/*** BODY - MAIN MENU ***/
+
+#MainMenuDiv{
+ float:left; /* REQUIRED: to the left side */
+ white-space:nowrap; /* don't break text */
+ text-align:center;
+ width:10%;
+ border:thin outset #4A4A4A;
+ -webkit-border-radius:4px;
+ -moz-border-radius:4px;
+ border-radius:4px;
+ background:#949494;
+}
+#MainMenuDiv ul{
+ list-style:none; /* REQUIRED: hide bullets */
+ padding:0; /* REQUIRED: remove extra gaps (ex-bullets) */
+ margin:0;
+}
+#MainMenuDiv li{
+ list-style:none; /* REQUIRED */
+ padding:0; /* REQUIRED */
+}
+#MainMenuDiv li a{ /* link as button!!! not-pressed state */
+ display:block; /* REQUIRED */
+ padding:3px;
+ border-top:thin inset #1E1E1E;
+ color:white;
+ font-weight:bold;
+}
+#MainMenuDiv li:first-child a {
+ border-top: none;
+}
+#MainMenuDiv li a:hover{ /* link as button!!! pressed state */
+ text-decoration:none;
+ padding:3px;
+ background:#444444;
+}
+#MainMenuDiv .main_menu_selected a{ /* the selected button */
+ border:thin inset #191919;
+ background:#2A2A2A;
+ color:white;
+}
+
+/*** BODY - SUB MENU ***/
+
+#SubMenuDiv{
+ display:table; /* display as table, sub menu will auto adjust width */
+ width:89%; /* main menu is 10% */
+ text-align:left;
+}
+#SubMenuDiv a:link, a:visited{
+ color:#0088CD;
+ text-decoration:none;
+}
+#SubMenuDiv a:hover{
+ color:#0088CD;
+ text-decoration:none;
+}
+#SubMenuDiv ul{
+ list-style-type:none; /* REQUIRED: hide bullets */
+ padding:0; /* REQUIRED: remove extra gaps (ex-bullets) */
+ margin-left:3px;
+ margin-top:0;
+ margin-bottom:0;
+ border:thin outset #D2D2D2;
+ -webkit-border-radius:4px;
+ -moz-border-radius:4px;
+ border-radius:4px;
+ background:white; /* for custom reports */
+}
+#SubMenuDiv li{
+ /*list-style:none;*/ /* REQUIRED: hide the bullets */
+ padding:2px;
+}
+#SubMenuDiv li img{
+ vertical-align:middle; /* verticall align icon with the text */
+}
+#SubMenuDiv .menu_group_headers {
+ border-bottom:thin solid #DADADA;
+ text-align:center;
+ color:#2C2C2C;
+}
+#TransactionsDiv{
+ display:table-cell;
+}
+#InquiriesDiv{
+ display:table-cell;
+}
+#InquiriesDiv div{ /* default div, used for custom report header */
+ /*background:#C9D392;*/
+ color:black;
+ padding:2px;
+ /*border:thin outset #5A5F00;*/
+}
+#InquiriesDiv body{
+ background:#eee;
+ color:red;
+ padding:2px;
+}
+#MaintenanceDiv{
+ display:table-cell;
+/* float:left;*/
+/* width:32.5%;
+ border:thin solid black;*/
+
+}
+.menu_group_item p {
+ color:#00f; /* This is the color for bullets, I like it to be the same as the anchor color, but it's up to you */
+ text-indent:-10px; /* this makes the bullet to appear as the li tag previously used */
+ margin:0 0 0 12px; /* One thing that I didnÃÂôt like of the li was that it had no left margin applied */
+}
+
+/*** FOOTER ***/
+
+#FooterDiv{
+ clear:both; /* REQUIRED */
+ overflow:hidden;
+ color:#999999;
+}
+#FooterDiv a{
+ text-decoration:underline;
+ color:#999999;
+}
+#FooterWrapDiv{
+ overflow:hidden;
+ padding:3px;
+}
+#FooterLogoDiv{
+ float:right; /* right side */
+ background:white;
+ border-radius:8px;
+ padding:2px;
+}
+#FooterLogoDiv img {
+ vertical-align:middle;
+}
+#FooterVersionDiv{
+ float:left; /* left side */
+ margin-top:3px;
+}
+#FooterTimeDiv{
+ clear:left; /* below */
+}
+
+/*** END ***/
\ No newline at end of file
Property changes on: trunk/css/xenos/.goutputstream-RI22EX
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: trunk/css/xenos/bullet.gif
===================================================================
(Binary files differ)
Index: trunk/css/xenos/bullet.gif
===================================================================
--- trunk/css/xenos/bullet.gif 2014-05-03 00:12:42 UTC (rev 6703)
+++ trunk/css/xenos/bullet.gif 2014-05-03 09:51:53 UTC (rev 6704)
Property changes on: trunk/css/xenos/bullet.gif
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/css/xenos/default.css
===================================================================
--- trunk/css/xenos/default.css (rev 0)
+++ trunk/css/xenos/default.css 2014-05-03 09:51:53 UTC (rev 6704)
@@ -0,0 +1,639 @@
+/***
+
+Xenos Theme
+by Khwunchai J.
+
+Xenos is a very clean and classy looking theme design for WebERP.
+
+NOTE:
+This CSS is not yet fully optimized. Some styles maybe redundant and not supported by some browser.
+
+***/
+
+body {
+ font-family:Arial, Verdana, Helvetica, sans-serif;
+ font-size:10pt;
+ margin:0;
+ padding:0;
+ background:#F1F1F1;
+}
+
+/*** Default Styles ***/
+a {
+ color:#0088CD;
+ text-decoration:none;
+}
+a:hover {
+ color:#0088CD;
+ text-decoration:underline;
+}
+
+img {
+ border:none;
+ vertical-align:middle;
+}
+p.page_title_text {
+ padding-top:2px;
+ padding-bottom:2px;
+ font-size:18px;
+ color:black;
+ width:60%;
+ text-align:center;
+ margin:10px auto;
+}
+p.good {
+ font-weight:bold;
+ color:green;
+}
+p.bad {
+ font-weight:bold;
+ color:red;
+}
+table {
+ background-color:white;
+ margin:0 auto;
+ width:100%;
+ /*border-collapse: collapse;*/
+ border:thin outset #B3B3B3;
+
+ -webkit-border-radius: 4px;
+ -moz-border-radius: 4px;
+ border-radius: 4px;
+ -moz-box-shadow: 1px 1px 2px #C3C3C3;
+ -webkit-box-shadow: 1px 1px 2px #C3C3C3;
+ box-shadow: 1px 1px 2px #C3C3C3;
+ -ms-filter: "progid:DXImageTransform.Microsoft.Shadow(Strength=1, Direction=135, Color='#C3C3C3')";
+ filter: progid:DXImageTransform.Microsoft.Shadow(Strength=1, Direction=135, Color='#C3C3C3')
+}
+table.selection {
+}
+th {
+ font-weight:bold;
+ color:#2C2C2C;
+ text-align:center;
+ border-bottom:thin solid #B3B3B3;
+}
+th.number {
+ text-align:right;
+ font-weight:normal;
+ background-color:#800000;
+ color:white;
+}
+th.ascending {
+ cursor:s-resize;
+}
+th.descending {
+ cursor:n-resize;
+}
+th:after {
+ content:"";
+ float:right;
+ margin-top:7px;
+ visibility:hidden;
+}
+th.ascending:after {
+ border-width:0 4px 4px;
+ border-style:solid;
+ border-color:#000 transparent;
+ visibility:visible;
+}
+th.descending:after {
+ border-bottom:none;
+ border-left:4px solid transparent;
+ border-right:4px solid transparent;
+ border-top:4px solid #000;
+ visibility:visible;
+}
+td {
+ padding:2px 4px;
+ text-align:left;
+ color:#575757;
+}
+td.select {
+ background-color:#eee;
+}
+td.number {
+ text-align:right;
+}
+td table {
+ background: red;
+}
+/*
+table tr:first-child th:first-child, table tr:first-child td:first-child {
+ -moz-border-radius-topleft: 4px;
+ -webkit-border-top-left-radius: 4px;
+ border-top-left-radius: 4px;
+}
+table tr:first-child th:last-child, table tr:first-child td:last-child {
+ -moz-border-radius-topright: 4px;
+ -webkit-border-top-right-radius: 4px;
+ border-top-right-radius: 4px;
+}
+table tr:last-child td:first-child {
+ -moz-border-radius-bottomleft: 4px;
+ -webkit-border-bottom-left-radius: 4px;
+ border-bottom-left-radius: 4px;
+}
+table tr:last-child td:last-child {
+ -moz-border-radius-bottomright: 4px;
+ -webkit-border-bottom-right-radius: 4px;
+ border-bottom-right-radius: 4px;
+}
+*/
+div.centre {
+ margin:0 auto;
+ text-align:center;
+}
+input {
+}
+input.number{
+ text-align:right;
+}
+input.image {
+ border-width:0px;
+ background-color:transparent;
+}
+input:hover{
+}
+select {
+ font-family:Arial, Verdana, Helvetica, sans-serif;;
+ font-size:12px;
+ border:thin solid #C3C3C3;
+ -webkit-border-radius:4px;
+ -moz-border-radius:4px;
+ border-radius:4px;
+ padding:4px 8px;
+ cursor: pointer;
+}
+input.inputerror, input.error, select.error, select.selecterror, label.error {
+ color:red;
+ border:2px solid red;
+}
+input[type='text'], input[type='tel'], input[type='password'], input[type='email'] {
+ border:thin solid #C3C3C3;
+ padding:4px 8px;
+
+ -webkit-border-radius: 4px;
+ -moz-border-radius: 4px;
+ border-radius: 4px;
+}
+input:required, select:required, textarea:required {
+ background-color:#e2f5ff;
+}
+input[type='text']:focus, input[type='tel']:focus, input[type='password']:focus, input[type='email']:focus, input[type='submit'], textarea:focus, select:focus, button:focus {
+ outline:none;
+ border-color:#2380CD;
+
+ -moz-box-shadow: 0px 0px 5px #55B1EA;
+ -webkit-box-shadow: 0px 0px 5px #55B1EA;
+ box-shadow: 0px 0px 5px #55B1EA;
+}
+input[type='submit'], button {
+ background-color:#34a7e8;
+ border:thin outset #1992DA;
+ padding:6px 24px;
+ vertical-align:middle;
+ font-weight:bold;
+ color:#FFFFFF;
+ cursor: pointer;
+
+ -webkit-border-radius: 4px;
+ -moz-border-radius: 4px;
+ border-radius: 4px;
+ -moz-box-shadow: 1px 1px 1px #64BEF1 inset;
+ -webkit-box-shadow: 1px 1px 1px #64BEF1 inset;
+ box-shadow: 1px 1px 1px #64BEF1 inset;
+}
+select {
+ background-color: white;
+}
+textarea{
+ border:thin solid #C3C3C3;
+ padding:4px 8px;
+
+ -webkit-border-radius: 4px;
+ -moz-border-radius: 4px;
+ border-radius: 4px;
+}
+.EvenTableRows {
+ background-color:white;
+}
+.OddTableRows {
+ background-color:#CCCCCC;
+}
+
+div.error {
+ color:red;
+}
+div.warn {
+ color:maroon;
+}
+div.success {
+ color:darkgreen;
+}
+div.info {
+ color:navy;
+}
+div.page_help_text {
+ background:lightgrey url(images/help.png) top left no-repeat;
+ border:thin solid #C3C3C3;
+ padding:4px 10px;
+ z-index:1;
+ width:80%;
+ float:none;
+ visibility:visible;
+ margin:0 auto;
+ position:static;
+ font-weight:normal;
+ color:black;
+ text-align:center;
+}
+
+/*** Calendar picker ***/
+#calendar{
+
+}
+.dpTbl {
+ border:1px solid #C3C3C3;
+ -moz-box-shadow: 0px 0px 8px #999999;
+ -webkit-box-shadow: 0px 0px 8px #999999;
+ box-shadow: 0px 0px 8px #999999;
+ -ms-filter: "progid:DXImageTransform.Microsoft.Shadow(Strength=4, Direction=0, Color='#64BEF1')";
+ filter: progid:DXImageTransform.Microsoft.Shadow(Strength=4, Direction=0, Color='#64BEF1');
+}
+.dpTD {
+ border: 0;
+ width:25px;
+ text-align:right;
+ cursor:pointer;
+}
+.dpTbl button {
+ padding: 4px 12px;
+}
+.dpDayHighlight {
+ border: 0;
+ width:20px;
+ background-color: yellow;
+ text-align:right;
+ cursor:pointer;
+}
+.dpTDHover {
+ border: 0;
+ width:20px;
+ background-color: #E1E1E1;
+ text-align:right;
+ cursor:pointer;
+}
+
+/* Table type is used for UI tables type 1 */
+.table1 {
+ width:90%;
+ background: #eee;
+ border: 0px 0px 2px 2px #222 solid;
+ margin: 0 auto;
+}
+/* Table type is used for UI tables type 2 */
+.table2 {
+ width:90%;
+ background: #eee;
+ border: 0px 0px 2px 2px #222 solid;
+ margin: 0 auto;
+}
+.tableheader {
+ font-weight: normal;
+ background-color: #777C59;
+}
+.notavailable {
+ font-weight:lighter;
+ font-style:italic;
+ color:#555555;
+}
+.label {
+ font-weight:bold;
+ font-style:normal;
+ font-size:120%;
+ color: #575757;
+}
+.table_index {
+ background-color: #F1FFDD;
+}
+
+
+.header {
+ background-image: url("");
+ background-repeat: no-repeat;
+ background-attachment: fixed;
+ border: none;
+ margin: 0px;
+ padding: 0px;
+}
+input.inputerror {
+ background-color: #fddbdb;
+}
+textarea.texterror {
+ background-color: #fddbdb;
+}
+select.selecterror {
+ background-color: #fddbdb;
+}
+.OsRow {
+ background-color: #234567;
+ color:white;
+}
+
+/*** CANVAS ***/
+
+#CanvasDiv{
+ background:#F1F1F1;
+ margin:0;
+}
+
+/*** HEADER ***/
+
+#HeaderDiv {
+ overflow:hidden; /* REQUIRED: height according to items contained */
+ color:#333333;
+ font-weight:bold;
+ padding-left:3px;
+ height: 44px;
+}
+#HeaderWrapDiv{
+}
+
+/*** HEADER - APP INFO ***/
+
+#AppInfoDiv{
+ float:left; /* REQUIRED: to the left */
+}
+#AppInfoDiv img{
+ vertical-align:middle; /* center image and text vertically */
+}
+#AppInfoCompanyDiv{
+ display:table-cell; /* REQUIRED: as a cell */
+}
+#AppInfoUserDiv{
+ display:table-cell; /* REQUIRED: as a cell */
+}
+#AppInfoUserDiv a{
+ color:#333333;
+ font-weight:bold;
+}
+#AppInfoUserDiv a:hover{
+ text-decoration:none;
+}
+#AppInfoModuleDiv{
+}
+
+/*** HEADER - QUICK MENU ***/
+
+#QuickMenuDiv{
+ float:right; /* to the right side */
+ z-index: 10;
+ margin-right: 1.05%;
+}
+#QuickMenuDiv ul{
+ list-style:none; /* hide the bullets */
+ margin:0;
+ padding:0;
+
+ -webkit-border-radius: 0 0 6px 6px;
+ -moz-border-radius: 0 0 6px 6px;
+ border-radius: 0 0 6px 6px;
+ -moz-box-shadow: 1px 1px 2px #C3C3C3;
+ -webkit-box-shadow: 1px 1px 2px #C3C3C3;
+ box-shadow: 1px 1px 2px #C3C3C3;
+ -ms-filter: "progid:DXImageTransform.Microsoft.Shadow(Strength=1, Direction=135, Color='#C3C3C3')";
+ filter: progid:DXImageTransform.Microsoft.Shadow(Strength=1, Direction=135, Color='#C3C3C3');
+}
+#QuickMenuDiv li{
+ display:inline-block; /* items are inline */
+ height:38px;
+}
+
+/*** links as buttons!!! clicking anywhere in the button will activate
+ the link!!! ***HJ***/
+
+#QuickMenuDiv li a{
+ color:white;
+ font-weight:bold;
+ padding:11px 24px;
+ background:#686868;
+ border-right:thin inset #5D5D5D;
+ border-left:thin outset #737373;
+ border-bottom:thin solid #7C7C7C;
+ display:block;
+}
+#QuickMenuDiv li:first-child a{
+ -webkit-border-radius: 0 0 0 6px;
+ -moz-border-radius: 0 0 0 6px;
+ border-radius: 0 0 0 6px;
+}
+#QuickMenuDiv li:last-child a{
+ -webkit-border-radius: 0 0 6px 0;
+ -moz-border-radius: 0 0 6px 0;
+ border-radius: 0 0 6px 0;
+}
+#QuickMenuDiv li a:hover{
+ background:#444444;
+ border-left:thin outset #5C5C5C;
+ text-decoration:none;
+}
+
+/*** BODY ***/
+
+#BodyDiv {
+ clear:both; /* REQUIRED */
+ overflow:hidden; /* REQUIRED */
+ color:black;
+ background:#F1F1F1;
+ padding:5px;
+ text-align:center;
+ min-height: 440px;
+}
+#BodyDiv table {
+ width:auto; /* automatic width */
+ margin:0 auto;
+ margin-bottom:10px;
+
+ -webkit-border-radius: 4px;
+ -moz-border-radius: 4px;
+ border-radius: 4px;
+ -moz-box-shadow: 1px 1px 2px #C3C3C3;
+ -webkit-box-shadow: 1px 1px 2px #C3C3C3;
+ box-shadow: 1px 1px 2px #C3C3C3;
+ -ms-filter: "progid:DXImageTransform.Microsoft.Shadow(Strength=1, Direction=135, Color='#C3C3C3')";
+ filter: progid:DXImageTransform.Microsoft.Shadow(Strength=1, Direction=135, Color='#C3C3C3')
+}
+#BodyDiv table.selection {
+ background-color:white;
+ border:thin outset #D2D2D2;
+ padding:5px;
+
+ -webkit-border-radius: 4px;
+ -moz-border-radius: 4px;
+ border-radius: 4px;
+ -moz-box-shadow: 1px 1px 2px #C3C3C3;
+ -webkit-box-shadow: 1px 1px 2px #C3C3C3;
+ box-shadow: 1px 1px 2px #C3C3C3;
+ -ms-filter: "progid:DXImageTransform.Microsoft.Shadow(Strength=1, Direction=135, Color='#C3C3C3')";
+ filter: progid:DXImageTransform.Microsoft.Shadow(Strength=1, Direction=135, Color='#C3C3C3')
+}
+
+/*** BODY - MAIN MENU ***/
+
+#MainMenuDiv{
+ margin-left: .6%;
+ margin-right: 1%;
+ float:left; /* REQUIRED: to the left side */
+ white-space:nowrap; /* don't break text */
+ text-align:center;
+ width:14%;
+ border:thin inset #5D5D5D;
+ background:#686868;
+
+ -webkit-border-radius: 4px;
+ -moz-border-radius: 4px;
+ border-radius: 4px;
+ -moz-box-shadow: 1px 1px 2px #C3C3C3;
+ -webkit-box-shadow: 1px 1px 2px #C3C3C3;
+ box-shadow: 1px 1px 2px #C3C3C3;
+ -ms-filter: "progid:DXImageTransform.Microsoft.Shadow(Strength=1, Direction=135, Color='#C3C3C3')";
+ filter: progid:DXImageTransform.Microsoft.Shadow(Strength=1, Direction=135, Color='#C3C3C3')
+}
+#MainMenuDiv ul{
+ list-style:none; /* REQUIRED: hide bullets */
+ padding:0; /* REQUIRED: remove extra gaps (ex-bullets) */
+ margin:0;
+}
+#MainMenuDiv li{
+ list-style:none; /* REQUIRED */
+ padding:0; /* REQUIRED */
+}
+#MainMenuDiv li a{ /* link as button!!! not-pressed state */
+ display:block; /* REQUIRED */
+ padding:8px;
+ /*border-top:thin outset #1E1E1E;*/
+ border-top:thin solid #5D5D5D;
+ border-bottom:thin solid #737373;
+ color:white;
+ font-weight:bold;
+}
+#MainMenuDiv li:first-child a {
+ border-top: none;
+}
+#MainMenuDiv li a:hover{ /* link as button!!! pressed state */
+ text-decoration:none;
+ background:#444444;
+ border-bottom:thin solid #444444;
+}
+#MainMenuDiv .main_menu_selected a{ /* the selected button */
+ /*border:thin inset #191919;*/
+ background:#2A2A2A;
+ border-bottom:thin solid #191919;
+}
+#MainMenuDiv .main_menu_selected a:hover{
+ background:#2A2A2A;
+}
+
+/*** BODY - SUB MENU ***/
+
+#SubMenuDiv{
+ display:table; /* display as table, sub menu will auto adjust width */
+ width:83.5%; /* main menu is 10% */
+ text-align:left;
+ border:thin outset #D2D2D2;
+ background-color:white; /* for custom reports */
+ min-height:400px;
+
+ -webkit-border-radius: 4px;
+ -moz-border-radius: 4px;
+ border-radius: 4px;
+ -moz-box-shadow: 1px 1px 2px #C3C3C3;
+ -webkit-box-shadow: 1px 1px 2px #C3C3C3;
+ box-shadow: 1px 1px 2px #C3C3C3;
+ -ms-filter: "progid:DXImageTransform.Microsoft.Shadow(Strength=1, Direction=135, Color='#C3C3C3')";
+ filter: progid:DXImageTransform.Microsoft.Shadow(Strength=1, Direction=135, Color='#C3C3C3')
+}
+#SubMenuDiv a:link, a:visited{
+ color:#0088CD;
+ text-decoration:none;
+}
+#SubMenuDiv a:hover{
+ color:#0088CD;
+ text-decoration:none;
+}
+#SubMenuDiv ul{
+ list-style-type:none;
+ padding:0;
+ margin:0;
+}
+#SubMenuDiv li{
+ padding:2px;
+ color:#333333;
+}
+#SubMenuDiv li img{
+ vertical-align:middle; /* verticall align icon with the text */
+}
+#SubMenuDiv .menu_group_headers {
+ border-bottom:thin solid #DADADA;
+ text-align:center;
+ color:#2C2C2C;
+}
+#TransactionsDiv{
+ display:table-cell;
+ border-right:thin solid #D2D2D2;
+}
+#InquiriesDiv{
+ display:table-cell;
+ border-right:thin solid #D2D2D2;
+}
+#InquiriesDiv div{ /* default div, used for custom report header */
+ color:black;
+ padding:2px;
+}
+#InquiriesDiv body{
+ background:#eee;
+ color:red;
+ padding:2px;
+}
+#MaintenanceDiv{
+ display:table-cell;
+}
+.menu_group_item p {
+ color:transparent; /* buttets color */
+ margin:4px 0 0 0;
+}
+
+/*** FOOTER ***/
+
+#FooterDiv{
+ clear:both; /* REQUIRED */
+ overflow:hidden;
+ color:#999999;
+ width: 98.6%;
+ margin: auto;
+}
+#FooterDiv a{
+ text-decoration:underline;
+ color:#999999;
+}
+#FooterWrapDiv{
+ overflow:hidden;
+ padding:3px;
+}
+#FooterLogoDiv{
+ float:right; /* right side */
+ padding:2px;
+}
+#FooterLogoDiv img {
+ vertical-align:middle;
+}
+#FooterVersionDiv{
+ float:left; /* left side */
+ margin-top:3px;
+}
+#FooterTimeDiv{
+ clear:left; /* below */
+}
+
+/*** END ***/
\ No newline at end of file
Property changes on: trunk/css/xenos/default.css
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: trunk/css/xenos/images/Graphique-32.png
===================================================================
(Binary files differ)
Index: trunk/css/xenos/images/Graphique-32.png
===================================================================
--- trunk/css/xenos/images/Graphique-32.png 2014-05-03 00:12:42 UTC (rev 6703)
+++ trunk/css/xenos/images/Graphique-32.png 2014-05-03 09:51:53 UTC (rev 6704)
Property changes on: trunk/css/xenos/images/Graphique-32.png
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/css/xenos/images/allocation.gif
=======================================================...
[truncated message content] |
|
From: <dai...@us...> - 2014-05-12 06:05:39
|
Revision: 6707
http://sourceforge.net/p/web-erp/reponame/6707
Author: daintree
Date: 2014-05-12 06:05:32 +0000 (Mon, 12 May 2014)
Log Message:
-----------
Harald Ringehan - updated de_DE.utf8 transalation
Modified Paths:
--------------
trunk/Labels.php
trunk/doc/Manual/ManualContributors.html
trunk/includes/FreightCalculation.inc
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.mo
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po
trunk/sql/mysql/upgrade2.7-2.8.sql
Modified: trunk/Labels.php
===================================================================
--- trunk/Labels.php 2014-05-06 01:38:05 UTC (rev 6706)
+++ trunk/Labels.php 2014-05-12 06:05:32 UTC (rev 6707)
@@ -114,8 +114,8 @@
echo '<p class="page_title_text">
<img src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' . _('Label Template Maintenance')
- . '" alt="" />' . $Title. '
- </p>';
+ . '" alt="" />' . $Title . ' - ' . _('all measurements in PDF points') .
+ '</p>';
if (isset($_POST['SelectedLabelID'])){
$SelectedLabelID =$_POST['SelectedLabelID'];
Modified: trunk/doc/Manual/ManualContributors.html
===================================================================
--- trunk/doc/Manual/ManualContributors.html 2014-05-06 01:38:05 UTC (rev 6706)
+++ trunk/doc/Manual/ManualContributors.html 2014-05-12 06:05:32 UTC (rev 6707)
@@ -80,7 +80,7 @@
<br />
Ditesh Kumar<br />
<br />
- Felix Lim<br />
+ Khwunchai J.: Xenos themeFelix Lim<br />
<br />
David Luo<br />
<br />
Modified: trunk/includes/FreightCalculation.inc
===================================================================
--- trunk/includes/FreightCalculation.inc 2014-05-06 01:38:05 UTC (rev 6706)
+++ trunk/includes/FreightCalculation.inc 2014-05-12 06:05:32 UTC (rev 6707)
@@ -21,12 +21,6 @@
if ((!isset($BrAdd2)) AND (!isset($BrAdd3)) AND (!isset($BrAdd4)) AND (!isset($BrAdd5)) AND (!isset($BrAddCountry))){
// No address field to detect destination ==> ERROR
$ParameterError = TRUE;
- //echo '<br />Branch address 2 : ' . $BrAdd2;
- //echo '<br />Branch address 3 : ' . $BrAdd3;
- //echo '<br />Branch address 4 : ' . $BrAdd4;
- //echo '<br />Branch address 5 : ' . $BrAdd5;
- //echo '<br />Branch address country : ' . $BrAddCountry;
-
}
if ((!isset($TotalVolume)) AND (!isset($TotalWeight))){
// No weight AND no volume ==> ERROR
@@ -34,14 +28,10 @@
}
if (!isset($FromLocation)){
// No location FROM ==> ERROR
- //echo '<br />From Location : ' . $FromLocation;
-
$ParameterError = TRUE;
}
if (!isset($Currency)){
// No Currency ==> ERROR
- //echo '<br />Currency : ' . $Currency;
-
$ParameterError = TRUE;
}
if($ParameterError){
@@ -65,7 +55,7 @@
//ALL suburbs and cities are compared in upper case - so data in freight tables must be in upper case too
foreach ($FindCity as $City) {
- if ( strtoupper($City) != ''){
+ if ($City != ''){
$sql .= " destination LIKE '" . strtoupper($City) . "%' OR";
}
}
@@ -75,9 +65,6 @@
}
$sql = mb_substr($sql, 0, mb_strrpos($sql,' OR')) . ')';
- //echo $sql;
-
-
$CalcFreightCostResult = DB_query($sql,$db);
if (DB_error_no($db) !=0) {
echo _('The freight calculation for the destination city cannot be performed because') . ' - ' . DB_error_msg($db) . ' - ' . $sql;
@@ -112,15 +99,11 @@
$CalcBestShipper =$myrow['shipperid'];
}
- //echo '<br /> calculated freight cost = ' . $CalcFreightCost;
}
} else {
$CalcFreightCost = "NOT AVAILABLE";
}
if ($TotalValue >= $_SESSION['FreightChargeAppliesIfLessThan'] AND $_SESSION['FreightChargeAppliesIfLessThan']!=0){
-
- //echo '<br />Freight should be charged on orders less than ' . $_SESSION['FreightChargeAppliesIfLessThan'];
-
/*Even though the order is over the freight free threshold - still need to calculate the best shipper to ensure get best deal*/
$CalcFreightCost =0;
}
Modified: trunk/locale/de_DE.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po 2014-05-06 01:38:05 UTC (rev 6706)
+++ trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po 2014-05-12 06:05:32 UTC (rev 6707)
@@ -1,51393 +1,51038 @@
-# webERP German Translation File.
-# Copyright (C) 2012 www.weberp.org
-# This file is distributed under the same license as the webERP package.
-# Harald Ringehahn <hri...@us...>, 2012.
-# Effective version 5743
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: WebERP 4.09.1/trunk\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-08 17:33+1300\n"
-"PO-Revision-Date: 2013-11-24 11:03-0600\n"
-"Last-Translator: Rafael Chacon <raf...@gm...>\n"
-"Language-Team: Deutsch <web...@li...>\n"
-"Language: de_DE\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.5.4\n"
-"X-Poedit-SourceCharset: utf-8\n"
-
-#: AccountGroups.php:7 includes/MainMenuLinksArray.php:370
-msgid "Account Groups"
-msgstr "Kontengruppen"
-
-#: AccountGroups.php:20
-msgid ""
-"An error occurred in retrieving the account groups of the parent account "
-"group during the check for recursion"
-msgstr ""
-"Bei der Prüfung der Kontengruppen auf Rekursion ist ein Fehler aufgetreten"
-
-#: AccountGroups.php:21
-msgid ""
-"The SQL that was used to retrieve the account groups of the parent account "
-"group and that failed in the process was"
-msgstr "Die fehlerhafte Abfrage zur Ermittlung der Unter-Kontengruppen war"
-
-#: AccountGroups.php:50
-msgid "An error occurred in moving the account group"
-msgstr "Beim Verschieben der Kontengruppe ist ein Fehler aufgetreten"
-
-#: AccountGroups.php:51
-msgid "The SQL that was used to move the account group was"
-msgstr ""
-
-#: AccountGroups.php:53 AccountGroups.php:334
-msgid "Review Account Groups"
-msgstr "Kontengruppen ansehen"
-
-#: AccountGroups.php:54
-msgid "All accounts in the account group:"
-msgstr "Alle Konten der Kontengruppe"
-
-#: AccountGroups.php:54
-msgid "have been changed to the account group:"
-msgstr "wurden verschoben zur Kontengruppe"
-
-#: AccountGroups.php:73 AccountGroups.php:110 AccountGroups.php:211
-#: AccountGroups.php:246
-msgid "The SQL that was used to retrieve the information was"
-msgstr "Die fehlerhafte Abfrage war"
-
-#: AccountGroups.php:74
-msgid "Could not check whether the group exists because"
-msgstr "Konnte nicht ermitteln, ob die Gruppe existiert, weil"
-
-#: AccountGroups.php:81
-msgid "The account group name already exists in the database"
-msgstr "Der Name der Kontengruppe kommt bereits in der Datenbank vor."
-
-#: AccountGroups.php:87
-msgid "The account group name cannot contain the character"
-msgstr "Der Name der Kontengruppe darf das Zeichen nicht enthalten:"
-
-#: AccountGroups.php:87 Departments.php:30 TaxCategories.php:31
-msgid "or the character"
-msgstr "oder das Zeichen"
-
-#: AccountGroups.php:93
-msgid "The account group name must be at least one character long"
-msgstr "Der Name der Kontengruppe muss wenigstens ein Zeichen lang sein"
-
-#: AccountGroups.php:100
-msgid ""
-"The parent account group selected appears to result in a recursive account "
-"structure - select an alternative parent account group or make this group a "
-"top level account group"
-msgstr ""
-"Die ausgewählte Eltern-Kontengruppe scheint eine rekursive Struktur zu sein "
-"- wählen Sie ein anderes Elternelement oder machen Sie diese Gruppe zur "
-"Kontengruppe der obersten Ebene."
-
-#: AccountGroups.php:111
-msgid "Could not check whether the group is recursive because"
-msgstr "Konnte nicht prüfen, ob die Gruppe rekursiv ist, weil"
-
-#: AccountGroups.php:119
-msgid ""
-"Since this account group is a child group, the sequence in the trial "
-"balance, the section in the accounts and whether or not the account group "
-"appears in the balance sheet or profit and loss account are all properties "
-"inherited from the parent account group. Any changes made to these fields "
-"will have no effect."
-msgstr ""
-"Da diese Kontengruppe eine Kind-Gruppe ist, werden alle Eigenschaften wie "
-"die Reihenfolge in der Bilanz, der Bereich bei den Konten und ob die Gruppe "
-"in der Bilanz oder der GuV erscheint, aus der Eltern-Kontengruppe "
-"abgeleitet. Jegliche Änderungen an diesen Feldern haben keine Wirkung."
-
-#: AccountGroups.php:124
-msgid "The section in accounts must be an integer"
-msgstr "Der Bereich bei den Konten muss eine Ganzzahl sein"
-
-#: AccountGroups.php:130
-msgid "The sequence in the trial balance must be an integer"
-msgstr "Die Reihenfolge für den Bilanzreport muss eine Ganzzahl sein"
-
-#: AccountGroups.php:136
-msgid "The sequence in the TB must be numeric and less than"
-msgstr "Die Reihenfolge in der Bilanz muss numerisch sein und kleiner als"
-
-#: AccountGroups.php:152
-msgid "An error occurred in renaming the account group"
-msgstr ""
-
-#: AccountGroups.php:153
-msgid "The SQL that was used to rename the account group was"
-msgstr ""
-
-#: AccountGroups.php:172
-msgid "An error occurred in updating the account group"
-msgstr "Ein Fehler ist aufgetreten beim Ändern der Kontengruppe"
-
-#: AccountGroups.php:173
-msgid "The SQL that was used to update the account group was"
-msgstr "Die fehlerhafte Abfrage war"
-
-#: AccountGroups.php:175 AccountSections.php:101 PaymentMethods.php:83
-msgid "Record Updated"
-msgstr "Datensatz gespeichert"
-
-#: AccountGroups.php:191
-msgid "An error occurred in inserting the account group"
-msgstr "Ein Fehler aufgetreten beim Einfügen der Kontengruppe"
-
-#: AccountGroups.php:192
-msgid "The SQL that was used to insert the account group was"
-msgstr "Die fehlerhafte Abfrage war"
-
-#: AccountGroups.php:193 AccountSections.php:111
-msgid "Record inserted"
-msgstr "Datensatz hinzugefügt"
-
-#: AccountGroups.php:210
-msgid "An error occurred in retrieving the group information from chartmaster"
-msgstr ""
-"Ein Fehler ist aufgetreten beim Ermitteln der Gruppeninformation aus der "
-"Hauptbuchkontentabelle"
-
-#: AccountGroups.php:215
-msgid ""
-"Cannot delete this account group because general ledger accounts have been "
-"created using this group"
-msgstr ""
-"Die Kontengruppe kann nicht gelöscht werden, weil Hauptbuchkonten dazu "
-"angelegt sind"
-
-#: AccountGroups.php:216 AccountGroups.php:251 AccountSections.php:133
-#: Areas.php:115 Areas.php:124 BankAccounts.php:159 CreditStatus.php:125
-#: Currencies.php:245 Currencies.php:253 Currencies.php:261
-#: CustomerBranches.php:301 CustomerBranches.php:311 CustomerBranches.php:321
-#: CustomerBranches.php:331 CustomerBranches.php:341 Customers.php:296
-#: Customers.php:305 Customers.php:313 Customers.php:324 Customers.php:334
-#: CustomerTypes.php:147 CustomerTypes.php:157 Departments.php:141
-#: Factors.php:134 FixedAssetCategories.php:137 GLAccounts.php:80
-#: GLAccounts.php:96 Locations.php:250 Locations.php:258 Locations.php:269
-#: Locations.php:278 Locations.php:287 Locations.php:296 Locations.php:305
-#: Locations.php:314 Locations.php:322 Manufacturers.php:154
-#: MRPDemandTypes.php:87 PaymentMethods.php:142 PaymentTerms.php:146
-#: PaymentTerms.php:153 PcExpenses.php:161 SalesCategories.php:128
-#: SalesCategories.php:135 SalesPeople.php:150 SalesPeople.php:157
-#: SalesPeople.php:163 SalesTypes.php:140 SalesTypes.php:150 Shippers.php:81
-#: Shippers.php:93 StockCategories.php:209 Stocks.php:726 Stocks.php:735
-#: Stocks.php:743 Stocks.php:751 Stocks.php:759 Stocks.php:767 Stocks.php:775
-#: Stocks.php:783 Suppliers.php:640 Suppliers.php:649 Suppliers.php:657
-#: SupplierTypes.php:145 TaxCategories.php:131 TaxGroups.php:132
-#: TaxGroups.php:140 TaxProvinces.php:129 UnitsOfMeasure.php:135
-#: WorkCentres.php:89 WorkCentres.php:95 WWW_Access.php:86
-msgid "There are"
-msgstr "Es gibt"
-
-#: AccountGroups.php:216
-msgid "general ledger accounts that refer to this account group"
-msgstr "Hauptbuchkonten die zu dieser Kontengruppe gehören"
-
-#: AccountGroups.php:223 AccountGroups.php:294 AccountGroups.php:407
-msgid "Parent Group"
-msgstr "Elterngruppe"
-
-#: AccountGroups.php:239
-msgid "Move Group"
-msgstr "Gruppe verschieben"
-
-#: AccountGroups.php:245
-msgid "An error occurred in retrieving the parent group information"
-msgstr "Ein Fehler ist aufgetreten beim Ermitteln der Eltern-Kontengruppe"
-
-#: AccountGroups.php:250
-msgid ""
-"Cannot delete this account group because it is a parent account group of "
-"other account group(s)"
-msgstr ""
-"Konnte diese Kontengruppe nicht löschen, weil sie als Elternelement anderer "
-"Kontengruppe(n) verwendet wird"
-
-#: AccountGroups.php:251
-msgid "account groups that have this group as its/there parent account group"
-msgstr "Kontengruppen, die diese Gruppe als Elternelement verwenden"
-
-#: AccountGroups.php:255
-msgid "An error occurred in deleting the account group"
-msgstr "Beim Löschen der Kontengruppe ist ein Fehler aufgetreten"
-
-#: AccountGroups.php:256
-msgid "The SQL that was used to delete the account group was"
-msgstr "Die fehlerhafte Abfrage war"
-
-#: AccountGroups.php:258
-msgid "group has been deleted"
-msgstr "Gruppe wurde gelöscht"
-
-#: AccountGroups.php:283
-msgid "The sql that was used to retrieve the account group information was "
-msgstr "Die fehlerhafte Abfrage war"
-
-#: AccountGroups.php:284
-msgid "Could not get account groups because"
-msgstr "Konnte keine Kontengruppe ermitteln, weil"
-
-#: AccountGroups.php:286 AccountSections.php:172 AddCustomerContacts.php:25
-#: AddCustomerContacts.php:27 AddCustomerNotes.php:101
-#: AddCustomerTypeNotes.php:94 AgedDebtors.php:454 AgedSuppliers.php:276
-#: Areas.php:144 AuditTrail.php:11 BankReconciliation.php:17
-#: BOMExtendedQty.php:252 BOMIndented.php:246 BOMIndentedReverse.php:235
-#: BOMInquiry.php:188 BOMListing.php:109 BOMs.php:233 BOMs.php:874
-#: COGSGLPostings.php:19 CompanyPreferences.php:102 CounterReturns.php:1619
-#: CounterSales.php:2105 CounterSales.php:2228 Credit_Invoice.php:275
-#: CreditStatus.php:21 Currencies.php:30 CustEDISetup.php:17
-#: DailyBankTransactions.php:15 DebtorsAtPeriodEnd.php:129
-#: DiscountCategories.php:12 DiscountCategories.php:149 DiscountMatrix.php:16
-#: EDIMessageFormat.php:105 FixedAssetLocations.php:13
-#: FixedAssetRegister.php:16 FixedAssetRegister.php:256
-#: FixedAssetTransfer.php:14 FormDesigner.php:173 GLBalanceSheet.php:387
-#: GLBudgets.php:32 GLJournalInquiry.php:11 GLJournal.php:250
-#: InternalStockRequest.php:310 InventoryPlanning.php:379
-#: InventoryPlanningPrefSupplier.php:469 MaintenanceTasks.php:14
-#: MaintenanceUserSchedule.php:16 MRPReport.php:516 NoSalesItems.php:89
-#: PcAssignCashToTab.php:59 PcAssignCashToTab.php:133
-#: PcAssignCashToTab.php:149 PcAssignCashToTab.php:193 PDFPickingList.php:28
-#: PDFStockLocTransfer.php:16 PO_AuthorisationLevels.php:10 POReport.php:60
-#: POReport.php:64 POReport.php:68 PO_SelectOSPurchOrder.php:142
-#: PriceMatrix.php:16 PricesBasedOnMarkUp.php:8 Prices_Customer.php:35
-#: Prices.php:30 PurchaseByPrefSupplier.php:305 PurchData.php:241
-#: PurchData.php:373 PurchData.php:401 RecurringSalesOrders.php:320
-#: SalesAnalReptCols.php:51 SalesAnalRepts.php:14 SalesCategories.php:11
-#: SalesGLPostings.php:19 SalesGraph.php:39 SalesPeople.php:20
-#: SalesTypes.php:20 SelectAsset.php:48 SelectCompletedOrder.php:11
-#: SelectContract.php:69 SelectCreditItems.php:220 SelectCreditItems.php:291
-#: SelectCustomer.php:265 SelectGLAccount.php:65 SelectOrderItems.php:601
-#: SelectOrderItems.php:1525 SelectOrderItems.php:1653 SelectProduct.php:526
-#: SelectSalesOrder.php:563 SelectSupplier.php:14 SelectSupplier.php:220
-#: SelectWorkOrder.php:9 SelectWorkOrder.php:169 SellThroughSupport.php:229
-#: ShipmentCosting.php:11 Shipments.php:17 Shippers.php:123 Shippers.php:160
-#: Shipt_Select.php:8 StockLocMovements.php:14 StockLocStatus.php:28
-#: StockSerialItemResearch.php:30 SupplierPriceList.php:14
-#: SupplierPriceList.php:224 SupplierPriceList.php:394
-#: SupplierPriceList.php:398 SupplierPriceList.php:449
-#: SupplierPriceList.php:499 Suppliers.php:305 SupplierTenderCreate.php:551
-#: SupplierTenderCreate.php:659 SupplierTenders.php:322
-#: SupplierTenders.php:388 SupplierTransInquiry.php:10 TaxGroups.php:15
-#: TaxProvinces.php:11 TopItems.php:114 UnitsOfMeasure.php:10
-#: WhereUsedInquiry.php:18 WorkCentres.php:111 WorkCentres.php:162
-#: WorkOrderCosting.php:22 WorkOrderEntry.php:11 WorkOrderIssue.php:22
-#: WorkOrderReceive.php:31 WorkOrderStatus.php:58 WWW_Access.php:11
-#: WWW_Users.php:36 Z_BottomUpCosts.php:57 ../webSHOP/includes/header.php:252
-msgid "Search"
-msgstr "Suchen"
-
-#: AccountGroups.php:290
-msgid "Group Name"
-msgstr "Kontengruppe"
-
-#: AccountGroups.php:291 EDIMessageFormat.php:129 EDIMessageFormat.php:208
-msgid "Section"
-msgstr "Bereich"
-
-#: AccountGroups.php:292 AccountGroups.php:461
-msgid "Sequence In TB"
-msgstr "Reihenfolge"
-
-#: AccountGroups.php:293 AccountGroups.php:444 GLProfit_Loss.php:6
-#: GLProfit_Loss.php:133 GLProfit_Loss.php:134 GLProfit_Loss.php:185
-#: SelectGLAccount.php:23 SelectGLAccount.php:37 SelectGLAccount.php:51
-msgid "Profit and Loss"
-msgstr "GuV"
-
-#: AccountGroups.php:310 AccountGroups.php:313 AccountGroups.php:448
-#: AccountGroups.php:450 BOMs.php:124 BOMs.php:786 BOMs.php:788
-#: CompanyPreferences.php:427 CompanyPreferences.php:429
-#: CompanyPreferences.php:442 CompanyPreferences.php:444
-#: CompanyPreferences.php:457 CompanyPreferences.php:459
-#: ContractCosting.php:202 Currencies.php:331 Currencies.php:499
-#: Currencies.php:501 CustomerBranches.php:451 Customers.php:659
-#: Customers.php:1047 Customers.php:1053 Customers.php:1056
-#: DailyBankTransactions.php:148 DeliveryDetails.php:1148
-#: DeliveryDetails.php:1191 DeliveryDetails.php:1194 FormDesigner.php:101
-#: GLTransInquiry.php:69 Labels.php:591 Labels.php:593 Labels.php:618
-#: Locations.php:628 Locations.php:630 MRPCalendar.php:224 MRP.php:540
-#: MRP.php:544 MRP.php:548 MRP.php:552 PaymentMethods.php:204
-#: PaymentMethods.php:205 PaymentMethods.php:206 PaymentMethods.php:207
-#: PaymentMethods.php:273 PaymentMethods.php:280 PaymentMethods.php:287
-#: PaymentMethods.php:294 PcAuthorizeExpenses.php:248 PDFChequeListing.php:65
-#: PDFDeliveryDifferences.php:76 PDFDIFOT.php:80
-#: PO_AuthorisationLevels.php:134 PO_AuthorisationLevels.php:139
-#: PO_Header.php:799 PO_PDFPurchOrder.php:408 PO_PDFPurchOrder.php:411
-#: PurchData.php:296 PurchData.php:667 PurchData.php:670
-#: RecurringSalesOrders.php:493 RecurringSalesOrders.php:496
-#: SalesAnalReptCols.php:284 SalesAnalReptCols.php:419
-#: SalesAnalReptCols.php:422 SalesAnalRepts.php:420 SalesAnalRepts.php:423
-#: SalesAnalRepts.php:448 SalesAnalRepts.php:451 SalesAnalRepts.php:476
-#: SalesAnalRepts.php:479 SalesCategories.php:264 SalesCategories.php:351
-#: SalesCategories.php:355 SalesPeople.php:219 SalesPeople.php:359
-#: SalesPeople.php:361 SelectProduct.php:238 SelectProduct.php:381
-#: ShipmentCosting.php:667 ShopParameters.php:289 ShopParameters.php:293
-#: ShopParameters.php:337 ShopParameters.php:341 ShopParameters.php:391
-#: ShopParameters.php:395 ShopParameters.php:413 ShopParameters.php:417
-#: ShopParameters.php:495 ShopParameters.php:499 StockClone.php:917
-#: StockClone.php:919 StockClone.php:942 StockClone.php:944 Stocks.php:1204
-#: Stocks.php:1206 Stocks.php:1229 Stocks.php:1231 SuppContractChgs.php:90
-#: SystemParameters.php:426 SystemParameters.php:449 SystemParameters.php:484
-#: SystemParameters.php:556 SystemParameters.php:564 SystemParameters.php:604
-#: SystemParameters.php:680 SystemParameters.php:689 SystemParameters.php:697
-#: SystemParameters.php:715 SystemParameters.php:722 SystemParameters.php:766
-#: SystemParameters.php:862 SystemParameters.php:1005
-#: SystemParameters.php:1007 SystemParameters.php:1017
-#: SystemParameters.php:1019 SystemParameters.php:1073
-#: SystemParameters.php:1085 SystemParameters.php:1087
-#: SystemParameters.php:1125 SystemParameters.php:1127 TaxGroups.php:311
-#: TaxGroups.php:314 TaxGroups.php:371 WWW_Users.php:491 WWW_Users.php:493
-#: WWW_Users.php:664 WWW_Users.php:666
-msgid "Yes"
-msgstr "Ja"
-
-#: AccountGroups.php:316 AccountGroups.php:453 AccountGroups.php:455
-#: BankAccounts.php:210 BankAccounts.php:379 BankAccounts.php:381
-#: BankAccounts.php:385 BankAccounts.php:393 BOMs.php:126 BOMs.php:785
-#: BOMs.php:789 CompanyPreferences.php:426 CompanyPreferences.php:430
-#: CompanyPreferences.php:441 CompanyPreferences.php:445
-#: CompanyPreferences.php:456 CompanyPreferences.php:460
-#: ContractCosting.php:200 Currencies.php:333 Currencies.php:504
-#: Currencies.php:506 CustomerBranches.php:451 Customers.php:658
-#: Customers.php:1045 Customers.php:1052 Customers.php:1055
-#: DailyBankTransactions.php:150 DeliveryDetails.php:1149
-#: DeliveryDetails.php:1192 DeliveryDetails.php:1195 FormDesigner.php:99
-#: GLTransInquiry.php:88 Labels.php:590 Labels.php:594 Labels.php:619
-#: Locations.php:633 Locations.php:635 MRPCalendar.php:226 MRP.php:538
-#: MRP.php:542 MRP.php:546 MRP.php:550 NoSalesItems.php:184
-#: PaymentMethods.php:204 PaymentMethods.php:205 PaymentMethods.php:206
-#: PaymentMethods.php:207 PaymentMethods.php:274 PaymentMethods.php:281
-#: PaymentMethods.php:288 PaymentMethods.php:295 PcAuthorizeExpenses.php:246
-#: PDFChequeListing.php:64 PDFDeliveryDifferences.php:75 PDFDIFOT.php:79
-#: PO_AuthorisationLevels.php:136 PO_AuthorisationLevels.php:141
-#: PO_Header.php:798 PO_PDFPurchOrder.php:409 PO_PDFPurchOrder.php:412
-#: PurchData.php:299 PurchData.php:668 PurchData.php:671
-#: RecurringSalesOrders.php:492 RecurringSalesOrders.php:495
-#: SalesAnalReptCols.php:282 SalesAnalReptCols.php:420
-#: SalesAnalReptCols.php:423 SalesAnalRepts.php:419 SalesAnalRepts.php:422
-#: SalesAnalRepts.php:447 SalesAnalRepts.php:450 SalesAnalRepts.php:475
-#: SalesAnalRepts.php:478 SalesCategories.php:266 SalesCategories.php:352
-#: SalesCategories.php:354 SalesPeople.php:221 SalesPeople.php:364
-#: SalesPeople.php:366 SelectProduct.php:240 SelectProduct.php:383
-#: ShipmentCosting.php:668 ShopParameters.php:290 ShopParameters.php:292
-#: ShopParameters.php:338 ShopParameters.php:340 ShopParameters.php:392
-#: ShopParameters.php:394 ShopParameters.php:414 ShopParameters.php:416
-#: ShopParameters.php:496 ShopParameters.php:498 StockClone.php:912
-#: StockClone.php:914 StockClone.php:937 StockClone.php:939 Stocks.php:1199
-#: Stocks.php:1201 Stocks.php:1224 Stocks.php:1226 SuppContractChgs.php:92
-#: SystemParameters.php:427 SystemParameters.php:450 SystemParameters.php:485
-#: SystemParameters.php:557 SystemParameters.php:565 SystemParameters.php:605
-#: SystemParameters.php:681 SystemParameters.php:690 SystemParameters.php:698
-#: SystemParameters.php:716 SystemParameters.php:723 SystemParameters.php:767
-#: SystemParameters.php:863 SystemParameters.php:1004
-#: SystemParameters.php:1008 SystemParameters.php:1016
-#: SystemParameters.php:1020 SystemParameters.php:1074
-#: SystemParameters.php:1084 SystemParameters.php:1088
-#: SystemParameters.php:1124 SystemParameters.php:1128 TaxGroups.php:312
-#: TaxGroups.php:315 TaxGroups.php:373 WWW_Users.php:490 WWW_Users.php:494
-#: WWW_Users.php:663 WWW_Users.php:667 includes/PDFLowGPPageHeader.inc:44
-#: includes/PDFTaxPageHeader.inc:35
-msgid "No"
-msgstr "Nein"
-
-#: AccountGroups.php:325 AccountSections.php:192 AddCustomerContacts.php:148
-#: AddCustomerNotes.php:137 AddCustomerTypeNotes.php:131 Areas.php:164
-#: BankAccounts.php:223 BOMs.php:152 COGSGLPostings.php:112
-#: COGSGLPostings.php:216 CreditStatus.php:175 Currencies.php:363
-#: CustomerBranches.php:455 Customers.php:1130 Customers.php:1164
-#: CustomerTypes.php:206 Departments.php:186 EDIMessageFormat.php:150
-#: Factors.php:334 FixedAssetCategories.php:190 FixedAssetLocations.php:111
-#: FreightCosts.php:253 GeocodeSetup.php:173 GLAccounts.php:317 GLTags.php:96
-#: ImportBankTransAnalysis.php:224 InternalStockRequest.php:292 Labels.php:323
-#: Labels.php:348 Locations.php:404 MailingGroupMaintenance.php:178
-#: MaintenanceTasks.php:118 Manufacturers.php:217 MRPDemands.php:309
-#: MRPDemandTypes.php:120 PaymentMethods.php:208 PaymentTerms.php:205
-#: PcAssignCashToTab.php:277 PcClaimExpensesFromTab.php:276 PcExpenses.php:226
-#: PcTabs.php:236 PcTypeTabs.php:180 PO_AuthorisationLevels.php:151
-#: Prices_Customer.php:280 Prices.php:255 PurchData.php:312
-#: SalesCategories.php:272 SalesGLPostings.php:137 SalesGLPostings.php:253
-#: SalesPeople.php:232 SalesTypes.php:206 SecurityTokens.php:130
-#: SelectCustomer.php:614 SelectCustomer.php:633 SelectCustomer.php:663
-#: SelectCustomer.php:681 SelectCustomer.php:705 SelectCustomer.php:722
-#: SelectGLAccount.php:117 SelectGLAccount.php:132 SellThroughSupport.php:298
-#: Shippers.php:144 StockCategories.php:289 SupplierContacts.php:165
-#: SupplierTenderCreate.php:155 SupplierTypes.php:189
-#: SuppTransGLAnalysis.php:125 TaxAuthorities.php:174 TaxCategories.php:182
-#: TaxGroups.php:188 TaxProvinces.php:180 UnitsOfMeasure.php:185
-#: WorkCentres.php:141 WWW_Access.php:126 WWW_Users.php:327
-#: includes/InputSerialItems.php:102 includes/OutputSerialItems.php:20
-#, php-format
-msgid "Edit"
-msgstr "Bearbeiten"
-
-#: AccountGroups.php:326
-msgid "Are you sure you wish to delete this account group?"
-msgstr "Möchten Sie diese Kontengruppe wirklich löschen?"
-
-#: AccountGroups.php:326 AccountSections.php:196 AddCustomerContacts.php:149
-#: AddCustomerNotes.php:138 AddCustomerTypeNotes.php:132 Areas.php:165
-#: BankAccounts.php:224 BOMs.php:154 COGSGLPostings.php:113
-#: COGSGLPostings.php:217 ContractBOM.php:272 ContractOtherReqts.php:124
-#: CounterReturns.php:740 CounterSales.php:836 Credit_Invoice.php:403
-#: CreditStatus.php:176 Currencies.php:366 CustomerReceipt.php:988
-#: Customers.php:1165 CustomerTypes.php:207 Departments.php:187
-#: DiscountCategories.php:238 DiscountMatrix.php:183 EDIMessageFormat.php:151
-#: FixedAssetCategories.php:191 FreightCosts.php:254 GeocodeSetup.php:174
-#: GLAccounts.php:318 GLJournal.php:429 GLTags.php:97
-#: ImportBankTransAnalysis.php:225 InternalStockCategoriesByRole.php:184
-#: InternalStockRequest.php:293 Labels.php:324 Labels.php:349 Labels.php:597
-#: Locations.php:405 MailingGroupMaintenance.php:179 MaintenanceTasks.php:119
-#: Manufacturers.php:218 MRPDemands.php:310 MRPDemandTypes.php:121
-#: PaymentMethods.php:209 Payments.php:1104 PaymentTerms.php:206
-#: PcAssignCashToTab.php:281 PcClaimExpensesFromTab.php:277 PcExpenses.php:227
-#: PcExpensesTypeTab.php:187 PcTabs.php:237 PcTypeTabs.php:181
-#: PO_AuthorisationLevels.php:153 PO_Items.php:772 PriceMatrix.php:174
-#: Prices_Customer.php:281 Prices.php:256 PurchData.php:314 PurchData.php:721
-#: SalesAnalReptCols.php:299 SalesAnalRepts.php:307 SalesCategories.php:273
-#: SalesGLPostings.php:138 SalesGLPostings.php:254 SalesPeople.php:233
-#: SalesTypes.php:207 SecurityTokens.php:131 SelectCreditItems.php:779
-#: SelectCustomer.php:615 SelectCustomer.php:634 SelectCustomer.php:664
-#: SelectCustomer.php:682 SelectCustomer.php:706 SelectCustomer.php:723
-#: SelectOrderItems.php:1440 SellThroughSupport.php:299 Shipments.php:440
-#: Shippers.php:145 SpecialOrder.php:667 StockCategories.php:290
-#: StockCategories.php:619 StockLocTransfer.php:324 SuppContractChgs.php:99
-#: SuppCreditGRNs.php:117 SuppFixedAssetChgs.php:90 SuppInvGRNs.php:147
-#: SupplierContacts.php:166 SupplierTenderCreate.php:417
-#: SupplierTenderCreate.php:447 SupplierTypes.php:191 SuppShiptChgs.php:90
-#: SuppTransGLAnalysis.php:126 TaxAuthorities.php:175 TaxCategories.php:183
-#: TaxGroups.php:189 TaxProvinces.php:181 UnitsOfMeasure.php:186
-#: WorkCentres.php:142 WOSerialNos.php:327 WWW_Access.php:127
-#: WWW_Users.php:328 includes/InputSerialItemsKeyed.php:60
-#: includes/OutputSerialItems.php:99
-#, php-format
-msgid "Delete"
-msgstr "Löschen"
-
-#: AccountGroups.php:354
-msgid "An error occurred in retrieving the account group information"
-msgstr "Ein Fehler ist aufgetreten beim Ermitteln der Kontengruppenangaben"
-
-#: AccountGroups.php:355
-msgid ""
-"The SQL that was used to retrieve the account group and that failed in the "
-"process was"
-msgstr "Die fehlerhafte Abfrage zur Ermittlung der Kontengruppe war"
-
-#: AccountGroups.php:358
-msgid "The account group name does not exist in the database"
-msgstr "Der Name der Kontengruppe kommt nicht in der Datenbank vor"
-
-#: AccountGroups.php:372
-msgid "Edit Account Group Details"
-msgstr "Kontengruppen-Details bearbeiten"
-
-#: AccountGroups.php:396
-msgid "New Account Group Details"
-msgstr "Neue Kontengruppen-Details"
-
-#: AccountGroups.php:403
-msgid "Account Group Name"
-msgstr "Name der Kontengruppe"
-
-#: AccountGroups.php:404
-msgid "Enter the account group name"
-msgstr ""
-
-#: AccountGroups.php:404
-msgid ""
-"A unique name for the account group must be entered - at least 3 characters "
-"long and less than 30 characters long. Only alpha numeric characters can be "
-"used."
-msgstr ""
-
-#: AccountGroups.php:413 AccountGroups.php:415
-msgid "Top Level Group"
-msgstr "Top-Level-Gruppe"
-
-#: AccountGroups.php:429
-msgid "Section In Accounts"
-msgstr "Kontenbereich"
-
-#: AccountGroups.php:445
-msgid ""
-"Select YES if this account group will contain accounts that will consist of "
-"only profit and loss accounts or NO if the group will contain balance sheet "
-"account"
-msgstr ""
-
-#: AccountGroups.php:462
-msgid ""
-"Enter the sequence number that this account group and its child general "
-"ledger accounts should display in the trial balance"
-msgstr ""
-
-#: AccountGroups.php:465 AccountSections.php:263 AddCustomerContacts.php:260
-#: AddCustomerNotes.php:242 AddCustomerTypeNotes.php:221 Areas.php:229
-#: BankAccounts.php:399 BOMs.php:802 COGSGLPostings.php:365
-#: CreditStatus.php:259 Currencies.php:513 CustLoginSetup.php:273
-#: Departments.php:258 DiscountMatrix.php:142 EDIMessageFormat.php:248
-#: FixedAssetCategories.php:350 FixedAssetLocations.php:161
-#: FreightCosts.php:371 GeocodeSetup.php:271 GLAccounts.php:266 Labels.php:631
-#: Locations.php:646 Manufacturers.php:312 MRPDemands.ph...
[truncated message content] |
|
From: <ex...@us...> - 2014-05-14 15:40:33
|
Revision: 6708
http://sourceforge.net/p/web-erp/reponame/6708
Author: exsonqu
Date: 2014-05-14 15:40:27 +0000 (Wed, 14 May 2014)
Log Message:
-----------
14/05/2014 Exson: Fixed typo in MRPReport.php which make some supplies not to be shown on the report and use itemdue instead of deliverydate in MRP to ensure that requirements are calculated correctly for items due on different date.
Modified Paths:
--------------
trunk/MRP.php
trunk/MRPReport.php
Modified: trunk/MRP.php
===================================================================
--- trunk/MRP.php 2014-05-12 06:05:32 UTC (rev 6707)
+++ trunk/MRP.php 2014-05-14 15:40:27 UTC (rev 6708)
@@ -239,7 +239,7 @@
directdemand,
whererequired)
SELECT stkcode,
- deliverydate,
+ itemdue,
(quantity - qtyinvoiced) AS netqty,
'SO',
salesorderdetails.orderno,
Modified: trunk/MRPReport.php
===================================================================
--- trunk/MRPReport.php 2014-05-12 06:05:32 UTC (rev 6707)
+++ trunk/MRPReport.php 2014-05-14 15:40:27 UTC (rev 6708)
@@ -422,7 +422,7 @@
// Details for Demand/Supply Sections
$i = 0;
- while ((isset($Supplies[$i]) AND mb_strlen($Supplies[$i]['part'])) > 1
+ while ((isset($Supplies[$i]) AND mb_strlen($Supplies[$i]['part']) > 1)
OR (isset($Requirements[$i]) AND mb_strlen($Requirements[$i]['part']) > 1)){
$YPos -=$line_height;
@@ -828,4 +828,4 @@
} // End of PrintHeader function
-?>
+?>
\ No newline at end of file
|
|
From: <dai...@us...> - 2014-05-16 09:44:34
|
Revision: 6711
http://sourceforge.net/p/web-erp/reponame/6711
Author: daintree
Date: 2014-05-16 09:44:30 +0000 (Fri, 16 May 2014)
Log Message:
-----------
renamed file css/wood/images/user.png and error trap 0 exrates for sales analysis
Modified Paths:
--------------
trunk/ConfirmDispatch_Invoice.php
trunk/CounterReturns.php
trunk/CounterSales.php
trunk/Credit_Invoice.php
trunk/MRP.php
trunk/SelectCreditItems.php
Added Paths:
-----------
trunk/css/wood/images/user.png
Removed Paths:
-------------
trunk/css/wood/images/User.png
Modified: trunk/ConfirmDispatch_Invoice.php
===================================================================
--- trunk/ConfirmDispatch_Invoice.php 2014-05-15 05:22:56 UTC (rev 6710)
+++ trunk/ConfirmDispatch_Invoice.php 2014-05-16 09:44:30 UTC (rev 6711)
@@ -1208,6 +1208,11 @@
/*Insert Sales Analysis records */
+ $SalesValue = 0;
+ if ($_SESSION['CurrencyRate']>0){
+ $SalesValue = $OrderLine->Price * $OrderLine->QtyDispatched / $_SESSION['CurrencyRate'];
+ }
+
$SQL="SELECT COUNT(*),
salesanalysis.stockid,
salesanalysis.stkcategory,
@@ -1248,10 +1253,10 @@
if ($myrow[0]>0){ /*Update the existing record that already exists */
- $SQL = "UPDATE salesanalysis SET amt=amt+" . round(($OrderLine->Price * $OrderLine->QtyDispatched / $_SESSION['CurrencyRate']),$_SESSION['CompanyRecord']['decimalplaces']) . ",
+ $SQL = "UPDATE salesanalysis SET amt=amt+" . round(($SalesValue),$_SESSION['CompanyRecord']['decimalplaces']) . ",
cost=cost+" . round(($OrderLine->StandardCost * $OrderLine->QtyDispatched),$_SESSION['CompanyRecord']['decimalplaces']) . ",
qty=qty +" . $OrderLine->QtyDispatched . ",
- disc=disc+" . round(($OrderLine->DiscountPercent * $OrderLine->Price * $OrderLine->QtyDispatched / $_SESSION['CurrencyRate']),$_SESSION['CompanyRecord']['decimalplaces']) . "
+ disc=disc+" . round(($OrderLine->DiscountPercent * $SalesValue),$_SESSION['CompanyRecord']['decimalplaces']) . "
WHERE salesanalysis.area='" . $myrow[5] . "'
AND salesanalysis.salesperson='" . $myrow[8] . "'
AND typeabbrev ='" . $_SESSION['Items'.$identifier]->DefaultSalesType . "'
@@ -1279,12 +1284,12 @@
stkcategory )
SELECT '" . $_SESSION['Items'.$identifier]->DefaultSalesType . "',
'" . $PeriodNo . "',
- '" . round(($OrderLine->Price * $OrderLine->QtyDispatched / $_SESSION['CurrencyRate']),$_SESSION['CompanyRecord']['decimalplaces']) . "',
+ '" . round(($SalesValue),$_SESSION['CompanyRecord']['decimalplaces']) . "',
'" . round(($OrderLine->StandardCost * $OrderLine->QtyDispatched),$_SESSION['CompanyRecord']['decimalplaces']) . "',
'" . $_SESSION['Items'.$identifier]->DebtorNo . "',
'" . $_SESSION['Items'.$identifier]->Branch . "',
'" . ($OrderLine->QtyDispatched) . "',
- '" . round(($OrderLine->DiscountPercent * $OrderLine->Price * $OrderLine->QtyDispatched / $_SESSION['CurrencyRate']),$_SESSION['CompanyRecord']['decimalplaces']) . "',
+ '" . round(($OrderLine->DiscountPercent * $SalesValue),$_SESSION['CompanyRecord']['decimalplaces']) . "',
'" . $OrderLine->StockID . "',
custbranch.area,
1,
Modified: trunk/CounterReturns.php
===================================================================
--- trunk/CounterReturns.php 2014-05-15 05:22:56 UTC (rev 6710)
+++ trunk/CounterReturns.php 2014-05-16 09:44:30 UTC (rev 6711)
@@ -1193,6 +1193,10 @@
/*Insert Sales Analysis records */
+ $SalesValue = 0;
+ if ($ExRate>0){
+ $SalesValue = $ReturnItemLine->Price * $ReturnItemLine->Quantity / $ExRate;
+ }
$SQL="SELECT COUNT(*),
salesanalysis.stockid,
@@ -1236,10 +1240,10 @@
if ($myrow[0]>0){ /*Update the existing record that already exists */
$SQL = "UPDATE salesanalysis
- SET amt=amt-" . ($ReturnItemLine->Price * $ReturnItemLine->Quantity / $ExRate) . ",
+ SET amt=amt-" . ($SalesValue) . ",
cost=cost-" . ($ReturnItemLine->StandardCost * $ReturnItemLine->Quantity) . ",
qty=qty -" . $ReturnItemLine->Quantity . ",
- disc=disc-" . ($ReturnItemLine->DiscountPercent * $ReturnItemLine->Price * $ReturnItemLine->Quantity / $ExRate) . "
+ disc=disc-" . ($ReturnItemLine->DiscountPercent * $SalesValue) . "
WHERE salesanalysis.area='" . $myrow[5] . "'
AND salesanalysis.salesperson='" . $_SESSION['Items' . $identifier]->SalesPerson . "'
AND typeabbrev ='" . $_SESSION['Items' . $identifier]->DefaultSalesType . "'
@@ -1267,12 +1271,12 @@
stkcategory )
SELECT '" . $_SESSION['Items' . $identifier]->DefaultSalesType . "',
'" . $PeriodNo . "',
- '" . -($ReturnItemLine->Price * $ReturnItemLine->Quantity / $ExRate) . "',
+ '" . -($SalesValue) . "',
'" . -($ReturnItemLine->StandardCost * $ReturnItemLine->Quantity) . "',
'" . $_SESSION['Items' . $identifier]->DebtorNo . "',
'" . $_SESSION['Items' . $identifier]->Branch . "',
'" . -$ReturnItemLine->Quantity . "',
- '" . -($ReturnItemLine->DiscountPercent * $ReturnItemLine->Price * $ReturnItemLine->Quantity / $ExRate) . "',
+ '" . -($ReturnItemLine->DiscountPercent * $SalesValue) . "',
'" . $ReturnItemLine->StockID . "',
custbranch.area,
1,
Modified: trunk/CounterSales.php
===================================================================
--- trunk/CounterSales.php 2014-05-15 05:22:56 UTC (rev 6710)
+++ trunk/CounterSales.php 2014-05-16 09:44:30 UTC (rev 6711)
@@ -1647,8 +1647,11 @@
End of controlled stuff not currently handled by counter orders
*/
+ $SalesValue = 0;
+ if ($ExRate>0){
+ $SalesValue = $OrderLine->Price * $OrderLine->Quantity / $ExRate;
+ }
-
/*Insert Sales Analysis records */
$SQL="SELECT COUNT(*),
@@ -1693,10 +1696,10 @@
if ($myrow[0]>0){ /*Update the existing record that already exists */
$SQL = "UPDATE salesanalysis
- SET amt=amt+" . ($OrderLine->Price * $OrderLine->Quantity / $ExRate) . ",
+ SET amt=amt+" . ($SalesValue) . ",
cost=cost+" . ($OrderLine->StandardCost * $OrderLine->Quantity) . ",
qty=qty +" . $OrderLine->Quantity . ",
- disc=disc+" . ($OrderLine->DiscountPercent * $OrderLine->Price * $OrderLine->Quantity / $ExRate) . "
+ disc=disc+" . ($OrderLine->DiscountPercent * $SalesValue) . "
WHERE salesanalysis.area='" . $myrow[5] . "'
AND salesanalysis.salesperson='" . $_SESSION['Items'.$identifier]->SalesPerson . "'
AND typeabbrev ='" . $_SESSION['Items'.$identifier]->DefaultSalesType . "'
@@ -1724,12 +1727,12 @@
stkcategory )
SELECT '" . $_SESSION['Items'.$identifier]->DefaultSalesType . "',
'" . $PeriodNo . "',
- '" . ($OrderLine->Price * $OrderLine->Quantity / $ExRate) . "',
+ '" . ($SalesValue) . "',
'" . ($OrderLine->StandardCost * $OrderLine->Quantity) . "',
'" . $_SESSION['Items'.$identifier]->DebtorNo . "',
'" . $_SESSION['Items'.$identifier]->Branch . "',
'" . $OrderLine->Quantity . "',
- '" . ($OrderLine->DiscountPercent * $OrderLine->Price * $OrderLine->Quantity / $ExRate) . "',
+ '" . ($OrderLine->DiscountPercent * $SalesValue) . "',
'" . $OrderLine->StockID . "',
custbranch.area,
1,
Modified: trunk/Credit_Invoice.php
===================================================================
--- trunk/Credit_Invoice.php 2014-05-15 05:22:56 UTC (rev 6710)
+++ trunk/Credit_Invoice.php 2014-05-16 09:44:30 UTC (rev 6711)
@@ -1124,6 +1124,10 @@
}
/*Insert Sales Analysis records */
+ $SalesValue = 0;
+ if ($_SESSION['CurrencyRate']>0){
+ $SalesValue = $CreditLine->Price * $CreditLine->QtyDispatched / $_SESSION['CurrencyRate'];
+ }
$SQL="SELECT COUNT(*),
stkcategory,
@@ -1157,7 +1161,7 @@
if ($_POST['CreditType']=='ReverseOverCharge'){
$SQL = "UPDATE salesanalysis
- SET amt=amt-" . $CreditLine->Price * $CreditLine->QtyDispatched / $_SESSION['CurrencyRate'] . ",
+ SET amt=amt-" . $SalesValue . ",
disc=disc-" . ($CreditLine->DiscountPercent * $CreditLine->Price * $CreditLine->QtyDispatched / $_SESSION['CurrencyRate']) . "
WHERE salesanalysis.area='" . $myrow[2] . "'
AND salesanalysis.salesperson='" . $_SESSION['CreditItems' . $identifier]->SalesPerson . "'
@@ -1172,10 +1176,10 @@
} else {
$SQL = "UPDATE salesanalysis
- SET amt=amt-" . $CreditLine->Price * $CreditLine->QtyDispatched / $_SESSION['CurrencyRate'] . ",
+ SET amt=amt-" . $SalesValue . ",
cost=cost-" . $CreditLine->StandardCost * $CreditLine->QtyDispatched . ",
qty=qty-" . $CreditLine->QtyDispatched . ",
- disc=disc-" . $CreditLine->DiscountPercent * $CreditLine->Price * $CreditLine->QtyDispatched / $_SESSION['CurrencyRate'] . "
+ disc=disc-" . $CreditLine->DiscountPercent * $SalesValue . "
WHERE salesanalysis.area='" . $myrow[2] . "'
AND salesanalysis.salesperson='" . $_SESSION['CreditItems' . $identifier]->SalesPerson . "'
AND typeabbrev ='" . $_SESSION['CreditItems' . $identifier]->DefaultSalesType . "'
@@ -1209,7 +1213,7 @@
'" . $_SESSION['CreditItems' . $identifier]->DebtorNo . "',
'" . $_SESSION['CreditItems' . $identifier]->Branch . "',
0,
- '" . -$CreditLine->DiscountPercent * $CreditLine->Price * $CreditLine->QtyDispatched / $_SESSION['CurrencyRate'] . "',
+ '" . -$CreditLine->DiscountPercent * $SalesValue . "',
'" . $CreditLine->StockID . "',
custbranch.area,
1,
@@ -1237,12 +1241,12 @@
stkcategory)
SELECT '" . $_SESSION['CreditItems' . $identifier]->DefaultSalesType . "',
'" . $PeriodNo . "',
- '" . -$CreditLine->Price * $CreditLine->QtyDispatched / $_SESSION['CurrencyRate'] . "',
+ '" . -$SalesValue . "',
'" . -$CreditLine->StandardCost * $CreditLine->QtyDispatched . "',
'" . $_SESSION['CreditItems' . $identifier]->DebtorNo . "',
'" . $_SESSION['CreditItems' . $identifier]->Branch . "',
'" . -$CreditLine->QtyDispatched . "',
- '" . -$CreditLine->DiscountPercent * $CreditLine->Price * $CreditLine->QtyDispatched / $_SESSION['CurrencyRate'] . "',
+ '" . -$CreditLine->DiscountPercent * $SalesValue . "',
'" . $CreditLine->StockID . "',
custbranch.area,
1,
Modified: trunk/MRP.php
===================================================================
--- trunk/MRP.php 2014-05-15 05:22:56 UTC (rev 6710)
+++ trunk/MRP.php 2014-05-16 09:44:30 UTC (rev 6711)
@@ -116,13 +116,13 @@
$sql = "SELECT * FROM tempbom";
$result = DB_query($sql,$db);
while ($myrow=DB_fetch_array($result)) {
- $parts = explode('%',$myrow['sortpart']);
+ $Parts = explode('%',$myrow['sortpart']);
$Level = $myrow['level'];
$ctr = 0;
- foreach ($parts as $part) {
+ foreach ($Parts as $Part) {
$ctr++;
$newlevel = $Level - $ctr;
- $sql = "INSERT INTO bomlevels (part, level) VALUES('" . $part . "','" . $newlevel . "')";
+ $sql = "INSERT INTO bomlevels (part, level) VALUES('" . $Part . "','" . $newlevel . "')";
$result2 = DB_query($sql,$db);
} // End of foreach
} //end of while loop
@@ -640,20 +640,20 @@
-function LevelNetting(&$db,$part,$eoq,$PanSize,$ShrinkFactor, $LeadTime) {
+function LevelNetting(&$db,$Part,$eoq,$PanSize,$ShrinkFactor, $LeadTime) {
// Create an array of mrprequirements and an array of mrpsupplies, then read through
// them seeing if all requirements are covered by supplies. Create a planned order
// for any unmet requirements. Change dates if necessary for the supplies.
- //echo '<br />Part is ' . "$part" . '<br />';
+ //echo '<br />Part is ' . "$Part" . '<br />';
// Get decimal places from stockmaster for rounding of shrinkage factor
- $sql = "SELECT decimalplaces FROM stockmaster WHERE stockid = '" . $part . "'";
+ $sql = "SELECT decimalplaces FROM stockmaster WHERE stockid = '" . $Part . "'";
$result = DB_query($sql,$db);
$myrow=DB_fetch_row($result);
$DecimalPlaces = $myrow[0];
// Load mrprequirements into $Requirements array
- $sql = "SELECT * FROM mrprequirements WHERE part = '" .$part. "' ORDER BY daterequired";
+ $sql = "SELECT * FROM mrprequirements WHERE part = '" .$Part. "' ORDER BY daterequired";
$result = DB_query($sql,$db);
$Requirements = array();
$i = 0;
@@ -663,7 +663,7 @@
} //end of while loop
// Load mrpsupplies into $Supplies array
- $sql = "SELECT * FROM mrpsupplies WHERE part = '" .$part. "' ORDER BY duedate";
+ $sql = "SELECT * FROM mrpsupplies WHERE part = '" . $Part. "' ORDER BY duedate";
$result = DB_query($sql,$db);
$Supplies = array();
$i = 0;
Modified: trunk/SelectCreditItems.php
===================================================================
--- trunk/SelectCreditItems.php 2014-05-15 05:22:56 UTC (rev 6710)
+++ trunk/SelectCreditItems.php 2014-05-16 09:44:30 UTC (rev 6711)
@@ -1636,6 +1636,11 @@
set up. Considered just getting the area and salesman from the branch table but these can alter and the
sales analysis needs to reflect the sales made before and after the changes*/
+ $SalesValue = 0;
+ if ($_SESSION['CurrencyRate']>0){
+ $SalesValue = $CreditLine->Price * $CreditLine->Quantity / $_SESSION['CurrencyRate'];
+ }
+
$SQL="SELECT COUNT(*),
salesanalysis.stkcategory,
salesanalysis.area
@@ -1670,8 +1675,8 @@
/*No updates to qty or cost data */
- $SQL = "UPDATE salesanalysis SET amt=amt-" . $CreditLine->Price * $CreditLine->Quantity / $_SESSION['CurrencyRate'] . ",
- disc=disc-" . $CreditLine->DiscountPercent * $CreditLine->Price * $CreditLine->Quantity / $_SESSION['CurrencyRate'] . "
+ $SQL = "UPDATE salesanalysis SET amt=amt-" . $SalesValue . ",
+ disc=disc-" . $CreditLine->DiscountPercent * $SalesValue . "
WHERE salesanalysis.area='" . $myrow['area'] . "'
AND salesanalysis.salesperson='" . $_SESSION['CreditItems'.$identifier]->SalesPerson . "'
AND salesanalysis.typeabbrev ='" . $_SESSION['CreditItems'.$identifier]->DefaultSalesType . "'
@@ -1684,10 +1689,10 @@
} else {
- $SQL = "UPDATE salesanalysis SET Amt=Amt-" . $CreditLine->Price * $CreditLine->Quantity / $_SESSION['CurrencyRate'] . ",
+ $SQL = "UPDATE salesanalysis SET Amt=Amt-" . $SalesValue . ",
Cost=Cost-" . $CreditLine->StandardCost * $CreditLine->Quantity . ",
Qty=Qty-" . $CreditLine->Quantity . ",
- Disc=Disc-" . $CreditLine->DiscountPercent * $CreditLine->Price * $CreditLine->Quantity / $_SESSION['CurrencyRate'] . "
+ Disc=Disc-" . $CreditLine->DiscountPercent * $SalesValue . "
WHERE salesanalysis.area='" . $myrow['area'] . "'
AND salesanalysis.salesperson='" . $_SESSION['CreditItems'.$identifier]->SalesPerson . "'
AND salesanalysis.typeabbrev ='" . $_SESSION['CreditItems'.$identifier]->DefaultSalesType . "'
@@ -1717,11 +1722,11 @@
stkcategory)
SELECT '" . $_SESSION['CreditItems'.$identifier]->DefaultSalesType . "',
'" . $PeriodNo . "',
- '" . -$CreditLine->Price * $CreditLine->Quantity / $_SESSION['CurrencyRate'] . "',
+ '" . -$SalesValue . "',
'" . $_SESSION['CreditItems'.$identifier]->DebtorNo . "',
'" . $_SESSION['CreditItems'.$identifier]->Branch . "',
0,
- '" . -$CreditLine->DiscountPercent * $CreditLine->Price * $CreditLine->Quantity / $_SESSION['CurrencyRate'] . "',
+ '" . -$CreditLine->DiscountPercent * $SalesValue . "',
'" . $CreditLine->StockID . "',
custbranch.area,
1,
@@ -1749,12 +1754,12 @@
stkcategory)
SELECT '" . $_SESSION['CreditItems'.$identifier]->DefaultSalesType . "',
'" . $PeriodNo . "',
- '" . -$CreditLine->Price * $CreditLine->Quantity / $_SESSION['CurrencyRate'] . "',
+ '" . -$SalesValue . "',
'" . -$CreditLine->StandardCost * $CreditLine->Quantity . "',
'" . $_SESSION['CreditItems'.$identifier]->DebtorNo . "',
'" . $_SESSION['CreditItems'.$identifier]->Branch . "',
'" . -$CreditLine->Quantity . "',
- '" . -$CreditLine->DiscountPercent * $CreditLine->Price * $CreditLine->Quantity / $_SESSION['CurrencyRate'] . "',
+ '" . -$CreditLine->DiscountPercent * $SalesValue . "',
'" . $CreditLine->StockID . "',
custbranch.area,
1,
Deleted: trunk/css/wood/images/User.png
===================================================================
(Binary files differ)
Copied: trunk/css/wood/images/user.png (from rev 6702, trunk/css/wood/images/User.png)
===================================================================
(Binary files differ)
|
|
From: <dai...@us...> - 2014-05-16 23:00:36
|
Revision: 6712
http://sourceforge.net/p/web-erp/reponame/6712
Author: daintree
Date: 2014-05-16 23:00:34 +0000 (Fri, 16 May 2014)
Log Message:
-----------
fixed Z_ChangeStockCode.php to change stockdescriptiontranslations too
Modified Paths:
--------------
trunk/Z_ChangeStockCode.php
trunk/doc/Change.log
Modified: trunk/Z_ChangeStockCode.php
===================================================================
--- trunk/Z_ChangeStockCode.php 2014-05-16 09:44:30 UTC (rev 6711)
+++ trunk/Z_ChangeStockCode.php 2014-05-16 23:00:34 UTC (rev 6712)
@@ -143,6 +143,7 @@
ChangeFieldInTable("bom", "component", $_POST['OldStockID'], $_POST['NewStockID'], $db);
ChangeFieldInTable("bom", "parent", $_POST['OldStockID'], $_POST['NewStockID'], $db);
ChangeFieldInTable("stockrequestitems", "stockid", $_POST['OldStockID'], $_POST['NewStockID'], $db);
+ ChangeFieldInTable("stockdescriptiontranslations", "stockid", $_POST['OldStockID'], $_POST['NewStockID'], $db);
echo '<br />' . _('Changing any image files');
if (file_exists($_SESSION['part_pics_dir'] . '/' .$_POST['OldStockID'].'.jpg')){
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2014-05-16 09:44:30 UTC (rev 6711)
+++ trunk/doc/Change.log 2014-05-16 23:00:34 UTC (rev 6712)
@@ -1,5 +1,7 @@
webERP Change Log
+17/05/14 Phil: sales invoice and credit scripts all check for 0 exchange rate before updating sales anlaysis now
+17/05/14 Phil: Fixed Z_ChangeStockCode.php which was orphaning stockdescriptiontranslations without changing them to the new code
14/05/14 Exson: Fixed typo in MRPReport.php which make some supplies not to be shown on the report and use itemdue instead of deliverydate in MRP to ensure that requirements are calculated correctly for items due on different date.
3/5/14 Khwunchai J.: New Xenos theme
3/5/14 Phil: StockCostUpdate.php now allows updates to manufactured items.
|
|
From: <dai...@us...> - 2014-05-17 02:53:58
|
Revision: 6713
http://sourceforge.net/p/web-erp/reponame/6713
Author: daintree
Date: 2014-05-17 02:53:54 +0000 (Sat, 17 May 2014)
Log Message:
-----------
remove db from GetPrice calls
Modified Paths:
--------------
trunk/SelectCreditItems.php
trunk/StockDispatch.php
trunk/api/api_php.php
trunk/includes/GetPrice.inc
trunk/includes/SelectOrderItems_IntoCart.inc
Modified: trunk/SelectCreditItems.php
===================================================================
--- trunk/SelectCreditItems.php 2014-05-16 23:00:34 UTC (rev 6712)
+++ trunk/SelectCreditItems.php 2014-05-17 02:53:54 UTC (rev 6713)
@@ -478,7 +478,7 @@
$myrow['longdescription'],
GetPrice ($_POST['NewItem'],
$_SESSION['CreditItems'.$identifier]->DebtorNo,
- $_SESSION['CreditItems'.$identifier]->Branch, $db),
+ $_SESSION['CreditItems'.$identifier]->Branch),
0,
$myrow['units'],
$myrow['volume'],
@@ -646,8 +646,7 @@
$myrow['longdescription'],
GetPrice($_POST['NewItem'],
$_SESSION['CreditItems'.$identifier]->DebtorNo,
- $_SESSION['CreditItems'.$identifier]->Branch,
- $db),
+ $_SESSION['CreditItems'.$identifier]->Branch),
0,
$myrow['units'],
$myrow['volume'],
Modified: trunk/StockDispatch.php
===================================================================
--- trunk/StockDispatch.php 2014-05-16 23:00:34 UTC (rev 6712)
+++ trunk/StockDispatch.php 2014-05-17 02:53:54 UTC (rev 6713)
@@ -233,7 +233,7 @@
$pdf->addTextWrap(510,$YPos,40,$FontSize,'_________','right',0,$fill);
if($template=='fullprices'){
// looking for price info
- $DefaultPrice = GetPrice($myrow['stockid'],$ToCustomer, $ToBranch, $db,$ShipQty, false);
+ $DefaultPrice = GetPrice($myrow['stockid'],$ToCustomer, $ToBranch, $ShipQty, false);
if ($myrow['discountcategory'] != "")
{
$DiscountLine = ' -> ' . _('Discount Category') . ':' . $myrow['discountcategory'];
Modified: trunk/api/api_php.php
===================================================================
--- trunk/api/api_php.php 2014-05-16 23:00:34 UTC (rev 6712)
+++ trunk/api/api_php.php 2014-05-17 02:53:54 UTC (rev 6713)
@@ -15,7 +15,6 @@
/* Required for creating invoices/credits */
include($PathPrefix . 'includes/GetSalesTransGLCodes.inc');
include($PathPrefix . 'includes/Z_POSDataCreation.php');
- include($PathPrefix . 'includes/GetPrice.inc');
/* Get weberp authentication, and return a valid database
connection */
Modified: trunk/includes/GetPrice.inc
===================================================================
--- trunk/includes/GetPrice.inc 2014-05-16 23:00:34 UTC (rev 6712)
+++ trunk/includes/GetPrice.inc 2014-05-17 02:53:54 UTC (rev 6713)
@@ -1,7 +1,7 @@
<?php
/* $Id$*/
-function GetPrice ($StockID, $DebtorNo, $BranchCode, $db, $OrderLineQty,$ReportZeroPrice=1){
-
+function GetPrice ($StockID, $DebtorNo, $BranchCode, $OrderLineQty=1,$ReportZeroPrice=1){
+ global $db;
$Price = 0;
/*Search by branch and customer for a date specified price */
Modified: trunk/includes/SelectOrderItems_IntoCart.inc
===================================================================
--- trunk/includes/SelectOrderItems_IntoCart.inc 2014-05-16 23:00:34 UTC (rev 6712)
+++ trunk/includes/SelectOrderItems_IntoCart.inc 2014-05-17 02:53:54 UTC (rev 6713)
@@ -109,7 +109,7 @@
$Discount = 0;
}
- $Price = GetPrice($NewItem, $_SESSION['Items'.$identifier]->DebtorNo,$_SESSION['Items'.$identifier]->Branch, $db,$NewItemQty);
+ $Price = GetPrice($NewItem, $_SESSION['Items'.$identifier]->DebtorNo,$_SESSION['Items'.$identifier]->Branch, $NewItemQty);
/* Need to check for sell through support deals */
|
|
From: <dai...@us...> - 2014-05-22 07:40:20
|
Revision: 6723
http://sourceforge.net/p/web-erp/reponame/6723
Author: daintree
Date: 2014-05-22 07:40:15 +0000 (Thu, 22 May 2014)
Log Message:
-----------
Tim:Allow functional currency data to be modified and highlight errors on editing currencies
Modified Paths:
--------------
trunk/Currencies.php
trunk/PO_Items.php
trunk/javascripts/MiscFunctions.js
Modified: trunk/Currencies.php
===================================================================
--- trunk/Currencies.php 2014-05-20 00:19:03 UTC (rev 6722)
+++ trunk/Currencies.php 2014-05-22 07:40:15 UTC (rev 6723)
@@ -54,7 +54,7 @@
$Errors[$i] = 'Abbreviation';
$i++;
}
-
+
if (!is_numeric(filter_number_format($_POST['ExchangeRate']))){
$InputError = 1;
prnMsg(_('The exchange rate must be numeric'),'error');
@@ -77,7 +77,7 @@
$Errors[$i] = 'DecimalPlaces';
$i++;
}
-
+
if (mb_strlen($_POST['Country']) > 50) {
$InputError = 1;
prnMsg(_('The currency country must be 50 characters or less long'),'error');
@@ -91,10 +91,9 @@
$i++;
}
if (($FunctionalCurrency != '') AND (isset($SelectedCurrency) AND $SelectedCurrency==$FunctionalCurrency)){
- $InputError = 1;
- prnMsg(_('The functional currency cannot be modified or deleted'),'error');
+ $_POST['ExchangeRate'] = 1;
}
-
+
if (isset($SelectedCurrency) AND $InputError !=1) {
/*Get the previous exchange rate. We will need it later to adjust bank account balances */
$SQLOldRate = "SELECT rate
@@ -113,7 +112,7 @@
WHERE currabrev = '" . $SelectedCurrency . "'";
$msg = _('The currency definition record has been updated');
$NewRate = $_POST['ExchangeRate'];
-
+
} else if ($InputError !=1) {
/*Selected currencies is null cos no item selected on first time round so must be adding a record must be submitting new entries in the new payment terms form */
@@ -141,22 +140,22 @@
if ($InputError!=1){
prnMsg( $msg,'success');
}
-
+
/* Now we should update the functional currency value of the bank accounts of the $SelectedCurrency
- Example: if functional currency = IDR and we have a bank account in USD.
+ Example: if functional currency = IDR and we have a bank account in USD.
Before rate was 1 USD = 9.000 IDR so OldRate = 1 /9.000 = 0.000111
- if the new exchange rate is 1 USD = 10.000 IDR NewRate will be 0.0001.
- If we had 5.000 USD on the bank account, we had 45.000.000 IDR on the balance sheet.
- After we update to the new rate, we still have 5.000 USD on the bank account
+ if the new exchange rate is 1 USD = 10.000 IDR NewRate will be 0.0001.
+ If we had 5.000 USD on the bank account, we had 45.000.000 IDR on the balance sheet.
+ After we update to the new rate, we still have 5.000 USD on the bank account
but the balance value of the bank account is 50.000.000 IDR, so let's adjust the value */
-
+
if (isset($SelectedCurrency) AND $InputError !=1) {
/*Get the current period */
$PostingDate = Date($_SESSION['DefaultDateFormat']);
$PeriodNo = GetPeriod($PostingDate,$db);
/* get all the bank accounts denominated on the selected currency */
- $SQLBankAccounts = "SELECT bankaccountname,
+ $SQLBankAccounts = "SELECT bankaccountname,
accountcode
FROM bankaccounts
WHERE currcode = '" . $SelectedCurrency . "'";
@@ -174,13 +173,13 @@
$myrow = DB_fetch_row($BalanceResult);
$OldBalanceInFunctionalCurrency = $myrow[0];
$BalanceInAccountCurrency = $OldBalanceInFunctionalCurrency * $OldRate;
-
+
/* Now calculate the Balance in functional currency at the new rate */
$NewBalanceInFucntionalCurrency = $BalanceInAccountCurrency / $NewRate;
-
+
/* If some adjustment has to be done, do it! */
$DifferenceToAdjust = $NewBalanceInFucntionalCurrency - $OldBalanceInFunctionalCurrency;
- if(OldRate != NewRate){
+ if($OldRate != $NewRate){
$SQL = "INSERT INTO gltrans (type,
typeno,
@@ -221,7 +220,7 @@
}
}
$resultTx = DB_Txn_Commit($db);
-
+
unset($SelectedCurrency);
unset($_POST['Country']);
unset($_POST['HundredsName']);
@@ -377,7 +376,8 @@
<td class="number">%s</td>
<td class="number">%s</td>
<td class="number">%s</td>
- <td class="centre" colspan="3">%s</td>
+ <td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?&SelectedCurrency=' . urlencode($myrow['currabrev']) . '">' . _('Edit') . '</a></td>
+ <td colspan="2">' . _('Functional Currency') . '</td>
</tr>',
$ImageFile,
$myrow['currabrev'],
@@ -457,40 +457,47 @@
}
echo '<tr>
- <td>' . _('Country').':</td>
- <td>';
+ <td>' . _('Country') . ':</td>';
if (!isset($_POST['Country'])) {
- $_POST['Country']='';
+ $_POST['Country'] = '';
}
- echo '<input ' . (in_array('Country',$Errors) ? 'class="inputerror"' : '' ) . ' type="text" name="Country" size="30" maxlength="50" value="' . $_POST['Country'] . '" /></td>
- </tr>
+ if ($_POST['Abbreviation'] != $FunctionalCurrency) {
+ echo '<td><input type="text" name="Country" size="30" required="required" minlength="1" maxlength="50" value="' . $_POST['Country'] . '" /></td>';
+ } else {
+ echo '<td>' . $_POST['Country'] . '</td>';
+ echo '<input type="hidden" name="Country" value="' . $_POST['Country'] . '" />';
+ }
+ echo '</tr>
<tr>
- <td>' . _('Hundredths Name').':</td>
+ <td>' . _('Hundredths Name') . ':</td>
<td>';
if (!isset($_POST['HundredsName'])) {
- $_POST['HundredsName']='';
+ $_POST['HundredsName'] = '';
}
- echo '<input ' . (in_array('HundredsName',$Errors) ? 'class="inputerror"' : '' ) . ' type="text" name="HundredsName" size="10" maxlength="15" value="'. $_POST['HundredsName'].'" /></td>
+ echo '<input type="text" name="HundredsName" size="10" required="required" minlength="1" maxlength="15" value="' . $_POST['HundredsName'] . '" /></td>
</tr>
<tr>
- <td>' . _('Decimal Places to Display').':</td>
+ <td>' . _('Decimal Places to Display') . ':</td>
<td>';
if (!isset($_POST['DecimalPlaces'])) {
- $_POST['DecimalPlaces']='0';
+ $_POST['DecimalPlaces'] = 2;
}
- echo '<input ' . (in_array('DecimalPlaces',$Errors) ? 'class="integer inputerror"' : 'class="integer"' ) . ' type="number" required="required" name="DecimalPlaces" size="2" maxlength="2" value="' . $_POST['DecimalPlaces'].'" /></td>
+ echo '<input class="integer" type="text" name="DecimalPlaces" size="2" required="required" minlength="1" maxlength="2" value="' . $_POST['DecimalPlaces'] . '" /></td>
</tr>
<tr>
- <td>' . _('Exchange Rate').':</td>
- <td>';
+ <td>' . _('Exchange Rate') . ':</td>';
if (!isset($_POST['ExchangeRate'])) {
- $_POST['ExchangeRate']='1';
+ $_POST['ExchangeRate'] = 1;
}
- echo '<input ' . (in_array('ExchangeRate',$Errors) ? 'class="inputerror"' : '' ) .' type="text" class="number" name="ExchangeRate" required="required" size="10" maxlength="10" value="' . $_POST['ExchangeRate'] . '" /></td>
- </tr>';
-
+ if ($_POST['Abbreviation'] != $FunctionalCurrency) {
+ echo '<td><input type="text" class="number" name="ExchangeRate" size="10" required="required" minlength="1" maxlength="10" value="' . $_POST['ExchangeRate'] . '" /></td>';
+ } else {
+ echo '<td>' . $_POST['ExchangeRate'] . '</td>';
+ echo '<input type="hidden" class="number" name="ExchangeRate" value="' . $_POST['ExchangeRate'] . '" />';
+ }
+ echo '</tr>';
if (!isset($_POST['webcart'])) {
- $_POST['webcart']=1;
+ $_POST['webcart'] = 1;
}
echo '<tr>
Modified: trunk/PO_Items.php
===================================================================
--- trunk/PO_Items.php 2014-05-20 00:19:03 UTC (rev 6722)
+++ trunk/PO_Items.php 2014-05-22 07:40:15 UTC (rev 6723)
@@ -9,6 +9,7 @@
* and authorisation level check
*/
include('includes/session.inc');
+
$Title = _('Purchase Order Items');
$identifier=$_GET['identifier'];
@@ -1254,6 +1255,7 @@
$PartsDisplayed++;
#end of page full new headings if
}
+
echo $PageBar;
#end of while loop
echo '</table>';
Modified: trunk/javascripts/MiscFunctions.js
===================================================================
--- trunk/javascripts/MiscFunctions.js 2014-05-20 00:19:03 UTC (rev 6722)
+++ trunk/javascripts/MiscFunctions.js 2014-05-22 07:40:15 UTC (rev 6723)
@@ -10,6 +10,7 @@
else if (event) k=event.which;
else return true;
kC=String.fromCharCode(k);
+ if (k==13) return false;
if ((k==null) || (k==0) || (k==8) || (k==9) || (k==13) || (k==27)) return true;
else if ((("0123456789.,- ").indexOf(kC)>-1)) return true;
else return false;
|
|
From: <dai...@us...> - 2014-05-22 08:05:38
|
Revision: 6724
http://sourceforge.net/p/web-erp/reponame/6724
Author: daintree
Date: 2014-05-22 08:05:30 +0000 (Thu, 22 May 2014)
Log Message:
-----------
Tidy up SQL in StockClone.php
Modified Paths:
--------------
trunk/StockClone.php
trunk/doc/Change.log
Modified: trunk/StockClone.php
===================================================================
--- trunk/StockClone.php 2014-05-22 07:40:15 UTC (rev 6723)
+++ trunk/StockClone.php 2014-05-22 08:05:30 UTC (rev 6724)
@@ -473,21 +473,11 @@
//What about cost data?
//get any existing cost data
$sql = "SELECT materialcost,
- labourcost,
- overheadcost,
- mbflag,
- sum(quantity) as totalqoh
- FROM stockmaster INNER JOIN locstock
- ON stockmaster.stockid=locstock.stockid
- WHERE stockmaster.stockid='".$_POST['OldStockID']."'
- GROUP BY description,
- units,
- lastcost,
- actualcost,
- materialcost,
- labourcost,
- overheadcost,
- mbflag";
+ labourcost,
+ overheadcost,
+ lastcost
+ FROM stockmaster
+ WHERE stockmaster.stockid='".$_POST['OldStockID']."'";
$ErrMsg = _('The entered item code does not exist');
$OldResult = DB_query($sql,$db,$ErrMsg);
$OldRow = DB_fetch_array($OldResult);
@@ -507,7 +497,7 @@
//finish up
if (DB_error_no($db) ==0) {
- prnMsg( _('New Cloned Item') .' ' . '<a href="SelectProduct.php?StockID=' . $_POST['StockID'] . '">' . $_POST['StockID'] . '</a> '. _('has been added to the database') .
+ prnMsg( _('New cloned Item') .' ' . '<a href="SelectProduct.php?StockID=' . $_POST['StockID'] . '">' . $_POST['StockID'] . '</a> '. _('has been added to the database') .
'<br />' . _('We also attempted to setup item purchase data and pricing.'));
if ($NoPricingData==1)
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2014-05-22 07:40:15 UTC (rev 6723)
+++ trunk/doc/Change.log 2014-05-22 08:05:30 UTC (rev 6724)
@@ -1,4 +1,8 @@
webERP Change Log
+
+22/5/14 Tim: Currencies.php now allows FunctionalCurrency to be modified
+22/5/14 Phil: Prevent use of enter key - experimental - in number fields - prevents users from losing data in big forms where they are entering large amounts of data e.g. purchase ordering - maybe we should consider for integer fields too?
+22/5/14 Ricard/Phil: Tidy up SQL in StockClone.php
19/5/14 Exson: Tidy up code of SelectOrderItems.php.
18/5/14 Thumb: Fixed the bug in ConfirmDispatch_Invoice.php for Balance quantity canceled policy by line no instead of by stockid since webERP allow same stock appeared in one order multiple times.
18/5/14 Exson: Tidy up SelectSalesOrder.php SQL code and add Thumb's salesman login control and fixed bugs caused by no group by statements for customer and items selected.
|
|
From: <rc...@us...> - 2014-05-22 17:19:04
|
Revision: 6725
http://sourceforge.net/p/web-erp/reponame/6725
Author: rchacon
Date: 2014-05-22 17:19:00 +0000 (Thu, 22 May 2014)
Log Message:
-----------
Minor changes: use printer.png for printing; Spanish translation improvements.
Modified Paths:
--------------
trunk/DeliveryDetails.php
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
Modified: trunk/DeliveryDetails.php
===================================================================
--- trunk/DeliveryDetails.php 2014-05-22 08:05:30 UTC (rev 6724)
+++ trunk/DeliveryDetails.php 2014-05-22 17:19:00 UTC (rev 6725)
@@ -617,13 +617,13 @@
/*link to print the quotation */
echo '<br /><table class="selection">
<tr>
- <td><img src="'.$RootPath.'/css/'.$Theme.'/images/reports.png" title="' . _('Order') . '" alt=""></td>
+ <td><img src="'.$RootPath.'/css/'.$Theme.'/images/printer.png" title="' . _('Order') . '" alt=""></td>
<td>' . ' ' . '<a href="' . $RootPath . '/PDFQuotation.php?identifier='.$identifier . '&QuotationNo=' . $OrderNo . '">' . _('Print Quotation (Landscape)') . '</a></td>
</tr>
</table>';
echo '<br /><table class="selection">
<tr>
- <td><img src="'.$RootPath.'/css/'.$Theme.'/images/reports.png" title="' . _('Order') . '" alt="" /></td>
+ <td><img src="'.$RootPath.'/css/'.$Theme.'/images/printer.png" title="' . _('Order') . '" alt="" /></td>
<td>' . ' ' . '<a href="' . $RootPath . '/PDFQuotationPortrait.php?identifier='.$identifier . '&QuotationNo=' . $OrderNo . '">' . _('Print Quotation (Portrait)') . '</a></td>
</tr>
</table>';
@@ -803,13 +803,13 @@
/*link to print the quotation */
echo '<br /><table class="selection">
<tr>
- <td><img src="'.$RootPath.'/css/'.$Theme.'/images/reports.png" title="' . _('Order') . '" alt=""></td>
+ <td><img src="'.$RootPath.'/css/'.$Theme.'/images/printer.png" title="' . _('Order') . '" alt=""></td>
<td>' . ' ' . '<a href="' . $RootPath . '/PDFQuotation.php?identifier='.$identifier . '&QuotationNo=' . $_SESSION['ExistingOrder'.$identifier] . '">' . _('Print Quotation (Landscape)') . '</a></td>
</tr>
</table>';
echo '<br /><table class="selection">
<tr>
- <td><img src="'.$RootPath.'/css/'.$Theme.'/images/reports.png" title="' . _('Order') . '" alt="" /></td>
+ <td><img src="'.$RootPath.'/css/'.$Theme.'/images/printer.png" title="' . _('Order') . '" alt="" /></td>
<td>' . ' ' . '<a href="' . $RootPath . '/PDFQuotationPortrait.php?identifier='.$identifier . '&QuotationNo=' . $_SESSION['ExistingOrder'.$identifier] . '">' . _('Print Quotation (Portrait)') . '</a></td>
</tr>
</table>';
Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2014-05-22 08:05:30 UTC (rev 6724)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2014-05-22 17:19:00 UTC (rev 6725)
@@ -8,7 +8,7 @@
"Project-Id-Version: WebERP 4.081\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-02-08 17:33+1300\n"
-"PO-Revision-Date: 2014-05-19 18:08-0600\n"
+"PO-Revision-Date: 2014-05-22 11:11-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -20037,7 +20037,7 @@
#: PDFReceipt.php:107
msgid "The Sum Of"
-msgstr "La Suma de"
+msgstr "La suma de"
#: PDFReceipt.php:113
msgid "Details"
@@ -20088,7 +20088,7 @@
#: PDFRemittanceAdvice.php:112
msgid "Total Payment:"
-msgstr "Total Pago:"
+msgstr "Pago total:"
#: PDFRemittanceAdvice.php:124
msgid "Remittance_Advices"
@@ -20100,7 +20100,7 @@
#: PDFRemittanceAdvice.php:168
msgid "Date Of Payment"
-msgstr "Fecha de Pago"
+msgstr "Fecha de pago"
#: PDFRemittanceAdvice.php:216
msgid "printed:"
@@ -25422,7 +25422,7 @@
#: SalesTopCustomersInquiry.php:6 SalesTopCustomersInquiry.php:9
#: TopCustomers.php:9
msgid "Top Customer Sales Inquiry"
-msgstr ""
+msgstr "Consulta de ventas a mejores clientes"
#: SalesTopCustomersInquiry.php:82 SalesTopItemsInquiry.php:83
#: TopCustomers.php:81 WWW_Users.php:660
@@ -41137,7 +41137,7 @@
#: includes/CountriesArray.php:88
msgid "Hong Kong"
-msgstr ""
+msgstr "Hong Kong"
#: includes/CountriesArray.php:89
msgid "Honduras"
@@ -41633,7 +41633,7 @@
#: includes/CountriesArray.php:212
msgid "South Africa"
-msgstr ""
+msgstr "Sudáfrica"
#: includes/CountriesArray.php:213
msgid "Zimbabwe"
@@ -42614,7 +42614,7 @@
#: includes/DefineTenderClass.php:45
msgid " Quantity "
-msgstr ""
+msgstr "Cantidad"
#: includes/DefineTenderClass.php:45
msgid " Unit "
@@ -42858,23 +42858,23 @@
#: includes/MainMenuLinksArray.php:53
msgid "Print Price Lists"
-msgstr "Imprimir Listas de Precios"
+msgstr "Imprimir listas de precios"
#: includes/MainMenuLinksArray.php:55
msgid "Orders Invoiced Reports"
-msgstr "Informes de Pedidos Facturados"
+msgstr "Informes de pedidos facturados"
#: includes/MainMenuLinksArray.php:57
msgid "Sales By Sales Type Inquiry"
-msgstr "Consulta de Ventas por Tipo de Ventas"
+msgstr "Consulta de ventas por tipo de venta"
#: includes/MainMenuLinksArray.php:58
msgid "Sales By Category Inquiry"
-msgstr "Consulta de Ventas por Categoría"
+msgstr "Consulta de ventas por categoría"
#: includes/MainMenuLinksArray.php:59
msgid "Top Sellers Inquiry"
-msgstr "Consulta de Mejores Ventas"
+msgstr "Consulta de mejores ventas"
#: includes/MainMenuLinksArray.php:60
msgid "Order Delivery Differences Report"
@@ -42886,7 +42886,7 @@
#: includes/MainMenuLinksArray.php:64
msgid "Top Customers Inquiry"
-msgstr ""
+msgstr "Consulta de mejores clientes"
#: includes/MainMenuLinksArray.php:65
msgid "Worst Sales Items Report"
|
|
From: <rc...@us...> - 2014-05-24 19:25:51
|
Revision: 6729
http://sourceforge.net/p/web-erp/reponame/6729
Author: rchacon
Date: 2014-05-24 19:25:49 +0000 (Sat, 24 May 2014)
Log Message:
-----------
Includes quotation date in header (instead of quotation creation date) and quotation number in file name.
Modified Paths:
--------------
trunk/DeliveryDetails.php
trunk/PDFQuotation.php
trunk/PDFQuotationPortrait.php
trunk/includes/PDFQuotationPageHeader.inc
trunk/includes/PDFQuotationPortraitPageHeader.inc
Modified: trunk/DeliveryDetails.php
===================================================================
--- trunk/DeliveryDetails.php 2014-05-24 19:18:16 UTC (rev 6728)
+++ trunk/DeliveryDetails.php 2014-05-24 19:25:49 UTC (rev 6729)
@@ -618,13 +618,13 @@
echo '<br /><table class="selection">
<tr>
<td><img src="'.$RootPath.'/css/'.$Theme.'/images/printer.png" title="' . _('Order') . '" alt=""></td>
- <td>' . ' ' . '<a href="' . $RootPath . '/PDFQuotation.php?identifier='.$identifier . '&QuotationNo=' . $OrderNo . '">' . _('Print Quotation (Landscape)') . '</a></td>
+ <td>' . ' ' . '<a href="' . $RootPath . '/PDFQuotation.php?identifier='.$identifier . '&QuotationNo=' . $OrderNo . '" target="_blank">' . _('Print Quotation (Landscape)') . '</a></td>
</tr>
</table>';
echo '<br /><table class="selection">
<tr>
<td><img src="'.$RootPath.'/css/'.$Theme.'/images/printer.png" title="' . _('Order') . '" alt="" /></td>
- <td>' . ' ' . '<a href="' . $RootPath . '/PDFQuotationPortrait.php?identifier='.$identifier . '&QuotationNo=' . $OrderNo . '">' . _('Print Quotation (Portrait)') . '</a></td>
+ <td>' . ' ' . '<a href="' . $RootPath . '/PDFQuotationPortrait.php?identifier='.$identifier . '&QuotationNo=' . $OrderNo . '" target="_blank">' . _('Print Quotation (Portrait)') . '</a></td>
</tr>
</table>';
}
@@ -804,13 +804,13 @@
echo '<br /><table class="selection">
<tr>
<td><img src="'.$RootPath.'/css/'.$Theme.'/images/printer.png" title="' . _('Order') . '" alt=""></td>
- <td>' . ' ' . '<a href="' . $RootPath . '/PDFQuotation.php?identifier='.$identifier . '&QuotationNo=' . $_SESSION['ExistingOrder'.$identifier] . '">' . _('Print Quotation (Landscape)') . '</a></td>
+ <td>' . ' ' . '<a href="' . $RootPath . '/PDFQuotation.php?identifier='.$identifier . '&QuotationNo=' . $_SESSION['ExistingOrder'.$identifier] . '" target="_blank">' . _('Print Quotation (Landscape)') . '</a></td>
</tr>
</table>';
echo '<br /><table class="selection">
<tr>
<td><img src="'.$RootPath.'/css/'.$Theme.'/images/printer.png" title="' . _('Order') . '" alt="" /></td>
- <td>' . ' ' . '<a href="' . $RootPath . '/PDFQuotationPortrait.php?identifier='.$identifier . '&QuotationNo=' . $_SESSION['ExistingOrder'.$identifier] . '">' . _('Print Quotation (Portrait)') . '</a></td>
+ <td>' . ' ' . '<a href="' . $RootPath . '/PDFQuotationPortrait.php?identifier='.$identifier . '&QuotationNo=' . $_SESSION['ExistingOrder'.$identifier] . '" target="_blank">' . _('Print Quotation (Portrait)') . '</a></td>
</tr>
</table>';
}else{
Modified: trunk/PDFQuotation.php
===================================================================
--- trunk/PDFQuotation.php 2014-05-24 19:18:16 UTC (rev 6728)
+++ trunk/PDFQuotation.php 2014-05-24 19:25:49 UTC (rev 6729)
@@ -55,6 +55,7 @@
shippers.shippername,
salesorders.printedpackingslip,
salesorders.datepackingslipprinted,
+ salesorders.quotedate,
salesorders.branchcode,
locations.taxprovinceid,
locations.locationname,
@@ -270,7 +271,7 @@
include('includes/footer.inc');
exit;
} else {
- $pdf->OutputI($_SESSION['DatabaseName'] . '_Quotation_' . date('Y-m-d') . '.pdf');
+ $pdf->OutputI($_SESSION['DatabaseName'] . '_Quotation_' . $_GET['QuotationNo'] . '_' . date('Y-m-d') . '.pdf');
$pdf->__destruct();
}
-?>
\ No newline at end of file
+?>
Modified: trunk/PDFQuotationPortrait.php
===================================================================
--- trunk/PDFQuotationPortrait.php 2014-05-24 19:18:16 UTC (rev 6728)
+++ trunk/PDFQuotationPortrait.php 2014-05-24 19:25:49 UTC (rev 6729)
@@ -57,6 +57,7 @@
shippers.shippername,
salesorders.printedpackingslip,
salesorders.datepackingslipprinted,
+ salesorders.quotedate,
salesorders.branchcode,
locations.taxprovinceid,
locations.locationname,
@@ -274,7 +275,7 @@
include('includes/footer.inc');
exit;
} else {
- $pdf->OutputD($_SESSION['DatabaseName'] . '_Quotation_' . date('Y-m-d') . '.pdf');
+ $pdf->OutputI($_SESSION['DatabaseName'] . '_Quotation_' . $_GET['QuotationNo'] . '_' . date('Y-m-d') . '.pdf');
$pdf->__destruct();
}
?>
Modified: trunk/includes/PDFQuotationPageHeader.inc
===================================================================
--- trunk/includes/PDFQuotationPageHeader.inc 2014-05-24 19:18:16 UTC (rev 6728)
+++ trunk/includes/PDFQuotationPageHeader.inc 2014-05-24 19:25:49 UTC (rev 6729)
@@ -16,7 +16,7 @@
// Print 'Quotation' info
$pdf->addTextWrap($Page_Width-$Right_Margin-200, $Page_Height-$Top_Margin-$FontSize*1, 200, $FontSize, _('Number'). ': '.$_GET['QuotationNo'], 'right');
$pdf->addTextWrap($Page_Width-$Right_Margin-200, $Page_Height-$Top_Margin-$FontSize*2, 200, $FontSize, _('Your Ref'). ': '.$myrow['customerref'], 'right');
-$pdf->addTextWrap($Page_Width-$Right_Margin-200, $Page_Height-$Top_Margin-$FontSize*3, 200, $FontSize, _('Date'). ': '.ConvertSQLDate($myrow['orddate']), 'right');
+$pdf->addTextWrap($Page_Width-$Right_Margin-200, $Page_Height-$Top_Margin-$FontSize*3, 200, $FontSize, _('Date'). ': '.ConvertSQLDate($myrow['quotedate']), 'right');
$pdf->addTextWrap($Page_Width-$Right_Margin-200, $Page_Height-$Top_Margin-$FontSize*4, 200, $FontSize, _('Page').': '.$PageNumber, 'right');
// Print company logo
@@ -112,4 +112,4 @@
$pdf->line($Page_Width-$Right_Margin, $Bottom_Margin+10,$Page_Width-$Right_Margin, $Bottom_Margin+350);
$YPos -= (2*$line_height);
-?>
\ No newline at end of file
+?>
Modified: trunk/includes/PDFQuotationPortraitPageHeader.inc
===================================================================
--- trunk/includes/PDFQuotationPortraitPageHeader.inc 2014-05-24 19:18:16 UTC (rev 6728)
+++ trunk/includes/PDFQuotationPortraitPageHeader.inc 2014-05-24 19:25:49 UTC (rev 6729)
@@ -85,7 +85,7 @@
$pdf->addTextWrap($Page_Width-$Right_Margin-200, $Page_Height-$Top_Margin-$FontSize*1, 200, $FontSize, _('Number'). ': '.$_GET['QuotationNo'], 'right');
$pdf->addTextWrap($Page_Width-$Right_Margin-200, $Page_Height-$Top_Margin-$FontSize*2, 200, $FontSize, _('Your Ref'). ': '.$myrow['customerref'], 'right');
-$pdf->addTextWrap($Page_Width-$Right_Margin-200, $Page_Height-$Top_Margin-$FontSize*3, 200, $FontSize, _('Date'). ': '.ConvertSQLDate($myrow['orddate']), 'right');
+$pdf->addTextWrap($Page_Width-$Right_Margin-200, $Page_Height-$Top_Margin-$FontSize*3, 200, $FontSize, _('Date'). ': '.ConvertSQLDate($myrow['quotedate']), 'right');
$pdf->addTextWrap($Page_Width-$Right_Margin-200, $Page_Height-$Top_Margin-$FontSize*4, 200, $FontSize, _('Page').': '.$PageNumber, 'right');
$pdf->addText($Page_Width/2-10, $YPos+15, $FontSize, _('All amounts stated in') . ' - ' . $myrow['currcode']);
|
|
From: <rc...@us...> - 2014-05-26 07:08:23
|
Revision: 6730
http://sourceforge.net/p/web-erp/reponame/6730
Author: rchacon
Date: 2014-05-26 07:08:19 +0000 (Mon, 26 May 2014)
Log Message:
-----------
Correct other problems related to updating translations of the items description. Improves Spanish translation.
Modified Paths:
--------------
trunk/StockClone.php
trunk/Stocks.php
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
Modified: trunk/StockClone.php
===================================================================
--- trunk/StockClone.php 2014-05-24 19:25:49 UTC (rev 6729)
+++ trunk/StockClone.php 2014-05-26 07:08:19 UTC (rev 6730)
@@ -321,10 +321,10 @@
//now insert the language descriptions
$ErrMsg = _('Could not update the language description because');
$DbgMsg = _('The SQL that was used to update the language description and failed was');
- if (count($ItemDescriptionLanguages)>0){
- foreach ($ItemDescriptionLanguagesArray as $DescriptionLanguage) {
- if ($DescriptionLanguage!=''){
- $result = DB_query("INSERT INTO stockdescriptiontranslations VALUES('" . $_POST['StockID'] . "','" . $DescriptionLanguage . "', '" . $_POST['Description_' . str_replace('.','_',$DescriptionLanguage)] . "')",$db,$ErrMsg,$DbgMsg,true);
+ if (count($ItemDescriptionLanguagesArray)>0){
+ foreach ($ItemDescriptionLanguagesArray as $LanguageId) {
+ if ($LanguageId!=''){
+ $result = DB_query("INSERT INTO stockdescriptiontranslations VALUES('" . $_POST['StockID'] . "','" . $LanguageId . "', '" . $_POST['Description_' . str_replace('.','_',$LanguageId)] . "')",$db,$ErrMsg,$DbgMsg,true);
}
}
}
@@ -538,8 +538,8 @@
unset($_POST['Pansize']);
unset($_POST['StockID']);
//unset($_POST['OldStockID']);
- foreach ($ItemDescriptionLanguagesArray as $DescriptionLanguage) {
- unset($_POST['Description_' . str_replace('.','_',$DescriptionLanguage)]);
+ foreach ($ItemDescriptionLanguagesArray as $LanguageId) {
+ unset($_POST['Description_' . str_replace('.','_',$LanguageId)]);
$_POST['New'] = 1; //do not show input form again
}
}//Reset the form variables
@@ -632,8 +632,8 @@
$_POST['ShrinkFactor'] = $myrow['shrinkfactor'];
$sql = "SELECT descriptiontranslation, language_id FROM stockdescriptiontranslations WHERE stockid='" . $selectedStockID . "' AND (";
- foreach ($ItemDescriptionLanguagesArray as $DescriptionLanguage) {
- $sql .= "language_id='" . $DescriptionLanguage ."' OR ";
+ foreach ($ItemDescriptionLanguagesArray as $LanguageId) {
+ $sql .= "language_id='" . $LanguageId ."' OR ";
}
$sql = mb_substr($sql,0,mb_strlen($sql)-3) . ')';
$result = DB_query($sql,$db);
@@ -654,15 +654,15 @@
<td><input ' . (in_array('Description',$Errors) ? 'class="inputerror"' : '' ) .' type="text" name="Description" size="52" maxlength="50" value="' . $Description . '" /></td>
</tr>';
- foreach ($ItemDescriptionLanguagesArray as $DescriptionLanguage) {
- if ($DescriptionLanguage!=''){
+ foreach ($ItemDescriptionLanguagesArray as $LanguageId) {
+ if ($LanguageId!=''){
//unfortunately cannot have points in POST variables so have to mess with the language id
- $PostVariableName = 'Description_' . str_replace('.','_',$DescriptionLanguage);
+ $PostVariableName = 'Description_' . str_replace('.','_',$LanguageId);
if (!isset($_POST[$PostVariableName])){
$_POST[$PostVariableName] ='';
}
echo '<tr>
- <td>' . $LanguagesArray[$DescriptionLanguage]['LanguageName'] . ' ' . _('Description') . ':</td>
+ <td>' . $LanguagesArray[$LanguageId]['LanguageName'] . ' ' . _('Description') . ':</td>
<td><input type="text" name="'. $PostVariableName . '" size="52" maxlength="50" value="' . $_POST[$PostVariableName] . '" /></td>
</tr>';
}
Modified: trunk/Stocks.php
===================================================================
--- trunk/Stocks.php 2014-05-24 19:25:49 UTC (rev 6729)
+++ trunk/Stocks.php 2014-05-26 07:08:19 UTC (rev 6730)
@@ -19,22 +19,22 @@
$StockID = '';
}
-$ItemDescriptionLanguagesArray = explode(',',$_SESSION['ItemDescriptionLanguages']);
+$ItemDescriptionLanguagesArray = explode(',',$_SESSION['ItemDescriptionLanguages']);//WARNING: if the last character is a ",", there are n+1 languages.
if (isset($_POST['NextItem'])){
$Result = DB_query("SELECT stockid FROM stockmaster WHERE stockid>'" . $StockID . "' ORDER BY stockid ASC LIMIT 1",$db);
$NextItemRow = DB_fetch_row($Result);
$StockID = $NextItemRow[0];
- foreach ($ItemDescriptionLanguagesArray as $DescriptionLanguage) {
- unset($_POST['Description_' . str_replace('.','_',$DescriptionLanguage)]);
+ foreach ($ItemDescriptionLanguagesArray as $LanguageId) {
+ unset($_POST['Description_' . str_replace('.','_',$LanguageId)]);
}
}
if (isset($_POST['PreviousItem'])){
$Result = DB_query("SELECT stockid FROM stockmaster WHERE stockid<'" . $StockID . "' ORDER BY stockid DESC LIMIT 1",$db);
$PreviousItemRow = DB_fetch_row($Result);
$StockID = $PreviousItemRow[0];
- foreach ($ItemDescriptionLanguagesArray as $DescriptionLanguage) {
- unset($_POST['Description_' . str_replace('.','_',$DescriptionLanguage)]);
+ foreach ($ItemDescriptionLanguagesArray as $LanguageId) {
+ unset($_POST['Description_' . str_replace('.','_',$LanguageId)]);
}
}
@@ -427,14 +427,26 @@
$ErrMsg = _('Could not update the language description because');
$DbgMsg = _('The SQL that was used to update the language description and failed was');
- if (count($ItemDescriptionLanguages)>0){
- foreach ($ItemDescriptionLanguagesArray as $DescriptionLanguage) {
- if ($DescriptionLanguage!=''){
- $result = DB_query("DELETE FROM stockdescriptiontranslations WHERE stockid='" . $StockID . "' AND language_id='" . $DescriptionLanguage . "'",$db,$ErrMsg,$DbgMsg,true);
- $result = DB_query("INSERT INTO stockdescriptiontranslations VALUES('" . $StockID . "','" . $DescriptionLanguage . "', '" . $_POST['Description_' . str_replace('.','_',$DescriptionLanguage)] . "')",$db,$ErrMsg,$DbgMsg,true);
+ if (count($ItemDescriptionLanguagesArray)>0){
+ foreach ($ItemDescriptionLanguagesArray as $LanguageId) {
+ if ($LanguageId!=''){
+ $result = DB_query("DELETE FROM stockdescriptiontranslations WHERE stockid='" . $StockID . "' AND language_id='" . $LanguageId . "'",$db,$ErrMsg,$DbgMsg,true);
+ $result = DB_query("INSERT INTO stockdescriptiontranslations VALUES('" . $StockID . "','" . $LanguageId . "', '" . $_POST['Description_' . str_replace('.','_',$LanguageId)] . "')",$db,$ErrMsg,$DbgMsg,true);
}
}
+ /*
+ foreach ($ItemDescriptionLanguagesArray as $LanguageId) {
+ $DescriptionTranslation = $_POST['Description_' . str_replace('.', '_', $LanguageId)];
+ //WARNING: It DOES NOT update if database row DOES NOT exist.
+ $sql = "UPDATE stockdescriptiontranslations " .
+ "SET descriptiontranslation='" . $DescriptionTranslation . "' " .
+ "WHERE stockid='" . $StockID . "' AND (language_id='" . $LanguageId. "')";
+ $result = DB_query($sql, $db, $ErrMsg, $DbgMsg, true);
+ }
+ */
+
}
+
//delete any properties for the item no longer relevant with the change of category
$result = DB_query("DELETE FROM stockitemproperties
WHERE stockid ='" . $StockID . "'",
@@ -623,9 +635,10 @@
$ErrMsg = _('Could not update the language description because');
$DbgMsg = _('The SQL that was used to update the language description and failed was');
if (count($ItemDescriptionLanguages)>0){
- foreach ($ItemDescriptionLanguagesArray as $DescriptionLanguage) {
- if ($DescriptionLanguage!=''){
- $result = DB_query("INSERT INTO stockdescriptiontranslations VALUES('" . $StockID . "','" . $DescriptionLanguage . "', '" . $_POST['Description_' . str_replace('.','_',$DescriptionLanguage)] . "')",$db,$ErrMsg,$DbgMsg,true);
+ foreach ($ItemDescriptionLanguagesArray as $LanguageId) {
+ if ($LanguageId!=''){
+ $sql = "INSERT INTO stockdescriptiontranslations VALUES('" . $StockID . "','" . $LanguageId . "', '" . $_POST['Description_' . str_replace('.','_',$LanguageId)] . "')";
+ $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
}
}
}
@@ -694,8 +707,8 @@
unset($_POST['ShrinkFactor']);
unset($_POST['Pansize']);
unset($StockID);
- foreach ($ItemDescriptionLanguagesArray as $DescriptionLanguage) {
- unset($_POST['Description_' . str_replace('.','_',$DescriptionLanguage)]);
+ foreach ($ItemDescriptionLanguagesArray as $LanguageId) {
+ unset($_POST['Description_' . str_replace('.','_',$LanguageId)]);
}
$New=1;
}//ALL WORKED SO RESET THE FORM VARIABLES
@@ -840,8 +853,8 @@
unset($_POST['TaxCat']);
unset($_POST['DecimalPlaces']);
unset($_SESSION['SelectedStockItem']);
- foreach ($ItemDescriptionLanguagesArray as $DescriptionLanguage) {
- unset($_POST['Description_' . str_replace('.','_',$DescriptionLanguage)]);
+ foreach ($ItemDescriptionLanguagesArray as $LanguageId) {
+ unset($_POST['Description_' . str_replace('.','_',$LanguageId)]);
}
unset($StockID);
@@ -934,8 +947,8 @@
$sql = "SELECT descriptiontranslation, language_id FROM stockdescriptiontranslations WHERE stockid='" . $StockID . "' AND (";
- foreach ($ItemDescriptionLanguagesArray as $DescriptionLanguage) {
- $sql .= "language_id='" . $DescriptionLanguage ."' OR ";
+ foreach ($ItemDescriptionLanguagesArray as $LanguageId) {
+ $sql .= "language_id='" . $LanguageId ."' OR ";
}
$sql = mb_substr($sql,0,mb_strlen($sql)-3) . ')';
$result = DB_query($sql,$db);
@@ -964,15 +977,15 @@
<td><input ' . (in_array('Description',$Errors) ? 'class="inputerror"' : '' ) .' type="text" ' . ($New==0?'autofocus="autofocus"':'') . ' name="Description" required="required" size="52" maxlength="50" value="' . stripslashes($Description) . '" /></td>
</tr>';
-foreach ($ItemDescriptionLanguagesArray as $DescriptionLanguage) {
- if ($DescriptionLanguage!=''){
+foreach ($ItemDescriptionLanguagesArray as $LanguageId) {
+ if ($LanguageId!=''){
//unfortunately cannot have points in POST variables so have to mess with the language id
- $PostVariableName = 'Description_' . str_replace('.','_',$DescriptionLanguage);
+ $PostVariableName = 'Description_' . str_replace('.','_',$LanguageId);
if (!isset($_POST[$PostVariableName])){
$_POST[$PostVariableName] ='';
}
echo '<tr>
- <td>' . $LanguagesArray[$DescriptionLanguage]['LanguageName'] . ' ' . _('Description') . ':</td>
+ <td>' . $LanguagesArray[$LanguageId]['LanguageName'] . ' ' . _('Description') . ':</td>
<td><input type="text" name="'. $PostVariableName . '" size="52" maxlength="50" value="' . $_POST[$PostVariableName] . '" title="' . _('This language translation of the item will be used in invoices and credits to customers who are defined to use this language. The language translations to maintain here can be configured in the system parameters page') . '" /></td>
</tr>';
}
Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2014-05-24 19:25:49 UTC (rev 6729)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2014-05-26 07:08:19 UTC (rev 6730)
@@ -8,7 +8,7 @@
"Project-Id-Version: WebERP 4.081\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-02-08 17:33+1300\n"
-"PO-Revision-Date: 2014-05-22 11:43-0600\n"
+"PO-Revision-Date: 2014-05-25 11:09-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -7826,7 +7826,7 @@
#: CustLoginSetup.php:155
msgid "Enter the user's real name"
-msgstr ""
+msgstr "Introduzca el nombre real del usuario"
#: CustLoginSetup.php:158 Locations.php:590 SalesPeople.php:332
#: SupplierContacts.php:265 SuppLoginSetup.php:141 WWW_Users.php:462
@@ -7835,7 +7835,7 @@
#: CustLoginSetup.php:163
msgid "Enter the user's email address"
-msgstr ""
+msgstr "Introduzca la dirección de correo-e del usuario"
#: CustLoginSetup.php:167 CustomerBranches.php:599 CustomerBranches.php:636
#: CustomerPurchases.php:79 WWW_Users.php:285 WWW_Users.php:531
@@ -8075,7 +8075,7 @@
#: CustomerAllocations.php:437 SupplierAllocations.php:506
msgid "Total Allocated"
-msgstr "Total Asignado"
+msgstr "Total asignado"
#: CustomerAllocations.php:441 SupplierAllocations.php:519
msgid "Recalculate Total To Allocate"
@@ -19906,7 +19906,7 @@
#: PDFPrintLabel.php:45
msgid "The Price Labels could not be retrieved by the SQL because"
-msgstr "El SQL no pudo obtener las Etiquetas de Precios porque"
+msgstr "El SQL no pudo obtener las etiquetas de precios porque"
#: PDFPrintLabel.php:54
msgid "There were no price labels to print out for the category specified"
@@ -19923,7 +19923,7 @@
#: PDFPrintLabel.php:184 PDFPrintLabel.php:185 PDFPrintLabel.php:268
#: PDFPrintLabel.php:271
msgid "Price Labels"
-msgstr "Etiquetas de Precios"
+msgstr "Etiquetas de precios"
#: PDFPrintLabel.php:261
msgid "Price_Labels"
@@ -19931,7 +19931,7 @@
#: PDFPrintLabel.php:272 includes/MainMenuLinksArray.php:220
msgid "Print Price Labels"
-msgstr "Imrpimir Etiquetas de Precios"
+msgstr "Imprimir etiquetas de precios"
#: PDFPrintLabel.php:282
msgid "Label to print"
@@ -20029,7 +20029,7 @@
#: PDFReceipt.php:33
msgid "Customer Receipt Number "
-msgstr "Número de Recepción de cliente"
+msgstr "Número de recibo de cliente"
#: PDFReceipt.php:96
msgid "Received From"
@@ -20075,7 +20075,7 @@
#: PDFRemittanceAdvice.php:48
msgid "and Paid On"
-msgstr "Y Pagado en"
+msgstr "Y pagado en"
#: PDFRemittanceAdvice.php:80
msgid "Remittance Advice Problem Report"
@@ -20112,7 +20112,7 @@
#: PDFRemittanceAdvice.php:311
msgid "This Payment"
-msgstr "Este Pago"
+msgstr "Este pago"
#: PDFSellThroughSupportClaim.php:6 PDFSellThroughSupportClaim.php:164
#: includes/MainMenuLinksArray.php:67
|
|
From: <rc...@us...> - 2014-05-31 00:35:29
|
Revision: 6738
http://sourceforge.net/p/web-erp/reponame/6738
Author: rchacon
Date: 2014-05-31 00:35:26 +0000 (Sat, 31 May 2014)
Log Message:
-----------
Add page title text and icon to import scripts. Page title text = menu option.
Modified Paths:
--------------
trunk/Z_ImportFixedAssets.php
trunk/Z_ImportGLTransactions.php
trunk/Z_ImportPriceList.php
trunk/Z_ImportStocks.php
Modified: trunk/Z_ImportFixedAssets.php
===================================================================
--- trunk/Z_ImportFixedAssets.php 2014-05-30 22:29:38 UTC (rev 6737)
+++ trunk/Z_ImportFixedAssets.php 2014-05-31 00:35:26 UTC (rev 6738)
@@ -6,23 +6,27 @@
$Title = _('Import Fixed Assets');
include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
+echo '<p class="page_title_text"><img alt="" src="' . $RootPath . '/css/' . $Theme .
+ '/images/fixed_assets.png" title="' .
+ _('Import Fixed Assets from .csv file') . '" />' . ' ' .
+ _('Import Fixed Assets from .csv file') . '</p>';
// If this script is called with a file object, then the file contents are imported
// If this script is called with the gettemplate flag, then a template file is served
// Otherwise, a file upload form is displayed
$FieldNames = array(
- 'Description', //0
- 'LongDescription', //1
- 'AssetCategoryID', //2
- 'SerialNo', //3
- 'BarCode', //4
- 'AssetLocationCode', //5
- 'Cost', //6
- 'AccumDepn', //7
- 'DepnType', //8 - SL or DV
- 'DepnRate', //9
- 'DatePurchased' //10
+ 'Description', // 0 'Title of the fixed asset',
+ 'LongDescription', // 1 'Description of the fixed asset',
+ 'AssetCategoryID', // 2 'Asset category id',
+ 'SerialNo', // 3 'Serial number',
+ 'BarCode', // 4 'Bar code',
+ 'AssetLocationCode', // 5 'Asset location code',
+ 'Cost', // 6 'Cost',
+ 'AccumDepn', // 7 'Accumulated depreciation',
+ 'DepnType', // 8 'Depreciation type - SL or DV',
+ 'DepnRate', // 9 'Depreciation rate',
+ 'DatePurchased' // 10 'Date of purchase',
);
if ($_FILES['SelectedAssetFile']['name']) { //start file processing
@@ -309,4 +313,4 @@
}
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/Z_ImportGLTransactions.php
===================================================================
--- trunk/Z_ImportGLTransactions.php 2014-05-30 22:29:38 UTC (rev 6737)
+++ trunk/Z_ImportGLTransactions.php 2014-05-31 00:35:26 UTC (rev 6738)
@@ -6,6 +6,10 @@
$Title = _('Import General Ledger Transactions');
include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
+echo '<p class="page_title_text"><img alt="" src="' . $RootPath . '/css/' . $Theme .
+ '/images/maintenance.png" title="' .
+ _('Import GL Payments Receipts Or Journals From CSV') . '" />' . ' ' .
+ _('Import GL Payments Receipts Or Journals From CSV') . '</p>';
$FieldHeadings = array(
'Date', // 0 'Transaction Date',
@@ -16,7 +20,6 @@
'Tag' // 5 'Tag reference'
);
-echo '<p class="page_title_text" ><img src="' . $RootPath . '/css/' . $Theme . '/images/maintenance.png" title="' . $Title . '" alt="' . $Title . '" />' . ' ' . $Title . '</p>';
if (isset($_FILES['userfile']) and $_FILES['userfile']['name']) { //start file processing
//check file info
@@ -274,4 +277,4 @@
}
}
-?>
\ No newline at end of file
+?>
Modified: trunk/Z_ImportPriceList.php
===================================================================
--- trunk/Z_ImportPriceList.php 2014-05-30 22:29:38 UTC (rev 6737)
+++ trunk/Z_ImportPriceList.php 2014-05-31 00:35:26 UTC (rev 6738)
@@ -3,6 +3,10 @@
include('includes/session.inc');
$Title = _('Import Sales Price List');
include('includes/header.inc');
+echo '<p class="page_title_text"><img alt="" src="' . $RootPath . '/css/' . $Theme .
+ '/images/maintenance.png" title="' .
+ _('Import Price List from CSV file') . '" />' . ' ' .
+ _('Import Price List from CSV file') . '</p>';
$FieldHeadings = array(
'StockID', // 0 'STOCKID',
@@ -11,8 +15,6 @@
'Price' // 3 'Price'
);
-echo '<p class="page_title_text" ><img src="' . $RootPath . '/css/' . $Theme . '/images/maintenance.png" title="' . $Title . '" alt="' . $Title . '" />' . ' ' . $Title . '</p>';
-
if (isset($_FILES['PriceListFile']) and $_FILES['PriceListFile']['name']) { //start file processing
//check file info
$FileName = $_FILES['PriceListFile']['name'];
Modified: trunk/Z_ImportStocks.php
===================================================================
--- trunk/Z_ImportStocks.php 2014-05-30 22:29:38 UTC (rev 6737)
+++ trunk/Z_ImportStocks.php 2014-05-31 00:35:26 UTC (rev 6738)
@@ -4,6 +4,10 @@
include('includes/session.inc');
$Title = _('Import Items');
include('includes/header.inc');
+echo '<p class="page_title_text"><img alt="" src="' . $RootPath . '/css/' . $Theme .
+ '/images/inventory.png" title="' .
+ _('Import Stock Items from .csv') . '" />' . ' ' .
+ _('Import Stock Items from .csv') . '</p>';
// If this script is called with a file object, then the file contents are imported
// If this script is called with the gettemplate flag, then a template file is served
@@ -22,7 +26,7 @@
'Serialised', // 9 'SERIALISED',
'Perishable', // 10 'PERISHABLE',
'Volume', // 11 'VOLUME',
- 'grossweight', // 12 'grossweight',
+ 'grossweight', // 12 'grossweight',
'BarCode', // 13 'BARCODE',
'DiscountCategory', // 14 'DISCOUNTCATEGORY',
'TaxCat', // 15 'TAXCAT',
@@ -296,4 +300,4 @@
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
|
|
From: <dai...@us...> - 2014-06-01 08:16:29
|
Revision: 6741
http://sourceforge.net/p/web-erp/reponame/6741
Author: daintree
Date: 2014-06-01 08:16:22 +0000 (Sun, 01 Jun 2014)
Log Message:
-----------
fix POItems.php paging
Modified Paths:
--------------
trunk/PO_Items.php
trunk/doc/Change.log
Modified: trunk/PO_Items.php
===================================================================
--- trunk/PO_Items.php 2014-05-31 01:41:40 UTC (rev 6740)
+++ trunk/PO_Items.php 2014-06-01 08:16:22 UTC (rev 6741)
@@ -1074,16 +1074,18 @@
}
}
- $sqlcount = substr($sql,strpos($sql, "FROM"));
- $sqlcount = substr($sqlcount,0, strpos($sqlcount, "ORDER"));
- $sqlcount = 'SELECT COUNT(*) '.$sqlcount;
- $SearchResult = DB_query($sqlcount,$db,$ErrMsg,$DbgMsg);
+ $SQLCount = substr($sql,strpos($sql, "FROM"));
+ $SQLCount = substr($SQLCount,0, strpos($SQLCount, "ORDER"));
+ $SQLCount = 'SELECT COUNT(*) '.$SQLCount;
+ $SearchResult = DB_query($SQLCount,$db,$ErrMsg,$DbgMsg);
$myrow=DB_fetch_array($SearchResult);
DB_free_result($SearchResult);
unset($SearchResult);
$ListCount = $myrow[0];
$ListPageMax = ceil($ListCount / $_SESSION['DisplayRecordsMax'])-1;
-
+ if ($ListPageMax < 0) {
+ $ListPageMax = 0;
+ }
if (isset($_POST['Next'])) {
$Offset = $_POST['currpage']+1;
}
@@ -1091,10 +1093,14 @@
$Offset = $_POST['currpage']-1;
}
if (!isset($Offset)) {
- $Offset=0;
+ $Offset = 0;
}
- if($Offset<0)$Offset=0;
- if($Offset>$ListPageMax)$Offset=$ListPageMax;
+ if($Offset < 0){
+ $Offset = 0;
+ }
+ if($Offset > $ListPageMax) {
+ $Offset = $ListPageMax;
+ }
$sql = $sql . "LIMIT " . $_SESSION['DisplayRecordsMax']." OFFSET " . strval($_SESSION['DisplayRecordsMax']*$Offset);
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2014-05-31 01:41:40 UTC (rev 6740)
+++ trunk/doc/Change.log 2014-06-01 08:16:22 UTC (rev 6741)
@@ -1,4 +1,5 @@
webERP Change Log
+1/6/14 Phil: Fixed bug in POItems.php that resulted in an SQL error when the number of items from the search was zero after previous searches had returned records
27/05/14 RChacon: Add page title text and icon to import scripts. Page title text = menu option.
27/05/14 RChacon: Regroups the import scripts in the utility menu.
27/05/14 Exson: Add Sales man login control for PDFOrderStatus.php
|
|
From: <dai...@us...> - 2014-06-02 03:25:06
|
Revision: 6742
http://sourceforge.net/p/web-erp/reponame/6742
Author: daintree
Date: 2014-06-02 03:25:01 +0000 (Mon, 02 Jun 2014)
Log Message:
-----------
fix WO entry costing calculations to take into account BOM effectivity dates
Modified Paths:
--------------
trunk/WorkOrderEntry.php
trunk/doc/Change.log
Modified: trunk/WorkOrderEntry.php
===================================================================
--- trunk/WorkOrderEntry.php 2014-06-01 08:16:22 UTC (rev 6741)
+++ trunk/WorkOrderEntry.php 2014-06-02 03:25:01 UTC (rev 6742)
@@ -270,7 +270,9 @@
INNER JOIN bom
ON stockmaster.stockid=bom.component
WHERE bom.parent='" . $NewItem . "'
- AND bom.loccode='" . $_POST['StockLocation'] . "'",
+ AND bom.loccode='" . $_POST['StockLocation'] . "'
+ AND bom.effectivefrom<='" . Date('Y-m-d') . "'
+ AND bom.effectiveto>='" . Date('Y-m-d') . "'",
$db);
$CostRow = DB_fetch_array($CostResult);
if (is_null($CostRow['cost']) OR $CostRow['cost']==0){
@@ -369,11 +371,12 @@
/* can only change location cost if QtyRecd=0 */
$CostResult = DB_query("SELECT SUM((materialcost+labourcost+overheadcost)*bom.quantity) AS cost
FROM stockmaster
- INNER JOIN bom
- ON stockmaster.stockid=bom.component
+ INNER JOIN bom ON stockmaster.stockid=bom.component
WHERE bom.parent='" . $_POST['OutputItem'.$i] . "'
- AND bom.loccode='" . $_POST['StockLocation'] . "'",
- $db);
+ AND bom.loccode='" . $_POST['StockLocation'] . "'
+ AND bom.effectivefrom<='" . Date('Y-m-d') . "'
+ AND bom.effectiveto>='" . Date('Y-m-d') . "'",
+ $db);
$CostRow = DB_fetch_array($CostResult);
if (is_null($CostRow['cost'])){
$Cost =0;
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2014-06-01 08:16:22 UTC (rev 6741)
+++ trunk/doc/Change.log 2014-06-02 03:25:01 UTC (rev 6742)
@@ -1,4 +1,5 @@
webERP Change Log
+2/6/14 Phil: Added bom effectivity dates into work order creation cost calculations - as spotted by Andrew Galuski
1/6/14 Phil: Fixed bug in POItems.php that resulted in an SQL error when the number of items from the search was zero after previous searches had returned records
27/05/14 RChacon: Add page title text and icon to import scripts. Page title text = menu option.
27/05/14 RChacon: Regroups the import scripts in the utility menu.
|
|
From: <dai...@us...> - 2014-06-02 03:40:54
|
Revision: 6743
http://sourceforge.net/p/web-erp/reponame/6743
Author: daintree
Date: 2014-06-02 03:40:49 +0000 (Mon, 02 Jun 2014)
Log Message:
-----------
fix WO entry costing calculations to take into account BOM effectivity dates
Modified Paths:
--------------
trunk/SystemParameters.php
trunk/WorkOrderEntry.php
trunk/includes/SQL_CommonFunctions.inc
Modified: trunk/SystemParameters.php
===================================================================
--- trunk/SystemParameters.php 2014-06-02 03:25:01 UTC (rev 6742)
+++ trunk/SystemParameters.php 2014-06-02 03:40:49 UTC (rev 6743)
@@ -905,7 +905,7 @@
echo '<tr style="outline: 1px solid"><td>' . _('Wiki application') . ':</td>
<td><select name="X_WikiApp">';
for ($i=0; $i < sizeof($WikiApplications); $i++ ) {
- echo '<option '.($_SESSION['WikiApp'] == $WikiApplications[$i] ? 'selected="selected" ' : '').'value="'.$WikiApplications[$i].'">' . $WikiApplications[$i] . '</option>';
+ echo '<option '.($_SESSION['WikiApp'] == $i ? 'selected="selected" ' : '').'value="'. $i .'">' . $WikiApplications[$i] . '</option>';
}
echo '</select></td>
<td>' . _('This feature makes webERP show links to a free form company knowledge base using a wiki. This allows sharing of important company information - about customers, suppliers and products and the set up of work flow menus and/or company procedures documentation') . '</td></tr>';
Modified: trunk/WorkOrderEntry.php
===================================================================
--- trunk/WorkOrderEntry.php 2014-06-02 03:25:01 UTC (rev 6742)
+++ trunk/WorkOrderEntry.php 2014-06-02 03:40:49 UTC (rev 6743)
@@ -271,7 +271,7 @@
ON stockmaster.stockid=bom.component
WHERE bom.parent='" . $NewItem . "'
AND bom.loccode='" . $_POST['StockLocation'] . "'
- AND bom.effectivefrom<='" . Date('Y-m-d') . "'
+ AND bom.effectiveafter<='" . Date('Y-m-d') . "'
AND bom.effectiveto>='" . Date('Y-m-d') . "'",
$db);
$CostRow = DB_fetch_array($CostResult);
@@ -374,7 +374,7 @@
INNER JOIN bom ON stockmaster.stockid=bom.component
WHERE bom.parent='" . $_POST['OutputItem'.$i] . "'
AND bom.loccode='" . $_POST['StockLocation'] . "'
- AND bom.effectivefrom<='" . Date('Y-m-d') . "'
+ AND bom.effectiveafter<='" . Date('Y-m-d') . "'
AND bom.effectiveto>='" . Date('Y-m-d') . "'",
$db);
$CostRow = DB_fetch_array($CostResult);
@@ -612,7 +612,9 @@
}
}
echo '<td>';
- wikiLink('WorkOrder', $_POST['WO'] . $_POST['OutputItem' .$i]);
+ if ($_SESSION['WikiApp']!=0){
+ wikiLink('WorkOrder', $_POST['WO'] . $_POST['OutputItem' .$i]);
+ }
echo '</td>';
echo '</tr>';
if (isset($_POST['Controlled' . $i])) {
Modified: trunk/includes/SQL_CommonFunctions.inc
===================================================================
--- trunk/includes/SQL_CommonFunctions.inc 2014-06-02 03:25:01 UTC (rev 6742)
+++ trunk/includes/SQL_CommonFunctions.inc 2014-06-02 03:40:49 UTC (rev 6743)
@@ -209,18 +209,20 @@
/* Calculates the material cost of a bill of materials, given parent code*/
function BomMaterialCost($Parent, $db) {
- $SQL = "SELECT materialcost from stockmaster where stockid='".$Parent."'";
+ $SQL = "SELECT materialcost FROM stockmaster WHERE stockid='" . $Parent . "'";
$result1 = DB_query($SQL,$db);
$MyRow1 = DB_fetch_row($result1);
$OldCost = $MyRow1[0];
- $SQL = "SELECT sum(quantity) as qoh from locstock where stockid='".$Parent."'";
+ $SQL = "SELECT sum(quantity) as qoh from locstock where stockid='" . $Parent . "'";
$result1 = DB_query($SQL,$db);
$MyRow1 = DB_fetch_row($result1);
$QOH = $MyRow1[0];
$SQL = "SELECT Sum(stockmaster.materialcost*bom.quantity) AS SumOfmaterialcost
FROM bom LEFT JOIN stockmaster
- ON bom.component = stockmaster.stockid
- WHERE bom.parent='". $Parent . "'";
+ ON bom.component = stockmaster.stockid
+ WHERE bom.parent='". $Parent . "'
+ AND bom.effectiveafter<='" . Date('Y-m-d') . "'
+ AND bom.effectiveto>='" . Date('Y-m-d') . "'";
$result = DB_query($SQL,$db);
$MyRow = DB_fetch_row($result);
$MaterialCost = $MyRow[0];
@@ -274,6 +276,8 @@
ON bom.component=stockmaster.stockid
WHERE bom.parent='" . $StockID . "'
AND bom.loccode ='" . $LocCode . "'
+ AND bom.effectiveafter<='" . Date('Y-m-d') . "'
+ AND bom.effectiveto>='" . Date('Y-m-d') . "'
AND stockmaster.mbflag<>'G'
AND bom.component NOT IN (
SELECT stockid
@@ -300,6 +304,8 @@
ON bom.component=stockmaster.stockid
WHERE bom.parent='" . $StockID . "'
AND bom.loccode ='" . $LocCode . "'
+ AND bom.effectiveafter<='" . Date('Y-m-d') . "'
+ AND bom.effectiveto>='" . Date('Y-m-d') . "'
AND stockmaster.mbflag<>'G'
AND bom.component IN (
SELECT stockid
@@ -322,6 +328,8 @@
ON bom.component=stockmaster.stockid
WHERE parent='" . $StockID . "'
AND loccode ='" . $LocCode . "'
+ AND bom.effectiveafter<='" . Date('Y-m-d') . "'
+ AND bom.effectiveto>='" . Date('Y-m-d') . "'
AND stockmaster.mbflag='G'";
$result = DB_query($sql, $db);
while ($MyRow=DB_fetch_array($result)) {
|
|
From: <dai...@us...> - 2014-06-12 06:07:52
|
Revision: 6748
http://sourceforge.net/p/web-erp/reponame/6748
Author: daintree
Date: 2014-06-12 06:07:43 +0000 (Thu, 12 Jun 2014)
Log Message:
-----------
commas and start to remove db from db_query calls
Modified Paths:
--------------
trunk/includes/ConnectDB_mysql.inc
trunk/includes/ConnectDB_mysqli.inc
trunk/reportwriter/WriteReport.inc
Modified: trunk/includes/ConnectDB_mysql.inc
===================================================================
--- trunk/includes/ConnectDB_mysql.inc 2014-06-11 03:00:12 UTC (rev 6747)
+++ trunk/includes/ConnectDB_mysql.inc 2014-06-12 06:07:43 UTC (rev 6748)
@@ -50,7 +50,7 @@
//DB wrapper functions to change only once for whole application
function DB_query ($SQL,
- &$Conn,
+ $Conn='',
$ErrorMessage='',
$DebugMessage= '',
$Transaction=false,
@@ -58,26 +58,27 @@
global $debug;
global $PathPrefix;
+ global $db;
- $result=mysql_query($SQL,$Conn);
- $_SESSION['LastInsertId'] = mysql_insert_id($Conn);
+ $result=mysql_query($SQL,$db);
+ $_SESSION['LastInsertId'] = mysql_insert_id($db);
if ($DebugMessage == '') {
$DebugMessage = _('The SQL that failed was');
}
- if (DB_error_no($Conn) != 0 AND $TrapErrors==true){
+ if (DB_error_no($db) != 0 AND $TrapErrors==true){
if ($TrapErrors){
require_once($PathPrefix . 'includes/header.inc');
}
- prnMsg($ErrorMessage . '<br />' . DB_error_msg($Conn),'error', _('Database Error'));
+ prnMsg($ErrorMessage . '<br />' . DB_error_msg($db),'error', _('Database Error'));
if ($debug==1){
prnMsg($DebugMessage. '<br />' . $SQL . '<br />','error',_('Database SQL Failure'));
}
if ($Transaction){
$SQL = 'rollback';
- $Result = DB_query($SQL,$Conn);
- if (DB_error_no($Conn) !=0){
+ $Result = DB_query($SQL,$db);
+ if (DB_error_no($db) !=0){
prnMsg(_('Error Rolling Back Transaction'), '', _('Database Rollback Error') );
}
}
@@ -85,7 +86,7 @@
include($PathPrefix . 'includes/footer.inc');
exit;
}
- } elseif (isset($_SESSION['MonthsAuditTrail']) and (DB_error_no($Conn)==0 AND $_SESSION['MonthsAuditTrail']>0)){
+ } elseif (isset($_SESSION['MonthsAuditTrail']) and (DB_error_no($db)==0 AND $_SESSION['MonthsAuditTrail']>0)){
$SQLArray = explode(' ', $SQL);
@@ -101,7 +102,7 @@
'" . trim($_SESSION['UserID']) . "',
'" . DB_escape_string($SQL) . "')";
- $AuditResult = mysql_query($AuditSQL,$Conn);
+ $AuditResult = mysql_query($AuditSQL,$db);
}
}
}
@@ -144,16 +145,18 @@
return mysql_affected_rows($ResultIndex);
}
-function DB_error_no (&$Conn){
- return mysql_errno($Conn);
+function DB_error_no (&$Conn=''){
+ global $db;
+ return mysql_errno($db);
}
-function DB_error_msg(&$Conn){
- return mysql_error($Conn);
+function DB_error_msg(&$Conn=''){
+ global $db;
+ return mysql_error($db);
}
-function DB_Last_Insert_ID(&$Conn,$table, $fieldname){
-// return mysql_insert_id($Conn);
+function DB_Last_Insert_ID(&$Conn='',$table, $fieldname){
+// return mysql_insert_id($db);
if (isset($_SESSION['LastInsertId'])) {
$Last_Insert_ID = $_SESSION['LastInsertId'];
} else {
@@ -167,13 +170,13 @@
return mysql_real_escape_string($String);
}
-function DB_show_tables(&$Conn){
- $Result = DB_query('SHOW TABLES',$Conn);
+function DB_show_tables(&$Conn=''){
+ $Result = DB_query('SHOW TABLES');
Return $Result;
}
-function DB_show_fields($TableName, &$Conn){
- $Result = DB_query("DESCRIBE $TableName",$Conn);
+function DB_show_fields($TableName, &$Conn=''){
+ $Result = DB_query("DESCRIBE $TableName");
Return $Result;
}
@@ -182,41 +185,39 @@
return "\n".'interval ' . $val . ' '. $Inter."\n";
}
-function DB_Maintenance($Conn){
+function DB_Maintenance($Conn=''){
prnMsg(_('The system has just run the regular database administration and optimisation routine.'),'info');
-
- $TablesResult = DB_query('SHOW TABLES',$Conn);
+ $TablesResult = DB_query('SHOW TABLES');
while ($myrow = DB_fetch_row($TablesResult)){
- $Result = DB_query('OPTIMIZE TABLE ' . $myrow[0],$Conn);
+ $Result = DB_query('OPTIMIZE TABLE ' . $myrow[0]);
}
$Result = DB_query("UPDATE config
SET confvalue='" . Date('Y-m-d') . "'
- WHERE confname='DB_Maintenance_LastRun'",
- $Conn);
+ WHERE confname='DB_Maintenance_LastRun'");
}
-function DB_Txn_Begin($Conn){
- mysql_query("SET autocommit=0",$Conn);
- mysql_query("START TRANSACTION",$Conn);
+function DB_Txn_Begin($Conn=''){
+ mysql_query("SET autocommit=0");
+ mysql_query("START TRANSACTION");
}
-function DB_Txn_Commit($Conn){
- mysql_query("COMMIT",$Conn );
- mysql_query("SET autocommit=1",$Conn);
+function DB_Txn_Commit($Conn=''){
+ mysql_query("COMMIT");
+ mysql_query("SET autocommit=1");
}
-function DB_Txn_Rollback($Conn){
- mysql_query("ROLLBACK", $Conn );
+function DB_Txn_Rollback($Conn=''){
+ mysql_query("ROLLBACK");
}
-function DB_IgnoreForeignKeys($Conn){
- mysql_query("SET FOREIGN_KEY_CHECKS=0",$Conn);
+function DB_IgnoreForeignKeys($Conn=''){
+ mysql_query("SET FOREIGN_KEY_CHECKS=0");
}
-function DB_ReinstateForeignKeys($Conn){
- mysql_query("SET FOREIGN_KEY_CHECKS=1",$Conn);
+function DB_ReinstateForeignKeys($Conn=''){
+ mysql_query("SET FOREIGN_KEY_CHECKS=1");
}
?>
Modified: trunk/includes/ConnectDB_mysqli.inc
===================================================================
--- trunk/includes/ConnectDB_mysqli.inc 2014-06-11 03:00:12 UTC (rev 6747)
+++ trunk/includes/ConnectDB_mysqli.inc 2014-06-12 06:07:43 UTC (rev 6748)
@@ -59,7 +59,7 @@
//DB wrapper functions to change only once for whole application
function DB_query ($SQL,
- &$Conn,
+ $Conn='',
$ErrorMessage='',
$DebugMessage= '',
$Transaction=false,
@@ -67,28 +67,29 @@
global $debug;
global $PathPrefix;
+ global $db;
- $result=mysqli_query($Conn, $SQL);
+ $result=mysqli_query($db, $SQL);
- $_SESSION['LastInsertId'] = mysqli_insert_id($Conn);
+ $_SESSION['LastInsertId'] = mysqli_insert_id($db);
if ($DebugMessage == '') {
$DebugMessage = _('The SQL that failed was');
}
- if (DB_error_no($Conn) != 0 AND $TrapErrors==true){
+ if (DB_error_no() != 0 AND $TrapErrors==true){
if ($TrapErrors){
require_once($PathPrefix . 'includes/header.inc');
}
- prnMsg($ErrorMessage . '<br />' . DB_error_msg($Conn),'error', _('Database Error'). ' ' .DB_error_no($Conn));
+ prnMsg($ErrorMessage . '<br />' . DB_error_msg(),'error', _('Database Error'). ' ' .DB_error_no());
if ($debug==1){
prnMsg($DebugMessage. '<br />' . $SQL . '<br />','error',_('Database SQL Failure'));
}
if ($Transaction){
$SQL = 'rollback';
- $Result = DB_query($SQL,$Conn);
- if (DB_error_no($Conn) !=0){
- prnMsg(_('Error Rolling Back Transaction'), 'error', _('Database Rollback Error'). ' ' .DB_error_no($Conn) );
+ $Result = DB_query($SQL);
+ if (DB_error_no() !=0){
+ prnMsg(_('Error Rolling Back Transaction'), 'error', _('Database Rollback Error'). ' ' .DB_error_no() );
}else{
prnMsg(_('Rolling Back Transaction OK'), 'error', _('Database Rollback Due to Error Above'));
}
@@ -97,7 +98,7 @@
include($PathPrefix . 'includes/footer.inc');
exit;
}
- } elseif (isset($_SESSION['MonthsAuditTrail']) and (DB_error_no($Conn)==0 AND $_SESSION['MonthsAuditTrail']>0) AND (DB_affected_rows($result)>0)){
+ } elseif (isset($_SESSION['MonthsAuditTrail']) and (DB_error_no()==0 AND $_SESSION['MonthsAuditTrail']>0) AND (DB_affected_rows($result)>0)){
$SQLArray = explode(' ', $SQL);
@@ -113,7 +114,7 @@
'" . trim($_SESSION['UserID']) . "',
'" . DB_escape_string($SQL) . "')";
- $AuditResult = mysqli_query($Conn, $AuditSQL);
+ $AuditResult = mysqli_query($db, $AuditSQL);
}
}
}
@@ -122,19 +123,16 @@
}
function DB_fetch_row (&$ResultIndex) {
-
$RowPointer=mysqli_fetch_row($ResultIndex);
Return $RowPointer;
}
function DB_fetch_assoc (&$ResultIndex) {
-
$RowPointer=mysqli_fetch_assoc($ResultIndex);
Return $RowPointer;
}
function DB_fetch_array (&$ResultIndex) {
-
$RowPointer=mysqli_fetch_array($ResultIndex);
Return $RowPointer;
}
@@ -154,21 +152,22 @@
}
function DB_affected_rows(&$ResultIndex){
-
global $db;
return mysqli_affected_rows($db);
}
-function DB_error_no (&$Conn){
- return mysqli_errno($Conn);
+function DB_error_no ($Conn=''){
+ global $db;
+ return mysqli_errno($db);
}
-function DB_error_msg(&$Conn){
- return mysqli_error($Conn);
+function DB_error_msg($Conn=''){
+ global $db;
+ return mysqli_error($db);
}
-function DB_Last_Insert_ID(&$Conn, $Table, $FieldName){
+function DB_Last_Insert_ID($Conn='', $Table, $FieldName){
// return mysqli_insert_id($Conn);
if (isset($_SESSION['LastInsertId'])) {
$Last_Insert_ID = $_SESSION['LastInsertId'];
@@ -184,13 +183,14 @@
return mysqli_real_escape_string($db, $String);
}
-function DB_show_tables(&$Conn){
- $Result = DB_query('SHOW TABLES',$Conn);
+function DB_show_tables($Conn=''){
+ global $db;
+ $Result = DB_query('SHOW TABLES',$db);
Return $Result;
}
-function DB_show_fields($TableName, &$Conn){
- $Result = DB_query("DESCRIBE $TableName",$Conn);
+function DB_show_fields($TableName, $Conn=''){
+ $Result = DB_query("DESCRIBE $TableName");
Return $Result;
}
@@ -199,38 +199,42 @@
return "\n".'interval ' . $val . ' '. $Inter."\n";
}
-function DB_Maintenance($Conn){
+function DB_Maintenance($Conn=''){
prnMsg(_('The system has just run the regular database administration and optimisation routine.'),'info');
- $TablesResult = DB_query('SHOW TABLES',$Conn);
+ $TablesResult = DB_query("SHOW TABLES");
while ($myrow = DB_fetch_row($TablesResult)){
- $Result = DB_query('OPTIMIZE TABLE ' . $myrow[0],$Conn);
+ $Result = DB_query('OPTIMIZE TABLE ' . $myrow[0]);
}
$Result = DB_query("UPDATE config
SET confvalue='" . Date('Y-m-d') . "'
- WHERE confname='DB_Maintenance_LastRun'",
- $Conn);
+ WHERE confname='DB_Maintenance_LastRun'");
}
-function DB_Txn_Begin($Conn){
- mysqli_query($Conn,'SET autocommit=0');
- mysqli_query($Conn,'START TRANSACTION');
+function DB_Txn_Begin($Conn=''){
+ global $db;
+ mysqli_query($db,'SET autocommit=0');
+ mysqli_query($db,'START TRANSACTION');
}
-function DB_Txn_Commit($Conn){
- mysqli_query($Conn,'COMMIT');
- mysqli_query($Conn,'SET autocommit=1');
+function DB_Txn_Commit($Conn=''){
+ global $db;
+ mysqli_query($db,'COMMIT');
+ mysqli_query($db,'SET autocommit=1');
}
-function DB_Txn_Rollback($Conn){
- mysqli_query($Conn,'ROLLBACK');
+function DB_Txn_Rollback($Conn=''){
+ global $db;
+ mysqli_query($db,'ROLLBACK');
}
-function DB_IgnoreForeignKeys($Conn){
- mysqli_query($Conn,'SET FOREIGN_KEY_CHECKS=0');
+function DB_IgnoreForeignKeys($Conn=''){
+ global $db;
+ mysqli_query($db,'SET FOREIGN_KEY_CHECKS=0');
}
-function DB_ReinstateForeignKeys($Conn){
- mysqli_query($Conn, 'SET FOREIGN_KEY_CHECKS=1');
+function DB_ReinstateForeignKeys($Conn=''){
+ global $db;
+ mysqli_query($db, 'SET FOREIGN_KEY_CHECKS=1');
}
-?>
+?>
\ No newline at end of file
Modified: trunk/reportwriter/WriteReport.inc
===================================================================
--- trunk/reportwriter/WriteReport.inc 2014-06-11 03:00:12 UTC (rev 6747)
+++ trunk/reportwriter/WriteReport.inc 2014-06-12 06:07:43 UTC (rev 6748)
@@ -545,8 +545,8 @@
global $Heading;
$CSVOutput = '';
// Write the column headings
- foreach ($Heading as $mycolumn) { // check for embedded commas and enclose in quotes
- if (mb_strpos($mycolumn,',')===false) $CSVOutput .= $mycolumn.','; else $CSVOutput .= '"'.$mycolumn.'",';
+ foreach ($Heading as $mycolumn) { // always enclose in quotes
+ $CSVOutput .= '"'.$mycolumn.'",';
}
$CSVOutput = mb_substr($CSVOutput,0,-1).chr(10); // Strip the last comma off and add line feed
// Now write each data line and totals
@@ -563,7 +563,7 @@
default:
$CSVLine = '';
foreach ($myrow as $mycolumn) { // check for embedded commas and enclose in quotes
- if (strpos($mycolumn,',')===false) $CSVLine .= $mycolumn.','; else $CSVLine .= '"'.$mycolumn.'",';
+ $CSVLine .= '"'.$mycolumn.'",';
}
$CSVLine = mb_substr($CSVLine,0,-1); // Strip the last comma off
}
|
Thanks for helping keep SourceForge clean.
X