|
From: <dai...@us...> - 2012-11-03 04:34:51
|
Revision: 5735
http://sourceforge.net/p/web-erp/reponame/5735
Author: daintree
Date: 2012-11-03 04:34:48 +0000 (Sat, 03 Nov 2012)
Log Message:
-----------
Jesus Aguirre tags on purchase invoice entry + fix for CounterSales + CounterReturns.php
Modified Paths:
--------------
trunk/CounterSales.php
trunk/SuppTransGLAnalysis.php
trunk/SupplierCredit.php
trunk/SupplierInvoice.php
trunk/doc/Change.log
trunk/doc/Manual/ManualContributors.html
trunk/includes/DefineSuppTransClass.php
trunk/includes/GLPostings.inc
trunk/includes/MainMenuLinksArray.php
trunk/sql/mysql/upgrade4.09-4.10.sql
Modified: trunk/CounterSales.php
===================================================================
--- trunk/CounterSales.php 2012-11-03 00:10:51 UTC (rev 5734)
+++ trunk/CounterSales.php 2012-11-03 04:34:48 UTC (rev 5735)
@@ -732,8 +732,7 @@
} /* end of discount matrix lookup code */
-if (count($_SESSION['Items'.$identifier]->LineItems)>0
- AND !isset($_POST['ProcessSale'])){ /*only show order lines if there are any */
+if (count($_SESSION['Items'.$identifier]->LineItems)>0 ){ /*only show order lines if there are any */
/*
// *************************************************************************
// T H I S W H E R E T H E S A L E I S D I S P L A Y E D
@@ -1449,21 +1448,20 @@
qty,
standardcost,
show_on_inv_crds,
- newqoh
- ) VALUES (
- '" . $AssParts['component'] . "',
- 10,
- '" . $InvoiceNo . "',
- '" . $_SESSION['Items'.$identifier]->Location . "',
- '" . $DefaultDispatchDate . "',
- '" . $_SESSION['Items'.$identifier]->DebtorNo . "',
- '" . $_SESSION['Items'.$identifier]->Branch . "',
- '" . $PeriodNo . "',
- '" . _('Assembly') . ': ' . $OrderLine->StockID . ' ' . _('Order') . ': ' . $OrderNo . "',
- '" . -$AssParts['quantity'] * $OrderLine->Quantity . "',
- '" . $AssParts['standard'] . "',
- 0,
- newqoh-" . ($AssParts['quantity'] * $OrderLine->Quantity) . " )";
+ newqoh)
+ VALUES ('" . $AssParts['component'] . "',
+ 10,
+ '" . $InvoiceNo . "',
+ '" . $_SESSION['Items'.$identifier]->Location . "',
+ '" . $DefaultDispatchDate . "',
+ '" . $_SESSION['Items'.$identifier]->DebtorNo . "',
+ '" . $_SESSION['Items'.$identifier]->Branch . "',
+ '" . $PeriodNo . "',
+ '" . _('Assembly') . ': ' . $OrderLine->StockID . ' ' . _('Order') . ': ' . $OrderNo . "',
+ '" . -$AssParts['quantity'] * $OrderLine->Quantity . "',
+ '" . $AssParts['standard'] . "',
+ 0,
+ newqoh-" . ($AssParts['quantity'] * $OrderLine->Quantity) . " )";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('Stock movement records for the assembly components of'). ' '. $OrderLine->StockID . ' ' . _('could not be inserted because');
$DbgMsg = _('The following SQL to insert the assembly components stock movement records was used');
@@ -1671,14 +1669,14 @@
qty=qty +" . $OrderLine->Quantity . ",
disc=disc+" . ($OrderLine->DiscountPercent * $OrderLine->Price * $OrderLine->Quantity / $ExRate) . "
WHERE salesanalysis.area='" . $myrow[5] . "'
- AND salesanalysis.salesperson='" . $myrow[8] . "'
- AND typeabbrev ='" . $_SESSION['Items'.$identifier]->DefaultSalesType . "'
- AND periodno = '" . $PeriodNo . "'
- AND cust " . LIKE . " '" . $_SESSION['Items'.$identifier]->De |