Menu
▾
▴
web-erp-svn
|
From: <dai...@us...> - 2011-11-27 09:16:44
|
Revision: 4757
http://web-erp.svn.sourceforge.net/web-erp/?rev=4757&view=rev
Author: daintree
Date: 2011-11-27 09:16:35 +0000 (Sun, 27 Nov 2011)
Log Message:
-----------
remove DB_escape_string() calls
Modified Paths:
--------------
trunk/ConfirmDispatch_Invoice.php
trunk/CounterSales.php
trunk/Credit_Invoice.php
trunk/DeliveryDetails.php
trunk/GLJournal.php
trunk/GLTags.php
trunk/Locations.php
trunk/MRPDemandTypes.php
trunk/PcAuthorizeExpenses.php
trunk/PcClaimExpensesFromTab.php
trunk/PcExpenses.php
trunk/SalesPeople.php
trunk/SelectCreditItems.php
trunk/Shippers.php
trunk/SpecialOrder.php
trunk/StockAdjustments.php
trunk/StockLocTransferReceive.php
trunk/StockTransfers.php
trunk/Stocks.php
trunk/SupplierContacts.php
trunk/SupplierCredit.php
trunk/Suppliers.php
trunk/TaxAuthorities.php
trunk/WOSerialNos.php
trunk/WWW_Access.php
trunk/WWW_Users.php
trunk/WorkCentres.php
trunk/WorkOrderEntry.php
trunk/WorkOrderIssue.php
trunk/WorkOrderReceive.php
trunk/doc/Change.log
Modified: trunk/ConfirmDispatch_Invoice.php
===================================================================
--- trunk/ConfirmDispatch_Invoice.php 2011-11-27 02:36:47 UTC (rev 4756)
+++ trunk/ConfirmDispatch_Invoice.php 2011-11-27 09:16:35 UTC (rev 4757)
@@ -1080,7 +1080,7 @@
'" . $OrderLine->DiscountPercent . "',
'" . $OrderLine->StandardCost . "',
'" . ($QtyOnHandPrior - $OrderLine->QtyDispatched) . "',
- '" . DB_escape_string($OrderLine->Narrative) . "' )";
+ '" . $OrderLine->Narrative . "' )";
} else {
// its an assembly or dummy and assemblies/dummies always have nil stock (by definition they are made up at the time of dispatch so new qty on hand will be nil
if (empty($OrderLine->StandardCost)) {
@@ -1113,7 +1113,7 @@
'" . -$OrderLine->QtyDispatched . "',
'" . $OrderLine->DiscountPercent . "',
'" . $OrderLine->StandardCost . "',
- '" . DB_escape_string($OrderLine->Narrative) . "')";
+ '" . $OrderLine->Narrative . "')";
}
@@ -1153,7 +1153,7 @@
$SQL = "UPDATE stockserialitems SET quantity= quantity - " . $Item->BundleQty . "
WHERE stockid='" . $OrderLine->StockID . "'
AND loccode='" . $_SESSION['Items'.$identifier]->Location . "'
- AND serialno='" . DB_escape_string($Item->BundleRef) . "'";
+ AND serialno='" . $Item->BundleRef . "'";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The serial stock item record could not be updated because');
$DbgMsg = _('The following SQL to update the serial stock item record was used');
@@ -1167,7 +1167,7 @@
moveqty)
VALUES ('" . $StkMoveNo . "',
'" . $OrderLine->StockID . "',
- '" . DB_escape_string($Item->BundleRef) . "',
+ '" . $Item->BundleRef . "',
'" . -$Item->BundleQty . "')";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The serial stock movement record could not be inserted because');
Modified: trunk/CounterSales.php
===================================================================
--- trunk/CounterSales.php 2011-11-27 02:36:47 UTC (rev 4756)
+++ trunk/CounterSales.php 2011-11-27 09:16:35 UTC (rev 4757)
@@ -1031,12 +1031,12 @@
'" . $OrderNo . "',
'" . $_SESSION['Items'.$identifier]->DebtorNo . "',
'" . $_SESSION['Items'.$identifier]->Branch . "',
- '". DB_escape_string($_SESSION['Items'.$identifier]->CustRef) ."',
- '". DB_escape_string($_SESSION['Items'.$identifier]->Comments) ."',
- '" . Date("Y-m-d H:i") . "',
+ '". $_SESSION['Items'.$identifier]->CustRef ."',
+ '". $_SESSION['Items'.$identifier]->Comments ."',
+ '" . Date('Y-m-d H:i') . "',
'" . $_SESSION['Items'.$identifier]->DefaultSalesType . "',
'" . $_SESSION['Items'.$identifier]->ShipVia . "',
- '". DB_escape_string($_SESSION['Items'.$identifier]->DeliverTo) . "',
+ '". $_SESSION['Items'.$identifier]->DeliverTo . "',
'" . _('Counter Sale') . "',
'" . $_SESSION['Items'.$identifier]->PhoneNo . "',
'" . $_SESSION['Items'.$identifier]->Email . "',
@@ -1071,7 +1071,7 @@
'". $StockItem->Price . "',
'" . $StockItem->Quantity . "',
'" . floatval($StockItem->DiscountPercent) . "',
- '" . DB_escape_string($StockItem->Narrative) . "',
+ '" . $StockItem->Narrative . "',
'" . Date('Y-m-d') . "',
'" . Date('Y-m-d') . "',
'" . $StockItem->Quantity . "',
@@ -1279,13 +1279,13 @@
'" . $DefaultDispatchDate . "',
'" . date('Y-m-d H-i-s') . "',
'" . $PeriodNo . "',
- '" . DB_escape_string($_SESSION['Items'.$identifier]->CustRef) . "',
+ '" . $_SESSION['Items'.$identifier]->CustRef . "',
'" . $_SESSION['Items'.$identifier]->DefaultSalesType . "',
'" . $OrderNo . "',
'" . $_SESSION['Items'.$identifier]->total . "',
'" . filter_number_format($_POST['TaxTotal']) . "',
'" . $ExRate . "',
- '" . DB_escape_string($_SESSION['Items'.$identifier]->Comments) . "',
+ '" . $_SESSION['Items'.$identifier]->Comments . "',
'" . $_SESSION['Items'.$identifier]->ShipVia . "',
'" . ($_SESSION['Items'.$identifier]->total + filter_number_format($_POST['TaxTotal'])) . "')";
@@ -1472,7 +1472,7 @@
'" . $OrderLine->DiscountPercent . "',
'" . $OrderLine->StandardCost . "',
'" . ($QtyOnHandPrior - $OrderLine->Quantity) . "',
- '" . DB_escape_string($OrderLine->Narrative) . "' )";
+ '" . $OrderLine->Narrative . "' )";
} else {
// its an assembly or dummy and assemblies/dummies always have nil stock (by definition they are made up at the time of dispatch so new qty on hand will be nil
if (empty($OrderLine->StandardCost)) {
@@ -1505,7 +1505,7 @@
'" . -$OrderLine->Quantity . "',
'" . $OrderLine->DiscountPercent . "',
'" . $OrderLine->StandardCost . "',
- '" . DB_escape_string($OrderLine->Narrative) . "')";
+ '" . $OrderLine->Narrative . "')";
}
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('Stock movement records could not be inserted because');
Modified: trunk/Credit_Invoice.php
===================================================================
--- trunk/Credit_Invoice.php 2011-11-27 02:36:47 UTC (rev 4756)
+++ trunk/Credit_Invoice.php 2011-11-27 09:16:35 UTC (rev 4757)
@@ -572,7 +572,7 @@
'" . -$TaxTotal . "',
'" . -$_SESSION['CreditItems']->FreightCost . "',
'" . $_SESSION['CurrencyRate'] . "',
- '" . DB_escape_string($_POST['CreditText']) . "',
+ '" . $_POST['CreditText'] . "',
'" . -$Allocate_amount . "',
'" . $Settled . "')";
@@ -836,7 +836,7 @@
'" . $CreditLine->DiscountPercent . "',
'" . $CreditLine->StandardCost . "',
'" . ($QtyOnHandPrior + $CreditLine->QtyDispatched) . "',
- '" . DB_escape_string($CreditLine->Narrative) . "')";
+ '" . $CreditLine->Narrative . "')";
} else {
$SQL = "INSERT INTO stockmoves (stockid,
@@ -866,7 +866,7 @@
'" . $CreditLine->QtyDispatched . "',
'" . $CreditLine->DiscountPercent . "',
'" . $CreditLine->StandardCost . "',
- '" . DB_escape_string($CreditLine->Narrative) . "')";
+ '" . $CreditLine->Narrative . "')";
}
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('Stock movement records could not be inserted because');
@@ -882,7 +882,7 @@
$SQL = "SELECT quantity from stockserialitems
WHERE stockid='" . $CreditLine->StockID . "'
AND loccode='" . $_SESSION['CreditItems']->Location . "'
- AND serialno='" . DB_escape_string($Item->BundleRef) . "'";
+ AND serialno='" . $Item->BundleRef . "'";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The serial stock item record could not be selected because');
$DbgMsg = _('The following SQL to select the serial stock item record was used');
@@ -896,7 +896,7 @@
VALUES
('" . $CreditLine->StockID . "',
'" . $_SESSION['CreditItems']->Location . "',
- '" . DB_escape_string($Item->BundleRef) . "',
+ '" . $Item->BundleRef . "',
'". $Item->BundleQty ."')";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The serial stock item record could not be updated because');
@@ -908,7 +908,7 @@
SET quantity= quantity + " . $Item->BundleQty . "
WHERE stockid='" . $CreditLine->StockID . "'
AND loccode='" . $_SESSION['CreditItems']->Location . "'
- AND serialno='" . DB_escape_string($Item->BundleRef) . "'";
+ AND serialno='" . $Item->BundleRef . "'";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The serial stock item record could not be updated because');
$DbgMsg = _('The following SQL to update the serial stock item record was used');
$Result = DB_query($SQL, $db, $ErrMsg, $DbgMsg, true);
@@ -922,7 +922,7 @@
moveqty)
VALUES ('" . $StkMoveNo . "',
'" . $CreditLine->StockID . "',
- '" . DB_escape_string($Item->BundleRef) . "',
+ '" . $Item->BundleRef . "',
'" . $Item->BundleQty . "')";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The serial stock movement record could not be inserted because');
$DbgMsg = _('The following SQL to insert the serial stock movement records was used');
@@ -965,7 +965,7 @@
'" . $CreditLine->DiscountPercent . "',
'" . $CreditLine->StandardCost . "',
'" . ($QtyOnHandPrior + $CreditLine->QtyDispatched) . "',
- '" . DB_escape_string($CreditLine->Narrative) . "')";
+ '" . $CreditLine->Narrative . "')";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('Stock movement records could not be inserted because');
$DbgMsg = _('The following SQL to insert the stock movement records was used');
@@ -1003,7 +1003,7 @@
'" . $CreditLine->StandardCost . "',
0,
'" . $QtyOnHandPrior . "',
- '" . DB_escape_string($CreditLine->Narrative) . "')";
+ '" . $CreditLine->Narrative . "')";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('Stock movement records could not be inserted because');
$DbgMsg = _('The following SQL to insert the stock movement records was used');
@@ -1042,7 +1042,7 @@
'" . $CreditLine->StandardCost . "',
'" . $QtyOnHandPrior . "',
1,
- '" . DB_escape_string($CreditLine->Narrative) . "')";
+ '" . $CreditLine->Narrative . "')";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('Stock movement records could not be inserted because');
Modified: trunk/DeliveryDetails.php
===================================================================
--- trunk/DeliveryDetails.php 2011-11-27 02:36:47 UTC (rev 4756)
+++ trunk/DeliveryDetails.php 2011-11-27 09:16:35 UTC (rev 4757)
@@ -354,21 +354,21 @@
'". $OrderNo . "',
'" . $_SESSION['Items'.$identifier]->DebtorNo . "',
'" . $_SESSION['Items'.$identifier]->Branch . "',
- '". DB_escape_string($_SESSION['Items'.$identifier]->CustRef) ."',
- '". DB_escape_string($_SESSION['Items'.$identifier]->Comments) ."',
+ '". $_SESSION['Items'.$identifier]->CustRef ."',
+ '". $_SESSION['Items'.$identifier]->Comments ."',
'" . Date('Y-m-d H:i') . "',
'" . $_SESSION['Items'.$identifier]->DefaultSalesType . "',
- '" . DB_escape_string($_POST['ShipVia']) ."',
- '". DB_escape_string($_SESSION['Items'.$identifier]->DeliverTo) . "',
- '" . DB_escape_string($_SESSION['Items'.$identifier]->BuyerName) . "',
- '" . DB_escape_string($_SESSION['Items'.$identifier]->DelAdd1) . "',
- '" . DB_escape_string($_SESSION['Items'.$identifier]->DelAdd2) . "',
- '" . DB_escape_string($_SESSION['Items'.$identifier]->DelAdd3) . "',
- '" . DB_escape_string($_SESSION['Items'.$identifier]->DelAdd4) . "',
- '" . DB_escape_string($_SESSION['Items'.$identifier]->DelAdd5) . "',
- '" . DB_escape_string($_SESSION['Items'.$identifier]->DelAdd6) . "',
- '" . DB_escape_string($_SESSION['Items'.$identifier]->PhoneNo) . "',
- '" . DB_escape_string($_SESSION['Items'.$identifier]->Email) . "',
+ '" . $_POST['ShipVia'] ."',
+ '". $_SESSION['Items'.$identifier]->DeliverTo . "',
+ '" . $_SESSION['Items'.$identifier]->BuyerName . "',
+ '" . $_SESSION['Items'.$identifier]->DelAdd1 . "',
+ '" . $_SESSION['Items'.$identifier]->DelAdd2 . "',
+ '" . $_SESSION['Items'.$identifier]->DelAdd3 . "',
+ '" . $_SESSION['Items'.$identifier]->DelAdd4 . "',
+ '" . $_SESSION['Items'.$identifier]->DelAdd5 . "',
+ '" . $_SESSION['Items'.$identifier]->DelAdd6 . "',
+ '" . $_SESSION['Items'.$identifier]->PhoneNo . "',
+ '" . $_SESSION['Items'.$identifier]->Email . "',
'" . $_SESSION['Items'.$identifier]->FreightCost ."',
'" . $_SESSION['Items'.$identifier]->Location ."',
'" . $DelDate . "',
@@ -403,7 +403,7 @@
'" . $StockItem->Price . "',
'" . $StockItem->Quantity . "',
'" . floatval($StockItem->DiscountPercent) . "',
- '" . DB_escape_string($StockItem->Narrative) . "',
+ '" . $StockItem->Narrative . "',
'" . $StockItem->POLine . "',
'" . FormatDateForSQL($StockItem->ItemDue) . "'
)";
@@ -712,23 +712,23 @@
$HeaderSQL = "UPDATE salesorders SET debtorno = '" . $_SESSION['Items'.$identifier]->DebtorNo . "',
branchcode = '" . $_SESSION['Items'.$identifier]->Branch . "',
- customerref = '". DB_escape_string($_SESSION['Items'.$identifier]->CustRef) ."',
- comments = '". DB_escape_string($_SESSION['Items'.$identifier]->Comments) ."',
+ customerref = '". $_SESSION['Items'.$identifier]->CustRef ."',
+ comments = '". $_SESSION['Items'.$identifier]->Comments ."',
ordertype = '" . $_SESSION['Items'.$identifier]->DefaultSalesType . "',
shipvia = '" . $_POST['ShipVia'] . "',
- deliverydate = '" . FormatDateForSQL(DB_escape_string($_SESSION['Items'.$identifier]->DeliveryDate)) . "',
- quotedate = '" . FormatDateForSQL(DB_escape_string($_SESSION['Items'.$identifier]->QuoteDate)) . "',
- confirmeddate = '" . FormatDateForSQL(DB_escape_string($_SESSION['Items'.$identifier]->ConfirmedDate)) . "',
- deliverto = '" . DB_escape_string($_SESSION['Items'.$identifier]->DeliverTo) . "',
- buyername = '" . DB_escape_string($_SESSION['Items'.$identifier]->BuyerName) . "',
- deladd1 = '" . DB_escape_string($_SESSION['Items'.$identifier]->DelAdd1) . "',
- deladd2 = '" . DB_escape_string($_SESSION['Items'.$identifier]->DelAdd2) . "',
- deladd3 = '" . DB_escape_string($_SESSION['Items'.$identifier]->DelAdd3) . "',
- deladd4 = '" . DB_escape_string($_SESSION['Items'.$identifier]->DelAdd4) . "',
- deladd5 = '" . DB_escape_string($_SESSION['Items'.$identifier]->DelAdd5) . "',
- deladd6 = '" . DB_escape_string($_SESSION['Items'.$identifier]->DelAdd6) . "',
- contactphone = '" . DB_escape_string($_SESSION['Items'.$identifier]->PhoneNo) . "',
- contactemail = '" . DB_escape_string($_SESSION['Items'.$identifier]->Email) . "',
+ deliverydate = '" . FormatDateForSQL($_SESSION['Items'.$identifier]->DeliveryDate) . "',
+ quotedate = '" . FormatDateForSQL($_SESSION['Items'.$identifier]->QuoteDate) . "',
+ confirmeddate = '" . FormatDateForSQL($_SESSION['Items'.$identifier]->ConfirmedDate) . "',
+ deliverto = '" . $_SESSION['Items'.$identifier]->DeliverTo . "',
+ buyername = '" . $_SESSION['Items'.$identifier]->BuyerName . "',
+ deladd1 = '" . $_SESSION['Items'.$identifier]->DelAdd1 . "',
+ deladd2 = '" . $_SESSION['Items'.$identifier]->DelAdd2 . "',
+ deladd3 = '" . $_SESSION['Items'.$identifier]->DelAdd3 . "',
+ deladd4 = '" . $_SESSION['Items'.$identifier]->DelAdd4 . "',
+ deladd5 = '" . $_SESSION['Items'.$identifier]->DelAdd5 . "',
+ deladd6 = '" . $_SESSION['Items'.$identifier]->DelAdd6 . "',
+ contactphone = '" . $_SESSION['Items'.$identifier]->PhoneNo . "',
+ contactemail = '" . $_SESSION['Items'.$identifier]->Email . "',
freightcost = '" . $_SESSION['Items'.$identifier]->FreightCost ."',
fromstkloc = '" . $_SESSION['Items'.$identifier]->Location ."',
printedpackingslip = '" . $_POST['ReprintPackingSlip'] . "',
Modified: trunk/GLJournal.php
===================================================================
--- trunk/GLJournal.php 2011-11-27 02:36:47 UTC (rev 4756)
+++ trunk/GLJournal.php 2011-11-27 09:16:35 UTC (rev 4757)
@@ -76,7 +76,7 @@
'" . FormatDateForSQL($_SESSION['JournalDetail']->JnlDate) . "',
'" . $PeriodNo . "',
'" . $JournalItem->GLCode . "',
- '" . DB_escape_string($JournalItem->Narrative) . "',
+ '" . $JournalItem->Narrative . "',
'" . $JournalItem->Amount . "',
'" . $JournalItem->tag."'
)";
@@ -98,7 +98,7 @@
'" . FormatDateForSQL($_SESSION['JournalDetail']->JnlDate) . "',
'" . ($PeriodNo + 1) . "',
'" . $JournalItem->GLCode . "',
- '" . _('Reversal') . " - " . DB_escape_string($JournalItem->Narrative) . "',
+ '" . _('Reversal') . " - " . $JournalItem->Narrative . "',
'" . -($JournalItem->Amount) ."',
'".$JournalItem->tag."'
)";
@@ -111,7 +111,7 @@
$ErrMsg = _('Cannot commit the changes');
- $result= DB_Txn_Begin($db);
+ $result= DB_Txn_Commit($db);
prnMsg(_('Journal').' ' . $TransNo . ' '._('has been successfully entered'),'success');
Modified: trunk/GLTags.php
===================================================================
--- trunk/GLTags.php 2011-11-27 02:36:47 UTC (rev 4756)
+++ trunk/GLTags.php 2011-11-27 09:16:35 UTC (rev 4757)
@@ -37,12 +37,12 @@
}
if (isset($_POST['submit'])) {
- $sql = "INSERT INTO tags values(NULL, '" . DB_escape_string($_POST['Description']) . "')";
+ $sql = "INSERT INTO tags values(NULL, '" . $_POST['Description'] . "')";
$result= DB_query($sql,$db);
}
if (isset($_POST['update'])) {
- $sql = "UPDATE tags SET tagdescription='".DB_escape_string($_POST['Description']). "'
+ $sql = "UPDATE tags SET tagdescription='" . $_POST['Description'] . "'
WHERE tagref='".$_POST['reference']."'";
$result= DB_query($sql,$db);
}
Modified: trunk/Locations.php
===================================================================
--- trunk/Locations.php 2011-11-27 02:36:47 UTC (rev 4756)
+++ trunk/Locations.php 2011-11-27 09:16:35 UTC (rev 4757)
@@ -55,17 +55,17 @@
}
$sql = "UPDATE locations SET loccode='" . $_POST['LocCode'] . "',
- locationname='" . DB_escape_string($_POST['LocationName']) . "',
- deladd1='" . DB_escape_string($_POST['DelAdd1']) . "',
- deladd2='" . DB_escape_string($_POST['DelAdd2']) . "',
- deladd3='" . DB_escape_string($_POST['DelAdd3']) . "',
- deladd4='" . DB_escape_string($_POST['DelAdd4']) . "',
- deladd5='" . DB_escape_string($_POST['DelAdd5']) . "',
- deladd6='" . DB_escape_string($_POST['DelAdd6']) . "',
- tel='" . DB_escape_string($_POST['Tel']) . "',
- fax='" . DB_escape_string($_POST['Fax']) . "',
- email='" . DB_escape_string($_POST['Email']) . "',
- contact='" . DB_escape_string($_POST['Contact']) . "',
+ locationname='" . $_POST['LocationName'] . "',
+ deladd1='" . $_POST['DelAdd1'] . "',
+ deladd2='" . $_POST['DelAdd2'] . "',
+ deladd3='" . $_POST['DelAdd3'] . "',
+ deladd4='" . $_POST['DelAdd4'] . "',
+ deladd5='" . $_POST['DelAdd5'] . "',
+ deladd6='" . $_POST['DelAdd6'] . "',
+ tel='" . $_POST['Tel'] . "',
+ fax='" . $_POST['Fax'] . "',
+ email='" . $_POST['Email'] . "',
+ contact='" . $_POST['Contact'] . "',
taxprovinceid = '" . $_POST['TaxProvince'] . "',
cashsalecustomer ='" . $_POST['CashSaleCustomer'] . "',
cashsalebranch ='" . $_POST['CashSaleBranch'] . "',
@@ -124,18 +124,18 @@
cashsalecustomer,
cashsalebranch,
managed )
- VALUES ('" . DB_escape_string($_POST['LocCode']) . "',
- '" . DB_escape_string($_POST['LocationName']) . "',
- '" . DB_escape_string($_POST['DelAdd1']) ."',
- '" . DB_escape_string($_POST['DelAdd2']) ."',
- '" . DB_escape_string($_POST['DelAdd3']) . "',
- '" . DB_escape_string($_POST['DelAdd4']) . "',
- '" . DB_escape_string($_POST['DelAdd5']) . "',
- '" . DB_escape_string($_POST['DelAdd6']) . "',
- '" . DB_escape_string($_POST['Tel']) . "',
- '" . DB_escape_string($_POST['Fax']) . "',
- '" . DB_escape_string($_POST['Email']) . "',
- '" . DB_escape_string($_POST['Contact']) . "',
+ VALUES ('" . $_POST['LocCode'] . "',
+ '" . $_POST['LocationName'] . "',
+ '" . $_POST['DelAdd1'] ."',
+ '" . $_POST['DelAdd2'] ."',
+ '" . $_POST['DelAdd3'] . "',
+ '" . $_POST['DelAdd4'] . "',
+ '" . $_POST['DelAdd5'] . "',
+ '" . $_POST['DelAdd6'] . "',
+ '" . $_POST['Tel'] . "',
+ '" . $_POST['Fax'] . "',
+ '" . $_POST['Email'] . "',
+ '" . $_POST['Contact'] . "',
'" . $_POST['TaxProvince'] . "',
'" . $_POST['CashSaleCustomer'] . "',
'" . $_POST['CashSaleBranch'] . "',
Modified: trunk/MRPDemandTypes.php
===================================================================
--- trunk/MRPDemandTypes.php 2011-11-27 02:36:47 UTC (rev 4756)
+++ trunk/MRPDemandTypes.php 2011-11-27 09:16:35 UTC (rev 4757)
@@ -58,7 +58,7 @@
$sql = "INSERT INTO mrpdemandtypes (mrpdemandtype,
description)
VALUES ('" . trim(mb_strtoupper($_POST['MRPDemandType'])) . "',
- '" . DB_escape_string($_POST['Description']) . "'
+ '" . $_POST['Description'] . "'
)";
$msg = _('The new demand type has been added to the database');
}
Modified: trunk/PcAuthorizeExpenses.php
===================================================================
--- trunk/PcAuthorizeExpenses.php 2011-11-27 02:36:47 UTC (rev 4756)
+++ trunk/PcAuthorizeExpenses.php 2011-11-27 09:16:35 UTC (rev 4757)
@@ -135,7 +135,7 @@
$typeno = GetNextTransNo($type,$db);
//build narrative
- $narrative= _('PettyCash') . ' - '.$myrow['tabcode'] . ' - ' . $myrow['codeexpense'] . ' - ' . $myrow['notes'] . ' - ' . $myrow['receipt'];
+ $Narrative= _('PettyCash') . ' - '. $myrow['tabcode'] . ' - ' . $myrow['codeexpense'] . ' - ' . DB_escape_string($myrow['notes']) . ' - ' . $myrow['receipt'];
//insert to gltrans
DB_Txn_Begin($db);
@@ -158,7 +158,7 @@
'".$myrow['date']."',
'".$PeriodNo."',
'".$AccountFrom."',
- '". DB_escape_string($narrative) ."',
+ '". $Narrative ."',
'".-$Amount."',
0,
'',
@@ -185,7 +185,7 @@
'".$myrow['date']."',
'".$PeriodNo."',
'".$AccountTo."',
- '" . DB_escape_string($narrative) . "',
+ '" . $Narrative . "',
'".$Amount."',
0,
'',
@@ -209,7 +209,7 @@
VALUES ('". $ReceiptTransNo . "',
1,
'" . $AccountFrom . "',
- '" . DB_escape_string($narrative) . "',
+ '" . $Narrative . "',
1,
'" . $myrow['rate'] . "',
'" . $myrow['date'] . "',
Modified: trunk/PcClaimExpensesFromTab.php
===================================================================
--- trunk/PcClaimExpensesFromTab.php 2011-11-27 02:36:47 UTC (rev 4756)
+++ trunk/PcClaimExpensesFromTab.php 2011-11-27 09:16:35 UTC (rev 4757)
@@ -72,8 +72,8 @@
SET date = '".FormatDateForSQL($_POST['Date'])."',
codeexpense = '" . $_POST['SelectedExpense'] . "',
amount = '" .-filter_number_format($_POST['amount']) . "',
- notes = '" . DB_escape_string($_POST['Notes']) . "',
- receipt = '" . DB_escape_string($_POST['Receipt']) . "'
+ notes = '" . $_POST['Notes'] . "',
+ receipt = '" . $_POST['Receipt'] . "'
WHERE counterindex = '".$SelectedIndex."'";
$msg = _('The Expense Claim on Tab') . ' ' . $SelectedTabs . ' ' . _('has been updated');
@@ -98,8 +98,8 @@
'" . -filter_number_format($_POST['amount']) . "',
'',
'',
- '" . DB_escape_string($_POST['Notes']) . "',
- '" . DB_escape_string($_POST['Receipt']) . "'
+ '" . $_POST['Notes'] . "',
+ '" . $_POST['Receipt'] . "'
)";
$msg = _('The Expense Claim on Tab') . ' ' . $_POST['SelectedTabs'] . ' ' . _('has been created');
Modified: trunk/PcExpenses.php
===================================================================
--- trunk/PcExpenses.php 2011-11-27 02:36:47 UTC (rev 4756)
+++ trunk/PcExpenses.php 2011-11-27 09:16:35 UTC (rev 4757)
@@ -87,7 +87,7 @@
if (isset($SelectedExpense) AND $InputError !=1) {
$sql = "UPDATE pcexpenses
- SET description = '" . DB_escape_string($_POST['Description']) . "',
+ SET description = '" . $_POST['Description'] . "',
glaccount = '" . $_POST['GLAccount'] . "',
tag = '" . $_POST['Tag'] . "'
WHERE codeexpense = '" . $SelectedExpense . "'";
@@ -117,7 +117,7 @@
glaccount,
tag)
VALUES ('" . $_POST['CodeExpense'] . "',
- '" . DB_escape_string($_POST['Description']) . "',
+ '" . $_POST['Description'] . "',
'" . $_POST['GLAccount'] . "',
'" . $_POST['Tag'] . "')";
Modified: trunk/SalesPeople.php
===================================================================
--- trunk/SalesPeople.php 2011-11-27 02:36:47 UTC (rev 4756)
+++ trunk/SalesPeople.php 2011-11-27 09:16:35 UTC (rev 4757)
@@ -85,10 +85,10 @@
/*SelectedSalesPerson could also exist if submit had not been clicked this code would not run in this case cos submit is false of course see the delete code below*/
- $sql = "UPDATE salesman SET salesmanname='" . DB_escape_string($_POST['SalesmanName']) . "',
+ $sql = "UPDATE salesman SET salesmanname='" . $_POST['SalesmanName'] . "',
commissionrate1='" . filter_number_format($_POST['CommissionRate1']) . "',
- smantel='" . DB_escape_string($_POST['SManTel']) . "',
- smanfax='" . DB_escape_string($_POST['SManFax']) . "',
+ smantel='" . $_POST['SManTel'] . "',
+ smanfax='" . $_POST['SManFax'] . "',
breakpoint='" . filter_number_format($_POST['Breakpoint']) . "',
commissionrate2='" . filter_number_format($_POST['CommissionRate2']) . "',
current='" . $_POST['Current'] . "'
@@ -107,13 +107,13 @@
smantel,
smanfax,
current)
- VALUES ('" . DB_escape_string($_POST['SalesmanCode']) . "',
- '" . DB_escape_string($_POST['SalesmanName']) . "',
+ VALUES ('" . $_POST['SalesmanCode'] . "',
+ '" . $_POST['SalesmanName'] . "',
'" . filter_number_format($_POST['CommissionRate1']) . "',
'" . filter_number_format($_POST['CommissionRate2']) . "',
'" . filter_number_format($_POST['Breakpoint']) . "',
- '" . DB_escape_string($_POST['SManTel']) . "',
- '" . DB_escape_string($_POST['SManFax']) . "',
+ '" . $_POST['SManTel'] . "',
+ '" . $_POST['SManFax'] . "',
'" . $_POST['Current'] . "'
)";
@@ -280,7 +280,7 @@
$_POST['SManTel'] = $myrow['smantel'];
$_POST['SManFax'] = $myrow['smanfax'];
$_POST['CommissionRate1'] = locale_number_format($myrow['commissionrate1'],'Variable');
- $_POST['Breakpoint'] = locale_number_format($myrow['breakpoint'],'Variable');
+ $_POST['Breakpoint'] = locale_number_format($myrow['breakpoint'],$_SESSION['CompanyRecord']['decimalplaces']);
$_POST['CommissionRate2'] = locale_number_format($myrow['commissionrate2'],'Variable');
$_POST['Current'] = $myrow['current'];
@@ -290,14 +290,15 @@
echo '<table class="selection">
<tr>
<td>' . _('Salesperson code') . ':</td>
- <td>' . $_POST['SalesmanCode'] . '</td></tr>';
+ <td>' . $_POST['SalesmanCode'] . '</td>
+ </tr>';
} else { //end of if $SelectedSalesPerson only do the else when a new record is being entered
echo '<table class="selection">
<tr>
<td>' . _('Salesperson code') . ':</td>
- <td><input type="text" '. (in_array('SalesmanCode',$Errors) ? 'class="inputerror"' : '' ) .' name="SalesmanCode" size=3 maxlength=3></td>
+ <td><input type="text" '. (in_array('SalesmanCode',$Errors) ? 'class="inputerror"' : '' ) .' name="SalesmanCode" size="3" maxlength="3" /></td>
</tr>';
}
if (!isset($_POST['SalesmanName'])){
@@ -324,27 +325,27 @@
echo '<tr>
<td>' . _('Salesperson Name') . ':</td>
- <td><input type="text" '. (in_array('SalesmanName',$Errors) ? 'class="inputerror"' : '' ) .' name="SalesmanName" size=30 maxlength=30 value="' . $_POST['SalesmanName'] . '"></td>
+ <td><input type="text" '. (in_array('SalesmanName',$Errors) ? 'class="inputerror"' : '' ) .' name="SalesmanName" size="30" maxlength="30" value="' . $_POST['SalesmanName'] . '" /></td>
</tr>';
echo '<tr>
<td>' . _('Telephone No') . ':</td>
- <td><input type="text" name="SManTel" size=20 maxlength=20 ...
[truncated message content] |
|
From: <dai...@us...> - 2011-11-27 09:16:44
|
Revision: 4757
http://web-erp.svn.sourceforge.net/web-erp/?rev=4757&view=rev
Author: daintree
Date: 2011-11-27 09:16:35 +0000 (Sun, 27 Nov 2011)
Log Message:
-----------
remove DB_escape_string() calls
Modified Paths:
--------------
trunk/ConfirmDispatch_Invoice.php
trunk/CounterSales.php
trunk/Credit_Invoice.php
trunk/DeliveryDetails.php
trunk/GLJournal.php
trunk/GLTags.php
trunk/Locations.php
trunk/MRPDemandTypes.php
trunk/PcAuthorizeExpenses.php
trunk/PcClaimExpensesFromTab.php
trunk/PcExpenses.php
trunk/SalesPeople.php
trunk/SelectCreditItems.php
trunk/Shippers.php
trunk/SpecialOrder.php
trunk/StockAdjustments.php
trunk/StockLocTransferReceive.php
trunk/StockTransfers.php
trunk/Stocks.php
trunk/SupplierContacts.php
trunk/SupplierCredit.php
trunk/Suppliers.php
trunk/TaxAuthorities.php
trunk/WOSerialNos.php
trunk/WWW_Access.php
trunk/WWW_Users.php
trunk/WorkCentres.php
trunk/WorkOrderEntry.php
trunk/WorkOrderIssue.php
trunk/WorkOrderReceive.php
trunk/doc/Change.log
Modified: trunk/ConfirmDispatch_Invoice.php
===================================================================
--- trunk/ConfirmDispatch_Invoice.php 2011-11-27 02:36:47 UTC (rev 4756)
+++ trunk/ConfirmDispatch_Invoice.php 2011-11-27 09:16:35 UTC (rev 4757)
@@ -1080,7 +1080,7 @@
'" . $OrderLine->DiscountPercent . "',
'" . $OrderLine->StandardCost . "',
'" . ($QtyOnHandPrior - $OrderLine->QtyDispatched) . "',
- '" . DB_escape_string($OrderLine->Narrative) . "' )";
+ '" . $OrderLine->Narrative . "' )";
} else {
// its an assembly or dummy and assemblies/dummies always have nil stock (by definition they are made up at the time of dispatch so new qty on hand will be nil
if (empty($OrderLine->StandardCost)) {
@@ -1113,7 +1113,7 @@
'" . -$OrderLine->QtyDispatched . "',
'" . $OrderLine->DiscountPercent . "',
'" . $OrderLine->StandardCost . "',
- '" . DB_escape_string($OrderLine->Narrative) . "')";
+ '" . $OrderLine->Narrative . "')";
}
@@ -1153,7 +1153,7 @@
$SQL = "UPDATE stockserialitems SET quantity= quantity - " . $Item->BundleQty . "
WHERE stockid='" . $OrderLine->StockID . "'
AND loccode='" . $_SESSION['Items'.$identifier]->Location . "'
- AND serialno='" . DB_escape_string($Item->BundleRef) . "'";
+ AND serialno='" . $Item->BundleRef . "'";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The serial stock item record could not be updated because');
$DbgMsg = _('The following SQL to update the serial stock item record was used');
@@ -1167,7 +1167,7 @@
moveqty)
VALUES ('" . $StkMoveNo . "',
'" . $OrderLine->StockID . "',
- '" . DB_escape_string($Item->BundleRef) . "',
+ '" . $Item->BundleRef . "',
'" . -$Item->BundleQty . "')";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The serial stock movement record could not be inserted because');
Modified: trunk/CounterSales.php
===================================================================
--- trunk/CounterSales.php 2011-11-27 02:36:47 UTC (rev 4756)
+++ trunk/CounterSales.php 2011-11-27 09:16:35 UTC (rev 4757)
@@ -1031,12 +1031,12 @@
'" . $OrderNo . "',
'" . $_SESSION['Items'.$identifier]->DebtorNo . "',
'" . $_SESSION['Items'.$identifier]->Branch . "',
- '". DB_escape_string($_SESSION['Items'.$identifier]->CustRef) ."',
- '". DB_escape_string($_SESSION['Items'.$identifier]->Comments) ."',
- '" . Date("Y-m-d H:i") . "',
+ '". $_SESSION['Items'.$identifier]->CustRef ."',
+ '". $_SESSION['Items'.$identifier]->Comments ."',
+ '" . Date('Y-m-d H:i') . "',
'" . $_SESSION['Items'.$identifier]->DefaultSalesType . "',
'" . $_SESSION['Items'.$identifier]->ShipVia . "',
- '". DB_escape_string($_SESSION['Items'.$identifier]->DeliverTo) . "',
+ '". $_SESSION['Items'.$identifier]->DeliverTo . "',
'" . _('Counter Sale') . "',
'" . $_SESSION['Items'.$identifier]->PhoneNo . "',
'" . $_SESSION['Items'.$identifier]->Email . "',
@@ -1071,7 +1071,7 @@
'". $StockItem->Price . "',
'" . $StockItem->Quantity . "',
'" . floatval($StockItem->DiscountPercent) . "',
- '" . DB_escape_string($StockItem->Narrative) . "',
+ '" . $StockItem->Narrative . "',
'" . Date('Y-m-d') . "',
'" . Date('Y-m-d') . "',
'" . $StockItem->Quantity . "',
@@ -1279,13 +1279,13 @@
'" . $DefaultDispatchDate . "',
'" . date('Y-m-d H-i-s') . "',
'" . $PeriodNo . "',
- '" . DB_escape_string($_SESSION['Items'.$identifier]->CustRef) . "',
+ '" . $_SESSION['Items'.$identifier]->CustRef . "',
'" . $_SESSION['Items'.$identifier]->DefaultSalesType . "',
'" . $OrderNo . "',
'" . $_SESSION['Items'.$identifier]->total . "',
'" . filter_number_format($_POST['TaxTotal']) . "',
'" . $ExRate . "',
- '" . DB_escape_string($_SESSION['Items'.$identifier]->Comments) . "',
+ '" . $_SESSION['Items'.$identifier]->Comments . "',
'" . $_SESSION['Items'.$identifier]->ShipVia . "',
'" . ($_SESSION['Items'.$identifier]->total + filter_number_format($_POST['TaxTotal'])) . "')";
@@ -1472,7 +1472,7 @@
'" . $OrderLine->DiscountPercent . "',
'" . $OrderLine->StandardCost . "',
'" . ($QtyOnHandPrior - $OrderLine->Quantity) . "',
- '" . DB_escape_string($OrderLine->Narrative) . "' )";
+ '" . $OrderLine->Narrative . "' )";
} else {
// its an assembly or dummy and assemblies/dummies always have nil stock (by definition they are made up at the time of dispatch so new qty on hand will be nil
if (empty($OrderLine->StandardCost)) {
@@ -1505,7 +1505,7 @@
'" . -$OrderLine->Quantity . "',
'" . $OrderLine->DiscountPercent . "',
'" . $OrderLine->StandardCost . "',
- '" . DB_escape_string($OrderLine->Narrative) . "')";
+ '" . $OrderLine->Narrative . "')";
}
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('Stock movement records could not be inserted because');
Modified: trunk/Credit_Invoice.php
===================================================================
--- trunk/Credit_Invoice.php 2011-11-27 02:36:47 UTC (rev 4756)
+++ trunk/Credit_Invoice.php 2011-11-27 09:16:35 UTC (rev 4757)
@@ -572,7 +572,7 @@
'" . -$TaxTotal . "',
'" . -$_SESSION['CreditItems']->FreightCost . "',
'" . $_SESSION['CurrencyRate'] . "',
- '" . DB_escape_string($_POST['CreditText']) . "',
+ '" . $_POST['CreditText'] . "',
'" . -$Allocate_amount . "',
'" . $Settled . "')";
@@ -836,7 +836,7 @@
'" . $CreditLine->DiscountPercent . "',
'" . $CreditLine->StandardCost . "',
'" . ($QtyOnHandPrior + $CreditLine->QtyDispatched) . "',
- '" . DB_escape_string($CreditLine->Narrative) . "')";
+ '" . $CreditLine->Narrative . "')";
} else {
$SQL = "INSERT INTO stockmoves (stockid,
@@ -866,7 +866,7 @@
'" . $CreditLine->QtyDispatched . "',
'" . $CreditLine->DiscountPercent . "',
'" . $CreditLine->StandardCost . "',
- '" . DB_escape_string($CreditLine->Narrative) . "')";
+ '" . $CreditLine->Narrative . "')";
}
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('Stock movement records could not be inserted because');
@@ -882,7 +882,7 @@
$SQL = "SELECT quantity from stockserialitems
WHERE stockid='" . $CreditLine->StockID . "'
AND loccode='" . $_SESSION['CreditItems']->Location . "'
- AND serialno='" . DB_escape_string($Item->BundleRef) . "'";
+ AND serialno='" . $Item->BundleRef . "'";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The serial stock item record could not be selected because');
$DbgMsg = _('The following SQL to select the serial stock item record was used');
@@ -896,7 +896,7 @@
VALUES
('" . $CreditLine->StockID . "',
'" . $_SESSION['CreditItems']->Location . "',
- '" . DB_escape_string($Item->BundleRef) . "',
+ '" . $Item->BundleRef . "',
'". $Item->BundleQty ."')";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The serial stock item record could not be updated because');
@@ -908,7 +908,7 @@
SET quantity= quantity + " . $Item->BundleQty . "
WHERE stockid='" . $CreditLine->StockID . "'
AND loccode='" . $_SESSION['CreditItems']->Location . "'
- AND serialno='" . DB_escape_string($Item->BundleRef) . "'";
+ AND serialno='" . $Item->BundleRef . "'";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The serial stock item record could not be updated because');
$DbgMsg = _('The following SQL to update the serial stock item record was used');
$Result = DB_query($SQL, $db, $ErrMsg, $DbgMsg, true);
@@ -922,7 +922,7 @@
moveqty)
VALUES ('" . $StkMoveNo . "',
'" . $CreditLine->StockID . "',
- '" . DB_escape_string($Item->BundleRef) . "',
+ '" . $Item->BundleRef . "',
'" . $Item->BundleQty . "')";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The serial stock movement record could not be inserted because');
$DbgMsg = _('The following SQL to insert the serial stock movement records was used');
@@ -965,7 +965,7 @@
'" . $CreditLine->DiscountPercent . "',
'" . $CreditLine->StandardCost . "',
'" . ($QtyOnHandPrior + $CreditLine->QtyDispatched) . "',
- '" . DB_escape_string($CreditLine->Narrative) . "')";
+ '" . $CreditLine->Narrative . "')";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('Stock movement records could not be inserted because');
$DbgMsg = _('The following SQL to insert the stock movement records was used');
@@ -1003,7 +1003,7 @@
'" . $CreditLine->StandardCost . "',
0,
'" . $QtyOnHandPrior . "',
- '" . DB_escape_string($CreditLine->Narrative) . "')";
+ '" . $CreditLine->Narrative . "')";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('Stock movement records could not be inserted because');
$DbgMsg = _('The following SQL to insert the stock movement records was used');
@@ -1042,7 +1042,7 @@
'" . $CreditLine->StandardCost . "',
'" . $QtyOnHandPrior . "',
1,
- '" . DB_escape_string($CreditLine->Narrative) . "')";
+ '" . $CreditLine->Narrative . "')";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('Stock movement records could not be inserted because');
Modified: trunk/DeliveryDetails.php
===================================================================
--- trunk/DeliveryDetails.php 2011-11-27 02:36:47 UTC (rev 4756)
+++ trunk/DeliveryDetails.php 2011-11-27 09:16:35 UTC (rev 4757)
@@ -354,21 +354,21 @@
'". $OrderNo . "',
'" . $_SESSION['Items'.$identifier]->DebtorNo . "',
'" . $_SESSION['Items'.$identifier]->Branch . "',
- '". DB_escape_string($_SESSION['Items'.$identifier]->CustRef) ."',
- '". DB_escape_string($_SESSION['Items'.$identifier]->Comments) ."',
+ '". $_SESSION['Items'.$identifier]->CustRef ."',
+ '". $_SESSION['Items'.$identifier]->Comments ."',
'" . Date('Y-m-d H:i') . "',
'" . $_SESSION['Items'.$identifier]->DefaultSalesType . "',
- '" . DB_escape_string($_POST['ShipVia']) ."',
- '". DB_escape_string($_SESSION['Items'.$identifier]->DeliverTo) . "',
- '" . DB_escape_string($_SESSION['Items'.$identifier]->BuyerName) . "',
- '" . DB_escape_string($_SESSION['Items'.$identifier]->DelAdd1) . "',
- '" . DB_escape_string($_SESSION['Items'.$identifier]->DelAdd2) . "',
- '" . DB_escape_string($_SESSION['Items'.$identifier]->DelAdd3) . "',
- '" . DB_escape_string($_SESSION['Items'.$identifier]->DelAdd4) . "',
- '" . DB_escape_string($_SESSION['Items'.$identifier]->DelAdd5) . "',
- '" . DB_escape_string($_SESSION['Items'.$identifier]->DelAdd6) . "',
- '" . DB_escape_string($_SESSION['Items'.$identifier]->PhoneNo) . "',
- '" . DB_escape_string($_SESSION['Items'.$identifier]->Email) . "',
+ '" . $_POST['ShipVia'] ."',
+ '". $_SESSION['Items'.$identifier]->DeliverTo . "',
+ '" . $_SESSION['Items'.$identifier]->BuyerName . "',
+ '" . $_SESSION['Items'.$identifier]->DelAdd1 . "',
+ '" . $_SESSION['Items'.$identifier]->DelAdd2 . "',
+ '" . $_SESSION['Items'.$identifier]->DelAdd3 . "',
+ '" . $_SESSION['Items'.$identifier]->DelAdd4 . "',
+ '" . $_SESSION['Items'.$identifier]->DelAdd5 . "',
+ '" . $_SESSION['Items'.$identifier]->DelAdd6 . "',
+ '" . $_SESSION['Items'.$identifier]->PhoneNo . "',
+ '" . $_SESSION['Items'.$identifier]->Email . "',
'" . $_SESSION['Items'.$identifier]->FreightCost ."',
'" . $_SESSION['Items'.$identifier]->Location ."',
'" . $DelDate . "',
@@ -403,7 +403,7 @@
'" . $StockItem->Price . "',
'" . $StockItem->Quantity . "',
'" . floatval($StockItem->DiscountPercent) . "',
- '" . DB_escape_string($StockItem->Narrative) . "',
+ '" . $StockItem->Narrative . "',
'" . $StockItem->POLine . "',
'" . FormatDateForSQL($StockItem->ItemDue) . "'
)";
@@ -712,23 +712,23 @@
$HeaderSQL = "UPDATE salesorders SET debtorno = '" . $_SESSION['Items'.$identifier]->DebtorNo . "',
branchcode = '" . $_SESSION['Items'.$identifier]->Branch . "',
- customerref = '". DB_escape_string($_SESSION['Items'.$identifier]->CustRef) ."',
- comments = '". DB_escape_string($_SESSION['Items'.$identifier]->Comments) ."',
+ customerref = '". $_SESSION['Items'.$identifier]->CustRef ."',
+ comments = '". $_SESSION['Items'.$identifier]->Comments ."',
ordertype = '" . $_SESSION['Items'.$identifier]->DefaultSalesType . "',
shipvia = '" . $_POST['ShipVia'] . "',
- deliverydate = '" . FormatDateForSQL(DB_escape_string($_SESSION['Items'.$identifier]->DeliveryDate)) . "',
- quotedate = '" . FormatDateForSQL(DB_escape_string($_SESSION['Items'.$identifier]->QuoteDate)) . "',
- confirmeddate = '" . FormatDateForSQL(DB_escape_string($_SESSION['Items'.$identifier]->ConfirmedDate)) . "',
- deliverto = '" . DB_escape_string($_SESSION['Items'.$identifier]->DeliverTo) . "',
- buyername = '" . DB_escape_string($_SESSION['Items'.$identifier]->BuyerName) . "',
- deladd1 = '" . DB_escape_string($_SESSION['Items'.$identifier]->DelAdd1) . "',
- deladd2 = '" . DB_escape_string($_SESSION['Items'.$identifier]->DelAdd2) . "',
- deladd3 = '" . DB_escape_string($_SESSION['Items'.$identifier]->DelAdd3) . "',
- deladd4 = '" . DB_escape_string($_SESSION['Items'.$identifier]->DelAdd4) . "',
- deladd5 = '" . DB_escape_string($_SESSION['Items'.$identifier]->DelAdd5) . "',
- deladd6 = '" . DB_escape_string($_SESSION['Items'.$identifier]->DelAdd6) . "',
- contactphone = '" . DB_escape_string($_SESSION['Items'.$identifier]->PhoneNo) . "',
- contactemail = '" . DB_escape_string($_SESSION['Items'.$identifier]->Email) . "',
+ deliverydate = '" . FormatDateForSQL($_SESSION['Items'.$identifier]->DeliveryDate) . "',
+ quotedate = '" . FormatDateForSQL($_SESSION['Items'.$identifier]->QuoteDate) . "',
+ confirmeddate = '" . FormatDateForSQL($_SESSION['Items'.$identifier]->ConfirmedDate) . "',
+ deliverto = '" . $_SESSION['Items'.$identifier]->DeliverTo . "',
+ buyername = '" . $_SESSION['Items'.$identifier]->BuyerName . "',
+ deladd1 = '" . $_SESSION['Items'.$identifier]->DelAdd1 . "',
+ deladd2 = '" . $_SESSION['Items'.$identifier]->DelAdd2 . "',
+ deladd3 = '" . $_SESSION['Items'.$identifier]->DelAdd3 . "',
+ deladd4 = '" . $_SESSION['Items'.$identifier]->DelAdd4 . "',
+ deladd5 = '" . $_SESSION['Items'.$identifier]->DelAdd5 . "',
+ deladd6 = '" . $_SESSION['Items'.$identifier]->DelAdd6 . "',
+ contactphone = '" . $_SESSION['Items'.$identifier]->PhoneNo . "',
+ contactemail = '" . $_SESSION['Items'.$identifier]->Email . "',
freightcost = '" . $_SESSION['Items'.$identifier]->FreightCost ."',
fromstkloc = '" . $_SESSION['Items'.$identifier]->Location ."',
printedpackingslip = '" . $_POST['ReprintPackingSlip'] . "',
Modified: trunk/GLJournal.php
===================================================================
--- trunk/GLJournal.php 2011-11-27 02:36:47 UTC (rev 4756)
+++ trunk/GLJournal.php 2011-11-27 09:16:35 UTC (rev 4757)
@@ -76,7 +76,7 @@
'" . FormatDateForSQL($_SESSION['JournalDetail']->JnlDate) . "',
'" . $PeriodNo . "',
'" . $JournalItem->GLCode . "',
- '" . DB_escape_string($JournalItem->Narrative) . "',
+ '" . $JournalItem->Narrative . "',
'" . $JournalItem->Amount . "',
'" . $JournalItem->tag."'
)";
@@ -98,7 +98,7 @@
'" . FormatDateForSQL($_SESSION['JournalDetail']->JnlDate) . "',
'" . ($PeriodNo + 1) . "',
'" . $JournalItem->GLCode . "',
- '" . _('Reversal') . " - " . DB_escape_string($JournalItem->Narrative) . "',
+ '" . _('Reversal') . " - " . $JournalItem->Narrative . "',
'" . -($JournalItem->Amount) ."',
'".$JournalItem->tag."'
)";
@@ -111,7 +111,7 @@
$ErrMsg = _('Cannot commit the changes');
- $result= DB_Txn_Begin($db);
+ $result= DB_Txn_Commit($db);
prnMsg(_('Journal').' ' . $TransNo . ' '._('has been successfully entered'),'success');
Modified: trunk/GLTags.php
===================================================================
--- trunk/GLTags.php 2011-11-27 02:36:47 UTC (rev 4756)
+++ trunk/GLTags.php 2011-11-27 09:16:35 UTC (rev 4757)
@@ -37,12 +37,12 @@
}
if (isset($_POST['submit'])) {
- $sql = "INSERT INTO tags values(NULL, '" . DB_escape_string($_POST['Description']) . "')";
+ $sql = "INSERT INTO tags values(NULL, '" . $_POST['Description'] . "')";
$result= DB_query($sql,$db);
}
if (isset($_POST['update'])) {
- $sql = "UPDATE tags SET tagdescription='".DB_escape_string($_POST['Description']). "'
+ $sql = "UPDATE tags SET tagdescription='" . $_POST['Description'] . "'
WHERE tagref='".$_POST['reference']."'";
$result= DB_query($sql,$db);
}
Modified: trunk/Locations.php
===================================================================
--- trunk/Locations.php 2011-11-27 02:36:47 UTC (rev 4756)
+++ trunk/Locations.php 2011-11-27 09:16:35 UTC (rev 4757)
@@ -55,17 +55,17 @@
}
$sql = "UPDATE locations SET loccode='" . $_POST['LocCode'] . "',
- locationname='" . DB_escape_string($_POST['LocationName']) . "',
- deladd1='" . DB_escape_string($_POST['DelAdd1']) . "',
- deladd2='" . DB_escape_string($_POST['DelAdd2']) . "',
- deladd3='" . DB_escape_string($_POST['DelAdd3']) . "',
- deladd4='" . DB_escape_string($_POST['DelAdd4']) . "',
- deladd5='" . DB_escape_string($_POST['DelAdd5']) . "',
- deladd6='" . DB_escape_string($_POST['DelAdd6']) . "',
- tel='" . DB_escape_string($_POST['Tel']) . "',
- fax='" . DB_escape_string($_POST['Fax']) . "',
- email='" . DB_escape_string($_POST['Email']) . "',
- contact='" . DB_escape_string($_POST['Contact']) . "',
+ locationname='" . $_POST['LocationName'] . "',
+ deladd1='" . $_POST['DelAdd1'] . "',
+ deladd2='" . $_POST['DelAdd2'] . "',
+ deladd3='" . $_POST['DelAdd3'] . "',
+ deladd4='" . $_POST['DelAdd4'] . "',
+ deladd5='" . $_POST['DelAdd5'] . "',
+ deladd6='" . $_POST['DelAdd6'] . "',
+ tel='" . $_POST['Tel'] . "',
+ fax='" . $_POST['Fax'] . "',
+ email='" . $_POST['Email'] . "',
+ contact='" . $_POST['Contact'] . "',
taxprovinceid = '" . $_POST['TaxProvince'] . "',
cashsalecustomer ='" . $_POST['CashSaleCustomer'] . "',
cashsalebranch ='" . $_POST['CashSaleBranch'] . "',
@@ -124,18 +124,18 @@
cashsalecustomer,
cashsalebranch,
managed )
- VALUES ('" . DB_escape_string($_POST['LocCode']) . "',
- '" . DB_escape_string($_POST['LocationName']) . "',
- '" . DB_escape_string($_POST['DelAdd1']) ."',
- '" . DB_escape_string($_POST['DelAdd2']) ."',
- '" . DB_escape_string($_POST['DelAdd3']) . "',
- '" . DB_escape_string($_POST['DelAdd4']) . "',
- '" . DB_escape_string($_POST['DelAdd5']) . "',
- '" . DB_escape_string($_POST['DelAdd6']) . "',
- '" . DB_escape_string($_POST['Tel']) . "',
- '" . DB_escape_string($_POST['Fax']) . "',
- '" . DB_escape_string($_POST['Email']) . "',
- '" . DB_escape_string($_POST['Contact']) . "',
+ VALUES ('" . $_POST['LocCode'] . "',
+ '" . $_POST['LocationName'] . "',
+ '" . $_POST['DelAdd1'] ."',
+ '" . $_POST['DelAdd2'] ."',
+ '" . $_POST['DelAdd3'] . "',
+ '" . $_POST['DelAdd4'] . "',
+ '" . $_POST['DelAdd5'] . "',
+ '" . $_POST['DelAdd6'] . "',
+ '" . $_POST['Tel'] . "',
+ '" . $_POST['Fax'] . "',
+ '" . $_POST['Email'] . "',
+ '" . $_POST['Contact'] . "',
'" . $_POST['TaxProvince'] . "',
'" . $_POST['CashSaleCustomer'] . "',
'" . $_POST['CashSaleBranch'] . "',
Modified: trunk/MRPDemandTypes.php
===================================================================
--- trunk/MRPDemandTypes.php 2011-11-27 02:36:47 UTC (rev 4756)
+++ trunk/MRPDemandTypes.php 2011-11-27 09:16:35 UTC (rev 4757)
@@ -58,7 +58,7 @@
$sql = "INSERT INTO mrpdemandtypes (mrpdemandtype,
description)
VALUES ('" . trim(mb_strtoupper($_POST['MRPDemandType'])) . "',
- '" . DB_escape_string($_POST['Description']) . "'
+ '" . $_POST['Description'] . "'
)";
$msg = _('The new demand type has been added to the database');
}
Modified: trunk/PcAuthorizeExpenses.php
===================================================================
--- trunk/PcAuthorizeExpenses.php 2011-11-27 02:36:47 UTC (rev 4756)
+++ trunk/PcAuthorizeExpenses.php 2011-11-27 09:16:35 UTC (rev 4757)
@@ -135,7 +135,7 @@
$typeno = GetNextTransNo($type,$db);
//build narrative
- $narrative= _('PettyCash') . ' - '.$myrow['tabcode'] . ' - ' . $myrow['codeexpense'] . ' - ' . $myrow['notes'] . ' - ' . $myrow['receipt'];
+ $Narrative= _('PettyCash') . ' - '. $myrow['tabcode'] . ' - ' . $myrow['codeexpense'] . ' - ' . DB_escape_string($myrow['notes']) . ' - ' . $myrow['receipt'];
//insert to gltrans
DB_Txn_Begin($db);
@@ -158,7 +158,7 @@
'".$myrow['date']."',
'".$PeriodNo."',
'".$AccountFrom."',
- '". DB_escape_string($narrative) ."',
+ '". $Narrative ."',
'".-$Amount."',
0,
'',
@@ -185,7 +185,7 @@
'".$myrow['date']."',
'".$PeriodNo."',
'".$AccountTo."',
- '" . DB_escape_string($narrative) . "',
+ '" . $Narrative . "',
'".$Amount."',
0,
'',
@@ -209,7 +209,7 @@
VALUES ('". $ReceiptTransNo . "',
1,
'" . $AccountFrom . "',
- '" . DB_escape_string($narrative) . "',
+ '" . $Narrative . "',
1,
'" . $myrow['rate'] . "',
'" . $myrow['date'] . "',
Modified: trunk/PcClaimExpensesFromTab.php
===================================================================
--- trunk/PcClaimExpensesFromTab.php 2011-11-27 02:36:47 UTC (rev 4756)
+++ trunk/PcClaimExpensesFromTab.php 2011-11-27 09:16:35 UTC (rev 4757)
@@ -72,8 +72,8 @@
SET date = '".FormatDateForSQL($_POST['Date'])."',
codeexpense = '" . $_POST['SelectedExpense'] . "',
amount = '" .-filter_number_format($_POST['amount']) . "',
- notes = '" . DB_escape_string($_POST['Notes']) . "',
- receipt = '" . DB_escape_string($_POST['Receipt']) . "'
+ notes = '" . $_POST['Notes'] . "',
+ receipt = '" . $_POST['Receipt'] . "'
WHERE counterindex = '".$SelectedIndex."'";
$msg = _('The Expense Claim on Tab') . ' ' . $SelectedTabs . ' ' . _('has been updated');
@@ -98,8 +98,8 @@
'" . -filter_number_format($_POST['amount']) . "',
'',
'',
- '" . DB_escape_string($_POST['Notes']) . "',
- '" . DB_escape_string($_POST['Receipt']) . "'
+ '" . $_POST['Notes'] . "',
+ '" . $_POST['Receipt'] . "'
)";
$msg = _('The Expense Claim on Tab') . ' ' . $_POST['SelectedTabs'] . ' ' . _('has been created');
Modified: trunk/PcExpenses.php
===================================================================
--- trunk/PcExpenses.php 2011-11-27 02:36:47 UTC (rev 4756)
+++ trunk/PcExpenses.php 2011-11-27 09:16:35 UTC (rev 4757)
@@ -87,7 +87,7 @@
if (isset($SelectedExpense) AND $InputError !=1) {
$sql = "UPDATE pcexpenses
- SET description = '" . DB_escape_string($_POST['Description']) . "',
+ SET description = '" . $_POST['Description'] . "',
glaccount = '" . $_POST['GLAccount'] . "',
tag = '" . $_POST['Tag'] . "'
WHERE codeexpense = '" . $SelectedExpense . "'";
@@ -117,7 +117,7 @@
glaccount,
tag)
VALUES ('" . $_POST['CodeExpense'] . "',
- '" . DB_escape_string($_POST['Description']) . "',
+ '" . $_POST['Description'] . "',
'" . $_POST['GLAccount'] . "',
'" . $_POST['Tag'] . "')";
Modified: trunk/SalesPeople.php
===================================================================
--- trunk/SalesPeople.php 2011-11-27 02:36:47 UTC (rev 4756)
+++ trunk/SalesPeople.php 2011-11-27 09:16:35 UTC (rev 4757)
@@ -85,10 +85,10 @@
/*SelectedSalesPerson could also exist if submit had not been clicked this code would not run in this case cos submit is false of course see the delete code below*/
- $sql = "UPDATE salesman SET salesmanname='" . DB_escape_string($_POST['SalesmanName']) . "',
+ $sql = "UPDATE salesman SET salesmanname='" . $_POST['SalesmanName'] . "',
commissionrate1='" . filter_number_format($_POST['CommissionRate1']) . "',
- smantel='" . DB_escape_string($_POST['SManTel']) . "',
- smanfax='" . DB_escape_string($_POST['SManFax']) . "',
+ smantel='" . $_POST['SManTel'] . "',
+ smanfax='" . $_POST['SManFax'] . "',
breakpoint='" . filter_number_format($_POST['Breakpoint']) . "',
commissionrate2='" . filter_number_format($_POST['CommissionRate2']) . "',
current='" . $_POST['Current'] . "'
@@ -107,13 +107,13 @@
smantel,
smanfax,
current)
- VALUES ('" . DB_escape_string($_POST['SalesmanCode']) . "',
- '" . DB_escape_string($_POST['SalesmanName']) . "',
+ VALUES ('" . $_POST['SalesmanCode'] . "',
+ '" . $_POST['SalesmanName'] . "',
'" . filter_number_format($_POST['CommissionRate1']) . "',
'" . filter_number_format($_POST['CommissionRate2']) . "',
'" . filter_number_format($_POST['Breakpoint']) . "',
- '" . DB_escape_string($_POST['SManTel']) . "',
- '" . DB_escape_string($_POST['SManFax']) . "',
+ '" . $_POST['SManTel'] . "',
+ '" . $_POST['SManFax'] . "',
'" . $_POST['Current'] . "'
)";
@@ -280,7 +280,7 @@
$_POST['SManTel'] = $myrow['smantel'];
$_POST['SManFax'] = $myrow['smanfax'];
$_POST['CommissionRate1'] = locale_number_format($myrow['commissionrate1'],'Variable');
- $_POST['Breakpoint'] = locale_number_format($myrow['breakpoint'],'Variable');
+ $_POST['Breakpoint'] = locale_number_format($myrow['breakpoint'],$_SESSION['CompanyRecord']['decimalplaces']);
$_POST['CommissionRate2'] = locale_number_format($myrow['commissionrate2'],'Variable');
$_POST['Current'] = $myrow['current'];
@@ -290,14 +290,15 @@
echo '<table class="selection">
<tr>
<td>' . _('Salesperson code') . ':</td>
- <td>' . $_POST['SalesmanCode'] . '</td></tr>';
+ <td>' . $_POST['SalesmanCode'] . '</td>
+ </tr>';
} else { //end of if $SelectedSalesPerson only do the else when a new record is being entered
echo '<table class="selection">
<tr>
<td>' . _('Salesperson code') . ':</td>
- <td><input type="text" '. (in_array('SalesmanCode',$Errors) ? 'class="inputerror"' : '' ) .' name="SalesmanCode" size=3 maxlength=3></td>
+ <td><input type="text" '. (in_array('SalesmanCode',$Errors) ? 'class="inputerror"' : '' ) .' name="SalesmanCode" size="3" maxlength="3" /></td>
</tr>';
}
if (!isset($_POST['SalesmanName'])){
@@ -324,27 +325,27 @@
echo '<tr>
<td>' . _('Salesperson Name') . ':</td>
- <td><input type="text" '. (in_array('SalesmanName',$Errors) ? 'class="inputerror"' : '' ) .' name="SalesmanName" size=30 maxlength=30 value="' . $_POST['SalesmanName'] . '"></td>
+ <td><input type="text" '. (in_array('SalesmanName',$Errors) ? 'class="inputerror"' : '' ) .' name="SalesmanName" size="30" maxlength="30" value="' . $_POST['SalesmanName'] . '" /></td>
</tr>';
echo '<tr>
<td>' . _('Telephone No') . ':</td>
- <td><input type="text" name="SManTel" size=20 maxlength=20 ...
[truncated message content] |
|
From: <dai...@us...> - 2011-11-28 09:44:32
|
Revision: 4758
http://web-erp.svn.sourceforge.net/web-erp/?rev=4758&view=rev
Author: daintree
Date: 2011-11-28 09:44:22 +0000 (Mon, 28 Nov 2011)
Log Message:
-----------
fixes to Special Orders and status comments
Modified Paths:
--------------
trunk/PO_Header.php
trunk/PO_Items.php
trunk/PO_PDFPurchOrder.php
trunk/PO_SelectOSPurchOrder.php
trunk/SpecialOrder.php
trunk/includes/PO_ReadInOrder.inc
Modified: trunk/PO_Header.php
===================================================================
--- trunk/PO_Header.php 2011-11-27 09:16:35 UTC (rev 4757)
+++ trunk/PO_Header.php 2011-11-28 09:44:22 UTC (rev 4758)
@@ -152,7 +152,7 @@
}
$SQL = "UPDATE purchorders SET status='" . $_POST['Status']. "',
stat_comment='" . $_SESSION['PO'.$identifier]->StatusComments ."',
- allowprint='".$AllowPrint."'
+ allowprint='" . $AllowPrint . "'
WHERE purchorders.orderno ='" . $_SESSION['ExistingOrder'] ."'";
$ErrMsg = _('The order status could not be updated because');
@@ -161,7 +161,6 @@
} //end if there is actually a status change the class Status != the POST['Status']
}
-/*New order initiated by user clicking on supplier purchasing data from items page */
if (isset($_GET['NewOrder'])
AND isset($_GET['StockID'])
AND isset($_GET['SelectedSupplier'])) {
@@ -179,7 +178,7 @@
$_SESSION['PO'.$identifier]->GLLink = $_SESSION['CompanyRecord']['gllink_stock'];
/* set the SupplierID we got */
$_SESSION['PO'.$identifier]->SupplierID = $_GET['SelectedSupplier'];
- $_SESSION['PO'.$identifier]->DeliveryDate = DateAdd(date($_SESSION['DefaultDateFormat']), 'd', $_GET['LeadTime']);
+ $_SESSION['PO'.$identifier]->DeliveryDate = date($_SESSION['DefaultDateFormat']);
$_SESSION['RequireSupplierSelection'] = 0;
$_POST['Select'] = $_GET['SelectedSupplier'];
@@ -732,7 +731,7 @@
if (isset($_GET['ModifyOrderNumber']) AND $_GET['ModifyOrderNumber'] != '') {
$_SESSION['PO'.$identifier]->Version += 1;
$_POST['Version'] = $_SESSION['PO'.$identifier]->Version;
- } elseif (isset($_SESSION['PO'.$identifier]->Version) and $_SESSION['PO'.$identifier]->Version != '') {
+ } elseif (isset($_SESSION['PO'.$identifier]->Version) AND $_SESSION['PO'.$identifier]->Version != '') {
$_POST['Version'] = $_SESSION['PO'.$identifier]->Version;
} else {
$_POST['Version']='1';
@@ -762,7 +761,9 @@
<td><input type="text" name="Requisition" size="16" maxlength="15" value="' . $_POST['Requisition'] . '" /></td></tr>';
echo '<tr><td>' . _('Date Printed') . ':</td><td>';
- if (isset($_SESSION['PO'.$identifier]->DatePurchaseOrderPrinted) AND mb_strlen($_SESSION['PO'.$identifier]->DatePurchaseOrderPrinted)>6){
+ if (isset($_SESSION['PO'.$identifier]->DatePurchaseOrderPrinted)
+ AND mb_strlen($_SESSION['PO'.$identifier]->DatePurchaseOrderPrinted)>6){
+
echo ConvertSQLDate($_SESSION['PO'.$identifier]->DatePurchaseOrderPrinted);
$Printed = True;
} else {
Modified: trunk/PO_Items.php
===================================================================
--- trunk/PO_Items.php 2011-11-27 09:16:35 UTC (rev 4757)
+++ trunk/PO_Items.php 2011-11-28 09:44:22 UTC (rev 4758)
@@ -94,7 +94,7 @@
$AuthRow=DB_fetch_array($AuthResult);
if (DB_num_rows($AuthResult) > 0 AND $AuthRow['authlevel'] > $_SESSION['PO'.$identifier]->Order_Value()) { //user has authority to authrorise as well as create the order
- $StatusComment=date($_SESSION['DefaultDateFormat']).' - ' . _('Order Created and Authorised by') . $UserDetails . '<br />'.$_SESSION['PO'.$identifier]->StatusComments.'<br />';
+ $StatusComment=date($_SESSION['DefaultDateFormat']).' - ' . _('Order Created and Authorised by') . $UserDetails . '<br />'. $_SESSION['PO'.$identifier]->StatusComments.'<br />';
$_SESSION['PO'.$identifier]->AllowPrintPO=1;
$_SESSION['PO'.$identifier]->Status = 'Authorised';
} else { // no authority to authorise this order
@@ -111,7 +111,7 @@
_('The order will be created with a status of pending and will require authorisation'), 'warn');
$_SESSION['PO'.$identifier]->AllowPrintPO=0;
- $StatusComment=date($_SESSION['DefaultDateFormat']).' - ' . _('Order Created by') . $UserDetails . '<br />'.$_SESSION['PO'.$identifier]->StatusComments.'<br />';
+ $StatusComment=date($_SESSION['DefaultDateFormat']).' - ' . _('Order Created by') . $UserDetails . '<br />' . $_SESSION['PO'.$identifier]->StatusComments.'<br />';
$_SESSION['PO'.$identifier]->Status = 'Pending';
}
} else { //auto authorise is set to off
@@ -186,7 +186,7 @@
'" . Date('Y-m-d') . "',
'" . $_SESSION['PO'.$identifier]->DeliveryBy . "',
'" . $_SESSION['PO'.$identifier]->Status . "',
- '" . $StatusComment . "',
+ '" . htmlentities($StatusComment,ENT_QUOTES,'UTF-8') . "',
'" . FormatDateForSQL($_SESSION['PO'.$identifier]->DeliveryDate) . "',
'" . $_SESSION['PO'.$identifier]->PaymentTerms. "',
'" . $_SESSION['PO'.$identifier]->AllowPrintPO . "' )";
@@ -244,12 +244,9 @@
}
if ($Completed){
$_SESSION['PO'.$identifier]->Status = 'Completed';
- if (IsEmailAddress($_SESSION['UserEmail'])){
- $UserChangedStatus = ' <a href="mailto:' . $_SESSION['UserEmail'] . '">' . $_SESSION['UsersRealName']. '</a>';
- } else {
- $UserChangedStatus = ' ' . $_SESSION['UsersRealName'] . ' ';
- }
- $_SESSION['PO'.$identifier]->StatusComments = date($_SESSION['DefaultDateFormat']).' - ' . _('Order completed by') . $UserChangedStatus . '<br />' .$_SESSION['PO'.$identifier]->StatusComments;
+ $_SESSION['PO'.$identifier]->StatusComments = date($_SESSION['DefaultDateFormat']).' - ' . _('Order completed by') . $UserDetails . '<br />' . $_SESSION['PO'.$identifier]->StatusComments;
+ } else {
+ $_SESSION['PO'.$identifier]->StatusComments = date($_SESSION['DefaultDateFormat']).' - ' . _('Order modified by') . $UserDetails . '<br />' . $_SESSION['PO'.$identifier]->StatusComments;
}
/*Update the purchase order header with any changes */
@@ -282,7 +279,7 @@
paymentterms='" . $_SESSION['PO'.$identifier]->PaymentTerms . "',
allowprint='" . $_SESSION['PO'.$identifier]->AllowPrintPO . "',
status = '" . $_SESSION['PO'.$identifier]->Status . "',
- stat_comment = '" . $_SESSION['PO'.$identifier]->StatusComments . "'
+ stat_comment = '" . htmlentities($_SESSION['PO'.$identifier]->StatusComments,ENT_QUOTES,'UTF-8') . "'
WHERE orderno = '" . $_SESSION['PO'.$identifier]->OrderNo ."'";
$ErrMsg = _('The purchase order could not be updated because');
@@ -375,6 +372,7 @@
if ($_SESSION['PO'.$identifier]->AllowPrintPO==1
AND ($_SESSION['PO'.$identifier]->Status=='Authorised'
OR $_SESSION['PO'.$identifier]->Status=='Printed')){
+
echo '<br /><a target="_blank" href="'.$rootpath.'/PO_PDFPurchOrder.php?OrderNo=' . $_SESSION['PO'.$identifier]->OrderNo . '">' . _('Print Purchase Order') . '</a>';
}
} /*end of if its a new order or an existing one */
Modified: trunk/PO_PDFPurchOrder.php
===================================================================
--- trunk/PO_PDFPurchOrder.php 2011-11-27 09:16:35 UTC (rev 4757)
+++ trunk/PO_PDFPurchOrder.php 2011-11-28 09:44:22 UTC (rev 4758)
@@ -125,7 +125,9 @@
$POHeader = DB_fetch_array($result);
- if ($POHeader['status'] != 'Authorised' AND $POHeader['status'] != 'Printed') {
+ if ($POHeader['status'] != 'Authorised'
+ AND $POHeader['status'] != 'Printed') {
+
include('includes/header.inc');
prnMsg( _('Purchase orders can only be printed once they have been authorised') . '. ' . _('This order is currently at a status of') . ' ' . _($POHeader['status']),'warn');
include('includes/footer.inc');
@@ -333,12 +335,12 @@
}
}
if ($ViewingOnly==0 AND $Success==1) {
- $StatusComment = date($_SESSION['DefaultDateFormat']) .' - ' . _('Printed by') . '<a href="mailto:'.$_SESSION['UserEmail'] .'">'.$_SESSION['UsersRealName']. '</a><br />' . $POHeader['stat_comment'];
+ $StatusComment = date($_SESSION['DefaultDateFormat']) .' - ' . _('Printed by') . ' <a href="mailto:'.$_SESSION['UserEmail'] .'">'.$_SESSION['UsersRealName']. '</a><br />' . html_entity_decode($POHeader['stat_comment'],ENT_QUOTES,'UTF-8');
$sql = "UPDATE purchorders SET allowprint = 0,
dateprinted = '" . Date('Y-m-d') . "',
status = 'Printed',
- stat_comment = '" . DB_escape_string($StatusComment) . "'
+ stat_comment = '" . htmlentities($StatusComment,ENT_QUOTES,'UTF-8') . "'
WHERE purchorders.orderno = '" . $OrderNo ."'";
$result = DB_query($sql,$db);
}
Modified: trunk/PO_SelectOSPurchOrder.php
===================================================================
--- trunk/PO_SelectOSPurchOrder.php 2011-11-27 09:16:35 UTC (rev 4757)
+++ trunk/PO_SelectOSPurchOrder.php 2011-11-28 09:44:22 UTC (rev 4758)
@@ -293,29 +293,33 @@
if (isset($OrderNumber) AND $OrderNumber !='') {
$SQL = "SELECT purchorders.orderno,
- suppliers.suppname,
- purchorders.orddate,
- purchorders.deliverydate,
- purchorders.initiator,
- purchorders.status,
- purchorders.requisitionno,
- purchorders.allowprint,
- suppliers.currcode,
- SUM(purchorderdetails.unitprice*purchorderdetails.quantityord) AS ordervalue
- FROM purchorders INNER JOIN purchorderdetails
- ON purchorders.orderno=purchorderdetails.orderno
- INNER JOIN suppliers
- ON purchorders.supplierno = suppliers.supplierid
- WHERE purchorderdetails.completed=0
- AND purchorders.orderno='". $OrderNumber ."'
- GROUP BY purchorders.orderno ASC,
- suppliers.suppname,
- purchorders.orddate,
- purchorders.status,
- purchorders.initiator,
- purchorders.requisitionno,
- purchorders.allowprint,
- suppliers.currcode";
+ purchorders.realorderno,
+ suppliers.suppname,
+ purchorders.orddate,
+ purchorders.deliverydate,
+ purchorders.initiator,
+ purchorders.status,
+ purchorders.requisitionno,
+ purchorders.allowprint,
+ suppliers.currcode,
+ currencies.decimalplaces AS currdecimalplaces,
+ SUM(purchorderdetails.unitprice*purchorderdetails.quantityord) AS ordervalue
+ FROM purchorders INNER JOIN purchorderdetails
+ ON purchorders.orderno=purchorderdetails.orderno
+ INNER JOIN suppliers
+ ON purchorders.supplierno = suppliers.supplierid
+ INNER JOIN currencies
+ ON suppliers.currcode=currencies.currabrev
+ WHERE purchorderdetails.completed=0
+ AND purchorders.orderno='". $OrderNumber ."'
+ GROUP BY purchorders.orderno ASC,
+ suppliers.suppname,
+ purchorders.orddate,
+ purchorders.status,
+ purchorders.initiator,
+ purchorders.requisitionno,
+ purchorders.allowprint,
+ suppliers.currcode";
} else {
/* $DateAfterCriteria = FormatDateforSQL($OrdersAfterDate); */
Modified: trunk/SpecialOrder.php
===================================================================
--- trunk/SpecialOrder.php 2011-11-27 09:16:35 UTC (rev 4757)
+++ trunk/SpecialOrder.php 2011-11-28 09:44:22 UTC (rev 4758)
@@ -302,7 +302,8 @@
$AuthResult=DB_query($AuthSQL,$db);
$AuthRow=DB_fetch_array($AuthResult);
- if (DB_num_rows($AuthResult) > 0 AND $AuthRow['authlevel'] > $_SESSION['SPL']->Order_Value()) { //user has authority to authrorise as well as create the order
+ if (DB_num_rows($AuthResult) > 0
+ AND $AuthRow['authlevel'] > $_SESSION['SPL']->Order_Value()) { //user has authority to authrorise as well as create the order
$StatusComment=date($_SESSION['DefaultDateFormat']).' - ' . _('Order Created and Authorised by') . $UserDetails . '<br />';
$_SESSION['SPL']->AllowPrintPO=1;
$_SESSION['SPL']->Status = 'Authorised';
@@ -373,7 +374,7 @@
'" . DB_escape_string($StkLocAddress['deladd6']) . "',
'" . DB_escape_string($StkLocAddress['contact']) . "',
'" . $_SESSION['SPL']->Status . "',
- '" . $StatusComment . "',
+ '" . htmlentities($StatusComment, ENT_QUOTES,'UTF-8') . "',
'" . $_SESSION['SPL']->AllowPrintPO . "',
'" . Date('Y-m-d') . "',
'" . Date('Y-m-d') . "')";
Modified: trunk/includes/PO_ReadInOrder.inc
===================================================================
--- trunk/includes/PO_ReadInOrder.inc 2011-11-27 09:16:35 UTC (rev 4757)
+++ trunk/includes/PO_ReadInOrder.inc 2011-11-28 09:44:22 UTC (rev 4758)
@@ -96,7 +96,7 @@
$_SESSION['PO'.$identifier]->Version = $myrow['version'];
$_SESSION['PO'.$identifier]->Port = $myrow['port'];
$_SESSION['PO'.$identifier]->Status = $myrow['status'];
- $_SESSION['PO'.$identifier]->StatusComments = $myrow['stat_comment'];
+ $_SESSION['PO'.$identifier]->StatusComments = html_entity_decode($myrow['stat_comment'],ENT_QUOTES,'UTF-8');
$_SESSION['PO'.$identifier]->DeliveryDate = ConvertSQLDate($myrow['deliverydate']);
$_SESSION['ExistingOrder'] = $_SESSION['PO'.$identifier]->OrderNo;
$_SESSION['PO'.$identifier]->PaymentTerms= $myrow['paymentterms'];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-11-28 09:44:34
|
Revision: 4758
http://web-erp.svn.sourceforge.net/web-erp/?rev=4758&view=rev
Author: daintree
Date: 2011-11-28 09:44:22 +0000 (Mon, 28 Nov 2011)
Log Message:
-----------
fixes to Special Orders and status comments
Modified Paths:
--------------
trunk/PO_Header.php
trunk/PO_Items.php
trunk/PO_PDFPurchOrder.php
trunk/PO_SelectOSPurchOrder.php
trunk/SpecialOrder.php
trunk/includes/PO_ReadInOrder.inc
Modified: trunk/PO_Header.php
===================================================================
--- trunk/PO_Header.php 2011-11-27 09:16:35 UTC (rev 4757)
+++ trunk/PO_Header.php 2011-11-28 09:44:22 UTC (rev 4758)
@@ -152,7 +152,7 @@
}
$SQL = "UPDATE purchorders SET status='" . $_POST['Status']. "',
stat_comment='" . $_SESSION['PO'.$identifier]->StatusComments ."',
- allowprint='".$AllowPrint."'
+ allowprint='" . $AllowPrint . "'
WHERE purchorders.orderno ='" . $_SESSION['ExistingOrder'] ."'";
$ErrMsg = _('The order status could not be updated because');
@@ -161,7 +161,6 @@
} //end if there is actually a status change the class Status != the POST['Status']
}
-/*New order initiated by user clicking on supplier purchasing data from items page */
if (isset($_GET['NewOrder'])
AND isset($_GET['StockID'])
AND isset($_GET['SelectedSupplier'])) {
@@ -179,7 +178,7 @@
$_SESSION['PO'.$identifier]->GLLink = $_SESSION['CompanyRecord']['gllink_stock'];
/* set the SupplierID we got */
$_SESSION['PO'.$identifier]->SupplierID = $_GET['SelectedSupplier'];
- $_SESSION['PO'.$identifier]->DeliveryDate = DateAdd(date($_SESSION['DefaultDateFormat']), 'd', $_GET['LeadTime']);
+ $_SESSION['PO'.$identifier]->DeliveryDate = date($_SESSION['DefaultDateFormat']);
$_SESSION['RequireSupplierSelection'] = 0;
$_POST['Select'] = $_GET['SelectedSupplier'];
@@ -732,7 +731,7 @@
if (isset($_GET['ModifyOrderNumber']) AND $_GET['ModifyOrderNumber'] != '') {
$_SESSION['PO'.$identifier]->Version += 1;
$_POST['Version'] = $_SESSION['PO'.$identifier]->Version;
- } elseif (isset($_SESSION['PO'.$identifier]->Version) and $_SESSION['PO'.$identifier]->Version != '') {
+ } elseif (isset($_SESSION['PO'.$identifier]->Version) AND $_SESSION['PO'.$identifier]->Version != '') {
$_POST['Version'] = $_SESSION['PO'.$identifier]->Version;
} else {
$_POST['Version']='1';
@@ -762,7 +761,9 @@
<td><input type="text" name="Requisition" size="16" maxlength="15" value="' . $_POST['Requisition'] . '" /></td></tr>';
echo '<tr><td>' . _('Date Printed') . ':</td><td>';
- if (isset($_SESSION['PO'.$identifier]->DatePurchaseOrderPrinted) AND mb_strlen($_SESSION['PO'.$identifier]->DatePurchaseOrderPrinted)>6){
+ if (isset($_SESSION['PO'.$identifier]->DatePurchaseOrderPrinted)
+ AND mb_strlen($_SESSION['PO'.$identifier]->DatePurchaseOrderPrinted)>6){
+
echo ConvertSQLDate($_SESSION['PO'.$identifier]->DatePurchaseOrderPrinted);
$Printed = True;
} else {
Modified: trunk/PO_Items.php
===================================================================
--- trunk/PO_Items.php 2011-11-27 09:16:35 UTC (rev 4757)
+++ trunk/PO_Items.php 2011-11-28 09:44:22 UTC (rev 4758)
@@ -94,7 +94,7 @@
$AuthRow=DB_fetch_array($AuthResult);
if (DB_num_rows($AuthResult) > 0 AND $AuthRow['authlevel'] > $_SESSION['PO'.$identifier]->Order_Value()) { //user has authority to authrorise as well as create the order
- $StatusComment=date($_SESSION['DefaultDateFormat']).' - ' . _('Order Created and Authorised by') . $UserDetails . '<br />'.$_SESSION['PO'.$identifier]->StatusComments.'<br />';
+ $StatusComment=date($_SESSION['DefaultDateFormat']).' - ' . _('Order Created and Authorised by') . $UserDetails . '<br />'. $_SESSION['PO'.$identifier]->StatusComments.'<br />';
$_SESSION['PO'.$identifier]->AllowPrintPO=1;
$_SESSION['PO'.$identifier]->Status = 'Authorised';
} else { // no authority to authorise this order
@@ -111,7 +111,7 @@
_('The order will be created with a status of pending and will require authorisation'), 'warn');
$_SESSION['PO'.$identifier]->AllowPrintPO=0;
- $StatusComment=date($_SESSION['DefaultDateFormat']).' - ' . _('Order Created by') . $UserDetails . '<br />'.$_SESSION['PO'.$identifier]->StatusComments.'<br />';
+ $StatusComment=date($_SESSION['DefaultDateFormat']).' - ' . _('Order Created by') . $UserDetails . '<br />' . $_SESSION['PO'.$identifier]->StatusComments.'<br />';
$_SESSION['PO'.$identifier]->Status = 'Pending';
}
} else { //auto authorise is set to off
@@ -186,7 +186,7 @@
'" . Date('Y-m-d') . "',
'" . $_SESSION['PO'.$identifier]->DeliveryBy . "',
'" . $_SESSION['PO'.$identifier]->Status . "',
- '" . $StatusComment . "',
+ '" . htmlentities($StatusComment,ENT_QUOTES,'UTF-8') . "',
'" . FormatDateForSQL($_SESSION['PO'.$identifier]->DeliveryDate) . "',
'" . $_SESSION['PO'.$identifier]->PaymentTerms. "',
'" . $_SESSION['PO'.$identifier]->AllowPrintPO . "' )";
@@ -244,12 +244,9 @@
}
if ($Completed){
$_SESSION['PO'.$identifier]->Status = 'Completed';
- if (IsEmailAddress($_SESSION['UserEmail'])){
- $UserChangedStatus = ' <a href="mailto:' . $_SESSION['UserEmail'] . '">' . $_SESSION['UsersRealName']. '</a>';
- } else {
- $UserChangedStatus = ' ' . $_SESSION['UsersRealName'] . ' ';
- }
- $_SESSION['PO'.$identifier]->StatusComments = date($_SESSION['DefaultDateFormat']).' - ' . _('Order completed by') . $UserChangedStatus . '<br />' .$_SESSION['PO'.$identifier]->StatusComments;
+ $_SESSION['PO'.$identifier]->StatusComments = date($_SESSION['DefaultDateFormat']).' - ' . _('Order completed by') . $UserDetails . '<br />' . $_SESSION['PO'.$identifier]->StatusComments;
+ } else {
+ $_SESSION['PO'.$identifier]->StatusComments = date($_SESSION['DefaultDateFormat']).' - ' . _('Order modified by') . $UserDetails . '<br />' . $_SESSION['PO'.$identifier]->StatusComments;
}
/*Update the purchase order header with any changes */
@@ -282,7 +279,7 @@
paymentterms='" . $_SESSION['PO'.$identifier]->PaymentTerms . "',
allowprint='" . $_SESSION['PO'.$identifier]->AllowPrintPO . "',
status = '" . $_SESSION['PO'.$identifier]->Status . "',
- stat_comment = '" . $_SESSION['PO'.$identifier]->StatusComments . "'
+ stat_comment = '" . htmlentities($_SESSION['PO'.$identifier]->StatusComments,ENT_QUOTES,'UTF-8') . "'
WHERE orderno = '" . $_SESSION['PO'.$identifier]->OrderNo ."'";
$ErrMsg = _('The purchase order could not be updated because');
@@ -375,6 +372,7 @@
if ($_SESSION['PO'.$identifier]->AllowPrintPO==1
AND ($_SESSION['PO'.$identifier]->Status=='Authorised'
OR $_SESSION['PO'.$identifier]->Status=='Printed')){
+
echo '<br /><a target="_blank" href="'.$rootpath.'/PO_PDFPurchOrder.php?OrderNo=' . $_SESSION['PO'.$identifier]->OrderNo . '">' . _('Print Purchase Order') . '</a>';
}
} /*end of if its a new order or an existing one */
Modified: trunk/PO_PDFPurchOrder.php
===================================================================
--- trunk/PO_PDFPurchOrder.php 2011-11-27 09:16:35 UTC (rev 4757)
+++ trunk/PO_PDFPurchOrder.php 2011-11-28 09:44:22 UTC (rev 4758)
@@ -125,7 +125,9 @@
$POHeader = DB_fetch_array($result);
- if ($POHeader['status'] != 'Authorised' AND $POHeader['status'] != 'Printed') {
+ if ($POHeader['status'] != 'Authorised'
+ AND $POHeader['status'] != 'Printed') {
+
include('includes/header.inc');
prnMsg( _('Purchase orders can only be printed once they have been authorised') . '. ' . _('This order is currently at a status of') . ' ' . _($POHeader['status']),'warn');
include('includes/footer.inc');
@@ -333,12 +335,12 @@
}
}
if ($ViewingOnly==0 AND $Success==1) {
- $StatusComment = date($_SESSION['DefaultDateFormat']) .' - ' . _('Printed by') . '<a href="mailto:'.$_SESSION['UserEmail'] .'">'.$_SESSION['UsersRealName']. '</a><br />' . $POHeader['stat_comment'];
+ $StatusComment = date($_SESSION['DefaultDateFormat']) .' - ' . _('Printed by') . ' <a href="mailto:'.$_SESSION['UserEmail'] .'">'.$_SESSION['UsersRealName']. '</a><br />' . html_entity_decode($POHeader['stat_comment'],ENT_QUOTES,'UTF-8');
$sql = "UPDATE purchorders SET allowprint = 0,
dateprinted = '" . Date('Y-m-d') . "',
status = 'Printed',
- stat_comment = '" . DB_escape_string($StatusComment) . "'
+ stat_comment = '" . htmlentities($StatusComment,ENT_QUOTES,'UTF-8') . "'
WHERE purchorders.orderno = '" . $OrderNo ."'";
$result = DB_query($sql,$db);
}
Modified: trunk/PO_SelectOSPurchOrder.php
===================================================================
--- trunk/PO_SelectOSPurchOrder.php 2011-11-27 09:16:35 UTC (rev 4757)
+++ trunk/PO_SelectOSPurchOrder.php 2011-11-28 09:44:22 UTC (rev 4758)
@@ -293,29 +293,33 @@
if (isset($OrderNumber) AND $OrderNumber !='') {
$SQL = "SELECT purchorders.orderno,
- suppliers.suppname,
- purchorders.orddate,
- purchorders.deliverydate,
- purchorders.initiator,
- purchorders.status,
- purchorders.requisitionno,
- purchorders.allowprint,
- suppliers.currcode,
- SUM(purchorderdetails.unitprice*purchorderdetails.quantityord) AS ordervalue
- FROM purchorders INNER JOIN purchorderdetails
- ON purchorders.orderno=purchorderdetails.orderno
- INNER JOIN suppliers
- ON purchorders.supplierno = suppliers.supplierid
- WHERE purchorderdetails.completed=0
- AND purchorders.orderno='". $OrderNumber ."'
- GROUP BY purchorders.orderno ASC,
- suppliers.suppname,
- purchorders.orddate,
- purchorders.status,
- purchorders.initiator,
- purchorders.requisitionno,
- purchorders.allowprint,
- suppliers.currcode";
+ purchorders.realorderno,
+ suppliers.suppname,
+ purchorders.orddate,
+ purchorders.deliverydate,
+ purchorders.initiator,
+ purchorders.status,
+ purchorders.requisitionno,
+ purchorders.allowprint,
+ suppliers.currcode,
+ currencies.decimalplaces AS currdecimalplaces,
+ SUM(purchorderdetails.unitprice*purchorderdetails.quantityord) AS ordervalue
+ FROM purchorders INNER JOIN purchorderdetails
+ ON purchorders.orderno=purchorderdetails.orderno
+ INNER JOIN suppliers
+ ON purchorders.supplierno = suppliers.supplierid
+ INNER JOIN currencies
+ ON suppliers.currcode=currencies.currabrev
+ WHERE purchorderdetails.completed=0
+ AND purchorders.orderno='". $OrderNumber ."'
+ GROUP BY purchorders.orderno ASC,
+ suppliers.suppname,
+ purchorders.orddate,
+ purchorders.status,
+ purchorders.initiator,
+ purchorders.requisitionno,
+ purchorders.allowprint,
+ suppliers.currcode";
} else {
/* $DateAfterCriteria = FormatDateforSQL($OrdersAfterDate); */
Modified: trunk/SpecialOrder.php
===================================================================
--- trunk/SpecialOrder.php 2011-11-27 09:16:35 UTC (rev 4757)
+++ trunk/SpecialOrder.php 2011-11-28 09:44:22 UTC (rev 4758)
@@ -302,7 +302,8 @@
$AuthResult=DB_query($AuthSQL,$db);
$AuthRow=DB_fetch_array($AuthResult);
- if (DB_num_rows($AuthResult) > 0 AND $AuthRow['authlevel'] > $_SESSION['SPL']->Order_Value()) { //user has authority to authrorise as well as create the order
+ if (DB_num_rows($AuthResult) > 0
+ AND $AuthRow['authlevel'] > $_SESSION['SPL']->Order_Value()) { //user has authority to authrorise as well as create the order
$StatusComment=date($_SESSION['DefaultDateFormat']).' - ' . _('Order Created and Authorised by') . $UserDetails . '<br />';
$_SESSION['SPL']->AllowPrintPO=1;
$_SESSION['SPL']->Status = 'Authorised';
@@ -373,7 +374,7 @@
'" . DB_escape_string($StkLocAddress['deladd6']) . "',
'" . DB_escape_string($StkLocAddress['contact']) . "',
'" . $_SESSION['SPL']->Status . "',
- '" . $StatusComment . "',
+ '" . htmlentities($StatusComment, ENT_QUOTES,'UTF-8') . "',
'" . $_SESSION['SPL']->AllowPrintPO . "',
'" . Date('Y-m-d') . "',
'" . Date('Y-m-d') . "')";
Modified: trunk/includes/PO_ReadInOrder.inc
===================================================================
--- trunk/includes/PO_ReadInOrder.inc 2011-11-27 09:16:35 UTC (rev 4757)
+++ trunk/includes/PO_ReadInOrder.inc 2011-11-28 09:44:22 UTC (rev 4758)
@@ -96,7 +96,7 @@
$_SESSION['PO'.$identifier]->Version = $myrow['version'];
$_SESSION['PO'.$identifier]->Port = $myrow['port'];
$_SESSION['PO'.$identifier]->Status = $myrow['status'];
- $_SESSION['PO'.$identifier]->StatusComments = $myrow['stat_comment'];
+ $_SESSION['PO'.$identifier]->StatusComments = html_entity_decode($myrow['stat_comment'],ENT_QUOTES,'UTF-8');
$_SESSION['PO'.$identifier]->DeliveryDate = ConvertSQLDate($myrow['deliverydate']);
$_SESSION['ExistingOrder'] = $_SESSION['PO'.$identifier]->OrderNo;
$_SESSION['PO'.$identifier]->PaymentTerms= $myrow['paymentterms'];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-12-03 03:03:45
|
Revision: 4761
http://web-erp.svn.sourceforge.net/web-erp/?rev=4761&view=rev
Author: daintree
Date: 2011-12-03 03:03:38 +0000 (Sat, 03 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/includes/LanguagesArray.php
trunk/includes/MiscFunctions.php
Added Paths:
-----------
trunk/locale/en_IN.utf8/
trunk/locale/en_IN.utf8/LC_MESSAGES/
Modified: trunk/includes/LanguagesArray.php
===================================================================
--- trunk/includes/LanguagesArray.php 2011-12-02 21:14:02 UTC (rev 4760)
+++ trunk/includes/LanguagesArray.php 2011-12-03 03:03:38 UTC (rev 4761)
@@ -11,6 +11,11 @@
$LanguagesArray['en_GB.utf8']['DecimalPoint'] = '.';
$LanguagesArray['en_GB.utf8']['ThousandsSeparator'] = ',';
+$LanguagesArray['en_IN.utf8']['LanguageName'] = _('English India');
+$LanguagesArray['en_IN.utf8']['WindowsLocale'] = 'english-in';
+$LanguagesArray['en_IN.utf8']['DecimalPoint'] = '.';
+$LanguagesArray['en_IN.utf8']['ThousandsSeparator'] = ',';
+
$LanguagesArray['cz_CZ.utf8']['LanguageName'] = _('Czech');
$LanguagesArray['cz_CZ.utf8']['WindowsLocale'] = 'czech';
$LanguagesArray['cz_CZ.utf8']['DecimalPoint'] = ',';
Modified: trunk/includes/MiscFunctions.php
===================================================================
--- trunk/includes/MiscFunctions.php 2011-12-02 21:14:02 UTC (rev 4760)
+++ trunk/includes/MiscFunctions.php 2011-12-03 03:03:38 UTC (rev 4761)
@@ -353,10 +353,20 @@
if ($DecimalPlaces !='Variable'){
$DecimalValue= round($DecimalValue,$DecimalPlaces);
}
- if (strlen(substr($DecimalValue,2))>0){
+ if ($DecimalPlaces!='Variable' AND strlen(substr($DecimalValue,2))>0){
+ /*If the DecimalValue is longer than '0.' then chop off the leading 0*/
$DecimalValue = substr($DecimalValue,1);
+ if ($DecimalPlaces > 0){
+ $DecimalValue = str_pad($DecimalValue,$DecimalPlaces,'0');
+ } else {
+ $DecimalValue ='';
+ }
} else {
- $DecimalValue ='';
+ if ($DecimalPlaces!='Variable' AND $DecimalPlaces > 0){
+ $DecimalValue = '.' . str_pad($DecimalValue,$DecimalPlaces,'0');
+ } elseif($DecimalPlaces==0) {
+ $DecimalValue ='';
+ }
}
if(strlen($IntegerNumber)>3){
$LastThreeNumbers = substr($IntegerNumber, strlen($IntegerNumber)-3, strlen($IntegerNumber));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-12-03 03:03:45
|
Revision: 4761
http://web-erp.svn.sourceforge.net/web-erp/?rev=4761&view=rev
Author: daintree
Date: 2011-12-03 03:03:38 +0000 (Sat, 03 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/includes/LanguagesArray.php
trunk/includes/MiscFunctions.php
Added Paths:
-----------
trunk/locale/en_IN.utf8/
trunk/locale/en_IN.utf8/LC_MESSAGES/
Modified: trunk/includes/LanguagesArray.php
===================================================================
--- trunk/includes/LanguagesArray.php 2011-12-02 21:14:02 UTC (rev 4760)
+++ trunk/includes/LanguagesArray.php 2011-12-03 03:03:38 UTC (rev 4761)
@@ -11,6 +11,11 @@
$LanguagesArray['en_GB.utf8']['DecimalPoint'] = '.';
$LanguagesArray['en_GB.utf8']['ThousandsSeparator'] = ',';
+$LanguagesArray['en_IN.utf8']['LanguageName'] = _('English India');
+$LanguagesArray['en_IN.utf8']['WindowsLocale'] = 'english-in';
+$LanguagesArray['en_IN.utf8']['DecimalPoint'] = '.';
+$LanguagesArray['en_IN.utf8']['ThousandsSeparator'] = ',';
+
$LanguagesArray['cz_CZ.utf8']['LanguageName'] = _('Czech');
$LanguagesArray['cz_CZ.utf8']['WindowsLocale'] = 'czech';
$LanguagesArray['cz_CZ.utf8']['DecimalPoint'] = ',';
Modified: trunk/includes/MiscFunctions.php
===================================================================
--- trunk/includes/MiscFunctions.php 2011-12-02 21:14:02 UTC (rev 4760)
+++ trunk/includes/MiscFunctions.php 2011-12-03 03:03:38 UTC (rev 4761)
@@ -353,10 +353,20 @@
if ($DecimalPlaces !='Variable'){
$DecimalValue= round($DecimalValue,$DecimalPlaces);
}
- if (strlen(substr($DecimalValue,2))>0){
+ if ($DecimalPlaces!='Variable' AND strlen(substr($DecimalValue,2))>0){
+ /*If the DecimalValue is longer than '0.' then chop off the leading 0*/
$DecimalValue = substr($DecimalValue,1);
+ if ($DecimalPlaces > 0){
+ $DecimalValue = str_pad($DecimalValue,$DecimalPlaces,'0');
+ } else {
+ $DecimalValue ='';
+ }
} else {
- $DecimalValue ='';
+ if ($DecimalPlaces!='Variable' AND $DecimalPlaces > 0){
+ $DecimalValue = '.' . str_pad($DecimalValue,$DecimalPlaces,'0');
+ } elseif($DecimalPlaces==0) {
+ $DecimalValue ='';
+ }
}
if(strlen($IntegerNumber)>3){
$LastThreeNumbers = substr($IntegerNumber, strlen($IntegerNumber)-3, strlen($IntegerNumber));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-12-03 04:18:59
|
Revision: 4762
http://web-erp.svn.sourceforge.net/web-erp/?rev=4762&view=rev
Author: daintree
Date: 2011-12-03 04:18:47 +0000 (Sat, 03 Dec 2011)
Log Message:
-----------
pre v 4.06.2
Modified Paths:
--------------
trunk/UpgradeDatabase.php
trunk/doc/Change.log
trunk/includes/ConnectDB.inc
trunk/includes/footer.inc
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.mo
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po
trunk/locale/el_GR.utf8/LC_MESSAGES/messages.mo
trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po
trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot
trunk/locale/en_US.utf8/LC_MESSAGES/messages.mo
trunk/locale/en_US.utf8/LC_MESSAGES/messages.po
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.mo
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.po
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.mo
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.po
trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.mo
trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.po
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.mo
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.po
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.mo
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.po
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.mo
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.po
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.mo
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.po
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.mo
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.po
trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.mo
trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.po
trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.mo
trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.mo
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.mo
trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.po
trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.mo
trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.po
trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.mo
trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.po
trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.mo
trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.po
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.mo
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.po
trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.mo
trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.po
trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.mo
trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.po
trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.mo
trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.po
trunk/sql/mysql/upgrade4.05-4.06.sql
trunk/sql/mysql/weberp-demo.sql
trunk/sql/mysql/weberp-new.sql
Modified: trunk/UpgradeDatabase.php
===================================================================
--- trunk/UpgradeDatabase.php 2011-12-03 03:03:38 UTC (rev 4761)
+++ trunk/UpgradeDatabase.php 2011-12-03 04:18:47 UTC (rev 4762)
@@ -121,8 +121,9 @@
case '4.05.2':
case '4.05.3':
case '4.06':
+ case '4.06.1':
$SQLScripts[] = './sql/mysql/upgrade4.05-4.06.sql';
- case '4.06.1':
+ case '4.06.2':
break;
} //end switch
}
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-12-03 03:03:38 UTC (rev 4761)
+++ trunk/doc/Change.log 2011-12-03 04:18:47 UTC (rev 4762)
@@ -1,5 +1,8 @@
webERP Change Log
+3/12/11 Release 4.06.2
+
+2/12/11 Phil: Added indian_number_format for specific unusal number formatting 00,00,000.00 for India and apparently South Asian countries. Kicks in for en_IN.utf8 and hi_IN.utf8
27/11/11 Phil: Removed a load of DB_escape_string() calls as no longer required now the entire $_POST and $_GET array are DB_escape_string()'ed
27/11/11 Tim: PrintCustTransPortrait.php added bank account code
27/11/11 Tim: GLTagProfit_Loss Gross Profit calculation error was = COGS - fixed
Modified: trunk/includes/ConnectDB.inc
===================================================================
--- trunk/includes/ConnectDB.inc 2011-12-03 03:03:38 UTC (rev 4761)
+++ trunk/includes/ConnectDB.inc 2011-12-03 04:18:47 UTC (rev 4762)
@@ -4,7 +4,7 @@
* this value is saved in the $_SESSION['Versionumber'] when includes/GetConfig.php is run
* if VersionNumber is < $Version then the DB update script is run */
-$Version='4.06.1'; //must update manually every time there is a DB change
+$Version='4.06.2'; //must update manually every time there is a DB change
require_once ($PathPrefix .'includes/MiscFunctions.php');
@@ -31,4 +31,4 @@
include_once($PathPrefix .'includes/ConnectDB_' . $dbType . '.inc');
}
-?>
+?>
\ No newline at end of file
Modified: trunk/includes/footer.inc
===================================================================
--- trunk/includes/footer.inc 2011-12-03 03:03:38 UTC (rev 4761)
+++ trunk/includes/footer.inc 2011-12-03 04:18:47 UTC (rev 4762)
@@ -20,7 +20,7 @@
echo '<tr>
<td class="footer"> </td>
- <td class="footer">webERP v' . $_SESSION['VersionNumber'] . ' ' . _('Copyright') . ' © weberp.org - '.date('Y').'</td>
+ <td class="footer">webERP v' . $_SESSION['VersionNumber'] . ' ' . _('Copyright') . ' © weberp.org 2002 - '.date('Y').'</td>
</tr>';
if(http_file_exists('http://sflogo.sourceforge.net/sflogo.php')) {
Modified: trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po 2011-12-03 03:03:38 UTC (rev 4761)
+++ trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po 2011-12-03 04:18:47 UTC (rev 4762)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: webERP 3.08\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-19 17:05+1300\n"
+"POT-Creation-Date: 2011-12-03 16:31+1300\n"
"PO-Revision-Date: 2011-02-07 15:33+0000\n"
"Last-Translator: Tim Schofield <Unknown>\n"
"Language-Team: Czech <cs...@li...>\n"
@@ -147,9 +147,9 @@
#: Locations.php:256 Locations.php:265 Locations.php:274 Locations.php:283
#: Locations.php:292 Locations.php:301 MRPDemandTypes.php:87
#: PaymentMethods.php:138 PaymentTerms.php:146 PaymentTerms.php:153
-#: PcExpenses.php:158 SalesCategories.php:124 SalesCategories.php:131
+#: PcExpenses.php:158 SalesCategories.php:125 SalesCategories.php:132
#: SalesPeople.php:150 SalesPeople.php:157 SalesPeople.php:163
-#: SalesTypes.php:140 SalesTypes.php:150 Shippers.php:82 Shippers.php:94
+#: SalesTypes.php:140 SalesTypes.php:150 Shippers.php:81 Shippers.php:93
#: StockCategories.php:181 Stocks.php:615 Stocks.php:624 Stocks.php:632
#: Stocks.php:640 Stocks.php:648 Stocks.php:656 Suppliers.php:612
#: Suppliers.php:621 Suppliers.php:629 SupplierTypes.php:145
@@ -220,7 +220,7 @@
#: PcAssignCashToTab.php:146 PcAssignCashToTab.php:187 PDFPickingList.php:28
#: PDFPrintLabel.php:140 PDFStockLocTransfer.php:17
#: PO_AuthorisationLevels.php:10 POReport.php:60 POReport.php:64
-#: POReport.php:68 PO_SelectOSPurchOrder.php:135 PricesBasedOnMarkUp.php:8
+#: POReport.php:68 PO_SelectOSPurchOrder.php:139 PricesBasedOnMarkUp.php:8
#: Prices_Customer.php:35 Prices.php:30 PurchData.php:137 PurchData.php:258
#: PurchData.php:282 RecurringSalesOrders.php:309 SalesAnalReptCols.php:51
#: SalesAnalRepts.php:11 SalesCategories.php:11 SalesGLPostings.php:17
@@ -231,7 +231,7 @@
#: SelectOrderItems.php:1603 SelectProduct.php:496 SelectSalesOrder.php:533
#: SelectSupplier.php:9 SelectSupplier.php:198 SelectWorkOrder.php:9
#: SelectWorkOrder.php:151 ShipmentCosting.php:11 Shipments.php:17
-#: Shippers.php:123 Shippers.php:159 Shipt_Select.php:8
+#: Shippers.php:122 Shippers.php:158 Shipt_Select.php:8
#: StockLocMovements.php:13 StockLocStatus.php:27 Suppliers.php:302
#: SupplierTenders.php:260 SupplierTenders.php:317 SupplierTransInquiry.php:10
#: TaxGroups.php:15 TaxProvinces.php:11 TopItems.php:77
@@ -278,14 +278,14 @@
#: PaymentMethods.php:275 PcAuthorizeExpenses.php:244 PDFChequeListing.php:63
#: PDFDeliveryDifferences.php:75 PDFDIFOT.php:75
#: PO_AuthorisationLevels.php:134 PO_AuthorisationLevels.php:139
-#: PO_Header.php:777 PO_PDFPurchOrder.php:382 PO_PDFPurchOrder.php:385
+#: PO_Header.php:783 PO_PDFPurchOrder.php:384 PO_PDFPurchOrder.php:387
#: PurchData.php:189 PurchData.php:514 PurchData.php:517
#: RecurringSalesOrders.php:482 RecurringSalesOrders.php:485
#: SalesAnalReptCols.php:284 SalesAnalReptCols.php:419
#: SalesAnalReptCols.php:422 SalesAnalRepts.php:415 SalesAnalRepts.php:418
#: SalesAnalRepts.php:443 SalesAnalRepts.php:446 SalesAnalRepts.php:471
-#: SalesAnalRepts.php:474 SalesPeople.php:219 SalesPeople.php:354
-#: SalesPeople.php:356 SelectProduct.php:381 ShipmentCosting.php:663
+#: SalesAnalRepts.php:474 SalesPeople.php:219 SalesPeople.php:355
+#: SalesPeople.php:357 SelectProduct.php:381 ShipmentCosting.php:663
#: Stocks.php:1015 Stocks.php:1017 Stocks.php:1040 Stocks.php:1042
#: SuppContractChgs.php:90 SystemParameters.php:389 SystemParameters.php:412
#: SystemParameters.php:428 SystemParameters.php:491 SystemParameters.php:499
@@ -294,7 +294,7 @@
#: SystemParameters.php:781 SystemParameters.php:916 SystemParameters.php:918
#: SystemParameters.php:928 SystemParameters.php:930 SystemParameters.php:984
#: SystemParameters.php:996 SystemParameters.php:998 TaxGroups.php:307
-#: TaxGroups.php:310 TaxGroups.php:366 WWW_Users.php:632 WWW_Users.php:634
+#: TaxGroups.php:310 TaxGroups.php:366 WWW_Users.php:636 WWW_Users.php:638
msgid "Yes"
msgstr "Ano"
@@ -313,14 +313,14 @@
#: PaymentMethods.php:276 PcAuthorizeExpenses.php:242 PDFChequeListing.php:62
#: PDFDeliveryDifferences.php:74 PDFDIFOT.php:74
#: PO_AuthorisationLevels.php:136 PO_AuthorisationLevels.php:141
-#: PO_Header.php:776 PO_PDFPurchOrder.php:383 PO_PDFPurchOrder.php:386
+#: PO_Header.php:782 PO_PDFPurchOrder.php:385 PO_PDFPurchOrder.php:388
#: PurchData.php:192 PurchData.php:515 PurchData.php:518
#: RecurringSalesOrders.php:481 RecurringSalesOrders.php:484
#: SalesAnalReptCols.php:282 SalesAnalReptCols.php:420
#: SalesAnalReptCols.php:423 SalesAnalRepts.php:414 SalesAnalRepts.php:417
#: SalesAnalRepts.php:442 SalesAnalRepts.php:445 SalesAnalRepts.php:470
-#: SalesAnalRepts.php:473 SalesPeople.php:221 SalesPeople.php:359
-#: SalesPeople.php:361 SelectProduct.php:383 ShipmentCosting.php:664
+#: SalesAnalRepts.php:473 SalesPeople.php:221 SalesPeople.php:360
+#: SalesPeople.php:362 SelectProduct.php:383 ShipmentCosting.php:664
#: Stocks.php:1010 Stocks.php:1012 Stocks.php:1035 Stocks.php:1037
#: SuppContractChgs.php:92 SystemParameters.php:390 SystemParameters.php:413
#: SystemParameters.php:429 SystemParameters.php:492 SystemParameters.php:500
@@ -329,7 +329,7 @@
#: SystemParameters.php:782 SystemParameters.php:915 SystemParameters.php:919
#: SystemParameters.php:927 SystemParameters.php:931 SystemParameters.php:985
#: SystemParameters.php:995 SystemParameters.php:999 TaxGroups.php:308
-#: TaxGroups.php:311 TaxGroups.php:368 WWW_Users.php:631 WWW_Users.php:635
+#: TaxGroups.php:311 TaxGroups.php:368 WWW_Users.php:635 WWW_Users.php:639
#: includes/PDFLowGPPageHeader.inc:44 includes/PDFTaxPageHeader.inc:35
msgid "No"
msgstr "Ne"
@@ -346,11 +346,11 @@
#: PaymentMethods.php:200 PaymentTerms.php:205 PcAssignCashToTab.php:259
#: PcClaimExpensesFromTab.php:252 PcExpenses.php:223 PcTabs.php:234
#: PcTypeTabs.php:172 PO_AuthorisationLevels.php:151 Prices_Customer.php:278
-#: Prices.php:251 PurchData.php:204 SalesCategories.php:255
+#: Prices.php:251 PurchData.php:204 SalesCategories.php:256
#: SalesGLPostings.php:132 SalesGLPostings.php:245 SalesPeople.php:232
#: SalesTypes.php:206 SecurityTokens.php:128 SelectCustomer.php:612
#: SelectCustomer.php:630 SelectCustomer.php:654 SelectCustomer.php:671
-#: SelectCustomer.php:695 SelectCustomer.php:712 Shippers.php:144
+#: SelectCustomer.php:695 SelectCustomer.php:712 Shippers.php:143
#: StockCategories.php:242 SupplierContacts.php:163 SupplierTypes.php:189
#: SuppTransGLAnalysis.php:120 TaxAuthorities.php:174 TaxCategories.php:182
#: TaxGroups.php:188 TaxProvinces.php:180 UnitsOfMeasure.php:185
@@ -378,20 +378,20 @@
#: PaymentMethods.php:201 Payments.php:1069 PaymentTerms.php:206
#: PcAssignCashToTab.php:263 PcClaimExpensesFromTab.php:253 PcExpenses.php:224
#: PcExpensesTypeTab.php:185 PcTabs.php:235 PcTypeTabs.php:173
-#: PO_AuthorisationLevels.php:153 PO_Items.php:711 Prices_Customer.php:279
+#: PO_AuthorisationLevels.php:153 PO_Items.php:709 Prices_Customer.php:279
#: Prices.php:252 PurchData.php:205 SalesAnalReptCols.php:299
-#: SalesAnalRepts.php:303 SalesCategories.php:256 SalesGLPostings.php:133
+#: SalesAnalRepts.php:303 SalesCategories.php:257 SalesGLPostings.php:133
#: SalesGLPostings.php:246 SalesPeople.php:233 SalesTypes.php:207
#: SecurityTokens.php:129 SelectCreditItems.php:764 SelectCustomer.php:613
#: SelectCustomer.php:631 SelectCustomer.php:655 SelectCustomer.php:672
#: SelectCustomer.php:696 SelectCustomer.php:713 SelectOrderItems.php:1398
-#: Shipments.php:429 Shippers.php:145 SpecialOrder.php:655
-#: StockCategories.php:243 StockCategories.php:554 SuppContractChgs.php:99
-#: SuppCreditGRNs.php:102 SuppFixedAssetChgs.php:87 SuppInvGRNs.php:139
+#: Shipments.php:440 Shippers.php:144 SpecialOrder.php:656
+#: StockCategories.php:243 StockCategories.php:557 SuppContractChgs.php:99
+#: SuppCreditGRNs.php:102 SuppFixedAssetChgs.php:87 SuppInvGRNs.php:147
#: SupplierContacts.php:164 SupplierTypes.php:191 SuppShiptChgs.php:90
#: SuppTransGLAnalysis.php:121 TaxAuthorities.php:175 TaxCategories.php:183
#: TaxGroups.php:189 TaxProvinces.php:181 UnitsOfMeasure.php:186
-#: WorkCentres.php:142 WOSerialNos.php:319 WWW_Access.php:124
+#: WorkCentres.php:142 WOSerialNos.php:320 WWW_Access.php:124
#: WWW_Users.php:319 includes/InputSerialItemsKeyed.php:58
#: includes/OutputSerialItems.php:99
#, php-format
@@ -446,10 +446,10 @@
#: OffersReceived.php:56 OffersReceived.php:143 PaymentMethods.php:282
#: PaymentTerms.php:309 PO_AuthorisationLevels.php:248 Prices_Customer.php:356
#: SalesAnalReptCols.php:552 SalesAnalRepts.php:514 SalesGLPostings.php:416
-#: SalesPeople.php:368 Shippers.php:200 StockCategories.php:581
+#: SalesPeople.php:369 Shippers.php:199 StockCategories.php:584
#: SupplierContacts.php:281 SuppLoginSetup.php:293 TaxAuthorities.php:327
#: TaxCategories.php:237 TaxProvinces.php:235 UnitsOfMeasure.php:240
-#: WorkCentres.php:279 WWW_Users.php:674
+#: WorkCentres.php:279 WWW_Users.php:678
msgid "Enter Information"
msgstr "Vložit informace"
@@ -560,7 +560,7 @@
#: AddCustomerTypeNotes.php:49 Areas.php:73 CustomerTypes.php:69
#: DeliveryDetails.php:774 Factors.php:105 FixedAssetItems.php:246
#: MRPCalendar.php:176 PcAssignCashToTab.php:88 PcClaimExpensesFromTab.php:79
-#: PcExpenses.php:95 PcTabs.php:102 PcTypeTabs.php:60 PO_Items.php:374
+#: PcExpenses.php:95 PcTabs.php:102 PcTypeTabs.php:60 PO_Items.php:371
#: SalesAnalReptCols.php:129 SalesPeople.php:97 SalesTypes.php:66
#: Stocks.php:497 Suppliers.php:513 SupplierTypes.php:67
msgid "has been updated"
@@ -597,12 +597,12 @@
#: CustomerBranches.php:374 CustomerBranches.php:774 CustomerInquiry.php:253
#: Customers.php:1017 Customers.php:1025 EmailCustTrans.php:15
#: EmailCustTrans.php:63 Factors.php:245 Factors.php:292 Locations.php:563
-#: OrderDetails.php:109 PDFRemittanceAdvice.php:243 PO_PDFPurchOrder.php:369
-#: PO_PDFPurchOrder.php:372 PrintCustTrans.php:714 PrintCustTrans.php:945
+#: OrderDetails.php:109 PDFRemittanceAdvice.php:243 PO_PDFPurchOrder.php:371
+#: PO_PDFPurchOrder.php:374 PrintCustTrans.php:714 PrintCustTrans.php:945
#: PrintCustTrans.php:994 PrintCustTransPortrait.php:753
#: PrintCustTransPortrait.php:999 PrintCustTransPortrait.php:1056
#: SelectCustomer.php:610 SupplierContacts.php:154 SupplierContacts.php:274
-#: UserSettings.php:183 WWW_Users.php:274 includes/PDFPickingListHeader.inc:25
+#: UserSettings.php:184 WWW_Users.php:274 includes/PDFPickingListHeader.inc:25
#: includes/PDFStatementPageHeader.inc:67 includes/PDFTransPageHeader.inc:82
#: includes/PDFTransPageHeaderPortrait.inc:109
#: includes/PO_PDFOrderPageHeader.inc:29
@@ -613,7 +613,7 @@
#: Customers.php:1026 PcAssignCashToTab.php:224 PcAssignCashToTab.php:353
#: PcAuthorizeExpenses.php:92 PcClaimExpensesFromTab.php:214
#: PcClaimExpensesFromTab.php:372 PcReportTab.php:327 SelectCustomer.php:611
-#: SystemParameters.php:328 WOSerialNos.php:290 WOSerialNos.php:296
+#: SystemParameters.php:328 WOSerialNos.php:291 WOSerialNos.php:297
msgid "Notes"
msgstr "Bere na vědomí"
@@ -635,7 +635,7 @@
msgstr "Jméno kontaktní osoby"
#: AddCustomerContacts.php:231 Contracts.php:775 PDFRemittanceAdvice.php:239
-#: PO_Header.php:986 PO_Header.php:1067 SelectCreditItems.php:241
+#: PO_Header.php:992 PO_Header.php:1073 SelectCreditItems.php:241
#: SelectCustomer.php:417 SelectOrderItems.php:606
#: includes/PDFStatementPageHeader.inc:63 includes/PDFTransPageHeader.inc:81
#: includes/PDFTransPageHeaderPortrait.inc:105
@@ -685,7 +685,7 @@
#: PaymentAllocations.php:66 PcAssignCashToTab.php:220
#: PcAuthorizeExpenses.php:88 PDFRemittanceAdvice.php:300
#: PrintCustTrans.php:822 PrintCustTransPortrait.php:867 ReverseGRN.php:386
-#: ShipmentCosting.php:534 ShipmentCosting.php:611 Shipments.php:476
+#: ShipmentCosting.php:534 ShipmentCosting.php:611 Shipments.php:491
#: StockDispatch.php:189 StockDispatch.php:201 StockLocMovements.php:90
#: StockMovements.php:94 StockSerialItemResearch.php:81
#: SupplierAllocations.php:455 SupplierAllocations.php:568
@@ -699,10 +699,10 @@
msgstr "Datum"
#: AddCustomerNotes.php:122 AddCustomerTypeNotes.php:109 PcReportTab.php:173
-#: Stocks.php:1019 UpgradeDatabase.php:175 UpgradeDatabase.php:178
-#: UpgradeDatabase.php:181 UpgradeDatabase.php:184 UpgradeDatabase.php:187
-#: UpgradeDatabase.php:190 UpgradeDatabase.php:193 UpgradeDatabase.php:196
-#: UpgradeDatabase.php:199 Z_Upgrade_3.10-3.11.php:62
+#: Stocks.php:1019 UpgradeDatabase.php:176 UpgradeDatabase.php:179
+#: UpgradeDatabase.php:182 UpgradeDatabase.php:185 UpgradeDatabase.php:188
+#: UpgradeDatabase.php:191 UpgradeDatabase.php:194 UpgradeDatabase.php:197
+#: UpgradeDatabase.php:200 Z_Upgrade_3.10-3.11.php:62
#: Z_Upgrade_3.10-3.11.php:66 Z_Upgrade_3.10-3.11.php:70
#: Z_Upgrade_3.10-3.11.php:74 Z_Upgrade_3.10-3.11.php:78
#: Z_Upgrade_3.11-4.00.php:62 Z_Upgrade_3.11-4.00.php:66
@@ -850,7 +850,7 @@
#: PDFPriceList.php:128 PDFQuotation.php:270 PDFQuotationPortrait.php:268
#: PDFRemittanceAdvice.php:83 PDFStockCheckComparison.php:37
#: PDFStockCheckComparison.php:63 PDFStockCheckComparison.php:268
-#: PO_PDFPurchOrder.php:31 PO_PDFPurchOrder.php:152
+#: PO_PDFPurchOrder.php:31 PO_PDFPurchOrder.php:154
#: PrintCustOrder_generic.php:243 PrintCustOrder.php:220 ReorderLevel.php:63
#: ReorderLevel.php:152 SalesAnalysis_UserDefined.php:28
#: SelectCreditItems.php:30 StockCheck.php:47 StockCheck.php:69
@@ -879,16 +879,16 @@
msgstr "Podrobnosti o nesplacených transakcí pro zákazníka"
#: AgedDebtors.php:370 AgedSuppliers.php:198 GLAccountCSV.php:168
-#: GLAccountInquiry.php:143 GLAccountReport.php:94 PO_Items.php:435
-#: PO_Items.php:559 PO_Items.php:584 SalesAnalReptCols.php:365
-#: SpecialOrder.php:440 StockLocTransferReceive.php:370
+#: GLAccountInquiry.php:143 GLAccountReport.php:94 PO_Items.php:433
+#: PO_Items.php:557 PO_Items.php:582 SalesAnalReptCols.php:365
+#: SpecialOrder.php:441 StockLocTransferReceive.php:370
#: StockQuantityByDate.php:121 includes/SelectOrderItems_IntoCart.inc:54
msgid "could not be retrieved because"
msgstr "se nepodařilo získat, protože"
#: AgedDebtors.php:373 AgedSuppliers.php:201 Areas.php:95
-#: ConfirmDispatch_Invoice.php:160 ConfirmDispatch_Invoice.php:967
-#: ConfirmDispatch_Invoice.php:981 Contracts.php:580 CounterSales.php:1365
+#: ConfirmDispatch_Invoice.php:160 ConfirmDispatch_Invoice.php:974
+#: ConfirmDispatch_Invoice.php:988 Contracts.php:580 CounterSales.php:1365
#: CounterSales.php:1379 Credit_Invoice.php:697 Credit_Invoice.php:718
#: CustomerReceipt.php:542 CustomerReceipt.php:681 CustomerReceipt.php:709
#: CustomerTransInquiry.php:91 DeliveryDetails.php:396 GLProfit_Loss.php:596
@@ -909,7 +909,7 @@
#: includes/PDFPaymentRun_PymtFooter.php:91
#: includes/PDFPaymentRun_PymtFooter.php:121
#: includes/PDFPaymentRun_PymtFooter.php:158
-#: includes/PDFPaymentRun_PymtFooter.php:189 includes/ConnectDB_mysqli.inc:81
+#: includes/PDFPaymentRun_PymtFooter.php:189 includes/ConnectDB_mysqli.inc:76
#: includes/ConnectDB_mysql.inc:67
msgid "The SQL that failed was"
msgstr "SQL příkaz, který selhal, byl"
@@ -1109,7 +1109,7 @@
#: FixedAssetCategories.php:138 GLAccounts.php:197 Locations.php:328
#: MRPDemands.php:248 PcAssignCashToTab.php:135 PcClaimExpensesFromTab.php:126
#: PcExpenses.php:166 PcExpensesTypeTab.php:101 PcTabs.php:166
-#: PcTypeTabs.php:135 SalesAnalReptCols.php:215 SalesCategories.php:135
+#: PcTypeTabs.php:135 SalesAnalReptCols.php:215 SalesCategories.php:136
#: SalesTypes.php:156 StockCategories.php:198 Suppliers.php:638
#: SupplierTypes.php:151 Z_DeleteInvoice.php:146
msgid "has been deleted"
@@ -1152,7 +1152,7 @@
#: AuditTrail.php:47 PO_AuthorisationLevels.php:124
#: PO_AuthorisationLevels.php:172 PO_AuthorisationLevels.php:175
-#: UserSettings.php:111
+#: UserSettings.php:112
msgid "User ID"
msgstr "ID uživatele"
@@ -1163,7 +1163,7 @@
#: InventoryQuantities.php:193 InventoryQuantities.php:195 MRP.php:585
#: MRPReport.php:523 MRPReport.php:525 MRPReschedules.php:144
#: PDFPeriodStockTransListing.php:59 PDFPriceList.php:198
-#: PDFPrintLabel.php:250 PO_Items.php:1023 POReport.php:1567
+#: PDFPrintLabel.php:250 PO_Items.php:1021 POReport.php:1567
#: ReorderLevel.php:181 ReorderLevel.php:183 ReorderLevel.php:213
#: ReorderLevel.php:215 SalesGraph.php:97 SalesGraph.php:99 SalesGraph.php:119
#: SalesGraph.php:121 SalesGraph.php:143 SalesGraph.php:145 SalesGraph.php:179
@@ -1408,10 +1408,10 @@
#: PcTabs.php:206 PcTabs.php:349 PDFPrintLabel.php:97
#: PO_AuthorisationLevels.php:126 PO_AuthorisationLevels.php:209
#: PO_AuthorisationLevels.php:214 PO_AuthoriseMyOrders.php:115
-#: PO_Header.php:554 PO_SelectOSPurchOrder.php:481 PO_SelectPurchOrder.php:432
+#: PO_Header.php:558 PO_SelectOSPurchOrder.php:489 PO_SelectPurchOrder.php:432
#: PricesByCost.php:274 Prices.php:222 Prices.php:295 PurchData.php:169
#: PurchData.php:352 PurchData.php:481 SelectSupplier.php:260
-#: SupplierCredit.php:263 SupplierInvoice.php:235 SupplierTransInquiry.php:109
+#: SupplierCredit.php:263 SupplierInvoice.php:233 SupplierTransInquiry.php:109
#: SuppPriceList.php:284 includes/PDFBankingSummaryPageHeader.inc:42
#: includes/PDFDebtorBalsPageHeader.inc:33
#: includes/PDFSupplierBalsPageHeader.inc:36
@@ -1535,7 +1535,7 @@
#: PDFDeliveryDifferences.php:200 PDFDeliveryDifferences.php:296
#: PDFDIFOT.php:190 PDFDIFOT.php:203 PDFDIFOT.php:307 PDFOrdersInvoiced.php:77
#: PDFOrdersInvoiced.php:274 PDFOrderStatus.php:82 PDFOrderStatus.php:256
-#: PDFRemittanceAdvice.php:48 PO_PDFPurchOrder.php:332
+#: PDFRemittanceAdvice.php:48 PO_PDFPurchOrder.php:334
#: PricesBasedOnMarkUp.php:213 PricesBasedOnMarkUp.php:352
#: PrintCustStatements.php:43 PrintCustTrans.php:60 PrintCustTrans.php:63
#: PrintCustTransPortrait.php:58 PrintCustTransPortrait.php:61
@@ -1641,7 +1641,7 @@
msgid "Ref"
msgstr "Ref"
-#: BankMatching.php:264 ConfirmDispatch_Invoice.php:284 Credit_Invoice.php:279
+#: BankMatching.php:264 ConfirmDispatch_Invoice.php:288 Credit_Invoice.php:279
#: CustomerAllocations.php:364 CustomerReceipt.php:897
#: CustomerTransInquiry.php:107 CustWhereAlloc.php:109
#: PaymentAllocations.php:67 Payments.php:1026 Payments.php:1030
@@ -1652,8 +1652,8 @@
#: SuppContractChgs.php:79 SuppContractChgs.php:163 SuppFixedAssetChgs.php:76
#: SuppFixedAssetChgs.php:149 SupplierAllocations.php:457
#: SupplierCredit.php:352 SupplierCredit.php:385 SupplierCredit.php:421
-#: SupplierCredit.php:460 SupplierInvoice.php:330 SupplierInvoice.php:371
-#: SupplierInvoice.php:411 SupplierInvoice.php:455
+#: SupplierCredit.php:460 SupplierInvoice.php:328 SupplierInvoice.php:369
+#: SupplierInvoice.php:409 SupplierInvoice.php:453
#: SupplierTransInquiry.php:108 SuppShiptChgs.php:81 SuppShiptChgs.php:146
#: SuppTransGLAnalysis.php:106 SuppTransGLAnalysis.php:191
#: Z_CheckAllocs.php:66 includes/PDFBankingSummaryPageHeader.inc:55
@@ -1663,7 +1663,7 @@
#: BankMatching.php:265 BankReconciliation.php:214 BankReconciliation.php:289
#: PDFOrdersInvoiced.php:351 PDFOrderStatus.php:322
-#: PO_SelectOSPurchOrder.php:233 PO_SelectPurchOrder.php:214
+#: PO_SelectOSPurchOrder.php:237 PO_SelectPurchOrder.php:214
#: Shipt_Select.php:192 SuppCreditGRNs.php:267
#: includes/PDFStatementPageHeader.inc:173
#: includes/PDFStatementPageHeader.inc:180
@@ -1936,13 +1936,13 @@
#: SelectCreditItems.php:673 SelectCreditItems.php:1034
#: SelectOrderItems.php:1333 SelectOrderItems.php:1491
#: SelectOrderItems.php:1675 SelectOrderItems.php:1802 ShipmentCosting.php:145
-#: ShipmentCosting.php:146 Shipments.php:391 Shipments.php:393
-#: Shipments.php:394 Shipments.php:473 Shipments.php:475 SpecialOrder.php:616
+#: ShipmentCosting.php:146 Shipments.php:401 Shipments.php:403
+#: Shipments.php:404 Shipments.php:488 Shipments.php:490 SpecialOrder.php:617
#: StockCounts.php:98 StockLocMovements.php:92 StockLocTransfer.php:186
#: StockMovements.php:97 StockStatus.php:310 StockUsageGraph.php:12
#: SuppCreditGRNs.php:267 SuppCreditGRNs.php:268 SupplierCredit.php:317
-#: SupplierTenders.php:265 SupplierTenders.php:493 WOSerialNos.php:255
-#: WOSerialNos.php:295 includes/InputSerialItems.php:111
+#: SupplierTenders.php:265 SupplierTenders.php:493 WOSerialNos.php:256
+#: WOSerialNos.php:296 includes/InputSerialItems.php:111
#: includes/InputSerialItems.php:117 includes/OutputSerialItems.php:38
#: includes/OutputSerialItems.php:43 includes/OutputSerialItems.php:49
#: includes/PDFBOMListingPageHeader.inc:44
@@ -2002,8 +2002,8 @@
#: InventoryQuantities.php:232 MRPPlannedPurchaseOrders.php:303
#: MRPPlannedWorkOrders.php:360 MRPReport.php:813 MRPReschedules.php:177
#: MRPShortages.php:331 PDFOrderStatus.php:305 PDFPriceList.php:337
-#: PDFReceipt.php:31 PO_Header.php:814 PO_PDFPurchOrder.php:61
-#: PO_SelectOSPurchOrder.php:511 ReorderLevel.php:251 StockDispatch.php:355
+#: PDFReceipt.php:31 PO_Header.php:820 PO_PDFPurchOrder.php:61
+#: PO_SelectOSPurchOrder.php:519 ReorderLevel.php:251 StockDispatch.php:355
#: SuppPriceList.php:273 Tax.php:243 includes/PDFAgedDebtorsPageHeader.inc:34
#: includes/PDFAgedSuppliersPageHeader.inc:21
#: includes/PDFBalanceSheetPageHeader.inc:25
@@ -2097,9 +2097,9 @@
msgstr "Stavět"
#: BOMExtendedQty.php:331 BOMInquiry.php:114 BOMs.php:856
-#: CounterSales.php:2032 CounterSales.php:2217 PO_SelectOSPurchOrder.php:232
+#: CounterSales.php:2032 CounterSales.php:2217 PO_SelectOSPurchOrder.php:236
#: PO_SelectPurchOrder.php:213 ReorderLevelLocation.php:70
-#: ReorderLevelLocation.php:71 SelectCompletedOrder.php:584
+#: ReorderLevelLocation.php:71 SelectCompletedOrder.php:551
#: SelectOrderItems.php:1487 SelectOrderItems.php:1671
#: SelectSalesOrder.php:582 SelectWorkOrder.php:193 Shipt_Select.php:191
#: TopItems.php:182 includes/PDFTopItemsHeader.inc:54
@@ -2181,20 +2181,20 @@
#: MRPReschedules.php:189 MRPShortages.php:347 PaymentTerms.php:182
#: PcExpenses.php:187 PcExpenses.php:291 PcExpensesTypeTab.php:169
#: PcReportTab.php:171 PcTypeTabs.php:156 PDFOrdersInvoiced.php:348
-#: PDFOrderStatus.php:319 PDFPrintLabel.php:248 PO_Items.php:661
-#: PO_Items.php:1073 PO_SelectOSPurchOrder.php:231 PO_SelectPurchOrder.php:212
+#: PDFOrderStatus.php:319 PDFPrintLabel.php:248 PO_Items.php:659
+#: PO_Items.php:1071 PO_SelectOSPurchOrder.php:235 PO_SelectPurchOrder.php:212
#: PricesByCost.php:152 ReorderLevelLocation.php:67 ReorderLevel.php:266
-#: ReverseGRN.php:385 SalesCategories.php:421 SecurityTokens.php:94
+#: ReverseGRN.php:385 SalesCategories.php:422 SecurityTokens.php:94
#: SecurityTokens.php:103 SecurityTokens.php:118 SelectAsset.php:243
-#: SelectCompletedOrder.php:583 SelectContract.php:153
+#: SelectCompletedOrder.php:550 SelectContract.php:153
#: SelectCreditItems.php:988 SelectOrderItems.php:1485
#: SelectOrderItems.php:1669 SelectProduct.php:516 SelectProduct.php:733
#: SelectSalesOrder.php:581 SelectWorkOrder.php:192 Shipt_Select.php:190
#: StockCategories.php:216 StockDispatch.php:375 StockDispatch.php:382
#: StockLocStatus.php:161 StockQuantityByDate.php:106 SuppCreditGRNs.php:82
-#: SuppCreditGRNs.php:176 SuppFixedAssetChgs.php:75 SuppInvGRNs.php:118
-#: SuppInvGRNs.php:296 SupplierCredit.php:316 SupplierCredit.php:384
-#: SupplierInvoice.php:290 SupplierInvoice.php:370 SupplierTenders.php:264
+#: SuppCreditGRNs.php:176 SuppFixedAssetChgs.php:75 SuppInvGRNs.php:126
+#: SuppInvGRNs.php:304 SupplierCredit.php:316 SupplierCredit.php:384
+#: SupplierInvoice.php:288 SupplierInvoice.php:368 SupplierTenders.php:264
#: SupplierTenders.php:350 SupplierTenders.php:490 SuppPriceList.php:290
#: TaxAuthorities.php:147 TopItems.php:178 WorkCentres.php:127
#: WorkOrderCosting.php:88 WorkOrderCosting.php:120 WorkOrderEntry.php:623
@@ -2272,13 +2272,13 @@
msgstr "sady nebo sestavy musí být k dispozici pro výstavbu kusovníku"
#: BOMInquiry.php:28 BOMs.php:837 MRPDemands.php:331
-#: PO_SelectOSPurchOrder.php:209 PO_SelectPurchOrder.php:189
+#: PO_SelectOSPurchOrder.php:213 PO_SelectPurchOrder.php:18...
[truncated message content] |
|
From: <dai...@us...> - 2011-12-03 04:18:59
|
Revision: 4762
http://web-erp.svn.sourceforge.net/web-erp/?rev=4762&view=rev
Author: daintree
Date: 2011-12-03 04:18:47 +0000 (Sat, 03 Dec 2011)
Log Message:
-----------
pre v 4.06.2
Modified Paths:
--------------
trunk/UpgradeDatabase.php
trunk/doc/Change.log
trunk/includes/ConnectDB.inc
trunk/includes/footer.inc
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.mo
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po
trunk/locale/el_GR.utf8/LC_MESSAGES/messages.mo
trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po
trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot
trunk/locale/en_US.utf8/LC_MESSAGES/messages.mo
trunk/locale/en_US.utf8/LC_MESSAGES/messages.po
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.mo
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.po
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.mo
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.po
trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.mo
trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.po
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.mo
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.po
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.mo
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.po
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.mo
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.po
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.mo
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.po
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.mo
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.po
trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.mo
trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.po
trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.mo
trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.mo
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.mo
trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.po
trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.mo
trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.po
trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.mo
trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.po
trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.mo
trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.po
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.mo
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.po
trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.mo
trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.po
trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.mo
trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.po
trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.mo
trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.po
trunk/sql/mysql/upgrade4.05-4.06.sql
trunk/sql/mysql/weberp-demo.sql
trunk/sql/mysql/weberp-new.sql
Modified: trunk/UpgradeDatabase.php
===================================================================
--- trunk/UpgradeDatabase.php 2011-12-03 03:03:38 UTC (rev 4761)
+++ trunk/UpgradeDatabase.php 2011-12-03 04:18:47 UTC (rev 4762)
@@ -121,8 +121,9 @@
case '4.05.2':
case '4.05.3':
case '4.06':
+ case '4.06.1':
$SQLScripts[] = './sql/mysql/upgrade4.05-4.06.sql';
- case '4.06.1':
+ case '4.06.2':
break;
} //end switch
}
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-12-03 03:03:38 UTC (rev 4761)
+++ trunk/doc/Change.log 2011-12-03 04:18:47 UTC (rev 4762)
@@ -1,5 +1,8 @@
webERP Change Log
+3/12/11 Release 4.06.2
+
+2/12/11 Phil: Added indian_number_format for specific unusal number formatting 00,00,000.00 for India and apparently South Asian countries. Kicks in for en_IN.utf8 and hi_IN.utf8
27/11/11 Phil: Removed a load of DB_escape_string() calls as no longer required now the entire $_POST and $_GET array are DB_escape_string()'ed
27/11/11 Tim: PrintCustTransPortrait.php added bank account code
27/11/11 Tim: GLTagProfit_Loss Gross Profit calculation error was = COGS - fixed
Modified: trunk/includes/ConnectDB.inc
===================================================================
--- trunk/includes/ConnectDB.inc 2011-12-03 03:03:38 UTC (rev 4761)
+++ trunk/includes/ConnectDB.inc 2011-12-03 04:18:47 UTC (rev 4762)
@@ -4,7 +4,7 @@
* this value is saved in the $_SESSION['Versionumber'] when includes/GetConfig.php is run
* if VersionNumber is < $Version then the DB update script is run */
-$Version='4.06.1'; //must update manually every time there is a DB change
+$Version='4.06.2'; //must update manually every time there is a DB change
require_once ($PathPrefix .'includes/MiscFunctions.php');
@@ -31,4 +31,4 @@
include_once($PathPrefix .'includes/ConnectDB_' . $dbType . '.inc');
}
-?>
+?>
\ No newline at end of file
Modified: trunk/includes/footer.inc
===================================================================
--- trunk/includes/footer.inc 2011-12-03 03:03:38 UTC (rev 4761)
+++ trunk/includes/footer.inc 2011-12-03 04:18:47 UTC (rev 4762)
@@ -20,7 +20,7 @@
echo '<tr>
<td class="footer"> </td>
- <td class="footer">webERP v' . $_SESSION['VersionNumber'] . ' ' . _('Copyright') . ' © weberp.org - '.date('Y').'</td>
+ <td class="footer">webERP v' . $_SESSION['VersionNumber'] . ' ' . _('Copyright') . ' © weberp.org 2002 - '.date('Y').'</td>
</tr>';
if(http_file_exists('http://sflogo.sourceforge.net/sflogo.php')) {
Modified: trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po 2011-12-03 03:03:38 UTC (rev 4761)
+++ trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po 2011-12-03 04:18:47 UTC (rev 4762)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: webERP 3.08\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-19 17:05+1300\n"
+"POT-Creation-Date: 2011-12-03 16:31+1300\n"
"PO-Revision-Date: 2011-02-07 15:33+0000\n"
"Last-Translator: Tim Schofield <Unknown>\n"
"Language-Team: Czech <cs...@li...>\n"
@@ -147,9 +147,9 @@
#: Locations.php:256 Locations.php:265 Locations.php:274 Locations.php:283
#: Locations.php:292 Locations.php:301 MRPDemandTypes.php:87
#: PaymentMethods.php:138 PaymentTerms.php:146 PaymentTerms.php:153
-#: PcExpenses.php:158 SalesCategories.php:124 SalesCategories.php:131
+#: PcExpenses.php:158 SalesCategories.php:125 SalesCategories.php:132
#: SalesPeople.php:150 SalesPeople.php:157 SalesPeople.php:163
-#: SalesTypes.php:140 SalesTypes.php:150 Shippers.php:82 Shippers.php:94
+#: SalesTypes.php:140 SalesTypes.php:150 Shippers.php:81 Shippers.php:93
#: StockCategories.php:181 Stocks.php:615 Stocks.php:624 Stocks.php:632
#: Stocks.php:640 Stocks.php:648 Stocks.php:656 Suppliers.php:612
#: Suppliers.php:621 Suppliers.php:629 SupplierTypes.php:145
@@ -220,7 +220,7 @@
#: PcAssignCashToTab.php:146 PcAssignCashToTab.php:187 PDFPickingList.php:28
#: PDFPrintLabel.php:140 PDFStockLocTransfer.php:17
#: PO_AuthorisationLevels.php:10 POReport.php:60 POReport.php:64
-#: POReport.php:68 PO_SelectOSPurchOrder.php:135 PricesBasedOnMarkUp.php:8
+#: POReport.php:68 PO_SelectOSPurchOrder.php:139 PricesBasedOnMarkUp.php:8
#: Prices_Customer.php:35 Prices.php:30 PurchData.php:137 PurchData.php:258
#: PurchData.php:282 RecurringSalesOrders.php:309 SalesAnalReptCols.php:51
#: SalesAnalRepts.php:11 SalesCategories.php:11 SalesGLPostings.php:17
@@ -231,7 +231,7 @@
#: SelectOrderItems.php:1603 SelectProduct.php:496 SelectSalesOrder.php:533
#: SelectSupplier.php:9 SelectSupplier.php:198 SelectWorkOrder.php:9
#: SelectWorkOrder.php:151 ShipmentCosting.php:11 Shipments.php:17
-#: Shippers.php:123 Shippers.php:159 Shipt_Select.php:8
+#: Shippers.php:122 Shippers.php:158 Shipt_Select.php:8
#: StockLocMovements.php:13 StockLocStatus.php:27 Suppliers.php:302
#: SupplierTenders.php:260 SupplierTenders.php:317 SupplierTransInquiry.php:10
#: TaxGroups.php:15 TaxProvinces.php:11 TopItems.php:77
@@ -278,14 +278,14 @@
#: PaymentMethods.php:275 PcAuthorizeExpenses.php:244 PDFChequeListing.php:63
#: PDFDeliveryDifferences.php:75 PDFDIFOT.php:75
#: PO_AuthorisationLevels.php:134 PO_AuthorisationLevels.php:139
-#: PO_Header.php:777 PO_PDFPurchOrder.php:382 PO_PDFPurchOrder.php:385
+#: PO_Header.php:783 PO_PDFPurchOrder.php:384 PO_PDFPurchOrder.php:387
#: PurchData.php:189 PurchData.php:514 PurchData.php:517
#: RecurringSalesOrders.php:482 RecurringSalesOrders.php:485
#: SalesAnalReptCols.php:284 SalesAnalReptCols.php:419
#: SalesAnalReptCols.php:422 SalesAnalRepts.php:415 SalesAnalRepts.php:418
#: SalesAnalRepts.php:443 SalesAnalRepts.php:446 SalesAnalRepts.php:471
-#: SalesAnalRepts.php:474 SalesPeople.php:219 SalesPeople.php:354
-#: SalesPeople.php:356 SelectProduct.php:381 ShipmentCosting.php:663
+#: SalesAnalRepts.php:474 SalesPeople.php:219 SalesPeople.php:355
+#: SalesPeople.php:357 SelectProduct.php:381 ShipmentCosting.php:663
#: Stocks.php:1015 Stocks.php:1017 Stocks.php:1040 Stocks.php:1042
#: SuppContractChgs.php:90 SystemParameters.php:389 SystemParameters.php:412
#: SystemParameters.php:428 SystemParameters.php:491 SystemParameters.php:499
@@ -294,7 +294,7 @@
#: SystemParameters.php:781 SystemParameters.php:916 SystemParameters.php:918
#: SystemParameters.php:928 SystemParameters.php:930 SystemParameters.php:984
#: SystemParameters.php:996 SystemParameters.php:998 TaxGroups.php:307
-#: TaxGroups.php:310 TaxGroups.php:366 WWW_Users.php:632 WWW_Users.php:634
+#: TaxGroups.php:310 TaxGroups.php:366 WWW_Users.php:636 WWW_Users.php:638
msgid "Yes"
msgstr "Ano"
@@ -313,14 +313,14 @@
#: PaymentMethods.php:276 PcAuthorizeExpenses.php:242 PDFChequeListing.php:62
#: PDFDeliveryDifferences.php:74 PDFDIFOT.php:74
#: PO_AuthorisationLevels.php:136 PO_AuthorisationLevels.php:141
-#: PO_Header.php:776 PO_PDFPurchOrder.php:383 PO_PDFPurchOrder.php:386
+#: PO_Header.php:782 PO_PDFPurchOrder.php:385 PO_PDFPurchOrder.php:388
#: PurchData.php:192 PurchData.php:515 PurchData.php:518
#: RecurringSalesOrders.php:481 RecurringSalesOrders.php:484
#: SalesAnalReptCols.php:282 SalesAnalReptCols.php:420
#: SalesAnalReptCols.php:423 SalesAnalRepts.php:414 SalesAnalRepts.php:417
#: SalesAnalRepts.php:442 SalesAnalRepts.php:445 SalesAnalRepts.php:470
-#: SalesAnalRepts.php:473 SalesPeople.php:221 SalesPeople.php:359
-#: SalesPeople.php:361 SelectProduct.php:383 ShipmentCosting.php:664
+#: SalesAnalRepts.php:473 SalesPeople.php:221 SalesPeople.php:360
+#: SalesPeople.php:362 SelectProduct.php:383 ShipmentCosting.php:664
#: Stocks.php:1010 Stocks.php:1012 Stocks.php:1035 Stocks.php:1037
#: SuppContractChgs.php:92 SystemParameters.php:390 SystemParameters.php:413
#: SystemParameters.php:429 SystemParameters.php:492 SystemParameters.php:500
@@ -329,7 +329,7 @@
#: SystemParameters.php:782 SystemParameters.php:915 SystemParameters.php:919
#: SystemParameters.php:927 SystemParameters.php:931 SystemParameters.php:985
#: SystemParameters.php:995 SystemParameters.php:999 TaxGroups.php:308
-#: TaxGroups.php:311 TaxGroups.php:368 WWW_Users.php:631 WWW_Users.php:635
+#: TaxGroups.php:311 TaxGroups.php:368 WWW_Users.php:635 WWW_Users.php:639
#: includes/PDFLowGPPageHeader.inc:44 includes/PDFTaxPageHeader.inc:35
msgid "No"
msgstr "Ne"
@@ -346,11 +346,11 @@
#: PaymentMethods.php:200 PaymentTerms.php:205 PcAssignCashToTab.php:259
#: PcClaimExpensesFromTab.php:252 PcExpenses.php:223 PcTabs.php:234
#: PcTypeTabs.php:172 PO_AuthorisationLevels.php:151 Prices_Customer.php:278
-#: Prices.php:251 PurchData.php:204 SalesCategories.php:255
+#: Prices.php:251 PurchData.php:204 SalesCategories.php:256
#: SalesGLPostings.php:132 SalesGLPostings.php:245 SalesPeople.php:232
#: SalesTypes.php:206 SecurityTokens.php:128 SelectCustomer.php:612
#: SelectCustomer.php:630 SelectCustomer.php:654 SelectCustomer.php:671
-#: SelectCustomer.php:695 SelectCustomer.php:712 Shippers.php:144
+#: SelectCustomer.php:695 SelectCustomer.php:712 Shippers.php:143
#: StockCategories.php:242 SupplierContacts.php:163 SupplierTypes.php:189
#: SuppTransGLAnalysis.php:120 TaxAuthorities.php:174 TaxCategories.php:182
#: TaxGroups.php:188 TaxProvinces.php:180 UnitsOfMeasure.php:185
@@ -378,20 +378,20 @@
#: PaymentMethods.php:201 Payments.php:1069 PaymentTerms.php:206
#: PcAssignCashToTab.php:263 PcClaimExpensesFromTab.php:253 PcExpenses.php:224
#: PcExpensesTypeTab.php:185 PcTabs.php:235 PcTypeTabs.php:173
-#: PO_AuthorisationLevels.php:153 PO_Items.php:711 Prices_Customer.php:279
+#: PO_AuthorisationLevels.php:153 PO_Items.php:709 Prices_Customer.php:279
#: Prices.php:252 PurchData.php:205 SalesAnalReptCols.php:299
-#: SalesAnalRepts.php:303 SalesCategories.php:256 SalesGLPostings.php:133
+#: SalesAnalRepts.php:303 SalesCategories.php:257 SalesGLPostings.php:133
#: SalesGLPostings.php:246 SalesPeople.php:233 SalesTypes.php:207
#: SecurityTokens.php:129 SelectCreditItems.php:764 SelectCustomer.php:613
#: SelectCustomer.php:631 SelectCustomer.php:655 SelectCustomer.php:672
#: SelectCustomer.php:696 SelectCustomer.php:713 SelectOrderItems.php:1398
-#: Shipments.php:429 Shippers.php:145 SpecialOrder.php:655
-#: StockCategories.php:243 StockCategories.php:554 SuppContractChgs.php:99
-#: SuppCreditGRNs.php:102 SuppFixedAssetChgs.php:87 SuppInvGRNs.php:139
+#: Shipments.php:440 Shippers.php:144 SpecialOrder.php:656
+#: StockCategories.php:243 StockCategories.php:557 SuppContractChgs.php:99
+#: SuppCreditGRNs.php:102 SuppFixedAssetChgs.php:87 SuppInvGRNs.php:147
#: SupplierContacts.php:164 SupplierTypes.php:191 SuppShiptChgs.php:90
#: SuppTransGLAnalysis.php:121 TaxAuthorities.php:175 TaxCategories.php:183
#: TaxGroups.php:189 TaxProvinces.php:181 UnitsOfMeasure.php:186
-#: WorkCentres.php:142 WOSerialNos.php:319 WWW_Access.php:124
+#: WorkCentres.php:142 WOSerialNos.php:320 WWW_Access.php:124
#: WWW_Users.php:319 includes/InputSerialItemsKeyed.php:58
#: includes/OutputSerialItems.php:99
#, php-format
@@ -446,10 +446,10 @@
#: OffersReceived.php:56 OffersReceived.php:143 PaymentMethods.php:282
#: PaymentTerms.php:309 PO_AuthorisationLevels.php:248 Prices_Customer.php:356
#: SalesAnalReptCols.php:552 SalesAnalRepts.php:514 SalesGLPostings.php:416
-#: SalesPeople.php:368 Shippers.php:200 StockCategories.php:581
+#: SalesPeople.php:369 Shippers.php:199 StockCategories.php:584
#: SupplierContacts.php:281 SuppLoginSetup.php:293 TaxAuthorities.php:327
#: TaxCategories.php:237 TaxProvinces.php:235 UnitsOfMeasure.php:240
-#: WorkCentres.php:279 WWW_Users.php:674
+#: WorkCentres.php:279 WWW_Users.php:678
msgid "Enter Information"
msgstr "Vložit informace"
@@ -560,7 +560,7 @@
#: AddCustomerTypeNotes.php:49 Areas.php:73 CustomerTypes.php:69
#: DeliveryDetails.php:774 Factors.php:105 FixedAssetItems.php:246
#: MRPCalendar.php:176 PcAssignCashToTab.php:88 PcClaimExpensesFromTab.php:79
-#: PcExpenses.php:95 PcTabs.php:102 PcTypeTabs.php:60 PO_Items.php:374
+#: PcExpenses.php:95 PcTabs.php:102 PcTypeTabs.php:60 PO_Items.php:371
#: SalesAnalReptCols.php:129 SalesPeople.php:97 SalesTypes.php:66
#: Stocks.php:497 Suppliers.php:513 SupplierTypes.php:67
msgid "has been updated"
@@ -597,12 +597,12 @@
#: CustomerBranches.php:374 CustomerBranches.php:774 CustomerInquiry.php:253
#: Customers.php:1017 Customers.php:1025 EmailCustTrans.php:15
#: EmailCustTrans.php:63 Factors.php:245 Factors.php:292 Locations.php:563
-#: OrderDetails.php:109 PDFRemittanceAdvice.php:243 PO_PDFPurchOrder.php:369
-#: PO_PDFPurchOrder.php:372 PrintCustTrans.php:714 PrintCustTrans.php:945
+#: OrderDetails.php:109 PDFRemittanceAdvice.php:243 PO_PDFPurchOrder.php:371
+#: PO_PDFPurchOrder.php:374 PrintCustTrans.php:714 PrintCustTrans.php:945
#: PrintCustTrans.php:994 PrintCustTransPortrait.php:753
#: PrintCustTransPortrait.php:999 PrintCustTransPortrait.php:1056
#: SelectCustomer.php:610 SupplierContacts.php:154 SupplierContacts.php:274
-#: UserSettings.php:183 WWW_Users.php:274 includes/PDFPickingListHeader.inc:25
+#: UserSettings.php:184 WWW_Users.php:274 includes/PDFPickingListHeader.inc:25
#: includes/PDFStatementPageHeader.inc:67 includes/PDFTransPageHeader.inc:82
#: includes/PDFTransPageHeaderPortrait.inc:109
#: includes/PO_PDFOrderPageHeader.inc:29
@@ -613,7 +613,7 @@
#: Customers.php:1026 PcAssignCashToTab.php:224 PcAssignCashToTab.php:353
#: PcAuthorizeExpenses.php:92 PcClaimExpensesFromTab.php:214
#: PcClaimExpensesFromTab.php:372 PcReportTab.php:327 SelectCustomer.php:611
-#: SystemParameters.php:328 WOSerialNos.php:290 WOSerialNos.php:296
+#: SystemParameters.php:328 WOSerialNos.php:291 WOSerialNos.php:297
msgid "Notes"
msgstr "Bere na vědomí"
@@ -635,7 +635,7 @@
msgstr "Jméno kontaktní osoby"
#: AddCustomerContacts.php:231 Contracts.php:775 PDFRemittanceAdvice.php:239
-#: PO_Header.php:986 PO_Header.php:1067 SelectCreditItems.php:241
+#: PO_Header.php:992 PO_Header.php:1073 SelectCreditItems.php:241
#: SelectCustomer.php:417 SelectOrderItems.php:606
#: includes/PDFStatementPageHeader.inc:63 includes/PDFTransPageHeader.inc:81
#: includes/PDFTransPageHeaderPortrait.inc:105
@@ -685,7 +685,7 @@
#: PaymentAllocations.php:66 PcAssignCashToTab.php:220
#: PcAuthorizeExpenses.php:88 PDFRemittanceAdvice.php:300
#: PrintCustTrans.php:822 PrintCustTransPortrait.php:867 ReverseGRN.php:386
-#: ShipmentCosting.php:534 ShipmentCosting.php:611 Shipments.php:476
+#: ShipmentCosting.php:534 ShipmentCosting.php:611 Shipments.php:491
#: StockDispatch.php:189 StockDispatch.php:201 StockLocMovements.php:90
#: StockMovements.php:94 StockSerialItemResearch.php:81
#: SupplierAllocations.php:455 SupplierAllocations.php:568
@@ -699,10 +699,10 @@
msgstr "Datum"
#: AddCustomerNotes.php:122 AddCustomerTypeNotes.php:109 PcReportTab.php:173
-#: Stocks.php:1019 UpgradeDatabase.php:175 UpgradeDatabase.php:178
-#: UpgradeDatabase.php:181 UpgradeDatabase.php:184 UpgradeDatabase.php:187
-#: UpgradeDatabase.php:190 UpgradeDatabase.php:193 UpgradeDatabase.php:196
-#: UpgradeDatabase.php:199 Z_Upgrade_3.10-3.11.php:62
+#: Stocks.php:1019 UpgradeDatabase.php:176 UpgradeDatabase.php:179
+#: UpgradeDatabase.php:182 UpgradeDatabase.php:185 UpgradeDatabase.php:188
+#: UpgradeDatabase.php:191 UpgradeDatabase.php:194 UpgradeDatabase.php:197
+#: UpgradeDatabase.php:200 Z_Upgrade_3.10-3.11.php:62
#: Z_Upgrade_3.10-3.11.php:66 Z_Upgrade_3.10-3.11.php:70
#: Z_Upgrade_3.10-3.11.php:74 Z_Upgrade_3.10-3.11.php:78
#: Z_Upgrade_3.11-4.00.php:62 Z_Upgrade_3.11-4.00.php:66
@@ -850,7 +850,7 @@
#: PDFPriceList.php:128 PDFQuotation.php:270 PDFQuotationPortrait.php:268
#: PDFRemittanceAdvice.php:83 PDFStockCheckComparison.php:37
#: PDFStockCheckComparison.php:63 PDFStockCheckComparison.php:268
-#: PO_PDFPurchOrder.php:31 PO_PDFPurchOrder.php:152
+#: PO_PDFPurchOrder.php:31 PO_PDFPurchOrder.php:154
#: PrintCustOrder_generic.php:243 PrintCustOrder.php:220 ReorderLevel.php:63
#: ReorderLevel.php:152 SalesAnalysis_UserDefined.php:28
#: SelectCreditItems.php:30 StockCheck.php:47 StockCheck.php:69
@@ -879,16 +879,16 @@
msgstr "Podrobnosti o nesplacených transakcí pro zákazníka"
#: AgedDebtors.php:370 AgedSuppliers.php:198 GLAccountCSV.php:168
-#: GLAccountInquiry.php:143 GLAccountReport.php:94 PO_Items.php:435
-#: PO_Items.php:559 PO_Items.php:584 SalesAnalReptCols.php:365
-#: SpecialOrder.php:440 StockLocTransferReceive.php:370
+#: GLAccountInquiry.php:143 GLAccountReport.php:94 PO_Items.php:433
+#: PO_Items.php:557 PO_Items.php:582 SalesAnalReptCols.php:365
+#: SpecialOrder.php:441 StockLocTransferReceive.php:370
#: StockQuantityByDate.php:121 includes/SelectOrderItems_IntoCart.inc:54
msgid "could not be retrieved because"
msgstr "se nepodařilo získat, protože"
#: AgedDebtors.php:373 AgedSuppliers.php:201 Areas.php:95
-#: ConfirmDispatch_Invoice.php:160 ConfirmDispatch_Invoice.php:967
-#: ConfirmDispatch_Invoice.php:981 Contracts.php:580 CounterSales.php:1365
+#: ConfirmDispatch_Invoice.php:160 ConfirmDispatch_Invoice.php:974
+#: ConfirmDispatch_Invoice.php:988 Contracts.php:580 CounterSales.php:1365
#: CounterSales.php:1379 Credit_Invoice.php:697 Credit_Invoice.php:718
#: CustomerReceipt.php:542 CustomerReceipt.php:681 CustomerReceipt.php:709
#: CustomerTransInquiry.php:91 DeliveryDetails.php:396 GLProfit_Loss.php:596
@@ -909,7 +909,7 @@
#: includes/PDFPaymentRun_PymtFooter.php:91
#: includes/PDFPaymentRun_PymtFooter.php:121
#: includes/PDFPaymentRun_PymtFooter.php:158
-#: includes/PDFPaymentRun_PymtFooter.php:189 includes/ConnectDB_mysqli.inc:81
+#: includes/PDFPaymentRun_PymtFooter.php:189 includes/ConnectDB_mysqli.inc:76
#: includes/ConnectDB_mysql.inc:67
msgid "The SQL that failed was"
msgstr "SQL příkaz, který selhal, byl"
@@ -1109,7 +1109,7 @@
#: FixedAssetCategories.php:138 GLAccounts.php:197 Locations.php:328
#: MRPDemands.php:248 PcAssignCashToTab.php:135 PcClaimExpensesFromTab.php:126
#: PcExpenses.php:166 PcExpensesTypeTab.php:101 PcTabs.php:166
-#: PcTypeTabs.php:135 SalesAnalReptCols.php:215 SalesCategories.php:135
+#: PcTypeTabs.php:135 SalesAnalReptCols.php:215 SalesCategories.php:136
#: SalesTypes.php:156 StockCategories.php:198 Suppliers.php:638
#: SupplierTypes.php:151 Z_DeleteInvoice.php:146
msgid "has been deleted"
@@ -1152,7 +1152,7 @@
#: AuditTrail.php:47 PO_AuthorisationLevels.php:124
#: PO_AuthorisationLevels.php:172 PO_AuthorisationLevels.php:175
-#: UserSettings.php:111
+#: UserSettings.php:112
msgid "User ID"
msgstr "ID uživatele"
@@ -1163,7 +1163,7 @@
#: InventoryQuantities.php:193 InventoryQuantities.php:195 MRP.php:585
#: MRPReport.php:523 MRPReport.php:525 MRPReschedules.php:144
#: PDFPeriodStockTransListing.php:59 PDFPriceList.php:198
-#: PDFPrintLabel.php:250 PO_Items.php:1023 POReport.php:1567
+#: PDFPrintLabel.php:250 PO_Items.php:1021 POReport.php:1567
#: ReorderLevel.php:181 ReorderLevel.php:183 ReorderLevel.php:213
#: ReorderLevel.php:215 SalesGraph.php:97 SalesGraph.php:99 SalesGraph.php:119
#: SalesGraph.php:121 SalesGraph.php:143 SalesGraph.php:145 SalesGraph.php:179
@@ -1408,10 +1408,10 @@
#: PcTabs.php:206 PcTabs.php:349 PDFPrintLabel.php:97
#: PO_AuthorisationLevels.php:126 PO_AuthorisationLevels.php:209
#: PO_AuthorisationLevels.php:214 PO_AuthoriseMyOrders.php:115
-#: PO_Header.php:554 PO_SelectOSPurchOrder.php:481 PO_SelectPurchOrder.php:432
+#: PO_Header.php:558 PO_SelectOSPurchOrder.php:489 PO_SelectPurchOrder.php:432
#: PricesByCost.php:274 Prices.php:222 Prices.php:295 PurchData.php:169
#: PurchData.php:352 PurchData.php:481 SelectSupplier.php:260
-#: SupplierCredit.php:263 SupplierInvoice.php:235 SupplierTransInquiry.php:109
+#: SupplierCredit.php:263 SupplierInvoice.php:233 SupplierTransInquiry.php:109
#: SuppPriceList.php:284 includes/PDFBankingSummaryPageHeader.inc:42
#: includes/PDFDebtorBalsPageHeader.inc:33
#: includes/PDFSupplierBalsPageHeader.inc:36
@@ -1535,7 +1535,7 @@
#: PDFDeliveryDifferences.php:200 PDFDeliveryDifferences.php:296
#: PDFDIFOT.php:190 PDFDIFOT.php:203 PDFDIFOT.php:307 PDFOrdersInvoiced.php:77
#: PDFOrdersInvoiced.php:274 PDFOrderStatus.php:82 PDFOrderStatus.php:256
-#: PDFRemittanceAdvice.php:48 PO_PDFPurchOrder.php:332
+#: PDFRemittanceAdvice.php:48 PO_PDFPurchOrder.php:334
#: PricesBasedOnMarkUp.php:213 PricesBasedOnMarkUp.php:352
#: PrintCustStatements.php:43 PrintCustTrans.php:60 PrintCustTrans.php:63
#: PrintCustTransPortrait.php:58 PrintCustTransPortrait.php:61
@@ -1641,7 +1641,7 @@
msgid "Ref"
msgstr "Ref"
-#: BankMatching.php:264 ConfirmDispatch_Invoice.php:284 Credit_Invoice.php:279
+#: BankMatching.php:264 ConfirmDispatch_Invoice.php:288 Credit_Invoice.php:279
#: CustomerAllocations.php:364 CustomerReceipt.php:897
#: CustomerTransInquiry.php:107 CustWhereAlloc.php:109
#: PaymentAllocations.php:67 Payments.php:1026 Payments.php:1030
@@ -1652,8 +1652,8 @@
#: SuppContractChgs.php:79 SuppContractChgs.php:163 SuppFixedAssetChgs.php:76
#: SuppFixedAssetChgs.php:149 SupplierAllocations.php:457
#: SupplierCredit.php:352 SupplierCredit.php:385 SupplierCredit.php:421
-#: SupplierCredit.php:460 SupplierInvoice.php:330 SupplierInvoice.php:371
-#: SupplierInvoice.php:411 SupplierInvoice.php:455
+#: SupplierCredit.php:460 SupplierInvoice.php:328 SupplierInvoice.php:369
+#: SupplierInvoice.php:409 SupplierInvoice.php:453
#: SupplierTransInquiry.php:108 SuppShiptChgs.php:81 SuppShiptChgs.php:146
#: SuppTransGLAnalysis.php:106 SuppTransGLAnalysis.php:191
#: Z_CheckAllocs.php:66 includes/PDFBankingSummaryPageHeader.inc:55
@@ -1663,7 +1663,7 @@
#: BankMatching.php:265 BankReconciliation.php:214 BankReconciliation.php:289
#: PDFOrdersInvoiced.php:351 PDFOrderStatus.php:322
-#: PO_SelectOSPurchOrder.php:233 PO_SelectPurchOrder.php:214
+#: PO_SelectOSPurchOrder.php:237 PO_SelectPurchOrder.php:214
#: Shipt_Select.php:192 SuppCreditGRNs.php:267
#: includes/PDFStatementPageHeader.inc:173
#: includes/PDFStatementPageHeader.inc:180
@@ -1936,13 +1936,13 @@
#: SelectCreditItems.php:673 SelectCreditItems.php:1034
#: SelectOrderItems.php:1333 SelectOrderItems.php:1491
#: SelectOrderItems.php:1675 SelectOrderItems.php:1802 ShipmentCosting.php:145
-#: ShipmentCosting.php:146 Shipments.php:391 Shipments.php:393
-#: Shipments.php:394 Shipments.php:473 Shipments.php:475 SpecialOrder.php:616
+#: ShipmentCosting.php:146 Shipments.php:401 Shipments.php:403
+#: Shipments.php:404 Shipments.php:488 Shipments.php:490 SpecialOrder.php:617
#: StockCounts.php:98 StockLocMovements.php:92 StockLocTransfer.php:186
#: StockMovements.php:97 StockStatus.php:310 StockUsageGraph.php:12
#: SuppCreditGRNs.php:267 SuppCreditGRNs.php:268 SupplierCredit.php:317
-#: SupplierTenders.php:265 SupplierTenders.php:493 WOSerialNos.php:255
-#: WOSerialNos.php:295 includes/InputSerialItems.php:111
+#: SupplierTenders.php:265 SupplierTenders.php:493 WOSerialNos.php:256
+#: WOSerialNos.php:296 includes/InputSerialItems.php:111
#: includes/InputSerialItems.php:117 includes/OutputSerialItems.php:38
#: includes/OutputSerialItems.php:43 includes/OutputSerialItems.php:49
#: includes/PDFBOMListingPageHeader.inc:44
@@ -2002,8 +2002,8 @@
#: InventoryQuantities.php:232 MRPPlannedPurchaseOrders.php:303
#: MRPPlannedWorkOrders.php:360 MRPReport.php:813 MRPReschedules.php:177
#: MRPShortages.php:331 PDFOrderStatus.php:305 PDFPriceList.php:337
-#: PDFReceipt.php:31 PO_Header.php:814 PO_PDFPurchOrder.php:61
-#: PO_SelectOSPurchOrder.php:511 ReorderLevel.php:251 StockDispatch.php:355
+#: PDFReceipt.php:31 PO_Header.php:820 PO_PDFPurchOrder.php:61
+#: PO_SelectOSPurchOrder.php:519 ReorderLevel.php:251 StockDispatch.php:355
#: SuppPriceList.php:273 Tax.php:243 includes/PDFAgedDebtorsPageHeader.inc:34
#: includes/PDFAgedSuppliersPageHeader.inc:21
#: includes/PDFBalanceSheetPageHeader.inc:25
@@ -2097,9 +2097,9 @@
msgstr "Stavět"
#: BOMExtendedQty.php:331 BOMInquiry.php:114 BOMs.php:856
-#: CounterSales.php:2032 CounterSales.php:2217 PO_SelectOSPurchOrder.php:232
+#: CounterSales.php:2032 CounterSales.php:2217 PO_SelectOSPurchOrder.php:236
#: PO_SelectPurchOrder.php:213 ReorderLevelLocation.php:70
-#: ReorderLevelLocation.php:71 SelectCompletedOrder.php:584
+#: ReorderLevelLocation.php:71 SelectCompletedOrder.php:551
#: SelectOrderItems.php:1487 SelectOrderItems.php:1671
#: SelectSalesOrder.php:582 SelectWorkOrder.php:193 Shipt_Select.php:191
#: TopItems.php:182 includes/PDFTopItemsHeader.inc:54
@@ -2181,20 +2181,20 @@
#: MRPReschedules.php:189 MRPShortages.php:347 PaymentTerms.php:182
#: PcExpenses.php:187 PcExpenses.php:291 PcExpensesTypeTab.php:169
#: PcReportTab.php:171 PcTypeTabs.php:156 PDFOrdersInvoiced.php:348
-#: PDFOrderStatus.php:319 PDFPrintLabel.php:248 PO_Items.php:661
-#: PO_Items.php:1073 PO_SelectOSPurchOrder.php:231 PO_SelectPurchOrder.php:212
+#: PDFOrderStatus.php:319 PDFPrintLabel.php:248 PO_Items.php:659
+#: PO_Items.php:1071 PO_SelectOSPurchOrder.php:235 PO_SelectPurchOrder.php:212
#: PricesByCost.php:152 ReorderLevelLocation.php:67 ReorderLevel.php:266
-#: ReverseGRN.php:385 SalesCategories.php:421 SecurityTokens.php:94
+#: ReverseGRN.php:385 SalesCategories.php:422 SecurityTokens.php:94
#: SecurityTokens.php:103 SecurityTokens.php:118 SelectAsset.php:243
-#: SelectCompletedOrder.php:583 SelectContract.php:153
+#: SelectCompletedOrder.php:550 SelectContract.php:153
#: SelectCreditItems.php:988 SelectOrderItems.php:1485
#: SelectOrderItems.php:1669 SelectProduct.php:516 SelectProduct.php:733
#: SelectSalesOrder.php:581 SelectWorkOrder.php:192 Shipt_Select.php:190
#: StockCategories.php:216 StockDispatch.php:375 StockDispatch.php:382
#: StockLocStatus.php:161 StockQuantityByDate.php:106 SuppCreditGRNs.php:82
-#: SuppCreditGRNs.php:176 SuppFixedAssetChgs.php:75 SuppInvGRNs.php:118
-#: SuppInvGRNs.php:296 SupplierCredit.php:316 SupplierCredit.php:384
-#: SupplierInvoice.php:290 SupplierInvoice.php:370 SupplierTenders.php:264
+#: SuppCreditGRNs.php:176 SuppFixedAssetChgs.php:75 SuppInvGRNs.php:126
+#: SuppInvGRNs.php:304 SupplierCredit.php:316 SupplierCredit.php:384
+#: SupplierInvoice.php:288 SupplierInvoice.php:368 SupplierTenders.php:264
#: SupplierTenders.php:350 SupplierTenders.php:490 SuppPriceList.php:290
#: TaxAuthorities.php:147 TopItems.php:178 WorkCentres.php:127
#: WorkOrderCosting.php:88 WorkOrderCosting.php:120 WorkOrderEntry.php:623
@@ -2272,13 +2272,13 @@
msgstr "sady nebo sestavy musí být k dispozici pro výstavbu kusovníku"
#: BOMInquiry.php:28 BOMs.php:837 MRPDemands.php:331
-#: PO_SelectOSPurchOrder.php:209 PO_SelectPurchOrder.php:189
+#: PO_SelectOSPurchOrder.php:213 PO_SelectPurchOrder.php:18...
[truncated message content] |
|
From: <dai...@us...> - 2011-12-08 18:48:08
|
Revision: 4764
http://web-erp.svn.sourceforge.net/web-erp/?rev=4764&view=rev
Author: daintree
Date: 2011-12-08 18:48:01 +0000 (Thu, 08 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/StockLocTransfer.php
trunk/StockStatus.php
trunk/Z_ImportFixedAssets.php
trunk/index.php
Modified: trunk/StockLocTransfer.php
===================================================================
--- trunk/StockLocTransfer.php 2011-12-07 07:03:38 UTC (rev 4763)
+++ trunk/StockLocTransfer.php 2011-12-08 18:48:01 UTC (rev 4764)
@@ -33,26 +33,23 @@
//loop through file rows
while ( ($myrow = fgetcsv($FileHandle, 10000, ',')) !== FALSE ) {
- //check for correct number of fields
- $FieldCount = count($myrow);
- if ($FieldCount != 2)){
- prnMsg (_('File contains') . ' '. $FieldCount . ' ' . _('columns, but only 2 columns are expected. The comma separated file should have just two columns the first for the item code and the second for the quantity to transfer'),'error');
+ if (count($myrow) != 2){
+ prnMsg (_('File contains') . ' '. count($myrow) . ' ' . _('columns, but only 2 columns are expected. The comma separated file should have just two columns the first for the item code and the second for the quantity to transfer'),'error');
fclose($FileHandle);
include('includes/footer.inc');
exit;
}
// cleanup the data (csv files often import with empty strings and such)
+ $StockID='';
+ $Quantity=0;
for ($i=0; $i<count($myrow);$i++) {
- $StockID='';
- $Quantity=0;
- $myrow[$i] = trim($myrow[$i]);
switch ($i) {
case 0:
$StockID = trim(mb_strtoupper($myrow[$i]));
$result = DB_query("SELECT COUNT(stockid) FROM stockmaster WHERE stockid='" . $StockID . "'",$db);
- $myrow = DB_fetch_row($result);
- if ($myrow[0]==0){
+ $StockIDCheck = DB_fetch_row($result);
+ if ($StockIDCheck[0]==0){
$InputError = True;
$ErrorMessage .= _('The part code entered of'). ' ' . $StockID . ' '. _('is not set up in the database') . '. ' . _('Only valid parts can be entered for transfers'). '<br />';
}
@@ -73,76 +70,77 @@
AND loccode='".$_POST['FromStockLocation']."'",
$db);
$CheckStockRow = DB_fetch_array($result);
- if ($myrow['quantity'] < $Quantity){
+ if ($CheckStockRow['quantity'] < $Quantity){
$InputError = True;
- $ErrorMessage .= _('The item'). ' ' . $StockID . ' ' . _('does not have enough stock available (') . ' ' . $myrow['quantity'] . ')' . ' ' . _('The quantity required to transfer was') . ' ' . $Quantity . '.<br />';
+ $ErrorMessage .= _('The item'). ' ' . $StockID . ' ' . _('does not have enough stock available (') . ' ' . $CheckStockRow['quantity'] . ')' . ' ' . _('The quantity required to transfer was') . ' ' . $Quantity . '.<br />';
}
}
-
- if ($StockID!='' AND $Quantity!=0){
- $_POST['StockID' . $RowCounter] = $StockID;
- $_POST['StockQTY' . $RowCounter] = $Quantity;
- }
} // end for loop through the columns on the row being processed
- $TotalItems++;
- $_POST['LinesCounter']=$TotalItems;
+ if ($StockID!='' AND $Quantity!=0){
+ $_POST['StockID' . $TotalItems] = $StockID;
+ $_POST['StockQTY' . $TotalItems] = $Quantity;
+ $StockID='';
+ $Quantity=0;
+ $TotalItems++;
+ }
} //end while there are lines in the CSV file
+ $_POST['LinesCounter']=$TotalItems;
} //end if there is a CSV file to import
else { // process the manually input lines
- $ErrorMessage='';
- for ($i=$_POST['LinesCounter']-10;$i<$_POST['LinesCounter'];$i++){
- if (isset($_POST['StockID' . $i]) AND $_POST['StockID' . $i]!=''){
- $_POST['StockID' . $i]=trim(mb_strtoupper($_POST['StockID' . $i]));
- $result = DB_query("SELECT COUNT(stockid) FROM stockmaster WHERE stockid='" . $_POST['StockID' . $i] . "'",$db);
- $myrow = DB_fetch_row($result);
- if ($myrow[0]==0){
- $InputError = True;
- $ErrorMessage .= _('The part code entered of'). ' ' . $_POST['StockID' . $i] . ' '. _('is not set up in the database') . '. ' . _('Only valid parts can be entered for transfers'). '<br />';
- $_POST['LinesCounter'] -= 10;
- }
- DB_free_result( $result );
- if (!is_numeric(filter_number_format($_POST['StockQTY' . $i]))){
- $InputError = True;
- $ErrorMessage .= _('The quantity entered of'). ' ' . $_POST['StockQTY' . $i] . ' '. _('for part code'). ' ' . $_POST['StockID' . $i] . ' '. _('is not numeric') . '. ' . _('The quantity entered for transfers is expected to be numeric').'<br />';
- $_POST['LinesCounter'] -= 10;
- }
- if (filter_number_format($_POST['StockQTY' . $i]) <= 0){
- $InputError = True;
- $ErrorMessage .= _('The quantity entered for').' '. $_POST['StockID' . $i] . ' ' . _('is less than or equal to 0') . '. ' . _('Please correct this or remove the item').'<br />';
- $_POST['LinesCounter'] -= 10;
- }
- if ($_SESSION['ProhibitNegativeStock']==1){
- // Only if stock exists at this location
- $result = DB_query("SELECT quantity
- FROM locstock
- WHERE stockid='" . $_POST['StockID' . $i] . "'
- AND loccode='".$_POST['FromStockLocation']."'",
- $db);
-
- $myrow = DB_fetch_row($result);
- if ($myrow[0] < filter_number_format($_POST['StockQTY' . $i])){
- $InputError = True;
- $ErrorMessage .= _('The part code entered of'). ' ' . $_POST['StockID' . $i] . ' '. _('does not have enough stock available for transfer.') . '.<br />';
- $_POST['LinesCounter'] -= 10;
- }
- }
- DB_free_result( $result );
- $TotalItems++;
- }
- }//for all LinesCounter
- }
-
- if ($TotalItems == 0){
- $InputError = True;
- $ErrorMessage .= _('You must enter at least 1 Stock Item to transfer').'<br />';
- }
-
- /*Ship location and Receive location are different */
- if ($_POST['FromStockLocation']==$_POST['ToStockLocation']){
- $InputError=True;
- $ErrorMessage .= _('The transfer must have a different location to receive into and location sent from');
- }
- } //end if the transfer is not a duplicated
+ $ErrorMessage='';
+ for ($i=$_POST['LinesCounter']-10;$i<$_POST['LinesCounter'];$i++){
+ if (isset($_POST['StockID' . $i]) AND $_POST['StockID' . $i]!=''){
+ $_POST['StockID' . $i]=trim(mb_strtoupper($_POST['StockID' . $i]));
+ $result = DB_query("SELECT COUNT(stockid) FROM stockmaster WHERE stockid='" . $_POST['StockID' . $i] . "'",$db);
+ $myrow = DB_fetch_row($result);
+ if ($myrow[0]==0){
+ $InputError = True;
+ $ErrorMessage .= _('The part code entered of'). ' ' . $_POST['StockID' . $i] . ' '. _('is not set up in the database') . '. ' . _('Only valid parts can be entered for transfers'). '<br />';
+ $_POST['LinesCounter'] -= 10;
+ }
+ DB_free_result( $result );
+ if (!is_numeric(filter_number_format($_POST['StockQTY' . $i]))){
+ $InputError = True;
+ $ErrorMessage .= _('The quantity entered of'). ' ' . $_POST['StockQTY' . $i] . ' '. _('for part code'). ' ' . $_POST['StockID' . $i] . ' '. _('is not numeric') . '. ' . _('The quantity entered for transfers is expected to be numeric').'<br />';
+ $_POST['LinesCounter'] -= 10;
+ }
+ if (filter_number_format($_POST['StockQTY' . $i]) <= 0){
+ $InputError = True;
+ $ErrorMessage .= _('The quantity entered for').' '. $_POST['StockID' . $i] . ' ' . _('is less than or equal to 0') . '. ' . _('Please correct this or remove the item').'<br />';
+ $_POST['LinesCounter'] -= 10;
+ }
+ if ($_SESSION['ProhibitNegativeStock']==1){
+ // Only if stock exists at this location
+ $result = DB_query("SELECT quantity
+ FROM locstock
+ WHERE stockid='" . $_POST['StockID' . $i] . "'
+ AND loccode='".$_POST['FromStockLocation']."'",
+ $db);
+
+ $myrow = DB_fetch_row($result);
+ if ($myrow[0] < filter_number_format($_POST['StockQTY' . $i])){
+ $InputError = True;
+ $ErrorMessage .= _('The part code entered of'). ' ' . $_POST['StockID' . $i] . ' '. _('does not have enough stock available for transfer.') . '.<br />';
+ $_POST['LinesCounter'] -= 10;
+ }
+ }
+ DB_free_result( $result );
+ $TotalItems++;
+ }
+ }//for all LinesCounter
+ }
+
+ if ($TotalItems == 0){
+ $InputError = True;
+ $ErrorMessage .= _('You must enter at least 1 Stock Item to transfer').'<br />';
+ }
+
+ /*Ship location and Receive location are different */
+ if ($_POST['FromStockLocation']==$_POST['ToStockLocation']){
+ $InputError=True;
+ $ErrorMessage .= _('The transfer must have a different location to receive into and location sent from');
+ }
+ } //end if the transfer is not a duplicated
}
if(isset($_POST['Submit']) AND $InputError==False){
@@ -203,7 +201,7 @@
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/supplier.png" title="' . _('Dispatch') .
'" alt="" />' . ' ' . $title . '</p>';
- echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF']) . '" method=post>';
+ echo '<form enctype="multipart/form-data" action="' . htmlspecialchars($_SERVER['PHP_SELF']) . '" method="post">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<table class="selection">';
@@ -252,11 +250,11 @@
echo '</select></td></tr>';
echo '<tr>
- <td>' . _('Upload CSV file of Transfer Items and Quantites') . ':</td>
- <td><input name="SelectedTransferFile" type="file" /></td>
- </tr>
- </table>';
-
+ <td>' . _('Upload CSV file of Transfer Items and Quantites') . ':</td>
+ <td><input name="SelectedTransferFile" type="file" /></td>
+ </tr>
+ </table>';
+
echo '<table class="selection">';
$tableheader = '<tr><th>'. _('Item Code'). '</th>
Modified: trunk/StockStatus.php
===================================================================
--- trunk/StockStatus.php 2011-12-07 07:03:38 UTC (rev 4763)
+++ trunk/StockStatus.php 2011-12-08 18:48:01 UTC (rev 4764)
@@ -2,8 +2,6 @@
/* $Id$*/
-//$PageSecurity = 2;
-
include('includes/session.inc');
$title = _('Stock Status');
Modified: trunk/Z_ImportFixedAssets.php
===================================================================
--- trunk/Z_ImportFixedAssets.php 2011-12-07 07:03:38 UTC (rev 4763)
+++ trunk/Z_ImportFixedAssets.php 2011-12-08 18:48:01 UTC (rev 4764)
@@ -276,7 +276,7 @@
fclose($FileHandle);
-} elseif ( isset($_POST['gettemplate']) || isset($_GET['gettemplate']) ) { //download an import template
+} elseif ( isset($_POST['gettemplate']) OR isset($_GET['gettemplate']) ) { //download an import template
echo '<br /><br /><br />"'. implode('","',$FieldNames). '"<br /><br /><br />';
@@ -288,7 +288,7 @@
<br />
<br />
';
- echo '<form enctype="multipart/form-data" action="Z_ImportFixedAssets.php" method=post>';
+ echo '<form enctype="multipart/form-data" action="Z_ImportFixedAssets.php" method="post">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '">';
echo '<input type="hidden" name="MAX_FILE_SIZE" value="1000000">';
Modified: trunk/index.php
===================================================================
--- trunk/index.php 2011-12-07 07:03:38 UTC (rev 4763)
+++ trunk/index.php 2011-12-08 18:48:01 UTC (rev 4764)
@@ -236,7 +236,7 @@
</td>
<td class="menu_group_items"> <!-- Orders Maintenance options -->
- <table width="100%">
+ <table width="100%" class="table_index" >
<tr>
<td class="menu_group_item">
<?php echo '<p>• <a href="' . $rootpath . '/SelectContract.php">' . _('Select Contract') . '</a></p>'; ?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-12-08 18:48:08
|
Revision: 4764
http://web-erp.svn.sourceforge.net/web-erp/?rev=4764&view=rev
Author: daintree
Date: 2011-12-08 18:48:01 +0000 (Thu, 08 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/StockLocTransfer.php
trunk/StockStatus.php
trunk/Z_ImportFixedAssets.php
trunk/index.php
Modified: trunk/StockLocTransfer.php
===================================================================
--- trunk/StockLocTransfer.php 2011-12-07 07:03:38 UTC (rev 4763)
+++ trunk/StockLocTransfer.php 2011-12-08 18:48:01 UTC (rev 4764)
@@ -33,26 +33,23 @@
//loop through file rows
while ( ($myrow = fgetcsv($FileHandle, 10000, ',')) !== FALSE ) {
- //check for correct number of fields
- $FieldCount = count($myrow);
- if ($FieldCount != 2)){
- prnMsg (_('File contains') . ' '. $FieldCount . ' ' . _('columns, but only 2 columns are expected. The comma separated file should have just two columns the first for the item code and the second for the quantity to transfer'),'error');
+ if (count($myrow) != 2){
+ prnMsg (_('File contains') . ' '. count($myrow) . ' ' . _('columns, but only 2 columns are expected. The comma separated file should have just two columns the first for the item code and the second for the quantity to transfer'),'error');
fclose($FileHandle);
include('includes/footer.inc');
exit;
}
// cleanup the data (csv files often import with empty strings and such)
+ $StockID='';
+ $Quantity=0;
for ($i=0; $i<count($myrow);$i++) {
- $StockID='';
- $Quantity=0;
- $myrow[$i] = trim($myrow[$i]);
switch ($i) {
case 0:
$StockID = trim(mb_strtoupper($myrow[$i]));
$result = DB_query("SELECT COUNT(stockid) FROM stockmaster WHERE stockid='" . $StockID . "'",$db);
- $myrow = DB_fetch_row($result);
- if ($myrow[0]==0){
+ $StockIDCheck = DB_fetch_row($result);
+ if ($StockIDCheck[0]==0){
$InputError = True;
$ErrorMessage .= _('The part code entered of'). ' ' . $StockID . ' '. _('is not set up in the database') . '. ' . _('Only valid parts can be entered for transfers'). '<br />';
}
@@ -73,76 +70,77 @@
AND loccode='".$_POST['FromStockLocation']."'",
$db);
$CheckStockRow = DB_fetch_array($result);
- if ($myrow['quantity'] < $Quantity){
+ if ($CheckStockRow['quantity'] < $Quantity){
$InputError = True;
- $ErrorMessage .= _('The item'). ' ' . $StockID . ' ' . _('does not have enough stock available (') . ' ' . $myrow['quantity'] . ')' . ' ' . _('The quantity required to transfer was') . ' ' . $Quantity . '.<br />';
+ $ErrorMessage .= _('The item'). ' ' . $StockID . ' ' . _('does not have enough stock available (') . ' ' . $CheckStockRow['quantity'] . ')' . ' ' . _('The quantity required to transfer was') . ' ' . $Quantity . '.<br />';
}
}
-
- if ($StockID!='' AND $Quantity!=0){
- $_POST['StockID' . $RowCounter] = $StockID;
- $_POST['StockQTY' . $RowCounter] = $Quantity;
- }
} // end for loop through the columns on the row being processed
- $TotalItems++;
- $_POST['LinesCounter']=$TotalItems;
+ if ($StockID!='' AND $Quantity!=0){
+ $_POST['StockID' . $TotalItems] = $StockID;
+ $_POST['StockQTY' . $TotalItems] = $Quantity;
+ $StockID='';
+ $Quantity=0;
+ $TotalItems++;
+ }
} //end while there are lines in the CSV file
+ $_POST['LinesCounter']=$TotalItems;
} //end if there is a CSV file to import
else { // process the manually input lines
- $ErrorMessage='';
- for ($i=$_POST['LinesCounter']-10;$i<$_POST['LinesCounter'];$i++){
- if (isset($_POST['StockID' . $i]) AND $_POST['StockID' . $i]!=''){
- $_POST['StockID' . $i]=trim(mb_strtoupper($_POST['StockID' . $i]));
- $result = DB_query("SELECT COUNT(stockid) FROM stockmaster WHERE stockid='" . $_POST['StockID' . $i] . "'",$db);
- $myrow = DB_fetch_row($result);
- if ($myrow[0]==0){
- $InputError = True;
- $ErrorMessage .= _('The part code entered of'). ' ' . $_POST['StockID' . $i] . ' '. _('is not set up in the database') . '. ' . _('Only valid parts can be entered for transfers'). '<br />';
- $_POST['LinesCounter'] -= 10;
- }
- DB_free_result( $result );
- if (!is_numeric(filter_number_format($_POST['StockQTY' . $i]))){
- $InputError = True;
- $ErrorMessage .= _('The quantity entered of'). ' ' . $_POST['StockQTY' . $i] . ' '. _('for part code'). ' ' . $_POST['StockID' . $i] . ' '. _('is not numeric') . '. ' . _('The quantity entered for transfers is expected to be numeric').'<br />';
- $_POST['LinesCounter'] -= 10;
- }
- if (filter_number_format($_POST['StockQTY' . $i]) <= 0){
- $InputError = True;
- $ErrorMessage .= _('The quantity entered for').' '. $_POST['StockID' . $i] . ' ' . _('is less than or equal to 0') . '. ' . _('Please correct this or remove the item').'<br />';
- $_POST['LinesCounter'] -= 10;
- }
- if ($_SESSION['ProhibitNegativeStock']==1){
- // Only if stock exists at this location
- $result = DB_query("SELECT quantity
- FROM locstock
- WHERE stockid='" . $_POST['StockID' . $i] . "'
- AND loccode='".$_POST['FromStockLocation']."'",
- $db);
-
- $myrow = DB_fetch_row($result);
- if ($myrow[0] < filter_number_format($_POST['StockQTY' . $i])){
- $InputError = True;
- $ErrorMessage .= _('The part code entered of'). ' ' . $_POST['StockID' . $i] . ' '. _('does not have enough stock available for transfer.') . '.<br />';
- $_POST['LinesCounter'] -= 10;
- }
- }
- DB_free_result( $result );
- $TotalItems++;
- }
- }//for all LinesCounter
- }
-
- if ($TotalItems == 0){
- $InputError = True;
- $ErrorMessage .= _('You must enter at least 1 Stock Item to transfer').'<br />';
- }
-
- /*Ship location and Receive location are different */
- if ($_POST['FromStockLocation']==$_POST['ToStockLocation']){
- $InputError=True;
- $ErrorMessage .= _('The transfer must have a different location to receive into and location sent from');
- }
- } //end if the transfer is not a duplicated
+ $ErrorMessage='';
+ for ($i=$_POST['LinesCounter']-10;$i<$_POST['LinesCounter'];$i++){
+ if (isset($_POST['StockID' . $i]) AND $_POST['StockID' . $i]!=''){
+ $_POST['StockID' . $i]=trim(mb_strtoupper($_POST['StockID' . $i]));
+ $result = DB_query("SELECT COUNT(stockid) FROM stockmaster WHERE stockid='" . $_POST['StockID' . $i] . "'",$db);
+ $myrow = DB_fetch_row($result);
+ if ($myrow[0]==0){
+ $InputError = True;
+ $ErrorMessage .= _('The part code entered of'). ' ' . $_POST['StockID' . $i] . ' '. _('is not set up in the database') . '. ' . _('Only valid parts can be entered for transfers'). '<br />';
+ $_POST['LinesCounter'] -= 10;
+ }
+ DB_free_result( $result );
+ if (!is_numeric(filter_number_format($_POST['StockQTY' . $i]))){
+ $InputError = True;
+ $ErrorMessage .= _('The quantity entered of'). ' ' . $_POST['StockQTY' . $i] . ' '. _('for part code'). ' ' . $_POST['StockID' . $i] . ' '. _('is not numeric') . '. ' . _('The quantity entered for transfers is expected to be numeric').'<br />';
+ $_POST['LinesCounter'] -= 10;
+ }
+ if (filter_number_format($_POST['StockQTY' . $i]) <= 0){
+ $InputError = True;
+ $ErrorMessage .= _('The quantity entered for').' '. $_POST['StockID' . $i] . ' ' . _('is less than or equal to 0') . '. ' . _('Please correct this or remove the item').'<br />';
+ $_POST['LinesCounter'] -= 10;
+ }
+ if ($_SESSION['ProhibitNegativeStock']==1){
+ // Only if stock exists at this location
+ $result = DB_query("SELECT quantity
+ FROM locstock
+ WHERE stockid='" . $_POST['StockID' . $i] . "'
+ AND loccode='".$_POST['FromStockLocation']."'",
+ $db);
+
+ $myrow = DB_fetch_row($result);
+ if ($myrow[0] < filter_number_format($_POST['StockQTY' . $i])){
+ $InputError = True;
+ $ErrorMessage .= _('The part code entered of'). ' ' . $_POST['StockID' . $i] . ' '. _('does not have enough stock available for transfer.') . '.<br />';
+ $_POST['LinesCounter'] -= 10;
+ }
+ }
+ DB_free_result( $result );
+ $TotalItems++;
+ }
+ }//for all LinesCounter
+ }
+
+ if ($TotalItems == 0){
+ $InputError = True;
+ $ErrorMessage .= _('You must enter at least 1 Stock Item to transfer').'<br />';
+ }
+
+ /*Ship location and Receive location are different */
+ if ($_POST['FromStockLocation']==$_POST['ToStockLocation']){
+ $InputError=True;
+ $ErrorMessage .= _('The transfer must have a different location to receive into and location sent from');
+ }
+ } //end if the transfer is not a duplicated
}
if(isset($_POST['Submit']) AND $InputError==False){
@@ -203,7 +201,7 @@
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/supplier.png" title="' . _('Dispatch') .
'" alt="" />' . ' ' . $title . '</p>';
- echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF']) . '" method=post>';
+ echo '<form enctype="multipart/form-data" action="' . htmlspecialchars($_SERVER['PHP_SELF']) . '" method="post">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<table class="selection">';
@@ -252,11 +250,11 @@
echo '</select></td></tr>';
echo '<tr>
- <td>' . _('Upload CSV file of Transfer Items and Quantites') . ':</td>
- <td><input name="SelectedTransferFile" type="file" /></td>
- </tr>
- </table>';
-
+ <td>' . _('Upload CSV file of Transfer Items and Quantites') . ':</td>
+ <td><input name="SelectedTransferFile" type="file" /></td>
+ </tr>
+ </table>';
+
echo '<table class="selection">';
$tableheader = '<tr><th>'. _('Item Code'). '</th>
Modified: trunk/StockStatus.php
===================================================================
--- trunk/StockStatus.php 2011-12-07 07:03:38 UTC (rev 4763)
+++ trunk/StockStatus.php 2011-12-08 18:48:01 UTC (rev 4764)
@@ -2,8 +2,6 @@
/* $Id$*/
-//$PageSecurity = 2;
-
include('includes/session.inc');
$title = _('Stock Status');
Modified: trunk/Z_ImportFixedAssets.php
===================================================================
--- trunk/Z_ImportFixedAssets.php 2011-12-07 07:03:38 UTC (rev 4763)
+++ trunk/Z_ImportFixedAssets.php 2011-12-08 18:48:01 UTC (rev 4764)
@@ -276,7 +276,7 @@
fclose($FileHandle);
-} elseif ( isset($_POST['gettemplate']) || isset($_GET['gettemplate']) ) { //download an import template
+} elseif ( isset($_POST['gettemplate']) OR isset($_GET['gettemplate']) ) { //download an import template
echo '<br /><br /><br />"'. implode('","',$FieldNames). '"<br /><br /><br />';
@@ -288,7 +288,7 @@
<br />
<br />
';
- echo '<form enctype="multipart/form-data" action="Z_ImportFixedAssets.php" method=post>';
+ echo '<form enctype="multipart/form-data" action="Z_ImportFixedAssets.php" method="post">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '">';
echo '<input type="hidden" name="MAX_FILE_SIZE" value="1000000">';
Modified: trunk/index.php
===================================================================
--- trunk/index.php 2011-12-07 07:03:38 UTC (rev 4763)
+++ trunk/index.php 2011-12-08 18:48:01 UTC (rev 4764)
@@ -236,7 +236,7 @@
</td>
<td class="menu_group_items"> <!-- Orders Maintenance options -->
- <table width="100%">
+ <table width="100%" class="table_index" >
<tr>
<td class="menu_group_item">
<?php echo '<p>• <a href="' . $rootpath . '/SelectContract.php">' . _('Select Contract') . '</a></p>'; ?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-12-11 09:52:27
|
Revision: 4766
http://web-erp.svn.sourceforge.net/web-erp/?rev=4766&view=rev
Author: daintree
Date: 2011-12-11 09:52:20 +0000 (Sun, 11 Dec 2011)
Log Message:
-----------
1/12/11 Phil: SupplierInvoice.php attempts to post back any cost variances where there is no stock left to apportion the variances to - posting back to stockmoves (so the DailySales.php and other sales inquiry scripts reflect the appropriate GP) and the salesanalysis tables
11/12/11 Phil: DailySalesInquiry.php removed incorrect call to establish new cart object??
Modified Paths:
--------------
trunk/DailySalesInquiry.php
trunk/SupplierInvoice.php
trunk/doc/Change.log
trunk/includes/DateFunctions.inc
Modified: trunk/DailySalesInquiry.php
===================================================================
--- trunk/DailySalesInquiry.php 2011-12-10 18:23:41 UTC (rev 4765)
+++ trunk/DailySalesInquiry.php 2011-12-11 09:52:20 UTC (rev 4766)
@@ -15,26 +15,27 @@
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF']) . '" method="post">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-echo '<table class="selection">
- <tr>
- <td>' . _('Month to Show') . ':</td>
- <td><select tabindex="1" name="MonthToShow">';
-
if (!isset($_POST['MonthToShow'])){
$_POST['MonthToShow'] = GetPeriod(Date($_SESSION['DefaultDateFormat']),$db);
- $Result = DB_query("SELECT lastdate_in_period FROM periods WHERE period='" . $_POST['MonthToShow'] . "'",$db);
+ echo 'Got Month to show of: ' .$_POST['MonthToShow'];
+ $Result = DB_query("SELECT lastdate_in_period FROM periods WHERE periodno='" . $_POST['MonthToShow'] . "'",$db);
$myrow = DB_fetch_array($Result);
$EndDateSQL = $myrow['lastdate_in_period'];
}
+echo '<table class="selection">
+ <tr>
+ <td>' . _('Month to Show') . ':</td>
+ <td><select tabindex="1" name="MonthToShow">';
+
$PeriodsResult = DB_query("SELECT periodno, lastdate_in_period FROM periods",$db);
while ($PeriodRow = DB_fetch_array($PeriodsResult)){
if ($_POST['MonthToShow']==$PeriodRow['periodno']) {
- echo '<option selected value="' . $PeriodRow['periodno'] . '">' . MonthAndYearFromSQLDate($PeriodRow['lastdate_in_period']) . '</option>';
- $EndDateSQL = $PeriodRow['lastdate_in_period'];
+ echo '<option selected value="' . $PeriodRow['periodno'] . '">' . MonthAndYearFromSQLDate($PeriodRow['lastdate_in_period']) . '</option>';
+ $EndDateSQL = $PeriodRow['lastdate_in_period'];
} else {
- echo '<option value="' . $PeriodRow['periodno'] . '">' . MonthAndYearFromSQLDate($PeriodRow['lastdate_in_period']) . '</option>';
+ echo '<option value="' . $PeriodRow['periodno'] . '">' . MonthAndYearFromSQLDate($PeriodRow['lastdate_in_period']) . '</option>';
}
}
echo '</select></td>
@@ -51,9 +52,9 @@
while ($SalespersonRow = DB_fetch_array($SalespeopleResult)){
if ($_POST['Salesperson']==$SalespersonRow['salesmancode']) {
- echo '<option selected value="' . $SalespersonRow['salesmancode'] . '">' . $SalespersonRow['salesmanname'] . '</option>';
+ echo '<option selected value="' . $SalespersonRow['salesmancode'] . '">' . $SalespersonRow['salesmanname'] . '</option>';
} else {
- echo '<option Value="' . $SalespersonRow['salesmancode'] . '">' . $SalespersonRow['salesmanname'] . '</option>';
+ echo '<option Value="' . $SalespersonRow['salesmancode'] . '">' . $SalespersonRow['salesmanname'] . '</option>';
}
}
echo '</select></td>';
@@ -116,7 +117,7 @@
$BilledDays = 0;
$DaySalesArray = array();
while ($DaySalesRow=DB_fetch_array($SalesResult)) {
- $DaySalesArray[DayOfMonthFromSQLDate($DaySalesRow['trandate'])] = new Cart;
+
if ($DaySalesRow['salesvalue'] > 0) {
$DaySalesArray[DayOfMonthFromSQLDate($DaySalesRow['trandate'])]->Sales = $DaySalesRow['salesvalue'];
} else {
Modified: trunk/SupplierInvoice.php
===================================================================
--- trunk/SupplierInvoice.php 2011-12-10 18:23:41 UTC (rev 4765)
+++ trunk/SupplierInvoice.php 2011-12-11 09:52:20 UTC (rev 4766)
@@ -228,17 +228,20 @@
/* everything below here only do if a Supplier is selected
fisrt add a header to show who we are making an invoice for */
- echo '<br /><table class=selection colspan=4>
- <tr><th>' . _('Supplier') . '</th>
+ echo '<br /><table class="selection" colspan="4">
+ <tr>
+ <th>' . _('Supplier') . '</th>
<th>' . _('Currency') . '</th>
<th>' . _('Terms') . '</th>
- <th>' . _('Tax Authority') . '</th></tr>';
+ <th>' . _('Tax Authority') . '</th>
+ </tr>';
- echo '<tr><td><font color=blue><b>' . $_SESSION['SuppTrans']->SupplierID . ' - ' .
+ echo '<tr>
+ <td><font color=blue><b>' . $_SESSION['SuppTrans']->SupplierID . ' - ' .
$_SESSION['SuppTrans']->SupplierName . '</b></font></td>
- <th><font color=blue><b>' . $_SESSION['SuppTrans']->CurrCode . '</b></font></th>
- <td><font color=blue><b>' . $_SESSION['SuppTrans']->TermsDescription . '</b></font></td>
- <td><font color=blue><b>' . $_SESSION['SuppTrans']->TaxGroupDescription . '</b></font></td>
+ <th><font color=blue><b>' . $_SESSION['SuppTrans']->CurrCode . '</b></font></th>
+ <td><font color=blue><b>' . $_SESSION['SuppTrans']->TermsDescription . '</b></font></td>
+ <td><font color=blue><b>' . $_SESSION['SuppTrans']->TaxGroupDescription . '</b></font></td>
</tr>
</table>';
@@ -247,7 +250,8 @@
echo '<br /><table class="selection">';
- echo '<tr><td>' . _('Supplier Invoice Reference') . ':</td>
+ echo '<tr>
+ <td>' . _('Supplier Invoice Reference') . ':</td>
<td><input type="text" size="20" maxlength="20" name="SuppReference" value="' . $_SESSION['SuppTrans']->SuppReference . '"></td>';
if (!isset($_SESSION['SuppTrans']->TranDate)){
@@ -467,9 +471,11 @@
}
- echo '<tr><td colspan="3" class="number"><font color="blue">' . _('Total GL Analysis') . ':</font></td>
- <td class=number><font color="blue">' . locale_number_format($TotalGLValue,$_SESSION['SuppTrans']->CurrDecimalPlaces) . '</font></td>
- </tr></table>';
+ echo '<tr>
+ <td colspan="3" class="number"><font color="blue">' . _('Total GL Analysis') . ':</font></td>
+ <td class="number"><font color="blue">' . locale_number_format($TotalGLValue,$_SESSION['SuppTrans']->CurrDecimalPlaces) . '</font></td>
+ </tr>
+ </table>';
}
$_SESSION['SuppTrans']->OvAmount = ($TotalGRNValue + $TotalGLValue + $TotalAssetValue + $TotalShiptValue + $TotalContractsValue);
@@ -788,9 +794,9 @@
foreach ($_SESSION['SuppTrans']->Contracts as $Contract){
- /*contract postings need to get the WIP from the contract items stock category record
- * debit postings to this WIP account
- * the WIP account is tidied up when the contract is closed*/
+ /*contract postings need to get the WIP from the contract items stock category record
+ * debit postings to this WIP account
+ * the WIP account is tidied up when the contract is closed*/
$result = DB_query("SELECT wipact FROM stockcategory
INNER JOIN stockmaster ON
stockcategory.categoryid=stockmaster.categoryid
@@ -860,7 +866,7 @@
/*need to get the stock category record for this stock item - this is function in SQL_CommonFunctions.inc */
$StockGLCode = GetStockGLCode($EnteredGRN->ItemCode,$db);
-
+
/*We have stock item and a purchase price variance need to see whether we are using Standard or WeightedAverageCosting */
if ($_SESSION['WeightedAverageCosting']==1){ /*Weighted Average costing */
@@ -915,61 +921,6 @@
$Result = DB_query($SQL, $db, $ErrMsg, $DbgMsg, True);
-
- /* The variance to the extent of the quantity invoiced should also be written off against the sales analysis cost - as sales analysis would have been created using the cost at the time the sale was made... this was incorrect as hind-sight has shown here. However, how to determine when these were last sold? To update the sales analysis cost. Work through the last 6 months sales analysis from the latest period in which this invoice is being posted and prior.
-
- The assumption here is that the goods have been sold prior to the purchase invocie being entered so it is necessary to back track on the sales analysis cost.
- *
- Note that this will mean that posting to GL COGS will not agree to the cost of sales from the sales analysis*/
-
- $QuantityVarianceAllocated = $EnteredGRN->This_QuantityInv;
- $CostVarPerUnit = (($EnteredGRN->ChgPrice / $_SESSION['SuppTrans']->ExRate) - $EnteredGRN->StdCostUnit);
- $PeriodAllocated = $PeriodNo;
-
- while ($QuantityVarianceAllocated >0) {
- $SalesAnalResult=DB_query("SELECT cust,
- custbranch,
- typeabbrev,
- periodno,
- stkcategory,
- area,
- salesperson,
- cost,
- qty
- FROM salesanalysis
- WHERE salesanalysis.stockid = '" . $EnteredGRN->ItemCode . "'
- AND salesanalysis.budgetoractual=1
- AND periodno='" . $PeriodAllocated . "'",
- $db);
- if (DB_num_rows($SalesAnalResult)>0){
- while ($SalesAnalRow = DB_fetch_array($SalesAnalResult) AND $QuantityVarianceAllocated >0){
- if ($SalesAnalRow['qty']<=$QuantityVarianceAllocated){
- $QuantityVarianceAllocated -= $SalesAnalRow['qty'];
- $QuantityAllocated = $SalesAnalRow['qty'];
- } else {
- $QuantityAllocated = $QuantityVarianceAllocated;
- $QuantityVarianceAllocated=0;
- }
- $UpdSalAnalResult = DB_query("UPDATE salesanalysis
- SET cost = cost + " . ($CostVarPerUnit * $QuantityAllocated) . "
- WHERE cust ='" . $SalesAnalRow['cust'] . "'
- AND stockid='" . $EnteredGRN->ItemCode . "'
- AND custbranch='" . $SalesAnalRow['custbranch'] . "'
- AND typeabbrev='" . $SalesAnalRow['typeabbrev'] . "'
- AND periodno='" . $PeriodAllocated . "'
- AND area='" . $SalesAnalRow['area'] . "'
- AND salesperson='" . $SalesAnalRow['salesperson'] . "'
- AND stkcategory='" . $SalesAnalRow['stkcategory'] . "'
- AND budgetoractual=1",
- $db);
- }
- } //end if there were sales in that period
- $PeriodAllocated--; //decrement the period
- if ($PeriodNo - $PeriodAllocated >6) {
- /*if more than 6 months ago when sales were made then forget it */
- break;
- }
- } //end loop around different periods to see which sales analysis records to update
} // end if the quantity being invoiced here is greater than the current stock on hand
/*Now post any remaining price variance to stock rather than price variances */
@@ -996,33 +947,6 @@
$Result = DB_query($SQL, $db, $ErrMsg, $DbgMsg, True);
- /*Now to update the stock cost with the new weighted average */
-
- /*Need to consider what to do if the cost has been changed manually between receiving the stock and entering the invoice - this code assumes there has been no cost updates made manually and all the price variance is posted to stock.
-
- A nicety or important?? */
-
-
- $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The cost could not be updated because');
- $DbgMsg = _('The following SQL to update the cost was used');
-
- if ($TotalQuantityOnHand>0) {
-
- $CostIncrement = ($PurchPriceVar - $WriteOffToVariances) / $TotalQuantityOnHand;
-
- $sql = "UPDATE stockmaster SET lastcost=materialcost+overheadcost+labourcost,
- materialcost=materialcost+" . $CostIncrement . "
- WHERE stockid='" . $EnteredGRN->ItemCode . "'";
- $Result = DB_query($sql, $db, $ErrMsg, $DbgMsg, True);
- } else {
- /* if stock is negative then update the cost to this cost */
- $sql = "UPDATE stockmaster SET lastcost=materialcost+overheadcost+labourcost,
- materialcost='" . ($EnteredGRN->ChgPrice / $_SESSION['SuppTrans']->ExRate) . "'
- WHERE stockid='" . $EnteredGRN->ItemCode . "'";
- $Result = DB_query($sql, $db, $ErrMsg, $DbgMsg, True);
- }
- /* End of Weighted Average Costing Code */
-
} else { //It must be Standard Costing
$SQL = "INSERT INTO gltrans (type,
@@ -1219,11 +1143,15 @@
/* Now update the GRN and PurchOrderDetails records for amounts invoiced - can't use the other loop through the GRNs as this was only where the GL link to credtors is active */
foreach ($_SESSION['SuppTrans']->GRNs as $EnteredGRN){
-
- $SQL = "UPDATE purchorderdetails SET qtyinvoiced = qtyinvoiced + " . $EnteredGRN->This_QuantityInv .",
- actprice = '" . $EnteredGRN->ChgPrice . "'
- WHERE podetailitem = '" . $EnteredGRN->PODetailItem . "'";
+ //in local currency
+ $ActualCost = $EnteredGRN->ChgPrice / $_SESSION['SuppTrans']->ExRate;
+ $PurchPriceVar = $EnteredGRN->This_QuantityInv * ($ActualCost - $EnteredGRN->StdCostUnit);
+
+ $SQL = "UPDATE purchorderdetails
+ SET qtyinvoiced = qtyinvoiced + " . $EnteredGRN->This_QuantityInv .",
+ actprice = '" . $EnteredGRN->ChgPrice . "'
+ WHERE podetailitem = '" . $EnteredGRN->PODetailItem . "'";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The quantity invoiced of the purchase order line could not be updated because');
@@ -1231,8 +1159,9 @@
$Result = DB_query($SQL, $db, $ErrMsg, $DbgMsg, True);
- $SQL = "UPDATE grns SET quantityinv = quantityinv + " . $EnteredGRN->This_QuantityInv .
- " WHERE grnno = '" . $EnteredGRN->GRNNo . "'";
+ $SQL = "UPDATE grns
+ SET quantityinv = quantityinv + " . $EnteredGRN->This_QuantityInv . "
+ WHERE grnno = '" . $EnteredGRN->GRNNo . "'";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The quantity invoiced off the goods received record could not be updated because');
$DbgMsg = _('The following SQL to update the GRN quantity invoiced was used');
@@ -1258,10 +1187,180 @@
$Result = DB_query($SQL, $db, $ErrMsg, $DbgMsg, True);
} //end of adding GRN shipment charges
+ else {
+ /*so its not a GRN shipment item its a plain old stock item */
+
+ if ($PurchPriceVar !=0){ /* don't bother with any of this lot if there is no difference ! */
+
+ if (mb_strlen($EnteredGRN->ItemCode)>0 OR $EnteredGRN->ItemCode != ''){ /*so it is a stock item */
+ /*We need to:
+ *
+ * a) update the stockmove for the delivery to reflect the actual cost of the delivery
+ *
+ * b) If a WeightedAverageCosting system and the stock quantity on hand now is negative then the cost that has gone to sales analysis and the cost of sales stock movement records will have been incorrect ... attempt to fix it retrospectively
+ */
+ /*Get the location that the stock was booked into */
+ $result = DB_query("SELECT intostocklocation
+ FROM purchorders
+ WHERE orderno='" . $EnteredGRN->PONo . "'",
+ $db);
+ $LocRow = DB_fetch_array($result);
+ $LocCode = $LocRow['intostocklocation'];
+
+ /* First update the stockmoves delivery cost */
+ $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The stock movement record for the delivery could not have the cost updated to the actual cost');
+ $result = DB_query("UPDATE stockmoves SET price = '" . $ActualCost . "'
+ WHERE stockid='" .$EnteredGRN->ItemCode . "'
+ AND type=25
+ AND loccode='" . $LocCode . "'
+ AND transno='" . $EnteredGRN->GRNNo . "'",
+ $db,$ErrMsg,$DbgMsg,True);
+
+ if ($_SESSION['WeightedAverageCosting']==1){
+ /*
+ * How many in stock now?
+ * The quantity being invoiced here - $EnteredGRN->This_QuantityInv
+ * If the quantity in stock now is less than the quantity being invoiced
+ * here then some items sold will not have had this cost factored in
+ * The cost of these items = $ActualCost
+ */
+
+ $sql ="SELECT quantity
+ FROM locstock
+ WHERE loccode='" . $LocCode . "'
+ AND stockid='" . $EnteredGRN->ItemCode . "'";
+ $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The quantity on hand could not be retrieved from the database');
+ $DbgMsg = _('The following SQL to retrieve the total stock quantity was used');
+ $Result = DB_query($sql, $db, $ErrMsg, $DbgMsg);
+ $QtyRow = DB_fetch_row($Result);
+ $TotalQuantityOnHand = $QtyRow[0];
+
+ /* If the quantity on hand is less the quantity charged on this invoice then some must have been sold and the price variance should be reflected in the cost of sales*/
+
+ if ($EnteredGRN->This_QuantityInv > $TotalQuantityOnHand){
+
+ /* The variance to the extent of the quantity invoiced should also be written off against the sales analysis cost - as sales analysis would have been created using the cost at the time the sale was made... this was incorrect as hind-sight has shown here. However, how to determine when these were last sold? To update the sales analysis cost. Work through the last 6 months sales analysis from the latest period in which this invoice is being posted and prior.
+
+ The assumption here is that the goods have been sold prior to the purchase invoice being entered so it is necessary to back track on the sales analysis cost.
+ * Note that this will mean that posting to GL COGS will not agree to the cost of sales from the sales analysis
+ * Of course the price variances will need to be included in COGS as well
+ * */
+
+ $QuantityVarianceAllocated = $EnteredGRN->This_QuantityInv;
+ $CostVarPerUnit = $ActualCost - $EnteredGRN->StdCostUnit;
+ $PeriodAllocated = $PeriodNo;
+ $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The sales analysis records could not be updated for the cost variances on this purchase invoice');
+
+ while ($QuantityVarianceAllocated >0) {
+ $SalesAnalResult=DB_query("SELECT cust,
+ custbranch,
+ typeabbrev,
+ periodno,
+ stkcategory,
+ area,
+ salesperson,
+ cost,
+ qty
+ FROM salesanalysis
+ WHERE salesanalysis.stockid = '" . $EnteredGRN->ItemCode . "'
+ AND salesanalysis.budgetoractual=1
+ AND periodno='" . $PeriodAllocated . "'",
+ $db);
+ if (DB_num_rows($SalesAnalResult)>0){
+ while ($SalesAnalRow = DB_fetch_array($SalesAnalResult) AND $QuantityVarianceAllocated >0){
+ if ($SalesAnalRow['qty']<=$QuantityVarianceAllocated){
+ $QuantityVarianceAllocated -= $SalesAnalRow['qty'];
+ $QuantityAllocated = $SalesAnalRow['qty'];
+ } else {
+ $QuantityAllocated = $QuantityVarianceAllocated;
+ $QuantityVarianceAllocated=0;
+ }
+ $UpdSalAnalResult = DB_query("UPDATE salesanalysis
+ SET cost = cost + " . ($CostVarPerUnit * $QuantityAllocated) . "
+ WHERE cust ='" . $SalesAnalRow['cust'] . "'
+ AND stockid='" . $EnteredGRN->ItemCode . "'
+ AND custbranch='" . $SalesAnalRow['custbranch'] . "'
+ AND typeabbrev='" . $SalesAnalRow['typeabbrev'] . "'
+ AND periodno='" . $PeriodAllocated . "'
+ AND area='" . $SalesAnalRow['area'] . "'
+ AND salesperson='" . $SalesAnalRow['salesperson'] . "'
+ AND stkcategory='" . $SalesAnalRow['stkcategory'] . "'
+ AND budgetoractual=1",
+ $db,$ErrMsg,$DbgMsg,True);
+ }
+ } //end if there were sales in that period
+ $PeriodAllocated--; //decrement the period
+ if ($PeriodNo - $PeriodAllocated >6) {
+ /*if more than 6 months ago when sales were made then forget it */
+ break;
+ }
+ } /*end loop around different periods to see which sales analysis records to update */
+
+ /*now we need to work back through the sales stockmoves up to the quantity on this purchase invoice to update costs
+ * Only go back up to 6 months looking for stockmoves and
+ * Only in the stock location where the purchase order was received
+ * into - if the stock was transferred to another location then
+ * we cannot adjust for this */
+ $result = DB_query("SELECT stkmoveno,
+ type,
+ qty,
+ standardcost
+ FROM stockmoves
+ WHERE loccode='" . $LocCode . "'
+ AND qty < 0
+ AND stockid='" . $EnteredGRN->ItemCode . "'
+ AND trandate>='" . FormatDateForSQL(DateAdd($_SESSION['SuppTrans']->TranDate,'m',-6)) . "'
+ ORDER BY stkmoveno DESC",
+ $db);
+ $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The stock movements for invoices cannot be updated for the cost variances on this purchase invoice');
+ $QuantityVarianceAllocated = $EnteredGRN->This_QuantityInv;
+ while ($StkMoveRow = DB_fetch_array($result) AND $QuantityVarianceAllocated >0){
+ if ($StkMoveRow['qty']+$QuantityVarianceAllocated>0){
+ if ($StkMoveRow['type']==10) { //its a sales invoice
+ $result = DB_query("UPDATE stockmoves
+ SET standardcost = '" . $ActualCost . "'
+ WHERE stkmoveno = '" . $StkMoveRow['stkmoveno'] . "'",
+ $db,$ErrMsg,$DbgMsg,True);
+ }
+ } //end if the invoice qty is more than is left to allocate
+ $QuantityVarianceAllocated+=$StkMoveRow['qty'];
+ }
+ } // end if the quantity being invoiced here is greater than the current stock on hand
+
+ /*Now to update the stock cost with the new weighted average */
+
+ /*Need to consider what to do if the cost has been changed manually between receiving the stock and entering the invoice - this code assumes there has been no cost updates made manually and all the price variance is posted to stock.
+
+ A nicety or important?? */
+
+
+ $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The cost could not be updated because');
+ $DbgMsg = _('The following SQL to update the cost was used');
+
+ if ($TotalQuantityOnHand>0) {
+
+ $CostIncrement = ($PurchPriceVar - $WriteOffToVariances) / $TotalQuantityOnHand;
+
+ $sql = "UPDATE stockmaster
+ SET lastcost=materialcost+overheadcost+labourcost,
+ materialcost=materialcost+" . $CostIncrement . "
+ WHERE stockid='" . $EnteredGRN->ItemCode . "'";
+ $Result = DB_query($sql, $db, $ErrMsg, $DbgMsg, True);
+ } else {
+ /* if stock is negative then update the cost to this cost */
+ $sql = "UPDATE stockmaster
+ SET lastcost=materialcost+overheadcost+labourcost,
+ materialcost='" . ($EnteredGRN->ChgPrice / $_SESSION['SuppTrans']->ExRate) . "'
+ WHERE stockid='" . $EnteredGRN->ItemCode . "'";
+ $Result = DB_query($sql, $db, $ErrMsg, $DbgMsg, True);
+ }
+ } /* End if it is weighted average costing we are working with */
+ } /*Its a stock item */
+ } /* There was a price variance */
+ }
if ($EnteredGRN->AssetID!=0) { //then it is an asset
- $PurchPriceVar = $EnteredGRN->This_QuantityInv * (($EnteredGRN->ChgPrice / $_SESSION['SuppTrans']->ExRate) - $EnteredGRN->StdCostUnit);
if ($PurchPriceVar !=0) {
/*Add the fixed asset trans for the difference in the cost */
$SQL = "INSERT INTO fixedassettrans (assetid,
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-12-10 18:23:41 UTC (rev 4765)
+++ trunk/doc/Change.log 2011-12-11 09:52:20 UTC (rev 4766)
@@ -1,5 +1,9 @@
webERP Change Log
+11/12/11 Phil: SupplierInvoice.php attempts to post back any cost variances where there is no stock left to apportion the variances to - posting back to stockmoves (so the DailySales.php and other sales inquiry scripts reflect the appropriate GP) and the salesanalysis tables
+11/12/11 Phil: DailySalesInquiry.php removed incorrect call to establish new cart object??
+10/12/11 Brian May: ConfirmDispatch_Invoice.php corrected SQL that was not calculating the difference to go to the orderdeliverydifferences log in parenthesis first before casting/concatenating to string for the SQL.
+
3/12/11 Release 4.06.2
2/12/11 Phil: Added indian_number_format for specific unusal number formatting 00,00,000.00 for India and apparently South Asian countries. Kicks in for en_IN.utf8 and hi_IN.utf8
Modified: trunk/includes/DateFunctions.inc
===================================================================
--- trunk/includes/DateFunctions.inc 2011-12-10 18:23:41 UTC (rev 4765)
+++ trunk/includes/DateFunctions.inc 2011-12-11 09:52:20 UTC (rev 4766)
@@ -646,7 +646,14 @@
}
function DateAdd ($DateToAddTo,$PeriodString,$NumberPeriods){
-
+ /*Takes
+ * DateToAddTo in $_SESSION['DefaultDateFormat'] format
+ * $PeriodString is one of:
+ * d - days
+ * w - weeks
+ * m - months
+ * y - years
+ * $NumberPeriods is an integer positve or negative */
$DateToAddTo = trim($DateToAddTo);
if (mb_strpos($DateToAddTo,'/')) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-12-11 09:52:27
|
Revision: 4766
http://web-erp.svn.sourceforge.net/web-erp/?rev=4766&view=rev
Author: daintree
Date: 2011-12-11 09:52:20 +0000 (Sun, 11 Dec 2011)
Log Message:
-----------
1/12/11 Phil: SupplierInvoice.php attempts to post back any cost variances where there is no stock left to apportion the variances to - posting back to stockmoves (so the DailySales.php and other sales inquiry scripts reflect the appropriate GP) and the salesanalysis tables
11/12/11 Phil: DailySalesInquiry.php removed incorrect call to establish new cart object??
Modified Paths:
--------------
trunk/DailySalesInquiry.php
trunk/SupplierInvoice.php
trunk/doc/Change.log
trunk/includes/DateFunctions.inc
Modified: trunk/DailySalesInquiry.php
===================================================================
--- trunk/DailySalesInquiry.php 2011-12-10 18:23:41 UTC (rev 4765)
+++ trunk/DailySalesInquiry.php 2011-12-11 09:52:20 UTC (rev 4766)
@@ -15,26 +15,27 @@
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF']) . '" method="post">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-echo '<table class="selection">
- <tr>
- <td>' . _('Month to Show') . ':</td>
- <td><select tabindex="1" name="MonthToShow">';
-
if (!isset($_POST['MonthToShow'])){
$_POST['MonthToShow'] = GetPeriod(Date($_SESSION['DefaultDateFormat']),$db);
- $Result = DB_query("SELECT lastdate_in_period FROM periods WHERE period='" . $_POST['MonthToShow'] . "'",$db);
+ echo 'Got Month to show of: ' .$_POST['MonthToShow'];
+ $Result = DB_query("SELECT lastdate_in_period FROM periods WHERE periodno='" . $_POST['MonthToShow'] . "'",$db);
$myrow = DB_fetch_array($Result);
$EndDateSQL = $myrow['lastdate_in_period'];
}
+echo '<table class="selection">
+ <tr>
+ <td>' . _('Month to Show') . ':</td>
+ <td><select tabindex="1" name="MonthToShow">';
+
$PeriodsResult = DB_query("SELECT periodno, lastdate_in_period FROM periods",$db);
while ($PeriodRow = DB_fetch_array($PeriodsResult)){
if ($_POST['MonthToShow']==$PeriodRow['periodno']) {
- echo '<option selected value="' . $PeriodRow['periodno'] . '">' . MonthAndYearFromSQLDate($PeriodRow['lastdate_in_period']) . '</option>';
- $EndDateSQL = $PeriodRow['lastdate_in_period'];
+ echo '<option selected value="' . $PeriodRow['periodno'] . '">' . MonthAndYearFromSQLDate($PeriodRow['lastdate_in_period']) . '</option>';
+ $EndDateSQL = $PeriodRow['lastdate_in_period'];
} else {
- echo '<option value="' . $PeriodRow['periodno'] . '">' . MonthAndYearFromSQLDate($PeriodRow['lastdate_in_period']) . '</option>';
+ echo '<option value="' . $PeriodRow['periodno'] . '">' . MonthAndYearFromSQLDate($PeriodRow['lastdate_in_period']) . '</option>';
}
}
echo '</select></td>
@@ -51,9 +52,9 @@
while ($SalespersonRow = DB_fetch_array($SalespeopleResult)){
if ($_POST['Salesperson']==$SalespersonRow['salesmancode']) {
- echo '<option selected value="' . $SalespersonRow['salesmancode'] . '">' . $SalespersonRow['salesmanname'] . '</option>';
+ echo '<option selected value="' . $SalespersonRow['salesmancode'] . '">' . $SalespersonRow['salesmanname'] . '</option>';
} else {
- echo '<option Value="' . $SalespersonRow['salesmancode'] . '">' . $SalespersonRow['salesmanname'] . '</option>';
+ echo '<option Value="' . $SalespersonRow['salesmancode'] . '">' . $SalespersonRow['salesmanname'] . '</option>';
}
}
echo '</select></td>';
@@ -116,7 +117,7 @@
$BilledDays = 0;
$DaySalesArray = array();
while ($DaySalesRow=DB_fetch_array($SalesResult)) {
- $DaySalesArray[DayOfMonthFromSQLDate($DaySalesRow['trandate'])] = new Cart;
+
if ($DaySalesRow['salesvalue'] > 0) {
$DaySalesArray[DayOfMonthFromSQLDate($DaySalesRow['trandate'])]->Sales = $DaySalesRow['salesvalue'];
} else {
Modified: trunk/SupplierInvoice.php
===================================================================
--- trunk/SupplierInvoice.php 2011-12-10 18:23:41 UTC (rev 4765)
+++ trunk/SupplierInvoice.php 2011-12-11 09:52:20 UTC (rev 4766)
@@ -228,17 +228,20 @@
/* everything below here only do if a Supplier is selected
fisrt add a header to show who we are making an invoice for */
- echo '<br /><table class=selection colspan=4>
- <tr><th>' . _('Supplier') . '</th>
+ echo '<br /><table class="selection" colspan="4">
+ <tr>
+ <th>' . _('Supplier') . '</th>
<th>' . _('Currency') . '</th>
<th>' . _('Terms') . '</th>
- <th>' . _('Tax Authority') . '</th></tr>';
+ <th>' . _('Tax Authority') . '</th>
+ </tr>';
- echo '<tr><td><font color=blue><b>' . $_SESSION['SuppTrans']->SupplierID . ' - ' .
+ echo '<tr>
+ <td><font color=blue><b>' . $_SESSION['SuppTrans']->SupplierID . ' - ' .
$_SESSION['SuppTrans']->SupplierName . '</b></font></td>
- <th><font color=blue><b>' . $_SESSION['SuppTrans']->CurrCode . '</b></font></th>
- <td><font color=blue><b>' . $_SESSION['SuppTrans']->TermsDescription . '</b></font></td>
- <td><font color=blue><b>' . $_SESSION['SuppTrans']->TaxGroupDescription . '</b></font></td>
+ <th><font color=blue><b>' . $_SESSION['SuppTrans']->CurrCode . '</b></font></th>
+ <td><font color=blue><b>' . $_SESSION['SuppTrans']->TermsDescription . '</b></font></td>
+ <td><font color=blue><b>' . $_SESSION['SuppTrans']->TaxGroupDescription . '</b></font></td>
</tr>
</table>';
@@ -247,7 +250,8 @@
echo '<br /><table class="selection">';
- echo '<tr><td>' . _('Supplier Invoice Reference') . ':</td>
+ echo '<tr>
+ <td>' . _('Supplier Invoice Reference') . ':</td>
<td><input type="text" size="20" maxlength="20" name="SuppReference" value="' . $_SESSION['SuppTrans']->SuppReference . '"></td>';
if (!isset($_SESSION['SuppTrans']->TranDate)){
@@ -467,9 +471,11 @@
}
- echo '<tr><td colspan="3" class="number"><font color="blue">' . _('Total GL Analysis') . ':</font></td>
- <td class=number><font color="blue">' . locale_number_format($TotalGLValue,$_SESSION['SuppTrans']->CurrDecimalPlaces) . '</font></td>
- </tr></table>';
+ echo '<tr>
+ <td colspan="3" class="number"><font color="blue">' . _('Total GL Analysis') . ':</font></td>
+ <td class="number"><font color="blue">' . locale_number_format($TotalGLValue,$_SESSION['SuppTrans']->CurrDecimalPlaces) . '</font></td>
+ </tr>
+ </table>';
}
$_SESSION['SuppTrans']->OvAmount = ($TotalGRNValue + $TotalGLValue + $TotalAssetValue + $TotalShiptValue + $TotalContractsValue);
@@ -788,9 +794,9 @@
foreach ($_SESSION['SuppTrans']->Contracts as $Contract){
- /*contract postings need to get the WIP from the contract items stock category record
- * debit postings to this WIP account
- * the WIP account is tidied up when the contract is closed*/
+ /*contract postings need to get the WIP from the contract items stock category record
+ * debit postings to this WIP account
+ * the WIP account is tidied up when the contract is closed*/
$result = DB_query("SELECT wipact FROM stockcategory
INNER JOIN stockmaster ON
stockcategory.categoryid=stockmaster.categoryid
@@ -860,7 +866,7 @@
/*need to get the stock category record for this stock item - this is function in SQL_CommonFunctions.inc */
$StockGLCode = GetStockGLCode($EnteredGRN->ItemCode,$db);
-
+
/*We have stock item and a purchase price variance need to see whether we are using Standard or WeightedAverageCosting */
if ($_SESSION['WeightedAverageCosting']==1){ /*Weighted Average costing */
@@ -915,61 +921,6 @@
$Result = DB_query($SQL, $db, $ErrMsg, $DbgMsg, True);
-
- /* The variance to the extent of the quantity invoiced should also be written off against the sales analysis cost - as sales analysis would have been created using the cost at the time the sale was made... this was incorrect as hind-sight has shown here. However, how to determine when these were last sold? To update the sales analysis cost. Work through the last 6 months sales analysis from the latest period in which this invoice is being posted and prior.
-
- The assumption here is that the goods have been sold prior to the purchase invocie being entered so it is necessary to back track on the sales analysis cost.
- *
- Note that this will mean that posting to GL COGS will not agree to the cost of sales from the sales analysis*/
-
- $QuantityVarianceAllocated = $EnteredGRN->This_QuantityInv;
- $CostVarPerUnit = (($EnteredGRN->ChgPrice / $_SESSION['SuppTrans']->ExRate) - $EnteredGRN->StdCostUnit);
- $PeriodAllocated = $PeriodNo;
-
- while ($QuantityVarianceAllocated >0) {
- $SalesAnalResult=DB_query("SELECT cust,
- custbranch,
- typeabbrev,
- periodno,
- stkcategory,
- area,
- salesperson,
- cost,
- qty
- FROM salesanalysis
- WHERE salesanalysis.stockid = '" . $EnteredGRN->ItemCode . "'
- AND salesanalysis.budgetoractual=1
- AND periodno='" . $PeriodAllocated . "'",
- $db);
- if (DB_num_rows($SalesAnalResult)>0){
- while ($SalesAnalRow = DB_fetch_array($SalesAnalResult) AND $QuantityVarianceAllocated >0){
- if ($SalesAnalRow['qty']<=$QuantityVarianceAllocated){
- $QuantityVarianceAllocated -= $SalesAnalRow['qty'];
- $QuantityAllocated = $SalesAnalRow['qty'];
- } else {
- $QuantityAllocated = $QuantityVarianceAllocated;
- $QuantityVarianceAllocated=0;
- }
- $UpdSalAnalResult = DB_query("UPDATE salesanalysis
- SET cost = cost + " . ($CostVarPerUnit * $QuantityAllocated) . "
- WHERE cust ='" . $SalesAnalRow['cust'] . "'
- AND stockid='" . $EnteredGRN->ItemCode . "'
- AND custbranch='" . $SalesAnalRow['custbranch'] . "'
- AND typeabbrev='" . $SalesAnalRow['typeabbrev'] . "'
- AND periodno='" . $PeriodAllocated . "'
- AND area='" . $SalesAnalRow['area'] . "'
- AND salesperson='" . $SalesAnalRow['salesperson'] . "'
- AND stkcategory='" . $SalesAnalRow['stkcategory'] . "'
- AND budgetoractual=1",
- $db);
- }
- } //end if there were sales in that period
- $PeriodAllocated--; //decrement the period
- if ($PeriodNo - $PeriodAllocated >6) {
- /*if more than 6 months ago when sales were made then forget it */
- break;
- }
- } //end loop around different periods to see which sales analysis records to update
} // end if the quantity being invoiced here is greater than the current stock on hand
/*Now post any remaining price variance to stock rather than price variances */
@@ -996,33 +947,6 @@
$Result = DB_query($SQL, $db, $ErrMsg, $DbgMsg, True);
- /*Now to update the stock cost with the new weighted average */
-
- /*Need to consider what to do if the cost has been changed manually between receiving the stock and entering the invoice - this code assumes there has been no cost updates made manually and all the price variance is posted to stock.
-
- A nicety or important?? */
-
-
- $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The cost could not be updated because');
- $DbgMsg = _('The following SQL to update the cost was used');
-
- if ($TotalQuantityOnHand>0) {
-
- $CostIncrement = ($PurchPriceVar - $WriteOffToVariances) / $TotalQuantityOnHand;
-
- $sql = "UPDATE stockmaster SET lastcost=materialcost+overheadcost+labourcost,
- materialcost=materialcost+" . $CostIncrement . "
- WHERE stockid='" . $EnteredGRN->ItemCode . "'";
- $Result = DB_query($sql, $db, $ErrMsg, $DbgMsg, True);
- } else {
- /* if stock is negative then update the cost to this cost */
- $sql = "UPDATE stockmaster SET lastcost=materialcost+overheadcost+labourcost,
- materialcost='" . ($EnteredGRN->ChgPrice / $_SESSION['SuppTrans']->ExRate) . "'
- WHERE stockid='" . $EnteredGRN->ItemCode . "'";
- $Result = DB_query($sql, $db, $ErrMsg, $DbgMsg, True);
- }
- /* End of Weighted Average Costing Code */
-
} else { //It must be Standard Costing
$SQL = "INSERT INTO gltrans (type,
@@ -1219,11 +1143,15 @@
/* Now update the GRN and PurchOrderDetails records for amounts invoiced - can't use the other loop through the GRNs as this was only where the GL link to credtors is active */
foreach ($_SESSION['SuppTrans']->GRNs as $EnteredGRN){
-
- $SQL = "UPDATE purchorderdetails SET qtyinvoiced = qtyinvoiced + " . $EnteredGRN->This_QuantityInv .",
- actprice = '" . $EnteredGRN->ChgPrice . "'
- WHERE podetailitem = '" . $EnteredGRN->PODetailItem . "'";
+ //in local currency
+ $ActualCost = $EnteredGRN->ChgPrice / $_SESSION['SuppTrans']->ExRate;
+ $PurchPriceVar = $EnteredGRN->This_QuantityInv * ($ActualCost - $EnteredGRN->StdCostUnit);
+
+ $SQL = "UPDATE purchorderdetails
+ SET qtyinvoiced = qtyinvoiced + " . $EnteredGRN->This_QuantityInv .",
+ actprice = '" . $EnteredGRN->ChgPrice . "'
+ WHERE podetailitem = '" . $EnteredGRN->PODetailItem . "'";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The quantity invoiced of the purchase order line could not be updated because');
@@ -1231,8 +1159,9 @@
$Result = DB_query($SQL, $db, $ErrMsg, $DbgMsg, True);
- $SQL = "UPDATE grns SET quantityinv = quantityinv + " . $EnteredGRN->This_QuantityInv .
- " WHERE grnno = '" . $EnteredGRN->GRNNo . "'";
+ $SQL = "UPDATE grns
+ SET quantityinv = quantityinv + " . $EnteredGRN->This_QuantityInv . "
+ WHERE grnno = '" . $EnteredGRN->GRNNo . "'";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The quantity invoiced off the goods received record could not be updated because');
$DbgMsg = _('The following SQL to update the GRN quantity invoiced was used');
@@ -1258,10 +1187,180 @@
$Result = DB_query($SQL, $db, $ErrMsg, $DbgMsg, True);
} //end of adding GRN shipment charges
+ else {
+ /*so its not a GRN shipment item its a plain old stock item */
+
+ if ($PurchPriceVar !=0){ /* don't bother with any of this lot if there is no difference ! */
+
+ if (mb_strlen($EnteredGRN->ItemCode)>0 OR $EnteredGRN->ItemCode != ''){ /*so it is a stock item */
+ /*We need to:
+ *
+ * a) update the stockmove for the delivery to reflect the actual cost of the delivery
+ *
+ * b) If a WeightedAverageCosting system and the stock quantity on hand now is negative then the cost that has gone to sales analysis and the cost of sales stock movement records will have been incorrect ... attempt to fix it retrospectively
+ */
+ /*Get the location that the stock was booked into */
+ $result = DB_query("SELECT intostocklocation
+ FROM purchorders
+ WHERE orderno='" . $EnteredGRN->PONo . "'",
+ $db);
+ $LocRow = DB_fetch_array($result);
+ $LocCode = $LocRow['intostocklocation'];
+
+ /* First update the stockmoves delivery cost */
+ $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The stock movement record for the delivery could not have the cost updated to the actual cost');
+ $result = DB_query("UPDATE stockmoves SET price = '" . $ActualCost . "'
+ WHERE stockid='" .$EnteredGRN->ItemCode . "'
+ AND type=25
+ AND loccode='" . $LocCode . "'
+ AND transno='" . $EnteredGRN->GRNNo . "'",
+ $db,$ErrMsg,$DbgMsg,True);
+
+ if ($_SESSION['WeightedAverageCosting']==1){
+ /*
+ * How many in stock now?
+ * The quantity being invoiced here - $EnteredGRN->This_QuantityInv
+ * If the quantity in stock now is less than the quantity being invoiced
+ * here then some items sold will not have had this cost factored in
+ * The cost of these items = $ActualCost
+ */
+
+ $sql ="SELECT quantity
+ FROM locstock
+ WHERE loccode='" . $LocCode . "'
+ AND stockid='" . $EnteredGRN->ItemCode . "'";
+ $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The quantity on hand could not be retrieved from the database');
+ $DbgMsg = _('The following SQL to retrieve the total stock quantity was used');
+ $Result = DB_query($sql, $db, $ErrMsg, $DbgMsg);
+ $QtyRow = DB_fetch_row($Result);
+ $TotalQuantityOnHand = $QtyRow[0];
+
+ /* If the quantity on hand is less the quantity charged on this invoice then some must have been sold and the price variance should be reflected in the cost of sales*/
+
+ if ($EnteredGRN->This_QuantityInv > $TotalQuantityOnHand){
+
+ /* The variance to the extent of the quantity invoiced should also be written off against the sales analysis cost - as sales analysis would have been created using the cost at the time the sale was made... this was incorrect as hind-sight has shown here. However, how to determine when these were last sold? To update the sales analysis cost. Work through the last 6 months sales analysis from the latest period in which this invoice is being posted and prior.
+
+ The assumption here is that the goods have been sold prior to the purchase invoice being entered so it is necessary to back track on the sales analysis cost.
+ * Note that this will mean that posting to GL COGS will not agree to the cost of sales from the sales analysis
+ * Of course the price variances will need to be included in COGS as well
+ * */
+
+ $QuantityVarianceAllocated = $EnteredGRN->This_QuantityInv;
+ $CostVarPerUnit = $ActualCost - $EnteredGRN->StdCostUnit;
+ $PeriodAllocated = $PeriodNo;
+ $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The sales analysis records could not be updated for the cost variances on this purchase invoice');
+
+ while ($QuantityVarianceAllocated >0) {
+ $SalesAnalResult=DB_query("SELECT cust,
+ custbranch,
+ typeabbrev,
+ periodno,
+ stkcategory,
+ area,
+ salesperson,
+ cost,
+ qty
+ FROM salesanalysis
+ WHERE salesanalysis.stockid = '" . $EnteredGRN->ItemCode . "'
+ AND salesanalysis.budgetoractual=1
+ AND periodno='" . $PeriodAllocated . "'",
+ $db);
+ if (DB_num_rows($SalesAnalResult)>0){
+ while ($SalesAnalRow = DB_fetch_array($SalesAnalResult) AND $QuantityVarianceAllocated >0){
+ if ($SalesAnalRow['qty']<=$QuantityVarianceAllocated){
+ $QuantityVarianceAllocated -= $SalesAnalRow['qty'];
+ $QuantityAllocated = $SalesAnalRow['qty'];
+ } else {
+ $QuantityAllocated = $QuantityVarianceAllocated;
+ $QuantityVarianceAllocated=0;
+ }
+ $UpdSalAnalResult = DB_query("UPDATE salesanalysis
+ SET cost = cost + " . ($CostVarPerUnit * $QuantityAllocated) . "
+ WHERE cust ='" . $SalesAnalRow['cust'] . "'
+ AND stockid='" . $EnteredGRN->ItemCode . "'
+ AND custbranch='" . $SalesAnalRow['custbranch'] . "'
+ AND typeabbrev='" . $SalesAnalRow['typeabbrev'] . "'
+ AND periodno='" . $PeriodAllocated . "'
+ AND area='" . $SalesAnalRow['area'] . "'
+ AND salesperson='" . $SalesAnalRow['salesperson'] . "'
+ AND stkcategory='" . $SalesAnalRow['stkcategory'] . "'
+ AND budgetoractual=1",
+ $db,$ErrMsg,$DbgMsg,True);
+ }
+ } //end if there were sales in that period
+ $PeriodAllocated--; //decrement the period
+ if ($PeriodNo - $PeriodAllocated >6) {
+ /*if more than 6 months ago when sales were made then forget it */
+ break;
+ }
+ } /*end loop around different periods to see which sales analysis records to update */
+
+ /*now we need to work back through the sales stockmoves up to the quantity on this purchase invoice to update costs
+ * Only go back up to 6 months looking for stockmoves and
+ * Only in the stock location where the purchase order was received
+ * into - if the stock was transferred to another location then
+ * we cannot adjust for this */
+ $result = DB_query("SELECT stkmoveno,
+ type,
+ qty,
+ standardcost
+ FROM stockmoves
+ WHERE loccode='" . $LocCode . "'
+ AND qty < 0
+ AND stockid='" . $EnteredGRN->ItemCode . "'
+ AND trandate>='" . FormatDateForSQL(DateAdd($_SESSION['SuppTrans']->TranDate,'m',-6)) . "'
+ ORDER BY stkmoveno DESC",
+ $db);
+ $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The stock movements for invoices cannot be updated for the cost variances on this purchase invoice');
+ $QuantityVarianceAllocated = $EnteredGRN->This_QuantityInv;
+ while ($StkMoveRow = DB_fetch_array($result) AND $QuantityVarianceAllocated >0){
+ if ($StkMoveRow['qty']+$QuantityVarianceAllocated>0){
+ if ($StkMoveRow['type']==10) { //its a sales invoice
+ $result = DB_query("UPDATE stockmoves
+ SET standardcost = '" . $ActualCost . "'
+ WHERE stkmoveno = '" . $StkMoveRow['stkmoveno'] . "'",
+ $db,$ErrMsg,$DbgMsg,True);
+ }
+ } //end if the invoice qty is more than is left to allocate
+ $QuantityVarianceAllocated+=$StkMoveRow['qty'];
+ }
+ } // end if the quantity being invoiced here is greater than the current stock on hand
+
+ /*Now to update the stock cost with the new weighted average */
+
+ /*Need to consider what to do if the cost has been changed manually between receiving the stock and entering the invoice - this code assumes there has been no cost updates made manually and all the price variance is posted to stock.
+
+ A nicety or important?? */
+
+
+ $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The cost could not be updated because');
+ $DbgMsg = _('The following SQL to update the cost was used');
+
+ if ($TotalQuantityOnHand>0) {
+
+ $CostIncrement = ($PurchPriceVar - $WriteOffToVariances) / $TotalQuantityOnHand;
+
+ $sql = "UPDATE stockmaster
+ SET lastcost=materialcost+overheadcost+labourcost,
+ materialcost=materialcost+" . $CostIncrement . "
+ WHERE stockid='" . $EnteredGRN->ItemCode . "'";
+ $Result = DB_query($sql, $db, $ErrMsg, $DbgMsg, True);
+ } else {
+ /* if stock is negative then update the cost to this cost */
+ $sql = "UPDATE stockmaster
+ SET lastcost=materialcost+overheadcost+labourcost,
+ materialcost='" . ($EnteredGRN->ChgPrice / $_SESSION['SuppTrans']->ExRate) . "'
+ WHERE stockid='" . $EnteredGRN->ItemCode . "'";
+ $Result = DB_query($sql, $db, $ErrMsg, $DbgMsg, True);
+ }
+ } /* End if it is weighted average costing we are working with */
+ } /*Its a stock item */
+ } /* There was a price variance */
+ }
if ($EnteredGRN->AssetID!=0) { //then it is an asset
- $PurchPriceVar = $EnteredGRN->This_QuantityInv * (($EnteredGRN->ChgPrice / $_SESSION['SuppTrans']->ExRate) - $EnteredGRN->StdCostUnit);
if ($PurchPriceVar !=0) {
/*Add the fixed asset trans for the difference in the cost */
$SQL = "INSERT INTO fixedassettrans (assetid,
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-12-10 18:23:41 UTC (rev 4765)
+++ trunk/doc/Change.log 2011-12-11 09:52:20 UTC (rev 4766)
@@ -1,5 +1,9 @@
webERP Change Log
+11/12/11 Phil: SupplierInvoice.php attempts to post back any cost variances where there is no stock left to apportion the variances to - posting back to stockmoves (so the DailySales.php and other sales inquiry scripts reflect the appropriate GP) and the salesanalysis tables
+11/12/11 Phil: DailySalesInquiry.php removed incorrect call to establish new cart object??
+10/12/11 Brian May: ConfirmDispatch_Invoice.php corrected SQL that was not calculating the difference to go to the orderdeliverydifferences log in parenthesis first before casting/concatenating to string for the SQL.
+
3/12/11 Release 4.06.2
2/12/11 Phil: Added indian_number_format for specific unusal number formatting 00,00,000.00 for India and apparently South Asian countries. Kicks in for en_IN.utf8 and hi_IN.utf8
Modified: trunk/includes/DateFunctions.inc
===================================================================
--- trunk/includes/DateFunctions.inc 2011-12-10 18:23:41 UTC (rev 4765)
+++ trunk/includes/DateFunctions.inc 2011-12-11 09:52:20 UTC (rev 4766)
@@ -646,7 +646,14 @@
}
function DateAdd ($DateToAddTo,$PeriodString,$NumberPeriods){
-
+ /*Takes
+ * DateToAddTo in $_SESSION['DefaultDateFormat'] format
+ * $PeriodString is one of:
+ * d - days
+ * w - weeks
+ * m - months
+ * y - years
+ * $NumberPeriods is an integer positve or negative */
$DateToAddTo = trim($DateToAddTo);
if (mb_strpos($DateToAddTo,'/')) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-12-13 07:29:02
|
Revision: 4769
http://web-erp.svn.sourceforge.net/web-erp/?rev=4769&view=rev
Author: daintree
Date: 2011-12-13 07:28:55 +0000 (Tue, 13 Dec 2011)
Log Message:
-----------
fix Exsons commit that was working on an older version of SelectOrderItems.php
Modified Paths:
--------------
trunk/DeliveryDetails.php
trunk/SelectOrderItems.php
trunk/StockLocTransfer.php
Property Changed:
----------------
trunk/
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/utf-8:3087
/branches/utf-8_xfer:3160-3162
+ /branches/utf-8:3087
/branches/utf-8_xfer:3160-3162
Modified: trunk/DeliveryDetails.php
===================================================================
--- trunk/DeliveryDetails.php 2011-12-13 01:34:17 UTC (rev 4768)
+++ trunk/DeliveryDetails.php 2011-12-13 07:28:55 UTC (rev 4769)
@@ -311,7 +311,7 @@
} #end if else freight charge not altered
} #end if process order
-if (isset($OK_to_PROCESS) and $OK_to_PROCESS == 1 && $_SESSION['ExistingOrder'.$identifier]==0){
+if (isset($OK_to_PROCESS) AND $OK_to_PROCESS == 1 && $_SESSION['ExistingOrder'.$identifier]==0){
/* finally write the order header to the database and then the order line details */
Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php 2011-12-13 01:34:17 UTC (rev 4768)
+++ trunk/SelectOrderItems.php 2011-12-13 07:28:55 UTC (rev 4769)
@@ -50,7 +50,7 @@
unset ($_SESSION['Items'.$identifier]);
}
- $_SESSION['ExistingOrder'.$identifier]=0;
+ $_SESSION['ExistingOrder' .$identifier]=0;
$_SESSION['Items'.$identifier] = new cart;
if (count($_SESSION['AllowedPageSecurityTokens'])==1){ //its a customer logon
@@ -651,11 +651,11 @@
if (isset($_POST['CancelOrder'])) {
$OK_to_delete=1; //assume this in the first instance
- if($_SESSION['ExistingOrder'.$identifier]!=0) { //need to check that not already dispatched
+ if($_SESSION['ExistingOrder' . $identifier]!=0) { //need to check that not already dispatched
$sql = "SELECT qtyinvoiced
FROM salesorderdetails
- WHERE orderno='" . $_SESSION['ExistingOrder'.$identifier] . "'
+ WHERE orderno='" . $_SESSION['ExistingOrder' . $identifier] . "'
AND qtyinvoiced>0";
$InvQties = DB_query($sql,$db);
@@ -669,17 +669,17 @@
}
if ($OK_to_delete==1){
- if($_SESSION['ExistingOrder'.$identifier]!=0){
+ if($_SESSION['ExistingOrder' . $identifier]!=0){
- $SQL = "DELETE FROM salesorderdetails WHERE salesorderdetails.orderno ='" . $_SESSION['ExistingOrder'.$identifier] . "'";
+ $SQL = "DELETE FROM salesorderdetails WHERE salesorderdetails.orderno ='" . $_SESSION['ExistingOrder' . $identifier] . "'";
$ErrMsg =_('The order detail lines could not be deleted because');
$DelResult=DB_query($SQL,$db,$ErrMsg);
- $SQL = "DELETE FROM salesorders WHERE salesorders.orderno='" . $_SESSION['ExistingOrder'.$identifier] . "'";
+ $SQL = "DELETE FROM salesorders WHERE salesorders.orderno='" . $_SESSION['ExistingOrder' . $identifier] . "'";
$ErrMsg = _('The order header could not be deleted because');
$DelResult=DB_query($SQL,$db,$ErrMsg);
- $_SESSION['ExistingOrder'.$identifier]=0;
+ $_SESSION['ExistingOrder' . $identifier]=0;
}
unset($_SESSION['Items'.$identifier]->LineItems);
Modified: trunk/StockLocTransfer.php
===================================================================
--- trunk/StockLocTransfer.php 2011-12-13 01:34:17 UTC (rev 4768)
+++ trunk/StockLocTransfer.php 2011-12-13 07:28:55 UTC (rev 4769)
@@ -88,7 +88,18 @@
} //end if there is a CSV file to import
else { // process the manually input lines
$ErrorMessage='';
+ if (isset($_POST['ClearAll'])){
+ unset($_POST['EnterMoreItems']);
+ for ($i=$_POST['LinesCounter']-10;$i<$_POST['LinesCounter'];$i++){
+ unset($_POST['StockID' . $i]);
+ unset($_POST['StockQTY' . $i]);
+ }
+ }
for ($i=$_POST['LinesCounter']-10;$i<$_POST['LinesCounter'];$i++){
+ if (isset($_POST['Delete' . $i])){
+ unset($_POST['StockID' . $i]);
+ unset($_POST['StockQTY' . $i]);
+ }
if (isset($_POST['StockID' . $i]) AND $_POST['StockID' . $i]!=''){
$_POST['StockID' . $i]=trim(mb_strtoupper($_POST['StockID' . $i]));
$result = DB_query("SELECT COUNT(stockid) FROM stockmaster WHERE stockid='" . $_POST['StockID' . $i] . "'",$db);
@@ -257,25 +268,36 @@
echo '<table class="selection">';
- $tableheader = '<tr><th>'. _('Item Code'). '</th>
- <th>'. _('Quantity'). '</th></tr>';
- echo $tableheader;
+ $TableHeader = '<tr>
+ <th>'. _('Item Code'). '</th>
+ <th>'. _('Quantity'). '</th>
+ <th>' . _('Clear All') . ':<input type="checkbox" name="ClearAll" /></th>
+ </tr>';
+ echo $TableHeader;
- $k=0; /* row counter */
+ $k=0; /* page heading row counter */
+ $j=0; /* row counter for reindexing */
if(isset($_POST['LinesCounter'])){
- for ($i=0;$i < $_POST['LinesCounter'] AND $_POST['StockID' . $i] !='';$i++){
-
+ for ($i=0;$i < $_POST['LinesCounter'];$i++){
+ if (!isset($_POST['StockID'. $i])){
+ continue;
+ }
+ if ($_POST['StockID' . $i] ==''){
+ break;
+ }
if ($k==18){
- echo $tableheader;
+ echo $TableHeader;
$k=0;
}
$k++;
echo '<tr>
- <td><input type="text" name="StockID' . $i .'" size="21" maxlength="20" value="' . $_POST['StockID' . $i] . '" /></td>
- <td><input type="text" name="StockQTY' . $i .'" size="10" maxlength="10" class="number" value="' . locale_number_format($_POST['StockQTY' . $i],'Variable') . '" /></td>
+ <td><input type="text" name="StockID' . $j .'" size="21" maxlength="20" value="' . $_POST['StockID' . $i] . '" /></td>
+ <td><input type="text" name="StockQTY' . $j .'" size="10" maxlength="10" class="number" value="' . locale_number_format($_POST['StockQTY' . $i],'Variable') . '" /></td>
+ <td>' . _('Delete') . '<input type="checkbox" name="Delete' . $j .'" /></td>
</tr>';
+ $j++;
}
}else {
$i = 0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-12-13 07:29:02
|
Revision: 4769
http://web-erp.svn.sourceforge.net/web-erp/?rev=4769&view=rev
Author: daintree
Date: 2011-12-13 07:28:55 +0000 (Tue, 13 Dec 2011)
Log Message:
-----------
fix Exsons commit that was working on an older version of SelectOrderItems.php
Modified Paths:
--------------
trunk/DeliveryDetails.php
trunk/SelectOrderItems.php
trunk/StockLocTransfer.php
Property Changed:
----------------
trunk/
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/utf-8:3087
/branches/utf-8_xfer:3160-3162
+ /branches/utf-8:3087
/branches/utf-8_xfer:3160-3162
Modified: trunk/DeliveryDetails.php
===================================================================
--- trunk/DeliveryDetails.php 2011-12-13 01:34:17 UTC (rev 4768)
+++ trunk/DeliveryDetails.php 2011-12-13 07:28:55 UTC (rev 4769)
@@ -311,7 +311,7 @@
} #end if else freight charge not altered
} #end if process order
-if (isset($OK_to_PROCESS) and $OK_to_PROCESS == 1 && $_SESSION['ExistingOrder'.$identifier]==0){
+if (isset($OK_to_PROCESS) AND $OK_to_PROCESS == 1 && $_SESSION['ExistingOrder'.$identifier]==0){
/* finally write the order header to the database and then the order line details */
Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php 2011-12-13 01:34:17 UTC (rev 4768)
+++ trunk/SelectOrderItems.php 2011-12-13 07:28:55 UTC (rev 4769)
@@ -50,7 +50,7 @@
unset ($_SESSION['Items'.$identifier]);
}
- $_SESSION['ExistingOrder'.$identifier]=0;
+ $_SESSION['ExistingOrder' .$identifier]=0;
$_SESSION['Items'.$identifier] = new cart;
if (count($_SESSION['AllowedPageSecurityTokens'])==1){ //its a customer logon
@@ -651,11 +651,11 @@
if (isset($_POST['CancelOrder'])) {
$OK_to_delete=1; //assume this in the first instance
- if($_SESSION['ExistingOrder'.$identifier]!=0) { //need to check that not already dispatched
+ if($_SESSION['ExistingOrder' . $identifier]!=0) { //need to check that not already dispatched
$sql = "SELECT qtyinvoiced
FROM salesorderdetails
- WHERE orderno='" . $_SESSION['ExistingOrder'.$identifier] . "'
+ WHERE orderno='" . $_SESSION['ExistingOrder' . $identifier] . "'
AND qtyinvoiced>0";
$InvQties = DB_query($sql,$db);
@@ -669,17 +669,17 @@
}
if ($OK_to_delete==1){
- if($_SESSION['ExistingOrder'.$identifier]!=0){
+ if($_SESSION['ExistingOrder' . $identifier]!=0){
- $SQL = "DELETE FROM salesorderdetails WHERE salesorderdetails.orderno ='" . $_SESSION['ExistingOrder'.$identifier] . "'";
+ $SQL = "DELETE FROM salesorderdetails WHERE salesorderdetails.orderno ='" . $_SESSION['ExistingOrder' . $identifier] . "'";
$ErrMsg =_('The order detail lines could not be deleted because');
$DelResult=DB_query($SQL,$db,$ErrMsg);
- $SQL = "DELETE FROM salesorders WHERE salesorders.orderno='" . $_SESSION['ExistingOrder'.$identifier] . "'";
+ $SQL = "DELETE FROM salesorders WHERE salesorders.orderno='" . $_SESSION['ExistingOrder' . $identifier] . "'";
$ErrMsg = _('The order header could not be deleted because');
$DelResult=DB_query($SQL,$db,$ErrMsg);
- $_SESSION['ExistingOrder'.$identifier]=0;
+ $_SESSION['ExistingOrder' . $identifier]=0;
}
unset($_SESSION['Items'.$identifier]->LineItems);
Modified: trunk/StockLocTransfer.php
===================================================================
--- trunk/StockLocTransfer.php 2011-12-13 01:34:17 UTC (rev 4768)
+++ trunk/StockLocTransfer.php 2011-12-13 07:28:55 UTC (rev 4769)
@@ -88,7 +88,18 @@
} //end if there is a CSV file to import
else { // process the manually input lines
$ErrorMessage='';
+ if (isset($_POST['ClearAll'])){
+ unset($_POST['EnterMoreItems']);
+ for ($i=$_POST['LinesCounter']-10;$i<$_POST['LinesCounter'];$i++){
+ unset($_POST['StockID' . $i]);
+ unset($_POST['StockQTY' . $i]);
+ }
+ }
for ($i=$_POST['LinesCounter']-10;$i<$_POST['LinesCounter'];$i++){
+ if (isset($_POST['Delete' . $i])){
+ unset($_POST['StockID' . $i]);
+ unset($_POST['StockQTY' . $i]);
+ }
if (isset($_POST['StockID' . $i]) AND $_POST['StockID' . $i]!=''){
$_POST['StockID' . $i]=trim(mb_strtoupper($_POST['StockID' . $i]));
$result = DB_query("SELECT COUNT(stockid) FROM stockmaster WHERE stockid='" . $_POST['StockID' . $i] . "'",$db);
@@ -257,25 +268,36 @@
echo '<table class="selection">';
- $tableheader = '<tr><th>'. _('Item Code'). '</th>
- <th>'. _('Quantity'). '</th></tr>';
- echo $tableheader;
+ $TableHeader = '<tr>
+ <th>'. _('Item Code'). '</th>
+ <th>'. _('Quantity'). '</th>
+ <th>' . _('Clear All') . ':<input type="checkbox" name="ClearAll" /></th>
+ </tr>';
+ echo $TableHeader;
- $k=0; /* row counter */
+ $k=0; /* page heading row counter */
+ $j=0; /* row counter for reindexing */
if(isset($_POST['LinesCounter'])){
- for ($i=0;$i < $_POST['LinesCounter'] AND $_POST['StockID' . $i] !='';$i++){
-
+ for ($i=0;$i < $_POST['LinesCounter'];$i++){
+ if (!isset($_POST['StockID'. $i])){
+ continue;
+ }
+ if ($_POST['StockID' . $i] ==''){
+ break;
+ }
if ($k==18){
- echo $tableheader;
+ echo $TableHeader;
$k=0;
}
$k++;
echo '<tr>
- <td><input type="text" name="StockID' . $i .'" size="21" maxlength="20" value="' . $_POST['StockID' . $i] . '" /></td>
- <td><input type="text" name="StockQTY' . $i .'" size="10" maxlength="10" class="number" value="' . locale_number_format($_POST['StockQTY' . $i],'Variable') . '" /></td>
+ <td><input type="text" name="StockID' . $j .'" size="21" maxlength="20" value="' . $_POST['StockID' . $i] . '" /></td>
+ <td><input type="text" name="StockQTY' . $j .'" size="10" maxlength="10" class="number" value="' . locale_number_format($_POST['StockQTY' . $i],'Variable') . '" /></td>
+ <td>' . _('Delete') . '<input type="checkbox" name="Delete' . $j .'" /></td>
</tr>';
+ $j++;
}
}else {
$i = 0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-12-13 07:50:25
|
Revision: 4771
http://web-erp.svn.sourceforge.net/web-erp/?rev=4771&view=rev
Author: daintree
Date: 2011-12-13 07:50:19 +0000 (Tue, 13 Dec 2011)
Log Message:
-----------
Vitaly fix to Z_ChangeStockCode.php
Modified Paths:
--------------
trunk/Z_ChangeStockCode.php
trunk/doc/Change.log
Modified: trunk/Z_ChangeStockCode.php
===================================================================
--- trunk/Z_ChangeStockCode.php 2011-12-13 07:31:31 UTC (rev 4770)
+++ trunk/Z_ChangeStockCode.php 2011-12-13 07:50:19 UTC (rev 4771)
@@ -134,7 +134,7 @@
//check if MRP tables exist before assuming
$result = DB_query("SELECT COUNT(*) FROM mrpplannedorders",$db,'','',false,false);
- if ($DB_error_no==0) {
+ if ($DB_error_no($db)==0) {
echo '<br />' . _('Changing MRP planned orders information');
$sql = "UPDATE mrpplannedorders SET part='" . $_POST['NewStockID'] . "' WHERE part='" . $_POST['OldStockID'] . "'";
$ErrMsg = _('The SQL to update the mrpplannedorders records failed');
@@ -238,8 +238,9 @@
$ErrMsg = _('The SQL to update the BOM records failed');
$result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
echo ' ... ' . _('completed');
+
+ DB_IgnoreForeignKeys($db);
-
echo '<br />' . _('Changing the BOM table records') . ' - ' . _('parents');
$sql = "UPDATE bom SET parent='" . $_POST['NewStockID'] . "' WHERE parent='" . $_POST['OldStockID'] . "'";
$ErrMsg = _('The SQL to update the BOM parent records failed');
@@ -264,8 +265,6 @@
$result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
echo ' ... ' . _('completed');
- $sql = 'SET FOREIGN_KEY_CHECKS=0';
- $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
echo '<br />' . _('Changing work order requirements information');
@@ -297,10 +296,9 @@
$ErrMsg = _('The SQL to update the stockserialitem records failed');
$result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
echo ' ... ' . _('completed');
-
- $sql = 'SET FOREIGN_KEY_CHECKS=1';
- $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
-
+
+ DB_ReinstateForeignKeys($db);
+
$result = DB_Txn_Commit($db);
echo '<br />' . _('Deleting the old stock master record');
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-12-13 07:31:31 UTC (rev 4770)
+++ trunk/doc/Change.log 2011-12-13 07:50:19 UTC (rev 4771)
@@ -1,5 +1,6 @@
webERP Change Log
+13/12/11 Vitaly Shevkunov: Z_ChangeStockCode.php fixed call to DB_error_no had missing ($db) - also turned off FOREIGN KEY CHECKS before updating the BOM.
13/12/11 Exson: Fix SelectOrderItems.php and DeliveryDetails.php for where an order is modified while another order is being created in a different tab of the browser - $_SESSION['ExistingOrder'] now modified to $_SESSION['ExistingOrder' .$identifier] as suggested by Tim
11/12/11 Phil: SupplierInvoice.php attempts to post back any cost variances where there is no stock left to apportion the variances to - posting back to stockmoves (so the DailySales.php and other sales inquiry scripts reflect the appropriate GP) and the salesanalysis tables
11/12/11 Phil: DailySalesInquiry.php removed incorrect call to establish new cart object??
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-12-13 07:50:26
|
Revision: 4771
http://web-erp.svn.sourceforge.net/web-erp/?rev=4771&view=rev
Author: daintree
Date: 2011-12-13 07:50:19 +0000 (Tue, 13 Dec 2011)
Log Message:
-----------
Vitaly fix to Z_ChangeStockCode.php
Modified Paths:
--------------
trunk/Z_ChangeStockCode.php
trunk/doc/Change.log
Modified: trunk/Z_ChangeStockCode.php
===================================================================
--- trunk/Z_ChangeStockCode.php 2011-12-13 07:31:31 UTC (rev 4770)
+++ trunk/Z_ChangeStockCode.php 2011-12-13 07:50:19 UTC (rev 4771)
@@ -134,7 +134,7 @@
//check if MRP tables exist before assuming
$result = DB_query("SELECT COUNT(*) FROM mrpplannedorders",$db,'','',false,false);
- if ($DB_error_no==0) {
+ if ($DB_error_no($db)==0) {
echo '<br />' . _('Changing MRP planned orders information');
$sql = "UPDATE mrpplannedorders SET part='" . $_POST['NewStockID'] . "' WHERE part='" . $_POST['OldStockID'] . "'";
$ErrMsg = _('The SQL to update the mrpplannedorders records failed');
@@ -238,8 +238,9 @@
$ErrMsg = _('The SQL to update the BOM records failed');
$result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
echo ' ... ' . _('completed');
+
+ DB_IgnoreForeignKeys($db);
-
echo '<br />' . _('Changing the BOM table records') . ' - ' . _('parents');
$sql = "UPDATE bom SET parent='" . $_POST['NewStockID'] . "' WHERE parent='" . $_POST['OldStockID'] . "'";
$ErrMsg = _('The SQL to update the BOM parent records failed');
@@ -264,8 +265,6 @@
$result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
echo ' ... ' . _('completed');
- $sql = 'SET FOREIGN_KEY_CHECKS=0';
- $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
echo '<br />' . _('Changing work order requirements information');
@@ -297,10 +296,9 @@
$ErrMsg = _('The SQL to update the stockserialitem records failed');
$result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
echo ' ... ' . _('completed');
-
- $sql = 'SET FOREIGN_KEY_CHECKS=1';
- $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
-
+
+ DB_ReinstateForeignKeys($db);
+
$result = DB_Txn_Commit($db);
echo '<br />' . _('Deleting the old stock master record');
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-12-13 07:31:31 UTC (rev 4770)
+++ trunk/doc/Change.log 2011-12-13 07:50:19 UTC (rev 4771)
@@ -1,5 +1,6 @@
webERP Change Log
+13/12/11 Vitaly Shevkunov: Z_ChangeStockCode.php fixed call to DB_error_no had missing ($db) - also turned off FOREIGN KEY CHECKS before updating the BOM.
13/12/11 Exson: Fix SelectOrderItems.php and DeliveryDetails.php for where an order is modified while another order is being created in a different tab of the browser - $_SESSION['ExistingOrder'] now modified to $_SESSION['ExistingOrder' .$identifier] as suggested by Tim
11/12/11 Phil: SupplierInvoice.php attempts to post back any cost variances where there is no stock left to apportion the variances to - posting back to stockmoves (so the DailySales.php and other sales inquiry scripts reflect the appropriate GP) and the salesanalysis tables
11/12/11 Phil: DailySalesInquiry.php removed incorrect call to establish new cart object??
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-12-13 08:55:48
|
Revision: 4772
http://web-erp.svn.sourceforge.net/web-erp/?rev=4772&view=rev
Author: daintree
Date: 2011-12-13 08:55:38 +0000 (Tue, 13 Dec 2011)
Log Message:
-----------
Additional changes to ExistingOrder
Modified Paths:
--------------
trunk/CounterSales.php
trunk/Credit_Invoice.php
trunk/DeliveryDetails.php
trunk/RecurringSalesOrders.php
trunk/SalesByTypePeriodInquiry.php
trunk/SalesCategoryPeriodInquiry.php
trunk/SalesTopItemsInquiry.php
trunk/SelectOrderItems.php
trunk/doc/Change.log
trunk/includes/DefineCartClass.php
trunk/includes/SelectOrderItems_IntoCart.inc
Modified: trunk/CounterSales.php
===================================================================
--- trunk/CounterSales.php 2011-12-13 07:50:19 UTC (rev 4771)
+++ trunk/CounterSales.php 2011-12-13 08:55:38 UTC (rev 4772)
@@ -63,7 +63,7 @@
set to 1. The delivery check screen is where the details of the order are either updated or
inserted depending on the value of ExistingOrder */
- $_SESSION['ExistingOrder'] = 0;
+ $_SESSION['ExistingOrder'. $identifier] = 0;
$_SESSION['Items'.$identifier] = new cart;
$_SESSION['PrintedPackingSlip'] = 0; /*Of course 'cos the order ain't even started !!*/
/*Get the default customer-branch combo from the user's default location record */
Modified: trunk/Credit_Invoice.php
===================================================================
--- trunk/Credit_Invoice.php 2011-12-13 07:50:19 UTC (rev 4771)
+++ trunk/Credit_Invoice.php 2011-12-13 08:55:38 UTC (rev 4772)
@@ -156,8 +156,8 @@
'',
'',
'',
- $myrow['standardcost']
- );
+ $myrow['standardcost']);
+
$_SESSION['CreditItems']->GetExistingTaxes($LineNumber, $myrow['stkmoveno']);
if ($myrow['controlled']==1){/* Populate the SerialItems array too*/
Modified: trunk/DeliveryDetails.php
===================================================================
--- trunk/DeliveryDetails.php 2011-12-13 07:50:19 UTC (rev 4771)
+++ trunk/DeliveryDetails.php 2011-12-13 08:55:38 UTC (rev 4772)
@@ -855,11 +855,11 @@
echo '<td>'.$StockItem->StockID.'</td>
<td>'.$StockItem->ItemDescription.'</td>
- <td class=number>'.$DisplayQuantity.'</td>
+ <td class="number">'.$DisplayQuantity.'</td>
<td>'.$StockItem->Units.'</td>
- <td class=number>'.$DisplayPrice.'</td>
- <td class=number>'.$DisplayDiscount.'</td>
- <td class=number>'.$DisplayLineTotal.'</td>
+ <td class="number">'.$DisplayPrice.'</td>
+ <td class="number">'.$DisplayDiscount.'</td>
+ <td class="number">'.$DisplayLineTotal.'</td>
</tr>';
$_SESSION['Items'.$identifier]->total = $_SESSION['Items'.$identifier]->total + $LineTotal;
@@ -869,25 +869,30 @@
$DisplayTotal = number_format($_SESSION['Items'.$identifier]->total,2);
echo '<tr class="EvenTableRows">
- <td colspan=6 class=number><b>'. _('TOTAL Excl Tax/Freight') .'</b></td>
- <td class=number>'.$DisplayTotal.'</td>
- </tr></table>';
+ <td colspan="6" class="number"><b>'. _('TOTAL Excl Tax/Freight') .'</b></td>
+ <td class="number">'.$DisplayTotal.'</td>
+ </tr>
+ </table>';
$DisplayVolume = number_format($_SESSION['Items'.$identifier]->totalVolume,2);
$DisplayWeight = number_format($_SESSION['Items'.$identifier]->totalWeight,2);
- echo '<br /><table><tr class="EvenTableRows">
- <td>'. _('Total Weight') .':</td>
- <td class="number">'.$DisplayWeight.'</td>
- <td>'. _('Total Volume') .':</td>
- <td class="number">'.$DisplayVolume.'</td>
- </tr></table>';
+ echo '<br />
+ <table>
+ <tr class="EvenTableRows">
+ <td>'. _('Total Weight') .':</td>
+ <td class="number">'.$DisplayWeight.'</td>
+ <td>'. _('Total Volume') .':</td>
+ <td class="number">'.$DisplayVolume.'</td>
+ </tr>
+ </table>';
} else {
/*Display the order without discount */
echo '<div class="centre"><b>' . _('Order Summary') . '</b></div>
- <table cellpadding=2 colspan=7 border=1><tr>
+ <table class="selection">
+ <tr>
<th>'. _('Item Description') .'</th>
<th>'. _('Quantity') .'</th>
<th>'. _('Unit') .'</th>
@@ -914,10 +919,10 @@
$k=1;
}
echo '<td>'.$StockItem->ItemDescription.'</td>
- <td class=number>'. $DisplayQuantity.'</td>
+ <td class="number">'. $DisplayQuantity.'</td>
<td>'.$StockItem->Units.'</td>
- <td class=number>'. $DisplayPrice.'</td>
- <td class=number>'. $DisplayLineTotal .'</font></td>
+ <td class="number">'. $DisplayPrice.'</td>
+ <td class="number">'. $DisplayLineTotal .'</font></td>
</tr>';
$_SESSION['Items'.$identifier]->total = $_SESSION['Items'.$identifier]->total + $LineTotal;
@@ -927,12 +932,14 @@
}
$DisplayTotal = number_format($_SESSION['Items'.$identifier]->total,$_SESSION['Items'.$identifier]->CurrDecimalPlaces);
- echo '<table class=selection><tr>
- <td>'. _('Total Weight') .':</td>
- <td>'.$DisplayWeight .'</td>
- <td>'. _('Total Volume') .':</td>
- <td>'.$DisplayVolume .'</td>
- </tr></table>';
+ echo '<table class="selection">
+ <tr>
+ <td>'. _('Total Weight') .':</td>
+ <td>'.$DisplayWeight .'</td>
+ <td>'. _('Total Volume') .':</td>
+ <td>'.$DisplayVolume .'</td>
+ </tr>
+ </table>';
$DisplayVolume = number_format($_SESSION['Items'.$identifier]->totalVolume,2);
$DisplayWeight = number_format($_SESSION['Items'.$identifier]->totalWeight,2);
@@ -945,10 +952,12 @@
}
-echo '<br /><table class=selection><tr>
- <td>'. _('Deliver To') .':</td>
- <td><input type="text" size=42 maxlength=40 name="DeliverTo" value="' . $_SESSION['Items'.$identifier]->DeliverTo . '"></td>
-</tr>';
+echo '<br />
+ <table class="selection">
+ <tr>
+ <td>'. _('Deliver To') .':</td>
+ <td><input type="text" size="42" maxlength="40" name="DeliverTo" value="' . $_SESSION['Items'.$identifier]->DeliverTo . '" /></td>
+ </tr>';
echo '<tr>
<td>'. _('Deliver from the warehouse at') .':</td>
@@ -986,66 +995,59 @@
// The estimated Dispatch date or Delivery date for this order
echo '<tr>
- <td>'. _('Estimated Delivery Date') .':</td>
- <td><input class="date" alt="'.$_SESSION['DefaultDateFormat'].'" type="text" size=15 maxlength=14 name="DeliveryDate" value="' . $_SESSION['Items'.$identifier]->DeliveryDate . '"></td>
+ <td>'. _('Estimated Delivery Date') .':</td>
+ <td><input class="date" alt="'.$_SESSION['DefaultDateFormat'].'" type="text" size=15 maxlength=14 name="DeliveryDate" value="' . $_SESSION['Items'.$identifier]->DeliveryDate . '"></td>
</tr>';
// The date when a quote was issued to the customer
echo '<tr>
- <td>'. _('Quote Date') .':</td>
- <td><input class="date" alt="'.$_SESSION['DefaultDateFormat'].'" type="text" size=15 maxlength=14 name="QuoteDate" value="' . $_SESSION['Items'.$identifier]->QuoteDate . '"></td>
+ <td>'. _('Quote Date') .':</td>
+ <td><input class="date" alt="'.$_SESSION['DefaultDateFormat'].'" type="text" size="15" maxlength="14" name="QuoteDate" value="' . $_SESSION['Items'.$identifier]->QuoteDate . '" /></td>
</tr>';
// The date when the customer confirmed their order
echo '<tr>
- <td>'. _('Confirmed Order Date') .':</td>
- <td><input class="date" alt="'.$_SESSION['DefaultDateFormat'].'" type="text" size=15 maxlength=14 name="ConfirmedDate" value="' . $_SESSION['Items'.$identifier]->ConfirmedDate . '"></td>
+ <td>'. _('Confirmed Order Date') .':</td>
+ <td><input class="date" alt="'.$_SESSION['DefaultDateFormat'].'" type="text" size="15" maxlength="14" name="ConfirmedDate" value="' . $_SESSION['Items'.$identifier]->ConfirmedDate . '" /></td>
+ </tr>
+ <tr>
+ <td>'. _('Delivery Address 1') . ':</td>
+ <td><input type="text" size="42" maxlength="40" name="BrAdd1" value="' . $_SESSION['Items'.$identifier]->DelAdd1 . '" /></td>
+ </tr>
+ <tr>
+ <td>'. _('Delivery Address 2') . ':</td>
+ <td><input type="text" size="42" maxlength="40" name="BrAdd2" value="' . $_SESSION['Items'.$identifier]->DelAdd2 . '" /></td>
+ </tr>
+ <tr>
+ <td>'. _('Delivery Address 3') . ':</td>
+ <td><input type="text" size="42" maxlength="40" name="BrAdd3" value="' . $_SESSION['Items'.$identifier]->DelAdd3 . '" /></td>
+ </tr>
+ <tr>
+ <td>'. _('Delivery Address 4') . ':</td>
+ <td><input type="text" size="42" maxlength="40" name="BrAdd4" value="' . $_SESSION['Items'.$identifier]->DelAdd4 . '" /></td>
+ </tr>
+ <tr>
+ <td>'. _('Delivery Address 5') . ':</td>
+ <td><input type="text" size="42" maxlength="40" name="BrAdd5" value="' . $_SESSION['Items'.$identifier]->DelAdd5 . '" /></td>
+ </tr>
+ <tr>
+ <td>'. _('Delivery Address 6') . ':</td>
+ <td><input type="text" size="42" maxlength="40" name="BrAdd6" value="' . $_SESSION['Items'.$identifier]->DelAdd6 . '" /></td>
+ </tr>
+ <tr>
+ <td>'. _('Contact Phone Number') .':</td>
+ <td><input type="text" size=25 maxlength=25 name="PhoneNo" value="' . $_SESSION['Items'.$identifier]->PhoneNo . '"></td>
+ </tr>
+ <tr>
+ <td>' . _('Contact Email') . ':</td><td><input type="text" size=40 maxlength=38 name="Email" value="' . $_SESSION['Items'.$identifier]->Email . '"></td>
+ </tr>
+ <tr>
+ <td>'. _('Customer Reference') .':</td>
+ <td><input type="text" size=25 maxlength=25 name="CustRef" value="' . $_SESSION['Items'.$identifier]->CustRef . '"></td>
+ </tr>
+ <tr>
+ <td>'. _('Comments') .':</td>
+ <td><textarea name="Comments" cols="31" rows="5">' . $_SESSION['Items'.$identifier]->Comments .'</textarea></td>
</tr>';
-echo '<tr>
- <td>'. _('Delivery Address 1') . ':</td>
- <td><input type="text" size=42 maxlength=40 name="BrAdd1" value="' . $_SESSION['Items'.$identifier]->DelAdd1 . '"></td>
-</tr>';
-
-echo '<tr>
- <td>'. _('Delivery Address 2') . ':</td>
- <td><input type="text" size=42 maxlength=40 name="BrAdd2" value="' . $_SESSION['Items'.$identifier]->DelAdd2 . '"></td>
-</tr>';
-
-echo '<tr>
- <td>'. _('Delivery Address 3') . ':</td>
- <td><input type="text" size="42" maxlength="40" name="BrAdd3" value="' . $_SESSION['Items'.$identifier]->DelAdd3 . '"></td>
-</tr>';
-
-echo '<tr>
- <td>'. _('Delivery Address 4') . ':</td>
- <td><input type="text" size=42 maxlength=40 name="BrAdd4" value="' . $_SESSION['Items'.$identifier]->DelAdd4 . '"></td>
-</tr>';
-
-echo '<tr>
- <td>'. _('Delivery Address 5') . ':</td>
- <td><input type="text" size=42 maxlength=40 name="BrAdd5" value="' . $_SESSION['Items'.$identifier]->DelAdd5 . '"></td>
-</tr>';
-
-echo '<tr>
- <td>'. _('Delivery Address 6') . ':</td>
- <td><input type="text" size=42 maxlength=40 name="BrAdd6" value="' . $_SESSION['Items'.$identifier]->DelAdd6 . '"></td>
-</tr>';
-
-echo '<tr>
- <td>'. _('Contact Phone Number') .':</td>
- <td><input type="text" size=25 maxlength=25 name="PhoneNo" value="' . $_SESSION['Items'.$identifier]->PhoneNo . '"></td>
-</tr>';
-
-echo '<tr><td>' . _('Contact Email') . ':</td><td><input type="text" size=40 maxlength=38 name="Email" value="' . $_SESSION['Items'.$identifier]->Email . '"></td></tr>';
-
-echo '<tr><td>'. _('Customer Reference') .':</td>
- <td><input type="text" size=25 maxlength=25 name="CustRef" value="' . $_SESSION['Items'.$identifier]->CustRef . '"></td>
-</tr>';
-
-echo '<tr>
- <td>'. _('Comments') .':</td>
- <td><textarea name="Comments" cols=31 rows=5>' . $_SESSION['Items'.$identifier]->Comments .'</textarea></td>
-</tr>';
-
/* This field will control whether or not to display the company logo and
address on the packlist */
@@ -1061,7 +1063,7 @@
}
echo '</select></td></tr>';
-if (isset($_SESSION['PrintedPackingSlip']) and $_SESSION['PrintedPackingSlip']==1){
+if (isset($_SESSION['PrintedPackingSlip']) AND $_SESSION['PrintedPackingSlip']==1){
echo '<tr>
<td>'. _('Reprint packing slip') .':</td>
@@ -1073,19 +1075,22 @@
echo '<input type=hidden name="ReprintPackingSlip" value=0>';
}
-echo '<tr><td>'. _('Charge Freight Cost inc tax') .':</td>';
-echo '<td><input type="text" class="number" size=10 maxlength=12 name="FreightCost" value="' . $_SESSION['Items'.$identifier]->FreightCost . '"></td>';
+echo '<tr>
+ <td>'. _('Charge Freight Cost inc tax') .':</td>
+ <td><input type="text" class="number" size="10" maxlength="12" name="FreightCost" value="' . $_SESSION['Items'.$identifier]->FreightCost . '" /></td>';
if ($_SESSION['DoFreightCalc']==true){
- echo '<td><input type=submit name="Update" value="' . _('Recalc Freight Cost') . '"></td></tr>';
+ echo '<td><input type=submit name="Update" value="' . _('Recalc Freight Cost') . '" /></td>
+ </tr>';
}
if ((!isset($_POST['ShipVia']) OR $_POST['ShipVia']=='') AND isset($_SESSION['Items'.$identifier]->ShipVia)){
$_POST['ShipVia'] = $_SESSION['Items'.$identifier]->ShipVia;
}
-echo '<tr><td>'. _('Freight/Shipper Method') .':</td>
- <td><select name="ShipVia">';
+echo '<tr>
+ <td>'. _('Freight/Shipper Method') .':</td>
+ <td><select name="ShipVia">';
$ErrMsg = _('The shipper details could not be retrieved');
$DbgMsg = _('SQL used to retrieve the shipper details was') . ':';
@@ -1123,7 +1128,7 @@
echo '<br /><br /><input type=submit name="ProcessOrder" value="' . _('Place Order') . '">';
echo '<br /><br /><input type=submit name="MakeRecurringOrder" value="' . _('Create Recurring Order') . '">';
} else {
- echo '<br /><input type=submit name="ProcessOrder" value="' . _('Commit Order Changes') . '">';
+ echo '<br /><input type="submit" name="ProcessOrder" value="' . _('Commit Order Changes') . '">';
}
echo '</div></form>';
Modified: trunk/RecurringSalesOrders.php
===================================================================
--- trunk/RecurringSalesOrders.php 2011-12-13 07:50:19 UTC (rev 4771)
+++ trunk/RecurringSalesOrders.php 2011-12-13 08:55:38 UTC (rev 4772)
@@ -128,22 +128,22 @@
while ($myrow=db_fetch_array($LineItemsResult)) {
$_SESSION['Items'.$identifier]->add_to_cart($myrow['stkcode'],
- $myrow['quantity'],
- $myrow['description'],
- $myrow['unitprice'],
- $myrow['discountpercent'],
- $myrow['units'],
- $myrow['volume'],
- $myrow['kgs'],
- $myrow['qohatloc'],
- $myrow['mbflag'],
- '',
- 0,
- $myrow['discountcategory'],
- 0, /*Controlled*/
- 0, /*Serialised */
- $myrow['decimalplaces'],
- $myrow['narrative']);
+ $myrow['quantity'],
+ $myrow['description'],
+ $myrow['unitprice'],
+ $myrow['discountpercent'],
+ $myrow['units'],
+ $myrow['volume'],
+ $myrow['kgs'],
+ $myrow['qohatloc'],
+ $myrow['mbflag'],
+ '',
+ 0,
+ $myrow['discountcategory'],
+ 0, /*Controlled*/
+ 0, /*Serialised */
+ $myrow['decimalplaces'],
+ $myrow['narrative']);
/*Just populating with existing order - no DBUpdates */
} /* line items from sales order details */
Modified: trunk/SalesByTypePeriodInquiry.php
===================================================================
--- trunk/SalesByTypePeriodInquiry.php 2011-12-13 07:50:19 UTC (rev 4771)
+++ trunk/SalesByTypePeriodInquiry.php 2011-12-13 08:55:38 UTC (rev 4772)
@@ -5,8 +5,8 @@
include('includes/session.inc');
$title = _('Sales Report');
include('includes/header.inc');
-include('includes/DefineCartClass.php');
+
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/transactions.png" title="' . _('Sales Report') . '" alt="" />' . ' ' . _('Sales Report') . '</p>';
echo '<div class="page_help_text">' . _('Select the parameters for the report') . '</div><br />';
Modified: trunk/SalesCategoryPeriodInquiry.php
===================================================================
--- trunk/SalesCategoryPeriodInquiry.php 2011-12-13 07:50:19 UTC (rev 4771)
+++ trunk/SalesCategoryPeriodInquiry.php 2011-12-13 08:55:38 UTC (rev 4772)
@@ -5,7 +5,6 @@
include('includes/session.inc');
$title = _('Sales Category Report');
include('includes/header.inc');
-include('includes/DefineCartClass.php');
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/transactions.png" title="' . _('Sales Report') . '" alt="" />' . ' ' . _('Sales Category Report') . '</p>';
echo '<div class="page_help_text">' . _('Select the parameters for the report') . '</div><br />';
Modified: trunk/SalesTopItemsInquiry.php
===================================================================
--- trunk/SalesTopItemsInquiry.php 2011-12-13 07:50:19 UTC (rev 4771)
+++ trunk/SalesTopItemsInquiry.php 2011-12-13 08:55:38 UTC (rev 4772)
@@ -5,7 +5,6 @@
include('includes/session.inc');
$title = _('Top Sales Inquiry');
include('includes/header.inc');
-include('includes/DefineCartClass.php');
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/transactions.png" title="' . _('Sales Inquiry') . '" alt="" />' . ' ' . _('Top Sales Items Inquiry') . '</p>';
echo '<div class="page_help_text">' . _('Select the parameters for the report') . '</div><br />';
@@ -214,13 +213,13 @@
echo '<table cellpadding=2 class="selection">';
echo'<tr>
- <th>' . _('Rank') . '</th>
- <th>' . _('Item') . '</th>
- <th>' . _('Category') . '</th>
- <th>' . _('Sales Value') . '</th>
- <th>' . _('Refunds') . '</th>
- <th>' . _('Net Sales') . '</th>
- <th>' . _('Sales') .'<br />' . _('Quantity') . '</th>
+ <th>' . _('Rank') . '</th>
+ <th>' . _('Item') . '</th>
+ <th>' . _('Category') . '</th>
+ <th>' . _('Sales Value') . '</th>
+ <th>' . _('Refunds') . '</th>
+ <th>' . _('Net Sales') . '</th>
+ <th>' . _('Sales') .'<br />' . _('Quantity') . '</th>
</tr>';
$CumulativeTotalSales = 0;
Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php 2011-12-13 07:50:19 UTC (rev 4771)
+++ trunk/SelectOrderItems.php 2011-12-13 08:55:38 UTC (rev 4772)
@@ -249,7 +249,8 @@
$myrow['standardcost'],
$myrow['eoq'],
$myrow['nextserialno'],
- $ExRate );
+ $ExRate,
+ $identifier );
/*Just populating with existing order - no DBUpdates */
}
@@ -1046,7 +1047,7 @@
//page called attempting to delete a line - GET['Delete'] = the line number to delete
$QuantityAlreadyDelivered = $_SESSION['Items'.$identifier]->Some_Already_Delivered($_GET['Delete']);
if($QuantityAlreadyDelivered == 0){
- $_SESSION['Items'.$identifier]->remove_from_cart($_GET['Delete'], 'Yes'); /*Do update DB */
+ $_SESSION['Items'.$identifier]->remove_from_cart($_GET['Delete'], 'Yes', $identifier); /*Do update DB */
} else {
$_SESSION['Items'.$identifier]->LineItems[$_GET['Delete']]->Quantity = $QuantityAlreadyDelivered;
}
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-12-13 07:50:19 UTC (rev 4771)
+++ trunk/doc/Change.log 2011-12-13 08:55:38 UTC (rev 4772)
@@ -2,6 +2,7 @@
13/12/11 Vitaly Shevkunov: Z_ChangeStockCode.php fixed call to DB_error_no had missing ($db) - also turned off FOREIGN KEY CHECKS before updating the BOM.
13/12/11 Exson: Fix SelectOrderItems.php and DeliveryDetails.php for where an order is modified while another order is being created in a different tab of the browser - $_SESSION['ExistingOrder'] now modified to $_SESSION['ExistingOrder' .$identifier] as suggested by Tim
+13/12/11 Phil: Fixed other scripts affected and send $identifier to add_to_cart function
11/12/11 Phil: SupplierInvoice.php attempts to post back any cost variances where there is no stock left to apportion the variances to - posting back to stockmoves (so the DailySales.php and other sales inquiry scripts reflect the appropriate GP) and the salesanalysis tables
11/12/11 Phil: DailySalesInquiry.php removed incorrect call to establish new cart object??
10/12/11 Brian May: ConfirmDispatch_Invoice.php corrected SQL that was not calculating the difference to go to the orderdeliverydifferences log in parenthesis first before casting/concatenating to string for the SQL.
Modified: trunk/includes/DefineCartClass.php
===================================================================
--- trunk/includes/DefineCartClass.php 2011-12-13 07:50:19 UTC (rev 4771)
+++ trunk/includes/DefineCartClass.php 2011-12-13 08:55:38 UTC (rev 4772)
@@ -67,7 +67,7 @@
$this->total=0;
$this->ItemsOrdered=0;
$this->LineCounter=0;
- $this->DefaultSalesType="";
+ $this->DefaultSalesType='';
$this->FreightCost =0;
$this->FreightTaxes = array();
$this->CurrDecimalPlaces=2; //default
@@ -99,7 +99,8 @@
$StandardCost=0,
$EOQ=1,
$NextSerialNo=0,
- $ExRate=1){
+ $ExRate=1,
+ $identifier=0){
if (isset($StockID) AND $StockID!="" AND $Qty>0 AND isset($Qty)){
@@ -157,7 +158,7 @@
itemdue,
poline)
VALUES(" . $this->LineCounter . ",
- " . $_SESSION['ExistingOrder'] . ",
+ " . $_SESSION['ExistingOrder' . $identifier] . ",
'" . trim(mb_strtoupper($StockID)) ."',
" . $Qty . ",
" . $Price . ",
@@ -209,7 +210,7 @@
}
}
- function remove_from_cart($LineNumber, $UpdateDB='No'){
+ function remove_from_cart($LineNumber, $UpdateDB='No', $identifier=0){
if (!isset($LineNumber) OR $LineNumber=='' OR $LineNumber < 0){ /* over check it */
prnMsg(_('No Line Number passed to remove_from_cart, so nothing has been removed.'), 'error');
@@ -220,12 +221,12 @@
if ($this->Some_Already_Delivered($LineNumber)==0){
/* nothing has been delivered, delete it. */
$result = DB_query("DELETE FROM salesorderdetails
- WHERE orderno='" . $_SESSION['ExistingOrder'] . "'
+ WHERE orderno='" . $_SESSION['ExistingOrder' . $identifier] . "'
AND orderlineno='" . $LineNumber . "'",
$db,
_('The order line could not be deleted because')
);
- prnMsg( _('Deleted Line Number'). ' ' . $LineNumber . ' ' . _('from existing Order Number').' ' . $_SESSION['ExistingOrder'], 'success');
+ prnMsg( _('Deleted Line Number'). ' ' . $LineNumber . ' ' . _('from existing Order Number').' ' . $_SESSION['ExistingOrder' . $identifier], 'success');
} else {
/* something has been delivered. Clear the remaining Qty and Mark Completed */
$result = DB_query("UPDATE salesorderdetails SET quantity=qtyinvoiced,
Modified: trunk/includes/SelectOrderItems_IntoCart.inc
===================================================================
--- trunk/includes/SelectOrderItems_IntoCart.inc 2011-12-13 07:50:19 UTC (rev 4771)
+++ trunk/includes/SelectOrderItems_IntoCart.inc 2011-12-13 08:55:38 UTC (rev 4772)
@@ -76,9 +76,9 @@
/*these checks above ensure that the item has a cost if the
config.php variable AllowSalesOfZeroCostItems is set to false */
- if ($_SESSION['ExistingOrder']!=0){
+ if ($_SESSION['ExistingOrder' . $identifier]!=0){
$UpdateDB = 'Yes';
- $result = DB_query("SELECT MAX(orderlineno) AS newlineno FROM salesorderdetails WHERE orderno='" . $_SESSION['ExistingOrder'] . "'",$db);
+ $result = DB_query("SELECT MAX(orderlineno) AS newlineno FROM salesorderdetails WHERE orderno='" . $_SESSION['ExistingOrder' . $identifier] . "'",$db);
$MaxNumRow = DB_fetch_row($result);
if ($MaxNumRow[0] != '' AND $MaxNumRow[0] > 0) {
$NewLineNo = $MaxNumRow[0]+1;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-12-13 08:55:50
|
Revision: 4772
http://web-erp.svn.sourceforge.net/web-erp/?rev=4772&view=rev
Author: daintree
Date: 2011-12-13 08:55:38 +0000 (Tue, 13 Dec 2011)
Log Message:
-----------
Additional changes to ExistingOrder
Modified Paths:
--------------
trunk/CounterSales.php
trunk/Credit_Invoice.php
trunk/DeliveryDetails.php
trunk/RecurringSalesOrders.php
trunk/SalesByTypePeriodInquiry.php
trunk/SalesCategoryPeriodInquiry.php
trunk/SalesTopItemsInquiry.php
trunk/SelectOrderItems.php
trunk/doc/Change.log
trunk/includes/DefineCartClass.php
trunk/includes/SelectOrderItems_IntoCart.inc
Modified: trunk/CounterSales.php
===================================================================
--- trunk/CounterSales.php 2011-12-13 07:50:19 UTC (rev 4771)
+++ trunk/CounterSales.php 2011-12-13 08:55:38 UTC (rev 4772)
@@ -63,7 +63,7 @@
set to 1. The delivery check screen is where the details of the order are either updated or
inserted depending on the value of ExistingOrder */
- $_SESSION['ExistingOrder'] = 0;
+ $_SESSION['ExistingOrder'. $identifier] = 0;
$_SESSION['Items'.$identifier] = new cart;
$_SESSION['PrintedPackingSlip'] = 0; /*Of course 'cos the order ain't even started !!*/
/*Get the default customer-branch combo from the user's default location record */
Modified: trunk/Credit_Invoice.php
===================================================================
--- trunk/Credit_Invoice.php 2011-12-13 07:50:19 UTC (rev 4771)
+++ trunk/Credit_Invoice.php 2011-12-13 08:55:38 UTC (rev 4772)
@@ -156,8 +156,8 @@
'',
'',
'',
- $myrow['standardcost']
- );
+ $myrow['standardcost']);
+
$_SESSION['CreditItems']->GetExistingTaxes($LineNumber, $myrow['stkmoveno']);
if ($myrow['controlled']==1){/* Populate the SerialItems array too*/
Modified: trunk/DeliveryDetails.php
===================================================================
--- trunk/DeliveryDetails.php 2011-12-13 07:50:19 UTC (rev 4771)
+++ trunk/DeliveryDetails.php 2011-12-13 08:55:38 UTC (rev 4772)
@@ -855,11 +855,11 @@
echo '<td>'.$StockItem->StockID.'</td>
<td>'.$StockItem->ItemDescription.'</td>
- <td class=number>'.$DisplayQuantity.'</td>
+ <td class="number">'.$DisplayQuantity.'</td>
<td>'.$StockItem->Units.'</td>
- <td class=number>'.$DisplayPrice.'</td>
- <td class=number>'.$DisplayDiscount.'</td>
- <td class=number>'.$DisplayLineTotal.'</td>
+ <td class="number">'.$DisplayPrice.'</td>
+ <td class="number">'.$DisplayDiscount.'</td>
+ <td class="number">'.$DisplayLineTotal.'</td>
</tr>';
$_SESSION['Items'.$identifier]->total = $_SESSION['Items'.$identifier]->total + $LineTotal;
@@ -869,25 +869,30 @@
$DisplayTotal = number_format($_SESSION['Items'.$identifier]->total,2);
echo '<tr class="EvenTableRows">
- <td colspan=6 class=number><b>'. _('TOTAL Excl Tax/Freight') .'</b></td>
- <td class=number>'.$DisplayTotal.'</td>
- </tr></table>';
+ <td colspan="6" class="number"><b>'. _('TOTAL Excl Tax/Freight') .'</b></td>
+ <td class="number">'.$DisplayTotal.'</td>
+ </tr>
+ </table>';
$DisplayVolume = number_format($_SESSION['Items'.$identifier]->totalVolume,2);
$DisplayWeight = number_format($_SESSION['Items'.$identifier]->totalWeight,2);
- echo '<br /><table><tr class="EvenTableRows">
- <td>'. _('Total Weight') .':</td>
- <td class="number">'.$DisplayWeight.'</td>
- <td>'. _('Total Volume') .':</td>
- <td class="number">'.$DisplayVolume.'</td>
- </tr></table>';
+ echo '<br />
+ <table>
+ <tr class="EvenTableRows">
+ <td>'. _('Total Weight') .':</td>
+ <td class="number">'.$DisplayWeight.'</td>
+ <td>'. _('Total Volume') .':</td>
+ <td class="number">'.$DisplayVolume.'</td>
+ </tr>
+ </table>';
} else {
/*Display the order without discount */
echo '<div class="centre"><b>' . _('Order Summary') . '</b></div>
- <table cellpadding=2 colspan=7 border=1><tr>
+ <table class="selection">
+ <tr>
<th>'. _('Item Description') .'</th>
<th>'. _('Quantity') .'</th>
<th>'. _('Unit') .'</th>
@@ -914,10 +919,10 @@
$k=1;
}
echo '<td>'.$StockItem->ItemDescription.'</td>
- <td class=number>'. $DisplayQuantity.'</td>
+ <td class="number">'. $DisplayQuantity.'</td>
<td>'.$StockItem->Units.'</td>
- <td class=number>'. $DisplayPrice.'</td>
- <td class=number>'. $DisplayLineTotal .'</font></td>
+ <td class="number">'. $DisplayPrice.'</td>
+ <td class="number">'. $DisplayLineTotal .'</font></td>
</tr>';
$_SESSION['Items'.$identifier]->total = $_SESSION['Items'.$identifier]->total + $LineTotal;
@@ -927,12 +932,14 @@
}
$DisplayTotal = number_format($_SESSION['Items'.$identifier]->total,$_SESSION['Items'.$identifier]->CurrDecimalPlaces);
- echo '<table class=selection><tr>
- <td>'. _('Total Weight') .':</td>
- <td>'.$DisplayWeight .'</td>
- <td>'. _('Total Volume') .':</td>
- <td>'.$DisplayVolume .'</td>
- </tr></table>';
+ echo '<table class="selection">
+ <tr>
+ <td>'. _('Total Weight') .':</td>
+ <td>'.$DisplayWeight .'</td>
+ <td>'. _('Total Volume') .':</td>
+ <td>'.$DisplayVolume .'</td>
+ </tr>
+ </table>';
$DisplayVolume = number_format($_SESSION['Items'.$identifier]->totalVolume,2);
$DisplayWeight = number_format($_SESSION['Items'.$identifier]->totalWeight,2);
@@ -945,10 +952,12 @@
}
-echo '<br /><table class=selection><tr>
- <td>'. _('Deliver To') .':</td>
- <td><input type="text" size=42 maxlength=40 name="DeliverTo" value="' . $_SESSION['Items'.$identifier]->DeliverTo . '"></td>
-</tr>';
+echo '<br />
+ <table class="selection">
+ <tr>
+ <td>'. _('Deliver To') .':</td>
+ <td><input type="text" size="42" maxlength="40" name="DeliverTo" value="' . $_SESSION['Items'.$identifier]->DeliverTo . '" /></td>
+ </tr>';
echo '<tr>
<td>'. _('Deliver from the warehouse at') .':</td>
@@ -986,66 +995,59 @@
// The estimated Dispatch date or Delivery date for this order
echo '<tr>
- <td>'. _('Estimated Delivery Date') .':</td>
- <td><input class="date" alt="'.$_SESSION['DefaultDateFormat'].'" type="text" size=15 maxlength=14 name="DeliveryDate" value="' . $_SESSION['Items'.$identifier]->DeliveryDate . '"></td>
+ <td>'. _('Estimated Delivery Date') .':</td>
+ <td><input class="date" alt="'.$_SESSION['DefaultDateFormat'].'" type="text" size=15 maxlength=14 name="DeliveryDate" value="' . $_SESSION['Items'.$identifier]->DeliveryDate . '"></td>
</tr>';
// The date when a quote was issued to the customer
echo '<tr>
- <td>'. _('Quote Date') .':</td>
- <td><input class="date" alt="'.$_SESSION['DefaultDateFormat'].'" type="text" size=15 maxlength=14 name="QuoteDate" value="' . $_SESSION['Items'.$identifier]->QuoteDate . '"></td>
+ <td>'. _('Quote Date') .':</td>
+ <td><input class="date" alt="'.$_SESSION['DefaultDateFormat'].'" type="text" size="15" maxlength="14" name="QuoteDate" value="' . $_SESSION['Items'.$identifier]->QuoteDate . '" /></td>
</tr>';
// The date when the customer confirmed their order
echo '<tr>
- <td>'. _('Confirmed Order Date') .':</td>
- <td><input class="date" alt="'.$_SESSION['DefaultDateFormat'].'" type="text" size=15 maxlength=14 name="ConfirmedDate" value="' . $_SESSION['Items'.$identifier]->ConfirmedDate . '"></td>
+ <td>'. _('Confirmed Order Date') .':</td>
+ <td><input class="date" alt="'.$_SESSION['DefaultDateFormat'].'" type="text" size="15" maxlength="14" name="ConfirmedDate" value="' . $_SESSION['Items'.$identifier]->ConfirmedDate . '" /></td>
+ </tr>
+ <tr>
+ <td>'. _('Delivery Address 1') . ':</td>
+ <td><input type="text" size="42" maxlength="40" name="BrAdd1" value="' . $_SESSION['Items'.$identifier]->DelAdd1 . '" /></td>
+ </tr>
+ <tr>
+ <td>'. _('Delivery Address 2') . ':</td>
+ <td><input type="text" size="42" maxlength="40" name="BrAdd2" value="' . $_SESSION['Items'.$identifier]->DelAdd2 . '" /></td>
+ </tr>
+ <tr>
+ <td>'. _('Delivery Address 3') . ':</td>
+ <td><input type="text" size="42" maxlength="40" name="BrAdd3" value="' . $_SESSION['Items'.$identifier]->DelAdd3 . '" /></td>
+ </tr>
+ <tr>
+ <td>'. _('Delivery Address 4') . ':</td>
+ <td><input type="text" size="42" maxlength="40" name="BrAdd4" value="' . $_SESSION['Items'.$identifier]->DelAdd4 . '" /></td>
+ </tr>
+ <tr>
+ <td>'. _('Delivery Address 5') . ':</td>
+ <td><input type="text" size="42" maxlength="40" name="BrAdd5" value="' . $_SESSION['Items'.$identifier]->DelAdd5 . '" /></td>
+ </tr>
+ <tr>
+ <td>'. _('Delivery Address 6') . ':</td>
+ <td><input type="text" size="42" maxlength="40" name="BrAdd6" value="' . $_SESSION['Items'.$identifier]->DelAdd6 . '" /></td>
+ </tr>
+ <tr>
+ <td>'. _('Contact Phone Number') .':</td>
+ <td><input type="text" size=25 maxlength=25 name="PhoneNo" value="' . $_SESSION['Items'.$identifier]->PhoneNo . '"></td>
+ </tr>
+ <tr>
+ <td>' . _('Contact Email') . ':</td><td><input type="text" size=40 maxlength=38 name="Email" value="' . $_SESSION['Items'.$identifier]->Email . '"></td>
+ </tr>
+ <tr>
+ <td>'. _('Customer Reference') .':</td>
+ <td><input type="text" size=25 maxlength=25 name="CustRef" value="' . $_SESSION['Items'.$identifier]->CustRef . '"></td>
+ </tr>
+ <tr>
+ <td>'. _('Comments') .':</td>
+ <td><textarea name="Comments" cols="31" rows="5">' . $_SESSION['Items'.$identifier]->Comments .'</textarea></td>
</tr>';
-echo '<tr>
- <td>'. _('Delivery Address 1') . ':</td>
- <td><input type="text" size=42 maxlength=40 name="BrAdd1" value="' . $_SESSION['Items'.$identifier]->DelAdd1 . '"></td>
-</tr>';
-
-echo '<tr>
- <td>'. _('Delivery Address 2') . ':</td>
- <td><input type="text" size=42 maxlength=40 name="BrAdd2" value="' . $_SESSION['Items'.$identifier]->DelAdd2 . '"></td>
-</tr>';
-
-echo '<tr>
- <td>'. _('Delivery Address 3') . ':</td>
- <td><input type="text" size="42" maxlength="40" name="BrAdd3" value="' . $_SESSION['Items'.$identifier]->DelAdd3 . '"></td>
-</tr>';
-
-echo '<tr>
- <td>'. _('Delivery Address 4') . ':</td>
- <td><input type="text" size=42 maxlength=40 name="BrAdd4" value="' . $_SESSION['Items'.$identifier]->DelAdd4 . '"></td>
-</tr>';
-
-echo '<tr>
- <td>'. _('Delivery Address 5') . ':</td>
- <td><input type="text" size=42 maxlength=40 name="BrAdd5" value="' . $_SESSION['Items'.$identifier]->DelAdd5 . '"></td>
-</tr>';
-
-echo '<tr>
- <td>'. _('Delivery Address 6') . ':</td>
- <td><input type="text" size=42 maxlength=40 name="BrAdd6" value="' . $_SESSION['Items'.$identifier]->DelAdd6 . '"></td>
-</tr>';
-
-echo '<tr>
- <td>'. _('Contact Phone Number') .':</td>
- <td><input type="text" size=25 maxlength=25 name="PhoneNo" value="' . $_SESSION['Items'.$identifier]->PhoneNo . '"></td>
-</tr>';
-
-echo '<tr><td>' . _('Contact Email') . ':</td><td><input type="text" size=40 maxlength=38 name="Email" value="' . $_SESSION['Items'.$identifier]->Email . '"></td></tr>';
-
-echo '<tr><td>'. _('Customer Reference') .':</td>
- <td><input type="text" size=25 maxlength=25 name="CustRef" value="' . $_SESSION['Items'.$identifier]->CustRef . '"></td>
-</tr>';
-
-echo '<tr>
- <td>'. _('Comments') .':</td>
- <td><textarea name="Comments" cols=31 rows=5>' . $_SESSION['Items'.$identifier]->Comments .'</textarea></td>
-</tr>';
-
/* This field will control whether or not to display the company logo and
address on the packlist */
@@ -1061,7 +1063,7 @@
}
echo '</select></td></tr>';
-if (isset($_SESSION['PrintedPackingSlip']) and $_SESSION['PrintedPackingSlip']==1){
+if (isset($_SESSION['PrintedPackingSlip']) AND $_SESSION['PrintedPackingSlip']==1){
echo '<tr>
<td>'. _('Reprint packing slip') .':</td>
@@ -1073,19 +1075,22 @@
echo '<input type=hidden name="ReprintPackingSlip" value=0>';
}
-echo '<tr><td>'. _('Charge Freight Cost inc tax') .':</td>';
-echo '<td><input type="text" class="number" size=10 maxlength=12 name="FreightCost" value="' . $_SESSION['Items'.$identifier]->FreightCost . '"></td>';
+echo '<tr>
+ <td>'. _('Charge Freight Cost inc tax') .':</td>
+ <td><input type="text" class="number" size="10" maxlength="12" name="FreightCost" value="' . $_SESSION['Items'.$identifier]->FreightCost . '" /></td>';
if ($_SESSION['DoFreightCalc']==true){
- echo '<td><input type=submit name="Update" value="' . _('Recalc Freight Cost') . '"></td></tr>';
+ echo '<td><input type=submit name="Update" value="' . _('Recalc Freight Cost') . '" /></td>
+ </tr>';
}
if ((!isset($_POST['ShipVia']) OR $_POST['ShipVia']=='') AND isset($_SESSION['Items'.$identifier]->ShipVia)){
$_POST['ShipVia'] = $_SESSION['Items'.$identifier]->ShipVia;
}
-echo '<tr><td>'. _('Freight/Shipper Method') .':</td>
- <td><select name="ShipVia">';
+echo '<tr>
+ <td>'. _('Freight/Shipper Method') .':</td>
+ <td><select name="ShipVia">';
$ErrMsg = _('The shipper details could not be retrieved');
$DbgMsg = _('SQL used to retrieve the shipper details was') . ':';
@@ -1123,7 +1128,7 @@
echo '<br /><br /><input type=submit name="ProcessOrder" value="' . _('Place Order') . '">';
echo '<br /><br /><input type=submit name="MakeRecurringOrder" value="' . _('Create Recurring Order') . '">';
} else {
- echo '<br /><input type=submit name="ProcessOrder" value="' . _('Commit Order Changes') . '">';
+ echo '<br /><input type="submit" name="ProcessOrder" value="' . _('Commit Order Changes') . '">';
}
echo '</div></form>';
Modified: trunk/RecurringSalesOrders.php
===================================================================
--- trunk/RecurringSalesOrders.php 2011-12-13 07:50:19 UTC (rev 4771)
+++ trunk/RecurringSalesOrders.php 2011-12-13 08:55:38 UTC (rev 4772)
@@ -128,22 +128,22 @@
while ($myrow=db_fetch_array($LineItemsResult)) {
$_SESSION['Items'.$identifier]->add_to_cart($myrow['stkcode'],
- $myrow['quantity'],
- $myrow['description'],
- $myrow['unitprice'],
- $myrow['discountpercent'],
- $myrow['units'],
- $myrow['volume'],
- $myrow['kgs'],
- $myrow['qohatloc'],
- $myrow['mbflag'],
- '',
- 0,
- $myrow['discountcategory'],
- 0, /*Controlled*/
- 0, /*Serialised */
- $myrow['decimalplaces'],
- $myrow['narrative']);
+ $myrow['quantity'],
+ $myrow['description'],
+ $myrow['unitprice'],
+ $myrow['discountpercent'],
+ $myrow['units'],
+ $myrow['volume'],
+ $myrow['kgs'],
+ $myrow['qohatloc'],
+ $myrow['mbflag'],
+ '',
+ 0,
+ $myrow['discountcategory'],
+ 0, /*Controlled*/
+ 0, /*Serialised */
+ $myrow['decimalplaces'],
+ $myrow['narrative']);
/*Just populating with existing order - no DBUpdates */
} /* line items from sales order details */
Modified: trunk/SalesByTypePeriodInquiry.php
===================================================================
--- trunk/SalesByTypePeriodInquiry.php 2011-12-13 07:50:19 UTC (rev 4771)
+++ trunk/SalesByTypePeriodInquiry.php 2011-12-13 08:55:38 UTC (rev 4772)
@@ -5,8 +5,8 @@
include('includes/session.inc');
$title = _('Sales Report');
include('includes/header.inc');
-include('includes/DefineCartClass.php');
+
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/transactions.png" title="' . _('Sales Report') . '" alt="" />' . ' ' . _('Sales Report') . '</p>';
echo '<div class="page_help_text">' . _('Select the parameters for the report') . '</div><br />';
Modified: trunk/SalesCategoryPeriodInquiry.php
===================================================================
--- trunk/SalesCategoryPeriodInquiry.php 2011-12-13 07:50:19 UTC (rev 4771)
+++ trunk/SalesCategoryPeriodInquiry.php 2011-12-13 08:55:38 UTC (rev 4772)
@@ -5,7 +5,6 @@
include('includes/session.inc');
$title = _('Sales Category Report');
include('includes/header.inc');
-include('includes/DefineCartClass.php');
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/transactions.png" title="' . _('Sales Report') . '" alt="" />' . ' ' . _('Sales Category Report') . '</p>';
echo '<div class="page_help_text">' . _('Select the parameters for the report') . '</div><br />';
Modified: trunk/SalesTopItemsInquiry.php
===================================================================
--- trunk/SalesTopItemsInquiry.php 2011-12-13 07:50:19 UTC (rev 4771)
+++ trunk/SalesTopItemsInquiry.php 2011-12-13 08:55:38 UTC (rev 4772)
@@ -5,7 +5,6 @@
include('includes/session.inc');
$title = _('Top Sales Inquiry');
include('includes/header.inc');
-include('includes/DefineCartClass.php');
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/transactions.png" title="' . _('Sales Inquiry') . '" alt="" />' . ' ' . _('Top Sales Items Inquiry') . '</p>';
echo '<div class="page_help_text">' . _('Select the parameters for the report') . '</div><br />';
@@ -214,13 +213,13 @@
echo '<table cellpadding=2 class="selection">';
echo'<tr>
- <th>' . _('Rank') . '</th>
- <th>' . _('Item') . '</th>
- <th>' . _('Category') . '</th>
- <th>' . _('Sales Value') . '</th>
- <th>' . _('Refunds') . '</th>
- <th>' . _('Net Sales') . '</th>
- <th>' . _('Sales') .'<br />' . _('Quantity') . '</th>
+ <th>' . _('Rank') . '</th>
+ <th>' . _('Item') . '</th>
+ <th>' . _('Category') . '</th>
+ <th>' . _('Sales Value') . '</th>
+ <th>' . _('Refunds') . '</th>
+ <th>' . _('Net Sales') . '</th>
+ <th>' . _('Sales') .'<br />' . _('Quantity') . '</th>
</tr>';
$CumulativeTotalSales = 0;
Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php 2011-12-13 07:50:19 UTC (rev 4771)
+++ trunk/SelectOrderItems.php 2011-12-13 08:55:38 UTC (rev 4772)
@@ -249,7 +249,8 @@
$myrow['standardcost'],
$myrow['eoq'],
$myrow['nextserialno'],
- $ExRate );
+ $ExRate,
+ $identifier );
/*Just populating with existing order - no DBUpdates */
}
@@ -1046,7 +1047,7 @@
//page called attempting to delete a line - GET['Delete'] = the line number to delete
$QuantityAlreadyDelivered = $_SESSION['Items'.$identifier]->Some_Already_Delivered($_GET['Delete']);
if($QuantityAlreadyDelivered == 0){
- $_SESSION['Items'.$identifier]->remove_from_cart($_GET['Delete'], 'Yes'); /*Do update DB */
+ $_SESSION['Items'.$identifier]->remove_from_cart($_GET['Delete'], 'Yes', $identifier); /*Do update DB */
} else {
$_SESSION['Items'.$identifier]->LineItems[$_GET['Delete']]->Quantity = $QuantityAlreadyDelivered;
}
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-12-13 07:50:19 UTC (rev 4771)
+++ trunk/doc/Change.log 2011-12-13 08:55:38 UTC (rev 4772)
@@ -2,6 +2,7 @@
13/12/11 Vitaly Shevkunov: Z_ChangeStockCode.php fixed call to DB_error_no had missing ($db) - also turned off FOREIGN KEY CHECKS before updating the BOM.
13/12/11 Exson: Fix SelectOrderItems.php and DeliveryDetails.php for where an order is modified while another order is being created in a different tab of the browser - $_SESSION['ExistingOrder'] now modified to $_SESSION['ExistingOrder' .$identifier] as suggested by Tim
+13/12/11 Phil: Fixed other scripts affected and send $identifier to add_to_cart function
11/12/11 Phil: SupplierInvoice.php attempts to post back any cost variances where there is no stock left to apportion the variances to - posting back to stockmoves (so the DailySales.php and other sales inquiry scripts reflect the appropriate GP) and the salesanalysis tables
11/12/11 Phil: DailySalesInquiry.php removed incorrect call to establish new cart object??
10/12/11 Brian May: ConfirmDispatch_Invoice.php corrected SQL that was not calculating the difference to go to the orderdeliverydifferences log in parenthesis first before casting/concatenating to string for the SQL.
Modified: trunk/includes/DefineCartClass.php
===================================================================
--- trunk/includes/DefineCartClass.php 2011-12-13 07:50:19 UTC (rev 4771)
+++ trunk/includes/DefineCartClass.php 2011-12-13 08:55:38 UTC (rev 4772)
@@ -67,7 +67,7 @@
$this->total=0;
$this->ItemsOrdered=0;
$this->LineCounter=0;
- $this->DefaultSalesType="";
+ $this->DefaultSalesType='';
$this->FreightCost =0;
$this->FreightTaxes = array();
$this->CurrDecimalPlaces=2; //default
@@ -99,7 +99,8 @@
$StandardCost=0,
$EOQ=1,
$NextSerialNo=0,
- $ExRate=1){
+ $ExRate=1,
+ $identifier=0){
if (isset($StockID) AND $StockID!="" AND $Qty>0 AND isset($Qty)){
@@ -157,7 +158,7 @@
itemdue,
poline)
VALUES(" . $this->LineCounter . ",
- " . $_SESSION['ExistingOrder'] . ",
+ " . $_SESSION['ExistingOrder' . $identifier] . ",
'" . trim(mb_strtoupper($StockID)) ."',
" . $Qty . ",
" . $Price . ",
@@ -209,7 +210,7 @@
}
}
- function remove_from_cart($LineNumber, $UpdateDB='No'){
+ function remove_from_cart($LineNumber, $UpdateDB='No', $identifier=0){
if (!isset($LineNumber) OR $LineNumber=='' OR $LineNumber < 0){ /* over check it */
prnMsg(_('No Line Number passed to remove_from_cart, so nothing has been removed.'), 'error');
@@ -220,12 +221,12 @@
if ($this->Some_Already_Delivered($LineNumber)==0){
/* nothing has been delivered, delete it. */
$result = DB_query("DELETE FROM salesorderdetails
- WHERE orderno='" . $_SESSION['ExistingOrder'] . "'
+ WHERE orderno='" . $_SESSION['ExistingOrder' . $identifier] . "'
AND orderlineno='" . $LineNumber . "'",
$db,
_('The order line could not be deleted because')
);
- prnMsg( _('Deleted Line Number'). ' ' . $LineNumber . ' ' . _('from existing Order Number').' ' . $_SESSION['ExistingOrder'], 'success');
+ prnMsg( _('Deleted Line Number'). ' ' . $LineNumber . ' ' . _('from existing Order Number').' ' . $_SESSION['ExistingOrder' . $identifier], 'success');
} else {
/* something has been delivered. Clear the remaining Qty and Mark Completed */
$result = DB_query("UPDATE salesorderdetails SET quantity=qtyinvoiced,
Modified: trunk/includes/SelectOrderItems_IntoCart.inc
===================================================================
--- trunk/includes/SelectOrderItems_IntoCart.inc 2011-12-13 07:50:19 UTC (rev 4771)
+++ trunk/includes/SelectOrderItems_IntoCart.inc 2011-12-13 08:55:38 UTC (rev 4772)
@@ -76,9 +76,9 @@
/*these checks above ensure that the item has a cost if the
config.php variable AllowSalesOfZeroCostItems is set to false */
- if ($_SESSION['ExistingOrder']!=0){
+ if ($_SESSION['ExistingOrder' . $identifier]!=0){
$UpdateDB = 'Yes';
- $result = DB_query("SELECT MAX(orderlineno) AS newlineno FROM salesorderdetails WHERE orderno='" . $_SESSION['ExistingOrder'] . "'",$db);
+ $result = DB_query("SELECT MAX(orderlineno) AS newlineno FROM salesorderdetails WHERE orderno='" . $_SESSION['ExistingOrder' . $identifier] . "'",$db);
$MaxNumRow = DB_fetch_row($result);
if ($MaxNumRow[0] != '' AND $MaxNumRow[0] > 0) {
$NewLineNo = $MaxNumRow[0]+1;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-12-15 06:11:02
|
Revision: 4777
http://web-erp.svn.sourceforge.net/web-erp/?rev=4777&view=rev
Author: daintree
Date: 2011-12-15 06:10:56 +0000 (Thu, 15 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/Shipments.php
trunk/doc/Change.log
Modified: trunk/Shipments.php
===================================================================
--- trunk/Shipments.php 2011-12-14 09:07:52 UTC (rev 4776)
+++ trunk/Shipments.php 2011-12-15 06:10:56 UTC (rev 4777)
@@ -312,7 +312,7 @@
<td>'. _('Vessel Name /Transport Agent'). ': </td>
<td colspan=3><input type="text" name="Vessel" maxlength="50" size="50" value="' . $_SESSION['Shipment']->Vessel . '" /></td>
<td>'._('Voyage Ref / Consignment Note').': </td>
- <td><input type="text name="VoyageRef" maxlength="20" size="20" value="' . $_SESSION['Shipment']->VoyageRef . '" /></td>
+ <td><input type="text" name="VoyageRef" maxlength="20" size="20" value="' . $_SESSION['Shipment']->VoyageRef . '" /></td>
</tr>';
if (isset($_SESSION['Shipment']->ETA)){
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-12-14 09:07:52 UTC (rev 4776)
+++ trunk/doc/Change.log 2011-12-15 06:10:56 UTC (rev 4777)
@@ -1,5 +1,6 @@
webERP Change Log
+15/12/11 Vitaly Shevkunov: Shipments.php fixed missing quote in html
13/12/11 Vitaly Shevkunov: Z_ChangeStockCode.php fixed call to DB_error_no had missing ($db) - also turned off FOREIGN KEY CHECKS before updating the BOM.
13/12/11 Exson: Fix SelectOrderItems.php and DeliveryDetails.php for where an order is modified while another order is being created in a different tab of the browser - $_SESSION['ExistingOrder'] now modified to $_SESSION['ExistingOrder' .$identifier] as suggested by Tim
13/12/11 Phil: Fixed other scripts affected and send $identifier to add_to_cart and remove_from_cart functions
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-12-15 06:11:02
|
Revision: 4777
http://web-erp.svn.sourceforge.net/web-erp/?rev=4777&view=rev
Author: daintree
Date: 2011-12-15 06:10:56 +0000 (Thu, 15 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/Shipments.php
trunk/doc/Change.log
Modified: trunk/Shipments.php
===================================================================
--- trunk/Shipments.php 2011-12-14 09:07:52 UTC (rev 4776)
+++ trunk/Shipments.php 2011-12-15 06:10:56 UTC (rev 4777)
@@ -312,7 +312,7 @@
<td>'. _('Vessel Name /Transport Agent'). ': </td>
<td colspan=3><input type="text" name="Vessel" maxlength="50" size="50" value="' . $_SESSION['Shipment']->Vessel . '" /></td>
<td>'._('Voyage Ref / Consignment Note').': </td>
- <td><input type="text name="VoyageRef" maxlength="20" size="20" value="' . $_SESSION['Shipment']->VoyageRef . '" /></td>
+ <td><input type="text" name="VoyageRef" maxlength="20" size="20" value="' . $_SESSION['Shipment']->VoyageRef . '" /></td>
</tr>';
if (isset($_SESSION['Shipment']->ETA)){
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-12-14 09:07:52 UTC (rev 4776)
+++ trunk/doc/Change.log 2011-12-15 06:10:56 UTC (rev 4777)
@@ -1,5 +1,6 @@
webERP Change Log
+15/12/11 Vitaly Shevkunov: Shipments.php fixed missing quote in html
13/12/11 Vitaly Shevkunov: Z_ChangeStockCode.php fixed call to DB_error_no had missing ($db) - also turned off FOREIGN KEY CHECKS before updating the BOM.
13/12/11 Exson: Fix SelectOrderItems.php and DeliveryDetails.php for where an order is modified while another order is being created in a different tab of the browser - $_SESSION['ExistingOrder'] now modified to $_SESSION['ExistingOrder' .$identifier] as suggested by Tim
13/12/11 Phil: Fixed other scripts affected and send $identifier to add_to_cart and remove_from_cart functions
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-12-15 09:11:45
|
Revision: 4778
http://web-erp.svn.sourceforge.net/web-erp/?rev=4778&view=rev
Author: daintree
Date: 2011-12-15 09:11:36 +0000 (Thu, 15 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/SalesGraph.php
trunk/doc/Change.log
Modified: trunk/SalesGraph.php
===================================================================
--- trunk/SalesGraph.php 2011-12-15 06:10:56 UTC (rev 4777)
+++ trunk/SalesGraph.php 2011-12-15 09:11:36 UTC (rev 4778)
@@ -270,7 +270,7 @@
}
$graph->SetXTickPos('none');
$graph->SetXTickLabelPos('none');
- $graph->SetBackgroundColor('selection');
+ $graph->SetBackgroundColor('white');
$graph->SetTitleColor('blue');
$graph->SetFileFormat('png');
$graph->SetPlotType($_POST['GraphType']);
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-12-15 06:10:56 UTC (rev 4777)
+++ trunk/doc/Change.log 2011-12-15 09:11:36 UTC (rev 4778)
@@ -1,5 +1,6 @@
webERP Change Log
+15/12/11 Phil: SalesGraph.php was trying to set background colour to 'selection' changed to white
15/12/11 Vitaly Shevkunov: Shipments.php fixed missing quote in html
13/12/11 Vitaly Shevkunov: Z_ChangeStockCode.php fixed call to DB_error_no had missing ($db) - also turned off FOREIGN KEY CHECKS before updating the BOM.
13/12/11 Exson: Fix SelectOrderItems.php and DeliveryDetails.php for where an order is modified while another order is being created in a different tab of the browser - $_SESSION['ExistingOrder'] now modified to $_SESSION['ExistingOrder' .$identifier] as suggested by Tim
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-12-15 09:11:45
|
Revision: 4778
http://web-erp.svn.sourceforge.net/web-erp/?rev=4778&view=rev
Author: daintree
Date: 2011-12-15 09:11:36 +0000 (Thu, 15 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/SalesGraph.php
trunk/doc/Change.log
Modified: trunk/SalesGraph.php
===================================================================
--- trunk/SalesGraph.php 2011-12-15 06:10:56 UTC (rev 4777)
+++ trunk/SalesGraph.php 2011-12-15 09:11:36 UTC (rev 4778)
@@ -270,7 +270,7 @@
}
$graph->SetXTickPos('none');
$graph->SetXTickLabelPos('none');
- $graph->SetBackgroundColor('selection');
+ $graph->SetBackgroundColor('white');
$graph->SetTitleColor('blue');
$graph->SetFileFormat('png');
$graph->SetPlotType($_POST['GraphType']);
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-12-15 06:10:56 UTC (rev 4777)
+++ trunk/doc/Change.log 2011-12-15 09:11:36 UTC (rev 4778)
@@ -1,5 +1,6 @@
webERP Change Log
+15/12/11 Phil: SalesGraph.php was trying to set background colour to 'selection' changed to white
15/12/11 Vitaly Shevkunov: Shipments.php fixed missing quote in html
13/12/11 Vitaly Shevkunov: Z_ChangeStockCode.php fixed call to DB_error_no had missing ($db) - also turned off FOREIGN KEY CHECKS before updating the BOM.
13/12/11 Exson: Fix SelectOrderItems.php and DeliveryDetails.php for where an order is modified while another order is being created in a different tab of the browser - $_SESSION['ExistingOrder'] now modified to $_SESSION['ExistingOrder' .$identifier] as suggested by Tim
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-12-15 09:26:00
|
Revision: 4779
http://web-erp.svn.sourceforge.net/web-erp/?rev=4779&view=rev
Author: daintree
Date: 2011-12-15 09:25:53 +0000 (Thu, 15 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/UpgradeDatabase.php
trunk/doc/Change.log
trunk/sql/mysql/upgrade3.11.1-4.00.sql
Modified: trunk/UpgradeDatabase.php
===================================================================
--- trunk/UpgradeDatabase.php 2011-12-15 09:11:36 UTC (rev 4778)
+++ trunk/UpgradeDatabase.php 2011-12-15 09:25:53 UTC (rev 4779)
@@ -34,6 +34,10 @@
</select></td>
</tr>
</table>';
+ prnMsg(_('This script will perform any modifications to the database required to allow the additional functionality in later scripts.') . '<br /><a target="_blank" href="' . $rootpath . '/BackupDatabase.php">' ._('Click to do a database backup now before proceeding!') . '</a>','info');
+ echo '<div class="centre">
+ <input type="submit" name="DoUpgrade" value="' . _('Perform Database Upgrade') . '" />
+ </div>';
} else {
if ($_SESSION['VersionNumber']=='4.00RC1'){
$_SESSION['VersionNumber']='3.12';
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-12-15 09:11:36 UTC (rev 4778)
+++ trunk/doc/Change.log 2011-12-15 09:25:53 UTC (rev 4779)
@@ -1,5 +1,6 @@
webERP Change Log
+15/12/11 Phil: Fix to UpgradeDatabase.php the button to perform the upgrade was missing for older versions where the version was not stored in the DB.
15/12/11 Phil: SalesGraph.php was trying to set background colour to 'selection' changed to white
15/12/11 Vitaly Shevkunov: Shipments.php fixed missing quote in html
13/12/11 Vitaly Shevkunov: Z_ChangeStockCode.php fixed call to DB_error_no had missing ($db) - also turned off FOREIGN KEY CHECKS before updating the BOM.
Modified: trunk/sql/mysql/upgrade3.11.1-4.00.sql
===================================================================
--- trunk/sql/mysql/upgrade3.11.1-4.00.sql 2011-12-15 09:11:36 UTC (rev 4778)
+++ trunk/sql/mysql/upgrade3.11.1-4.00.sql 2011-12-15 09:25:53 UTC (rev 4779)
@@ -1,3 +1,4 @@
+SET FOREIGN_KEY_CHECKS=0;
ALTER TABLE accountgroups CONVERT TO CHARACTER SET utf8;
ALTER TABLE accountsection CONVERT TO CHARACTER SET utf8;
ALTER TABLE areas CONVERT TO CHARACTER SET utf8;
@@ -853,4 +854,5 @@
DROP `netweight`,
DROP `total_amount`;
UPDATE purchdata INNER JOIN unitsofmeasure ON purchdata.suppliersuom=unitsofmeasure.unitid SET suppliersuom = unitsofmeasure.unitname;
-UPDATE config SET confvalue='4.03.8' WHERE confname='VersionNumber';
\ No newline at end of file
+UPDATE config SET confvalue='4.03.8' WHERE confname='VersionNumber';
+SET FOREIGN_KEY_CHECKS=1;
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-12-15 09:26:02
|
Revision: 4779
http://web-erp.svn.sourceforge.net/web-erp/?rev=4779&view=rev
Author: daintree
Date: 2011-12-15 09:25:53 +0000 (Thu, 15 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/UpgradeDatabase.php
trunk/doc/Change.log
trunk/sql/mysql/upgrade3.11.1-4.00.sql
Modified: trunk/UpgradeDatabase.php
===================================================================
--- trunk/UpgradeDatabase.php 2011-12-15 09:11:36 UTC (rev 4778)
+++ trunk/UpgradeDatabase.php 2011-12-15 09:25:53 UTC (rev 4779)
@@ -34,6 +34,10 @@
</select></td>
</tr>
</table>';
+ prnMsg(_('This script will perform any modifications to the database required to allow the additional functionality in later scripts.') . '<br /><a target="_blank" href="' . $rootpath . '/BackupDatabase.php">' ._('Click to do a database backup now before proceeding!') . '</a>','info');
+ echo '<div class="centre">
+ <input type="submit" name="DoUpgrade" value="' . _('Perform Database Upgrade') . '" />
+ </div>';
} else {
if ($_SESSION['VersionNumber']=='4.00RC1'){
$_SESSION['VersionNumber']='3.12';
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-12-15 09:11:36 UTC (rev 4778)
+++ trunk/doc/Change.log 2011-12-15 09:25:53 UTC (rev 4779)
@@ -1,5 +1,6 @@
webERP Change Log
+15/12/11 Phil: Fix to UpgradeDatabase.php the button to perform the upgrade was missing for older versions where the version was not stored in the DB.
15/12/11 Phil: SalesGraph.php was trying to set background colour to 'selection' changed to white
15/12/11 Vitaly Shevkunov: Shipments.php fixed missing quote in html
13/12/11 Vitaly Shevkunov: Z_ChangeStockCode.php fixed call to DB_error_no had missing ($db) - also turned off FOREIGN KEY CHECKS before updating the BOM.
Modified: trunk/sql/mysql/upgrade3.11.1-4.00.sql
===================================================================
--- trunk/sql/mysql/upgrade3.11.1-4.00.sql 2011-12-15 09:11:36 UTC (rev 4778)
+++ trunk/sql/mysql/upgrade3.11.1-4.00.sql 2011-12-15 09:25:53 UTC (rev 4779)
@@ -1,3 +1,4 @@
+SET FOREIGN_KEY_CHECKS=0;
ALTER TABLE accountgroups CONVERT TO CHARACTER SET utf8;
ALTER TABLE accountsection CONVERT TO CHARACTER SET utf8;
ALTER TABLE areas CONVERT TO CHARACTER SET utf8;
@@ -853,4 +854,5 @@
DROP `netweight`,
DROP `total_amount`;
UPDATE purchdata INNER JOIN unitsofmeasure ON purchdata.suppliersuom=unitsofmeasure.unitid SET suppliersuom = unitsofmeasure.unitname;
-UPDATE config SET confvalue='4.03.8' WHERE confname='VersionNumber';
\ No newline at end of file
+UPDATE config SET confvalue='4.03.8' WHERE confname='VersionNumber';
+SET FOREIGN_KEY_CHECKS=1;
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-12-17 23:07:06
|
Revision: 4781
http://web-erp.svn.sourceforge.net/web-erp/?rev=4781&view=rev
Author: daintree
Date: 2011-12-17 23:06:55 +0000 (Sat, 17 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.mo
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po
trunk/locale/el_GR.utf8/LC_MESSAGES/messages.mo
trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po
trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot
trunk/locale/en_US.utf8/LC_MESSAGES/messages.mo
trunk/locale/en_US.utf8/LC_MESSAGES/messages.po
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.mo
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.po
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.mo
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.po
trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.mo
trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.po
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.mo
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.po
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.mo
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.po
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.mo
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.po
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.mo
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.po
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.mo
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.po
trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.mo
trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.po
trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.mo
trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.mo
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.mo
trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.po
trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.mo
trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.po
trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.mo
trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.po
trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.mo
trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.po
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.mo
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.po
trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.mo
trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.po
trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.mo
trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.po
trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.mo
trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.po
trunk/sql/mysql/weberp-demo.sql
trunk/sql/mysql/weberp-new.sql
Modified: trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po 2011-12-15 11:56:25 UTC (rev 4780)
+++ trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po 2011-12-17 23:06:55 UTC (rev 4781)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: webERP 3.08\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-03 16:31+1300\n"
+"POT-Creation-Date: 2011-12-10 09:04+1300\n"
"PO-Revision-Date: 2011-02-07 15:33+0000\n"
"Last-Translator: Tim Schofield <Unknown>\n"
"Language-Team: Czech <cs...@li...>\n"
@@ -898,7 +898,7 @@
#: ReverseGRN.php:374 SelectCreditItems.php:1408 SelectSalesOrder.php:189
#: SelectSalesOrder.php:353 StockCheck.php:223 StockCostUpdate.php:77
#: StockCostUpdate.php:87 StockLocStatus.php:153 StockMovements.php:87
-#: StockQuantityByDate.php:95 StockReorderLevel.php:40 StockStatus.php:265
+#: StockQuantityByDate.php:95 StockReorderLevel.php:40 StockStatus.php:263
#: StockTransfers.php:191 StockUsageGraph.php:53 StockUsage.php:139
#: SupplierInquiry.php:78 SupplierInquiry.php:100 SupplierInquiry.php:136
#: SupplierInquiry.php:190 SupplierTransInquiry.php:95 SuppPaymentRun.php:114
@@ -1541,7 +1541,7 @@
#: PrintCustTransPortrait.php:58 PrintCustTransPortrait.php:61
#: SalesGraph.php:211 SalesGraph.php:240 SalesGraph.php:244
#: StockLocTransferReceive.php:306 StockLocTransferReceive.php:423
-#: Stocks.php:266 Stocks.php:271 StockStatus.php:306 StockStatus.php:347
+#: Stocks.php:266 Stocks.php:271 StockStatus.php:304 StockStatus.php:345
#: StockTransfers.php:436 includes/PDFAgedDebtorsPageHeader.inc:18
#: includes/PDFAgedSuppliersPageHeader.inc:17
#: includes/PDFChequeListingPageHeader.inc:17
@@ -1938,8 +1938,8 @@
#: SelectOrderItems.php:1675 SelectOrderItems.php:1802 ShipmentCosting.php:145
#: ShipmentCosting.php:146 Shipments.php:401 Shipments.php:403
#: Shipments.php:404 Shipments.php:488 Shipments.php:490 SpecialOrder.php:617
-#: StockCounts.php:98 StockLocMovements.php:92 StockLocTransfer.php:186
-#: StockMovements.php:97 StockStatus.php:310 StockUsageGraph.php:12
+#: StockCounts.php:98 StockLocMovements.php:92 StockLocTransfer.php:261
+#: StockMovements.php:97 StockStatus.php:308 StockUsageGraph.php:12
#: SuppCreditGRNs.php:267 SuppCreditGRNs.php:268 SupplierCredit.php:317
#: SupplierTenders.php:265 SupplierTenders.php:493 WOSerialNos.php:256
#: WOSerialNos.php:296 includes/InputSerialItems.php:111
@@ -2316,7 +2316,7 @@
#: SalesInquiry.php:1204 SelectProduct.php:523 Shipt_Select.php:173
#: StockAdjustments.php:85 StockAdjustments.php:359 StockCounts.php:97
#: StockCounts.php:132 StockMovements.php:32 StockReorderLevel.php:46
-#: StockStatus.php:59 StockTransfers.php:47 StockTransfers.php:458
+#: StockStatus.php:57 StockTransfers.php:47 StockTransfers.php:458
#: StockUsage.php:64 SupplierTenders.php:359 WorkOrderEntry.php:606
#: WorkOrderIssue.php:667 Z_ChangeStockCategory.php:90
#: Z_ChangeStockCode.php:313
@@ -2711,7 +2711,7 @@
#: PDFOrdersInvoiced.php:309 PDFOrderStatus.php:278
#: ReorderLevelLocation.php:169 ReorderLevel.php:258 ReorderLevel.php:267
#: StockCounts.php:133 StockReorderLevel.php:53 StockSerialItemResearch.php:80
-#: StockStatus.php:82 StockStatus.php:87 WhereUsedInquiry.php:72
+#: StockStatus.php:80 StockStatus.php:85 WhereUsedInquiry.php:72
#: WorkCentres.php:128 WorkCentres.php:221
#: includes/PDFPeriodStockTransListingPageHeader.inc:51
#: includes/PDFStockNegativesHeader.inc:31 api/api_xml-rpc.php:2258
@@ -3239,7 +3239,7 @@
#: RecurringSalesOrders.php:318 ReorderLevelLocation.php:199 ReprintGRN.php:81
#: ReverseGRN.php:384 SalesGraph.php:181 SelectCreditItems.php:671
#: SelectOrderItems.php:1331 StockCostUpdate.php:123 StockLocMovements.php:87
-#: StockLocTransfer.php:185 StockLocTransferReceive.php:427
+#: StockLocTransfer.php:260 StockLocTransferReceive.php:427
#: StockQuantityByDate.php:105 Stocks.php:729 Stocks.php:732 Stocks.php:787
#: Stocks.php:794 SuppCreditGRNs.php:81 SuppCreditGRNs.php:175
#: SuppInvGRNs.php:125 SuppInvGRNs.php:303 SupplierCredit.php:315
@@ -3306,7 +3306,7 @@
#: PrintCustTransPortrait.php:1066 PurchData.php:165 PurchData.php:483
#: RecurringSalesOrders.php:322 SelectCreditItems.php:675
#: SelectOrderItems.php:1336 Shipments.php:405 StockLocMovements.php:94
-#: StockMovements.php:99 StockStatus.php:311 SuppCreditGRNs.php:181
+#: StockMovements.php:99 StockStatus.php:309 SuppCreditGRNs.php:181
#: SuppCreditGRNs.php:269 SuppCreditGRNs.php:270 SupplierTenders.php:267
#: SupplierTenders.php:494 SuppPriceList.php:292
#: includes/DefineLabelClass.php:49 includes/PDFQuotationPageHeader.inc:104
@@ -3323,7 +3323,7 @@
#: PrintCustTransPortrait.php:1067 RecurringSalesOrders.php:323
#: SalesAnalReptCols.php:41 SalesAnalReptCols.php:43 SelectCreditItems.php:677
#: SelectOrderItems.php:1339 StockLocMovements.php:95 StockMovements.php:100
-#: StockStatus.php:312 includes/PDFQuotationPageHeader.inc:105
+#: StockStatus.php:310 includes/PDFQuotationPageHeader.inc:105
#: includes/PDFQuotationPortraitPageHeader.inc:105
#: includes/PDFTransPageHeader.inc:211
msgid "Discount"
@@ -3654,8 +3654,8 @@
#: ShipmentCosting.php:428 ShipmentCosting.php:447 ShipmentCosting.php:461
#: StockAdjustments.php:177 StockAdjustments.php:208 StockAdjustments.php:226
#: StockAdjustments.php:242 StockAdjustments.php:255 StockAdjustments.php:283
-#: StockAdjustments.php:305 StockDispatch.php:179 StockLocTransfer.php:79
-#: StockLocTransfer.php:101 StockLocTransfer.php:105
+#: StockAdjustments.php:305 StockDispatch.php:179 StockLocTransfer.php:148
+#: StockLocTransfer.php:170 StockLocTransfer.php:174
#: StockLocTransferReceive.php:102 StockLocTransferReceive.php:136
#: StockLocTransferReceive.php:150 StockLocTransferReceive.php:169
#: StockLocTransferReceive.php:214 StockLocTransferReceive.php:250
@@ -4302,7 +4302,7 @@
msgstr ""
"Smlouvu kusovníku nelze alterned, protože zákazník má již umístěn objednávky"
-#: ContractBOM.php:175 PO_Items.php:538
+#: ContractBOM.php:175 PO_Items.php:538 StockLocTransfer.php:75
#: includes/SelectOrderItems_IntoCart.inc:27
#: includes/SelectOrderItems_IntoCart.inc:64
msgid "The item"
@@ -5057,8 +5057,8 @@
#: SelectOrderItems.php:548 SelectOrderItems.php:1523
#: SelectOrderItems.php:1704 SpecialOrder.php:61 SpecialOrder.php:85
#: StockCheck.php:221 StockLocStatus.php:183 StockLocStatus.php:206
-#: StockLocStatus.php:239 StockStatus.php:117 StockStatus.php:141
-#: StockStatus.php:161 StockStatus.php:181 StockStatus.php:198
+#: StockLocStatus.php:239 StockStatus.php:115 StockStatus.php:139
+#: StockStatus.php:159 StockStatus.php:179 StockStatus.php:196
#: SupplierCredit.php:91 SupplierInvoice.php:70
msgid "cannot be retrieved because"
msgstr "nelze načíst, protože"
@@ -5826,19 +5826,19 @@
msgstr "On Demand"
#: CounterSales.php:2034 CounterSales.php:2219 SelectOrderItems.php:1489
-#: SelectOrderItems.php:1673 StockLocStatus.php:166 StockStatus.php:92
+#: SelectOrderItems.php:1673 StockLocStatus.php:166 StockStatus.php:90
msgid "On Order"
msgstr "Na objednávku"
#: CounterSales.php:2035 CounterSales.php:2220 SelectOrderItems.php:1490
-#: SelectOrderItems.php:1674 StockLocStatus.php:165 StockStatus.php:91
+#: SelectOrderItems.php:1674 StockLocStatus.php:165 StockStatus.php:89
#: includes/OutputSerialItems.php:37 includes/PDFStockCheckPageHeader.inc:40
msgid "Available"
msgstr "K dispozici"
#: CounterSales.php:2064 CounterSales.php:2246 SelectOrderItems.php:1522
#: SelectOrderItems.php:1704 StockCheck.php:221 StockLocStatus.php:183
-#: StockLocStatus.php:206 StockStatus.php:117 StockStatus.php:141
+#: StockLocStatus.php:206 StockStatus.php:115 StockStatus.php:139
msgid "The demand for this product from"
msgstr "Poptávka po tomto produktu ze"
@@ -12724,7 +12724,7 @@
#: ReorderLevel.php:164 SelectProduct.php:78 StockDispatch.php:221
#: StockMovements.php:19 StockQties_csv.php:8 StockQuantityByDate.php:10
#: StockReorderLevel.php:18 StockSerialItemResearch.php:9
-#: StockSerialItems.php:9 StockStatus.php:42 StockTransferControlled.php:14
+#: StockSerialItems.php:9 StockStatus.php:40 StockTransferControlled.php:14
#: SuppLoginSetup.php:24 WWW_Users.php:16
msgid "Inventory"
msgstr "Sklad"
@@ -13002,7 +13002,7 @@
msgid "Bulk Inventory Transfer"
msgstr "Hromadný přesun položek"
-#: index.php:590 StockAdjustments.php:66 StockLocTransfer.php:132
+#: index.php:590 StockAdjustments.php:66 StockLocTransfer.php:201
#: StockLocTransferReceive.php:411 StockLocTransferReceive.php:503
#: StockTransfers.php:27 StockTransfers.php:446 StockUsage.php:28
#: SuppCreditGRNs.php:19 SuppInvGRNs.php:16
@@ -14965,10 +14965,11 @@
#: MRPReport.php:724 SelectAsset.php:222 SelectCustomer.php:392
#: SelectCustomer.php:473 SelectOrderItems.php:1380 SelectProduct.php:709
-#: SelectSupplier.php:235 SelectSupplier.php:297 SupplierTenders.php:146
-#: SupplierTenders.php:204 WorkOrderIssue.php:352 WorkOrderReceive.php:676
-#: includes/Add_SerialItemsOut.php:23 includes/Add_SerialItems.php:33
-#: includes/Add_SerialItems.php:184 includes/Add_SerialItems.php:281
+#: SelectSupplier.php:235 SelectSupplier.php:297 StockLocTransfer.php:61
+#: SupplierTenders.php:146 SupplierTenders.php:204 WorkOrderIssue.php:352
+#: WorkOrderReceive.php:676 includes/Add_SerialItemsOut.php:23
+#: includes/Add_SerialItems.php:33 includes/Add_SerialItems.php:184
+#: includes/Add_SerialItems.php:281
#: includes/PDFBankingSummaryPageHeader.inc:19
msgid "of"
msgstr "ze dne"
@@ -15002,7 +15003,7 @@
msgid "Total Qty On Hand"
msgstr "Celkem Množství na ruce"
-#: MRPReport.php:750 SelectProduct.php:736 StockStatus.php:9
+#: MRPReport.php:750 SelectProduct.php:736 StockStatus.php:7
msgid "Stock Status"
msgstr "Stav skladu"
@@ -15124,8 +15125,8 @@
msgid "Supply"
msgstr "Zásobování"
-#: MRPShortages.php:351 StockLocStatus.php:164 StockStatus.php:83
-#: StockStatus.php:90
+#: MRPShortages.php:351 StockLocStatus.php:164 StockStatus.php:81
+#: StockStatus.php:88
msgid "Demand"
msgstr "Poptávka"
@@ -19013,7 +19014,7 @@
msgstr "Datum Typ"
#: POReport.php:516 POReport.php:1286 POReport.php:1515 SalesInquiry.php:780
-#: SalesInquiry.php:1087 StockStatus.php:309
+#: SalesInquiry.php:1087 StockStatus.php:307
msgid "Date Range"
msgstr "Časové"
@@ -19127,7 +19128,7 @@
msgid "Run Inquiry"
msgstr "Spustit Poptávka"
-#: PO_SelectOSPurchOrder.php:9 SelectProduct.php:408 StockStatus.php:357
+#: PO_SelectOSPurchOrder.php:9 SelectProduct.php:408 StockStatus.php:355
#: StockUsage.php:200
msgid "Search Outstanding Purchase Orders"
msgstr "Hledat Vynikající Objednávky"
@@ -20639,7 +20640,7 @@
#: PurchData.php:529 SelectProduct.php:402 StockAdjustments.php:464
#: StockCostUpdate.php:189 StockLocStatus.php:108 StockMovements.php:201
-#: StockQuantityByDate.php:70 StockStatus.php:61 StockTransfers.php:559
+#: StockQuantityByDate.php:70 StockStatus.php:59 StockTransfers.php:559
#: StockUsage.php:192
msgid "Show Stock Status"
msgstr "Zobrazit stavu populace"
@@ -20652,14 +20653,14 @@
#: PurchData.php:531 SelectProduct.php:405 SelectSalesOrder.php:6
#: StockAdjustments.php:470 StockCostUpdate.php:192 StockMovements.php:203
-#: StockReorderLevel.php:109 StockStatus.php:354 StockTransfers.php:565
+#: StockReorderLevel.php:109 StockStatus.php:352 StockTransfers.php:565
#: StockUsage.php:196
msgid "Search Outstanding Sales Orders"
msgstr "Hledat Vynikající Prodejní objednávky"
#: PurchData.php:532 SelectProduct.php:406 StockAdjustments.php:472
#: StockCostUpdate.php:193 StockMovements.php:204 StockReorderLevel.php:110
-#: StockStatus.php:355 StockTransfers.php:567 StockUsage.php:198
+#: StockStatus.php:353 StockTransfers.php:567 StockUsage.php:198
msgid "Search Completed Sales Orders"
msgstr "Vyhledávání Dokončené Prodejní objednávky"
@@ -21008,7 +21009,7 @@
msgstr "Zásoby Změna pořadí Úroveň zprávě"
#: ReorderLevel.php:175 SelectSalesOrder.php:496 StockDispatch.php:248
-#: StockLocMovements.php:18 StockLocStatus.php:32 StockLocTransfer.php:146
+#: StockLocMovements.php:18 StockLocStatus.php:32 StockLocTransfer.php:215
#: StockMovements.php:34 StockTransfers.php:484 StockUsage.php:66
msgid "From Stock Location"
msgstr "Od Umístění skladu"
@@ -23687,7 +23688,7 @@
#: SelectProduct.php:336 StockLocStatus.php:162 StockQuantityByDate.php:107
#: StockReorderLevel.php:54 StockSerialItems.php:108 StockSerialItems.php:111
#: StockSerialItems.php:114 StockSerialItems.php:119 StockSerialItems.php:123
-#: StockSerialItems.php:127 StockStatus.php:88
+#: StockSerialItems.php:127 StockStatus.php:86
msgid "Quantity On Hand"
msgstr "Množství na ruce"
@@ -25049,7 +25050,7 @@
msgid "Enter Stock Adjustment"
msgstr "Zadejte skladem Nastavení"
-#: StockAdjustments.php:466 StockStatus.php:352 StockTransfers.php:561
+#: StockAdjustments.php:466 StockStatus.php:350 StockTransfers.php:561
msgid "Show Movements"
msgstr "Zobrazit Pohyby"
@@ -25484,7 +25485,7 @@
msgid "The quantity entered for line"
msgstr "Množství propuštěné do linky"
-#: StockCounts.php:51 StockLocTransfer.php:40 StockLocTransferReceive.php:34
+#: StockCounts.php:51 StockLocTransfer.php:104 StockLocTransferReceive.php:34
msgid "is not numeric"
msgstr "není číselný"
@@ -25572,7 +25573,7 @@
msgid "The stock dispatch did not have any items to list"
msgstr "Populace odeslání neměl žádné položky do seznamu"
-#: StockDispatch.php:179 StockLocTransfer.php:101
+#: StockDispatch.php:179 StockLocTransfer.php:170
msgid "Unable to enter Location Transfer record for"
msgstr "Nelze zadat umístění Transfer rekord"
@@ -25621,7 +25622,7 @@
msgid "Dispatch Percent"
msgstr "Expedice procent"
-#: StockDispatch.php:264 StockLocTransfer.php:165 StockTransfers.php:508
+#: StockDispatch.php:264 StockLocTransfer.php:234 StockTransfers.php:508
msgid "To Stock Location"
msgstr "Chcete-li Umístění skladu"
@@ -25690,7 +25691,7 @@
msgid "But after"
msgstr "Ale poté, co"
-#: StockLocMovements.php:82 StockMovements.php:86 StockStatus.php:264
+#: StockLocMovements.php:82 StockMovements.php:86 StockStatus.php:262
msgid ""
"The stock movements for the selected criteria could not be retrieved because"
msgstr "Pohyby zásob pro zvolená kritéria se nepodařilo získat, protože"
@@ -25720,7 +25721,7 @@
msgid "Only items where stock is available"
msgstr "Pouze položky, kde je k dispozici skladem"
-#: StockLocStatus.php:152 StockReorderLevel.php:39 StockStatus.php:73
+#: StockLocStatus.php:152 StockReorderLevel.php:39 StockStatus.php:71
msgid "The stock held at each location cannot be retrieved because"
msgstr "Stavu zásob v každém místě, nemůže získat, protože"
@@ -25729,19 +25730,19 @@
msgid "StockID"
msgstr "StockID"
-#: StockLocStatus.php:163 StockReorderLevel.php:55 StockStatus.php:89
+#: StockLocStatus.php:163 StockReorderLevel.php:55 StockStatus.php:87
msgid "Re-Order Level"
msgstr "Re-Objednávka úrovni"
-#: StockLocStatus.php:239 StockStatus.php:181
+#: StockLocStatus.php:239 StockStatus.php:179
msgid "The quantity on order for this product to be received into"
msgstr "Množství na objednávku pro tento produkt mají být přijaty do"
-#: StockLocStatus.php:281 StockLocStatus.php:311 StockStatus.php:222
+#: StockLocStatus.php:281 StockLocStatus.php:311 StockStatus.php:220
msgid "Serial Numbers"
msgstr "Sériová čísla"
-#: StockLocStatus.php:283 StockLocStatus.php:313 StockStatus.php:224
+#: StockLocStatus.php:283 StockLocStatus.php:313 StockStatus.php:222
#: WorkOrderEntry.php:541
msgid "Batches"
msgstr "Dávky"
@@ -25758,82 +25759,112 @@
msgid "Please start over now"
msgstr "Prosím začít více než nyní"
-#: StockLocTransfer.php:34 StockLocTransfer.php:58
+#: StockLocTransfer.php:37 Z_ImportFixedAssets.php:48
+msgid "File contains"
+msgstr "Soubor obsahuje"
+
+#: StockLocTransfer.php:37
+msgid ""
+"columns, but only 2 columns are expected. The comma separated file should "
+"have just two columns the first for the item code and the second for the "
+"quantity to transfer"
+msgstr ""
+
+#: StockLocTransfer.php:54 StockLocTransfer.php:98 StockLocTransfer.php:123
msgid "The part code entered of"
msgstr "Část kódu vstoupila na"
-#: StockLocTransfer.php:34
+#: StockLocTransfer.php:54 StockLocTransfer.php:98
msgid "is not set up in the database"
msgstr "není zřízen v databázi"
-#: StockLocTransfer.php:34
+#: StockLocTransfer.php:54 StockLocTransfer.php:98
msgid "Only valid parts can be entered for transfers"
msgstr "Platné pouze části mohou být zapsány pro převody"
-#: StockLocTransfer.php:40
+#: StockLocTransfer.php:61 StockLocTransfer.php:109
+#: StockLocTransferReceive.php:34 StockLocTransferReceive.php:38
+msgid "The quantity entered for"
+msgstr "Množství propuštěné do"
+
+#: StockLocTransfer.php:61
+#, fuzzy
+msgid "is not numeric."
+msgstr "není číselný"
+
+#: StockLocTransfer.php:61 StockLocTransfer.php:104
+msgid "The quantity entered for transfers is expected to be numeric"
+msgstr "Množství uvedené pro převody Očekává se, že číselné"
+
+#: StockLocTransfer.php:75
+#, fuzzy
+msgid "does not have enough stock available ("
+msgstr "nemá dostatek zásob k dispozici pro převod."
+
+#: StockLocTransfer.php:75
+#, fuzzy
+msgid "The quantity required to transfer was"
+msgstr "SQL získat převod byl"
+
+#: StockLocTransfer.php:104
msgid "The quantity entered of"
msgstr "Množství uvedené v"
-#: StockLocTransfer.php:40
+#: StockLocTransfer.php:104
msgid "for part code"
msgstr "pro část kódu"
-#: StockLocTransfer.php:40
-msgid "The quantity entered for transfers is expected to be numeric"
-msgstr "Množství uvedené pro převody Očekává se, že číselné"
-
-#: StockLocTransfer.php:45 StockLocTransferReceive.php:34
-#: StockLocTransferReceive.php:38
-msgid "The quantity entered for"
-msgstr "Množství propuštěné do"
-
-#: StockLocTransfer.php:45
+#: StockLocTransfer.php:109
msgid "is less than or equal to 0"
msgstr "je menší než nebo rovna 0"
-#: StockLocTransfer.php:45
+#: StockLocTransfer.php:109
msgid "Please correct this or remove the item"
msgstr "Opravte to nebo odebrat položku"
-#: StockLocTransfer.php:58
+#: StockLocTransfer.php:123
msgid "does not have enough stock available for transfer."
msgstr "nemá dostatek zásob k dispozici pro převod."
-#: StockLocTransfer.php:67
+#: StockLocTransfer.php:135
msgid "You must enter at least 1 Stock Item to transfer"
msgstr "Musíte zadat alespoň 1 bod skladem k převodu"
-#: StockLocTransfer.php:73
+#: StockLocTransfer.php:141
msgid ""
"The transfer must have a different location to receive into and location "
"sent from"
msgstr "Převod musí mít jiné umístění pro příjem a umístění do odeslané z"
-#: StockLocTransfer.php:79
+#: StockLocTransfer.php:148
msgid "Unable to BEGIN Location Transfer transaction"
msgstr "Nelze BEGIN Místo Transfer transakce"
-#: StockLocTransfer.php:105
+#: StockLocTransfer.php:174
msgid "Unable to COMMIT Location Transfer transaction"
msgstr "Nelze COMMIT Místo transakce Transfer"
-#: StockLocTransfer.php:108
+#: StockLocTransfer.php:177
msgid "The inventory transfer records have been created successfully"
msgstr "Inventární převod byly úspěšně vytvořen"
-#: StockLocTransfer.php:109
+#: StockLocTransfer.php:178
msgid "Print the Transfer Docket"
msgstr "Tisk Transfer Docket"
-#: StockLocTransfer.php:140
+#: StockLocTransfer.php:209
msgid "Inventory Location Transfer Shipment Reference"
msgstr "Zásoby Umístění Transfer zásilku Reference"
-#: StockLocTransfer.php:229
+#: StockLocTransfer.php:253
+msgid "Upload CSV file of Transfer Items and Quantites"
+msgstr ""
+
+#: StockLocTransfer.php:304
msgid "Add More Items"
msgstr "Přidat další položky"
-#: StockLocTransfer.php:230
+#: StockLocTransfer.php:305
msgid "Create Transfer Shipment"
msgstr "Vytvořit zásilku Transfer"
@@ -26024,7 +26055,7 @@
msgid "Stock Movements"
msgstr "Pohybů zásob"
-#: StockMovements.php:19 StockStatus.php:43 StockUsage.php:57
+#: StockMovements.php:19 StockStatus.php:41 StockUsage.php:57
#: WhereUsedInquiry.php:33
msgid "in units of"
msgstr "v jednotkách"
@@ -26435,7 +26466,7 @@
msgid "The stock item could not be updated because"
msgstr "Skladová položka nelze aktualizovat, protože"
-#: Stocks.php:372 StockStatus.php:74
+#: Stocks.php:372 StockStatus.php:72
msgid "The SQL that was used to update the stock item and failed was"
msgstr "SQL, který byl použit k aktualizaci na skladě a neúspěšný byl"
@@ -26731,47 +26762,47 @@
msgid "Delete This Item"
msgstr "Odstranit tuto položku"
-#: StockStatus.php:33
+#: StockStatus.php:31
msgid "Could not retrieve the requested item"
msgstr "Nepodařilo se načíst požadovanou položku"
-#: StockStatus.php:34
+#: StockStatus.php:32
msgid "The SQL used to retrieve the items was"
msgstr "SQL používá k načtení položek byl"
-#: StockStatus.php:48
+#: StockStatus.php:46
msgid "This is a kitset part and cannot have a stock holding"
msgstr "Jedná se o kitset část a nemůže mít skladového hospodářství"
-#: StockStatus.php:48 StockStatus.php:51 StockStatus.php:54
+#: StockStatus.php:46 StockStatus.php:49 StockStatus.php:52
msgid "only the total quantity on outstanding sales orders is shown"
msgstr "pouze celkové množství, pro vynikající prodejní objednávky je zobrazen"
-#: StockStatus.php:51
+#: StockStatus.php:49
msgid "This is an assembly part and cannot have a stock holding"
msgstr "To je součástí sestavy a nemohou mít skladového hospodářství"
-#: StockStatus.php:54
+#: StockStatus.php:52
msgid "This is an dummy part and cannot have a stock holding"
msgstr "Toto je fiktivní část a nemůže mít skladového hospodářství"
-#: StockStatus.php:161
+#: StockStatus.php:159
msgid "The workorder component demand for this product from"
msgstr "Workorder složka poptávky po tomto výrobku z"
-#: StockStatus.php:198
+#: StockStatus.php:196
msgid "The quantity on work orders for this product to be received into"
msgstr "Množství na pracovních příkazů pro tento produkt mají být přijaty do"
-#: StockStatus.php:306
+#: StockStatus.php:304
msgid "Pricing history for sales of"
msgstr "Historie cen za prodej"
-#: StockStatus.php:347
+#: StockStatus.php:345
msgid "No history of sales of"
msgstr "Neexistuje žádný záznam o prodeji"
-#: StockStatus.php:353
+#: StockStatus.php:351
msgid "Show Usage"
msgstr "Zobrazit Využití"
@@ -33715,10 +33746,6 @@
msgstr "Import Dlouhodobý majetek"
#: Z_ImportFixedAssets.php:48
-msgid "File contains"
-msgstr "Soubor obsahuje"
-
-#: Z_ImportFixedAssets.php:48
msgid "columns, expected"
msgstr "sloupy, očekávané"
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 2011-12-15 11:56:25 UTC (rev 4780)
+++ trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po 2011-12-17 23:06:55 UTC (rev 4781)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: WebERP 4.00/trunk\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-03 16:31+1300\n"
+"POT-Creation-Date: 2011-12-10 09:04+1300\n"
"PO-Revision-Date: 2011-07-17 13:46+0000\n"
"Last-Translator: Peter Hürlimann <su...@ph...>\n"
"Language-Team: Deutsch <web...@li...>\n"
@@ -894,7 +894,7 @@
#: ReverseGRN.php:374 SelectCreditItems.php:1408 SelectSalesOrder.php:189
#: SelectSalesOrder.php:353 StockCheck.php:223 StockCostUpdate.php:77
#: StockCostUpdate.php:87 StockLocStatus.php:153 StockMovements.php:87
-#: StockQuantityByDate.php:95 StockReorderLevel.php:40 StockStatus.php:265
+#: StockQuantityByDate.php:95 StockReorderLevel.php:40 StockStatus.php:263
#: StockTransfers.php:191 StockUsageGraph.php:53 StockUsage.php:139
#: SupplierInquiry.php:78 SupplierInquiry.php:100 SupplierInquiry.php:136
#: SupplierInquiry.php:190 SupplierTransInquiry.php:95 SuppPaymentRun.php:114
@@ -1541,7 +1541,7 @@
#: PrintCustTransPortrait.php:58 PrintCustTransPortrait.php:61
#: SalesGraph.php:211 SalesGraph.php:240 SalesGraph.php:244
#: StockLocTransferReceive.php:306 StockLocTransferReceive.php:423
-#: Stocks.php:266 Stocks.php:271 StockStatus.php:306 StockStatus.php:347
+#: Stocks.php:266 Stocks.php:271 StockStatus.php:304 StockStatus.php:345
#: StockTransfers.php:436 includes/PDFAgedDebtorsPageHeader.inc:18
#: includes/PDFAgedSuppliersPageHeader.inc:17
#: includes/PDFChequeListingPageHeader.inc:17
@@ -1952,8 +1952,8 @@
#: SelectOrderItems.php:1675 SelectOrderItems.php:1802 ShipmentCosting.php:145
#: ShipmentCosting.php:146 Shipments.php:401 Shipments.php:403
#: Shipments.php:404 Shipments.php:488 Shipments.php:490 SpecialOrder.php:617
-#: StockCounts.php:98 StockLocMovements.php:92 StockLocTransfer.php:186
-#: StockMovements.php:97 StockStatus.php:310 StockUsageGraph.php:12
+#: StockCounts.php:98 StockLocMovements.php:92 StockLocTransfer.php:261
+#: StockMovements.php:97 StockStatus.php:308 StockUsageGraph.php:12
#: SuppCreditGRNs.php:267 SuppCreditGRNs.php:268 SupplierCredit.php:317
#: SupplierTenders.php:265 SupplierTenders.php:493 WOSerialNos.php:256
#: WOSerialNos.php:296 includes/InputSerialItems.php:111
@@ -2334,7 +2334,7 @@
#: SalesInquiry.php:1204 SelectProduct.php:523 Shipt_Select.php:173
#: StockAdjustments.php:85 StockAdjustments.php:359 StockCounts.php:97
#: StockCounts.php:132 StockMovements.php:32 StockReorderLevel.php:46
-#: StockStatus.php:59 StockTransfers.php:47 StockTransfers.php:458
+#: StockStatus.php:57 StockTransfers.php:47 StockTransfers.php:458
#: StockUsage.php:64 SupplierTenders.php:359 WorkOrderEntry.php:606
#: WorkOrderIssue.php:667 Z_ChangeStockCategory.php:90
#: Z_ChangeStockCode.php:313
@@ -2736,7 +2736,7 @@
#: PDFOrdersInvoiced.php:309 PDFOrderStatus.php:278
#: ReorderLevelLocation.php:169 ReorderLevel.php:258 ReorderLevel.php:267
#: StockCounts.php:133 StockReorderLevel.php:53 StockSerialItemResearch.php:80
-#: StockStatus.php:82 StockStatus.php:87 WhereUsedInquiry.php:72
+#: StockStatus.php:80 StockStatus.php:85 WhereUsedInquiry.php:72
#: WorkCentres.php:128 WorkCentres.php:221
#: includes/PDFPeriodStockTransListingPageHeader.inc:51
#: includes/PDFStockNegativesHeader.inc:31 api/api_xml-rpc.php:2258
@@ -3267,7 +3267,7 @@
#: RecurringSalesOrders.php:318 ReorderLevelLocation.php:199 ReprintGRN.php:81
#: ReverseGRN.php:384 SalesGraph.php:181 SelectCreditItems.php:671
#: SelectOrderItems.php:1331 StockCostUpdate.php:123 StockLocMovements.php:87
-#: StockLocTransfer.php:185 StockLocTransferReceive.php:427
+#: StockLocTransfer.php:260 StockLocTransferReceive.php:427
#: StockQuantityByDate.php:105 Stocks.php:729 Stocks.php:732 Stocks.php:787
#: Stocks.php:794 SuppCreditGRNs.php:81 SuppCreditGRNs.php:175
#: SuppInvGRNs.php:125 SuppInvGRNs.php:303 SupplierCredit.php:315
@@ -3334,7 +33...
[truncated message content] |
Thanks for helping keep SourceForge clean.
X