Menu
▾
▴
web-erp-svn
|
From: <Ex...@us...> - 2012-03-25 13:52:20
|
Revision: 5147
http://web-erp.svn.sourceforge.net/web-erp/?rev=5147&view=rev
Author: ExsonQu
Date: 2012-03-25 13:52:14 +0000 (Sun, 25 Mar 2012)
Log Message:
-----------
25/3/2012 Exson: Add return back link for SupplierInvoice.php while users make input errors. Reported by Ke from webERP Chinese Community QQ group
Modified Paths:
--------------
trunk/SupplierInvoice.php
Modified: trunk/SupplierInvoice.php
===================================================================
--- trunk/SupplierInvoice.php 2012-03-23 15:15:42 UTC (rev 5146)
+++ trunk/SupplierInvoice.php 2012-03-25 13:52:14 UTC (rev 5147)
@@ -1514,6 +1514,10 @@
} /*end of process invoice */
+if($InputError==true){ //add a link to return if users make input errors.
+ echo '<div class="centre"><a href="'.$rootpath.'/SupplierInvoice.php" >'._('Back to Invoice Entry').'</a></div>';
+} //end of return link for input errors
+
echo '</form>';
include('includes/footer.inc');
-?>
\ 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: <Ex...@us...> - 2012-03-25 13:52:20
|
Revision: 5147
http://web-erp.svn.sourceforge.net/web-erp/?rev=5147&view=rev
Author: ExsonQu
Date: 2012-03-25 13:52:14 +0000 (Sun, 25 Mar 2012)
Log Message:
-----------
25/3/2012 Exson: Add return back link for SupplierInvoice.php while users make input errors. Reported by Ke from webERP Chinese Community QQ group
Modified Paths:
--------------
trunk/SupplierInvoice.php
Modified: trunk/SupplierInvoice.php
===================================================================
--- trunk/SupplierInvoice.php 2012-03-23 15:15:42 UTC (rev 5146)
+++ trunk/SupplierInvoice.php 2012-03-25 13:52:14 UTC (rev 5147)
@@ -1514,6 +1514,10 @@
} /*end of process invoice */
+if($InputError==true){ //add a link to return if users make input errors.
+ echo '<div class="centre"><a href="'.$rootpath.'/SupplierInvoice.php" >'._('Back to Invoice Entry').'</a></div>';
+} //end of return link for input errors
+
echo '</form>';
include('includes/footer.inc');
-?>
\ 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: <Ex...@us...> - 2012-07-25 09:31:10
|
Revision: 5557
http://web-erp.svn.sourceforge.net/web-erp/?rev=5557&view=rev
Author: ExsonQu
Date: 2012-07-25 09:31:04 +0000 (Wed, 25 Jul 2012)
Log Message:
-----------
25/7/2012 Exson: Fix the typo to make the $TotalQuantityOnHand is correct in SupplierInvoice.php
Modified Paths:
--------------
trunk/SupplierInvoice.php
Modified: trunk/SupplierInvoice.php
===================================================================
--- trunk/SupplierInvoice.php 2012-07-25 09:27:36 UTC (rev 5556)
+++ trunk/SupplierInvoice.php 2012-07-25 09:31:04 UTC (rev 5557)
@@ -1233,7 +1233,7 @@
* The cost of these items = $ActualCost
*/
- $sql ="SELECT quantity
+ $sql ="SELECT sum(quantity)
FROM locstock
WHERE stockid='" . $EnteredGRN->ItemCode . "'";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The quantity on hand could not be retrieved from the database');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Ex...@us...> - 2012-07-25 09:31:13
|
Revision: 5557
http://web-erp.svn.sourceforge.net/web-erp/?rev=5557&view=rev
Author: ExsonQu
Date: 2012-07-25 09:31:04 +0000 (Wed, 25 Jul 2012)
Log Message:
-----------
25/7/2012 Exson: Fix the typo to make the $TotalQuantityOnHand is correct in SupplierInvoice.php
Modified Paths:
--------------
trunk/SupplierInvoice.php
Modified: trunk/SupplierInvoice.php
===================================================================
--- trunk/SupplierInvoice.php 2012-07-25 09:27:36 UTC (rev 5556)
+++ trunk/SupplierInvoice.php 2012-07-25 09:31:04 UTC (rev 5557)
@@ -1233,7 +1233,7 @@
* The cost of these items = $ActualCost
*/
- $sql ="SELECT quantity
+ $sql ="SELECT sum(quantity)
FROM locstock
WHERE stockid='" . $EnteredGRN->ItemCode . "'";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The quantity on hand could not be retrieved from the database');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ex...@us...> - 2013-08-20 02:23:46
|
Revision: 6262
http://sourceforge.net/p/web-erp/reponame/6262
Author: exsonqu
Date: 2013-08-20 02:23:40 +0000 (Tue, 20 Aug 2013)
Log Message:
-----------
20/8/2013 Exson: Use manually instead of manual to make distinguish translation possible and make it html5 compatible in SupplierInvoice.php.
Modified Paths:
--------------
trunk/SupplierInvoice.php
Modified: trunk/SupplierInvoice.php
===================================================================
--- trunk/SupplierInvoice.php 2013-08-20 01:54:00 UTC (rev 6261)
+++ trunk/SupplierInvoice.php 2013-08-20 02:23:40 UTC (rev 6262)
@@ -625,7 +625,7 @@
echo '<tr>
<td>' . _('Supplier Invoice Reference') . ':</td>
- <td><input type="text" size="20" maxlength="20" name="SuppReference" value="' . $_SESSION['SuppTrans']->SuppReference . '" /></td>';
+ <td><input type="text" required="required" pattern=".{1,20}" title="'._('The input should not be blank and should be less than 20 characters').'" placeholder="'._('Within 20 characters needed').'" size="20" maxlength="20" name="SuppReference" value="' . $_SESSION['SuppTrans']->SuppReference . '" /></td>';
if (!isset($_SESSION['SuppTrans']->TranDate)){
$_SESSION['SuppTrans']->TranDate= Date($_SESSION['DefaultDateFormat'], Mktime(0,0,0,Date('m'),Date('d')-1,Date('y')));
@@ -633,7 +633,7 @@
echo '<td>' . _('Invoice Date') . ' (' . _('in format') . ' ' . $_SESSION['DefaultDateFormat'] . ') :</td>
<td><input type="text" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" size="11" maxlength="10" name="TranDate" value="' . $_SESSION['SuppTrans']->TranDate . '" /></td>
<td>' . _('Exchange Rate') . ':</td>
- <td><input type="text" class="number" size="11" maxlength="10" name="ExRate" value="' . locale_number_format($_SESSION['SuppTrans']->ExRate,'Variable') . '" /></td>
+ <td><input type="text" class="number" size="11" maxlength="10" name="ExRate" value="' . locale_number_format($_SESSION['SuppTrans']->ExRate,8) . '" /></td>
</tr>
</table>';
@@ -865,7 +865,7 @@
<table class="selection">
<tr>
<td>' . _('Amount in supplier currency') . ':</td>
- <td colspan="2" class="number"><input type="text" size="12" maxlength="10" name="OvAmount" value="' . locale_number_format( $_SESSION['SuppTrans']->OvAmount,$_SESSION['SuppTrans']->CurrDecimalPlaces) . '" /></td>
+ <td colspan="2" class="number"><input type="text" class="number" title="'._('The input must be numeric').'" size="12" maxlength="10" name="OvAmount" value="' . locale_number_format( $_SESSION['SuppTrans']->OvAmount,$_SESSION['SuppTrans']->CurrDecimalPlaces) . '" /></td>
</tr>';
}
@@ -875,10 +875,10 @@
if ($_POST['OverRideTax']=='Man'){
echo '<option value="Auto">' . _('Automatic') . '</option>
- <option selected="selected" value="Man">' . _('Manual') . '</option>';
+ <option selected="selected" value="Man">' . _('Manually') . '</option>';
} else {
echo '<option selected="selected" value="Auto">' . _('Automatic') . '</option>
- <option value="Man">' . _('Manual') . '</option>';
+ <option value="Man">' . _('Manually') . '</option>';
}
echo '</select></td>
|
|
From: <tu...@us...> - 2014-10-30 01:37:47
|
Revision: 6953
http://sourceforge.net/p/web-erp/reponame/6953
Author: turbopt
Date: 2014-10-30 01:37:37 +0000 (Thu, 30 Oct 2014)
Log Message:
-----------
Add closing parenthesis.
Modified Paths:
--------------
trunk/SupplierInvoice.php
Modified: trunk/SupplierInvoice.php
===================================================================
--- trunk/SupplierInvoice.php 2014-10-29 15:15:29 UTC (rev 6952)
+++ trunk/SupplierInvoice.php 2014-10-30 01:37:37 UTC (rev 6953)
@@ -319,7 +319,7 @@
FROM fixedassets
INNER JOIN fixedassetcategories
ON fixedassets.assetcategoryid=fixedassetcategories.categoryid
- WHERE assetid='" . $OrderLine->AssetID . "'";
+ WHERE assetid='" . $OrderLine->AssetID . "'");
if (DB_num_rows($CheckAssetExistsResult)==1){ //then work with the assetid provided
/*Need to add a fixedassettrans for the cost of the asset being received */
|
|
From: <ex...@us...> - 2015-03-07 13:49:20
|
Revision: 7198
http://sourceforge.net/p/web-erp/reponame/7198
Author: exsonqu
Date: 2015-03-07 13:49:08 +0000 (Sat, 07 Mar 2015)
Log Message:
-----------
07/03/15 Exson: Fixed undefine index InputError noise in SupplierInvoice.php.
Modified Paths:
--------------
trunk/SupplierInvoice.php
Modified: trunk/SupplierInvoice.php
===================================================================
--- trunk/SupplierInvoice.php 2015-03-07 11:07:11 UTC (rev 7197)
+++ trunk/SupplierInvoice.php 2015-03-07 13:49:08 UTC (rev 7198)
@@ -1896,7 +1896,7 @@
} /*end of process invoice */
-if($InputError==true){ //add a link to return if users make input errors.
+if(isset($InputError) AND $InputError==true){ //add a link to return if users make input errors.
echo '<div class="centre"><a href="'.$RootPath.'/SupplierInvoice.php" >' . _('Back to Invoice Entry') . '</a></div>';
} //end of return link for input errors
|
|
From: <ex...@us...> - 2015-09-23 13:51:10
|
Revision: 7357
http://sourceforge.net/p/web-erp/reponame/7357
Author: exsonqu
Date: 2015-09-23 13:51:07 +0000 (Wed, 23 Sep 2015)
Log Message:
-----------
23/09/2015 Tim: ADD invoice to grns mapping data in SupplierInvoice.php.
Modified Paths:
--------------
trunk/SupplierInvoice.php
Modified: trunk/SupplierInvoice.php
===================================================================
--- trunk/SupplierInvoice.php 2015-09-21 17:30:10 UTC (rev 7356)
+++ trunk/SupplierInvoice.php 2015-09-23 13:51:07 UTC (rev 7357)
@@ -1546,6 +1546,13 @@
$DbgMsg = _('The following SQL to update the GRN quantity invoiced was used');
$Result = DB_query($SQL, $ErrMsg, $DbgMsg, True);
+ $SQL = "INSERT INTO suppinvstogrn VALUES ('" . $InvoiceNo . "',
+ '" .$EnteredGRN->GRNNo . "')";
+ $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The invoice could not be mapped to the
+ goods received record because');
+ $DbgMsg = _('The following SQL to map the invoice to the GRN was used');
+ $Result = DB_query($SQL, $ErrMsg, $DbgMsg, True);
+
if (mb_strlen($EnteredGRN->ShiptRef)>0 AND $EnteredGRN->ShiptRef != '0'){
/* insert the shipment charge records */
$SQL = "INSERT INTO shipmentcharges (shiptref,
|
|
From: <ex...@us...> - 2017-06-19 06:17:26
|
Revision: 7785
http://sourceforge.net/p/web-erp/reponame/7785
Author: exsonqu
Date: 2017-06-19 06:17:24 +0000 (Mon, 19 Jun 2017)
Log Message:
-----------
19/06/17 Exson: Add a empty submit blocked feature to SupplierInvoice.php to avoid a empty invoice.
Modified Paths:
--------------
trunk/SupplierInvoice.php
Modified: trunk/SupplierInvoice.php
===================================================================
--- trunk/SupplierInvoice.php 2017-06-19 04:25:04 UTC (rev 7784)
+++ trunk/SupplierInvoice.php 2017-06-19 06:17:24 UTC (rev 7785)
@@ -32,12 +32,15 @@
$result = DB_query($sql);
$myrow = DB_fetch_row($result);
$SupplierName=$myrow[0];
+ if (!isset($_SESSION['SuppTrans']->SupplierID)) {
+ $_SESSION['SuppTrans']->SupplierID = $myrow[1];
+ }
} else {
$SupplierName=$_SESSION['SuppTrans']->SupplierName;
}
echo '<p class="page_title_text"><img alt="" src="'.$RootPath . '/css/' . $Theme .
'/images/transactions.png" title="' . _('Supplier Invoice') . '" />' . ' ' .
- _('Enter Supplier Invoice') . ': ' . $SupplierName . '</p>';
+ _('Enter Supplier Invoice') . ': ' . $SupplierName . ' ' . $_SESSION['SuppTrans']->SupplierID . '</p>';
if (isset($_GET['SupplierID']) AND $_GET['SupplierID']!=''){
/*It must be a new invoice entry - clear any existing invoice details from the SuppTrans object and initiate a newy*/
@@ -649,11 +652,13 @@
}
echo ' <input type="submit" name="FixedAssets" value="' . _('Fixed Assets') . '" />
</div>';
+ $CanSubmit = false;//To avoid a empty submit
$TotalGRNValue = 0;
if (count( $_SESSION['SuppTrans']->GRNs)>0){ /*if there are any GRNs selected for invoicing then */
/*Show all the selected GRNs so far from the SESSION['SuppInv']->GRNs array */
+ $CanSubmit = true;
echo '<br />
<table class="selection">
@@ -699,6 +704,7 @@
$TotalShiptValue = 0;
if (count( $_SESSION['SuppTrans']->Shipts) > 0){ /*if there are any Shipment charges on the invoice*/
+ $CanSubmit = true;
echo '<br />
<table class="selection">
@@ -739,6 +745,7 @@
$TotalAssetValue = 0;
if (count( $_SESSION['SuppTrans']->Assets) > 0){ /*if there are any fixed assets on the invoice*/
+ $CanSubmit = true;
echo '<br />
<table class="selection">
@@ -779,6 +786,7 @@
$TotalContractsValue = 0;
if (count( $_SESSION['SuppTrans']->Contracts) > 0){ /*if there are any contract charges on the invoice*/
+ $CanSubmit = true;
echo '<br />
<table class="selection">
@@ -823,6 +831,7 @@
if ( $_SESSION['SuppTrans']->GLLink_Creditors == 1){
if (count($_SESSION['SuppTrans']->GLCodes) > 0){
+ $CanSubmit = true;
echo '<br />
<table class="selection">
<tr>
@@ -957,11 +966,13 @@
<td><textarea name="Comments" cols="40" rows="2">' . $_SESSION['SuppTrans']->Comments . '</textarea></td>
</tr>
</table>';
+ if ($CanSubmit) {
echo '<br />
<div class="centre">
<input type="submit" name="PostInvoice" value="' . _('Enter Invoice') . '" />
</div>';
+ }
echo '</div>
</form>';
|
|
From: <ex...@us...> - 2017-06-29 23:45:47
|
Revision: 7802
http://sourceforge.net/p/web-erp/reponame/7802
Author: exsonqu
Date: 2017-06-29 23:45:44 +0000 (Thu, 29 Jun 2017)
Log Message:
-----------
30/06/17 Exson: Fixed the argument count error in SupplierInvoice.php.
Modified Paths:
--------------
trunk/SupplierInvoice.php
Modified: trunk/SupplierInvoice.php
===================================================================
--- trunk/SupplierInvoice.php 2017-06-26 05:15:21 UTC (rev 7801)
+++ trunk/SupplierInvoice.php 2017-06-29 23:45:44 UTC (rev 7802)
@@ -452,6 +452,7 @@
grns.qtyrecd,
grns.quantityinv,
grns.stdcostunit,
+ grns.supplierref,
purchorderdetails.glcode,
purchorderdetails.shiptref,
purchorderdetails.jobref,
@@ -490,7 +491,8 @@
$myrow['assetid'],
0,
$myrow['decimalplaces'],
- $myrow['grnbatch']);
+ $myrow['grnbatch'],
+ $myrow['supplierref']);
}
} //end if the order has no controlled items on it
} //only allow auto receiving of all lines if the PO is authorised
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X