Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[4919] trunk
|
From: <dai...@us...> - 2012-02-17 10:34:20
|
Revision: 4919
http://web-erp.svn.sourceforge.net/web-erp/?rev=4919&view=rev
Author: daintree
Date: 2012-02-17 10:34:08 +0000 (Fri, 17 Feb 2012)
Log Message:
-----------
bug fix
Modified Paths:
--------------
trunk/AccountGroups.php
trunk/AddCustomerNotes.php
trunk/AgedDebtors.php
trunk/AgedSuppliers.php
trunk/Areas.php
trunk/SuppCreditGRNs.php
trunk/SuppInvGRNs.php
trunk/SupplierInvoice.php
trunk/doc/Change.log
trunk/includes/DefineSuppTransClass.php
Modified: trunk/AccountGroups.php
===================================================================
--- trunk/AccountGroups.php 2012-02-17 03:32:32 UTC (rev 4918)
+++ trunk/AccountGroups.php 2012-02-17 10:34:08 UTC (rev 4919)
@@ -61,7 +61,7 @@
$result=DB_query($sql, $db,$ErrMsg,$DbgMsg);
$myrow=DB_fetch_row($result);
- if ($myrow[0]!=0 and $_POST['SelectedAccountGroup']=='') {
+ if ($myrow[0]!=0 AND $_POST['SelectedAccountGroup']=='') {
$InputError = 1;
prnMsg( _('The account group name already exists in the database'),'error');
$Errors[$i] = 'GroupName';
@@ -201,7 +201,7 @@
}
-if (!isset($_GET['SelectedAccountGroup']) and !isset($_POST['SelectedAccountGroup'])) {
+if (!isset($_GET['SelectedAccountGroup']) AND !isset($_POST['SelectedAccountGroup'])) {
/* An account group could be posted when one has been edited and is being updated or GOT when selected for modification
SelectedAccountGroup will exist because it was sent with the page in a GET .
@@ -359,7 +359,7 @@
while ( $grouprow = DB_fetch_array($groupresult) ) {
- if (isset($_POST['ParentGroupName']) and $_POST['ParentGroupName']==$grouprow['groupname']) {
+ if (isset($_POST['ParentGroupName']) AND $_POST['ParentGroupName']==$grouprow['groupname']) {
echo '<option selected="selected" value="'.htmlentities($grouprow['groupname'], ENT_QUOTES,'UTF-8').'">' .htmlentities($grouprow['groupname'], ENT_QUOTES,'UTF-8').'</option>';
} else {
echo '<option value="'.htmlentities($grouprow['groupname'], ENT_QUOTES,'UTF-8').'">' .htmlentities($grouprow['groupname'], ENT_QUOTES,'UTF-8').'</option>';
Modified: trunk/AddCustomerNotes.php
===================================================================
--- trunk/AddCustomerNotes.php 2012-02-17 03:32:32 UTC (rev 4918)
+++ trunk/AddCustomerNotes.php 2012-02-17 10:34:08 UTC (rev 4919)
@@ -29,23 +29,23 @@
ie the page has called itself with some user input */
//first off validate inputs sensible
- if (!is_long((integer)$_POST['priority'])) {
+ if (!is_long((integer)$_POST['Priority'])) {
$InputError = 1;
prnMsg( _('The contact priority must be an integer.'), 'error');
- } elseif (mb_strlen($_POST['note']) >200) {
+ } elseif (mb_strlen($_POST['Note']) >200) {
$InputError = 1;
prnMsg( _('The contact\'s notes must be two hundred characters or less long'), 'error');
- } elseif( trim($_POST['note']) == '' ) {
+ } elseif( trim($_POST['Note']) == '' ) {
$InputError = 1;
prnMsg( _('The contact\'s notes may not be empty'), 'error');
}
if (isset($Id) and $InputError !=1) {
- $sql = "UPDATE custnotes SET note='" . $_POST['note'] . "',
+ $sql = "UPDATE custnotes SET note='" . $_POST['Note'] . "',
date='" . FormatDateForSQL($_POST['date']) . "',
- href='" . $_POST['href'] . "',
- priority='" . $_POST['priority'] . "'
+ href='" . $_POST['Href'] . "',
+ priority='" . $_POST['Priority'] . "'
WHERE debtorno ='".$DebtorNo."'
AND noteid='".$Id."'";
$msg = _('Customer Notes') . ' ' . $DebtorNo . ' ' . _('has been updated');
@@ -57,10 +57,10 @@
date,
priority)
VALUES ('" . $DebtorNo. "',
- '" . $_POST['href'] . "',
- '" . $_POST['note'] . "',
+ '" . $_POST['Href'] . "',
+ '" . $_POST['Note'] . "',
'" . FormatDateForSQL($_POST['date']) . "',
- '" . $_POST['priority'] . "')";
+ '" . $_POST['Priority'] . "')";
$msg = _('The contact notes record has been added');
}
@@ -71,11 +71,11 @@
echo '<br />';
prnMsg($msg, 'success');
unset($Id);
- unset($_POST['note']);
- unset($_POST['noteid']);
+ unset($_POST['Note']);
+ unset($_POST['Noteid']);
unset($_POST['date']);
- unset($_POST['href']);
- unset($_POST['priority']);
+ unset($_POST['Href']);
+ unset($_POST['Priority']);
}
} elseif (isset($_GET['delete'])) {
//the link to delete a selected record was clicked instead of the submit button
@@ -181,19 +181,19 @@
$myrow = DB_fetch_array($result);
- $_POST['noteid'] = $myrow['noteid'];
- $_POST['note'] = $myrow['note'];
- $_POST['href'] = $myrow['href'];
+ $_POST['Noteid'] = $myrow['noteid'];
+ $_POST['Note'] = $myrow['note'];
+ $_POST['Href'] = $myrow['href'];
$_POST['date'] = $myrow['date'];
- $_POST['priority'] = $myrow['priority'];
+ $_POST['Priority'] = $myrow['priority'];
$_POST['debtorno'] = $myrow['debtorno'];
echo '<input type="hidden" name="Id" value="'. $Id .'" />';
- echo '<input type="hidden" name="Con_ID" value="' . $_POST['noteid'] . '" />';
+ echo '<input type="hidden" name="Con_ID" value="' . $_POST['Noteid'] . '" />';
echo '<input type="hidden" name="DebtorNo" value="' . $_POST['debtorno'] . '" />';
echo '<table class="selection">
<tr>
<td>'. _('Note ID').':</td>
- <td>' . $_POST['noteid'] . '</td>
+ <td>' . $_POST['Noteid'] . '</td>
</tr>';
} else {
echo '<table class="selection">';
@@ -201,20 +201,20 @@
echo '<tr>
<td>' . _('Contact Note'). '</td>';
- if (isset($_POST['note'])) {
- echo '<td><textarea name="note">' .$_POST['note'] . '</textarea></td>
+ if (isset($_POST['Note'])) {
+ echo '<td><textarea name="Note">' .$_POST['Note'] . '</textarea></td>
</tr>';
} else {
- echo '<td><textarea name="note"></textarea></td>
+ echo '<td><textarea name="Note"></textarea></td>
</tr>';
}
echo '<tr>
<td>'. _('WWW').'</td>';
- if (isset($_POST['href'])) {
- echo '<td><input type="text" name="href" value="'.$_POST['href'].'" size="35" maxlength="100" /></td>
+ if (isset($_POST['Href'])) {
+ echo '<td><input type="text" name="Href" value="'.$_POST['Href'].'" size="35" maxlength="100" /></td>
</tr>';
} else {
- echo '<td><input type="text" name="href" size="35" maxlength="100" /></td>
+ echo '<td><input type="text" name="Href" size="35" maxlength="100" /></td>
</tr>';
}
echo '<tr>
@@ -228,11 +228,11 @@
}
echo '<tr>
<td>'. _('Priority'). '</td>';
- if (isset($_POST['priority'])) {
- echo '<td><input type="text" name="priority" value="' .$_POST['priority']. '" size="1" maxlength="3" /></td>
+ if (isset($_POST['Priority'])) {
+ echo '<td><input type="text" name="Priority" value="' .$_POST['Priority']. '" size="1" maxlength="3" /></td>
</tr>';
} else {
- echo '<td><input type="text" name="priority" size="1" maxlength="3" /></td>
+ echo '<td><input type="text" name="Priority" size="1" maxlength="3" /></td>
</tr>';
}
echo '<tr>
Modified: trunk/AgedDebtors.php
===================================================================
--- trunk/AgedDebtors.php 2012-02-17 03:32:32 UTC (rev 4918)
+++ trunk/AgedDebtors.php 2012-02-17 10:34:08 UTC (rev 4919)
@@ -186,82 +186,80 @@
debtorsmaster.creditlimit,
holdreasons.dissallowinvoices,
holdreasons.reasondescription,
- SUM(debtortrans.ovamount +
- debtortrans.ovgst +
- debtortrans.ovfreight +
- debtortrans.ovdiscount -
- debtortrans.alloc) AS balance,
- SUM(
- CASE WHEN (paymentterms.daysbeforedue > 0)
- THEN
- CASE WHEN TO_DAYS(Now()) - TO_DAYS(debtortrans.trandate) >= paymentterms.daysbeforedue
- THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc
- ELSE 0 END
- ELSE
- CASE WHEN (TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(debtortrans.trandate," . INTERVAL('1', 'MONTH') . ")," . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(debtortrans.trandate))', 'DAY') . ")) >= 0)
- THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc
- ELSE 0 END
- END
- ) AS due,
- SUM(
- CASE WHEN (paymentterms.daysbeforedue > 0)
- THEN
- CASE WHEN TO_DAYS(Now()) - TO_DAYS(debtortrans.trandate) > paymentterms.daysbeforedue
- AND TO_DAYS(Now()) - TO_DAYS(debtortrans.trandate) >= (paymentterms.daysbeforedue + " . $_SESSION['PastDueDays1'] . ")
- THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc ELSE 0 END
- ELSE
- CASE WHEN (TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(debtortrans.trandate, " . INTERVAL('1', 'MONTH') . "), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(debtortrans.trandate))', 'DAY') . ")) >= " . $_SESSION['PastDueDays1'] . ")
- THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc
- ELSE 0 END
- END
- ) AS overdue1,
- SUM(
- CASE WHEN (paymentterms.daysbeforedue > 0)
- THEN
- CASE WHEN TO_DAYS(Now()) - TO_DAYS(debtortrans.trandate) > paymentterms.daysbeforedue
- AND TO_DAYS(Now()) - TO_DAYS(debtortrans.trandate) >= (paymentterms.daysbeforedue + " . $_SESSION['PastDueDays2'] . ")
- THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc
- ELSE 0 END
- ELSE
- CASE WHEN (TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(debtortrans.trandate, " . INTERVAL('1', 'MONTH') . "), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(debtortrans.trandate))', 'DAY') . ")) >= ".$_SESSION['PastDueDays2'] . ")
- THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc
- ELSE 0 END
- END
- ) AS overdue2
- FROM debtorsmaster,
- paymentterms,
- holdreasons,
- currencies,
- debtortrans
- WHERE debtorsmaster.paymentterms = paymentterms.termsindicator
- AND debtorsmaster.currcode = currencies.currabrev
- AND debtorsmaster.holdreason = holdreasons.reasoncode
- AND debtorsmaster.debtorno = debtortrans.debtorno
- AND holdreasons.dissallowinvoices=1
- AND debtorsmaster.debtorno >= '" . $_POST['FromCriteria'] . "'
- AND debtorsmaster.debtorno <= '" . $_POST['ToCriteria'] . "'
- AND debtorsmaster.currcode ='" . $_POST['Currency'] . "'
- " . $SalesLimit . "
- GROUP BY debtorsmaster.debtorno,
- debtorsmaster.name,
- currencies.currency,
- paymentterms.terms,
- paymentterms.daysbeforedue,
- paymentterms.dayinfollowingmonth,
- debtorsmaster.creditlimit,
- holdreasons.dissallowinvoices,
- holdreasons.reasondescription
- HAVING ABS(SUM(
- debtortrans.ovamount +
- debtortrans.ovgst +
- debtortrans.ovfreight +
- debtortrans.ovdiscount -
- debtortrans.alloc)) >0.005";
+ SUM(debtortrans.ovamount +
+ debtortrans.ovgst +
+ debtortrans.ovfreight +
+ debtortrans.ovdiscount -
+ debtortrans.alloc) AS balance,
+ SUM(
+ CASE WHEN (paymentterms.daysbeforedue > 0)
+ THEN
+ CASE WHEN TO_DAYS(Now()) - TO_DAYS(debtortrans.trandate) >= paymentterms.daysbeforedue
+ THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc
+ ELSE 0 END
+ ELSE
+ CASE WHEN (TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(debtortrans.trandate," . INTERVAL('1', 'MONTH') . ")," . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(debtortrans.trandate))', 'DAY') . ")) >= 0)
+ THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc
+ ELSE 0 END
+ END
+ ) AS due,
+ SUM(
+ CASE WHEN (paymentterms.daysbeforedue > 0)
+ THEN
+ CASE WHEN TO_DAYS(Now()) - TO_DAYS(debtortrans.trandate) > paymentterms.daysbeforedue
+ AND TO_DAYS(Now()) - TO_DAYS(debtortrans.trandate) >= (paymentterms.daysbeforedue + " . $_SESSION['PastDueDays1'] . ")
+ THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc ELSE 0 END
+ ELSE
+ CASE WHEN (TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(debtortrans.trandate, " . INTERVAL('1', 'MONTH') . "), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(debtortrans.trandate))', 'DAY') . ")) >= " . $_SESSION['PastDueDays1'] . ")
+ THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc
+ ELSE 0 END
+ END
+ ) AS overdue1,
+ SUM(
+ CASE WHEN (paymentterms.daysbeforedue > 0)
+ THEN
+ CASE WHEN TO_DAYS(Now()) - TO_DAYS(debtortrans.trandate) > paymentterms.daysbeforedue
+ AND TO_DAYS(Now()) - TO_DAYS(debtortrans.trandate) >= (paymentterms.daysbeforedue + " . $_SESSION['PastDueDays2'] . ")
+ THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc
+ ELSE 0 END
+ ELSE
+ CASE WHEN (TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(debtortrans.trandate, " . INTERVAL('1', 'MONTH') . "), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(debtortrans.trandate))', 'DAY') . ")) >= ".$_SESSION['PastDueDays2'] . ")
+ THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc
+ ELSE 0 END
+ END
+ ) AS overdue2
+ FROM debtorsmaster,
+ paymentterms,
+ holdreasons,
+ currencies,
+ debtortrans
+ WHERE debtorsmaster.paymentterms = paymentterms.termsindicator
+ AND debtorsmaster.currcode = currencies.currabrev
+ AND debtorsmaster.holdreason = holdreasons.reasoncode
+ AND debtorsmaster.debtorno = debtortrans.debtorno
+ AND holdreasons.dissallowinvoices=1
+ AND debtorsmaster.debtorno >= '" . $_POST['FromCriteria'] . "'
+ AND debtorsmaster.debtorno <= '" . $_POST['ToCriteria'] . "'
+ AND debtorsmaster.currcode ='" . $_POST['Currency'] . "'
+ " . $SalesLimit . "
+ GROUP BY debtorsmaster.debtorno,
+ debtorsmaster.name,
+ currencies.currency,
+ paymentterms.terms,
+ paymentterms.daysbeforedue,
+ paymentterms.dayinfollowingmonth,
+ debtorsmaster.creditlimit,
+ holdreasons.dissallowinvoices,
+ holdreasons.reasondescription
+ HAVING ABS(SUM(
+ debtortrans.ovamount +
+ debtortrans.ovgst +
+ debtortrans.ovfreight +
+ debtortrans.ovdiscount -
+ debtortrans.alloc)) >0.005";
}
$CustomerResult = DB_query($SQL,$db,'','',False,False); /*dont trap errors handled below*/
- //$ListCount = count ($CustomerResult); // Javier
-
if (DB_error_no($db) !=0) {
$title = _('Aged Customer Account Analysis') . ' - ' . _('Problem Report') . '.... ';
include('includes/header.inc');
Modified: trunk/AgedSuppliers.php
===================================================================
--- trunk/AgedSuppliers.php 2012-02-17 03:32:32 UTC (rev 4918)
+++ trunk/AgedSuppliers.php 2012-02-17 10:34:08 UTC (rev 4919)
@@ -81,24 +81,24 @@
ELSE
CASE WHEN (TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(supptrans.trandate, " . INTERVAL('1', 'MONTH') . "), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(supptrans.trandate))', 'DAY') . ")) >= " . $_SESSION['PastDueDays2'] . ") THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
END) AS overdue2
- FROM suppliers INNER JOIN paymentterms
- ON suppliers.paymentterms = paymentterms.termsindicator
- INNER JOIN currencies
- ON suppliers.currcode = currencies.currabrev
- INNER JOIN supptrans
- ON suppliers.supplierid = supptrans.supplierno
- WHERE suppliers.supplierid >= '" . $_POST['FromCriteria'] . "'
- AND suppliers.supplierid <= '" . $_POST['ToCriteria'] . "'
- AND suppliers.currcode ='" . $_POST['Currency'] . "'
- GROUP BY suppliers.supplierid,
- suppliers.suppname,
- currencies.currency,
- paymentterms.terms,
- paymentterms.daysbeforedue,
- paymentterms.dayinfollowingmonth
- HAVING SUM(IF (paymentterms.daysbeforedue > 0,
- CASE WHEN TO_DAYS(Now()) - TO_DAYS(supptrans.trandate) > paymentterms.daysbeforedue AND TO_DAYS(Now()) - TO_DAYS(supptrans.trandate) >= (paymentterms.daysbeforedue + " . $_SESSION['PastDueDays1'] . ") THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END,
- CASE WHEN (TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(supptrans.trandate, " . INTERVAL('1', 'MONTH') . "), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(supptrans.trandate))', 'DAY') . ")) >= " . $_SESSION['PastDueDays1'] . ") THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END)) > 0";
+ FROM suppliers INNER JOIN paymentterms
+ ON suppliers.paymentterms = paymentterms.termsindicator
+ INNER JOIN currencies
+ ON suppliers.currcode = currencies.currabrev
+ INNER JOIN supptrans
+ ON suppliers.supplierid = supptrans.supplierno
+ WHERE suppliers.supplierid >= '" . $_POST['FromCriteria'] . "'
+ AND suppliers.supplierid <= '" . $_POST['ToCriteria'] . "'
+ AND suppliers.currcode ='" . $_POST['Currency'] . "'
+ GROUP BY suppliers.supplierid,
+ suppliers.suppname,
+ currencies.currency,
+ paymentterms.terms,
+ paymentterms.daysbeforedue,
+ paymentterms.dayinfollowingmonth
+ HAVING SUM(IF (paymentterms.daysbeforedue > 0,
+ CASE WHEN TO_DAYS(Now()) - TO_DAYS(supptrans.trandate) > paymentterms.daysbeforedue AND TO_DAYS(Now()) - TO_DAYS(supptrans.trandate) >= (paymentterms.daysbeforedue + " . $_SESSION['PastDueDays1'] . ") THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END,
+ CASE WHEN (TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(supptrans.trandate, " . INTERVAL('1', 'MONTH') . "), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(supptrans.trandate))', 'DAY') . ")) >= " . $_SESSION['PastDueDays1'] . ") THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END)) > 0";
}
Modified: trunk/Areas.php
===================================================================
--- trunk/Areas.php 2012-02-17 03:32:32 UTC (rev 4918)
+++ trunk/Areas.php 2012-02-17 10:34:08 UTC (rev 4919)
@@ -39,7 +39,7 @@
prnMsg(_('The area code must be three characters or less long'),'error');
$Errors[$i] = 'AreaCode';
$i++;
- } elseif (DB_num_rows($result)>0 and !isset($SelectedArea)){
+ } elseif (DB_num_rows($result)>0 AND !isset($SelectedArea)){
$InputError = 1;
prnMsg(_('The area code entered already exists'),'error');
$Errors[$i] = 'AreaCode';
Modified: trunk/SuppCreditGRNs.php
===================================================================
--- trunk/SuppCreditGRNs.php 2012-02-17 03:32:32 UTC (rev 4918)
+++ trunk/SuppCreditGRNs.php 2012-02-17 10:34:08 UTC (rev 4919)
@@ -51,6 +51,7 @@
}
if ($InputError==False){
+
$_SESSION['SuppTrans']->Add_GRN_To_Trans($_POST['GRNNumber'],
$_POST['PODetailItem'],
$_POST['ItemCode'],
@@ -67,7 +68,9 @@
$_POST['GLCode'],
$_POST['PONo'],
$_POST['AssetID'],
- $_POST['DecimalPlaces']);
+ 0,
+ $_POST['DecimalPlaces'],
+ $_POST['GRNBatchNo']);
}
}
@@ -236,6 +239,7 @@
if (isset($_POST['GRNNo']) AND $_POST['GRNNo']!=''){
$SQL = "SELECT grnno,
+ grns.grnbatch,
grns.podetailitem,
purchorderdetails.orderno,
purchorderdetails.unitprice,
@@ -320,6 +324,7 @@
echo '<input type="hidden" name="PONo" value="' . $myrow['orderno'] . '" />';
echo '<input type="hidden" name="AssetID" value="' . $myrow['assetid'] . '" />';
echo '<input type="hidden" name="DecimalPlaces" value="' . $myrow['decimalplaces'] . '" />';
+ echo '<input type="hidden" name="GRNBatchNo" value="' . $myrow['grnbatch'] . '" />';
}
} //end if there were GRNs to select
echo '</form>';
Modified: trunk/SuppInvGRNs.php
===================================================================
--- trunk/SuppInvGRNs.php 2012-02-17 03:32:32 UTC (rev 4918)
+++ trunk/SuppInvGRNs.php 2012-02-17 10:34:08 UTC (rev 4919)
@@ -236,7 +236,9 @@
$myrow['glcode'],
$myrow['orderno'],
$myrow['assetid'],
- $myrow['decimalplaces']);
+ 0,
+ $myrow['decimalplaces'],
+ $myrow['grnbatch']);
}
}
}
Modified: trunk/SupplierInvoice.php
===================================================================
--- trunk/SupplierInvoice.php 2012-02-17 03:32:32 UTC (rev 4918)
+++ trunk/SupplierInvoice.php 2012-02-17 10:34:08 UTC (rev 4919)
@@ -1211,12 +1211,13 @@
/* 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 . "'
+ $SQL = "UPDATE stockmoves SET price = '" . $ActualCost . "'
WHERE stockid='" .$EnteredGRN->ItemCode . "'
AND type=25
AND loccode='" . $LocCode . "'
- AND transno='" . $EnteredGRN->GRNNo . "'",
- $db,$ErrMsg,$DbgMsg,True);
+ AND transno='" . $EnteredGRN->GRNBatchNo . "'";
+
+ $result = DB_query($SQL,$db,$ErrMsg,$DbgMsg,True);
if ($_SESSION['WeightedAverageCosting']==1){
/*
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-02-17 03:32:32 UTC (rev 4918)
+++ trunk/doc/Change.log 2012-02-17 10:34:08 UTC (rev 4919)
@@ -1,5 +1,10 @@
webERP Change Log
+17/2/12 Phil: SuppCreditGRNs.php SuppInvGRNs.php DefineSuppTransClass.php SupplierInvoice.php stock movement was not being updated correctly with cost on purchase invoice entry as was using GRNNo not GRNBatchNo - which is used as the GRN transaction number in stock movements.
+16/2/12 Tim: Modified index.php to use arrays of links rather than hard code all menus
+16/2/12 Exson: Fixed StockAdjustments.php was not producing gltrans entries when stock code entered directly
+
+
Release 4.07
11/2/12 Phil: Fix Prices.php for end dates when a new price with no end date is inserted with a start date in the future.
Modified: trunk/includes/DefineSuppTransClass.php
===================================================================
--- trunk/includes/DefineSuppTransClass.php 2012-02-17 03:32:32 UTC (rev 4918)
+++ trunk/includes/DefineSuppTransClass.php 2012-02-17 10:34:08 UTC (rev 4919)
@@ -100,7 +100,9 @@
$GLCode,
$PONo,
$AssetID=0,
- $DecimalPlaces=2){
+ $Hold=0,
+ $DecimalPlaces=2,
+ $GRNBatchNo){
if ($This_QuantityInv!=0 AND isset($This_QuantityInv)){
$this->GRNs[$GRNNo] = new GRNs($GRNNo,
@@ -119,7 +121,9 @@
$GLCode,
$PONo,
$AssetID,
- $DecimalPlaces);
+ $Hold,
+ $DecimalPlaces,
+ $GRNBatchNo);
Return 1;
}
Return 0;
@@ -181,7 +185,8 @@
$GRNSrc->PONo,
$GRNSrc->AssetID,
$GRNSrc->Hold,
- $GRNSrc->DecimalPlaces);
+ $GRNSrc->DecimalPlaces,
+ $GRNSrc->GRNBatchNo);
Return 1;
}
Return 0;
@@ -317,6 +322,7 @@
var $Hold;
var $AssetID;
var $DecimalPlaces;
+ var $GRNBatchNo;
function GRNs ($GRNNo,
$PODetailItem,
@@ -335,9 +341,11 @@
$PONo,
$AssetID,
$Hold=0,
- $DecimalPlaces=2){
+ $DecimalPlaces=2,
+ $GRNBatchNo){
+
/* Constructor function to add a new GRNs object with passed params */
$this->GRNNo = $GRNNo;
$this->PODetailItem = $PODetailItem;
@@ -357,22 +365,23 @@
$this->AssetID = $AssetID;
$this->Hold = $Hold;
$this->DecimalPlaces = $DecimalPlaces;
+ $this->GRNBatchNo = $GRNBatchNo;
}
function Modify ($PODetailItem,
- $ItemCode,
- $ItemDescription,
- $QtyRecd,
- $Prev_QuantityInv,
- $This_QuantityInv,
- $OrderPrice,
- $ChgPrice,
- $Complete,
- $StdCostUnit,
- $ShiptRef,
- $JobRef,
- $GLCode,
- $Hold){
+ $ItemCode,
+ $ItemDescription,
+ $QtyRecd,
+ $Prev_QuantityInv,
+ $This_QuantityInv,
+ $OrderPrice,
+ $ChgPrice,
+ $Complete,
+ $StdCostUnit,
+ $ShiptRef,
+ $JobRef,
+ $GLCode,
+ $Hold){
/* Modify function to edit a GRNs object with passed params */
$this->PODetailItem = $PODetailItem;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
