Menu
▾
▴
web-erp-svn — SVN commits
This list is closed, nobody may subscribe to it.
| 2011 |
Jan
(14) |
Feb
(42) |
Mar
(56) |
Apr
(60) |
May
(54) |
Jun
(48) |
Jul
(74) |
Aug
(52) |
Sep
(68) |
Oct
(64) |
Nov
(42) |
Dec
(62) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2012 |
Jan
(142) |
Feb
(270) |
Mar
(374) |
Apr
(230) |
May
(214) |
Jun
(116) |
Jul
(234) |
Aug
(66) |
Sep
(120) |
Oct
(16) |
Nov
(17) |
Dec
(41) |
| 2013 |
Jan
(19) |
Feb
(18) |
Mar
(8) |
Apr
(40) |
May
(121) |
Jun
(42) |
Jul
(127) |
Aug
(145) |
Sep
(27) |
Oct
(38) |
Nov
(83) |
Dec
(61) |
| 2014 |
Jan
(33) |
Feb
(35) |
Mar
(59) |
Apr
(41) |
May
(38) |
Jun
(45) |
Jul
(17) |
Aug
(58) |
Sep
(46) |
Oct
(51) |
Nov
(55) |
Dec
(36) |
| 2015 |
Jan
(57) |
Feb
(67) |
Mar
(70) |
Apr
(34) |
May
(32) |
Jun
(11) |
Jul
(3) |
Aug
(17) |
Sep
(16) |
Oct
(13) |
Nov
(30) |
Dec
(30) |
| 2016 |
Jan
(17) |
Feb
(12) |
Mar
(17) |
Apr
(20) |
May
(47) |
Jun
(15) |
Jul
(13) |
Aug
(30) |
Sep
(32) |
Oct
(20) |
Nov
(32) |
Dec
(24) |
| 2017 |
Jan
(16) |
Feb
|
Mar
(11) |
Apr
(11) |
May
(5) |
Jun
(42) |
Jul
(9) |
Aug
(10) |
Sep
(14) |
Oct
(15) |
Nov
(2) |
Dec
(29) |
| 2018 |
Jan
(28) |
Feb
(49) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ex...@us...> - 2015-03-07 16:14:04
|
Revision: 7205
http://sourceforge.net/p/web-erp/reponame/7205
Author: exsonqu
Date: 2015-03-07 16:13:57 +0000 (Sat, 07 Mar 2015)
Log Message:
-----------
Modified Paths:
--------------
trunk/doc/Change.log
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-03-07 16:13:24 UTC (rev 7204)
+++ trunk/doc/Change.log 2015-03-07 16:13:57 UTC (rev 7205)
@@ -1,5 +1,5 @@
webERP Change Log
-
+07/03/15 Exson: Fixed undefined index noise in ShipmentCosting.php.
07/03/15 Exson: Fixed property ShiptCounter non defined bug in DefineSuppTransClass.php.
07/03/15 Exson: Fixed the undefine index OpenOrClose noise in Shipt_Select.php.
07/03/15 Exson: Fixed undefine index InputError noise in SupplierInvoice.php.
|
|
From: <ex...@us...> - 2015-03-07 16:13:26
|
Revision: 7204
http://sourceforge.net/p/web-erp/reponame/7204
Author: exsonqu
Date: 2015-03-07 16:13:24 +0000 (Sat, 07 Mar 2015)
Log Message:
-----------
07/03/15 Exson: Fixed undefined index noise in ShipmentCosting.php.
Modified Paths:
--------------
trunk/ShipmentCosting.php
Modified: trunk/ShipmentCosting.php
===================================================================
--- trunk/ShipmentCosting.php 2015-03-07 14:16:47 UTC (rev 7203)
+++ trunk/ShipmentCosting.php 2015-03-07 16:13:24 UTC (rev 7204)
@@ -399,7 +399,7 @@
$result = DB_query($sql, $ErrMsg,'',TRUE);
}
- if ( $_POST['UpdateCost'] == 'Yes' ){ /*Only ever a standard costing option
+ if ( isset($_POST['UpdateCost']) AND $_POST['UpdateCost'] == 'Yes' ){ /*Only ever a standard costing option
Weighted average costing implies cost updates taking place automatically */
$QOHResult = DB_query("SELECT SUM(quantity)
@@ -705,11 +705,11 @@
echo '<br />';
prnMsg ( _('All variances were posted to the general ledger') );
}
- If ($_POST['UpdateCost']=='Yes'){
+ If (isset($_POST['UpdateCost']) AND $_POST['UpdateCost']=='Yes'){
echo '<br />';
prnMsg ( _('All shipment items have had their standard costs updated') );
}
}
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
|
|
From: <ex...@us...> - 2015-03-07 14:18:32
|
Revision: 7203
http://sourceforge.net/p/web-erp/reponame/7203
Author: exsonqu
Date: 2015-03-07 14:16:47 +0000 (Sat, 07 Mar 2015)
Log Message:
-----------
Modified Paths:
--------------
trunk/doc/Change.log
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-03-07 14:15:55 UTC (rev 7202)
+++ trunk/doc/Change.log 2015-03-07 14:16:47 UTC (rev 7203)
@@ -1,5 +1,6 @@
webERP Change Log
+07/03/15 Exson: Fixed property ShiptCounter non defined bug in DefineSuppTransClass.php.
07/03/15 Exson: Fixed the undefine index OpenOrClose noise in Shipt_Select.php.
07/03/15 Exson: Fixed undefine index InputError noise in SupplierInvoice.php.
07/03/15 Exson: Fixed typo in AuditTrail.php.
|
|
From: <ex...@us...> - 2015-03-07 14:15:58
|
Revision: 7202
http://sourceforge.net/p/web-erp/reponame/7202
Author: exsonqu
Date: 2015-03-07 14:15:55 +0000 (Sat, 07 Mar 2015)
Log Message:
-----------
07/03/15 Exson: Fixed property ShiptCounter non defined bug in DefineSuppTransClass.php.
Modified Paths:
--------------
trunk/includes/DefineSuppTransClass.php
Modified: trunk/includes/DefineSuppTransClass.php
===================================================================
--- trunk/includes/DefineSuppTransClass.php 2015-03-07 13:59:24 UTC (rev 7201)
+++ trunk/includes/DefineSuppTransClass.php 2015-03-07 14:15:55 UTC (rev 7202)
@@ -36,6 +36,7 @@
var $TaxGroupDescription;
var $Taxes;
var $Hold;
+ var $ShiptCounter;
function SuppTrans(){
/*Constructor function initialises a new Supplier Transaction object */
@@ -45,6 +46,7 @@
$this->Contracts = array();
$this->Assets = array();
$this->Taxes = array();
+ $ShiptCounter = 0;
}
function GetTaxes () {
@@ -514,4 +516,4 @@
$this->TaxGLCode = $TaxGLCode;
}
}
-?>
\ No newline at end of file
+?>
|
|
From: <ex...@us...> - 2015-03-07 14:00:21
|
Revision: 7201
http://sourceforge.net/p/web-erp/reponame/7201
Author: exsonqu
Date: 2015-03-07 13:59:24 +0000 (Sat, 07 Mar 2015)
Log Message:
-----------
Modified Paths:
--------------
trunk/doc/Change.log
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-03-07 13:57:58 UTC (rev 7200)
+++ trunk/doc/Change.log 2015-03-07 13:59:24 UTC (rev 7201)
@@ -1,5 +1,6 @@
webERP Change Log
+07/03/15 Exson: Fixed the undefine index OpenOrClose noise in Shipt_Select.php.
07/03/15 Exson: Fixed undefine index InputError noise in SupplierInvoice.php.
07/03/15 Exson: Fixed typo in AuditTrail.php.
07/03/15 Exson: Remove properties $_SESSION['Shipment']->GLLink which never been defined in Shipments.php.
|
|
From: <ex...@us...> - 2015-03-07 13:58:00
|
Revision: 7200
http://sourceforge.net/p/web-erp/reponame/7200
Author: exsonqu
Date: 2015-03-07 13:57:58 +0000 (Sat, 07 Mar 2015)
Log Message:
-----------
07/03/15 Exson: Fixed the undefine index OpenOrClose noise in Shipt_Select.php.
Modified Paths:
--------------
trunk/Shipt_Select.php
Modified: trunk/Shipt_Select.php
===================================================================
--- trunk/Shipt_Select.php 2015-03-07 13:50:14 UTC (rev 7199)
+++ trunk/Shipt_Select.php 2015-03-07 13:57:58 UTC (rev 7200)
@@ -126,7 +126,7 @@
echo '</select>';
echo ' <select name="OpenOrClosed">';
- if ($_POST['OpenOrClosed']==1){
+ if (isset($_POST['OpenOrClosed']) AND $_POST['OpenOrClosed']==1){
echo '<option selected="selected" value="1">' . _('Closed Shipments Only') . '</option>';
echo '<option value="0">' . _('Open Shipments Only') . '</option>';
} else {
@@ -371,4 +371,4 @@
echo '</div>
</form>';
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
|
|
From: <ex...@us...> - 2015-03-07 13:50:19
|
Revision: 7199
http://sourceforge.net/p/web-erp/reponame/7199
Author: exsonqu
Date: 2015-03-07 13:50:14 +0000 (Sat, 07 Mar 2015)
Log Message:
-----------
Modified Paths:
--------------
trunk/doc/Change.log
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-03-07 13:49:08 UTC (rev 7198)
+++ trunk/doc/Change.log 2015-03-07 13:50:14 UTC (rev 7199)
@@ -1,5 +1,6 @@
webERP Change Log
+07/03/15 Exson: Fixed undefine index InputError noise in SupplierInvoice.php.
07/03/15 Exson: Fixed typo in AuditTrail.php.
07/03/15 Exson: Remove properties $_SESSION['Shipment']->GLLink which never been defined in Shipments.php.
07/03/15: Exson: Change login date of users without login record to 'No login record' instead of today. It's very confusion.
|
|
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-03-07 11:07:18
|
Revision: 7197
http://sourceforge.net/p/web-erp/reponame/7197
Author: exsonqu
Date: 2015-03-07 11:07:11 +0000 (Sat, 07 Mar 2015)
Log Message:
-----------
Modified Paths:
--------------
trunk/doc/Change.log
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-03-07 11:06:33 UTC (rev 7196)
+++ trunk/doc/Change.log 2015-03-07 11:07:11 UTC (rev 7197)
@@ -1,5 +1,6 @@
webERP Change Log
+07/03/15 Exson: Fixed typo in AuditTrail.php.
07/03/15 Exson: Remove properties $_SESSION['Shipment']->GLLink which never been defined in Shipments.php.
07/03/15: Exson: Change login date of users without login record to 'No login record' instead of today. It's very confusion.
07/03/15 Exson: Fixed order value error that should be value undelivered instead of uncompleted line value and some notice noise in SelectSalesOrder.php.
|
|
From: <ex...@us...> - 2015-03-07 11:06:40
|
Revision: 7196
http://sourceforge.net/p/web-erp/reponame/7196
Author: exsonqu
Date: 2015-03-07 11:06:33 +0000 (Sat, 07 Mar 2015)
Log Message:
-----------
07/03/15 Exson: Fixed typo in AuditTrail.php.
Modified Paths:
--------------
trunk/AuditTrail.php
Modified: trunk/AuditTrail.php
===================================================================
--- trunk/AuditTrail.php 2015-03-07 10:13:47 UTC (rev 7195)
+++ trunk/AuditTrail.php 2015-03-07 11:06:33 UTC (rev 7196)
@@ -54,7 +54,7 @@
<td><select tabindex="3" name="SelectedUser">
<option value="ALL">' . _('All') . '</option>';
while ($Users = DB_fetch_row($UserResult)) {
- if (isset($_POST['SelectedUser']) and $users[0]==$_POST['SelectedUser']) {
+ if (isset($_POST['SelectedUser']) and $Users[0]==$_POST['SelectedUser']) {
echo '<option selected="selected" value="' . $Users[0] . '">' . $Users[0] . '</option>';
} else {
echo '<option value="' . $Users[0] . '">' . $Users[0] . '</option>';
@@ -226,4 +226,4 @@
}
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
|
|
From: <ex...@us...> - 2015-03-07 10:13:54
|
Revision: 7195
http://sourceforge.net/p/web-erp/reponame/7195
Author: exsonqu
Date: 2015-03-07 10:13:47 +0000 (Sat, 07 Mar 2015)
Log Message:
-----------
Modified Paths:
--------------
trunk/doc/Change.log
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-03-07 10:13:21 UTC (rev 7194)
+++ trunk/doc/Change.log 2015-03-07 10:13:47 UTC (rev 7195)
@@ -1,5 +1,6 @@
webERP Change Log
+07/03/15 Exson: Remove properties $_SESSION['Shipment']->GLLink which never been defined in Shipments.php.
07/03/15: Exson: Change login date of users without login record to 'No login record' instead of today. It's very confusion.
07/03/15 Exson: Fixed order value error that should be value undelivered instead of uncompleted line value and some notice noise in SelectSalesOrder.php.
3/4/15 Vitaly: Display Phantom assembly type correctly in SelectProduct.php
|
|
From: <ex...@us...> - 2015-03-07 10:13:29
|
Revision: 7194
http://sourceforge.net/p/web-erp/reponame/7194
Author: exsonqu
Date: 2015-03-07 10:13:21 +0000 (Sat, 07 Mar 2015)
Log Message:
-----------
07/03/15 Exson: Remove properties $_SESSION['Shipment']->GLLink which never been defined in Shipments.php.
Modified Paths:
--------------
trunk/Shipments.php
Modified: trunk/Shipments.php
===================================================================
--- trunk/Shipments.php 2015-03-07 02:22:36 UTC (rev 7193)
+++ trunk/Shipments.php 2015-03-07 10:13:21 UTC (rev 7194)
@@ -36,8 +36,6 @@
$_SESSION['Shipment'] = new Shipment;
- $_SESSION['Shipment']->GLLink = $_SESSION['CompanyRecord']['gllink_stock'];
-
/*read in all the guff from the selected shipment into the Shipment Class variable - the class code is included in the main script before this script is included */
$ShipmentHeaderSQL = "SELECT shipments.supplierid,
@@ -531,4 +529,4 @@
</form>';
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
|
|
From: <ex...@us...> - 2015-03-07 02:22:43
|
Revision: 7193
http://sourceforge.net/p/web-erp/reponame/7193
Author: exsonqu
Date: 2015-03-07 02:22:36 +0000 (Sat, 07 Mar 2015)
Log Message:
-----------
Modified Paths:
--------------
trunk/doc/Change.log
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-03-07 02:22:03 UTC (rev 7192)
+++ trunk/doc/Change.log 2015-03-07 02:22:36 UTC (rev 7193)
@@ -1,5 +1,6 @@
webERP Change Log
+07/03/15: Exson: Change login date of users without login record to 'No login record' instead of today. It's very confusion.
07/03/15 Exson: Fixed order value error that should be value undelivered instead of uncompleted line value and some notice noise in SelectSalesOrder.php.
3/4/15 Vitaly: Display Phantom assembly type correctly in SelectProduct.php
3/4/15 Vitaly: Added missing comma to SQL statement in Credit_Invoice.php
|
|
From: <ex...@us...> - 2015-03-07 02:22:05
|
Revision: 7192
http://sourceforge.net/p/web-erp/reponame/7192
Author: exsonqu
Date: 2015-03-07 02:22:03 +0000 (Sat, 07 Mar 2015)
Log Message:
-----------
07/03/15: Exson: Change login date of users without login record to 'No login record' instead of today. It's very confusion.
Modified Paths:
--------------
trunk/WWW_Users.php
Modified: trunk/WWW_Users.php
===================================================================
--- trunk/WWW_Users.php 2015-03-07 02:16:15 UTC (rev 7191)
+++ trunk/WWW_Users.php 2015-03-07 02:22:03 UTC (rev 7192)
@@ -327,7 +327,7 @@
}
if ($myrow[8]=='') {
- $LastVisitDate = Date($_SESSION['DefaultDateFormat']);
+ $LastVisitDate = _('No login record');
} else {
$LastVisitDate = ConvertSQLDate($myrow[8]);
}
|
|
From: <ex...@us...> - 2015-03-07 02:16:23
|
Revision: 7191
http://sourceforge.net/p/web-erp/reponame/7191
Author: exsonqu
Date: 2015-03-07 02:16:15 +0000 (Sat, 07 Mar 2015)
Log Message:
-----------
Modified Paths:
--------------
trunk/doc/Change.log
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-03-07 02:14:54 UTC (rev 7190)
+++ trunk/doc/Change.log 2015-03-07 02:16:15 UTC (rev 7191)
@@ -1,5 +1,6 @@
webERP Change Log
+07/03/15 Exson: Fixed order value error that should be value undelivered instead of uncompleted line value and some notice noise in SelectSalesOrder.php.
3/4/15 Vitaly: Display Phantom assembly type correctly in SelectProduct.php
3/4/15 Vitaly: Added missing comma to SQL statement in Credit_Invoice.php
3/3/15 RChacon: Adds cross.png to all css images for use in Reset or Cancel buttons as needed.
|
|
From: <ex...@us...> - 2015-03-07 02:14:57
|
Revision: 7190
http://sourceforge.net/p/web-erp/reponame/7190
Author: exsonqu
Date: 2015-03-07 02:14:54 +0000 (Sat, 07 Mar 2015)
Log Message:
-----------
07/03/15 Exson: Fixed order value error that should be value undelivered instead of uncompleted line value and some notice noise in SelectSalesOrder.php.
Modified Paths:
--------------
trunk/SelectSalesOrder.php
Modified: trunk/SelectSalesOrder.php
===================================================================
--- trunk/SelectSalesOrder.php 2015-03-05 23:49:01 UTC (rev 7189)
+++ trunk/SelectSalesOrder.php 2015-03-07 02:14:54 UTC (rev 7190)
@@ -496,11 +496,11 @@
echo '</select></td>
<td><select name="Quotations">';
- if ($_GET['Quotations']=='Quotes_Only'){
+ if (isset($_GET['Quotations']) AND $_GET['Quotations']=='Quotes_Only'){
$_POST['Quotations']='Quotes_Only';
}
- if ($_POST['Quotations']=='Quotes_Only'){
+ if (isset($_POST['Quotations']) AND $_POST['Quotations']=='Quotes_Only'){
echo '<option selected="selected" value="Quotes_Only">' . _('Quotations Only') . '</option>';
echo '<option value="Orders_Only">' . _('Orders Only') . '</option>';
} else {
@@ -613,7 +613,7 @@
salesorders.deliverto,
salesorders.printedpackingslip,
salesorders.poplaced,
- SUM(salesorderdetails.unitprice*salesorderdetails.quantity*(1-salesorderdetails.discountpercent)/currencies.rate) AS ordervalue
+ SUM(salesorderdetails.unitprice*(salesorderdetails.quantity-salesorderdetails.qtyinvoiced)*(1-salesorderdetails.discountpercent)/currencies.rate) AS ordervalue
FROM salesorders INNER JOIN salesorderdetails
ON salesorders.orderno = salesorderdetails.orderno
INNER JOIN debtorsmaster
@@ -915,4 +915,4 @@
return $StockItemsResult;
}
-?>
\ No newline at end of file
+?>
|
|
From: <rc...@us...> - 2015-03-05 23:49:09
|
Revision: 7189
http://sourceforge.net/p/web-erp/reponame/7189
Author: rchacon
Date: 2015-03-05 23:49:01 +0000 (Thu, 05 Mar 2015)
Log Message:
-----------
Format improvement: makes the body of the report use the entire width of the page.
Modified Paths:
--------------
trunk/GLBalanceSheet.php
trunk/GLProfit_Loss.php
Modified: trunk/GLBalanceSheet.php
===================================================================
--- trunk/GLBalanceSheet.php 2015-03-05 01:57:24 UTC (rev 7188)
+++ trunk/GLBalanceSheet.php 2015-03-05 23:49:01 UTC (rev 7189)
@@ -400,7 +400,7 @@
_('All amounts stated in').': '. _($CurrencyName[$_SESSION['CompanyRecord']['currencydefault']]).'</p>';// Page title, reporting presentation currency and level of rounding used.
echo '<div class="invoice">
- <table class="selection">';
+ <table class="selection" width="100%">';
if ($_POST['Detail']=='Detailed'){
$TableHeader = '<tr>
@@ -416,8 +416,8 @@
<th colspan="2">' ._('Last Year') . '</th>
</tr>';
}
+/* echo '<thead>' . $TableHeader . '<thead><tbody>';// thead used in conjunction with tbody enable scrolling of the table body independently of the header and footer. Also, when printing a large table that spans multiple pages, these elements can enable the table header to be printed at the top of each page. */
-
$k=0; //row colour counter
$Section='';
$SectionBalance = 0;
@@ -704,20 +704,18 @@
<td></td>
<td><hr /></td>
</tr>';
-
+/* echo '</tbody>';// See comment at the begin of the table.*/
echo '</table>';
echo '</div>';
- echo '<br />';
-/* <div class="centre noprint"><input type="submit" name="SelectADifferentPeriod" value="'._('Select A Different Balance Date').'" /></div>';*/
-
-echo '<div class="centre noprint">'.
+ echo '<br />
+ <div class="centre noprint">'.
'<button onclick="javascript:window.print()" type="button"><img alt="" src="'.$RootPath.'/css/'.$Theme.
'/images/printer.png" /> ' . _('Print This') . '</button>'.// "Print This" button.
'<button name="SelectADifferentPeriod" type="submit" value="'. _('Select A Different Period') .'"><img alt="" src="'.$RootPath.'/css/'.$Theme.
'/images/gl.png" /> ' . _('Select A Different Balance Date') . '</button>'.// "Select A Different Period" button.
'<button formaction="index.php" type="submit"><img alt="" src="'.$RootPath.'/css/'.$Theme.
'/images/previous.png" /> ' . _('Return') . '</button>'.// "Return" button.
- '</div>';
+ '</div>';
echo '</div></form>';
}
Modified: trunk/GLProfit_Loss.php
===================================================================
--- trunk/GLProfit_Loss.php 2015-03-05 01:57:24 UTC (rev 7188)
+++ trunk/GLProfit_Loss.php 2015-03-05 23:49:01 UTC (rev 7189)
@@ -625,7 +625,7 @@
/*show a table of the accounts info returned by the SQL
Account Code , Account Name , Month Actual, Month Budget, Period Actual, Period Budget */
- echo '<table class="selection">';
+ echo '<table class="selection" width="100%">';
if ($_POST['Detail']=='Detailed'){
$TableHeader = '<tr>
@@ -643,8 +643,8 @@
<th colspan="2">' . _('Last Year') . '</th>
</tr>';
}
+/* echo '<thead>' . $TableHeader . '<thead><tbody>';// thead used in conjunction with tbody enable scrolling of the table body independently of the header and footer. Also, when printing a large table that spans multiple pages, these elements can enable the table header to be printed at the top of each page. */
-
$j = 1;
$k=0; //row colour counter
$Section='';
@@ -1301,6 +1301,7 @@
<td colspan="2"></td>
<td colspan="6"><hr /></td>
</tr>';
+/* echo '</tbody>';// See comment at the begin of the table.*/
echo '</table>';
echo '<br />
<div class="centre noprint">'.
|
|
From: <vv...@us...> - 2015-03-05 01:57:26
|
Revision: 7188
http://sourceforge.net/p/web-erp/reponame/7188
Author: vvs2012
Date: 2015-03-05 01:57:24 +0000 (Thu, 05 Mar 2015)
Log Message:
-----------
Display Phantom assembly type correctly in SelectProduct.php
Modified Paths:
--------------
trunk/SelectProduct.php
trunk/doc/Change.log
Modified: trunk/SelectProduct.php
===================================================================
--- trunk/SelectProduct.php 2015-03-05 01:28:14 UTC (rev 7187)
+++ trunk/SelectProduct.php 2015-03-05 01:57:24 UTC (rev 7188)
@@ -101,6 +101,11 @@
echo _('Assembly Item');
$Its_A_Kitset_Assembly_Or_Dummy = True;
break;
+ case 'G':
+ echo _('Phantom Assembly Item');
+ $Its_A_Kitset_Assembly_Or_Dummy = True;
+ $Its_A_Kitset = True;
+ break;
case 'K':
echo _('Kitset Item');
$Its_A_Kitset_Assembly_Or_Dummy = True;
@@ -147,7 +152,7 @@
AND branchcode=''
AND startdate <= '". Date('Y-m-d') ."' AND ( enddate >= '" . Date('Y-m-d') . "' OR enddate = '0000-00-00')
AND stockid='" . $StockID . "'");
- if ($myrow['mbflag'] == 'K' OR $myrow['mbflag'] == 'A') {
+ if ($myrow['mbflag'] == 'K' OR $myrow['mbflag'] == 'A' OR $myrow['mbflag'] == 'G') {
$CostResult = DB_query("SELECT SUM(bom.quantity * (stockmaster.materialcost+stockmaster.labourcost+stockmaster.overheadcost)) AS cost
FROM bom INNER JOIN stockmaster
ON bom.component=stockmaster.stockid
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-03-05 01:28:14 UTC (rev 7187)
+++ trunk/doc/Change.log 2015-03-05 01:57:24 UTC (rev 7188)
@@ -1,5 +1,6 @@
webERP Change Log
+3/4/15 Vitaly: Display Phantom assembly type correctly in SelectProduct.php
3/4/15 Vitaly: Added missing comma to SQL statement in Credit_Invoice.php
3/3/15 RChacon: Adds cross.png to all css images for use in Reset or Cancel buttons as needed.
2/3/15 RChacon: Completes table-row colums, regroups price, cost and gross profit in one table-row, uses company decimal places for gross profit in SelectProduct.php.
|
|
From: <vv...@us...> - 2015-03-05 01:28:17
|
Revision: 7187
http://sourceforge.net/p/web-erp/reponame/7187
Author: vvs2012
Date: 2015-03-05 01:28:14 +0000 (Thu, 05 Mar 2015)
Log Message:
-----------
Added missing comma to SQL statement in Credit_Invoice.php
Modified Paths:
--------------
trunk/Credit_Invoice.php
trunk/doc/Change.log
Modified: trunk/Credit_Invoice.php
===================================================================
--- trunk/Credit_Invoice.php 2015-03-04 13:12:03 UTC (rev 7186)
+++ trunk/Credit_Invoice.php 2015-03-05 01:28:14 UTC (rev 7187)
@@ -922,7 +922,7 @@
'" . $CreditNo . "',
'" . $_SESSION['CreditItems' . $identifier]->Location . "',
'" . $DefaultDispatchDate . "',
- '" . $_SESSION['UserID'] . "'
+ '" . $_SESSION['UserID'] . "',
'" . $_SESSION['CreditItems' . $identifier]->DebtorNo . "',
'" . $_SESSION['CreditItems' . $identifier]->Branch . "',
'" . $LocalCurrencyPrice . "',
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-03-04 13:12:03 UTC (rev 7186)
+++ trunk/doc/Change.log 2015-03-05 01:28:14 UTC (rev 7187)
@@ -1,5 +1,6 @@
webERP Change Log
+3/4/15 Vitaly: Added missing comma to SQL statement in Credit_Invoice.php
3/3/15 RChacon: Adds cross.png to all css images for use in Reset or Cancel buttons as needed.
2/3/15 RChacon: Completes table-row colums, regroups price, cost and gross profit in one table-row, uses company decimal places for gross profit in SelectProduct.php.
25/2/15 TurboPT: Fix Z_ImportSupplier bug reported in forum by: Bill Schlaerth.
|
|
From: <rc...@us...> - 2015-03-04 13:12:05
|
Revision: 7186
http://sourceforge.net/p/web-erp/reponame/7186
Author: rchacon
Date: 2015-03-04 13:12:03 +0000 (Wed, 04 Mar 2015)
Log Message:
-----------
Fix, only one option selected per select.
Modified Paths:
--------------
trunk/GLProfit_Loss.php
Modified: trunk/GLProfit_Loss.php
===================================================================
--- trunk/GLProfit_Loss.php 2015-03-04 00:20:21 UTC (rev 7185)
+++ trunk/GLProfit_Loss.php 2015-03-04 13:12:03 UTC (rev 7186)
@@ -106,7 +106,7 @@
echo '<tr>
<td>' . _('Detail Or Summary').':</td>
<td><select name="Detail">
- <option selected="selected" value="Summary">' . _('Summary') . '</option>
+ <option value="Summary">' . _('Summary') . '</option>
<option selected="selected" value="Detailed">' . _('All Accounts') . '</option>
</select>
</td>
|
|
From: <rc...@us...> - 2015-03-04 00:20:28
|
Revision: 7185
http://sourceforge.net/p/web-erp/reponame/7185
Author: rchacon
Date: 2015-03-04 00:20:21 +0000 (Wed, 04 Mar 2015)
Log Message:
-----------
Replaces credit.gif with credit.png and deletes credit.gif.
Modified Paths:
--------------
trunk/Credit_Invoice.php
Removed Paths:
-------------
trunk/css/aguapop/images/credit.gif
trunk/css/default/images/credit.gif
trunk/css/fluid/images/credit.gif
trunk/css/fresh/images/credit.gif
trunk/css/gel/images/credit.gif
trunk/css/professional/images/credit.gif
trunk/css/professional-rtl/images/credit.gif
trunk/css/silverwolf/images/credit.gif
trunk/css/wood/images/credit.gif
trunk/css/xenos/images/credit.gif
Modified: trunk/Credit_Invoice.php
===================================================================
--- trunk/Credit_Invoice.php 2015-03-04 00:06:20 UTC (rev 7184)
+++ trunk/Credit_Invoice.php 2015-03-04 00:20:21 UTC (rev 7185)
@@ -273,7 +273,7 @@
/* Always display credit quantities
NB QtyDispatched in the LineItems array is used for the quantity to credit */
-echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/credit.gif" title="' . _('Search') . '" alt="" />' . $Title . '</p>';
+echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/credit.png" title="' . _('Search') . '" alt="" />' . $Title . '</p>';
if(!isset($_POST['ProcessCredit'])) {
Deleted: trunk/css/aguapop/images/credit.gif
===================================================================
(Binary files differ)
Deleted: trunk/css/default/images/credit.gif
===================================================================
(Binary files differ)
Deleted: trunk/css/fluid/images/credit.gif
===================================================================
(Binary files differ)
Deleted: trunk/css/fresh/images/credit.gif
===================================================================
(Binary files differ)
Deleted: trunk/css/gel/images/credit.gif
===================================================================
(Binary files differ)
Deleted: trunk/css/professional/images/credit.gif
===================================================================
(Binary files differ)
Deleted: trunk/css/professional-rtl/images/credit.gif
===================================================================
(Binary files differ)
Deleted: trunk/css/silverwolf/images/credit.gif
===================================================================
(Binary files differ)
Deleted: trunk/css/wood/images/credit.gif
===================================================================
(Binary files differ)
Deleted: trunk/css/xenos/images/credit.gif
===================================================================
(Binary files differ)
|
|
From: <rc...@us...> - 2015-03-04 00:06:22
|
Revision: 7184
http://sourceforge.net/p/web-erp/reponame/7184
Author: rchacon
Date: 2015-03-04 00:06:20 +0000 (Wed, 04 Mar 2015)
Log Message:
-----------
Replaces preview.gif with preview.png and deletes preview.gif.
Modified Paths:
--------------
trunk/CustomerTransInquiry.php
Removed Paths:
-------------
trunk/css/aguapop/images/preview.gif
trunk/css/default/images/preview.gif
trunk/css/fluid/images/preview.gif
trunk/css/fresh/images/preview.gif
trunk/css/gel/images/preview.gif
trunk/css/professional/images/preview.gif
trunk/css/professional-rtl/images/preview.gif
trunk/css/silverwolf/images/preview.gif
trunk/css/wood/images/preview.gif
trunk/css/xenos/images/preview.gif
Modified: trunk/CustomerTransInquiry.php
===================================================================
--- trunk/CustomerTransInquiry.php 2015-03-03 23:51:31 UTC (rev 7183)
+++ trunk/CustomerTransInquiry.php 2015-03-04 00:06:20 UTC (rev 7184)
@@ -152,7 +152,7 @@
$myrow['currcode'],
$RootPath,
$myrow['transno'],
- $RootPath.'/css/'.$Theme.'/images/preview.gif');
+ $RootPath.'/css/'.$Theme.'/images/preview.png');
} elseif($_POST['TransType']==11) { /* credit notes */
printf($format_base .
@@ -171,7 +171,7 @@
$myrow['currcode'],
$RootPath,
$myrow['transno'],
- $RootPath.'/css/'.$Theme.'/images/preview.gif');
+ $RootPath.'/css/'.$Theme.'/images/preview.png');
} else { /* otherwise */
printf($format_base . '</tr>',
_($myrow['typename']),
Deleted: trunk/css/aguapop/images/preview.gif
===================================================================
(Binary files differ)
Deleted: trunk/css/default/images/preview.gif
===================================================================
(Binary files differ)
Deleted: trunk/css/fluid/images/preview.gif
===================================================================
(Binary files differ)
Deleted: trunk/css/fresh/images/preview.gif
===================================================================
(Binary files differ)
Deleted: trunk/css/gel/images/preview.gif
===================================================================
(Binary files differ)
Deleted: trunk/css/professional/images/preview.gif
===================================================================
(Binary files differ)
Deleted: trunk/css/professional-rtl/images/preview.gif
===================================================================
(Binary files differ)
Deleted: trunk/css/silverwolf/images/preview.gif
===================================================================
(Binary files differ)
Deleted: trunk/css/wood/images/preview.gif
===================================================================
(Binary files differ)
Deleted: trunk/css/xenos/images/preview.gif
===================================================================
(Binary files differ)
|
|
From: <rc...@us...> - 2015-03-03 23:51:34
|
Revision: 7183
http://sourceforge.net/p/web-erp/reponame/7183
Author: rchacon
Date: 2015-03-03 23:51:31 +0000 (Tue, 03 Mar 2015)
Log Message:
-----------
Adds cross.png to all css images for use in Reset or Cancel buttons as needed.
Modified Paths:
--------------
trunk/doc/Change.log
Added Paths:
-----------
trunk/css/aguapop/images/cross.png
trunk/css/default/images/cross.png
trunk/css/fluid/images/cross.png
trunk/css/fresh/images/cross.png
trunk/css/gel/images/cross.png
trunk/css/professional/images/cross.png
trunk/css/professional-rtl/images/cross.png
trunk/css/silverwolf/images/cross.png
trunk/css/wood/images/cross.png
trunk/css/xenos/images/cross.png
Added: trunk/css/aguapop/images/cross.png
===================================================================
(Binary files differ)
Index: trunk/css/aguapop/images/cross.png
===================================================================
--- trunk/css/aguapop/images/cross.png 2015-03-03 14:38:37 UTC (rev 7182)
+++ trunk/css/aguapop/images/cross.png 2015-03-03 23:51:31 UTC (rev 7183)
Property changes on: trunk/css/aguapop/images/cross.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/css/default/images/cross.png
===================================================================
(Binary files differ)
Index: trunk/css/default/images/cross.png
===================================================================
--- trunk/css/default/images/cross.png 2015-03-03 14:38:37 UTC (rev 7182)
+++ trunk/css/default/images/cross.png 2015-03-03 23:51:31 UTC (rev 7183)
Property changes on: trunk/css/default/images/cross.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/css/fluid/images/cross.png
===================================================================
(Binary files differ)
Index: trunk/css/fluid/images/cross.png
===================================================================
--- trunk/css/fluid/images/cross.png 2015-03-03 14:38:37 UTC (rev 7182)
+++ trunk/css/fluid/images/cross.png 2015-03-03 23:51:31 UTC (rev 7183)
Property changes on: trunk/css/fluid/images/cross.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/css/fresh/images/cross.png
===================================================================
(Binary files differ)
Index: trunk/css/fresh/images/cross.png
===================================================================
--- trunk/css/fresh/images/cross.png 2015-03-03 14:38:37 UTC (rev 7182)
+++ trunk/css/fresh/images/cross.png 2015-03-03 23:51:31 UTC (rev 7183)
Property changes on: trunk/css/fresh/images/cross.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/css/gel/images/cross.png
===================================================================
(Binary files differ)
Index: trunk/css/gel/images/cross.png
===================================================================
--- trunk/css/gel/images/cross.png 2015-03-03 14:38:37 UTC (rev 7182)
+++ trunk/css/gel/images/cross.png 2015-03-03 23:51:31 UTC (rev 7183)
Property changes on: trunk/css/gel/images/cross.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/css/professional/images/cross.png
===================================================================
(Binary files differ)
Index: trunk/css/professional/images/cross.png
===================================================================
--- trunk/css/professional/images/cross.png 2015-03-03 14:38:37 UTC (rev 7182)
+++ trunk/css/professional/images/cross.png 2015-03-03 23:51:31 UTC (rev 7183)
Property changes on: trunk/css/professional/images/cross.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/css/professional-rtl/images/cross.png
===================================================================
(Binary files differ)
Index: trunk/css/professional-rtl/images/cross.png
===================================================================
--- trunk/css/professional-rtl/images/cross.png 2015-03-03 14:38:37 UTC (rev 7182)
+++ trunk/css/professional-rtl/images/cross.png 2015-03-03 23:51:31 UTC (rev 7183)
Property changes on: trunk/css/professional-rtl/images/cross.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/css/silverwolf/images/cross.png
===================================================================
(Binary files differ)
Index: trunk/css/silverwolf/images/cross.png
===================================================================
--- trunk/css/silverwolf/images/cross.png 2015-03-03 14:38:37 UTC (rev 7182)
+++ trunk/css/silverwolf/images/cross.png 2015-03-03 23:51:31 UTC (rev 7183)
Property changes on: trunk/css/silverwolf/images/cross.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/css/wood/images/cross.png
===================================================================
(Binary files differ)
Index: trunk/css/wood/images/cross.png
===================================================================
--- trunk/css/wood/images/cross.png 2015-03-03 14:38:37 UTC (rev 7182)
+++ trunk/css/wood/images/cross.png 2015-03-03 23:51:31 UTC (rev 7183)
Property changes on: trunk/css/wood/images/cross.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/css/xenos/images/cross.png
===================================================================
(Binary files differ)
Index: trunk/css/xenos/images/cross.png
===================================================================
--- trunk/css/xenos/images/cross.png 2015-03-03 14:38:37 UTC (rev 7182)
+++ trunk/css/xenos/images/cross.png 2015-03-03 23:51:31 UTC (rev 7183)
Property changes on: trunk/css/xenos/images/cross.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-03-03 14:38:37 UTC (rev 7182)
+++ trunk/doc/Change.log 2015-03-03 23:51:31 UTC (rev 7183)
@@ -1,5 +1,6 @@
webERP Change Log
+3/3/15 RChacon: Adds cross.png to all css images for use in Reset or Cancel buttons as needed.
2/3/15 RChacon: Completes table-row colums, regroups price, cost and gross profit in one table-row, uses company decimal places for gross profit in SelectProduct.php.
25/2/15 TurboPT: Fix Z_ImportSupplier bug reported in forum by: Bill Schlaerth.
22/2/15 TurboPT: Fix supplier delivery address bug reported in form by: Giusba
|
|
From: <rc...@us...> - 2015-03-03 14:38:44
|
Revision: 7182
http://sourceforge.net/p/web-erp/reponame/7182
Author: rchacon
Date: 2015-03-03 14:38:37 +0000 (Tue, 03 Mar 2015)
Log Message:
-----------
Reverse change: Use "1" instead of "$_SESSION['CompanyRecord']['decimalplaces']" for decimal places of gross profit (as previous version).
Modified Paths:
--------------
trunk/SelectProduct.php
Modified: trunk/SelectProduct.php
===================================================================
--- trunk/SelectProduct.php 2015-03-02 17:26:32 UTC (rev 7181)
+++ trunk/SelectProduct.php 2015-03-03 14:38:37 UTC (rev 7182)
@@ -1,5 +1,6 @@
<?php
/* $Id$*/
+/* Selection of items. All item maintenance, transactions and inquiries start with this script. */
$PricesSecurity = 12;//don't show pricing info unless security token 12 available to user
$SuppliersSecurity = 9; //don't show supplier purchasing info unless security token 9 available to user
@@ -174,7 +175,7 @@
<th class="number">' . _('Gross Profit') . ':</th>
<td class="select">';
if ($Price > 0) {
- echo locale_number_format(($Price - $Cost) * 100 / $Price, $_SESSION['CompanyRecord']['decimalplaces']) . '%';
+ echo locale_number_format(($Price - $Cost) * 100 / $Price, 1) . '%';
} else {
echo _('N/A');
}
|
|
From: <rc...@us...> - 2015-03-02 17:26:34
|
Revision: 7181
http://sourceforge.net/p/web-erp/reponame/7181
Author: rchacon
Date: 2015-03-02 17:26:32 +0000 (Mon, 02 Mar 2015)
Log Message:
-----------
Adds colon to table-titles.
Modified Paths:
--------------
trunk/SelectProduct.php
Modified: trunk/SelectProduct.php
===================================================================
--- trunk/SelectProduct.php 2015-03-02 15:48:19 UTC (rev 7180)
+++ trunk/SelectProduct.php 2015-03-02 17:26:32 UTC (rev 7181)
@@ -159,19 +159,19 @@
$Cost = $myrow['cost'];
}
echo '<tr>
- <th class="number">' . _('Price') . ':</th>
- <td class="select">';
+ <th class="number">' . _('Price') . ':</th>';
if (DB_num_rows($PriceResult) == 0) {
- echo _('No Default Price Set in Home Currency') . '</td></tr>';
+ echo '<td class="select" colspan="6">' . _('No Default Price Set in Home Currency') . '</td>
+ </tr>';
$Price = 0;
} else {
$PriceRow = DB_fetch_row($PriceResult);
$Price = $PriceRow[1];
- echo $PriceRow[0] . '</td>
+ echo '<td class="select">' . $PriceRow[0] . '</td>
<td class="select">' . locale_number_format($Price, $_SESSION['CompanyRecord']['decimalplaces']) . '</td>
- <th class="number">' . _('Cost') . '</th>
+ <th class="number">' . _('Cost') . ':</th>
<td class="select">' . locale_number_format($Cost, $_SESSION['StandardCostDecimalPlaces']) . '</td>
- <th class="number">' . _('Gross Profit') . '</th>
+ <th class="number">' . _('Gross Profit') . ':</th>
<td class="select">';
if ($Price > 0) {
echo locale_number_format(($Price - $Cost) * 100 / $Price, $_SESSION['CompanyRecord']['decimalplaces']) . '%';
|
15 messages has been excluded from this view by a project administrator.
