Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[4753] trunk
|
From: <dai...@us...> - 2011-11-26 07:58:29
|
Revision: 4753
http://web-erp.svn.sourceforge.net/web-erp/?rev=4753&view=rev
Author: daintree
Date: 2011-11-26 07:58:19 +0000 (Sat, 26 Nov 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/ConfirmDispatchControlled_Invoice.php
trunk/ConfirmDispatch_Invoice.php
trunk/PO_PDFPurchOrder.php
trunk/PO_SelectOSPurchOrder.php
trunk/PcAssignCashToTab.php
trunk/SelectCompletedOrder.php
trunk/StockCostUpdate.php
trunk/SuppInvGRNs.php
trunk/SupplierInvoice.php
trunk/doc/README.txt
trunk/includes/ConnectDB_mysqli.inc
trunk/includes/SQL_CommonFunctions.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/weberp-demo.sql
trunk/sql/mysql/weberp-new.sql
Added Paths:
-----------
trunk/css/aguapop/images/allocation.gif
trunk/css/aguapop/images/bank.gif
trunk/css/aguapop/images/credit.gif
trunk/css/aguapop/images/email.gif
trunk/css/aguapop/images/folders.gif
trunk/css/aguapop/images/inventory.gif
trunk/css/aguapop/images/maintenance.gif
trunk/css/aguapop/images/preview.gif
trunk/css/aguapop/images/reports.gif
trunk/css/aguapop/images/transactions.gif
Modified: trunk/ConfirmDispatchControlled_Invoice.php
===================================================================
--- trunk/ConfirmDispatchControlled_Invoice.php 2011-11-24 09:10:21 UTC (rev 4752)
+++ trunk/ConfirmDispatchControlled_Invoice.php 2011-11-26 07:58:19 UTC (rev 4753)
@@ -33,7 +33,7 @@
exit;
}
-if (!isset($_SESSION['Items']) OR !isset($_SESSION['ProcessingOrder'])) {
+if (!isset($_SESSION['Items'.$identifier]) OR !isset($_SESSION['ProcessingOrder'])) {
/* This page can only be called with a sales order number to invoice */
echo '<div class="centre">
<a href="' . $rootpath . '/SelectSalesOrder.php">'. _('Select a sales order to invoice') . '</a>
@@ -46,7 +46,7 @@
/*Save some typing by referring to the line item class object in short form */
-$LineItem = &$_SESSION['Items']->LineItems[$LineNo];
+$LineItem = &$_SESSION['Items'.$identifier]->LineItems[$LineNo];
//Make sure this item is really controlled
@@ -63,15 +63,15 @@
********************************************/
echo '<div class="centre">';
-echo '<br /><a href="'. $rootpath. '/ConfirmDispatch_Invoice.php">'. _('Back to Confirmation of Dispatch') . '/' . _('Invoice'). '</a>';
+echo '<br /><a href="'. $rootpath. '/ConfirmDispatch_Invoice.php?identifier=' . $identifier . '">'. _('Back to Confirmation of Dispatch') . '/' . _('Invoice'). '</a>';
-echo '<br /><font size=2><b>'. _('Dispatch of up to').' '. locale_number_format($LineItem->Quantity-$LineItem->QtyInv, $LineItem->DecimalPlaces). ' '. _('Controlled items').' ' . $LineItem->StockID . ' - ' . $LineItem->ItemDescription . ' '. _('on order').' ' . $_SESSION['Items']->OrderNo . ' '. _('to'). ' ' . $_SESSION['Items']->CustomerName . '</b></font></div>';
+echo '<br /><b>'. _('Dispatch of up to').' '. locale_number_format($LineItem->Quantity-$LineItem->QtyInv, $LineItem->DecimalPlaces). ' '. _('Controlled items').' ' . $LineItem->StockID . ' - ' . $LineItem->ItemDescription . ' '. _('on order').' ' . $_SESSION['Items'.$identifier]->OrderNo . ' '. _('to'). ' ' . $_SESSION['Items'.$identifier]->CustomerName . '</b></div>';
/** vars needed by InputSerialItem : **/
$StockID = $LineItem->StockID;
$RecvQty = $LineItem->Quantity-$LineItem->QtyInv;
$ItemMustExist = true; /*Can only invoice valid batches/serial numbered items that exist */
-$LocationOut = $_SESSION['Items']->Location;
+$LocationOut = $_SESSION['Items'.$identifier]->Location;
$InOutModifier=1;
$ShowExisting=false;
@@ -79,7 +79,7 @@
/*TotalQuantity set inside this include file from the sum of the bundles
of the item selected for dispatch */
-$_SESSION['Items']->LineItems[$LineNo]->QtyDispatched = $TotalQuantity;
+$_SESSION['Items'.$identifier]->LineItems[$LineNo]->QtyDispatched = $TotalQuantity;
include('includes/footer.inc');
exit;
Modified: trunk/ConfirmDispatch_Invoice.php
===================================================================
--- trunk/ConfirmDispatch_Invoice.php 2011-11-24 09:10:21 UTC (rev 4752)
+++ trunk/ConfirmDispatch_Invoice.php 2011-11-26 07:58:19 UTC (rev 4753)
@@ -232,8 +232,12 @@
foreach ($Itm->SerialItems as $SerialItem) { //calculate QtyDispatched from bundle quantities
$_SESSION['Items'.$identifier]->LineItems[$Itm->LineNumber]->QtyDispatched += $SerialItem->BundleQty;
}
- } else if (is_numeric(filter_number_format($_POST[$Itm->LineNumber . '_QtyDispatched' ])) AND filter_number_format($_POST[$Itm->LineNumber . '_QtyDispatched']) <= ($_SESSION['Items'.$identifier]->LineItems[$Itm->LineNumber]->Quantity - $_SESSION['Items'.$identifier]->LineItems[$Itm->LineNumber]->QtyInv)){
- $_SESSION['Items'.$identifier]->LineItems[$Itm->LineNumber]->QtyDispatched = round(filter_number_format($_POST[$Itm->LineNumber . '_QtyDispatched']),$Itm->DecimalPlaces);
+ } else if (isset($_POST[$Itm->LineNumber . '_QtyDispatched' ])){
+ if (is_numeric(filter_number_format($_POST[$Itm->LineNumber . '_QtyDispatched' ]))
+ AND filter_number_format($_POST[$Itm->LineNumber . '_QtyDispatched']) <= ($_SESSION['Items'.$identifier]->LineItems[$Itm->LineNumber]->Quantity - $_SESSION['Items'.$identifier]->LineItems[$Itm->LineNumber]->QtyInv)){
+
+ $_SESSION['Items'.$identifier]->LineItems[$Itm->LineNumber]->QtyDispatched = round(filter_number_format($_POST[$Itm->LineNumber . '_QtyDispatched']),$Itm->DecimalPlaces);
+ }
}
foreach ($Itm->Taxes as $TaxLine) {
if (isset($_POST[$Itm->LineNumber . $TaxLine->TaxCalculationOrder . '_TaxRate'])){
@@ -449,7 +453,7 @@
}
}
-if (isset($_POST['ChargeFreightCost']) and !is_numeric(filter_number_format($_POST['ChargeFreightCost']))){
+if (isset($_POST['ChargeFreightCost']) AND !is_numeric(filter_number_format($_POST['ChargeFreightCost']))){
$_POST['ChargeFreightCost'] = 0;
}
@@ -467,7 +471,10 @@
if (!isset($_POST['ChargeFreightCost'])) {
$_POST['ChargeFreightCost']=0;
}
-if ($_SESSION['Items'.$identifier]->Any_Already_Delivered()==1 and (!isset($_SESSION['Items'.$identifier]->FreightCost) or $_POST['ChargeFreightCost']==0)) {
+if ($_SESSION['Items'.$identifier]->Any_Already_Delivered()==1
+ AND (!isset($_SESSION['Items'.$identifier]->FreightCost)
+ OR $_POST['ChargeFreightCost']==0)) {
+
echo '<td colspan="2" class="number">'. _('Charge Freight Cost inc Tax').'</td>
<td><input tabindex='.$j.' type="text" class="number" size="10" maxlength="12" name="ChargeFreightCost" value="0"></td>';
$_SESSION['Items'.$identifier]->FreightCost=0;
@@ -478,7 +485,7 @@
} else {
echo '<td class="number"><input tabindex='.$j.' type="text" class="number" size="10" maxlength="12" name="ChargeFreightCost" value="' . locale_number_format($_SESSION['Items'.$identifier]->FreightCost,$_SESSION['Items'.$identifier]->CurrDecimalPlaces) . '" /></td>';
}
- $_POST['ChargeFreightCost'] = $_SESSION['Items'.$identifier]->FreightCost;
+ $_POST['ChargeFreightCost'] = locale_number_format($_SESSION['Items'.$identifier]->FreightCost,$_SESSION['Items'.$identifier]->CurrDecimalPlaces);
}
$FreightTaxTotal =0; //initialise tax total
Modified: trunk/PO_PDFPurchOrder.php
===================================================================
--- trunk/PO_PDFPurchOrder.php 2011-11-24 09:10:21 UTC (rev 4752)
+++ trunk/PO_PDFPurchOrder.php 2011-11-26 07:58:19 UTC (rev 4753)
@@ -305,7 +305,7 @@
$Success = 1; //assume the best and email goes - has to be set to 1 to allow update status
if ($MakePDFThenDisplayIt){
$pdf->OutputD($_SESSION['DatabaseName'] . '_PurchaseOrder_' . $OrderNo . '_' . date('Y-m-d') . '.pdf');
- $pdf->__destruct(); //UldisN
+ $pdf->__destruct();
} else { /* must be MakingPDF to email it */
$PdfFileName = $_SESSION['DatabaseName'] . '_PurchaseOrder_' . $OrderNo . '_' .date('Y-m-d') . '.pdf';
Modified: trunk/PO_SelectOSPurchOrder.php
===================================================================
--- trunk/PO_SelectOSPurchOrder.php 2011-11-24 09:10:21 UTC (rev 4752)
+++ trunk/PO_SelectOSPurchOrder.php 2011-11-26 07:58:19 UTC (rev 4753)
@@ -131,7 +131,11 @@
*/
if (!isset($OrderNumber) or $OrderNumber=='' ){
- echo '<a href="' . $rootpath . '/PO_Header.php?NewOrder=Yes">' . _('Add Purchase Order') . '</a>';
+ if (isset($SelectedSupplier)){
+ echo '<a href="' . $rootpath . '/PO_Header.php?NewOrder=Yes&SupplierID=' . $SelectedSupplier . '">' . _('Add Purchase Order') . '</a>';
+ } else {
+ echo '<a href="' . $rootpath . '/PO_Header.php?NewOrder=Yes">' . _('Add Purchase Order') . '</a>';
+ }
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/magnifier.png" title="' . _('Search') . '" alt="">' . ' ' . $title.'</p>';
echo '<table class=selection>
<tr>
Modified: trunk/PcAssignCashToTab.php
===================================================================
--- trunk/PcAssignCashToTab.php 2011-11-24 09:10:21 UTC (rev 4752)
+++ trunk/PcAssignCashToTab.php 2011-11-26 07:58:19 UTC (rev 4753)
@@ -82,8 +82,8 @@
SET date = '".FormatDateForSQL($_POST['Date'])."',
amount = '" . filter_number_format($_POST['Amount']) . "',
authorized = '0000-00-00',
- notes = '" . DB_escape_string($_POST['Notes']) . "',
- receipt = '" . DB_escape_string($_POST['Receipt']) . "'
+ notes = '" . $_POST['Notes'] . "',
+ receipt = '" . $_POST['Receipt'] . "'
WHERE counterindex = '" . $SelectedIndex . "'";
$msg = _('Assignment of cash to PC Tab ') . ' ' . $SelectedTabs . ' ' . _('has been updated');
@@ -106,8 +106,8 @@
'" . filter_number_format($_POST['Amount']) . "',
authorized = '0000-00-00',
'0',
- '" . DB_escape_string($_POST['Notes']) . "',
- '" . DB_escape_string($_POST['Receipt']) . "'
+ '" . $_POST['Notes'] . "',
+ '" . $_POST['Receipt'] . "'
)";
$msg = _('Assignment of cash to PC Tab ') . ' ' . $_POST['SelectedTabs'] . ' ' . _('has been created');
}
@@ -173,8 +173,8 @@
echo '</td></tr></table>'; // close main table
echo '<p>
<div class="centre">
- <input type=submit name="process" value="' . _('Accept') . '" />
- <input type=submit name="Cancel" value="' . _('Cancel') . '" />
+ <input type="submit" name="process" value="' . _('Accept') . '" />
+ <input type="submit" name="Cancel" value="' . _('Cancel') . '" />
</div>';
echo '</form>';
}
@@ -321,10 +321,10 @@
$_POST['Notes'] = $myrow['notes'];
$_POST['Receipt'] = $myrow['receipt'];
- echo '<input type="hidden" name="SelectedTabs" value="' . $SelectedTabs . '">';
- echo '<input type=hidden name="SelectedIndex" value="' . $SelectedIndex. '">';
- echo '<input type=hidden name="CurrentAmount" value="' . $Amount[0]. '">';
- echo '<input type=hidden name="Days" value="' . $Days . '">';
+ echo '<input type="hidden" name="SelectedTabs" value="' . $SelectedTabs . '" />';
+ echo '<input type=hidden name="SelectedIndex" value="' . $SelectedIndex. '" />';
+ echo '<input type=hidden name="CurrentAmount" value="' . $Amount[0]. '" />';
+ echo '<input type=hidden name="Days" value="' . $Days . '" />';
}
/* Ricard: needs revision of this date initialization */
Modified: trunk/SelectCompletedOrder.php
===================================================================
--- trunk/SelectCompletedOrder.php 2011-11-24 09:10:21 UTC (rev 4752)
+++ trunk/SelectCompletedOrder.php 2011-11-26 07:58:19 UTC (rev 4753)
@@ -235,68 +235,35 @@
//figure out the SQL required from the inputs available
if (isset($OrderNumber)) {
- if (isset($SelectedCustomer)) {
- $SQL = "SELECT salesorders.orderno,
- debtorsmaster.name,
- custbranch.brname,
- salesorders.customerref,
- salesorders.orddate,
- salesorders.deliverydate,
- salesorders.deliverto,
- currencies.decimalplaces AS currdecimalplaces, SUM(salesorderdetails.unitprice*salesorderdetails.quantity*(1-salesorderdetails.discountpercent)) AS ordervalue
- FROM salesorders INNER JOIN salesorderdetails
- ON salesorders.orderno = salesorderdetails.orderno
- INNER JOIN debtorsmaster
- ON salesorders.debtorno = debtorsmaster.debtorno
- INNER JOIN custbranch
- ON salesorders.branchcode = custbranch.branchcode
- AND salesorders.debtorno = custbranch.debtorno
- INNER JOIN currencies
- ON debtorsmaster.currcode = currencies.currabrev
- WHERE salesorders.debtorno='" . $SelectedCustomer ."'
- AND salesorders.orderno='". $OrderNumber ."'
- AND salesorders.quotation=0
- AND salesorderdetails.completed".$Completed."
- GROUP BY salesorders.orderno,
- debtorsmaster.name,
- custbranch.brname,
- salesorders.customerref,
- salesorders.orddate,
- salesorders.deliverydate,
- currencies.decimalplaces,
- salesorders.deliverto
- ORDER BY salesorders.orderno";
- } else { //Set order number and SelectedCustomer not set
- $SQL = "SELECT salesorders.orderno,
- debtorsmaster.name,
- custbranch.brname,
- salesorders.customerref,
- salesorders.orddate,
- salesorders.deliverydate,
- salesorders.deliverto,
- currencies.decimalplaces AS currdecimalplaces, SUM(salesorderdetails.unitprice*salesorderdetails.quantity*(1-salesorderdetails.discountpercent)) AS ordervalue
- FROM salesorders INNER JOIN salesorderdetails
- ON salesorders.orderno = salesorderdetails.orderno
- INNER JOIN debtorsmaster
- ON salesorders.debtorno = debtorsmaster.debtorno
- INNER JOIN custbranch
- ON salesorders.branchcode = custbranch.branchcode
- AND salesorders.debtorno = custbranch.debtorno
- INNER JOIN currencies
- ON debtorsmaster.currcode = currencies.currabrev
- WHERE salesorders.orderno='". $OrderNumber ."'
- AND salesorders.quotation=0
- AND salesorderdetails.completed " . $Completed ."
- GROUP BY salesorders.orderno,
- debtorsmaster.name,
- currencies.decimalplaces,
- custbranch.brname,
- salesorders.customerref,
- salesorders.orddate,
- salesorders.deliverydate,
- salesorders.deliverto
- ORDER BY salesorders.orderno";
- }
+ $SQL = "SELECT salesorders.orderno,
+ debtorsmaster.name,
+ custbranch.brname,
+ salesorders.customerref,
+ salesorders.orddate,
+ salesorders.deliverydate,
+ salesorders.deliverto,
+ currencies.decimalplaces AS currdecimalplaces, SUM(salesorderdetails.unitprice*salesorderdetails.quantity*(1-salesorderdetails.discountpercent)) AS ordervalue
+ FROM salesorders INNER JOIN salesorderdetails
+ ON salesorders.orderno = salesorderdetails.orderno
+ INNER JOIN debtorsmaster
+ ON salesorders.debtorno = debtorsmaster.debtorno
+ INNER JOIN custbranch
+ ON salesorders.branchcode = custbranch.branchcode
+ AND salesorders.debtorno = custbranch.debtorno
+ INNER JOIN currencies
+ ON debtorsmaster.currcode = currencies.currabrev
+ WHERE salesorders.orderno='". $OrderNumber ."'
+ AND salesorders.quotation=0
+ AND salesorderdetails.completed " . $Completed ."
+ GROUP BY salesorders.orderno,
+ debtorsmaster.name,
+ currencies.decimalplaces,
+ custbranch.brname,
+ salesorders.customerref,
+ salesorders.orddate,
+ salesorders.deliverydate,
+ salesorders.deliverto
+ ORDER BY salesorders.orderno";
} elseif (isset($CustomerRef)) {
if (isset($SelectedCustomer)) {
$SQL = "SELECT salesorders.orderno,
Modified: trunk/StockCostUpdate.php
===================================================================
--- trunk/StockCostUpdate.php 2011-11-24 09:10:21 UTC (rev 4752)
+++ trunk/StockCostUpdate.php 2011-11-26 07:58:19 UTC (rev 4753)
@@ -186,7 +186,7 @@
<br />';
}
if ($myrow['mbflag']!='D'){
- echo '<div class="centre"><a href="' . $rootpath . '/StockStatus.php?StockID=' . $StockID . '>' . _('Show Stock Status') . '</a>';
+ echo '<div class="centre"><a href="' . $rootpath . '/StockStatus.php?StockID=' . $StockID . '">' . _('Show Stock Status') . '</a>';
echo '<br /><a href="' . $rootpath . '/StockMovements.php?StockID=' . $StockID . '">' . _('Show Stock Movements') . '</a>';
echo '<br /><a href="' . $rootpath . '/StockUsage.php?StockID=' . $StockID . '">' . _('Show Stock Usage') .'</a>';
echo '<br /><a href="' . $rootpath . '/SelectSalesOrder.php?SelectedStockItem=' . $StockID . '">' . _('Search Outstanding Sales Orders') . '</a>';
Modified: trunk/SuppInvGRNs.php
===================================================================
--- trunk/SuppInvGRNs.php 2011-11-24 09:10:21 UTC (rev 4752)
+++ trunk/SuppInvGRNs.php 2011-11-26 07:58:19 UTC (rev 4753)
@@ -62,6 +62,9 @@
} else {
$Complete = False;
}
+
+ /* It is not logical to allow being charged for more than was received - and doing so would leave the goods received suspense account out of balance */
+ /*
if ($_SESSION['Check_Qty_Charged_vs_Del_Qty']==True) {
if ((filter_number_format($_POST['This_QuantityInv'])+ $_POST['Prev_QuantityInv'])/($_POST['QtyRecd'] ) > (1+ ($_SESSION['OverChargeProportion'] / 100))){
prnMsg(_('The quantity being invoiced is more than the outstanding quantity by more than') . ' ' . $_SESSION['OverChargeProportion'] . ' ' .
@@ -69,6 +72,11 @@
$Hold = True;
}
}
+ */
+ if (filter_number_format($_POST['This_QuantityInv'])+$_POST['Prev_QuantityInv']-$_POST['QtyRecd'] > 0){
+ prnMsg(_('The quantity being invoiced is more than the outstanding quantity that was delivered. It is not possible to enter an invoice for a quantity more than was received into stock'),'warn');
+ $InputError = True;
+ }
if (!is_numeric(filter_number_format($_POST['ChgPrice'])) AND filter_number_format($_POST['ChgPrice'])<0){
$InputError = True;
prnMsg(_('The price charged in the suppliers currency is either not numeric or negative') . '. ' . _('The goods received cannot be invoiced at this price'),'error');
Modified: trunk/SupplierInvoice.php
===================================================================
--- trunk/SupplierInvoice.php 2011-11-24 09:10:21 UTC (rev 4752)
+++ trunk/SupplierInvoice.php 2011-11-26 07:58:19 UTC (rev 4753)
@@ -16,8 +16,6 @@
include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
-//this is available from the menu on this page already
-//echo "<a href='" . $rootpath . '/SelectSupplier.php?' . SID . "'>" . _('Back to Suppliers') . '</a><br />';
if (!isset($_SESSION['SuppTrans']->SupplierName)) {
$sql="SELECT suppname FROM suppliers WHERE supplierid='" . $_GET['SupplierID'] . "'";
@@ -723,7 +721,7 @@
'" . $SQLInvoiceDate . "',
'" . $PeriodNo . "',
'" . $EnteredGLCode->GLCode . "',
- '" . DB_escape_string($_SESSION['SuppTrans']->SupplierID . ' ' . $EnteredGLCode->Narrative) . "',
+ '" . $_SESSION['SuppTrans']->SupplierID . ' ' . $EnteredGLCode->Narrative . "',
'" . $EnteredGLCode->Amount/ $_SESSION['SuppTrans']->ExRate ."')";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The general ledger transaction could not be added because');
@@ -751,7 +749,7 @@
'" . $SQLInvoiceDate . "',
'" . $PeriodNo . "',
'" . $_SESSION['SuppTrans']->GRNAct . "',
- '" . DB_escape_string($_SESSION['SuppTrans']->SupplierID . ' ' . _('Shipment charge against') . ' ' . $ShiptChg->ShiptRef) . "',
+ '" . $_SESSION['SuppTrans']->SupplierID . ' ' . _('Shipment charge against') . ' ' . $ShiptChg->ShiptRef . "',
'" . $ShiptChg->Amount/ $_SESSION['SuppTrans']->ExRate . "')";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The general ledger transaction for the shipment') .
@@ -779,7 +777,7 @@
'" . $SQLInvoiceDate . "',
'" . $PeriodNo . "',
'". $AssetAddition->CostAct . "',
- '" . DB_escape_string($_SESSION['SuppTrans']->SupplierID . ' ' . _('Asset Addition') . ' ' . $AssetAddition->AssetID . ': ' . $AssetAddition->Description) . "',
+ '" . $_SESSION['SuppTrans']->SupplierID . ' ' . _('Asset Addition') . ' ' . $AssetAddition->AssetID . ': ' . $AssetAddition->Description . "',
'" . ($AssetAddition->Amount/ $_SESSION['SuppTrans']->ExRate) . "')";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The general ledger transaction for the asset addition could not be added because');
$DbgMsg = _('The following SQL to insert the GL transaction was used');
@@ -842,8 +840,8 @@
'" . $SQLInvoiceDate . "',
'" . $PeriodNo . "',
'" . $_SESSION['SuppTrans']->GRNAct . "',
- '" . DB_escape_string($_SESSION['SuppTrans']->SupplierID . ' - ' . _('GRN') . ' ' . $EnteredGRN->GRNNo . ' - ' . $EnteredGRN->ItemCode . ' x ' . $EnteredGRN->This_QuantityInv . ' @ ' .
- _('std cost of') . ' ' . $EnteredGRN->StdCostUnit) . "',
+ '" . $_SESSION['SuppTrans']->SupplierID . ' - ' . _('GRN') . ' ' . $EnteredGRN->GRNNo . ' - ' . $EnteredGRN->ItemCode . ' x ' . $EnteredGRN->This_QuantityInv . ' @ ' .
+ _('std cost of') . ' ' . $EnteredGRN->StdCostUnit . "',
'" . ($EnteredGRN->StdCostUnit * $EnteredGRN->This_QuantityInv) . "')";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The general ledger transaction could not be added because');
@@ -892,10 +890,11 @@
if ($EnteredGRN->This_QuantityInv > $TotalQuantityOnHand){
/*So we need to write off some of the variance to variances and only the balance of the quantity in stock to go to stock value */
-
- $WriteOffToVariances = ($EnteredGRN->This_QuantityInv - $TotalQuantityOnHand)
- * (($EnteredGRN->ChgPrice / $_SESSION['SuppTrans']->ExRate) - $EnteredGRN->StdCostUnit);
-
+
+ /*if the TotalQuantityOnHand is negative then this variance to write off is inflated by the negative quantity - which makes sense */
+
+ $WriteOffToVariances = ($EnteredGRN->This_QuantityInv - $TotalQuantityOnHand) * (($EnteredGRN->ChgPrice / $_SESSION['SuppTrans']->ExRate) - $EnteredGRN->StdCostUnit);
+
$SQL = "INSERT INTO gltrans (type,
typeno,
trandate,
@@ -916,7 +915,63 @@
$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 */
$SQL = "INSERT INTO gltrans (type,
@@ -933,7 +988,7 @@
'" . $StockGLCode['stockact'] . "',
'" . $_SESSION['SuppTrans']->SupplierID . ' - ' . _('Average Cost Adj') .
' - ' . $EnteredGRN->ItemCode . ' x ' . $TotalQuantityOnHand . ' x ' .
- round(($EnteredGRN->ChgPrice / $_SESSION['SuppTrans']->ExRate) - $EnteredGRN->StdCostUnit,2) . "',
+ round(($EnteredGRN->ChgPrice / $_SESSION['SuppTrans']->ExRate) - $EnteredGRN->StdCostUnit,$_SESSION['CompanyRecord']['decimalplaces']) . "',
'" . ($PurchPriceVar - $WriteOffToVariances) . "')";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The general ledger transaction could not be added for the price variance of the stock item because');
@@ -959,7 +1014,8 @@
materialcost=materialcost+" . $CostIncrement . "
WHERE stockid='" . $EnteredGRN->ItemCode . "'";
$Result = DB_query($sql, $db, $ErrMsg, $DbgMsg, True);
- } else {
+ } 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 . "'";
@@ -1109,6 +1165,8 @@
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The general ledger transaction for the control total could not be added because');
$DbgMsg = _('The following SQL to insert the GL transaction was used');
$Result = DB_query($SQL, $db, $ErrMsg, $DbgMsg, True);
+
+ EnsureGLEntriesBalance(20, $InvoiceNo, $db);
} /*Thats the end of the GL postings */
/*Now insert the invoice into the SuppTrans table*/
@@ -1276,7 +1334,7 @@
'20',
'" . $InvoiceNo . "',
'" . $Contract->Amount/ $_SESSION['SuppTrans']->ExRate . "',
- '" . DB_escape_string($Contract->Narrative) . "',
+ '" . $Contract->Narrative . "',
'" . $Anticipated . "')";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The contract charge record for contract') . ' ' . $Contract->ContractRef . ' ' . _('could not be added because');
Added: trunk/css/aguapop/images/allocation.gif
===================================================================
(Binary files differ)
Property changes on: trunk/css/aguapop/images/allocation.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/css/aguapop/images/bank.gif
===================================================================
(Binary files differ)
Property changes on: trunk/css/aguapop/images/bank.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/css/aguapop/images/credit.gif
===================================================================
(Binary files differ)
Property changes on: trunk/css/aguapop/images/credit.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/css/aguapop/images/email.gif
===================================================================
(Binary files differ)
Property changes on: trunk/css/aguapop/images/email.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/css/aguapop/images/folders.gif
===================================================================
(Binary files differ)
Property changes on: trunk/css/aguapop/images/folders.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/css/aguapop/images/inventory.gif
===================================================================
(Binary files differ)
Property changes on: trunk/css/aguapop/images/inventory.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/css/aguapop/images/maintenance.gif
===================================================================
(Binary files differ)
Property changes on: trunk/css/aguapop/images/maintenance.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/css/aguapop/images/preview.gif
===================================================================
(Binary files differ)
Property changes on: trunk/css/aguapop/images/preview.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/css/aguapop/images/reports.gif
===================================================================
(Binary files differ)
Property changes on: trunk/css/aguapop/images/reports.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/css/aguapop/images/transactions.gif
===================================================================
(Binary files differ)
Property changes on: trunk/css/aguapop/images/transactions.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/doc/README.txt
===================================================================
--- trunk/doc/README.txt 2011-11-24 09:10:21 UTC (rev 4752)
+++ trunk/doc/README.txt 2011-11-26 07:58:19 UTC (rev 4753)
@@ -22,6 +22,8 @@
6. A significant push has been made to try to reduce the number of bugs, with a great deal of testing from all quarters.
+7. Numbers can now be entered in the language format the user has selected and all numbers now display in the users language format - as of version 4.06.1
+
The change log shows descriptions and dates of all changes made.
Installation instructions are in the file INSTALL.txt in the doc directory. It is important to read the INSTALL.txt file in its entirety before proceeding. A printout is recommended.
Modified: trunk/includes/ConnectDB_mysqli.inc
===================================================================
--- trunk/includes/ConnectDB_mysqli.inc 2011-11-24 09:10:21 UTC (rev 4752)
+++ trunk/includes/ConnectDB_mysqli.inc 2011-11-26 07:58:19 UTC (rev 4753)
@@ -69,11 +69,6 @@
global $debug;
global $PathPrefix;
-/* PeterMoulding.com
-20071102 Change from mysql to mysqli;
- $result=mysql_query($SQL,$Conn);
-*/
-
$result=mysqli_query($Conn, $SQL);
$_SESSION['LastInsertId'] = mysqli_insert_id($Conn);
Modified: trunk/includes/SQL_CommonFunctions.inc
===================================================================
--- trunk/includes/SQL_CommonFunctions.inc 2011-11-24 09:10:21 UTC (rev 4752)
+++ trunk/includes/SQL_CommonFunctions.inc 2011-11-26 07:58:19 UTC (rev 4753)
@@ -141,10 +141,9 @@
$sql = "SELECT SUM(salesorderdetails.unitprice *
(salesorderdetails.quantity - salesorderdetails.qtyinvoiced) *
(1 - salesorderdetails.discountpercent)) AS ordervalue
- FROM salesorders,
- salesorderdetails
- WHERE salesorders.orderno = salesorderdetails.orderno
- AND salesorders.debtorno = '" . $DebtorNo . "'
+ FROM salesorders INNER JOIN salesorderdetails
+ ON salesorders.orderno = salesorderdetails.orderno
+ WHERE salesorders.debtorno = '" . $DebtorNo . "'
AND salesorderdetails.completed = 0
AND salesorders.quotation = 0";
@@ -154,7 +153,7 @@
$myrow = DB_fetch_array($GetOSOrdersResult);
$CreditAvailable -= $myrow['ordervalue'];
- Return $CreditAvailable;
+ return $CreditAvailable;
}
function ItemCostUpdateGL($db, $StockID, $NewCost, $OldCost, $QOH) {
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-11-24 09:10:21 UTC (rev 4752)
+++ trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po 2011-11-26 07:58:19 UTC (rev 4753)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: webERP 3.08\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-13 10:46+1300\n"
+"POT-Creation-Date: 2011-11-19 17:05+1300\n"
"PO-Revision-Date: 2011-02-07 15:33+0000\n"
"Last-Translator: Tim Schofield <Unknown>\n"
"Language-Team: Czech <cs...@li...>\n"
@@ -202,12 +202,12 @@
#: AccountGroups.php:223 AccountSections.php:175 AddCustomerContacts.php:25
#: AddCustomerContacts.php:28 AddCustomerNotes.php:103
-#: AddCustomerTypeNotes.php:97 AgedDebtors.php:451 AgedSuppliers.php:278
+#: AddCustomerTypeNotes.php:97 AgedDebtors.php:450 AgedSuppliers.php:278
#: Areas.php:144 AuditTrail.php:11 BankReconciliation.php:13
#: BOMExtendedQty.php:261 BOMIndented.php:246 BOMIndentedReverse.php:235
#: BOMInquiry.php:187 BOMListing.php:109 BOMs.php:213 BOMs.php:832
-#: COGSGLPostings.php:18 CompanyPreferences.php:153 CounterSales.php:2014
-#: CounterSales.php:2140 Credit_Invoice.php:255 CreditStatus.php:21
+#: COGSGLPostings.php:18 CompanyPreferences.php:153 CounterSales.php:2025
+#: CounterSales.php:2151 Credit_Invoice.php:255 CreditStatus.php:21
#: Currencies.php:28 CustEDISetup.php:17 DailyBankTransactions.php:11
#: DebtorsAtPeriodEnd.php:125 DiscountCategories.php:10
#: DiscountCategories.php:131 DiscountMatrix.php:16 EDIMessageFormat.php:104
@@ -221,14 +221,14 @@
#: 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
-#: Prices_Customer.php:34 Prices.php:30 PurchData.php:137 PurchData.php:258
+#: 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
#: SalesGraph.php:34 SalesPeople.php:20 SalesTypes.php:20 SelectAsset.php:45
#: SelectCompletedOrder.php:11 SelectContract.php:78 SelectCreditItems.php:215
#: SelectCreditItems.php:286 SelectCustomer.php:260 SelectGLAccount.php:17
-#: SelectGLAccount.php:77 SelectOrderItems.php:575 SelectOrderItems.php:1468
-#: SelectOrderItems.php:1592 SelectProduct.php:496 SelectSalesOrder.php:533
+#: SelectGLAccount.php:77 SelectOrderItems.php:577 SelectOrderItems.php:1479
+#: 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
@@ -269,8 +269,8 @@
#: CompanyPreferences.php:476 CompanyPreferences.php:478
#: CompanyPreferences.php:491 CompanyPreferences.php:493
#: CompanyPreferences.php:506 CompanyPreferences.php:508
-#: ContractCosting.php:198 CustomerBranches.php:410 Customers.php:577
-#: Customers.php:925 Customers.php:934 Customers.php:937
+#: ContractCosting.php:198 CustomerBranches.php:410 Customers.php:593
+#: Customers.php:941 Customers.php:950 Customers.php:953
#: DeliveryDetails.php:1079 DeliveryDetails.php:1118 DeliveryDetails.php:1121
#: GLTransInquiry.php:69 MRPCalendar.php:224 MRP.php:529 MRP.php:533
#: MRP.php:537 MRP.php:541 PaymentMethods.php:197 PaymentMethods.php:198
@@ -304,8 +304,8 @@
#: BOMs.php:749 CompanyPreferences.php:475 CompanyPreferences.php:479
#: CompanyPreferences.php:490 CompanyPreferences.php:494
#: CompanyPreferences.php:505 CompanyPreferences.php:509
-#: ContractCosting.php:196 CustomerBranches.php:410 Customers.php:576
-#: Customers.php:920 Customers.php:933 Customers.php:936
+#: ContractCosting.php:196 CustomerBranches.php:410 Customers.php:592
+#: Customers.php:936 Customers.php:949 Customers.php:952
#: DeliveryDetails.php:1080 DeliveryDetails.php:1119 DeliveryDetails.php:1122
#: GLTransInquiry.php:86 MRPCalendar.php:226 MRP.php:527 MRP.php:531
#: MRP.php:535 MRP.php:539 PaymentMethods.php:197 PaymentMethods.php:198
@@ -338,14 +338,14 @@
#: AddCustomerNotes.php:141 AddCustomerTypeNotes.php:128 Areas.php:164
#: BankAccounts.php:223 BOMs.php:149 COGSGLPostings.php:108
#: COGSGLPostings.php:206 CreditStatus.php:174 Currencies.php:272
-#: CustomerBranches.php:414 Customers.php:1011 Customers.php:1045
+#: CustomerBranches.php:414 Customers.php:1027 Customers.php:1061
#: CustomerTypes.php:202 EDIMessageFormat.php:150 Factors.php:329
#: FixedAssetCategories.php:186 FixedAssetLocations.php:107
#: FreightCosts.php:240 GeocodeSetup.php:173 GLAccounts.php:312 GLTags.php:91
#: Labels.php:411 Locations.php:382 MRPDemands.php:306 MRPDemandTypes.php:120
#: 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:277
+#: PcTypeTabs.php:172 PO_AuthorisationLevels.php:151 Prices_Customer.php:278
#: Prices.php:251 PurchData.php:204 SalesCategories.php:255
#: SalesGLPostings.php:132 SalesGLPostings.php:245 SalesPeople.php:232
#: SalesTypes.php:206 SecurityTokens.php:128 SelectCustomer.php:612
@@ -369,8 +369,8 @@
#: AddCustomerNotes.php:142 AddCustomerTypeNotes.php:129 Areas.php:165
#: BankAccounts.php:224 BOMs.php:151 COGSGLPostings.php:109
#: COGSGLPostings.php:207 ContractBOM.php:266 ContractOtherReqts.php:119
-#: CounterSales.php:813 Credit_Invoice.php:381 CreditStatus.php:175
-#: Currencies.php:275 CustomerReceipt.php:918 Customers.php:1046
+#: CounterSales.php:821 Credit_Invoice.php:381 CreditStatus.php:175
+#: Currencies.php:275 CustomerReceipt.php:918 Customers.php:1062
#: CustomerTypes.php:203 DiscountCategories.php:219 DiscountMatrix.php:182
#: EDIMessageFormat.php:151 FixedAssetCategories.php:187 FreightCosts.php:241
#: GeocodeSetup.php:174 GLAccounts.php:313 GLJournal.php:427 GLTags.php:92
@@ -378,13 +378,13 @@
#: 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:278
+#: PO_AuthorisationLevels.php:153 PO_Items.php:711 Prices_Customer.php:279
#: Prices.php:252 PurchData.php:205 SalesAnalReptCols.php:299
#: SalesAnalRepts.php:303 SalesCategories.php:256 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:1387
+#: 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
@@ -444,7 +444,7 @@
#: FreightCosts.php:339 GeocodeSetup.php:270 GLAccounts.php:262
#: Locations.php:597 MRPDemands.php:419 MRPDemandTypes.php:187
#: OffersReceived.php:56 OffersReceived.php:143 PaymentMethods.php:282
-#: PaymentTerms.php:309 PO_AuthorisationLevels.php:248 Prices_Customer.php:354
+#: 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
#: SupplierContacts.php:281 SuppLoginSetup.php:293 TaxAuthorities.php:327
@@ -575,7 +575,7 @@
msgstr "Kontakt záznam byl odstraněn"
#: AddCustomerContacts.php:128 CompanyPreferences.php:223
-#: CustomerBranches.php:368 Customers.php:998 Customers.php:1006
+#: CustomerBranches.php:368 Customers.php:1014 Customers.php:1022
#: SalesPeople.php:200 SelectCustomer.php:607 StockDispatch.php:187
#: StockDispatch.php:199 SupplierContacts.php:150 SuppTransGLAnalysis.php:105
#: includes/InputSerialItemsFile.php:84 includes/InputSerialItemsFile.php:124
@@ -583,8 +583,8 @@
msgid "Name"
msgstr "Název"
-#: AddCustomerContacts.php:129 AddCustomerContacts.php:223 Customers.php:999
-#: Customers.php:1007 SelectCustomer.php:608 WWW_Access.php:107
+#: AddCustomerContacts.php:129 AddCustomerContacts.php:223 Customers.php:1015
+#: Customers.php:1023 SelectCustomer.php:608 WWW_Access.php:107
#: WWW_Access.php:169
msgid "Role"
msgstr "Roli"
@@ -595,7 +595,7 @@
#: AddCustomerContacts.php:131 AddCustomerContacts.php:240
#: CustomerBranches.php:374 CustomerBranches.php:774 CustomerInquiry.php:253
-#: Customers.php:1001 Customers.php:1009 EmailCustTrans.php:15
+#: 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
@@ -609,8 +609,8 @@
msgid "Email"
msgstr "E-mail"
-#: AddCustomerContacts.php:132 AddCustomerContacts.php:249 Customers.php:1002
-#: Customers.php:1010 PcAssignCashToTab.php:224 PcAssignCashToTab.php:353
+#: AddCustomerContacts.php:132 AddCustomerContacts.php:249 Customers.php:1018
+#: 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
@@ -636,7 +636,7 @@
#: AddCustomerContacts.php:231 Contracts.php:775 PDFRemittanceAdvice.php:239
#: PO_Header.php:986 PO_Header.php:1067 SelectCreditItems.php:241
-#: SelectCustomer.php:417 SelectOrderItems.php:604
+#: SelectCustomer.php:417 SelectOrderItems.php:606
#: includes/PDFStatementPageHeader.inc:63 includes/PDFTransPageHeader.inc:81
#: includes/PDFTransPageHeaderPortrait.inc:105
msgid "Phone"
@@ -699,14 +699,15 @@
msgstr "Datum"
#: AddCustomerNotes.php:122 AddCustomerTypeNotes.php:109 PcReportTab.php:173
-#: Stocks.php:1019 UpgradeDatabase.php:174 UpgradeDatabase.php:177
-#: UpgradeDatabase.php:180 UpgradeDatabase.php:183 UpgradeDatabase.php:186
-#: UpgradeDatabase.php:189 UpgradeDatabase.php:192 UpgradeDatabase.php:195
-#: 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 Z_Upgrade_3.11-4.00.php:70
-#: Z_Upgrade_3.11-4.00.php:74 Z_Upgrade_3.11-4.00.php:78
+#: 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
+#: 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
+#: Z_Upgrade_3.11-4.00.php:70 Z_Upgrade_3.11-4.00.php:74
+#: Z_Upgrade_3.11-4.00.php:78
msgid "Note"
msgstr "Poznámka:"
@@ -789,11 +790,11 @@
msgid "Aged Customer Balances"
msgstr "Zákazník ve věku Váhy"
-#: AgedDebtors.php:270 AgedDebtors.php:369 AgedDebtors.php:434
+#: AgedDebtors.php:269 AgedDebtors.php:368 AgedDebtors.php:433
msgid "Aged Customer Account Analysis"
msgstr "Ve věku od zákaznického účtu analýza"
-#: AgedDebtors.php:270 AgedDebtors.php:369 AgedDebtors.php:434
+#: AgedDebtors.php:269 AgedDebtors.php:368 AgedDebtors.php:433
#: AgedSuppliers.php:111 BOMExtendedQty.php:149 BOMIndented.php:150
#: BOMIndentedReverse.php:140 BOMListing.php:41 BOMListing.php:52
#: DebtorsAtPeriodEnd.php:57 DebtorsAtPeriodEnd.php:69 GLBalanceSheet.php:100
@@ -817,12 +818,12 @@
msgid "Problem Report"
msgstr "Problém"
-#: AgedDebtors.php:272 CustomerInquiry.php:85 CustomerInquiry.php:109
+#: AgedDebtors.php:271 CustomerInquiry.php:85 CustomerInquiry.php:109
#: DebtorsAtPeriodEnd.php:59
msgid "The customer details could not be retrieved by the SQL because"
msgstr "Zákazník podrobnosti se nepodařilo získat do SQL, protože"
-#: AgedDebtors.php:273 AgedDebtors.php:372 AgedDebtors.php:437
+#: AgedDebtors.php:272 AgedDebtors.php:371 AgedDebtors.php:436
#: AgedSuppliers.php:114 AgedSuppliers.php:199 BOMExtendedQty.php:152
#: BOMExtendedQty.php:248 BOMIndented.php:153 BOMIndented.php:234
#: BOMIndentedReverse.php:144 BOMIndentedReverse.php:221 BOMListing.php:44
@@ -873,11 +874,11 @@
msgid "Back to the menu"
msgstr "Zpět do menu"
-#: AgedDebtors.php:371
+#: AgedDebtors.php:370
msgid "The details of outstanding transactions for customer"
msgstr "Podrobnosti o nesplacených transakcí pro zákazníka"
-#: AgedDebtors.php:371 AgedSuppliers.php:198 GLAccountCSV.php:168
+#: 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
@@ -885,10 +886,10 @@
msgid "could not be retrieved because"
msgstr "se nepodařilo získat, protože"
-#: AgedDebtors.php:374 AgedSuppliers.php:201 Areas.php:95
-#: ConfirmDispatch_Invoice.php:152 ConfirmDispatch_Invoice.php:959
-#: ConfirmDispatch_Invoice.php:973 Contracts.php:580 CounterSales.php:1354
-#: CounterSales.php:1368 Credit_Invoice.php:697 Credit_Invoice.php:718
+#: 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
+#: 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
#: GLTagProfit_Loss.php:511 Payments.php:334 PDFRemittanceAdvice.php:85
@@ -913,66 +914,66 @@
msgid "The SQL that failed was"
msgstr "SQL příkaz, který selhal, byl"
-#: AgedDebtors.php:436
+#: AgedDebtors.php:435
#, fuzzy
msgid ""
"There are no customers meeting the criteria specified with balances to list"
msgstr "Nejsou žádné zákazníky, splňující kritéria uvedená na seznamu"
-#: AgedDebtors.php:447
+#: AgedDebtors.php:446
msgid "Aged Debtor Analysis"
msgstr "Ve věku dlužníka analýza"
-#: AgedDebtors.php:461 DebtorsAtPeriodEnd.php:137
+#: AgedDebtors.php:460 DebtorsAtPeriodEnd.php:137
msgid "From Customer Code"
msgstr "Od kódu zákazníka"
-#: AgedDebtors.php:465 DebtorsAtPeriodEnd.php:141
+#: AgedDebtors.php:464 DebtorsAtPeriodEnd.php:141
msgid "To Customer Code"
msgstr "Do kódu zákazníka"
-#: AgedDebtors.php:469 AgedSuppliers.php:296
+#: AgedDebtors.php:468 AgedSuppliers.php:296
msgid "All balances or overdues only"
msgstr "Všechny zůstatky nebo overdues pouze"
-#: AgedDebtors.php:471
+#: AgedDebtors.php:470
msgid "All customers with balances"
msgstr "Všichni zákazníci s bilancí"
-#: AgedDebtors.php:472 AgedSuppliers.php:299
+#: AgedDebtors.php:471 AgedSuppliers.php:299
msgid "Overdue accounts only"
msgstr "Po lhůtě splatnosti účtů"
-#: AgedDebtors.php:473
+#: AgedDebtors.php:472
msgid "Held accounts only"
msgstr "Účtů, pouze"
-#: AgedDebtors.php:478
+#: AgedDebtors.php:477
msgid "Only Show Customers Of"
msgstr "Zobrazit jen zákazníky"
-#: AgedDebtors.php:484
+#: AgedDebtors.php:483
#, fuzzy
msgid "All Sales people"
msgstr "Všechny Prodejci"
-#: AgedDebtors.php:491
+#: AgedDebtors.php:490
msgid "Only show customers trading in"
msgstr "Zobrazovat pouze zákazníkům obchodování"
-#: AgedDebtors.php:507
+#: AgedDebtors.php:506
msgid "Summary or detailed report"
msgstr "Souhrn nebo podrobné zprávy"
-#: AgedDebtors.php:509 AgedSuppliers.php:321 InventoryValuation.php:261
+#: AgedDebtors.php:508 AgedSuppliers.php:321 InventoryValuation.php:261
msgid "Summary Report"
msgstr "Souhrnná zpráva"
-#: AgedDebtors.php:510 AgedSuppliers.php:322 InventoryValuation.php:262
+#: AgedDebtors.php:509 AgedSuppliers.php:322 InventoryValuation.php:262
msgid "Detailed Report"
msgstr "Podrobná zpráva"
-#: AgedDebtors.php:517 AgedSuppliers.php:328 BOMExtendedQty.php:295
+#: AgedDebtors.php:516 AgedSuppliers.php:328 BOMExtendedQty.php:295
#: BOMIndented.php:276 BOMIndentedReverse.php:255 BOMListing.php:129
#: DebtorsAtPeriodEnd.php:163 InventoryPlanning.php:445
#: InventoryPlanningPrefSupplier.php:516 InventoryQuantities.php:209
@@ -1156,7 +1157,7 @@
msgstr "ID uživatele"
#: AuditTrail.php:49 AuditTrail.php:62 ContractBOM.php:298
-#: CounterSales.php:2146 CounterSales.php:2149 CustomerTransInquiry.php:31
+#: CounterSales.php:2157 CounterSales.php:2160 CustomerTransInquiry.php:31
#: DailySalesInquiry.php:47 DailySalesInquiry.php:49 FixedAssetRegister.php:56
#: FixedAssetRegister.php:65 InventoryQuantities.php:167
#: InventoryQuantities.php:193 InventoryQuantities.php:195 MRP.php:585
@@ -1167,7 +1168,7 @@
#: ReorderLevel.php:215 SalesGraph.php:97 SalesGraph.php:99 SalesGraph.php:119
#: SalesGraph.php:121 SalesGraph.php:143 SalesGraph.php:145 SalesGraph.php:179
#: SalesInquiry.php:1078 SalesInquiry.php:1141 SelectCreditItems.php:952
-#: SelectOrderItems.php:1598 SelectOrderItems.php:1601 SelectProduct.php:504
+#: SelectOrderItems.php:1609 SelectOrderItems.php:1612 SelectProduct.php:504
#: SelectProduct.php:506 StockDispatch.php:298 StockDispatch.php:300
#: StockLocStatus.php:69 StockLocStatus.php:71 StockLocStatus.php:89
#: StockLocStatus.php:93 StockLocStatus.php:97 StockQuantityByDate.php:24
@@ -1526,7 +1527,7 @@
msgid "from"
msgstr "od"
-#: BankMatching.php:120 ConfirmDispatchControlled_Invoice.php:60
+#: BankMatching.php:120 ConfirmDispatchControlled_Invoice.php:68
#: EmailCustTrans.php:63 FixedAssetRegister.php:78 FTP_RadioBeacon.php:280
#: GLAccountCSV.php:171 GLAccountReport.php:103 Payments.php:733
#: PcReportTab.php:102 PDFChequeListing.php:114 PDFChequeListing.php:124
@@ -1640,7 +1641,7 @@
msgid "Ref"
msgstr "Ref"
-#: BankMatching.php:264 ConfirmDispatch_Invoice.php:276 Credit_Invoice.php:279
+#: BankMatching.php:264 ConfirmDispatch_Invoice.php:284 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
@@ -1848,8 +1849,8 @@
"zůstatek na účtu. Je důležité, že směnný kurz výše odráží současnou hodnotu "
"měny bankovního účtu"
-#: BankReconciliation.php:354 CounterSales.php:813 Customers.php:1075
-#: SelectOrderItems.php:1398 Stocks.php:1204 WorkOrderCosting.php:540
+#: BankReconciliation.php:354 CounterSales.php:821 Customers.php:1091
+#: SelectOrderItems.php:1409 Stocks.php:1204 WorkOrderCosting.php:540
#: WorkOrderEntry.php:569
msgid "Are You Sure?"
msgstr "Opravdu provést?"
@@ -1916,8 +1917,8 @@
#: BOMIndentedReverse.php:295 BOMInquiry.php:200 BOMs.php:532 BOMs.php:709
#: ContractBOM.php:237 ContractBOM.php:349 ContractCosting.php:81
#: ContractCosting.php:87 ContractCosting.php:152 ContractOtherReqts.php:94
-#: Contracts.php:961 Contracts.php:997 CounterSales.php:733
-#: CounterSales.php:2025 CounterSales.php:2210 CounterSales.php:2336
+#: Contracts.php:961 Contracts.php:997 CounterSales.php:741
+#: CounterSales.php:2036 CounterSales.php:2221 CounterSales.php:2347
#: Credit_Invoice.php:273 DeliveryDetails.php:825 DeliveryDetails.php:891
#: GoodsReceived.php:100 GoodsReceived.php:104 GoodsReceived.php:107
#: InventoryPlanningPrefSupplier.php:78 InventoryQuantities.php:246
@@ -1933,16 +1934,16 @@
#: SalesAnalReptCols.php:16 SalesAnalReptCols.php:18 SalesGraph.php:188
#: SalesGraph.php:269 SalesInquiry.php:980 SalesTopItemsInquiry.php:223
#: SelectCreditItems.php:673 SelectCreditItems.php:1034
-#: SelectOrderItems.php:1322 SelectOrderItems.php:1480
-#: SelectOrderItems.php:1664 SelectOrderItems.php:1791 ShipmentCosting.php:145
+#: 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
#: 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:104
-#: includes/InputSerialItems.php:110 includes/OutputSerialItems.php:38
+#: WOSerialNos.php:295 includes/InputSerialItems.php:111
+#: includes/InputSerialItems.php:117 includes/OutputSerialItems.php:38
#: includes/OutputSerialItems.php:43 includes/OutputSerialItems.php:49
#: includes/PDFBOMListingPageHeader.inc:44
#: includes/PDFDeliveryDifferencesPageHeader.inc:43
@@ -2096,10 +2097,10 @@
msgstr "Stavět"
#: BOMExtendedQty.php:331 BOMInquiry.php:114 BOMs.php:856
-#: CounterSales.php:2021 CounterSales.php:2206 PO_SelectOSPurchOrder.php:232
+#: CounterSales.php:2032 CounterSales.php:2217 PO_SelectOSPurchOrder.php:232
#: PO_SelectPurchOrder.php:213 ReorderLevelLocation.php:70
#: ReorderLevelLocation.php:71 SelectCompletedOrder.php:584
-#: SelectOrderItems.php:1476 SelectOrderItems.php:1660
+#: SelectOrderItems.php:1487 SelectOrderItems.php:1671
#: SelectSalesOrder.php:582 SelectWorkOrder.php:193 Shipt_Select.php:191
#: TopItems.php:182 includes/PDFTopItemsHeader.inc:54
msgid "On Hand"
@@ -2168,8 +2169,8 @@
#: BOMIndented.php:312 BOMIndentedReverse.php:292 BOMInquiry.php:113
#: BOMInquiry.php:199 BOMs.php:529 BOMs.php:855 ContractBOM.php:236
-#: ContractBOM.php:346 ContractOtherReqts.php:93 CounterSales.php:2019
-#: CounterSales.php:2204 CreditStatus.php:152 CreditStatus.php:241
+#: ContractBOM.php:346 ContractOtherReqts.php:93 CounterSales.php:2030
+#: CounterSales.php:2215 CreditStatus.php:152 CreditStatus.php:241
#: EmailConfirmation.php:192 FixedAssetCategories.php:163
#: FixedAssetDepreciation.php:86 FixedAssetRegister.php:83
#: FixedAssetRegister.php:372 FixedAssetTransfer.php:50
@@ -2186,8 +2187,8 @@
#: ReverseGRN.php:385 SalesCategories.php:421 SecurityTokens.php:94
#: SecurityTokens.php:103 SecurityTokens.php:118 SelectAsset.php:243
#: SelectCompletedOrder.php:583 SelectContract.php:153
-#: SelectCreditItems.php:988 SelectOrderItems.php:1474
-#: SelectOrderItems.php:1658 SelectProduct.php:516 SelectProduct.php:733
+#: 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
@@ -2283,7 +2284,7 @@
msgstr "popis"
#: BOMInquiry.php:30 BOMs.php:839 ContractBOM.php:324 ContractBOM.php:329
-#: Contracts.php:756 Contracts.php:759 CounterSales.php:2171
+#: Contracts.php:756 Contracts.php:759 CounterSales.php:2182
#: CustomerReceipt.php:1106 CustomerReceipt.php:1109
#: DiscountCategories.php:104 DiscountCategories.php:106
#: DiscountCategories.php:110 DiscountCategories.php:112
@@ -2293,8 +2...
[truncated message content] |
