Menu
▾
▴
web-erp-svn
|
From: <dai...@us...> - 2011-05-16 07:41:53
|
Revision: 4570
http://web-erp.svn.sourceforge.net/web-erp/?rev=4570&view=rev
Author: daintree
Date: 2011-05-16 07:41:47 +0000 (Mon, 16 May 2011)
Log Message:
-----------
various
Modified Paths:
--------------
trunk/Suppliers.php
trunk/UpgradeDatabase.php
trunk/Z_ChangeStockCode.php
trunk/doc/Change.log
Modified: trunk/Suppliers.php
===================================================================
--- trunk/Suppliers.php 2011-05-15 07:53:42 UTC (rev 4569)
+++ trunk/Suppliers.php 2011-05-16 07:41:47 UTC (rev 4570)
@@ -936,7 +936,7 @@
DB_data_seek($result, 0);
- $sql = 'SELECT taxgroupid, taxgroupdescription FROM taxgroups';
+ $sql = "SELECT taxgroupid, taxgroupdescription FROM taxgroups";
$result = DB_query($sql, $db);
while ($myrow = DB_fetch_array($result)) {
Modified: trunk/UpgradeDatabase.php
===================================================================
--- trunk/UpgradeDatabase.php 2011-05-15 07:53:42 UTC (rev 4569)
+++ trunk/UpgradeDatabase.php 2011-05-16 07:41:47 UTC (rev 4570)
@@ -107,6 +107,7 @@
case '4.03':
case '4.03.2':
case '4.03.5':
+ case '4.03.7':
$SQLScripts[] = './sql/mysql/upgrade3.11.1-4.00.sql';
case '4.03.8':
$SQLScripts[] = './sql/mysql/upgrade4.03-4.04.sql';
Modified: trunk/Z_ChangeStockCode.php
===================================================================
--- trunk/Z_ChangeStockCode.php 2011-05-15 07:53:42 UTC (rev 4569)
+++ trunk/Z_ChangeStockCode.php 2011-05-16 07:41:47 UTC (rev 4570)
@@ -1,4 +1,5 @@
<?php
+
/* $Id$*/
/*Script to Delete all sales transactions*/
@@ -124,7 +125,7 @@
//check if MRP tables exist before assuming
- $result = DB_query("SELECT COUNT(*) FROM mrpplannedorders",$db);
+ $result = DB_query("SELECT COUNT(*) FROM mrpplannedorders",$db,'','',false,false);
if ($DB_error_no==0) {
echo '<br />' . _('Changing MRP planned orders information');
$sql = "UPDATE mrpplannedorders SET part='" . $_POST['NewStockID'] . "' WHERE part='" . $_POST['OldStockID'] . "'";
@@ -133,7 +134,7 @@
echo ' ... ' . _('completed');
}
- $result = DB_query("SELECT * FROM mrprequirements" , $db);
+ $result = DB_query("SELECT * FROM mrprequirements" , $db,'','',false,false);
if (DB_error_no($db)==0){
echo '<br />' . _('Changing MRP requirements information');
$sql = "UPDATE mrprequirements SET part='" . $_POST['NewStockID'] . "' WHERE part='" . $_POST['OldStockID'] . "'";
@@ -141,7 +142,7 @@
$result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
echo ' ... ' . _('completed');
}
- $result = DB_query("SELECT * FROM mrpsupplies" , $db);
+ $result = DB_query("SELECT * FROM mrpsupplies" , $db,'','',false,false);
if (DB_error_no($db)==0){
echo '<br />' . _('Changing MRP supplies information');
$sql = "UPDATE mrpsupplies SET part='" . $_POST['NewStockID'] . "' WHERE part='" . $_POST['OldStockID'] . "'";
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-05-15 07:53:42 UTC (rev 4569)
+++ trunk/doc/Change.log 2011-05-16 07:41:47 UTC (rev 4570)
@@ -1,6 +1,7 @@
webERP Change Log
-15/5/11 Z_ChangeStockCode.php modified to test if MRP tables exist before doing the updates
+15/5/11 Added upgrade from 4.03.7 to UpgradeDatabase.php
+15/5/11 Z_ChangeStockCode.php modified to test if MRP tables exist before doing the updates - turned off error trapping on these queries as the error trapping is done in the script
15/5/11 Tim: FixedAssetCategories prior to deletion of a category check for existing assets in the category failed due to typo in SQL - fixed
14/5/11 Tim: StockTransfer now checks for negative stock before allowing transfer - launchpad changes to 4691
14/5/11 CustomerInquiry.php now shows the currency decimal places
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-05-16 07:41:56
|
Revision: 4570
http://web-erp.svn.sourceforge.net/web-erp/?rev=4570&view=rev
Author: daintree
Date: 2011-05-16 07:41:47 +0000 (Mon, 16 May 2011)
Log Message:
-----------
various
Modified Paths:
--------------
trunk/Suppliers.php
trunk/UpgradeDatabase.php
trunk/Z_ChangeStockCode.php
trunk/doc/Change.log
Modified: trunk/Suppliers.php
===================================================================
--- trunk/Suppliers.php 2011-05-15 07:53:42 UTC (rev 4569)
+++ trunk/Suppliers.php 2011-05-16 07:41:47 UTC (rev 4570)
@@ -936,7 +936,7 @@
DB_data_seek($result, 0);
- $sql = 'SELECT taxgroupid, taxgroupdescription FROM taxgroups';
+ $sql = "SELECT taxgroupid, taxgroupdescription FROM taxgroups";
$result = DB_query($sql, $db);
while ($myrow = DB_fetch_array($result)) {
Modified: trunk/UpgradeDatabase.php
===================================================================
--- trunk/UpgradeDatabase.php 2011-05-15 07:53:42 UTC (rev 4569)
+++ trunk/UpgradeDatabase.php 2011-05-16 07:41:47 UTC (rev 4570)
@@ -107,6 +107,7 @@
case '4.03':
case '4.03.2':
case '4.03.5':
+ case '4.03.7':
$SQLScripts[] = './sql/mysql/upgrade3.11.1-4.00.sql';
case '4.03.8':
$SQLScripts[] = './sql/mysql/upgrade4.03-4.04.sql';
Modified: trunk/Z_ChangeStockCode.php
===================================================================
--- trunk/Z_ChangeStockCode.php 2011-05-15 07:53:42 UTC (rev 4569)
+++ trunk/Z_ChangeStockCode.php 2011-05-16 07:41:47 UTC (rev 4570)
@@ -1,4 +1,5 @@
<?php
+
/* $Id$*/
/*Script to Delete all sales transactions*/
@@ -124,7 +125,7 @@
//check if MRP tables exist before assuming
- $result = DB_query("SELECT COUNT(*) FROM mrpplannedorders",$db);
+ $result = DB_query("SELECT COUNT(*) FROM mrpplannedorders",$db,'','',false,false);
if ($DB_error_no==0) {
echo '<br />' . _('Changing MRP planned orders information');
$sql = "UPDATE mrpplannedorders SET part='" . $_POST['NewStockID'] . "' WHERE part='" . $_POST['OldStockID'] . "'";
@@ -133,7 +134,7 @@
echo ' ... ' . _('completed');
}
- $result = DB_query("SELECT * FROM mrprequirements" , $db);
+ $result = DB_query("SELECT * FROM mrprequirements" , $db,'','',false,false);
if (DB_error_no($db)==0){
echo '<br />' . _('Changing MRP requirements information');
$sql = "UPDATE mrprequirements SET part='" . $_POST['NewStockID'] . "' WHERE part='" . $_POST['OldStockID'] . "'";
@@ -141,7 +142,7 @@
$result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
echo ' ... ' . _('completed');
}
- $result = DB_query("SELECT * FROM mrpsupplies" , $db);
+ $result = DB_query("SELECT * FROM mrpsupplies" , $db,'','',false,false);
if (DB_error_no($db)==0){
echo '<br />' . _('Changing MRP supplies information');
$sql = "UPDATE mrpsupplies SET part='" . $_POST['NewStockID'] . "' WHERE part='" . $_POST['OldStockID'] . "'";
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-05-15 07:53:42 UTC (rev 4569)
+++ trunk/doc/Change.log 2011-05-16 07:41:47 UTC (rev 4570)
@@ -1,6 +1,7 @@
webERP Change Log
-15/5/11 Z_ChangeStockCode.php modified to test if MRP tables exist before doing the updates
+15/5/11 Added upgrade from 4.03.7 to UpgradeDatabase.php
+15/5/11 Z_ChangeStockCode.php modified to test if MRP tables exist before doing the updates - turned off error trapping on these queries as the error trapping is done in the script
15/5/11 Tim: FixedAssetCategories prior to deletion of a category check for existing assets in the category failed due to typo in SQL - fixed
14/5/11 Tim: StockTransfer now checks for negative stock before allowing transfer - launchpad changes to 4691
14/5/11 CustomerInquiry.php now shows the currency decimal places
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-05-16 10:46:56
|
Revision: 4571
http://web-erp.svn.sourceforge.net/web-erp/?rev=4571&view=rev
Author: daintree
Date: 2011-05-16 10:46:50 +0000 (Mon, 16 May 2011)
Log Message:
-----------
various
Modified Paths:
--------------
trunk/PO_Header.php
trunk/SelectOrderItems.php
trunk/doc/Change.log
Modified: trunk/PO_Header.php
===================================================================
--- trunk/PO_Header.php 2011-05-16 07:41:47 UTC (rev 4570)
+++ trunk/PO_Header.php 2011-05-16 10:46:50 UTC (rev 4571)
@@ -84,7 +84,7 @@
if ($_POST['Status'] == 'Authorised') {
if ($AuthorityLevel > $OrderTotal) {
- $_SESSION['PO'.$identifier]->StatusComments = date($_SESSION['DefaultDateFormat']) . ' - ' . _('Authorised by') . $UserChangedStatus . $_POST['StatusComments'] . '<br />' . html_entity_decode($_POST['StatusCommentsComplete']);
+ $_SESSION['PO'.$identifier]->StatusComments = date($_SESSION['DefaultDateFormat']) . ' - ' . _('Authorised by') . $UserChangedStatus . $_POST['StatusComments'] . '<br />' . html_entity_decode($_POST['StatusCommentsComplete'],ENT_QUOTES,'UTF-8');
$_SESSION['PO'.$identifier]->AllowPrintPO=1;
} else {
$OKToUpdateStatus=0;
@@ -109,7 +109,7 @@
}
if ($OKToUpdateStatus==1){ // none of the order has been received
if ($AuthorityLevel>$OrderTotal) {
- $_SESSION['PO'.$identifier]->StatusComments = date($_SESSION['DefaultDateFormat']).' - ' . $_POST['Status'] . ' ' . _('by') . $UserChangedStatus . $_POST['StatusComments'].'<br />' . $_POST['StatusCommentsComplete'];
+ $_SESSION['PO'.$identifier]->StatusComments = date($_SESSION['DefaultDateFormat']).' - ' . $_POST['Status'] . ' ' . _('by') . $UserChangedStatus . $_POST['StatusComments'].'<br />' . html_entity_decode($_POST['StatusCommentsComplete'], ENT_QUOTES,'UTF-8');
} else {
$OKToUpdateStatus=0;
prnMsg( _('You do not have permission to reject this purchase order').'.<br />'. _('This order is for').' '.
@@ -129,7 +129,7 @@
if (($AuthorityLevel>$OrderTotal OR $_SESSION['UserID']==$_SESSION['PO'.$identifier]->Initiator ) AND $OKToUpdateStatus==1) {
- $_SESSION['PO'.$identifier]->StatusComments = date($_SESSION['DefaultDateFormat']).' - ' . _('Order set to pending status by') . $UserChangedStatus . $_POST['StatusComments']. '<br />' .$_POST['StatusCommentsComplete'];
+ $_SESSION['PO'.$identifier]->StatusComments = date($_SESSION['DefaultDateFormat']).' - ' . _('Order set to pending status by') . $UserChangedStatus . $_POST['StatusComments']. '<br />' .html_entity_decode($_POST['StatusCommentsComplete'],ENT_QUOTES,'UTF-8');
} elseif ($AuthorityLevel<$OrderTotal AND $_SESSION['UserID']!=$_SESSION['PO'.$identifier]->Initiator) {
$OKToUpdateStatus=0;
@@ -281,7 +281,7 @@
if ($_SESSION['PO'.$identifier]->Any_Already_Received()==0){
$_SESSION['RequireSupplierSelection']=1;
$_SESSION['PO'.$identifier]->Status = 'Pending';
- $_SESSION['PO'.$identifier]->StatusComments==date($_SESSION['DefaultDateFormat']).' - ' . _('Supplier changed by') . ' <a href="mailto:'. $_SESSION['UserEmail'] .'">'.$_SESSION['UserID']. '</a> - '.$_POST['StatusComments'].'<br />'.$_POST['StatusCommentsComplete'];
+ $_SESSION['PO'.$identifier]->StatusComments==date($_SESSION['DefaultDateFormat']).' - ' . _('Supplier changed by') . ' <a href="mailto:'. $_SESSION['UserEmail'] .'">'.$_SESSION['UserID']. '</a> - '.$_POST['StatusComments'].'<br />'.html_entity_decode($_POST['StatusCommentsComplete'], ENT_QUOTES,'UTF-8');
} else {
echo '<br /><br />';
prnMsg(_('Cannot modify the supplier of the order once some of the order has been received'),'warn');
@@ -583,7 +583,6 @@
if ($_SESSION['ExistingOrder']) {
echo _(' Modify Purchase Order Number') . ' ' . $_SESSION['PO'.$identifier]->OrderNo;
- echo '</p>';
}
if (isset($Purch_Item)) {
@@ -689,7 +688,7 @@
</tr>
<tr><td style="width:50%">';
//sub table starts
- echo '<table class=selection width=100%>';
+ echo '<table class="selection" width="100%">';
echo '<tr><td>' . _('PO Date') . ':</td><td>';
if ($_SESSION['ExistingOrder']!=0){
echo ConvertSQLDate($_SESSION['PO'.$identifier]->Orig_OrderDate);
@@ -757,8 +756,9 @@
}
echo '</table>';
-
- echo '<td style="width:50%" valign=top><table class=selection width=100%>';
+ //Set up the next column with a sub-table in it too
+ echo '<td style="width:50%" valign=top>
+ <table class="selection" width="100%">';
if($_SESSION['ExistingOrder'] != 0 AND $_SESSION['PO'.$identifier]->Status == 'Printed'){
@@ -769,7 +769,8 @@
echo '<input type="hidden" name="Status" value="NewOrder">';
echo '<tr><td>' . _('New Purchase Order') . '</td></tr>';
} else {
- echo '<tr><td>' . _('Status') . ' : </td><td><select name="Status" onChange="ReloadForm(form1.UpdateStatus)">';
+ echo '<tr><td>' . _('Status') . ' : </td>
+ <td><select name="Status" onChange="ReloadForm(form1.UpdateStatus)">';
switch ($_SESSION['PO'.$identifier]->Status) {
case 'Pending':
@@ -807,8 +808,8 @@
echo '<tr><td>' . _('Status Comment') . ':</td>
<td><input type=text name="StatusComments" size=50></td></tr>
<tr><td colspan=2><b>' . $_SESSION['PO'.$identifier]->StatusComments .'</b></td></tr>';
- //need to use single quotes as double quotes inside the string of StatusComments
- echo '<input type="hidden" name="StatusCommentsComplete" value="' . $_SESSION['PO'.$identifier]->StatusComments .'">';
+
+ echo '<input type="hidden" name="StatusCommentsComplete" value="' . htmlentities($_SESSION['PO'.$identifier]->StatusComments, ENT_QUOTES,'UTF-8') .'" />';
echo '<tr><td><input type="submit" name="UpdateStatus" value="' . _('Status Update') .'"></td>';
} //end its not a new order
Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php 2011-05-16 07:41:47 UTC (rev 4570)
+++ trunk/SelectOrderItems.php 2011-05-16 10:46:50 UTC (rev 4571)
@@ -1652,10 +1652,9 @@
// Find the quantity on outstanding sales orders
$sql = "SELECT SUM(salesorderdetails.quantity-salesorderdetails.qtyinvoiced) AS dem
- FROM salesorderdetails,
- salesorders
- WHERE salesorders.orderno = salesorderdetails.orderno
- AND salesorders.fromstkloc='" . $_SESSION['Items'.$identifier]->Location . "'
+ FROM salesorderdetails INNER JOIN salesorders
+ ON salesorders.orderno = salesorderdetails.orderno
+ WHERE salesorders.fromstkloc='" . $_SESSION['Items'.$identifier]->Location . "'
AND salesorderdetails.completed=0
AND salesorders.quotation=0
AND salesorderdetails.stkcode='" . $myrow['stockid'] . "'";
@@ -1672,7 +1671,8 @@
// Find the quantity on purchase orders
$sql = "SELECT SUM(purchorderdetails.quantityord-purchorderdetails.quantityrecd) AS qoo
- FROM purchorderdetails INNER JOIN purchorders
+ FROM purchorderdetails INNER JOIN purchorders
+ ON purchorderdetails.orderno=purchorders.orderno
WHERE purchorderdetails.completed=0
AND purchorders.status<>'Cancelled'
AND purchorders.status<>'Rejected'
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-05-16 07:41:47 UTC (rev 4570)
+++ trunk/doc/Change.log 2011-05-16 10:46:50 UTC (rev 4571)
@@ -1,6 +1,7 @@
webERP Change Log
-15/5/11 Added upgrade from 4.03.7 to UpgradeDatabase.php
+16/5/11 Bug in quantity on purchase order in SelectOrderItems.php added correct join syntax
+16/5/11 Added upgrade from 4.03.7 to UpgradeDatabase.php
15/5/11 Z_ChangeStockCode.php modified to test if MRP tables exist before doing the updates - turned off error trapping on these queries as the error trapping is done in the script
15/5/11 Tim: FixedAssetCategories prior to deletion of a category check for existing assets in the category failed due to typo in SQL - fixed
14/5/11 Tim: StockTransfer now checks for negative stock before allowing transfer - launchpad changes to 4691
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-05-16 10:46:57
|
Revision: 4571
http://web-erp.svn.sourceforge.net/web-erp/?rev=4571&view=rev
Author: daintree
Date: 2011-05-16 10:46:50 +0000 (Mon, 16 May 2011)
Log Message:
-----------
various
Modified Paths:
--------------
trunk/PO_Header.php
trunk/SelectOrderItems.php
trunk/doc/Change.log
Modified: trunk/PO_Header.php
===================================================================
--- trunk/PO_Header.php 2011-05-16 07:41:47 UTC (rev 4570)
+++ trunk/PO_Header.php 2011-05-16 10:46:50 UTC (rev 4571)
@@ -84,7 +84,7 @@
if ($_POST['Status'] == 'Authorised') {
if ($AuthorityLevel > $OrderTotal) {
- $_SESSION['PO'.$identifier]->StatusComments = date($_SESSION['DefaultDateFormat']) . ' - ' . _('Authorised by') . $UserChangedStatus . $_POST['StatusComments'] . '<br />' . html_entity_decode($_POST['StatusCommentsComplete']);
+ $_SESSION['PO'.$identifier]->StatusComments = date($_SESSION['DefaultDateFormat']) . ' - ' . _('Authorised by') . $UserChangedStatus . $_POST['StatusComments'] . '<br />' . html_entity_decode($_POST['StatusCommentsComplete'],ENT_QUOTES,'UTF-8');
$_SESSION['PO'.$identifier]->AllowPrintPO=1;
} else {
$OKToUpdateStatus=0;
@@ -109,7 +109,7 @@
}
if ($OKToUpdateStatus==1){ // none of the order has been received
if ($AuthorityLevel>$OrderTotal) {
- $_SESSION['PO'.$identifier]->StatusComments = date($_SESSION['DefaultDateFormat']).' - ' . $_POST['Status'] . ' ' . _('by') . $UserChangedStatus . $_POST['StatusComments'].'<br />' . $_POST['StatusCommentsComplete'];
+ $_SESSION['PO'.$identifier]->StatusComments = date($_SESSION['DefaultDateFormat']).' - ' . $_POST['Status'] . ' ' . _('by') . $UserChangedStatus . $_POST['StatusComments'].'<br />' . html_entity_decode($_POST['StatusCommentsComplete'], ENT_QUOTES,'UTF-8');
} else {
$OKToUpdateStatus=0;
prnMsg( _('You do not have permission to reject this purchase order').'.<br />'. _('This order is for').' '.
@@ -129,7 +129,7 @@
if (($AuthorityLevel>$OrderTotal OR $_SESSION['UserID']==$_SESSION['PO'.$identifier]->Initiator ) AND $OKToUpdateStatus==1) {
- $_SESSION['PO'.$identifier]->StatusComments = date($_SESSION['DefaultDateFormat']).' - ' . _('Order set to pending status by') . $UserChangedStatus . $_POST['StatusComments']. '<br />' .$_POST['StatusCommentsComplete'];
+ $_SESSION['PO'.$identifier]->StatusComments = date($_SESSION['DefaultDateFormat']).' - ' . _('Order set to pending status by') . $UserChangedStatus . $_POST['StatusComments']. '<br />' .html_entity_decode($_POST['StatusCommentsComplete'],ENT_QUOTES,'UTF-8');
} elseif ($AuthorityLevel<$OrderTotal AND $_SESSION['UserID']!=$_SESSION['PO'.$identifier]->Initiator) {
$OKToUpdateStatus=0;
@@ -281,7 +281,7 @@
if ($_SESSION['PO'.$identifier]->Any_Already_Received()==0){
$_SESSION['RequireSupplierSelection']=1;
$_SESSION['PO'.$identifier]->Status = 'Pending';
- $_SESSION['PO'.$identifier]->StatusComments==date($_SESSION['DefaultDateFormat']).' - ' . _('Supplier changed by') . ' <a href="mailto:'. $_SESSION['UserEmail'] .'">'.$_SESSION['UserID']. '</a> - '.$_POST['StatusComments'].'<br />'.$_POST['StatusCommentsComplete'];
+ $_SESSION['PO'.$identifier]->StatusComments==date($_SESSION['DefaultDateFormat']).' - ' . _('Supplier changed by') . ' <a href="mailto:'. $_SESSION['UserEmail'] .'">'.$_SESSION['UserID']. '</a> - '.$_POST['StatusComments'].'<br />'.html_entity_decode($_POST['StatusCommentsComplete'], ENT_QUOTES,'UTF-8');
} else {
echo '<br /><br />';
prnMsg(_('Cannot modify the supplier of the order once some of the order has been received'),'warn');
@@ -583,7 +583,6 @@
if ($_SESSION['ExistingOrder']) {
echo _(' Modify Purchase Order Number') . ' ' . $_SESSION['PO'.$identifier]->OrderNo;
- echo '</p>';
}
if (isset($Purch_Item)) {
@@ -689,7 +688,7 @@
</tr>
<tr><td style="width:50%">';
//sub table starts
- echo '<table class=selection width=100%>';
+ echo '<table class="selection" width="100%">';
echo '<tr><td>' . _('PO Date') . ':</td><td>';
if ($_SESSION['ExistingOrder']!=0){
echo ConvertSQLDate($_SESSION['PO'.$identifier]->Orig_OrderDate);
@@ -757,8 +756,9 @@
}
echo '</table>';
-
- echo '<td style="width:50%" valign=top><table class=selection width=100%>';
+ //Set up the next column with a sub-table in it too
+ echo '<td style="width:50%" valign=top>
+ <table class="selection" width="100%">';
if($_SESSION['ExistingOrder'] != 0 AND $_SESSION['PO'.$identifier]->Status == 'Printed'){
@@ -769,7 +769,8 @@
echo '<input type="hidden" name="Status" value="NewOrder">';
echo '<tr><td>' . _('New Purchase Order') . '</td></tr>';
} else {
- echo '<tr><td>' . _('Status') . ' : </td><td><select name="Status" onChange="ReloadForm(form1.UpdateStatus)">';
+ echo '<tr><td>' . _('Status') . ' : </td>
+ <td><select name="Status" onChange="ReloadForm(form1.UpdateStatus)">';
switch ($_SESSION['PO'.$identifier]->Status) {
case 'Pending':
@@ -807,8 +808,8 @@
echo '<tr><td>' . _('Status Comment') . ':</td>
<td><input type=text name="StatusComments" size=50></td></tr>
<tr><td colspan=2><b>' . $_SESSION['PO'.$identifier]->StatusComments .'</b></td></tr>';
- //need to use single quotes as double quotes inside the string of StatusComments
- echo '<input type="hidden" name="StatusCommentsComplete" value="' . $_SESSION['PO'.$identifier]->StatusComments .'">';
+
+ echo '<input type="hidden" name="StatusCommentsComplete" value="' . htmlentities($_SESSION['PO'.$identifier]->StatusComments, ENT_QUOTES,'UTF-8') .'" />';
echo '<tr><td><input type="submit" name="UpdateStatus" value="' . _('Status Update') .'"></td>';
} //end its not a new order
Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php 2011-05-16 07:41:47 UTC (rev 4570)
+++ trunk/SelectOrderItems.php 2011-05-16 10:46:50 UTC (rev 4571)
@@ -1652,10 +1652,9 @@
// Find the quantity on outstanding sales orders
$sql = "SELECT SUM(salesorderdetails.quantity-salesorderdetails.qtyinvoiced) AS dem
- FROM salesorderdetails,
- salesorders
- WHERE salesorders.orderno = salesorderdetails.orderno
- AND salesorders.fromstkloc='" . $_SESSION['Items'.$identifier]->Location . "'
+ FROM salesorderdetails INNER JOIN salesorders
+ ON salesorders.orderno = salesorderdetails.orderno
+ WHERE salesorders.fromstkloc='" . $_SESSION['Items'.$identifier]->Location . "'
AND salesorderdetails.completed=0
AND salesorders.quotation=0
AND salesorderdetails.stkcode='" . $myrow['stockid'] . "'";
@@ -1672,7 +1671,8 @@
// Find the quantity on purchase orders
$sql = "SELECT SUM(purchorderdetails.quantityord-purchorderdetails.quantityrecd) AS qoo
- FROM purchorderdetails INNER JOIN purchorders
+ FROM purchorderdetails INNER JOIN purchorders
+ ON purchorderdetails.orderno=purchorders.orderno
WHERE purchorderdetails.completed=0
AND purchorders.status<>'Cancelled'
AND purchorders.status<>'Rejected'
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-05-16 07:41:47 UTC (rev 4570)
+++ trunk/doc/Change.log 2011-05-16 10:46:50 UTC (rev 4571)
@@ -1,6 +1,7 @@
webERP Change Log
-15/5/11 Added upgrade from 4.03.7 to UpgradeDatabase.php
+16/5/11 Bug in quantity on purchase order in SelectOrderItems.php added correct join syntax
+16/5/11 Added upgrade from 4.03.7 to UpgradeDatabase.php
15/5/11 Z_ChangeStockCode.php modified to test if MRP tables exist before doing the updates - turned off error trapping on these queries as the error trapping is done in the script
15/5/11 Tim: FixedAssetCategories prior to deletion of a category check for existing assets in the category failed due to typo in SQL - fixed
14/5/11 Tim: StockTransfer now checks for negative stock before allowing transfer - launchpad changes to 4691
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-05-23 10:14:15
|
Revision: 4572
http://web-erp.svn.sourceforge.net/web-erp/?rev=4572&view=rev
Author: daintree
Date: 2011-05-23 10:14:06 +0000 (Mon, 23 May 2011)
Log Message:
-----------
various
Modified Paths:
--------------
trunk/Areas.php
trunk/AuditTrail.php
trunk/BankMatching.php
trunk/BankReconciliation.php
trunk/ContractBOM.php
trunk/CreditStatus.php
trunk/CustomerBranches.php
trunk/CustomerInquiry.php
trunk/CustomerReceipt.php
trunk/DailySalesInquiry.php
trunk/FTP_RadioBeacon.php
trunk/FreightCosts.php
trunk/GLTransInquiry.php
trunk/GoodsReceived.php
trunk/PO_Header.php
trunk/PO_Items.php
trunk/PO_SelectOSPurchOrder.php
trunk/PaymentMethods.php
trunk/PaymentTerms.php
trunk/SelectProduct.php
trunk/StockQties_csv.php
trunk/SuppInvGRNs.php
trunk/SuppTransGLAnalysis.php
trunk/SupplierAllocations.php
trunk/SupplierInvoice.php
trunk/UpgradeDatabase.php
trunk/WWW_Access.php
trunk/doc/Change.log
trunk/includes/DefinePOClass.php
trunk/includes/DefineSuppAllocsClass.php
trunk/includes/DefineSuppTransClass.php
trunk/includes/PO_ReadInOrder.inc
trunk/includes/footer.inc
trunk/index.php
Removed Paths:
-------------
trunk/SystemCheck.php
Modified: trunk/Areas.php
===================================================================
--- trunk/Areas.php 2011-05-16 10:46:50 UTC (rev 4571)
+++ trunk/Areas.php 2011-05-23 10:14:06 UTC (rev 4572)
@@ -1,7 +1,6 @@
<?php
-/* $Revision: 1.22 $ */
+
/* $Id$*/
-//$PageSecurity = 3;
include('includes/session.inc');
@@ -163,7 +162,7 @@
echo '<td>' . $myrow[0] . '</td>
<td>' . $myrow[1] . '</td>';
echo '<td><a href="' . $_SERVER['PHP_SELF'] . '?SelectedArea=' . $myrow[0] . '">' . _('Edit') . '</a></td>';
- echo '<td><a href="' . $_SERVER['PHP_SELF'] . '?SelectedArea=' . $myrow[0] . '&delete=yes">' . _('Delete') . '</a></td>';
+ echo '<td><a href="' . $_SERVER['PHP_SELF'] . '?SelectedArea=' . $myrow[0] . '&delete=yes" onclick="return confirm(\'' . _('Are you sure you wish to delete this sales area?') . '\');">' . _('Delete') . '</a></td>';
echo '<td><a href="SelectCustomer.php'. '?Area=' . $myrow[0] . '">' . _('View Customers from this Area') . '</a></td>';
}
//END WHILE LIST LOOP
Modified: trunk/AuditTrail.php
===================================================================
--- trunk/AuditTrail.php 2011-05-16 10:46:50 UTC (rev 4571)
+++ trunk/AuditTrail.php 2011-05-23 10:14:06 UTC (rev 4572)
@@ -30,7 +30,7 @@
echo '<form action="' . $_SERVER['PHP_SELF'] . '" method="post">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-echo '<table class=selection>';
+echo '<table class="selection">';
echo '<tr><td>'. _('From Date') . ' ' . $_SESSION['DefaultDateFormat'] .'</td>
<td><input tabindex="1" type=text class=date alt="'.$_SESSION['DefaultDateFormat'].'" name="FromDate" size="11" maxlength="10" value=' .$_POST['FromDate'].'></td></tr>';
@@ -40,7 +40,7 @@
// Show user selections
echo '<tr><td>'. _('User ID'). '</td>
<td><select tabindex="3" name="SelectedUser">';
-echo '<option value="ALL">' . _('ALL') . '</option>';
+echo '<option value="ALL">' . _('All') . '</option>';
while ($users = DB_fetch_row($UserResult)) {
if (isset($_POST['SelectedUser']) and $users[0]==$_POST['SelectedUser']) {
echo '<option selected value="' . $users[0] . '">' . $users[0] . '</option>';
@@ -53,7 +53,7 @@
// Show table selections
echo '<tr><td>'. _('Table '). '</td>
<td><select tabindex="4" name="SelectedTable">';
-echo '<option value="ALL">' . _('ALL') . '</option>';
+echo '<option value="ALL">' . _('All') . '</option>';
while ($tables = DB_fetch_row($TableResult)) {
if (isset($_POST['SelectedTable']) and $tables[0]==$_POST['SelectedTable']) {
echo '<option selected value=' . $tables[0] . '>' . $tables[0] . '</option>';
@@ -176,7 +176,7 @@
for ($i=1; $i<sizeof($_SESSION['SQLString']['fields']); $i++) {
if (isset($_SESSION['SQLString']['values'][$i]) and (trim(str_replace("'","",$_SESSION['SQLString']['values'][$i])) != "") &
(trim($_SESSION['SQLString']['fields'][$i]) != 'password') &
- (trim($_SESSION['SQLString']['fields'][$i]) != "www_users.password")) {
+ (trim($_SESSION['SQLString']['fields'][$i]) != 'www_users.password')) {
echo '<tr bgcolor="' . $RowColour . '">';
echo '<td></td>
<td></td>
Modified: trunk/BankMatching.php
===================================================================
--- trunk/BankMatching.php 2011-05-16 10:46:50 UTC (rev 4571)
+++ trunk/BankMatching.php 2011-05-23 10:14:06 UTC (rev 4572)
@@ -1,10 +1,8 @@
<?php
-/* $Revision: 1.23 $ */
+
/* $Id$*/
-//$PageSecurity = 7;
-
-include("includes/session.inc");
+include('includes/session.inc');
$title = _('Bank Account Matching');
include('includes/header.inc');
@@ -29,9 +27,16 @@
exit;
}
+if (isset($_GET['Account'])) {
+ $_POST['BankAccount']=$_GET['Account'];
+ $_POST['ShowTransactions']=true;
+ $_POST['Ostg_or_All']='Ostg';
+ $_POST['First20_or_All']='All';
+}
+
if (isset($_POST['Update']) AND $_POST['RowCounter']>1){
for ($Counter=1;$Counter <= $_POST['RowCounter']; $Counter++){
- if (isset($_POST["Clear_" . $Counter]) and $_POST["Clear_" . $Counter]==True){
+ if (isset($_POST['Clear_' . $Counter]) AND $_POST['Clear_' . $Counter]==True){
/*Get amount to be cleared */
$sql = "SELECT amount,
exrate
@@ -79,13 +84,13 @@
echo '<table class=selection><tr>';
echo '<td align=left>' . _('Bank Account') . ':</td><td colspan=3><select tabindex="1" name="BankAccount">';
-$sql = 'SELECT accountcode, bankaccountname FROM bankaccounts';
+$sql = "SELECT accountcode, bankaccountname FROM bankaccounts";
$resultBankActs = DB_query($sql,$db);
while ($myrow=DB_fetch_array($resultBankActs)){
if (isset($_POST['BankAccount']) and $myrow['accountcode']==$_POST['BankAccount']){
- echo "<option selected Value='" . $myrow['accountcode'] . "'>" . $myrow['bankaccountname'];
+ echo '<option selected value="' . $myrow['accountcode'] . '">' . $myrow['bankaccountname'] . '</option>';
} else {
- echo "<option Value='" . $myrow['accountcode'] . "'>" . $myrow['bankaccountname'];
+ echo '<option value="' . $myrow['accountcode'] . '">' . $myrow['bankaccountname'] . '</option>';
}
}
@@ -95,12 +100,12 @@
$_POST['BeforeDate'] = Date($_SESSION['DefaultDateFormat']);
}
if (!isset($_POST['AfterDate']) OR !Is_Date($_POST['AfterDate'])){
- $_POST['AfterDate'] = Date($_SESSION['DefaultDateFormat'], Mktime(0,0,0,Date("m")-3,Date("d"),Date("y")));
+ $_POST['AfterDate'] = Date($_SESSION['DefaultDateFormat'], Mktime(0,0,0,Date('m')-3,Date('d'),Date('y')));
}
// Change to allow input of FROM DATE and then TO DATE, instead of previous back-to-front method, add datepicker
echo '<tr><td>' . _('Show') . ' ' . $TypeName . ' ' . _('from') . ':</td>
- <td><input tabindex="3" type="text" name="AfterDate" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" size="12" maxlength="10" onChange="isDate(this, this.value, '."'".$_SESSION['DefaultDateFormat']."'".')" Value="' . $_POST['AfterDate'] . '"></td></tr>';
+ <td><input tabindex="3" type="text" name="AfterDate" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" size="12" maxlength="10" onChange="isDate(this, this.value, '."'".$_SESSION['DefaultDateFormat']."'".')" value="' . $_POST['AfterDate'] . '"></td></tr>';
echo '<td>' . _('to') . ':</td>
<td><input tabindex="2" type="text" name="BeforeDate" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" size="12" maxlength="10" onChange="isDate(this, this.value, '."'".$_SESSION['DefaultDateFormat']."'".')" Value="' . $_POST['BeforeDate'] . '"></td>';
@@ -108,29 +113,29 @@
<td><select tabindex="4" name="Ostg_or_All">';
if ($_POST['Ostg_or_All']=='All'){
- echo '<option selected Value="All">' . _('Show all') . ' ' . $TypeName . ' ' . _('in the date range');
- echo '<option Value="Ostdg">' . _('Show unmatched') . ' ' . $TypeName . ' ' . _('only');
+ echo '<option selected value="All">' . _('Show all') . ' ' . $TypeName . ' ' . _('in the date range') . '</option>';
+ echo '<option value="Ostdg">' . _('Show unmatched') . ' ' . $TypeName . ' ' . _('only') . '</option>';
} else {
- echo '<option Value="All">' . _('Show all') . ' ' . $TypeName . ' ' . _('in the date range');
- echo '<option selected Value="Ostdg">' . _('Show unmatched') . ' ' . $TypeName . ' ' . _('only');
+ echo '<option Value="All">' . _('Show all') . ' ' . $TypeName . ' ' . _('in the date range') . '</option>';
+ echo '<option selected Value="Ostdg">' . _('Show unmatched') . ' ' . $TypeName . ' ' . _('only') . '</option>';
}
echo '</select></td></tr>';
echo '<tr><td colspan=3>' . _('Choose to display only the first 20 matching') . ' ' . $TypeName . ' ' .
_('or all') . ' ' . $TypeName . ' ' . _('meeting the criteria') . ':</td><td><select tabindex="5" name="First20_or_All">';
if ($_POST['First20_or_All']=='All'){
- echo '<option selected Value="All">' . _('Show all') . ' ' . $TypeName . ' ' . _('in the date range');
- echo '<option Value="First20">' . _('Show only the first 20') . ' ' . $TypeName;
+ echo '<option selected Value="All">' . _('Show all') . ' ' . $TypeName . ' ' . _('in the date range') . '</option>';
+ echo '<option Value="First20">' . _('Show only the first 20') . ' ' . $TypeName . '</option>';
} else {
- echo '<option Value="All">' . _('Show all') . ' ' . $TypeName . ' ' . _('in the date range');
- echo '<option selected Value="First20">' . _('Show only the first 20') . ' ' . $TypeName;
+ echo '<option Value="All">' . _('Show all') . ' ' . $TypeName . ' ' . _('in the date range') . '</option>';
+ echo '<option selected Value="First20">' . _('Show only the first 20') . ' ' . $TypeName . '</option>';
}
echo '</select></td></tr>';
echo '</table><br><div class="centre"><input tabindex="6" type=submit name="ShowTransactions" VALUE="' . _('Show selected') . ' ' . $TypeName . '">';
-echo "<p><a href='$rootpath/BankReconciliation.php?" . SID . "'>" . _('Show reconciliation') . '</a></div>';
-echo '<hr>';
+echo '<p><a href="' . $rootpath . '/BankReconciliation.php">' . _('Show reconciliation') . '</a></div>';
+echo '<hr />';
$InputError=0;
if (!Is_Date($_POST['BeforeDate'])){
@@ -151,7 +156,7 @@
$SQLBeforeDate = FormatDateForSQL($_POST['BeforeDate']);
$SQLAfterDate = FormatDateForSQL($_POST['AfterDate']);
- if ($_POST["Ostg_or_All"]=='All'){
+ if ($_POST['Ostg_or_All']=='All'){
if ($Type=='Payments'){
$sql = "SELECT banktransid,
ref,
@@ -163,7 +168,7 @@
WHERE amount <0
AND transdate >= '". $SQLAfterDate . "'
AND transdate <= '" . $SQLBeforeDate . "'
- AND bankact='" .$_POST["BankAccount"] . "'
+ AND bankact='" .$_POST['BankAccount'] . "'
ORDER BY transdate";
} else { /* Type must == Receipts */
@@ -192,7 +197,7 @@
WHERE amount <0
AND transdate >= '". $SQLAfterDate . "'
AND transdate <= '" . $SQLBeforeDate . "'
- AND bankact=" .$_POST["BankAccount"] . "
+ AND bankact=" .$_POST['BankAccount'] . "
AND ABS(amountcleared - (amount / exrate)) > 0.009
ORDER BY transdate";
} else { /* Type must == Receipts */
@@ -206,12 +211,12 @@
WHERE amount >0
AND transdate >= '". $SQLAfterDate . "'
AND transdate <= '" . $SQLBeforeDate . "'
- AND bankact='" .$_POST["BankAccount"] . "'
+ AND bankact='" .$_POST['BankAccount'] . "'
AND ABS(amountcleared - (amount / exrate)) > 0.009
ORDER BY transdate";
}
}
- if ($_POST["First20_or_All"]!='All'){
+ if ($_POST['First20_or_All']!='All'){
$sql = $sql . " LIMIT 20";
}
@@ -219,13 +224,13 @@
$PaymentsResult = DB_query($sql, $db, $ErrMsg);
$TableHeader = '<tr><th>'. _('Ref'). '</th>
- <th>' . $TypeName . '</th>
- <th>' . _('Date') . '</th>
- <th>' . _('Amount') . '</th>
- <th>' . _('Outstanding') . '</th>
- <th colspan=3>' . _('Clear') . ' / ' . _('Unclear') . '</th>
- </tr>';
- echo '<table cellpadding=2 class=selection>' . $TableHeader;
+ <th>' . $TypeName . '</th>
+ <th>' . _('Date') . '</th>
+ <th>' . _('Amount') . '</th>
+ <th>' . _('Outstanding') . '</th>
+ <th colspan=3>' . _('Clear') . ' / ' . _('Unclear') . '</th>
+ </tr>';
+ echo '<table cellpadding=2 class="selection">' . $TableHeader;
$j = 1; //page length counter
@@ -238,24 +243,23 @@
$Outstanding = $myrow['amt']- $myrow['amountcleared'];
if (ABS($Outstanding)<0.009){ /*the payment is cleared dont show the check box*/
- printf("<tr bgcolor='#CCCEEE'>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td class=number>%s</td>
- <td class=number>%s</td>
- <td colspan=2>%s</td>
- <td><input type='checkbox' name='Unclear_%s'><input type=hidden name='BankTrans_%s' VALUE=%s></td>
- </tr>",
- $myrow['ref'],
- $myrow['banktranstype'],
- $DisplayTranDate,
- number_format($myrow['amt'],2),
- number_format($Outstanding,2),
- _('Unclear'),
- $i,
- $i,
- $myrow['banktransid']);
+ pprintf('<tr bgcolor="#CCCEEE">
+ <td>%s</td>
+ <td>%s</td>
+ <td class=number>%s</td>
+ <td class=number>%s</td>
+ <td colspan=2>%s</td>
+ <td><input type="checkbox" name="Unclear_%s"><input type="hidden" name="BankTrans_%s" value=%s></td>
+ </tr>',
+ $myrow['ref'],
+ $myrow['banktranstype'],
+ $DisplayTranDate,
+ number_format($myrow['amt'],2),
+ number_format($Outstanding,2),
+ _('Unclear'),
+ $i,
+ $i,
+ $myrow['banktransid']);
} else{
if ($k==1){
@@ -265,15 +269,14 @@
echo '<tr class="OddTableRows">';
$k=1;
}
-
- printf("<td>%s</td>
+ printf('<td>%s</td>
<td>%s</td>
<td>%s</td>
<td class=number>%s</td>
<td class=number>%s</td>
- <td><input type='checkbox' name='Clear_%s'><input type=hidden name='BankTrans_%s' VALUE=%s></td>
- <td colspan=2><input type='text' maxlength=15 size=15 class=number name='AmtClear_%s'></td>
- </tr>",
+ <td><input type="checkbox" name="Clear_%s"><input type=hidden name="BankTrans_%s" value=%s></td>
+ <td colspan=2><input type="text" maxlength=15 size=15 class="number" name="AmtClear_%s"></td>
+ </tr>',
$myrow['ref'],
$myrow['banktranstype'],
$DisplayTranDate,
@@ -296,10 +299,11 @@
}
//end of while loop
- echo '</table><br><div class="centre"><input type=hidden name="RowCounter" value=' . $i . '><input type=submit name="Update" VALUE="' . _('Update Matching') . '"></div>';
-
+ echo '</table>
+ <br />
+ <div class="centre"><input type=hidden name="RowCounter" value=' . $i . '>
+ <input type=submit name="Update" value="' . _('Update Matching') . '"></div>';
}
-
echo '</form>';
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/BankReconciliation.php
===================================================================
--- trunk/BankReconciliation.php 2011-05-16 10:46:50 UTC (rev 4571)
+++ trunk/BankReconciliation.php 2011-05-23 10:14:06 UTC (rev 4572)
@@ -1,29 +1,33 @@
<?php
-/* $Revision: 1.15 $ */
/* $Id$*/
-//$PageSecurity = 7;
-
include ('includes/session.inc');
$title = _('Bank Reconciliation');
include('includes/header.inc');
-echo '<form method="post" action="' . $_SERVER['PHP_SELF'] . '?' . SID . '">';
+echo '<form method="post" action="' . $_SERVER['PHP_SELF'] . '">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/money_add.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'</p><br />';
+if (isset($_GET['Account'])) {
+ $_POST['BankAccount']=$_GET['Account'];
+ $_POST['ShowRec']=true;
+}
+
if (isset($_POST['PostExchangeDifference']) and is_numeric($_POST['DoExchangeDifference'])){
- if (!is_numeric($_POST['BankStatmentBalance'])){
+ if (!is_numeric($_POST['BankStatementBalance'])){
prnMsg(_('The entry in the bank statement balance is not numeric. The balance on the bank statement should be entered. The exchange difference has not been calculated and no general ledger journal has been created'),'warn');
- echo '<p>' . $_POST['BankStatmentBalance'];
+ echo '<p>' . $_POST['BankStatementBalance'];
} else {
/* Now need to get the currency of the account and the current table ex rate */
- $SQL = "SELECT rate, bankaccountname
- FROM bankaccounts INNER JOIN currencies
- ON bankaccounts.currcode=currencies.currabrev
+ $SQL = "SELECT rate,
+ bankaccountname
+ FROM bankaccounts INNER JOIN currencies
+ ON bankaccounts.currcode=currencies.currabrev
WHERE bankaccounts.accountcode = '" . $_POST['BankAccount']."'";
$ErrMsg = _('Could not retrieve the exchange rate for the selected bank account');
@@ -33,7 +37,7 @@
$BankAccountName = $CurrencyRow[1];
$CalculatedBalance = $_POST['DoExchangeDifference'];
- $ExchangeDifference = ($CalculatedBalance - $_POST['BankStatmentBalance'])/$ExRate;
+ $ExchangeDifference = ($CalculatedBalance - $_POST['BankStatementBalance'])/$ExRate;
include ('includes/SQL_CommonFunctions.inc');
$ExDiffTransNo = GetNextTransNo(36,$db);
@@ -84,20 +88,22 @@
} //end if the bank statement balance was numeric
}
+echo '<table class="selection">';
+$SQL = "SELECT bankaccountname, accountcode FROM bankaccounts";
-echo '<table>';
-
-$SQL = 'SELECT bankaccountname, accountcode FROM bankaccounts';
-
$ErrMsg = _('The bank accounts could not be retrieved by the SQL because');
$DbgMsg = _('The SQL used to retrieve the bank accounts was');
$AccountsResults = DB_query($SQL,$db,$ErrMsg,$DbgMsg);
-echo '<tr><td>' . _('Bank Account') . ':</td><td><select tabindex="1" name="BankAccount">';
+echo '<tr><td>' . _('Bank Account') . ':</td>
+ <td><select tabindex="1" name="BankAccount">';
if (DB_num_rows($AccountsResults)==0){
- echo '</select></td></tr></table><p>' . _('Bank Accounts have not yet been defined') . '. ' . _('You must first') . "<a href='" . $rootpath . "/BankAccounts.php'>" . _('define the bank accounts') . '</a>' . ' ' . _('and general ledger accounts to be affected') . '.';
+ echo '</select></td>
+ </tr>
+ </table>
+ <p>' . _('Bank Accounts have not yet been defined') . '. ' . _('You must first') . '<a href="' . $rootpath . '/BankAccounts.php">' . _('define the bank accounts') . '</a>' . ' ' . _('and general ledger accounts to be affected') . '.';
include('includes/footer.inc');
exit;
} else {
@@ -116,20 +122,24 @@
include ('includes/GLPostings.inc');
-echo '</table><p><div class="centre"><input type=submit tabindex="2" name="ShowRec" value="' . _('Show bank reconciliation statement') . '"></div><br>';
+echo '</table><p><div class="centre"><input type=submit tabindex="2" name="ShowRec" value="' . _('Show bank reconciliation statement') . '"></div><br />';
if (isset($_POST['ShowRec']) OR isset($_POST['DoExchangeDifference'])){
/*Get the balance of the bank account concerned */
- $sql = "SELECT MAX(period) FROM chartdetails WHERE accountcode='" . $_POST['BankAccount']."'";
+ $sql = "SELECT MAX(period)
+ FROM chartdetails
+ WHERE accountcode='" . $_POST['BankAccount']."'";
$PrdResult = DB_query($sql, $db);
$myrow = DB_fetch_row($PrdResult);
$LastPeriod = $myrow[0];
$SQL = "SELECT bfwd+actual AS balance
- FROM chartdetails WHERE period='" . $LastPeriod . "' AND accountcode='" . $_POST['BankAccount']."'";
+ FROM chartdetails
+ WHERE period='" . $LastPeriod . "'
+ AND accountcode='" . $_POST['BankAccount']."'";
$ErrMsg = _('The bank account balance could not be returned by the SQL because');
$BalanceResult = DB_query($SQL,$db,$ErrMsg);
@@ -141,9 +151,9 @@
$SQL = "SELECT rate,
bankaccounts.currcode,
bankaccounts.bankaccountname
- FROM bankaccounts INNER JOIN currencies
- ON bankaccounts.currcode=currencies.currabrev
- WHERE bankaccounts.accountcode = '" . $_POST['BankAccount']."'";
+ FROM bankaccounts INNER JOIN currencies
+ ON bankaccounts.currcode=currencies.currabrev
+ WHERE bankaccounts.accountcode = '" . $_POST['BankAccount']."'";
$ErrMsg = _('Could not retrieve the currency and exchange rate for the selected bank account');
$CurrencyResult = DB_query($SQL,$db);
$CurrencyRow = DB_fetch_row($CurrencyResult);
@@ -151,13 +161,13 @@
$BankCurrCode = $CurrencyRow[1];
$BankAccountName = $CurrencyRow[2];
- echo '<table class=selection>
- <tr class=EvenTableRows><td colspan=6><b>' . $BankAccountName . ' ' . _('Balance as at') . ' ' . Date($_SESSION['DefaultDateFormat']);
+ echo '<table class="selection">
+ <tr class="EvenTableRows"><td colspan=6><b>' . $BankAccountName . ' ' . _('Balance as at') . ' ' . Date($_SESSION['DefaultDateFormat']);
if ($_SESSION['CompanyRecord']['currencydefault']!=$BankCurrCode){
echo ' (' . $BankCurrCode . ' @ ' . $ExRate .')';
}
echo '</b></td>
- <td valign=bottom class=number><b>' . number_format($Balance*$ExRate,2) . '</b></td></tr>';
+ <td valign=bottom class="number"><b>' . number_format($Balance*$ExRate,2) . '</b></td></tr>';
$SQL = "SELECT amount/exrate AS amt,
amountcleared,
@@ -181,13 +191,13 @@
echo '<tr><td colspan=6><b>' . _('Add back unpresented cheques') . ':</b></td></tr>';
$TableHeader = '<tr>
- <th>' . _('Date') . '</th>
- <th>' . _('Type') . '</th>
- <th>' . _('Number') . '</th>
- <th>' . _('Reference') . '</th>
- <th>' . _('Orig Amount') . '</th>
- <th>' . _('Outstanding') . '</th>
- </tr>';
+ <th>' . _('Date') . '</th>
+ <th>' . _('Type') . '</th>
+ <th>' . _('Number') . '</th>
+ <th>' . _('Reference') . '</th>
+ <th>' . _('Orig Amount') . '</th>
+ <th>' . _('Outstanding') . '</th>
+ </tr>';
echo $TableHeader;
@@ -307,7 +317,7 @@
if (isset($_POST['DoExchangeDifference'])){
echo '<input type="hidden" name="DoExchangeDifference" value=' . $FXStatementBalance . '>';
echo '<tr><td colspan=6>' . _('Enter the actual bank statement balance') . ' (' . $BankCurrCode . ')</b></td>
- <td class=number><input type="text" name="BankStatmentBalance" maxlength=15 size=15 value=' . $_POST['BankStatmentBalance'] . '><td></tr>';
+ <td class=number><input type="text" name="BankStatementBalance" maxlength=15 size=15 value=' . $_POST['BankStatementBalance'] . '><td></tr>';
echo '<tr><td colspan=7 align="center"><input type="submit" name="PostExchangeDifference" value="' . _('Calculate and Post Exchange Difference') . '" onclick="return confirm(\'' . _('This will create a general ledger journal to write off the exchange difference in the current balance of the account. It is important that the exchange rate above reflects the current value of the bank account currency') . ' - ' . _('Are You Sure?') . '\');"></td></tr>';
}
@@ -323,8 +333,15 @@
echo '</table>';
}
-echo '<p><div class="centre"><a tabindex="4" href="' . $rootpath . '/BankMatching.php?' . SID . '&Type=Payments">' . _('Match off cleared payments') . '</a>';
-echo '<br><a tabindex="5" href="' . $rootpath . '/BankMatching.php?' . SID . '&Type=Receipts">' . _('Match off cleared deposits') . '</a></div>';
+
+if (isset($_POST['BankAccount'])) {
+ echo '<p><div class="centre"><a tabindex="4" href="' . $rootpath . '/BankMatching.php?Type=Payments&Account='.$_POST['BankAccount'].'">' . _('Match off cleared payments') . '</a>';
+ echo '<br /><a tabindex="5" href="' . $rootpath . '/BankMatching.php?Type=Receipts&Account='.$_POST['BankAccount'].'">' . _('Match off cleared deposits') . '</a></div>';
+} else {
+ echo '<p><div class="centre"><a tabindex="4" href="' . $rootpath . '/BankMatching.php?Type=Payments">' . _('Match off cleared payments') . '</a>';
+ echo '<br /><a tabindex="5" href="' . $rootpath . '/BankMatching.php?Type=Receipts">' . _('Match off cleared deposits') . '</a></div>';
+}
+
echo '</form>';
include('includes/footer.inc');
?>
Modified: trunk/ContractBOM.php
===================================================================
--- trunk/ContractBOM.php 2011-05-16 10:46:50 UTC (rev 4571)
+++ trunk/ContractBOM.php 2011-05-23 10:14:06 UTC (rev 4572)
@@ -290,11 +290,11 @@
$result1 = DB_query($sql,$db,$ErrMsg,$DbgMsg);
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/magnifier.png" title="' .
_('Print') . '" alt="" />' . ' ' . _('Search For Stock Items') . '</p>';
- echo '<table class="selection"><tr>';
+ echo '<table class="selection">
+ <tr></tr>
+ <tr><td><select name="StockCat">';
- echo ':</tr><tr><td><select name="StockCat">';
-
- echo '<option selected="True" value="All">' . _('All').'</option>';
+ echo '<option selected="true" value="All">' . _('All').'</option>';
while ($myrow1 = DB_fetch_array($result1)) {
if (isset($_POST['StockCat']) and $_POST['StockCat']==$myrow1['categoryid']){
echo '<option selected value="'. $myrow1['categoryid'] . '">' . $myrow1['categorydescription'].'</option>';
Modified: trunk/CreditStatus.php
===================================================================
--- trunk/CreditStatus.php 2011-05-16 10:46:50 UTC (rev 4571)
+++ trunk/CreditStatus.php 2011-05-23 10:14:06 UTC (rev 4572)
@@ -214,14 +214,15 @@
echo '<input type="hidden" name="SelectedReason" value="' . $SelectedReason . '">';
echo '<input type="hidden" name="ReasonCode" value="' . $_POST['ReasonCode'] . '">';
- echo '<table class="selection"><tr><td>'. _('Status Code') .':</td><td>';
- echo $_POST['ReasonCode'] . '</td></tr>';
+ echo '<table class="selection">
+ <tr><td>'. _('Status Code') .':</td>
+ <td>' . $_POST['ReasonCode'] . '</td></tr>';
} else { //end of if $SelectedReason only do the else when a new record is being entered
if (!isset($_POST['ReasonCode'])) {
$_POST['ReasonCode'] = '';
}
- echo '<br><table class=selection>
+ echo '<br /><table class="selection">
<tr>
<td>'. _('Status Code') .':</td>
<td><input ' . (in_array('ReasonCode',$Errors) ? 'class="inputerror"' : '' ) . ' tabindex=1 type="text" name="ReasonCode" value="'. $_POST['ReasonCode'] .'" size=3 maxlength=2></td>
Modified: trunk/CustomerBranches.php
===================================================================
--- trunk/CustomerBranches.php 2011-05-16 10:46:50 UTC (rev 4571)
+++ trunk/CustomerBranches.php 2011-05-23 10:14:06 UTC (rev 4572)
@@ -396,8 +396,7 @@
<td>%s</td>
<td>%s</td>
<td><a href="%s?DebtorNo=%s&SelectedBranch=%s">%s</td>
- <td><a href="%s?DebtorNo=%s&SelectedBranch=%s&delete=yes" onclick=\'return confirm("' .
- _('Are you sure you wish to delete this branch?') . '");\'>%s</td></tr>',
+ <td><a href="%s?DebtorNo=%s&SelectedBranch=%s&delete=yes" onclick=\'return confirm("' . _('Are you sure you wish to delete this branch?') . '");\'>%s</td></tr>',
$myrow[10],
$myrow[2],
$myrow[5],
@@ -590,42 +589,42 @@
exit;
}
- echo '<input type=hidden name="DebtorNo" value="'. $DebtorNo . '">';
+ echo '<input type=hidden name="DebtorNo" value="'. $DebtorNo . '" />';
echo '<tr><td>'._('Branch Name').':</td>';
if (!isset($_POST['BrName'])) {$_POST['BrName']='';}
- echo '<td><input tabindex=2 type="Text" name="BrName" size=41 maxlength=40 value="'. $_POST['BrName'].'"></td></tr>';
+ echo '<td><input tabindex=2 type="text" name="BrName" size=41 maxlength=40 value="'. $_POST['BrName'].'"></td></tr>';
echo '<tr><td>'._('Branch Contact').':</td>';
if (!isset($_POST['ContactName'])) {$_POST['ContactName']='';}
- echo '<td><input tabindex=3 type="Text" name="ContactName" size=41 maxlength=40 value="'. $_POST['ContactName'].'"></td></tr>';
+ echo '<td><input tabindex=3 type="text" name="ContactName" size=41 maxlength=40 value="'. $_POST['ContactName'].'"></td></tr>';
echo '<tr><td>'._('Street Address 1 (Street)').':</td>';
if (!isset($_POST['BrAddress1'])) {$_POST['BrAddress1']='';}
- echo '<td><input tabindex=4 type="Text" name="BrAddress1" size=41 maxlength=40 value="'. $_POST['BrAddress1'].'"></td></tr>';
+ echo '<td><input tabindex=4 type="text" name="BrAddress1" size=41 maxlength=40 value="'. $_POST['BrAddress1'].'"></td></tr>';
echo '<tr><td>'._('Street Address 2 (Suburb/City)').':</td>';
if (!isset($_POST['BrAddress2'])) {$_POST['BrAddress2']='';}
- echo '<td><input tabindex=5 type="Text" name="BrAddress2" size=41 maxlength=40 value="'. $_POST['BrAddress2'].'"></td></tr>';
+ echo '<td><input tabindex=5 type="text" name="BrAddress2" size=41 maxlength=40 value="'. $_POST['BrAddress2'].'"></td></tr>';
echo '<tr><td>'._('Street Address 3 (State)').':</td>';
if (!isset($_POST['BrAddress3'])) {$_POST['BrAddress3']='';}
- echo '<td><input tabindex=6 type="Text" name="BrAddress3" size=41 maxlength=40 value="'. $_POST['BrAddress3'].'"></td></tr>';
+ echo '<td><input tabindex=6 type="text" name="BrAddress3" size=41 maxlength=40 value="'. $_POST['BrAddress3'].'"></td></tr>';
echo '<tr><td>'._('Street Address 4 (Postal Code)').':</td>';
if (!isset($_POST['BrAddress4'])) {$_POST['BrAddress4']='';}
- echo '<td><input tabindex=7 type="Text" name="BrAddress4" size=31 maxlength=40 value="'. $_POST['BrAddress4'].'"></td></tr>';
+ echo '<td><input tabindex=7 type="text" name="BrAddress4" size=31 maxlength=40 value="'. $_POST['BrAddress4'].'"></td></tr>';
echo '<tr><td>'._('Street Address 5').':</td>';
if (!isset($_POST['BrAddress5'])) {$_POST['BrAddress5']='';}
- echo '<td><input tabindex=8 type="Text" name="BrAddress5" size=21 maxlength=20 value="'. $_POST['BrAddress5'].'"></td></tr>';
+ echo '<td><input tabindex=8 type="text" name="BrAddress5" size=21 maxlength=20 value="'. $_POST['BrAddress5'].'"></td></tr>';
echo '<tr><td>'._('Street Address 6').':</td>';
if (!isset($_POST['BrAddress6'])) {$_POST['BrAddress6']='';}
- echo '<td><input tabindex=9 type="Text" name="BrAddress6" size=16 maxlength=15 value="'. $_POST['BrAddress6'].'"></td></tr>';
+ echo '<td><input tabindex=9 type="text" name="BrAddress6" size=16 maxlength=15 value="'. $_POST['BrAddress6'].'"></td></tr>';
echo '<tr><td>'._('Special Instructions').':</td>';
if (!isset($_POST['specialinstructions'])) {$_POST['specialinstructions']='';}
- echo '<td><input tabindex=10 type="Text" name="specialinstructions" size=56 value="'. $_POST['specialinstructions'].'"></td></tr>';
+ echo '<td><input tabindex=10 type="text" name="specialinstructions" size=56 value="'. $_POST['specialinstructions'].'"></td></tr>';
echo '<tr><td>'._('Default days to deliver').':</td>';
if (!isset($_POST['EstDeliveryDays'])) {$_POST['EstDeliveryDays']=0;}
- echo '<td><input ' .(in_array('EstDeliveryDays',$Errors) ? 'class="inputerror"' : '' ) .' tabindex=11 type="Text" class=number name="EstDeliveryDays" size=4 maxlength=2 value='. $_POST['EstDeliveryDays'].'></td></tr>';
+ echo '<td><input ' .(in_array('EstDeliveryDays',$Errors) ? 'class="inputerror"' : '' ) .' tabindex=11 type="text" class=number name="EstDeliveryDays" size=4 maxlength=2 value='. $_POST['EstDeliveryDays'].'></td></tr>';
echo '<tr><td>'._('Forward Date After (day in month)').':</td>';
if (!isset($_POST['FwdDate'])) {$_POST['FwdDate']=0;}
- echo '<td><input ' .(in_array('FwdDate',$Errors) ? 'class="inputerror"' : '' ) .' tabindex=12 type="Text" class=number name="FwdDate" size=4 maxlength=2 value='. $_POST['FwdDate'].'></td></tr>';
+ echo '<td><input ' .(in_array('FwdDate',$Errors) ? 'class="inputerror"' : '' ) .' tabindex=12 type="text" class=number name="FwdDate" size=4 maxlength=2 value='. $_POST['FwdDate'].'></td></tr>';
echo '<tr><td>'._('Salesperson').':</td>';
echo '<td><select tabindex=13 name="Salesman">';
Modified: trunk/CustomerInquiry.php
===================================================================
--- trunk/CustomerInquiry.php 2011-05-16 10:46:50 UTC (rev 4571)
+++ trunk/CustomerInquiry.php 2011-05-23 10:14:06 UTC (rev 4572)
@@ -131,7 +131,7 @@
echo '<br /><font color=RED size=4><b>' . _('ACCOUNT ON HOLD') . '</font></b><br />';
}
-echo '<table class=selection width=70%>
+echo '<table class="selection" width="70%">
<tr>
<th width=20%>' . _('Total Balance') . '</th>
<th width=20%>' . _('Current') . '</th>
@@ -149,11 +149,12 @@
echo '<br /><div class="centre"><form action="' . $_SERVER['PHP_SELF'] . '" method=post>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-echo _('Show all transactions after') . ': <input tabindex=1 type=text class="date" alt="' .$_SESSION['DefaultDateFormat']. '" id="datepicker" name="TransAfterDate" Value="' . $_POST['TransAfterDate'] . '" maxlength =10 size=12>' . '<input tabindex=2 type="submit" name="Refresh Inquiry" value="' . _('Refresh Inquiry') . '"></div></form><br />';
+echo _('Show all transactions after') . ': <input tabindex=1 type="text" class="date" alt="' .$_SESSION['DefaultDateFormat']. '" id="datepicker" name="TransAfterDate" Value="' . $_POST['TransAfterDate'] . '" maxlength =10 size=12>' . '<input tabindex=2 type="submit" name="Refresh Inquiry" value="' . _('Refresh Inquiry') . '"></div>
+</form>
+<br />';
$DateAfterCriteria = FormatDateForSQL($_POST['TransAfterDate']);
-
$SQL = "SELECT systypes.typename,
debtortrans.id,
debtortrans.type,
Modified: trunk/CustomerReceipt.php
===================================================================
--- trunk/CustomerReceipt.php 2011-05-16 10:46:50 UTC (rev 4571)
+++ trunk/CustomerReceipt.php 2011-05-23 10:14:06 UTC (rev 4572)
@@ -700,7 +700,7 @@
/*set up the form whatever */
-echo '<form action="' . $_SERVER['PHP_SELF'] . '?Type='.$_GET['Type'] . '" method=post name=form1>';
+echo '<form action="' . $_SERVER['PHP_SELF'] . '?Type='.$_GET['Type'] . '" method="post" name="form1">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
/*show the batch header details and the entries in the batch so far */
Modified: trunk/DailySalesInquiry.php
===================================================================
--- trunk/DailySalesInquiry.php 2011-05-16 10:46:50 UTC (rev 4571)
+++ trunk/DailySalesInquiry.php 2011-05-23 10:14:06 UTC (rev 4572)
@@ -1,10 +1,7 @@
<?php
-/* $Revision: 1.00$ */
/* $Id$*/
-//$PageSecurity = 2;
-
include('includes/session.inc');
$title = _('Daily Sales Inquiry');
include('includes/header.inc');
@@ -25,7 +22,7 @@
$_POST['MonthToShow'] = GetPeriod(Date($_SESSION['DefaultDateFormat']),$db);
}
-$PeriodsResult = DB_query('SELECT periodno, lastdate_in_period FROM periods',$db);
+$PeriodsResult = DB_query("SELECT periodno, lastdate_in_period FROM periods",$db);
while ($PeriodRow = DB_fetch_array($PeriodsResult)){
if ($_POST['MonthToShow']==$PeriodRow['periodno']) {
@@ -38,7 +35,7 @@
echo '</select></td>';
echo '<td>' . _('Salesperson') . ':</td><td><select tabindex=2 name="Salesperson">';
-$SalespeopleResult = DB_query('SELECT salesmancode, salesmanname FROM salesman',$db);
+$SalespeopleResult = DB_query("SELECT salesmancode, salesmanname FROM salesman",$db);
if (!isset($_POST['Salesperson'])){
$_POST['Salesperson'] = 'All';
echo '<option selected value="All">' . _('All') . '</option>';
Modified: trunk/FTP_RadioBeacon.php
===================================================================
--- trunk/FTP_RadioBeacon.php 2011-05-16 10:46:50 UTC (rev 4571)
+++ trunk/FTP_RadioBeacon.php 2011-05-23 10:14:06 UTC (rev 4572)
@@ -14,30 +14,30 @@
some details of the order for confirming before producing the file for ftp */
$SQL = "SELECT salesorders.orderno,
- debtorsmaster.name,
- custbranch.brname,
- salesorders.customerref,
- salesorders.orddate,
- salesorders.deliverto,
- salesorders.deliverydate,
- sum(salesorderdetails.unitprice*salesorderdetails.quantity*(1-salesorderdetails.discountpercent)) as ordervalue,
- datepackingslipprinted,
- printedpackingslip
- FROM salesorders,
- salesorderdetails,
- debtorsmaster,
- custbranch
- WHERE salesorders.orderno = salesorderdetails.orderno
- AND salesorders.debtorno = debtorsmaster.debtorno
- AND debtorsmaster.debtorno = custbranch.debtorno
- AND salesorderdetails.completed=0
- AND salesorders.fromstkloc = '". $_SESSION['RadioBeaconStockLocation'] . "'
- GROUP BY salesorders.orderno,
- salesorders.debtorno,
- salesorders.branchcode,
- salesorders.customerref,
- salesorders.orddate,
- salesorders.deliverto";
+ debtorsmaster.name,
+ custbranch.brname,
+ salesorders.customerref,
+ salesorders.orddate,
+ salesorders.deliverto,
+ salesorders.deliverydate,
+ sum(salesorderdetails.unitprice*salesorderdetails.quantity*(1-salesorderdetails.discountpercent)) as ordervalue,
+ datepackingslipprinted,
+ printedpackingslip
+ FROM salesorders,
+ salesorderdetails,
+ debtorsmaster,
+ custbranch
+ WHERE salesorders.orderno = salesorderdetails.orderno
+ AND salesorders.debtorno = debtorsmaster.debtorno
+ AND debtorsmaster.debtorno = custbranch.debtorno
+ AND salesorderdetails.completed=0
+ AND salesorders.fromstkloc = '". $_SESSION['RadioBeaconStockLocation'] . "'
+ GROUP BY salesorders.orderno,
+ salesorders.debtorno,
+ salesorders.branchcode,
+ salesorders.customerref,
+ salesorders.orddate,
+ salesorders.deliverto";
$ErrMsg = _('No orders were returned because');
$SalesOrdersResult = DB_query($SQL,$db,$ErrMsg);
@@ -146,33 +146,33 @@
/*Now get the order header info */
$sql = "SELECT salesorders.debtorno,
- customerref,
- comments,
- orddate,
- deliverydate,
- deliverto,
- deladd1,
- deladd2,
- deladd3,
- deladd4,
- deladd5,
- deladd6,
- contactphone,
- contactemail,
- name,
- address1,
- address2,
- address3,
- address4,
- address5,
- address6,
- printedpackingslip,
- datepackingslipprinted
- FROM salesorders,
- debtorsmaster
- WHERE salesorders.debtorno=debtorsmaster.debtorno
- AND salesorders.fromstkloc = '". $_SESSION['RadioBeaconStockLocation'] . "'
- AND salesorders.orderno='" . $_GET['OrderNo'] . "'";
+ customerref,
+ comments,
+ orddate,
+ deliverydate,
+ deliverto,
+ deladd1,
+ deladd2,
+ deladd3,
+ deladd4,
+ deladd5,
+ deladd6,
+ contactphone,
+ contactemail,
+ name,
+ address1,
+ address2,
+ address3,
+ address4,
+ address5,
+ address6,
+ printedpackingslip,
+ datepackingslipprinted
+ FROM salesorders,
+ debtorsmaster
+ WHERE salesorders.debtorno=debtorsmaster.debtorno
+ AND salesorders.fromstkloc = '". $_SESSION['RadioBeaconStockLocation'] . "'
+ AND salesorders.orderno='" . $_GET['OrderNo'] . "'";
$ErrMsg = _('There was a problem retrieving the order header details for Order Number') . ' ' . $_GET['OrderNo'] . ' ' . _('from the database');
Modified: trunk/FreightCosts.php
===================================================================
--- trunk/FreightCosts.php 2011-05-16 10:46:50 UTC (rev 4571)
+++ trunk/FreightCosts.php 2011-05-23 10:14:06 UTC (rev 4572)
@@ -32,13 +32,13 @@
$sql = "SELECT shippername, shipper_id FROM shippers";
$ShipperResults = DB_query($sql,$db);
- echo '<table class=selection>
+ echo '<table class="selection">
<tr>
<td>' . _('Select A Freight Company to set up costs for') . '</td>
<td><select name="ShipperID">';
while ($myrow = DB_fetch_array($ShipperResults)){
- echo '<option value=' . $myrow['shipper_id'] . '>' . $myrow['shippername'] . '</option>';
+ echo '<option value="' . $myrow['shipper_id'] . '">' . $myrow['shippername'] . '</option>';
}
echo '</select></td></tr>
<tr>
@@ -51,12 +51,12 @@
$LocationResults = DB_query($sql,$db);
while ($myrow = DB_fetch_array($LocationResults)){
- echo '<option value=' . $myrow['loccode'] . '>' . $myrow['locationname'];
+ echo '<option value=' . $myrow['loccode'] . '>' . $myrow['locationname'] . '</option>';
}
echo '</select></td></tr>
</table>
- <br><div class="centre"><input type="submit" value="' . _('Accept') . '" name="Accept"></div>
+ <br /><div class="centre"><input type="submit" value="' . _('Accept') . '" name="Accept"></div>
</form>';
} else {
@@ -198,7 +198,7 @@
$result = DB_query($sql,$db);
- echo '<br><table class=selection>';
+ echo '<br /><table class=selection>';
$TableHeader = '<tr>
<th>' . _('Destination') . '</th>
<th>' . _('Cubic Rate') . '</th>
@@ -307,8 +307,8 @@
$_POST['MinimumChg'] = 0;
}
- echo '<input type="hidden" name="LocationFrom" value="' . $LocationFrom . '">';
- echo '<input type="hidden" name="ShipperID" value="' . $ShipperID . '">';
+ echo '<input type="hidden" name="LocationFrom" value="' . $LocationFrom . '" />';
+ echo '<input type="hidden" name="ShipperID" value="' . $ShipperID . '" />';
if (!isset($_POST['Destination'])) {$_POST['Destination']='';}
if (!isset($_POST['CubRate'])) {$_POST['CubRate']='';}
@@ -316,7 +316,7 @@
if (!isset($_POST['MAXKGs'])) {$_POST['MAXKGs']='';}
if (!isset($_POST['MAXCub'])) {$_POST['MAXCub']='';}
- echo '<br><table class=selection>';
+ echo '<br /><table class=selection>';
echo '<tr><th colspan=2><font size=4 color=blue>' . _('For Deliveries From') . ' ' . $LocationName . ' ' . _('using') . ' ' .
$ShipperName . '</font></th></tr>';
echo'<tr><td>' . _('Destination') . ':</td>
@@ -334,7 +334,7 @@
echo '<tr><td>' . _('Minimum Charge (0 is N/A)') . ':</a></td>
<td><input type="text" name="MinimumChg" class="number" size=6 maxlength=5 value="' . $_POST['MinimumChg'] . '"></td></tr>';
- echo '</table><br>';
+ echo '</table><br />';
echo '<div class="centre"><input type="submit" name="submit" value="' . _('Enter Information') . '"></div>';
Modified: trunk/GLTransInquiry.php
===================================================================
--- trunk/GLTransInquiry.php 2011-05-16 10:46:50 UTC (rev 4571)
+++ trunk/GLTransInquiry.php 2011-05-23 10:14:06 UTC (rev 4572)
@@ -1,16 +1,12 @@
<?php
/* $Id$*/
-/* $Revision: 1.16 $ */
-//$PageSecurity = 8;
-
include ('includes/session.inc');
$title = _('General Ledger Transaction Inquiry');
include('includes/header.inc');
-// Page Border
-$menuUrl = '<a href="'. $rootpath . '/index.php?&Application=GL'. SID .'">' . _('General Ledger Menu') . '</a></div>';
+$menuUrl = '<a href="'. $rootpath . '/index.php?&Application=GL">' . _('General Ledger Menu') . '</a></div>';
if ( !isset($_GET['TypeID']) OR !isset($_GET['TransNo']) )
{
@@ -52,22 +48,22 @@
</tr>';
$SQL = "SELECT gltrans.type,
- gltrans.trandate,
- gltrans.periodno,
- gltrans.account,
- gltrans.narrative,
- gltrans.amount,
- gltrans.posted,
- chartmaster.accountname,
- periods.lastdate_in_period
- FROM gltrans,
- chartmaster,
- periods
- WHERE gltrans.account = chartmaster.accountcode
- AND periods.periodno=gltrans.periodno
- AND gltrans.type= '" . $_GET['TypeID'] . "'
- AND gltrans.typeno = '" . $_GET['TransNo'] . "'
- ORDER BY gltrans.counterindex";
+ gltrans.trandate,
+ gltrans.periodno,
+ gltrans.account,
+ gltrans.narrative,
+ gltrans.amount,
+ gltrans.posted,
+ chartmaster.accountname,
+ periods.lastdate_in_period
+ FROM gltrans,
+ chartmaster,
+ periods
+ WHERE gltrans.account = chartmaster.accountcode
+ AND periods.periodno=gltrans.periodno
+ AND gltrans.type= '" . $_GET['TypeID'] . "'
+ AND gltrans.typeno = '" . $_GET['TransNo'] . "'
+ ORDER BY gltrans.counterindex";
$TransResult = DB_query($SQL,$db);
$Posted = _('Yes');
@@ -78,17 +74,17 @@
$DetailResult = false;
if ( $TransRow['amount'] > 0) {
- $DebitAmount = number_format($TransRow['amount'],2);
+ $DebitAmount = number_format($TransRow['amount'],$_SESSION['CompanyRecord']['decimalplaces']);
$DebitTotal += $TransRow['amount'];
$CreditAmount = ' ';
} else {
- $CreditAmount = number_format(-$TransRow['amount'],2);
+ $CreditAmount = number_format(-$TransRow['amount'],$_SESSION['CompanyRecord']['decimalplaces']);
$CreditTotal += $TransRow['amount'];
$DebitAmount = ' ';
}
if ( $TransRow['account'] == $_SESSION['CompanyRecord']['debtorsact'] ) {
- $URL = $rootpath . '/CustomerInquiry.php?' . SID . '&CustomerID=';
+ $URL = $rootpath . '/CustomerInquiry.php?CustomerID=';
$date = '&TransAfterDate=' . $TranDate;
$DetailSQL = "SELECT debtortrans.debtorno,
@@ -103,7 +99,7 @@
AND debtortrans.transno = '" . $_GET['TransNo']. "'";
$DetailResult = DB_query($DetailSQL,$db);
} elseif ( $TransRow['account'] == $_SESSION['CompanyRecord']['creditorsact'] ) {
- $URL = $rootpath . '/SupplierInquiry.php?' . SID . '&SupplierID=';
+ $URL = $rootpath . '/SupplierInquiry.php?SupplierID=';
$date = '&FromDate=' . $TranDate;
$DetailSQL = "SELECT supptrans.supplierno,
@@ -118,7 +114,7 @@
AND supptrans.transno = '" . $_GET['TransNo'] . "'";
$DetailResult = DB_query($DetailSQL,$db);
} else {
- $URL = $rootpath . '/GLAccountInquiry.php?' . SID . '&Account=' . $TransRow['account'];
+ $URL = $rootpath . '/GLAccountInquiry.php?Account=' . $TransRow['account'];
if( strlen($TransRow['narrative'])==0 ) {
$TransRow['narrative'] = ' ';
@@ -156,10 +152,10 @@
}
} else {
if ($TransRow['account'] == $_SESSION['CompanyRecord']['debtorsact']) {
- $Credit = number_format(-($DetailRow[1] + $DetailRow[2]) / $DetailRow[3],2);
+ $Credit = number_format(-($DetailRow[1] + $DetailRow[2]) / $DetailRow[3],$_SESSION['CompanyRecord']['decimalplaces']);
$Debit = ' ';
} else {
- $Credit = number_format(($DetailRow[1] + $DetailRow[2]) / $DetailRow[3],2);
+ $Credit = number_format(($DetailRow[1] + $DetailRow[2]) / $DetailRow[3],$_SESSION['CompanyRecord']['decimalplaces']);
$Debit = ' ';
}
}
@@ -187,8 +183,8 @@
echo '<tr bgcolor="#FFFFFF">
<td class=number colspan=3><b>' . _('Total') . '</b></td>
- <td class=number>' . number_format(($DebitTotal),2) . '</td>
- <td class=number>' . number_format((-$CreditTotal),2) . '</td>
+ <td class=number>' . number_format(($DebitTotal),$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
+ <td class=number>' . number_format((-$CreditTotal),$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
<td colspan=2> </td>
</tr>';
echo '</table><p>';
@@ -196,7 +192,7 @@
}
-echo '</td></tr></table>'; // end Page Border
+echo '</td></tr></table>';
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/GoodsReceived.php
===================================================================
--- trunk/GoodsReceived.php 2011-05-16 10:46:50 UTC (rev 4571)
+++ trunk/GoodsReceived.php 2011-05-23 10:14:06 UTC (rev 4572)
@@ -135,8 +135,8 @@
$DisplaySupplierQtyRec = number_format($LnItm->QtyReceived/$LnItm->ConversionFactor,$LnItm->DecimalPlaces);
$DisplayQtyOrd = number_format($LnItm->Quantity,$LnItm->DecimalPlaces);
$DisplayQtyRec = number_format($LnItm->QtyReceived,$LnItm->DecimalPlaces);
- $DisplayLineTotal = number_format($LineTotal,2);
- $DisplayPrice = number_format($LnItm->Price,2);
+ $DisplayLineTotal = number_format($LineTotal,$_SESSION['PO'.$identifier]->CurrDecimalPlaces);
+ $DisplayPrice = number_format($LnItm->Price,$_SESSION['PO'.$identifier]->CurrDecimalPlaces);
//Now Display LineItem
@@ -178,7 +178,7 @@
}//foreach(LineItem)
echo '<script>defaultControl(document.forms[0].RecvQty_'.$LnItm->LineNo.');</script>';
- $DisplayTotal = number_format($_SESSION['PO'.$identifier]->Total,2);
+ $DisplayTotal = number_format($_SESSION['PO'.$identifier]->Total,$_SESSION['PO'.$identifier]->CurrDecimalPlaces);
if ($_SESSION['ShowValueOnGRN']==1) {
echo '<tr><td colspan="11" class=number><b>' . _('Total value of goods received'). '</b></td>
<td class=number><b>'. $DisplayTotal. '</b></td>
@@ -316,8 +316,7 @@
}
echo '<div class="centre"><a href="' . $rootpath . '/PO_SelectOSPurchOrder.php">'.
_('Select a different purchase order for receiving goods against').'</a></div>';
- echo '<div class="centre"><a href="' . $rootpath . '/GoodsReceived.php?PONumber=' .
- $_SESSION['PO'.$identifier]->OrderNumber . '">'. _('Re-read the updated purchase order for receiving goods against'). '</a></div>';
+ echo '<div class="centre"><a href="' . $rootpath . '/GoodsReceived.php?PONumber=' . $_SESSION['PO'.$identifier]->OrderNumber . '">'. _('Re-read the updated purchase order for receiving goods against'). '</a></div>';
unset($_SESSION['PO'.$identifier]->LineItems);
unset($_SESSION['PO'.$identifier]);
unset($_POST['ProcessGoodsReceived']);
@@ -514,17 +513,17 @@
AND serialno = '" . $Item->BundleRef . "'";
} else {
$SQL = "INSERT INTO stockserialitems (stockid,
- loccode,
- serialno,
- qualitytext,
- expirationdate,
- quantity)
- VALUES ('" . $OrderLine->StockID . "',
- '" . $_SESSION['PO'.$identifier]->Location . "',
- '" . $Item->BundleRef . "',
- '',
- '" . FormatDateForSQL($Item->ExpiryDate) . "',
- '" . $Item->BundleQty . "')";
+ loccode,
+ serialno,
+ qualitytext,
+ expirationdate,
+ quantity)
+ VALUES ('" . $OrderLine->StockID . "',
+ '" . $_SESSION['PO'.$identifier]->Location . "',
+ '" . $Item->BundleRef . "',
+ '',
+ '" . FormatDateForSQL($Item->ExpiryDate) . "',
+ '" . $Item->BundleQty . "')";
}
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The serial stock item record could not be inserted because');
@@ -535,15 +534,15 @@
/** now insert the serial stock movement **/
$SQL = "INSERT INTO stockserialmoves (stockmoveno,
- stockid,
- serialno,
- moveqty)
- VALUES (
- '" . $StkMoveNo . "',
- '" . $OrderLine->StockID . "',
- '" . $Item->BundleRef . "',
- '" . $Item->BundleQty . "'
- )";
+ stockid,
+ serialno,
+ moveqty)
+ VALUES (
+ '" . $StkMoveNo . "',
+ '" . $OrderLine->StockID . "',
+ '" . $Item->BundleRef . "',
+ '" . $Item->BundleQty . "'
+ )";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The serial stock movement record could not be inserted because');
$DbgMsg = _('The following SQL to insert the serial stock movement records was used');
$Result = DB_query($SQL, $db, $ErrMsg, $DbgMsg, true);
@@ -557,30 +556,31 @@
/*first validate the AssetID and if it doesn't exist treat it like a normal nominal item */
$CheckAssetExistsResult = DB_query("SELECT assetid,
- datepurchased,
- costact
- FROM fixedassets INNER JOIN fixedassetcategories
- ON fixedassets.assetcategoryid=fixedassetcategories.categoryid
- WHERE assetid='" . $OrderLine->AssetID . "'",$db);
+ datepurchased,
+ costact
+ FROM fixedassets
+ INNER JOIN fixedassetcategories
+ ON fixedassets.assetcategoryid=fixedassetcategories.categoryid
+ WHERE assetid='" . $OrderLine->AssetID . "'",$db);
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 */
$SQL = "INSERT INTO fixedassettrans (assetid,
- transtype,
- transno,
- transdate,
- periodno,
- inputdate,
- fixedassettranstype,
- amount)
- VALUES ('" . $OrderLine->AssetID . "',
- 25,
- '" . $GRN . "',
- '" . $_POST['DefaultReceivedDate'] . "',
- '" . $PeriodNo . "',
- '" . Date('Y-m-d') . "',
- 'cost',
- '" . $CurrentStandardCost * $OrderLine->ReceiveQty . "')";
+ transtype,
+ transno,
+ transdate,
+ periodno,
+ inputdate,
+ fixedassettranstype,
+ amount)
+ VALUES ('" . $OrderLine->AssetID . "',
+ 25,
+ '" . $GRN . "',
+ '" . $_POST['DefaultReceivedDate'] . "',
+ '" . $PeriodNo . "',
+ '" . Date('Y-m-d') . "',
+ 'cost',
+ '" . $CurrentStandardCost * $OrderLine->ReceiveQty . "')";
$ErrMsg = _('CRITICAL ERROR! NOTE DOWN THIS ERROR AND SEEK ASSISTANCE The fixed asset transaction could not be inserted because');
$DbgMsg = _('The following SQL to insert the fixed asset transaction record was used');
$Result = DB_query($SQL,$db,$ErrMsg, $DbgMsg, true);
@@ -594,12 +594,13 @@
/* it is a new addition as the date is set to 0000-00-00 when the asset record is created
* before any cost is added to the asset
*/
- $SQL = "UPDATE fixedassets SET datepurchased='" . $_POST['DefaultReceivedDate'] . "',
- cost = cost + " . ($CurrentStandardCost * $OrderLine->ReceiveQty) . "
- WHERE assetid = '" . $OrderLine->AssetID . "'";
+ $SQL = "UPDATE fixedassets
+ SET datepurchased='" . $_POST['DefaultReceivedDate'] . "',
+ cost = cost + " . ($CurrentStandardCost * $OrderLine->ReceiveQty) . "
+ WHERE assetid = '" . $OrderLine->AssetID . "'";
} else {
$SQL = "UPDATE fixedassets SET cost = cost + " . ($CurrentStandardCost * $OrderLine->ReceiveQty) . "
- WHERE assetid = '" . $OrderLine->AssetID . "'";
+ WHERE assetid = '" . $OrderLine->AssetID . "'";
}
$ErrMsg = _('CRITICAL ERROR! NOTE DOWN THIS ERROR AND SEEK ASSISTANCE. The fixed asset cost and date purchased was not able to be updated because:');
$DbgMsg = _('The following SQL was used to attempt the update of the cost and the date the asset was purchased');
@@ -614,23 +615,23 @@
/*first the debit using the GLCode in the PO detail record entry*/
$SQL = "INSERT INTO gltrans (type,
- typeno,
- trandate,
- periodno,
- account,
- narrative,
- amount)
- VALUES (
- 25,
- '" . $GRN . "',
- '" . $_POST['DefaultReceivedDate'] . "',
- '" . $PeriodNo . "',
- '" . $OrderLine->GLCode . "',
- 'PO: " . $_SESSION['PO'.$identifier]->OrderNo . " " . $_SESSION['PO'.$identifier]->SupplierID . " - " . $OrderLine->StockID
- . " - " . $OrderLine->ItemDescription . " x " . $OrderLine->ReceiveQty . " @ " .
- number_format($CurrentStandardCost,2) . "',
- '" . $CurrentStandardCost * $OrderLine->ReceiveQty . "'
- )";
+ typeno,
+ trandate,
+ periodno,
+ account,
+ narrative,
+ amount)
+ VALUES (
+ 25,
+ '" . $GRN . "',
+ '" . $_POST['DefaultReceivedDate'] . "',
+ '" . $PeriodNo . "',
+ '" . $OrderLine->GLCode . "',
+ 'PO: " . $_SESSION['PO'.$identifier]->OrderNo . " " . $_SESSION['PO'.$identifier]->SupplierID . " - " . $OrderLine->StockID
+ . " - " . $OrderLine->ItemDescription . " x " . $OrderLine->ReceiveQty . " @ " .
+ number_format($CurrentStandardCost,2) . "',
+ '" . $CurrentStandardCost * $OrderLine->ReceiveQty . "'
+ )";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The purchase GL posting could not be inserted because');
$DbgMsg = _('The following SQL to insert the purchase GLTrans record was used');
@@ -640,22 +641,22 @@
/*now the GRN suspense entry*/
$SQL = "INSERT INTO gltrans (type,
- typeno,
- trandate,
- periodno,
- account,
- narrative,
- amount)
- VALUES (25,
- '" . $GRN . "',
- '" . $_POST['DefaultReceivedDate'] . "',
- '" . $PeriodNo . "',
- '" . $_SESSION['CompanyRecord']['grnact'] . "',
- '" . _('PO'.$identifier) . ': ' . $_SESSION['PO'.$identifier]->OrderNo . ' ' . $_SESSION['PO'.$identifier]->SupplierID . ' - ' .
- $OrderLine->StockID . ' - ' . $OrderLine->ItemDescription . ' x ' .
- $OrderLine->ReceiveQty . ' @ ' . number_format($UnitCost,2) . "',
- '" . -$UnitCost * $OrderLine->ReceiveQty . "'
- )";
+ typeno,
+ trandate,
+ periodno,
+ account,
+ narrative,
+ amount)
+ VALUES (25,
+ '" . $GRN . "',
+ '" . $_POST['DefaultReceivedDate'] . "',
+ '" . $PeriodNo . "',
+ '" . $_SESSION['CompanyRecord']['grnact'] . "',
+ '" . _('PO'.$identifier) . ': ' . $_SESSION['PO'.$identifier]->OrderNo . ' ' . $_SESSION['PO'.$identifier]->SupplierID . ' - ' .
+ $OrderLine->StockID . ' - ' . $OrderLine->ItemDescription . ' x ' .
+ $OrderLine->ReceiveQty . ' @ ' . number_format($UnitCost,2) . "',
+ '" . -$UnitCost * $OrderLine->ReceiveQty . "'
+ )";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The GRN suspense side of the GL posting could not be inserted because');
$DbgMsg = _('The following SQL to insert the GRN Suspense GLTrans record was used');
Modified: trunk/PO_Header.php
===================================================================
--- trunk/PO_Header.php 2011-05-16 10:46:50 UTC (rev 4571)
+++ trunk/PO_Header.php 2011-05-23 10:14:06 UTC (rev 4572)
@@ -146,8 +146,8 @@
$AllowPrint=0;
}
$SQL = "UPDATE purchorders SET status='" . $_POST['Status']. "',
- stat_comment='" . $_SESSION['PO'.$identifier]->StatusComments ."',
- allowprint='".$AllowPrint."'
+ stat_comment='" . $_SESSION['PO'.$identifier]->StatusComments ."',
+ allowprint='".$AllowPrint."'
WHERE purchorders.orderno ='" . $_SESSION['ExistingOrder'] ."'";
$ErrMsg = _('The order status could not be updated because');
@@ -172,8 +172,10 @@
$_SESSION['PO'.$identifier]->GLLink = $_SESSION['CompanyRecord']['gllink_stock'];
/* set the SupplierID we got */
$_SESSION['PO'.$identifier]->SupplierID = $_GET['SelectedSupplier'];
+ $_SESSION['PO'.$identifier]->DeliveryDate = DateAdd(date($_SESSION['DefaultDateFormat']), 'd', $_GET['LeadTime']);
$_SESSION['RequireSupplierSelection'] = 0;
$_POST['Select'] = $_GET['SelectedSupplier'];
+
/*
* the item (it's item code) that should be purchased
@@ -219,8 +221,8 @@
$_SESSION['PO'.$identifier]->AllowPrintPO=1;
$sql = "UPDATE purchorders
- SET purchorders.allowprint='1'
- WHERE purchorders.orderno='" . $_SESSION['PO'.$identifier]->OrderNo ."'";
+ SET purchorders.allowprint='1'
+ WHERE purchorders.orderno='" . $_SESSION['PO'.$identifier]->OrderNo ."'";
$ErrMsg = _('An error occurred updating the purchase order to allow reprints') . '. ' . _('The error says');
$UpdateResult = DB_query($sql,$db,$ErrMsg);
@@ -365,6 +367,7 @@
$_POST['SuppDelAdd4']=$_SESSION['PO'.$identifier]->SuppDelAdd4;
$_POST['SuppDelAdd5']=$_SESSION['PO'.$identifier]->SuppDelAdd5;
$_POST['SuppD...
[truncated message content] |
|
From: <dai...@us...> - 2011-05-23 10:14:15
|
Revision: 4572
http://web-erp.svn.sourceforge.net/web-erp/?rev=4572&view=rev
Author: daintree
Date: 2011-05-23 10:14:06 +0000 (Mon, 23 May 2011)
Log Message:
-----------
various
Modified Paths:
--------------
trunk/Areas.php
trunk/AuditTrail.php
trunk/BankMatching.php
trunk/BankReconciliation.php
trunk/ContractBOM.php
trunk/CreditStatus.php
trunk/CustomerBranches.php
trunk/CustomerInquiry.php
trunk/CustomerReceipt.php
trunk/DailySalesInquiry.php
trunk/FTP_RadioBeacon.php
trunk/FreightCosts.php
trunk/GLTransInquiry.php
trunk/GoodsReceived.php
trunk/PO_Header.php
trunk/PO_Items.php
trunk/PO_SelectOSPurchOrder.php
trunk/PaymentMethods.php
trunk/PaymentTerms.php
trunk/SelectProduct.php
trunk/StockQties_csv.php
trunk/SuppInvGRNs.php
trunk/SuppTransGLAnalysis.php
trunk/SupplierAllocations.php
trunk/SupplierInvoice.php
trunk/UpgradeDatabase.php
trunk/WWW_Access.php
trunk/doc/Change.log
trunk/includes/DefinePOClass.php
trunk/includes/DefineSuppAllocsClass.php
trunk/includes/DefineSuppTransClass.php
trunk/includes/PO_ReadInOrder.inc
trunk/includes/footer.inc
trunk/index.php
Removed Paths:
-------------
trunk/SystemCheck.php
Modified: trunk/Areas.php
===================================================================
--- trunk/Areas.php 2011-05-16 10:46:50 UTC (rev 4571)
+++ trunk/Areas.php 2011-05-23 10:14:06 UTC (rev 4572)
@@ -1,7 +1,6 @@
<?php
-/* $Revision: 1.22 $ */
+
/* $Id$*/
-//$PageSecurity = 3;
include('includes/session.inc');
@@ -163,7 +162,7 @@
echo '<td>' . $myrow[0] . '</td>
<td>' . $myrow[1] . '</td>';
echo '<td><a href="' . $_SERVER['PHP_SELF'] . '?SelectedArea=' . $myrow[0] . '">' . _('Edit') . '</a></td>';
- echo '<td><a href="' . $_SERVER['PHP_SELF'] . '?SelectedArea=' . $myrow[0] . '&delete=yes">' . _('Delete') . '</a></td>';
+ echo '<td><a href="' . $_SERVER['PHP_SELF'] . '?SelectedArea=' . $myrow[0] . '&delete=yes" onclick="return confirm(\'' . _('Are you sure you wish to delete this sales area?') . '\');">' . _('Delete') . '</a></td>';
echo '<td><a href="SelectCustomer.php'. '?Area=' . $myrow[0] . '">' . _('View Customers from this Area') . '</a></td>';
}
//END WHILE LIST LOOP
Modified: trunk/AuditTrail.php
===================================================================
--- trunk/AuditTrail.php 2011-05-16 10:46:50 UTC (rev 4571)
+++ trunk/AuditTrail.php 2011-05-23 10:14:06 UTC (rev 4572)
@@ -30,7 +30,7 @@
echo '<form action="' . $_SERVER['PHP_SELF'] . '" method="post">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-echo '<table class=selection>';
+echo '<table class="selection">';
echo '<tr><td>'. _('From Date') . ' ' . $_SESSION['DefaultDateFormat'] .'</td>
<td><input tabindex="1" type=text class=date alt="'.$_SESSION['DefaultDateFormat'].'" name="FromDate" size="11" maxlength="10" value=' .$_POST['FromDate'].'></td></tr>';
@@ -40,7 +40,7 @@
// Show user selections
echo '<tr><td>'. _('User ID'). '</td>
<td><select tabindex="3" name="SelectedUser">';
-echo '<option value="ALL">' . _('ALL') . '</option>';
+echo '<option value="ALL">' . _('All') . '</option>';
while ($users = DB_fetch_row($UserResult)) {
if (isset($_POST['SelectedUser']) and $users[0]==$_POST['SelectedUser']) {
echo '<option selected value="' . $users[0] . '">' . $users[0] . '</option>';
@@ -53,7 +53,7 @@
// Show table selections
echo '<tr><td>'. _('Table '). '</td>
<td><select tabindex="4" name="SelectedTable">';
-echo '<option value="ALL">' . _('ALL') . '</option>';
+echo '<option value="ALL">' . _('All') . '</option>';
while ($tables = DB_fetch_row($TableResult)) {
if (isset($_POST['SelectedTable']) and $tables[0]==$_POST['SelectedTable']) {
echo '<option selected value=' . $tables[0] . '>' . $tables[0] . '</option>';
@@ -176,7 +176,7 @@
for ($i=1; $i<sizeof($_SESSION['SQLString']['fields']); $i++) {
if (isset($_SESSION['SQLString']['values'][$i]) and (trim(str_replace("'","",$_SESSION['SQLString']['values'][$i])) != "") &
(trim($_SESSION['SQLString']['fields'][$i]) != 'password') &
- (trim($_SESSION['SQLString']['fields'][$i]) != "www_users.password")) {
+ (trim($_SESSION['SQLString']['fields'][$i]) != 'www_users.password')) {
echo '<tr bgcolor="' . $RowColour . '">';
echo '<td></td>
<td></td>
Modified: trunk/BankMatching.php
===================================================================
--- trunk/BankMatching.php 2011-05-16 10:46:50 UTC (rev 4571)
+++ trunk/BankMatching.php 2011-05-23 10:14:06 UTC (rev 4572)
@@ -1,10 +1,8 @@
<?php
-/* $Revision: 1.23 $ */
+
/* $Id$*/
-//$PageSecurity = 7;
-
-include("includes/session.inc");
+include('includes/session.inc');
$title = _('Bank Account Matching');
include('includes/header.inc');
@@ -29,9 +27,16 @@
exit;
}
+if (isset($_GET['Account'])) {
+ $_POST['BankAccount']=$_GET['Account'];
+ $_POST['ShowTransactions']=true;
+ $_POST['Ostg_or_All']='Ostg';
+ $_POST['First20_or_All']='All';
+}
+
if (isset($_POST['Update']) AND $_POST['RowCounter']>1){
for ($Counter=1;$Counter <= $_POST['RowCounter']; $Counter++){
- if (isset($_POST["Clear_" . $Counter]) and $_POST["Clear_" . $Counter]==True){
+ if (isset($_POST['Clear_' . $Counter]) AND $_POST['Clear_' . $Counter]==True){
/*Get amount to be cleared */
$sql = "SELECT amount,
exrate
@@ -79,13 +84,13 @@
echo '<table class=selection><tr>';
echo '<td align=left>' . _('Bank Account') . ':</td><td colspan=3><select tabindex="1" name="BankAccount">';
-$sql = 'SELECT accountcode, bankaccountname FROM bankaccounts';
+$sql = "SELECT accountcode, bankaccountname FROM bankaccounts";
$resultBankActs = DB_query($sql,$db);
while ($myrow=DB_fetch_array($resultBankActs)){
if (isset($_POST['BankAccount']) and $myrow['accountcode']==$_POST['BankAccount']){
- echo "<option selected Value='" . $myrow['accountcode'] . "'>" . $myrow['bankaccountname'];
+ echo '<option selected value="' . $myrow['accountcode'] . '">' . $myrow['bankaccountname'] . '</option>';
} else {
- echo "<option Value='" . $myrow['accountcode'] . "'>" . $myrow['bankaccountname'];
+ echo '<option value="' . $myrow['accountcode'] . '">' . $myrow['bankaccountname'] . '</option>';
}
}
@@ -95,12 +100,12 @@
$_POST['BeforeDate'] = Date($_SESSION['DefaultDateFormat']);
}
if (!isset($_POST['AfterDate']) OR !Is_Date($_POST['AfterDate'])){
- $_POST['AfterDate'] = Date($_SESSION['DefaultDateFormat'], Mktime(0,0,0,Date("m")-3,Date("d"),Date("y")));
+ $_POST['AfterDate'] = Date($_SESSION['DefaultDateFormat'], Mktime(0,0,0,Date('m')-3,Date('d'),Date('y')));
}
// Change to allow input of FROM DATE and then TO DATE, instead of previous back-to-front method, add datepicker
echo '<tr><td>' . _('Show') . ' ' . $TypeName . ' ' . _('from') . ':</td>
- <td><input tabindex="3" type="text" name="AfterDate" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" size="12" maxlength="10" onChange="isDate(this, this.value, '."'".$_SESSION['DefaultDateFormat']."'".')" Value="' . $_POST['AfterDate'] . '"></td></tr>';
+ <td><input tabindex="3" type="text" name="AfterDate" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" size="12" maxlength="10" onChange="isDate(this, this.value, '."'".$_SESSION['DefaultDateFormat']."'".')" value="' . $_POST['AfterDate'] . '"></td></tr>';
echo '<td>' . _('to') . ':</td>
<td><input tabindex="2" type="text" name="BeforeDate" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" size="12" maxlength="10" onChange="isDate(this, this.value, '."'".$_SESSION['DefaultDateFormat']."'".')" Value="' . $_POST['BeforeDate'] . '"></td>';
@@ -108,29 +113,29 @@
<td><select tabindex="4" name="Ostg_or_All">';
if ($_POST['Ostg_or_All']=='All'){
- echo '<option selected Value="All">' . _('Show all') . ' ' . $TypeName . ' ' . _('in the date range');
- echo '<option Value="Ostdg">' . _('Show unmatched') . ' ' . $TypeName . ' ' . _('only');
+ echo '<option selected value="All">' . _('Show all') . ' ' . $TypeName . ' ' . _('in the date range') . '</option>';
+ echo '<option value="Ostdg">' . _('Show unmatched') . ' ' . $TypeName . ' ' . _('only') . '</option>';
} else {
- echo '<option Value="All">' . _('Show all') . ' ' . $TypeName . ' ' . _('in the date range');
- echo '<option selected Value="Ostdg">' . _('Show unmatched') . ' ' . $TypeName . ' ' . _('only');
+ echo '<option Value="All">' . _('Show all') . ' ' . $TypeName . ' ' . _('in the date range') . '</option>';
+ echo '<option selected Value="Ostdg">' . _('Show unmatched') . ' ' . $TypeName . ' ' . _('only') . '</option>';
}
echo '</select></td></tr>';
echo '<tr><td colspan=3>' . _('Choose to display only the first 20 matching') . ' ' . $TypeName . ' ' .
_('or all') . ' ' . $TypeName . ' ' . _('meeting the criteria') . ':</td><td><select tabindex="5" name="First20_or_All">';
if ($_POST['First20_or_All']=='All'){
- echo '<option selected Value="All">' . _('Show all') . ' ' . $TypeName . ' ' . _('in the date range');
- echo '<option Value="First20">' . _('Show only the first 20') . ' ' . $TypeName;
+ echo '<option selected Value="All">' . _('Show all') . ' ' . $TypeName . ' ' . _('in the date range') . '</option>';
+ echo '<option Value="First20">' . _('Show only the first 20') . ' ' . $TypeName . '</option>';
} else {
- echo '<option Value="All">' . _('Show all') . ' ' . $TypeName . ' ' . _('in the date range');
- echo '<option selected Value="First20">' . _('Show only the first 20') . ' ' . $TypeName;
+ echo '<option Value="All">' . _('Show all') . ' ' . $TypeName . ' ' . _('in the date range') . '</option>';
+ echo '<option selected Value="First20">' . _('Show only the first 20') . ' ' . $TypeName . '</option>';
}
echo '</select></td></tr>';
echo '</table><br><div class="centre"><input tabindex="6" type=submit name="ShowTransactions" VALUE="' . _('Show selected') . ' ' . $TypeName . '">';
-echo "<p><a href='$rootpath/BankReconciliation.php?" . SID . "'>" . _('Show reconciliation') . '</a></div>';
-echo '<hr>';
+echo '<p><a href="' . $rootpath . '/BankReconciliation.php">' . _('Show reconciliation') . '</a></div>';
+echo '<hr />';
$InputError=0;
if (!Is_Date($_POST['BeforeDate'])){
@@ -151,7 +156,7 @@
$SQLBeforeDate = FormatDateForSQL($_POST['BeforeDate']);
$SQLAfterDate = FormatDateForSQL($_POST['AfterDate']);
- if ($_POST["Ostg_or_All"]=='All'){
+ if ($_POST['Ostg_or_All']=='All'){
if ($Type=='Payments'){
$sql = "SELECT banktransid,
ref,
@@ -163,7 +168,7 @@
WHERE amount <0
AND transdate >= '". $SQLAfterDate . "'
AND transdate <= '" . $SQLBeforeDate . "'
- AND bankact='" .$_POST["BankAccount"] . "'
+ AND bankact='" .$_POST['BankAccount'] . "'
ORDER BY transdate";
} else { /* Type must == Receipts */
@@ -192,7 +197,7 @@
WHERE amount <0
AND transdate >= '". $SQLAfterDate . "'
AND transdate <= '" . $SQLBeforeDate . "'
- AND bankact=" .$_POST["BankAccount"] . "
+ AND bankact=" .$_POST['BankAccount'] . "
AND ABS(amountcleared - (amount / exrate)) > 0.009
ORDER BY transdate";
} else { /* Type must == Receipts */
@@ -206,12 +211,12 @@
WHERE amount >0
AND transdate >= '". $SQLAfterDate . "'
AND transdate <= '" . $SQLBeforeDate . "'
- AND bankact='" .$_POST["BankAccount"] . "'
+ AND bankact='" .$_POST['BankAccount'] . "'
AND ABS(amountcleared - (amount / exrate)) > 0.009
ORDER BY transdate";
}
}
- if ($_POST["First20_or_All"]!='All'){
+ if ($_POST['First20_or_All']!='All'){
$sql = $sql . " LIMIT 20";
}
@@ -219,13 +224,13 @@
$PaymentsResult = DB_query($sql, $db, $ErrMsg);
$TableHeader = '<tr><th>'. _('Ref'). '</th>
- <th>' . $TypeName . '</th>
- <th>' . _('Date') . '</th>
- <th>' . _('Amount') . '</th>
- <th>' . _('Outstanding') . '</th>
- <th colspan=3>' . _('Clear') . ' / ' . _('Unclear') . '</th>
- </tr>';
- echo '<table cellpadding=2 class=selection>' . $TableHeader;
+ <th>' . $TypeName . '</th>
+ <th>' . _('Date') . '</th>
+ <th>' . _('Amount') . '</th>
+ <th>' . _('Outstanding') . '</th>
+ <th colspan=3>' . _('Clear') . ' / ' . _('Unclear') . '</th>
+ </tr>';
+ echo '<table cellpadding=2 class="selection">' . $TableHeader;
$j = 1; //page length counter
@@ -238,24 +243,23 @@
$Outstanding = $myrow['amt']- $myrow['amountcleared'];
if (ABS($Outstanding)<0.009){ /*the payment is cleared dont show the check box*/
- printf("<tr bgcolor='#CCCEEE'>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td class=number>%s</td>
- <td class=number>%s</td>
- <td colspan=2>%s</td>
- <td><input type='checkbox' name='Unclear_%s'><input type=hidden name='BankTrans_%s' VALUE=%s></td>
- </tr>",
- $myrow['ref'],
- $myrow['banktranstype'],
- $DisplayTranDate,
- number_format($myrow['amt'],2),
- number_format($Outstanding,2),
- _('Unclear'),
- $i,
- $i,
- $myrow['banktransid']);
+ pprintf('<tr bgcolor="#CCCEEE">
+ <td>%s</td>
+ <td>%s</td>
+ <td class=number>%s</td>
+ <td class=number>%s</td>
+ <td colspan=2>%s</td>
+ <td><input type="checkbox" name="Unclear_%s"><input type="hidden" name="BankTrans_%s" value=%s></td>
+ </tr>',
+ $myrow['ref'],
+ $myrow['banktranstype'],
+ $DisplayTranDate,
+ number_format($myrow['amt'],2),
+ number_format($Outstanding,2),
+ _('Unclear'),
+ $i,
+ $i,
+ $myrow['banktransid']);
} else{
if ($k==1){
@@ -265,15 +269,14 @@
echo '<tr class="OddTableRows">';
$k=1;
}
-
- printf("<td>%s</td>
+ printf('<td>%s</td>
<td>%s</td>
<td>%s</td>
<td class=number>%s</td>
<td class=number>%s</td>
- <td><input type='checkbox' name='Clear_%s'><input type=hidden name='BankTrans_%s' VALUE=%s></td>
- <td colspan=2><input type='text' maxlength=15 size=15 class=number name='AmtClear_%s'></td>
- </tr>",
+ <td><input type="checkbox" name="Clear_%s"><input type=hidden name="BankTrans_%s" value=%s></td>
+ <td colspan=2><input type="text" maxlength=15 size=15 class="number" name="AmtClear_%s"></td>
+ </tr>',
$myrow['ref'],
$myrow['banktranstype'],
$DisplayTranDate,
@@ -296,10 +299,11 @@
}
//end of while loop
- echo '</table><br><div class="centre"><input type=hidden name="RowCounter" value=' . $i . '><input type=submit name="Update" VALUE="' . _('Update Matching') . '"></div>';
-
+ echo '</table>
+ <br />
+ <div class="centre"><input type=hidden name="RowCounter" value=' . $i . '>
+ <input type=submit name="Update" value="' . _('Update Matching') . '"></div>';
}
-
echo '</form>';
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/BankReconciliation.php
===================================================================
--- trunk/BankReconciliation.php 2011-05-16 10:46:50 UTC (rev 4571)
+++ trunk/BankReconciliation.php 2011-05-23 10:14:06 UTC (rev 4572)
@@ -1,29 +1,33 @@
<?php
-/* $Revision: 1.15 $ */
/* $Id$*/
-//$PageSecurity = 7;
-
include ('includes/session.inc');
$title = _('Bank Reconciliation');
include('includes/header.inc');
-echo '<form method="post" action="' . $_SERVER['PHP_SELF'] . '?' . SID . '">';
+echo '<form method="post" action="' . $_SERVER['PHP_SELF'] . '">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/money_add.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'</p><br />';
+if (isset($_GET['Account'])) {
+ $_POST['BankAccount']=$_GET['Account'];
+ $_POST['ShowRec']=true;
+}
+
if (isset($_POST['PostExchangeDifference']) and is_numeric($_POST['DoExchangeDifference'])){
- if (!is_numeric($_POST['BankStatmentBalance'])){
+ if (!is_numeric($_POST['BankStatementBalance'])){
prnMsg(_('The entry in the bank statement balance is not numeric. The balance on the bank statement should be entered. The exchange difference has not been calculated and no general ledger journal has been created'),'warn');
- echo '<p>' . $_POST['BankStatmentBalance'];
+ echo '<p>' . $_POST['BankStatementBalance'];
} else {
/* Now need to get the currency of the account and the current table ex rate */
- $SQL = "SELECT rate, bankaccountname
- FROM bankaccounts INNER JOIN currencies
- ON bankaccounts.currcode=currencies.currabrev
+ $SQL = "SELECT rate,
+ bankaccountname
+ FROM bankaccounts INNER JOIN currencies
+ ON bankaccounts.currcode=currencies.currabrev
WHERE bankaccounts.accountcode = '" . $_POST['BankAccount']."'";
$ErrMsg = _('Could not retrieve the exchange rate for the selected bank account');
@@ -33,7 +37,7 @@
$BankAccountName = $CurrencyRow[1];
$CalculatedBalance = $_POST['DoExchangeDifference'];
- $ExchangeDifference = ($CalculatedBalance - $_POST['BankStatmentBalance'])/$ExRate;
+ $ExchangeDifference = ($CalculatedBalance - $_POST['BankStatementBalance'])/$ExRate;
include ('includes/SQL_CommonFunctions.inc');
$ExDiffTransNo = GetNextTransNo(36,$db);
@@ -84,20 +88,22 @@
} //end if the bank statement balance was numeric
}
+echo '<table class="selection">';
+$SQL = "SELECT bankaccountname, accountcode FROM bankaccounts";
-echo '<table>';
-
-$SQL = 'SELECT bankaccountname, accountcode FROM bankaccounts';
-
$ErrMsg = _('The bank accounts could not be retrieved by the SQL because');
$DbgMsg = _('The SQL used to retrieve the bank accounts was');
$AccountsResults = DB_query($SQL,$db,$ErrMsg,$DbgMsg);
-echo '<tr><td>' . _('Bank Account') . ':</td><td><select tabindex="1" name="BankAccount">';
+echo '<tr><td>' . _('Bank Account') . ':</td>
+ <td><select tabindex="1" name="BankAccount">';
if (DB_num_rows($AccountsResults)==0){
- echo '</select></td></tr></table><p>' . _('Bank Accounts have not yet been defined') . '. ' . _('You must first') . "<a href='" . $rootpath . "/BankAccounts.php'>" . _('define the bank accounts') . '</a>' . ' ' . _('and general ledger accounts to be affected') . '.';
+ echo '</select></td>
+ </tr>
+ </table>
+ <p>' . _('Bank Accounts have not yet been defined') . '. ' . _('You must first') . '<a href="' . $rootpath . '/BankAccounts.php">' . _('define the bank accounts') . '</a>' . ' ' . _('and general ledger accounts to be affected') . '.';
include('includes/footer.inc');
exit;
} else {
@@ -116,20 +122,24 @@
include ('includes/GLPostings.inc');
-echo '</table><p><div class="centre"><input type=submit tabindex="2" name="ShowRec" value="' . _('Show bank reconciliation statement') . '"></div><br>';
+echo '</table><p><div class="centre"><input type=submit tabindex="2" name="ShowRec" value="' . _('Show bank reconciliation statement') . '"></div><br />';
if (isset($_POST['ShowRec']) OR isset($_POST['DoExchangeDifference'])){
/*Get the balance of the bank account concerned */
- $sql = "SELECT MAX(period) FROM chartdetails WHERE accountcode='" . $_POST['BankAccount']."'";
+ $sql = "SELECT MAX(period)
+ FROM chartdetails
+ WHERE accountcode='" . $_POST['BankAccount']."'";
$PrdResult = DB_query($sql, $db);
$myrow = DB_fetch_row($PrdResult);
$LastPeriod = $myrow[0];
$SQL = "SELECT bfwd+actual AS balance
- FROM chartdetails WHERE period='" . $LastPeriod . "' AND accountcode='" . $_POST['BankAccount']."'";
+ FROM chartdetails
+ WHERE period='" . $LastPeriod . "'
+ AND accountcode='" . $_POST['BankAccount']."'";
$ErrMsg = _('The bank account balance could not be returned by the SQL because');
$BalanceResult = DB_query($SQL,$db,$ErrMsg);
@@ -141,9 +151,9 @@
$SQL = "SELECT rate,
bankaccounts.currcode,
bankaccounts.bankaccountname
- FROM bankaccounts INNER JOIN currencies
- ON bankaccounts.currcode=currencies.currabrev
- WHERE bankaccounts.accountcode = '" . $_POST['BankAccount']."'";
+ FROM bankaccounts INNER JOIN currencies
+ ON bankaccounts.currcode=currencies.currabrev
+ WHERE bankaccounts.accountcode = '" . $_POST['BankAccount']."'";
$ErrMsg = _('Could not retrieve the currency and exchange rate for the selected bank account');
$CurrencyResult = DB_query($SQL,$db);
$CurrencyRow = DB_fetch_row($CurrencyResult);
@@ -151,13 +161,13 @@
$BankCurrCode = $CurrencyRow[1];
$BankAccountName = $CurrencyRow[2];
- echo '<table class=selection>
- <tr class=EvenTableRows><td colspan=6><b>' . $BankAccountName . ' ' . _('Balance as at') . ' ' . Date($_SESSION['DefaultDateFormat']);
+ echo '<table class="selection">
+ <tr class="EvenTableRows"><td colspan=6><b>' . $BankAccountName . ' ' . _('Balance as at') . ' ' . Date($_SESSION['DefaultDateFormat']);
if ($_SESSION['CompanyRecord']['currencydefault']!=$BankCurrCode){
echo ' (' . $BankCurrCode . ' @ ' . $ExRate .')';
}
echo '</b></td>
- <td valign=bottom class=number><b>' . number_format($Balance*$ExRate,2) . '</b></td></tr>';
+ <td valign=bottom class="number"><b>' . number_format($Balance*$ExRate,2) . '</b></td></tr>';
$SQL = "SELECT amount/exrate AS amt,
amountcleared,
@@ -181,13 +191,13 @@
echo '<tr><td colspan=6><b>' . _('Add back unpresented cheques') . ':</b></td></tr>';
$TableHeader = '<tr>
- <th>' . _('Date') . '</th>
- <th>' . _('Type') . '</th>
- <th>' . _('Number') . '</th>
- <th>' . _('Reference') . '</th>
- <th>' . _('Orig Amount') . '</th>
- <th>' . _('Outstanding') . '</th>
- </tr>';
+ <th>' . _('Date') . '</th>
+ <th>' . _('Type') . '</th>
+ <th>' . _('Number') . '</th>
+ <th>' . _('Reference') . '</th>
+ <th>' . _('Orig Amount') . '</th>
+ <th>' . _('Outstanding') . '</th>
+ </tr>';
echo $TableHeader;
@@ -307,7 +317,7 @@
if (isset($_POST['DoExchangeDifference'])){
echo '<input type="hidden" name="DoExchangeDifference" value=' . $FXStatementBalance . '>';
echo '<tr><td colspan=6>' . _('Enter the actual bank statement balance') . ' (' . $BankCurrCode . ')</b></td>
- <td class=number><input type="text" name="BankStatmentBalance" maxlength=15 size=15 value=' . $_POST['BankStatmentBalance'] . '><td></tr>';
+ <td class=number><input type="text" name="BankStatementBalance" maxlength=15 size=15 value=' . $_POST['BankStatementBalance'] . '><td></tr>';
echo '<tr><td colspan=7 align="center"><input type="submit" name="PostExchangeDifference" value="' . _('Calculate and Post Exchange Difference') . '" onclick="return confirm(\'' . _('This will create a general ledger journal to write off the exchange difference in the current balance of the account. It is important that the exchange rate above reflects the current value of the bank account currency') . ' - ' . _('Are You Sure?') . '\');"></td></tr>';
}
@@ -323,8 +333,15 @@
echo '</table>';
}
-echo '<p><div class="centre"><a tabindex="4" href="' . $rootpath . '/BankMatching.php?' . SID . '&Type=Payments">' . _('Match off cleared payments') . '</a>';
-echo '<br><a tabindex="5" href="' . $rootpath . '/BankMatching.php?' . SID . '&Type=Receipts">' . _('Match off cleared deposits') . '</a></div>';
+
+if (isset($_POST['BankAccount'])) {
+ echo '<p><div class="centre"><a tabindex="4" href="' . $rootpath . '/BankMatching.php?Type=Payments&Account='.$_POST['BankAccount'].'">' . _('Match off cleared payments') . '</a>';
+ echo '<br /><a tabindex="5" href="' . $rootpath . '/BankMatching.php?Type=Receipts&Account='.$_POST['BankAccount'].'">' . _('Match off cleared deposits') . '</a></div>';
+} else {
+ echo '<p><div class="centre"><a tabindex="4" href="' . $rootpath . '/BankMatching.php?Type=Payments">' . _('Match off cleared payments') . '</a>';
+ echo '<br /><a tabindex="5" href="' . $rootpath . '/BankMatching.php?Type=Receipts">' . _('Match off cleared deposits') . '</a></div>';
+}
+
echo '</form>';
include('includes/footer.inc');
?>
Modified: trunk/ContractBOM.php
===================================================================
--- trunk/ContractBOM.php 2011-05-16 10:46:50 UTC (rev 4571)
+++ trunk/ContractBOM.php 2011-05-23 10:14:06 UTC (rev 4572)
@@ -290,11 +290,11 @@
$result1 = DB_query($sql,$db,$ErrMsg,$DbgMsg);
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/magnifier.png" title="' .
_('Print') . '" alt="" />' . ' ' . _('Search For Stock Items') . '</p>';
- echo '<table class="selection"><tr>';
+ echo '<table class="selection">
+ <tr></tr>
+ <tr><td><select name="StockCat">';
- echo ':</tr><tr><td><select name="StockCat">';
-
- echo '<option selected="True" value="All">' . _('All').'</option>';
+ echo '<option selected="true" value="All">' . _('All').'</option>';
while ($myrow1 = DB_fetch_array($result1)) {
if (isset($_POST['StockCat']) and $_POST['StockCat']==$myrow1['categoryid']){
echo '<option selected value="'. $myrow1['categoryid'] . '">' . $myrow1['categorydescription'].'</option>';
Modified: trunk/CreditStatus.php
===================================================================
--- trunk/CreditStatus.php 2011-05-16 10:46:50 UTC (rev 4571)
+++ trunk/CreditStatus.php 2011-05-23 10:14:06 UTC (rev 4572)
@@ -214,14 +214,15 @@
echo '<input type="hidden" name="SelectedReason" value="' . $SelectedReason . '">';
echo '<input type="hidden" name="ReasonCode" value="' . $_POST['ReasonCode'] . '">';
- echo '<table class="selection"><tr><td>'. _('Status Code') .':</td><td>';
- echo $_POST['ReasonCode'] . '</td></tr>';
+ echo '<table class="selection">
+ <tr><td>'. _('Status Code') .':</td>
+ <td>' . $_POST['ReasonCode'] . '</td></tr>';
} else { //end of if $SelectedReason only do the else when a new record is being entered
if (!isset($_POST['ReasonCode'])) {
$_POST['ReasonCode'] = '';
}
- echo '<br><table class=selection>
+ echo '<br /><table class="selection">
<tr>
<td>'. _('Status Code') .':</td>
<td><input ' . (in_array('ReasonCode',$Errors) ? 'class="inputerror"' : '' ) . ' tabindex=1 type="text" name="ReasonCode" value="'. $_POST['ReasonCode'] .'" size=3 maxlength=2></td>
Modified: trunk/CustomerBranches.php
===================================================================
--- trunk/CustomerBranches.php 2011-05-16 10:46:50 UTC (rev 4571)
+++ trunk/CustomerBranches.php 2011-05-23 10:14:06 UTC (rev 4572)
@@ -396,8 +396,7 @@
<td>%s</td>
<td>%s</td>
<td><a href="%s?DebtorNo=%s&SelectedBranch=%s">%s</td>
- <td><a href="%s?DebtorNo=%s&SelectedBranch=%s&delete=yes" onclick=\'return confirm("' .
- _('Are you sure you wish to delete this branch?') . '");\'>%s</td></tr>',
+ <td><a href="%s?DebtorNo=%s&SelectedBranch=%s&delete=yes" onclick=\'return confirm("' . _('Are you sure you wish to delete this branch?') . '");\'>%s</td></tr>',
$myrow[10],
$myrow[2],
$myrow[5],
@@ -590,42 +589,42 @@
exit;
}
- echo '<input type=hidden name="DebtorNo" value="'. $DebtorNo . '">';
+ echo '<input type=hidden name="DebtorNo" value="'. $DebtorNo . '" />';
echo '<tr><td>'._('Branch Name').':</td>';
if (!isset($_POST['BrName'])) {$_POST['BrName']='';}
- echo '<td><input tabindex=2 type="Text" name="BrName" size=41 maxlength=40 value="'. $_POST['BrName'].'"></td></tr>';
+ echo '<td><input tabindex=2 type="text" name="BrName" size=41 maxlength=40 value="'. $_POST['BrName'].'"></td></tr>';
echo '<tr><td>'._('Branch Contact').':</td>';
if (!isset($_POST['ContactName'])) {$_POST['ContactName']='';}
- echo '<td><input tabindex=3 type="Text" name="ContactName" size=41 maxlength=40 value="'. $_POST['ContactName'].'"></td></tr>';
+ echo '<td><input tabindex=3 type="text" name="ContactName" size=41 maxlength=40 value="'. $_POST['ContactName'].'"></td></tr>';
echo '<tr><td>'._('Street Address 1 (Street)').':</td>';
if (!isset($_POST['BrAddress1'])) {$_POST['BrAddress1']='';}
- echo '<td><input tabindex=4 type="Text" name="BrAddress1" size=41 maxlength=40 value="'. $_POST['BrAddress1'].'"></td></tr>';
+ echo '<td><input tabindex=4 type="text" name="BrAddress1" size=41 maxlength=40 value="'. $_POST['BrAddress1'].'"></td></tr>';
echo '<tr><td>'._('Street Address 2 (Suburb/City)').':</td>';
if (!isset($_POST['BrAddress2'])) {$_POST['BrAddress2']='';}
- echo '<td><input tabindex=5 type="Text" name="BrAddress2" size=41 maxlength=40 value="'. $_POST['BrAddress2'].'"></td></tr>';
+ echo '<td><input tabindex=5 type="text" name="BrAddress2" size=41 maxlength=40 value="'. $_POST['BrAddress2'].'"></td></tr>';
echo '<tr><td>'._('Street Address 3 (State)').':</td>';
if (!isset($_POST['BrAddress3'])) {$_POST['BrAddress3']='';}
- echo '<td><input tabindex=6 type="Text" name="BrAddress3" size=41 maxlength=40 value="'. $_POST['BrAddress3'].'"></td></tr>';
+ echo '<td><input tabindex=6 type="text" name="BrAddress3" size=41 maxlength=40 value="'. $_POST['BrAddress3'].'"></td></tr>';
echo '<tr><td>'._('Street Address 4 (Postal Code)').':</td>';
if (!isset($_POST['BrAddress4'])) {$_POST['BrAddress4']='';}
- echo '<td><input tabindex=7 type="Text" name="BrAddress4" size=31 maxlength=40 value="'. $_POST['BrAddress4'].'"></td></tr>';
+ echo '<td><input tabindex=7 type="text" name="BrAddress4" size=31 maxlength=40 value="'. $_POST['BrAddress4'].'"></td></tr>';
echo '<tr><td>'._('Street Address 5').':</td>';
if (!isset($_POST['BrAddress5'])) {$_POST['BrAddress5']='';}
- echo '<td><input tabindex=8 type="Text" name="BrAddress5" size=21 maxlength=20 value="'. $_POST['BrAddress5'].'"></td></tr>';
+ echo '<td><input tabindex=8 type="text" name="BrAddress5" size=21 maxlength=20 value="'. $_POST['BrAddress5'].'"></td></tr>';
echo '<tr><td>'._('Street Address 6').':</td>';
if (!isset($_POST['BrAddress6'])) {$_POST['BrAddress6']='';}
- echo '<td><input tabindex=9 type="Text" name="BrAddress6" size=16 maxlength=15 value="'. $_POST['BrAddress6'].'"></td></tr>';
+ echo '<td><input tabindex=9 type="text" name="BrAddress6" size=16 maxlength=15 value="'. $_POST['BrAddress6'].'"></td></tr>';
echo '<tr><td>'._('Special Instructions').':</td>';
if (!isset($_POST['specialinstructions'])) {$_POST['specialinstructions']='';}
- echo '<td><input tabindex=10 type="Text" name="specialinstructions" size=56 value="'. $_POST['specialinstructions'].'"></td></tr>';
+ echo '<td><input tabindex=10 type="text" name="specialinstructions" size=56 value="'. $_POST['specialinstructions'].'"></td></tr>';
echo '<tr><td>'._('Default days to deliver').':</td>';
if (!isset($_POST['EstDeliveryDays'])) {$_POST['EstDeliveryDays']=0;}
- echo '<td><input ' .(in_array('EstDeliveryDays',$Errors) ? 'class="inputerror"' : '' ) .' tabindex=11 type="Text" class=number name="EstDeliveryDays" size=4 maxlength=2 value='. $_POST['EstDeliveryDays'].'></td></tr>';
+ echo '<td><input ' .(in_array('EstDeliveryDays',$Errors) ? 'class="inputerror"' : '' ) .' tabindex=11 type="text" class=number name="EstDeliveryDays" size=4 maxlength=2 value='. $_POST['EstDeliveryDays'].'></td></tr>';
echo '<tr><td>'._('Forward Date After (day in month)').':</td>';
if (!isset($_POST['FwdDate'])) {$_POST['FwdDate']=0;}
- echo '<td><input ' .(in_array('FwdDate',$Errors) ? 'class="inputerror"' : '' ) .' tabindex=12 type="Text" class=number name="FwdDate" size=4 maxlength=2 value='. $_POST['FwdDate'].'></td></tr>';
+ echo '<td><input ' .(in_array('FwdDate',$Errors) ? 'class="inputerror"' : '' ) .' tabindex=12 type="text" class=number name="FwdDate" size=4 maxlength=2 value='. $_POST['FwdDate'].'></td></tr>';
echo '<tr><td>'._('Salesperson').':</td>';
echo '<td><select tabindex=13 name="Salesman">';
Modified: trunk/CustomerInquiry.php
===================================================================
--- trunk/CustomerInquiry.php 2011-05-16 10:46:50 UTC (rev 4571)
+++ trunk/CustomerInquiry.php 2011-05-23 10:14:06 UTC (rev 4572)
@@ -131,7 +131,7 @@
echo '<br /><font color=RED size=4><b>' . _('ACCOUNT ON HOLD') . '</font></b><br />';
}
-echo '<table class=selection width=70%>
+echo '<table class="selection" width="70%">
<tr>
<th width=20%>' . _('Total Balance') . '</th>
<th width=20%>' . _('Current') . '</th>
@@ -149,11 +149,12 @@
echo '<br /><div class="centre"><form action="' . $_SERVER['PHP_SELF'] . '" method=post>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-echo _('Show all transactions after') . ': <input tabindex=1 type=text class="date" alt="' .$_SESSION['DefaultDateFormat']. '" id="datepicker" name="TransAfterDate" Value="' . $_POST['TransAfterDate'] . '" maxlength =10 size=12>' . '<input tabindex=2 type="submit" name="Refresh Inquiry" value="' . _('Refresh Inquiry') . '"></div></form><br />';
+echo _('Show all transactions after') . ': <input tabindex=1 type="text" class="date" alt="' .$_SESSION['DefaultDateFormat']. '" id="datepicker" name="TransAfterDate" Value="' . $_POST['TransAfterDate'] . '" maxlength =10 size=12>' . '<input tabindex=2 type="submit" name="Refresh Inquiry" value="' . _('Refresh Inquiry') . '"></div>
+</form>
+<br />';
$DateAfterCriteria = FormatDateForSQL($_POST['TransAfterDate']);
-
$SQL = "SELECT systypes.typename,
debtortrans.id,
debtortrans.type,
Modified: trunk/CustomerReceipt.php
===================================================================
--- trunk/CustomerReceipt.php 2011-05-16 10:46:50 UTC (rev 4571)
+++ trunk/CustomerReceipt.php 2011-05-23 10:14:06 UTC (rev 4572)
@@ -700,7 +700,7 @@
/*set up the form whatever */
-echo '<form action="' . $_SERVER['PHP_SELF'] . '?Type='.$_GET['Type'] . '" method=post name=form1>';
+echo '<form action="' . $_SERVER['PHP_SELF'] . '?Type='.$_GET['Type'] . '" method="post" name="form1">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
/*show the batch header details and the entries in the batch so far */
Modified: trunk/DailySalesInquiry.php
===================================================================
--- trunk/DailySalesInquiry.php 2011-05-16 10:46:50 UTC (rev 4571)
+++ trunk/DailySalesInquiry.php 2011-05-23 10:14:06 UTC (rev 4572)
@@ -1,10 +1,7 @@
<?php
-/* $Revision: 1.00$ */
/* $Id$*/
-//$PageSecurity = 2;
-
include('includes/session.inc');
$title = _('Daily Sales Inquiry');
include('includes/header.inc');
@@ -25,7 +22,7 @@
$_POST['MonthToShow'] = GetPeriod(Date($_SESSION['DefaultDateFormat']),$db);
}
-$PeriodsResult = DB_query('SELECT periodno, lastdate_in_period FROM periods',$db);
+$PeriodsResult = DB_query("SELECT periodno, lastdate_in_period FROM periods",$db);
while ($PeriodRow = DB_fetch_array($PeriodsResult)){
if ($_POST['MonthToShow']==$PeriodRow['periodno']) {
@@ -38,7 +35,7 @@
echo '</select></td>';
echo '<td>' . _('Salesperson') . ':</td><td><select tabindex=2 name="Salesperson">';
-$SalespeopleResult = DB_query('SELECT salesmancode, salesmanname FROM salesman',$db);
+$SalespeopleResult = DB_query("SELECT salesmancode, salesmanname FROM salesman",$db);
if (!isset($_POST['Salesperson'])){
$_POST['Salesperson'] = 'All';
echo '<option selected value="All">' . _('All') . '</option>';
Modified: trunk/FTP_RadioBeacon.php
===================================================================
--- trunk/FTP_RadioBeacon.php 2011-05-16 10:46:50 UTC (rev 4571)
+++ trunk/FTP_RadioBeacon.php 2011-05-23 10:14:06 UTC (rev 4572)
@@ -14,30 +14,30 @@
some details of the order for confirming before producing the file for ftp */
$SQL = "SELECT salesorders.orderno,
- debtorsmaster.name,
- custbranch.brname,
- salesorders.customerref,
- salesorders.orddate,
- salesorders.deliverto,
- salesorders.deliverydate,
- sum(salesorderdetails.unitprice*salesorderdetails.quantity*(1-salesorderdetails.discountpercent)) as ordervalue,
- datepackingslipprinted,
- printedpackingslip
- FROM salesorders,
- salesorderdetails,
- debtorsmaster,
- custbranch
- WHERE salesorders.orderno = salesorderdetails.orderno
- AND salesorders.debtorno = debtorsmaster.debtorno
- AND debtorsmaster.debtorno = custbranch.debtorno
- AND salesorderdetails.completed=0
- AND salesorders.fromstkloc = '". $_SESSION['RadioBeaconStockLocation'] . "'
- GROUP BY salesorders.orderno,
- salesorders.debtorno,
- salesorders.branchcode,
- salesorders.customerref,
- salesorders.orddate,
- salesorders.deliverto";
+ debtorsmaster.name,
+ custbranch.brname,
+ salesorders.customerref,
+ salesorders.orddate,
+ salesorders.deliverto,
+ salesorders.deliverydate,
+ sum(salesorderdetails.unitprice*salesorderdetails.quantity*(1-salesorderdetails.discountpercent)) as ordervalue,
+ datepackingslipprinted,
+ printedpackingslip
+ FROM salesorders,
+ salesorderdetails,
+ debtorsmaster,
+ custbranch
+ WHERE salesorders.orderno = salesorderdetails.orderno
+ AND salesorders.debtorno = debtorsmaster.debtorno
+ AND debtorsmaster.debtorno = custbranch.debtorno
+ AND salesorderdetails.completed=0
+ AND salesorders.fromstkloc = '". $_SESSION['RadioBeaconStockLocation'] . "'
+ GROUP BY salesorders.orderno,
+ salesorders.debtorno,
+ salesorders.branchcode,
+ salesorders.customerref,
+ salesorders.orddate,
+ salesorders.deliverto";
$ErrMsg = _('No orders were returned because');
$SalesOrdersResult = DB_query($SQL,$db,$ErrMsg);
@@ -146,33 +146,33 @@
/*Now get the order header info */
$sql = "SELECT salesorders.debtorno,
- customerref,
- comments,
- orddate,
- deliverydate,
- deliverto,
- deladd1,
- deladd2,
- deladd3,
- deladd4,
- deladd5,
- deladd6,
- contactphone,
- contactemail,
- name,
- address1,
- address2,
- address3,
- address4,
- address5,
- address6,
- printedpackingslip,
- datepackingslipprinted
- FROM salesorders,
- debtorsmaster
- WHERE salesorders.debtorno=debtorsmaster.debtorno
- AND salesorders.fromstkloc = '". $_SESSION['RadioBeaconStockLocation'] . "'
- AND salesorders.orderno='" . $_GET['OrderNo'] . "'";
+ customerref,
+ comments,
+ orddate,
+ deliverydate,
+ deliverto,
+ deladd1,
+ deladd2,
+ deladd3,
+ deladd4,
+ deladd5,
+ deladd6,
+ contactphone,
+ contactemail,
+ name,
+ address1,
+ address2,
+ address3,
+ address4,
+ address5,
+ address6,
+ printedpackingslip,
+ datepackingslipprinted
+ FROM salesorders,
+ debtorsmaster
+ WHERE salesorders.debtorno=debtorsmaster.debtorno
+ AND salesorders.fromstkloc = '". $_SESSION['RadioBeaconStockLocation'] . "'
+ AND salesorders.orderno='" . $_GET['OrderNo'] . "'";
$ErrMsg = _('There was a problem retrieving the order header details for Order Number') . ' ' . $_GET['OrderNo'] . ' ' . _('from the database');
Modified: trunk/FreightCosts.php
===================================================================
--- trunk/FreightCosts.php 2011-05-16 10:46:50 UTC (rev 4571)
+++ trunk/FreightCosts.php 2011-05-23 10:14:06 UTC (rev 4572)
@@ -32,13 +32,13 @@
$sql = "SELECT shippername, shipper_id FROM shippers";
$ShipperResults = DB_query($sql,$db);
- echo '<table class=selection>
+ echo '<table class="selection">
<tr>
<td>' . _('Select A Freight Company to set up costs for') . '</td>
<td><select name="ShipperID">';
while ($myrow = DB_fetch_array($ShipperResults)){
- echo '<option value=' . $myrow['shipper_id'] . '>' . $myrow['shippername'] . '</option>';
+ echo '<option value="' . $myrow['shipper_id'] . '">' . $myrow['shippername'] . '</option>';
}
echo '</select></td></tr>
<tr>
@@ -51,12 +51,12 @@
$LocationResults = DB_query($sql,$db);
while ($myrow = DB_fetch_array($LocationResults)){
- echo '<option value=' . $myrow['loccode'] . '>' . $myrow['locationname'];
+ echo '<option value=' . $myrow['loccode'] . '>' . $myrow['locationname'] . '</option>';
}
echo '</select></td></tr>
</table>
- <br><div class="centre"><input type="submit" value="' . _('Accept') . '" name="Accept"></div>
+ <br /><div class="centre"><input type="submit" value="' . _('Accept') . '" name="Accept"></div>
</form>';
} else {
@@ -198,7 +198,7 @@
$result = DB_query($sql,$db);
- echo '<br><table class=selection>';
+ echo '<br /><table class=selection>';
$TableHeader = '<tr>
<th>' . _('Destination') . '</th>
<th>' . _('Cubic Rate') . '</th>
@@ -307,8 +307,8 @@
$_POST['MinimumChg'] = 0;
}
- echo '<input type="hidden" name="LocationFrom" value="' . $LocationFrom . '">';
- echo '<input type="hidden" name="ShipperID" value="' . $ShipperID . '">';
+ echo '<input type="hidden" name="LocationFrom" value="' . $LocationFrom . '" />';
+ echo '<input type="hidden" name="ShipperID" value="' . $ShipperID . '" />';
if (!isset($_POST['Destination'])) {$_POST['Destination']='';}
if (!isset($_POST['CubRate'])) {$_POST['CubRate']='';}
@@ -316,7 +316,7 @@
if (!isset($_POST['MAXKGs'])) {$_POST['MAXKGs']='';}
if (!isset($_POST['MAXCub'])) {$_POST['MAXCub']='';}
- echo '<br><table class=selection>';
+ echo '<br /><table class=selection>';
echo '<tr><th colspan=2><font size=4 color=blue>' . _('For Deliveries From') . ' ' . $LocationName . ' ' . _('using') . ' ' .
$ShipperName . '</font></th></tr>';
echo'<tr><td>' . _('Destination') . ':</td>
@@ -334,7 +334,7 @@
echo '<tr><td>' . _('Minimum Charge (0 is N/A)') . ':</a></td>
<td><input type="text" name="MinimumChg" class="number" size=6 maxlength=5 value="' . $_POST['MinimumChg'] . '"></td></tr>';
- echo '</table><br>';
+ echo '</table><br />';
echo '<div class="centre"><input type="submit" name="submit" value="' . _('Enter Information') . '"></div>';
Modified: trunk/GLTransInquiry.php
===================================================================
--- trunk/GLTransInquiry.php 2011-05-16 10:46:50 UTC (rev 4571)
+++ trunk/GLTransInquiry.php 2011-05-23 10:14:06 UTC (rev 4572)
@@ -1,16 +1,12 @@
<?php
/* $Id$*/
-/* $Revision: 1.16 $ */
-//$PageSecurity = 8;
-
include ('includes/session.inc');
$title = _('General Ledger Transaction Inquiry');
include('includes/header.inc');
-// Page Border
-$menuUrl = '<a href="'. $rootpath . '/index.php?&Application=GL'. SID .'">' . _('General Ledger Menu') . '</a></div>';
+$menuUrl = '<a href="'. $rootpath . '/index.php?&Application=GL">' . _('General Ledger Menu') . '</a></div>';
if ( !isset($_GET['TypeID']) OR !isset($_GET['TransNo']) )
{
@@ -52,22 +48,22 @@
</tr>';
$SQL = "SELECT gltrans.type,
- gltrans.trandate,
- gltrans.periodno,
- gltrans.account,
- gltrans.narrative,
- gltrans.amount,
- gltrans.posted,
- chartmaster.accountname,
- periods.lastdate_in_period
- FROM gltrans,
- chartmaster,
- periods
- WHERE gltrans.account = chartmaster.accountcode
- AND periods.periodno=gltrans.periodno
- AND gltrans.type= '" . $_GET['TypeID'] . "'
- AND gltrans.typeno = '" . $_GET['TransNo'] . "'
- ORDER BY gltrans.counterindex";
+ gltrans.trandate,
+ gltrans.periodno,
+ gltrans.account,
+ gltrans.narrative,
+ gltrans.amount,
+ gltrans.posted,
+ chartmaster.accountname,
+ periods.lastdate_in_period
+ FROM gltrans,
+ chartmaster,
+ periods
+ WHERE gltrans.account = chartmaster.accountcode
+ AND periods.periodno=gltrans.periodno
+ AND gltrans.type= '" . $_GET['TypeID'] . "'
+ AND gltrans.typeno = '" . $_GET['TransNo'] . "'
+ ORDER BY gltrans.counterindex";
$TransResult = DB_query($SQL,$db);
$Posted = _('Yes');
@@ -78,17 +74,17 @@
$DetailResult = false;
if ( $TransRow['amount'] > 0) {
- $DebitAmount = number_format($TransRow['amount'],2);
+ $DebitAmount = number_format($TransRow['amount'],$_SESSION['CompanyRecord']['decimalplaces']);
$DebitTotal += $TransRow['amount'];
$CreditAmount = ' ';
} else {
- $CreditAmount = number_format(-$TransRow['amount'],2);
+ $CreditAmount = number_format(-$TransRow['amount'],$_SESSION['CompanyRecord']['decimalplaces']);
$CreditTotal += $TransRow['amount'];
$DebitAmount = ' ';
}
if ( $TransRow['account'] == $_SESSION['CompanyRecord']['debtorsact'] ) {
- $URL = $rootpath . '/CustomerInquiry.php?' . SID . '&CustomerID=';
+ $URL = $rootpath . '/CustomerInquiry.php?CustomerID=';
$date = '&TransAfterDate=' . $TranDate;
$DetailSQL = "SELECT debtortrans.debtorno,
@@ -103,7 +99,7 @@
AND debtortrans.transno = '" . $_GET['TransNo']. "'";
$DetailResult = DB_query($DetailSQL,$db);
} elseif ( $TransRow['account'] == $_SESSION['CompanyRecord']['creditorsact'] ) {
- $URL = $rootpath . '/SupplierInquiry.php?' . SID . '&SupplierID=';
+ $URL = $rootpath . '/SupplierInquiry.php?SupplierID=';
$date = '&FromDate=' . $TranDate;
$DetailSQL = "SELECT supptrans.supplierno,
@@ -118,7 +114,7 @@
AND supptrans.transno = '" . $_GET['TransNo'] . "'";
$DetailResult = DB_query($DetailSQL,$db);
} else {
- $URL = $rootpath . '/GLAccountInquiry.php?' . SID . '&Account=' . $TransRow['account'];
+ $URL = $rootpath . '/GLAccountInquiry.php?Account=' . $TransRow['account'];
if( strlen($TransRow['narrative'])==0 ) {
$TransRow['narrative'] = ' ';
@@ -156,10 +152,10 @@
}
} else {
if ($TransRow['account'] == $_SESSION['CompanyRecord']['debtorsact']) {
- $Credit = number_format(-($DetailRow[1] + $DetailRow[2]) / $DetailRow[3],2);
+ $Credit = number_format(-($DetailRow[1] + $DetailRow[2]) / $DetailRow[3],$_SESSION['CompanyRecord']['decimalplaces']);
$Debit = ' ';
} else {
- $Credit = number_format(($DetailRow[1] + $DetailRow[2]) / $DetailRow[3],2);
+ $Credit = number_format(($DetailRow[1] + $DetailRow[2]) / $DetailRow[3],$_SESSION['CompanyRecord']['decimalplaces']);
$Debit = ' ';
}
}
@@ -187,8 +183,8 @@
echo '<tr bgcolor="#FFFFFF">
<td class=number colspan=3><b>' . _('Total') . '</b></td>
- <td class=number>' . number_format(($DebitTotal),2) . '</td>
- <td class=number>' . number_format((-$CreditTotal),2) . '</td>
+ <td class=number>' . number_format(($DebitTotal),$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
+ <td class=number>' . number_format((-$CreditTotal),$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
<td colspan=2> </td>
</tr>';
echo '</table><p>';
@@ -196,7 +192,7 @@
}
-echo '</td></tr></table>'; // end Page Border
+echo '</td></tr></table>';
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/GoodsReceived.php
===================================================================
--- trunk/GoodsReceived.php 2011-05-16 10:46:50 UTC (rev 4571)
+++ trunk/GoodsReceived.php 2011-05-23 10:14:06 UTC (rev 4572)
@@ -135,8 +135,8 @@
$DisplaySupplierQtyRec = number_format($LnItm->QtyReceived/$LnItm->ConversionFactor,$LnItm->DecimalPlaces);
$DisplayQtyOrd = number_format($LnItm->Quantity,$LnItm->DecimalPlaces);
$DisplayQtyRec = number_format($LnItm->QtyReceived,$LnItm->DecimalPlaces);
- $DisplayLineTotal = number_format($LineTotal,2);
- $DisplayPrice = number_format($LnItm->Price,2);
+ $DisplayLineTotal = number_format($LineTotal,$_SESSION['PO'.$identifier]->CurrDecimalPlaces);
+ $DisplayPrice = number_format($LnItm->Price,$_SESSION['PO'.$identifier]->CurrDecimalPlaces);
//Now Display LineItem
@@ -178,7 +178,7 @@
}//foreach(LineItem)
echo '<script>defaultControl(document.forms[0].RecvQty_'.$LnItm->LineNo.');</script>';
- $DisplayTotal = number_format($_SESSION['PO'.$identifier]->Total,2);
+ $DisplayTotal = number_format($_SESSION['PO'.$identifier]->Total,$_SESSION['PO'.$identifier]->CurrDecimalPlaces);
if ($_SESSION['ShowValueOnGRN']==1) {
echo '<tr><td colspan="11" class=number><b>' . _('Total value of goods received'). '</b></td>
<td class=number><b>'. $DisplayTotal. '</b></td>
@@ -316,8 +316,7 @@
}
echo '<div class="centre"><a href="' . $rootpath . '/PO_SelectOSPurchOrder.php">'.
_('Select a different purchase order for receiving goods against').'</a></div>';
- echo '<div class="centre"><a href="' . $rootpath . '/GoodsReceived.php?PONumber=' .
- $_SESSION['PO'.$identifier]->OrderNumber . '">'. _('Re-read the updated purchase order for receiving goods against'). '</a></div>';
+ echo '<div class="centre"><a href="' . $rootpath . '/GoodsReceived.php?PONumber=' . $_SESSION['PO'.$identifier]->OrderNumber . '">'. _('Re-read the updated purchase order for receiving goods against'). '</a></div>';
unset($_SESSION['PO'.$identifier]->LineItems);
unset($_SESSION['PO'.$identifier]);
unset($_POST['ProcessGoodsReceived']);
@@ -514,17 +513,17 @@
AND serialno = '" . $Item->BundleRef . "'";
} else {
$SQL = "INSERT INTO stockserialitems (stockid,
- loccode,
- serialno,
- qualitytext,
- expirationdate,
- quantity)
- VALUES ('" . $OrderLine->StockID . "',
- '" . $_SESSION['PO'.$identifier]->Location . "',
- '" . $Item->BundleRef . "',
- '',
- '" . FormatDateForSQL($Item->ExpiryDate) . "',
- '" . $Item->BundleQty . "')";
+ loccode,
+ serialno,
+ qualitytext,
+ expirationdate,
+ quantity)
+ VALUES ('" . $OrderLine->StockID . "',
+ '" . $_SESSION['PO'.$identifier]->Location . "',
+ '" . $Item->BundleRef . "',
+ '',
+ '" . FormatDateForSQL($Item->ExpiryDate) . "',
+ '" . $Item->BundleQty . "')";
}
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The serial stock item record could not be inserted because');
@@ -535,15 +534,15 @@
/** now insert the serial stock movement **/
$SQL = "INSERT INTO stockserialmoves (stockmoveno,
- stockid,
- serialno,
- moveqty)
- VALUES (
- '" . $StkMoveNo . "',
- '" . $OrderLine->StockID . "',
- '" . $Item->BundleRef . "',
- '" . $Item->BundleQty . "'
- )";
+ stockid,
+ serialno,
+ moveqty)
+ VALUES (
+ '" . $StkMoveNo . "',
+ '" . $OrderLine->StockID . "',
+ '" . $Item->BundleRef . "',
+ '" . $Item->BundleQty . "'
+ )";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The serial stock movement record could not be inserted because');
$DbgMsg = _('The following SQL to insert the serial stock movement records was used');
$Result = DB_query($SQL, $db, $ErrMsg, $DbgMsg, true);
@@ -557,30 +556,31 @@
/*first validate the AssetID and if it doesn't exist treat it like a normal nominal item */
$CheckAssetExistsResult = DB_query("SELECT assetid,
- datepurchased,
- costact
- FROM fixedassets INNER JOIN fixedassetcategories
- ON fixedassets.assetcategoryid=fixedassetcategories.categoryid
- WHERE assetid='" . $OrderLine->AssetID . "'",$db);
+ datepurchased,
+ costact
+ FROM fixedassets
+ INNER JOIN fixedassetcategories
+ ON fixedassets.assetcategoryid=fixedassetcategories.categoryid
+ WHERE assetid='" . $OrderLine->AssetID . "'",$db);
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 */
$SQL = "INSERT INTO fixedassettrans (assetid,
- transtype,
- transno,
- transdate,
- periodno,
- inputdate,
- fixedassettranstype,
- amount)
- VALUES ('" . $OrderLine->AssetID . "',
- 25,
- '" . $GRN . "',
- '" . $_POST['DefaultReceivedDate'] . "',
- '" . $PeriodNo . "',
- '" . Date('Y-m-d') . "',
- 'cost',
- '" . $CurrentStandardCost * $OrderLine->ReceiveQty . "')";
+ transtype,
+ transno,
+ transdate,
+ periodno,
+ inputdate,
+ fixedassettranstype,
+ amount)
+ VALUES ('" . $OrderLine->AssetID . "',
+ 25,
+ '" . $GRN . "',
+ '" . $_POST['DefaultReceivedDate'] . "',
+ '" . $PeriodNo . "',
+ '" . Date('Y-m-d') . "',
+ 'cost',
+ '" . $CurrentStandardCost * $OrderLine->ReceiveQty . "')";
$ErrMsg = _('CRITICAL ERROR! NOTE DOWN THIS ERROR AND SEEK ASSISTANCE The fixed asset transaction could not be inserted because');
$DbgMsg = _('The following SQL to insert the fixed asset transaction record was used');
$Result = DB_query($SQL,$db,$ErrMsg, $DbgMsg, true);
@@ -594,12 +594,13 @@
/* it is a new addition as the date is set to 0000-00-00 when the asset record is created
* before any cost is added to the asset
*/
- $SQL = "UPDATE fixedassets SET datepurchased='" . $_POST['DefaultReceivedDate'] . "',
- cost = cost + " . ($CurrentStandardCost * $OrderLine->ReceiveQty) . "
- WHERE assetid = '" . $OrderLine->AssetID . "'";
+ $SQL = "UPDATE fixedassets
+ SET datepurchased='" . $_POST['DefaultReceivedDate'] . "',
+ cost = cost + " . ($CurrentStandardCost * $OrderLine->ReceiveQty) . "
+ WHERE assetid = '" . $OrderLine->AssetID . "'";
} else {
$SQL = "UPDATE fixedassets SET cost = cost + " . ($CurrentStandardCost * $OrderLine->ReceiveQty) . "
- WHERE assetid = '" . $OrderLine->AssetID . "'";
+ WHERE assetid = '" . $OrderLine->AssetID . "'";
}
$ErrMsg = _('CRITICAL ERROR! NOTE DOWN THIS ERROR AND SEEK ASSISTANCE. The fixed asset cost and date purchased was not able to be updated because:');
$DbgMsg = _('The following SQL was used to attempt the update of the cost and the date the asset was purchased');
@@ -614,23 +615,23 @@
/*first the debit using the GLCode in the PO detail record entry*/
$SQL = "INSERT INTO gltrans (type,
- typeno,
- trandate,
- periodno,
- account,
- narrative,
- amount)
- VALUES (
- 25,
- '" . $GRN . "',
- '" . $_POST['DefaultReceivedDate'] . "',
- '" . $PeriodNo . "',
- '" . $OrderLine->GLCode . "',
- 'PO: " . $_SESSION['PO'.$identifier]->OrderNo . " " . $_SESSION['PO'.$identifier]->SupplierID . " - " . $OrderLine->StockID
- . " - " . $OrderLine->ItemDescription . " x " . $OrderLine->ReceiveQty . " @ " .
- number_format($CurrentStandardCost,2) . "',
- '" . $CurrentStandardCost * $OrderLine->ReceiveQty . "'
- )";
+ typeno,
+ trandate,
+ periodno,
+ account,
+ narrative,
+ amount)
+ VALUES (
+ 25,
+ '" . $GRN . "',
+ '" . $_POST['DefaultReceivedDate'] . "',
+ '" . $PeriodNo . "',
+ '" . $OrderLine->GLCode . "',
+ 'PO: " . $_SESSION['PO'.$identifier]->OrderNo . " " . $_SESSION['PO'.$identifier]->SupplierID . " - " . $OrderLine->StockID
+ . " - " . $OrderLine->ItemDescription . " x " . $OrderLine->ReceiveQty . " @ " .
+ number_format($CurrentStandardCost,2) . "',
+ '" . $CurrentStandardCost * $OrderLine->ReceiveQty . "'
+ )";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The purchase GL posting could not be inserted because');
$DbgMsg = _('The following SQL to insert the purchase GLTrans record was used');
@@ -640,22 +641,22 @@
/*now the GRN suspense entry*/
$SQL = "INSERT INTO gltrans (type,
- typeno,
- trandate,
- periodno,
- account,
- narrative,
- amount)
- VALUES (25,
- '" . $GRN . "',
- '" . $_POST['DefaultReceivedDate'] . "',
- '" . $PeriodNo . "',
- '" . $_SESSION['CompanyRecord']['grnact'] . "',
- '" . _('PO'.$identifier) . ': ' . $_SESSION['PO'.$identifier]->OrderNo . ' ' . $_SESSION['PO'.$identifier]->SupplierID . ' - ' .
- $OrderLine->StockID . ' - ' . $OrderLine->ItemDescription . ' x ' .
- $OrderLine->ReceiveQty . ' @ ' . number_format($UnitCost,2) . "',
- '" . -$UnitCost * $OrderLine->ReceiveQty . "'
- )";
+ typeno,
+ trandate,
+ periodno,
+ account,
+ narrative,
+ amount)
+ VALUES (25,
+ '" . $GRN . "',
+ '" . $_POST['DefaultReceivedDate'] . "',
+ '" . $PeriodNo . "',
+ '" . $_SESSION['CompanyRecord']['grnact'] . "',
+ '" . _('PO'.$identifier) . ': ' . $_SESSION['PO'.$identifier]->OrderNo . ' ' . $_SESSION['PO'.$identifier]->SupplierID . ' - ' .
+ $OrderLine->StockID . ' - ' . $OrderLine->ItemDescription . ' x ' .
+ $OrderLine->ReceiveQty . ' @ ' . number_format($UnitCost,2) . "',
+ '" . -$UnitCost * $OrderLine->ReceiveQty . "'
+ )";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The GRN suspense side of the GL posting could not be inserted because');
$DbgMsg = _('The following SQL to insert the GRN Suspense GLTrans record was used');
Modified: trunk/PO_Header.php
===================================================================
--- trunk/PO_Header.php 2011-05-16 10:46:50 UTC (rev 4571)
+++ trunk/PO_Header.php 2011-05-23 10:14:06 UTC (rev 4572)
@@ -146,8 +146,8 @@
$AllowPrint=0;
}
$SQL = "UPDATE purchorders SET status='" . $_POST['Status']. "',
- stat_comment='" . $_SESSION['PO'.$identifier]->StatusComments ."',
- allowprint='".$AllowPrint."'
+ stat_comment='" . $_SESSION['PO'.$identifier]->StatusComments ."',
+ allowprint='".$AllowPrint."'
WHERE purchorders.orderno ='" . $_SESSION['ExistingOrder'] ."'";
$ErrMsg = _('The order status could not be updated because');
@@ -172,8 +172,10 @@
$_SESSION['PO'.$identifier]->GLLink = $_SESSION['CompanyRecord']['gllink_stock'];
/* set the SupplierID we got */
$_SESSION['PO'.$identifier]->SupplierID = $_GET['SelectedSupplier'];
+ $_SESSION['PO'.$identifier]->DeliveryDate = DateAdd(date($_SESSION['DefaultDateFormat']), 'd', $_GET['LeadTime']);
$_SESSION['RequireSupplierSelection'] = 0;
$_POST['Select'] = $_GET['SelectedSupplier'];
+
/*
* the item (it's item code) that should be purchased
@@ -219,8 +221,8 @@
$_SESSION['PO'.$identifier]->AllowPrintPO=1;
$sql = "UPDATE purchorders
- SET purchorders.allowprint='1'
- WHERE purchorders.orderno='" . $_SESSION['PO'.$identifier]->OrderNo ."'";
+ SET purchorders.allowprint='1'
+ WHERE purchorders.orderno='" . $_SESSION['PO'.$identifier]->OrderNo ."'";
$ErrMsg = _('An error occurred updating the purchase order to allow reprints') . '. ' . _('The error says');
$UpdateResult = DB_query($sql,$db,$ErrMsg);
@@ -365,6 +367,7 @@
$_POST['SuppDelAdd4']=$_SESSION['PO'.$identifier]->SuppDelAdd4;
$_POST['SuppDelAdd5']=$_SESSION['PO'.$identifier]->SuppDelAdd5;
$_POST['SuppD...
[truncated message content] |
|
From: <dai...@us...> - 2011-05-25 10:30:55
|
Revision: 4574
http://web-erp.svn.sourceforge.net/web-erp/?rev=4574&view=rev
Author: daintree
Date: 2011-05-25 10:30:45 +0000 (Wed, 25 May 2011)
Log Message:
-----------
new sales inquiries
Modified Paths:
--------------
trunk/COGSGLPostings.php
trunk/PeriodsInquiry.php
trunk/SalesGLPostings.php
trunk/UpgradeDatabase.php
trunk/build/make_release.sh
trunk/config.distrib.php
trunk/doc/Change.log
trunk/doc/Manual/ManualContents.php
trunk/index.php
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/upgrade4.03-4.04.sql
trunk/sql/mysql/weberp-demo.sql
trunk/sql/mysql/weberp-new.sql
Added Paths:
-----------
trunk/SalesByTypePeriodInquiry.php
trunk/SalesCategoryPeriodInquiry.php
trunk/SalesTopItemsInquiry.php
Modified: trunk/COGSGLPostings.php
===================================================================
--- trunk/COGSGLPostings.php 2011-05-23 10:20:46 UTC (rev 4573)
+++ trunk/COGSGLPostings.php 2011-05-25 10:30:45 UTC (rev 4574)
@@ -84,7 +84,7 @@
if (DB_num_rows($result)>0){
$ShowLivePostingRecords = false;
prnMsg (_('The following cost of sales posting records that do not have valid general ledger code specified - these records must be amended.'),'error');
- echo '<table class=selection>';
+ echo '<table class="selection">';
echo '<tr><th>' . _('Area') . '</th>
<th>' . _('Stock Category') . '</th>
<th>' . _('Sales Type') . '</th>
@@ -209,7 +209,7 @@
<td>%s</td>
<td>%s</td>
<td><a href="%sSelectedCOGSPostingID=%s">' . _('Edit') . '</td>
- <td><a href="%sSelectedCOGSPostingID=%s&delete=yes">' . _('Delete') . '</td>
+ <td><a href="%sSelectedCOGSPostingID=%s&delete=yes" onclick="return confirm(\'' . _('Are you sure you wish to delete this COGS GL posting record?') . '\');">' . _('Delete') . '</td>
</tr>',
$myrow['area'],
$myrow['stkcat'],
Modified: trunk/PeriodsInquiry.php
===================================================================
--- trunk/PeriodsInquiry.php 2011-05-23 10:20:46 UTC (rev 4573)
+++ trunk/PeriodsInquiry.php 2011-05-25 10:30:45 UTC (rev 4574)
@@ -1,10 +1,7 @@
<?php
/* $Id$*/
-/* $Revision: 1.8 $ */
-//$PageSecurity = 2;
-
include ('includes/session.inc');
$title = _('Periods Inquiry');
@@ -13,13 +10,13 @@
$SQL = "SELECT periodno ,
lastdate_in_period
- FROM periods
- ORDER BY periodno";
+ FROM periods
+ ORDER BY periodno";
$ErrMsg = _('No periods were returned by the SQL because');
$PeriodsResult = DB_query($SQL,$db,$ErrMsg);
- echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/transactions.png" title="' . $title . '" alt="" />' . ' '
+echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/transactions.png" title="' . $title . '" alt="" />' . ' '
. $title . '</p>';
/*show a table of the orders returned by the SQL */
@@ -28,16 +25,18 @@
$PeriodsInTable = round($NumberOfPeriods/3,0);
$TableHeader = '<tr><th>' . _('Period Number') . '</th>
- <th>' . _('Date of Last Day') . '</th>
- </tr>';
+ <th>' . _('Date of Last Day') . '</th>
+ </tr>';
+
echo '<table><tr>';
-for ($i=0;$i<2;$i++) {
- echo '<td>';
- echo '<table cellpadding=2 colspan=2 class=selection>';
+
+for ($i=0;$i<3;$i++) {
+ echo '<td valign="top">';
+ echo '<table cellpadding=2 colspan=2 class="selection">';
echo $TableHeader;
$k=0;
- for ($j=0; $j<$PeriodsInTable;$j++) {
- $myrow=DB_fetch_array($PeriodsResult);
+ $j=0;
+ while ($myrow=DB_fetch_array($PeriodsResult)){
if ($k==1){
echo '<tr class="EvenTableRows">';
$k=0;
@@ -45,33 +44,18 @@
echo '<tr class="OddTableRows">';
$k++;
}
- $FormatedLastDate = ConvertSQLDate($myrow['lastdate_in_period']);
- echo "<td>".$myrow['periodno']."</td>
- <td>".$FormatedLastDate."</td>
- </tr>";
+ echo '<td>' . $myrow['periodno'] . '</td>
+ <td>' . ConvertSQLDate($myrow['lastdate_in_period']) . '</td>
+ </tr>';
+ $j++;
+ if ($j==$PeriodsInTable){
+ break;
+ }
}
echo '</table>';
echo '</td>';
}
-echo '<td>';
-echo '<table cellpadding=2 colspan=2 class=selection>';
-echo $TableHeader;
-$k = 0; //row colour counter
-while ($myrow=DB_fetch_array($PeriodsResult)) {
- if ($k==1){
- echo '<tr class="EvenTableRows">';
- $k=0;
- } else {
- echo '<tr class="OddTableRows">';
- $k++;
- }
- $FormatedLastDate = ConvertSQLDate($myrow['lastdate_in_period']);
- echo "<td>".$myrow['periodno']."</td>
- <td>".$FormatedLastDate."</td>
- </tr>";
-}
-echo '</table>';
-echo '</td>';
+
echo '</tr></table>';
//end of while loop
Added: trunk/SalesByTypePeriodInquiry.php
===================================================================
--- trunk/SalesByTypePeriodInquiry.php (rev 0)
+++ trunk/SalesByTypePeriodInquiry.php 2011-05-25 10:30:45 UTC (rev 4574)
@@ -0,0 +1,560 @@
+<?php
+
+/* $Id: SalesByTypePeriodInquiry.php 4261 2010-12-22 15:56:50Z tim_schofield $*/
+
+include('includes/session.inc');
+$title = _('Sales Report');
+include('includes/header.inc');
+include('includes/DefineCartClass.php');
+
+echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/transactions.png" title="' . _('Sales Report') . '" alt="" />' . ' ' . _('Sales Report') . '</p>';
+echo '<div class="page_help_text">' . _('Select the parameters for the report') . '</div><br>';
+
+if (!isset($_POST['DisplayData'])){
+ /* then assume to display daily - maybe wrong to do this but hey better than reporting an error?*/
+ $_POST['DisplayData']='Weekly';
+}
+if (!isset($_POST['DateRange'])){
+ /* then assume report is for This Month - maybe wrong to do this but hey better than reporting an error?*/
+ $_POST['DateRange']='ThisMonth';
+}
+
+echo '<form action="' . $_SERVER['PHP_SELF'] . '" method="post">';
+echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+
+echo '<table cellpadding=2 class="selection">
+ <tr><td valign=top>
+ <table>';
+
+echo '<tr><th colspan="2" class="centre">' . _('Date Selection') . '</th>
+ </tr>
+ <tr>
+ <td>' . _('Custom Range') . ':</td>
+ <td><input type="radio" name="DateRange" value="Custom" ';
+if ($_POST['DateRange']=='Custom'){
+ echo 'checked';
+}
+echo '></td>
+ </tr>
+ <tr>
+ <td>' . _('This Week') . ':</td>
+ <td><input type="radio" name="DateRange" value="ThisWeek" ';
+if ($_POST['DateRange']=='ThisWeek'){
+ echo 'checked';
+}
+echo '></td>
+ </tr>
+ <tr>
+ <td>' . _('This Month') . ':</td>
+ <td><input type="radio" name="DateRange" value="ThisMonth" ';
+if ($_POST['DateRange']=='ThisMonth'){
+ echo 'checked';
+}
+echo '></td>
+ </tr>
+ <tr>
+ <td>' . _('This Quarter') . ':</td>
+ <td><input type="radio" name="DateRange" value="ThisQuarter" ';
+if ($_POST['DateRange']=='ThisQuarter'){
+ echo 'checked';
+}
+echo '></td>
+ </tr>';
+if ($_POST['DateRange']=='Custom'){
+ echo '<tr>
+ <td>' . _('Date From') . ':</td>
+ <td><input type="text" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" name="FromDate" maxlength="10" size="11" value="' . $_POST['FromDate'] . '" /></td>
+ </tr>';
+ echo '<tr>
+ <td>' . _('Date To') . ':</td>
+ <td><input type="text" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" name="ToDate" maxlength="10" size="11" value="' . $_POST['ToDate'] . '" /></td>
+ </tr>';
+}
+echo '</table>
+ </td><td valign=top>
+ <table>';
+
+echo '<tr><th colspan="2" class="centre">' . _('Display Data') . '</th>
+ </tr>
+ <tr>
+ <td>' . _('Daily') . ':</td>
+ <td><input type="radio" name="DisplayData" value="Daily" ';
+if ($_POST['DisplayData']=='Daily'){
+ echo 'checked';
+}
+echo '></td>
+ </tr>
+ <tr>
+ <td>' . _('Weekly') . ':</td>
+ <td><input type="radio" name="DisplayData" value="Weekly" ';
+if ($_POST['DisplayData']=='Weekly'){
+ echo 'checked';
+}
+echo '></td>
+ </tr>
+ <tr>
+ <td>' . _('Monthly') . ':</td>
+ <td><input type="radio" name="DisplayData" value="Monthly" ';
+if ($_POST['DisplayData']=='Monthly'){
+ echo 'checked';
+}
+echo '></td>
+ </tr>
+ <tr>
+ <td>' . _('Quarterly') . ':</td>
+ <td><input type="radio" name="DisplayData" value="Quarterly" ';
+if ($_POST['DisplayData']=='Monthly'){
+ echo 'checked';
+}
+echo '></td>
+ </tr>';
+echo '</table>
+ </td></tr>
+ </table>';
+
+
+echo '<br /><div class="centre"><input tabindex=4 type=submit name="ShowSales" value="' . _('Show Sales') . '">';
+echo '</form></div>';
+echo '<br />';
+
+if ($_POST['DateRange']=='Custom' AND !isset($_POST['FromDate']) AND !isset($_POST['ToDate'])){
+ //Don't run the report until custom dates entered
+ unset($_POST['ShowSales']);
+}
+
+if (isset($_POST['ShowSales'])){
+ $InputError=0; //assume no input errors now test for errors
+ if ($_POST['DateRange']=='Custom'){
+ if (!Is_Date($_POST['FromDate'])){
+ $InputError = 1;
+ prnMsg(_('The date entered for the from date is not in the appropriate format. Dates must be entered in the format') . ' ' . $_SESSION['DefaultDateFormat'], 'error');
+ }
+ if (!Is_Date($_POST['ToDate'])){
+ $InputError = 1;
+ prnMsg(_('The date entered for the to date is not in the appropriate format. Dates must be entered in the format') . ' ' . $_SESSION['DefaultDateFormat'], 'error');
+ }
+ if (Date1GreaterThanDate2($_POST['FromDate'],$_POST['ToDate'])){
+ $InputError = 1;
+ prnMsg(_('The from date is expected to be a date prior to the to date. Please review the selected date range'),'error');
+ }
+ }
+ switch ($_POST['DateRange']) {
+ case 'ThisWeek':
+ $FromDate = date('Y-m-d',mktime(0,0,0,date('m'),date('d')-date('w')+1,date('Y')));
+ $ToDate = date('Y-m-d');
+ break;
+ case 'ThisMonth':
+ $FromDate = date('Y-m-d',mktime(0,0,0,date('m'),1,date('Y')));
+ $ToDate = date('Y-m-d');
+ break;
+ case 'ThisQuarter':
+ switch (date('m')) {
+ case 1:
+ case 2:
+ case 3:
+ $QuarterStartMonth=1;
+ break;
+ case 4:
+ case 5:
+ case 6:
+ $QuarterStartMonth=4;
+ break;
+ case 7:
+ case 8:
+ case 9:
+ $QuarterStartMonth=7;
+ break;
+ default:
+ $QuarterStartMonth=10;
+ }
+ $FromDate = date('Y-m-d',mktime(0,0,0,$QuarterStartMonth,1,date('Y')));
+ $ToDate = date('Y-m-d');
+ break;
+ case 'Custom':
+ $FromDate = FormatDateForSQL($_POST['FromDate']);
+ $ToDate = FormatDateForSQL($_POST['ToDate']);
+ }
+ switch ($_POST['DisplayData']) {
+ case 'Daily':
+ $sql = "SELECT debtortrans.trandate,
+ debtortrans.tpe,
+ SUM(CASE WHEN stockmoves.type=10 THEN
+ price*(1-discountpercent)* -qty
+ ELSE 0 END)
+ as salesvalue,
+ SUM(CASE WHEN stockmoves.type=10 THEN
+ 1 ELSE 0 END)
+ as nooforders,
+ SUM(CASE WHEN stockmoves.type=11 THEN
+ price*(1-discountpercent)* (-qty)
+ ELSE 0 END)
+ as returnvalue,
+ SUM((standardcost * -qty)) as cost
+ FROM stockmoves
+ INNER JOIN custbranch
+ ON stockmoves.debtorno=custbranch.debtorno
+ AND stockmoves.branchcode=custbranch.branchcode
+ INNER JOIN debtortrans
+ ON stockmoves.type=debtortrans.type
+ AND stockmoves.transno=debtortrans.transno
+ WHERE (stockmoves.type=10 or stockmoves.type=11)
+ AND show_on_inv_crds =1
+ AND debtortrans.trandate>='" . $FromDate . "'
+ AND debtortrans.trandate<='" . $ToDate . "'
+ GROUP BY debtortrans.trandate,
+ tpe
+ ORDER BY debtortrans.trandate,
+ tpe";
+
+ break;
+ case 'Weekly':
+ $sql = "SELECT WEEKOFYEAR(debtortrans.trandate) as week_no,
+ YEAR(debtortrans.trandate) as transyear,
+ debtortrans.tpe,
+ SUM(CASE WHEN stockmoves.type=10 THEN
+ price*(1-discountpercent)* -qty
+ ELSE 0 END)
+ as salesvalue,
+ SUM(CASE WHEN stockmoves.type=10 THEN
+ 1 ELSE 0 END)
+ as nooforders,
+ SUM(CASE WHEN stockmoves.type=11 THEN
+ price*(1-discountpercent)* (-qty)
+ ELSE 0 END)
+ as returnvalue,
+ SUM((standardcost * -qty)) as cost
+ FROM stockmoves
+ INNER JOIN custbranch
+ ON stockmoves.debtorno=custbranch.debtorno
+ AND stockmoves.branchcode=custbranch.branchcode
+ INNER JOIN debtortrans
+ ON stockmoves.type=debtortrans.type
+ AND stockmoves.transno=debtortrans.transno
+ WHERE (stockmoves.type=10 or stockmoves.type=11)
+ AND show_on_inv_crds =1
+ AND debtortrans.trandate>='" . $FromDate . "'
+ AND debtortrans.trandate<='" . $ToDate . "'
+ GROUP BY week_no,
+ transyear,
+ tpe
+ ORDER BY transyear,
+ week_no,
+ tpe";
+
+ break;
+ case 'Monthly':
+ $sql = "SELECT MONTH(debtortrans.trandate) as month_no,
+ MONTHNAME(debtortrans.trandate) as month_name,
+ YEAR(debtortrans.trandate) as transyear,
+ debtortrans.tpe,
+ SUM(CASE WHEN stockmoves.type=10 THEN
+ price*(1-discountpercent)* -qty
+ ELSE 0 END)
+ as salesvalue,
+ SUM(CASE WHEN stockmoves.type=10 THEN
+ 1 ELSE 0 END)
+ as nooforders,
+ SUM(CASE WHEN stockmoves.type=11 THEN
+ price*(1-discountpercent)* (-qty)
+ ELSE 0 END)
+ as returnvalue,
+ SUM((standardcost * -qty)) as cost
+ FROM stockmoves
+ INNER JOIN custbranch
+ ON stockmoves.debtorno=custbranch.debtorno
+ AND stockmoves.branchcode=custbranch.branchcode
+ INNER JOIN debtortrans
+ ON stockmoves.type=debtortrans.type
+ AND stockmoves.transno=debtortrans.transno
+ WHERE (stockmoves.type=10 or stockmoves.type=11)
+ AND show_on_inv_crds =1
+ AND debtortrans.trandate>='" . $FromDate . "'
+ AND debtortrans.trandate<='" . $ToDate . "'
+ GROUP BY month_no,
+ month_name,
+ transyear,
+ debtortrans.tpe
+ ORDER BY transyear,
+ month_no,
+ tpe";
+
+ break;
+ case 'Quarterly':
+ $sql = "SELECT QUARTER(debtortrans.trandate) as quarter_no,
+ YEAR(debtortrans.trandate) as transyear,
+ debtortrans.tpe,
+ SUM(CASE WHEN stockmoves.type=10 THEN
+ price*(1-discountpercent)* -qty
+ ELSE 0 END)
+ as salesvalue,
+ SUM(CASE WHEN stockmoves.type=10 THEN
+ 1 ELSE 0 END)
+ as nooforders,
+ SUM(CASE WHEN stockmoves.type=11 THEN
+ price*(1-discountpercent)* (-qty)
+ ELSE 0 END)
+ as returnvalue,
+ SUM((standardcost * -qty)) as cost
+ FROM stockmoves
+ INNER JOIN custbranch
+ ON stockmoves.debtorno=custbranch.debtorno
+ AND stockmoves.branchcode=custbranch.branchcode
+ INNER JOIN debtortrans
+ ON stockmoves.type=debtortrans.type
+ AND stockmoves.transno=debtortrans.transno
+ WHERE (stockmoves.type=10 or stockmoves.type=11)
+ AND show_on_inv_crds =1
+ AND debtortrans.trandate>='" . $FromDate . "'
+ AND debtortrans.trandate<='" . $ToDate . "'
+ GROUP BY quarter_no,
+ transyear,
+ tpe
+ ORDER BY transyear,
+ quarter_no,
+ tpe";
+
+ break;
+ }
+
+ $ErrMsg = _('The sales data could not be retrieved because') . ' - ' . DB_error_msg($db);
+ $SalesResult = DB_query($sql,$db,$ErrMsg);
+
+
+ echo '<table cellpadding=2 class="selection">';
+
+ echo'<tr>
+ <th>' . _('Period') . '</th>
+ <th>' . _('Sales') . '<br />' . _('Type') . '</th>
+ <th>' . _('No Orders') . '</th>
+ <th>' . _('Total Sales') . '</th>
+ <th>' . _('Refunds') . '</th>
+ <th>' . _('Net Sales') . '</th>
+ <th>' . _('Cost of Sales') . '</th>
+ <th>' . _('Gross Profit') . '</th>
+ </tr>';
+
+ $CumulativeTotalSales = 0;
+ $CumulativeTotalOrders = 0;
+ $CumulativeTotalRefunds = 0;
+ $CumulativeTotalNetSales = 0;
+ $CumulativeTotalCost = 0;
+ $CumulativeTotalGP = 0;
+
+ $PrdTotalOrders =0;
+ $PrdTotalSales=0;
+ $PrdTotalRefunds=0;
+ $PrdTotalNetSales=0;
+ $PrdTotalCost=0;
+ $PrdTotalGP=0;
+
+ $PeriodHeadingDone = false;
+ $LastPeriodHeading = 'First Run Through';
+ $k=0;
+ while ($SalesRow=DB_fetch_array($SalesResult)) {
+ if ($k==1){
+ echo '<tr class="EvenTableRows">';
+ $k=0;
+ } else {
+ echo '<tr class="OddTableRows">';
+ $k=1;
+ }
+ switch ($_POST['DisplayData']){
+ case 'Daily':
+ if ($LastPeriodHeading != ConvertSQLDate($SalesRow['trandate'])) {
+ $PeriodHeadingDone=false;
+ if ($LastPeriodHeading != 'First Run Through'){ //print the footer for the period
+ echo '<td colspan="2" class="number">' . _('Total') . '-' . $LastPeriodHeading . '</td>
+ <td class="number">' . $PrdTotalOrders . '</td>
+ <td class="number">' . number_format($PrdTotalSales,2) . '</td>
+ <td class="number">' . number_format($PrdTotalRefunds,2) . '</td>
+ <td class="number">' . number_format($PrdTotalNetSales,2) . '</td>
+ <td class="number">' . number_format($PrdTotalCost,2) . '</td>
+ <td class="number">' . number_format($PrdTotalGP,2) . '</td>
+ </tr>';
+ if ($k==1){
+ echo '<tr class="EvenTableRows"><td colspan="8"><hr></td></tr>';
+ echo '<tr class="OddTableRows">';
+ } else {
+ echo '<tr class="OddTableRows"><td colspan="8"><hr></td></tr>';
+ echo '<tr class="EvenTableRows">';
+ }
+ $PrdTotalOrders =0;
+ $PrdTotalSales=0;
+ $PrdTotalRefunds=0;
+ $PrdTotalNetSales=0;
+ $PrdTotalCost=0;
+ $PrdTotalGP=0;
+ }
+ }
+ if (! $PeriodHeadingDone){
+ echo '<td>' . ConvertSQLDate($SalesRow['trandate']) . '</td>';
+ $LastPeriodHeading = ConvertSQLDate($SalesRow['trandate']);
+ $PeriodHeadingDone = true;
+ } else {
+ echo '<td></td>';
+ }
+ break;
+ case 'Weekly':
+ if ($LastPeriodHeading != _('wk'). '-' . $SalesRow['week_no'] . ' ' . $SalesRow['transyear']) {
+ $PeriodHeadingDone=false;
+ if ($LastPeriodHeading != 'First Run Through'){
+ echo '<td colspan="2" class="number">' . _('Total') . '-' . $LastPeriodHeading . '</td>
+ <td class="number">' . $PrdTotalOrders . '</td>
+ <td class="number">' . number_format($PrdTotalSales,2) . '</td>
+ <td class="number">' . number_format($PrdTotalRefunds,2) . '</td>
+ <td class="number">' . number_format($PrdTotalNetSales,2) . '</td>
+ <td class="number">' . number_format($PrdTotalCost,2) . '</td>
+ <td class="number">' . number_format($PrdTotalGP,2) . '</td>
+ </tr>';
+ if ($k==1){
+ echo '<tr class="EvenTableRows"><td colspan="8"><hr></td></tr>';
+ echo '<tr class="OddTableRows">';
+ } else {
+ echo '<tr class="OddTableRows"><td colspan="8"><hr></td></tr>';
+ echo '<tr class="EvenTableRows">';
+ }
+ $PrdTotalOrders =0;
+ $PrdTotalSales=0;
+ $PrdTotalRefunds=0;
+ $PrdTotalNetSales=0;
+ $PrdTotalCost=0;
+ $PrdTotalGP=0;
+ }
+ }
+ if (! $PeriodHeadingDone){
+ echo '<td>' . _('wk'). '-' . $SalesRow['week_no'] . ' ' . $SalesRow['transyear'] . '</td>';
+ $LastPeriodHeading = _('wk'). '-' . $SalesRow['week_no'] . ' ' . $SalesRow['transyear'];
+ $PeriodHeadingDone = true;
+ } else {
+ echo '<td></td>';
+ }
+ break;
+ case 'Monthly':
+ if ($LastPeriodHeading != $SalesRow['month_name'] . ' ' . $SalesRow['transyear']) {
+ $PeriodHeadingDone=false;
+ if ($LastPeriodHeading != 'First Run Through'){
+ echo '<td colspan="2" class="number">' . _('Total') . '-' . $LastPeriodHeading . '</td>
+ <td class="number">' . $PrdTotalOrders . '</td>
+ <td class="number">' . number_format($PrdTotalSales,2) . '</td>
+ <td class="number">' . number_format($PrdTotalRefunds,2) . '</td>
+ <td class="number">' . number_format($PrdTotalNetSales,2) . '</td>
+ <td class="number">' . number_format($PrdTotalCost,2) . '</td>
+ <td class="number">' . number_format($PrdTotalGP,2) . '</td>
+ </tr>';
+ if ($k==1){
+ echo '<tr class="EvenTableRows"><td colspan="8"><hr></td></tr>';
+ echo '<tr class="OddTableRows">';
+ } else {
+ echo '<tr class="OddTableRows"><td colspan="8"><hr></td></tr>';
+ echo '<tr class="EvenTableRows">';
+ }
+ $PrdTotalOrders =0;
+ $PrdTotalSales=0;
+ $PrdTotalRefunds=0;
+ $PrdTotalNetSales=0;
+ $PrdTotalCost=0;
+ $PrdTotalGP=0;
+ }
+ }
+ if (! $PeriodHeadingDone){
+ echo '<td>' . $SalesRow['month_name'] . ' ' . $SalesRow['transyear'] . '</td>';
+ $LastPeriodHeading = $SalesRow['month_name'] . ' ' . $SalesRow['transyear'];
+ $PeriodHeadingDone = true;
+ } else {
+ echo '<td></td>';
+ }
+ break;
+ case 'Quarterly':
+ if ($LastPeriodHeading != _('Qtr'). '-' . $SalesRow['quarter_no'] . ' ' . $SalesRow['transyear']) {
+ $PeriodHeadingDone=false;
+ if ($LastPeriodHeading != 'First Run Through'){
+ echo '<td colspan="2" class="number">' . _('Total') . '-'. $LastPeriodHeading . '</td>
+ <td class="number">' . $PrdTotalOrders . '</td>
+ <td class="number">' . number_format($PrdTotalSales,2) . '</td>
+ <td class="number">' . number_format($PrdTotalRefunds,2) . '</td>
+ <td class="number">' . number_format($PrdTotalNetSales,2) . '</td>
+ <td class="number">' . number_format($PrdTotalCost,2) . '</td>
+ <td class="number">' . number_format($PrdTotalGP,2) . '</td>
+ </tr>';
+ if ($k==1){
+ echo '<tr class="EvenTableRows"><td colspan="8"><hr></td></tr>';
+ echo '<tr class="OddTableRows">';
+ } else {
+ echo '<tr class="OddTableRows"><td colspan="8"><hr></td></tr>';
+ echo '<tr class="EvenTableRows">';
+ }
+ $PrdTotalOrders =0;
+ $PrdTotalSales=0;
+ $PrdTotalRefunds=0;
+ $PrdTotalNetSales=0;
+ $PrdTotalCost=0;
+ $PrdTotalGP=0;
+ }
+ }
+ if (! $PeriodHeadingDone){
+ echo '<td>' . _('Qtr'). '-' . $SalesRow['quarter_no'] . ' ' . $SalesRow['transyear'] . '</td>';
+ $LastPeriodHeading = _('Qtr'). '-' . $SalesRow['quarter_no'] . ' ' . $SalesRow['transyear'];
+ $PeriodHeadingDone = true;
+ } else {
+ echo '<td></td>';
+ }
+ break;
+ }
+ echo '<td>' . $SalesRow['tpe'] . '</td>
+ <td class="number">' . $SalesRow['nooforders'] . '</td>
+ <td class="number">' . number_format($SalesRow['salesvalue'],2) . '</td>
+ <td class="number">' . number_format($SalesRow['returnvalue'],2) . '</td>
+ <td class="number">' . number_format($SalesRow['salesvalue']+$SalesRow['returnvalue'],2) . '</td>
+ <td class="number">' . number_format($SalesRow['cost'],2) . '</td>
+ <td class="number">' . number_format(($SalesRow['salesvalue']+$SalesRow['returnvalue']-$SalesRow['cost']),2) . '</td>
+ </tr>';
+ $PrdTotalOrders +=$SalesRow['nooforders'];
+ $PrdTotalSales += $SalesRow['salesvalue'];
+ $PrdTotalRefunds += $SalesRow['returnvalue'];
+ $PrdTotalNetSales += ($SalesRow['salesvalue']+$SalesRow['returnvalue']);
+ $PrdTotalCost += $SalesRow['cost'];
+ $PrdTotalGP += ($SalesRow['salesvalue']+$SalesRow['returnvalue']-$SalesRow['cost']);
+
+ $CumulativeTotalSales += $SalesRow['salesvalue'];
+ $CumulativeTotalOrders = $SalesRow['nooforders'];
+ $CumulativeTotalRefunds += $SalesRow['returnvalue'];
+ $CumulativeTotalNetSales += ($SalesRow['salesvalue']+$SalesRow['returnvalue']);
+ $CumulativeTotalCost += $SalesRow['cost'];
+ $CumulativeTotalGP += ($SalesRow['salesvalue']+$SalesRow['returnvalue']-$SalesRow['cost']);
+ }
+ if ($k==1){
+ echo '<tr class="EvenTableRows">';
+ $k=0;
+ } else {
+ echo '<tr class="OddTableRows">';
+ $k=1;
+ }
+ echo '<td colspan="2" class="number">' . _('Total') . ' ' . $LastPeriodHeading . '</td>
+ <td class="number">' . $PrdTotalOrders . '</td>
+ <td class="number">' . number_format($PrdTotalSales,2) . '</td>
+ <td class="number">' . number_format($PrdTotalRefunds,2) . '</td>
+ <td class="number">' . number_format($PrdTotalNetSales,2) . '</td>
+ <td class="number">' . number_format($PrdTotalCost,2) . '</td>
+ <td class="number">' . number_format($PrdTotalGP,2) . '</td>
+ </tr>';
+ if ($k==1){
+ echo '<tr class="EvenTableRows"><td colspan="8"><hr></td></tr>';
+ echo '<tr class="OddTableRows">';
+ } else {
+ echo '<tr class="OddTableRows"><td colspan="8"><hr></td></tr>';
+ echo '<tr class="EvenTableRows">';
+ }
+ echo '<td colspan="2" class="number">' . _('GRAND Total') . '</td>
+ <td class="number">' . $CumulativeTotalOrders . '</td>
+ <td class="number">' . number_format($CumulativeTotalSales,2) . '</td>
+ <td class="number">' . number_format($CumulativeTotalRefunds,2) . '</td>
+ <td class="number">' . number_format($CumulativeTotalNetSales,2) . '</td>
+ <td class="number">' . number_format($CumulativeTotalCost,2) . '</td>
+ <td class="number">' . number_format($CumulativeTotalGP,2) . '</td>
+ </tr>';
+
+ echo '</table>';
+
+} //end of if user hit show sales
+include('includes/footer.inc');
+?>
\ No newline at end of file
Added: trunk/SalesCategoryPeriodInquiry.php
===================================================================
--- trunk/SalesCategoryPeriodInquiry.php (rev 0)
+++ trunk/SalesCategoryPeriodInquiry.php 2011-05-25 10:30:45 UTC (rev 4574)
@@ -0,0 +1,220 @@
+<?php
+
+/* $Id: SalesCategoryPeriodInquiry.php 4261 2010-12-22 15:56:50Z $*/
+
+include('includes/session.inc');
+$title = _('Sales Category Report');
+include('includes/header.inc');
+include('includes/DefineCartClass.php');
+
+echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/transactions.png" title="' . _('Sales Report') . '" alt="" />' . ' ' . _('Sales Category Report') . '</p>';
+echo '<div class="page_help_text">' . _('Select the parameters for the report') . '</div><br>';
+
+if (!isset($_POST['DateRange'])){
+ /* then assume report is for This Month - maybe wrong to do this but hey better than reporting an error?*/
+ $_POST['DateRange']='ThisMonth';
+}
+
+echo '<form action="' . $_SERVER['PHP_SELF'] . '" method="post">';
+echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+
+echo '<table cellpadding=2 class="selection">';
+
+echo '<tr><th colspan="2" class="centre">' . _('Date Selection') . '</th>
+ </tr>
+ <tr>
+ <td>' . _('Custom Range') . ':</td>
+ <td><input type="radio" name="DateRange" value="Custom" ';
+if ($_POST['DateRange']=='Custom'){
+ echo 'checked';
+}
+echo '></td>
+ </tr>
+ <tr>
+ <td>' . _('This Week') . ':</td>
+ <td><input type="radio" name="DateRange" value="ThisWeek" ';
+if ($_POST['DateRange']=='ThisWeek'){
+ echo 'checked';
+}
+echo '></td>
+ </tr>
+ <tr>
+ <td>' . _('This Month') . ':</td>
+ <td><input type="radio" name="DateRange" value="ThisMonth" ';
+if ($_POST['DateRange']=='ThisMonth'){
+ echo 'checked';
+}
+echo '></td>
+ </tr>
+ <tr>
+ <td>' . _('This Quarter') . ':</td>
+ <td><input type="radio" name="DateRange" value="ThisQuarter" ';
+if ($_POST['DateRange']=='ThisQuarter'){
+ echo 'checked';
+}
+echo '></td>
+ </tr>';
+if ($_POST['DateRange']=='Custom'){
+ echo '<tr>
+ <td>' . _('Date From') . ':</td>
+ <td><input type="text" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" name="FromDate" maxlength="10" size="11" value="' . $_POST['FromDate'] . '" /></td>
+ </tr>';
+ echo '<tr>
+ <td>' . _('Date To') . ':</td>
+ <td><input type="text" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" name="ToDate" maxlength="10" size="11" value="' . $_POST['ToDate'] . '" /></td>
+ </tr>';
+}
+echo '</table>';
+
+
+echo '<br /><div class="centre"><input tabindex=4 type=submit name="ShowSales" value="' . _('Show Sales') . '">';
+echo '</form></div>';
+echo '<br />';
+
+if ($_POST['DateRange']=='Custom' AND !isset($_POST['FromDate']) AND !isset($_POST['ToDate'])){
+ //Don't run the report until custom dates entered
+ unset($_POST['ShowSales']);
+}
+
+if (isset($_POST['ShowSales'])){
+ $InputError=0; //assume no input errors now test for errors
+ if ($_POST['DateRange']=='Custom'){
+ if (!Is_Date($_POST['FromDate'])){
+ $InputError = 1;
+ prnMsg(_('The date entered for the from date is not in the appropriate format. Dates must be entered in the format') . ' ' . $_SESSION['DefaultDateFormat'], 'error');
+ }
+ if (!Is_Date($_POST['ToDate'])){
+ $InputError = 1;
+ prnMsg(_('The date entered for the to date is not in the appropriate format. Dates must be entered in the format') . ' ' . $_SESSION['DefaultDateFormat'], 'error');
+ }
+ if (Date1GreaterThanDate2($_POST['FromDate'],$_POST['ToDate'])){
+ $InputError = 1;
+ prnMsg(_('The from date is expected to be a date prior to the to date. Please review the selected date range'),'error');
+ }
+ }
+ switch ($_POST['DateRange']) {
+ case 'ThisWeek':
+ $FromDate = date('Y-m-d',mktime(0,0,0,date('m'),date('d')-date('w')+1,date('Y')));
+ $ToDate = date('Y-m-d');
+ break;
+ case 'ThisMonth':
+ $FromDate = date('Y-m-d',mktime(0,0,0,date('m'),1,date('Y')));
+ $ToDate = date('Y-m-d');
+ break;
+ case 'ThisQuarter':
+ switch (date('m')) {
+ case 1:
+ case 2:
+ case 3:
+ $QuarterStartMonth=1;
+ break;
+ case 4:
+ case 5:
+ case 6:
+ $QuarterStartMonth=4;
+ break;
+ case 7:
+ case 8:
+ case 9:
+ $QuarterStartMonth=7;
+ break;
+ default:
+ $QuarterStartMonth=10;
+ }
+ $FromDate = date('Y-m-d',mktime(0,0,0,$QuarterStartMonth,1,date('Y')));
+ $ToDate = date('Y-m-d');
+ break;
+ case 'Custom':
+ $FromDate = FormatDateForSQL($_POST['FromDate']);
+ $ToDate = FormatDateForSQL($_POST['ToDate']);
+ }
+ $sql = "SELECT stockmaster.categoryid,
+ stockcategory.categorydescription,
+ SUM(CASE WHEN stockmoves.type=10 THEN
+ price*(1-discountpercent)* -qty
+ ELSE 0 END) as salesvalue,
+ SUM(CASE WHEN stockmoves.type=11 THEN
+ price*(1-discountpercent)* (-qty)
+ ELSE 0 END) as returnvalue,
+ SUM(CASE WHEN stockmoves.type=11
+ OR stockmoves.type=10 THEN
+ price*(1-discountpercent)* (-qty)
+ ELSE 0 END) as netsalesvalue,
+ SUM((standardcost * -qty)) as cost
+ FROM stockmoves INNER JOIN stockmaster
+ ON stockmoves.stockid=stockmaster.stockid
+ INNER JOIN stockcategory
+ ON stockmaster.categoryid=stockcategory.categoryid
+ WHERE (stockmoves.type=10 or stockmoves.type=11)
+ AND show_on_inv_crds =1
+ AND trandate>='" . $FromDate . "'
+ AND trandate<='" . $ToDate . "'
+ GROUP BY stockmaster.categoryid
+ ORDER BY netsalesvalue DESC";
+
+ $ErrMsg = _('The sales data could not be retrieved because') . ' - ' . DB_error_msg($db);
+ $SalesResult = DB_query($sql,$db,$ErrMsg);
+ $OrdersResult = DB_query($OrdersSQL,$db,$ErrMsg);
+
+ echo '<table cellpadding=2 class="selection">';
+
+ echo'<tr>
+ <th>' . _('Category') . '</th>
+ <th>' . _('Total Sales') . '</th>
+ <th>' . _('Refunds') . '</th>
+ <th>' . _('Net Sales') . '</th>
+ <th>' . _('Cost of Sales') . '</th>
+ <th>' . _('Gross Profit') . '</th>
+ </tr>';
+
+ $CumulativeTotalSales = 0;
+ $CumulativeTotalRefunds = 0;
+ $CumulativeTotalNetSales = 0;
+ $CumulativeTotalCost = 0;
+ $CumulativeTotalGP = 0;
+
+ $k=0;
+ while ($SalesRow=DB_fetch_array($SalesResult)) {
+ if ($k==1){
+ echo '<tr class="EvenTableRows">';
+ $k=0;
+ } else {
+ echo '<tr class="OddTableRows">';
+ $k=1;
+ }
+
+ echo '<td>' . $SalesRow['categoryid'] . ' - ' . $SalesRow['categorydescription'] . '</td>
+ <td class="number">' . number_format($SalesRow['salesvalue'],2) . '</td>
+ <td class="number">' . number_format($SalesRow['returnvalue'],2) . '</td>
+ <td class="number">' . number_format($SalesRow['salesvalue']+$SalesRow['returnvalue'],2) . '</td>
+ <td class="number">' . number_format($SalesRow['cost'],2) . '</td>
+ <td class="number">' . number_format(($SalesRow['salesvalue']+$SalesRow['returnvalue']-$SalesRow['cost']),2) . '</td>
+ </tr>';
+
+ $CumulativeTotalSales += $SalesRow['salesvalue'];
+ $CumulativeTotalRefunds += $SalesRow['returnvalue'];
+ $CumulativeTotalNetSales += ($SalesRow['salesvalue']+$SalesRow['returnvalue']);
+ $CumulativeTotalCost += $SalesRow['cost'];
+ $CumulativeTotalGP += ($SalesRow['salesvalue']+$SalesRow['returnvalue']-$SalesRow['cost']);
+ } //loop around category sales for the period
+
+ if ($k==1){
+ echo '<tr class="EvenTableRows"><td colspan="8"><hr></td></tr>';
+ echo '<tr class="OddTableRows">';
+ } else {
+ echo '<tr class="OddTableRows"><td colspan="8"><hr></td></tr>';
+ echo '<tr class="EvenTableRows">';
+ }
+ echo '<td class="number">' . _('GRAND Total') . '</td>
+ <td class="number">' . number_format($CumulativeTotalSales,2) . '</td>
+ <td class="number">' . number_format($CumulativeTotalRefunds,2) . '</td>
+ <td class="number">' . number_format($CumulativeTotalNetSales,2) . '</td>
+ <td class="number">' . number_format($CumulativeTotalCost,2) . '</td>
+ <td class="number">' . number_format($CumulativeTotalGP,2) . '</td>
+ </tr>';
+
+ echo '</table>';
+
+} //end of if user hit show sales
+include('includes/footer.inc');
+?>
\ No newline at end of file
Modified: trunk/SalesGLPostings.php
===================================================================
--- trunk/SalesGLPostings.php 2011-05-23 10:20:46 UTC (rev 4573)
+++ trunk/SalesGLPostings.php 2011-05-25 10:30:45 UTC (rev 4574)
@@ -92,7 +92,7 @@
$ShowLivePostingRecords = true;
- $SQL = 'SELECT salesglpostings.id,
+ $SQL = "SELECT salesglpostings.id,
salesglpostings.area,
salesglpostings.stkcat,
salesglpostings.salestype,
@@ -100,7 +100,7 @@
salesglpostings.discountglcode
FROM salesglpostings LEFT JOIN chartmaster
ON salesglpostings.salesglcode = chartmaster.accountcode
- WHERE chartmaster.accountcode IS NULL';
+ WHERE chartmaster.accountcode IS NULL";
$result = DB_query($SQL,$db);
if (DB_num_rows($result)>0){
@@ -124,13 +124,13 @@
$k=1;
}
- printf("<td>%s</td>
+ printf('<td>%s</td>
<td>%s</td>
<td>%s</td>
<td>%s</td>
<td>%s</td>
- <td><a href=\"%sSelectedSalesPostingID=%s\">" . _('Edit') . "</td>
- <td><a href=\"%sSelectedSalesPostingID=%s&delete=yes\">". _('Delete') . "</td></tr>",
+ <td><a href="%sSelectedSalesPostingID=%s">' . _('Edit') . '</td>
+ <td><a href="%sSelectedSalesPostingID=%s&delete=yes" onclick="return confirm(\'' . _('Are you sure you wish to delete this sales GL posting record?') . '\');">'. _('Delete') . '</td></tr>',
$myrow[1],
$myrow[2],
$myrow[3],
@@ -143,11 +143,11 @@
}
}
- $SQL = 'SELECT salesglpostings.id,
+ $SQL = "SELECT salesglpostings.id,
salesglpostings.area,
salesglpostings.stkcat,
salesglpostings.salestype
- FROM salesglpostings';
+ FROM salesglpostings";
$result = DB_query($SQL,$db);
@@ -203,7 +203,7 @@
}
if ($ShowLivePostingRecords){
- $SQL = 'SELECT salesglpostings.id,
+ $SQL = "SELECT salesglpostings.id,
salesglpostings.area,
salesglpostings.stkcat,
salesglpostings.salestype,
@@ -213,12 +213,13 @@
chartmaster as chart1,
chartmaster as chart2
WHERE salesglpostings.salesglcode = chart1.accountcode
- AND salesglpostings.discountglcode = chart2.accountcode';
+ AND salesglpostings.discountglcode = chart2.accountcode";
$result = DB_query($SQL,$db);
- echo '<table class=selection>';
- echo '<tr><th>' . _('Area') . '</th>
+ echo '<table class=selection>
+ <tr>
+ <th>' . _('Area') . '</th>
<th>' . _('Stock Category') . '</th>
<th>' . _('Sales Type') . '</th>
<th>' . _('Sales Account') . '</th>
@@ -236,13 +237,13 @@
$k=1;
}
- printf("<td>%s</td>
+ printf('<td>%s</td>
<td>%s</td>
<td>%s</td>
<td>%s</td>
<td>%s</td>
- <td><a href=\"%sSelectedSalesPostingID=%s\">" . _('Edit') . "</td>
- <td><a href=\"%sSelectedSalesPostingID=%s&delete=yes\">". _('Delete') . "</td></tr>",
+ <td><a href="%sSelectedSalesPostingID=%s">' . _('Edit') . '</td>
+ <td><a href="%sSelectedSalesPostingID=%s&delete=yes" onclick="return confirm(\'' . _('Are you sure you wish to delete this sales GL posting record?') . '\');">'. _('Delete') . '</td></tr>',
$myrow[1],
$myrow[2],
$myrow[3],
@@ -296,21 +297,21 @@
}
/*end of if $SelectedSalesPostingID only do the else when a new record is being entered */
- $SQL = 'SELECT areacode,
- areadescription FROM areas';
+ $SQL = "SELECT areacode,
+ areadescription FROM areas";
$result = DB_query($SQL,$db);
- echo '<br /><table class=selection>
+ echo '<br /><table class="selection">
<tr>
<td>' . _('Area') . ':</td>
<td><select name="Area">
- <option VALUE="AN">' . _('Any Other') . '</option>';
+ <option value="AN">' . _('Any Other') . '</option>';
while ($myrow = DB_fetch_array($result)) {
if (isset($_POST['Area']) and $myrow['areacode']==$_POST['Area']) {
echo '<option selected value="';
} else {
- echo '<option VALUE="';
+ echo '<option value="';
}
echo $myrow['areacode'] . '">'. $myrow['areadescription'] . '</option>';
@@ -318,7 +319,7 @@
DB_free_result($result);
- $SQL = 'SELECT categoryid, categorydescription FROM stockcategory';
+ $SQL = "SELECT categoryid, categorydescription FROM stockcategory";
$result = DB_query($SQL,$db);
echo '</select></td></tr>';
@@ -326,7 +327,7 @@
echo '<tr><td>' . _('Stock Category') . ':</td>
<td><select name="StkCat">
- <option VALUE="ANY">' . _('Any Other') . '</option>';
+ <option value="ANY">' . _('Any Other') . '</option>';
while ($myrow = DB_fetch_array($result)) {
@@ -344,21 +345,21 @@
DB_free_result($result);
- $SQL = 'SELECT typeabbrev,
+ $SQL = "SELECT typeabbrev,
sales_type
- FROM salestypes';
+ FROM salestypes";
$result = DB_query($SQL,$db);
echo '<tr><td>' . _('Sales Type') . ' / ' . _('Price List') . ':</td>
<td><select name="SalesType">';
- echo '<option VALUE="AN">' . _('Any Other') . '</option>';
+ echo '<option value="AN">' . _('Any Other') . '</option>';
while ($myrow = DB_fetch_array($result)) {
if (isset($_POST['SalesType']) and $myrow['typeabbrev']==$_POST['SalesType']) {
- echo '<option selected VALUE="';
+ echo '<option selected value="';
} else {
- echo '<option VALUE="';
+ echo '<option value="';
}
echo $myrow['typeabbrev'] . '">' . $myrow['sales_type'] . '</option>';
@@ -386,7 +387,7 @@
if (isset($_POST['SalesGLCode']) and $myrow['accountcode']==$_POST['SalesGLCode']) {
echo '<option selected value="';
} else {
- echo '<option VALUE="';
+ echo '<option value="';
}
echo $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' - ' . $myrow['accountname'] . '</option>';
@@ -404,7 +405,7 @@
} else {
echo '<option value="';
}
- echo $myrow['accountcode'] . "'>" . $myrow['accountcode'] . ' - ' . $myrow['accountname'] . '</option>';
+ echo $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' - ' . $myrow['accountname'] . '</option>';
} //end while loop
Added: trunk/SalesTopItemsInquiry.php
===================================================================
--- trunk/SalesTopItemsInquiry.php (rev 0)
+++ trunk/SalesTopItemsInquiry.php 2011-05-25 10:30:45 UTC (rev 4574)
@@ -0,0 +1,275 @@
+<?php
+
+/* $Id: SalesTopItemsInquiry.php 4261 2010-12-22 15:56:50Z $*/
+
+include('includes/session.inc');
+$title = _('Sales Category Report');
+include('includes/header.inc');
+include('includes/DefineCartClass.php');
+
+echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/transactions.png" title="' . _('Sales Report') . '" alt="" />' . ' ' . _('Sales Category Report') . '</p>';
+echo '<div class="page_help_text">' . _('Select the parameters for the report') . '</div><br>';
+
+if (!isset($_POST['DateRange'])){
+ /* then assume report is for This Month - maybe wrong to do this but hey better than reporting an error?*/
+ $_POST['DateRange']='ThisMonth';
+}
+
+echo '<form action="' . $_SERVER['PHP_SELF'] . '" method="post">';
+echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+
+echo '<table cellpadding=2 class="selection">
+ <tr><td valign=top>
+ <table>';
+
+echo '<tr><th colspan="2" class="centre">' . _('Date Selection') . '</th>
+ </tr>
+ <tr>
+ <td>' . _('Custom Range') . ':</td>
+ <td><input type="radio" name="DateRange" value="Custom" ';
+if ($_POST['DateRange']=='Custom'){
+ echo 'checked';
+}
+echo '></td>
+ </tr>
+ <tr>
+ <td>' . _('This Week') . ':</td>
+ <td><input type="radio" name="DateRange" value="ThisWeek" ';
+if ($_POST['DateRange']=='ThisWeek'){
+ echo 'checked';
+}
+echo '></td>
+ </tr>
+ <tr>
+ <td>' . _('This Month') . ':</td>
+ <td><input type="radio" name="DateRange" value="ThisMonth" ';
+if ($_POST['DateRange']=='ThisMonth'){
+ echo 'checked';
+}
+echo '></td>
+ </tr>
+ <tr>
+ <td>' . _('This Quarter') . ':</td>
+ <td><input type="radio" name="DateRange" value="ThisQuarter" ';
+if ($_POST['DateRange']=='ThisQuarter'){
+ echo 'checked';
+}
+echo '></td>
+ </tr>';
+if ($_POST['DateRange']=='Custom'){
+ echo '<tr>
+ <td>' . _('Date From') . ':</td>
+ <td><input type="text" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" name="FromDate" maxlength="10" size="11" value="' . $_POST['FromDate'] . '" /></td>
+ </tr>';
+ echo '<tr>
+ <td>' . _('Date To') . ':</td>
+ <td><input type="text" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" name="ToDate" maxlength="10" size="11" value="' . $_POST['ToDate'] . '" /></td>
+ </tr>';
+}
+echo '</table></td>
+ <td valign=top>
+ <table>'; //new sub table to set parameters for order of display
+
+
+if (!isset($_POST['OrderBy'])){ //default to order by net sales
+ $_POST['OrderBy']='NetSales';
+}
+echo '<tr><th colspan="2" class="centre">' . _('Display') . '</th>
+ </tr>
+ <tr>
+ <td>' . _('Order By Net Sales') . ':</td>
+ <td><input type="radio" name="OrderBy" value="NetSales" ';
+if ($_POST['OrderBy']=='NetSales'){
+ echo 'checked';
+}
+echo '></td>
+ </tr>
+ <tr>
+ <td>' . _('Order By Quantity') . ':</td>
+ <td><input type="radio" name="OrderBy" value="Quantity" ';
+if ($_POST['OrderBy']=='Quantity'){
+ echo 'checked';
+}
+if (!isset($_POST['NoToDisplay'])){
+ $_POST['NoToDisplay']=20;
+}
+echo '></td>
+ </tr>
+ <tr>
+ <td>' . _('Number to Display') . ':</td>
+ <td><input type="text class="number" name="NoToDisplay" size="4" maxlength="4" value="' . $_POST['NoToDisplay'] .'" ></td>
+ </tr>
+ </table>
+ </td></tr>
+ </table>';
+
+
+echo '<br /><div class="centre"><input tabindex=4 type=submit name="ShowSales" value="' . _('Show Sales') . '">';
+echo '</form></div>';
+echo '<br />';
+
+if ($_POST['DateRange']=='Custom' AND !isset($_POST['FromDate']) AND !isset($_POST['ToDate'])){
+ //Don't run the report until custom dates entered
+ unset($_POST['ShowSales']);
+}
+
+if (isset($_POST['ShowSales'])){
+ $InputError=0; //assume no input errors now test for errors
+ if ($_POST['DateRange']=='Custom'){
+ if (!Is_Date($_POST['FromDate'])){
+ $InputError = 1;
+ prnMsg(_('The date entered for the from date is not in the appropriate format. Dates must be entered in the format') . ' ' . $_SESSION['DefaultDateFormat'], 'error');
+ }
+ if (!Is_Date($_POST['ToDate'])){
+ $InputError = 1;
+ prnMsg(_('The date entered for the to date is not in the appropriate format. Dates must be entered in the format') . ' ' . $_SESSION['DefaultDateFormat'], 'error');
+ }
+ if (Date1GreaterThanDate2($_POST['FromDate'],$_POST['ToDate'])){
+ $InputError = 1;
+ prnMsg(_('The from date is expected to be a date prior to the to date. Please review the selected date range'),'error');
+ }
+ }
+ switch ($_POST['DateRange']) {
+ case 'ThisWeek':
+ $FromDate = date('Y-m-d',mktime(0,0,0,date('m'),date('d')-date('w')+1,date('Y')));
+ $ToDate = date('Y-m-d');
+ break;
+ case 'ThisMonth':
+ $FromDate = date('Y-m-d',mktime(0,0,0,date('m'),1,date('Y')));
+ $ToDate = date('Y-m-d');
+ break;
+ case 'ThisQuarter':
+ switch (date('m')) {
+ case 1:
+ case 2:
+ case 3:
+ $QuarterStartMonth=1;
+ break;
+ case 4:
+ case 5:
+ case 6:
+ $QuarterStartMonth=4;
+ break;
+ case 7:
+ case 8:
+ case 9:
+ $QuarterStartMonth=7;
+ break;
+ default:
+ $QuarterStartMonth=10;
+ }
+ $FromDate = date('Y-m-d',mktime(0,0,0,$QuarterStartMonth,1,date('Y')));
+ $ToDate = date('Y-m-d');
+ break;
+ case 'Custom':
+ $FromDate = FormatDateForSQL($_POST['FromDate']);
+ $ToDate = FormatDateForSQL($_POST['ToDate']);
+ }
+ $sql = "SELECT stockmaster.stockid,
+ stockmaster.description,
+ stockcategory.categorydescription,
+ SUM(CASE WHEN stockmoves.type=10
+ OR stockmoves.type=11 THEN
+ -qty
+ ELSE 0 END) as salesquantity,
+ SUM(CASE WHEN stockmoves.type=10 THEN
+ price*(1-discountpercent)* -qty
+ ELSE 0 END) as salesvalue,
+ SUM(CASE WHEN stockmoves.type=11 THEN
+ price*(1-discountpercent)* (-qty)
+ ELSE 0 END) as returnvalue,
+ SUM(CASE WHEN stockmoves.type=11
+ OR stockmoves.type=10 THEN
+ price*(1-discountpercent)* (-qty)
+ ELSE 0 END) as netsalesvalue,
+ SUM((standardcost * -qty)) as cost
+ FROM stockmoves INNER JOIN stockmaster
+ ON stockmoves.stockid=stockmaster.stockid
+ INNER JOIN stockcategory
+ ON stockmaster.categoryid=stockcategory.categoryid
+ WHERE (stockmoves.type=10 or stockmoves.type=11)
+ AND show_on_inv_crds =1
+ AND trandate>='" . $FromDate . "'
+ AND trandate<='" . $ToDate . "'
+ GROUP BY stockmaster.stockid,
+ stockmaster.description,
+ stockcategory.categorydescription ";
+
+ if ($_POST['OrderBy']=='NetSales'){
+ $sql .= " ORDER BY netsalesvalue DESC ";
+ } else {
+ $sql .= " ORDER BY salesquantity DESC ";
+ }
+ if (is_numeric($_POST['NoToDisplay'])){
+ if ($_POST['NoToDisplay'] > 0){
+ $sql .= " LIMIT " . $_POST['NoToDisplay'];
+ }
+ }
+
+ $ErrMsg = _('The sales data could not be retrieved because') . ' - ' . DB_error_msg($db);
+ $SalesResult = DB_query($sql,$db,$ErrMsg);
+
+
+ echo '<table cellpadding=2 class="selection">';
+
+ echo'<tr>
+ <th>' . _('Rank') . '</th>
+ <th>' . _('Item') . '</th>
+ <th>' . _('Category') . '</th>
+ <th>' . _('Sales Value') . '</th>
+ <th>' . _('Refunds') . '</th>
+ <th>' . _('Net Sales') . '</th>
+ <th>' . _('Sales') .'<br />' . _('Quantity') . '</th>
+ </tr>';
+
+ $CumulativeTotalSales = 0;
+ $CumulativeTotalRefunds = 0;
+ $CumulativeTotalNetSales = 0;
+ $CumulativeTotalQuantity = 0;
+ $i=1;
+ $k=0;
+ while ($SalesRow=DB_fetch_array($SalesResult)) {
+ if ($k==1){
+ echo '<tr class="EvenTableRows">';
+ $k=0;
+ } else {
+ echo '<tr class="OddTableRows">';
+ $k=1;
+ }
+
+ echo '<td>' . $i . '</td>
+ <td>' . $SalesRow['stockid'] . ' - ' . $SalesRow['description'] . '</td>
+ <td>' . $SalesRow['categorydescription'] . '</td>
+ <td class="number">' . number_format($SalesRow['salesvalue'],2) . '</td>
+ <td class="number">' . number_format($SalesRow['returnvalue'],2) . '</td>
+ <td class="number">' . number_format($SalesRow['netsalesvalue'],2) . '</td>
+ <td class="number">' . $SalesRow['salesquantity'] . '</td>
+ </tr>';
+ $i++;
+
+ $CumulativeTotalSales += $SalesRow['salesvalue'];
+ $CumulativeTotalRefunds += $SalesRow['returnvalue'];
+ $CumulativeTotalNetSales += ($SalesRow['salesvalue']+$SalesRow['returnvalue']);
+ $CumulativeTotalQuantity += $SalesRow['salesquantity'];
+
+ } //loop around category sales for the period
+
+ if ($k==1){
+ echo '<tr class="EvenTableRows"><td colspan="8"><hr></td></tr>';
+ echo '<tr class="OddTableRows">';
+ } else {
+ echo '<tr class="OddTableRows"><td colspan="8"><hr></td></tr>';
+ echo '<tr class="EvenTableRows">';
+ }
+ echo '<td class="number" colspan=3>' . _('GRAND Total') . '</td>
+ <td class="number">' . number_format($CumulativeTotalSales,2) . '</td>
+ <td class="number">' . number_format($CumulativeTotalRefunds,2) . '</td>
+ <td class="number">' . number_format($CumulativeTotalNetSales,2) . '</td>
+ <td class="number">' . $CumulativeTotalQuantity . '</td>
+ </tr>';
+
+ echo '</table>';
+
+} //end of if user hit show sales
+include('includes/footer.inc');
+?>
\ No newline at end of file
Modified: trunk/UpgradeDatabase.php
===================================================================
--- trunk/UpgradeDatabase.php 2011-05-23 10:20:46 UTC (rev 4573)
+++ trunk/UpgradeDatabase.php 2011-05-25 10:30:45 UTC (rev 4574)
@@ -109,7 +109,9 @@
case '4.03RC2':
case '4.03':
case '4.03.2':
+ case '4.03.3':
case '4.03.5':
+ case '4.03.6':
case '4.03.7':
$SQLScripts[] = './sql/mysql/upgrade3.11.1-4.00.sql';
case '4.03.8':
Modified: trunk/build/make_release.sh
===================================================================
--- trunk/build/make_release.sh 2011-05-23 10:20:46 UTC (rev 4573)
+++ trunk/build/make_release.sh 2011-05-25 10:30:45 UTC (rev 4574)
@@ -67,6 +67,8 @@
msgfmt -o locale/zh_HK.utf8/LC_MESSAGES/messages.mo locale/zh_HK.utf8/LC_MESSAGES/messages.po
msgfmt -o locale/vi_VN.utf8/LC_MESSAGES/messages.mo locale/vi_VN.utf8/LC_MESSAGES/messages.po
+mysql -u$MYSQL_USER -p$MYSQL_PWD < $BASE_DIR/build/TruncateAuditTrail.sql
+
echo "SET FOREIGN_KEY_CHECKS = 0;" > $BASE_DIR/sql/mysql/weberp-new.sql
mysqldump -u$MYSQL_USER -p$MYSQL_PWD --skip-opt --create-options --skip-set-charset --ignore-table=weberpdemo.mrpsupplies --ignore-table=weberpdemo.mrpplanedorders --ignore-table=weberpdemo.mrpparameters --ignore-table=weberpdemo.levels --ignore-table=weberpdemo.mrprequirements --ignore-table=weberpdemo.audittrail --no-data weberpdemo >> $BASE_DIR/sql/mysql/weberp-new.sql
@@ -118,7 +120,6 @@
echo "UPDATE systypes SET typeno=0;" >> $BASE_DIR/sql/mysql/weberp-new.sql
echo "INSERT INTO shippers VALUES (1,'Default Shipper',0);" >> $BASE_DIR/sql/mysql/weberp-new.sql
echo "UPDATE config SET confvalue='1' WHERE confname='Default_Shipper';" >> $BASE_DIR/sql/mysql/weberp-new.sql
-echo "TRUNCATE TABLE audittrail;" >> $BASE_DIR/sql/mysql/weberp-demo.sql
echo "SET FOREIGN_KEY_CHECKS = 1;" >> $BASE_DIR/sql/mysql/weberp-demo.sql
rm $OUTPUT_DIR/webERP.zip
Modified: trunk/config.distrib.php
===================================================================
--- trunk/config.distrib.php 2011-05-23 10:20:46 UTC (rev 4573)
+++ trunk/config.distrib.php 2011-05-25 10:30:45 UTC (rev 4574)
@@ -18,7 +18,7 @@
// The timezone of the business - this allows the possibility of having
// the web-server on a overseas machine but record local time
// this is not necessary if you have your own server locally
-// putenv('TZ=Europe/London');
+putenv('TZ=Europe/London');
// putenv('TZ=Australia/Melbourne');
// putenv('TZ=Australia/Sydney');
// putenv('TZ=Pacific/Auckland');
@@ -86,8 +86,8 @@
if ($rootpath == "/" OR $rootpath == "\\") {
$rootpath = "";
}
-//$rootpath = '/web-erp';
+
/* Report all errors except E_NOTICE
This is the default value set in php.ini for most installations but just to be sure it is forced here
turning on NOTICES destroys things */
@@ -95,4 +95,4 @@
error_reporting (E_ALL && ~E_NOTICE);
/*Make sure there is nothing - not even spaces after this last ?> */
-?>
+?>
\ No newline at end of file
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-05-23 10:20:46 UTC (rev 4573)
+++ trunk/doc/Change.log 2011-05-25 10:30:45 UTC (rev 4574)
@@ -1,5 +1,7 @@
webERP Change Log
+25/5/11 New Sales Inquiry scripts by sales type/price list by category and top sellers
+24/5/11 Updated from launchpad translations those that had changed from 18/4/11 including Viatnamese, Albanian, Russian, Spanish
23/5/11 Tim: Remove SystemCheck.php and code standards changes(launchpad 4711-4718)
23/5/11 Tim: Make link from SelectProduct.php to place purchase orders factor in the lead time into the delivery date in the purchase order (launchpad 4710)
23/5/11 Exson: fix PaymentMethods could not add new - comma missing in INSERT SQL
Modified: trunk/doc/Manual/ManualContents.php
===================================================================
--- trunk/doc/Manual/ManualContents.php 2011-05-23 10:20:46 UTC (rev 4573)
+++ trunk/doc/Manual/ManualContents.php 2011-05-25 10:30:45 UTC (rev 4574)
@@ -21,7 +21,7 @@
-->';*/
$PathPrefix='../../';
-include($PathPrefix.'includes/session.inc');
+//include($PathPrefix.'includes/session.inc');
include('ManualHeader.html');
?>
Modified: trunk/index.php
===================================================================
--- trunk/index.php 2011-05-23 10:20:46 UTC (rev 4573)
+++ trunk/index.php 2011-05-25 10:30:45 UTC (rev 4574)
@@ -188,6 +188,22 @@
</tr>
<tr>
<td class="menu_group_item">
+ <?php echo '<p>• <a href="' . $rootpath . '/SalesByTypePeriodInquiry.php">' . _('Sales By Sales Type Inquiry') . '</a></p>'; ?>
+ </td>
+ </tr>
+ <tr>
+ <td class="menu_group_item">
+ <?php echo '<p>• <a href="' . $rootpath . '/SalesCategoryPeriodInquiry.php">' . _('Sales By Category Inquiry') . '</a></p>'; ?>
+ </td>
+ </tr>
+ <tr>
+ <td class="menu_group_item">
+ <?php echo '<p>• <a href="' . $rootpath . '/SalesTopItemsInquiry.php">' . _('Top Sellers Inquiry') . '</a></p>'; ?>
+ </td>
+ </tr>
+
+ <tr>
+ <td class="menu_group_item">
<?php echo '<p>• <a href="' . $rootpath . '/PDFDeliveryDifferences.php">' . _('Order Delivery Differences Report') . '</a></p>'; ?>
</td>
</tr>
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-05-23 10:20:46 UTC (rev 4573)
+++ trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po 2011-05-25 10:30:45 UTC (rev 4574)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: webERP 3.08\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-29 20:59+1200\n"
+"POT-Creation-Date: 2011-05-24 21:53+1200\n"
"PO-Revision-Date: 2011-02-07 15:33+0000\n"
"Last-Translator: Tim Schofield <Unknown>\n"
"Language-Team: Czech <cs...@li...>\n"
@@ -21,7 +21,7 @@
"X-Poedit-Language: Czech\n"
"X-Poedit-SourceCharset: utf-8\n"
-#: AccountGroups.php:7 index.php:1275
+#: AccountGroups.php:7 index.php:1280
msgid "Account Groups"
msgstr "Účetní skupiny"
@@ -58,8 +58,8 @@
msgid "The account group name cannot contain the character"
msgstr "Název účetní skupiny nemůže obsahovat znak"
-#: AccountGroups.php:69 AccountSections.php:75 TaxCategories.php:33
-#: TaxProvinces.php:30 UnitsOfMeasure.php:30
+#: AccountGroups.php:69 TaxCategories.php:31 TaxProvinces.php:30
+#: UnitsOfMeasure.php:30
msgid "or the character"
msgstr "nebo znak"
@@ -101,7 +101,7 @@
msgid "The SQL that was used to update the account group was"
msgstr "SQL, který byl použit k aktualizaci účtu skupina byla"
-#: AccountGroups.php:137 AccountSections.php:106 PaymentMethods.php:90
+#: AccountGroups.php:137 AccountSections.php:104 PaymentMethods.php:82
msgid "Record Updated"
msgstr "Záznam aktualizován"
@@ -113,7 +113,7 @@
msgid "The SQL that was used to insert the account group was"
msgstr "SQL, který byl použit pro vložení na účet skupina byla"
-#: AccountGroups.php:157 AccountSections.php:118 PaymentMethods.php:114
+#: AccountGroups.php:157 AccountSections.php:116 PaymentMethods.php:106
msgid "Record inserted"
msgstr "Záznam vložen"
@@ -129,24 +129,24 @@
"Nelze smazat tento účet skupiny, protože účtů hlavní knihy byly vytvořeny "
"pomocí této skupině"
-#: AccountGroups.php:180 AccountGroups.php:190 AccountSections.php:139
-#: Areas.php:117 Areas.php:126 BankAccounts.php:163 CreditStatus.php:126
-#: Currencies.php:144 Currencies.php:152 Currencies.php:159
+#: AccountGroups.php:180 AccountGroups.php:190 AccountSections.php:137
+#: Areas.php:116 Areas.php:125 BankAccounts.php:157 CreditStatus.php:125
+#: Currencies.php:143 Currencies.php:151 Currencies.php:158
#: CustomerBranches.php:286 CustomerBranches.php:296 CustomerBranches.php:306
#: CustomerBranches.php:316 Customers.php:311 Customers.php:320
#: Customers.php:328 Customers.php:336 CustomerTypes.php:147
-#: CustomerTypes.php:157 Factors.php:136 FixedAssetCategories.php:131
+#: CustomerTypes.php:157 Factors.php:134 FixedAssetCategories.php:130
#: GLAccounts.php:80 GLAccounts.php:94 Locations.php:244 Locations.php:252
#: Locations.php:261 Locations.php:269 Locations.php:277 Locations.php:285
#: Locations.php:293 Locations.php:301 MRPDemandTypes.php:87
-#: PaymentMethods.php:148 PaymentTerms.php:147 PaymentTerms.php:154
-#: PcExpenses.php:128 SalesCategories.php:127 SalesCategories.php:135
-#: SalesPeople.php:144 SalesPeople.php:151 SalesTypes.php:147
-#: SalesTypes.php:157 Shippers.php:82 Shippers.php:94 StockCategories.php:179
+#: PaymentMethods.php:140 PaymentTerms.php:147 PaymentTerms.php:154
+#: PcExpenses.php:152 SalesCategories.php:125 SalesCategories.php:133
+#: SalesPeople.php:144 SalesPeople.php:151 SalesTypes.php:145
+#: SalesTypes.php:155 Shippers.php:82 Shippers.php:94 StockCategories.php:179
#: Stocks.php:475 Stocks.php:484 Stocks.php:492 Stocks.php:500 Stocks.php:508
#: Stocks.php:516 Suppliers.php:609 Suppliers.php:618 Suppliers.php:626
-#: SupplierTypes.php:145 TaxCategories.php:133 TaxGroups.php:127
-#: TaxGroups.php:134 TaxProvinces.php:125 UnitsOfMeasure.php:137
+#: SupplierTypes.php:145 TaxCategories.php:131 TaxGroups.php:127
+#: TaxGroups.php:134 TaxProvinces.php:125 UnitsOfMeasure.php:138
#: WorkCentres.php:89 WorkCentres.php:95 WWW_Access.php:83
msgid "There are"
msgstr "Jsou zde"
@@ -192,35 +192,36 @@
msgid "Could not get account groups because"
msgstr "Nemohu získat účetní sk...
[truncated message content] |
|
From: <dai...@us...> - 2011-05-25 10:30:55
|
Revision: 4574
http://web-erp.svn.sourceforge.net/web-erp/?rev=4574&view=rev
Author: daintree
Date: 2011-05-25 10:30:45 +0000 (Wed, 25 May 2011)
Log Message:
-----------
new sales inquiries
Modified Paths:
--------------
trunk/COGSGLPostings.php
trunk/PeriodsInquiry.php
trunk/SalesGLPostings.php
trunk/UpgradeDatabase.php
trunk/build/make_release.sh
trunk/config.distrib.php
trunk/doc/Change.log
trunk/doc/Manual/ManualContents.php
trunk/index.php
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/upgrade4.03-4.04.sql
trunk/sql/mysql/weberp-demo.sql
trunk/sql/mysql/weberp-new.sql
Added Paths:
-----------
trunk/SalesByTypePeriodInquiry.php
trunk/SalesCategoryPeriodInquiry.php
trunk/SalesTopItemsInquiry.php
Modified: trunk/COGSGLPostings.php
===================================================================
--- trunk/COGSGLPostings.php 2011-05-23 10:20:46 UTC (rev 4573)
+++ trunk/COGSGLPostings.php 2011-05-25 10:30:45 UTC (rev 4574)
@@ -84,7 +84,7 @@
if (DB_num_rows($result)>0){
$ShowLivePostingRecords = false;
prnMsg (_('The following cost of sales posting records that do not have valid general ledger code specified - these records must be amended.'),'error');
- echo '<table class=selection>';
+ echo '<table class="selection">';
echo '<tr><th>' . _('Area') . '</th>
<th>' . _('Stock Category') . '</th>
<th>' . _('Sales Type') . '</th>
@@ -209,7 +209,7 @@
<td>%s</td>
<td>%s</td>
<td><a href="%sSelectedCOGSPostingID=%s">' . _('Edit') . '</td>
- <td><a href="%sSelectedCOGSPostingID=%s&delete=yes">' . _('Delete') . '</td>
+ <td><a href="%sSelectedCOGSPostingID=%s&delete=yes" onclick="return confirm(\'' . _('Are you sure you wish to delete this COGS GL posting record?') . '\');">' . _('Delete') . '</td>
</tr>',
$myrow['area'],
$myrow['stkcat'],
Modified: trunk/PeriodsInquiry.php
===================================================================
--- trunk/PeriodsInquiry.php 2011-05-23 10:20:46 UTC (rev 4573)
+++ trunk/PeriodsInquiry.php 2011-05-25 10:30:45 UTC (rev 4574)
@@ -1,10 +1,7 @@
<?php
/* $Id$*/
-/* $Revision: 1.8 $ */
-//$PageSecurity = 2;
-
include ('includes/session.inc');
$title = _('Periods Inquiry');
@@ -13,13 +10,13 @@
$SQL = "SELECT periodno ,
lastdate_in_period
- FROM periods
- ORDER BY periodno";
+ FROM periods
+ ORDER BY periodno";
$ErrMsg = _('No periods were returned by the SQL because');
$PeriodsResult = DB_query($SQL,$db,$ErrMsg);
- echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/transactions.png" title="' . $title . '" alt="" />' . ' '
+echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/transactions.png" title="' . $title . '" alt="" />' . ' '
. $title . '</p>';
/*show a table of the orders returned by the SQL */
@@ -28,16 +25,18 @@
$PeriodsInTable = round($NumberOfPeriods/3,0);
$TableHeader = '<tr><th>' . _('Period Number') . '</th>
- <th>' . _('Date of Last Day') . '</th>
- </tr>';
+ <th>' . _('Date of Last Day') . '</th>
+ </tr>';
+
echo '<table><tr>';
-for ($i=0;$i<2;$i++) {
- echo '<td>';
- echo '<table cellpadding=2 colspan=2 class=selection>';
+
+for ($i=0;$i<3;$i++) {
+ echo '<td valign="top">';
+ echo '<table cellpadding=2 colspan=2 class="selection">';
echo $TableHeader;
$k=0;
- for ($j=0; $j<$PeriodsInTable;$j++) {
- $myrow=DB_fetch_array($PeriodsResult);
+ $j=0;
+ while ($myrow=DB_fetch_array($PeriodsResult)){
if ($k==1){
echo '<tr class="EvenTableRows">';
$k=0;
@@ -45,33 +44,18 @@
echo '<tr class="OddTableRows">';
$k++;
}
- $FormatedLastDate = ConvertSQLDate($myrow['lastdate_in_period']);
- echo "<td>".$myrow['periodno']."</td>
- <td>".$FormatedLastDate."</td>
- </tr>";
+ echo '<td>' . $myrow['periodno'] . '</td>
+ <td>' . ConvertSQLDate($myrow['lastdate_in_period']) . '</td>
+ </tr>';
+ $j++;
+ if ($j==$PeriodsInTable){
+ break;
+ }
}
echo '</table>';
echo '</td>';
}
-echo '<td>';
-echo '<table cellpadding=2 colspan=2 class=selection>';
-echo $TableHeader;
-$k = 0; //row colour counter
-while ($myrow=DB_fetch_array($PeriodsResult)) {
- if ($k==1){
- echo '<tr class="EvenTableRows">';
- $k=0;
- } else {
- echo '<tr class="OddTableRows">';
- $k++;
- }
- $FormatedLastDate = ConvertSQLDate($myrow['lastdate_in_period']);
- echo "<td>".$myrow['periodno']."</td>
- <td>".$FormatedLastDate."</td>
- </tr>";
-}
-echo '</table>';
-echo '</td>';
+
echo '</tr></table>';
//end of while loop
Added: trunk/SalesByTypePeriodInquiry.php
===================================================================
--- trunk/SalesByTypePeriodInquiry.php (rev 0)
+++ trunk/SalesByTypePeriodInquiry.php 2011-05-25 10:30:45 UTC (rev 4574)
@@ -0,0 +1,560 @@
+<?php
+
+/* $Id: SalesByTypePeriodInquiry.php 4261 2010-12-22 15:56:50Z tim_schofield $*/
+
+include('includes/session.inc');
+$title = _('Sales Report');
+include('includes/header.inc');
+include('includes/DefineCartClass.php');
+
+echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/transactions.png" title="' . _('Sales Report') . '" alt="" />' . ' ' . _('Sales Report') . '</p>';
+echo '<div class="page_help_text">' . _('Select the parameters for the report') . '</div><br>';
+
+if (!isset($_POST['DisplayData'])){
+ /* then assume to display daily - maybe wrong to do this but hey better than reporting an error?*/
+ $_POST['DisplayData']='Weekly';
+}
+if (!isset($_POST['DateRange'])){
+ /* then assume report is for This Month - maybe wrong to do this but hey better than reporting an error?*/
+ $_POST['DateRange']='ThisMonth';
+}
+
+echo '<form action="' . $_SERVER['PHP_SELF'] . '" method="post">';
+echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+
+echo '<table cellpadding=2 class="selection">
+ <tr><td valign=top>
+ <table>';
+
+echo '<tr><th colspan="2" class="centre">' . _('Date Selection') . '</th>
+ </tr>
+ <tr>
+ <td>' . _('Custom Range') . ':</td>
+ <td><input type="radio" name="DateRange" value="Custom" ';
+if ($_POST['DateRange']=='Custom'){
+ echo 'checked';
+}
+echo '></td>
+ </tr>
+ <tr>
+ <td>' . _('This Week') . ':</td>
+ <td><input type="radio" name="DateRange" value="ThisWeek" ';
+if ($_POST['DateRange']=='ThisWeek'){
+ echo 'checked';
+}
+echo '></td>
+ </tr>
+ <tr>
+ <td>' . _('This Month') . ':</td>
+ <td><input type="radio" name="DateRange" value="ThisMonth" ';
+if ($_POST['DateRange']=='ThisMonth'){
+ echo 'checked';
+}
+echo '></td>
+ </tr>
+ <tr>
+ <td>' . _('This Quarter') . ':</td>
+ <td><input type="radio" name="DateRange" value="ThisQuarter" ';
+if ($_POST['DateRange']=='ThisQuarter'){
+ echo 'checked';
+}
+echo '></td>
+ </tr>';
+if ($_POST['DateRange']=='Custom'){
+ echo '<tr>
+ <td>' . _('Date From') . ':</td>
+ <td><input type="text" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" name="FromDate" maxlength="10" size="11" value="' . $_POST['FromDate'] . '" /></td>
+ </tr>';
+ echo '<tr>
+ <td>' . _('Date To') . ':</td>
+ <td><input type="text" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" name="ToDate" maxlength="10" size="11" value="' . $_POST['ToDate'] . '" /></td>
+ </tr>';
+}
+echo '</table>
+ </td><td valign=top>
+ <table>';
+
+echo '<tr><th colspan="2" class="centre">' . _('Display Data') . '</th>
+ </tr>
+ <tr>
+ <td>' . _('Daily') . ':</td>
+ <td><input type="radio" name="DisplayData" value="Daily" ';
+if ($_POST['DisplayData']=='Daily'){
+ echo 'checked';
+}
+echo '></td>
+ </tr>
+ <tr>
+ <td>' . _('Weekly') . ':</td>
+ <td><input type="radio" name="DisplayData" value="Weekly" ';
+if ($_POST['DisplayData']=='Weekly'){
+ echo 'checked';
+}
+echo '></td>
+ </tr>
+ <tr>
+ <td>' . _('Monthly') . ':</td>
+ <td><input type="radio" name="DisplayData" value="Monthly" ';
+if ($_POST['DisplayData']=='Monthly'){
+ echo 'checked';
+}
+echo '></td>
+ </tr>
+ <tr>
+ <td>' . _('Quarterly') . ':</td>
+ <td><input type="radio" name="DisplayData" value="Quarterly" ';
+if ($_POST['DisplayData']=='Monthly'){
+ echo 'checked';
+}
+echo '></td>
+ </tr>';
+echo '</table>
+ </td></tr>
+ </table>';
+
+
+echo '<br /><div class="centre"><input tabindex=4 type=submit name="ShowSales" value="' . _('Show Sales') . '">';
+echo '</form></div>';
+echo '<br />';
+
+if ($_POST['DateRange']=='Custom' AND !isset($_POST['FromDate']) AND !isset($_POST['ToDate'])){
+ //Don't run the report until custom dates entered
+ unset($_POST['ShowSales']);
+}
+
+if (isset($_POST['ShowSales'])){
+ $InputError=0; //assume no input errors now test for errors
+ if ($_POST['DateRange']=='Custom'){
+ if (!Is_Date($_POST['FromDate'])){
+ $InputError = 1;
+ prnMsg(_('The date entered for the from date is not in the appropriate format. Dates must be entered in the format') . ' ' . $_SESSION['DefaultDateFormat'], 'error');
+ }
+ if (!Is_Date($_POST['ToDate'])){
+ $InputError = 1;
+ prnMsg(_('The date entered for the to date is not in the appropriate format. Dates must be entered in the format') . ' ' . $_SESSION['DefaultDateFormat'], 'error');
+ }
+ if (Date1GreaterThanDate2($_POST['FromDate'],$_POST['ToDate'])){
+ $InputError = 1;
+ prnMsg(_('The from date is expected to be a date prior to the to date. Please review the selected date range'),'error');
+ }
+ }
+ switch ($_POST['DateRange']) {
+ case 'ThisWeek':
+ $FromDate = date('Y-m-d',mktime(0,0,0,date('m'),date('d')-date('w')+1,date('Y')));
+ $ToDate = date('Y-m-d');
+ break;
+ case 'ThisMonth':
+ $FromDate = date('Y-m-d',mktime(0,0,0,date('m'),1,date('Y')));
+ $ToDate = date('Y-m-d');
+ break;
+ case 'ThisQuarter':
+ switch (date('m')) {
+ case 1:
+ case 2:
+ case 3:
+ $QuarterStartMonth=1;
+ break;
+ case 4:
+ case 5:
+ case 6:
+ $QuarterStartMonth=4;
+ break;
+ case 7:
+ case 8:
+ case 9:
+ $QuarterStartMonth=7;
+ break;
+ default:
+ $QuarterStartMonth=10;
+ }
+ $FromDate = date('Y-m-d',mktime(0,0,0,$QuarterStartMonth,1,date('Y')));
+ $ToDate = date('Y-m-d');
+ break;
+ case 'Custom':
+ $FromDate = FormatDateForSQL($_POST['FromDate']);
+ $ToDate = FormatDateForSQL($_POST['ToDate']);
+ }
+ switch ($_POST['DisplayData']) {
+ case 'Daily':
+ $sql = "SELECT debtortrans.trandate,
+ debtortrans.tpe,
+ SUM(CASE WHEN stockmoves.type=10 THEN
+ price*(1-discountpercent)* -qty
+ ELSE 0 END)
+ as salesvalue,
+ SUM(CASE WHEN stockmoves.type=10 THEN
+ 1 ELSE 0 END)
+ as nooforders,
+ SUM(CASE WHEN stockmoves.type=11 THEN
+ price*(1-discountpercent)* (-qty)
+ ELSE 0 END)
+ as returnvalue,
+ SUM((standardcost * -qty)) as cost
+ FROM stockmoves
+ INNER JOIN custbranch
+ ON stockmoves.debtorno=custbranch.debtorno
+ AND stockmoves.branchcode=custbranch.branchcode
+ INNER JOIN debtortrans
+ ON stockmoves.type=debtortrans.type
+ AND stockmoves.transno=debtortrans.transno
+ WHERE (stockmoves.type=10 or stockmoves.type=11)
+ AND show_on_inv_crds =1
+ AND debtortrans.trandate>='" . $FromDate . "'
+ AND debtortrans.trandate<='" . $ToDate . "'
+ GROUP BY debtortrans.trandate,
+ tpe
+ ORDER BY debtortrans.trandate,
+ tpe";
+
+ break;
+ case 'Weekly':
+ $sql = "SELECT WEEKOFYEAR(debtortrans.trandate) as week_no,
+ YEAR(debtortrans.trandate) as transyear,
+ debtortrans.tpe,
+ SUM(CASE WHEN stockmoves.type=10 THEN
+ price*(1-discountpercent)* -qty
+ ELSE 0 END)
+ as salesvalue,
+ SUM(CASE WHEN stockmoves.type=10 THEN
+ 1 ELSE 0 END)
+ as nooforders,
+ SUM(CASE WHEN stockmoves.type=11 THEN
+ price*(1-discountpercent)* (-qty)
+ ELSE 0 END)
+ as returnvalue,
+ SUM((standardcost * -qty)) as cost
+ FROM stockmoves
+ INNER JOIN custbranch
+ ON stockmoves.debtorno=custbranch.debtorno
+ AND stockmoves.branchcode=custbranch.branchcode
+ INNER JOIN debtortrans
+ ON stockmoves.type=debtortrans.type
+ AND stockmoves.transno=debtortrans.transno
+ WHERE (stockmoves.type=10 or stockmoves.type=11)
+ AND show_on_inv_crds =1
+ AND debtortrans.trandate>='" . $FromDate . "'
+ AND debtortrans.trandate<='" . $ToDate . "'
+ GROUP BY week_no,
+ transyear,
+ tpe
+ ORDER BY transyear,
+ week_no,
+ tpe";
+
+ break;
+ case 'Monthly':
+ $sql = "SELECT MONTH(debtortrans.trandate) as month_no,
+ MONTHNAME(debtortrans.trandate) as month_name,
+ YEAR(debtortrans.trandate) as transyear,
+ debtortrans.tpe,
+ SUM(CASE WHEN stockmoves.type=10 THEN
+ price*(1-discountpercent)* -qty
+ ELSE 0 END)
+ as salesvalue,
+ SUM(CASE WHEN stockmoves.type=10 THEN
+ 1 ELSE 0 END)
+ as nooforders,
+ SUM(CASE WHEN stockmoves.type=11 THEN
+ price*(1-discountpercent)* (-qty)
+ ELSE 0 END)
+ as returnvalue,
+ SUM((standardcost * -qty)) as cost
+ FROM stockmoves
+ INNER JOIN custbranch
+ ON stockmoves.debtorno=custbranch.debtorno
+ AND stockmoves.branchcode=custbranch.branchcode
+ INNER JOIN debtortrans
+ ON stockmoves.type=debtortrans.type
+ AND stockmoves.transno=debtortrans.transno
+ WHERE (stockmoves.type=10 or stockmoves.type=11)
+ AND show_on_inv_crds =1
+ AND debtortrans.trandate>='" . $FromDate . "'
+ AND debtortrans.trandate<='" . $ToDate . "'
+ GROUP BY month_no,
+ month_name,
+ transyear,
+ debtortrans.tpe
+ ORDER BY transyear,
+ month_no,
+ tpe";
+
+ break;
+ case 'Quarterly':
+ $sql = "SELECT QUARTER(debtortrans.trandate) as quarter_no,
+ YEAR(debtortrans.trandate) as transyear,
+ debtortrans.tpe,
+ SUM(CASE WHEN stockmoves.type=10 THEN
+ price*(1-discountpercent)* -qty
+ ELSE 0 END)
+ as salesvalue,
+ SUM(CASE WHEN stockmoves.type=10 THEN
+ 1 ELSE 0 END)
+ as nooforders,
+ SUM(CASE WHEN stockmoves.type=11 THEN
+ price*(1-discountpercent)* (-qty)
+ ELSE 0 END)
+ as returnvalue,
+ SUM((standardcost * -qty)) as cost
+ FROM stockmoves
+ INNER JOIN custbranch
+ ON stockmoves.debtorno=custbranch.debtorno
+ AND stockmoves.branchcode=custbranch.branchcode
+ INNER JOIN debtortrans
+ ON stockmoves.type=debtortrans.type
+ AND stockmoves.transno=debtortrans.transno
+ WHERE (stockmoves.type=10 or stockmoves.type=11)
+ AND show_on_inv_crds =1
+ AND debtortrans.trandate>='" . $FromDate . "'
+ AND debtortrans.trandate<='" . $ToDate . "'
+ GROUP BY quarter_no,
+ transyear,
+ tpe
+ ORDER BY transyear,
+ quarter_no,
+ tpe";
+
+ break;
+ }
+
+ $ErrMsg = _('The sales data could not be retrieved because') . ' - ' . DB_error_msg($db);
+ $SalesResult = DB_query($sql,$db,$ErrMsg);
+
+
+ echo '<table cellpadding=2 class="selection">';
+
+ echo'<tr>
+ <th>' . _('Period') . '</th>
+ <th>' . _('Sales') . '<br />' . _('Type') . '</th>
+ <th>' . _('No Orders') . '</th>
+ <th>' . _('Total Sales') . '</th>
+ <th>' . _('Refunds') . '</th>
+ <th>' . _('Net Sales') . '</th>
+ <th>' . _('Cost of Sales') . '</th>
+ <th>' . _('Gross Profit') . '</th>
+ </tr>';
+
+ $CumulativeTotalSales = 0;
+ $CumulativeTotalOrders = 0;
+ $CumulativeTotalRefunds = 0;
+ $CumulativeTotalNetSales = 0;
+ $CumulativeTotalCost = 0;
+ $CumulativeTotalGP = 0;
+
+ $PrdTotalOrders =0;
+ $PrdTotalSales=0;
+ $PrdTotalRefunds=0;
+ $PrdTotalNetSales=0;
+ $PrdTotalCost=0;
+ $PrdTotalGP=0;
+
+ $PeriodHeadingDone = false;
+ $LastPeriodHeading = 'First Run Through';
+ $k=0;
+ while ($SalesRow=DB_fetch_array($SalesResult)) {
+ if ($k==1){
+ echo '<tr class="EvenTableRows">';
+ $k=0;
+ } else {
+ echo '<tr class="OddTableRows">';
+ $k=1;
+ }
+ switch ($_POST['DisplayData']){
+ case 'Daily':
+ if ($LastPeriodHeading != ConvertSQLDate($SalesRow['trandate'])) {
+ $PeriodHeadingDone=false;
+ if ($LastPeriodHeading != 'First Run Through'){ //print the footer for the period
+ echo '<td colspan="2" class="number">' . _('Total') . '-' . $LastPeriodHeading . '</td>
+ <td class="number">' . $PrdTotalOrders . '</td>
+ <td class="number">' . number_format($PrdTotalSales,2) . '</td>
+ <td class="number">' . number_format($PrdTotalRefunds,2) . '</td>
+ <td class="number">' . number_format($PrdTotalNetSales,2) . '</td>
+ <td class="number">' . number_format($PrdTotalCost,2) . '</td>
+ <td class="number">' . number_format($PrdTotalGP,2) . '</td>
+ </tr>';
+ if ($k==1){
+ echo '<tr class="EvenTableRows"><td colspan="8"><hr></td></tr>';
+ echo '<tr class="OddTableRows">';
+ } else {
+ echo '<tr class="OddTableRows"><td colspan="8"><hr></td></tr>';
+ echo '<tr class="EvenTableRows">';
+ }
+ $PrdTotalOrders =0;
+ $PrdTotalSales=0;
+ $PrdTotalRefunds=0;
+ $PrdTotalNetSales=0;
+ $PrdTotalCost=0;
+ $PrdTotalGP=0;
+ }
+ }
+ if (! $PeriodHeadingDone){
+ echo '<td>' . ConvertSQLDate($SalesRow['trandate']) . '</td>';
+ $LastPeriodHeading = ConvertSQLDate($SalesRow['trandate']);
+ $PeriodHeadingDone = true;
+ } else {
+ echo '<td></td>';
+ }
+ break;
+ case 'Weekly':
+ if ($LastPeriodHeading != _('wk'). '-' . $SalesRow['week_no'] . ' ' . $SalesRow['transyear']) {
+ $PeriodHeadingDone=false;
+ if ($LastPeriodHeading != 'First Run Through'){
+ echo '<td colspan="2" class="number">' . _('Total') . '-' . $LastPeriodHeading . '</td>
+ <td class="number">' . $PrdTotalOrders . '</td>
+ <td class="number">' . number_format($PrdTotalSales,2) . '</td>
+ <td class="number">' . number_format($PrdTotalRefunds,2) . '</td>
+ <td class="number">' . number_format($PrdTotalNetSales,2) . '</td>
+ <td class="number">' . number_format($PrdTotalCost,2) . '</td>
+ <td class="number">' . number_format($PrdTotalGP,2) . '</td>
+ </tr>';
+ if ($k==1){
+ echo '<tr class="EvenTableRows"><td colspan="8"><hr></td></tr>';
+ echo '<tr class="OddTableRows">';
+ } else {
+ echo '<tr class="OddTableRows"><td colspan="8"><hr></td></tr>';
+ echo '<tr class="EvenTableRows">';
+ }
+ $PrdTotalOrders =0;
+ $PrdTotalSales=0;
+ $PrdTotalRefunds=0;
+ $PrdTotalNetSales=0;
+ $PrdTotalCost=0;
+ $PrdTotalGP=0;
+ }
+ }
+ if (! $PeriodHeadingDone){
+ echo '<td>' . _('wk'). '-' . $SalesRow['week_no'] . ' ' . $SalesRow['transyear'] . '</td>';
+ $LastPeriodHeading = _('wk'). '-' . $SalesRow['week_no'] . ' ' . $SalesRow['transyear'];
+ $PeriodHeadingDone = true;
+ } else {
+ echo '<td></td>';
+ }
+ break;
+ case 'Monthly':
+ if ($LastPeriodHeading != $SalesRow['month_name'] . ' ' . $SalesRow['transyear']) {
+ $PeriodHeadingDone=false;
+ if ($LastPeriodHeading != 'First Run Through'){
+ echo '<td colspan="2" class="number">' . _('Total') . '-' . $LastPeriodHeading . '</td>
+ <td class="number">' . $PrdTotalOrders . '</td>
+ <td class="number">' . number_format($PrdTotalSales,2) . '</td>
+ <td class="number">' . number_format($PrdTotalRefunds,2) . '</td>
+ <td class="number">' . number_format($PrdTotalNetSales,2) . '</td>
+ <td class="number">' . number_format($PrdTotalCost,2) . '</td>
+ <td class="number">' . number_format($PrdTotalGP,2) . '</td>
+ </tr>';
+ if ($k==1){
+ echo '<tr class="EvenTableRows"><td colspan="8"><hr></td></tr>';
+ echo '<tr class="OddTableRows">';
+ } else {
+ echo '<tr class="OddTableRows"><td colspan="8"><hr></td></tr>';
+ echo '<tr class="EvenTableRows">';
+ }
+ $PrdTotalOrders =0;
+ $PrdTotalSales=0;
+ $PrdTotalRefunds=0;
+ $PrdTotalNetSales=0;
+ $PrdTotalCost=0;
+ $PrdTotalGP=0;
+ }
+ }
+ if (! $PeriodHeadingDone){
+ echo '<td>' . $SalesRow['month_name'] . ' ' . $SalesRow['transyear'] . '</td>';
+ $LastPeriodHeading = $SalesRow['month_name'] . ' ' . $SalesRow['transyear'];
+ $PeriodHeadingDone = true;
+ } else {
+ echo '<td></td>';
+ }
+ break;
+ case 'Quarterly':
+ if ($LastPeriodHeading != _('Qtr'). '-' . $SalesRow['quarter_no'] . ' ' . $SalesRow['transyear']) {
+ $PeriodHeadingDone=false;
+ if ($LastPeriodHeading != 'First Run Through'){
+ echo '<td colspan="2" class="number">' . _('Total') . '-'. $LastPeriodHeading . '</td>
+ <td class="number">' . $PrdTotalOrders . '</td>
+ <td class="number">' . number_format($PrdTotalSales,2) . '</td>
+ <td class="number">' . number_format($PrdTotalRefunds,2) . '</td>
+ <td class="number">' . number_format($PrdTotalNetSales,2) . '</td>
+ <td class="number">' . number_format($PrdTotalCost,2) . '</td>
+ <td class="number">' . number_format($PrdTotalGP,2) . '</td>
+ </tr>';
+ if ($k==1){
+ echo '<tr class="EvenTableRows"><td colspan="8"><hr></td></tr>';
+ echo '<tr class="OddTableRows">';
+ } else {
+ echo '<tr class="OddTableRows"><td colspan="8"><hr></td></tr>';
+ echo '<tr class="EvenTableRows">';
+ }
+ $PrdTotalOrders =0;
+ $PrdTotalSales=0;
+ $PrdTotalRefunds=0;
+ $PrdTotalNetSales=0;
+ $PrdTotalCost=0;
+ $PrdTotalGP=0;
+ }
+ }
+ if (! $PeriodHeadingDone){
+ echo '<td>' . _('Qtr'). '-' . $SalesRow['quarter_no'] . ' ' . $SalesRow['transyear'] . '</td>';
+ $LastPeriodHeading = _('Qtr'). '-' . $SalesRow['quarter_no'] . ' ' . $SalesRow['transyear'];
+ $PeriodHeadingDone = true;
+ } else {
+ echo '<td></td>';
+ }
+ break;
+ }
+ echo '<td>' . $SalesRow['tpe'] . '</td>
+ <td class="number">' . $SalesRow['nooforders'] . '</td>
+ <td class="number">' . number_format($SalesRow['salesvalue'],2) . '</td>
+ <td class="number">' . number_format($SalesRow['returnvalue'],2) . '</td>
+ <td class="number">' . number_format($SalesRow['salesvalue']+$SalesRow['returnvalue'],2) . '</td>
+ <td class="number">' . number_format($SalesRow['cost'],2) . '</td>
+ <td class="number">' . number_format(($SalesRow['salesvalue']+$SalesRow['returnvalue']-$SalesRow['cost']),2) . '</td>
+ </tr>';
+ $PrdTotalOrders +=$SalesRow['nooforders'];
+ $PrdTotalSales += $SalesRow['salesvalue'];
+ $PrdTotalRefunds += $SalesRow['returnvalue'];
+ $PrdTotalNetSales += ($SalesRow['salesvalue']+$SalesRow['returnvalue']);
+ $PrdTotalCost += $SalesRow['cost'];
+ $PrdTotalGP += ($SalesRow['salesvalue']+$SalesRow['returnvalue']-$SalesRow['cost']);
+
+ $CumulativeTotalSales += $SalesRow['salesvalue'];
+ $CumulativeTotalOrders = $SalesRow['nooforders'];
+ $CumulativeTotalRefunds += $SalesRow['returnvalue'];
+ $CumulativeTotalNetSales += ($SalesRow['salesvalue']+$SalesRow['returnvalue']);
+ $CumulativeTotalCost += $SalesRow['cost'];
+ $CumulativeTotalGP += ($SalesRow['salesvalue']+$SalesRow['returnvalue']-$SalesRow['cost']);
+ }
+ if ($k==1){
+ echo '<tr class="EvenTableRows">';
+ $k=0;
+ } else {
+ echo '<tr class="OddTableRows">';
+ $k=1;
+ }
+ echo '<td colspan="2" class="number">' . _('Total') . ' ' . $LastPeriodHeading . '</td>
+ <td class="number">' . $PrdTotalOrders . '</td>
+ <td class="number">' . number_format($PrdTotalSales,2) . '</td>
+ <td class="number">' . number_format($PrdTotalRefunds,2) . '</td>
+ <td class="number">' . number_format($PrdTotalNetSales,2) . '</td>
+ <td class="number">' . number_format($PrdTotalCost,2) . '</td>
+ <td class="number">' . number_format($PrdTotalGP,2) . '</td>
+ </tr>';
+ if ($k==1){
+ echo '<tr class="EvenTableRows"><td colspan="8"><hr></td></tr>';
+ echo '<tr class="OddTableRows">';
+ } else {
+ echo '<tr class="OddTableRows"><td colspan="8"><hr></td></tr>';
+ echo '<tr class="EvenTableRows">';
+ }
+ echo '<td colspan="2" class="number">' . _('GRAND Total') . '</td>
+ <td class="number">' . $CumulativeTotalOrders . '</td>
+ <td class="number">' . number_format($CumulativeTotalSales,2) . '</td>
+ <td class="number">' . number_format($CumulativeTotalRefunds,2) . '</td>
+ <td class="number">' . number_format($CumulativeTotalNetSales,2) . '</td>
+ <td class="number">' . number_format($CumulativeTotalCost,2) . '</td>
+ <td class="number">' . number_format($CumulativeTotalGP,2) . '</td>
+ </tr>';
+
+ echo '</table>';
+
+} //end of if user hit show sales
+include('includes/footer.inc');
+?>
\ No newline at end of file
Added: trunk/SalesCategoryPeriodInquiry.php
===================================================================
--- trunk/SalesCategoryPeriodInquiry.php (rev 0)
+++ trunk/SalesCategoryPeriodInquiry.php 2011-05-25 10:30:45 UTC (rev 4574)
@@ -0,0 +1,220 @@
+<?php
+
+/* $Id: SalesCategoryPeriodInquiry.php 4261 2010-12-22 15:56:50Z $*/
+
+include('includes/session.inc');
+$title = _('Sales Category Report');
+include('includes/header.inc');
+include('includes/DefineCartClass.php');
+
+echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/transactions.png" title="' . _('Sales Report') . '" alt="" />' . ' ' . _('Sales Category Report') . '</p>';
+echo '<div class="page_help_text">' . _('Select the parameters for the report') . '</div><br>';
+
+if (!isset($_POST['DateRange'])){
+ /* then assume report is for This Month - maybe wrong to do this but hey better than reporting an error?*/
+ $_POST['DateRange']='ThisMonth';
+}
+
+echo '<form action="' . $_SERVER['PHP_SELF'] . '" method="post">';
+echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+
+echo '<table cellpadding=2 class="selection">';
+
+echo '<tr><th colspan="2" class="centre">' . _('Date Selection') . '</th>
+ </tr>
+ <tr>
+ <td>' . _('Custom Range') . ':</td>
+ <td><input type="radio" name="DateRange" value="Custom" ';
+if ($_POST['DateRange']=='Custom'){
+ echo 'checked';
+}
+echo '></td>
+ </tr>
+ <tr>
+ <td>' . _('This Week') . ':</td>
+ <td><input type="radio" name="DateRange" value="ThisWeek" ';
+if ($_POST['DateRange']=='ThisWeek'){
+ echo 'checked';
+}
+echo '></td>
+ </tr>
+ <tr>
+ <td>' . _('This Month') . ':</td>
+ <td><input type="radio" name="DateRange" value="ThisMonth" ';
+if ($_POST['DateRange']=='ThisMonth'){
+ echo 'checked';
+}
+echo '></td>
+ </tr>
+ <tr>
+ <td>' . _('This Quarter') . ':</td>
+ <td><input type="radio" name="DateRange" value="ThisQuarter" ';
+if ($_POST['DateRange']=='ThisQuarter'){
+ echo 'checked';
+}
+echo '></td>
+ </tr>';
+if ($_POST['DateRange']=='Custom'){
+ echo '<tr>
+ <td>' . _('Date From') . ':</td>
+ <td><input type="text" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" name="FromDate" maxlength="10" size="11" value="' . $_POST['FromDate'] . '" /></td>
+ </tr>';
+ echo '<tr>
+ <td>' . _('Date To') . ':</td>
+ <td><input type="text" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" name="ToDate" maxlength="10" size="11" value="' . $_POST['ToDate'] . '" /></td>
+ </tr>';
+}
+echo '</table>';
+
+
+echo '<br /><div class="centre"><input tabindex=4 type=submit name="ShowSales" value="' . _('Show Sales') . '">';
+echo '</form></div>';
+echo '<br />';
+
+if ($_POST['DateRange']=='Custom' AND !isset($_POST['FromDate']) AND !isset($_POST['ToDate'])){
+ //Don't run the report until custom dates entered
+ unset($_POST['ShowSales']);
+}
+
+if (isset($_POST['ShowSales'])){
+ $InputError=0; //assume no input errors now test for errors
+ if ($_POST['DateRange']=='Custom'){
+ if (!Is_Date($_POST['FromDate'])){
+ $InputError = 1;
+ prnMsg(_('The date entered for the from date is not in the appropriate format. Dates must be entered in the format') . ' ' . $_SESSION['DefaultDateFormat'], 'error');
+ }
+ if (!Is_Date($_POST['ToDate'])){
+ $InputError = 1;
+ prnMsg(_('The date entered for the to date is not in the appropriate format. Dates must be entered in the format') . ' ' . $_SESSION['DefaultDateFormat'], 'error');
+ }
+ if (Date1GreaterThanDate2($_POST['FromDate'],$_POST['ToDate'])){
+ $InputError = 1;
+ prnMsg(_('The from date is expected to be a date prior to the to date. Please review the selected date range'),'error');
+ }
+ }
+ switch ($_POST['DateRange']) {
+ case 'ThisWeek':
+ $FromDate = date('Y-m-d',mktime(0,0,0,date('m'),date('d')-date('w')+1,date('Y')));
+ $ToDate = date('Y-m-d');
+ break;
+ case 'ThisMonth':
+ $FromDate = date('Y-m-d',mktime(0,0,0,date('m'),1,date('Y')));
+ $ToDate = date('Y-m-d');
+ break;
+ case 'ThisQuarter':
+ switch (date('m')) {
+ case 1:
+ case 2:
+ case 3:
+ $QuarterStartMonth=1;
+ break;
+ case 4:
+ case 5:
+ case 6:
+ $QuarterStartMonth=4;
+ break;
+ case 7:
+ case 8:
+ case 9:
+ $QuarterStartMonth=7;
+ break;
+ default:
+ $QuarterStartMonth=10;
+ }
+ $FromDate = date('Y-m-d',mktime(0,0,0,$QuarterStartMonth,1,date('Y')));
+ $ToDate = date('Y-m-d');
+ break;
+ case 'Custom':
+ $FromDate = FormatDateForSQL($_POST['FromDate']);
+ $ToDate = FormatDateForSQL($_POST['ToDate']);
+ }
+ $sql = "SELECT stockmaster.categoryid,
+ stockcategory.categorydescription,
+ SUM(CASE WHEN stockmoves.type=10 THEN
+ price*(1-discountpercent)* -qty
+ ELSE 0 END) as salesvalue,
+ SUM(CASE WHEN stockmoves.type=11 THEN
+ price*(1-discountpercent)* (-qty)
+ ELSE 0 END) as returnvalue,
+ SUM(CASE WHEN stockmoves.type=11
+ OR stockmoves.type=10 THEN
+ price*(1-discountpercent)* (-qty)
+ ELSE 0 END) as netsalesvalue,
+ SUM((standardcost * -qty)) as cost
+ FROM stockmoves INNER JOIN stockmaster
+ ON stockmoves.stockid=stockmaster.stockid
+ INNER JOIN stockcategory
+ ON stockmaster.categoryid=stockcategory.categoryid
+ WHERE (stockmoves.type=10 or stockmoves.type=11)
+ AND show_on_inv_crds =1
+ AND trandate>='" . $FromDate . "'
+ AND trandate<='" . $ToDate . "'
+ GROUP BY stockmaster.categoryid
+ ORDER BY netsalesvalue DESC";
+
+ $ErrMsg = _('The sales data could not be retrieved because') . ' - ' . DB_error_msg($db);
+ $SalesResult = DB_query($sql,$db,$ErrMsg);
+ $OrdersResult = DB_query($OrdersSQL,$db,$ErrMsg);
+
+ echo '<table cellpadding=2 class="selection">';
+
+ echo'<tr>
+ <th>' . _('Category') . '</th>
+ <th>' . _('Total Sales') . '</th>
+ <th>' . _('Refunds') . '</th>
+ <th>' . _('Net Sales') . '</th>
+ <th>' . _('Cost of Sales') . '</th>
+ <th>' . _('Gross Profit') . '</th>
+ </tr>';
+
+ $CumulativeTotalSales = 0;
+ $CumulativeTotalRefunds = 0;
+ $CumulativeTotalNetSales = 0;
+ $CumulativeTotalCost = 0;
+ $CumulativeTotalGP = 0;
+
+ $k=0;
+ while ($SalesRow=DB_fetch_array($SalesResult)) {
+ if ($k==1){
+ echo '<tr class="EvenTableRows">';
+ $k=0;
+ } else {
+ echo '<tr class="OddTableRows">';
+ $k=1;
+ }
+
+ echo '<td>' . $SalesRow['categoryid'] . ' - ' . $SalesRow['categorydescription'] . '</td>
+ <td class="number">' . number_format($SalesRow['salesvalue'],2) . '</td>
+ <td class="number">' . number_format($SalesRow['returnvalue'],2) . '</td>
+ <td class="number">' . number_format($SalesRow['salesvalue']+$SalesRow['returnvalue'],2) . '</td>
+ <td class="number">' . number_format($SalesRow['cost'],2) . '</td>
+ <td class="number">' . number_format(($SalesRow['salesvalue']+$SalesRow['returnvalue']-$SalesRow['cost']),2) . '</td>
+ </tr>';
+
+ $CumulativeTotalSales += $SalesRow['salesvalue'];
+ $CumulativeTotalRefunds += $SalesRow['returnvalue'];
+ $CumulativeTotalNetSales += ($SalesRow['salesvalue']+$SalesRow['returnvalue']);
+ $CumulativeTotalCost += $SalesRow['cost'];
+ $CumulativeTotalGP += ($SalesRow['salesvalue']+$SalesRow['returnvalue']-$SalesRow['cost']);
+ } //loop around category sales for the period
+
+ if ($k==1){
+ echo '<tr class="EvenTableRows"><td colspan="8"><hr></td></tr>';
+ echo '<tr class="OddTableRows">';
+ } else {
+ echo '<tr class="OddTableRows"><td colspan="8"><hr></td></tr>';
+ echo '<tr class="EvenTableRows">';
+ }
+ echo '<td class="number">' . _('GRAND Total') . '</td>
+ <td class="number">' . number_format($CumulativeTotalSales,2) . '</td>
+ <td class="number">' . number_format($CumulativeTotalRefunds,2) . '</td>
+ <td class="number">' . number_format($CumulativeTotalNetSales,2) . '</td>
+ <td class="number">' . number_format($CumulativeTotalCost,2) . '</td>
+ <td class="number">' . number_format($CumulativeTotalGP,2) . '</td>
+ </tr>';
+
+ echo '</table>';
+
+} //end of if user hit show sales
+include('includes/footer.inc');
+?>
\ No newline at end of file
Modified: trunk/SalesGLPostings.php
===================================================================
--- trunk/SalesGLPostings.php 2011-05-23 10:20:46 UTC (rev 4573)
+++ trunk/SalesGLPostings.php 2011-05-25 10:30:45 UTC (rev 4574)
@@ -92,7 +92,7 @@
$ShowLivePostingRecords = true;
- $SQL = 'SELECT salesglpostings.id,
+ $SQL = "SELECT salesglpostings.id,
salesglpostings.area,
salesglpostings.stkcat,
salesglpostings.salestype,
@@ -100,7 +100,7 @@
salesglpostings.discountglcode
FROM salesglpostings LEFT JOIN chartmaster
ON salesglpostings.salesglcode = chartmaster.accountcode
- WHERE chartmaster.accountcode IS NULL';
+ WHERE chartmaster.accountcode IS NULL";
$result = DB_query($SQL,$db);
if (DB_num_rows($result)>0){
@@ -124,13 +124,13 @@
$k=1;
}
- printf("<td>%s</td>
+ printf('<td>%s</td>
<td>%s</td>
<td>%s</td>
<td>%s</td>
<td>%s</td>
- <td><a href=\"%sSelectedSalesPostingID=%s\">" . _('Edit') . "</td>
- <td><a href=\"%sSelectedSalesPostingID=%s&delete=yes\">". _('Delete') . "</td></tr>",
+ <td><a href="%sSelectedSalesPostingID=%s">' . _('Edit') . '</td>
+ <td><a href="%sSelectedSalesPostingID=%s&delete=yes" onclick="return confirm(\'' . _('Are you sure you wish to delete this sales GL posting record?') . '\');">'. _('Delete') . '</td></tr>',
$myrow[1],
$myrow[2],
$myrow[3],
@@ -143,11 +143,11 @@
}
}
- $SQL = 'SELECT salesglpostings.id,
+ $SQL = "SELECT salesglpostings.id,
salesglpostings.area,
salesglpostings.stkcat,
salesglpostings.salestype
- FROM salesglpostings';
+ FROM salesglpostings";
$result = DB_query($SQL,$db);
@@ -203,7 +203,7 @@
}
if ($ShowLivePostingRecords){
- $SQL = 'SELECT salesglpostings.id,
+ $SQL = "SELECT salesglpostings.id,
salesglpostings.area,
salesglpostings.stkcat,
salesglpostings.salestype,
@@ -213,12 +213,13 @@
chartmaster as chart1,
chartmaster as chart2
WHERE salesglpostings.salesglcode = chart1.accountcode
- AND salesglpostings.discountglcode = chart2.accountcode';
+ AND salesglpostings.discountglcode = chart2.accountcode";
$result = DB_query($SQL,$db);
- echo '<table class=selection>';
- echo '<tr><th>' . _('Area') . '</th>
+ echo '<table class=selection>
+ <tr>
+ <th>' . _('Area') . '</th>
<th>' . _('Stock Category') . '</th>
<th>' . _('Sales Type') . '</th>
<th>' . _('Sales Account') . '</th>
@@ -236,13 +237,13 @@
$k=1;
}
- printf("<td>%s</td>
+ printf('<td>%s</td>
<td>%s</td>
<td>%s</td>
<td>%s</td>
<td>%s</td>
- <td><a href=\"%sSelectedSalesPostingID=%s\">" . _('Edit') . "</td>
- <td><a href=\"%sSelectedSalesPostingID=%s&delete=yes\">". _('Delete') . "</td></tr>",
+ <td><a href="%sSelectedSalesPostingID=%s">' . _('Edit') . '</td>
+ <td><a href="%sSelectedSalesPostingID=%s&delete=yes" onclick="return confirm(\'' . _('Are you sure you wish to delete this sales GL posting record?') . '\');">'. _('Delete') . '</td></tr>',
$myrow[1],
$myrow[2],
$myrow[3],
@@ -296,21 +297,21 @@
}
/*end of if $SelectedSalesPostingID only do the else when a new record is being entered */
- $SQL = 'SELECT areacode,
- areadescription FROM areas';
+ $SQL = "SELECT areacode,
+ areadescription FROM areas";
$result = DB_query($SQL,$db);
- echo '<br /><table class=selection>
+ echo '<br /><table class="selection">
<tr>
<td>' . _('Area') . ':</td>
<td><select name="Area">
- <option VALUE="AN">' . _('Any Other') . '</option>';
+ <option value="AN">' . _('Any Other') . '</option>';
while ($myrow = DB_fetch_array($result)) {
if (isset($_POST['Area']) and $myrow['areacode']==$_POST['Area']) {
echo '<option selected value="';
} else {
- echo '<option VALUE="';
+ echo '<option value="';
}
echo $myrow['areacode'] . '">'. $myrow['areadescription'] . '</option>';
@@ -318,7 +319,7 @@
DB_free_result($result);
- $SQL = 'SELECT categoryid, categorydescription FROM stockcategory';
+ $SQL = "SELECT categoryid, categorydescription FROM stockcategory";
$result = DB_query($SQL,$db);
echo '</select></td></tr>';
@@ -326,7 +327,7 @@
echo '<tr><td>' . _('Stock Category') . ':</td>
<td><select name="StkCat">
- <option VALUE="ANY">' . _('Any Other') . '</option>';
+ <option value="ANY">' . _('Any Other') . '</option>';
while ($myrow = DB_fetch_array($result)) {
@@ -344,21 +345,21 @@
DB_free_result($result);
- $SQL = 'SELECT typeabbrev,
+ $SQL = "SELECT typeabbrev,
sales_type
- FROM salestypes';
+ FROM salestypes";
$result = DB_query($SQL,$db);
echo '<tr><td>' . _('Sales Type') . ' / ' . _('Price List') . ':</td>
<td><select name="SalesType">';
- echo '<option VALUE="AN">' . _('Any Other') . '</option>';
+ echo '<option value="AN">' . _('Any Other') . '</option>';
while ($myrow = DB_fetch_array($result)) {
if (isset($_POST['SalesType']) and $myrow['typeabbrev']==$_POST['SalesType']) {
- echo '<option selected VALUE="';
+ echo '<option selected value="';
} else {
- echo '<option VALUE="';
+ echo '<option value="';
}
echo $myrow['typeabbrev'] . '">' . $myrow['sales_type'] . '</option>';
@@ -386,7 +387,7 @@
if (isset($_POST['SalesGLCode']) and $myrow['accountcode']==$_POST['SalesGLCode']) {
echo '<option selected value="';
} else {
- echo '<option VALUE="';
+ echo '<option value="';
}
echo $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' - ' . $myrow['accountname'] . '</option>';
@@ -404,7 +405,7 @@
} else {
echo '<option value="';
}
- echo $myrow['accountcode'] . "'>" . $myrow['accountcode'] . ' - ' . $myrow['accountname'] . '</option>';
+ echo $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' - ' . $myrow['accountname'] . '</option>';
} //end while loop
Added: trunk/SalesTopItemsInquiry.php
===================================================================
--- trunk/SalesTopItemsInquiry.php (rev 0)
+++ trunk/SalesTopItemsInquiry.php 2011-05-25 10:30:45 UTC (rev 4574)
@@ -0,0 +1,275 @@
+<?php
+
+/* $Id: SalesTopItemsInquiry.php 4261 2010-12-22 15:56:50Z $*/
+
+include('includes/session.inc');
+$title = _('Sales Category Report');
+include('includes/header.inc');
+include('includes/DefineCartClass.php');
+
+echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/transactions.png" title="' . _('Sales Report') . '" alt="" />' . ' ' . _('Sales Category Report') . '</p>';
+echo '<div class="page_help_text">' . _('Select the parameters for the report') . '</div><br>';
+
+if (!isset($_POST['DateRange'])){
+ /* then assume report is for This Month - maybe wrong to do this but hey better than reporting an error?*/
+ $_POST['DateRange']='ThisMonth';
+}
+
+echo '<form action="' . $_SERVER['PHP_SELF'] . '" method="post">';
+echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+
+echo '<table cellpadding=2 class="selection">
+ <tr><td valign=top>
+ <table>';
+
+echo '<tr><th colspan="2" class="centre">' . _('Date Selection') . '</th>
+ </tr>
+ <tr>
+ <td>' . _('Custom Range') . ':</td>
+ <td><input type="radio" name="DateRange" value="Custom" ';
+if ($_POST['DateRange']=='Custom'){
+ echo 'checked';
+}
+echo '></td>
+ </tr>
+ <tr>
+ <td>' . _('This Week') . ':</td>
+ <td><input type="radio" name="DateRange" value="ThisWeek" ';
+if ($_POST['DateRange']=='ThisWeek'){
+ echo 'checked';
+}
+echo '></td>
+ </tr>
+ <tr>
+ <td>' . _('This Month') . ':</td>
+ <td><input type="radio" name="DateRange" value="ThisMonth" ';
+if ($_POST['DateRange']=='ThisMonth'){
+ echo 'checked';
+}
+echo '></td>
+ </tr>
+ <tr>
+ <td>' . _('This Quarter') . ':</td>
+ <td><input type="radio" name="DateRange" value="ThisQuarter" ';
+if ($_POST['DateRange']=='ThisQuarter'){
+ echo 'checked';
+}
+echo '></td>
+ </tr>';
+if ($_POST['DateRange']=='Custom'){
+ echo '<tr>
+ <td>' . _('Date From') . ':</td>
+ <td><input type="text" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" name="FromDate" maxlength="10" size="11" value="' . $_POST['FromDate'] . '" /></td>
+ </tr>';
+ echo '<tr>
+ <td>' . _('Date To') . ':</td>
+ <td><input type="text" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" name="ToDate" maxlength="10" size="11" value="' . $_POST['ToDate'] . '" /></td>
+ </tr>';
+}
+echo '</table></td>
+ <td valign=top>
+ <table>'; //new sub table to set parameters for order of display
+
+
+if (!isset($_POST['OrderBy'])){ //default to order by net sales
+ $_POST['OrderBy']='NetSales';
+}
+echo '<tr><th colspan="2" class="centre">' . _('Display') . '</th>
+ </tr>
+ <tr>
+ <td>' . _('Order By Net Sales') . ':</td>
+ <td><input type="radio" name="OrderBy" value="NetSales" ';
+if ($_POST['OrderBy']=='NetSales'){
+ echo 'checked';
+}
+echo '></td>
+ </tr>
+ <tr>
+ <td>' . _('Order By Quantity') . ':</td>
+ <td><input type="radio" name="OrderBy" value="Quantity" ';
+if ($_POST['OrderBy']=='Quantity'){
+ echo 'checked';
+}
+if (!isset($_POST['NoToDisplay'])){
+ $_POST['NoToDisplay']=20;
+}
+echo '></td>
+ </tr>
+ <tr>
+ <td>' . _('Number to Display') . ':</td>
+ <td><input type="text class="number" name="NoToDisplay" size="4" maxlength="4" value="' . $_POST['NoToDisplay'] .'" ></td>
+ </tr>
+ </table>
+ </td></tr>
+ </table>';
+
+
+echo '<br /><div class="centre"><input tabindex=4 type=submit name="ShowSales" value="' . _('Show Sales') . '">';
+echo '</form></div>';
+echo '<br />';
+
+if ($_POST['DateRange']=='Custom' AND !isset($_POST['FromDate']) AND !isset($_POST['ToDate'])){
+ //Don't run the report until custom dates entered
+ unset($_POST['ShowSales']);
+}
+
+if (isset($_POST['ShowSales'])){
+ $InputError=0; //assume no input errors now test for errors
+ if ($_POST['DateRange']=='Custom'){
+ if (!Is_Date($_POST['FromDate'])){
+ $InputError = 1;
+ prnMsg(_('The date entered for the from date is not in the appropriate format. Dates must be entered in the format') . ' ' . $_SESSION['DefaultDateFormat'], 'error');
+ }
+ if (!Is_Date($_POST['ToDate'])){
+ $InputError = 1;
+ prnMsg(_('The date entered for the to date is not in the appropriate format. Dates must be entered in the format') . ' ' . $_SESSION['DefaultDateFormat'], 'error');
+ }
+ if (Date1GreaterThanDate2($_POST['FromDate'],$_POST['ToDate'])){
+ $InputError = 1;
+ prnMsg(_('The from date is expected to be a date prior to the to date. Please review the selected date range'),'error');
+ }
+ }
+ switch ($_POST['DateRange']) {
+ case 'ThisWeek':
+ $FromDate = date('Y-m-d',mktime(0,0,0,date('m'),date('d')-date('w')+1,date('Y')));
+ $ToDate = date('Y-m-d');
+ break;
+ case 'ThisMonth':
+ $FromDate = date('Y-m-d',mktime(0,0,0,date('m'),1,date('Y')));
+ $ToDate = date('Y-m-d');
+ break;
+ case 'ThisQuarter':
+ switch (date('m')) {
+ case 1:
+ case 2:
+ case 3:
+ $QuarterStartMonth=1;
+ break;
+ case 4:
+ case 5:
+ case 6:
+ $QuarterStartMonth=4;
+ break;
+ case 7:
+ case 8:
+ case 9:
+ $QuarterStartMonth=7;
+ break;
+ default:
+ $QuarterStartMonth=10;
+ }
+ $FromDate = date('Y-m-d',mktime(0,0,0,$QuarterStartMonth,1,date('Y')));
+ $ToDate = date('Y-m-d');
+ break;
+ case 'Custom':
+ $FromDate = FormatDateForSQL($_POST['FromDate']);
+ $ToDate = FormatDateForSQL($_POST['ToDate']);
+ }
+ $sql = "SELECT stockmaster.stockid,
+ stockmaster.description,
+ stockcategory.categorydescription,
+ SUM(CASE WHEN stockmoves.type=10
+ OR stockmoves.type=11 THEN
+ -qty
+ ELSE 0 END) as salesquantity,
+ SUM(CASE WHEN stockmoves.type=10 THEN
+ price*(1-discountpercent)* -qty
+ ELSE 0 END) as salesvalue,
+ SUM(CASE WHEN stockmoves.type=11 THEN
+ price*(1-discountpercent)* (-qty)
+ ELSE 0 END) as returnvalue,
+ SUM(CASE WHEN stockmoves.type=11
+ OR stockmoves.type=10 THEN
+ price*(1-discountpercent)* (-qty)
+ ELSE 0 END) as netsalesvalue,
+ SUM((standardcost * -qty)) as cost
+ FROM stockmoves INNER JOIN stockmaster
+ ON stockmoves.stockid=stockmaster.stockid
+ INNER JOIN stockcategory
+ ON stockmaster.categoryid=stockcategory.categoryid
+ WHERE (stockmoves.type=10 or stockmoves.type=11)
+ AND show_on_inv_crds =1
+ AND trandate>='" . $FromDate . "'
+ AND trandate<='" . $ToDate . "'
+ GROUP BY stockmaster.stockid,
+ stockmaster.description,
+ stockcategory.categorydescription ";
+
+ if ($_POST['OrderBy']=='NetSales'){
+ $sql .= " ORDER BY netsalesvalue DESC ";
+ } else {
+ $sql .= " ORDER BY salesquantity DESC ";
+ }
+ if (is_numeric($_POST['NoToDisplay'])){
+ if ($_POST['NoToDisplay'] > 0){
+ $sql .= " LIMIT " . $_POST['NoToDisplay'];
+ }
+ }
+
+ $ErrMsg = _('The sales data could not be retrieved because') . ' - ' . DB_error_msg($db);
+ $SalesResult = DB_query($sql,$db,$ErrMsg);
+
+
+ echo '<table cellpadding=2 class="selection">';
+
+ echo'<tr>
+ <th>' . _('Rank') . '</th>
+ <th>' . _('Item') . '</th>
+ <th>' . _('Category') . '</th>
+ <th>' . _('Sales Value') . '</th>
+ <th>' . _('Refunds') . '</th>
+ <th>' . _('Net Sales') . '</th>
+ <th>' . _('Sales') .'<br />' . _('Quantity') . '</th>
+ </tr>';
+
+ $CumulativeTotalSales = 0;
+ $CumulativeTotalRefunds = 0;
+ $CumulativeTotalNetSales = 0;
+ $CumulativeTotalQuantity = 0;
+ $i=1;
+ $k=0;
+ while ($SalesRow=DB_fetch_array($SalesResult)) {
+ if ($k==1){
+ echo '<tr class="EvenTableRows">';
+ $k=0;
+ } else {
+ echo '<tr class="OddTableRows">';
+ $k=1;
+ }
+
+ echo '<td>' . $i . '</td>
+ <td>' . $SalesRow['stockid'] . ' - ' . $SalesRow['description'] . '</td>
+ <td>' . $SalesRow['categorydescription'] . '</td>
+ <td class="number">' . number_format($SalesRow['salesvalue'],2) . '</td>
+ <td class="number">' . number_format($SalesRow['returnvalue'],2) . '</td>
+ <td class="number">' . number_format($SalesRow['netsalesvalue'],2) . '</td>
+ <td class="number">' . $SalesRow['salesquantity'] . '</td>
+ </tr>';
+ $i++;
+
+ $CumulativeTotalSales += $SalesRow['salesvalue'];
+ $CumulativeTotalRefunds += $SalesRow['returnvalue'];
+ $CumulativeTotalNetSales += ($SalesRow['salesvalue']+$SalesRow['returnvalue']);
+ $CumulativeTotalQuantity += $SalesRow['salesquantity'];
+
+ } //loop around category sales for the period
+
+ if ($k==1){
+ echo '<tr class="EvenTableRows"><td colspan="8"><hr></td></tr>';
+ echo '<tr class="OddTableRows">';
+ } else {
+ echo '<tr class="OddTableRows"><td colspan="8"><hr></td></tr>';
+ echo '<tr class="EvenTableRows">';
+ }
+ echo '<td class="number" colspan=3>' . _('GRAND Total') . '</td>
+ <td class="number">' . number_format($CumulativeTotalSales,2) . '</td>
+ <td class="number">' . number_format($CumulativeTotalRefunds,2) . '</td>
+ <td class="number">' . number_format($CumulativeTotalNetSales,2) . '</td>
+ <td class="number">' . $CumulativeTotalQuantity . '</td>
+ </tr>';
+
+ echo '</table>';
+
+} //end of if user hit show sales
+include('includes/footer.inc');
+?>
\ No newline at end of file
Modified: trunk/UpgradeDatabase.php
===================================================================
--- trunk/UpgradeDatabase.php 2011-05-23 10:20:46 UTC (rev 4573)
+++ trunk/UpgradeDatabase.php 2011-05-25 10:30:45 UTC (rev 4574)
@@ -109,7 +109,9 @@
case '4.03RC2':
case '4.03':
case '4.03.2':
+ case '4.03.3':
case '4.03.5':
+ case '4.03.6':
case '4.03.7':
$SQLScripts[] = './sql/mysql/upgrade3.11.1-4.00.sql';
case '4.03.8':
Modified: trunk/build/make_release.sh
===================================================================
--- trunk/build/make_release.sh 2011-05-23 10:20:46 UTC (rev 4573)
+++ trunk/build/make_release.sh 2011-05-25 10:30:45 UTC (rev 4574)
@@ -67,6 +67,8 @@
msgfmt -o locale/zh_HK.utf8/LC_MESSAGES/messages.mo locale/zh_HK.utf8/LC_MESSAGES/messages.po
msgfmt -o locale/vi_VN.utf8/LC_MESSAGES/messages.mo locale/vi_VN.utf8/LC_MESSAGES/messages.po
+mysql -u$MYSQL_USER -p$MYSQL_PWD < $BASE_DIR/build/TruncateAuditTrail.sql
+
echo "SET FOREIGN_KEY_CHECKS = 0;" > $BASE_DIR/sql/mysql/weberp-new.sql
mysqldump -u$MYSQL_USER -p$MYSQL_PWD --skip-opt --create-options --skip-set-charset --ignore-table=weberpdemo.mrpsupplies --ignore-table=weberpdemo.mrpplanedorders --ignore-table=weberpdemo.mrpparameters --ignore-table=weberpdemo.levels --ignore-table=weberpdemo.mrprequirements --ignore-table=weberpdemo.audittrail --no-data weberpdemo >> $BASE_DIR/sql/mysql/weberp-new.sql
@@ -118,7 +120,6 @@
echo "UPDATE systypes SET typeno=0;" >> $BASE_DIR/sql/mysql/weberp-new.sql
echo "INSERT INTO shippers VALUES (1,'Default Shipper',0);" >> $BASE_DIR/sql/mysql/weberp-new.sql
echo "UPDATE config SET confvalue='1' WHERE confname='Default_Shipper';" >> $BASE_DIR/sql/mysql/weberp-new.sql
-echo "TRUNCATE TABLE audittrail;" >> $BASE_DIR/sql/mysql/weberp-demo.sql
echo "SET FOREIGN_KEY_CHECKS = 1;" >> $BASE_DIR/sql/mysql/weberp-demo.sql
rm $OUTPUT_DIR/webERP.zip
Modified: trunk/config.distrib.php
===================================================================
--- trunk/config.distrib.php 2011-05-23 10:20:46 UTC (rev 4573)
+++ trunk/config.distrib.php 2011-05-25 10:30:45 UTC (rev 4574)
@@ -18,7 +18,7 @@
// The timezone of the business - this allows the possibility of having
// the web-server on a overseas machine but record local time
// this is not necessary if you have your own server locally
-// putenv('TZ=Europe/London');
+putenv('TZ=Europe/London');
// putenv('TZ=Australia/Melbourne');
// putenv('TZ=Australia/Sydney');
// putenv('TZ=Pacific/Auckland');
@@ -86,8 +86,8 @@
if ($rootpath == "/" OR $rootpath == "\\") {
$rootpath = "";
}
-//$rootpath = '/web-erp';
+
/* Report all errors except E_NOTICE
This is the default value set in php.ini for most installations but just to be sure it is forced here
turning on NOTICES destroys things */
@@ -95,4 +95,4 @@
error_reporting (E_ALL && ~E_NOTICE);
/*Make sure there is nothing - not even spaces after this last ?> */
-?>
+?>
\ No newline at end of file
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-05-23 10:20:46 UTC (rev 4573)
+++ trunk/doc/Change.log 2011-05-25 10:30:45 UTC (rev 4574)
@@ -1,5 +1,7 @@
webERP Change Log
+25/5/11 New Sales Inquiry scripts by sales type/price list by category and top sellers
+24/5/11 Updated from launchpad translations those that had changed from 18/4/11 including Viatnamese, Albanian, Russian, Spanish
23/5/11 Tim: Remove SystemCheck.php and code standards changes(launchpad 4711-4718)
23/5/11 Tim: Make link from SelectProduct.php to place purchase orders factor in the lead time into the delivery date in the purchase order (launchpad 4710)
23/5/11 Exson: fix PaymentMethods could not add new - comma missing in INSERT SQL
Modified: trunk/doc/Manual/ManualContents.php
===================================================================
--- trunk/doc/Manual/ManualContents.php 2011-05-23 10:20:46 UTC (rev 4573)
+++ trunk/doc/Manual/ManualContents.php 2011-05-25 10:30:45 UTC (rev 4574)
@@ -21,7 +21,7 @@
-->';*/
$PathPrefix='../../';
-include($PathPrefix.'includes/session.inc');
+//include($PathPrefix.'includes/session.inc');
include('ManualHeader.html');
?>
Modified: trunk/index.php
===================================================================
--- trunk/index.php 2011-05-23 10:20:46 UTC (rev 4573)
+++ trunk/index.php 2011-05-25 10:30:45 UTC (rev 4574)
@@ -188,6 +188,22 @@
</tr>
<tr>
<td class="menu_group_item">
+ <?php echo '<p>• <a href="' . $rootpath . '/SalesByTypePeriodInquiry.php">' . _('Sales By Sales Type Inquiry') . '</a></p>'; ?>
+ </td>
+ </tr>
+ <tr>
+ <td class="menu_group_item">
+ <?php echo '<p>• <a href="' . $rootpath . '/SalesCategoryPeriodInquiry.php">' . _('Sales By Category Inquiry') . '</a></p>'; ?>
+ </td>
+ </tr>
+ <tr>
+ <td class="menu_group_item">
+ <?php echo '<p>• <a href="' . $rootpath . '/SalesTopItemsInquiry.php">' . _('Top Sellers Inquiry') . '</a></p>'; ?>
+ </td>
+ </tr>
+
+ <tr>
+ <td class="menu_group_item">
<?php echo '<p>• <a href="' . $rootpath . '/PDFDeliveryDifferences.php">' . _('Order Delivery Differences Report') . '</a></p>'; ?>
</td>
</tr>
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-05-23 10:20:46 UTC (rev 4573)
+++ trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po 2011-05-25 10:30:45 UTC (rev 4574)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: webERP 3.08\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-29 20:59+1200\n"
+"POT-Creation-Date: 2011-05-24 21:53+1200\n"
"PO-Revision-Date: 2011-02-07 15:33+0000\n"
"Last-Translator: Tim Schofield <Unknown>\n"
"Language-Team: Czech <cs...@li...>\n"
@@ -21,7 +21,7 @@
"X-Poedit-Language: Czech\n"
"X-Poedit-SourceCharset: utf-8\n"
-#: AccountGroups.php:7 index.php:1275
+#: AccountGroups.php:7 index.php:1280
msgid "Account Groups"
msgstr "Účetní skupiny"
@@ -58,8 +58,8 @@
msgid "The account group name cannot contain the character"
msgstr "Název účetní skupiny nemůže obsahovat znak"
-#: AccountGroups.php:69 AccountSections.php:75 TaxCategories.php:33
-#: TaxProvinces.php:30 UnitsOfMeasure.php:30
+#: AccountGroups.php:69 TaxCategories.php:31 TaxProvinces.php:30
+#: UnitsOfMeasure.php:30
msgid "or the character"
msgstr "nebo znak"
@@ -101,7 +101,7 @@
msgid "The SQL that was used to update the account group was"
msgstr "SQL, který byl použit k aktualizaci účtu skupina byla"
-#: AccountGroups.php:137 AccountSections.php:106 PaymentMethods.php:90
+#: AccountGroups.php:137 AccountSections.php:104 PaymentMethods.php:82
msgid "Record Updated"
msgstr "Záznam aktualizován"
@@ -113,7 +113,7 @@
msgid "The SQL that was used to insert the account group was"
msgstr "SQL, který byl použit pro vložení na účet skupina byla"
-#: AccountGroups.php:157 AccountSections.php:118 PaymentMethods.php:114
+#: AccountGroups.php:157 AccountSections.php:116 PaymentMethods.php:106
msgid "Record inserted"
msgstr "Záznam vložen"
@@ -129,24 +129,24 @@
"Nelze smazat tento účet skupiny, protože účtů hlavní knihy byly vytvořeny "
"pomocí této skupině"
-#: AccountGroups.php:180 AccountGroups.php:190 AccountSections.php:139
-#: Areas.php:117 Areas.php:126 BankAccounts.php:163 CreditStatus.php:126
-#: Currencies.php:144 Currencies.php:152 Currencies.php:159
+#: AccountGroups.php:180 AccountGroups.php:190 AccountSections.php:137
+#: Areas.php:116 Areas.php:125 BankAccounts.php:157 CreditStatus.php:125
+#: Currencies.php:143 Currencies.php:151 Currencies.php:158
#: CustomerBranches.php:286 CustomerBranches.php:296 CustomerBranches.php:306
#: CustomerBranches.php:316 Customers.php:311 Customers.php:320
#: Customers.php:328 Customers.php:336 CustomerTypes.php:147
-#: CustomerTypes.php:157 Factors.php:136 FixedAssetCategories.php:131
+#: CustomerTypes.php:157 Factors.php:134 FixedAssetCategories.php:130
#: GLAccounts.php:80 GLAccounts.php:94 Locations.php:244 Locations.php:252
#: Locations.php:261 Locations.php:269 Locations.php:277 Locations.php:285
#: Locations.php:293 Locations.php:301 MRPDemandTypes.php:87
-#: PaymentMethods.php:148 PaymentTerms.php:147 PaymentTerms.php:154
-#: PcExpenses.php:128 SalesCategories.php:127 SalesCategories.php:135
-#: SalesPeople.php:144 SalesPeople.php:151 SalesTypes.php:147
-#: SalesTypes.php:157 Shippers.php:82 Shippers.php:94 StockCategories.php:179
+#: PaymentMethods.php:140 PaymentTerms.php:147 PaymentTerms.php:154
+#: PcExpenses.php:152 SalesCategories.php:125 SalesCategories.php:133
+#: SalesPeople.php:144 SalesPeople.php:151 SalesTypes.php:145
+#: SalesTypes.php:155 Shippers.php:82 Shippers.php:94 StockCategories.php:179
#: Stocks.php:475 Stocks.php:484 Stocks.php:492 Stocks.php:500 Stocks.php:508
#: Stocks.php:516 Suppliers.php:609 Suppliers.php:618 Suppliers.php:626
-#: SupplierTypes.php:145 TaxCategories.php:133 TaxGroups.php:127
-#: TaxGroups.php:134 TaxProvinces.php:125 UnitsOfMeasure.php:137
+#: SupplierTypes.php:145 TaxCategories.php:131 TaxGroups.php:127
+#: TaxGroups.php:134 TaxProvinces.php:125 UnitsOfMeasure.php:138
#: WorkCentres.php:89 WorkCentres.php:95 WWW_Access.php:83
msgid "There are"
msgstr "Jsou zde"
@@ -192,35 +192,36 @@
msgid "Could not get account groups because"
msgstr "Nemohu získat účetní sk...
[truncated message content] |
|
From: <dai...@us...> - 2011-05-26 10:47:16
|
Revision: 4575
http://web-erp.svn.sourceforge.net/web-erp/?rev=4575&view=rev
Author: daintree
Date: 2011-05-26 10:47:06 +0000 (Thu, 26 May 2011)
Log Message:
-----------
pre 4.04 release
Modified Paths:
--------------
trunk/CustomerReceipt.php
trunk/SelectProduct.php
trunk/doc/Change.log
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
Modified: trunk/CustomerReceipt.php
===================================================================
--- trunk/CustomerReceipt.php 2011-05-25 10:30:45 UTC (rev 4574)
+++ trunk/CustomerReceipt.php 2011-05-26 10:47:06 UTC (rev 4575)
@@ -209,7 +209,7 @@
}
/*Make an array of the defined bank accounts */
- $SQL = 'SELECT accountcode FROM bankaccounts';
+ $SQL = "SELECT accountcode FROM bankaccounts";
$result = DB_query($SQL,$db);
$BankAccounts = array();
$i=0;
@@ -819,7 +819,7 @@
if (isset($_POST['ReceiptType']) and $_POST['ReceiptType']==$RcptType){
echo '<option selected value="' . $RcptType . '">' . $RcptType .'</option>';
} else {
- echo '<option Value="' .$RcptType . '">' . $RcptType .'</option>';
+ echo '<option value="' .$RcptType . '">' . $RcptType .'</option>';
}
}
echo '</select></td></tr>';
@@ -916,7 +916,7 @@
</tr>
</table><br>';
- echo '<table class=selection>';
+ echo '<table class="selection">';
$DisplayDiscountPercent = number_format($_SESSION['CustomerRecord']['pymtdiscount']*100,2) . '%';
@@ -933,10 +933,10 @@
//Select the tag
echo '<tr><td>' . _('Select Tag') . ':</td><td><select name="tag">';
- $SQL = 'SELECT tagref,
+ $SQL = "SELECT tagref,
tagdescription
FROM tags
- ORDER BY tagref';
+ ORDER BY tagref";
$result=DB_query($SQL,$db);
echo '<option value=0></option>';
@@ -1069,11 +1069,11 @@
echo '</table>';
} //end if results to show
- if (isset($_SESSION['ReceiptBatch']->Items) and count($_SESSION['ReceiptBatch']->Items) > 0){
- echo '<div class="centre"><br/><input tabindex="13" type="submit" name="CommitBatch" VALUE="' . _('Accept and Process Batch') . '"></div>';
- }
+
}
-
+if (isset($_SESSION['ReceiptBatch']->Items) and count($_SESSION['ReceiptBatch']->Items) > 0){
+ echo '<div class="centre"><br/><input tabindex="13" type="submit" name="CommitBatch" value="' . _('Accept and Process Batch') . '"></div>';
+}
echo '</form>';
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/SelectProduct.php
===================================================================
--- trunk/SelectProduct.php 2011-05-25 10:30:45 UTC (rev 4574)
+++ trunk/SelectProduct.php 2011-05-26 10:47:06 UTC (rev 4575)
@@ -1,7 +1,9 @@
<?php
/* $Id$*/
-$PricesSecurity = 12;
+$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
+
include ('includes/session.inc');
$title = _('Search Inventory Items');
include ('includes/header.inc');
@@ -332,7 +334,10 @@
<td width="17%" class="select">' . $QOO . '</td></tr>
</table>'; //end of nested table
echo '</td>'; //end cell of master table
-if ($myrow['mbflag'] == 'B' or ($myrow['mbflag'] == 'M')) {
+
+if (($myrow['mbflag'] == 'B' OR ($myrow['mbflag'] == 'M'))
+ AND (in_array($SuppliersSecurity, $_SESSION['AllowedPageSecurityTokens']))){
+
echo '<td width="50%" valign="top"><table>
<tr><th width="50%">' . _('Supplier') . '</th>
<th width="15%">' . _('Cost') . '</th>
@@ -410,21 +415,9 @@
if ($Its_A_Kitset_Assembly_Or_Dummy == False) {
echo '<a href="' . $rootpath . '/StockAdjustments.php?StockID=' . $StockID . '">' . _('Quantity Adjustments') . '</a><br />';
echo '<a href="' . $rootpath . '/StockTransfers.php?StockID=' . $StockID . '">' . _('Location Transfers') . '</a><br />';
-
- if (function_exists('imagecreatefrompng')){
- $StockImgLink = '
- GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC'.
- '&StockID='.urlencode($StockID).
- '&text='.
- '&width=200'.
- '&height=200'.
- ' ';
- } else {
- if( isset($StockID) and file_exists($_SESSION['part_pics_dir'] . '/' .$StockID.'.jpg') ) {
- $StockImgLink = ' ' . $_SESSION['part_pics_dir'] . '/' .$StockID.'.jpg ';
- } else {
- $StockImgLink = _('No Image');
- }
+ //show the item image if it has been uploaded
+ if( isset($StockID) and file_exists($_SESSION['part_pics_dir'] . '/' .$StockID.'.jpg') ) {
+ echo '<div class="centre"><img src="' . $_SERVER['HTTP_SCHEME'] .'://'. $_SERVER['HTTP_HOST'] . $rootpath . '/' . $_SESSION['part_pics_dir'] . '/' .$StockID.'.jpg ' . '" ></div>';
}
if ($myrow['mbflag'] == 'B') {
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-05-25 10:30:45 UTC (rev 4574)
+++ trunk/doc/Change.log 2011-05-26 10:47:06 UTC (rev 4575)
@@ -1,5 +1,9 @@
webERP Change Log
+26/5/11 Version 4.04 Release
+
+26/5/11 Ricard: require securitytoken 9 to allow user to see purchasing data in SelectProduct.php
+26/5/11 SelectProduct.php fix item image display in centre under item transactions
25/5/11 New Sales Inquiry scripts by sales type/price list by category and top sellers
24/5/11 Updated from launchpad translations those that had changed from 18/4/11 including Viatnamese, Albanian, Russian, Spanish
23/5/11 Tim: Remove SystemCheck.php and code standards changes(launchpad 4711-4718)
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-05-25 10:30:45 UTC (rev 4574)
+++ trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po 2011-05-26 10:47:06 UTC (rev 4575)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: webERP 3.08\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-24 21:53+1200\n"
+"POT-Creation-Date: 2011-05-26 22:38+1200\n"
"PO-Revision-Date: 2011-02-07 15:33+0000\n"
"Last-Translator: Tim Schofield <Unknown>\n"
"Language-Team: Czech <cs...@li...>\n"
@@ -21,7 +21,7 @@
"X-Poedit-Language: Czech\n"
"X-Poedit-SourceCharset: utf-8\n"
-#: AccountGroups.php:7 index.php:1280
+#: AccountGroups.php:7 index.php:1296
msgid "Account Groups"
msgstr "Účetní skupiny"
@@ -221,7 +221,7 @@
#: SelectCompletedOrder.php:11 SelectContract.php:81 SelectCreditItems.php:202
#: SelectCreditItems.php:270 SelectCustomer.php:323 SelectGLAccount.php:19
#: SelectGLAccount.php:79 SelectOrderItems.php:617 SelectOrderItems.php:1443
-#: SelectOrderItems.php:1563 SelectProduct.php:493 SelectSalesOrder.php:458
+#: SelectOrderItems.php:1563 SelectProduct.php:486 SelectSalesOrder.php:458
#: SelectSupplier.php:9 SelectSupplier.php:192 SelectWorkOrder.php:9
#: SelectWorkOrder.php:145 ShipmentCosting.php:11 Shipments.php:17
#: Shippers.php:123 Shippers.php:159 Shipt_Select.php:8
@@ -279,7 +279,7 @@
#: SalesAnalReptCols.php:279 SalesAnalReptCols.php:401
#: SalesAnalReptCols.php:404 SalesAnalRepts.php:404 SalesAnalRepts.php:407
#: SalesAnalRepts.php:430 SalesAnalRepts.php:433 SalesAnalRepts.php:456
-#: SalesAnalRepts.php:459 SelectProduct.php:369 ShipmentCosting.php:627
+#: SalesAnalRepts.php:459 SelectProduct.php:374 ShipmentCosting.php:627
#: Stocks.php:878 Stocks.php:880 Stocks.php:898 Stocks.php:900
#: SuppContractChgs.php:83 SuppLoginSetup.php:508 SuppLoginSetup.php:510
#: SystemParameters.php:376 SystemParameters.php:399 SystemParameters.php:415
@@ -315,7 +315,7 @@
#: SalesAnalReptCols.php:277 SalesAnalReptCols.php:402
#: SalesAnalReptCols.php:405 SalesAnalRepts.php:403 SalesAnalRepts.php:406
#: SalesAnalRepts.php:429 SalesAnalRepts.php:432 SalesAnalRepts.php:455
-#: SalesAnalRepts.php:458 SelectProduct.php:371 ShipmentCosting.php:628
+#: SalesAnalRepts.php:458 SelectProduct.php:376 ShipmentCosting.php:628
#: Stocks.php:873 Stocks.php:875 Stocks.php:893 Stocks.php:895
#: SuppContractChgs.php:85 SuppLoginSetup.php:507 SuppLoginSetup.php:511
#: SystemParameters.php:377 SystemParameters.php:400 SystemParameters.php:416
@@ -446,7 +446,7 @@
msgid "Enter Information"
msgstr "Vložit informace"
-#: AccountSections.php:7 index.php:1285
+#: AccountSections.php:7 index.php:1301
msgid "Account Sections"
msgstr "Sekce účtu"
@@ -664,9 +664,9 @@
msgstr "Datum"
#: AddCustomerNotes.php:107 AddCustomerTypeNotes.php:105 PcReportTab.php:173
-#: Stocks.php:882 UpgradeDatabase.php:163 UpgradeDatabase.php:166
-#: UpgradeDatabase.php:169 UpgradeDatabase.php:172 UpgradeDatabase.php:175
-#: UpgradeDatabase.php:178 UpgradeDatabase.php:181 UpgradeDatabase.php:184
+#: Stocks.php:882 UpgradeDatabase.php:165 UpgradeDatabase.php:168
+#: UpgradeDatabase.php:171 UpgradeDatabase.php:174 UpgradeDatabase.php:177
+#: UpgradeDatabase.php:180 UpgradeDatabase.php:183 UpgradeDatabase.php:186
#: 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
@@ -766,7 +766,7 @@
#: PDFCustomerList.php:18 PDFCustomerList.php:230 PDFCustomerList.php:242
#: PDFLowGP.php:20 PDFStockCheckComparison.php:35
#: PDFStockCheckComparison.php:61 PDFStockCheckComparison.php:262
-#: ReorderLevel.php:57 SelectAsset.php:37 SelectProduct.php:37
+#: ReorderLevel.php:57 SelectAsset.php:37 SelectProduct.php:39
#: StockCheck.php:65 StockCheck.php:139 SupplierTenders.php:326
#: SuppPriceList.php:118 includes/PDFPaymentRun_PymtFooter.php:149
msgid "Problem Report"
@@ -1116,8 +1116,8 @@
#: ReorderLevel.php:207 SalesGraph.php:91 SalesGraph.php:93 SalesGraph.php:111
#: SalesGraph.php:113 SalesGraph.php:134 SalesGraph.php:136 SalesGraph.php:168
#: SalesInquiry.php:1054 SalesInquiry.php:1093 SelectCreditItems.php:923
-#: SelectOrderItems.php:1569 SelectOrderItems.php:1572 SelectProduct.php:501
-#: SelectProduct.php:503 StockDispatch.php:282 StockDispatch.php:284
+#: SelectOrderItems.php:1569 SelectOrderItems.php:1572 SelectProduct.php:494
+#: SelectProduct.php:496 StockDispatch.php:282 StockDispatch.php:284
#: StockLocStatus.php:67 StockLocStatus.php:69 StockLocStatus.php:87
#: StockLocStatus.php:91 StockLocStatus.php:95 StockQuantityByDate.php:21
#: SupplierTenders.php:338 SupplierTenders.php:340 SystemParameters.php:920
@@ -1134,7 +1134,7 @@
msgstr "Tabulka "
#: AuditTrail.php:67 MRPReport.php:768 PO_SelectPurchOrder.php:391
-#: SelectContract.php:196 SelectProduct.php:747
+#: SelectContract.php:196 SelectProduct.php:740
msgid "View"
msgstr "Zobrazit"
@@ -1151,15 +1151,14 @@
#: CustomerTransInquiry.php:21 CustomerTransInquiry.php:85
#: CustWhereAlloc.php:17 CustWhereAlloc.php:88 DailyBankTransactions.php:104
#: GLAccountInquiry.php:152 GLAccountReportphp:155 GLAccountReport.php:367
-#: GLJournal.php:240 MRPReschedules.php:178 Nasser_SalesInquiry.php:328
-#: SelectCustomer.php:462 ShipmentCosting.php:506 ShipmentCosting.php:577
-#: StockCategories.php:215 StockLocMovements.php:81 StockMovements.php:90
-#: SupplierAllocations.php:452 SupplierInquiry.php:199
-#: SupplierTransInquiry.php:19 SupplierTransInquiry.php:86
-#: Z_CheckAllocationsFrom.php:26 Z_CheckAllocationsFrom.php:49
-#: Z_CheckAllocs.php:57 Z_CheckGLTransBalance.php:11
-#: includes/InputSerialItemsFile.php:86 includes/InputSerialItemsFile.php:126
-#: includes/PDFTaxPageHeader.inc:34
+#: GLJournal.php:240 MRPReschedules.php:178 SelectCustomer.php:462
+#: ShipmentCosting.php:506 ShipmentCosting.php:577 StockCategories.php:215
+#: StockLocMovements.php:81 StockMovements.php:90 SupplierAllocations.php:452
+#: SupplierInquiry.php:199 SupplierTransInquiry.php:19
+#: SupplierTransInquiry.php:86 Z_CheckAllocationsFrom.php:26
+#: Z_CheckAllocationsFrom.php:49 Z_CheckAllocs.php:57
+#: Z_CheckGLTransBalance.php:11 includes/InputSerialItemsFile.php:86
+#: includes/InputSerialItemsFile.php:126 includes/PDFTaxPageHeader.inc:34
msgid "Type"
msgstr "Typ"
@@ -1172,7 +1171,7 @@
msgid "Field Name"
msgstr "Název pole"
-#: AuditTrail.php:149 Nasser_SupplierWise.php:176 SystemParameters.php:314
+#: AuditTrail.php:149 SystemParameters.php:314
#: includes/PDFOstdgGRNsPageHeader.inc:43
msgid "Value"
msgstr "Hodnota"
@@ -1791,29 +1790,27 @@
#: InventoryPlanningPrefSupplier.php:83 InventoryQuantities.php:223
#: MRPDemands.php:291 MRPDemands.php:381 MRPPlannedPurchaseOrders.php:326
#: MRPPlannedWorkOrders.php:259 MRPPlannedWorkOrders.php:387 MRPReport.php:413
-#: MRPReport.php:419 MRPReschedules.php:179 Nasser_SupplierWise.php:172
-#: Nasser_SupplierWise.php:173 Nasser_TopSalesInquiry.php:223
-#: OffersReceived.php:95 OffersReceived.php:197 OffersReceived.php:244
-#: OrderDetails.php:155 PDFOrdersInvoiced.php:384 POReport.php:743
-#: POReport.php:1428 PrintCustTrans.php:801 PrintCustTrans.php:889
-#: PrintCustTrans.php:936 PrintCustTransPortrait.php:857
-#: PrintCustTransPortrait.php:940 PrintCustTransPortrait.php:984
-#: RecurringSalesOrders.php:321 ReorderLevel.php:256 ReverseGRN.php:379
-#: ReverseGRN.php:380 SalesAnalReptCols.php:18 SalesAnalReptCols.php:20
-#: SalesGraph.php:177 SalesGraph.php:258 SalesInquiry.php:966
-#: SelectCreditItems.php:651 SelectCreditItems.php:1004
-#: SelectOrderItems.php:1305 SelectOrderItems.php:1454
-#: SelectOrderItems.php:1634 SelectOrderItems.php:1758 ShipmentCosting.php:144
-#: ShipmentCosting.php:145 Shipments.php:385 Shipments.php:387
-#: Shipments.php:388 Shipments.php:463 Shipments.php:465 SpecialOrder.php:542
-#: StockCounts.php:98 StockLocMovements.php:85 StockLocTransfer.php:179
-#: StockMovements.php:95 StockStatus.php:312 StockUsageGraph.php:12
-#: SuppCreditGRNs.php:227 SuppCreditGRNs.php:228 SupplierCredit.php:313
-#: SupplierTenders.php:265 SupplierTenders.php:493 WOSerialNos.php:249
-#: WOSerialNos.php:282 includes/InputSerialItems.php:104
-#: includes/InputSerialItems.php:110 includes/OutputSerialItems.php:39
-#: includes/OutputSerialItems.php:44 includes/OutputSerialItems.php:50
-#: includes/PDFBOMListingPageHeader.inc:44
+#: MRPReport.php:419 MRPReschedules.php:179 OffersReceived.php:95
+#: OffersReceived.php:197 OffersReceived.php:244 OrderDetails.php:155
+#: PDFOrdersInvoiced.php:384 POReport.php:743 POReport.php:1428
+#: PrintCustTrans.php:801 PrintCustTrans.php:889 PrintCustTrans.php:936
+#: PrintCustTransPortrait.php:857 PrintCustTransPortrait.php:940
+#: PrintCustTransPortrait.php:984 RecurringSalesOrders.php:321
+#: ReorderLevel.php:256 ReverseGRN.php:379 ReverseGRN.php:380
+#: SalesAnalReptCols.php:18 SalesAnalReptCols.php:20 SalesGraph.php:177
+#: SalesGraph.php:258 SalesInquiry.php:966 SelectCreditItems.php:651
+#: SelectCreditItems.php:1004 SelectOrderItems.php:1305
+#: SelectOrderItems.php:1454 SelectOrderItems.php:1634
+#: SelectOrderItems.php:1758 ShipmentCosting.php:144 ShipmentCosting.php:145
+#: Shipments.php:385 Shipments.php:387 Shipments.php:388 Shipments.php:463
+#: Shipments.php:465 SpecialOrder.php:542 StockCounts.php:98
+#: StockLocMovements.php:85 StockLocTransfer.php:179 StockMovements.php:95
+#: StockStatus.php:312 StockUsageGraph.php:12 SuppCreditGRNs.php:227
+#: SuppCreditGRNs.php:228 SupplierCredit.php:313 SupplierTenders.php:265
+#: SupplierTenders.php:493 WOSerialNos.php:249 WOSerialNos.php:282
+#: includes/InputSerialItems.php:104 includes/InputSerialItems.php:110
+#: includes/OutputSerialItems.php:39 includes/OutputSerialItems.php:44
+#: includes/OutputSerialItems.php:50 includes/PDFBOMListingPageHeader.inc:44
#: includes/PDFDeliveryDifferencesPageHeader.inc:43
#: includes/PDFDIFOTPageHeader.inc:42
#: includes/PDFInventoryValnPageHeader.inc:33
@@ -2062,7 +2059,7 @@
#: SecurityTokens.php:92 SecurityTokens.php:102 SelectAsset.php:243
#: SelectCompletedOrder.php:536 SelectContract.php:156
#: SelectCreditItems.php:957 SelectOrderItems.php:1448
-#: SelectOrderItems.php:1628 SelectProduct.php:513 SelectProduct.php:718
+#: SelectOrderItems.php:1628 SelectProduct.php:506 SelectProduct.php:711
#: SelectSalesOrder.php:498 SelectWorkOrder.php:183 Shipt_Select.php:180
#: StockCategories.php:214 StockDispatch.php:356 StockDispatch.php:363
#: StockLocStatus.php:154 StockQuantityByDate.php:96 SuppCreditGRNs.php:74
@@ -2169,7 +2166,7 @@
#: SelectCreditItems.php:942 SelectCustomer.php:331 SelectCustomer.php:337
#: SelectCustomer.php:344 SelectCustomer.php:351 SelectCustomer.php:395
#: SelectGLAccount.php:92 SelectOrderItems.php:627 SelectOrderItems.php:630
-#: SelectOrderItems.php:1597 SelectProduct.php:520 SelectSalesOrder.php:486
+#: SelectOrderItems.php:1597 SelectProduct.php:513 SelectSalesOrder.php:486
#: SelectSupplier.php:200 SelectWorkOrder.php:171 Shipt_Select.php:166
#: SuppFixedAssetChgs.php:116 SupplierTenders.php:359 WorkOrderEntry.php:582
#: WorkOrderIssue.php:646
@@ -2184,7 +2181,7 @@
#: BOMInquiry.php:25 BOMs.php:802 MRPDemands.php:331 MRPReport.php:542
#: PO_SelectOSPurchOrder.php:199 PO_SelectPurchOrder.php:170
-#: SalesCategories.php:422 SelectProduct.php:520 Shipt_Select.php:166
+#: SalesCategories.php:422 SelectProduct.php:513 Shipt_Select.php:166
#: StockAdjustments.php:69 StockAdjustments.php:324 StockCounts.php:97
#: StockCounts.php:132 StockMovements.php:31 StockReorderLevel.php:44
#: StockStatus.php:61 StockTransfers.php:38 StockTransfers.php:445
@@ -2199,7 +2196,7 @@
#: MRPDemands.php:335 MRPReport.php:550 PO_Header.php:532 PO_Items.php:911
#: SelectAsset.php:102 SelectCreditItems.php:213 SelectCreditItems.php:947
#: SelectCustomer.php:418 SelectGLAccount.php:98 SelectOrderItems.php:635
-#: SelectOrderItems.php:1604 SelectProduct.php:528 SelectSupplier.php:208
+#: SelectOrderItems.php:1604 SelectProduct.php:521 SelectSupplier.php:208
#: SelectSupplier.php:241 SupplierTenders.php:367 WorkOrderEntry.php:586
#: WorkOrderIssue.php:650
msgid "Search Now"
@@ -2208,7 +2205,7 @@
#: BOMInquiry.php:36 BOMs.php:735 ContractBOM.php:49 MRPDemands.php:56
#: MRPReport.php:568 PO_Items.php:745 PO_SelectOSPurchOrder.php:61
#: PO_SelectPurchOrder.php:43 SelectCompletedOrder.php:92
-#: SelectCreditItems.php:276 SelectProduct.php:541 SelectSalesOrder.php:348
+#: SelectCreditItems.php:276 SelectProduct.php:534 SelectSalesOrder.php:348
#: SelectWorkOrder.php:33 Shipt_Select.php:60 SupplierTenders.php:379
#: WorkOrderEntry.php:62 WorkOrderIssue.php:378
msgid ""
@@ -2241,7 +2238,7 @@
#: ReorderLevelLocation.php:203 SalesPeople.php:184
#: SelectCompletedOrder.php:535 SelectCreditItems.php:220
#: SelectCreditItems.php:956 SelectCustomer.php:458 SelectGLAccount.php:105
-#: SelectOrderItems.php:1447 SelectOrderItems.php:1627 SelectProduct.php:717
+#: SelectOrderItems.php:1447 SelectOrderItems.php:1627 SelectProduct.php:710
#: SelectSalesOrder.php:497 SelectSupplier.php:245 SelectWorkOrder.php:182
#: Shipt_Select.php:179 SpecialOrder.php:132 SupplierTenders.php:489
#: SuppPriceList.php:272 TopItems.php:162 WorkOrderEntry.php:597
@@ -2256,8 +2253,8 @@
#: MRPReport.php:741 OffersReceived.php:96 PO_Items.php:927
#: PO_SelectOSPurchOrder.php:213 PO_SelectPurchOrder.php:181
#: SelectCompletedOrder.php:540 SelectCreditItems.php:958
-#: SelectOrderItems.php:1449 SelectOrderItems.php:1629 SelectProduct.php:110
-#: SelectProduct.php:720 SelectSalesOrder.php:500 SelectWorkOrder.php:185
+#: SelectOrderItems.php:1449 SelectOrderItems.php:1629 SelectProduct.php:112
+#: SelectProduct.php:713 SelectSalesOrder.php:500 SelectWorkOrder.php:185
#: Shipments.php:386 Shipments.php:464 Shipt_Select.php:183
#: StockLocTransferReceive.php:435 SupplierTenders.php:491 TopItems.php:165
#: WorkOrderCosting.php:84 WorkOrderEntry.php:599 WorkOrderIssue.php:669
@@ -2321,7 +2318,7 @@
msgid "to view the costed bill of material for"
msgstr "Pro zobrazení vyčíslením nákladů, vyúčtování materiálu pro"
-#: BOMListing.php:14 BOMListing.php:15 BOMListing.php:110 index.php:804
+#: BOMListing.php:14 BOMListing.php:15 BOMListing.php:110 index.php:820
msgid "Bill Of Material Listing"
msgstr "Kusovníku Výpis"
@@ -2385,9 +2382,9 @@
#: BOMs.php:120 BOMs.php:126 BOMs.php:130 BOMs.php:831 OrderDetails.php:177
#: PaymentTerms.php:188 PaymentTerms.php:194 PO_SelectOSPurchOrder.php:473
-#: SalesAnalReptCols.php:280 SelectProduct.php:108 SelectProduct.php:152
-#: SelectProduct.php:165 SelectProduct.php:249 SelectProduct.php:250
-#: SelectProduct.php:739
+#: SalesAnalReptCols.php:280 SelectProduct.php:110 SelectProduct.php:154
+#: SelectProduct.php:167 SelectProduct.php:251 SelectProduct.php:252
+#: SelectProduct.php:732
msgid "N/A"
msgstr "N / A"
@@ -2542,8 +2539,7 @@
msgid "Assembly"
msgstr "Sestava"
-#: BOMs.php:400 FixedAssetRegister.php:357 Nasser_SupplierWise.php:172
-#: Stocks.php:830 Stocks.php:832
+#: BOMs.php:400 FixedAssetRegister.php:357 Stocks.php:830 Stocks.php:832
msgid "Purchased"
msgstr "Koupeno"
@@ -2594,7 +2590,7 @@
msgid "Location"
msgstr "Umístění"
-#: BOMs.php:515 index.php:858 WhereUsedInquiry.php:66
+#: BOMs.php:515 index.php:874 WhereUsedInquiry.php:66
msgid "Work Centre"
msgstr "Výrobní středisko"
@@ -2723,7 +2719,7 @@
msgstr "Jste si jisti, že chcete smazat tuto cenu?"
#: COGSGLPostings.php:195 CustomerReceipt.php:954 FixedAssetJournal.php:354
-#: GLJournal.php:341 GLTransInquiry.php:43 index.php:1270 Payments.php:985
+#: GLJournal.php:341 GLTransInquiry.php:43 index.php:1286 Payments.php:985
#: SupplierTransInquiry.php:146 TaxAuthorities.php:146 TaxAuthorities.php:147
msgid "GL Account"
msgstr "GL účtu"
@@ -2749,7 +2745,7 @@
msgid "Post to GL account"
msgstr "Příspěvek na účet GL"
-#: CompanyPreferences.php:7 index.php:947
+#: CompanyPreferences.php:7 index.php:963
msgid "Company Preferences"
msgstr "Nastavení firmy"
@@ -3215,20 +3211,17 @@
#: GLTrialBalance.php:229 GLTrialBalance.php:250 GLTrialBalance.php:346
#: GLTrialBalance.php:484 GLTrialBalance.php:504 GLTrialBalance.php:528
#: GLTrialBalance.php:632 GLTrialBalance.php:652 GLTrialBalance.php:676
-#: Nasser_SalesInquiry.php:367 Nasser_SalesInquiry.php:402
-#: Nasser_SalesInquiry.php:437 Nasser_SalesInquiry.php:472
-#: Nasser_SalesInquiry.php:533 OffersReceived.php:98 OrderDetails.php:159
-#: PDFCustTransListing.php:125 PDFOrdersInvoiced.php:386
-#: PDFRemittanceAdvice.php:310 PDFSuppTransListing.php:125
-#: RecurringSalesOrders.php:325 SelectCreditItems.php:656
-#: SelectCreditItems.php:660 SelectOrderItems.php:1314 SuppContractChgs.php:98
-#: SuppFixedAssetChgs.php:91 SupplierAllocations.php:456
-#: SupplierAllocations.php:560 SupplierAllocations.php:631
-#: SupplierCredit.php:394 SupplierCredit.php:429 SupplierCredit.php:464
-#: SupplierInquiry.php:202 SupplierInvoice.php:332 SupplierInvoice.php:362
-#: SupplierInvoice.php:395 SupplierInvoice.php:424 SuppShiptChgs.php:96
-#: SuppTransGLAnalysis.php:132 Z_CheckDebtorsControl.php:157
-#: includes/PDFQuotationPageHeader.inc:107
+#: OffersReceived.php:98 OrderDetails.php:159 PDFCustTransListing.php:125
+#: PDFOrdersInvoiced.php:386 PDFRemittanceAdvice.php:310
+#: PDFSuppTransListing.php:125 RecurringSalesOrders.php:325
+#: SelectCreditItems.php:656 SelectCreditItems.php:660
+#: SelectOrderItems.php:1314 SuppContractChgs.php:98 SuppFixedAssetChgs.php:91
+#: SupplierAllocations.php:456 SupplierAllocations.php:560
+#: SupplierAllocations.php:631 SupplierCredit.php:394 SupplierCredit.php:429
+#: SupplierCredit.php:464 SupplierInquiry.php:202 SupplierInvoice.php:332
+#: SupplierInvoice.php:362 SupplierInvoice.php:395 SupplierInvoice.php:424
+#: SuppShiptChgs.php:96 SuppTransGLAnalysis.php:132
+#: Z_CheckDebtorsControl.php:157 includes/PDFQuotationPageHeader.inc:107
#: includes/PDFQuotationPortraitPageHeader.inc:106
#: includes/PO_PDFOrderPageHeader.inc:82 api/api_debtortransactions.php:364
#: api/api_debtortransactions.php:377 api/api_debtortransactions.php:503
@@ -3794,7 +3787,7 @@
#: DeliveryDetails.php:599 DeliveryDetails.php:606 DeliveryDetails.php:787
#: MRPReport.php:412 PDFOrdersInvoiced.php:298 PDFOrderStatus.php:271
#: SelectCompletedOrder.php:585 SelectContract.php:152
-#: SelectOrderItems.php:741 SelectProduct.php:374 Shipments.php:383
+#: SelectOrderItems.php:741 SelectProduct.php:379 Shipments.php:383
#: Shipments.php:461 SuppCreditGRNs.php:151 SuppCreditGRNs.php:229
#: SuppInvGRNs.php:279 TaxGroups.php:271
#: includes/PDFDeliveryDifferencesPageHeader.inc:41
@@ -4278,9 +4271,8 @@
#: ContractBOM.php:365 CounterSales.php:2001 FixedAssetItems.php:461
#: FixedAssetItems.php:465 PO_Items.php:949 SalesCategories.php:249
#: SelectCreditItems.php:971 SelectOrderItems.php:1461
-#: SelectOrderItems.php:1636 SelectProduct.php:426 Stocks.php:718
-#: Stocks.php:722 SupplierTenders.php:518 WorkOrderEntry.php:617
-#: WorkOrderIssue.php:684
+#: SelectOrderItems.php:1636 Stocks.php:718 Stocks.php:722
+#: SupplierTenders.php:518 WorkOrderEntry.php:617 WorkOrderIssue.php:684
msgid "No Image"
msgstr "Obrázek není k dispozici"
@@ -4380,12 +4372,11 @@
msgid "Budgeted Other Costs"
msgstr "Ostatní náklady do rozpočtu"
-#: ContractCosting.php:147 Nasser_SupplierWise.php:170 OffersReceived.php:93
-#: PO_AuthoriseMyOrders.php:59 PO_SelectOSPurchOrder.php:435
-#: PO_SelectPurchOrder.php:392 PurchData.php:170 ReprintGRN.php:70
-#: SelectProduct.php:337 SelectSupplier.php:140 ShipmentCosting.php:505
-#: ShipmentCosting.php:576 Shipt_Select.php:280 ShiptsList.php:11
-#: SupplierAllocations.php:557 SupplierAllocations.php:628
+#: ContractCosting.php:147 OffersReceived.php:93 PO_AuthoriseMyOrders.php:59
+#: PO_SelectOSPurchOrder.php:435 PO_SelectPurchOrder.php:392 PurchData.php:170
+#: ReprintGRN.php:70 SelectProduct.php:342 SelectSupplier.php:140
+#: ShipmentCosting.php:505 ShipmentCosting.php:576 Shipt_Select.php:280
+#: ShiptsList.php:11 SupplierAllocations.php:557 SupplierAllocations.php:628
#: SupplierCredit.php:264 SupplierInquiry.php:114 SupplierInvoice.php:230
#: SupplierTransInquiry.php:90 SuppLoginSetup.php:23 SuppPriceList.php:199
#: SuppPriceList.php:257 includes/PDFAgedSuppliersPageHeader.inc:34
@@ -5030,13 +5021,11 @@
msgid "Contract Reference"
msgstr "Referenční zakázky"
-#: Contracts.php:846 InventoryQuantities.php:212
-#: Nasser_SalesCategoryInquiry.php:163 Nasser_TopSalesInquiry.php:219
-#: PDFPriceList.php:352 PDFPrintLabel.php:94 PricesByCost.php:204
-#: ReorderLevelLocation.php:189 ReorderLevel.php:242 SpecialOrder.php:606
-#: StockDispatch.php:344 Stocks.php:728 SuppPriceList.php:211
-#: SuppPriceList.php:261 Z_PriceChanges.php:37
-#: includes/PDFInventoryValnPageHeader.inc:32
+#: Contracts.php:846 InventoryQuantities.php:212 PDFPriceList.php:352
+#: PDFPrintLabel.php:94 PricesByCost.php:204 ReorderLevelLocation.php:189
+#: ReorderLevel.php:242 SpecialOrder.php:606 StockDispatch.php:344
+#: Stocks.php:728 SuppPriceList.php:211 SuppPriceList.php:261
+#: Z_PriceChanges.php:37 includes/PDFInventoryValnPageHeader.inc:32
#: includes/PDFInventoryValnPageHeader.inc:38
#: includes/PDFPriceListPageHeader.inc:38
msgid "Category"
@@ -5088,10 +5077,9 @@
#: Contracts.php:894 GLProfit_Loss.php:293 GLProfit_Loss.php:482
#: GLProfit_Loss.php:787 GLProfit_Loss.php:1090 GLTagProfit_Loss.php:285
#: GLTagProfit_Loss.php:423 GLTagProfit_Loss.php:654 GLTagProfit_Loss.php:876
-#: Nasser_SalesCategoryInquiry.php:168 Nasser_SalesInquiry.php:334
#: SalesAnalReptCols.php:33 SalesAnalReptCols.php:35 SalesGraph.php:176
-#: SalesGraph.php:193 SalesGraph.php:256 SelectProduct.php:147
-#: SelectProduct.php:160
+#: SalesGraph.php:193 SalesGraph.php:256 SelectProduct.php:149
+#: SelectProduct.php:162
#, php-format
msgid "Gross Profit"
msgstr "Hrubý zisk"
@@ -5746,7 +5734,7 @@
#: CounterSales.php:2166 CounterSales.php:2289 MRPReport.php:729
#: SelectAsset.php:236 SelectCustomer.php:453 SelectCustomer.php:529
-#: SelectOrderItems.php:1626 SelectOrderItems.php:1742 SelectProduct.php:708
+#: SelectOrderItems.php:1626 SelectOrderItems.php:1742 SelectProduct.php:701
#: SelectSupplier.php:238 SelectSupplier.php:298
msgid "Next"
msgstr "Další"
@@ -6476,7 +6464,7 @@
#: MRPDemandTypes.php:17 MRP.php:515 MRPPlannedPurchaseOrders.php:267
#: MRPPlannedWorkOrders.php:247 MRPPlannedWorkOrders.php:326
#: PricesByCost.php:8 ReorderLevelLocation.php:13 ReorderLevel.php:161
-#: SelectProduct.php:71 StockDispatch.php:219 StockMovements.php:19
+#: SelectProduct.php:73 StockDispatch.php:219 StockMovements.php:19
#: StockQties_csv.php:8 StockQuantityByDate.php:9 StockReorderLevel.php:17
#: StockSerialItemResearch.php:10 StockSerialItems.php:10 StockStatus.php:44
#: StockTransferControlled.php:14 SuppLoginSetup.php:14 WWW_Users.php:16
@@ -6708,8 +6696,7 @@
msgid "Legal"
msgstr "Právní"
-#: CustLoginSetup.php:574 Nasser_TopSalesInquiry.php:78 SuppLoginSetup.php:505
-#: WWW_Users.php:602
+#: CustLoginSetup.php:574 SuppLoginSetup.php:505 WWW_Users.php:602
msgid "Display"
msgstr "Zobrazení"
@@ -7363,7 +7350,7 @@
#: CustomerInquiry.php:128 CustomerReceipt.php:895 Customers.php:551
#: Customers.php:827 Customers.php:831 Customers.php:847 Customers.php:866
-#: Customers.php:870 index.php:1062
+#: Customers.php:870 index.php:1078
msgid "Credit Status"
msgstr "Stav úvěru"
@@ -7812,7 +7799,7 @@
msgid "Enter A GL Receipt"
msgstr "Zadejte GL Příjem"
-#: CustomerReceipt.php:1073
+#: CustomerReceipt.php:1075
msgid "Accept and Process Batch"
msgstr "Přijímat a zpracovávat šarže"
@@ -8067,7 +8054,7 @@
"Nejsou žádné platební podmínky v současné době definovány - přejděte na "
"kartu Nastavení v hlavním menu a nastavit alespoň jeden jako první"
-#: Customers.php:541 Customers.php:808 Customers.php:811 index.php:1067
+#: Customers.php:541 Customers.php:808 Customers.php:811 index.php:1083
#: PaymentTerms.php:13 PO_Header.php:1041 PrintCustTrans.php:370
#: PrintCustTransPortrait.php:435 Suppliers.php:702 Suppliers.php:878
#: includes/PO_PDFOrderPageHeader.inc:62 includes/PO_PDFOrderPageHeader.inc:64
@@ -8192,11 +8179,11 @@
msgid "Click to preview the credit"
msgstr "Klikněte pro náhled úvěr"
-#: CustomerTypes.php:6 CustomerTypes.php:21 index.php:1052
+#: CustomerTypes.php:6 CustomerTypes.php:21 index.php:1068
msgid "Customer Types"
msgstr "Typy zákazníků"
-#: CustomerTypes.php:6 index.php:1489 index.php:1492 SupplierTypes.php:6
+#: CustomerTypes.php:6 index.php:1505 index.php:1508 SupplierTypes.php:6
msgid "Maintenance"
msgstr "Nastavení"
@@ -8456,9 +8443,7 @@
msgid "Show Daily Sales For The Selected Month"
msgstr "Zobrazit Denní tržby za vybraný měsíc"
-#: DailySalesInquiry.php:89 Nasser_SalesCategoryInquiry.php:156
-#: Nasser_SalesInquiry.php:320 Nasser_SupplierWise.php:163
-#: Nasser_TopSalesInquiry.php:210
+#: DailySalesInquiry.php:89
msgid "The sales data could not be retrieved because"
msgstr "Údaje o prodeji se nepodařilo získat, protože"
@@ -8897,7 +8882,7 @@
msgid "Demand Work Orders"
msgstr "Hledat práci Objednávky"
-#: DemandWorkOrders.php:46 SelectProduct.php:280
+#: DemandWorkOrders.php:46 SelectProduct.php:282
msgid ""
"The quantity on work orders for this product cannot be retrieved because"
msgstr ""
@@ -8982,7 +8967,6 @@
msgstr "Slevová skupina"
#: DiscountCategories.php:199 InventoryPlanningPrefSupplier.php:77
-#: Nasser_SupplierWise.php:171 Nasser_TopSalesInquiry.php:218
#: PDFPriceList.php:352 SelectWorkOrder.php:300 ShipmentCosting.php:143
#: ShipmentCosting.php:509 Shipments.php:384 Shipments.php:462
#: StockUsage.php:52 SuppCreditGRNs.php:226 SuppInvGRNs.php:233
@@ -9125,14 +9109,14 @@
msgid "Heading"
msgstr "Okruh"
-#: EDIMessageFormat.php:218 EDIMessageFormat.php:220
-#: Nasser_SupplierWise.php:52 POReport.php:1485 SalesInquiry.php:1035
+#: EDIMessageFormat.php:218 EDIMessageFormat.php:220 POReport.php:1485
+#: SalesInquiry.php:1035
msgid "Detail"
msgstr "Detail"
#: EDIMessageFormat.php:223 EDIMessageFormat.php:225 GLBalanceSheet.php:51
-#: GLProfit_Loss.php:89 GLTagProfit_Loss.php:103 Nasser_SupplierWise.php:57
-#: POReport.php:1486 SalesInquiry.php:1036 Tax.php:240
+#: GLProfit_Loss.php:89 GLTagProfit_Loss.php:103 POReport.php:1486
+#: SalesInquiry.php:1036 Tax.php:240
msgid "Summary"
msgstr "Shrnutí"
@@ -10096,9 +10080,8 @@
msgid "Date Purchased"
msgstr "Datum Zakoupeno"
-#: FixedAssetDepreciation.php:86 Nasser_SupplierWise.php:174
-#: Nasser_SupplierWise.php:175 PricesByCost.php:123 SalesAnalReptCols.php:38
-#: SalesAnalReptCols.php:40 SelectProduct.php:184 SelectProduct.php:338
+#: FixedAssetDepreciation.php:86 PricesByCost.php:123 SalesAnalReptCols.php:38
+#: SalesAnalReptCols.php:40 SelectProduct.php:186 SelectProduct.php:343
#: ShipmentCosting.php:148 ShipmentCosting.php:149 StockCostUpdate.php:149
#: includes/PDFAssetRegisterHeader.inc:66
#: includes/PDFAssetRegisterHeader.inc:69
@@ -10176,8 +10159,7 @@
"depreciation of the asset was:"
msgstr "Následující SQL byl použit k pokusu aktualizovat oprávky majetku bylo:"
-#: FixedAssetDepreciation.php:236 Nasser_SalesCategoryInquiry.php:209
-#: Nasser_SalesInquiry.php:548 Nasser_TopSalesInquiry.php:265
+#: FixedAssetDepreciation.php:236
msgid "GRAND Total"
msgstr "Celkový součet"
@@ -10733,7 +10715,7 @@
msgid "Depn C/Fwd"
msgstr "Depn C / Vpřed"
-#: FixedAssetTransfer.php:7 index.php:1326
+#: FixedAssetTransfer.php:7 index.php:1342
msgid "Change Asset Location"
msgstr "Změna umístění aktiv"
@@ -10742,7 +10724,7 @@
msgstr "V kategorii Asset"
#: FixedAssetTransfer.php:50 FixedAssetTransfer.php:61 MRPReport.php:535
-#: MRPReport.php:542 SelectProduct.php:513 SelectProduct.php:520
+#: MRPReport.php:542 SelectProduct.php:506 SelectProduct.php:513
#: SupplierTenders.php:350 SupplierTenders.php:359
msgid "Enter partial"
msgstr "Zadejte část"
@@ -11160,7 +11142,7 @@
msgid "Geocode Generate"
msgstr "Vytvořit geokód"
-#: geocode.php:26 GeocodeSetup.php:134 GeocodeSetup.php:226 index.php:1022
+#: geocode.php:26 GeocodeSetup.php:134 GeocodeSetup.php:226 index.php:1038
msgid "Geocode Setup"
msgstr "Geokód Nastavení"
@@ -11460,9 +11442,8 @@
msgstr "Celkem za období"
#: GLAccountInquiry.php:236 GLAccountReportphp:231 GLBudgets.php:165
-#: GLTransInquiry.php:42 Nasser_SalesInquiry.php:327
-#: Z_CheckDebtorsControl.php:78 Z_CheckGLTransBalance.php:13
-#: Z_UpdateChartDetailsBFwd.php:78
+#: GLTransInquiry.php:42 Z_CheckDebtorsControl.php:78
+#: Z_CheckGLTransBalance.php:13 Z_UpdateChartDetailsBFwd.php:78
msgid "Period"
msgstr "Období"
@@ -11659,7 +11640,7 @@
#: GLAccounts.php:274 GLBalanceSheet.php:12 GLBalanceSheet.php:21
#: GLBalanceSheet.php:66 GLBalanceSheet.php:67 GLBalanceSheet.php:90
-#: GLBalanceSheet.php:128 index.php:1246 SelectGLAccount.php:46
+#: GLBalanceSheet.php:128 index.php:1262 SelectGLAccount.php:46
#: SelectGLAccount.php:59
msgid "Balance Sheet"
msgstr "Rozvaha"
@@ -11877,7 +11858,7 @@
msgid "Group"
msgstr "Skupina"
-#: GLJournal.php:8 index.php:1187
+#: GLJournal.php:8 index.php:1203
msgid "Journal Entry"
msgstr "Zápis do deníku"
@@ -12157,7 +12138,7 @@
#: GLTrialBalance.php:14 GLTrialBalance.php:28 GLTrialBalance.php:108
#: GLTrialBalance.php:109 GLTrialBalance.php:151 GLTrialBalance.php:432
-#: index.php:1206
+#: index.php:1222
msgid "Trial Balance"
msgstr "Předvaha"
@@ -12261,7 +12242,7 @@
msgid "Receive controlled item"
msgstr "Dostávat kontrolované položky"
-#: GoodsReceived.php:22 index.php:567
+#: GoodsReceived.php:22 index.php:583
msgid "Receive Purchase Orders"
msgstr "Dostávat Objednávky"
@@ -12290,7 +12271,7 @@
msgid "has a status of"
msgstr "má statut"
-#: GoodsReceived.php:63 index.php:577 PO_SelectOSPurchOrder.php:444
+#: GoodsReceived.php:63 index.php:593 PO_SelectOSPurchOrder.php:444
#: PO_SelectOSPurchOrder.php:461 PO_SelectOSPurchOrder.php:463
#: SelectWorkOrder.php:297 SelectWorkOrder.php:332
#: StockLocTransferReceive.php:554 WorkOrderCosting.php:87
@@ -12582,8 +12563,7 @@
msgid "Process Goods Received"
msgstr "Proces přijetí zboží"
-#: index.php:11 Nasser_SalesInquiry.php:328 Nasser_SupplierWise.php:176
-#: Nasser_TopSalesInquiry.php:223 ReverseGRN.php:31 SelectSalesOrder.php:313
+#: index.php:11 ReverseGRN.php:31 SelectSalesOrder.php:313
msgid "Sales"
msgstr "Prodeje"
@@ -12649,679 +12629,694 @@
msgstr "Hlášení fakturovaných objednávek"
#: index.php:191
+#, fuzzy
+msgid "Sales By Sales Type Inquiry"
+msgstr "Denní prodej Poptávka"
+
+#: index.php:196
+#, fuzzy
+msgid "Sales By Category Inquiry"
+msgstr "Hlášení analýzy prodeje"
+
+#: index.php:201
+#, fuzzy
+msgid "Top Sellers Inquiry"
+msgstr "Prodej Poptávka"
+
+#: index.php:207
msgid "Order Delivery Differences Report"
msgstr "Hlášení rozdílů v dodaných množstvích"
-#: index.php:196 PDFDIFOT.php:24
+#: index.php:212 PDFDIFOT.php:24
msgid "Delivery In Full On Time (DIFOT) Report"
msgstr "Dodávka, v plném rozsahu Time (DIFOT) Zpráva"
-#: index.php:201
+#: index.php:217
msgid "Sales Order Detail Or Summary Inquiries"
msgstr "Prodejní objednávky Detail Nebo Shrnutí Dotazy"
-#: index.php:206
+#: index.php:222
msgid "Top Sales Items Report"
msgstr "Prodej top položky Zpráva"
-#: index.php:211
+#: index.php:227
msgid "Sales With Low Gross Profit Report"
msgstr "Prodej s nízkým hrubý zisk Zpráva"
-#: index.php:229 SelectContract.php:8
+#: index.php:245 SelectContract.php:8
msgid "Select Contract"
msgstr "Vyberte smlouvy"
-#: index.php:234
+#: index.php:250
msgid "Create Contract"
msgstr "Vytvoření smlouvy"
-#: index.php:267
+#: index.php:283
msgid "Select Order to Invoice"
msgstr "Zvolit objednávku k fakturaci"
-#: index.php:272
+#: index.php:288
msgid "Create A Credit Note"
msgstr "Vytvořit dobropis"
-#: index.php:277
+#: index.php:293
msgid "Enter Receipts"
msgstr "Vložit příjmové doklady"
-#: index.php:283 SelectCustomer.php:296
+#: index.php:299 SelectCustomer.php:296
msgid "Allocate Receipts or Credit Notes"
msgstr "Přiřadit příjmové doklady / dobropisy"
-#: index.php:292
+#: index.php:308
msgid "Where Allocated Inquiry"
msgstr "Kde Přidělené Poptávka"
-#: index.php:299 index.php:301 PrintCustTrans.php:475
+#: index.php:315 index.php:317 PrintCustTrans.php:475
#: PrintCustTransPortrait.php:526
msgid "Print Invoices or Credit Notes"
msgstr "Tisk faktur / dobropisů"
-#: index.php:308 PrintCustStatements.php:87 PrintCustStatements.php:420
+#: index.php:324 PrintCustStatements.php:87 PrintCustStatements.php:420
msgid "Print Statements"
msgstr "Tisk přehledů"
-#: index.php:313
+#: index.php:329
msgid "Sales Analysis Reports"
msgstr "Hlášení analýz prodeje"
-#: index.php:318
+#: index.php:334
msgid "Aged Customer Balances/Overdues Report"
msgstr "Zákazník ve věku Váhy / Overdues zpráva"
-#: index.php:323
+#: index.php:339
msgid "Re-Print A Deposit Listing"
msgstr "Re-Print vklad výpis"
-#: index.php:328
+#: index.php:344
msgid "Debtor Balances At A Prior Month End"
msgstr "Dlužník Zůstatky v předchozí Konec měsíce"
-#: index.php:333
+#: index.php:349
msgid "Customer Listing By Area/Salesperson"
msgstr "Zákazník Výpis podle lokality / Prodejce"
-#: index.php:338
+#: index.php:354
msgid "Sales Graphs"
msgstr "Grafy prodeje"
-#: index.php:343 index.php:436
+#: index.php:359 index.php:452
msgid "List Daily Transactions"
msgstr "Seznam Denní Transakce"
-#: index.php:348 SelectCustomer.php:289
+#: index.php:364 SelectCustomer.php:289
msgid "Customer Transaction Inquiries"
msgstr "Informace o transakcích zákazníka"
-#: index.php:362
+#: index.php:378
msgid "Add Customer"
msgstr "Přidat zákazníka"
-#: index.php:367 SelectCustomer.php:24 includes/header.inc:60
+#: index.php:383 SelectCustomer.php:24 includes/header.inc:60
#: includes/PDFTopItemsHeader.inc:27
msgid "Customers"
msgstr "Zákazníci"
-#: index.php:397 OffersReceived.php:42 OffersReceived.php:46
+#: index.php:413 OffersReceived.php:42 OffersReceived.php:46
msgid "Select Supplier"
msgstr "Zvolit dodavatele"
-#: index.php:402 SupplierAllocations.php:30 SupplierBalsAtPeriodEnd.php:119
+#: index.php:418 SupplierAllocations.php:30 SupplierBalsAtPeriodEnd.php:119
#: SupplierContacts.php:19
msgid "Supplier Allocations"
msgstr "Dodavatel Přidělené"
-#: index.php:411
+#: index.php:427
msgid "Aged Supplier Report"
msgstr "Dodavatel ve věku Zpráva"
-#: index.php:416 SuppPaymentRun.php:31
+#: index.php:432 SuppPaymentRun.php:31
msgid "Payment Run Report"
msgstr "Platba Spustit sestavu"
-#: index.php:421 PDFRemittanceAdvice.php:120
+#: index.php:437 PDFRemittanceAdvice.php:120
msgid "Remittance Advices"
msgstr "Poukazování Avíza"
-#: index.php:426 OutstandingGRNs.php:14 OutstandingGRNs.php:147
+#: index.php:442 OutstandingGRNs.php:14 OutstandingGRNs.php:147
msgid "Outstanding GRNs Report"
msgstr "Vynikající zpráva GRNs"
-#: index.php:431
+#: index.php:447
msgid "Supplier Balances At A Prior Month End"
msgstr "Zůstatky na dodavatele Před Konec měsíce"
-#: index.php:441
+#: index.php:457
msgid "Supplier Transaction Inquiries"
msgstr "Dodavatel informací o transakcích"
-#: index.php:455
+#: index.php:471
msgid "Add Supplier"
msgstr "Přidat dodavatele"
-#: index.php:460
+#: index.php:476
msgid "Maintain Factor Companies"
msgstr "Udržovat faktor firem"
-#: index.php:488 PO_SelectPurchOrder.php:7 SelectCompletedOrder.php:538
+#: index.php:504 PO_SelectPurchOrder.php:7 SelectCompletedOrder.php:538
#: SupplierCredit.php:208 SupplierCredit.php:294 SupplierInvoice.php:186
#: SupplierInvoice.php:261
msgid "Purchase Orders"
msgstr "Nákupní objednávky"
-#: index.php:493 PO_SelectOSPurchOrder.php:132
+#: index.php:509 PO_SelectOSPurchOrder.php:132
msgid "Add Purchase Order"
msgstr "Přidat Objednávka"
-#: index.php:498
+#: index.php:514
msgid "Process Tenders and Offers"
msgstr "Nabídky procesu a nabídky"
-#: index.php:503
+#: index.php:519
msgid "Orders to Authorise"
msgstr "Objednávky na Povolit"
-#: index.php:508
+#: index.php:524
msgid "Shipment Entry"
msgstr "Vstup zásilku"
-#: index.php:513
+#: index.php:529
msgid "Select A Shipment"
msgstr "Zvolit dodávku"
-#: index.php:522 PO_PDFPurchOrder.php:20 PO_PDFPurchOrder.php:114
+#: index.php:538 PO_PDFPurchOrder.php:20 PO_PDFPurchOrder.php:114
msgid "Purchase Order Inquiry"
msgstr "Informace o nákupních objednávkách"
-#: index.php:527
+#: index.php:543
msgid "Purchase Order Detail Or Summary Inquiries"
msgstr "Objednávka Detail Nebo Shrnutí Dotazy"
-#: index.php:572 index.php:577
+#: index.php:588 index.php:593
msgid "Bulk Inventory Transfer"
msgstr "Hromadný přesun položek"
-#: index.php:572 StockAdjustments.php:58 StockLocTransfer.php:130
+#: index.php:588 StockAdjustments.php:58 StockLocTransfer.php:130
#: StockLocTransferReceive.php:415 StockLocTransferReceive.php:499
#: StockTransfers.php:26 StockTransfers.php:435 StockUsage.php:28
#: SuppCreditGRNs.php:18 SuppInvGRNs.php:15
msgid "Dispatch"
msgstr "Odeslání"
-#: index.php:582
+#: index.php:598
msgid "Inventory Location Transfers"
msgstr "Zásoby Umístění Převody"
-#: index.php:587
+#: index.php:603
msgid "Inventory Adjustments"
msgstr "Zásoby Opravné položky"
-#: index.php:592 ReverseGRN.php:13
+#: index.php:608 ReverseGRN.php:13
msgid "Reverse Goods Received"
msgstr "Reverzní zboží obdržené"
-#: index.php:597
+#: index.php:613
msgid "Enter Stock Counts"
msgstr "Vložit skladové stavy"
-#: index.php:606
+#: index.php:622
msgid "Serial Item Research Tool"
msgstr "Sériové bod výzkumný nástroj"
-#: index.php:611 PDFPrintLabel.php:75
+#: index.php:627 PDFPrintLabel.php:75
msgid "Print Price Labels"
msgstr "Tisknout cenovky"
-#: index.php:616
+#: index.php:632
msgid "Inventory Item Movements"
msgstr "Pohyby skladových položek"
-#: index.php:621
+#: index.php:637
msgid "Inventory Item Status"
msgstr "Stav skladové položky"
-#: index.php:626
+#: index.php:642
msgid "Inventory Item Usage"
msgstr "Použití skladové položky"
-#: index.php:631 InventoryQuantities.php:81
+#: index.php:647 InventoryQuantities.php:81
msgid "Inventory Quantities"
msgstr "Množství zásob"
-#: index.php:636 ReorderLevelLocation.php:60 ReorderLevel.php:57
+#: index.php:652 ReorderLevelLocation.php:60 ReorderLevel.php:57
msgid "Reorder Level"
msgstr "Změna pořadí úrovni"
-#: index.php:641
+#: index.php:657
msgid "Stock Dispatch"
msgstr "Skladem Expedice"
-#: index.php:646 InventoryValuation.php:15 MailInventoryValuation.php:47
+#: index.php:662 InventoryValuation.php:15 MailInventoryValuation.php:47
#: MailInventoryValuation.php:226
msgid "Inventory Valuation Report"
msgstr "Hlášení o ocenění skladu"
-#: index.php:651 InventoryPlanning.php:35
+#: index.php:667 InventoryPlanning.php:35
msgid "Inventory Planning Report"
msgstr "Hlášení o plánování skladu"
-#: index.php:656
+#: index.php:672
msgid "Inventory Planning Based On Preferred Supplier Data"
msgstr "Zásoby plánování na základě preferovaného dodavatele dat"
-#: index.php:661
+#: index.php:677
msgid "Inventory Stock Check Sheets"
msgstr "Inventurní seznamy"
-#: index.php:666
+#: index.php:682
msgid "Make Inventory Quantities CSV"
msgstr "Zkontrolujte množství zásob ve formátu CSV"
-#: index.php:671
+#: index.php:687
msgid "Compare Counts Vs Stock Check Data"
msgstr "Porovnejte Counts Vs Data Reklamní Kontrola"
-#: index.php:676
+#: index.php:692
msgid "All Inventory Movements By Location/Date"
msgstr "Všechny pohyby zásob podle Místo / Datum"
-#: index.php:681
+#: index.php:697
msgid "List Inventory Status By Location/Category"
msgstr "Seznam zásob stav Umístění / Kategorie"
-#: index.php:686
+#: index.php:702
msgid "Historical Stock Quantity By Location/Category"
msgstr "Historické skladem Množství Podle lokality / Kategorie"
-#: index.php:691
+#: index.php:707
msgid "List Negative Stocks"
msgstr "Seznam Negativní Zásoby"
-#: index.php:696
+#: index.php:712
#, fuzzy
msgid "Period Stock Transaction Listing"
msgstr "Sklad seznamu transakcí"
-#: index.php:701
+#: index.php:717
#, fuzzy
msgid "Stock Transfer Note"
msgstr "Sklad Transfer formuláře"
-#: index.php:706
+#: index.php:722
#, fuzzy
msgid "Reprint GRN"
msgstr "Dotisk teď"
-#: index.php:720
+#: index.php:736
msgid "Add A New Item"
msgstr "Přidat novou položku"
-#: index.php:725
+#: index.php:741
msgid "Select An Item"
msgstr "Zvolit položku"
-#: index.php:730 SalesCategories.php:7
+#: index.php:746 SalesCategories.php:7
msgid "Sales Category Maintenance"
msgstr "Nastavení prodejních skupin"
-#: index.php:735
+#: index.php:751
#, fuzzy
msgid "Add or Update Prices Based On Costs Or Other Price List"
msgstr "Přidat nebo aktualizovat ceny na základě nákladů"
-#: index.php:740
+#: index.php:756
msgid "View or Update Prices Based On Costs"
msgstr "Zobrazit nebo aktualizace ceny na základě nákladů"
-#: index.php:745
+#: index.php:761
msgid "Reorder Level By Category/Location"
msgstr "Změna pořadí úrovni kategorie / Místo"
-#: index.php:775 WorkOrderEntry.php:6
+#: index.php:791 WorkOrderEntry.php:6
msgid "Work Order Entry"
msgstr "Práce Objednat Vstup"
-#: index.php:780 index.php:789
+#: index.php:796 index.php:805
msgid "Select A Work Order"
msgstr "Zvolit výrobní zakázku"
-#: index.php:794
+#: index.php:810
msgid "Costed Bill Of Material Inquiry"
msgstr "Vyčíslením nákladů kusovníku Poptávka"
-#: index.php:799 WhereUsedInquiry.php:8
+#: index.php:815 WhereUsedInquiry.php:8
msgid "Where Used Inquiry"
msgstr "V případě, Použité Poptávka"
-#: index.php:809
+#: index.php:825
msgid "Indented Bill Of Material Listing"
msgstr "Odsazené kusovníku Výpis"
-#: index.php:814
+#: index.php:830
msgid "List Components Required"
msgstr "Seznam Požadované součásti"
-#: index.php:819
+#: index.php:835
msgid "Indented Where Used Listing"
msgstr "Odsazené Pokud Použité Výpis"
-#: index.php:824
+#: index.php:840
msgid "MRP"
msgstr "MRP"
-#: index.php:829 MRPShortages.php:26 MRPShortages.php:144 MRPShortages.php:156
+#: index.php:845 MRPShortages.php:26 MRPShortages.php:144 MRPShortages.php:156
msgid "MRP Shortages"
msgstr "MRP Nedostatky"
-#: index.php:834
+#: index.php:850
msgid "MRP Suggested Purchase Orders"
msgstr "MRP Doporučené Objednávky"
-#: index.php:839
+#: index.php:855
msgid "MRP Suggested Work Orders"
msgstr "MRP Doporučené pracovní Objednávky"
-#: index.php:844
+#: index.php:860
msgid "MRP Reschedules Required"
msgstr "MRP přeplánuje Požadované"
-#: index.php:863
+#: index.php:879
msgid "Bills Of Material"
msgstr "Materiálové listy"
-#: index.php:869
+#: index.php:885
msgid "Master Schedule"
msgstr "Master plán"
-#: index.php:874
+#: index.php:890
msgid "Auto Create Master Schedule"
msgstr "Auto Vytvořit Master plán"
-#: index.php:879
+#: index.php:895
msgid "MRP Calculation"
msgstr "Výpočet MRP"
-#: index.php:905
+#: index.php:921
msgid "General Setup Options"
msgstr "Hlavní nastavení"
-#: index.php:908
+#: index.php:924
msgid "General"
msgstr "Obecné"
-#: index.php:917
+#: index.php:933
msgid "Receivables/Payables Setup"
msgstr "Nastavení příjmů / výdajů"
-#: index.php:920
+#: index.php:936
msgid "Receivables/Payables"
msgstr "Příjmy / výdaje"
-#: index.php:930 index.php:933
+#: index.php:946 index.php:949
msgid "Inventory Setup"
msgstr "Nastavení skladu"
-#: index.php:952
+#: index.php:968
msgid "Configuration Settings"
msgstr "Nastavení konfigurace"
-#: index.php:957 WWW_Users.php:27
+#: index.php:973 WWW_Users.php:27
msgid "User Maintenance"
msgstr "Správa uživatelského účtu"
-#: index.php:962
+#: index.php:978
msgid "Role Permissions"
msgstr "Přístupová práva"
-#: index.php:967
+#: index.php:983
msgid "Page Security Settings"
msgstr "Stránka Nastavení zabezpečení"
-#: index.php:972
+#: index.php:988
#, fuzzy
msgid "Define Security Tokens"
msgstr "Účelově tokeny zabezpečení"
-#: index.php:977
+#: index.php:993
msgid "Bank Accounts"
msgstr "Bankovní účty"
-#: index.php:982
+#: index.php:998
msgid "Currency Maintenance"
msgstr "Nastavení měn"
-#: index.php:987
+#: index.php:1003
msgid "Tax Authorities and Rates Maintenance"
msgstr "Nastavení daňového úřadu a daňových sazeb"
-#: index.php:992
+#: index.php:1008
msgid "Tax Group Maintenance"
msgstr "Nastavení daňových skupin"
-#: index.php:997
+#: index.php:1013
msgid "Dispatch Tax Province Maintenance"
msgstr "Nastavení oblastí odvodu daní"
-#: index.php:1002
+#: index.php:1018
msgid "Tax Category Maintenance"
msgstr "Nastavení daňových skupin"
-#: index.php:1007
+#: index.php:1023
msgid "List Periods Defined"
msgstr "Seznam definovaných období"
-#: index.php:1007
+#: index.php:1023
msgid "Periods are automatically maintained"
msgstr "Období jsou nastavována automaticky"
-#: index.php:1012
+#: index.php:1028
msgid "Report Builder Tool"
msgstr "Nástroj tvorby hlášení"
-#: index.php:1017
+#: index.php:1033
msgid "View Audit Trail"
msgstr "Zobrazit Audit Trail"
-#: index.php:1027
+#: index.php:1043
msgid "Form Layout Editor"
msgstr "Formulář Layout Editor"
-#: index.php:1032
+#: index.php:1048
msgid "Label Templates Maintenance"
msgstr "Štítek Šablony pro údržbu"
-#: index.php:1037
+#: index.php:1053
msgid "SMTP Server Details"
msgstr "SMTP Server Podrobnosti"
-#: index.php:1047 SalesTypes.php:5
+#: index.php:1063 SalesTypes.php:5
msgid "Sales Types"
msgstr "Typy prodejů"
-#: index.php:1057 SupplierTypes.php:6 SupplierTypes.php:21
+#: index.php:1073 SupplierTypes.php:6 SupplierTypes.php:21
#: SuppPaymentRun.php:237 SystemParameters.php:11 TaxAuthorities.php:9
#: TaxAuthorityRates.php:17 TaxCategories.php:10 Tax.php:289
msgid "Supplier Types"
msgstr "Typy dodavatel"
-#: index.php:1072
+#: index.php:1088
msgid "Set Purchase Order Authorisation levels"
msgstr "Nastavit objednávky autorizační limity"
-#: index.php:1077 PaymentMethods.php:7
+#: index.php:1093 PaymentMethods.php:7
msgid "Payment Methods"
msgstr "Platební metody"
-#: index.php:1082
+#: index.php:1098
msgid "Sales People"
msgstr "Prodejci"
-#: index.php:1087
+#: index.php:1103
msgid "Sales Areas"
msgstr "Prodejní místa"
-#: index.php:1092
+#: index.php:1108
msgid "Shippers"
msgstr "Dopravci"
-#: index.php:1097
+#: index.php:1113
msgid "Sales GL Interface Postings"
msgstr "Prodej GL rozhraní Komentáře"
-#: index.php:1102
+#: index.php:1118
msgid "COGS GL Interface Postings"
msgstr "Čepy GL rozhraní Komentáře"
-#: index.php:1107
+#: index.php:1123
msgid "Freight Costs Maintenance"
msgstr "Nastavení cen dopravy"
-#: index.php:1112
+#: index.php:1128
msgid "Discount Matrix"
msgstr "Matice slev"
-#: index.php:1122
+#: index.php:1138
msgid "Inventory Categories Maintenance"
msgstr "Nastavení skladových skupin"
-#: index.php:1127
+#: index.php:1143
msgid "Inventory Locations Maintenance"
msgstr "Nastavení skladových umístění"
-#: index.php:1132
+#: index.php:1148
msgid "Discount Category Maintenance"
msgstr "Nastavení slevových skupin"
-#: index.php:1137 Stocks.php:789 UnitsOfMeasure.php:173
+#: index.php:1153 Stocks.php:789 UnitsOfMeasure.php:173
msgid "Units of Measure"
msgstr "Měrné jednotky"
-#: index.php:1144
+#: index.php:1160
msgid "MRP Available Production Days"
msgstr "MRP K dispozici Výrobní dny"
-#: index.php:1149 MRPDemandTypes.php:6
+#: index.php:1165 MRPDemandTypes.php:6
msgid "MRP Demand Types"
msgstr "MRP Poptávka Typy"
-#: index.php:1177
+#: index.php:1193
msgid "Bank Account Payments Entry"
msgstr "Bankovní účet platební Vstup"
-#: index.php:1182
+#: index.php:1198
msgid "Bank Account Receipts Entry"
msgstr "Bankovní účet Příjmy Vstup"
-#: index.php:1192
+#: index.php:1208
msgid "Bank Account Payments Matching"
msgstr "Bankovní účet platby odpovídající"
-#: index.php:1197
+#: index.php:1213
msgid "Bank Account Receipts Matching"
msgstr "Bankovní účet Příjmy odpovídající"
-#: index.php:1211 SelectGLAccount.php:26
+#: index.php:1227 SelectGLAccount.php:26
msgid "Account Inquiry"
msgstr "Přehled účtu"
-#: index.php:1216
+#: index.php:1232
msgid "Account Listing"
msgstr "Výpis účet"
-#: index.php:1221
+#: index.php:1237
msgid "Account Listing to CSV File"
msgstr "Výpis účtu do CSV souboru"
-#: index.php:1226
+#: index.php:1242
msgid "Bank Account Reconciliation Statement"
msgstr "Bankovní účet Odsouhlasení prohlášení"
-#: index.php:1231
+#: index.php:1247
msgid "Cheque Payments Listing"
msgstr "Seznam šekových plateb"
-#: index.php:1236
+#: index.php:1252
msgid "Daily Bank Transactions"
msgstr "Denní Bankovní Transakce"
-#: index.php:1241
+#: index.php:1257
msgid "Profit and Loss Statement"
msgstr "Výkaz zisku a ztráty"
-#: index.php:1251
+#: index.php:1267
msgid "Tag Reports"
msgstr "Tag zprávy"
-#: index.php:1256
+#: index.php:1272
msgid "Tax Reports"
msgstr "Daňová přiznání"
-#: index.php:1275
+#: index.php:1291
msgid "GL Budgets"
msgstr "GL rozpočty"
-#: index.php:1290
+#: index.php:1306
msgid "GL Tags"
msgstr "GL Tagy"
-#: index.php:1316
+#: index.php:1332
msgid "Add a new Asset"
msgstr "Přidat nový Asset"
-#: index.php:1321 SelectAsset.php:7
+#: index.php:1337 SelectAsset.php:7
msgid "Select an Asset"
msgstr "Vyberte Asset"
-#: index.php:1331
+#: index.php:1347
msgid "Depreciation Journal"
msgstr "Odpisy věstníku"
-#: index.php:1340
+#: index.php:1356
msgid "Asset Register"
msgstr "Asset Registrace"
-#: index.php:1354
+#: index.php:1370
msgid "Asset Categories Maintenance"
msgstr "Kategorie aktiv Údržba"
-#: index.php:1359
+#: index.php:1375
msgid "Add or Maintain Asset Locations"
msgstr "Přidat nebo zachovat Asset lokality"
-#: index.php:1386
+#: index.php:1402
msgid "Assign Cash to PC Tab"
msgstr "Přiřazení Peníze na PC karta"
-#: index.php:1391
+#: index.php:1407
msgid "Claim Expenses From PC Tab"
msgstr "Požadovat náhradu výdajů od PC karty"
-#: index.php:1396
+#: index.php:1412
msgid "Expenses Authorisation"
msgstr "Náklady Povolení"
-#: index.php:1405
+#: index.php:1421
msgid "PC Tab General Report"
msgstr "PC karta Obecná zpráva"
-#: index.php:1419
+#: index.php:1435
msgid "Types of PC Tabs"
msgstr "Typy PC Záloľky"
-#: index.php:1424
+#: index.php:1440
msgid "PC Tabs"
msgstr "PC Záloľky"
-#: index.php:1429
+#: index.php:1445
msgid "PC Expenses"
msgstr "Náklady PC"
-#: index.php:1434
+#: index.php:1450
msgid "Expenses for Type of PC Tab"
msgstr "Náklady na typ PC karty"
-#: index.php:1465 index.php:1468 PDFCustTransListing.php:125
+#: index.php:1481 index.php:1484 PDFCustTransListing.php:125
#: PDFSuppTransListing.php:125
msgid "Transactions"
msgstr "Transakce"
-#: index.php:1477 index.php:1480
+#: index.php:1493 index.php:1496
msgid "Inquiries and Reports"
msgstr "Přehledy a hlášení"
-#: index.php:1514
+#: index.php:1530
msgid "Custom Reports"
msgstr "Vlastní hlášení"
-#: index.php:1514
+#: index.php:1530
msgid "Standard Reports and Forms"
msgstr "Standardní hlášení a formuláře"
-#: index.php:1556
+#: index.php:1572
msgid "There are no reports to show!"
msgstr "Žádná hlášení ke zobrazení!"
@@ -13487,7 +13482,7 @@
msgstr "Odchylka"
#: InventoryPlanningPrefSupplier.php:89 PurchData.php:178 PurchData.php:492
-#: SelectProduct.php:341
+#: SelectProduct.php:346
msgid "Lead Time"
msgstr "Dodací lhůta"
@@ -13595,7 +13590,7 @@
msgstr "Pouze díly s více pobočkami"
#: InventoryQuantities.php:163 MRPReport.php:508 ReorderLevel.php:194
-#: SelectProduct.php:37 StockDispatch.php:268 StockLocStatus.php:55
+#: SelectProduct.php:39 StockDispatch.php:268 StockLocStatus.php:55
#: SupplierTenders.php:327
msgid ""
"There are no stock categories currently defined please use the link below to "
@@ -13605,13 +13600,13 @@
"jejich definici"
#: InventoryQuantities.php:164 MRPReport.php:509 ReorderLevel.php:195
-#: Se...
[truncated message content] |
|
From: <dai...@us...> - 2011-05-26 11:24:09
|
Revision: 4575
http://web-erp.svn.sourceforge.net/web-erp/?rev=4575&view=rev
Author: daintree
Date: 2011-05-26 10:47:06 +0000 (Thu, 26 May 2011)
Log Message:
-----------
pre 4.04 release
Modified Paths:
--------------
trunk/CustomerReceipt.php
trunk/SelectProduct.php
trunk/doc/Change.log
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
Modified: trunk/CustomerReceipt.php
===================================================================
--- trunk/CustomerReceipt.php 2011-05-25 10:30:45 UTC (rev 4574)
+++ trunk/CustomerReceipt.php 2011-05-26 10:47:06 UTC (rev 4575)
@@ -209,7 +209,7 @@
}
/*Make an array of the defined bank accounts */
- $SQL = 'SELECT accountcode FROM bankaccounts';
+ $SQL = "SELECT accountcode FROM bankaccounts";
$result = DB_query($SQL,$db);
$BankAccounts = array();
$i=0;
@@ -819,7 +819,7 @@
if (isset($_POST['ReceiptType']) and $_POST['ReceiptType']==$RcptType){
echo '<option selected value="' . $RcptType . '">' . $RcptType .'</option>';
} else {
- echo '<option Value="' .$RcptType . '">' . $RcptType .'</option>';
+ echo '<option value="' .$RcptType . '">' . $RcptType .'</option>';
}
}
echo '</select></td></tr>';
@@ -916,7 +916,7 @@
</tr>
</table><br>';
- echo '<table class=selection>';
+ echo '<table class="selection">';
$DisplayDiscountPercent = number_format($_SESSION['CustomerRecord']['pymtdiscount']*100,2) . '%';
@@ -933,10 +933,10 @@
//Select the tag
echo '<tr><td>' . _('Select Tag') . ':</td><td><select name="tag">';
- $SQL = 'SELECT tagref,
+ $SQL = "SELECT tagref,
tagdescription
FROM tags
- ORDER BY tagref';
+ ORDER BY tagref";
$result=DB_query($SQL,$db);
echo '<option value=0></option>';
@@ -1069,11 +1069,11 @@
echo '</table>';
} //end if results to show
- if (isset($_SESSION['ReceiptBatch']->Items) and count($_SESSION['ReceiptBatch']->Items) > 0){
- echo '<div class="centre"><br/><input tabindex="13" type="submit" name="CommitBatch" VALUE="' . _('Accept and Process Batch') . '"></div>';
- }
+
}
-
+if (isset($_SESSION['ReceiptBatch']->Items) and count($_SESSION['ReceiptBatch']->Items) > 0){
+ echo '<div class="centre"><br/><input tabindex="13" type="submit" name="CommitBatch" value="' . _('Accept and Process Batch') . '"></div>';
+}
echo '</form>';
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/SelectProduct.php
===================================================================
--- trunk/SelectProduct.php 2011-05-25 10:30:45 UTC (rev 4574)
+++ trunk/SelectProduct.php 2011-05-26 10:47:06 UTC (rev 4575)
@@ -1,7 +1,9 @@
<?php
/* $Id$*/
-$PricesSecurity = 12;
+$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
+
include ('includes/session.inc');
$title = _('Search Inventory Items');
include ('includes/header.inc');
@@ -332,7 +334,10 @@
<td width="17%" class="select">' . $QOO . '</td></tr>
</table>'; //end of nested table
echo '</td>'; //end cell of master table
-if ($myrow['mbflag'] == 'B' or ($myrow['mbflag'] == 'M')) {
+
+if (($myrow['mbflag'] == 'B' OR ($myrow['mbflag'] == 'M'))
+ AND (in_array($SuppliersSecurity, $_SESSION['AllowedPageSecurityTokens']))){
+
echo '<td width="50%" valign="top"><table>
<tr><th width="50%">' . _('Supplier') . '</th>
<th width="15%">' . _('Cost') . '</th>
@@ -410,21 +415,9 @@
if ($Its_A_Kitset_Assembly_Or_Dummy == False) {
echo '<a href="' . $rootpath . '/StockAdjustments.php?StockID=' . $StockID . '">' . _('Quantity Adjustments') . '</a><br />';
echo '<a href="' . $rootpath . '/StockTransfers.php?StockID=' . $StockID . '">' . _('Location Transfers') . '</a><br />';
-
- if (function_exists('imagecreatefrompng')){
- $StockImgLink = '
- GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC'.
- '&StockID='.urlencode($StockID).
- '&text='.
- '&width=200'.
- '&height=200'.
- ' ';
- } else {
- if( isset($StockID) and file_exists($_SESSION['part_pics_dir'] . '/' .$StockID.'.jpg') ) {
- $StockImgLink = ' ' . $_SESSION['part_pics_dir'] . '/' .$StockID.'.jpg ';
- } else {
- $StockImgLink = _('No Image');
- }
+ //show the item image if it has been uploaded
+ if( isset($StockID) and file_exists($_SESSION['part_pics_dir'] . '/' .$StockID.'.jpg') ) {
+ echo '<div class="centre"><img src="' . $_SERVER['HTTP_SCHEME'] .'://'. $_SERVER['HTTP_HOST'] . $rootpath . '/' . $_SESSION['part_pics_dir'] . '/' .$StockID.'.jpg ' . '" ></div>';
}
if ($myrow['mbflag'] == 'B') {
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-05-25 10:30:45 UTC (rev 4574)
+++ trunk/doc/Change.log 2011-05-26 10:47:06 UTC (rev 4575)
@@ -1,5 +1,9 @@
webERP Change Log
+26/5/11 Version 4.04 Release
+
+26/5/11 Ricard: require securitytoken 9 to allow user to see purchasing data in SelectProduct.php
+26/5/11 SelectProduct.php fix item image display in centre under item transactions
25/5/11 New Sales Inquiry scripts by sales type/price list by category and top sellers
24/5/11 Updated from launchpad translations those that had changed from 18/4/11 including Viatnamese, Albanian, Russian, Spanish
23/5/11 Tim: Remove SystemCheck.php and code standards changes(launchpad 4711-4718)
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-05-25 10:30:45 UTC (rev 4574)
+++ trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po 2011-05-26 10:47:06 UTC (rev 4575)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: webERP 3.08\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-24 21:53+1200\n"
+"POT-Creation-Date: 2011-05-26 22:38+1200\n"
"PO-Revision-Date: 2011-02-07 15:33+0000\n"
"Last-Translator: Tim Schofield <Unknown>\n"
"Language-Team: Czech <cs...@li...>\n"
@@ -21,7 +21,7 @@
"X-Poedit-Language: Czech\n"
"X-Poedit-SourceCharset: utf-8\n"
-#: AccountGroups.php:7 index.php:1280
+#: AccountGroups.php:7 index.php:1296
msgid "Account Groups"
msgstr "Účetní skupiny"
@@ -221,7 +221,7 @@
#: SelectCompletedOrder.php:11 SelectContract.php:81 SelectCreditItems.php:202
#: SelectCreditItems.php:270 SelectCustomer.php:323 SelectGLAccount.php:19
#: SelectGLAccount.php:79 SelectOrderItems.php:617 SelectOrderItems.php:1443
-#: SelectOrderItems.php:1563 SelectProduct.php:493 SelectSalesOrder.php:458
+#: SelectOrderItems.php:1563 SelectProduct.php:486 SelectSalesOrder.php:458
#: SelectSupplier.php:9 SelectSupplier.php:192 SelectWorkOrder.php:9
#: SelectWorkOrder.php:145 ShipmentCosting.php:11 Shipments.php:17
#: Shippers.php:123 Shippers.php:159 Shipt_Select.php:8
@@ -279,7 +279,7 @@
#: SalesAnalReptCols.php:279 SalesAnalReptCols.php:401
#: SalesAnalReptCols.php:404 SalesAnalRepts.php:404 SalesAnalRepts.php:407
#: SalesAnalRepts.php:430 SalesAnalRepts.php:433 SalesAnalRepts.php:456
-#: SalesAnalRepts.php:459 SelectProduct.php:369 ShipmentCosting.php:627
+#: SalesAnalRepts.php:459 SelectProduct.php:374 ShipmentCosting.php:627
#: Stocks.php:878 Stocks.php:880 Stocks.php:898 Stocks.php:900
#: SuppContractChgs.php:83 SuppLoginSetup.php:508 SuppLoginSetup.php:510
#: SystemParameters.php:376 SystemParameters.php:399 SystemParameters.php:415
@@ -315,7 +315,7 @@
#: SalesAnalReptCols.php:277 SalesAnalReptCols.php:402
#: SalesAnalReptCols.php:405 SalesAnalRepts.php:403 SalesAnalRepts.php:406
#: SalesAnalRepts.php:429 SalesAnalRepts.php:432 SalesAnalRepts.php:455
-#: SalesAnalRepts.php:458 SelectProduct.php:371 ShipmentCosting.php:628
+#: SalesAnalRepts.php:458 SelectProduct.php:376 ShipmentCosting.php:628
#: Stocks.php:873 Stocks.php:875 Stocks.php:893 Stocks.php:895
#: SuppContractChgs.php:85 SuppLoginSetup.php:507 SuppLoginSetup.php:511
#: SystemParameters.php:377 SystemParameters.php:400 SystemParameters.php:416
@@ -446,7 +446,7 @@
msgid "Enter Information"
msgstr "Vložit informace"
-#: AccountSections.php:7 index.php:1285
+#: AccountSections.php:7 index.php:1301
msgid "Account Sections"
msgstr "Sekce účtu"
@@ -664,9 +664,9 @@
msgstr "Datum"
#: AddCustomerNotes.php:107 AddCustomerTypeNotes.php:105 PcReportTab.php:173
-#: Stocks.php:882 UpgradeDatabase.php:163 UpgradeDatabase.php:166
-#: UpgradeDatabase.php:169 UpgradeDatabase.php:172 UpgradeDatabase.php:175
-#: UpgradeDatabase.php:178 UpgradeDatabase.php:181 UpgradeDatabase.php:184
+#: Stocks.php:882 UpgradeDatabase.php:165 UpgradeDatabase.php:168
+#: UpgradeDatabase.php:171 UpgradeDatabase.php:174 UpgradeDatabase.php:177
+#: UpgradeDatabase.php:180 UpgradeDatabase.php:183 UpgradeDatabase.php:186
#: 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
@@ -766,7 +766,7 @@
#: PDFCustomerList.php:18 PDFCustomerList.php:230 PDFCustomerList.php:242
#: PDFLowGP.php:20 PDFStockCheckComparison.php:35
#: PDFStockCheckComparison.php:61 PDFStockCheckComparison.php:262
-#: ReorderLevel.php:57 SelectAsset.php:37 SelectProduct.php:37
+#: ReorderLevel.php:57 SelectAsset.php:37 SelectProduct.php:39
#: StockCheck.php:65 StockCheck.php:139 SupplierTenders.php:326
#: SuppPriceList.php:118 includes/PDFPaymentRun_PymtFooter.php:149
msgid "Problem Report"
@@ -1116,8 +1116,8 @@
#: ReorderLevel.php:207 SalesGraph.php:91 SalesGraph.php:93 SalesGraph.php:111
#: SalesGraph.php:113 SalesGraph.php:134 SalesGraph.php:136 SalesGraph.php:168
#: SalesInquiry.php:1054 SalesInquiry.php:1093 SelectCreditItems.php:923
-#: SelectOrderItems.php:1569 SelectOrderItems.php:1572 SelectProduct.php:501
-#: SelectProduct.php:503 StockDispatch.php:282 StockDispatch.php:284
+#: SelectOrderItems.php:1569 SelectOrderItems.php:1572 SelectProduct.php:494
+#: SelectProduct.php:496 StockDispatch.php:282 StockDispatch.php:284
#: StockLocStatus.php:67 StockLocStatus.php:69 StockLocStatus.php:87
#: StockLocStatus.php:91 StockLocStatus.php:95 StockQuantityByDate.php:21
#: SupplierTenders.php:338 SupplierTenders.php:340 SystemParameters.php:920
@@ -1134,7 +1134,7 @@
msgstr "Tabulka "
#: AuditTrail.php:67 MRPReport.php:768 PO_SelectPurchOrder.php:391
-#: SelectContract.php:196 SelectProduct.php:747
+#: SelectContract.php:196 SelectProduct.php:740
msgid "View"
msgstr "Zobrazit"
@@ -1151,15 +1151,14 @@
#: CustomerTransInquiry.php:21 CustomerTransInquiry.php:85
#: CustWhereAlloc.php:17 CustWhereAlloc.php:88 DailyBankTransactions.php:104
#: GLAccountInquiry.php:152 GLAccountReportphp:155 GLAccountReport.php:367
-#: GLJournal.php:240 MRPReschedules.php:178 Nasser_SalesInquiry.php:328
-#: SelectCustomer.php:462 ShipmentCosting.php:506 ShipmentCosting.php:577
-#: StockCategories.php:215 StockLocMovements.php:81 StockMovements.php:90
-#: SupplierAllocations.php:452 SupplierInquiry.php:199
-#: SupplierTransInquiry.php:19 SupplierTransInquiry.php:86
-#: Z_CheckAllocationsFrom.php:26 Z_CheckAllocationsFrom.php:49
-#: Z_CheckAllocs.php:57 Z_CheckGLTransBalance.php:11
-#: includes/InputSerialItemsFile.php:86 includes/InputSerialItemsFile.php:126
-#: includes/PDFTaxPageHeader.inc:34
+#: GLJournal.php:240 MRPReschedules.php:178 SelectCustomer.php:462
+#: ShipmentCosting.php:506 ShipmentCosting.php:577 StockCategories.php:215
+#: StockLocMovements.php:81 StockMovements.php:90 SupplierAllocations.php:452
+#: SupplierInquiry.php:199 SupplierTransInquiry.php:19
+#: SupplierTransInquiry.php:86 Z_CheckAllocationsFrom.php:26
+#: Z_CheckAllocationsFrom.php:49 Z_CheckAllocs.php:57
+#: Z_CheckGLTransBalance.php:11 includes/InputSerialItemsFile.php:86
+#: includes/InputSerialItemsFile.php:126 includes/PDFTaxPageHeader.inc:34
msgid "Type"
msgstr "Typ"
@@ -1172,7 +1171,7 @@
msgid "Field Name"
msgstr "Název pole"
-#: AuditTrail.php:149 Nasser_SupplierWise.php:176 SystemParameters.php:314
+#: AuditTrail.php:149 SystemParameters.php:314
#: includes/PDFOstdgGRNsPageHeader.inc:43
msgid "Value"
msgstr "Hodnota"
@@ -1791,29 +1790,27 @@
#: InventoryPlanningPrefSupplier.php:83 InventoryQuantities.php:223
#: MRPDemands.php:291 MRPDemands.php:381 MRPPlannedPurchaseOrders.php:326
#: MRPPlannedWorkOrders.php:259 MRPPlannedWorkOrders.php:387 MRPReport.php:413
-#: MRPReport.php:419 MRPReschedules.php:179 Nasser_SupplierWise.php:172
-#: Nasser_SupplierWise.php:173 Nasser_TopSalesInquiry.php:223
-#: OffersReceived.php:95 OffersReceived.php:197 OffersReceived.php:244
-#: OrderDetails.php:155 PDFOrdersInvoiced.php:384 POReport.php:743
-#: POReport.php:1428 PrintCustTrans.php:801 PrintCustTrans.php:889
-#: PrintCustTrans.php:936 PrintCustTransPortrait.php:857
-#: PrintCustTransPortrait.php:940 PrintCustTransPortrait.php:984
-#: RecurringSalesOrders.php:321 ReorderLevel.php:256 ReverseGRN.php:379
-#: ReverseGRN.php:380 SalesAnalReptCols.php:18 SalesAnalReptCols.php:20
-#: SalesGraph.php:177 SalesGraph.php:258 SalesInquiry.php:966
-#: SelectCreditItems.php:651 SelectCreditItems.php:1004
-#: SelectOrderItems.php:1305 SelectOrderItems.php:1454
-#: SelectOrderItems.php:1634 SelectOrderItems.php:1758 ShipmentCosting.php:144
-#: ShipmentCosting.php:145 Shipments.php:385 Shipments.php:387
-#: Shipments.php:388 Shipments.php:463 Shipments.php:465 SpecialOrder.php:542
-#: StockCounts.php:98 StockLocMovements.php:85 StockLocTransfer.php:179
-#: StockMovements.php:95 StockStatus.php:312 StockUsageGraph.php:12
-#: SuppCreditGRNs.php:227 SuppCreditGRNs.php:228 SupplierCredit.php:313
-#: SupplierTenders.php:265 SupplierTenders.php:493 WOSerialNos.php:249
-#: WOSerialNos.php:282 includes/InputSerialItems.php:104
-#: includes/InputSerialItems.php:110 includes/OutputSerialItems.php:39
-#: includes/OutputSerialItems.php:44 includes/OutputSerialItems.php:50
-#: includes/PDFBOMListingPageHeader.inc:44
+#: MRPReport.php:419 MRPReschedules.php:179 OffersReceived.php:95
+#: OffersReceived.php:197 OffersReceived.php:244 OrderDetails.php:155
+#: PDFOrdersInvoiced.php:384 POReport.php:743 POReport.php:1428
+#: PrintCustTrans.php:801 PrintCustTrans.php:889 PrintCustTrans.php:936
+#: PrintCustTransPortrait.php:857 PrintCustTransPortrait.php:940
+#: PrintCustTransPortrait.php:984 RecurringSalesOrders.php:321
+#: ReorderLevel.php:256 ReverseGRN.php:379 ReverseGRN.php:380
+#: SalesAnalReptCols.php:18 SalesAnalReptCols.php:20 SalesGraph.php:177
+#: SalesGraph.php:258 SalesInquiry.php:966 SelectCreditItems.php:651
+#: SelectCreditItems.php:1004 SelectOrderItems.php:1305
+#: SelectOrderItems.php:1454 SelectOrderItems.php:1634
+#: SelectOrderItems.php:1758 ShipmentCosting.php:144 ShipmentCosting.php:145
+#: Shipments.php:385 Shipments.php:387 Shipments.php:388 Shipments.php:463
+#: Shipments.php:465 SpecialOrder.php:542 StockCounts.php:98
+#: StockLocMovements.php:85 StockLocTransfer.php:179 StockMovements.php:95
+#: StockStatus.php:312 StockUsageGraph.php:12 SuppCreditGRNs.php:227
+#: SuppCreditGRNs.php:228 SupplierCredit.php:313 SupplierTenders.php:265
+#: SupplierTenders.php:493 WOSerialNos.php:249 WOSerialNos.php:282
+#: includes/InputSerialItems.php:104 includes/InputSerialItems.php:110
+#: includes/OutputSerialItems.php:39 includes/OutputSerialItems.php:44
+#: includes/OutputSerialItems.php:50 includes/PDFBOMListingPageHeader.inc:44
#: includes/PDFDeliveryDifferencesPageHeader.inc:43
#: includes/PDFDIFOTPageHeader.inc:42
#: includes/PDFInventoryValnPageHeader.inc:33
@@ -2062,7 +2059,7 @@
#: SecurityTokens.php:92 SecurityTokens.php:102 SelectAsset.php:243
#: SelectCompletedOrder.php:536 SelectContract.php:156
#: SelectCreditItems.php:957 SelectOrderItems.php:1448
-#: SelectOrderItems.php:1628 SelectProduct.php:513 SelectProduct.php:718
+#: SelectOrderItems.php:1628 SelectProduct.php:506 SelectProduct.php:711
#: SelectSalesOrder.php:498 SelectWorkOrder.php:183 Shipt_Select.php:180
#: StockCategories.php:214 StockDispatch.php:356 StockDispatch.php:363
#: StockLocStatus.php:154 StockQuantityByDate.php:96 SuppCreditGRNs.php:74
@@ -2169,7 +2166,7 @@
#: SelectCreditItems.php:942 SelectCustomer.php:331 SelectCustomer.php:337
#: SelectCustomer.php:344 SelectCustomer.php:351 SelectCustomer.php:395
#: SelectGLAccount.php:92 SelectOrderItems.php:627 SelectOrderItems.php:630
-#: SelectOrderItems.php:1597 SelectProduct.php:520 SelectSalesOrder.php:486
+#: SelectOrderItems.php:1597 SelectProduct.php:513 SelectSalesOrder.php:486
#: SelectSupplier.php:200 SelectWorkOrder.php:171 Shipt_Select.php:166
#: SuppFixedAssetChgs.php:116 SupplierTenders.php:359 WorkOrderEntry.php:582
#: WorkOrderIssue.php:646
@@ -2184,7 +2181,7 @@
#: BOMInquiry.php:25 BOMs.php:802 MRPDemands.php:331 MRPReport.php:542
#: PO_SelectOSPurchOrder.php:199 PO_SelectPurchOrder.php:170
-#: SalesCategories.php:422 SelectProduct.php:520 Shipt_Select.php:166
+#: SalesCategories.php:422 SelectProduct.php:513 Shipt_Select.php:166
#: StockAdjustments.php:69 StockAdjustments.php:324 StockCounts.php:97
#: StockCounts.php:132 StockMovements.php:31 StockReorderLevel.php:44
#: StockStatus.php:61 StockTransfers.php:38 StockTransfers.php:445
@@ -2199,7 +2196,7 @@
#: MRPDemands.php:335 MRPReport.php:550 PO_Header.php:532 PO_Items.php:911
#: SelectAsset.php:102 SelectCreditItems.php:213 SelectCreditItems.php:947
#: SelectCustomer.php:418 SelectGLAccount.php:98 SelectOrderItems.php:635
-#: SelectOrderItems.php:1604 SelectProduct.php:528 SelectSupplier.php:208
+#: SelectOrderItems.php:1604 SelectProduct.php:521 SelectSupplier.php:208
#: SelectSupplier.php:241 SupplierTenders.php:367 WorkOrderEntry.php:586
#: WorkOrderIssue.php:650
msgid "Search Now"
@@ -2208,7 +2205,7 @@
#: BOMInquiry.php:36 BOMs.php:735 ContractBOM.php:49 MRPDemands.php:56
#: MRPReport.php:568 PO_Items.php:745 PO_SelectOSPurchOrder.php:61
#: PO_SelectPurchOrder.php:43 SelectCompletedOrder.php:92
-#: SelectCreditItems.php:276 SelectProduct.php:541 SelectSalesOrder.php:348
+#: SelectCreditItems.php:276 SelectProduct.php:534 SelectSalesOrder.php:348
#: SelectWorkOrder.php:33 Shipt_Select.php:60 SupplierTenders.php:379
#: WorkOrderEntry.php:62 WorkOrderIssue.php:378
msgid ""
@@ -2241,7 +2238,7 @@
#: ReorderLevelLocation.php:203 SalesPeople.php:184
#: SelectCompletedOrder.php:535 SelectCreditItems.php:220
#: SelectCreditItems.php:956 SelectCustomer.php:458 SelectGLAccount.php:105
-#: SelectOrderItems.php:1447 SelectOrderItems.php:1627 SelectProduct.php:717
+#: SelectOrderItems.php:1447 SelectOrderItems.php:1627 SelectProduct.php:710
#: SelectSalesOrder.php:497 SelectSupplier.php:245 SelectWorkOrder.php:182
#: Shipt_Select.php:179 SpecialOrder.php:132 SupplierTenders.php:489
#: SuppPriceList.php:272 TopItems.php:162 WorkOrderEntry.php:597
@@ -2256,8 +2253,8 @@
#: MRPReport.php:741 OffersReceived.php:96 PO_Items.php:927
#: PO_SelectOSPurchOrder.php:213 PO_SelectPurchOrder.php:181
#: SelectCompletedOrder.php:540 SelectCreditItems.php:958
-#: SelectOrderItems.php:1449 SelectOrderItems.php:1629 SelectProduct.php:110
-#: SelectProduct.php:720 SelectSalesOrder.php:500 SelectWorkOrder.php:185
+#: SelectOrderItems.php:1449 SelectOrderItems.php:1629 SelectProduct.php:112
+#: SelectProduct.php:713 SelectSalesOrder.php:500 SelectWorkOrder.php:185
#: Shipments.php:386 Shipments.php:464 Shipt_Select.php:183
#: StockLocTransferReceive.php:435 SupplierTenders.php:491 TopItems.php:165
#: WorkOrderCosting.php:84 WorkOrderEntry.php:599 WorkOrderIssue.php:669
@@ -2321,7 +2318,7 @@
msgid "to view the costed bill of material for"
msgstr "Pro zobrazení vyčíslením nákladů, vyúčtování materiálu pro"
-#: BOMListing.php:14 BOMListing.php:15 BOMListing.php:110 index.php:804
+#: BOMListing.php:14 BOMListing.php:15 BOMListing.php:110 index.php:820
msgid "Bill Of Material Listing"
msgstr "Kusovníku Výpis"
@@ -2385,9 +2382,9 @@
#: BOMs.php:120 BOMs.php:126 BOMs.php:130 BOMs.php:831 OrderDetails.php:177
#: PaymentTerms.php:188 PaymentTerms.php:194 PO_SelectOSPurchOrder.php:473
-#: SalesAnalReptCols.php:280 SelectProduct.php:108 SelectProduct.php:152
-#: SelectProduct.php:165 SelectProduct.php:249 SelectProduct.php:250
-#: SelectProduct.php:739
+#: SalesAnalReptCols.php:280 SelectProduct.php:110 SelectProduct.php:154
+#: SelectProduct.php:167 SelectProduct.php:251 SelectProduct.php:252
+#: SelectProduct.php:732
msgid "N/A"
msgstr "N / A"
@@ -2542,8 +2539,7 @@
msgid "Assembly"
msgstr "Sestava"
-#: BOMs.php:400 FixedAssetRegister.php:357 Nasser_SupplierWise.php:172
-#: Stocks.php:830 Stocks.php:832
+#: BOMs.php:400 FixedAssetRegister.php:357 Stocks.php:830 Stocks.php:832
msgid "Purchased"
msgstr "Koupeno"
@@ -2594,7 +2590,7 @@
msgid "Location"
msgstr "Umístění"
-#: BOMs.php:515 index.php:858 WhereUsedInquiry.php:66
+#: BOMs.php:515 index.php:874 WhereUsedInquiry.php:66
msgid "Work Centre"
msgstr "Výrobní středisko"
@@ -2723,7 +2719,7 @@
msgstr "Jste si jisti, že chcete smazat tuto cenu?"
#: COGSGLPostings.php:195 CustomerReceipt.php:954 FixedAssetJournal.php:354
-#: GLJournal.php:341 GLTransInquiry.php:43 index.php:1270 Payments.php:985
+#: GLJournal.php:341 GLTransInquiry.php:43 index.php:1286 Payments.php:985
#: SupplierTransInquiry.php:146 TaxAuthorities.php:146 TaxAuthorities.php:147
msgid "GL Account"
msgstr "GL účtu"
@@ -2749,7 +2745,7 @@
msgid "Post to GL account"
msgstr "Příspěvek na účet GL"
-#: CompanyPreferences.php:7 index.php:947
+#: CompanyPreferences.php:7 index.php:963
msgid "Company Preferences"
msgstr "Nastavení firmy"
@@ -3215,20 +3211,17 @@
#: GLTrialBalance.php:229 GLTrialBalance.php:250 GLTrialBalance.php:346
#: GLTrialBalance.php:484 GLTrialBalance.php:504 GLTrialBalance.php:528
#: GLTrialBalance.php:632 GLTrialBalance.php:652 GLTrialBalance.php:676
-#: Nasser_SalesInquiry.php:367 Nasser_SalesInquiry.php:402
-#: Nasser_SalesInquiry.php:437 Nasser_SalesInquiry.php:472
-#: Nasser_SalesInquiry.php:533 OffersReceived.php:98 OrderDetails.php:159
-#: PDFCustTransListing.php:125 PDFOrdersInvoiced.php:386
-#: PDFRemittanceAdvice.php:310 PDFSuppTransListing.php:125
-#: RecurringSalesOrders.php:325 SelectCreditItems.php:656
-#: SelectCreditItems.php:660 SelectOrderItems.php:1314 SuppContractChgs.php:98
-#: SuppFixedAssetChgs.php:91 SupplierAllocations.php:456
-#: SupplierAllocations.php:560 SupplierAllocations.php:631
-#: SupplierCredit.php:394 SupplierCredit.php:429 SupplierCredit.php:464
-#: SupplierInquiry.php:202 SupplierInvoice.php:332 SupplierInvoice.php:362
-#: SupplierInvoice.php:395 SupplierInvoice.php:424 SuppShiptChgs.php:96
-#: SuppTransGLAnalysis.php:132 Z_CheckDebtorsControl.php:157
-#: includes/PDFQuotationPageHeader.inc:107
+#: OffersReceived.php:98 OrderDetails.php:159 PDFCustTransListing.php:125
+#: PDFOrdersInvoiced.php:386 PDFRemittanceAdvice.php:310
+#: PDFSuppTransListing.php:125 RecurringSalesOrders.php:325
+#: SelectCreditItems.php:656 SelectCreditItems.php:660
+#: SelectOrderItems.php:1314 SuppContractChgs.php:98 SuppFixedAssetChgs.php:91
+#: SupplierAllocations.php:456 SupplierAllocations.php:560
+#: SupplierAllocations.php:631 SupplierCredit.php:394 SupplierCredit.php:429
+#: SupplierCredit.php:464 SupplierInquiry.php:202 SupplierInvoice.php:332
+#: SupplierInvoice.php:362 SupplierInvoice.php:395 SupplierInvoice.php:424
+#: SuppShiptChgs.php:96 SuppTransGLAnalysis.php:132
+#: Z_CheckDebtorsControl.php:157 includes/PDFQuotationPageHeader.inc:107
#: includes/PDFQuotationPortraitPageHeader.inc:106
#: includes/PO_PDFOrderPageHeader.inc:82 api/api_debtortransactions.php:364
#: api/api_debtortransactions.php:377 api/api_debtortransactions.php:503
@@ -3794,7 +3787,7 @@
#: DeliveryDetails.php:599 DeliveryDetails.php:606 DeliveryDetails.php:787
#: MRPReport.php:412 PDFOrdersInvoiced.php:298 PDFOrderStatus.php:271
#: SelectCompletedOrder.php:585 SelectContract.php:152
-#: SelectOrderItems.php:741 SelectProduct.php:374 Shipments.php:383
+#: SelectOrderItems.php:741 SelectProduct.php:379 Shipments.php:383
#: Shipments.php:461 SuppCreditGRNs.php:151 SuppCreditGRNs.php:229
#: SuppInvGRNs.php:279 TaxGroups.php:271
#: includes/PDFDeliveryDifferencesPageHeader.inc:41
@@ -4278,9 +4271,8 @@
#: ContractBOM.php:365 CounterSales.php:2001 FixedAssetItems.php:461
#: FixedAssetItems.php:465 PO_Items.php:949 SalesCategories.php:249
#: SelectCreditItems.php:971 SelectOrderItems.php:1461
-#: SelectOrderItems.php:1636 SelectProduct.php:426 Stocks.php:718
-#: Stocks.php:722 SupplierTenders.php:518 WorkOrderEntry.php:617
-#: WorkOrderIssue.php:684
+#: SelectOrderItems.php:1636 Stocks.php:718 Stocks.php:722
+#: SupplierTenders.php:518 WorkOrderEntry.php:617 WorkOrderIssue.php:684
msgid "No Image"
msgstr "Obrázek není k dispozici"
@@ -4380,12 +4372,11 @@
msgid "Budgeted Other Costs"
msgstr "Ostatní náklady do rozpočtu"
-#: ContractCosting.php:147 Nasser_SupplierWise.php:170 OffersReceived.php:93
-#: PO_AuthoriseMyOrders.php:59 PO_SelectOSPurchOrder.php:435
-#: PO_SelectPurchOrder.php:392 PurchData.php:170 ReprintGRN.php:70
-#: SelectProduct.php:337 SelectSupplier.php:140 ShipmentCosting.php:505
-#: ShipmentCosting.php:576 Shipt_Select.php:280 ShiptsList.php:11
-#: SupplierAllocations.php:557 SupplierAllocations.php:628
+#: ContractCosting.php:147 OffersReceived.php:93 PO_AuthoriseMyOrders.php:59
+#: PO_SelectOSPurchOrder.php:435 PO_SelectPurchOrder.php:392 PurchData.php:170
+#: ReprintGRN.php:70 SelectProduct.php:342 SelectSupplier.php:140
+#: ShipmentCosting.php:505 ShipmentCosting.php:576 Shipt_Select.php:280
+#: ShiptsList.php:11 SupplierAllocations.php:557 SupplierAllocations.php:628
#: SupplierCredit.php:264 SupplierInquiry.php:114 SupplierInvoice.php:230
#: SupplierTransInquiry.php:90 SuppLoginSetup.php:23 SuppPriceList.php:199
#: SuppPriceList.php:257 includes/PDFAgedSuppliersPageHeader.inc:34
@@ -5030,13 +5021,11 @@
msgid "Contract Reference"
msgstr "Referenční zakázky"
-#: Contracts.php:846 InventoryQuantities.php:212
-#: Nasser_SalesCategoryInquiry.php:163 Nasser_TopSalesInquiry.php:219
-#: PDFPriceList.php:352 PDFPrintLabel.php:94 PricesByCost.php:204
-#: ReorderLevelLocation.php:189 ReorderLevel.php:242 SpecialOrder.php:606
-#: StockDispatch.php:344 Stocks.php:728 SuppPriceList.php:211
-#: SuppPriceList.php:261 Z_PriceChanges.php:37
-#: includes/PDFInventoryValnPageHeader.inc:32
+#: Contracts.php:846 InventoryQuantities.php:212 PDFPriceList.php:352
+#: PDFPrintLabel.php:94 PricesByCost.php:204 ReorderLevelLocation.php:189
+#: ReorderLevel.php:242 SpecialOrder.php:606 StockDispatch.php:344
+#: Stocks.php:728 SuppPriceList.php:211 SuppPriceList.php:261
+#: Z_PriceChanges.php:37 includes/PDFInventoryValnPageHeader.inc:32
#: includes/PDFInventoryValnPageHeader.inc:38
#: includes/PDFPriceListPageHeader.inc:38
msgid "Category"
@@ -5088,10 +5077,9 @@
#: Contracts.php:894 GLProfit_Loss.php:293 GLProfit_Loss.php:482
#: GLProfit_Loss.php:787 GLProfit_Loss.php:1090 GLTagProfit_Loss.php:285
#: GLTagProfit_Loss.php:423 GLTagProfit_Loss.php:654 GLTagProfit_Loss.php:876
-#: Nasser_SalesCategoryInquiry.php:168 Nasser_SalesInquiry.php:334
#: SalesAnalReptCols.php:33 SalesAnalReptCols.php:35 SalesGraph.php:176
-#: SalesGraph.php:193 SalesGraph.php:256 SelectProduct.php:147
-#: SelectProduct.php:160
+#: SalesGraph.php:193 SalesGraph.php:256 SelectProduct.php:149
+#: SelectProduct.php:162
#, php-format
msgid "Gross Profit"
msgstr "Hrubý zisk"
@@ -5746,7 +5734,7 @@
#: CounterSales.php:2166 CounterSales.php:2289 MRPReport.php:729
#: SelectAsset.php:236 SelectCustomer.php:453 SelectCustomer.php:529
-#: SelectOrderItems.php:1626 SelectOrderItems.php:1742 SelectProduct.php:708
+#: SelectOrderItems.php:1626 SelectOrderItems.php:1742 SelectProduct.php:701
#: SelectSupplier.php:238 SelectSupplier.php:298
msgid "Next"
msgstr "Další"
@@ -6476,7 +6464,7 @@
#: MRPDemandTypes.php:17 MRP.php:515 MRPPlannedPurchaseOrders.php:267
#: MRPPlannedWorkOrders.php:247 MRPPlannedWorkOrders.php:326
#: PricesByCost.php:8 ReorderLevelLocation.php:13 ReorderLevel.php:161
-#: SelectProduct.php:71 StockDispatch.php:219 StockMovements.php:19
+#: SelectProduct.php:73 StockDispatch.php:219 StockMovements.php:19
#: StockQties_csv.php:8 StockQuantityByDate.php:9 StockReorderLevel.php:17
#: StockSerialItemResearch.php:10 StockSerialItems.php:10 StockStatus.php:44
#: StockTransferControlled.php:14 SuppLoginSetup.php:14 WWW_Users.php:16
@@ -6708,8 +6696,7 @@
msgid "Legal"
msgstr "Právní"
-#: CustLoginSetup.php:574 Nasser_TopSalesInquiry.php:78 SuppLoginSetup.php:505
-#: WWW_Users.php:602
+#: CustLoginSetup.php:574 SuppLoginSetup.php:505 WWW_Users.php:602
msgid "Display"
msgstr "Zobrazení"
@@ -7363,7 +7350,7 @@
#: CustomerInquiry.php:128 CustomerReceipt.php:895 Customers.php:551
#: Customers.php:827 Customers.php:831 Customers.php:847 Customers.php:866
-#: Customers.php:870 index.php:1062
+#: Customers.php:870 index.php:1078
msgid "Credit Status"
msgstr "Stav úvěru"
@@ -7812,7 +7799,7 @@
msgid "Enter A GL Receipt"
msgstr "Zadejte GL Příjem"
-#: CustomerReceipt.php:1073
+#: CustomerReceipt.php:1075
msgid "Accept and Process Batch"
msgstr "Přijímat a zpracovávat šarže"
@@ -8067,7 +8054,7 @@
"Nejsou žádné platební podmínky v současné době definovány - přejděte na "
"kartu Nastavení v hlavním menu a nastavit alespoň jeden jako první"
-#: Customers.php:541 Customers.php:808 Customers.php:811 index.php:1067
+#: Customers.php:541 Customers.php:808 Customers.php:811 index.php:1083
#: PaymentTerms.php:13 PO_Header.php:1041 PrintCustTrans.php:370
#: PrintCustTransPortrait.php:435 Suppliers.php:702 Suppliers.php:878
#: includes/PO_PDFOrderPageHeader.inc:62 includes/PO_PDFOrderPageHeader.inc:64
@@ -8192,11 +8179,11 @@
msgid "Click to preview the credit"
msgstr "Klikněte pro náhled úvěr"
-#: CustomerTypes.php:6 CustomerTypes.php:21 index.php:1052
+#: CustomerTypes.php:6 CustomerTypes.php:21 index.php:1068
msgid "Customer Types"
msgstr "Typy zákazníků"
-#: CustomerTypes.php:6 index.php:1489 index.php:1492 SupplierTypes.php:6
+#: CustomerTypes.php:6 index.php:1505 index.php:1508 SupplierTypes.php:6
msgid "Maintenance"
msgstr "Nastavení"
@@ -8456,9 +8443,7 @@
msgid "Show Daily Sales For The Selected Month"
msgstr "Zobrazit Denní tržby za vybraný měsíc"
-#: DailySalesInquiry.php:89 Nasser_SalesCategoryInquiry.php:156
-#: Nasser_SalesInquiry.php:320 Nasser_SupplierWise.php:163
-#: Nasser_TopSalesInquiry.php:210
+#: DailySalesInquiry.php:89
msgid "The sales data could not be retrieved because"
msgstr "Údaje o prodeji se nepodařilo získat, protože"
@@ -8897,7 +8882,7 @@
msgid "Demand Work Orders"
msgstr "Hledat práci Objednávky"
-#: DemandWorkOrders.php:46 SelectProduct.php:280
+#: DemandWorkOrders.php:46 SelectProduct.php:282
msgid ""
"The quantity on work orders for this product cannot be retrieved because"
msgstr ""
@@ -8982,7 +8967,6 @@
msgstr "Slevová skupina"
#: DiscountCategories.php:199 InventoryPlanningPrefSupplier.php:77
-#: Nasser_SupplierWise.php:171 Nasser_TopSalesInquiry.php:218
#: PDFPriceList.php:352 SelectWorkOrder.php:300 ShipmentCosting.php:143
#: ShipmentCosting.php:509 Shipments.php:384 Shipments.php:462
#: StockUsage.php:52 SuppCreditGRNs.php:226 SuppInvGRNs.php:233
@@ -9125,14 +9109,14 @@
msgid "Heading"
msgstr "Okruh"
-#: EDIMessageFormat.php:218 EDIMessageFormat.php:220
-#: Nasser_SupplierWise.php:52 POReport.php:1485 SalesInquiry.php:1035
+#: EDIMessageFormat.php:218 EDIMessageFormat.php:220 POReport.php:1485
+#: SalesInquiry.php:1035
msgid "Detail"
msgstr "Detail"
#: EDIMessageFormat.php:223 EDIMessageFormat.php:225 GLBalanceSheet.php:51
-#: GLProfit_Loss.php:89 GLTagProfit_Loss.php:103 Nasser_SupplierWise.php:57
-#: POReport.php:1486 SalesInquiry.php:1036 Tax.php:240
+#: GLProfit_Loss.php:89 GLTagProfit_Loss.php:103 POReport.php:1486
+#: SalesInquiry.php:1036 Tax.php:240
msgid "Summary"
msgstr "Shrnutí"
@@ -10096,9 +10080,8 @@
msgid "Date Purchased"
msgstr "Datum Zakoupeno"
-#: FixedAssetDepreciation.php:86 Nasser_SupplierWise.php:174
-#: Nasser_SupplierWise.php:175 PricesByCost.php:123 SalesAnalReptCols.php:38
-#: SalesAnalReptCols.php:40 SelectProduct.php:184 SelectProduct.php:338
+#: FixedAssetDepreciation.php:86 PricesByCost.php:123 SalesAnalReptCols.php:38
+#: SalesAnalReptCols.php:40 SelectProduct.php:186 SelectProduct.php:343
#: ShipmentCosting.php:148 ShipmentCosting.php:149 StockCostUpdate.php:149
#: includes/PDFAssetRegisterHeader.inc:66
#: includes/PDFAssetRegisterHeader.inc:69
@@ -10176,8 +10159,7 @@
"depreciation of the asset was:"
msgstr "Následující SQL byl použit k pokusu aktualizovat oprávky majetku bylo:"
-#: FixedAssetDepreciation.php:236 Nasser_SalesCategoryInquiry.php:209
-#: Nasser_SalesInquiry.php:548 Nasser_TopSalesInquiry.php:265
+#: FixedAssetDepreciation.php:236
msgid "GRAND Total"
msgstr "Celkový součet"
@@ -10733,7 +10715,7 @@
msgid "Depn C/Fwd"
msgstr "Depn C / Vpřed"
-#: FixedAssetTransfer.php:7 index.php:1326
+#: FixedAssetTransfer.php:7 index.php:1342
msgid "Change Asset Location"
msgstr "Změna umístění aktiv"
@@ -10742,7 +10724,7 @@
msgstr "V kategorii Asset"
#: FixedAssetTransfer.php:50 FixedAssetTransfer.php:61 MRPReport.php:535
-#: MRPReport.php:542 SelectProduct.php:513 SelectProduct.php:520
+#: MRPReport.php:542 SelectProduct.php:506 SelectProduct.php:513
#: SupplierTenders.php:350 SupplierTenders.php:359
msgid "Enter partial"
msgstr "Zadejte část"
@@ -11160,7 +11142,7 @@
msgid "Geocode Generate"
msgstr "Vytvořit geokód"
-#: geocode.php:26 GeocodeSetup.php:134 GeocodeSetup.php:226 index.php:1022
+#: geocode.php:26 GeocodeSetup.php:134 GeocodeSetup.php:226 index.php:1038
msgid "Geocode Setup"
msgstr "Geokód Nastavení"
@@ -11460,9 +11442,8 @@
msgstr "Celkem za období"
#: GLAccountInquiry.php:236 GLAccountReportphp:231 GLBudgets.php:165
-#: GLTransInquiry.php:42 Nasser_SalesInquiry.php:327
-#: Z_CheckDebtorsControl.php:78 Z_CheckGLTransBalance.php:13
-#: Z_UpdateChartDetailsBFwd.php:78
+#: GLTransInquiry.php:42 Z_CheckDebtorsControl.php:78
+#: Z_CheckGLTransBalance.php:13 Z_UpdateChartDetailsBFwd.php:78
msgid "Period"
msgstr "Období"
@@ -11659,7 +11640,7 @@
#: GLAccounts.php:274 GLBalanceSheet.php:12 GLBalanceSheet.php:21
#: GLBalanceSheet.php:66 GLBalanceSheet.php:67 GLBalanceSheet.php:90
-#: GLBalanceSheet.php:128 index.php:1246 SelectGLAccount.php:46
+#: GLBalanceSheet.php:128 index.php:1262 SelectGLAccount.php:46
#: SelectGLAccount.php:59
msgid "Balance Sheet"
msgstr "Rozvaha"
@@ -11877,7 +11858,7 @@
msgid "Group"
msgstr "Skupina"
-#: GLJournal.php:8 index.php:1187
+#: GLJournal.php:8 index.php:1203
msgid "Journal Entry"
msgstr "Zápis do deníku"
@@ -12157,7 +12138,7 @@
#: GLTrialBalance.php:14 GLTrialBalance.php:28 GLTrialBalance.php:108
#: GLTrialBalance.php:109 GLTrialBalance.php:151 GLTrialBalance.php:432
-#: index.php:1206
+#: index.php:1222
msgid "Trial Balance"
msgstr "Předvaha"
@@ -12261,7 +12242,7 @@
msgid "Receive controlled item"
msgstr "Dostávat kontrolované položky"
-#: GoodsReceived.php:22 index.php:567
+#: GoodsReceived.php:22 index.php:583
msgid "Receive Purchase Orders"
msgstr "Dostávat Objednávky"
@@ -12290,7 +12271,7 @@
msgid "has a status of"
msgstr "má statut"
-#: GoodsReceived.php:63 index.php:577 PO_SelectOSPurchOrder.php:444
+#: GoodsReceived.php:63 index.php:593 PO_SelectOSPurchOrder.php:444
#: PO_SelectOSPurchOrder.php:461 PO_SelectOSPurchOrder.php:463
#: SelectWorkOrder.php:297 SelectWorkOrder.php:332
#: StockLocTransferReceive.php:554 WorkOrderCosting.php:87
@@ -12582,8 +12563,7 @@
msgid "Process Goods Received"
msgstr "Proces přijetí zboží"
-#: index.php:11 Nasser_SalesInquiry.php:328 Nasser_SupplierWise.php:176
-#: Nasser_TopSalesInquiry.php:223 ReverseGRN.php:31 SelectSalesOrder.php:313
+#: index.php:11 ReverseGRN.php:31 SelectSalesOrder.php:313
msgid "Sales"
msgstr "Prodeje"
@@ -12649,679 +12629,694 @@
msgstr "Hlášení fakturovaných objednávek"
#: index.php:191
+#, fuzzy
+msgid "Sales By Sales Type Inquiry"
+msgstr "Denní prodej Poptávka"
+
+#: index.php:196
+#, fuzzy
+msgid "Sales By Category Inquiry"
+msgstr "Hlášení analýzy prodeje"
+
+#: index.php:201
+#, fuzzy
+msgid "Top Sellers Inquiry"
+msgstr "Prodej Poptávka"
+
+#: index.php:207
msgid "Order Delivery Differences Report"
msgstr "Hlášení rozdílů v dodaných množstvích"
-#: index.php:196 PDFDIFOT.php:24
+#: index.php:212 PDFDIFOT.php:24
msgid "Delivery In Full On Time (DIFOT) Report"
msgstr "Dodávka, v plném rozsahu Time (DIFOT) Zpráva"
-#: index.php:201
+#: index.php:217
msgid "Sales Order Detail Or Summary Inquiries"
msgstr "Prodejní objednávky Detail Nebo Shrnutí Dotazy"
-#: index.php:206
+#: index.php:222
msgid "Top Sales Items Report"
msgstr "Prodej top položky Zpráva"
-#: index.php:211
+#: index.php:227
msgid "Sales With Low Gross Profit Report"
msgstr "Prodej s nízkým hrubý zisk Zpráva"
-#: index.php:229 SelectContract.php:8
+#: index.php:245 SelectContract.php:8
msgid "Select Contract"
msgstr "Vyberte smlouvy"
-#: index.php:234
+#: index.php:250
msgid "Create Contract"
msgstr "Vytvoření smlouvy"
-#: index.php:267
+#: index.php:283
msgid "Select Order to Invoice"
msgstr "Zvolit objednávku k fakturaci"
-#: index.php:272
+#: index.php:288
msgid "Create A Credit Note"
msgstr "Vytvořit dobropis"
-#: index.php:277
+#: index.php:293
msgid "Enter Receipts"
msgstr "Vložit příjmové doklady"
-#: index.php:283 SelectCustomer.php:296
+#: index.php:299 SelectCustomer.php:296
msgid "Allocate Receipts or Credit Notes"
msgstr "Přiřadit příjmové doklady / dobropisy"
-#: index.php:292
+#: index.php:308
msgid "Where Allocated Inquiry"
msgstr "Kde Přidělené Poptávka"
-#: index.php:299 index.php:301 PrintCustTrans.php:475
+#: index.php:315 index.php:317 PrintCustTrans.php:475
#: PrintCustTransPortrait.php:526
msgid "Print Invoices or Credit Notes"
msgstr "Tisk faktur / dobropisů"
-#: index.php:308 PrintCustStatements.php:87 PrintCustStatements.php:420
+#: index.php:324 PrintCustStatements.php:87 PrintCustStatements.php:420
msgid "Print Statements"
msgstr "Tisk přehledů"
-#: index.php:313
+#: index.php:329
msgid "Sales Analysis Reports"
msgstr "Hlášení analýz prodeje"
-#: index.php:318
+#: index.php:334
msgid "Aged Customer Balances/Overdues Report"
msgstr "Zákazník ve věku Váhy / Overdues zpráva"
-#: index.php:323
+#: index.php:339
msgid "Re-Print A Deposit Listing"
msgstr "Re-Print vklad výpis"
-#: index.php:328
+#: index.php:344
msgid "Debtor Balances At A Prior Month End"
msgstr "Dlužník Zůstatky v předchozí Konec měsíce"
-#: index.php:333
+#: index.php:349
msgid "Customer Listing By Area/Salesperson"
msgstr "Zákazník Výpis podle lokality / Prodejce"
-#: index.php:338
+#: index.php:354
msgid "Sales Graphs"
msgstr "Grafy prodeje"
-#: index.php:343 index.php:436
+#: index.php:359 index.php:452
msgid "List Daily Transactions"
msgstr "Seznam Denní Transakce"
-#: index.php:348 SelectCustomer.php:289
+#: index.php:364 SelectCustomer.php:289
msgid "Customer Transaction Inquiries"
msgstr "Informace o transakcích zákazníka"
-#: index.php:362
+#: index.php:378
msgid "Add Customer"
msgstr "Přidat zákazníka"
-#: index.php:367 SelectCustomer.php:24 includes/header.inc:60
+#: index.php:383 SelectCustomer.php:24 includes/header.inc:60
#: includes/PDFTopItemsHeader.inc:27
msgid "Customers"
msgstr "Zákazníci"
-#: index.php:397 OffersReceived.php:42 OffersReceived.php:46
+#: index.php:413 OffersReceived.php:42 OffersReceived.php:46
msgid "Select Supplier"
msgstr "Zvolit dodavatele"
-#: index.php:402 SupplierAllocations.php:30 SupplierBalsAtPeriodEnd.php:119
+#: index.php:418 SupplierAllocations.php:30 SupplierBalsAtPeriodEnd.php:119
#: SupplierContacts.php:19
msgid "Supplier Allocations"
msgstr "Dodavatel Přidělené"
-#: index.php:411
+#: index.php:427
msgid "Aged Supplier Report"
msgstr "Dodavatel ve věku Zpráva"
-#: index.php:416 SuppPaymentRun.php:31
+#: index.php:432 SuppPaymentRun.php:31
msgid "Payment Run Report"
msgstr "Platba Spustit sestavu"
-#: index.php:421 PDFRemittanceAdvice.php:120
+#: index.php:437 PDFRemittanceAdvice.php:120
msgid "Remittance Advices"
msgstr "Poukazování Avíza"
-#: index.php:426 OutstandingGRNs.php:14 OutstandingGRNs.php:147
+#: index.php:442 OutstandingGRNs.php:14 OutstandingGRNs.php:147
msgid "Outstanding GRNs Report"
msgstr "Vynikající zpráva GRNs"
-#: index.php:431
+#: index.php:447
msgid "Supplier Balances At A Prior Month End"
msgstr "Zůstatky na dodavatele Před Konec měsíce"
-#: index.php:441
+#: index.php:457
msgid "Supplier Transaction Inquiries"
msgstr "Dodavatel informací o transakcích"
-#: index.php:455
+#: index.php:471
msgid "Add Supplier"
msgstr "Přidat dodavatele"
-#: index.php:460
+#: index.php:476
msgid "Maintain Factor Companies"
msgstr "Udržovat faktor firem"
-#: index.php:488 PO_SelectPurchOrder.php:7 SelectCompletedOrder.php:538
+#: index.php:504 PO_SelectPurchOrder.php:7 SelectCompletedOrder.php:538
#: SupplierCredit.php:208 SupplierCredit.php:294 SupplierInvoice.php:186
#: SupplierInvoice.php:261
msgid "Purchase Orders"
msgstr "Nákupní objednávky"
-#: index.php:493 PO_SelectOSPurchOrder.php:132
+#: index.php:509 PO_SelectOSPurchOrder.php:132
msgid "Add Purchase Order"
msgstr "Přidat Objednávka"
-#: index.php:498
+#: index.php:514
msgid "Process Tenders and Offers"
msgstr "Nabídky procesu a nabídky"
-#: index.php:503
+#: index.php:519
msgid "Orders to Authorise"
msgstr "Objednávky na Povolit"
-#: index.php:508
+#: index.php:524
msgid "Shipment Entry"
msgstr "Vstup zásilku"
-#: index.php:513
+#: index.php:529
msgid "Select A Shipment"
msgstr "Zvolit dodávku"
-#: index.php:522 PO_PDFPurchOrder.php:20 PO_PDFPurchOrder.php:114
+#: index.php:538 PO_PDFPurchOrder.php:20 PO_PDFPurchOrder.php:114
msgid "Purchase Order Inquiry"
msgstr "Informace o nákupních objednávkách"
-#: index.php:527
+#: index.php:543
msgid "Purchase Order Detail Or Summary Inquiries"
msgstr "Objednávka Detail Nebo Shrnutí Dotazy"
-#: index.php:572 index.php:577
+#: index.php:588 index.php:593
msgid "Bulk Inventory Transfer"
msgstr "Hromadný přesun položek"
-#: index.php:572 StockAdjustments.php:58 StockLocTransfer.php:130
+#: index.php:588 StockAdjustments.php:58 StockLocTransfer.php:130
#: StockLocTransferReceive.php:415 StockLocTransferReceive.php:499
#: StockTransfers.php:26 StockTransfers.php:435 StockUsage.php:28
#: SuppCreditGRNs.php:18 SuppInvGRNs.php:15
msgid "Dispatch"
msgstr "Odeslání"
-#: index.php:582
+#: index.php:598
msgid "Inventory Location Transfers"
msgstr "Zásoby Umístění Převody"
-#: index.php:587
+#: index.php:603
msgid "Inventory Adjustments"
msgstr "Zásoby Opravné položky"
-#: index.php:592 ReverseGRN.php:13
+#: index.php:608 ReverseGRN.php:13
msgid "Reverse Goods Received"
msgstr "Reverzní zboží obdržené"
-#: index.php:597
+#: index.php:613
msgid "Enter Stock Counts"
msgstr "Vložit skladové stavy"
-#: index.php:606
+#: index.php:622
msgid "Serial Item Research Tool"
msgstr "Sériové bod výzkumný nástroj"
-#: index.php:611 PDFPrintLabel.php:75
+#: index.php:627 PDFPrintLabel.php:75
msgid "Print Price Labels"
msgstr "Tisknout cenovky"
-#: index.php:616
+#: index.php:632
msgid "Inventory Item Movements"
msgstr "Pohyby skladových položek"
-#: index.php:621
+#: index.php:637
msgid "Inventory Item Status"
msgstr "Stav skladové položky"
-#: index.php:626
+#: index.php:642
msgid "Inventory Item Usage"
msgstr "Použití skladové položky"
-#: index.php:631 InventoryQuantities.php:81
+#: index.php:647 InventoryQuantities.php:81
msgid "Inventory Quantities"
msgstr "Množství zásob"
-#: index.php:636 ReorderLevelLocation.php:60 ReorderLevel.php:57
+#: index.php:652 ReorderLevelLocation.php:60 ReorderLevel.php:57
msgid "Reorder Level"
msgstr "Změna pořadí úrovni"
-#: index.php:641
+#: index.php:657
msgid "Stock Dispatch"
msgstr "Skladem Expedice"
-#: index.php:646 InventoryValuation.php:15 MailInventoryValuation.php:47
+#: index.php:662 InventoryValuation.php:15 MailInventoryValuation.php:47
#: MailInventoryValuation.php:226
msgid "Inventory Valuation Report"
msgstr "Hlášení o ocenění skladu"
-#: index.php:651 InventoryPlanning.php:35
+#: index.php:667 InventoryPlanning.php:35
msgid "Inventory Planning Report"
msgstr "Hlášení o plánování skladu"
-#: index.php:656
+#: index.php:672
msgid "Inventory Planning Based On Preferred Supplier Data"
msgstr "Zásoby plánování na základě preferovaného dodavatele dat"
-#: index.php:661
+#: index.php:677
msgid "Inventory Stock Check Sheets"
msgstr "Inventurní seznamy"
-#: index.php:666
+#: index.php:682
msgid "Make Inventory Quantities CSV"
msgstr "Zkontrolujte množství zásob ve formátu CSV"
-#: index.php:671
+#: index.php:687
msgid "Compare Counts Vs Stock Check Data"
msgstr "Porovnejte Counts Vs Data Reklamní Kontrola"
-#: index.php:676
+#: index.php:692
msgid "All Inventory Movements By Location/Date"
msgstr "Všechny pohyby zásob podle Místo / Datum"
-#: index.php:681
+#: index.php:697
msgid "List Inventory Status By Location/Category"
msgstr "Seznam zásob stav Umístění / Kategorie"
-#: index.php:686
+#: index.php:702
msgid "Historical Stock Quantity By Location/Category"
msgstr "Historické skladem Množství Podle lokality / Kategorie"
-#: index.php:691
+#: index.php:707
msgid "List Negative Stocks"
msgstr "Seznam Negativní Zásoby"
-#: index.php:696
+#: index.php:712
#, fuzzy
msgid "Period Stock Transaction Listing"
msgstr "Sklad seznamu transakcí"
-#: index.php:701
+#: index.php:717
#, fuzzy
msgid "Stock Transfer Note"
msgstr "Sklad Transfer formuláře"
-#: index.php:706
+#: index.php:722
#, fuzzy
msgid "Reprint GRN"
msgstr "Dotisk teď"
-#: index.php:720
+#: index.php:736
msgid "Add A New Item"
msgstr "Přidat novou položku"
-#: index.php:725
+#: index.php:741
msgid "Select An Item"
msgstr "Zvolit položku"
-#: index.php:730 SalesCategories.php:7
+#: index.php:746 SalesCategories.php:7
msgid "Sales Category Maintenance"
msgstr "Nastavení prodejních skupin"
-#: index.php:735
+#: index.php:751
#, fuzzy
msgid "Add or Update Prices Based On Costs Or Other Price List"
msgstr "Přidat nebo aktualizovat ceny na základě nákladů"
-#: index.php:740
+#: index.php:756
msgid "View or Update Prices Based On Costs"
msgstr "Zobrazit nebo aktualizace ceny na základě nákladů"
-#: index.php:745
+#: index.php:761
msgid "Reorder Level By Category/Location"
msgstr "Změna pořadí úrovni kategorie / Místo"
-#: index.php:775 WorkOrderEntry.php:6
+#: index.php:791 WorkOrderEntry.php:6
msgid "Work Order Entry"
msgstr "Práce Objednat Vstup"
-#: index.php:780 index.php:789
+#: index.php:796 index.php:805
msgid "Select A Work Order"
msgstr "Zvolit výrobní zakázku"
-#: index.php:794
+#: index.php:810
msgid "Costed Bill Of Material Inquiry"
msgstr "Vyčíslením nákladů kusovníku Poptávka"
-#: index.php:799 WhereUsedInquiry.php:8
+#: index.php:815 WhereUsedInquiry.php:8
msgid "Where Used Inquiry"
msgstr "V případě, Použité Poptávka"
-#: index.php:809
+#: index.php:825
msgid "Indented Bill Of Material Listing"
msgstr "Odsazené kusovníku Výpis"
-#: index.php:814
+#: index.php:830
msgid "List Components Required"
msgstr "Seznam Požadované součásti"
-#: index.php:819
+#: index.php:835
msgid "Indented Where Used Listing"
msgstr "Odsazené Pokud Použité Výpis"
-#: index.php:824
+#: index.php:840
msgid "MRP"
msgstr "MRP"
-#: index.php:829 MRPShortages.php:26 MRPShortages.php:144 MRPShortages.php:156
+#: index.php:845 MRPShortages.php:26 MRPShortages.php:144 MRPShortages.php:156
msgid "MRP Shortages"
msgstr "MRP Nedostatky"
-#: index.php:834
+#: index.php:850
msgid "MRP Suggested Purchase Orders"
msgstr "MRP Doporučené Objednávky"
-#: index.php:839
+#: index.php:855
msgid "MRP Suggested Work Orders"
msgstr "MRP Doporučené pracovní Objednávky"
-#: index.php:844
+#: index.php:860
msgid "MRP Reschedules Required"
msgstr "MRP přeplánuje Požadované"
-#: index.php:863
+#: index.php:879
msgid "Bills Of Material"
msgstr "Materiálové listy"
-#: index.php:869
+#: index.php:885
msgid "Master Schedule"
msgstr "Master plán"
-#: index.php:874
+#: index.php:890
msgid "Auto Create Master Schedule"
msgstr "Auto Vytvořit Master plán"
-#: index.php:879
+#: index.php:895
msgid "MRP Calculation"
msgstr "Výpočet MRP"
-#: index.php:905
+#: index.php:921
msgid "General Setup Options"
msgstr "Hlavní nastavení"
-#: index.php:908
+#: index.php:924
msgid "General"
msgstr "Obecné"
-#: index.php:917
+#: index.php:933
msgid "Receivables/Payables Setup"
msgstr "Nastavení příjmů / výdajů"
-#: index.php:920
+#: index.php:936
msgid "Receivables/Payables"
msgstr "Příjmy / výdaje"
-#: index.php:930 index.php:933
+#: index.php:946 index.php:949
msgid "Inventory Setup"
msgstr "Nastavení skladu"
-#: index.php:952
+#: index.php:968
msgid "Configuration Settings"
msgstr "Nastavení konfigurace"
-#: index.php:957 WWW_Users.php:27
+#: index.php:973 WWW_Users.php:27
msgid "User Maintenance"
msgstr "Správa uživatelského účtu"
-#: index.php:962
+#: index.php:978
msgid "Role Permissions"
msgstr "Přístupová práva"
-#: index.php:967
+#: index.php:983
msgid "Page Security Settings"
msgstr "Stránka Nastavení zabezpečení"
-#: index.php:972
+#: index.php:988
#, fuzzy
msgid "Define Security Tokens"
msgstr "Účelově tokeny zabezpečení"
-#: index.php:977
+#: index.php:993
msgid "Bank Accounts"
msgstr "Bankovní účty"
-#: index.php:982
+#: index.php:998
msgid "Currency Maintenance"
msgstr "Nastavení měn"
-#: index.php:987
+#: index.php:1003
msgid "Tax Authorities and Rates Maintenance"
msgstr "Nastavení daňového úřadu a daňových sazeb"
-#: index.php:992
+#: index.php:1008
msgid "Tax Group Maintenance"
msgstr "Nastavení daňových skupin"
-#: index.php:997
+#: index.php:1013
msgid "Dispatch Tax Province Maintenance"
msgstr "Nastavení oblastí odvodu daní"
-#: index.php:1002
+#: index.php:1018
msgid "Tax Category Maintenance"
msgstr "Nastavení daňových skupin"
-#: index.php:1007
+#: index.php:1023
msgid "List Periods Defined"
msgstr "Seznam definovaných období"
-#: index.php:1007
+#: index.php:1023
msgid "Periods are automatically maintained"
msgstr "Období jsou nastavována automaticky"
-#: index.php:1012
+#: index.php:1028
msgid "Report Builder Tool"
msgstr "Nástroj tvorby hlášení"
-#: index.php:1017
+#: index.php:1033
msgid "View Audit Trail"
msgstr "Zobrazit Audit Trail"
-#: index.php:1027
+#: index.php:1043
msgid "Form Layout Editor"
msgstr "Formulář Layout Editor"
-#: index.php:1032
+#: index.php:1048
msgid "Label Templates Maintenance"
msgstr "Štítek Šablony pro údržbu"
-#: index.php:1037
+#: index.php:1053
msgid "SMTP Server Details"
msgstr "SMTP Server Podrobnosti"
-#: index.php:1047 SalesTypes.php:5
+#: index.php:1063 SalesTypes.php:5
msgid "Sales Types"
msgstr "Typy prodejů"
-#: index.php:1057 SupplierTypes.php:6 SupplierTypes.php:21
+#: index.php:1073 SupplierTypes.php:6 SupplierTypes.php:21
#: SuppPaymentRun.php:237 SystemParameters.php:11 TaxAuthorities.php:9
#: TaxAuthorityRates.php:17 TaxCategories.php:10 Tax.php:289
msgid "Supplier Types"
msgstr "Typy dodavatel"
-#: index.php:1072
+#: index.php:1088
msgid "Set Purchase Order Authorisation levels"
msgstr "Nastavit objednávky autorizační limity"
-#: index.php:1077 PaymentMethods.php:7
+#: index.php:1093 PaymentMethods.php:7
msgid "Payment Methods"
msgstr "Platební metody"
-#: index.php:1082
+#: index.php:1098
msgid "Sales People"
msgstr "Prodejci"
-#: index.php:1087
+#: index.php:1103
msgid "Sales Areas"
msgstr "Prodejní místa"
-#: index.php:1092
+#: index.php:1108
msgid "Shippers"
msgstr "Dopravci"
-#: index.php:1097
+#: index.php:1113
msgid "Sales GL Interface Postings"
msgstr "Prodej GL rozhraní Komentáře"
-#: index.php:1102
+#: index.php:1118
msgid "COGS GL Interface Postings"
msgstr "Čepy GL rozhraní Komentáře"
-#: index.php:1107
+#: index.php:1123
msgid "Freight Costs Maintenance"
msgstr "Nastavení cen dopravy"
-#: index.php:1112
+#: index.php:1128
msgid "Discount Matrix"
msgstr "Matice slev"
-#: index.php:1122
+#: index.php:1138
msgid "Inventory Categories Maintenance"
msgstr "Nastavení skladových skupin"
-#: index.php:1127
+#: index.php:1143
msgid "Inventory Locations Maintenance"
msgstr "Nastavení skladových umístění"
-#: index.php:1132
+#: index.php:1148
msgid "Discount Category Maintenance"
msgstr "Nastavení slevových skupin"
-#: index.php:1137 Stocks.php:789 UnitsOfMeasure.php:173
+#: index.php:1153 Stocks.php:789 UnitsOfMeasure.php:173
msgid "Units of Measure"
msgstr "Měrné jednotky"
-#: index.php:1144
+#: index.php:1160
msgid "MRP Available Production Days"
msgstr "MRP K dispozici Výrobní dny"
-#: index.php:1149 MRPDemandTypes.php:6
+#: index.php:1165 MRPDemandTypes.php:6
msgid "MRP Demand Types"
msgstr "MRP Poptávka Typy"
-#: index.php:1177
+#: index.php:1193
msgid "Bank Account Payments Entry"
msgstr "Bankovní účet platební Vstup"
-#: index.php:1182
+#: index.php:1198
msgid "Bank Account Receipts Entry"
msgstr "Bankovní účet Příjmy Vstup"
-#: index.php:1192
+#: index.php:1208
msgid "Bank Account Payments Matching"
msgstr "Bankovní účet platby odpovídající"
-#: index.php:1197
+#: index.php:1213
msgid "Bank Account Receipts Matching"
msgstr "Bankovní účet Příjmy odpovídající"
-#: index.php:1211 SelectGLAccount.php:26
+#: index.php:1227 SelectGLAccount.php:26
msgid "Account Inquiry"
msgstr "Přehled účtu"
-#: index.php:1216
+#: index.php:1232
msgid "Account Listing"
msgstr "Výpis účet"
-#: index.php:1221
+#: index.php:1237
msgid "Account Listing to CSV File"
msgstr "Výpis účtu do CSV souboru"
-#: index.php:1226
+#: index.php:1242
msgid "Bank Account Reconciliation Statement"
msgstr "Bankovní účet Odsouhlasení prohlášení"
-#: index.php:1231
+#: index.php:1247
msgid "Cheque Payments Listing"
msgstr "Seznam šekových plateb"
-#: index.php:1236
+#: index.php:1252
msgid "Daily Bank Transactions"
msgstr "Denní Bankovní Transakce"
-#: index.php:1241
+#: index.php:1257
msgid "Profit and Loss Statement"
msgstr "Výkaz zisku a ztráty"
-#: index.php:1251
+#: index.php:1267
msgid "Tag Reports"
msgstr "Tag zprávy"
-#: index.php:1256
+#: index.php:1272
msgid "Tax Reports"
msgstr "Daňová přiznání"
-#: index.php:1275
+#: index.php:1291
msgid "GL Budgets"
msgstr "GL rozpočty"
-#: index.php:1290
+#: index.php:1306
msgid "GL Tags"
msgstr "GL Tagy"
-#: index.php:1316
+#: index.php:1332
msgid "Add a new Asset"
msgstr "Přidat nový Asset"
-#: index.php:1321 SelectAsset.php:7
+#: index.php:1337 SelectAsset.php:7
msgid "Select an Asset"
msgstr "Vyberte Asset"
-#: index.php:1331
+#: index.php:1347
msgid "Depreciation Journal"
msgstr "Odpisy věstníku"
-#: index.php:1340
+#: index.php:1356
msgid "Asset Register"
msgstr "Asset Registrace"
-#: index.php:1354
+#: index.php:1370
msgid "Asset Categories Maintenance"
msgstr "Kategorie aktiv Údržba"
-#: index.php:1359
+#: index.php:1375
msgid "Add or Maintain Asset Locations"
msgstr "Přidat nebo zachovat Asset lokality"
-#: index.php:1386
+#: index.php:1402
msgid "Assign Cash to PC Tab"
msgstr "Přiřazení Peníze na PC karta"
-#: index.php:1391
+#: index.php:1407
msgid "Claim Expenses From PC Tab"
msgstr "Požadovat náhradu výdajů od PC karty"
-#: index.php:1396
+#: index.php:1412
msgid "Expenses Authorisation"
msgstr "Náklady Povolení"
-#: index.php:1405
+#: index.php:1421
msgid "PC Tab General Report"
msgstr "PC karta Obecná zpráva"
-#: index.php:1419
+#: index.php:1435
msgid "Types of PC Tabs"
msgstr "Typy PC Záloľky"
-#: index.php:1424
+#: index.php:1440
msgid "PC Tabs"
msgstr "PC Záloľky"
-#: index.php:1429
+#: index.php:1445
msgid "PC Expenses"
msgstr "Náklady PC"
-#: index.php:1434
+#: index.php:1450
msgid "Expenses for Type of PC Tab"
msgstr "Náklady na typ PC karty"
-#: index.php:1465 index.php:1468 PDFCustTransListing.php:125
+#: index.php:1481 index.php:1484 PDFCustTransListing.php:125
#: PDFSuppTransListing.php:125
msgid "Transactions"
msgstr "Transakce"
-#: index.php:1477 index.php:1480
+#: index.php:1493 index.php:1496
msgid "Inquiries and Reports"
msgstr "Přehledy a hlášení"
-#: index.php:1514
+#: index.php:1530
msgid "Custom Reports"
msgstr "Vlastní hlášení"
-#: index.php:1514
+#: index.php:1530
msgid "Standard Reports and Forms"
msgstr "Standardní hlášení a formuláře"
-#: index.php:1556
+#: index.php:1572
msgid "There are no reports to show!"
msgstr "Žádná hlášení ke zobrazení!"
@@ -13487,7 +13482,7 @@
msgstr "Odchylka"
#: InventoryPlanningPrefSupplier.php:89 PurchData.php:178 PurchData.php:492
-#: SelectProduct.php:341
+#: SelectProduct.php:346
msgid "Lead Time"
msgstr "Dodací lhůta"
@@ -13595,7 +13590,7 @@
msgstr "Pouze díly s více pobočkami"
#: InventoryQuantities.php:163 MRPReport.php:508 ReorderLevel.php:194
-#: SelectProduct.php:37 StockDispatch.php:268 StockLocStatus.php:55
+#: SelectProduct.php:39 StockDispatch.php:268 StockLocStatus.php:55
#: SupplierTenders.php:327
msgid ""
"There are no stock categories currently defined please use the link below to "
@@ -13605,13 +13600,13 @@
"jejich definici"
#: InventoryQuantities.php:164 MRPReport.php:509 ReorderLevel.php:195
-#: Se...
[truncated message content] |
|
From: <dai...@us...> - 2011-05-27 10:59:26
|
Revision: 4576
http://web-erp.svn.sourceforge.net/web-erp/?rev=4576&view=rev
Author: daintree
Date: 2011-05-27 10:59:20 +0000 (Fri, 27 May 2011)
Log Message:
-----------
bug fixes reported by Ricard/Exson
Modified Paths:
--------------
trunk/ContractBOM.php
trunk/PO_Items.php
trunk/SelectProduct.php
trunk/Shipt_Select.php
trunk/StockTransfers.php
Modified: trunk/ContractBOM.php
===================================================================
--- trunk/ContractBOM.php 2011-05-26 10:47:06 UTC (rev 4575)
+++ trunk/ContractBOM.php 2011-05-27 10:59:20 UTC (rev 4576)
@@ -167,7 +167,7 @@
if (isset($_POST['NewItem'])){ /* NewItem is set from the part selection list as the part code selected */
/* take the form entries and enter the data from the form into the PurchOrder class variable */
foreach ($_POST as $key => $value) {
- if (substr($key, 0, 3)=='qty') {
+ if (substr($key, 0, 3)=='Qty') {
$ItemCode=substr($key, 3, strlen($key)-3);
$Quantity=$value;
$AlreadyOnThisBOM = 0;
Modified: trunk/PO_Items.php
===================================================================
--- trunk/PO_Items.php 2011-05-26 10:47:06 UTC (rev 4575)
+++ trunk/PO_Items.php 2011-05-27 10:59:20 UTC (rev 4576)
@@ -566,7 +566,12 @@
$PurchRow = DB_fetch_array($PurchDataResult);
$PurchPrice = $PurchRow['price']/$PurchRow['conversionfactor'];
$ConversionFactor = $PurchRow['conversionfactor'];
- $SupplierDescription = $PurchRow['suppliers_partno'] .' - ' . $PurchRow['supplierdescription'];
+ $SupplierDescription = $PurchRow['suppliers_partno'] .' - ';
+ if (strlen($PurchRow['supplierdescription'])>2){
+ $SupplierDescription .= $PurchRow['supplierdescription'];
+ } else {
+ $SupplierDescription .= $ItemRow['description'];
+ }
$SuppliersUnitOfMeasure = $PurchRow['suppliersuom'];
$SuppliersPartNo = $PurchRow['suppliers_partno'];
$LeadTime = $PurchRow['leadtime'];
Modified: trunk/SelectProduct.php
===================================================================
--- trunk/SelectProduct.php 2011-05-26 10:47:06 UTC (rev 4575)
+++ trunk/SelectProduct.php 2011-05-27 10:59:20 UTC (rev 4576)
@@ -417,10 +417,9 @@
echo '<a href="' . $rootpath . '/StockTransfers.php?StockID=' . $StockID . '">' . _('Location Transfers') . '</a><br />';
//show the item image if it has been uploaded
if( isset($StockID) and file_exists($_SESSION['part_pics_dir'] . '/' .$StockID.'.jpg') ) {
- echo '<div class="centre"><img src="' . $_SERVER['HTTP_SCHEME'] .'://'. $_SERVER['HTTP_HOST'] . $rootpath . '/' . $_SESSION['part_pics_dir'] . '/' .$StockID.'.jpg ' . '" ></div>';
+ echo '<div class="centre"><img src="' . $_SESSION['part_pics_dir'] . '/' .$StockID.'.jpg ' . '" ></div>';
}
-
- if ($myrow['mbflag'] == 'B') {
+ if (($myrow['mbflag'] == 'B') AND (in_array($SuppliersSecurity, $_SESSION['AllowedPageSecurityTokens']))){
echo '<br />';
$SuppResult = DB_query("SELECT suppliers.suppname,
suppliers.supplierid,
Modified: trunk/Shipt_Select.php
===================================================================
--- trunk/Shipt_Select.php 2011-05-26 10:47:06 UTC (rev 4575)
+++ trunk/Shipt_Select.php 2011-05-27 10:59:20 UTC (rev 4576)
@@ -250,17 +250,17 @@
AND purchorders.intostocklocation = '". $_POST['StockLocation'] . "'
AND shipments.closed='" . $_POST['OpenOrClosed'] . "'";
} else {
- $SQL .= "WHERE shipments.supplierid='" . $SelectedSupplier ."'
+ $SQL .= " WHERE shipments.supplierid='" . $SelectedSupplier ."'
AND purchorders.intostocklocation = '". $_POST['StockLocation'] . "'
AND shipments.closed='" . $_POST['OpenOrClosed'] ."'";
}
} else { //no supplier selected
if (isset($SelectedStockItem)) {
- $SQL .= "WHERE purchorderdetails.itemcode='". $SelectedStockItem ."'
+ $SQL .= " WHERE purchorderdetails.itemcode='". $SelectedStockItem ."'
AND purchorders.intostocklocation = '". $_POST['StockLocation'] . "'
AND shipments.closed='" . $_POST['OpenOrClosed'] . "'";
} else {
- $SQL .= "WHERE purchorders.intostocklocation = '". $_POST['StockLocation'] . "'
+ $SQL .= " WHERE purchorders.intostocklocation = '". $_POST['StockLocation'] . "'
AND shipments.closed='" . $_POST['OpenOrClosed'] . "'";
}
Modified: trunk/StockTransfers.php
===================================================================
--- trunk/StockTransfers.php 2011-05-26 10:47:06 UTC (rev 4575)
+++ trunk/StockTransfers.php 2011-05-27 10:59:20 UTC (rev 4576)
@@ -42,7 +42,7 @@
echo '<tr><td>'.$myrow['stockid'].'</td>
<td>'.$myrow['description'].'</td>
<td><a href="' . $rootpath . '/StockTransfers.php?StockID='.$myrow['stockid'].'&Description='.$myrow['description'].'&NewTransfer=Yes&Quantity='.$_POST['Quantity'].'&From='.$_POST['StockLocationFrom'].'&To='.$_POST['StockLocationTo'].'">'
-+ ._('Transfer').'</a></td>
+ ._('Transfer').'</a></td>
</tr>';
}
@@ -66,7 +66,7 @@
} elseif (isset($_POST['StockID'])){ /* initiate a new transfer only if the StockID is different to the previous entry */
- if (isset($_SESSION['Transfer']) and $_POST['StockID'] != $_SESSION['Transfer']->TransferItem[0]->StockID){
+ if (isset($_SESSION['Transfer']) AND $_POST['StockID'] != $_SESSION['Transfer']->TransferItem[0]->StockID){
unset($_SESSION['Transfer']);
$NewTransfer = true;
}
@@ -121,10 +121,10 @@
}
-if (isset($_POST['Quantity']) and isset($_SESSION['Transfer']->TransferItem[0]->Controlled) and $_SESSION['Transfer']->TransferItem[0]->Controlled==0){
+if (isset($_POST['Quantity']) AND isset($_SESSION['Transfer']->TransferItem[0]->Controlled) AND $_SESSION['Transfer']->TransferItem[0]->Controlled==0){
$_SESSION['Transfer']->TransferItem[0]->Quantity = $_POST['Quantity'];
}
-if ( isset($_POST['StockLocationFrom']) && $_POST['StockLocationFrom']!= $_SESSION['Transfer']->StockLocationFrom ){
+if ( isset($_POST['StockLocationFrom']) AND $_POST['StockLocationFrom']!= $_SESSION['Transfer']->StockLocationFrom ){
$_SESSION['Transfer']->StockLocationFrom = $_POST['StockLocationFrom'];
$_SESSION['Transfer']->StockLocationTo = $_POST['StockLocationTo'];
$_SESSION['Transfer']->TransferItem[0]->Quantity=$_POST['Quantity'];
@@ -149,7 +149,7 @@
echo '<p>';
prnMsg( _('The quantity entered must be numeric'), 'error' );
$InputError = true;
- } elseif ($_SESSION['Transfer']->TransferItem[0]->Quantity<=0){
+ } elseif ($_SESSION['Transfer']->TransferItem[0]->Quantity <= 0){
echo '<p>';
prnMsg( _('The quantity entered must be a positive number greater than zero'), 'error');
$InputError = true;
@@ -455,7 +455,7 @@
} else {
echo '<input type=text name="StockCode" size=21 value="" maxlength=20>';
}
-echo '</td><td><input type=submit name="CheckCode" VALUE="'._('Check Part').'"></td></tr>';
+echo '</td><td><input type=submit name="CheckCode" value="'._('Check Part').'"></td></tr>';
if (isset($_SESSION['Transfer']->TransferItem[0]->ItemDescription) and strlen($_SESSION['Transfer']->TransferItem[0]->ItemDescription)>1){
echo '<tr><td colspan=3><font color=BLUE size=3>' . $_SESSION['Transfer']->TransferItem[0]->ItemDescription . ' ('._('In Units of').' ' . $_SESSION['Transfer']->TransferItem[0]->PartUnit . ' )</font></td></tr>';
@@ -491,13 +491,13 @@
if ($myrow['loccode'] == $_SESSION['Transfer']->StockLocationTo){
echo '<option selected Value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
} else {
- echo '<option Value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
+ echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
}
} elseif ($myrow['loccode']==$_SESSION['UserStockLocation'] AND isset($_SESSION['Transfer'])){
echo '<option selected Value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
$_SESSION['Transfer']->StockLocationTo=$myrow['loccode'] . '</option>';
} else {
- echo '<option Value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
+ echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
}
}
@@ -506,10 +506,10 @@
echo '<tr><td>'._('Transfer Quantity').':</td>';
-if (isset($_SESSION['Transfer']->TransferItem[0]->Controlled) and $_SESSION['Transfer']->TransferItem[0]->Controlled==1){
+if (isset($_SESSION['Transfer']->TransferItem[0]->Controlled) AND $_SESSION['Transfer']->TransferItem[0]->Controlled==1){
echo '<td class=number><input type=hidden name="Quantity" value=' . $_SESSION['Transfer']->TransferItem[0]->Quantity .
'><a href="' . $rootpath .'/StockTransferControlled.php?StockLocationFrom='.$_SESSION['Transfer']->StockLocationFrom.'">' . $_SESSION['Transfer']->TransferItem[0]->Quantity . '</a></td></tr>';
-} else if (isset($_SESSION['Transfer']->TransferItem[0]->Controlled)){
+} elseif (isset($_SESSION['Transfer']->TransferItem[0]->Controlled)){
echo '<td><input type=text class="number" name="Quantity" size=12 maxlength=12 value=' . $_SESSION['Transfer']->TransferItem[0]->Quantity . '></td></tr>';
} else {
echo '<td><input type=text class="number" name="Quantity" size=12 maxlength=12 Value="0"></td></tr>';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-05-27 10:59:26
|
Revision: 4576
http://web-erp.svn.sourceforge.net/web-erp/?rev=4576&view=rev
Author: daintree
Date: 2011-05-27 10:59:20 +0000 (Fri, 27 May 2011)
Log Message:
-----------
bug fixes reported by Ricard/Exson
Modified Paths:
--------------
trunk/ContractBOM.php
trunk/PO_Items.php
trunk/SelectProduct.php
trunk/Shipt_Select.php
trunk/StockTransfers.php
Modified: trunk/ContractBOM.php
===================================================================
--- trunk/ContractBOM.php 2011-05-26 10:47:06 UTC (rev 4575)
+++ trunk/ContractBOM.php 2011-05-27 10:59:20 UTC (rev 4576)
@@ -167,7 +167,7 @@
if (isset($_POST['NewItem'])){ /* NewItem is set from the part selection list as the part code selected */
/* take the form entries and enter the data from the form into the PurchOrder class variable */
foreach ($_POST as $key => $value) {
- if (substr($key, 0, 3)=='qty') {
+ if (substr($key, 0, 3)=='Qty') {
$ItemCode=substr($key, 3, strlen($key)-3);
$Quantity=$value;
$AlreadyOnThisBOM = 0;
Modified: trunk/PO_Items.php
===================================================================
--- trunk/PO_Items.php 2011-05-26 10:47:06 UTC (rev 4575)
+++ trunk/PO_Items.php 2011-05-27 10:59:20 UTC (rev 4576)
@@ -566,7 +566,12 @@
$PurchRow = DB_fetch_array($PurchDataResult);
$PurchPrice = $PurchRow['price']/$PurchRow['conversionfactor'];
$ConversionFactor = $PurchRow['conversionfactor'];
- $SupplierDescription = $PurchRow['suppliers_partno'] .' - ' . $PurchRow['supplierdescription'];
+ $SupplierDescription = $PurchRow['suppliers_partno'] .' - ';
+ if (strlen($PurchRow['supplierdescription'])>2){
+ $SupplierDescription .= $PurchRow['supplierdescription'];
+ } else {
+ $SupplierDescription .= $ItemRow['description'];
+ }
$SuppliersUnitOfMeasure = $PurchRow['suppliersuom'];
$SuppliersPartNo = $PurchRow['suppliers_partno'];
$LeadTime = $PurchRow['leadtime'];
Modified: trunk/SelectProduct.php
===================================================================
--- trunk/SelectProduct.php 2011-05-26 10:47:06 UTC (rev 4575)
+++ trunk/SelectProduct.php 2011-05-27 10:59:20 UTC (rev 4576)
@@ -417,10 +417,9 @@
echo '<a href="' . $rootpath . '/StockTransfers.php?StockID=' . $StockID . '">' . _('Location Transfers') . '</a><br />';
//show the item image if it has been uploaded
if( isset($StockID) and file_exists($_SESSION['part_pics_dir'] . '/' .$StockID.'.jpg') ) {
- echo '<div class="centre"><img src="' . $_SERVER['HTTP_SCHEME'] .'://'. $_SERVER['HTTP_HOST'] . $rootpath . '/' . $_SESSION['part_pics_dir'] . '/' .$StockID.'.jpg ' . '" ></div>';
+ echo '<div class="centre"><img src="' . $_SESSION['part_pics_dir'] . '/' .$StockID.'.jpg ' . '" ></div>';
}
-
- if ($myrow['mbflag'] == 'B') {
+ if (($myrow['mbflag'] == 'B') AND (in_array($SuppliersSecurity, $_SESSION['AllowedPageSecurityTokens']))){
echo '<br />';
$SuppResult = DB_query("SELECT suppliers.suppname,
suppliers.supplierid,
Modified: trunk/Shipt_Select.php
===================================================================
--- trunk/Shipt_Select.php 2011-05-26 10:47:06 UTC (rev 4575)
+++ trunk/Shipt_Select.php 2011-05-27 10:59:20 UTC (rev 4576)
@@ -250,17 +250,17 @@
AND purchorders.intostocklocation = '". $_POST['StockLocation'] . "'
AND shipments.closed='" . $_POST['OpenOrClosed'] . "'";
} else {
- $SQL .= "WHERE shipments.supplierid='" . $SelectedSupplier ."'
+ $SQL .= " WHERE shipments.supplierid='" . $SelectedSupplier ."'
AND purchorders.intostocklocation = '". $_POST['StockLocation'] . "'
AND shipments.closed='" . $_POST['OpenOrClosed'] ."'";
}
} else { //no supplier selected
if (isset($SelectedStockItem)) {
- $SQL .= "WHERE purchorderdetails.itemcode='". $SelectedStockItem ."'
+ $SQL .= " WHERE purchorderdetails.itemcode='". $SelectedStockItem ."'
AND purchorders.intostocklocation = '". $_POST['StockLocation'] . "'
AND shipments.closed='" . $_POST['OpenOrClosed'] . "'";
} else {
- $SQL .= "WHERE purchorders.intostocklocation = '". $_POST['StockLocation'] . "'
+ $SQL .= " WHERE purchorders.intostocklocation = '". $_POST['StockLocation'] . "'
AND shipments.closed='" . $_POST['OpenOrClosed'] . "'";
}
Modified: trunk/StockTransfers.php
===================================================================
--- trunk/StockTransfers.php 2011-05-26 10:47:06 UTC (rev 4575)
+++ trunk/StockTransfers.php 2011-05-27 10:59:20 UTC (rev 4576)
@@ -42,7 +42,7 @@
echo '<tr><td>'.$myrow['stockid'].'</td>
<td>'.$myrow['description'].'</td>
<td><a href="' . $rootpath . '/StockTransfers.php?StockID='.$myrow['stockid'].'&Description='.$myrow['description'].'&NewTransfer=Yes&Quantity='.$_POST['Quantity'].'&From='.$_POST['StockLocationFrom'].'&To='.$_POST['StockLocationTo'].'">'
-+ ._('Transfer').'</a></td>
+ ._('Transfer').'</a></td>
</tr>';
}
@@ -66,7 +66,7 @@
} elseif (isset($_POST['StockID'])){ /* initiate a new transfer only if the StockID is different to the previous entry */
- if (isset($_SESSION['Transfer']) and $_POST['StockID'] != $_SESSION['Transfer']->TransferItem[0]->StockID){
+ if (isset($_SESSION['Transfer']) AND $_POST['StockID'] != $_SESSION['Transfer']->TransferItem[0]->StockID){
unset($_SESSION['Transfer']);
$NewTransfer = true;
}
@@ -121,10 +121,10 @@
}
-if (isset($_POST['Quantity']) and isset($_SESSION['Transfer']->TransferItem[0]->Controlled) and $_SESSION['Transfer']->TransferItem[0]->Controlled==0){
+if (isset($_POST['Quantity']) AND isset($_SESSION['Transfer']->TransferItem[0]->Controlled) AND $_SESSION['Transfer']->TransferItem[0]->Controlled==0){
$_SESSION['Transfer']->TransferItem[0]->Quantity = $_POST['Quantity'];
}
-if ( isset($_POST['StockLocationFrom']) && $_POST['StockLocationFrom']!= $_SESSION['Transfer']->StockLocationFrom ){
+if ( isset($_POST['StockLocationFrom']) AND $_POST['StockLocationFrom']!= $_SESSION['Transfer']->StockLocationFrom ){
$_SESSION['Transfer']->StockLocationFrom = $_POST['StockLocationFrom'];
$_SESSION['Transfer']->StockLocationTo = $_POST['StockLocationTo'];
$_SESSION['Transfer']->TransferItem[0]->Quantity=$_POST['Quantity'];
@@ -149,7 +149,7 @@
echo '<p>';
prnMsg( _('The quantity entered must be numeric'), 'error' );
$InputError = true;
- } elseif ($_SESSION['Transfer']->TransferItem[0]->Quantity<=0){
+ } elseif ($_SESSION['Transfer']->TransferItem[0]->Quantity <= 0){
echo '<p>';
prnMsg( _('The quantity entered must be a positive number greater than zero'), 'error');
$InputError = true;
@@ -455,7 +455,7 @@
} else {
echo '<input type=text name="StockCode" size=21 value="" maxlength=20>';
}
-echo '</td><td><input type=submit name="CheckCode" VALUE="'._('Check Part').'"></td></tr>';
+echo '</td><td><input type=submit name="CheckCode" value="'._('Check Part').'"></td></tr>';
if (isset($_SESSION['Transfer']->TransferItem[0]->ItemDescription) and strlen($_SESSION['Transfer']->TransferItem[0]->ItemDescription)>1){
echo '<tr><td colspan=3><font color=BLUE size=3>' . $_SESSION['Transfer']->TransferItem[0]->ItemDescription . ' ('._('In Units of').' ' . $_SESSION['Transfer']->TransferItem[0]->PartUnit . ' )</font></td></tr>';
@@ -491,13 +491,13 @@
if ($myrow['loccode'] == $_SESSION['Transfer']->StockLocationTo){
echo '<option selected Value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
} else {
- echo '<option Value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
+ echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
}
} elseif ($myrow['loccode']==$_SESSION['UserStockLocation'] AND isset($_SESSION['Transfer'])){
echo '<option selected Value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
$_SESSION['Transfer']->StockLocationTo=$myrow['loccode'] . '</option>';
} else {
- echo '<option Value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
+ echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
}
}
@@ -506,10 +506,10 @@
echo '<tr><td>'._('Transfer Quantity').':</td>';
-if (isset($_SESSION['Transfer']->TransferItem[0]->Controlled) and $_SESSION['Transfer']->TransferItem[0]->Controlled==1){
+if (isset($_SESSION['Transfer']->TransferItem[0]->Controlled) AND $_SESSION['Transfer']->TransferItem[0]->Controlled==1){
echo '<td class=number><input type=hidden name="Quantity" value=' . $_SESSION['Transfer']->TransferItem[0]->Quantity .
'><a href="' . $rootpath .'/StockTransferControlled.php?StockLocationFrom='.$_SESSION['Transfer']->StockLocationFrom.'">' . $_SESSION['Transfer']->TransferItem[0]->Quantity . '</a></td></tr>';
-} else if (isset($_SESSION['Transfer']->TransferItem[0]->Controlled)){
+} elseif (isset($_SESSION['Transfer']->TransferItem[0]->Controlled)){
echo '<td><input type=text class="number" name="Quantity" size=12 maxlength=12 value=' . $_SESSION['Transfer']->TransferItem[0]->Quantity . '></td></tr>';
} else {
echo '<td><input type=text class="number" name="Quantity" size=12 maxlength=12 Value="0"></td></tr>';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-05-28 05:38:49
|
Revision: 4577
http://web-erp.svn.sourceforge.net/web-erp/?rev=4577&view=rev
Author: daintree
Date: 2011-05-28 05:38:42 +0000 (Sat, 28 May 2011)
Log Message:
-----------
bug fixes reported by Ricard/Exson/Daniel Brewer
Modified Paths:
--------------
trunk/PDFPrintLabel.php
trunk/SelectSalesOrder.php
trunk/SystemParameters.php
trunk/doc/Change.log
trunk/includes/session.inc
trunk/sql/mysql/upgrade4.03-4.04.sql
Modified: trunk/PDFPrintLabel.php
===================================================================
--- trunk/PDFPrintLabel.php 2011-05-27 10:59:20 UTC (rev 4576)
+++ trunk/PDFPrintLabel.php 2011-05-28 05:38:42 UTC (rev 4577)
@@ -299,14 +299,18 @@
}
$sql="SELECT stockmaster.stockid,
- stockmaster.description, stockmaster.longdescription, stockmaster.barcode, prices.price
- FROM stockmaster LEFT JOIN prices ON stockmaster.stockid=prices.stockid
- AND prices.currabrev = '" . $CurrCode . "'
- AND prices.typeabbrev= '" . $SalesType . "'
- AND prices.startdate >= '" . Date('Y-m-d') . "'
- AND (prices.enddate <= '" . Date('Y-m-d') . "' OR prices.enddate='0000-00-00')
- AND prices.debtorno=''
- WHERE " . $WhereClause;
+ stockmaster.description,
+ stockmaster.longdescription,
+ stockmaster.barcode,
+ prices.price
+ FROM stockmaster LEFT JOIN prices
+ ON stockmaster.stockid=prices.stockid
+ AND prices.currabrev = '" . $CurrCode . "'
+ AND prices.typeabbrev= '" . $SalesType . "'
+ AND prices.startdate <= '" . Date('Y-m-d') . "'
+ AND (prices.enddate >= '" . Date('Y-m-d') . "' OR prices.enddate='0000-00-00')
+ AND prices.debtorno=''
+ WHERE " . $WhereClause;
// if current prices are those with enddate = 0000-00-00 the following line was wrong
// "AND ('$Today' BETWEEN pr.startdate AND prices.enddate) " .
Modified: trunk/SelectSalesOrder.php
===================================================================
--- trunk/SelectSalesOrder.php 2011-05-27 10:59:20 UTC (rev 4576)
+++ trunk/SelectSalesOrder.php 2011-05-28 05:38:42 UTC (rev 4577)
@@ -237,8 +237,6 @@
quantityord,
suppliersunit,
suppliers_partno,
- kgs,
- cuft,
conversionfactor )
VALUES ('" . $PO_OrderNo . "',
'" . $ItemRow['stockid'] . "',
@@ -249,8 +247,6 @@
'" . $ItemRow['orderqty'] . "',
'" . $ItemRow['suppliersuom'] . "',
'" . $ItemRow['suppliers_partno'] . "',
- '" . $ItemRow['kgs'] . "',
- '" . $ItemRow['volume'] . "',
'" . $ItemRow['conversionfactor'] . "')";
$ErrMsg =_('One of the purchase order detail records could not be inserted into the database because');
$DbgMsg =_('The SQL statement used to insert the purchase order detail record and failed was');
Modified: trunk/SystemParameters.php
===================================================================
--- trunk/SystemParameters.php 2011-05-27 10:59:20 UTC (rev 4576)
+++ trunk/SystemParameters.php 2011-05-28 05:38:42 UTC (rev 4577)
@@ -260,7 +260,11 @@
$sql[] = "UPDATE config SET confvalue='" . $_POST['X_LogPath'] . "' WHERE confname='LogPath'";
}
if ($_SESSION['UpdateCurrencyRatesDaily'] != $_POST['X_UpdateCurrencyRatesDaily']){
- $sql[] = "UPDATE config SET confvalue='".$_POST['X_UpdateCurrencyRatesDaily']."' WHERE confname='UpdateCurrencyRatesDaily'";
+ if ($_POST['X_UpdateCurrencyRatesDaily']==1) {
+ $sql[] = "UPDATE config SET confvalue='".Date('Y-m-d')."' WHERE confname='UpdateCurrencyRatesDaily'";
+ } else {
+ $sql[] = "UPDATE config SET confvalue='0' WHERE confname='UpdateCurrencyRatesDaily'";
+ }
}
if ($_SESSION['FactoryManagerEmail'] != $_POST['X_FactoryManagerEmail']){
$sql[] = "UPDATE config SET confvalue='" . $_POST['X_FactoryManagerEmail'] . "' WHERE confname='FactoryManagerEmail'";
@@ -421,7 +425,7 @@
//UpdateCurrencyRatesDaily
echo '<tr style="outline: 1px solid"><td>' . _('Auto Update Exchange Rates Daily') . ':</td>
<td><select Name="X_UpdateCurrencyRatesDaily">
- <option '.($_SESSION['UpdateCurrencyRatesDaily']!='0'?'selected ':'').'value="1">'._('Automatic').'</option>
+ <option '.($_SESSION['UpdateCurrencyRatesDaily']!='1'?'selected ':'').'value="1">'._('Automatic').'</option>
<option '.($_SESSION['UpdateCurrencyRatesDaily']=='0'?'selected ':'').'value="0">'._('Manual').'</option>
</select></td>
<td>' . _('Automatic updates to exchange rates will retrieve the latest daily rates from the European Central Bank once per day - when the first user logs in for the day. Manual will never update the rates automatically - exchange rates will need to be maintained manually') . '</td>
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-05-27 10:59:20 UTC (rev 4576)
+++ trunk/doc/Change.log 2011-05-28 05:38:42 UTC (rev 4577)
@@ -1,5 +1,10 @@
webERP Change Log
+28/5/11 Ricard: Fix sql to take quotes out of literals in upgrade script. PDFPrintLabels fix sql to get current price.
+28/5/11 Reported by Daniel Brewer Fix SelectSalesOrder.php creation of PO with excluding redundant fields in purchorderdetails that were taken out.
+28/5/11 Exson: UpdateCurrencyRateDaily was set to 1 when the option to enable it was clicked - should have been set to today's date in SystemParameters - fixed. Now no error reported bu ConvertSQLDate function when user enables update currencies daily.
+
+
26/5/11 Version 4.04 Release
26/5/11 Ricard: require securitytoken 9 to allow user to see purchasing data in SelectProduct.php
Modified: trunk/includes/session.inc
===================================================================
--- trunk/includes/session.inc 2011-05-27 10:59:20 UTC (rev 4576)
+++ trunk/includes/session.inc 2011-05-28 05:38:42 UTC (rev 4577)
@@ -161,7 +161,7 @@
$CurrencyRates = GetECBCurrencyRates(); // gets rates from ECB see includes/MiscFunctions.php
/*Loop around the defined currencies and get the rate from ECB */
if ($CurrencyRates!=false) {
- $CurrenciesResult = DB_query('SELECT currabrev FROM currencies',$db);
+ $CurrenciesResult = DB_query("SELECT currabrev FROM currencies",$db);
while ($CurrencyRow = DB_fetch_row($CurrenciesResult)){
if ($CurrencyRow[0]!=$_SESSION['CompanyRecord']['currencydefault']){
Modified: trunk/sql/mysql/upgrade4.03-4.04.sql
===================================================================
--- trunk/sql/mysql/upgrade4.03-4.04.sql 2011-05-27 10:59:20 UTC (rev 4576)
+++ trunk/sql/mysql/upgrade4.03-4.04.sql 2011-05-28 05:38:42 UTC (rev 4577)
@@ -1,5 +1,5 @@
INSERT INTO scripts (script, pagesecurity, description) VALUES ('SecurityTokens.php', 15, 'Administration of security tokens');
-INSERT INTO scripts (script , pagesecurity ,description) VALUES ('SalesByTypePeriodInquiry.php', '2', 'Shows sales for a selected date range by sales type/price list');
-INSERT INTO scripts (script , pagesecurity ,description) VALUES ('SalesCategoryPeriodInquiry.php', '2', 'Shows sales for a selected date range by stock category');
-INSERT INTO scripts (script , pagesecurity ,description) VALUES ('SalesTopItemsInquiry.php', '2', 'Shows the top item sales for a selected date range');
+INSERT INTO scripts (script , pagesecurity ,description) VALUES ('SalesByTypePeriodInquiry.php', 2, 'Shows sales for a selected date range by sales type/price list');
+INSERT INTO scripts (script , pagesecurity ,description) VALUES ('SalesCategoryPeriodInquiry.php', 2, 'Shows sales for a selected date range by stock category');
+INSERT INTO scripts (script , pagesecurity ,description) VALUES ('SalesTopItemsInquiry.php', 2, 'Shows the top item sales for a selected date range');
UPDATE config SET confvalue='4.04' WHERE confname='VersionNumber';
\ 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: <dai...@us...> - 2011-05-28 05:38:49
|
Revision: 4577
http://web-erp.svn.sourceforge.net/web-erp/?rev=4577&view=rev
Author: daintree
Date: 2011-05-28 05:38:42 +0000 (Sat, 28 May 2011)
Log Message:
-----------
bug fixes reported by Ricard/Exson/Daniel Brewer
Modified Paths:
--------------
trunk/PDFPrintLabel.php
trunk/SelectSalesOrder.php
trunk/SystemParameters.php
trunk/doc/Change.log
trunk/includes/session.inc
trunk/sql/mysql/upgrade4.03-4.04.sql
Modified: trunk/PDFPrintLabel.php
===================================================================
--- trunk/PDFPrintLabel.php 2011-05-27 10:59:20 UTC (rev 4576)
+++ trunk/PDFPrintLabel.php 2011-05-28 05:38:42 UTC (rev 4577)
@@ -299,14 +299,18 @@
}
$sql="SELECT stockmaster.stockid,
- stockmaster.description, stockmaster.longdescription, stockmaster.barcode, prices.price
- FROM stockmaster LEFT JOIN prices ON stockmaster.stockid=prices.stockid
- AND prices.currabrev = '" . $CurrCode . "'
- AND prices.typeabbrev= '" . $SalesType . "'
- AND prices.startdate >= '" . Date('Y-m-d') . "'
- AND (prices.enddate <= '" . Date('Y-m-d') . "' OR prices.enddate='0000-00-00')
- AND prices.debtorno=''
- WHERE " . $WhereClause;
+ stockmaster.description,
+ stockmaster.longdescription,
+ stockmaster.barcode,
+ prices.price
+ FROM stockmaster LEFT JOIN prices
+ ON stockmaster.stockid=prices.stockid
+ AND prices.currabrev = '" . $CurrCode . "'
+ AND prices.typeabbrev= '" . $SalesType . "'
+ AND prices.startdate <= '" . Date('Y-m-d') . "'
+ AND (prices.enddate >= '" . Date('Y-m-d') . "' OR prices.enddate='0000-00-00')
+ AND prices.debtorno=''
+ WHERE " . $WhereClause;
// if current prices are those with enddate = 0000-00-00 the following line was wrong
// "AND ('$Today' BETWEEN pr.startdate AND prices.enddate) " .
Modified: trunk/SelectSalesOrder.php
===================================================================
--- trunk/SelectSalesOrder.php 2011-05-27 10:59:20 UTC (rev 4576)
+++ trunk/SelectSalesOrder.php 2011-05-28 05:38:42 UTC (rev 4577)
@@ -237,8 +237,6 @@
quantityord,
suppliersunit,
suppliers_partno,
- kgs,
- cuft,
conversionfactor )
VALUES ('" . $PO_OrderNo . "',
'" . $ItemRow['stockid'] . "',
@@ -249,8 +247,6 @@
'" . $ItemRow['orderqty'] . "',
'" . $ItemRow['suppliersuom'] . "',
'" . $ItemRow['suppliers_partno'] . "',
- '" . $ItemRow['kgs'] . "',
- '" . $ItemRow['volume'] . "',
'" . $ItemRow['conversionfactor'] . "')";
$ErrMsg =_('One of the purchase order detail records could not be inserted into the database because');
$DbgMsg =_('The SQL statement used to insert the purchase order detail record and failed was');
Modified: trunk/SystemParameters.php
===================================================================
--- trunk/SystemParameters.php 2011-05-27 10:59:20 UTC (rev 4576)
+++ trunk/SystemParameters.php 2011-05-28 05:38:42 UTC (rev 4577)
@@ -260,7 +260,11 @@
$sql[] = "UPDATE config SET confvalue='" . $_POST['X_LogPath'] . "' WHERE confname='LogPath'";
}
if ($_SESSION['UpdateCurrencyRatesDaily'] != $_POST['X_UpdateCurrencyRatesDaily']){
- $sql[] = "UPDATE config SET confvalue='".$_POST['X_UpdateCurrencyRatesDaily']."' WHERE confname='UpdateCurrencyRatesDaily'";
+ if ($_POST['X_UpdateCurrencyRatesDaily']==1) {
+ $sql[] = "UPDATE config SET confvalue='".Date('Y-m-d')."' WHERE confname='UpdateCurrencyRatesDaily'";
+ } else {
+ $sql[] = "UPDATE config SET confvalue='0' WHERE confname='UpdateCurrencyRatesDaily'";
+ }
}
if ($_SESSION['FactoryManagerEmail'] != $_POST['X_FactoryManagerEmail']){
$sql[] = "UPDATE config SET confvalue='" . $_POST['X_FactoryManagerEmail'] . "' WHERE confname='FactoryManagerEmail'";
@@ -421,7 +425,7 @@
//UpdateCurrencyRatesDaily
echo '<tr style="outline: 1px solid"><td>' . _('Auto Update Exchange Rates Daily') . ':</td>
<td><select Name="X_UpdateCurrencyRatesDaily">
- <option '.($_SESSION['UpdateCurrencyRatesDaily']!='0'?'selected ':'').'value="1">'._('Automatic').'</option>
+ <option '.($_SESSION['UpdateCurrencyRatesDaily']!='1'?'selected ':'').'value="1">'._('Automatic').'</option>
<option '.($_SESSION['UpdateCurrencyRatesDaily']=='0'?'selected ':'').'value="0">'._('Manual').'</option>
</select></td>
<td>' . _('Automatic updates to exchange rates will retrieve the latest daily rates from the European Central Bank once per day - when the first user logs in for the day. Manual will never update the rates automatically - exchange rates will need to be maintained manually') . '</td>
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-05-27 10:59:20 UTC (rev 4576)
+++ trunk/doc/Change.log 2011-05-28 05:38:42 UTC (rev 4577)
@@ -1,5 +1,10 @@
webERP Change Log
+28/5/11 Ricard: Fix sql to take quotes out of literals in upgrade script. PDFPrintLabels fix sql to get current price.
+28/5/11 Reported by Daniel Brewer Fix SelectSalesOrder.php creation of PO with excluding redundant fields in purchorderdetails that were taken out.
+28/5/11 Exson: UpdateCurrencyRateDaily was set to 1 when the option to enable it was clicked - should have been set to today's date in SystemParameters - fixed. Now no error reported bu ConvertSQLDate function when user enables update currencies daily.
+
+
26/5/11 Version 4.04 Release
26/5/11 Ricard: require securitytoken 9 to allow user to see purchasing data in SelectProduct.php
Modified: trunk/includes/session.inc
===================================================================
--- trunk/includes/session.inc 2011-05-27 10:59:20 UTC (rev 4576)
+++ trunk/includes/session.inc 2011-05-28 05:38:42 UTC (rev 4577)
@@ -161,7 +161,7 @@
$CurrencyRates = GetECBCurrencyRates(); // gets rates from ECB see includes/MiscFunctions.php
/*Loop around the defined currencies and get the rate from ECB */
if ($CurrencyRates!=false) {
- $CurrenciesResult = DB_query('SELECT currabrev FROM currencies',$db);
+ $CurrenciesResult = DB_query("SELECT currabrev FROM currencies",$db);
while ($CurrencyRow = DB_fetch_row($CurrenciesResult)){
if ($CurrencyRow[0]!=$_SESSION['CompanyRecord']['currencydefault']){
Modified: trunk/sql/mysql/upgrade4.03-4.04.sql
===================================================================
--- trunk/sql/mysql/upgrade4.03-4.04.sql 2011-05-27 10:59:20 UTC (rev 4576)
+++ trunk/sql/mysql/upgrade4.03-4.04.sql 2011-05-28 05:38:42 UTC (rev 4577)
@@ -1,5 +1,5 @@
INSERT INTO scripts (script, pagesecurity, description) VALUES ('SecurityTokens.php', 15, 'Administration of security tokens');
-INSERT INTO scripts (script , pagesecurity ,description) VALUES ('SalesByTypePeriodInquiry.php', '2', 'Shows sales for a selected date range by sales type/price list');
-INSERT INTO scripts (script , pagesecurity ,description) VALUES ('SalesCategoryPeriodInquiry.php', '2', 'Shows sales for a selected date range by stock category');
-INSERT INTO scripts (script , pagesecurity ,description) VALUES ('SalesTopItemsInquiry.php', '2', 'Shows the top item sales for a selected date range');
+INSERT INTO scripts (script , pagesecurity ,description) VALUES ('SalesByTypePeriodInquiry.php', 2, 'Shows sales for a selected date range by sales type/price list');
+INSERT INTO scripts (script , pagesecurity ,description) VALUES ('SalesCategoryPeriodInquiry.php', 2, 'Shows sales for a selected date range by stock category');
+INSERT INTO scripts (script , pagesecurity ,description) VALUES ('SalesTopItemsInquiry.php', 2, 'Shows the top item sales for a selected date range');
UPDATE config SET confvalue='4.04' WHERE confname='VersionNumber';
\ 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: <dai...@us...> - 2011-05-28 11:01:06
|
Revision: 4578
http://web-erp.svn.sourceforge.net/web-erp/?rev=4578&view=rev
Author: daintree
Date: 2011-05-28 11:01:00 +0000 (Sat, 28 May 2011)
Log Message:
-----------
bug fixes reported by Ricard
Modified Paths:
--------------
trunk/MRPShortages.php
trunk/PcAssignCashToTab.php
trunk/PcExpensesTypeTab.php
trunk/SuppTransGLAnalysis.php
trunk/UpgradeDatabase.php
trunk/doc/Change.log
Modified: trunk/MRPShortages.php
===================================================================
--- trunk/MRPShortages.php 2011-05-28 05:38:42 UTC (rev 4577)
+++ trunk/MRPShortages.php 2011-05-28 11:01:00 UTC (rev 4578)
@@ -22,8 +22,13 @@
if (isset($_POST['PrintPDF'])) {
include('includes/PDFStarter.php');
- $pdf->addInfo('Title',_('MRP Shortages Report'));
- $pdf->addInfo('Subject',_('MRP Shortages'));
+ if ($_POST['ReportType'] == 'Shortage'){
+ $pdf->addInfo('Title',_('MRP Shortages Report'));
+ $pdf->addInfo('Subject',_('MRP Shortages'));
+ }else{
+ $pdf->addInfo('Title',_('MRP Excess Report'));
+ $pdf->addInfo('Subject',_('MRP Excess'));
+ }
$FontSize=9;
$PageNumber=1;
$line_height=12;
@@ -89,19 +94,19 @@
(demandtotal.demand - supplytotal.supply) *
(stockmaster.materialcost + stockmaster.labourcost +
stockmaster.overheadcost ) as extcost
- FROM stockmaster
- LEFT JOIN demandtotal ON stockmaster.stockid = demandtotal.part
- LEFT JOIN supplytotal ON stockmaster.stockid = supplytotal.part
- GROUP BY stockmaster.stockid,
- stockmaster.description,
- stockmaster.mbflag,
- stockmaster.actualcost,
- stockmaster.decimalplaces,
- supplytotal.supply,
- demandtotal.demand,
- extcost
- HAVING demand > supply
- ORDER BY '" . $_POST['Sort']."'";
+ FROM stockmaster
+ LEFT JOIN demandtotal ON stockmaster.stockid = demandtotal.part
+ LEFT JOIN supplytotal ON stockmaster.stockid = supplytotal.part
+ GROUP BY stockmaster.stockid,
+ stockmaster.description,
+ stockmaster.mbflag,
+ stockmaster.actualcost,
+ stockmaster.decimalplaces,
+ supplytotal.supply,
+ demandtotal.demand,
+ extcost
+ HAVING demand > supply
+ ORDER BY '" . $_POST['Sort']."'";
if ($_POST['CategoryID'] == 'All'){
$SQLCategory = ' ';
@@ -109,6 +114,12 @@
$SQLCategory = "WHERE stockmaster.categoryid = '" . $_POST['CategoryID'] . "'";
}
+ if ($_POST['ReportType'] == 'Shortage'){
+ $SQLHaving = " HAVING demandtotal.demand > supplytotal.supply ";
+ }else{
+ $SQLHaving = " HAVING demandtotal.demand <= supplytotal.supply ";
+ }
+
$sql = "SELECT stockmaster.stockid,
stockmaster.description,
stockmaster.mbflag,
@@ -135,15 +146,15 @@
stockmaster.overheadcost,
computedcost,
supplytotal.supply,
- demandtotal.demand
- HAVING demandtotal.demand > supplytotal.supply
- ORDER BY '" . $_POST['Sort'] . "'";
+ demandtotal.demand "
+ . $SQLHaving .
+ " ORDER BY '" . $_POST['Sort'] . "'";
$result = DB_query($sql,$db,'','',false,true);
if (DB_error_no($db) !=0) {
- $title = _('MRP Shortages') . ' - ' . _('Problem Report');
+ $title = _('MRP Shortages and Excesses') . ' - ' . _('Problem Report');
include('includes/header.inc');
- prnMsg( _('The MRP shortages could not be retrieved by the SQL because') . ' ' . DB_error_msg($db),'error');
+ prnMsg( _('The MRP shortages and excesses could not be retrieved by the SQL because') . ' ' . DB_error_msg($db),'error');
echo '<br/><a href="' .$rootpath .'/index.php">' . _('Back to the menu') . '</a>';
if ($debug==1){
echo '<br/>' . $sql;
@@ -153,9 +164,9 @@
}
if (DB_num_rows($result) == 0) {
- $title = _('MRP Shortages') . ' - ' . _('Problem Report');
+ $title = _('MRP Shortages and Excesses') . ' - ' . _('Problem Report');
include('includes/header.inc');
- prnMsg( _('No MRP shortages retrieved'), 'warn');
+ prnMsg( _('No MRP shortages - Excess retrieved'), 'warn');
echo '<br /><a href="' .$rootpath .'/index.php">' . _('Back to the menu') . '</a>';
if ($debug==1){
echo '<br />' . $sql;
@@ -172,7 +183,14 @@
$fill = false;
$pdf->SetFillColor(224,235,255); // Defines color to make alternating lines highlighted
while ($myrow = DB_fetch_array($result,$db)){
- if ($myrow['demand'] > $myrow['supply']) {
+
+ if ($_POST['ReportType'] == 'Shortage'){
+ $lineToPrint = ($myrow['demand'] > $myrow['supply']);
+ }else{
+ $lineToPrint = ($myrow['demand'] <= $myrow['supply']);
+ }
+
+ if ($lineToPrint) {
$YPos -=$line_height;
$FontSize=8;
@@ -220,15 +238,23 @@
/*Print out the grand totals */
$pdf->addTextWrap($Left_Margin,$YPos,120,$FontSize,_('Number of Parts: '), 'left');
$pdf->addTextWrap(150,$YPos,30,$FontSize,$Partctr, 'left');
+ if ($_POST['ReportType'] == 'Shortage'){
$pdf->addTextWrap(300,$YPos,180,$FontSize,_('Total Extended Shortage:'), 'right');
+ }else{
+ $pdf->addTextWrap(300,$YPos,180,$FontSize,_('Total Extended Excess:'), 'right');
+ }
$DisplayTotalVal = number_format($Total_Shortage,2);
$pdf->addTextWrap(510,$YPos,60,$FontSize,$DisplayTotalVal, 'right');
- $pdf->OutputD($_SESSION['DatabaseName'] . '_MRPShortages_' . date('Y-m-d').'.pdf');
+ if ($_POST['ReportType'] == 'Shortage'){
+ $pdf->OutputD($_SESSION['DatabaseName'] . '_MRPShortages_' . date('Y-m-d').'.pdf');
+ }else{
+ $pdf->OutputD($_SESSION['DatabaseName'] . '_MRPExcess_' . date('Y-m-d').'.pdf');
+ }
$pdf->__destruct();
} else { /*The option to print PDF was not hit so display form */
- $title=_('MRP Shortages Reporting');
+ $title=_('MRP Shortages - Excess Reporting');
include('includes/header.inc');
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/inventory.png" title="'
@@ -251,6 +277,12 @@
echo "<option selected value='extcost'>" . _('Extended Shortage Dollars').'</option>';
echo "<option value='stockid'>" . _('Part Number').'</option>';
echo '</select></td></tr>';
+
+ echo '<tr><td>' . _('Shortage-Excess Option') . ":</td><td><select name='ReportType'>";
+ echo "<option selected value='Shortage'>" . _('Report MRP Shortages').'</option>';
+ echo "<option value='Excess'>" . _('Report MRP Excesses').'</option>';
+ echo '</select></td></tr>';
+
echo '<tr><td>' . _('Print Option') . ":</td><td><select name='Fill'>";
echo "<option selected value='yes'>" . _('Print With Alternating Highlighted Lines').'</option>';
echo "<option value='no'>" . _('Plain Print').'</option>';
@@ -277,8 +309,12 @@
$pdf->addTextWrap($Left_Margin,$YPos,300,$FontSize,$_SESSION['CompanyRecord']['coyname']);
$YPos -=$line_height;
+if ($_POST['ReportType'] == 'Shortage'){
+$pdf->addTextWrap($Left_Margin,$YPos,300,$FontSize,_('MRP Shortages Report'));
+}else{
+ $pdf->addTextWrap($Left_Margin,$YPos,300,$FontSize,_('MRP Excess Report'));
+}
-$pdf->addTextWrap($Left_Margin,$YPos,300,$FontSize,_('MRP Shortages Report'));
$pdf->addTextWrap($Page_Width-$Right_Margin-110,$YPos,160,$FontSize,_('Printed') . ': ' .
Date($_SESSION['DefaultDateFormat']) . ' ' . _('Page') . ' ' . $PageNumber,'left');
@@ -300,9 +336,13 @@
$pdf->addTextWrap(305,$YPos,55,$FontSize,_('Unit Cost'), 'right');
$pdf->addTextWrap(360,$YPos,50,$FontSize,_('Supply'), 'right');
$pdf->addTextWrap(410,$YPos,50,$FontSize,_('Demand'), 'right');
+if ($_POST['ReportType'] == 'Shortage'){
$pdf->addTextWrap(460,$YPos,50,$FontSize,_('Shortage'), 'right');
$pdf->addTextWrap(510,$YPos,60,$FontSize,_('Ext. Shortage'), 'right');
-
+}else{
+ $pdf->addTextWrap(460,$YPos,50,$FontSize,_('Excess'), 'right');
+ $pdf->addTextWrap(510,$YPos,60,$FontSize,_('Ext. Excess'), 'right');
+}
$FontSize=8;
$YPos =$YPos - (2*$line_height);
$PageNumber++;
Modified: trunk/PcAssignCashToTab.php
===================================================================
--- trunk/PcAssignCashToTab.php 2011-05-28 05:38:42 UTC (rev 4577)
+++ trunk/PcAssignCashToTab.php 2011-05-28 11:01:00 UTC (rev 4578)
@@ -198,7 +198,7 @@
}
$sql = "SELECT * FROM pcashdetails
WHERE tabcode='" . $SelectedTabs . "'
- AND date >=DATE_SUB(CURDATE(), INTERVAL , '".$Days."' DAY)
+ AND date >=DATE_SUB(CURDATE(), INTERVAL , ".$Days." DAY)
ORDER BY date, counterindex ASC";
Modified: trunk/PcExpensesTypeTab.php
===================================================================
--- trunk/PcExpensesTypeTab.php 2011-05-28 05:38:42 UTC (rev 4577)
+++ trunk/PcExpensesTypeTab.php 2011-05-28 11:01:00 UTC (rev 4578)
@@ -179,12 +179,14 @@
printf('<td>%s</td>
<td>%s</td>
- <td><a href="%sSelectedType=%s&delete=yes&SelectedTab=' . $_POST['SelectedTab'] . '" onclick="return confirm(\'' . _('Are you sure you wish to delete this code and the expense it may have set up?') . '\');">' . _('Delete') . '</td>
+ <td><a href="%s?SelectedType=%s&delete=yes&SelectedTab=' . $_POST['SelectedTab'] . '" onclick="return confirm(\'' . _('Are you sure you wish to delete this code and the expense it may have set up?') . '\');">' . _('Delete') . '</td>
</tr>',
$myrow['codeexpense'],
$myrow['description'],
- $_SERVER['PHP_SELF'], $myrow['codeexpense'],
- $_SERVER['PHP_SELF'], $myrow['codeexpense']);
+ $_SERVER['PHP_SELF'],
+ $myrow['codeexpense'],
+ $_SERVER['PHP_SELF'],
+ $myrow['codeexpense']);
}
//END WHILE LIST LOOP
echo '</table>';
Modified: trunk/SuppTransGLAnalysis.php
===================================================================
--- trunk/SuppTransGLAnalysis.php 2011-05-28 05:38:42 UTC (rev 4577)
+++ trunk/SuppTransGLAnalysis.php 2011-05-28 11:01:00 UTC (rev 4578)
@@ -136,9 +136,9 @@
if ($_SESSION['SuppTrans']->InvoiceOrCredit == 'Invoice'){
- echo '<br /><a href="' . $rootpath . '/SupplierInvoice.php">' . _('Back to Invoice Entry') . '</a>';
+ echo '<br /><div class="centre"><a href="' . $rootpath . '/SupplierInvoice.php">' . _('Back to Invoice Entry') . '</a></div>';
} else {
- echo '<br /><a href="' . $rootpath . '/SupplierCredit.php">' . _('Back to Credit Note Entry') . '</a>';
+ echo '<br /><div class="centre"><a href="' . $rootpath . '/SupplierCredit.php">' . _('Back to Credit Note Entry') . '</a></div>';
}
/*Set up a form to allow input of new GL entries */
@@ -191,7 +191,7 @@
</tr>
</table><br />';
-echo '<input type="submit" name="AddGLCodeToTrans" value="' . _('Enter GL Line') . '">';
+echo '<div class="centre"><input type="submit" name="AddGLCodeToTrans" value="' . _('Enter GL Line') . '"></div>';
echo '</form>';
include('includes/footer.inc');
Modified: trunk/UpgradeDatabase.php
===================================================================
--- trunk/UpgradeDatabase.php 2011-05-28 05:38:42 UTC (rev 4577)
+++ trunk/UpgradeDatabase.php 2011-05-28 11:01:00 UTC (rev 4578)
@@ -116,6 +116,8 @@
$SQLScripts[] = './sql/mysql/upgrade3.11.1-4.00.sql';
case '4.03.8':
$SQLScripts[] = './sql/mysql/upgrade4.03-4.04.sql';
+ case '4.04':
+ $SQLScripts[] = './sql/mysql/upgrade4.04-4.04.1.sql';
break;
} //end switch
}
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-05-28 05:38:42 UTC (rev 4577)
+++ trunk/doc/Change.log 2011-05-28 11:01:00 UTC (rev 4578)
@@ -1,5 +1,10 @@
webERP Change Log
+28/5/11 Ricard PcAssignCashToTab.php quoted the $Days integer parameter to the INTERVAL function incorrectly now fixed
+28/5/11 Ricard reported bug on deletion of PcExpensesTypeTab - incorrectly formed URL and parameters added ?
+28/5/11 Ricard reported mismatch of fields scripts pagesecurity changed to int(11) from tinyint as other tables all refer to as int(11)
+28/5/11 R2-G reported alignment issue with link and button on SuppTransGLAnalysis now fixed
+28/5/11 Ricard: MRPShortages now has an option to report excesses too
28/5/11 Ricard: Fix sql to take quotes out of literals in upgrade script. PDFPrintLabels fix sql to get current price.
28/5/11 Reported by Daniel Brewer Fix SelectSalesOrder.php creation of PO with excluding redundant fields in purchorderdetails that were taken out.
28/5/11 Exson: UpdateCurrencyRateDaily was set to 1 when the option to enable it was clicked - should have been set to today's date in SystemParameters - fixed. Now no error reported bu ConvertSQLDate function when user enables update currencies daily.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-05-28 11:01:06
|
Revision: 4578
http://web-erp.svn.sourceforge.net/web-erp/?rev=4578&view=rev
Author: daintree
Date: 2011-05-28 11:01:00 +0000 (Sat, 28 May 2011)
Log Message:
-----------
bug fixes reported by Ricard
Modified Paths:
--------------
trunk/MRPShortages.php
trunk/PcAssignCashToTab.php
trunk/PcExpensesTypeTab.php
trunk/SuppTransGLAnalysis.php
trunk/UpgradeDatabase.php
trunk/doc/Change.log
Modified: trunk/MRPShortages.php
===================================================================
--- trunk/MRPShortages.php 2011-05-28 05:38:42 UTC (rev 4577)
+++ trunk/MRPShortages.php 2011-05-28 11:01:00 UTC (rev 4578)
@@ -22,8 +22,13 @@
if (isset($_POST['PrintPDF'])) {
include('includes/PDFStarter.php');
- $pdf->addInfo('Title',_('MRP Shortages Report'));
- $pdf->addInfo('Subject',_('MRP Shortages'));
+ if ($_POST['ReportType'] == 'Shortage'){
+ $pdf->addInfo('Title',_('MRP Shortages Report'));
+ $pdf->addInfo('Subject',_('MRP Shortages'));
+ }else{
+ $pdf->addInfo('Title',_('MRP Excess Report'));
+ $pdf->addInfo('Subject',_('MRP Excess'));
+ }
$FontSize=9;
$PageNumber=1;
$line_height=12;
@@ -89,19 +94,19 @@
(demandtotal.demand - supplytotal.supply) *
(stockmaster.materialcost + stockmaster.labourcost +
stockmaster.overheadcost ) as extcost
- FROM stockmaster
- LEFT JOIN demandtotal ON stockmaster.stockid = demandtotal.part
- LEFT JOIN supplytotal ON stockmaster.stockid = supplytotal.part
- GROUP BY stockmaster.stockid,
- stockmaster.description,
- stockmaster.mbflag,
- stockmaster.actualcost,
- stockmaster.decimalplaces,
- supplytotal.supply,
- demandtotal.demand,
- extcost
- HAVING demand > supply
- ORDER BY '" . $_POST['Sort']."'";
+ FROM stockmaster
+ LEFT JOIN demandtotal ON stockmaster.stockid = demandtotal.part
+ LEFT JOIN supplytotal ON stockmaster.stockid = supplytotal.part
+ GROUP BY stockmaster.stockid,
+ stockmaster.description,
+ stockmaster.mbflag,
+ stockmaster.actualcost,
+ stockmaster.decimalplaces,
+ supplytotal.supply,
+ demandtotal.demand,
+ extcost
+ HAVING demand > supply
+ ORDER BY '" . $_POST['Sort']."'";
if ($_POST['CategoryID'] == 'All'){
$SQLCategory = ' ';
@@ -109,6 +114,12 @@
$SQLCategory = "WHERE stockmaster.categoryid = '" . $_POST['CategoryID'] . "'";
}
+ if ($_POST['ReportType'] == 'Shortage'){
+ $SQLHaving = " HAVING demandtotal.demand > supplytotal.supply ";
+ }else{
+ $SQLHaving = " HAVING demandtotal.demand <= supplytotal.supply ";
+ }
+
$sql = "SELECT stockmaster.stockid,
stockmaster.description,
stockmaster.mbflag,
@@ -135,15 +146,15 @@
stockmaster.overheadcost,
computedcost,
supplytotal.supply,
- demandtotal.demand
- HAVING demandtotal.demand > supplytotal.supply
- ORDER BY '" . $_POST['Sort'] . "'";
+ demandtotal.demand "
+ . $SQLHaving .
+ " ORDER BY '" . $_POST['Sort'] . "'";
$result = DB_query($sql,$db,'','',false,true);
if (DB_error_no($db) !=0) {
- $title = _('MRP Shortages') . ' - ' . _('Problem Report');
+ $title = _('MRP Shortages and Excesses') . ' - ' . _('Problem Report');
include('includes/header.inc');
- prnMsg( _('The MRP shortages could not be retrieved by the SQL because') . ' ' . DB_error_msg($db),'error');
+ prnMsg( _('The MRP shortages and excesses could not be retrieved by the SQL because') . ' ' . DB_error_msg($db),'error');
echo '<br/><a href="' .$rootpath .'/index.php">' . _('Back to the menu') . '</a>';
if ($debug==1){
echo '<br/>' . $sql;
@@ -153,9 +164,9 @@
}
if (DB_num_rows($result) == 0) {
- $title = _('MRP Shortages') . ' - ' . _('Problem Report');
+ $title = _('MRP Shortages and Excesses') . ' - ' . _('Problem Report');
include('includes/header.inc');
- prnMsg( _('No MRP shortages retrieved'), 'warn');
+ prnMsg( _('No MRP shortages - Excess retrieved'), 'warn');
echo '<br /><a href="' .$rootpath .'/index.php">' . _('Back to the menu') . '</a>';
if ($debug==1){
echo '<br />' . $sql;
@@ -172,7 +183,14 @@
$fill = false;
$pdf->SetFillColor(224,235,255); // Defines color to make alternating lines highlighted
while ($myrow = DB_fetch_array($result,$db)){
- if ($myrow['demand'] > $myrow['supply']) {
+
+ if ($_POST['ReportType'] == 'Shortage'){
+ $lineToPrint = ($myrow['demand'] > $myrow['supply']);
+ }else{
+ $lineToPrint = ($myrow['demand'] <= $myrow['supply']);
+ }
+
+ if ($lineToPrint) {
$YPos -=$line_height;
$FontSize=8;
@@ -220,15 +238,23 @@
/*Print out the grand totals */
$pdf->addTextWrap($Left_Margin,$YPos,120,$FontSize,_('Number of Parts: '), 'left');
$pdf->addTextWrap(150,$YPos,30,$FontSize,$Partctr, 'left');
+ if ($_POST['ReportType'] == 'Shortage'){
$pdf->addTextWrap(300,$YPos,180,$FontSize,_('Total Extended Shortage:'), 'right');
+ }else{
+ $pdf->addTextWrap(300,$YPos,180,$FontSize,_('Total Extended Excess:'), 'right');
+ }
$DisplayTotalVal = number_format($Total_Shortage,2);
$pdf->addTextWrap(510,$YPos,60,$FontSize,$DisplayTotalVal, 'right');
- $pdf->OutputD($_SESSION['DatabaseName'] . '_MRPShortages_' . date('Y-m-d').'.pdf');
+ if ($_POST['ReportType'] == 'Shortage'){
+ $pdf->OutputD($_SESSION['DatabaseName'] . '_MRPShortages_' . date('Y-m-d').'.pdf');
+ }else{
+ $pdf->OutputD($_SESSION['DatabaseName'] . '_MRPExcess_' . date('Y-m-d').'.pdf');
+ }
$pdf->__destruct();
} else { /*The option to print PDF was not hit so display form */
- $title=_('MRP Shortages Reporting');
+ $title=_('MRP Shortages - Excess Reporting');
include('includes/header.inc');
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/inventory.png" title="'
@@ -251,6 +277,12 @@
echo "<option selected value='extcost'>" . _('Extended Shortage Dollars').'</option>';
echo "<option value='stockid'>" . _('Part Number').'</option>';
echo '</select></td></tr>';
+
+ echo '<tr><td>' . _('Shortage-Excess Option') . ":</td><td><select name='ReportType'>";
+ echo "<option selected value='Shortage'>" . _('Report MRP Shortages').'</option>';
+ echo "<option value='Excess'>" . _('Report MRP Excesses').'</option>';
+ echo '</select></td></tr>';
+
echo '<tr><td>' . _('Print Option') . ":</td><td><select name='Fill'>";
echo "<option selected value='yes'>" . _('Print With Alternating Highlighted Lines').'</option>';
echo "<option value='no'>" . _('Plain Print').'</option>';
@@ -277,8 +309,12 @@
$pdf->addTextWrap($Left_Margin,$YPos,300,$FontSize,$_SESSION['CompanyRecord']['coyname']);
$YPos -=$line_height;
+if ($_POST['ReportType'] == 'Shortage'){
+$pdf->addTextWrap($Left_Margin,$YPos,300,$FontSize,_('MRP Shortages Report'));
+}else{
+ $pdf->addTextWrap($Left_Margin,$YPos,300,$FontSize,_('MRP Excess Report'));
+}
-$pdf->addTextWrap($Left_Margin,$YPos,300,$FontSize,_('MRP Shortages Report'));
$pdf->addTextWrap($Page_Width-$Right_Margin-110,$YPos,160,$FontSize,_('Printed') . ': ' .
Date($_SESSION['DefaultDateFormat']) . ' ' . _('Page') . ' ' . $PageNumber,'left');
@@ -300,9 +336,13 @@
$pdf->addTextWrap(305,$YPos,55,$FontSize,_('Unit Cost'), 'right');
$pdf->addTextWrap(360,$YPos,50,$FontSize,_('Supply'), 'right');
$pdf->addTextWrap(410,$YPos,50,$FontSize,_('Demand'), 'right');
+if ($_POST['ReportType'] == 'Shortage'){
$pdf->addTextWrap(460,$YPos,50,$FontSize,_('Shortage'), 'right');
$pdf->addTextWrap(510,$YPos,60,$FontSize,_('Ext. Shortage'), 'right');
-
+}else{
+ $pdf->addTextWrap(460,$YPos,50,$FontSize,_('Excess'), 'right');
+ $pdf->addTextWrap(510,$YPos,60,$FontSize,_('Ext. Excess'), 'right');
+}
$FontSize=8;
$YPos =$YPos - (2*$line_height);
$PageNumber++;
Modified: trunk/PcAssignCashToTab.php
===================================================================
--- trunk/PcAssignCashToTab.php 2011-05-28 05:38:42 UTC (rev 4577)
+++ trunk/PcAssignCashToTab.php 2011-05-28 11:01:00 UTC (rev 4578)
@@ -198,7 +198,7 @@
}
$sql = "SELECT * FROM pcashdetails
WHERE tabcode='" . $SelectedTabs . "'
- AND date >=DATE_SUB(CURDATE(), INTERVAL , '".$Days."' DAY)
+ AND date >=DATE_SUB(CURDATE(), INTERVAL , ".$Days." DAY)
ORDER BY date, counterindex ASC";
Modified: trunk/PcExpensesTypeTab.php
===================================================================
--- trunk/PcExpensesTypeTab.php 2011-05-28 05:38:42 UTC (rev 4577)
+++ trunk/PcExpensesTypeTab.php 2011-05-28 11:01:00 UTC (rev 4578)
@@ -179,12 +179,14 @@
printf('<td>%s</td>
<td>%s</td>
- <td><a href="%sSelectedType=%s&delete=yes&SelectedTab=' . $_POST['SelectedTab'] . '" onclick="return confirm(\'' . _('Are you sure you wish to delete this code and the expense it may have set up?') . '\');">' . _('Delete') . '</td>
+ <td><a href="%s?SelectedType=%s&delete=yes&SelectedTab=' . $_POST['SelectedTab'] . '" onclick="return confirm(\'' . _('Are you sure you wish to delete this code and the expense it may have set up?') . '\');">' . _('Delete') . '</td>
</tr>',
$myrow['codeexpense'],
$myrow['description'],
- $_SERVER['PHP_SELF'], $myrow['codeexpense'],
- $_SERVER['PHP_SELF'], $myrow['codeexpense']);
+ $_SERVER['PHP_SELF'],
+ $myrow['codeexpense'],
+ $_SERVER['PHP_SELF'],
+ $myrow['codeexpense']);
}
//END WHILE LIST LOOP
echo '</table>';
Modified: trunk/SuppTransGLAnalysis.php
===================================================================
--- trunk/SuppTransGLAnalysis.php 2011-05-28 05:38:42 UTC (rev 4577)
+++ trunk/SuppTransGLAnalysis.php 2011-05-28 11:01:00 UTC (rev 4578)
@@ -136,9 +136,9 @@
if ($_SESSION['SuppTrans']->InvoiceOrCredit == 'Invoice'){
- echo '<br /><a href="' . $rootpath . '/SupplierInvoice.php">' . _('Back to Invoice Entry') . '</a>';
+ echo '<br /><div class="centre"><a href="' . $rootpath . '/SupplierInvoice.php">' . _('Back to Invoice Entry') . '</a></div>';
} else {
- echo '<br /><a href="' . $rootpath . '/SupplierCredit.php">' . _('Back to Credit Note Entry') . '</a>';
+ echo '<br /><div class="centre"><a href="' . $rootpath . '/SupplierCredit.php">' . _('Back to Credit Note Entry') . '</a></div>';
}
/*Set up a form to allow input of new GL entries */
@@ -191,7 +191,7 @@
</tr>
</table><br />';
-echo '<input type="submit" name="AddGLCodeToTrans" value="' . _('Enter GL Line') . '">';
+echo '<div class="centre"><input type="submit" name="AddGLCodeToTrans" value="' . _('Enter GL Line') . '"></div>';
echo '</form>';
include('includes/footer.inc');
Modified: trunk/UpgradeDatabase.php
===================================================================
--- trunk/UpgradeDatabase.php 2011-05-28 05:38:42 UTC (rev 4577)
+++ trunk/UpgradeDatabase.php 2011-05-28 11:01:00 UTC (rev 4578)
@@ -116,6 +116,8 @@
$SQLScripts[] = './sql/mysql/upgrade3.11.1-4.00.sql';
case '4.03.8':
$SQLScripts[] = './sql/mysql/upgrade4.03-4.04.sql';
+ case '4.04':
+ $SQLScripts[] = './sql/mysql/upgrade4.04-4.04.1.sql';
break;
} //end switch
}
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-05-28 05:38:42 UTC (rev 4577)
+++ trunk/doc/Change.log 2011-05-28 11:01:00 UTC (rev 4578)
@@ -1,5 +1,10 @@
webERP Change Log
+28/5/11 Ricard PcAssignCashToTab.php quoted the $Days integer parameter to the INTERVAL function incorrectly now fixed
+28/5/11 Ricard reported bug on deletion of PcExpensesTypeTab - incorrectly formed URL and parameters added ?
+28/5/11 Ricard reported mismatch of fields scripts pagesecurity changed to int(11) from tinyint as other tables all refer to as int(11)
+28/5/11 R2-G reported alignment issue with link and button on SuppTransGLAnalysis now fixed
+28/5/11 Ricard: MRPShortages now has an option to report excesses too
28/5/11 Ricard: Fix sql to take quotes out of literals in upgrade script. PDFPrintLabels fix sql to get current price.
28/5/11 Reported by Daniel Brewer Fix SelectSalesOrder.php creation of PO with excluding redundant fields in purchorderdetails that were taken out.
28/5/11 Exson: UpdateCurrencyRateDaily was set to 1 when the option to enable it was clicked - should have been set to today's date in SystemParameters - fixed. Now no error reported bu ConvertSQLDate function when user enables update currencies daily.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-05-29 04:07:24
|
Revision: 4579
http://web-erp.svn.sourceforge.net/web-erp/?rev=4579&view=rev
Author: daintree
Date: 2011-05-29 04:07:16 +0000 (Sun, 29 May 2011)
Log Message:
-----------
Ricard bug fixes assigner changes
Modified Paths:
--------------
trunk/ConfirmDispatch_Invoice.php
trunk/GetStockImage.php
trunk/PO_SelectOSPurchOrder.php
trunk/PcAssignCashToTab.php
trunk/PcAuthorizeExpenses.php
trunk/PcReportTab.php
trunk/PcTabs.php
trunk/SelectProduct.php
trunk/SelectSalesOrder.php
trunk/doc/Change.log
trunk/includes/ConnectDB.inc
trunk/locale/en_US.utf8/LC_MESSAGES/messages.po
Modified: trunk/ConfirmDispatch_Invoice.php
===================================================================
--- trunk/ConfirmDispatch_Invoice.php 2011-05-28 11:01:00 UTC (rev 4578)
+++ trunk/ConfirmDispatch_Invoice.php 2011-05-29 04:07:16 UTC (rev 4579)
@@ -139,9 +139,7 @@
salesorderdetails.orderlineno,
salesorderdetails.poline,
salesorderdetails.itemdue,
- stockmaster.materialcost +
- stockmaster.labourcost +
- stockmaster.overheadcost AS standardcost
+ stockmaster.materialcost + stockmaster.labourcost + stockmaster.overheadcost AS standardcost
FROM salesorderdetails INNER JOIN stockmaster
ON salesorderdetails.stkcode = stockmaster.stockid
WHERE salesorderdetails.orderno ='" . $_GET['OrderNumber'] . "'
@@ -316,8 +314,7 @@
echo '<td class="number">' . $LnItm->QtyDispatched . '</td>';
} else {
echo '<td class="number"><input type=hidden name="' . $LnItm->LineNumber . '_QtyDispatched" value="' .
- $LnItm->QtyDispatched . '"><a href="' . $rootpath .'/ConfirmDispatchControlled_Invoice.php?' . SID .
- '&LineNo='. $LnItm->LineNumber.'">' .$LnItm->QtyDispatched . '</a></td>';
+ $LnItm->QtyDispatched . '"><a href="' . $rootpath .'/ConfirmDispatchControlled_Invoice.php?LineNo='. $LnItm->LineNumber.'">' .$LnItm->QtyDispatched . '</a></td>';
}
} else {
if (isset($_POST['ProcessInvoice'])) {
@@ -1139,8 +1136,7 @@
if ($OrderLine->Controlled ==1){
foreach($OrderLine->SerialItems as $Item){
- /*We need to add the StockSerialItem record and
- The StockSerialMoves as well */
+ /*We need to add the StockSerialItem record and the StockSerialMoves as well */
$SQL = "UPDATE stockserialitems SET quantity= quantity - " . $Item->BundleQty . "
WHERE stockid='" . $OrderLine->StockID . "'
Modified: trunk/GetStockImage.php
===================================================================
--- trunk/GetStockImage.php 2011-05-28 11:01:00 UTC (rev 4578)
+++ trunk/GetStockImage.php 2011-05-29 04:07:16 UTC (rev 4579)
@@ -1,7 +1,7 @@
<?php
/* $Id$*/
-//$PageSecurity = 1;
+
include ('includes/session.inc');
/*
http://127.0.0.1/~brink/webERP/GetStockImage.php
Modified: trunk/PO_SelectOSPurchOrder.php
===================================================================
--- trunk/PO_SelectOSPurchOrder.php 2011-05-28 11:01:00 UTC (rev 4578)
+++ trunk/PO_SelectOSPurchOrder.php 2011-05-29 04:07:16 UTC (rev 4579)
@@ -131,20 +131,21 @@
if (!isset($OrderNumber) or $OrderNumber=='' ){
echo '<a href="' . $rootpath . '/PO_Header.php?' .SID . '&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><td>'._('Order Number') . ': <input type=text name="OrderNumber" MAXLENGTH =8 size=9> ' . _('Into Stock Location') . ':<select name="StockLocation"> ';
- $sql = 'SELECT loccode, locationname FROM locations';
+ echo '<table class=selection><tr><td>'._('Order Number') . ': <input type="text" name="OrderNumber" maxlength="8" size="9" /> ' . _('Into Stock Location') . ':<select name="StockLocation">';
+
+ $sql = "SELECT loccode, locationname FROM locations";
$resultStkLocs = DB_query($sql,$db);
while ($myrow=DB_fetch_array($resultStkLocs)){
if (isset($_POST['StockLocation'])){
if ($myrow['loccode'] == $_POST['StockLocation']){
- echo '<option selected Value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
+ echo '<option selected value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
} else {
- echo '<option Value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '<option>';
+ echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
}
} elseif ($myrow['loccode']== $_SESSION['UserStockLocation']){
- echo '<option selected Value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
+ echo '<option selected value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
} else {
- echo '<option Value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
+ echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
}
}
@@ -180,23 +181,23 @@
$SQL="SELECT categoryid, categorydescription FROM stockcategory ORDER BY categorydescription";
$result1 = DB_query($SQL,$db);
-echo "<br><font size=1><div class='page_help_text'>" ._('To search for purchase orders for a specific part use the part selection facilities below')
- ."</div> </font>";
-echo "<br><table class=selection><tr>";
+echo '<br /><font size=1><div class="page_help_text">' ._('To search for purchase orders for a specific part use the part selection facilities below')
+ .'</div> </font>';
+echo '<br /><table class="selection"><tr>';
-echo "<td><font size=1>" . _('Select a stock category') . ":</font><select name='StockCat'>";
+echo '<td><font size="1">' . _('Select a stock category') . ':</font><select name="StockCat">';
while ($myrow1 = DB_fetch_array($result1)) {
if (isset($_POST['StockCat']) and $myrow1['categoryid']==$_POST['StockCat']){
- echo "<option selected value='". $myrow1['categoryid'] . "'>" . $myrow1['categorydescription'] . '</option>';
+ echo '<option selected value="'. $myrow1['categoryid'] . '">' . $myrow1['categorydescription'] . '</option>';
} else {
- echo "<option value='". $myrow1['categoryid'] . "'>" . $myrow1['categorydescription'] . '</option>';
+ echo '<option value="'. $myrow1['categoryid'] . '">' . $myrow1['categorydescription'] . '</option>';
}
}
-echo "</select>";
-echo "<td><font size=1>" . _('Enter text extracts in the') . "<b>" . _('description') . "</b>:</font></td>";
+echo '</select>';
+echo '<td><font size=1>' . _('Enter text extracts in the') . '<b>' . _('description') . '</b>:</font></td>';
echo '<td><input type="Text" name="Keywords" size=20 maxlength=25></td></tr><tr><td></td>';
-echo "<td><font size<b>" . _('OR') . "</b></font><font size=1>" . _('Enter extract of the') . "<b>" . _('Stock Code') . "</b>:</font></td>";
+echo '<td><font size<b>' . _('OR') . '</b></font><font size=1>' . _('Enter extract of the') . '<b>' . _('Stock Code') . '</b>:</font></td>';
echo '<td><input type="Text" name="StockCode" size=15 maxlength=18></td></tr></table><br>';
echo '<table><tr><td><input type=submit name="SearchParts" value="' . _('Search Parts Now') . '">';
echo '<input type=submit name="ResetPart" value="' . _('Show All') . '"></td></tr></table>';
Modified: trunk/PcAssignCashToTab.php
===================================================================
--- trunk/PcAssignCashToTab.php 2011-05-28 11:01:00 UTC (rev 4578)
+++ trunk/PcAssignCashToTab.php 2011-05-29 04:07:16 UTC (rev 4579)
@@ -155,7 +155,7 @@
DB_free_result($result);
$SQL = "SELECT tabcode
FROM pctabs
- WHERE authorizer='" . $_SESSION['UserID'] . "'
+ WHERE assigner='" . $_SESSION['UserID'] . "'
ORDER BY tabcode";
$result = DB_query($SQL,$db);
@@ -198,7 +198,7 @@
}
$sql = "SELECT * FROM pcashdetails
WHERE tabcode='" . $SelectedTabs . "'
- AND date >=DATE_SUB(CURDATE(), INTERVAL , ".$Days." DAY)
+ AND date >=DATE_SUB(CURDATE(), INTERVAL , " . $Days . " DAY)
ORDER BY date, counterindex ASC";
Modified: trunk/PcAuthorizeExpenses.php
===================================================================
--- trunk/PcAuthorizeExpenses.php 2011-05-28 11:01:00 UTC (rev 4578)
+++ trunk/PcAuthorizeExpenses.php 2011-05-29 04:07:16 UTC (rev 4579)
@@ -2,7 +2,7 @@
/* $Id$*/
include('includes/session.inc');
-$title = _('Authorization of Petty Cash Expenses');
+$title = _('Authorisation of Petty Cash Expenses');
include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
@@ -40,10 +40,10 @@
if (isset($SelectedTabs)) {
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/magnifier.png" title="' . _('Petty Cash') .
- '" alt="" />' . _('Authorization Of Petty Cash Expenses ') . ''.$SelectedTabs.'</p>';
+ '" alt="" />' . _('Authorisation Of Petty Cash Expenses ') . ''.$SelectedTabs.'</p>';
} else {
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/magnifier.png" title="' . _('Petty Cash') .
- '" alt="" />' . _('Authorization Of Petty Cash Expenses ') . '</p>';
+ '" alt="" />' . _('Authorisation Of Petty Cash Expenses ') . '</p>';
}
if (isset($_POST['Submit']) or isset($_POST['update']) OR isset($SelectedTabs) OR isset ($_POST['GO'])) {
@@ -248,8 +248,8 @@
if (isset($_POST[$myrow['counterindex']])){
echo'<td>'.ConvertSQLDate(Date('Y-m-d')).'</td>';
}else{
- $Authorizer=ConvertSQLDate($myrow['authorized']);
- if(($Authorizer!='00/00/0000')){
+ $Authoriser=ConvertSQLDate($myrow['authorized']);
+ if(($Authoriser!='00/00/0000')){
echo'<td>'.ConvertSQLDate($myrow['authorized']).'</td>';
}else{
echo '<td align=right><input type="checkbox" name="'.$myrow['counterindex'].'">';
Modified: trunk/PcReportTab.php
===================================================================
--- trunk/PcReportTab.php 2011-05-28 11:01:00 UTC (rev 4578)
+++ trunk/PcReportTab.php 2011-05-29 04:07:16 UTC (rev 4579)
@@ -146,7 +146,7 @@
$LeftOvers = $pdf->addTextWrap($Left_Margin+340,$YPos,70,$FontSize,$_POST['ToDate']);
$YPos -= $line_height;
- $LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,60,$FontSize,_('Authorizer '));
+ $LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,60,$FontSize,_('Authoriser '));
$LeftOvers = $pdf->addTextWrap($Left_Margin+100,$YPos,20,$FontSize,_(': '));
$LeftOvers = $pdf->addTextWrap($Left_Margin+110,$YPos,70,$FontSize,$Tabs['authorizer']);
@@ -172,7 +172,7 @@
$LeftOvers = $pdf->addTextWrap($Left_Margin+200,$YPos,100,$FontSize,_('Amount'));
$LeftOvers = $pdf->addTextWrap($Left_Margin+250,$YPos,100,$FontSize,_('Note'));
$LeftOvers = $pdf->addTextWrap($Left_Margin+350,$YPos,100,$FontSize,_('Receipt'));
- $LeftOvers = $pdf->addTextWrap($Left_Margin+420,$YPos,100,$FontSize,_('Date Authorizer'));
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+420,$YPos,100,$FontSize,_('Date Authoriser'));
$YPos -= (2 * $line_height);
while ($myrow=DB_fetch_array($TabDetail)) {
@@ -262,7 +262,7 @@
'<td>' . _('To') . '</td><td>:</td><td>' .
''.$_POST['ToDate'].'</td></tr>';
- echo '<tr><td>' . _('Authorizer') . '</td><td>:</td><td>' . ''.$Tabs['authorizer'].'</td>
+ echo '<tr><td>' . _('Authoriser') . '</td><td>:</td><td>' . ''.$Tabs['authorizer'].'</td>
</tr>';
echo '<tr><td>' . _('Currency') . '</td><td>:</td><td>' . ''.$Tabs['currency'].'</td>
</tr>';
@@ -299,7 +299,7 @@
$BalanceNotAut['0']=0;
}
- echo '<tr><td>' . _('Total not authorized before ') . ''.$_POST['FromDate'].'</td><td>:</td><td>' . ''.$BalanceNotAut['0'].' '.$Tabs['currency'].'</td></tr>';
+ echo '<tr><td>' . _('Total not authorised before ') . ''.$_POST['FromDate'].'</td><td>:</td><td>' . ''.$BalanceNotAut['0'].' '.$Tabs['currency'].'</td></tr>';
echo '</table>';
@@ -326,7 +326,7 @@
<th>' . _('Amount') . '</th>
<th>' . _('Notes') . '</th>
<th>' . _('Receipt') . '</th>
- <th>' . _('Date Authorized') . '</th>
+ <th>' . _('Date Authorised') . '</th>
</tr>';
$j = 1;
Modified: trunk/PcTabs.php
===================================================================
--- trunk/PcTabs.php 2011-05-28 11:01:00 UTC (rev 4578)
+++ trunk/PcTabs.php 2011-05-29 04:07:16 UTC (rev 4579)
@@ -21,7 +21,8 @@
unset($_POST['SelectTabs']);
unset($_POST['SelectCurrency']);
unset($_POST['TabLimit']);
- unset($_POST['SelectAuthorizer']);
+ unset($_POST['SelectAssigner']);
+ unset($_POST['SelectAuthoriser']);
unset($_POST['GLAccountCash']);
unset($_POST['GLAccountPcashTab']);
}
@@ -64,10 +65,15 @@
echo prnMsg(_('You must select a type of tab from the list'),'error');
$Errors[$i] = 'TabType';
$i++;
- } elseif (($_POST['SelectAuthorizer'])=='') {
+ } elseif (($_POST['SelectAssigner'])=='') {
$InputError = 1;
+ echo prnMsg(_('You must select a User to assign cash to this tab'),'error');
+ $Errors[$i] = 'AssignerName';
+ $i++;
+ } elseif (($_POST['SelectAuthoriser'])=='') {
+ $InputError = 1;
echo prnMsg(_('You must select a User to authorise this tab'),'error');
- $Errors[$i] = 'AuthorizerName';
+ $Errors[$i] = 'AuthoriserName';
$i++;
} elseif (($_POST['GLAccountCash'])=='') {
$InputError = 1;
@@ -87,12 +93,13 @@
typetabcode = '" . $_POST['SelectTabs'] . "',
currency = '" . $_POST['SelectCurrency'] . "',
tablimit = '" . $_POST['TabLimit'] . "',
- authorizer = '" . $_POST['SelectAuthorizer'] . "',
+ assigner = '" . $_POST['SelectAssigner'] . "',
+ authorizer = '" . $_POST['SelectAuthoriser'] . "',
glaccountassignment = '" . $_POST['GLAccountCash'] . "',
glaccountpcash = '" . $_POST['GLAccountPcashTab'] . "'
WHERE tabcode = '".$SelectedTab."'";
- $msg = _('The Tabs Of Code') . ' ' . $SelectedTab . ' ' . _('has been updated');
+ $msg = _('The Petty Cash Tab') . ' ' . $SelectedTab . ' ' . _('has been updated');
} elseif ( $InputError !=1 ) {
// First check the type is not being duplicated
@@ -116,6 +123,7 @@
typetabcode,
currency,
tablimit,
+ assigner,
authorizer,
glaccountassignment,
glaccountpcash)
@@ -124,11 +132,12 @@
'" . $_POST['SelectTabs'] . "',
'" . $_POST['SelectCurrency'] . "',
'" . $_POST['TabLimit'] . "',
- '" . $_POST['SelectAuthorizer'] . "',
+ '" . $_POST['SelectAssigner'] . "',
+ '" . $_POST['SelectAuthoriser'] . "',
'" . $_POST['GLAccountCash'] . "',
'" . $_POST['GLAccountPcashTab'] . "')";
- $msg = _('Tab with Code ') . ' ' . $_POST['TabCode'] . ' ' . _('has been created');
+ $msg = _('The Petty Cash Tab') . ' ' . $_POST['tabcode'] . ' ' . _('has been created');
}
}
@@ -143,7 +152,8 @@
unset($_POST['SelectTabs']);
unset($_POST['SelectCurrency']);
unset($_POST['TabLimit']);
- unset($_POST['SelectAuthorizer']);
+ unset($_POST['SelectAssigner']);
+ unset($_POST['SelectAuthoriser']);
unset($_POST['GLAccountCash']);
unset($_POST['GLAccountPcashTab']);
}
@@ -153,7 +163,7 @@
$sql="DELETE FROM pctabs WHERE tabcode='".$SelectedTab."'";
$ErrMsg = _('The Tab record could not be deleted because');
$result = DB_query($sql,$db,$ErrMsg);
- prnMsg(_('Tab type') . ' ' . $SelectedTab . ' ' . _('has been deleted') ,'success');
+ prnMsg(_('The Petty Cash Tab') . ' ' . $SelectedTab . ' ' . _('has been deleted') ,'success');
unset ($SelectedTab);
unset($_GET['delete']);
}
@@ -170,6 +180,7 @@
typetabdescription,
currabrev,
tablimit,
+ assigner,
authorizer,
glaccountassignment,
glaccountpcash,
@@ -194,7 +205,8 @@
<th>' . _('Type Of Tab') . '</th>
<th>' . _('Currency') . '</th>
<th>' . _('Limit') . '</th>
- <th>' . _('Authorizer') . '</th>
+ <th>' . _('Assigner') . '</th>
+ <th>' . _('Authoriser') . '</th>
<th>' . _('GL Account For Cash Assignment') . '</th>
<th>' . _('GL Account Petty Cash Tab') . '</th>
</tr>';
@@ -218,6 +230,7 @@
<td>%s</td>
<td>%s</td>
<td>%s</td>
+ <td>%s</td>
<td><a href="%sSelectedTab=%s">' . _('Edit') . '</td>
<td><a href="%sSelectedTab=%s&delete=yes" onclick=\' return confirm("' . _('Are you sure you wish to delete this tab code?') . '");\'>' . _('Delete') . '</td>
</tr>',
@@ -226,6 +239,7 @@
$myrow['typetabdescription'],
$myrow['currabrev'],
number_format($myrow['tablimit'],$myrow['decimalplaces']),
+ $myrow['assigner'],
$myrow['authorizer'],
$myrow['glaccountassignment'].' - '. $myrow['glactassigntname'],
$myrow['glaccountpcash'].' - '.$myrow['glactpcashname'],
@@ -262,7 +276,8 @@
$_POST['SelectTabs'] = $myrow['typetabcode'];
$_POST['SelectCurrency'] = $myrow['currency'];
$_POST['TabLimit'] = $myrow['tablimit'];
- $_POST['SelectAuthorizer'] = $myrow['authorizer'];
+ $_POST['SelectAssigner'] = $myrow['assigner'];
+ $_POST['SelectAuthoriser'] = $myrow['authorizer'];
$_POST['GLAccountCash'] = $myrow['glaccountassignment'];
$_POST['GLAccountPcashTab'] = $myrow['glaccountpcash'];
@@ -358,8 +373,8 @@
echo '<tr><td>' . _('Limit Of Tab') . ':</td>
<td><input type="Text" class="number" name="TabLimit" size="12" maxlength="11" value="' . $_POST['TabLimit'] . '"></td></tr>';
- echo '<tr><td>' . _('Authoriser') . ':</td>
- <td><select name="SelectAuthorizer">';
+ echo '<tr><td>' . _('Assigner') . ':</td>
+ <td><select name="SelectAssigner">';
DB_free_result($result);
$SQL = "SELECT userid,
@@ -370,14 +385,34 @@
$result = DB_query($SQL,$db);
while ($myrow = DB_fetch_array($result)) {
- if (isset($_POST['SelectAuthorizer']) and $myrow['userid']==$_POST['SelectAuthorizer']) {
+ if (isset($_POST['SelectAssigner']) and $myrow['userid']==$_POST['SelectAssigner']) {
+ echo "<option selected value='";
+ } else {
+ echo "<option value='";
+ }
+ echo $myrow['userid'] . "'>" . $myrow['userid'] . ' - ' . $myrow['realname'] . '</option>';
+
+ } //end while loop get assigner
+
+ echo '<tr><td>' . _('Authoriser') . ":</td><td><select name='SelectAuthoriser'>";
+
+ DB_free_result($result);
+ $SQL = "SELECT userid,
+ realname
+ FROM www_users
+ ORDER BY userid";
+
+ $result = DB_query($SQL,$db);
+
+ while ($myrow = DB_fetch_array($result)) {
+ if (isset($_POST['SelectAuthoriser']) and $myrow['userid']==$_POST['SelectAuthoriser']) {
echo '<option selected value="';
} else {
echo '<option value="';
}
echo $myrow['userid'] . '">' . $myrow['userid'] . ' - ' . $myrow['realname'] . '</option>';
- } //end while loop get authorizer
+ } //end while loop get authoriser
echo '</select></td></tr>';
Modified: trunk/SelectProduct.php
===================================================================
--- trunk/SelectProduct.php 2011-05-28 11:01:00 UTC (rev 4578)
+++ trunk/SelectProduct.php 2011-05-29 04:07:16 UTC (rev 4579)
@@ -417,7 +417,7 @@
echo '<a href="' . $rootpath . '/StockTransfers.php?StockID=' . $StockID . '">' . _('Location Transfers') . '</a><br />';
//show the item image if it has been uploaded
if( isset($StockID) and file_exists($_SESSION['part_pics_dir'] . '/' .$StockID.'.jpg') ) {
- echo '<div class="centre"><img src="' . $_SESSION['part_pics_dir'] . '/' .$StockID.'.jpg ' . '" ></div>';
+ echo '<div class="centre"><img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC&StockID=' . $StockID . '&text=&width=120&height=120">';
}
if (($myrow['mbflag'] == 'B') AND (in_array($SuppliersSecurity, $_SESSION['AllowedPageSecurityTokens']))){
echo '<br />';
Modified: trunk/SelectSalesOrder.php
===================================================================
--- trunk/SelectSalesOrder.php 2011-05-28 11:01:00 UTC (rev 4578)
+++ trunk/SelectSalesOrder.php 2011-05-29 04:07:16 UTC (rev 4579)
@@ -807,80 +807,80 @@
/*Check authority to create POs if user has authority then show the check boxes to select sales orders to place POs for otherwise don't provide this option */
if ($AuthRow['cancreate']==0 AND $myrow['poplaced']==0){ //cancreate==0 if the user can create POs and not already placed
- printf("<td><a href='%s'>%s</a></td>
- <td><a href='%s'>" . _('Invoice') . "</a></td>
- <td><a target='_blank' href='%s'>" . $PrintText . " <IMG SRC='" .$rootpath."/css/".$theme."/images/pdf.png' title='" . _('Click for PDF') . "'></a></td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td class=number>%s</td>
- <td><input type=checkbox name=PlacePO_%s value><input type=hidden name=OrderNo_PO_%s value=%s></td>
- </tr>",
- $ModifyPage,
- $myrow['orderno'],
- $Confirm_Invoice,
- $PrintDispatchNote,
- $myrow['name'],
- $myrow['brname'],
- $myrow['customerref'],
- $FormatedOrderDate,
- $FormatedDelDate,
- $myrow['deliverto'],
- $FormatedOrderValue,
- $i,
- $i,
- $myrow['orderno']);
+ printf('<td><a href="%s">%s</a></td>
+ <td><a href="%s">' . _('Invoice') . '</a></td>
+ <td><a target="_blank" href="%s">' . $PrintText . ' <img src="' .$rootpath.'/css/'.$theme.'/images/pdf.png" title="' . _('Click for PDF') . '"></a></td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td class=number>%s</td>
+ <td><input type=checkbox name="PlacePO_%s" value><input type="hidden" name="OrderNo_PO_%s" value="%s"></td>
+ </tr>',
+ $ModifyPage,
+ $myrow['orderno'],
+ $Confirm_Invoice,
+ $PrintDispatchNote,
+ $myrow['name'],
+ $myrow['brname'],
+ $myrow['customerref'],
+ $FormatedOrderDate,
+ $FormatedDelDate,
+ html_entity_decode($myrow['deliverto'],ENT_QUOTES,UTF-8),
+ $FormatedOrderValue,
+ $i,
+ $i,
+ $myrow['orderno']);
} else { /*User is not authorised to create POs so don't even show the option */
- printf("<td><a href='%s'>%s</a></td>
- <td><a href='%s'>" . _('Invoice') . "</a></td>
- <td><a target='_blank' href='%s'>" . $PrintText . " <IMG SRC='" .$rootpath."/css/".$theme."/images/pdf.png' title='" . _('Click for PDF') . "'></a></td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td class=number>%s</td>
- </tr>",
- $ModifyPage,
- $myrow['orderno'],
- $Confirm_Invoice,
- $PrintDispatchNote,
- $myrow['name'],
- $myrow['brname'],
- $myrow['customerref'],
- $FormatedOrderDate,
- $FormatedDelDate,
- $myrow['deliverto'],
- $FormatedOrderValue);
+ printf('<td><a href="%s">%s</a></td>
+ <td><a href="%s">' . _('Invoice') . '</a></td>
+ <td><a target="_blank" href="%s">' . $PrintText . ' <img src="' .$rootpath . '/css/' . $theme .'/images/pdf.png" title="' . _('Click for PDF') . '"></a></td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td class=number>%s</td>
+ </tr>',
+ $ModifyPage,
+ $myrow['orderno'],
+ $Confirm_Invoice,
+ $PrintDispatchNote,
+ $myrow['name'],
+ $myrow['brname'],
+ $myrow['customerref'],
+ $FormatedOrderDate,
+ $FormatedDelDate,
+ html_entity_decode($myrow['deliverto'],ENT_QUOTES,UTF-8),
+ $FormatedOrderValue);
}
} else { /*must be quotes only */
- printf("<td><a href='%s'>%s</a></td>
- <td><a href='%s'>" . $PrintText . "</a></td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td class=number>%s</td>
- </tr>",
- $ModifyPage,
- $myrow['orderno'],
- $PrintQuotation,
- $myrow['name'],
- $myrow['brname'],
- $myrow['customerref'],
- $FormatedOrderDate,
- $FormatedDelDate,
- $myrow['deliverto'],
- $FormatedOrderValue);
+ printf('<td><a href="%s">%s</a></td>
+ <td><a href="%s">' . $PrintText . '</a></td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td class=number>%s</td>
+ </tr>',
+ $ModifyPage,
+ $myrow['orderno'],
+ $PrintQuotation,
+ $myrow['name'],
+ $myrow['brname'],
+ $myrow['customerref'],
+ $FormatedOrderDate,
+ $FormatedDelDate,
+ html_entity_decode($myrow['deliverto'],ENT_QUOTES,UTF-8),
+ $FormatedOrderValue);
}
- $i++;
+ $i++;
$j++;
$OrdersTotal += $myrow['ordervalue'];
if ($j == 12){
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-05-28 11:01:00 UTC (rev 4578)
+++ trunk/doc/Change.log 2011-05-29 04:07:16 UTC (rev 4579)
@@ -1,5 +1,8 @@
webERP Change Log
+28/5/11 Could not set controlled item batches/serial numbers on ConfirmDispatch_Invoice.php
+28/5/11 Ricard PO_SelectOSPurchOrder.php was showing select location with gaps between locations - no slash before <option> fixed
+28/5/11 Ricard added new field assigner to petty cash module and changes to PcTabs.php and PcAssignCashToTab.php
28/5/11 Ricard PcAssignCashToTab.php quoted the $Days integer parameter to the INTERVAL function incorrectly now fixed
28/5/11 Ricard reported bug on deletion of PcExpensesTypeTab - incorrectly formed URL and parameters added ?
28/5/11 Ricard reported mismatch of fields scripts pagesecurity changed to int(11) from tinyint as other tables all refer to as int(11)
Modified: trunk/includes/ConnectDB.inc
===================================================================
--- trunk/includes/ConnectDB.inc 2011-05-28 11:01:00 UTC (rev 4578)
+++ trunk/includes/ConnectDB.inc 2011-05-29 04:07:16 UTC (rev 4579)
@@ -4,7 +4,7 @@
* this value is saved in the $_SESSION['Versionumber'] when includes/GetConfig.php is run
* if VersionNumber is < $Version then the DB update script is run */
-$Version='4.04'; //must update manually every time there is a DB change
+$Version='4.04.1'; //must update manually every time there is a DB change
require_once ($PathPrefix .'includes/MiscFunctions.php');
Modified: trunk/locale/en_US.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/en_US.utf8/LC_MESSAGES/messages.po 2011-05-28 11:01:00 UTC (rev 4578)
+++ trunk/locale/en_US.utf8/LC_MESSAGES/messages.po 2011-05-29 04:07:16 UTC (rev 4579)
@@ -15517,16 +15517,16 @@
msgstr ""
#: PcAuthorizeExpenses.php:5
-msgid "Authorization of Petty Cash Expenses"
-msgstr ""
+msgid "Authorisation of Petty Cash Expenses"
+msgstr "Authorization of Petty Cash Expenses"
#: PcAuthorizeExpenses.php:29
msgid "You Must First Select a Petty Cash Tab To Authorise"
-msgstr ""
+msgstr "You Must First Select a Petty Cash Tab To Authorize"
#: PcAuthorizeExpenses.php:43 PcAuthorizeExpenses.php:46
-msgid "Authorization Of Petty Cash Expenses "
-msgstr ""
+msgid "Authorisation Of Petty Cash Expenses "
+msgstr "Authorization Of Petty Cash Expenses"
#: PcAuthorizeExpenses.php:58
msgid "Detail Of Movement For Last "
@@ -15543,7 +15543,7 @@
#: PcAuthorizeExpenses.php:293
#, fuzzy
msgid "Authorise expenses to Petty Cash Tab"
-msgstr "Shipping Re-charged GL Account"
+msgstr "Authorize expenses to Petty Cash Tab"
#: PcClaimExpensesFromTab.php:6
msgid "Claim Petty Cash Expenses From Tab"
@@ -15560,7 +15560,7 @@
#: PcClaimExpensesFromTab.php:67
#, fuzzy
msgid "The Amount must be greater than 0"
-msgstr "The shipping-method ID must be an integer"
+msgstr "The Amount must be greater than 0"
#: PcClaimExpensesFromTab.php:79 PcClaimExpensesFromTab.php:105
msgid "The Expense Claim on Tab"
@@ -15569,7 +15569,7 @@
#: PcClaimExpensesFromTab.php:124
#, fuzzy
msgid "Petty Cash Expense record could not be deleted because"
-msgstr "The Shipping cost record could not be updated because"
+msgstr "Petty Cash Expense record could not be deleted because"
#: PcClaimExpensesFromTab.php:126
msgid "Petty cash Expense record"
@@ -15592,12 +15592,12 @@
#: PcClaimExpensesFromTab.php:176
#, fuzzy
msgid "Select another tab"
-msgstr "Select the Vendor"
+msgstr "Select another tab"
#: PcClaimExpensesFromTab.php:182
#, fuzzy
msgid "Petty Cash Tab"
-msgstr "Shipping Re-charged GL Account"
+msgstr "Petty Cash Tab"
#: PcClaimExpensesFromTab.php:183
msgid "Detail Of Movements For Last "
@@ -15611,15 +15611,15 @@
#: PcClaimExpensesFromTab.php:211 PcReportTab.php:325
#, fuzzy
msgid "Expense Description"
-msgstr "Vendor Code or Description"
+msgstr ""
#: PcClaimExpensesFromTab.php:213
-msgid "Authorized"
-msgstr ""
+msgid "Authorised"
+msgstr "Authorized"
#: PcClaimExpensesFromTab.php:240
msgid "Unauthorised"
-msgstr ""
+msgstr "Unauthorized"
#: PcClaimExpensesFromTab.php:253
#, php-format
@@ -15644,7 +15644,7 @@
#: PcExpenses.php:51
#, fuzzy
msgid "The Expense code must be twenty characters or less long"
-msgstr "The territory code must be three characters or less long"
+msgstr ""
#: PcExpenses.php:57
msgid ""
@@ -15656,22 +15656,22 @@
msgid ""
"The Expense description cannot contain any of the following characters \" ' "
"- &"
-msgstr "The terrirory desscription must be twenty five characters or less long"
+msgstr ""
#: PcExpenses.php:69 PcTypeTabs.php:49
#, fuzzy
msgid "The tab code must be Fifty characters or less long"
-msgstr "The territory code must be three characters or less long"
+msgstr ""
#: PcExpenses.php:76
#, fuzzy
msgid "The tab code description must be entered"
-msgstr "The territory description may not be left blank"
+msgstr ""
#: PcExpenses.php:82
#, fuzzy
msgid "A general ledger code must be selected for this expense"
-msgstr "Shipping Re-charged GL Account"
+msgstr ""
#: PcExpenses.php:93
msgid "The Expenses type"
@@ -15707,12 +15707,12 @@
#: PcExpenses.php:152
#, fuzzy
msgid "tab types using this expense code"
-msgstr "branches using this territory code"
+msgstr ""
#: PcExpenses.php:158
#, fuzzy
msgid "The expense type record could not be deleted because"
-msgstr "The Shipping cost record could not be updated because"
+msgstr ""
#: PcExpenses.php:160
msgid "Expense type"
@@ -15721,7 +15721,7 @@
#: PcExpenses.php:183
#, fuzzy
msgid "Account Description"
-msgstr "Vendor Code or Description"
+msgstr ""
#: PcExpenses.php:209
#, php-format
@@ -15794,7 +15794,7 @@
#: PcExpensesTypeTab.php:198
#, fuzzy
msgid "Select Expense Code"
-msgstr "Select Vendor"
+msgstr ""
#: PcReportTab.php:8
msgid "Petty Cash Management Report"
@@ -15807,12 +15807,12 @@
#: PcReportTab.php:64
#, fuzzy
msgid "From Date :"
-msgstr "Vendor Order"
+msgstr ""
#: PcReportTab.php:67
#, fuzzy
msgid "To Date:"
-msgstr "Vendor Order"
+msgstr ""
#: PcReportTab.php:70
msgid "Show HTML"
@@ -15854,12 +15854,12 @@
#: PcReportTab.php:115
#, fuzzy
msgid "No Petty Cash tabs were returned by the SQL because"
-msgstr "The Vendor details could not be retrieved by the SQL because"
+msgstr ""
#: PcReportTab.php:133
#, fuzzy
msgid "Tab Code :"
-msgstr "Territory Code"
+msgstr ""
#: PcReportTab.php:134 PcReportTab.php:137 PcReportTab.php:142
#: PcReportTab.php:145 PcReportTab.php:150 PcReportTab.php:155
@@ -15881,8 +15881,8 @@
msgstr ""
#: PcReportTab.php:149
-msgid "Authorizer "
-msgstr ""
+msgid "Authoriser "
+msgstr "Authorizer"
#: PcReportTab.php:154
msgid "Currency "
@@ -15903,12 +15903,12 @@
#: PcReportTab.php:246
#, fuzzy
msgid "No Petty Cash Tabs were returned by the SQL because"
-msgstr "The Vendor details could not be retrieved by the SQL because"
+msgstr ""
#: PcReportTab.php:253 PcTabs.php:192 PcTabs.php:274 PcTabs.php:280
#, fuzzy
msgid "Tab Code"
-msgstr "Territory Code"
+msgstr ""
#: PcReportTab.php:265 PcTabs.php:197
msgid "Authorizer"
@@ -15921,11 +15921,11 @@
#: PcReportTab.php:319
#, fuzzy
msgid "No Petty Cash movements for this tab were returned by the SQL because"
-msgstr "The Vendor details could not be retrieved by the SQL because"
+msgstr ""
#: PcReportTab.php:329
-msgid "Date Authorized"
-msgstr ""
+msgid "Date Authorised"
+msgstr "Date Authorized"
#: PcReportTab.php:399
msgid "Balance At"
@@ -15947,7 +15947,7 @@
#: PcTabs.php:54
#, fuzzy
msgid "The Tab code must be twenty characters or less long"
-msgstr "The territory code must be three characters or less long"
+msgstr ""
#: PcTabs.php:59
msgid "You must select a User for this tab"
@@ -15960,7 +15960,7 @@
#: PcTabs.php:69
#, fuzzy
msgid "You must select a User to authorise this tab"
-msgstr "Vendor Code or Description"
+msgstr ""
#: PcTabs.php:74
msgid "You must select a General ledger code for the cash to be assigned from"
@@ -15981,7 +15981,7 @@
#: PcTabs.php:109
#, fuzzy
msgid " already exists"
-msgstr "The territory code entered already exists"
+msgstr ""
#: PcTabs.php:131
msgid "Tab with Code "
@@ -15990,7 +15990,7 @@
#: PcTabs.php:154
#, fuzzy
msgid "The Tab record could not be deleted because"
-msgstr "The Shipping cost record could not be updated because"
+msgstr ""
#: PcTabs.php:156 PcTypeTabs.php:135
msgid "Tab type"
@@ -16016,7 +16016,7 @@
#: PcTabs.php:199 PcTabs.php:408
#, fuzzy
msgid "GL Account Petty Cash Tab"
-msgstr "Shipping Re-charged GL Account"
+msgstr ""
#: PcTabs.php:222
#, php-format
@@ -16026,7 +16026,7 @@
#: PcTabs.php:243
#, fuzzy
msgid "Show All Tabs Defined"
-msgstr "Review Territories Defined"
+msgstr ""
#: PcTabs.php:358
msgid "Limit Of Tab"
@@ -16034,12 +16034,12 @@
#: PcTabs.php:361
msgid "Authoriser"
-msgstr ""
+msgstr "Authorizer"
#: PcTabs.php:384
#, fuzzy
msgid "GL Account Cash Assignment"
-msgstr "Shipping Re-charged GL Account"
+msgstr ""
#: PcTypeTabs.php:5
msgid "Maintenance Of Petty Cash Type of Tabs"
@@ -16048,18 +16048,18 @@
#: PcTypeTabs.php:36
#, fuzzy
msgid "The Tabs type code cannot be an empty string"
-msgstr "The territory code may not be left blank"
+msgstr ""
#: PcTypeTabs.php:41
#, fuzzy
msgid "The tab code must be twenty characters or less long"
-msgstr "The territory code must be three characters or less long"
+msgstr ""
#: PcTypeTabs.php:46
#, fuzzy
msgid ""
"The petty cash tab type code cannot contain any of the illegal characters"
-msgstr "The terrirory desscription must be twenty five characters or less long"
+msgstr ""
#: PcTypeTabs.php:60
msgid "The Tabs type"
@@ -16077,7 +16077,6 @@
#, fuzzy
msgid "The number of tabs using this Tab type could not be retrieved"
msgstr ""
-"The vendors matching the criteria entered could not be retrieved because"
#: PcTypeTabs.php:122
#, fuzzy
@@ -16085,8 +16084,6 @@
"Cannot delete this tab type because tabs have been created using this tab "
"type"
msgstr ""
-"Cannot delete this territory because customer branches have been created "
-"using this area"
#: PcTypeTabs.php:126
msgid "Return to list of tab types"
@@ -16102,7 +16099,7 @@
#: PcTypeTabs.php:187
#, fuzzy
msgid "Show All Types Tabs Defined"
-msgstr "Review Territories Defined"
+msgstr ""
#: PcTypeTabs.php:212 PcTypeTabs.php:224
msgid "Code Of Type Of Tab"
@@ -16336,7 +16333,7 @@
#: PDFCustTransListing.php:91
#, fuzzy
msgid "Customer Transaction Listing"
-msgstr "Vendor Contacts"
+msgstr ""
#: PDFCustTransListing.php:31 PDFStockTransListing.php:34
#: PDFSuppTransListing.php:31
@@ -16364,7 +16361,7 @@
#: PDFCustTransListing.php:74
#, fuzzy
msgid "The SQL used to get the transaction information that failed was"
-msgstr "The SQL used to retrieve the vendor details and failed was"
+msgstr ""
#: PDFCustTransListing.php:82 PDFStockTransListing.php:92
#: PDFSuppTransListing.php:82
@@ -16499,7 +16496,7 @@
#: PDFGrn.php:73
#, fuzzy
msgid "Could not get the supplier of the selected GRN"
-msgstr "Could not load shipping-method"
+msgstr "Could not get the vendor of the selected GRN"
#: PDFGrn.php:115
msgid "Date of Receipt: "
@@ -16516,7 +16513,7 @@
#: PDFGrn.php:122
#, fuzzy
msgid "There were no GRNs to print"
-msgstr "There are no shipping-methods defined"
+msgstr ""
#: PDFLowGP.php:8 PDFLowGP.php:14 PDFLowGP.php:15
msgid "Low Gross Profit Sales"
@@ -16632,7 +16629,7 @@
#: PDFStockTransListing.php:24 PDFStockTransListing.php:101
#, fuzzy
msgid "Stock Transaction Listing"
-msgstr "Vendor Contacts"
+msgstr ""
#: PDFPeriodStockTransListing.php:31
msgid "Enter the date from which the transactions are to be listed"
@@ -16641,7 +16638,7 @@
#: PDFPeriodStockTransListing.php:35
#, fuzzy
msgid "Enter the date to which the transactions are to be listed"
-msgstr "The SQL used to retrieve the vendor details and failed was"
+msgstr ""
#: PDFPeriodStockTransListing.php:43 PDFStockTransListing.php:42
#: PrintCustTrans.php:59 PrintCustTransPortrait.php:57 SalesInquiry.php:1055
@@ -16656,7 +16653,7 @@
#: PDFPeriodStockTransListing.php:45 PDFStockTransListing.php:44
#, fuzzy
msgid "Location Transfer"
-msgstr "Select Vendor"
+msgstr ""
#: PDFPeriodStockTransListing.php:46 PDFStockTransListing.php:45
msgid "Stock Adjustment"
@@ -16665,7 +16662,7 @@
#: PDFPeriodStockTransListing.php:47 PDFStockTransListing.php:46
#, fuzzy
msgid "Purchase Order Delivery"
-msgstr "Select Vendor"
+msgstr ""
#: PDFPeriodStockTransListing.php:48 PDFStockTransListing.php:47
msgid "Work Order Receipt"
@@ -16674,7 +16671,7 @@
#: PDFPeriodStockTransListing.php:49 PDFStockTransListing.php:48
#, fuzzy
msgid "Work Order Issue"
-msgstr "Sales Order Inquiry"
+msgstr ""
#: PDFPeriodStockTransListing.php:56 StockQuantityByDate.php:39
msgid "For Stock Location"
@@ -16684,31 +16681,31 @@
#: PDFStockTransListing.php:83 PDFStockTransListing.php:89
#, fuzzy
msgid "Transaction Listing"
-msgstr "Vendor Contacts"
+msgstr ""
#: PDFPeriodStockTransListing.php:137
#, fuzzy
msgid "There were no transactions found in the database between the dates"
-msgstr "The Shipping cost record could not be updated because"
+msgstr ""
#: PDFPeriodStockTransListing.php:147 PDFStockTransListing.php:102
#, fuzzy
msgid "Stock transaction listing from"
-msgstr "Vendor Balance Listing"
+msgstr "Inventory transaction listing from"
#: PDFPeriodStockTransListing.php:154
#: includes/PDFCustTransListingPageHeader.inc:15
#: includes/PDFStockTransListingPageHeader.inc:15
#, fuzzy
msgid "Customer Invoices"
-msgstr "Vendor Contacts"
+msgstr ""
#: PDFPeriodStockTransListing.php:157
#: includes/PDFCustTransListingPageHeader.inc:18
#: includes/PDFStockTransListingPageHeader.inc:18
#, fuzzy
msgid "Customer Credit Notes"
-msgstr "Vendor Contacts"
+msgstr ""
#: PDFPeriodStockTransListing.php:160 SelectProduct.php:417
#: includes/PDFStockTransListingPageHeader.inc:21
@@ -16749,7 +16746,7 @@
#: PDFPickingList.php:22
#, fuzzy
msgid "Select Picking Lists"
-msgstr "Vendor Balance Listing"
+msgstr ""
#: PDFPickingList.php:32
msgid "Create picking lists for all deliveries to be made on"
@@ -16758,13 +16755,13 @@
#: PDFPickingList.php:34
#, fuzzy
msgid "From Warehouse"
-msgstr "Vendor Order"
+msgstr ""
#: PDFPickingList.php:47
#, fuzzy
msgid ""
"There was a problem retrieving the order header details from the database"
-msgstr "There was a problem testing for a default shipping-method because"
+msgstr ""
#: PDFPickingList.php:129 PDFPickingList.php:324
msgid "Print Picking List Error"
@@ -16789,7 +16786,7 @@
#: PDFPickingList.php:204
#, fuzzy
msgid "There was a problem retrieving the order line details for Order Number"
-msgstr "There was a problem testing for a default shipping-method because"
+msgstr ""
#: PDFPriceList.php:16
msgid "Price Listing Report"
@@ -16894,7 +16891,7 @@
#: PDFPriceList.php:296
#, fuzzy
msgid "Full Description"
-msgstr "Vendor Code or Description"
+msgstr ""
#: PDFPriceList.php:299 PDFPriceList.php:336 PDFPriceList.php:338
msgid "Effective As At"
@@ -16948,7 +16945,7 @@
#: PDFPrintLabel.php:91
#, fuzzy
msgid "Select label type"
-msgstr "Select the Vendor"
+msgstr ""
#: PDFPrintLabel.php:92
msgid "Number of labels per item"
@@ -16961,12 +16958,12 @@
#: PDFPrintLabel.php:94
#, fuzzy
msgid "Update values"
-msgstr "Sales Order Inquiry"
+msgstr ""
#: PDFPrintLabel.php:117
#, fuzzy
msgid "Print labels"
-msgstr "Vendor Balance Listing"
+msgstr ""
#: PDFPrintLabel.php:118
msgid "Print labels with borders"
@@ -16988,7 +16985,7 @@
#: PDFPrintLabel.php:500
#, fuzzy
msgid "Couldnt get the currency data"
-msgstr "Could not load shipping-method"
+msgstr ""
#: PDFQuotation.php:10 PDFQuotationPortrait.php:11
msgid "Select Quotation To Print"
@@ -17124,7 +17121,7 @@
#, fuzzy
msgid ""
"The details of the payment to the supplier could not be retrieved because"
-msgstr "The Vendor details could not be retrieved by the SQL because"
+msgstr "The details of the payment to the vendor could not be retrieved because"
#: PDFRemittanceAdvice.php:114
msgid "Remittance_Advices"
@@ -17145,7 +17142,7 @@
#: PDFRemittanceAdvice.php:269
#, fuzzy
msgid "Our Code:"
-msgstr "Territory Code"
+msgstr ""
#: PDFRemittanceAdvice.php:311
msgid "This Payment"
@@ -17166,7 +17163,7 @@
#: PDFStockCheckComparison.php:38
#, fuzzy
msgid "The inventory check file could not be retrieved because"
-msgstr "The Vendor details could not be retrieved by the SQL because"
+msgstr ""
#: PDFStockCheckComparison.php:61
msgid "Stock Count Comparison"
@@ -17175,7 +17172,7 @@
#: PDFStockCheckComparison.php:64
#, fuzzy
msgid "The inventory counts file could not be retrieved because"
-msgstr "The Vendor details could not be retrieved by the SQL because"
+msgstr ""
#: PDFStockCheckComparison.php:117 PDFStockCheckComparison.php:153
#: PDFStockCheckComparison.php:171
@@ -17335,7 +17332,7 @@
#: PDFStockNegatives.php:20
#, fuzzy
msgid "The sql that failed to retrieve the negative quantities was"
-msgstr "The SQL used to retrieve the vendor details and failed was"
+msgstr ""
#: PDFStockNegatives.php:37
msgid "There are no negative stocks to list"
@@ -17344,7 +17341,7 @@
#: PDFStockTransfer.php:12
#, fuzzy
msgid "The entered transfer reference is expected to be numeric"
-msgstr "The Shipping cost entered is expected to be numeric"
+msgstr ""
#: PDFStockTransfer.php:18
#, fuzzy
@@ -17371,7 +17368,7 @@
#: PDFStockTransfer.php:63
#, fuzzy
msgid "There was no transfer found with number"
-msgstr "there is no purchasing data set up for this vendor"
+msgstr ""
#: PDFStockTransfer.php:64
msgid "Try Again"
@@ -17385,12 +17382,12 @@
#: PDFSuppTransListing.php:91
#, fuzzy
msgid "Supplier Transaction Listing"
-msgstr "Vendor Balance Listing"
+msgstr "Vendor Transaction Listing"
#: PDFSuppTransListing.php:92
#, fuzzy
msgid "Supplier transaction listing from"
-msgstr "Vendor Balance Listing"
+msgstr "Vendor transaction listing from"
#: PDFTopItems.php:8
msgid "Top Items Search Result"
@@ -17399,7 +17396,7 @@
#: PDFTopItems.php:117
#, fuzzy
msgid "There were no records returned "
-msgstr "There are no shipping-methods defined"
+msgstr ""
#: PeriodsInquiry.php:7
msgid "Periods Inquiry"
@@ -17424,7 +17421,7 @@
#: PO_AuthorisationLevels.php:50
#, fuzzy
msgid "The authentication details cannot be inserted because"
-msgstr "The shipping GL posting could not be inserted because"
+msgstr ""
#: PO_AuthorisationLevels.php:53
msgid "There already exists an entry for this user/currency combination"
@@ -17433,18 +17430,18 @@
#: PO_AuthorisationLevels.php:76
#, fuzzy
msgid "The authentication details cannot be updated because"
-msgstr "The Shipping cost record could not be updated because"
+msgstr ""
#: PO_AuthorisationLevels.php:85
#, fuzzy
msgid "The authentication details cannot be deleted because"
-msgstr "The Vendor details could not be retrieved by the SQL because"
+msgstr ""
#: PO_AuthorisationLevels.php:96 PO_AuthorisationLevels.php:119
#: PO_AuthorisationLevels.php:195
#, fuzzy
msgid "The authentication details cannot be retrieved because"
-msgstr "The Vendor details could not be retrieved by the SQL because"
+msgstr ""
#: PO_AuthorisationLevels.php:126
#, fuzzy
@@ -17486,7 +17483,7 @@
#: PO_AuthoriseMyOrders.php:60
#, fuzzy
msgid "Date Ordered"
-msgstr "Vendor Order"
+msgstr ""
#: PO_AuthoriseMyOrders.php:61 PO_OrderDetails.php:105
#: PO_SelectPurchOrder.php:396 includes/PO_PDFOrderPageHeader.inc:54
@@ -17497,7 +17494,7 @@
#: POReport.php:1492 ReprintGRN.php:75 includes/PDFPickingListHeader.inc:46
#, fuzzy
msgid "Delivery Date"
-msgstr "City-State-zip"
+msgstr ""
#: PO_AuthoriseMyOrders.php:94 PO_Header.php:789 PO_Header.php:805
#: PO_SelectOSPurchOrder.php:173 PO_SelectOSPurchOrder.php:175
@@ -17652,7 +17649,7 @@
#: PO_Header.php:286
#, fuzzy
msgid "Supplier changed by"
-msgstr "Vendor Purchasing Data"
+msgstr "Vendor changed by"
#: PO_Header.php:289
msgid ""
@@ -17809,7 +17806,7 @@
#: PO_Header.php:832
#, fuzzy
msgid "Supplier Info"
-msgstr "Vendor Code"
+msgstr "Vendor Info"
#: PO_Header.php:837 includes/PDFPickingListHeader.inc:13
msgid "Warehouse"
@@ -17873,13 +17870,13 @@
msgid ""
"The quantity in the supplier units is expected to be numeric. Please re-"
"enter as a number"
-msgstr "The Shipping cost entered is expected to be numeric"
+msgstr ""
#: PO_Items.php:48
#, fuzzy
msgid ""
"The supplier price is expected to be numeric. Please re-enter as a number"
-msgstr "The Shipping cost entered is expected to be numeric"
+msgstr "The vendor price is expected to be numeric. Please re-enter as a number"
#: PO_Items.php:64
#, fuzzy
@@ -17905,7 +17902,7 @@
#: PO_Items.php:96 SelectSalesOrder.php:111 SelectSalesOrder.php:279
#, fuzzy
msgid "Order Created and Authorised by"
-msgstr "Sales Order Inquiry"
+msgstr ""
#: PO_Items.php:101 SelectSalesOrder.php:121 SelectSalesOrder.php:289
msgid "Your authority to approve purchase orders in"
@@ -18020,7 +18017,7 @@
#: PO_Items.php:416
#, fuzzy
msgid "The account details for"
-msgstr "The vendor pricing details for"
+msgstr ""
#: PO_Items.php:417
#, fuzzy
@@ -18113,7 +18110,7 @@
#: PO_Items.php:637
#, fuzzy
msgid "Our Unit"
-msgstr "Vendor Unit"
+msgstr ""
#: PO_Items.php:638
msgid "Price Our Units"
@@ -18163,7 +18160,7 @@
#: PO_Items.php:718
#, fuzzy
msgid "Not an Asset"
-msgstr "Select the Vendor"
+msgstr ""
#: PO_Items.php:721
msgid "Not yet purchased"
@@ -18193,7 +18190,7 @@
#: PO_Items.php:925
#, fuzzy
msgid "Our Units"
-msgstr "Vendor Unit"
+msgstr ""
#: PO_Items.php:927
#, fuzzy
@@ -18207,7 +18204,7 @@
#: PO_Items.php:958
#, fuzzy
msgid "Could not retrieve the purchasing data for the item"
-msgstr "The shipping-method record has been added"
+msgstr ""
#: PO_OrderDetails.php:11
msgid "Reviewing Purchase Order Number"
@@ -18260,7 +18257,7 @@
#: PO_OrderDetails.php:89 RecurringSalesOrders.php:371
#, fuzzy
msgid "Order Header Details"
-msgstr "Credit Shipping"
+msgstr ""
#: PO_OrderDetails.php:90 Suppliers.php:652 Suppliers.php:835
#: SuppLoginSetup.php:238 SuppLoginSetup.php:404 WWW_Users.php:264
@@ -18521,12 +18518,12 @@
#: POReport.php:541 POReport.php:626 POReport.php:1286 POReport.php:1337
#, fuzzy
msgid "Supplier No"
-msgstr "Vendor Name"
+msgstr "Vendor No"
#: POReport.php:543 POReport.php:1288 SalesInquiry.php:799
#, fuzzy
msgid "Order Qty"
-msgstr "Sales Order Inquiry"
+msgstr "S"
#: POReport.php:544 POReport.php:629 POReport.php:744 POReport.php:1289
#: POReport.php:1340 POReport.php:1429 SalesInquiry.php:800
@@ -18576,7 +18573,7 @@
#: POReport.php:1466
#, fuzzy
msgid "The report has been exported as a csv file."
-msgstr "The shipping-method record has been deleted"
+msgstr ""
#: POReport.php:1483 SalesInquiry.php:1033 StockDispatch.php:295
msgid "Report Type"
@@ -18615,7 +18612,7 @@
#: POReport.php:1585 SalesInquiry.php:1159
#, fuzzy
msgid "Run Inquiry"
-msgstr "Sales Order Inquiry"
+msgstr ""
#: PO_SelectOSPurchOrder.php:9 SelectProduct.php:401 StockStatus.php:360
#: StockUsage.php:185
@@ -18652,7 +18649,7 @@
#: PO_SelectOSPurchOrder.php:151 PO_SelectPurchOrder.php:123
#, fuzzy
msgid "Order Status:"
-msgstr "Credit Shipping"
+msgstr ""
#: PO_SelectOSPurchOrder.php:153 PO_SelectOSPurchOrder.php:155
msgid "Pending and Authorised"
@@ -18695,7 +18692,7 @@
#: PO_SelectOSPurchOrder.php:432
#, fuzzy
msgid "Order #"
-msgstr "Sales Order Inquiry"
+msgstr ""
#: PO_SelectOSPurchOrder.php:434
msgid "Initiated by"
@@ -18764,7 +18761,7 @@
#: PricesBasedOnMarkUp.php:81 PricesBasedOnMarkUp.php:221
#, fuzzy
msgid "Preferred Supplier Cost Data"
-msgstr "Vendor Contacts"
+msgstr "Preferred Vendor Cost Data"
#: PricesBasedOnMarkUp.php:75 PricesBasedOnMarkUp.php:79
#: PricesBasedOnMarkUp.php:83
@@ -18847,7 +18844,7 @@
#: PricesBasedOnMarkUp.php:203
#, fuzzy
msgid "Base price list selected"
-msgstr "The shipping-method record has been deleted"
+msgstr ""
#: PricesBasedOnMarkUp.php:204
msgid ""
@@ -18928,7 +18925,7 @@
#: PricesBasedOnMarkUp.php:291
#, fuzzy
msgid "There is no default price defined in the base price list for the item"
-msgstr "there is no purchasing data set up for this vendor"
+msgstr ""
#: PricesBasedOnMarkUp.php:300
msgid ""
@@ -18980,7 +18977,7 @@
#: PricesByCost.php:113
#, fuzzy
msgid "Cost in Price List"
-msgstr "Vendor Balance Listing"
+msgstr ""
#: PricesByCost.php:121 Prices_Customer.php:338 Prices.php:220
#: RecurringSalesOrders.php:417 WorkOrderEntry.php:473
@@ -19115,7 +19112,7 @@
#: Prices_Customer.php:202 Prices_Customer.php:248
#, fuzzy
msgid "The SQL used to retrieve these records was"
-msgstr "The SQL used to retrieve the vendor details and failed was"
+msgstr ""
#: Prices_Customer.php:209
msgid "There are no default prices set up for this part"
@@ -19169,22 +19166,22 @@
#: Prices.php:142
#, fuzzy
msgid "The price has been updated"
-msgstr "The shipping charge has been updated"
+msgstr ""
#: Prices.php:160
#, fuzzy
msgid "The new price could not be added"
-msgstr "The Shipping cost record could not be updated because"
+msgstr ""
#: Prices.php:164
#, fuzzy
msgid "The new price has been inserted"
-msgstr "The shipping-method record has been deleted"
+msgstr ""
#: Prices.php:180
#, fuzzy
msgid "Could not delete this price"
-msgstr "Could not load shipping-method"
+msgstr ""
#: Prices.php:182
msgid "The selected price has been deleted"
@@ -19587,7 +19584,7 @@
#: PrintCustTransPortrait.php:89
#, fuzzy
msgid "Bank Code:"
-msgstr "Territory Code"
+msgstr ""
#: PrintCustTransPortrait.php:525
msgid "Print Invoices or Credit Notes (Portrait Mode)"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-05-29 04:07:24
|
Revision: 4579
http://web-erp.svn.sourceforge.net/web-erp/?rev=4579&view=rev
Author: daintree
Date: 2011-05-29 04:07:16 +0000 (Sun, 29 May 2011)
Log Message:
-----------
Ricard bug fixes assigner changes
Modified Paths:
--------------
trunk/ConfirmDispatch_Invoice.php
trunk/GetStockImage.php
trunk/PO_SelectOSPurchOrder.php
trunk/PcAssignCashToTab.php
trunk/PcAuthorizeExpenses.php
trunk/PcReportTab.php
trunk/PcTabs.php
trunk/SelectProduct.php
trunk/SelectSalesOrder.php
trunk/doc/Change.log
trunk/includes/ConnectDB.inc
trunk/locale/en_US.utf8/LC_MESSAGES/messages.po
Modified: trunk/ConfirmDispatch_Invoice.php
===================================================================
--- trunk/ConfirmDispatch_Invoice.php 2011-05-28 11:01:00 UTC (rev 4578)
+++ trunk/ConfirmDispatch_Invoice.php 2011-05-29 04:07:16 UTC (rev 4579)
@@ -139,9 +139,7 @@
salesorderdetails.orderlineno,
salesorderdetails.poline,
salesorderdetails.itemdue,
- stockmaster.materialcost +
- stockmaster.labourcost +
- stockmaster.overheadcost AS standardcost
+ stockmaster.materialcost + stockmaster.labourcost + stockmaster.overheadcost AS standardcost
FROM salesorderdetails INNER JOIN stockmaster
ON salesorderdetails.stkcode = stockmaster.stockid
WHERE salesorderdetails.orderno ='" . $_GET['OrderNumber'] . "'
@@ -316,8 +314,7 @@
echo '<td class="number">' . $LnItm->QtyDispatched . '</td>';
} else {
echo '<td class="number"><input type=hidden name="' . $LnItm->LineNumber . '_QtyDispatched" value="' .
- $LnItm->QtyDispatched . '"><a href="' . $rootpath .'/ConfirmDispatchControlled_Invoice.php?' . SID .
- '&LineNo='. $LnItm->LineNumber.'">' .$LnItm->QtyDispatched . '</a></td>';
+ $LnItm->QtyDispatched . '"><a href="' . $rootpath .'/ConfirmDispatchControlled_Invoice.php?LineNo='. $LnItm->LineNumber.'">' .$LnItm->QtyDispatched . '</a></td>';
}
} else {
if (isset($_POST['ProcessInvoice'])) {
@@ -1139,8 +1136,7 @@
if ($OrderLine->Controlled ==1){
foreach($OrderLine->SerialItems as $Item){
- /*We need to add the StockSerialItem record and
- The StockSerialMoves as well */
+ /*We need to add the StockSerialItem record and the StockSerialMoves as well */
$SQL = "UPDATE stockserialitems SET quantity= quantity - " . $Item->BundleQty . "
WHERE stockid='" . $OrderLine->StockID . "'
Modified: trunk/GetStockImage.php
===================================================================
--- trunk/GetStockImage.php 2011-05-28 11:01:00 UTC (rev 4578)
+++ trunk/GetStockImage.php 2011-05-29 04:07:16 UTC (rev 4579)
@@ -1,7 +1,7 @@
<?php
/* $Id$*/
-//$PageSecurity = 1;
+
include ('includes/session.inc');
/*
http://127.0.0.1/~brink/webERP/GetStockImage.php
Modified: trunk/PO_SelectOSPurchOrder.php
===================================================================
--- trunk/PO_SelectOSPurchOrder.php 2011-05-28 11:01:00 UTC (rev 4578)
+++ trunk/PO_SelectOSPurchOrder.php 2011-05-29 04:07:16 UTC (rev 4579)
@@ -131,20 +131,21 @@
if (!isset($OrderNumber) or $OrderNumber=='' ){
echo '<a href="' . $rootpath . '/PO_Header.php?' .SID . '&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><td>'._('Order Number') . ': <input type=text name="OrderNumber" MAXLENGTH =8 size=9> ' . _('Into Stock Location') . ':<select name="StockLocation"> ';
- $sql = 'SELECT loccode, locationname FROM locations';
+ echo '<table class=selection><tr><td>'._('Order Number') . ': <input type="text" name="OrderNumber" maxlength="8" size="9" /> ' . _('Into Stock Location') . ':<select name="StockLocation">';
+
+ $sql = "SELECT loccode, locationname FROM locations";
$resultStkLocs = DB_query($sql,$db);
while ($myrow=DB_fetch_array($resultStkLocs)){
if (isset($_POST['StockLocation'])){
if ($myrow['loccode'] == $_POST['StockLocation']){
- echo '<option selected Value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
+ echo '<option selected value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
} else {
- echo '<option Value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '<option>';
+ echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
}
} elseif ($myrow['loccode']== $_SESSION['UserStockLocation']){
- echo '<option selected Value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
+ echo '<option selected value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
} else {
- echo '<option Value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
+ echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
}
}
@@ -180,23 +181,23 @@
$SQL="SELECT categoryid, categorydescription FROM stockcategory ORDER BY categorydescription";
$result1 = DB_query($SQL,$db);
-echo "<br><font size=1><div class='page_help_text'>" ._('To search for purchase orders for a specific part use the part selection facilities below')
- ."</div> </font>";
-echo "<br><table class=selection><tr>";
+echo '<br /><font size=1><div class="page_help_text">' ._('To search for purchase orders for a specific part use the part selection facilities below')
+ .'</div> </font>';
+echo '<br /><table class="selection"><tr>';
-echo "<td><font size=1>" . _('Select a stock category') . ":</font><select name='StockCat'>";
+echo '<td><font size="1">' . _('Select a stock category') . ':</font><select name="StockCat">';
while ($myrow1 = DB_fetch_array($result1)) {
if (isset($_POST['StockCat']) and $myrow1['categoryid']==$_POST['StockCat']){
- echo "<option selected value='". $myrow1['categoryid'] . "'>" . $myrow1['categorydescription'] . '</option>';
+ echo '<option selected value="'. $myrow1['categoryid'] . '">' . $myrow1['categorydescription'] . '</option>';
} else {
- echo "<option value='". $myrow1['categoryid'] . "'>" . $myrow1['categorydescription'] . '</option>';
+ echo '<option value="'. $myrow1['categoryid'] . '">' . $myrow1['categorydescription'] . '</option>';
}
}
-echo "</select>";
-echo "<td><font size=1>" . _('Enter text extracts in the') . "<b>" . _('description') . "</b>:</font></td>";
+echo '</select>';
+echo '<td><font size=1>' . _('Enter text extracts in the') . '<b>' . _('description') . '</b>:</font></td>';
echo '<td><input type="Text" name="Keywords" size=20 maxlength=25></td></tr><tr><td></td>';
-echo "<td><font size<b>" . _('OR') . "</b></font><font size=1>" . _('Enter extract of the') . "<b>" . _('Stock Code') . "</b>:</font></td>";
+echo '<td><font size<b>' . _('OR') . '</b></font><font size=1>' . _('Enter extract of the') . '<b>' . _('Stock Code') . '</b>:</font></td>';
echo '<td><input type="Text" name="StockCode" size=15 maxlength=18></td></tr></table><br>';
echo '<table><tr><td><input type=submit name="SearchParts" value="' . _('Search Parts Now') . '">';
echo '<input type=submit name="ResetPart" value="' . _('Show All') . '"></td></tr></table>';
Modified: trunk/PcAssignCashToTab.php
===================================================================
--- trunk/PcAssignCashToTab.php 2011-05-28 11:01:00 UTC (rev 4578)
+++ trunk/PcAssignCashToTab.php 2011-05-29 04:07:16 UTC (rev 4579)
@@ -155,7 +155,7 @@
DB_free_result($result);
$SQL = "SELECT tabcode
FROM pctabs
- WHERE authorizer='" . $_SESSION['UserID'] . "'
+ WHERE assigner='" . $_SESSION['UserID'] . "'
ORDER BY tabcode";
$result = DB_query($SQL,$db);
@@ -198,7 +198,7 @@
}
$sql = "SELECT * FROM pcashdetails
WHERE tabcode='" . $SelectedTabs . "'
- AND date >=DATE_SUB(CURDATE(), INTERVAL , ".$Days." DAY)
+ AND date >=DATE_SUB(CURDATE(), INTERVAL , " . $Days . " DAY)
ORDER BY date, counterindex ASC";
Modified: trunk/PcAuthorizeExpenses.php
===================================================================
--- trunk/PcAuthorizeExpenses.php 2011-05-28 11:01:00 UTC (rev 4578)
+++ trunk/PcAuthorizeExpenses.php 2011-05-29 04:07:16 UTC (rev 4579)
@@ -2,7 +2,7 @@
/* $Id$*/
include('includes/session.inc');
-$title = _('Authorization of Petty Cash Expenses');
+$title = _('Authorisation of Petty Cash Expenses');
include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
@@ -40,10 +40,10 @@
if (isset($SelectedTabs)) {
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/magnifier.png" title="' . _('Petty Cash') .
- '" alt="" />' . _('Authorization Of Petty Cash Expenses ') . ''.$SelectedTabs.'</p>';
+ '" alt="" />' . _('Authorisation Of Petty Cash Expenses ') . ''.$SelectedTabs.'</p>';
} else {
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/magnifier.png" title="' . _('Petty Cash') .
- '" alt="" />' . _('Authorization Of Petty Cash Expenses ') . '</p>';
+ '" alt="" />' . _('Authorisation Of Petty Cash Expenses ') . '</p>';
}
if (isset($_POST['Submit']) or isset($_POST['update']) OR isset($SelectedTabs) OR isset ($_POST['GO'])) {
@@ -248,8 +248,8 @@
if (isset($_POST[$myrow['counterindex']])){
echo'<td>'.ConvertSQLDate(Date('Y-m-d')).'</td>';
}else{
- $Authorizer=ConvertSQLDate($myrow['authorized']);
- if(($Authorizer!='00/00/0000')){
+ $Authoriser=ConvertSQLDate($myrow['authorized']);
+ if(($Authoriser!='00/00/0000')){
echo'<td>'.ConvertSQLDate($myrow['authorized']).'</td>';
}else{
echo '<td align=right><input type="checkbox" name="'.$myrow['counterindex'].'">';
Modified: trunk/PcReportTab.php
===================================================================
--- trunk/PcReportTab.php 2011-05-28 11:01:00 UTC (rev 4578)
+++ trunk/PcReportTab.php 2011-05-29 04:07:16 UTC (rev 4579)
@@ -146,7 +146,7 @@
$LeftOvers = $pdf->addTextWrap($Left_Margin+340,$YPos,70,$FontSize,$_POST['ToDate']);
$YPos -= $line_height;
- $LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,60,$FontSize,_('Authorizer '));
+ $LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,60,$FontSize,_('Authoriser '));
$LeftOvers = $pdf->addTextWrap($Left_Margin+100,$YPos,20,$FontSize,_(': '));
$LeftOvers = $pdf->addTextWrap($Left_Margin+110,$YPos,70,$FontSize,$Tabs['authorizer']);
@@ -172,7 +172,7 @@
$LeftOvers = $pdf->addTextWrap($Left_Margin+200,$YPos,100,$FontSize,_('Amount'));
$LeftOvers = $pdf->addTextWrap($Left_Margin+250,$YPos,100,$FontSize,_('Note'));
$LeftOvers = $pdf->addTextWrap($Left_Margin+350,$YPos,100,$FontSize,_('Receipt'));
- $LeftOvers = $pdf->addTextWrap($Left_Margin+420,$YPos,100,$FontSize,_('Date Authorizer'));
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+420,$YPos,100,$FontSize,_('Date Authoriser'));
$YPos -= (2 * $line_height);
while ($myrow=DB_fetch_array($TabDetail)) {
@@ -262,7 +262,7 @@
'<td>' . _('To') . '</td><td>:</td><td>' .
''.$_POST['ToDate'].'</td></tr>';
- echo '<tr><td>' . _('Authorizer') . '</td><td>:</td><td>' . ''.$Tabs['authorizer'].'</td>
+ echo '<tr><td>' . _('Authoriser') . '</td><td>:</td><td>' . ''.$Tabs['authorizer'].'</td>
</tr>';
echo '<tr><td>' . _('Currency') . '</td><td>:</td><td>' . ''.$Tabs['currency'].'</td>
</tr>';
@@ -299,7 +299,7 @@
$BalanceNotAut['0']=0;
}
- echo '<tr><td>' . _('Total not authorized before ') . ''.$_POST['FromDate'].'</td><td>:</td><td>' . ''.$BalanceNotAut['0'].' '.$Tabs['currency'].'</td></tr>';
+ echo '<tr><td>' . _('Total not authorised before ') . ''.$_POST['FromDate'].'</td><td>:</td><td>' . ''.$BalanceNotAut['0'].' '.$Tabs['currency'].'</td></tr>';
echo '</table>';
@@ -326,7 +326,7 @@
<th>' . _('Amount') . '</th>
<th>' . _('Notes') . '</th>
<th>' . _('Receipt') . '</th>
- <th>' . _('Date Authorized') . '</th>
+ <th>' . _('Date Authorised') . '</th>
</tr>';
$j = 1;
Modified: trunk/PcTabs.php
===================================================================
--- trunk/PcTabs.php 2011-05-28 11:01:00 UTC (rev 4578)
+++ trunk/PcTabs.php 2011-05-29 04:07:16 UTC (rev 4579)
@@ -21,7 +21,8 @@
unset($_POST['SelectTabs']);
unset($_POST['SelectCurrency']);
unset($_POST['TabLimit']);
- unset($_POST['SelectAuthorizer']);
+ unset($_POST['SelectAssigner']);
+ unset($_POST['SelectAuthoriser']);
unset($_POST['GLAccountCash']);
unset($_POST['GLAccountPcashTab']);
}
@@ -64,10 +65,15 @@
echo prnMsg(_('You must select a type of tab from the list'),'error');
$Errors[$i] = 'TabType';
$i++;
- } elseif (($_POST['SelectAuthorizer'])=='') {
+ } elseif (($_POST['SelectAssigner'])=='') {
$InputError = 1;
+ echo prnMsg(_('You must select a User to assign cash to this tab'),'error');
+ $Errors[$i] = 'AssignerName';
+ $i++;
+ } elseif (($_POST['SelectAuthoriser'])=='') {
+ $InputError = 1;
echo prnMsg(_('You must select a User to authorise this tab'),'error');
- $Errors[$i] = 'AuthorizerName';
+ $Errors[$i] = 'AuthoriserName';
$i++;
} elseif (($_POST['GLAccountCash'])=='') {
$InputError = 1;
@@ -87,12 +93,13 @@
typetabcode = '" . $_POST['SelectTabs'] . "',
currency = '" . $_POST['SelectCurrency'] . "',
tablimit = '" . $_POST['TabLimit'] . "',
- authorizer = '" . $_POST['SelectAuthorizer'] . "',
+ assigner = '" . $_POST['SelectAssigner'] . "',
+ authorizer = '" . $_POST['SelectAuthoriser'] . "',
glaccountassignment = '" . $_POST['GLAccountCash'] . "',
glaccountpcash = '" . $_POST['GLAccountPcashTab'] . "'
WHERE tabcode = '".$SelectedTab."'";
- $msg = _('The Tabs Of Code') . ' ' . $SelectedTab . ' ' . _('has been updated');
+ $msg = _('The Petty Cash Tab') . ' ' . $SelectedTab . ' ' . _('has been updated');
} elseif ( $InputError !=1 ) {
// First check the type is not being duplicated
@@ -116,6 +123,7 @@
typetabcode,
currency,
tablimit,
+ assigner,
authorizer,
glaccountassignment,
glaccountpcash)
@@ -124,11 +132,12 @@
'" . $_POST['SelectTabs'] . "',
'" . $_POST['SelectCurrency'] . "',
'" . $_POST['TabLimit'] . "',
- '" . $_POST['SelectAuthorizer'] . "',
+ '" . $_POST['SelectAssigner'] . "',
+ '" . $_POST['SelectAuthoriser'] . "',
'" . $_POST['GLAccountCash'] . "',
'" . $_POST['GLAccountPcashTab'] . "')";
- $msg = _('Tab with Code ') . ' ' . $_POST['TabCode'] . ' ' . _('has been created');
+ $msg = _('The Petty Cash Tab') . ' ' . $_POST['tabcode'] . ' ' . _('has been created');
}
}
@@ -143,7 +152,8 @@
unset($_POST['SelectTabs']);
unset($_POST['SelectCurrency']);
unset($_POST['TabLimit']);
- unset($_POST['SelectAuthorizer']);
+ unset($_POST['SelectAssigner']);
+ unset($_POST['SelectAuthoriser']);
unset($_POST['GLAccountCash']);
unset($_POST['GLAccountPcashTab']);
}
@@ -153,7 +163,7 @@
$sql="DELETE FROM pctabs WHERE tabcode='".$SelectedTab."'";
$ErrMsg = _('The Tab record could not be deleted because');
$result = DB_query($sql,$db,$ErrMsg);
- prnMsg(_('Tab type') . ' ' . $SelectedTab . ' ' . _('has been deleted') ,'success');
+ prnMsg(_('The Petty Cash Tab') . ' ' . $SelectedTab . ' ' . _('has been deleted') ,'success');
unset ($SelectedTab);
unset($_GET['delete']);
}
@@ -170,6 +180,7 @@
typetabdescription,
currabrev,
tablimit,
+ assigner,
authorizer,
glaccountassignment,
glaccountpcash,
@@ -194,7 +205,8 @@
<th>' . _('Type Of Tab') . '</th>
<th>' . _('Currency') . '</th>
<th>' . _('Limit') . '</th>
- <th>' . _('Authorizer') . '</th>
+ <th>' . _('Assigner') . '</th>
+ <th>' . _('Authoriser') . '</th>
<th>' . _('GL Account For Cash Assignment') . '</th>
<th>' . _('GL Account Petty Cash Tab') . '</th>
</tr>';
@@ -218,6 +230,7 @@
<td>%s</td>
<td>%s</td>
<td>%s</td>
+ <td>%s</td>
<td><a href="%sSelectedTab=%s">' . _('Edit') . '</td>
<td><a href="%sSelectedTab=%s&delete=yes" onclick=\' return confirm("' . _('Are you sure you wish to delete this tab code?') . '");\'>' . _('Delete') . '</td>
</tr>',
@@ -226,6 +239,7 @@
$myrow['typetabdescription'],
$myrow['currabrev'],
number_format($myrow['tablimit'],$myrow['decimalplaces']),
+ $myrow['assigner'],
$myrow['authorizer'],
$myrow['glaccountassignment'].' - '. $myrow['glactassigntname'],
$myrow['glaccountpcash'].' - '.$myrow['glactpcashname'],
@@ -262,7 +276,8 @@
$_POST['SelectTabs'] = $myrow['typetabcode'];
$_POST['SelectCurrency'] = $myrow['currency'];
$_POST['TabLimit'] = $myrow['tablimit'];
- $_POST['SelectAuthorizer'] = $myrow['authorizer'];
+ $_POST['SelectAssigner'] = $myrow['assigner'];
+ $_POST['SelectAuthoriser'] = $myrow['authorizer'];
$_POST['GLAccountCash'] = $myrow['glaccountassignment'];
$_POST['GLAccountPcashTab'] = $myrow['glaccountpcash'];
@@ -358,8 +373,8 @@
echo '<tr><td>' . _('Limit Of Tab') . ':</td>
<td><input type="Text" class="number" name="TabLimit" size="12" maxlength="11" value="' . $_POST['TabLimit'] . '"></td></tr>';
- echo '<tr><td>' . _('Authoriser') . ':</td>
- <td><select name="SelectAuthorizer">';
+ echo '<tr><td>' . _('Assigner') . ':</td>
+ <td><select name="SelectAssigner">';
DB_free_result($result);
$SQL = "SELECT userid,
@@ -370,14 +385,34 @@
$result = DB_query($SQL,$db);
while ($myrow = DB_fetch_array($result)) {
- if (isset($_POST['SelectAuthorizer']) and $myrow['userid']==$_POST['SelectAuthorizer']) {
+ if (isset($_POST['SelectAssigner']) and $myrow['userid']==$_POST['SelectAssigner']) {
+ echo "<option selected value='";
+ } else {
+ echo "<option value='";
+ }
+ echo $myrow['userid'] . "'>" . $myrow['userid'] . ' - ' . $myrow['realname'] . '</option>';
+
+ } //end while loop get assigner
+
+ echo '<tr><td>' . _('Authoriser') . ":</td><td><select name='SelectAuthoriser'>";
+
+ DB_free_result($result);
+ $SQL = "SELECT userid,
+ realname
+ FROM www_users
+ ORDER BY userid";
+
+ $result = DB_query($SQL,$db);
+
+ while ($myrow = DB_fetch_array($result)) {
+ if (isset($_POST['SelectAuthoriser']) and $myrow['userid']==$_POST['SelectAuthoriser']) {
echo '<option selected value="';
} else {
echo '<option value="';
}
echo $myrow['userid'] . '">' . $myrow['userid'] . ' - ' . $myrow['realname'] . '</option>';
- } //end while loop get authorizer
+ } //end while loop get authoriser
echo '</select></td></tr>';
Modified: trunk/SelectProduct.php
===================================================================
--- trunk/SelectProduct.php 2011-05-28 11:01:00 UTC (rev 4578)
+++ trunk/SelectProduct.php 2011-05-29 04:07:16 UTC (rev 4579)
@@ -417,7 +417,7 @@
echo '<a href="' . $rootpath . '/StockTransfers.php?StockID=' . $StockID . '">' . _('Location Transfers') . '</a><br />';
//show the item image if it has been uploaded
if( isset($StockID) and file_exists($_SESSION['part_pics_dir'] . '/' .$StockID.'.jpg') ) {
- echo '<div class="centre"><img src="' . $_SESSION['part_pics_dir'] . '/' .$StockID.'.jpg ' . '" ></div>';
+ echo '<div class="centre"><img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC&StockID=' . $StockID . '&text=&width=120&height=120">';
}
if (($myrow['mbflag'] == 'B') AND (in_array($SuppliersSecurity, $_SESSION['AllowedPageSecurityTokens']))){
echo '<br />';
Modified: trunk/SelectSalesOrder.php
===================================================================
--- trunk/SelectSalesOrder.php 2011-05-28 11:01:00 UTC (rev 4578)
+++ trunk/SelectSalesOrder.php 2011-05-29 04:07:16 UTC (rev 4579)
@@ -807,80 +807,80 @@
/*Check authority to create POs if user has authority then show the check boxes to select sales orders to place POs for otherwise don't provide this option */
if ($AuthRow['cancreate']==0 AND $myrow['poplaced']==0){ //cancreate==0 if the user can create POs and not already placed
- printf("<td><a href='%s'>%s</a></td>
- <td><a href='%s'>" . _('Invoice') . "</a></td>
- <td><a target='_blank' href='%s'>" . $PrintText . " <IMG SRC='" .$rootpath."/css/".$theme."/images/pdf.png' title='" . _('Click for PDF') . "'></a></td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td class=number>%s</td>
- <td><input type=checkbox name=PlacePO_%s value><input type=hidden name=OrderNo_PO_%s value=%s></td>
- </tr>",
- $ModifyPage,
- $myrow['orderno'],
- $Confirm_Invoice,
- $PrintDispatchNote,
- $myrow['name'],
- $myrow['brname'],
- $myrow['customerref'],
- $FormatedOrderDate,
- $FormatedDelDate,
- $myrow['deliverto'],
- $FormatedOrderValue,
- $i,
- $i,
- $myrow['orderno']);
+ printf('<td><a href="%s">%s</a></td>
+ <td><a href="%s">' . _('Invoice') . '</a></td>
+ <td><a target="_blank" href="%s">' . $PrintText . ' <img src="' .$rootpath.'/css/'.$theme.'/images/pdf.png" title="' . _('Click for PDF') . '"></a></td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td class=number>%s</td>
+ <td><input type=checkbox name="PlacePO_%s" value><input type="hidden" name="OrderNo_PO_%s" value="%s"></td>
+ </tr>',
+ $ModifyPage,
+ $myrow['orderno'],
+ $Confirm_Invoice,
+ $PrintDispatchNote,
+ $myrow['name'],
+ $myrow['brname'],
+ $myrow['customerref'],
+ $FormatedOrderDate,
+ $FormatedDelDate,
+ html_entity_decode($myrow['deliverto'],ENT_QUOTES,UTF-8),
+ $FormatedOrderValue,
+ $i,
+ $i,
+ $myrow['orderno']);
} else { /*User is not authorised to create POs so don't even show the option */
- printf("<td><a href='%s'>%s</a></td>
- <td><a href='%s'>" . _('Invoice') . "</a></td>
- <td><a target='_blank' href='%s'>" . $PrintText . " <IMG SRC='" .$rootpath."/css/".$theme."/images/pdf.png' title='" . _('Click for PDF') . "'></a></td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td class=number>%s</td>
- </tr>",
- $ModifyPage,
- $myrow['orderno'],
- $Confirm_Invoice,
- $PrintDispatchNote,
- $myrow['name'],
- $myrow['brname'],
- $myrow['customerref'],
- $FormatedOrderDate,
- $FormatedDelDate,
- $myrow['deliverto'],
- $FormatedOrderValue);
+ printf('<td><a href="%s">%s</a></td>
+ <td><a href="%s">' . _('Invoice') . '</a></td>
+ <td><a target="_blank" href="%s">' . $PrintText . ' <img src="' .$rootpath . '/css/' . $theme .'/images/pdf.png" title="' . _('Click for PDF') . '"></a></td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td class=number>%s</td>
+ </tr>',
+ $ModifyPage,
+ $myrow['orderno'],
+ $Confirm_Invoice,
+ $PrintDispatchNote,
+ $myrow['name'],
+ $myrow['brname'],
+ $myrow['customerref'],
+ $FormatedOrderDate,
+ $FormatedDelDate,
+ html_entity_decode($myrow['deliverto'],ENT_QUOTES,UTF-8),
+ $FormatedOrderValue);
}
} else { /*must be quotes only */
- printf("<td><a href='%s'>%s</a></td>
- <td><a href='%s'>" . $PrintText . "</a></td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td class=number>%s</td>
- </tr>",
- $ModifyPage,
- $myrow['orderno'],
- $PrintQuotation,
- $myrow['name'],
- $myrow['brname'],
- $myrow['customerref'],
- $FormatedOrderDate,
- $FormatedDelDate,
- $myrow['deliverto'],
- $FormatedOrderValue);
+ printf('<td><a href="%s">%s</a></td>
+ <td><a href="%s">' . $PrintText . '</a></td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td class=number>%s</td>
+ </tr>',
+ $ModifyPage,
+ $myrow['orderno'],
+ $PrintQuotation,
+ $myrow['name'],
+ $myrow['brname'],
+ $myrow['customerref'],
+ $FormatedOrderDate,
+ $FormatedDelDate,
+ html_entity_decode($myrow['deliverto'],ENT_QUOTES,UTF-8),
+ $FormatedOrderValue);
}
- $i++;
+ $i++;
$j++;
$OrdersTotal += $myrow['ordervalue'];
if ($j == 12){
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-05-28 11:01:00 UTC (rev 4578)
+++ trunk/doc/Change.log 2011-05-29 04:07:16 UTC (rev 4579)
@@ -1,5 +1,8 @@
webERP Change Log
+28/5/11 Could not set controlled item batches/serial numbers on ConfirmDispatch_Invoice.php
+28/5/11 Ricard PO_SelectOSPurchOrder.php was showing select location with gaps between locations - no slash before <option> fixed
+28/5/11 Ricard added new field assigner to petty cash module and changes to PcTabs.php and PcAssignCashToTab.php
28/5/11 Ricard PcAssignCashToTab.php quoted the $Days integer parameter to the INTERVAL function incorrectly now fixed
28/5/11 Ricard reported bug on deletion of PcExpensesTypeTab - incorrectly formed URL and parameters added ?
28/5/11 Ricard reported mismatch of fields scripts pagesecurity changed to int(11) from tinyint as other tables all refer to as int(11)
Modified: trunk/includes/ConnectDB.inc
===================================================================
--- trunk/includes/ConnectDB.inc 2011-05-28 11:01:00 UTC (rev 4578)
+++ trunk/includes/ConnectDB.inc 2011-05-29 04:07:16 UTC (rev 4579)
@@ -4,7 +4,7 @@
* this value is saved in the $_SESSION['Versionumber'] when includes/GetConfig.php is run
* if VersionNumber is < $Version then the DB update script is run */
-$Version='4.04'; //must update manually every time there is a DB change
+$Version='4.04.1'; //must update manually every time there is a DB change
require_once ($PathPrefix .'includes/MiscFunctions.php');
Modified: trunk/locale/en_US.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/en_US.utf8/LC_MESSAGES/messages.po 2011-05-28 11:01:00 UTC (rev 4578)
+++ trunk/locale/en_US.utf8/LC_MESSAGES/messages.po 2011-05-29 04:07:16 UTC (rev 4579)
@@ -15517,16 +15517,16 @@
msgstr ""
#: PcAuthorizeExpenses.php:5
-msgid "Authorization of Petty Cash Expenses"
-msgstr ""
+msgid "Authorisation of Petty Cash Expenses"
+msgstr "Authorization of Petty Cash Expenses"
#: PcAuthorizeExpenses.php:29
msgid "You Must First Select a Petty Cash Tab To Authorise"
-msgstr ""
+msgstr "You Must First Select a Petty Cash Tab To Authorize"
#: PcAuthorizeExpenses.php:43 PcAuthorizeExpenses.php:46
-msgid "Authorization Of Petty Cash Expenses "
-msgstr ""
+msgid "Authorisation Of Petty Cash Expenses "
+msgstr "Authorization Of Petty Cash Expenses"
#: PcAuthorizeExpenses.php:58
msgid "Detail Of Movement For Last "
@@ -15543,7 +15543,7 @@
#: PcAuthorizeExpenses.php:293
#, fuzzy
msgid "Authorise expenses to Petty Cash Tab"
-msgstr "Shipping Re-charged GL Account"
+msgstr "Authorize expenses to Petty Cash Tab"
#: PcClaimExpensesFromTab.php:6
msgid "Claim Petty Cash Expenses From Tab"
@@ -15560,7 +15560,7 @@
#: PcClaimExpensesFromTab.php:67
#, fuzzy
msgid "The Amount must be greater than 0"
-msgstr "The shipping-method ID must be an integer"
+msgstr "The Amount must be greater than 0"
#: PcClaimExpensesFromTab.php:79 PcClaimExpensesFromTab.php:105
msgid "The Expense Claim on Tab"
@@ -15569,7 +15569,7 @@
#: PcClaimExpensesFromTab.php:124
#, fuzzy
msgid "Petty Cash Expense record could not be deleted because"
-msgstr "The Shipping cost record could not be updated because"
+msgstr "Petty Cash Expense record could not be deleted because"
#: PcClaimExpensesFromTab.php:126
msgid "Petty cash Expense record"
@@ -15592,12 +15592,12 @@
#: PcClaimExpensesFromTab.php:176
#, fuzzy
msgid "Select another tab"
-msgstr "Select the Vendor"
+msgstr "Select another tab"
#: PcClaimExpensesFromTab.php:182
#, fuzzy
msgid "Petty Cash Tab"
-msgstr "Shipping Re-charged GL Account"
+msgstr "Petty Cash Tab"
#: PcClaimExpensesFromTab.php:183
msgid "Detail Of Movements For Last "
@@ -15611,15 +15611,15 @@
#: PcClaimExpensesFromTab.php:211 PcReportTab.php:325
#, fuzzy
msgid "Expense Description"
-msgstr "Vendor Code or Description"
+msgstr ""
#: PcClaimExpensesFromTab.php:213
-msgid "Authorized"
-msgstr ""
+msgid "Authorised"
+msgstr "Authorized"
#: PcClaimExpensesFromTab.php:240
msgid "Unauthorised"
-msgstr ""
+msgstr "Unauthorized"
#: PcClaimExpensesFromTab.php:253
#, php-format
@@ -15644,7 +15644,7 @@
#: PcExpenses.php:51
#, fuzzy
msgid "The Expense code must be twenty characters or less long"
-msgstr "The territory code must be three characters or less long"
+msgstr ""
#: PcExpenses.php:57
msgid ""
@@ -15656,22 +15656,22 @@
msgid ""
"The Expense description cannot contain any of the following characters \" ' "
"- &"
-msgstr "The terrirory desscription must be twenty five characters or less long"
+msgstr ""
#: PcExpenses.php:69 PcTypeTabs.php:49
#, fuzzy
msgid "The tab code must be Fifty characters or less long"
-msgstr "The territory code must be three characters or less long"
+msgstr ""
#: PcExpenses.php:76
#, fuzzy
msgid "The tab code description must be entered"
-msgstr "The territory description may not be left blank"
+msgstr ""
#: PcExpenses.php:82
#, fuzzy
msgid "A general ledger code must be selected for this expense"
-msgstr "Shipping Re-charged GL Account"
+msgstr ""
#: PcExpenses.php:93
msgid "The Expenses type"
@@ -15707,12 +15707,12 @@
#: PcExpenses.php:152
#, fuzzy
msgid "tab types using this expense code"
-msgstr "branches using this territory code"
+msgstr ""
#: PcExpenses.php:158
#, fuzzy
msgid "The expense type record could not be deleted because"
-msgstr "The Shipping cost record could not be updated because"
+msgstr ""
#: PcExpenses.php:160
msgid "Expense type"
@@ -15721,7 +15721,7 @@
#: PcExpenses.php:183
#, fuzzy
msgid "Account Description"
-msgstr "Vendor Code or Description"
+msgstr ""
#: PcExpenses.php:209
#, php-format
@@ -15794,7 +15794,7 @@
#: PcExpensesTypeTab.php:198
#, fuzzy
msgid "Select Expense Code"
-msgstr "Select Vendor"
+msgstr ""
#: PcReportTab.php:8
msgid "Petty Cash Management Report"
@@ -15807,12 +15807,12 @@
#: PcReportTab.php:64
#, fuzzy
msgid "From Date :"
-msgstr "Vendor Order"
+msgstr ""
#: PcReportTab.php:67
#, fuzzy
msgid "To Date:"
-msgstr "Vendor Order"
+msgstr ""
#: PcReportTab.php:70
msgid "Show HTML"
@@ -15854,12 +15854,12 @@
#: PcReportTab.php:115
#, fuzzy
msgid "No Petty Cash tabs were returned by the SQL because"
-msgstr "The Vendor details could not be retrieved by the SQL because"
+msgstr ""
#: PcReportTab.php:133
#, fuzzy
msgid "Tab Code :"
-msgstr "Territory Code"
+msgstr ""
#: PcReportTab.php:134 PcReportTab.php:137 PcReportTab.php:142
#: PcReportTab.php:145 PcReportTab.php:150 PcReportTab.php:155
@@ -15881,8 +15881,8 @@
msgstr ""
#: PcReportTab.php:149
-msgid "Authorizer "
-msgstr ""
+msgid "Authoriser "
+msgstr "Authorizer"
#: PcReportTab.php:154
msgid "Currency "
@@ -15903,12 +15903,12 @@
#: PcReportTab.php:246
#, fuzzy
msgid "No Petty Cash Tabs were returned by the SQL because"
-msgstr "The Vendor details could not be retrieved by the SQL because"
+msgstr ""
#: PcReportTab.php:253 PcTabs.php:192 PcTabs.php:274 PcTabs.php:280
#, fuzzy
msgid "Tab Code"
-msgstr "Territory Code"
+msgstr ""
#: PcReportTab.php:265 PcTabs.php:197
msgid "Authorizer"
@@ -15921,11 +15921,11 @@
#: PcReportTab.php:319
#, fuzzy
msgid "No Petty Cash movements for this tab were returned by the SQL because"
-msgstr "The Vendor details could not be retrieved by the SQL because"
+msgstr ""
#: PcReportTab.php:329
-msgid "Date Authorized"
-msgstr ""
+msgid "Date Authorised"
+msgstr "Date Authorized"
#: PcReportTab.php:399
msgid "Balance At"
@@ -15947,7 +15947,7 @@
#: PcTabs.php:54
#, fuzzy
msgid "The Tab code must be twenty characters or less long"
-msgstr "The territory code must be three characters or less long"
+msgstr ""
#: PcTabs.php:59
msgid "You must select a User for this tab"
@@ -15960,7 +15960,7 @@
#: PcTabs.php:69
#, fuzzy
msgid "You must select a User to authorise this tab"
-msgstr "Vendor Code or Description"
+msgstr ""
#: PcTabs.php:74
msgid "You must select a General ledger code for the cash to be assigned from"
@@ -15981,7 +15981,7 @@
#: PcTabs.php:109
#, fuzzy
msgid " already exists"
-msgstr "The territory code entered already exists"
+msgstr ""
#: PcTabs.php:131
msgid "Tab with Code "
@@ -15990,7 +15990,7 @@
#: PcTabs.php:154
#, fuzzy
msgid "The Tab record could not be deleted because"
-msgstr "The Shipping cost record could not be updated because"
+msgstr ""
#: PcTabs.php:156 PcTypeTabs.php:135
msgid "Tab type"
@@ -16016,7 +16016,7 @@
#: PcTabs.php:199 PcTabs.php:408
#, fuzzy
msgid "GL Account Petty Cash Tab"
-msgstr "Shipping Re-charged GL Account"
+msgstr ""
#: PcTabs.php:222
#, php-format
@@ -16026,7 +16026,7 @@
#: PcTabs.php:243
#, fuzzy
msgid "Show All Tabs Defined"
-msgstr "Review Territories Defined"
+msgstr ""
#: PcTabs.php:358
msgid "Limit Of Tab"
@@ -16034,12 +16034,12 @@
#: PcTabs.php:361
msgid "Authoriser"
-msgstr ""
+msgstr "Authorizer"
#: PcTabs.php:384
#, fuzzy
msgid "GL Account Cash Assignment"
-msgstr "Shipping Re-charged GL Account"
+msgstr ""
#: PcTypeTabs.php:5
msgid "Maintenance Of Petty Cash Type of Tabs"
@@ -16048,18 +16048,18 @@
#: PcTypeTabs.php:36
#, fuzzy
msgid "The Tabs type code cannot be an empty string"
-msgstr "The territory code may not be left blank"
+msgstr ""
#: PcTypeTabs.php:41
#, fuzzy
msgid "The tab code must be twenty characters or less long"
-msgstr "The territory code must be three characters or less long"
+msgstr ""
#: PcTypeTabs.php:46
#, fuzzy
msgid ""
"The petty cash tab type code cannot contain any of the illegal characters"
-msgstr "The terrirory desscription must be twenty five characters or less long"
+msgstr ""
#: PcTypeTabs.php:60
msgid "The Tabs type"
@@ -16077,7 +16077,6 @@
#, fuzzy
msgid "The number of tabs using this Tab type could not be retrieved"
msgstr ""
-"The vendors matching the criteria entered could not be retrieved because"
#: PcTypeTabs.php:122
#, fuzzy
@@ -16085,8 +16084,6 @@
"Cannot delete this tab type because tabs have been created using this tab "
"type"
msgstr ""
-"Cannot delete this territory because customer branches have been created "
-"using this area"
#: PcTypeTabs.php:126
msgid "Return to list of tab types"
@@ -16102,7 +16099,7 @@
#: PcTypeTabs.php:187
#, fuzzy
msgid "Show All Types Tabs Defined"
-msgstr "Review Territories Defined"
+msgstr ""
#: PcTypeTabs.php:212 PcTypeTabs.php:224
msgid "Code Of Type Of Tab"
@@ -16336,7 +16333,7 @@
#: PDFCustTransListing.php:91
#, fuzzy
msgid "Customer Transaction Listing"
-msgstr "Vendor Contacts"
+msgstr ""
#: PDFCustTransListing.php:31 PDFStockTransListing.php:34
#: PDFSuppTransListing.php:31
@@ -16364,7 +16361,7 @@
#: PDFCustTransListing.php:74
#, fuzzy
msgid "The SQL used to get the transaction information that failed was"
-msgstr "The SQL used to retrieve the vendor details and failed was"
+msgstr ""
#: PDFCustTransListing.php:82 PDFStockTransListing.php:92
#: PDFSuppTransListing.php:82
@@ -16499,7 +16496,7 @@
#: PDFGrn.php:73
#, fuzzy
msgid "Could not get the supplier of the selected GRN"
-msgstr "Could not load shipping-method"
+msgstr "Could not get the vendor of the selected GRN"
#: PDFGrn.php:115
msgid "Date of Receipt: "
@@ -16516,7 +16513,7 @@
#: PDFGrn.php:122
#, fuzzy
msgid "There were no GRNs to print"
-msgstr "There are no shipping-methods defined"
+msgstr ""
#: PDFLowGP.php:8 PDFLowGP.php:14 PDFLowGP.php:15
msgid "Low Gross Profit Sales"
@@ -16632,7 +16629,7 @@
#: PDFStockTransListing.php:24 PDFStockTransListing.php:101
#, fuzzy
msgid "Stock Transaction Listing"
-msgstr "Vendor Contacts"
+msgstr ""
#: PDFPeriodStockTransListing.php:31
msgid "Enter the date from which the transactions are to be listed"
@@ -16641,7 +16638,7 @@
#: PDFPeriodStockTransListing.php:35
#, fuzzy
msgid "Enter the date to which the transactions are to be listed"
-msgstr "The SQL used to retrieve the vendor details and failed was"
+msgstr ""
#: PDFPeriodStockTransListing.php:43 PDFStockTransListing.php:42
#: PrintCustTrans.php:59 PrintCustTransPortrait.php:57 SalesInquiry.php:1055
@@ -16656,7 +16653,7 @@
#: PDFPeriodStockTransListing.php:45 PDFStockTransListing.php:44
#, fuzzy
msgid "Location Transfer"
-msgstr "Select Vendor"
+msgstr ""
#: PDFPeriodStockTransListing.php:46 PDFStockTransListing.php:45
msgid "Stock Adjustment"
@@ -16665,7 +16662,7 @@
#: PDFPeriodStockTransListing.php:47 PDFStockTransListing.php:46
#, fuzzy
msgid "Purchase Order Delivery"
-msgstr "Select Vendor"
+msgstr ""
#: PDFPeriodStockTransListing.php:48 PDFStockTransListing.php:47
msgid "Work Order Receipt"
@@ -16674,7 +16671,7 @@
#: PDFPeriodStockTransListing.php:49 PDFStockTransListing.php:48
#, fuzzy
msgid "Work Order Issue"
-msgstr "Sales Order Inquiry"
+msgstr ""
#: PDFPeriodStockTransListing.php:56 StockQuantityByDate.php:39
msgid "For Stock Location"
@@ -16684,31 +16681,31 @@
#: PDFStockTransListing.php:83 PDFStockTransListing.php:89
#, fuzzy
msgid "Transaction Listing"
-msgstr "Vendor Contacts"
+msgstr ""
#: PDFPeriodStockTransListing.php:137
#, fuzzy
msgid "There were no transactions found in the database between the dates"
-msgstr "The Shipping cost record could not be updated because"
+msgstr ""
#: PDFPeriodStockTransListing.php:147 PDFStockTransListing.php:102
#, fuzzy
msgid "Stock transaction listing from"
-msgstr "Vendor Balance Listing"
+msgstr "Inventory transaction listing from"
#: PDFPeriodStockTransListing.php:154
#: includes/PDFCustTransListingPageHeader.inc:15
#: includes/PDFStockTransListingPageHeader.inc:15
#, fuzzy
msgid "Customer Invoices"
-msgstr "Vendor Contacts"
+msgstr ""
#: PDFPeriodStockTransListing.php:157
#: includes/PDFCustTransListingPageHeader.inc:18
#: includes/PDFStockTransListingPageHeader.inc:18
#, fuzzy
msgid "Customer Credit Notes"
-msgstr "Vendor Contacts"
+msgstr ""
#: PDFPeriodStockTransListing.php:160 SelectProduct.php:417
#: includes/PDFStockTransListingPageHeader.inc:21
@@ -16749,7 +16746,7 @@
#: PDFPickingList.php:22
#, fuzzy
msgid "Select Picking Lists"
-msgstr "Vendor Balance Listing"
+msgstr ""
#: PDFPickingList.php:32
msgid "Create picking lists for all deliveries to be made on"
@@ -16758,13 +16755,13 @@
#: PDFPickingList.php:34
#, fuzzy
msgid "From Warehouse"
-msgstr "Vendor Order"
+msgstr ""
#: PDFPickingList.php:47
#, fuzzy
msgid ""
"There was a problem retrieving the order header details from the database"
-msgstr "There was a problem testing for a default shipping-method because"
+msgstr ""
#: PDFPickingList.php:129 PDFPickingList.php:324
msgid "Print Picking List Error"
@@ -16789,7 +16786,7 @@
#: PDFPickingList.php:204
#, fuzzy
msgid "There was a problem retrieving the order line details for Order Number"
-msgstr "There was a problem testing for a default shipping-method because"
+msgstr ""
#: PDFPriceList.php:16
msgid "Price Listing Report"
@@ -16894,7 +16891,7 @@
#: PDFPriceList.php:296
#, fuzzy
msgid "Full Description"
-msgstr "Vendor Code or Description"
+msgstr ""
#: PDFPriceList.php:299 PDFPriceList.php:336 PDFPriceList.php:338
msgid "Effective As At"
@@ -16948,7 +16945,7 @@
#: PDFPrintLabel.php:91
#, fuzzy
msgid "Select label type"
-msgstr "Select the Vendor"
+msgstr ""
#: PDFPrintLabel.php:92
msgid "Number of labels per item"
@@ -16961,12 +16958,12 @@
#: PDFPrintLabel.php:94
#, fuzzy
msgid "Update values"
-msgstr "Sales Order Inquiry"
+msgstr ""
#: PDFPrintLabel.php:117
#, fuzzy
msgid "Print labels"
-msgstr "Vendor Balance Listing"
+msgstr ""
#: PDFPrintLabel.php:118
msgid "Print labels with borders"
@@ -16988,7 +16985,7 @@
#: PDFPrintLabel.php:500
#, fuzzy
msgid "Couldnt get the currency data"
-msgstr "Could not load shipping-method"
+msgstr ""
#: PDFQuotation.php:10 PDFQuotationPortrait.php:11
msgid "Select Quotation To Print"
@@ -17124,7 +17121,7 @@
#, fuzzy
msgid ""
"The details of the payment to the supplier could not be retrieved because"
-msgstr "The Vendor details could not be retrieved by the SQL because"
+msgstr "The details of the payment to the vendor could not be retrieved because"
#: PDFRemittanceAdvice.php:114
msgid "Remittance_Advices"
@@ -17145,7 +17142,7 @@
#: PDFRemittanceAdvice.php:269
#, fuzzy
msgid "Our Code:"
-msgstr "Territory Code"
+msgstr ""
#: PDFRemittanceAdvice.php:311
msgid "This Payment"
@@ -17166,7 +17163,7 @@
#: PDFStockCheckComparison.php:38
#, fuzzy
msgid "The inventory check file could not be retrieved because"
-msgstr "The Vendor details could not be retrieved by the SQL because"
+msgstr ""
#: PDFStockCheckComparison.php:61
msgid "Stock Count Comparison"
@@ -17175,7 +17172,7 @@
#: PDFStockCheckComparison.php:64
#, fuzzy
msgid "The inventory counts file could not be retrieved because"
-msgstr "The Vendor details could not be retrieved by the SQL because"
+msgstr ""
#: PDFStockCheckComparison.php:117 PDFStockCheckComparison.php:153
#: PDFStockCheckComparison.php:171
@@ -17335,7 +17332,7 @@
#: PDFStockNegatives.php:20
#, fuzzy
msgid "The sql that failed to retrieve the negative quantities was"
-msgstr "The SQL used to retrieve the vendor details and failed was"
+msgstr ""
#: PDFStockNegatives.php:37
msgid "There are no negative stocks to list"
@@ -17344,7 +17341,7 @@
#: PDFStockTransfer.php:12
#, fuzzy
msgid "The entered transfer reference is expected to be numeric"
-msgstr "The Shipping cost entered is expected to be numeric"
+msgstr ""
#: PDFStockTransfer.php:18
#, fuzzy
@@ -17371,7 +17368,7 @@
#: PDFStockTransfer.php:63
#, fuzzy
msgid "There was no transfer found with number"
-msgstr "there is no purchasing data set up for this vendor"
+msgstr ""
#: PDFStockTransfer.php:64
msgid "Try Again"
@@ -17385,12 +17382,12 @@
#: PDFSuppTransListing.php:91
#, fuzzy
msgid "Supplier Transaction Listing"
-msgstr "Vendor Balance Listing"
+msgstr "Vendor Transaction Listing"
#: PDFSuppTransListing.php:92
#, fuzzy
msgid "Supplier transaction listing from"
-msgstr "Vendor Balance Listing"
+msgstr "Vendor transaction listing from"
#: PDFTopItems.php:8
msgid "Top Items Search Result"
@@ -17399,7 +17396,7 @@
#: PDFTopItems.php:117
#, fuzzy
msgid "There were no records returned "
-msgstr "There are no shipping-methods defined"
+msgstr ""
#: PeriodsInquiry.php:7
msgid "Periods Inquiry"
@@ -17424,7 +17421,7 @@
#: PO_AuthorisationLevels.php:50
#, fuzzy
msgid "The authentication details cannot be inserted because"
-msgstr "The shipping GL posting could not be inserted because"
+msgstr ""
#: PO_AuthorisationLevels.php:53
msgid "There already exists an entry for this user/currency combination"
@@ -17433,18 +17430,18 @@
#: PO_AuthorisationLevels.php:76
#, fuzzy
msgid "The authentication details cannot be updated because"
-msgstr "The Shipping cost record could not be updated because"
+msgstr ""
#: PO_AuthorisationLevels.php:85
#, fuzzy
msgid "The authentication details cannot be deleted because"
-msgstr "The Vendor details could not be retrieved by the SQL because"
+msgstr ""
#: PO_AuthorisationLevels.php:96 PO_AuthorisationLevels.php:119
#: PO_AuthorisationLevels.php:195
#, fuzzy
msgid "The authentication details cannot be retrieved because"
-msgstr "The Vendor details could not be retrieved by the SQL because"
+msgstr ""
#: PO_AuthorisationLevels.php:126
#, fuzzy
@@ -17486,7 +17483,7 @@
#: PO_AuthoriseMyOrders.php:60
#, fuzzy
msgid "Date Ordered"
-msgstr "Vendor Order"
+msgstr ""
#: PO_AuthoriseMyOrders.php:61 PO_OrderDetails.php:105
#: PO_SelectPurchOrder.php:396 includes/PO_PDFOrderPageHeader.inc:54
@@ -17497,7 +17494,7 @@
#: POReport.php:1492 ReprintGRN.php:75 includes/PDFPickingListHeader.inc:46
#, fuzzy
msgid "Delivery Date"
-msgstr "City-State-zip"
+msgstr ""
#: PO_AuthoriseMyOrders.php:94 PO_Header.php:789 PO_Header.php:805
#: PO_SelectOSPurchOrder.php:173 PO_SelectOSPurchOrder.php:175
@@ -17652,7 +17649,7 @@
#: PO_Header.php:286
#, fuzzy
msgid "Supplier changed by"
-msgstr "Vendor Purchasing Data"
+msgstr "Vendor changed by"
#: PO_Header.php:289
msgid ""
@@ -17809,7 +17806,7 @@
#: PO_Header.php:832
#, fuzzy
msgid "Supplier Info"
-msgstr "Vendor Code"
+msgstr "Vendor Info"
#: PO_Header.php:837 includes/PDFPickingListHeader.inc:13
msgid "Warehouse"
@@ -17873,13 +17870,13 @@
msgid ""
"The quantity in the supplier units is expected to be numeric. Please re-"
"enter as a number"
-msgstr "The Shipping cost entered is expected to be numeric"
+msgstr ""
#: PO_Items.php:48
#, fuzzy
msgid ""
"The supplier price is expected to be numeric. Please re-enter as a number"
-msgstr "The Shipping cost entered is expected to be numeric"
+msgstr "The vendor price is expected to be numeric. Please re-enter as a number"
#: PO_Items.php:64
#, fuzzy
@@ -17905,7 +17902,7 @@
#: PO_Items.php:96 SelectSalesOrder.php:111 SelectSalesOrder.php:279
#, fuzzy
msgid "Order Created and Authorised by"
-msgstr "Sales Order Inquiry"
+msgstr ""
#: PO_Items.php:101 SelectSalesOrder.php:121 SelectSalesOrder.php:289
msgid "Your authority to approve purchase orders in"
@@ -18020,7 +18017,7 @@
#: PO_Items.php:416
#, fuzzy
msgid "The account details for"
-msgstr "The vendor pricing details for"
+msgstr ""
#: PO_Items.php:417
#, fuzzy
@@ -18113,7 +18110,7 @@
#: PO_Items.php:637
#, fuzzy
msgid "Our Unit"
-msgstr "Vendor Unit"
+msgstr ""
#: PO_Items.php:638
msgid "Price Our Units"
@@ -18163,7 +18160,7 @@
#: PO_Items.php:718
#, fuzzy
msgid "Not an Asset"
-msgstr "Select the Vendor"
+msgstr ""
#: PO_Items.php:721
msgid "Not yet purchased"
@@ -18193,7 +18190,7 @@
#: PO_Items.php:925
#, fuzzy
msgid "Our Units"
-msgstr "Vendor Unit"
+msgstr ""
#: PO_Items.php:927
#, fuzzy
@@ -18207,7 +18204,7 @@
#: PO_Items.php:958
#, fuzzy
msgid "Could not retrieve the purchasing data for the item"
-msgstr "The shipping-method record has been added"
+msgstr ""
#: PO_OrderDetails.php:11
msgid "Reviewing Purchase Order Number"
@@ -18260,7 +18257,7 @@
#: PO_OrderDetails.php:89 RecurringSalesOrders.php:371
#, fuzzy
msgid "Order Header Details"
-msgstr "Credit Shipping"
+msgstr ""
#: PO_OrderDetails.php:90 Suppliers.php:652 Suppliers.php:835
#: SuppLoginSetup.php:238 SuppLoginSetup.php:404 WWW_Users.php:264
@@ -18521,12 +18518,12 @@
#: POReport.php:541 POReport.php:626 POReport.php:1286 POReport.php:1337
#, fuzzy
msgid "Supplier No"
-msgstr "Vendor Name"
+msgstr "Vendor No"
#: POReport.php:543 POReport.php:1288 SalesInquiry.php:799
#, fuzzy
msgid "Order Qty"
-msgstr "Sales Order Inquiry"
+msgstr "S"
#: POReport.php:544 POReport.php:629 POReport.php:744 POReport.php:1289
#: POReport.php:1340 POReport.php:1429 SalesInquiry.php:800
@@ -18576,7 +18573,7 @@
#: POReport.php:1466
#, fuzzy
msgid "The report has been exported as a csv file."
-msgstr "The shipping-method record has been deleted"
+msgstr ""
#: POReport.php:1483 SalesInquiry.php:1033 StockDispatch.php:295
msgid "Report Type"
@@ -18615,7 +18612,7 @@
#: POReport.php:1585 SalesInquiry.php:1159
#, fuzzy
msgid "Run Inquiry"
-msgstr "Sales Order Inquiry"
+msgstr ""
#: PO_SelectOSPurchOrder.php:9 SelectProduct.php:401 StockStatus.php:360
#: StockUsage.php:185
@@ -18652,7 +18649,7 @@
#: PO_SelectOSPurchOrder.php:151 PO_SelectPurchOrder.php:123
#, fuzzy
msgid "Order Status:"
-msgstr "Credit Shipping"
+msgstr ""
#: PO_SelectOSPurchOrder.php:153 PO_SelectOSPurchOrder.php:155
msgid "Pending and Authorised"
@@ -18695,7 +18692,7 @@
#: PO_SelectOSPurchOrder.php:432
#, fuzzy
msgid "Order #"
-msgstr "Sales Order Inquiry"
+msgstr ""
#: PO_SelectOSPurchOrder.php:434
msgid "Initiated by"
@@ -18764,7 +18761,7 @@
#: PricesBasedOnMarkUp.php:81 PricesBasedOnMarkUp.php:221
#, fuzzy
msgid "Preferred Supplier Cost Data"
-msgstr "Vendor Contacts"
+msgstr "Preferred Vendor Cost Data"
#: PricesBasedOnMarkUp.php:75 PricesBasedOnMarkUp.php:79
#: PricesBasedOnMarkUp.php:83
@@ -18847,7 +18844,7 @@
#: PricesBasedOnMarkUp.php:203
#, fuzzy
msgid "Base price list selected"
-msgstr "The shipping-method record has been deleted"
+msgstr ""
#: PricesBasedOnMarkUp.php:204
msgid ""
@@ -18928,7 +18925,7 @@
#: PricesBasedOnMarkUp.php:291
#, fuzzy
msgid "There is no default price defined in the base price list for the item"
-msgstr "there is no purchasing data set up for this vendor"
+msgstr ""
#: PricesBasedOnMarkUp.php:300
msgid ""
@@ -18980,7 +18977,7 @@
#: PricesByCost.php:113
#, fuzzy
msgid "Cost in Price List"
-msgstr "Vendor Balance Listing"
+msgstr ""
#: PricesByCost.php:121 Prices_Customer.php:338 Prices.php:220
#: RecurringSalesOrders.php:417 WorkOrderEntry.php:473
@@ -19115,7 +19112,7 @@
#: Prices_Customer.php:202 Prices_Customer.php:248
#, fuzzy
msgid "The SQL used to retrieve these records was"
-msgstr "The SQL used to retrieve the vendor details and failed was"
+msgstr ""
#: Prices_Customer.php:209
msgid "There are no default prices set up for this part"
@@ -19169,22 +19166,22 @@
#: Prices.php:142
#, fuzzy
msgid "The price has been updated"
-msgstr "The shipping charge has been updated"
+msgstr ""
#: Prices.php:160
#, fuzzy
msgid "The new price could not be added"
-msgstr "The Shipping cost record could not be updated because"
+msgstr ""
#: Prices.php:164
#, fuzzy
msgid "The new price has been inserted"
-msgstr "The shipping-method record has been deleted"
+msgstr ""
#: Prices.php:180
#, fuzzy
msgid "Could not delete this price"
-msgstr "Could not load shipping-method"
+msgstr ""
#: Prices.php:182
msgid "The selected price has been deleted"
@@ -19587,7 +19584,7 @@
#: PrintCustTransPortrait.php:89
#, fuzzy
msgid "Bank Code:"
-msgstr "Territory Code"
+msgstr ""
#: PrintCustTransPortrait.php:525
msgid "Print Invoices or Credit Notes (Portrait Mode)"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-05-29 09:38:53
|
Revision: 4581
http://web-erp.svn.sourceforge.net/web-erp/?rev=4581&view=rev
Author: daintree
Date: 2011-05-29 09:38:46 +0000 (Sun, 29 May 2011)
Log Message:
-----------
various
Modified Paths:
--------------
trunk/PDFTopItems.php
trunk/PricesByCost.php
trunk/Stocks.php
trunk/TopItems.php
trunk/doc/Change.log
Added Paths:
-----------
trunk/sql/mysql/upgrade4.04-4.04.1.sql
Removed Paths:
-------------
trunk/companies/weberpdemo/part_pics/HON90021.jpg
trunk/companies/weberpdemo/part_pics/HON90022.jpg
trunk/companies/weberpdemo/part_pics/PHIS01.jpg
Modified: trunk/PDFTopItems.php
===================================================================
--- trunk/PDFTopItems.php 2011-05-29 04:45:11 UTC (rev 4580)
+++ trunk/PDFTopItems.php 2011-05-29 09:38:46 UTC (rev 4581)
@@ -1,5 +1,5 @@
<?php
-/* $Revision: 1.2 $ */
+
/* $Id$*/
include ('includes/session.inc');
@@ -18,14 +18,15 @@
SUM(salesorderdetails.qtyinvoiced) totalinvoiced,
SUM(salesorderdetails.qtyinvoiced * salesorderdetails.unitprice ) AS valuesales,
stockmaster.description,
- stockmaster.units
+ stockmaster.units,
+ stockmaster.decimalplaces
FROM salesorderdetails, salesorders, debtorsmaster,stockmaster
WHERE salesorderdetails.orderno = salesorders.orderno
AND salesorderdetails.stkcode = stockmaster.stockid
AND salesorders.debtorno = debtorsmaster.debtorno
AND salesorderdetails.actualdispatchdate >='" . $FromDate . "'
GROUP BY salesorderdetails.stkcode
- ORDER BY '" . $_GET['Sequence'] . "' DESC
+ ORDER BY " . $_GET['Sequence'] . " DESC
LIMIT " . $_GET['NumberOfTopItems'] ;
} else { //the situation if only location type selected "All"
if ($_GET['Location'] == 'All') {
@@ -41,7 +42,7 @@
AND debtorsmaster.typeid = '" . $_GET['Customers'] . "'
AND salesorderdetails.ActualDispatchDate >= '" . $FromDate . "'
GROUP BY salesorderdetails.stkcode
- ORDER BY '" . $_GET['Sequence'] . "' DESC
+ ORDER BY " . $_GET['Sequence'] . " DESC
LIMIT " . $_GET['NumberOfTopItems'];
} else {
//the situation if the customer type selected "All"
@@ -50,7 +51,8 @@
SUM(salesorderdetails.qtyinvoiced) totalinvoiced,
SUM(salesorderdetails.qtyinvoiced * salesorderdetails.unitprice ) AS valuesales,
stockmaster.description,
- stockmaster.units
+ stockmaster.units,
+ stockmaster.decimalplaces
FROM salesorderdetails, salesorders, debtorsmaster,stockmaster
WHERE salesorderdetails.orderno = salesorders.orderno
AND salesorderdetails.stkcode = stockmaster.stockid
@@ -58,7 +60,7 @@
AND salesorders.fromstkloc = '" . $_GET['Location'] . "'
AND salesorderdetails.ActualDispatchDate >= '" . $FromDate . "'
GROUP BY salesorderdetails.stkcode
- ORDER BY '" . $_GET['Sequence'] . "' DESC
+ ORDER BY " . $_GET['Sequence'] . " DESC
LIMIT 0," . $_GET['NumberOfTopItems'];
} else {
//the situation if the location and customer type not selected "All"
@@ -66,7 +68,8 @@
SUM(salesorderdetails.qtyinvoiced) totalinvoiced,
SUM(salesorderdetails.qtyinvoiced * salesorderdetails.unitprice ) AS valuesales,
stockmaster.description,
- stockmaster.units
+ stockmaster.units,
+ stockmaster.decimalplaces
FROM salesorderdetails, salesorders, debtorsmaster,stockmaster
WHERE salesorderdetails.orderno = salesorders.orderno
AND salesorderdetails.stkcode = stockmaster.stockid
@@ -75,57 +78,43 @@
AND debtorsmaster.typeid = '" . $_GET['Customers'] . "'
AND salesorderdetails.actualdispatchdate >= '" . $FromDate . "'
GROUP BY salesorderdetails.stkcode
- ORDER BY '" . $_GET['Sequence'] . "' DESC
+ ORDER BY " . $_GET['Sequence'] . " DESC
LIMIT " . $_GET['NumberOfTopItems'];
}
}
}
$result = DB_query($SQL, $db);
-
-$YPos = $YPos - 6;
-while ($myrow = DB_fetch_array($result)) {
- //find the quantity onhand item
- $sqloh = "SELECT sum(quantity)as qty
- FROM `locstock`
- WHERE stockid='" . $myrow['0'] . "'";
- $oh = db_query($sqloh, $db);
- $ohRow = db_fetch_row($oh);
- $LeftOvers = $pdf->addTextWrap($Left_Margin + 1, $YPos, 300 - $Left_Margin, $FontSize, $myrow['stkcode']);
- $LeftOvers = $pdf->addTextWrap($Left_Margin + 100, $YPos, 270 - $Left_Margin, $FontSize, $myrow['description']);
- $LeftOvers = $pdf->addTextWrap($Left_Margin + 330, $YPos, 30, $FontSize, $myrow['totalinvoiced'], 'right');
- $LeftOvers = $pdf->addTextWrap($Left_Margin + 370, $YPos, 300 - $Left_Margin, $FontSize, $myrow['units'], 'left');
- $LeftOvers = $pdf->addTextWrap($Left_Margin + 400, $YPos, 70, $FontSize, number_format($myrow['valuesales'], 2), 'right');
- $LeftOvers = $pdf->addTextWrap($Left_Margin + 490, $YPos, 30, $FontSize, $ohRow[0], 'right');
- if (strlen($LeftOvers) > 1) {
- $LeftOvers = $pdf->addTextWrap($Left_Margin + 1 + 94, $YPos - $line_height, 270, $FontSize, $LeftOvers, 'left');
+if (DB_num_rows($result)>0){
+ $YPos = $YPos - 6;
+ while ($myrow = DB_fetch_array($result)) {
+ //find the quantity onhand item
+ $sqloh = "SELECT sum(quantity)as qty
+ FROM locstock
+ WHERE stockid='" . $myrow['stkcode'] . "'";
+ $oh = db_query($sqloh, $db);
+ $ohRow = db_fetch_row($oh);
+ $LeftOvers = $pdf->addTextWrap($Left_Margin + 1, $YPos, 80, $FontSize, $myrow['stkcode']);
+ $LeftOvers = $pdf->addTextWrap($Left_Margin + 100, $YPos, 100, $FontSize, $myrow['description']);
+ $LeftOvers = $pdf->addTextWrap($Left_Margin + 330, $YPos, 30, $FontSize, number_format($myrow['totalinvoiced'],$myrow['decimalplaces']), 'right');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin + 370, $YPos, 300 - $Left_Margin, $FontSize, $myrow['units'], 'left');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin + 400, $YPos, 70, $FontSize, number_format($myrow['valuesales'], $_SESSION['CompanyRecord']['decimalplaces']), 'right');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin + 490, $YPos, 30, $FontSize, number_format($ohRow[0],$myrow['decimalplaces']), 'right');
+ if (strlen($LeftOvers) > 1) {
+ $LeftOvers = $pdf->addTextWrap($Left_Margin + 1 + 94, $YPos - $line_height, 270, $FontSize, $LeftOvers, 'left');
+ $YPos-= $line_height;
+ }
+ if ($YPos - $line_height <= $Bottom_Margin) {
+ /* We reached the end of the page so finish off the page and start a newy */
+ $PageNumber++;
+ include ('includes/PDFTopItemsHeader.inc');
+ $FontSize = 10;
+ } //end if need a new page headed up
+ /*increment a line down for the next line item */
$YPos-= $line_height;
}
- if ($YPos - $line_height <= $Bottom_Margin) {
- /* We reached the end of the page so finish off the page and start a newy */
- $PageNumber++;
- include ('includes/PDFTopItemsHeader.inc');
- $FontSize = 10;
- } //end if need a new page headed up
- /*increment a line down for the next line item */
- $YPos-= $line_height;
+
+ $pdf->OutputD($_SESSION['DatabaseName'] . '_TopItemsListing_' . date('Y-m-d').'.pdf');
+ $pdf->__destruct();
}
-$pdfcode = $pdf->output();
-$len = strlen($pdfcode);
-if (DB_num_rows($result) == 0) {
- $title = _('Print Price List Error');
- include ('includes/header.inc');
- prnMsg(_('There were no records returned '), 'warn');
- echo '<br><a href="' . $rootpath . '/index.php">' . _('Back to the menu') . '</a>';
- include ('includes/footer.inc');
- exit;
-} else {
- header('Content-type: application/pdf');
- header('Content-Length: ' . $len);
- header('Content-Disposition: inline; filename=TopItems.pdf');
- header('Expires: 0');
- header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
- header('Pragma: public');
- $pdf->Output('TopItems.pdf', 'I');
-}
/*end of else not PrintPDF */
?>
Modified: trunk/PricesByCost.php
===================================================================
--- trunk/PricesByCost.php 2011-05-29 04:45:11 UTC (rev 4580)
+++ trunk/PricesByCost.php 2011-05-29 09:38:46 UTC (rev 4581)
@@ -7,7 +7,7 @@
echo '<p class="page_title_text"><img src="' . $rootpath . '/css/' . $theme . '/images/inventory.png" title="' . _('Inventory') . '" alt="" />' . ' ' . _('Update Price By Cost') . '</p>';
-if (isset($_POST['submit']) or isset($_POST['update'])) {
+if (isset($_POST['submit']) OR isset($_POST['update'])) {
if ($_POST['Margin'] == '') {
header('Location: PricesByCost.php');
}
@@ -27,12 +27,19 @@
prices.debtorno,
prices.branchcode,
(stockmaster.materialcost + stockmaster.labourcost + stockmaster.overheadcost) as cost,
- prices.price as price, prices.debtorno as customer, prices.branchcode as branch,
+ prices.price as price,
+ prices.debtorno AS customer,
+ prices.branchcode AS branch,
prices.startdate,
- prices.enddate
- FROM stockmaster, prices
- WHERE stockmaster.stockid=prices.stockid" . $Category . "
- AND stockmaster.discontinued = 0
+ prices.enddate,
+ currencies.decimalplaces,
+ currencies.rate
+ FROM stockmaster INNER JOIN prices
+ ON stockmaster.stockid=prices.stockid
+ INNER JOIN currencies
+ ON prices.currabrev=currencies.currabrev
+ WHERE stockmaster.discontinued = 0
+ " . $Category . "
AND prices.price" . $Comparator . "(stockmaster.materialcost + stockmaster.labourcost + stockmaster.overheadcost) * '" . $_POST['Margin'] . "'
AND prices.typeabbrev ='" . $_POST['SalesType'] . "'
AND prices.currabrev ='" . $_POST['CurrCode'] . "'
@@ -46,44 +53,54 @@
while ($myrow = DB_fetch_array($result)) {
$SQLTestExists = "SELECT price FROM prices
- WHERE stockid = '" . $_POST['StockID_' . $PriceCounter] . "'
- AND prices.typeabbrev ='" . $_POST['SalesType'] . "'
- AND prices.currabrev ='" . $_POST['CurrCode'] . "'
- AND prices.debtorno ='" . $_POST['DebtorNo_' . $PriceCounter] . "'
- AND prices.branchcode ='" . $_POST['BranchCode_' . $PriceCounter] . "'
- AND prices.startdate ='" . date('Y-m-d') . "'";
+ WHERE stockid = '" . $_POST['StockID_' . $PriceCounter] . "'
+ AND prices.typeabbrev ='" . $_POST['SalesType'] . "'
+ AND prices.currabrev ='" . $_POST['CurrCode'] . "'
+ AND prices.debtorno ='" . $_POST['DebtorNo_' . $PriceCounter] . "'
+ AND prices.branchcode ='" . $_POST['BranchCode_' . $PriceCounter] . "'
+ AND prices.startdate ='" . date('Y-m-d') . "'";
$TestExistsResult = DB_query($SQLTestExists,$db);
if (DB_num_rows($TestExistsResult)==1){
//then we are updating
- $SQLUpdate = "UPDATE prices SET price = '" . $_POST['Price_' . $PriceCounter] . "'
- WHERE stockid = '" . $_POST['StockID_' . $PriceCounter] . "'
- AND prices.typeabbrev ='" . $_POST['SalesType'] . "'
- AND prices.currabrev ='" . $_POST['CurrCode'] . "'
- AND prices.debtorno ='" . $_POST['DebtorNo_' . $PriceCounter] . "'
- AND prices.branchcode ='" . $_POST['BranchCode_' . $PriceCounter] . "'
- AND prices.startdate ='" . date('Y-m-d') . "'
- AND prices.enddate ='" . $_POST['EndDate_' . $PriceCounter] . "'";
+ $SQLUpdate = "UPDATE prices SET price = '" . $_POST['Price_' . $PriceCounter] . "'
+ WHERE stockid = '" . $_POST['StockID_' . $PriceCounter] . "'
+ AND prices.typeabbrev ='" . $_POST['SalesType'] . "'
+ AND prices.currabrev ='" . $_POST['CurrCode'] . "'
+ AND prices.debtorno ='" . $_POST['DebtorNo_' . $PriceCounter] . "'
+ AND prices.branchcode ='" . $_POST['BranchCode_' . $PriceCounter] . "'
+ AND prices.startdate ='" . date('Y-m-d') . "'
+ AND prices.enddate ='" . $_POST['EndDate_' . $PriceCounter] . "'";
$ResultUpdate = DB_query($SQLUpdate, $db);
} else {
- //we need to add a new price from today
- $SQLInsert = "INSERT INTO prices (
- stockid,
- price,
- typeabbrev,
- currabrev,
- debtorno,
- branchcode,
- startdate
- ) VALUES (
- '" . $_POST['StockID_' . $PriceCounter] . "',
- '" . $_POST['Price_' . $PriceCounter] . "',
- '" . $_POST['SalesType'] . "',
- '" . $_POST['CurrCode'] . "',
- '" . $_POST['DebtorNo_' . $PriceCounter] . "',
- '" . $_POST['BranchCode_' . $PriceCounter] . "',
- '" . date('Y-m-d') . "'
- )";
- $ResultInsert = DB_query($SQLInsert, $db);
+ //update the old price to have an end date of yesterday too
+ $SQLUpdate = "UPDATE prices SET enddate = '" . FormatDateForSQL(DateAdd(Date($_SESSION['DefaultDateFormat']),'d',-1)) . "'
+ WHERE stockid = '" . $_POST['StockID_' . $PriceCounter] . "'
+ AND prices.typeabbrev ='" . $_POST['SalesType'] . "'
+ AND prices.currabrev ='" . $_POST['CurrCode'] . "'
+ AND prices.debtorno ='" . $_POST['DebtorNo_' . $PriceCounter] . "'
+ AND prices.branchcode ='" . $_POST['BranchCode_' . $PriceCounter] . "'
+ AND prices.startdate ='" . $_POST['StartDate_' . $PriceCounter] . "'
+ AND prices.enddate ='" . $_POST['EndDate_' . $PriceCounter] . "'";
+ $Result = DB_query($SQLUpdate, $db);
+ //we need to add a new price from today
+ $SQLInsert = "INSERT INTO prices ( stockid,
+ price,
+ typeabbrev,
+ currabrev,
+ debtorno,
+ branchcode,
+ startdate
+ ) VALUES (
+ '" . $_POST['StockID_' . $PriceCounter] . "',
+ '" . $_POST['Price_' . $PriceCounter] . "',
+ '" . $_POST['SalesType'] . "',
+ '" . $_POST['CurrCode'] . "',
+ '" . $_POST['DebtorNo_' . $PriceCounter] . "',
+ '" . $_POST['BranchCode_' . $PriceCounter] . "',
+ '" . date('Y-m-d') . "'
+ )";
+ $ResultInsert = DB_query($SQLInsert, $db);
+
}
$PriceCounter++;
}//end while loop
@@ -159,12 +176,12 @@
<input type="hidden" value=' . $myrow['enddate'] . ' name="EndDate_' . $PriceCounter .'">';
//variable for current margin
if ($myrow['price'] != 0){
- $CurrentGP = ($myrow['price']-$Cost)*100 / $myrow['price'];
+ $CurrentGP = (($myrow['price']/$myrow['rate'])-$Cost)*100 / ($myrow['price']/$myrow['rate']);
} else {
$CurrentGP = 0;
}
//variable for proposed
- $Proposed = $Cost * $_POST['Margin'];
+ $ProposedPrice = $Cost * $_POST['Margin'];
if ($myrow['enddate']=='0000-00-00'){
$EndDateDisplay = _('No End Date');
} else {
@@ -176,16 +193,16 @@
<td>' . $myrow['branch'] . '</td>
<td>' . ConvertSQLDate($myrow['startdate']) . '</td>
<td>' . $EndDateDisplay . '</td>
- <td class="number">' . number_format($Cost, 2) . '</td>
+ <td class="number">' . number_format($Cost, $_SESSION['CompanyRecord']['decimalplaces']) . '</td>
<td class="number">' . number_format($CurrentGP, 1) . '%</td>
- <td class="number">' . number_format($Proposed, 2) . '</td>
+ <td class="number">' . number_format($ProposedPrice, $myrow['decimalplaces']) . '</td>
<td><input type="text" class="number" name="Price_' . $PriceCounter . '" maxlength=14 size=10 value="' . $myrow['price'] . '"></td>
</tr> ';
$PriceCounter++;
} //end of looping
echo '<tr>
- <td style="text-align:right" colspan=4><input type=submit name=submit value=' . _('Update') . '></td>
- <td style="text-align:left" colspan=3><a href="' . $_SERVER['PHP_SELF'] . '"><input type=submit value=' . _('Back') . '><a/></td>
+ <td style="text-align:right" colspan=4><input type="submit" name="submit" value=' . _('Update') . ' onclick="return confirm(\'' . _('If the prices above do not have a commencement date as today, this will create new prices with commencement date of today at the entered figures and update the existing prices with historical start dates to have an end date of yesterday. Are You Sure?') . '\');"></td>
+ <td style="text-align:left" colspan=3><a href="' . $_SERVER['PHP_SELF'] . '"><input type="submit" value="' . _('Back') . '"><a/></td>
</tr></form>';
} else {
prnMsg(_('There were no prices meeting the criteria specified to review'),'info');
@@ -196,9 +213,9 @@
echo '</br></br><form action="' . $_SERVER['PHP_SELF'] . '" method="post"><table class=selection>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- $SQL = 'SELECT categoryid, categorydescription
+ $SQL = "SELECT categoryid, categorydescription
FROM stockcategory
- ORDER BY categorydescription';
+ ORDER BY categorydescription";
$result1 = DB_query($SQL, $db);
echo '<tr>
<td>' . _('Category') . ':</td>
@@ -221,7 +238,7 @@
$_POST['Margin']=1;
}
echo '<td><input type="text" class="number" name="Margin" MAXLENGTH =8 size=8 value=' .$_POST['Margin'] . '></td></tr>';
- $result = DB_query('SELECT typeabbrev, sales_type FROM salestypes ', $db);
+ $result = DB_query("SELECT typeabbrev, sales_type FROM salestypes", $db);
echo '<tr><td>' . _('Sales Type') . '/' . _('Price List') . ':</td>
<td><select name="SalesType">';
while ($myrow = DB_fetch_array($result)) {
@@ -232,7 +249,7 @@
}
} //end while loop
DB_data_seek($result, 0);
- $result = DB_query('SELECT currency, currabrev FROM currencies', $db);
+ $result = DB_query("SELECT currency, currabrev FROM currencies", $db);
echo '</select></td></tr>
<tr><td>' . _('Currency') . ':</td>
<td><select name="CurrCode">';
Modified: trunk/Stocks.php
===================================================================
--- trunk/Stocks.php 2011-05-29 04:45:11 UTC (rev 4580)
+++ trunk/Stocks.php 2011-05-29 09:38:46 UTC (rev 4581)
@@ -692,7 +692,7 @@
$teller++;
}
}
- $mydir .= "";
+ $mydir .= '';
}
return $mydir;
}
@@ -713,7 +713,7 @@
'" >';
} else {
if( isset($StockID) and file_exists($_SESSION['part_pics_dir'] . '/' .$StockID.'.jpg') ) {
- $StockImgLink = '<img src="' . $_SESSION['part_pics_dir'] . '/' .$StockID.'.jpg" >';
+ $StockImgLink = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC&StockID=' . $StockID . '&text=&width=120&height=120">';
} else {
$StockImgLink = _('No Image');
}
Modified: trunk/TopItems.php
===================================================================
--- trunk/TopItems.php 2011-05-29 04:45:11 UTC (rev 4580)
+++ trunk/TopItems.php 2011-05-29 09:38:46 UTC (rev 4581)
@@ -15,7 +15,7 @@
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<table cellpadding="3" colspan="4" class="selection">';
//to view store location
- echo '<tr><td width="150">' . _('Select Location') . ' </td><td>:</td><td><select name=Location>';
+ echo '<tr><td width="150">' . _('Select Location') . ' </td><td>:</td><td><select name="Location">';
$sql = "SELECT loccode,
locationname
FROM `locations`";
@@ -43,8 +43,8 @@
echo '<tr> <td width="150">' . _('Select Order By ') . ' </td>
<td>:</td>
<td><select name="Sequence">';
- echo ' <option value="TotalInvoiced">' . _('Total Pieces') . '</option>';
- echo ' <option value="ValueSales">' . _('Value of Sales') . '</option>';
+ echo ' <option value="totalinvoiced">' . _('Total Pieces') . '</option>';
+ echo ' <option value="valuesales">' . _('Value of Sales') . '</option>';
echo ' </select></td>
</tr>';
//View number of days
@@ -71,8 +71,8 @@
if (($_POST['Location'] == 'All') and ($_POST['Customers'] == 'All')) {
$SQL = "SELECT salesorderdetails.stkcode,
- SUM(salesorderdetails.qtyinvoiced) TotalInvoiced,
- SUM(salesorderdetails.qtyinvoiced * salesorderdetails.unitprice ) AS ValueSales,
+ SUM(salesorderdetails.qtyinvoiced) AS totalinvoiced,
+ SUM(salesorderdetails.qtyinvoiced * salesorderdetails.unitprice/currencies.rate ) AS valuesales,
stockmaster.description,
stockmaster.units,
currencies.rate,
@@ -85,42 +85,41 @@
AND debtorsmaster.currcode = currencies.currabrev
AND salesorderdetails.actualdispatchdate >= '" . $FromDate . "'
GROUP BY salesorderdetails.stkcode
- ORDER BY '" . $_POST['Sequence'] . "' DESC
- LIMIT " . $_POST['NumberOfTopItems'] . "";
+ ORDER BY " . $_POST['Sequence'] . " DESC
+ LIMIT " . $_POST['NumberOfTopItems'];
} else { //the situation if only location type selected "All"
if ($_POST['Location'] == 'All') {
- $SQL = "
- SELECT salesorderdetails.stkcode,
- SUM(salesorderdetails.qtyinvoiced) TotalInvoiced,
- SUM(salesorderdetails.qtyinvoiced * salesorderdetails.unitprice ) AS ValueSales,
+ $SQL = "SELECT salesorderdetails.stkcode,
+ SUM(salesorderdetails.qtyinvoiced) AS totalinvoiced,
+ SUM(salesorderdetails.qtyinvoiced * salesorderdetails.unitprice/currencies.rate ) AS valuesales,
stockmaster.description,
stockmaster.units,
currencies.rate,
debtorsmaster.currcode,
stockmaster.decimalplaces
- FROM salesorderdetails, salesorders, debtorsmaster,stockmaster, currencies
- WHERE salesorderdetails.orderno = salesorders.orderno
+ FROM salesorderdetails, salesorders, debtorsmaster,stockmaster, currencies
+ WHERE salesorderdetails.orderno = salesorders.orderno
AND salesorderdetails.stkcode = stockmaster.stockid
AND salesorders.debtorno = debtorsmaster.debtorno
AND debtorsmaster.currcode = currencies.currabrev
AND debtorsmaster.typeid = '" . $_POST['Customers'] . "'
AND salesorderdetails.actualdispatchdate >= '" . $FromDate . "'
GROUP BY salesorderdetails.stkcode
- ORDER BY '" . $_POST['Sequence'] . "' DESC
- LIMIT " . $_POST[NumberOfTopItems] . "";
+ ORDER BY " . $_POST['Sequence'] . " DESC
+ LIMIT " . $_POST[NumberOfTopItems];
} else {
//the situation if the customer type selected "All"
if ($_POST['Customers'] == 'All') {
$SQL = "SELECT salesorderdetails.stkcode,
- SUM(salesorderdetails.qtyinvoiced) TotalInvoiced,
- SUM(salesorderdetails.qtyinvoiced * salesorderdetails.unitprice ) AS ValueSales,
+ SUM(salesorderdetails.qtyinvoiced) AS totalinvoiced,
+ SUM(salesorderdetails.qtyinvoiced * salesorderdetails.unitprice/currencies.rate ) AS valuesales,
stockmaster.description,
stockmaster.units,
currencies.rate,
debtorsmaster.currcode,
stockmaster.decimalplaces
- FROM salesorderdetails, salesorders, debtorsmaster,stockmaster, currencies
- WHERE salesorderdetails.orderno = salesorders.orderno
+ FROM salesorderdetails, salesorders, debtorsmaster,stockmaster, currencies
+ WHERE salesorderdetails.orderno = salesorders.orderno
AND salesorderdetails.stkcode = stockmaster.stockid
AND salesorders.debtorno = debtorsmaster.debtorno
AND debtorsmaster.currcode = currencies.currabrev
@@ -128,19 +127,19 @@
AND salesorderdetails.actualdispatchdate >= '" . $FromDate . "'
GROUP BY salesorderdetails.stkcode
ORDER BY " . $_POST['Sequence'] . " DESC
- LIMIT " . $_POST['NumberOfTopItems'] . "";
+ LIMIT " . $_POST['NumberOfTopItems'];
} else {
//the situation if the location and customer type not selected "All"
$SQL = "SELECT salesorderdetails.stkcode,
- SUM(salesorderdetails.qtyinvoiced) TotalInvoiced,
- SUM(salesorderdetails.qtyinvoiced * salesorderdetails.unitprice ) AS ValueSales,
+ SUM(salesorderdetails.qtyinvoiced) AS totalinvoiced,
+ SUM(salesorderdetails.qtyinvoiced * salesorderdetails.unitprice/currencies.rate ) AS valuesales,
stockmaster.description,
stockmaster.units,
currencies.rate,
debtorsmaster.currcode,
stockmaster.decimalplaces
- FROM salesorderdetails, salesorders, debtorsmaster,stockmaster, currencies
- WHERE salesorderdetails.orderno = salesorders.orderno
+ FROM salesorderdetails, salesorders, debtorsmaster,stockmaster, currencies
+ WHERE salesorderdetails.orderno = salesorders.orderno
AND salesorderdetails.stkcode = stockmaster.stockid
AND salesorders.debtorno = debtorsmaster.debtorno
AND debtorsmaster.currcode = currencies.currabrev
@@ -148,23 +147,25 @@
AND debtorsmaster.typeid = '" . $_POST['Customers'] . "'
AND salesorderdetails.actualdispatchdate >= '" . $FromDate . "'
GROUP BY salesorderdetails.stkcode
- ORDER BY '" . $_POST['Sequence'] . "' DESC
- LIMIT " . $_POST['NumberOfTopItems'] . "";
+ ORDER BY " . $_POST['Sequence'] . " DESC
+ LIMIT " . $_POST['NumberOfTopItems'];
}
}
}
+
$result = DB_query($SQL, $db);
echo '<p class="page_title_text" align="center"><strong>' . _('Top Sales Items List') . '</strong></p>';
echo '<form action="PDFTopItems.php" method="GET"><table class="selection">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
$TableHeader = '<tr><th>' . _('#') . '</th>
- <th>' . _('Code') . '</th>
- <th>' . _('Description') . '</th>
- <th>' . _('Total Invoiced') . '</th>
- <th>' . _('Units') . '</th>
- <th>' . _('Value Sales') . '</th>
- <th>' . _('On Hand') . '</th>';
+ <th>' . _('Code') . '</th>
+ <th>' . _('Description') . '</th>
+ <th>' . _('Total Invoiced') . '</th>
+ <th>' . _('Units') . '</th>
+ <th>' . _('Value Sales') . '</th>
+ <th>' . _('On Hand') . '</th>
+ </tr>';
echo $TableHeader;
echo '<input type="hidden" value=' . $_POST['Location'] . ' name="Location" />
<input type="hidden" value=' . $_POST['Sequence'] . ' name="Sequence" />
@@ -175,11 +176,12 @@
$i = 1;
while ($myrow = DB_fetch_array($result)) {
//find the quantity onhand item
- $sqloh = "SELECT sum(quantity)as qty
- FROM `locstock`
- WHERE stockid='" . $myrow['0'] . "'";
- $oh = db_query($sqloh, $db);
- $ohRow = db_fetch_row($oh);
+ $sqloh = "SELECT sum(quantity) AS qty
+ FROM locstock
+ WHERE stockid='" . $myrow['stkcode'] . "'";
+
+ $oh = DB_query($sqloh, $db);
+ $ohRow = DB_fetch_row($oh);
if ($k == 1) {
echo '<tr class="EvenTableRows">';
$k = 0;
@@ -188,25 +190,25 @@
$k = 1;
}
printf('<td class="number">%s</td>
- <td>%s</font></td>
- <td>%s</td>
- <td class="number">%s</td>
- <td>%s</td>
- <td class="number">%s</td>
- <td class="number">%s</td>
- </tr>',
- $i,
- $myrow['0'],
- $myrow['3'],
- $myrow['1'], //total invoice here
- $myrow['4'], //unit
- number_format($myrow['2']/$myrow['5'],2), //value sales here
- number_format($ohRow[0], $myrow['7']) //on hand
- );
+ <td>%s</td>
+ <td>%s</td>
+ <td class="number">%s</td>
+ <td>%s</td>
+ <td class="number">%s</td>
+ <td class="number">%s</td>
+ </tr>',
+ $i,
+ $myrow['stkcode'],
+ $myrow['description'],
+ number_format($myrow['totalinvoiced'],$myrow['decimalplaces']), //total invoice here
+ $myrow['units'], //unit
+ number_format($myrow['valuesales'],$_SESSION['CompanyRecord']['decimalplaces']), //value sales here
+ number_format($ohRow[0], $myrow['decimalplaces']) //on hand
+ );
$i++;
}
echo '</table>';
- echo '<br /><div class="centre"><input type=Submit Name="PrintPDF" Value="' . _('Print To PDF') . '"></div>';
+ echo '<br /><div class="centre"><input type=Submit Name="PrintPDF" value="' . _('Print To PDF') . '"></div>';
echo '</form>';
}
include ('includes/footer.inc');
Deleted: trunk/companies/weberpdemo/part_pics/HON90021.jpg
===================================================================
(Binary files differ)
Deleted: trunk/companies/weberpdemo/part_pics/HON90022.jpg
===================================================================
(Binary files differ)
Deleted: trunk/companies/weberpdemo/part_pics/PHIS01.jpg
===================================================================
(Binary files differ)
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-05-29 04:45:11 UTC (rev 4580)
+++ trunk/doc/Change.log 2011-05-29 09:38:46 UTC (rev 4581)
@@ -1,5 +1,7 @@
webERP Change Log
+29/5/11 PricesByCost.php made it so the existing prices had end dates set as yesterday and new prices created from today
+29/5/11 TopItems.php fixed sequence and birthday to script
28/5/11 Could not set controlled item batches/serial numbers on ConfirmDispatch_Invoice.php
28/5/11 Ricard PO_SelectOSPurchOrder.php was showing select location with gaps between locations - no slash before <option> fixed
28/5/11 Ricard added new field assigner to petty cash module and changes to PcTabs.php and PcAssignCashToTab.php
Added: trunk/sql/mysql/upgrade4.04-4.04.1.sql
===================================================================
--- trunk/sql/mysql/upgrade4.04-4.04.1.sql (rev 0)
+++ trunk/sql/mysql/upgrade4.04-4.04.1.sql 2011-05-29 09:38:46 UTC (rev 4581)
@@ -0,0 +1,7 @@
+INSERT INTO scripts (script, pagesecurity, description) VALUES ('SalesTopItemsInquiry.php', 2, 'Shows top selling items either by quantity or sales value by user selectable period range');
+INSERT INTO scripts (script, pagesecurity, description) VALUES ('SalesCategoryPeriodInquiry.php', 2, 'Shows sales by caetgory for a user selectable period range');
+INSERT INTO scripts (script, pagesecurity, description) VALUES ('SalesByTypePeriodInquiry.php', 2, 'Shows sales value by sales type by user selectable period range');
+ALTER TABLE `scripts` CHANGE `pagesecurity` `pagesecurity` INT( 11 ) NOT NULL DEFAULT '1';
+ALTER TABLE `pctabs` ADD `assigner` VARCHAR( 20 ) NOT NULL COMMENT 'Cash assigner for the tab' AFTER `tablimit`;
+UPDATE pctabs SET assigner = authorizer;
+UPDATE config SET confvalue='4.04.1' WHERE confname='VersionNumber';
\ 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: <dai...@us...> - 2011-05-29 09:38:53
|
Revision: 4581
http://web-erp.svn.sourceforge.net/web-erp/?rev=4581&view=rev
Author: daintree
Date: 2011-05-29 09:38:46 +0000 (Sun, 29 May 2011)
Log Message:
-----------
various
Modified Paths:
--------------
trunk/PDFTopItems.php
trunk/PricesByCost.php
trunk/Stocks.php
trunk/TopItems.php
trunk/doc/Change.log
Added Paths:
-----------
trunk/sql/mysql/upgrade4.04-4.04.1.sql
Removed Paths:
-------------
trunk/companies/weberpdemo/part_pics/HON90021.jpg
trunk/companies/weberpdemo/part_pics/HON90022.jpg
trunk/companies/weberpdemo/part_pics/PHIS01.jpg
Modified: trunk/PDFTopItems.php
===================================================================
--- trunk/PDFTopItems.php 2011-05-29 04:45:11 UTC (rev 4580)
+++ trunk/PDFTopItems.php 2011-05-29 09:38:46 UTC (rev 4581)
@@ -1,5 +1,5 @@
<?php
-/* $Revision: 1.2 $ */
+
/* $Id$*/
include ('includes/session.inc');
@@ -18,14 +18,15 @@
SUM(salesorderdetails.qtyinvoiced) totalinvoiced,
SUM(salesorderdetails.qtyinvoiced * salesorderdetails.unitprice ) AS valuesales,
stockmaster.description,
- stockmaster.units
+ stockmaster.units,
+ stockmaster.decimalplaces
FROM salesorderdetails, salesorders, debtorsmaster,stockmaster
WHERE salesorderdetails.orderno = salesorders.orderno
AND salesorderdetails.stkcode = stockmaster.stockid
AND salesorders.debtorno = debtorsmaster.debtorno
AND salesorderdetails.actualdispatchdate >='" . $FromDate . "'
GROUP BY salesorderdetails.stkcode
- ORDER BY '" . $_GET['Sequence'] . "' DESC
+ ORDER BY " . $_GET['Sequence'] . " DESC
LIMIT " . $_GET['NumberOfTopItems'] ;
} else { //the situation if only location type selected "All"
if ($_GET['Location'] == 'All') {
@@ -41,7 +42,7 @@
AND debtorsmaster.typeid = '" . $_GET['Customers'] . "'
AND salesorderdetails.ActualDispatchDate >= '" . $FromDate . "'
GROUP BY salesorderdetails.stkcode
- ORDER BY '" . $_GET['Sequence'] . "' DESC
+ ORDER BY " . $_GET['Sequence'] . " DESC
LIMIT " . $_GET['NumberOfTopItems'];
} else {
//the situation if the customer type selected "All"
@@ -50,7 +51,8 @@
SUM(salesorderdetails.qtyinvoiced) totalinvoiced,
SUM(salesorderdetails.qtyinvoiced * salesorderdetails.unitprice ) AS valuesales,
stockmaster.description,
- stockmaster.units
+ stockmaster.units,
+ stockmaster.decimalplaces
FROM salesorderdetails, salesorders, debtorsmaster,stockmaster
WHERE salesorderdetails.orderno = salesorders.orderno
AND salesorderdetails.stkcode = stockmaster.stockid
@@ -58,7 +60,7 @@
AND salesorders.fromstkloc = '" . $_GET['Location'] . "'
AND salesorderdetails.ActualDispatchDate >= '" . $FromDate . "'
GROUP BY salesorderdetails.stkcode
- ORDER BY '" . $_GET['Sequence'] . "' DESC
+ ORDER BY " . $_GET['Sequence'] . " DESC
LIMIT 0," . $_GET['NumberOfTopItems'];
} else {
//the situation if the location and customer type not selected "All"
@@ -66,7 +68,8 @@
SUM(salesorderdetails.qtyinvoiced) totalinvoiced,
SUM(salesorderdetails.qtyinvoiced * salesorderdetails.unitprice ) AS valuesales,
stockmaster.description,
- stockmaster.units
+ stockmaster.units,
+ stockmaster.decimalplaces
FROM salesorderdetails, salesorders, debtorsmaster,stockmaster
WHERE salesorderdetails.orderno = salesorders.orderno
AND salesorderdetails.stkcode = stockmaster.stockid
@@ -75,57 +78,43 @@
AND debtorsmaster.typeid = '" . $_GET['Customers'] . "'
AND salesorderdetails.actualdispatchdate >= '" . $FromDate . "'
GROUP BY salesorderdetails.stkcode
- ORDER BY '" . $_GET['Sequence'] . "' DESC
+ ORDER BY " . $_GET['Sequence'] . " DESC
LIMIT " . $_GET['NumberOfTopItems'];
}
}
}
$result = DB_query($SQL, $db);
-
-$YPos = $YPos - 6;
-while ($myrow = DB_fetch_array($result)) {
- //find the quantity onhand item
- $sqloh = "SELECT sum(quantity)as qty
- FROM `locstock`
- WHERE stockid='" . $myrow['0'] . "'";
- $oh = db_query($sqloh, $db);
- $ohRow = db_fetch_row($oh);
- $LeftOvers = $pdf->addTextWrap($Left_Margin + 1, $YPos, 300 - $Left_Margin, $FontSize, $myrow['stkcode']);
- $LeftOvers = $pdf->addTextWrap($Left_Margin + 100, $YPos, 270 - $Left_Margin, $FontSize, $myrow['description']);
- $LeftOvers = $pdf->addTextWrap($Left_Margin + 330, $YPos, 30, $FontSize, $myrow['totalinvoiced'], 'right');
- $LeftOvers = $pdf->addTextWrap($Left_Margin + 370, $YPos, 300 - $Left_Margin, $FontSize, $myrow['units'], 'left');
- $LeftOvers = $pdf->addTextWrap($Left_Margin + 400, $YPos, 70, $FontSize, number_format($myrow['valuesales'], 2), 'right');
- $LeftOvers = $pdf->addTextWrap($Left_Margin + 490, $YPos, 30, $FontSize, $ohRow[0], 'right');
- if (strlen($LeftOvers) > 1) {
- $LeftOvers = $pdf->addTextWrap($Left_Margin + 1 + 94, $YPos - $line_height, 270, $FontSize, $LeftOvers, 'left');
+if (DB_num_rows($result)>0){
+ $YPos = $YPos - 6;
+ while ($myrow = DB_fetch_array($result)) {
+ //find the quantity onhand item
+ $sqloh = "SELECT sum(quantity)as qty
+ FROM locstock
+ WHERE stockid='" . $myrow['stkcode'] . "'";
+ $oh = db_query($sqloh, $db);
+ $ohRow = db_fetch_row($oh);
+ $LeftOvers = $pdf->addTextWrap($Left_Margin + 1, $YPos, 80, $FontSize, $myrow['stkcode']);
+ $LeftOvers = $pdf->addTextWrap($Left_Margin + 100, $YPos, 100, $FontSize, $myrow['description']);
+ $LeftOvers = $pdf->addTextWrap($Left_Margin + 330, $YPos, 30, $FontSize, number_format($myrow['totalinvoiced'],$myrow['decimalplaces']), 'right');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin + 370, $YPos, 300 - $Left_Margin, $FontSize, $myrow['units'], 'left');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin + 400, $YPos, 70, $FontSize, number_format($myrow['valuesales'], $_SESSION['CompanyRecord']['decimalplaces']), 'right');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin + 490, $YPos, 30, $FontSize, number_format($ohRow[0],$myrow['decimalplaces']), 'right');
+ if (strlen($LeftOvers) > 1) {
+ $LeftOvers = $pdf->addTextWrap($Left_Margin + 1 + 94, $YPos - $line_height, 270, $FontSize, $LeftOvers, 'left');
+ $YPos-= $line_height;
+ }
+ if ($YPos - $line_height <= $Bottom_Margin) {
+ /* We reached the end of the page so finish off the page and start a newy */
+ $PageNumber++;
+ include ('includes/PDFTopItemsHeader.inc');
+ $FontSize = 10;
+ } //end if need a new page headed up
+ /*increment a line down for the next line item */
$YPos-= $line_height;
}
- if ($YPos - $line_height <= $Bottom_Margin) {
- /* We reached the end of the page so finish off the page and start a newy */
- $PageNumber++;
- include ('includes/PDFTopItemsHeader.inc');
- $FontSize = 10;
- } //end if need a new page headed up
- /*increment a line down for the next line item */
- $YPos-= $line_height;
+
+ $pdf->OutputD($_SESSION['DatabaseName'] . '_TopItemsListing_' . date('Y-m-d').'.pdf');
+ $pdf->__destruct();
}
-$pdfcode = $pdf->output();
-$len = strlen($pdfcode);
-if (DB_num_rows($result) == 0) {
- $title = _('Print Price List Error');
- include ('includes/header.inc');
- prnMsg(_('There were no records returned '), 'warn');
- echo '<br><a href="' . $rootpath . '/index.php">' . _('Back to the menu') . '</a>';
- include ('includes/footer.inc');
- exit;
-} else {
- header('Content-type: application/pdf');
- header('Content-Length: ' . $len);
- header('Content-Disposition: inline; filename=TopItems.pdf');
- header('Expires: 0');
- header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
- header('Pragma: public');
- $pdf->Output('TopItems.pdf', 'I');
-}
/*end of else not PrintPDF */
?>
Modified: trunk/PricesByCost.php
===================================================================
--- trunk/PricesByCost.php 2011-05-29 04:45:11 UTC (rev 4580)
+++ trunk/PricesByCost.php 2011-05-29 09:38:46 UTC (rev 4581)
@@ -7,7 +7,7 @@
echo '<p class="page_title_text"><img src="' . $rootpath . '/css/' . $theme . '/images/inventory.png" title="' . _('Inventory') . '" alt="" />' . ' ' . _('Update Price By Cost') . '</p>';
-if (isset($_POST['submit']) or isset($_POST['update'])) {
+if (isset($_POST['submit']) OR isset($_POST['update'])) {
if ($_POST['Margin'] == '') {
header('Location: PricesByCost.php');
}
@@ -27,12 +27,19 @@
prices.debtorno,
prices.branchcode,
(stockmaster.materialcost + stockmaster.labourcost + stockmaster.overheadcost) as cost,
- prices.price as price, prices.debtorno as customer, prices.branchcode as branch,
+ prices.price as price,
+ prices.debtorno AS customer,
+ prices.branchcode AS branch,
prices.startdate,
- prices.enddate
- FROM stockmaster, prices
- WHERE stockmaster.stockid=prices.stockid" . $Category . "
- AND stockmaster.discontinued = 0
+ prices.enddate,
+ currencies.decimalplaces,
+ currencies.rate
+ FROM stockmaster INNER JOIN prices
+ ON stockmaster.stockid=prices.stockid
+ INNER JOIN currencies
+ ON prices.currabrev=currencies.currabrev
+ WHERE stockmaster.discontinued = 0
+ " . $Category . "
AND prices.price" . $Comparator . "(stockmaster.materialcost + stockmaster.labourcost + stockmaster.overheadcost) * '" . $_POST['Margin'] . "'
AND prices.typeabbrev ='" . $_POST['SalesType'] . "'
AND prices.currabrev ='" . $_POST['CurrCode'] . "'
@@ -46,44 +53,54 @@
while ($myrow = DB_fetch_array($result)) {
$SQLTestExists = "SELECT price FROM prices
- WHERE stockid = '" . $_POST['StockID_' . $PriceCounter] . "'
- AND prices.typeabbrev ='" . $_POST['SalesType'] . "'
- AND prices.currabrev ='" . $_POST['CurrCode'] . "'
- AND prices.debtorno ='" . $_POST['DebtorNo_' . $PriceCounter] . "'
- AND prices.branchcode ='" . $_POST['BranchCode_' . $PriceCounter] . "'
- AND prices.startdate ='" . date('Y-m-d') . "'";
+ WHERE stockid = '" . $_POST['StockID_' . $PriceCounter] . "'
+ AND prices.typeabbrev ='" . $_POST['SalesType'] . "'
+ AND prices.currabrev ='" . $_POST['CurrCode'] . "'
+ AND prices.debtorno ='" . $_POST['DebtorNo_' . $PriceCounter] . "'
+ AND prices.branchcode ='" . $_POST['BranchCode_' . $PriceCounter] . "'
+ AND prices.startdate ='" . date('Y-m-d') . "'";
$TestExistsResult = DB_query($SQLTestExists,$db);
if (DB_num_rows($TestExistsResult)==1){
//then we are updating
- $SQLUpdate = "UPDATE prices SET price = '" . $_POST['Price_' . $PriceCounter] . "'
- WHERE stockid = '" . $_POST['StockID_' . $PriceCounter] . "'
- AND prices.typeabbrev ='" . $_POST['SalesType'] . "'
- AND prices.currabrev ='" . $_POST['CurrCode'] . "'
- AND prices.debtorno ='" . $_POST['DebtorNo_' . $PriceCounter] . "'
- AND prices.branchcode ='" . $_POST['BranchCode_' . $PriceCounter] . "'
- AND prices.startdate ='" . date('Y-m-d') . "'
- AND prices.enddate ='" . $_POST['EndDate_' . $PriceCounter] . "'";
+ $SQLUpdate = "UPDATE prices SET price = '" . $_POST['Price_' . $PriceCounter] . "'
+ WHERE stockid = '" . $_POST['StockID_' . $PriceCounter] . "'
+ AND prices.typeabbrev ='" . $_POST['SalesType'] . "'
+ AND prices.currabrev ='" . $_POST['CurrCode'] . "'
+ AND prices.debtorno ='" . $_POST['DebtorNo_' . $PriceCounter] . "'
+ AND prices.branchcode ='" . $_POST['BranchCode_' . $PriceCounter] . "'
+ AND prices.startdate ='" . date('Y-m-d') . "'
+ AND prices.enddate ='" . $_POST['EndDate_' . $PriceCounter] . "'";
$ResultUpdate = DB_query($SQLUpdate, $db);
} else {
- //we need to add a new price from today
- $SQLInsert = "INSERT INTO prices (
- stockid,
- price,
- typeabbrev,
- currabrev,
- debtorno,
- branchcode,
- startdate
- ) VALUES (
- '" . $_POST['StockID_' . $PriceCounter] . "',
- '" . $_POST['Price_' . $PriceCounter] . "',
- '" . $_POST['SalesType'] . "',
- '" . $_POST['CurrCode'] . "',
- '" . $_POST['DebtorNo_' . $PriceCounter] . "',
- '" . $_POST['BranchCode_' . $PriceCounter] . "',
- '" . date('Y-m-d') . "'
- )";
- $ResultInsert = DB_query($SQLInsert, $db);
+ //update the old price to have an end date of yesterday too
+ $SQLUpdate = "UPDATE prices SET enddate = '" . FormatDateForSQL(DateAdd(Date($_SESSION['DefaultDateFormat']),'d',-1)) . "'
+ WHERE stockid = '" . $_POST['StockID_' . $PriceCounter] . "'
+ AND prices.typeabbrev ='" . $_POST['SalesType'] . "'
+ AND prices.currabrev ='" . $_POST['CurrCode'] . "'
+ AND prices.debtorno ='" . $_POST['DebtorNo_' . $PriceCounter] . "'
+ AND prices.branchcode ='" . $_POST['BranchCode_' . $PriceCounter] . "'
+ AND prices.startdate ='" . $_POST['StartDate_' . $PriceCounter] . "'
+ AND prices.enddate ='" . $_POST['EndDate_' . $PriceCounter] . "'";
+ $Result = DB_query($SQLUpdate, $db);
+ //we need to add a new price from today
+ $SQLInsert = "INSERT INTO prices ( stockid,
+ price,
+ typeabbrev,
+ currabrev,
+ debtorno,
+ branchcode,
+ startdate
+ ) VALUES (
+ '" . $_POST['StockID_' . $PriceCounter] . "',
+ '" . $_POST['Price_' . $PriceCounter] . "',
+ '" . $_POST['SalesType'] . "',
+ '" . $_POST['CurrCode'] . "',
+ '" . $_POST['DebtorNo_' . $PriceCounter] . "',
+ '" . $_POST['BranchCode_' . $PriceCounter] . "',
+ '" . date('Y-m-d') . "'
+ )";
+ $ResultInsert = DB_query($SQLInsert, $db);
+
}
$PriceCounter++;
}//end while loop
@@ -159,12 +176,12 @@
<input type="hidden" value=' . $myrow['enddate'] . ' name="EndDate_' . $PriceCounter .'">';
//variable for current margin
if ($myrow['price'] != 0){
- $CurrentGP = ($myrow['price']-$Cost)*100 / $myrow['price'];
+ $CurrentGP = (($myrow['price']/$myrow['rate'])-$Cost)*100 / ($myrow['price']/$myrow['rate']);
} else {
$CurrentGP = 0;
}
//variable for proposed
- $Proposed = $Cost * $_POST['Margin'];
+ $ProposedPrice = $Cost * $_POST['Margin'];
if ($myrow['enddate']=='0000-00-00'){
$EndDateDisplay = _('No End Date');
} else {
@@ -176,16 +193,16 @@
<td>' . $myrow['branch'] . '</td>
<td>' . ConvertSQLDate($myrow['startdate']) . '</td>
<td>' . $EndDateDisplay . '</td>
- <td class="number">' . number_format($Cost, 2) . '</td>
+ <td class="number">' . number_format($Cost, $_SESSION['CompanyRecord']['decimalplaces']) . '</td>
<td class="number">' . number_format($CurrentGP, 1) . '%</td>
- <td class="number">' . number_format($Proposed, 2) . '</td>
+ <td class="number">' . number_format($ProposedPrice, $myrow['decimalplaces']) . '</td>
<td><input type="text" class="number" name="Price_' . $PriceCounter . '" maxlength=14 size=10 value="' . $myrow['price'] . '"></td>
</tr> ';
$PriceCounter++;
} //end of looping
echo '<tr>
- <td style="text-align:right" colspan=4><input type=submit name=submit value=' . _('Update') . '></td>
- <td style="text-align:left" colspan=3><a href="' . $_SERVER['PHP_SELF'] . '"><input type=submit value=' . _('Back') . '><a/></td>
+ <td style="text-align:right" colspan=4><input type="submit" name="submit" value=' . _('Update') . ' onclick="return confirm(\'' . _('If the prices above do not have a commencement date as today, this will create new prices with commencement date of today at the entered figures and update the existing prices with historical start dates to have an end date of yesterday. Are You Sure?') . '\');"></td>
+ <td style="text-align:left" colspan=3><a href="' . $_SERVER['PHP_SELF'] . '"><input type="submit" value="' . _('Back') . '"><a/></td>
</tr></form>';
} else {
prnMsg(_('There were no prices meeting the criteria specified to review'),'info');
@@ -196,9 +213,9 @@
echo '</br></br><form action="' . $_SERVER['PHP_SELF'] . '" method="post"><table class=selection>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- $SQL = 'SELECT categoryid, categorydescription
+ $SQL = "SELECT categoryid, categorydescription
FROM stockcategory
- ORDER BY categorydescription';
+ ORDER BY categorydescription";
$result1 = DB_query($SQL, $db);
echo '<tr>
<td>' . _('Category') . ':</td>
@@ -221,7 +238,7 @@
$_POST['Margin']=1;
}
echo '<td><input type="text" class="number" name="Margin" MAXLENGTH =8 size=8 value=' .$_POST['Margin'] . '></td></tr>';
- $result = DB_query('SELECT typeabbrev, sales_type FROM salestypes ', $db);
+ $result = DB_query("SELECT typeabbrev, sales_type FROM salestypes", $db);
echo '<tr><td>' . _('Sales Type') . '/' . _('Price List') . ':</td>
<td><select name="SalesType">';
while ($myrow = DB_fetch_array($result)) {
@@ -232,7 +249,7 @@
}
} //end while loop
DB_data_seek($result, 0);
- $result = DB_query('SELECT currency, currabrev FROM currencies', $db);
+ $result = DB_query("SELECT currency, currabrev FROM currencies", $db);
echo '</select></td></tr>
<tr><td>' . _('Currency') . ':</td>
<td><select name="CurrCode">';
Modified: trunk/Stocks.php
===================================================================
--- trunk/Stocks.php 2011-05-29 04:45:11 UTC (rev 4580)
+++ trunk/Stocks.php 2011-05-29 09:38:46 UTC (rev 4581)
@@ -692,7 +692,7 @@
$teller++;
}
}
- $mydir .= "";
+ $mydir .= '';
}
return $mydir;
}
@@ -713,7 +713,7 @@
'" >';
} else {
if( isset($StockID) and file_exists($_SESSION['part_pics_dir'] . '/' .$StockID.'.jpg') ) {
- $StockImgLink = '<img src="' . $_SESSION['part_pics_dir'] . '/' .$StockID.'.jpg" >';
+ $StockImgLink = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC&StockID=' . $StockID . '&text=&width=120&height=120">';
} else {
$StockImgLink = _('No Image');
}
Modified: trunk/TopItems.php
===================================================================
--- trunk/TopItems.php 2011-05-29 04:45:11 UTC (rev 4580)
+++ trunk/TopItems.php 2011-05-29 09:38:46 UTC (rev 4581)
@@ -15,7 +15,7 @@
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<table cellpadding="3" colspan="4" class="selection">';
//to view store location
- echo '<tr><td width="150">' . _('Select Location') . ' </td><td>:</td><td><select name=Location>';
+ echo '<tr><td width="150">' . _('Select Location') . ' </td><td>:</td><td><select name="Location">';
$sql = "SELECT loccode,
locationname
FROM `locations`";
@@ -43,8 +43,8 @@
echo '<tr> <td width="150">' . _('Select Order By ') . ' </td>
<td>:</td>
<td><select name="Sequence">';
- echo ' <option value="TotalInvoiced">' . _('Total Pieces') . '</option>';
- echo ' <option value="ValueSales">' . _('Value of Sales') . '</option>';
+ echo ' <option value="totalinvoiced">' . _('Total Pieces') . '</option>';
+ echo ' <option value="valuesales">' . _('Value of Sales') . '</option>';
echo ' </select></td>
</tr>';
//View number of days
@@ -71,8 +71,8 @@
if (($_POST['Location'] == 'All') and ($_POST['Customers'] == 'All')) {
$SQL = "SELECT salesorderdetails.stkcode,
- SUM(salesorderdetails.qtyinvoiced) TotalInvoiced,
- SUM(salesorderdetails.qtyinvoiced * salesorderdetails.unitprice ) AS ValueSales,
+ SUM(salesorderdetails.qtyinvoiced) AS totalinvoiced,
+ SUM(salesorderdetails.qtyinvoiced * salesorderdetails.unitprice/currencies.rate ) AS valuesales,
stockmaster.description,
stockmaster.units,
currencies.rate,
@@ -85,42 +85,41 @@
AND debtorsmaster.currcode = currencies.currabrev
AND salesorderdetails.actualdispatchdate >= '" . $FromDate . "'
GROUP BY salesorderdetails.stkcode
- ORDER BY '" . $_POST['Sequence'] . "' DESC
- LIMIT " . $_POST['NumberOfTopItems'] . "";
+ ORDER BY " . $_POST['Sequence'] . " DESC
+ LIMIT " . $_POST['NumberOfTopItems'];
} else { //the situation if only location type selected "All"
if ($_POST['Location'] == 'All') {
- $SQL = "
- SELECT salesorderdetails.stkcode,
- SUM(salesorderdetails.qtyinvoiced) TotalInvoiced,
- SUM(salesorderdetails.qtyinvoiced * salesorderdetails.unitprice ) AS ValueSales,
+ $SQL = "SELECT salesorderdetails.stkcode,
+ SUM(salesorderdetails.qtyinvoiced) AS totalinvoiced,
+ SUM(salesorderdetails.qtyinvoiced * salesorderdetails.unitprice/currencies.rate ) AS valuesales,
stockmaster.description,
stockmaster.units,
currencies.rate,
debtorsmaster.currcode,
stockmaster.decimalplaces
- FROM salesorderdetails, salesorders, debtorsmaster,stockmaster, currencies
- WHERE salesorderdetails.orderno = salesorders.orderno
+ FROM salesorderdetails, salesorders, debtorsmaster,stockmaster, currencies
+ WHERE salesorderdetails.orderno = salesorders.orderno
AND salesorderdetails.stkcode = stockmaster.stockid
AND salesorders.debtorno = debtorsmaster.debtorno
AND debtorsmaster.currcode = currencies.currabrev
AND debtorsmaster.typeid = '" . $_POST['Customers'] . "'
AND salesorderdetails.actualdispatchdate >= '" . $FromDate . "'
GROUP BY salesorderdetails.stkcode
- ORDER BY '" . $_POST['Sequence'] . "' DESC
- LIMIT " . $_POST[NumberOfTopItems] . "";
+ ORDER BY " . $_POST['Sequence'] . " DESC
+ LIMIT " . $_POST[NumberOfTopItems];
} else {
//the situation if the customer type selected "All"
if ($_POST['Customers'] == 'All') {
$SQL = "SELECT salesorderdetails.stkcode,
- SUM(salesorderdetails.qtyinvoiced) TotalInvoiced,
- SUM(salesorderdetails.qtyinvoiced * salesorderdetails.unitprice ) AS ValueSales,
+ SUM(salesorderdetails.qtyinvoiced) AS totalinvoiced,
+ SUM(salesorderdetails.qtyinvoiced * salesorderdetails.unitprice/currencies.rate ) AS valuesales,
stockmaster.description,
stockmaster.units,
currencies.rate,
debtorsmaster.currcode,
stockmaster.decimalplaces
- FROM salesorderdetails, salesorders, debtorsmaster,stockmaster, currencies
- WHERE salesorderdetails.orderno = salesorders.orderno
+ FROM salesorderdetails, salesorders, debtorsmaster,stockmaster, currencies
+ WHERE salesorderdetails.orderno = salesorders.orderno
AND salesorderdetails.stkcode = stockmaster.stockid
AND salesorders.debtorno = debtorsmaster.debtorno
AND debtorsmaster.currcode = currencies.currabrev
@@ -128,19 +127,19 @@
AND salesorderdetails.actualdispatchdate >= '" . $FromDate . "'
GROUP BY salesorderdetails.stkcode
ORDER BY " . $_POST['Sequence'] . " DESC
- LIMIT " . $_POST['NumberOfTopItems'] . "";
+ LIMIT " . $_POST['NumberOfTopItems'];
} else {
//the situation if the location and customer type not selected "All"
$SQL = "SELECT salesorderdetails.stkcode,
- SUM(salesorderdetails.qtyinvoiced) TotalInvoiced,
- SUM(salesorderdetails.qtyinvoiced * salesorderdetails.unitprice ) AS ValueSales,
+ SUM(salesorderdetails.qtyinvoiced) AS totalinvoiced,
+ SUM(salesorderdetails.qtyinvoiced * salesorderdetails.unitprice/currencies.rate ) AS valuesales,
stockmaster.description,
stockmaster.units,
currencies.rate,
debtorsmaster.currcode,
stockmaster.decimalplaces
- FROM salesorderdetails, salesorders, debtorsmaster,stockmaster, currencies
- WHERE salesorderdetails.orderno = salesorders.orderno
+ FROM salesorderdetails, salesorders, debtorsmaster,stockmaster, currencies
+ WHERE salesorderdetails.orderno = salesorders.orderno
AND salesorderdetails.stkcode = stockmaster.stockid
AND salesorders.debtorno = debtorsmaster.debtorno
AND debtorsmaster.currcode = currencies.currabrev
@@ -148,23 +147,25 @@
AND debtorsmaster.typeid = '" . $_POST['Customers'] . "'
AND salesorderdetails.actualdispatchdate >= '" . $FromDate . "'
GROUP BY salesorderdetails.stkcode
- ORDER BY '" . $_POST['Sequence'] . "' DESC
- LIMIT " . $_POST['NumberOfTopItems'] . "";
+ ORDER BY " . $_POST['Sequence'] . " DESC
+ LIMIT " . $_POST['NumberOfTopItems'];
}
}
}
+
$result = DB_query($SQL, $db);
echo '<p class="page_title_text" align="center"><strong>' . _('Top Sales Items List') . '</strong></p>';
echo '<form action="PDFTopItems.php" method="GET"><table class="selection">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
$TableHeader = '<tr><th>' . _('#') . '</th>
- <th>' . _('Code') . '</th>
- <th>' . _('Description') . '</th>
- <th>' . _('Total Invoiced') . '</th>
- <th>' . _('Units') . '</th>
- <th>' . _('Value Sales') . '</th>
- <th>' . _('On Hand') . '</th>';
+ <th>' . _('Code') . '</th>
+ <th>' . _('Description') . '</th>
+ <th>' . _('Total Invoiced') . '</th>
+ <th>' . _('Units') . '</th>
+ <th>' . _('Value Sales') . '</th>
+ <th>' . _('On Hand') . '</th>
+ </tr>';
echo $TableHeader;
echo '<input type="hidden" value=' . $_POST['Location'] . ' name="Location" />
<input type="hidden" value=' . $_POST['Sequence'] . ' name="Sequence" />
@@ -175,11 +176,12 @@
$i = 1;
while ($myrow = DB_fetch_array($result)) {
//find the quantity onhand item
- $sqloh = "SELECT sum(quantity)as qty
- FROM `locstock`
- WHERE stockid='" . $myrow['0'] . "'";
- $oh = db_query($sqloh, $db);
- $ohRow = db_fetch_row($oh);
+ $sqloh = "SELECT sum(quantity) AS qty
+ FROM locstock
+ WHERE stockid='" . $myrow['stkcode'] . "'";
+
+ $oh = DB_query($sqloh, $db);
+ $ohRow = DB_fetch_row($oh);
if ($k == 1) {
echo '<tr class="EvenTableRows">';
$k = 0;
@@ -188,25 +190,25 @@
$k = 1;
}
printf('<td class="number">%s</td>
- <td>%s</font></td>
- <td>%s</td>
- <td class="number">%s</td>
- <td>%s</td>
- <td class="number">%s</td>
- <td class="number">%s</td>
- </tr>',
- $i,
- $myrow['0'],
- $myrow['3'],
- $myrow['1'], //total invoice here
- $myrow['4'], //unit
- number_format($myrow['2']/$myrow['5'],2), //value sales here
- number_format($ohRow[0], $myrow['7']) //on hand
- );
+ <td>%s</td>
+ <td>%s</td>
+ <td class="number">%s</td>
+ <td>%s</td>
+ <td class="number">%s</td>
+ <td class="number">%s</td>
+ </tr>',
+ $i,
+ $myrow['stkcode'],
+ $myrow['description'],
+ number_format($myrow['totalinvoiced'],$myrow['decimalplaces']), //total invoice here
+ $myrow['units'], //unit
+ number_format($myrow['valuesales'],$_SESSION['CompanyRecord']['decimalplaces']), //value sales here
+ number_format($ohRow[0], $myrow['decimalplaces']) //on hand
+ );
$i++;
}
echo '</table>';
- echo '<br /><div class="centre"><input type=Submit Name="PrintPDF" Value="' . _('Print To PDF') . '"></div>';
+ echo '<br /><div class="centre"><input type=Submit Name="PrintPDF" value="' . _('Print To PDF') . '"></div>';
echo '</form>';
}
include ('includes/footer.inc');
Deleted: trunk/companies/weberpdemo/part_pics/HON90021.jpg
===================================================================
(Binary files differ)
Deleted: trunk/companies/weberpdemo/part_pics/HON90022.jpg
===================================================================
(Binary files differ)
Deleted: trunk/companies/weberpdemo/part_pics/PHIS01.jpg
===================================================================
(Binary files differ)
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-05-29 04:45:11 UTC (rev 4580)
+++ trunk/doc/Change.log 2011-05-29 09:38:46 UTC (rev 4581)
@@ -1,5 +1,7 @@
webERP Change Log
+29/5/11 PricesByCost.php made it so the existing prices had end dates set as yesterday and new prices created from today
+29/5/11 TopItems.php fixed sequence and birthday to script
28/5/11 Could not set controlled item batches/serial numbers on ConfirmDispatch_Invoice.php
28/5/11 Ricard PO_SelectOSPurchOrder.php was showing select location with gaps between locations - no slash before <option> fixed
28/5/11 Ricard added new field assigner to petty cash module and changes to PcTabs.php and PcAssignCashToTab.php
Added: trunk/sql/mysql/upgrade4.04-4.04.1.sql
===================================================================
--- trunk/sql/mysql/upgrade4.04-4.04.1.sql (rev 0)
+++ trunk/sql/mysql/upgrade4.04-4.04.1.sql 2011-05-29 09:38:46 UTC (rev 4581)
@@ -0,0 +1,7 @@
+INSERT INTO scripts (script, pagesecurity, description) VALUES ('SalesTopItemsInquiry.php', 2, 'Shows top selling items either by quantity or sales value by user selectable period range');
+INSERT INTO scripts (script, pagesecurity, description) VALUES ('SalesCategoryPeriodInquiry.php', 2, 'Shows sales by caetgory for a user selectable period range');
+INSERT INTO scripts (script, pagesecurity, description) VALUES ('SalesByTypePeriodInquiry.php', 2, 'Shows sales value by sales type by user selectable period range');
+ALTER TABLE `scripts` CHANGE `pagesecurity` `pagesecurity` INT( 11 ) NOT NULL DEFAULT '1';
+ALTER TABLE `pctabs` ADD `assigner` VARCHAR( 20 ) NOT NULL COMMENT 'Cash assigner for the tab' AFTER `tablimit`;
+UPDATE pctabs SET assigner = authorizer;
+UPDATE config SET confvalue='4.04.1' WHERE confname='VersionNumber';
\ 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: <dai...@us...> - 2011-05-29 09:57:17
|
Revision: 4582
http://web-erp.svn.sourceforge.net/web-erp/?rev=4582&view=rev
Author: daintree
Date: 2011-05-29 09:57:07 +0000 (Sun, 29 May 2011)
Log Message:
-----------
Pre v 4.04.1
Modified Paths:
--------------
trunk/doc/Change.log
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
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-05-29 09:38:46 UTC (rev 4581)
+++ trunk/doc/Change.log 2011-05-29 09:57:07 UTC (rev 4582)
@@ -1,14 +1,16 @@
webERP Change Log
+29/5/11 Version 4.04.1 Release
+
29/5/11 PricesByCost.php made it so the existing prices had end dates set as yesterday and new prices created from today
-29/5/11 TopItems.php fixed sequence and birthday to script
+29/5/11 TopItems.php fixed sequence and birthday to script and PDFTopItems.php script
28/5/11 Could not set controlled item batches/serial numbers on ConfirmDispatch_Invoice.php
-28/5/11 Ricard PO_SelectOSPurchOrder.php was showing select location with gaps between locations - no slash before <option> fixed
-28/5/11 Ricard added new field assigner to petty cash module and changes to PcTabs.php and PcAssignCashToTab.php
-28/5/11 Ricard PcAssignCashToTab.php quoted the $Days integer parameter to the INTERVAL function incorrectly now fixed
-28/5/11 Ricard reported bug on deletion of PcExpensesTypeTab - incorrectly formed URL and parameters added ?
-28/5/11 Ricard reported mismatch of fields scripts pagesecurity changed to int(11) from tinyint as other tables all refer to as int(11)
-28/5/11 R2-G reported alignment issue with link and button on SuppTransGLAnalysis now fixed
+28/5/11 Ricard: PO_SelectOSPurchOrder.php was showing select location with gaps between locations - no slash before <option> fixed
+28/5/11 Ricard: added new field assigner to petty cash module and changes to PcTabs.php and PcAssignCashToTab.php
+28/5/11 Ricard: PcAssignCashToTab.php quoted the $Days integer parameter to the INTERVAL function incorrectly now fixed
+28/5/11 Ricard: reported bug on deletion of PcExpensesTypeTab - incorrectly formed URL and parameters added ?
+28/5/11 Ricard: reported mismatch of fields scripts pagesecurity changed to int(11) from tinyint as other tables all refer to as int(11)
+28/5/11 R2-G: reported alignment issue with link and button on SuppTransGLAnalysis now fixed
28/5/11 Ricard: MRPShortages now has an option to report excesses too
28/5/11 Ricard: Fix sql to take quotes out of literals in upgrade script. PDFPrintLabels fix sql to get current price.
28/5/11 Reported by Daniel Brewer Fix SelectSalesOrder.php creation of PO with excluding redundant fields in purchorderdetails that were taken out.
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-05-29 09:38:46 UTC (rev 4581)
+++ trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po 2011-05-29 09:57:07 UTC (rev 4582)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: webERP 3.08\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-26 22:38+1200\n"
+"POT-Creation-Date: 2011-05-29 21:48+1200\n"
"PO-Revision-Date: 2011-02-07 15:33+0000\n"
"Last-Translator: Tim Schofield <Unknown>\n"
"Language-Team: Czech <cs...@li...>\n"
@@ -221,7 +221,7 @@
#: SelectCompletedOrder.php:11 SelectContract.php:81 SelectCreditItems.php:202
#: SelectCreditItems.php:270 SelectCustomer.php:323 SelectGLAccount.php:19
#: SelectGLAccount.php:79 SelectOrderItems.php:617 SelectOrderItems.php:1443
-#: SelectOrderItems.php:1563 SelectProduct.php:486 SelectSalesOrder.php:458
+#: SelectOrderItems.php:1563 SelectProduct.php:485 SelectSalesOrder.php:454
#: SelectSupplier.php:9 SelectSupplier.php:192 SelectWorkOrder.php:9
#: SelectWorkOrder.php:145 ShipmentCosting.php:11 Shipments.php:17
#: Shippers.php:123 Shippers.php:159 Shipt_Select.php:8
@@ -282,13 +282,13 @@
#: SalesAnalRepts.php:459 SelectProduct.php:374 ShipmentCosting.php:627
#: Stocks.php:878 Stocks.php:880 Stocks.php:898 Stocks.php:900
#: SuppContractChgs.php:83 SuppLoginSetup.php:508 SuppLoginSetup.php:510
-#: SystemParameters.php:376 SystemParameters.php:399 SystemParameters.php:415
-#: SystemParameters.php:468 SystemParameters.php:476 SystemParameters.php:516
-#: SystemParameters.php:589 SystemParameters.php:598 SystemParameters.php:606
-#: SystemParameters.php:624 SystemParameters.php:631 SystemParameters.php:758
-#: SystemParameters.php:889 SystemParameters.php:891 SystemParameters.php:901
-#: SystemParameters.php:903 SystemParameters.php:957 SystemParameters.php:969
-#: SystemParameters.php:971 TaxGroups.php:293 TaxGroups.php:296
+#: SystemParameters.php:380 SystemParameters.php:403 SystemParameters.php:419
+#: SystemParameters.php:472 SystemParameters.php:480 SystemParameters.php:520
+#: SystemParameters.php:593 SystemParameters.php:602 SystemParameters.php:610
+#: SystemParameters.php:628 SystemParameters.php:635 SystemParameters.php:762
+#: SystemParameters.php:893 SystemParameters.php:895 SystemParameters.php:905
+#: SystemParameters.php:907 SystemParameters.php:961 SystemParameters.php:973
+#: SystemParameters.php:975 TaxGroups.php:293 TaxGroups.php:296
#: TaxGroups.php:345 WWW_Users.php:605 WWW_Users.php:607
msgid "Yes"
msgstr "Ano"
@@ -318,13 +318,13 @@
#: SalesAnalRepts.php:458 SelectProduct.php:376 ShipmentCosting.php:628
#: Stocks.php:873 Stocks.php:875 Stocks.php:893 Stocks.php:895
#: SuppContractChgs.php:85 SuppLoginSetup.php:507 SuppLoginSetup.php:511
-#: SystemParameters.php:377 SystemParameters.php:400 SystemParameters.php:416
-#: SystemParameters.php:469 SystemParameters.php:477 SystemParameters.php:517
-#: SystemParameters.php:590 SystemParameters.php:599 SystemParameters.php:607
-#: SystemParameters.php:625 SystemParameters.php:632 SystemParameters.php:759
-#: SystemParameters.php:888 SystemParameters.php:892 SystemParameters.php:900
-#: SystemParameters.php:904 SystemParameters.php:958 SystemParameters.php:968
-#: SystemParameters.php:972 TaxGroups.php:294 TaxGroups.php:297
+#: SystemParameters.php:381 SystemParameters.php:404 SystemParameters.php:420
+#: SystemParameters.php:473 SystemParameters.php:481 SystemParameters.php:521
+#: SystemParameters.php:594 SystemParameters.php:603 SystemParameters.php:611
+#: SystemParameters.php:629 SystemParameters.php:636 SystemParameters.php:763
+#: SystemParameters.php:892 SystemParameters.php:896 SystemParameters.php:904
+#: SystemParameters.php:908 SystemParameters.php:962 SystemParameters.php:972
+#: SystemParameters.php:976 TaxGroups.php:294 TaxGroups.php:297
#: TaxGroups.php:347 WWW_Users.php:604 WWW_Users.php:608
#: includes/PDFLowGPPageHeader.inc:44 includes/PDFTaxPageHeader.inc:35
msgid "No"
@@ -340,7 +340,7 @@
#: FreightCosts.php:240 GeocodeSetup.php:170 GLAccounts.php:308 GLTags.php:82
#: Labels.php:414 Locations.php:377 MRPDemands.php:303 MRPDemandTypes.php:120
#: PaymentMethods.php:202 PaymentTerms.php:203 PcAssignCashToTab.php:255
-#: PcClaimExpensesFromTab.php:252 PcExpenses.php:208 PcTabs.php:221
+#: PcClaimExpensesFromTab.php:252 PcExpenses.php:208 PcTabs.php:234
#: PcTypeTabs.php:172 PO_AuthorisationLevels.php:149 Prices_Customer.php:280
#: Prices.php:246 PurchData.php:210 SalesCategories.php:256
#: SalesGLPostings.php:132 SalesGLPostings.php:245 SalesPeople.php:210
@@ -370,8 +370,8 @@
#: Labels.php:414 Locations.php:378 MRPDemands.php:304 MRPDemandTypes.php:121
#: PaymentMethods.php:203 Payments.php:1006 PaymentTerms.php:204
#: PcAssignCashToTab.php:259 PcClaimExpensesFromTab.php:253 PcExpenses.php:209
-#: PcExpensesTypeTab.php:182 PcTabs.php:222 PcTypeTabs.php:173
-#: PO_AuthorisationLevels.php:151 PO_Items.php:682 Prices_Customer.php:281
+#: PcExpensesTypeTab.php:182 PcTabs.php:235 PcTypeTabs.php:173
+#: PO_AuthorisationLevels.php:151 PO_Items.php:687 Prices_Customer.php:281
#: Prices.php:247 PurchData.php:211 SalesAnalReptCols.php:294
#: SalesAnalRepts.php:302 SalesCategories.php:257 SalesGLPostings.php:133
#: SalesGLPostings.php:246 SalesPeople.php:211 SalesTypes.php:205
@@ -544,7 +544,7 @@
#: AddCustomerTypeNotes.php:49 Areas.php:73 CustomerTypes.php:69
#: DeliveryDetails.php:771 Factors.php:105 FixedAssetItems.php:236
#: PcAssignCashToTab.php:88 PcClaimExpensesFromTab.php:79 PcExpenses.php:93
-#: PcTabs.php:95 PcTypeTabs.php:60 PO_Items.php:356 SalesAnalReptCols.php:129
+#: PcTabs.php:102 PcTypeTabs.php:60 PO_Items.php:356 SalesAnalReptCols.php:129
#: SalesPeople.php:94 SalesTypes.php:61 Stocks.php:355 Suppliers.php:510
#: SupplierTypes.php:67
msgid "has been updated"
@@ -582,7 +582,7 @@
#: Customers.php:924 Customers.php:992 PcAssignCashToTab.php:220
#: PcAssignCashToTab.php:346 PcAuthorizeExpenses.php:91
#: PcClaimExpensesFromTab.php:214 PcClaimExpensesFromTab.php:372
-#: PcReportTab.php:327 SelectCustomer.php:612 SystemParameters.php:315
+#: PcReportTab.php:327 SelectCustomer.php:612 SystemParameters.php:319
#: WOSerialNos.php:280 WOSerialNos.php:282
msgid "Notes"
msgstr "Bere na vědomí"
@@ -664,9 +664,9 @@
msgstr "Datum"
#: AddCustomerNotes.php:107 AddCustomerTypeNotes.php:105 PcReportTab.php:173
-#: Stocks.php:882 UpgradeDatabase.php:165 UpgradeDatabase.php:168
-#: UpgradeDatabase.php:171 UpgradeDatabase.php:174 UpgradeDatabase.php:177
-#: UpgradeDatabase.php:180 UpgradeDatabase.php:183 UpgradeDatabase.php:186
+#: Stocks.php:882 UpgradeDatabase.php:167 UpgradeDatabase.php:170
+#: UpgradeDatabase.php:173 UpgradeDatabase.php:176 UpgradeDatabase.php:179
+#: UpgradeDatabase.php:182 UpgradeDatabase.php:185 UpgradeDatabase.php:188
#: 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
@@ -761,8 +761,8 @@
#: InventoryQuantities.php:81 InventoryValuation.php:78
#: MailInventoryValuation.php:115 MRPPlannedPurchaseOrders.php:114
#: MRPPlannedWorkOrders.php:105 MRPReport.php:147 MRPReport.php:508
-#: MRPReschedules.php:45 MRPReschedules.php:57 MRPShortages.php:144
-#: MRPShortages.php:156 OutstandingGRNs.php:48 OutstandingGRNs.php:60
+#: MRPReschedules.php:45 MRPReschedules.php:57 MRPShortages.php:155
+#: MRPShortages.php:167 OutstandingGRNs.php:48 OutstandingGRNs.php:60
#: PDFCustomerList.php:18 PDFCustomerList.php:230 PDFCustomerList.php:242
#: PDFLowGP.php:20 PDFStockCheckComparison.php:35
#: PDFStockCheckComparison.php:61 PDFStockCheckComparison.php:262
@@ -798,13 +798,13 @@
#: MRPPlannedPurchaseOrders.php:128 MRPPlannedWorkOrders.php:108
#: MRPPlannedWorkOrders.php:119 MRPPlannedWorkOrders.php:316 MRPReport.php:39
#: MRPReport.php:50 MRPReport.php:150 MRPReschedules.php:48
-#: MRPReschedules.php:60 MRPShortages.php:147 MRPShortages.php:159
+#: MRPReschedules.php:60 MRPShortages.php:158 MRPShortages.php:170
#: OutstandingGRNs.php:51 OutstandingGRNs.php:63 PDFCustomerList.php:233
#: PDFCustomerList.php:245 PDFGrn.php:123 PDFLowGP.php:60 PDFLowGP.php:72
#: PDFPriceList.php:124 PDFQuotation.php:234 PDFQuotationPortrait.php:235
#: PDFRemittanceAdvice.php:84 PDFStockCheckComparison.php:39
#: PDFStockCheckComparison.php:65 PDFStockCheckComparison.php:266
-#: PDFTopItems.php:118 PO_PDFPurchOrder.php:31 PO_PDFPurchOrder.php:149
+#: PO_PDFPurchOrder.php:31 PO_PDFPurchOrder.php:149
#: PrintCustOrder_generic.php:180 PrintCustOrder.php:198
#: PrintSalesOrder_generic.php:183 ReorderLevel.php:60 ReorderLevel.php:149
#: SalesAnalysis_UserDefined.php:28 SelectCreditItems.php:23 StockCheck.php:47
@@ -842,15 +842,15 @@
msgstr "se nepodařilo získat, protože"
#: AgedDebtors.php:374 AgedSuppliers.php:192 Areas.php:95
-#: ConfirmDispatch_Invoice.php:152 ConfirmDispatch_Invoice.php:965
-#: ConfirmDispatch_Invoice.php:979 Contracts.php:581 CounterSales.php:1323
+#: ConfirmDispatch_Invoice.php:150 ConfirmDispatch_Invoice.php:962
+#: ConfirmDispatch_Invoice.php:976 Contracts.php:581 CounterSales.php:1323
#: CounterSales.php:1337 Credit_Invoice.php:705 Credit_Invoice.php:727
#: CustomerReceipt.php:523 CustomerReceipt.php:655 CustomerReceipt.php:683
#: CustomerTransInquiry.php:79 DeliveryDetails.php:393 GLProfit_Loss.php:579
#: GLTagProfit_Loss.php:488 Payments.php:312 PDFRemittanceAdvice.php:86
#: PurchData.php:95 PurchData.php:113 PurchData.php:245 ReverseGRN.php:191
#: ReverseGRN.php:205 ReverseGRN.php:366 SelectCreditItems.php:1372
-#: SelectSalesOrder.php:113 SelectSalesOrder.php:281 StockCheck.php:225
+#: SelectSalesOrder.php:113 SelectSalesOrder.php:277 StockCheck.php:225
#: StockCostUpdate.php:76 StockCostUpdate.php:86 StockLocStatus.php:147
#: StockMovements.php:85 StockQuantityByDate.php:86 StockReorderLevel.php:39
#: StockStatus.php:271 StockTransfers.php:179 StockUsageGraph.php:53
@@ -926,7 +926,7 @@
#: DebtorsAtPeriodEnd.php:156 InventoryPlanning.php:442
#: InventoryPlanningPrefSupplier.php:518 InventoryQuantities.php:187
#: InventoryValuation.php:251 MRPPlannedPurchaseOrders.php:282
-#: MRPPlannedWorkOrders.php:343 MRPReschedules.php:140 MRPShortages.php:258
+#: MRPPlannedWorkOrders.php:343 MRPReschedules.php:140 MRPShortages.php:290
#: OutstandingGRNs.php:162 PDFCustomerList.php:410 PDFLowGP.php:145
#: PDFPriceList.php:301 PDFRemittanceAdvice.php:152
#: PDFStockCheckComparison.php:379 PrintCustTrans.php:506
@@ -1056,7 +1056,7 @@
#: Areas.php:132 CustomerTypes.php:164 Factors.php:140
#: FixedAssetCategories.php:135 GLAccounts.php:193 Locations.php:325
#: MRPDemands.php:247 PcAssignCashToTab.php:135 PcClaimExpensesFromTab.php:126
-#: PcExpenses.php:160 PcExpensesTypeTab.php:101 PcTabs.php:156
+#: PcExpenses.php:160 PcExpensesTypeTab.php:101 PcTabs.php:166
#: PcTypeTabs.php:135 SalesAnalReptCols.php:215 SalesCategories.php:137
#: SalesTypes.php:161 StockCategories.php:196 Suppliers.php:635
#: SupplierTypes.php:151 Z_DeleteInvoice.php:146
@@ -1111,18 +1111,18 @@
#: InventoryQuantities.php:175 InventoryQuantities.php:177 MRP.php:562
#: MRPReport.php:523 MRPReport.php:525 MRPReschedules.php:135
#: PDFPeriodStockTransListing.php:58 PDFPriceList.php:194
-#: PDFPrintLabel.php:239 PO_Items.php:878 POReport.php:1548
+#: PDFPrintLabel.php:239 PO_Items.php:883 POReport.php:1548
#: ReorderLevel.php:175 ReorderLevel.php:177 ReorderLevel.php:205
#: ReorderLevel.php:207 SalesGraph.php:91 SalesGraph.php:93 SalesGraph.php:111
#: SalesGraph.php:113 SalesGraph.php:134 SalesGraph.php:136 SalesGraph.php:168
#: SalesInquiry.php:1054 SalesInquiry.php:1093 SelectCreditItems.php:923
-#: SelectOrderItems.php:1569 SelectOrderItems.php:1572 SelectProduct.php:494
-#: SelectProduct.php:496 StockDispatch.php:282 StockDispatch.php:284
+#: SelectOrderItems.php:1569 SelectOrderItems.php:1572 SelectProduct.php:493
+#: SelectProduct.php:495 StockDispatch.php:282 StockDispatch.php:284
#: StockLocStatus.php:67 StockLocStatus.php:69 StockLocStatus.php:87
#: StockLocStatus.php:91 StockLocStatus.php:95 StockQuantityByDate.php:21
-#: SupplierTenders.php:338 SupplierTenders.php:340 SystemParameters.php:920
-#: SystemParameters.php:926 SystemParameters.php:932 SystemParameters.php:938
-#: SystemParameters.php:944 TopItems.php:23 TopItems.php:36
+#: SupplierTenders.php:338 SupplierTenders.php:340 SystemParameters.php:924
+#: SystemParameters.php:930 SystemParameters.php:936 SystemParameters.php:942
+#: SystemParameters.php:948 TopItems.php:23 TopItems.php:36
#: WorkOrderEntry.php:562 WorkOrderEntry.php:565 WorkOrderIssue.php:626
#: WorkOrderIssue.php:629 includes/PDFAssetRegisterHeader.inc:15
#: includes/PDFAssetRegisterHeader.inc:24
@@ -1134,7 +1134,7 @@
msgstr "Tabulka "
#: AuditTrail.php:67 MRPReport.php:768 PO_SelectPurchOrder.php:391
-#: SelectContract.php:196 SelectProduct.php:740
+#: SelectContract.php:196 SelectProduct.php:739
msgid "View"
msgstr "Zobrazit"
@@ -1151,14 +1151,15 @@
#: CustomerTransInquiry.php:21 CustomerTransInquiry.php:85
#: CustWhereAlloc.php:17 CustWhereAlloc.php:88 DailyBankTransactions.php:104
#: GLAccountInquiry.php:152 GLAccountReportphp:155 GLAccountReport.php:367
-#: GLJournal.php:240 MRPReschedules.php:178 SelectCustomer.php:462
-#: ShipmentCosting.php:506 ShipmentCosting.php:577 StockCategories.php:215
-#: StockLocMovements.php:81 StockMovements.php:90 SupplierAllocations.php:452
-#: SupplierInquiry.php:199 SupplierTransInquiry.php:19
-#: SupplierTransInquiry.php:86 Z_CheckAllocationsFrom.php:26
-#: Z_CheckAllocationsFrom.php:49 Z_CheckAllocs.php:57
-#: Z_CheckGLTransBalance.php:11 includes/InputSerialItemsFile.php:86
-#: includes/InputSerialItemsFile.php:126 includes/PDFTaxPageHeader.inc:34
+#: GLJournal.php:240 MRPReschedules.php:178 SalesByTypePeriodInquiry.php:327
+#: SelectCustomer.php:462 ShipmentCosting.php:506 ShipmentCosting.php:577
+#: StockCategories.php:215 StockLocMovements.php:81 StockMovements.php:90
+#: SupplierAllocations.php:452 SupplierInquiry.php:199
+#: SupplierTransInquiry.php:19 SupplierTransInquiry.php:86
+#: Z_CheckAllocationsFrom.php:26 Z_CheckAllocationsFrom.php:49
+#: Z_CheckAllocs.php:57 Z_CheckGLTransBalance.php:11
+#: includes/InputSerialItemsFile.php:86 includes/InputSerialItemsFile.php:126
+#: includes/PDFTaxPageHeader.inc:34
msgid "Type"
msgstr "Typ"
@@ -1171,7 +1172,7 @@
msgid "Field Name"
msgstr "Název pole"
-#: AuditTrail.php:149 SystemParameters.php:314
+#: AuditTrail.php:149 SystemParameters.php:318
#: includes/PDFOstdgGRNsPageHeader.inc:43
msgid "Value"
msgstr "Hodnota"
@@ -1284,12 +1285,12 @@
msgstr "Adresa banky"
#: BankAccounts.php:196 CustomerReceipt.php:753 CustomerTransInquiry.php:95
-#: OffersReceived.php:99 PcReportTab.php:267 PcTabs.php:195 PcTabs.php:334
+#: OffersReceived.php:99 PcReportTab.php:267 PcTabs.php:206 PcTabs.php:349
#: PDFPrintLabel.php:93 PO_AuthorisationLevels.php:125
#: PO_AuthorisationLevels.php:205 PO_AuthorisationLevels.php:210
#: PO_AuthoriseMyOrders.php:114 PO_Header.php:545
-#: PO_SelectOSPurchOrder.php:436 PO_SelectPurchOrder.php:393
-#: PricesByCost.php:237 Prices.php:217 Prices.php:287 PurchData.php:175
+#: PO_SelectOSPurchOrder.php:437 PO_SelectPurchOrder.php:393
+#: PricesByCost.php:254 Prices.php:217 Prices.php:287 PurchData.php:175
#: PurchData.php:341 PurchData.php:465 SelectSupplier.php:247
#: SupplierCredit.php:265 SupplierInvoice.php:231 SupplierTransInquiry.php:95
#: SuppPriceList.php:265 includes/PDFBankingSummaryPageHeader.inc:42
@@ -1505,7 +1506,7 @@
msgid "Ref"
msgstr "Ref"
-#: BankMatching.php:229 ConfirmDispatch_Invoice.php:276 Credit_Invoice.php:281
+#: BankMatching.php:229 ConfirmDispatch_Invoice.php:274 Credit_Invoice.php:281
#: CustomerAllocations.php:358 CustomerReceipt.php:842
#: CustomerTransInquiry.php:94 CustWhereAlloc.php:92 PaymentAllocations.php:78
#: Payments.php:969 Payments.php:972 Payments.php:984
@@ -1527,7 +1528,7 @@
#: BankMatching.php:230 BankReconciliation.php:199 BankReconciliation.php:271
#: PDFOrdersInvoiced.php:345 PDFOrderStatus.php:319
-#: PO_SelectOSPurchOrder.php:212 PO_SelectPurchOrder.php:180
+#: PO_SelectOSPurchOrder.php:213 PO_SelectPurchOrder.php:180
#: Shipt_Select.php:182 SuppCreditGRNs.php:227
#: includes/PDFStatementPageHeader.inc:173
#: includes/PDFStatementPageHeader.inc:180
@@ -1798,19 +1799,20 @@
#: PrintCustTransPortrait.php:984 RecurringSalesOrders.php:321
#: ReorderLevel.php:256 ReverseGRN.php:379 ReverseGRN.php:380
#: SalesAnalReptCols.php:18 SalesAnalReptCols.php:20 SalesGraph.php:177
-#: SalesGraph.php:258 SalesInquiry.php:966 SelectCreditItems.php:651
-#: SelectCreditItems.php:1004 SelectOrderItems.php:1305
-#: SelectOrderItems.php:1454 SelectOrderItems.php:1634
-#: SelectOrderItems.php:1758 ShipmentCosting.php:144 ShipmentCosting.php:145
-#: Shipments.php:385 Shipments.php:387 Shipments.php:388 Shipments.php:463
-#: Shipments.php:465 SpecialOrder.php:542 StockCounts.php:98
-#: StockLocMovements.php:85 StockLocTransfer.php:179 StockMovements.php:95
-#: StockStatus.php:312 StockUsageGraph.php:12 SuppCreditGRNs.php:227
-#: SuppCreditGRNs.php:228 SupplierCredit.php:313 SupplierTenders.php:265
-#: SupplierTenders.php:493 WOSerialNos.php:249 WOSerialNos.php:282
-#: includes/InputSerialItems.php:104 includes/InputSerialItems.php:110
-#: includes/OutputSerialItems.php:39 includes/OutputSerialItems.php:44
-#: includes/OutputSerialItems.php:50 includes/PDFBOMListingPageHeader.inc:44
+#: SalesGraph.php:258 SalesInquiry.php:966 SalesTopItemsInquiry.php:222
+#: SelectCreditItems.php:651 SelectCreditItems.php:1004
+#: SelectOrderItems.php:1305 SelectOrderItems.php:1454
+#: SelectOrderItems.php:1634 SelectOrderItems.php:1758 ShipmentCosting.php:144
+#: ShipmentCosting.php:145 Shipments.php:385 Shipments.php:387
+#: Shipments.php:388 Shipments.php:463 Shipments.php:465 SpecialOrder.php:542
+#: StockCounts.php:98 StockLocMovements.php:85 StockLocTransfer.php:179
+#: StockMovements.php:95 StockStatus.php:312 StockUsageGraph.php:12
+#: SuppCreditGRNs.php:227 SuppCreditGRNs.php:228 SupplierCredit.php:313
+#: SupplierTenders.php:265 SupplierTenders.php:493 WOSerialNos.php:249
+#: WOSerialNos.php:282 includes/InputSerialItems.php:104
+#: includes/InputSerialItems.php:110 includes/OutputSerialItems.php:39
+#: includes/OutputSerialItems.php:44 includes/OutputSerialItems.php:50
+#: includes/PDFBOMListingPageHeader.inc:44
#: includes/PDFDeliveryDifferencesPageHeader.inc:43
#: includes/PDFDIFOTPageHeader.inc:42
#: includes/PDFInventoryValnPageHeader.inc:33
@@ -1843,19 +1845,19 @@
#: BOMExtendedQty.php:282 BOMIndented.php:263 BOMIndentedReverse.php:251
#: MRPPlannedPurchaseOrders.php:276 MRPPlannedWorkOrders.php:337
-#: MRPReschedules.php:130 MRPShortages.php:254
+#: MRPReschedules.php:130 MRPShortages.php:286
msgid "Print Option"
msgstr "Možnost tisku"
#: BOMExtendedQty.php:283 BOMIndented.php:265 BOMIndentedReverse.php:252
#: MRPPlannedPurchaseOrders.php:277 MRPPlannedWorkOrders.php:338
-#: MRPReschedules.php:131 MRPShortages.php:255
+#: MRPReschedules.php:131 MRPShortages.php:287
msgid "Print With Alternating Highlighted Lines"
msgstr "Tisk se střídavými Zvýrazněné Lines"
#: BOMExtendedQty.php:284 BOMIndented.php:266 BOMIndentedReverse.php:253
#: MRPPlannedPurchaseOrders.php:278 MRPPlannedWorkOrders.php:339
-#: MRPReschedules.php:132 MRPShortages.php:256
+#: MRPReschedules.php:132 MRPShortages.php:288
msgid "Plain Print"
msgstr "Prostý Tisk"
@@ -1867,9 +1869,9 @@
#: GLAccountReport.php:353 InventoryPlanningPrefSupplier.php:63
#: InventoryQuantities.php:209 MRPPlannedPurchaseOrders.php:305
#: MRPPlannedWorkOrders.php:366 MRPReport.php:805 MRPReschedules.php:164
-#: MRPShortages.php:282 PDFOrderStatus.php:302 PDFPriceList.php:331
+#: MRPShortages.php:318 PDFOrderStatus.php:302 PDFPriceList.php:331
#: PDFReceipt.php:32 PO_Header.php:798 PO_PDFPurchOrder.php:61
-#: PO_SelectOSPurchOrder.php:468 ReorderLevel.php:239 StockDispatch.php:336
+#: PO_SelectOSPurchOrder.php:469 ReorderLevel.php:239 StockDispatch.php:336
#: SuppPriceList.php:254 Tax.php:243 includes/PDFAgedDebtorsPageHeader.inc:34
#: includes/PDFAgedSuppliersPageHeader.inc:21
#: includes/PDFBalanceSheetPageHeader.inc:25
@@ -1903,7 +1905,7 @@
#: FixedAssetRegister.php:334 GLAccountReport.php:353
#: InventoryPlanningPrefSupplier.php:63 InventoryQuantities.php:210
#: MRPPlannedPurchaseOrders.php:306 MRPPlannedWorkOrders.php:367
-#: MRPReport.php:806 MRPReschedules.php:165 MRPShortages.php:283
+#: MRPReport.php:806 MRPReschedules.php:165 MRPShortages.php:319
#: PDFPriceList.php:331 PDFReceipt.php:32 PDFRemittanceAdvice.php:218
#: PrintCustTrans.php:682 PrintCustTrans.php:885 PrintCustTrans.php:932
#: PrintCustTransPortrait.php:732 PrintCustTransPortrait.php:936
@@ -1965,11 +1967,11 @@
msgstr "Stavět"
#: BOMExtendedQty.php:321 BOMInquiry.php:94 BOMs.php:814 CounterSales.php:1990
-#: CounterSales.php:2170 PO_SelectOSPurchOrder.php:211
+#: CounterSales.php:2170 PO_SelectOSPurchOrder.php:212
#: PO_SelectPurchOrder.php:179 ReorderLevelLocation.php:58
#: ReorderLevelLocation.php:59 SelectCompletedOrder.php:537
#: SelectOrderItems.php:1450 SelectOrderItems.php:1630
-#: SelectSalesOrder.php:499 SelectWorkOrder.php:184 Shipt_Select.php:181
+#: SelectSalesOrder.php:495 SelectWorkOrder.php:184 Shipt_Select.php:181
#: TopItems.php:167 includes/PDFTopItemsHeader.inc:54
msgid "On Hand"
msgstr "Na ruce"
@@ -1985,8 +1987,8 @@
#: BOMExtendedQty.php:325 BOMIndented.php:303 BOMIndentedReverse.php:288
#: InventoryQuantities.php:220 MRPDemands.php:288 MRPDemands.php:361
#: MRPDemands.php:368 MRPPlannedPurchaseOrders.php:323
-#: MRPPlannedWorkOrders.php:384 MRPReschedules.php:175 MRPShortages.php:252
-#: MRPShortages.php:297 POReport.php:491 POReport.php:500 POReport.php:519
+#: MRPPlannedWorkOrders.php:384 MRPReschedules.php:175 MRPShortages.php:278
+#: MRPShortages.php:333 POReport.php:491 POReport.php:500 POReport.php:519
#: POReport.php:539 POReport.php:624 POReport.php:713 POReport.php:1246
#: POReport.php:1255 POReport.php:1269 POReport.php:1284 POReport.php:1335
#: POReport.php:1398 POReport.php:1501 POReport.php:1566 POReport.php:1575
@@ -1998,7 +2000,7 @@
msgstr "Číslo dílu"
#: BOMExtendedQty.php:326 BOMIndented.php:304 BOMIndentedReverse.php:289
-#: MRPShortages.php:299
+#: MRPShortages.php:335
msgid "M/B"
msgstr "M / B"
@@ -2008,7 +2010,7 @@
msgid "Part Description"
msgstr "Popis části"
-#: BOMExtendedQty.php:332 MRPShortages.php:303
+#: BOMExtendedQty.php:332 MRPShortages.php:340
msgid "Shortage"
msgstr "Nedostatek"
@@ -2049,18 +2051,18 @@
#: InventoryQuantities.php:221 Labels.php:413 MRPDemands.php:91
#: MRPDemands.php:289 MRPDemandTypes.php:113 MRPPlannedWorkOrders.php:256
#: MRPReport.php:535 MRPReport.php:739 MRPReschedules.php:176
-#: MRPShortages.php:298 PaymentTerms.php:180 PcExpenses.php:181
+#: MRPShortages.php:334 PaymentTerms.php:180 PcExpenses.php:181
#: PcExpenses.php:273 PcExpensesTypeTab.php:166 PcReportTab.php:171
#: PcTypeTabs.php:156 PDFOrdersInvoiced.php:342 PDFOrderStatus.php:316
-#: PDFPrintLabel.php:238 PO_Items.php:635 PO_Items.php:924
-#: PO_SelectOSPurchOrder.php:210 PO_SelectPurchOrder.php:178
-#: PricesByCost.php:118 ReorderLevelLocation.php:55 ReorderLevel.php:254
+#: PDFPrintLabel.php:238 PO_Items.php:640 PO_Items.php:929
+#: PO_SelectOSPurchOrder.php:211 PO_SelectPurchOrder.php:178
+#: PricesByCost.php:135 ReorderLevelLocation.php:55 ReorderLevel.php:254
#: ReverseGRN.php:377 SalesCategories.php:423 SecurityTokens.php:86
#: SecurityTokens.php:92 SecurityTokens.php:102 SelectAsset.php:243
#: SelectCompletedOrder.php:536 SelectContract.php:156
#: SelectCreditItems.php:957 SelectOrderItems.php:1448
-#: SelectOrderItems.php:1628 SelectProduct.php:506 SelectProduct.php:711
-#: SelectSalesOrder.php:498 SelectWorkOrder.php:183 Shipt_Select.php:180
+#: SelectOrderItems.php:1628 SelectProduct.php:505 SelectProduct.php:710
+#: SelectSalesOrder.php:494 SelectWorkOrder.php:183 Shipt_Select.php:180
#: StockCategories.php:214 StockDispatch.php:356 StockDispatch.php:363
#: StockLocStatus.php:154 StockQuantityByDate.php:96 SuppCreditGRNs.php:74
#: SuppCreditGRNs.php:153 SuppFixedAssetChgs.php:73 SuppInvGRNs.php:113
@@ -2143,13 +2145,13 @@
msgstr "sady nebo sestavy musí být k dispozici pro výstavbu kusovníku"
#: BOMInquiry.php:22 BOMs.php:799 MRPDemands.php:328
-#: PO_SelectOSPurchOrder.php:197 PO_SelectPurchOrder.php:168
+#: PO_SelectOSPurchOrder.php:198 PO_SelectPurchOrder.php:168
#: Shipt_Select.php:163 WorkOrderEntry.php:579 WorkOrderIssue.php:643
msgid "Enter text extracts in the"
msgstr "Zadejte text extrakty v"
#: BOMInquiry.php:23 BOMs.php:799 MRPDemands.php:328
-#: PO_SelectOSPurchOrder.php:197 PO_SelectPurchOrder.php:168
+#: PO_SelectOSPurchOrder.php:198 PO_SelectPurchOrder.php:168
#: Shipt_Select.php:163 WorkOrderEntry.php:579 WorkOrderIssue.php:643
msgid "description"
msgstr "popis"
@@ -2160,13 +2162,13 @@
#: DiscountCategories.php:101 DiscountCategories.php:103
#: DiscountCategories.php:107 DiscountCategories.php:109
#: FixedAssetTransfer.php:61 MRPDemands.php:330 MRPDemands.php:333
-#: MRPReport.php:542 PO_Header.php:527 PO_Items.php:903 PO_Items.php:907
-#: PO_SelectOSPurchOrder.php:199 PO_SelectPurchOrder.php:170 PurchData.php:265
+#: MRPReport.php:542 PO_Header.php:527 PO_Items.php:908 PO_Items.php:912
+#: PO_SelectOSPurchOrder.php:200 PO_SelectPurchOrder.php:170 PurchData.php:265
#: SelectAsset.php:94 SelectCompletedOrder.php:519 SelectCreditItems.php:208
#: SelectCreditItems.php:942 SelectCustomer.php:331 SelectCustomer.php:337
#: SelectCustomer.php:344 SelectCustomer.php:351 SelectCustomer.php:395
#: SelectGLAccount.php:92 SelectOrderItems.php:627 SelectOrderItems.php:630
-#: SelectOrderItems.php:1597 SelectProduct.php:513 SelectSalesOrder.php:486
+#: SelectOrderItems.php:1597 SelectProduct.php:512 SelectSalesOrder.php:482
#: SelectSupplier.php:200 SelectWorkOrder.php:171 Shipt_Select.php:166
#: SuppFixedAssetChgs.php:116 SupplierTenders.php:359 WorkOrderEntry.php:582
#: WorkOrderIssue.php:646
@@ -2174,14 +2176,14 @@
msgstr "nebo"
#: BOMInquiry.php:24 BOMs.php:802 MRPDemands.php:331
-#: PO_SelectOSPurchOrder.php:199 PO_SelectPurchOrder.php:170
+#: PO_SelectOSPurchOrder.php:200 PO_SelectPurchOrder.php:170
#: Shipt_Select.php:166 WorkOrderEntry.php:582 WorkOrderIssue.php:646
msgid "Enter extract of the"
msgstr "Zadejte extrakt"
#: BOMInquiry.php:25 BOMs.php:802 MRPDemands.php:331 MRPReport.php:542
-#: PO_SelectOSPurchOrder.php:199 PO_SelectPurchOrder.php:170
-#: SalesCategories.php:422 SelectProduct.php:513 Shipt_Select.php:166
+#: PO_SelectOSPurchOrder.php:200 PO_SelectPurchOrder.php:170
+#: SalesCategories.php:422 SelectProduct.php:512 Shipt_Select.php:166
#: StockAdjustments.php:69 StockAdjustments.php:324 StockCounts.php:97
#: StockCounts.php:132 StockMovements.php:31 StockReorderLevel.php:44
#: StockStatus.php:61 StockTransfers.php:38 StockTransfers.php:445
@@ -2193,19 +2195,19 @@
#: BOMInquiry.php:26 BOMs.php:806 ContractBOM.php:328 Contracts.php:766
#: CounterSales.php:2142 CustomerReceipt.php:1032 FixedAssetTransfer.php:72
-#: MRPDemands.php:335 MRPReport.php:550 PO_Header.php:532 PO_Items.php:911
+#: MRPDemands.php:335 MRPReport.php:550 PO_Header.php:532 PO_Items.php:916
#: SelectAsset.php:102 SelectCreditItems.php:213 SelectCreditItems.php:947
#: SelectCustomer.php:418 SelectGLAccount.php:98 SelectOrderItems.php:635
-#: SelectOrderItems.php:1604 SelectProduct.php:521 SelectSupplier.php:208
+#: SelectOrderItems.php:1604 SelectProduct.php:520 SelectSupplier.php:208
#: SelectSupplier.php:241 SupplierTenders.php:367 WorkOrderEntry.php:586
#: WorkOrderIssue.php:650
msgid "Search Now"
msgstr "Vyhledat"
#: BOMInquiry.php:36 BOMs.php:735 ContractBOM.php:49 MRPDemands.php:56
-#: MRPReport.php:568 PO_Items.php:745 PO_SelectOSPurchOrder.php:61
+#: MRPReport.php:568 PO_Items.php:750 PO_SelectOSPurchOrder.php:61
#: PO_SelectPurchOrder.php:43 SelectCompletedOrder.php:92
-#: SelectCreditItems.php:276 SelectProduct.php:534 SelectSalesOrder.php:348
+#: SelectCreditItems.php:276 SelectProduct.php:533 SelectSalesOrder.php:344
#: SelectWorkOrder.php:33 Shipt_Select.php:60 SupplierTenders.php:379
#: WorkOrderEntry.php:62 WorkOrderIssue.php:378
msgid ""
@@ -2233,13 +2235,13 @@
#: CustomerReceipt.php:1038 GLCodesInquiry.php:26 MRPDemands.php:90
#: MRPPlannedWorkOrders.php:255 MRPReport.php:738 PDFOrdersInvoiced.php:341
#: PDFOrderStatus.php:315 PDFPrintLabel.php:238 PO_Header.php:542
-#: PO_Items.php:923 PO_SelectOSPurchOrder.php:209 PO_SelectPurchOrder.php:177
-#: PricesByCost.php:117 PurchData.php:339 ReorderLevelLocation.php:54
+#: PO_Items.php:928 PO_SelectOSPurchOrder.php:210 PO_SelectPurchOrder.php:177
+#: PricesByCost.php:134 PurchData.php:339 ReorderLevelLocation.php:54
#: ReorderLevelLocation.php:203 SalesPeople.php:184
#: SelectCompletedOrder.php:535 SelectCreditItems.php:220
#: SelectCreditItems.php:956 SelectCustomer.php:458 SelectGLAccount.php:105
-#: SelectOrderItems.php:1447 SelectOrderItems.php:1627 SelectProduct.php:710
-#: SelectSalesOrder.php:497 SelectSupplier.php:245 SelectWorkOrder.php:182
+#: SelectOrderItems.php:1447 SelectOrderItems.php:1627 SelectProduct.php:709
+#: SelectSalesOrder.php:493 SelectSupplier.php:245 SelectWorkOrder.php:182
#: Shipt_Select.php:179 SpecialOrder.php:132 SupplierTenders.php:489
#: SuppPriceList.php:272 TopItems.php:162 WorkOrderEntry.php:597
#: WorkOrderIssue.php:667 includes/PDFTaxPageHeader.inc:38
@@ -2247,14 +2249,14 @@
msgid "Code"
msgstr "Kód"
-#: BOMInquiry.php:95 BOMs.php:815 ConfirmDispatch_Invoice.php:268
+#: BOMInquiry.php:95 BOMs.php:815 ConfirmDispatch_Invoice.php:266
#: ContractBOM.php:342 CounterSales.php:1989 CounterSales.php:2169
#: Credit_Invoice.php:274 GoodsReceived.php:89 GoodsReceived.php:93
-#: MRPReport.php:741 OffersReceived.php:96 PO_Items.php:927
-#: PO_SelectOSPurchOrder.php:213 PO_SelectPurchOrder.php:181
+#: MRPReport.php:741 OffersReceived.php:96 PO_Items.php:932
+#: PO_SelectOSPurchOrder.php:214 PO_SelectPurchOrder.php:181
#: SelectCompletedOrder.php:540 SelectCreditItems.php:958
#: SelectOrderItems.php:1449 SelectOrderItems.php:1629 SelectProduct.php:112
-#: SelectProduct.php:713 SelectSalesOrder.php:500 SelectWorkOrder.php:185
+#: SelectProduct.php:712 SelectSalesOrder.php:496 SelectWorkOrder.php:185
#: Shipments.php:386 Shipments.php:464 Shipt_Select.php:183
#: StockLocTransferReceive.php:435 SupplierTenders.php:491 TopItems.php:165
#: WorkOrderCosting.php:84 WorkOrderEntry.php:599 WorkOrderIssue.php:669
@@ -2291,7 +2293,7 @@
#: BOMInquiry.php:174 ContractBOM.php:243 ContractCosting.php:76
#: ContractCosting.php:82 ContractCosting.php:132 ContractOtherReqts.php:96
#: Contracts.php:934 Contracts.php:957 MRPPlannedWorkOrders.php:260
-#: MRPShortages.php:300 SpecialOrder.php:632 StockAdjustments.php:340
+#: MRPShortages.php:336 SpecialOrder.php:632 StockAdjustments.php:340
msgid "Unit Cost"
msgstr "Jednotková cena"
@@ -2381,10 +2383,10 @@
msgstr "Drill-down"
#: BOMs.php:120 BOMs.php:126 BOMs.php:130 BOMs.php:831 OrderDetails.php:177
-#: PaymentTerms.php:188 PaymentTerms.php:194 PO_SelectOSPurchOrder.php:473
+#: PaymentTerms.php:188 PaymentTerms.php:194 PO_SelectOSPurchOrder.php:474
#: SalesAnalReptCols.php:280 SelectProduct.php:110 SelectProduct.php:154
#: SelectProduct.php:167 SelectProduct.php:251 SelectProduct.php:252
-#: SelectProduct.php:732
+#: SelectProduct.php:731
msgid "N/A"
msgstr "N / A"
@@ -2533,7 +2535,7 @@
msgid "The SQL used to retrieve description of the parent part was"
msgstr "SQL slouží k získání popisu mateřské část byla"
-#: BOMs.php:397 ConfirmDispatch_Invoice.php:1012 CounterSales.php:1372
+#: BOMs.php:397 ConfirmDispatch_Invoice.php:1009 CounterSales.php:1372
#: Credit_Invoice.php:763 Credit_Invoice.php:792 SelectCreditItems.php:1417
#: Stocks.php:810 Stocks.php:812
msgid "Assembly"
@@ -2702,7 +2704,7 @@
#: COGSGLPostings.php:90 COGSGLPostings.php:194 COGSGLPostings.php:306
#: Customers.php:739 Customers.php:742 DiscountMatrix.php:96
-#: DiscountMatrix.php:152 PricesByCost.php:225 Prices.php:218
+#: DiscountMatrix.php:152 PricesByCost.php:242 Prices.php:218
#: SalesAnalRepts.php:32 SalesAnalRepts.php:34 SalesGLPostings.php:112
#: SalesGLPostings.php:224 SalesGLPostings.php:354 SelectOrderItems.php:752
#: api/api_xml-rpc.php:931 api/api_xml-rpc.php:974
@@ -2735,7 +2737,7 @@
#: COGSGLPostings.php:306 Customers.php:742 EDIProcessOrders.php:389
#: PDFCustomerList.php:332 PDFPriceList.php:17 PDFPriceList.php:121
-#: PDFPriceList.php:251 PricesBasedOnMarkUp.php:223 PricesByCost.php:225
+#: PDFPriceList.php:251 PricesBasedOnMarkUp.php:223 PricesByCost.php:242
#: SalesGLPostings.php:354 SelectOrderItems.php:752 SuppPriceList.php:118
#: SuppPriceList.php:222
msgid "Price List"
@@ -2806,11 +2808,11 @@
msgstr "Nepodařilo se aktualizovat měnových kurzů"
#: CompanyPreferences.php:150 Customers.php:294 Suppliers.php:591
-#: SystemParameters.php:303
+#: SystemParameters.php:307
msgid "Validation failed"
msgstr "Validace selhala"
-#: CompanyPreferences.php:150 Suppliers.php:591 SystemParameters.php:303
+#: CompanyPreferences.php:150 Suppliers.php:591 SystemParameters.php:307
msgid "no updates or deletes took place"
msgstr "žádné aktualizace nebo odstraní se konal"
@@ -2922,16 +2924,16 @@
msgid "Create GL entries for stock transactions"
msgstr "Vytvořte GL údaje pro obchodů s akciemi"
-#: CompanyPreferences.php:474 ConfirmDispatch_Invoice.php:621
-#: ConfirmDispatch_Invoice.php:1651 Credit_Invoice.php:1528
+#: CompanyPreferences.php:474 ConfirmDispatch_Invoice.php:618
+#: ConfirmDispatch_Invoice.php:1647 Credit_Invoice.php:1528
#: FixedAssetItems.php:120 FixedAssetItems.php:566 GLBudgets.php:216
#: GLTags.php:62 GoodsReceived.php:229 GoodsReceived.php:235
#: GoodsReceived.php:242 GoodsReceived.php:699 Labels.php:262
#: MRPCalendar.php:307 Payments.php:860 PcAuthorizeExpenses.php:283
-#: PO_AuthoriseMyOrders.php:132 PricesByCost.php:187 PurchData.php:505
+#: PO_AuthoriseMyOrders.php:132 PricesByCost.php:204 PurchData.php:505
#: ReorderLevelLocation.php:156 SecurityTokens.php:89
#: SelectCreditItems.php:898 SMTPServer.php:64 StockCostUpdate.php:163
-#: StockReorderLevel.php:94 Stocks.php:1037 SystemParameters.php:1001
+#: StockReorderLevel.php:94 Stocks.php:1037 SystemParameters.php:1005
#: TaxAuthorityRates.php:82 WorkOrderEntry.php:546 WOSerialNos.php:315
msgid "Update"
msgstr "Aktualizace"
@@ -2988,8 +2990,8 @@
#: ConfirmDispatchControlled_Invoice.php:57 CounterSales.php:1207
#: DeliveryDetails.php:583 DeliveryDetails.php:783 EmailCustTrans.php:11
-#: PaymentAllocations.php:33 SelectSalesOrder.php:746 SelectSalesOrder.php:815
-#: SelectSalesOrder.php:842 Z_SalesIntegrityCheck.php:46
+#: PaymentAllocations.php:33 SelectSalesOrder.php:742 SelectSalesOrder.php:811
+#: SelectSalesOrder.php:838 Z_SalesIntegrityCheck.php:46
#: includes/PDFDeliveryDifferencesPageHeader.inc:40
#, php-format
msgid "Invoice"
@@ -3029,12 +3031,12 @@
msgid "The SQL to get the order header was"
msgstr "SQL získat pořadí záhlaví byl"
-#: ConfirmDispatch_Invoice.php:151 Credit_Invoice.php:127 OrderDetails.php:140
+#: ConfirmDispatch_Invoice.php:149 Credit_Invoice.php:127 OrderDetails.php:140
#: RecurringSalesOrders.php:125 SelectOrderItems.php:220
msgid "The line items of the order cannot be retrieved because"
msgstr "Řádkové položky v řádu nelze načíst, protože"
-#: ConfirmDispatch_Invoice.php:191
+#: ConfirmDispatch_Invoice.php:189
msgid ""
"There are no ordered items with a quantity left to deliver. There is nothing "
"left to invoice"
@@ -3042,29 +3044,29 @@
"Nejsou žádné objednané položky s množstvím vlevo dodat. Na tom není nic "
"ponecháno na faktuře"
-#: ConfirmDispatch_Invoice.php:201
+#: ConfirmDispatch_Invoice.php:199
msgid "This order item could not be retrieved. Please select another order"
msgstr "Tato objednat se nepodařilo získat. Prosím, vyberte jiný pořadí"
-#: ConfirmDispatch_Invoice.php:244
+#: ConfirmDispatch_Invoice.php:242
msgid "Confirm Invoice"
msgstr "Potvrdit faktury"
-#: ConfirmDispatch_Invoice.php:245
+#: ConfirmDispatch_Invoice.php:243
msgid "Confirm Dispatch and Invoice"
msgstr "Potvrdit Expedice a faktury"
-#: ConfirmDispatch_Invoice.php:248 Contracts.php:774 CustLoginSetup.php:32
+#: ConfirmDispatch_Invoice.php:246 Contracts.php:774 CustLoginSetup.php:32
#: CustLoginSetup.php:33 CustomerAllocations.php:328 CustomerBranches.php:363
#: CustomerBranches.php:532 CustomerBranches.php:573 CustomerInquiry.php:126
#: CustomerReceipt.php:844 CustomerReceipt.php:895 CustomerReceipt.php:1020
#: Customers.php:12 Customers.php:347 CustomerTransInquiry.php:88
#: DeliveryDetails.php:800 FTP_RadioBeacon.php:51 PDFOrdersInvoiced.php:299
-#: PDFOrderStatus.php:272 PricesByCost.php:119 SalesGraph.php:169
+#: PDFOrderStatus.php:272 PricesByCost.php:136 SalesGraph.php:169
#: SelectCompletedOrder.php:586 SelectContract.php:157 SelectCustomer.php:24
#: SelectCustomer.php:281 SelectOrderItems.php:643
-#: SelectRecurringSalesOrder.php:78 SelectSalesOrder.php:748
-#: SelectSalesOrder.php:764 StockLocMovements.php:84 StockMovements.php:93
+#: SelectRecurringSalesOrder.php:78 SelectSalesOrder.php:744
+#: SelectSalesOrder.php:760 StockLocMovements.php:84 StockMovements.php:93
#: includes/PDFAgedDebtorsPageHeader.inc:48
#: includes/PDFBankingSummaryPageHeader.inc:56
#: includes/PDFCustTransListingPageHeader.inc:48
@@ -3076,7 +3078,7 @@
msgid "Customer"
msgstr "Zákazník"
-#: ConfirmDispatch_Invoice.php:248 CustEDISetup.php:94 CustLoginSetup.php:272
+#: ConfirmDispatch_Invoice.php:246 CustEDISetup.php:94 CustLoginSetup.php:272
#: CustLoginSetup.php:448 Customers.php:461 Customers.php:659
#: Customers.php:696 DeliveryDetails.php:800 OrderDetails.php:65
#: SalesAnalRepts.php:27 SalesAnalRepts.php:29 WWW_Users.php:262
@@ -3086,7 +3088,7 @@
msgid "Customer Code"
msgstr "Kód zákazníka"
-#: ConfirmDispatch_Invoice.php:249 CustEDISetup.php:96 CustomerReceipt.php:235
+#: ConfirmDispatch_Invoice.php:247 CustEDISetup.php:96 CustomerReceipt.php:235
#: CustomerReceipt.php:1039 Customers.php:464 Customers.php:701
#: Customers.php:713 DeliveryDetails.php:801 OrderDetails.php:67
#: POReport.php:494 POReport.php:1249 SalesInquiry.php:740
@@ -3097,14 +3099,14 @@
msgid "Customer Name"
msgstr "Název zákazníka"
-#: ConfirmDispatch_Invoice.php:252
+#: ConfirmDispatch_Invoice.php:250
msgid "Invoice amounts stated in"
msgstr "Všechny částky v"
-#: ConfirmDispatch_Invoice.php:265 ContractBOM.php:239 ContractCosting.php:72
+#: ConfirmDispatch_Invoice.php:263 ContractBOM.php:239 ContractCosting.php:72
#: ContractCosting.php:78 Contracts.php:930 CounterSales.php:699
#: CounterSales.php:2301 Credit_Invoice.php:271 DeliveryDetails.php:820
-#: GoodsReceived.php:86 OrderDetails.php:153 PO_Items.php:634
+#: GoodsReceived.php:86 OrderDetails.php:153 PO_Items.php:639
#: PO_OrderDetails.php:142 PrintCustTrans.php:799 PrintCustTrans.php:887
#: PrintCustTrans.php:934 PrintCustTransPortrait.php:855
#: PrintCustTransPortrait.php:938 PrintCustTransPortrait.php:982
@@ -3126,10 +3128,10 @@
msgid "Item Code"
msgstr "Kód položky"
-#: ConfirmDispatch_Invoice.php:266 ContractCosting.php:73
+#: ConfirmDispatch_Invoice.php:264 ContractCosting.php:73
#: ContractCosting.php:79 Contracts.php:931 CounterSales.php:700
#: Credit_Invoice.php:272 DeliveryDetails.php:821 DeliveryDetails.php:886
-#: OrderDetails.php:154 PO_Items.php:701 PO_OrderDetails.php:143
+#: OrderDetails.php:154 PO_Items.php:706 PO_OrderDetails.php:143
#: PrintCustTrans.php:800 PrintCustTrans.php:888 PrintCustTrans.php:935
#: PrintCustTransPortrait.php:856 PrintCustTransPortrait.php:939
#: PrintCustTransPortrait.php:983 RecurringSalesOrders.php:320
@@ -3145,32 +3147,32 @@
msgid "Item Description"
msgstr "Popis položky"
-#: ConfirmDispatch_Invoice.php:267 GoodsReceived.php:88 GoodsReceived.php:92
+#: ConfirmDispatch_Invoice.php:265 GoodsReceived.php:88 GoodsReceived.php:92
#: PDFOrdersInvoiced.php:343 PDFOrderStatus.php:317 Shipments.php:385
#: Shipments.php:463
msgid "Ordered"
msgstr "Objednáno"
-#: ConfirmDispatch_Invoice.php:269 FTP_RadioBeacon.php:83 GoodsReceived.php:90
+#: ConfirmDispatch_Invoice.php:267 FTP_RadioBeacon.php:83 GoodsReceived.php:90
#: GoodsReceived.php:94
#, php-format
msgid "Already"
msgstr "Již"
-#: ConfirmDispatch_Invoice.php:269 FTP_RadioBeacon.php:83
+#: ConfirmDispatch_Invoice.php:267 FTP_RadioBeacon.php:83
#, php-format
msgid "Sent"
msgstr "odesláno"
-#: ConfirmDispatch_Invoice.php:270
+#: ConfirmDispatch_Invoice.php:268
msgid "This Dispatch"
msgstr "Tato zásilka"
-#: ConfirmDispatch_Invoice.php:271 CounterSales.php:704 Credit_Invoice.php:276
+#: ConfirmDispatch_Invoice.php:269 CounterSales.php:704 Credit_Invoice.php:276
#: DeliveryDetails.php:824 DeliveryDetails.php:889 GoodsReceived.php:98
#: OffersReceived.php:97 OffersReceived.php:197 OffersReceived.php:244
#: OrderDetails.php:157 PDFOrdersInvoiced.php:385 PDFPriceList.php:359
-#: PDFPrintLabel.php:238 PO_AuthoriseMyOrders.php:115 PricesByCost.php:211
+#: PDFPrintLabel.php:238 PO_AuthoriseMyOrders.php:115 PricesByCost.php:228
#: Prices_Customer.php:345 Prices.php:219 Prices.php:331
#: PrintCustTrans.php:803 PrintCustTrans.php:891 PrintCustTrans.php:938
#: PrintCustTransPortrait.php:859 PrintCustTransPortrait.php:942
@@ -3188,7 +3190,7 @@
msgid "Price"
msgstr "Cena"
-#: ConfirmDispatch_Invoice.php:272 CounterSales.php:705 Credit_Invoice.php:277
+#: ConfirmDispatch_Invoice.php:270 CounterSales.php:705 Credit_Invoice.php:277
#: CustomerReceipt.php:843 DeliveryDetails.php:825 OrderDetails.php:158
#: PrintCustTrans.php:804 PrintCustTrans.php:892 PrintCustTrans.php:939
#: PrintCustTransPortrait.php:860 PrintCustTransPortrait.php:943
@@ -3201,7 +3203,7 @@
msgid "Discount"
msgstr "Sleva"
-#: ConfirmDispatch_Invoice.php:273 ConfirmDispatch_Invoice.php:277
+#: ConfirmDispatch_Invoice.php:271 ConfirmDispatch_Invoice.php:275
#: CounterSales.php:709 CounterSales.php:796 Credit_Invoice.php:278
#: Credit_Invoice.php:282 CustomerAllocations.php:332
#: CustomerAllocations.php:358 CustomerInquiry.php:197 DeliveryDetails.php:826
@@ -3214,14 +3216,17 @@
#: OffersReceived.php:98 OrderDetails.php:159 PDFCustTransListing.php:125
#: PDFOrdersInvoiced.php:386 PDFRemittanceAdvice.php:310
#: PDFSuppTransListing.php:125 RecurringSalesOrders.php:325
-#: SelectCreditItems.php:656 SelectCreditItems.php:660
-#: SelectOrderItems.php:1314 SuppContractChgs.php:98 SuppFixedAssetChgs.php:91
-#: SupplierAllocations.php:456 SupplierAllocations.php:560
-#: SupplierAllocations.php:631 SupplierCredit.php:394 SupplierCredit.php:429
-#: SupplierCredit.php:464 SupplierInquiry.php:202 SupplierInvoice.php:332
-#: SupplierInvoice.php:362 SupplierInvoice.php:395 SupplierInvoice.php:424
-#: SuppShiptChgs.php:96 SuppTransGLAnalysis.php:132
-#: Z_CheckDebtorsControl.php:157 includes/PDFQuotationPageHeader.inc:107
+#: SalesByTypePeriodInquiry.php:366 SalesByTypePeriodInquiry.php:401
+#: SalesByTypePeriodInquiry.php:436 SalesByTypePeriodInquiry.php:471
+#: SalesByTypePeriodInquiry.php:532 SelectCreditItems.php:656
+#: SelectCreditItems.php:660 SelectOrderItems.php:1314 SuppContractChgs.php:98
+#: SuppFixedAssetChgs.php:91 SupplierAllocations.php:456
+#: SupplierAllocations.php:560 SupplierAllocations.php:631
+#: SupplierCredit.php:394 SupplierCredit.php:429 SupplierCredit.php:464
+#: SupplierInquiry.php:202 SupplierInvoice.php:332 SupplierInvoice.php:362
+#: SupplierInvoice.php:395 SupplierInvoice.php:424 SuppShiptChgs.php:96
+#: SuppTransGLAnalysis.php:132 Z_CheckDebtorsControl.php:157
+#: includes/PDFQuotationPageHeader.inc:107
#: includes/PDFQuotationPortraitPageHeader.inc:106
#: includes/PO_PDFOrderPageHeader.inc:82 api/api_debtortransactions.php:364
#: api/api_debtortransactions.php:377 api/api_debtortransactions.php:503
@@ -3229,21 +3234,21 @@
msgid "Total"
msgstr "Celkem"
-#: ConfirmDispatch_Invoice.php:273 Credit_Invoice.php:278
+#: ConfirmDispatch_Invoice.php:271 Credit_Invoice.php:278
#: SelectCreditItems.php:656
msgid "Excl Tax"
msgstr "bez DPH"
-#: ConfirmDispatch_Invoice.php:274 Credit_Invoice.php:279
+#: ConfirmDispatch_Invoice.php:272 Credit_Invoice.php:279
#: SelectCreditItems.php:657 SupplierInvoice.php:233 TaxGroups.php:270
msgid "Tax Authority"
msgstr "Daňový úřad"
-#: ConfirmDispatch_Invoice.php:275
+#: ConfirmDispatch_Invoice.php:273
msgid "Tax %"
msgstr "DPH %"
-#: ConfirmDispatch_Invoice.php:276 CounterSales.php:708 Credit_Invoice.php:280
+#: ConfirmDispatch_Invoice.php:274 CounterSales.php:708 Credit_Invoice.php:280
#: Credit_Invoice.php:281 PrintCustTrans.php:391 PrintCustTrans.php:976
#: PrintCustTransPortrait.php:450 PrintCustTransPortrait.php:1023
#: SelectCreditItems.php:658 SelectCreditItems.php:659
@@ -3251,32 +3256,32 @@
msgid "Tax"
msgstr "DPH"
-#: ConfirmDispatch_Invoice.php:277 CounterSales.php:709 Credit_Invoice.php:282
+#: ConfirmDispatch_Invoice.php:275 CounterSales.php:709 Credit_Invoice.php:282
#: SelectCreditItems.php:660
msgid "Incl Tax"
msgstr "včetně DPH"
-#: ConfirmDispatch_Invoice.php:391 StockLocTransferReceive.php:481
+#: ConfirmDispatch_Invoice.php:388 StockLocTransferReceive.php:481
msgid "Enter Serial Numbers"
msgstr "Vložit sériová čísla"
-#: ConfirmDispatch_Invoice.php:393
+#: ConfirmDispatch_Invoice.php:390
msgid "Enter Batch/Roll/Lot #"
msgstr "Zadejte Dávkové / role / položka #"
-#: ConfirmDispatch_Invoice.php:428
+#: ConfirmDispatch_Invoice.php:425
msgid "There was a problem testing for a default shipper because"
msgstr "Tam byl problém testování pro přepravce, protože výchozí"
-#: ConfirmDispatch_Invoice.php:434
+#: ConfirmDispatch_Invoice.php:431
msgid "There was a problem testing for a default shipper"
msgstr "Tam byl problém testování na výchozí odesílatele"
-#: ConfirmDispatch_Invoice.php:440
+#: ConfirmDispatch_Invoice.php:437
msgid "There are no shippers defined"
msgstr "Nejsou definováni žádní dopravci"
-#: ConfirmDispatch_Invoice.php:440
+#: ConfirmDispatch_Invoice.php:437
msgid ""
"Please use the link below to set up shipping freight companies, the system "
"expects the shipping company to be selected or a default freight company to "
@@ -3286,7 +3291,7 @@
"systém očekává, že námořní společnosti, které budou vybrány, nebo výchozí "
"nákladní společnost mají být použity"
-#: ConfirmDispatch_Invoice.php:441 DeliveryDetails.php:244 Prices.php:342
+#: ConfirmDispatch_Invoice.php:438 DeliveryDetails.php:244 Prices.php:342
#: includes/InputSerialItemsExisting.php:58
#: includes/InputSerialItemsKeyed.php:139
#: includes/InputSerialItemsSequential.php:48
@@ -3294,35 +3299,35 @@
msgid "Enter"
msgstr "Vložit"
-#: ConfirmDispatch_Invoice.php:441 DeliveryDetails.php:244
+#: ConfirmDispatch_Invoice.php:438 DeliveryDetails.php:244
msgid "Amend Freight Companies"
msgstr "Mění se Nákladní Firmy"
-#: ConfirmDispatch_Invoice.php:452
+#: ConfirmDispatch_Invoice.php:449
msgid "Order Freight Cost"
msgstr "Cena za dopravu"
-#: ConfirmDispatch_Invoice.php:456
+#: ConfirmDispatch_Invoice.php:453
msgid "Recalculated Freight Cost"
msgstr "Přepočítána přepravní náklady"
-#: ConfirmDispatch_Invoice.php:466 ConfirmDispatch_Invoice.php:470
+#: ConfirmDispatch_Invoice.php:463 ConfirmDispatch_Invoice.php:467
msgid "Charge Freight Cost inc Tax"
msgstr "Účtovat přepravní náklady s DPH"
-#: ConfirmDispatch_Invoice.php:535
+#: ConfirmDispatch_Invoice.php:532
msgid "Invoice Totals"
msgstr "Faktura celkem"
-#: ConfirmDispatch_Invoice.php:565
+#: ConfirmDispatch_Invoice.php:562
msgid "There are no lines on this order with a quantity to invoice"
msgstr "Tam nejsou žádné čáry na této objednávky se množství faktury"
-#: ConfirmDispatch_Invoice.php:565
+#: ConfirmDispatch_Invoice.php:562
msgid "No further processing has been done"
msgstr "Žádné další zpracování bylo provedeno"
-#: ConfirmDispatch_Invoice.php:583 CounterSales.php:894
+#: ConfirmDispatch_Invoice.php:580 CounterSales.php:894
msgid ""
"Could not retrieve the quantity left at the location once this order is "
"invoiced (for the purposes of checking that stock will not go negative "
@@ -3331,7 +3336,7 @@
"Nepodařilo se načíst množství vlevo na místě, jakmile toto pořadí je "
"fakturováno (za účelem kontroly, zda vozidla nepůjde, protože negativní)"
-#: ConfirmDispatch_Invoice.php:588 CounterSales.php:899
+#: ConfirmDispatch_Invoice.php:585 CounterSales.php:899
msgid ""
"Invoicing the selected order would result in negative stock. The system "
"parameters are set to prohibit negative stocks from occurring. This invoice "
@@ -3341,12 +3346,12 @@
"systému jsou nastaveny zakázat negativní zásoby od nastávání. Tato faktura "
"může být vytvořena do vyprodání na ruce je opraven."
-#: ConfirmDispatch_Invoice.php:588 ConfirmDispatch_Invoice.php:611
+#: ConfirmDispatch_Invoice.php:585 ConfirmDispatch_Invoice.php:608
#: CounterSales.php:899 CounterSales.php:922 WorkOrderReceive.php:154
msgid "Negative Stock Prohibited"
msgstr "Negativní Zakázané skladem"
-#: ConfirmDispatch_Invoice.php:607 CounterSales.php:918
+#: ConfirmDispatch_Invoice.php:604 CounterSales.php:918
msgid ""
"Could not retrieve the component quantity left at the location once the "
"assembly item on this order is invoiced (for the purposes of checking that "
@@ -3356,7 +3361,7 @@
"na tomto pořadí je fakturováno (za účelem kontroly, zda vozidla nepůjde, "
"protože negativní)"
-#: ConfirmDispatch_Invoice.php:611 CounterSales.php:922
+#: ConfirmDispatch_Invoice.php:608 CounterSales.php:922
msgid ""
"Invoicing the selected order would result in negative stock for a component "
"of an assembly item on the order. The system parameters are set to prohibit "
@@ -3368,34 +3373,34 @@
"negativní zásoby od nastávání. Tato faktura může být vytvořena do vyprodání "
"na ruce je opraven."
-#: ConfirmDispatch_Invoice.php:637
+#: ConfirmDispatch_Invoice.php:634
msgid ""
"We were unable to load Area where the Sale is to from the BRANCHES table"
msgstr "Nebyli jsme schopni načíst oblast, kde Prodej je z tabulky OBORY"
-#: ConfirmDispatch_Invoice.php:637
+#: ConfirmDispatch_Invoice.php:634
msgid "Please remedy this"
msgstr "Prosím nápravě tohoto"
-#: ConfirmDispatch_Invoice.php:648 Credit_Invoice.php:485
+#: ConfirmDispatch_Invoice.php:645 Credit_Invoice.php:485
#: GoodsReceived.php:252
msgid "The company information and preferences could not be retrieved"
msgstr "Informace o společnosti a preference se nepodařilo získat"
-#: ConfirmDispatch_Invoice.php:648 Credit_Invoice.php:485
+#: ConfirmDispatch_Invoice.php:645 Credit_Invoice.php:485
#: GoodsReceived.php:252
msgid "see your system administrator"
msgstr "kontaktujte administrátora"
-#: ConfirmDispatch_Invoice.php:671
+#: ConfirmDispatch_Invoice.php:668
msgid "Number of rows returned by SQL"
msgstr "Počet řádků vrácených SQL dotazem"
-#: ConfirmDispatch_Invoice.php:672
+#: ConfirmDispatch_Invoice.php:669
msgid "Count of items in the session"
msgstr "Počet položek v relaci"
-#: ConfirmDispatch_Invoice.php:676 ConfirmDispatch_Invoice.php:695
+#: ConfirmDispatch_Invoice.php:673 ConfirmDispatch_Invoice.php:692
msgid ""
"This order has been changed or invoiced since this delivery was started to "
"be confirmed"
@@ -3403,15 +3408,15 @@
"Tento příkaz byl změněn nebo fakturovány, protože tato dodávka byla zahájena "
"bude potvrzeno"
-#: ConfirmDispatch_Invoice.php:676 GoodsReceived.php:289
+#: ConfirmDispatch_Invoice.php:673 GoodsReceived.php:289
msgid "Processing halted"
msgstr "Zpracování zastaveno"
-#: ConfirmDispatch_Invoice.php:676
+#: ConfirmDispatch_Invoice.php:673
msgid "To enter and confirm this dispatch"
msgstr "Chcete-li zadat a potvrdit tuto expedici"
-#: ConfirmDispatch_Invoice.php:676
+#: ConfirmDispatch_Invoice.php:673
msgid ""
"invoice the order must be re-selected and re-read again to update the "
"changes made by the other user"
@@ -3419,31 +3424,31 @@
"faktura příkaz musí být re-vybraný a re-číst a aktualizovat změny provedené "
"ostatními uživateli"
-#: ConfirmDispatch_Invoice.php:690
+#: ConfirmDispatch_Invoice.php:687
msgid "Orig order for"
msgstr "Orig aby"
-#: ConfirmDispatch_Invoice.php:690
+#: ConfirmDispatch_Invoice.php:687
msgid "has a quantity of"
msgstr "má množství"
-#: ConfirmDispatch_Invoice.php:691
+#: ConfirmDispatch_Invoice.php:688
msgid "and an invoiced qty of"
msgstr "a fakturované Množství"
-#: ConfirmDispatch_Invoice.php:692
+#: ConfirmDispatch_Invoice.php:689
msgid "the session shows quantity of"
msgstr "zasedání ukazuje množství"
-#: ConfirmDispatch_Invoice.php:693
+#: ConfirmDispatch_Invoice.php:690
msgid "and quantity invoice of"
msgstr "a množství fakturu"
-#: ConfirmDispatch_Invoice.php:695
+#: ConfirmDispatch_Invoice.php:692
msgid "Processing halted."
msgstr "Zpracování zastaveno."
-#: ConfirmDispatch_Invoice.php:695
+#: ConfirmDispatch_Invoice.php:692
msgid ""
"To enter and confirm this dispatch, it must be re-selected and re-read again "
"to update the changes made by the other user"
@@ -3451,33 +3456,33 @@
"Chcete-li zadat a potvrdit tuto expedici, je třeba re-vybraný a re-číst a "
"aktualizovat změny provedené ostatními uživateli"
-#: ConfirmDispatch_Invoice.php:698
+#: ConfirmDispatch_Invoice.php:695
msgid "Select a sales order for confirming deliveries and invoicing"
msgstr "Vyberte prodejní objednávky k potvrzení dodávky a fakturace"
-#: ConfirmDispatch_Invoice.php:728
+#: ConfirmDispatch_Invoice.php:725
msgid "Could not update the default shipping carrier for this branch because"
msgstr "Nemohu aktualizovat výchozí lodní dopravce pro tento obor, protože"
-#: ConfirmDispatch_Invoice.php:729
+#: ConfirmDispatch_Invoice.php:726
msgid "The SQL used to update the branch default carrier was"
msgstr "SQL používaných k aktualizaci pobočky výchozí dopravce byl"
-#: ConfirmDispatch_Invoice.php:740 ConfirmDispatch_Invoice.php:782
-#: ConfirmDispatch_Invoice.php:798 ConfirmDispatch_Invoice.php:830
-#: ConfirmDispatch_Invoice.php:853 ConfirmDispatch_Invoice.php:882
-#: ConfirmDispatch_Invoice.php:908 ConfirmDispatch_Invoice.php:945
-#: ConfirmDispatch_Invoice.php:964 ConfirmDispatch_Invoice.php:978
-#: ConfirmDispatch_Invoice.php:1018 ConfirmDispatch_Invoice.php:1028
-#: ConfirmDispatch_Invoice.php:1111 ConfirmDispatch_Invoice.php:1132
-#: ConfirmDispatch_Invoice.php:1150 ConfirmDispatch_Invoice.php:1165
-#: ConfirmDispatch_Invoice.php:1289 ConfirmDispatch_Invoice.php:1312
-#: ConfirmDispatch_Invoice.php:1339 ConfirmDispatch_Invo...
[truncated message content] |
|
From: <dai...@us...> - 2011-05-29 09:57:17
|
Revision: 4582
http://web-erp.svn.sourceforge.net/web-erp/?rev=4582&view=rev
Author: daintree
Date: 2011-05-29 09:57:07 +0000 (Sun, 29 May 2011)
Log Message:
-----------
Pre v 4.04.1
Modified Paths:
--------------
trunk/doc/Change.log
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
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-05-29 09:38:46 UTC (rev 4581)
+++ trunk/doc/Change.log 2011-05-29 09:57:07 UTC (rev 4582)
@@ -1,14 +1,16 @@
webERP Change Log
+29/5/11 Version 4.04.1 Release
+
29/5/11 PricesByCost.php made it so the existing prices had end dates set as yesterday and new prices created from today
-29/5/11 TopItems.php fixed sequence and birthday to script
+29/5/11 TopItems.php fixed sequence and birthday to script and PDFTopItems.php script
28/5/11 Could not set controlled item batches/serial numbers on ConfirmDispatch_Invoice.php
-28/5/11 Ricard PO_SelectOSPurchOrder.php was showing select location with gaps between locations - no slash before <option> fixed
-28/5/11 Ricard added new field assigner to petty cash module and changes to PcTabs.php and PcAssignCashToTab.php
-28/5/11 Ricard PcAssignCashToTab.php quoted the $Days integer parameter to the INTERVAL function incorrectly now fixed
-28/5/11 Ricard reported bug on deletion of PcExpensesTypeTab - incorrectly formed URL and parameters added ?
-28/5/11 Ricard reported mismatch of fields scripts pagesecurity changed to int(11) from tinyint as other tables all refer to as int(11)
-28/5/11 R2-G reported alignment issue with link and button on SuppTransGLAnalysis now fixed
+28/5/11 Ricard: PO_SelectOSPurchOrder.php was showing select location with gaps between locations - no slash before <option> fixed
+28/5/11 Ricard: added new field assigner to petty cash module and changes to PcTabs.php and PcAssignCashToTab.php
+28/5/11 Ricard: PcAssignCashToTab.php quoted the $Days integer parameter to the INTERVAL function incorrectly now fixed
+28/5/11 Ricard: reported bug on deletion of PcExpensesTypeTab - incorrectly formed URL and parameters added ?
+28/5/11 Ricard: reported mismatch of fields scripts pagesecurity changed to int(11) from tinyint as other tables all refer to as int(11)
+28/5/11 R2-G: reported alignment issue with link and button on SuppTransGLAnalysis now fixed
28/5/11 Ricard: MRPShortages now has an option to report excesses too
28/5/11 Ricard: Fix sql to take quotes out of literals in upgrade script. PDFPrintLabels fix sql to get current price.
28/5/11 Reported by Daniel Brewer Fix SelectSalesOrder.php creation of PO with excluding redundant fields in purchorderdetails that were taken out.
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-05-29 09:38:46 UTC (rev 4581)
+++ trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po 2011-05-29 09:57:07 UTC (rev 4582)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: webERP 3.08\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-26 22:38+1200\n"
+"POT-Creation-Date: 2011-05-29 21:48+1200\n"
"PO-Revision-Date: 2011-02-07 15:33+0000\n"
"Last-Translator: Tim Schofield <Unknown>\n"
"Language-Team: Czech <cs...@li...>\n"
@@ -221,7 +221,7 @@
#: SelectCompletedOrder.php:11 SelectContract.php:81 SelectCreditItems.php:202
#: SelectCreditItems.php:270 SelectCustomer.php:323 SelectGLAccount.php:19
#: SelectGLAccount.php:79 SelectOrderItems.php:617 SelectOrderItems.php:1443
-#: SelectOrderItems.php:1563 SelectProduct.php:486 SelectSalesOrder.php:458
+#: SelectOrderItems.php:1563 SelectProduct.php:485 SelectSalesOrder.php:454
#: SelectSupplier.php:9 SelectSupplier.php:192 SelectWorkOrder.php:9
#: SelectWorkOrder.php:145 ShipmentCosting.php:11 Shipments.php:17
#: Shippers.php:123 Shippers.php:159 Shipt_Select.php:8
@@ -282,13 +282,13 @@
#: SalesAnalRepts.php:459 SelectProduct.php:374 ShipmentCosting.php:627
#: Stocks.php:878 Stocks.php:880 Stocks.php:898 Stocks.php:900
#: SuppContractChgs.php:83 SuppLoginSetup.php:508 SuppLoginSetup.php:510
-#: SystemParameters.php:376 SystemParameters.php:399 SystemParameters.php:415
-#: SystemParameters.php:468 SystemParameters.php:476 SystemParameters.php:516
-#: SystemParameters.php:589 SystemParameters.php:598 SystemParameters.php:606
-#: SystemParameters.php:624 SystemParameters.php:631 SystemParameters.php:758
-#: SystemParameters.php:889 SystemParameters.php:891 SystemParameters.php:901
-#: SystemParameters.php:903 SystemParameters.php:957 SystemParameters.php:969
-#: SystemParameters.php:971 TaxGroups.php:293 TaxGroups.php:296
+#: SystemParameters.php:380 SystemParameters.php:403 SystemParameters.php:419
+#: SystemParameters.php:472 SystemParameters.php:480 SystemParameters.php:520
+#: SystemParameters.php:593 SystemParameters.php:602 SystemParameters.php:610
+#: SystemParameters.php:628 SystemParameters.php:635 SystemParameters.php:762
+#: SystemParameters.php:893 SystemParameters.php:895 SystemParameters.php:905
+#: SystemParameters.php:907 SystemParameters.php:961 SystemParameters.php:973
+#: SystemParameters.php:975 TaxGroups.php:293 TaxGroups.php:296
#: TaxGroups.php:345 WWW_Users.php:605 WWW_Users.php:607
msgid "Yes"
msgstr "Ano"
@@ -318,13 +318,13 @@
#: SalesAnalRepts.php:458 SelectProduct.php:376 ShipmentCosting.php:628
#: Stocks.php:873 Stocks.php:875 Stocks.php:893 Stocks.php:895
#: SuppContractChgs.php:85 SuppLoginSetup.php:507 SuppLoginSetup.php:511
-#: SystemParameters.php:377 SystemParameters.php:400 SystemParameters.php:416
-#: SystemParameters.php:469 SystemParameters.php:477 SystemParameters.php:517
-#: SystemParameters.php:590 SystemParameters.php:599 SystemParameters.php:607
-#: SystemParameters.php:625 SystemParameters.php:632 SystemParameters.php:759
-#: SystemParameters.php:888 SystemParameters.php:892 SystemParameters.php:900
-#: SystemParameters.php:904 SystemParameters.php:958 SystemParameters.php:968
-#: SystemParameters.php:972 TaxGroups.php:294 TaxGroups.php:297
+#: SystemParameters.php:381 SystemParameters.php:404 SystemParameters.php:420
+#: SystemParameters.php:473 SystemParameters.php:481 SystemParameters.php:521
+#: SystemParameters.php:594 SystemParameters.php:603 SystemParameters.php:611
+#: SystemParameters.php:629 SystemParameters.php:636 SystemParameters.php:763
+#: SystemParameters.php:892 SystemParameters.php:896 SystemParameters.php:904
+#: SystemParameters.php:908 SystemParameters.php:962 SystemParameters.php:972
+#: SystemParameters.php:976 TaxGroups.php:294 TaxGroups.php:297
#: TaxGroups.php:347 WWW_Users.php:604 WWW_Users.php:608
#: includes/PDFLowGPPageHeader.inc:44 includes/PDFTaxPageHeader.inc:35
msgid "No"
@@ -340,7 +340,7 @@
#: FreightCosts.php:240 GeocodeSetup.php:170 GLAccounts.php:308 GLTags.php:82
#: Labels.php:414 Locations.php:377 MRPDemands.php:303 MRPDemandTypes.php:120
#: PaymentMethods.php:202 PaymentTerms.php:203 PcAssignCashToTab.php:255
-#: PcClaimExpensesFromTab.php:252 PcExpenses.php:208 PcTabs.php:221
+#: PcClaimExpensesFromTab.php:252 PcExpenses.php:208 PcTabs.php:234
#: PcTypeTabs.php:172 PO_AuthorisationLevels.php:149 Prices_Customer.php:280
#: Prices.php:246 PurchData.php:210 SalesCategories.php:256
#: SalesGLPostings.php:132 SalesGLPostings.php:245 SalesPeople.php:210
@@ -370,8 +370,8 @@
#: Labels.php:414 Locations.php:378 MRPDemands.php:304 MRPDemandTypes.php:121
#: PaymentMethods.php:203 Payments.php:1006 PaymentTerms.php:204
#: PcAssignCashToTab.php:259 PcClaimExpensesFromTab.php:253 PcExpenses.php:209
-#: PcExpensesTypeTab.php:182 PcTabs.php:222 PcTypeTabs.php:173
-#: PO_AuthorisationLevels.php:151 PO_Items.php:682 Prices_Customer.php:281
+#: PcExpensesTypeTab.php:182 PcTabs.php:235 PcTypeTabs.php:173
+#: PO_AuthorisationLevels.php:151 PO_Items.php:687 Prices_Customer.php:281
#: Prices.php:247 PurchData.php:211 SalesAnalReptCols.php:294
#: SalesAnalRepts.php:302 SalesCategories.php:257 SalesGLPostings.php:133
#: SalesGLPostings.php:246 SalesPeople.php:211 SalesTypes.php:205
@@ -544,7 +544,7 @@
#: AddCustomerTypeNotes.php:49 Areas.php:73 CustomerTypes.php:69
#: DeliveryDetails.php:771 Factors.php:105 FixedAssetItems.php:236
#: PcAssignCashToTab.php:88 PcClaimExpensesFromTab.php:79 PcExpenses.php:93
-#: PcTabs.php:95 PcTypeTabs.php:60 PO_Items.php:356 SalesAnalReptCols.php:129
+#: PcTabs.php:102 PcTypeTabs.php:60 PO_Items.php:356 SalesAnalReptCols.php:129
#: SalesPeople.php:94 SalesTypes.php:61 Stocks.php:355 Suppliers.php:510
#: SupplierTypes.php:67
msgid "has been updated"
@@ -582,7 +582,7 @@
#: Customers.php:924 Customers.php:992 PcAssignCashToTab.php:220
#: PcAssignCashToTab.php:346 PcAuthorizeExpenses.php:91
#: PcClaimExpensesFromTab.php:214 PcClaimExpensesFromTab.php:372
-#: PcReportTab.php:327 SelectCustomer.php:612 SystemParameters.php:315
+#: PcReportTab.php:327 SelectCustomer.php:612 SystemParameters.php:319
#: WOSerialNos.php:280 WOSerialNos.php:282
msgid "Notes"
msgstr "Bere na vědomí"
@@ -664,9 +664,9 @@
msgstr "Datum"
#: AddCustomerNotes.php:107 AddCustomerTypeNotes.php:105 PcReportTab.php:173
-#: Stocks.php:882 UpgradeDatabase.php:165 UpgradeDatabase.php:168
-#: UpgradeDatabase.php:171 UpgradeDatabase.php:174 UpgradeDatabase.php:177
-#: UpgradeDatabase.php:180 UpgradeDatabase.php:183 UpgradeDatabase.php:186
+#: Stocks.php:882 UpgradeDatabase.php:167 UpgradeDatabase.php:170
+#: UpgradeDatabase.php:173 UpgradeDatabase.php:176 UpgradeDatabase.php:179
+#: UpgradeDatabase.php:182 UpgradeDatabase.php:185 UpgradeDatabase.php:188
#: 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
@@ -761,8 +761,8 @@
#: InventoryQuantities.php:81 InventoryValuation.php:78
#: MailInventoryValuation.php:115 MRPPlannedPurchaseOrders.php:114
#: MRPPlannedWorkOrders.php:105 MRPReport.php:147 MRPReport.php:508
-#: MRPReschedules.php:45 MRPReschedules.php:57 MRPShortages.php:144
-#: MRPShortages.php:156 OutstandingGRNs.php:48 OutstandingGRNs.php:60
+#: MRPReschedules.php:45 MRPReschedules.php:57 MRPShortages.php:155
+#: MRPShortages.php:167 OutstandingGRNs.php:48 OutstandingGRNs.php:60
#: PDFCustomerList.php:18 PDFCustomerList.php:230 PDFCustomerList.php:242
#: PDFLowGP.php:20 PDFStockCheckComparison.php:35
#: PDFStockCheckComparison.php:61 PDFStockCheckComparison.php:262
@@ -798,13 +798,13 @@
#: MRPPlannedPurchaseOrders.php:128 MRPPlannedWorkOrders.php:108
#: MRPPlannedWorkOrders.php:119 MRPPlannedWorkOrders.php:316 MRPReport.php:39
#: MRPReport.php:50 MRPReport.php:150 MRPReschedules.php:48
-#: MRPReschedules.php:60 MRPShortages.php:147 MRPShortages.php:159
+#: MRPReschedules.php:60 MRPShortages.php:158 MRPShortages.php:170
#: OutstandingGRNs.php:51 OutstandingGRNs.php:63 PDFCustomerList.php:233
#: PDFCustomerList.php:245 PDFGrn.php:123 PDFLowGP.php:60 PDFLowGP.php:72
#: PDFPriceList.php:124 PDFQuotation.php:234 PDFQuotationPortrait.php:235
#: PDFRemittanceAdvice.php:84 PDFStockCheckComparison.php:39
#: PDFStockCheckComparison.php:65 PDFStockCheckComparison.php:266
-#: PDFTopItems.php:118 PO_PDFPurchOrder.php:31 PO_PDFPurchOrder.php:149
+#: PO_PDFPurchOrder.php:31 PO_PDFPurchOrder.php:149
#: PrintCustOrder_generic.php:180 PrintCustOrder.php:198
#: PrintSalesOrder_generic.php:183 ReorderLevel.php:60 ReorderLevel.php:149
#: SalesAnalysis_UserDefined.php:28 SelectCreditItems.php:23 StockCheck.php:47
@@ -842,15 +842,15 @@
msgstr "se nepodařilo získat, protože"
#: AgedDebtors.php:374 AgedSuppliers.php:192 Areas.php:95
-#: ConfirmDispatch_Invoice.php:152 ConfirmDispatch_Invoice.php:965
-#: ConfirmDispatch_Invoice.php:979 Contracts.php:581 CounterSales.php:1323
+#: ConfirmDispatch_Invoice.php:150 ConfirmDispatch_Invoice.php:962
+#: ConfirmDispatch_Invoice.php:976 Contracts.php:581 CounterSales.php:1323
#: CounterSales.php:1337 Credit_Invoice.php:705 Credit_Invoice.php:727
#: CustomerReceipt.php:523 CustomerReceipt.php:655 CustomerReceipt.php:683
#: CustomerTransInquiry.php:79 DeliveryDetails.php:393 GLProfit_Loss.php:579
#: GLTagProfit_Loss.php:488 Payments.php:312 PDFRemittanceAdvice.php:86
#: PurchData.php:95 PurchData.php:113 PurchData.php:245 ReverseGRN.php:191
#: ReverseGRN.php:205 ReverseGRN.php:366 SelectCreditItems.php:1372
-#: SelectSalesOrder.php:113 SelectSalesOrder.php:281 StockCheck.php:225
+#: SelectSalesOrder.php:113 SelectSalesOrder.php:277 StockCheck.php:225
#: StockCostUpdate.php:76 StockCostUpdate.php:86 StockLocStatus.php:147
#: StockMovements.php:85 StockQuantityByDate.php:86 StockReorderLevel.php:39
#: StockStatus.php:271 StockTransfers.php:179 StockUsageGraph.php:53
@@ -926,7 +926,7 @@
#: DebtorsAtPeriodEnd.php:156 InventoryPlanning.php:442
#: InventoryPlanningPrefSupplier.php:518 InventoryQuantities.php:187
#: InventoryValuation.php:251 MRPPlannedPurchaseOrders.php:282
-#: MRPPlannedWorkOrders.php:343 MRPReschedules.php:140 MRPShortages.php:258
+#: MRPPlannedWorkOrders.php:343 MRPReschedules.php:140 MRPShortages.php:290
#: OutstandingGRNs.php:162 PDFCustomerList.php:410 PDFLowGP.php:145
#: PDFPriceList.php:301 PDFRemittanceAdvice.php:152
#: PDFStockCheckComparison.php:379 PrintCustTrans.php:506
@@ -1056,7 +1056,7 @@
#: Areas.php:132 CustomerTypes.php:164 Factors.php:140
#: FixedAssetCategories.php:135 GLAccounts.php:193 Locations.php:325
#: MRPDemands.php:247 PcAssignCashToTab.php:135 PcClaimExpensesFromTab.php:126
-#: PcExpenses.php:160 PcExpensesTypeTab.php:101 PcTabs.php:156
+#: PcExpenses.php:160 PcExpensesTypeTab.php:101 PcTabs.php:166
#: PcTypeTabs.php:135 SalesAnalReptCols.php:215 SalesCategories.php:137
#: SalesTypes.php:161 StockCategories.php:196 Suppliers.php:635
#: SupplierTypes.php:151 Z_DeleteInvoice.php:146
@@ -1111,18 +1111,18 @@
#: InventoryQuantities.php:175 InventoryQuantities.php:177 MRP.php:562
#: MRPReport.php:523 MRPReport.php:525 MRPReschedules.php:135
#: PDFPeriodStockTransListing.php:58 PDFPriceList.php:194
-#: PDFPrintLabel.php:239 PO_Items.php:878 POReport.php:1548
+#: PDFPrintLabel.php:239 PO_Items.php:883 POReport.php:1548
#: ReorderLevel.php:175 ReorderLevel.php:177 ReorderLevel.php:205
#: ReorderLevel.php:207 SalesGraph.php:91 SalesGraph.php:93 SalesGraph.php:111
#: SalesGraph.php:113 SalesGraph.php:134 SalesGraph.php:136 SalesGraph.php:168
#: SalesInquiry.php:1054 SalesInquiry.php:1093 SelectCreditItems.php:923
-#: SelectOrderItems.php:1569 SelectOrderItems.php:1572 SelectProduct.php:494
-#: SelectProduct.php:496 StockDispatch.php:282 StockDispatch.php:284
+#: SelectOrderItems.php:1569 SelectOrderItems.php:1572 SelectProduct.php:493
+#: SelectProduct.php:495 StockDispatch.php:282 StockDispatch.php:284
#: StockLocStatus.php:67 StockLocStatus.php:69 StockLocStatus.php:87
#: StockLocStatus.php:91 StockLocStatus.php:95 StockQuantityByDate.php:21
-#: SupplierTenders.php:338 SupplierTenders.php:340 SystemParameters.php:920
-#: SystemParameters.php:926 SystemParameters.php:932 SystemParameters.php:938
-#: SystemParameters.php:944 TopItems.php:23 TopItems.php:36
+#: SupplierTenders.php:338 SupplierTenders.php:340 SystemParameters.php:924
+#: SystemParameters.php:930 SystemParameters.php:936 SystemParameters.php:942
+#: SystemParameters.php:948 TopItems.php:23 TopItems.php:36
#: WorkOrderEntry.php:562 WorkOrderEntry.php:565 WorkOrderIssue.php:626
#: WorkOrderIssue.php:629 includes/PDFAssetRegisterHeader.inc:15
#: includes/PDFAssetRegisterHeader.inc:24
@@ -1134,7 +1134,7 @@
msgstr "Tabulka "
#: AuditTrail.php:67 MRPReport.php:768 PO_SelectPurchOrder.php:391
-#: SelectContract.php:196 SelectProduct.php:740
+#: SelectContract.php:196 SelectProduct.php:739
msgid "View"
msgstr "Zobrazit"
@@ -1151,14 +1151,15 @@
#: CustomerTransInquiry.php:21 CustomerTransInquiry.php:85
#: CustWhereAlloc.php:17 CustWhereAlloc.php:88 DailyBankTransactions.php:104
#: GLAccountInquiry.php:152 GLAccountReportphp:155 GLAccountReport.php:367
-#: GLJournal.php:240 MRPReschedules.php:178 SelectCustomer.php:462
-#: ShipmentCosting.php:506 ShipmentCosting.php:577 StockCategories.php:215
-#: StockLocMovements.php:81 StockMovements.php:90 SupplierAllocations.php:452
-#: SupplierInquiry.php:199 SupplierTransInquiry.php:19
-#: SupplierTransInquiry.php:86 Z_CheckAllocationsFrom.php:26
-#: Z_CheckAllocationsFrom.php:49 Z_CheckAllocs.php:57
-#: Z_CheckGLTransBalance.php:11 includes/InputSerialItemsFile.php:86
-#: includes/InputSerialItemsFile.php:126 includes/PDFTaxPageHeader.inc:34
+#: GLJournal.php:240 MRPReschedules.php:178 SalesByTypePeriodInquiry.php:327
+#: SelectCustomer.php:462 ShipmentCosting.php:506 ShipmentCosting.php:577
+#: StockCategories.php:215 StockLocMovements.php:81 StockMovements.php:90
+#: SupplierAllocations.php:452 SupplierInquiry.php:199
+#: SupplierTransInquiry.php:19 SupplierTransInquiry.php:86
+#: Z_CheckAllocationsFrom.php:26 Z_CheckAllocationsFrom.php:49
+#: Z_CheckAllocs.php:57 Z_CheckGLTransBalance.php:11
+#: includes/InputSerialItemsFile.php:86 includes/InputSerialItemsFile.php:126
+#: includes/PDFTaxPageHeader.inc:34
msgid "Type"
msgstr "Typ"
@@ -1171,7 +1172,7 @@
msgid "Field Name"
msgstr "Název pole"
-#: AuditTrail.php:149 SystemParameters.php:314
+#: AuditTrail.php:149 SystemParameters.php:318
#: includes/PDFOstdgGRNsPageHeader.inc:43
msgid "Value"
msgstr "Hodnota"
@@ -1284,12 +1285,12 @@
msgstr "Adresa banky"
#: BankAccounts.php:196 CustomerReceipt.php:753 CustomerTransInquiry.php:95
-#: OffersReceived.php:99 PcReportTab.php:267 PcTabs.php:195 PcTabs.php:334
+#: OffersReceived.php:99 PcReportTab.php:267 PcTabs.php:206 PcTabs.php:349
#: PDFPrintLabel.php:93 PO_AuthorisationLevels.php:125
#: PO_AuthorisationLevels.php:205 PO_AuthorisationLevels.php:210
#: PO_AuthoriseMyOrders.php:114 PO_Header.php:545
-#: PO_SelectOSPurchOrder.php:436 PO_SelectPurchOrder.php:393
-#: PricesByCost.php:237 Prices.php:217 Prices.php:287 PurchData.php:175
+#: PO_SelectOSPurchOrder.php:437 PO_SelectPurchOrder.php:393
+#: PricesByCost.php:254 Prices.php:217 Prices.php:287 PurchData.php:175
#: PurchData.php:341 PurchData.php:465 SelectSupplier.php:247
#: SupplierCredit.php:265 SupplierInvoice.php:231 SupplierTransInquiry.php:95
#: SuppPriceList.php:265 includes/PDFBankingSummaryPageHeader.inc:42
@@ -1505,7 +1506,7 @@
msgid "Ref"
msgstr "Ref"
-#: BankMatching.php:229 ConfirmDispatch_Invoice.php:276 Credit_Invoice.php:281
+#: BankMatching.php:229 ConfirmDispatch_Invoice.php:274 Credit_Invoice.php:281
#: CustomerAllocations.php:358 CustomerReceipt.php:842
#: CustomerTransInquiry.php:94 CustWhereAlloc.php:92 PaymentAllocations.php:78
#: Payments.php:969 Payments.php:972 Payments.php:984
@@ -1527,7 +1528,7 @@
#: BankMatching.php:230 BankReconciliation.php:199 BankReconciliation.php:271
#: PDFOrdersInvoiced.php:345 PDFOrderStatus.php:319
-#: PO_SelectOSPurchOrder.php:212 PO_SelectPurchOrder.php:180
+#: PO_SelectOSPurchOrder.php:213 PO_SelectPurchOrder.php:180
#: Shipt_Select.php:182 SuppCreditGRNs.php:227
#: includes/PDFStatementPageHeader.inc:173
#: includes/PDFStatementPageHeader.inc:180
@@ -1798,19 +1799,20 @@
#: PrintCustTransPortrait.php:984 RecurringSalesOrders.php:321
#: ReorderLevel.php:256 ReverseGRN.php:379 ReverseGRN.php:380
#: SalesAnalReptCols.php:18 SalesAnalReptCols.php:20 SalesGraph.php:177
-#: SalesGraph.php:258 SalesInquiry.php:966 SelectCreditItems.php:651
-#: SelectCreditItems.php:1004 SelectOrderItems.php:1305
-#: SelectOrderItems.php:1454 SelectOrderItems.php:1634
-#: SelectOrderItems.php:1758 ShipmentCosting.php:144 ShipmentCosting.php:145
-#: Shipments.php:385 Shipments.php:387 Shipments.php:388 Shipments.php:463
-#: Shipments.php:465 SpecialOrder.php:542 StockCounts.php:98
-#: StockLocMovements.php:85 StockLocTransfer.php:179 StockMovements.php:95
-#: StockStatus.php:312 StockUsageGraph.php:12 SuppCreditGRNs.php:227
-#: SuppCreditGRNs.php:228 SupplierCredit.php:313 SupplierTenders.php:265
-#: SupplierTenders.php:493 WOSerialNos.php:249 WOSerialNos.php:282
-#: includes/InputSerialItems.php:104 includes/InputSerialItems.php:110
-#: includes/OutputSerialItems.php:39 includes/OutputSerialItems.php:44
-#: includes/OutputSerialItems.php:50 includes/PDFBOMListingPageHeader.inc:44
+#: SalesGraph.php:258 SalesInquiry.php:966 SalesTopItemsInquiry.php:222
+#: SelectCreditItems.php:651 SelectCreditItems.php:1004
+#: SelectOrderItems.php:1305 SelectOrderItems.php:1454
+#: SelectOrderItems.php:1634 SelectOrderItems.php:1758 ShipmentCosting.php:144
+#: ShipmentCosting.php:145 Shipments.php:385 Shipments.php:387
+#: Shipments.php:388 Shipments.php:463 Shipments.php:465 SpecialOrder.php:542
+#: StockCounts.php:98 StockLocMovements.php:85 StockLocTransfer.php:179
+#: StockMovements.php:95 StockStatus.php:312 StockUsageGraph.php:12
+#: SuppCreditGRNs.php:227 SuppCreditGRNs.php:228 SupplierCredit.php:313
+#: SupplierTenders.php:265 SupplierTenders.php:493 WOSerialNos.php:249
+#: WOSerialNos.php:282 includes/InputSerialItems.php:104
+#: includes/InputSerialItems.php:110 includes/OutputSerialItems.php:39
+#: includes/OutputSerialItems.php:44 includes/OutputSerialItems.php:50
+#: includes/PDFBOMListingPageHeader.inc:44
#: includes/PDFDeliveryDifferencesPageHeader.inc:43
#: includes/PDFDIFOTPageHeader.inc:42
#: includes/PDFInventoryValnPageHeader.inc:33
@@ -1843,19 +1845,19 @@
#: BOMExtendedQty.php:282 BOMIndented.php:263 BOMIndentedReverse.php:251
#: MRPPlannedPurchaseOrders.php:276 MRPPlannedWorkOrders.php:337
-#: MRPReschedules.php:130 MRPShortages.php:254
+#: MRPReschedules.php:130 MRPShortages.php:286
msgid "Print Option"
msgstr "Možnost tisku"
#: BOMExtendedQty.php:283 BOMIndented.php:265 BOMIndentedReverse.php:252
#: MRPPlannedPurchaseOrders.php:277 MRPPlannedWorkOrders.php:338
-#: MRPReschedules.php:131 MRPShortages.php:255
+#: MRPReschedules.php:131 MRPShortages.php:287
msgid "Print With Alternating Highlighted Lines"
msgstr "Tisk se střídavými Zvýrazněné Lines"
#: BOMExtendedQty.php:284 BOMIndented.php:266 BOMIndentedReverse.php:253
#: MRPPlannedPurchaseOrders.php:278 MRPPlannedWorkOrders.php:339
-#: MRPReschedules.php:132 MRPShortages.php:256
+#: MRPReschedules.php:132 MRPShortages.php:288
msgid "Plain Print"
msgstr "Prostý Tisk"
@@ -1867,9 +1869,9 @@
#: GLAccountReport.php:353 InventoryPlanningPrefSupplier.php:63
#: InventoryQuantities.php:209 MRPPlannedPurchaseOrders.php:305
#: MRPPlannedWorkOrders.php:366 MRPReport.php:805 MRPReschedules.php:164
-#: MRPShortages.php:282 PDFOrderStatus.php:302 PDFPriceList.php:331
+#: MRPShortages.php:318 PDFOrderStatus.php:302 PDFPriceList.php:331
#: PDFReceipt.php:32 PO_Header.php:798 PO_PDFPurchOrder.php:61
-#: PO_SelectOSPurchOrder.php:468 ReorderLevel.php:239 StockDispatch.php:336
+#: PO_SelectOSPurchOrder.php:469 ReorderLevel.php:239 StockDispatch.php:336
#: SuppPriceList.php:254 Tax.php:243 includes/PDFAgedDebtorsPageHeader.inc:34
#: includes/PDFAgedSuppliersPageHeader.inc:21
#: includes/PDFBalanceSheetPageHeader.inc:25
@@ -1903,7 +1905,7 @@
#: FixedAssetRegister.php:334 GLAccountReport.php:353
#: InventoryPlanningPrefSupplier.php:63 InventoryQuantities.php:210
#: MRPPlannedPurchaseOrders.php:306 MRPPlannedWorkOrders.php:367
-#: MRPReport.php:806 MRPReschedules.php:165 MRPShortages.php:283
+#: MRPReport.php:806 MRPReschedules.php:165 MRPShortages.php:319
#: PDFPriceList.php:331 PDFReceipt.php:32 PDFRemittanceAdvice.php:218
#: PrintCustTrans.php:682 PrintCustTrans.php:885 PrintCustTrans.php:932
#: PrintCustTransPortrait.php:732 PrintCustTransPortrait.php:936
@@ -1965,11 +1967,11 @@
msgstr "Stavět"
#: BOMExtendedQty.php:321 BOMInquiry.php:94 BOMs.php:814 CounterSales.php:1990
-#: CounterSales.php:2170 PO_SelectOSPurchOrder.php:211
+#: CounterSales.php:2170 PO_SelectOSPurchOrder.php:212
#: PO_SelectPurchOrder.php:179 ReorderLevelLocation.php:58
#: ReorderLevelLocation.php:59 SelectCompletedOrder.php:537
#: SelectOrderItems.php:1450 SelectOrderItems.php:1630
-#: SelectSalesOrder.php:499 SelectWorkOrder.php:184 Shipt_Select.php:181
+#: SelectSalesOrder.php:495 SelectWorkOrder.php:184 Shipt_Select.php:181
#: TopItems.php:167 includes/PDFTopItemsHeader.inc:54
msgid "On Hand"
msgstr "Na ruce"
@@ -1985,8 +1987,8 @@
#: BOMExtendedQty.php:325 BOMIndented.php:303 BOMIndentedReverse.php:288
#: InventoryQuantities.php:220 MRPDemands.php:288 MRPDemands.php:361
#: MRPDemands.php:368 MRPPlannedPurchaseOrders.php:323
-#: MRPPlannedWorkOrders.php:384 MRPReschedules.php:175 MRPShortages.php:252
-#: MRPShortages.php:297 POReport.php:491 POReport.php:500 POReport.php:519
+#: MRPPlannedWorkOrders.php:384 MRPReschedules.php:175 MRPShortages.php:278
+#: MRPShortages.php:333 POReport.php:491 POReport.php:500 POReport.php:519
#: POReport.php:539 POReport.php:624 POReport.php:713 POReport.php:1246
#: POReport.php:1255 POReport.php:1269 POReport.php:1284 POReport.php:1335
#: POReport.php:1398 POReport.php:1501 POReport.php:1566 POReport.php:1575
@@ -1998,7 +2000,7 @@
msgstr "Číslo dílu"
#: BOMExtendedQty.php:326 BOMIndented.php:304 BOMIndentedReverse.php:289
-#: MRPShortages.php:299
+#: MRPShortages.php:335
msgid "M/B"
msgstr "M / B"
@@ -2008,7 +2010,7 @@
msgid "Part Description"
msgstr "Popis části"
-#: BOMExtendedQty.php:332 MRPShortages.php:303
+#: BOMExtendedQty.php:332 MRPShortages.php:340
msgid "Shortage"
msgstr "Nedostatek"
@@ -2049,18 +2051,18 @@
#: InventoryQuantities.php:221 Labels.php:413 MRPDemands.php:91
#: MRPDemands.php:289 MRPDemandTypes.php:113 MRPPlannedWorkOrders.php:256
#: MRPReport.php:535 MRPReport.php:739 MRPReschedules.php:176
-#: MRPShortages.php:298 PaymentTerms.php:180 PcExpenses.php:181
+#: MRPShortages.php:334 PaymentTerms.php:180 PcExpenses.php:181
#: PcExpenses.php:273 PcExpensesTypeTab.php:166 PcReportTab.php:171
#: PcTypeTabs.php:156 PDFOrdersInvoiced.php:342 PDFOrderStatus.php:316
-#: PDFPrintLabel.php:238 PO_Items.php:635 PO_Items.php:924
-#: PO_SelectOSPurchOrder.php:210 PO_SelectPurchOrder.php:178
-#: PricesByCost.php:118 ReorderLevelLocation.php:55 ReorderLevel.php:254
+#: PDFPrintLabel.php:238 PO_Items.php:640 PO_Items.php:929
+#: PO_SelectOSPurchOrder.php:211 PO_SelectPurchOrder.php:178
+#: PricesByCost.php:135 ReorderLevelLocation.php:55 ReorderLevel.php:254
#: ReverseGRN.php:377 SalesCategories.php:423 SecurityTokens.php:86
#: SecurityTokens.php:92 SecurityTokens.php:102 SelectAsset.php:243
#: SelectCompletedOrder.php:536 SelectContract.php:156
#: SelectCreditItems.php:957 SelectOrderItems.php:1448
-#: SelectOrderItems.php:1628 SelectProduct.php:506 SelectProduct.php:711
-#: SelectSalesOrder.php:498 SelectWorkOrder.php:183 Shipt_Select.php:180
+#: SelectOrderItems.php:1628 SelectProduct.php:505 SelectProduct.php:710
+#: SelectSalesOrder.php:494 SelectWorkOrder.php:183 Shipt_Select.php:180
#: StockCategories.php:214 StockDispatch.php:356 StockDispatch.php:363
#: StockLocStatus.php:154 StockQuantityByDate.php:96 SuppCreditGRNs.php:74
#: SuppCreditGRNs.php:153 SuppFixedAssetChgs.php:73 SuppInvGRNs.php:113
@@ -2143,13 +2145,13 @@
msgstr "sady nebo sestavy musí být k dispozici pro výstavbu kusovníku"
#: BOMInquiry.php:22 BOMs.php:799 MRPDemands.php:328
-#: PO_SelectOSPurchOrder.php:197 PO_SelectPurchOrder.php:168
+#: PO_SelectOSPurchOrder.php:198 PO_SelectPurchOrder.php:168
#: Shipt_Select.php:163 WorkOrderEntry.php:579 WorkOrderIssue.php:643
msgid "Enter text extracts in the"
msgstr "Zadejte text extrakty v"
#: BOMInquiry.php:23 BOMs.php:799 MRPDemands.php:328
-#: PO_SelectOSPurchOrder.php:197 PO_SelectPurchOrder.php:168
+#: PO_SelectOSPurchOrder.php:198 PO_SelectPurchOrder.php:168
#: Shipt_Select.php:163 WorkOrderEntry.php:579 WorkOrderIssue.php:643
msgid "description"
msgstr "popis"
@@ -2160,13 +2162,13 @@
#: DiscountCategories.php:101 DiscountCategories.php:103
#: DiscountCategories.php:107 DiscountCategories.php:109
#: FixedAssetTransfer.php:61 MRPDemands.php:330 MRPDemands.php:333
-#: MRPReport.php:542 PO_Header.php:527 PO_Items.php:903 PO_Items.php:907
-#: PO_SelectOSPurchOrder.php:199 PO_SelectPurchOrder.php:170 PurchData.php:265
+#: MRPReport.php:542 PO_Header.php:527 PO_Items.php:908 PO_Items.php:912
+#: PO_SelectOSPurchOrder.php:200 PO_SelectPurchOrder.php:170 PurchData.php:265
#: SelectAsset.php:94 SelectCompletedOrder.php:519 SelectCreditItems.php:208
#: SelectCreditItems.php:942 SelectCustomer.php:331 SelectCustomer.php:337
#: SelectCustomer.php:344 SelectCustomer.php:351 SelectCustomer.php:395
#: SelectGLAccount.php:92 SelectOrderItems.php:627 SelectOrderItems.php:630
-#: SelectOrderItems.php:1597 SelectProduct.php:513 SelectSalesOrder.php:486
+#: SelectOrderItems.php:1597 SelectProduct.php:512 SelectSalesOrder.php:482
#: SelectSupplier.php:200 SelectWorkOrder.php:171 Shipt_Select.php:166
#: SuppFixedAssetChgs.php:116 SupplierTenders.php:359 WorkOrderEntry.php:582
#: WorkOrderIssue.php:646
@@ -2174,14 +2176,14 @@
msgstr "nebo"
#: BOMInquiry.php:24 BOMs.php:802 MRPDemands.php:331
-#: PO_SelectOSPurchOrder.php:199 PO_SelectPurchOrder.php:170
+#: PO_SelectOSPurchOrder.php:200 PO_SelectPurchOrder.php:170
#: Shipt_Select.php:166 WorkOrderEntry.php:582 WorkOrderIssue.php:646
msgid "Enter extract of the"
msgstr "Zadejte extrakt"
#: BOMInquiry.php:25 BOMs.php:802 MRPDemands.php:331 MRPReport.php:542
-#: PO_SelectOSPurchOrder.php:199 PO_SelectPurchOrder.php:170
-#: SalesCategories.php:422 SelectProduct.php:513 Shipt_Select.php:166
+#: PO_SelectOSPurchOrder.php:200 PO_SelectPurchOrder.php:170
+#: SalesCategories.php:422 SelectProduct.php:512 Shipt_Select.php:166
#: StockAdjustments.php:69 StockAdjustments.php:324 StockCounts.php:97
#: StockCounts.php:132 StockMovements.php:31 StockReorderLevel.php:44
#: StockStatus.php:61 StockTransfers.php:38 StockTransfers.php:445
@@ -2193,19 +2195,19 @@
#: BOMInquiry.php:26 BOMs.php:806 ContractBOM.php:328 Contracts.php:766
#: CounterSales.php:2142 CustomerReceipt.php:1032 FixedAssetTransfer.php:72
-#: MRPDemands.php:335 MRPReport.php:550 PO_Header.php:532 PO_Items.php:911
+#: MRPDemands.php:335 MRPReport.php:550 PO_Header.php:532 PO_Items.php:916
#: SelectAsset.php:102 SelectCreditItems.php:213 SelectCreditItems.php:947
#: SelectCustomer.php:418 SelectGLAccount.php:98 SelectOrderItems.php:635
-#: SelectOrderItems.php:1604 SelectProduct.php:521 SelectSupplier.php:208
+#: SelectOrderItems.php:1604 SelectProduct.php:520 SelectSupplier.php:208
#: SelectSupplier.php:241 SupplierTenders.php:367 WorkOrderEntry.php:586
#: WorkOrderIssue.php:650
msgid "Search Now"
msgstr "Vyhledat"
#: BOMInquiry.php:36 BOMs.php:735 ContractBOM.php:49 MRPDemands.php:56
-#: MRPReport.php:568 PO_Items.php:745 PO_SelectOSPurchOrder.php:61
+#: MRPReport.php:568 PO_Items.php:750 PO_SelectOSPurchOrder.php:61
#: PO_SelectPurchOrder.php:43 SelectCompletedOrder.php:92
-#: SelectCreditItems.php:276 SelectProduct.php:534 SelectSalesOrder.php:348
+#: SelectCreditItems.php:276 SelectProduct.php:533 SelectSalesOrder.php:344
#: SelectWorkOrder.php:33 Shipt_Select.php:60 SupplierTenders.php:379
#: WorkOrderEntry.php:62 WorkOrderIssue.php:378
msgid ""
@@ -2233,13 +2235,13 @@
#: CustomerReceipt.php:1038 GLCodesInquiry.php:26 MRPDemands.php:90
#: MRPPlannedWorkOrders.php:255 MRPReport.php:738 PDFOrdersInvoiced.php:341
#: PDFOrderStatus.php:315 PDFPrintLabel.php:238 PO_Header.php:542
-#: PO_Items.php:923 PO_SelectOSPurchOrder.php:209 PO_SelectPurchOrder.php:177
-#: PricesByCost.php:117 PurchData.php:339 ReorderLevelLocation.php:54
+#: PO_Items.php:928 PO_SelectOSPurchOrder.php:210 PO_SelectPurchOrder.php:177
+#: PricesByCost.php:134 PurchData.php:339 ReorderLevelLocation.php:54
#: ReorderLevelLocation.php:203 SalesPeople.php:184
#: SelectCompletedOrder.php:535 SelectCreditItems.php:220
#: SelectCreditItems.php:956 SelectCustomer.php:458 SelectGLAccount.php:105
-#: SelectOrderItems.php:1447 SelectOrderItems.php:1627 SelectProduct.php:710
-#: SelectSalesOrder.php:497 SelectSupplier.php:245 SelectWorkOrder.php:182
+#: SelectOrderItems.php:1447 SelectOrderItems.php:1627 SelectProduct.php:709
+#: SelectSalesOrder.php:493 SelectSupplier.php:245 SelectWorkOrder.php:182
#: Shipt_Select.php:179 SpecialOrder.php:132 SupplierTenders.php:489
#: SuppPriceList.php:272 TopItems.php:162 WorkOrderEntry.php:597
#: WorkOrderIssue.php:667 includes/PDFTaxPageHeader.inc:38
@@ -2247,14 +2249,14 @@
msgid "Code"
msgstr "Kód"
-#: BOMInquiry.php:95 BOMs.php:815 ConfirmDispatch_Invoice.php:268
+#: BOMInquiry.php:95 BOMs.php:815 ConfirmDispatch_Invoice.php:266
#: ContractBOM.php:342 CounterSales.php:1989 CounterSales.php:2169
#: Credit_Invoice.php:274 GoodsReceived.php:89 GoodsReceived.php:93
-#: MRPReport.php:741 OffersReceived.php:96 PO_Items.php:927
-#: PO_SelectOSPurchOrder.php:213 PO_SelectPurchOrder.php:181
+#: MRPReport.php:741 OffersReceived.php:96 PO_Items.php:932
+#: PO_SelectOSPurchOrder.php:214 PO_SelectPurchOrder.php:181
#: SelectCompletedOrder.php:540 SelectCreditItems.php:958
#: SelectOrderItems.php:1449 SelectOrderItems.php:1629 SelectProduct.php:112
-#: SelectProduct.php:713 SelectSalesOrder.php:500 SelectWorkOrder.php:185
+#: SelectProduct.php:712 SelectSalesOrder.php:496 SelectWorkOrder.php:185
#: Shipments.php:386 Shipments.php:464 Shipt_Select.php:183
#: StockLocTransferReceive.php:435 SupplierTenders.php:491 TopItems.php:165
#: WorkOrderCosting.php:84 WorkOrderEntry.php:599 WorkOrderIssue.php:669
@@ -2291,7 +2293,7 @@
#: BOMInquiry.php:174 ContractBOM.php:243 ContractCosting.php:76
#: ContractCosting.php:82 ContractCosting.php:132 ContractOtherReqts.php:96
#: Contracts.php:934 Contracts.php:957 MRPPlannedWorkOrders.php:260
-#: MRPShortages.php:300 SpecialOrder.php:632 StockAdjustments.php:340
+#: MRPShortages.php:336 SpecialOrder.php:632 StockAdjustments.php:340
msgid "Unit Cost"
msgstr "Jednotková cena"
@@ -2381,10 +2383,10 @@
msgstr "Drill-down"
#: BOMs.php:120 BOMs.php:126 BOMs.php:130 BOMs.php:831 OrderDetails.php:177
-#: PaymentTerms.php:188 PaymentTerms.php:194 PO_SelectOSPurchOrder.php:473
+#: PaymentTerms.php:188 PaymentTerms.php:194 PO_SelectOSPurchOrder.php:474
#: SalesAnalReptCols.php:280 SelectProduct.php:110 SelectProduct.php:154
#: SelectProduct.php:167 SelectProduct.php:251 SelectProduct.php:252
-#: SelectProduct.php:732
+#: SelectProduct.php:731
msgid "N/A"
msgstr "N / A"
@@ -2533,7 +2535,7 @@
msgid "The SQL used to retrieve description of the parent part was"
msgstr "SQL slouží k získání popisu mateřské část byla"
-#: BOMs.php:397 ConfirmDispatch_Invoice.php:1012 CounterSales.php:1372
+#: BOMs.php:397 ConfirmDispatch_Invoice.php:1009 CounterSales.php:1372
#: Credit_Invoice.php:763 Credit_Invoice.php:792 SelectCreditItems.php:1417
#: Stocks.php:810 Stocks.php:812
msgid "Assembly"
@@ -2702,7 +2704,7 @@
#: COGSGLPostings.php:90 COGSGLPostings.php:194 COGSGLPostings.php:306
#: Customers.php:739 Customers.php:742 DiscountMatrix.php:96
-#: DiscountMatrix.php:152 PricesByCost.php:225 Prices.php:218
+#: DiscountMatrix.php:152 PricesByCost.php:242 Prices.php:218
#: SalesAnalRepts.php:32 SalesAnalRepts.php:34 SalesGLPostings.php:112
#: SalesGLPostings.php:224 SalesGLPostings.php:354 SelectOrderItems.php:752
#: api/api_xml-rpc.php:931 api/api_xml-rpc.php:974
@@ -2735,7 +2737,7 @@
#: COGSGLPostings.php:306 Customers.php:742 EDIProcessOrders.php:389
#: PDFCustomerList.php:332 PDFPriceList.php:17 PDFPriceList.php:121
-#: PDFPriceList.php:251 PricesBasedOnMarkUp.php:223 PricesByCost.php:225
+#: PDFPriceList.php:251 PricesBasedOnMarkUp.php:223 PricesByCost.php:242
#: SalesGLPostings.php:354 SelectOrderItems.php:752 SuppPriceList.php:118
#: SuppPriceList.php:222
msgid "Price List"
@@ -2806,11 +2808,11 @@
msgstr "Nepodařilo se aktualizovat měnových kurzů"
#: CompanyPreferences.php:150 Customers.php:294 Suppliers.php:591
-#: SystemParameters.php:303
+#: SystemParameters.php:307
msgid "Validation failed"
msgstr "Validace selhala"
-#: CompanyPreferences.php:150 Suppliers.php:591 SystemParameters.php:303
+#: CompanyPreferences.php:150 Suppliers.php:591 SystemParameters.php:307
msgid "no updates or deletes took place"
msgstr "žádné aktualizace nebo odstraní se konal"
@@ -2922,16 +2924,16 @@
msgid "Create GL entries for stock transactions"
msgstr "Vytvořte GL údaje pro obchodů s akciemi"
-#: CompanyPreferences.php:474 ConfirmDispatch_Invoice.php:621
-#: ConfirmDispatch_Invoice.php:1651 Credit_Invoice.php:1528
+#: CompanyPreferences.php:474 ConfirmDispatch_Invoice.php:618
+#: ConfirmDispatch_Invoice.php:1647 Credit_Invoice.php:1528
#: FixedAssetItems.php:120 FixedAssetItems.php:566 GLBudgets.php:216
#: GLTags.php:62 GoodsReceived.php:229 GoodsReceived.php:235
#: GoodsReceived.php:242 GoodsReceived.php:699 Labels.php:262
#: MRPCalendar.php:307 Payments.php:860 PcAuthorizeExpenses.php:283
-#: PO_AuthoriseMyOrders.php:132 PricesByCost.php:187 PurchData.php:505
+#: PO_AuthoriseMyOrders.php:132 PricesByCost.php:204 PurchData.php:505
#: ReorderLevelLocation.php:156 SecurityTokens.php:89
#: SelectCreditItems.php:898 SMTPServer.php:64 StockCostUpdate.php:163
-#: StockReorderLevel.php:94 Stocks.php:1037 SystemParameters.php:1001
+#: StockReorderLevel.php:94 Stocks.php:1037 SystemParameters.php:1005
#: TaxAuthorityRates.php:82 WorkOrderEntry.php:546 WOSerialNos.php:315
msgid "Update"
msgstr "Aktualizace"
@@ -2988,8 +2990,8 @@
#: ConfirmDispatchControlled_Invoice.php:57 CounterSales.php:1207
#: DeliveryDetails.php:583 DeliveryDetails.php:783 EmailCustTrans.php:11
-#: PaymentAllocations.php:33 SelectSalesOrder.php:746 SelectSalesOrder.php:815
-#: SelectSalesOrder.php:842 Z_SalesIntegrityCheck.php:46
+#: PaymentAllocations.php:33 SelectSalesOrder.php:742 SelectSalesOrder.php:811
+#: SelectSalesOrder.php:838 Z_SalesIntegrityCheck.php:46
#: includes/PDFDeliveryDifferencesPageHeader.inc:40
#, php-format
msgid "Invoice"
@@ -3029,12 +3031,12 @@
msgid "The SQL to get the order header was"
msgstr "SQL získat pořadí záhlaví byl"
-#: ConfirmDispatch_Invoice.php:151 Credit_Invoice.php:127 OrderDetails.php:140
+#: ConfirmDispatch_Invoice.php:149 Credit_Invoice.php:127 OrderDetails.php:140
#: RecurringSalesOrders.php:125 SelectOrderItems.php:220
msgid "The line items of the order cannot be retrieved because"
msgstr "Řádkové položky v řádu nelze načíst, protože"
-#: ConfirmDispatch_Invoice.php:191
+#: ConfirmDispatch_Invoice.php:189
msgid ""
"There are no ordered items with a quantity left to deliver. There is nothing "
"left to invoice"
@@ -3042,29 +3044,29 @@
"Nejsou žádné objednané položky s množstvím vlevo dodat. Na tom není nic "
"ponecháno na faktuře"
-#: ConfirmDispatch_Invoice.php:201
+#: ConfirmDispatch_Invoice.php:199
msgid "This order item could not be retrieved. Please select another order"
msgstr "Tato objednat se nepodařilo získat. Prosím, vyberte jiný pořadí"
-#: ConfirmDispatch_Invoice.php:244
+#: ConfirmDispatch_Invoice.php:242
msgid "Confirm Invoice"
msgstr "Potvrdit faktury"
-#: ConfirmDispatch_Invoice.php:245
+#: ConfirmDispatch_Invoice.php:243
msgid "Confirm Dispatch and Invoice"
msgstr "Potvrdit Expedice a faktury"
-#: ConfirmDispatch_Invoice.php:248 Contracts.php:774 CustLoginSetup.php:32
+#: ConfirmDispatch_Invoice.php:246 Contracts.php:774 CustLoginSetup.php:32
#: CustLoginSetup.php:33 CustomerAllocations.php:328 CustomerBranches.php:363
#: CustomerBranches.php:532 CustomerBranches.php:573 CustomerInquiry.php:126
#: CustomerReceipt.php:844 CustomerReceipt.php:895 CustomerReceipt.php:1020
#: Customers.php:12 Customers.php:347 CustomerTransInquiry.php:88
#: DeliveryDetails.php:800 FTP_RadioBeacon.php:51 PDFOrdersInvoiced.php:299
-#: PDFOrderStatus.php:272 PricesByCost.php:119 SalesGraph.php:169
+#: PDFOrderStatus.php:272 PricesByCost.php:136 SalesGraph.php:169
#: SelectCompletedOrder.php:586 SelectContract.php:157 SelectCustomer.php:24
#: SelectCustomer.php:281 SelectOrderItems.php:643
-#: SelectRecurringSalesOrder.php:78 SelectSalesOrder.php:748
-#: SelectSalesOrder.php:764 StockLocMovements.php:84 StockMovements.php:93
+#: SelectRecurringSalesOrder.php:78 SelectSalesOrder.php:744
+#: SelectSalesOrder.php:760 StockLocMovements.php:84 StockMovements.php:93
#: includes/PDFAgedDebtorsPageHeader.inc:48
#: includes/PDFBankingSummaryPageHeader.inc:56
#: includes/PDFCustTransListingPageHeader.inc:48
@@ -3076,7 +3078,7 @@
msgid "Customer"
msgstr "Zákazník"
-#: ConfirmDispatch_Invoice.php:248 CustEDISetup.php:94 CustLoginSetup.php:272
+#: ConfirmDispatch_Invoice.php:246 CustEDISetup.php:94 CustLoginSetup.php:272
#: CustLoginSetup.php:448 Customers.php:461 Customers.php:659
#: Customers.php:696 DeliveryDetails.php:800 OrderDetails.php:65
#: SalesAnalRepts.php:27 SalesAnalRepts.php:29 WWW_Users.php:262
@@ -3086,7 +3088,7 @@
msgid "Customer Code"
msgstr "Kód zákazníka"
-#: ConfirmDispatch_Invoice.php:249 CustEDISetup.php:96 CustomerReceipt.php:235
+#: ConfirmDispatch_Invoice.php:247 CustEDISetup.php:96 CustomerReceipt.php:235
#: CustomerReceipt.php:1039 Customers.php:464 Customers.php:701
#: Customers.php:713 DeliveryDetails.php:801 OrderDetails.php:67
#: POReport.php:494 POReport.php:1249 SalesInquiry.php:740
@@ -3097,14 +3099,14 @@
msgid "Customer Name"
msgstr "Název zákazníka"
-#: ConfirmDispatch_Invoice.php:252
+#: ConfirmDispatch_Invoice.php:250
msgid "Invoice amounts stated in"
msgstr "Všechny částky v"
-#: ConfirmDispatch_Invoice.php:265 ContractBOM.php:239 ContractCosting.php:72
+#: ConfirmDispatch_Invoice.php:263 ContractBOM.php:239 ContractCosting.php:72
#: ContractCosting.php:78 Contracts.php:930 CounterSales.php:699
#: CounterSales.php:2301 Credit_Invoice.php:271 DeliveryDetails.php:820
-#: GoodsReceived.php:86 OrderDetails.php:153 PO_Items.php:634
+#: GoodsReceived.php:86 OrderDetails.php:153 PO_Items.php:639
#: PO_OrderDetails.php:142 PrintCustTrans.php:799 PrintCustTrans.php:887
#: PrintCustTrans.php:934 PrintCustTransPortrait.php:855
#: PrintCustTransPortrait.php:938 PrintCustTransPortrait.php:982
@@ -3126,10 +3128,10 @@
msgid "Item Code"
msgstr "Kód položky"
-#: ConfirmDispatch_Invoice.php:266 ContractCosting.php:73
+#: ConfirmDispatch_Invoice.php:264 ContractCosting.php:73
#: ContractCosting.php:79 Contracts.php:931 CounterSales.php:700
#: Credit_Invoice.php:272 DeliveryDetails.php:821 DeliveryDetails.php:886
-#: OrderDetails.php:154 PO_Items.php:701 PO_OrderDetails.php:143
+#: OrderDetails.php:154 PO_Items.php:706 PO_OrderDetails.php:143
#: PrintCustTrans.php:800 PrintCustTrans.php:888 PrintCustTrans.php:935
#: PrintCustTransPortrait.php:856 PrintCustTransPortrait.php:939
#: PrintCustTransPortrait.php:983 RecurringSalesOrders.php:320
@@ -3145,32 +3147,32 @@
msgid "Item Description"
msgstr "Popis položky"
-#: ConfirmDispatch_Invoice.php:267 GoodsReceived.php:88 GoodsReceived.php:92
+#: ConfirmDispatch_Invoice.php:265 GoodsReceived.php:88 GoodsReceived.php:92
#: PDFOrdersInvoiced.php:343 PDFOrderStatus.php:317 Shipments.php:385
#: Shipments.php:463
msgid "Ordered"
msgstr "Objednáno"
-#: ConfirmDispatch_Invoice.php:269 FTP_RadioBeacon.php:83 GoodsReceived.php:90
+#: ConfirmDispatch_Invoice.php:267 FTP_RadioBeacon.php:83 GoodsReceived.php:90
#: GoodsReceived.php:94
#, php-format
msgid "Already"
msgstr "Již"
-#: ConfirmDispatch_Invoice.php:269 FTP_RadioBeacon.php:83
+#: ConfirmDispatch_Invoice.php:267 FTP_RadioBeacon.php:83
#, php-format
msgid "Sent"
msgstr "odesláno"
-#: ConfirmDispatch_Invoice.php:270
+#: ConfirmDispatch_Invoice.php:268
msgid "This Dispatch"
msgstr "Tato zásilka"
-#: ConfirmDispatch_Invoice.php:271 CounterSales.php:704 Credit_Invoice.php:276
+#: ConfirmDispatch_Invoice.php:269 CounterSales.php:704 Credit_Invoice.php:276
#: DeliveryDetails.php:824 DeliveryDetails.php:889 GoodsReceived.php:98
#: OffersReceived.php:97 OffersReceived.php:197 OffersReceived.php:244
#: OrderDetails.php:157 PDFOrdersInvoiced.php:385 PDFPriceList.php:359
-#: PDFPrintLabel.php:238 PO_AuthoriseMyOrders.php:115 PricesByCost.php:211
+#: PDFPrintLabel.php:238 PO_AuthoriseMyOrders.php:115 PricesByCost.php:228
#: Prices_Customer.php:345 Prices.php:219 Prices.php:331
#: PrintCustTrans.php:803 PrintCustTrans.php:891 PrintCustTrans.php:938
#: PrintCustTransPortrait.php:859 PrintCustTransPortrait.php:942
@@ -3188,7 +3190,7 @@
msgid "Price"
msgstr "Cena"
-#: ConfirmDispatch_Invoice.php:272 CounterSales.php:705 Credit_Invoice.php:277
+#: ConfirmDispatch_Invoice.php:270 CounterSales.php:705 Credit_Invoice.php:277
#: CustomerReceipt.php:843 DeliveryDetails.php:825 OrderDetails.php:158
#: PrintCustTrans.php:804 PrintCustTrans.php:892 PrintCustTrans.php:939
#: PrintCustTransPortrait.php:860 PrintCustTransPortrait.php:943
@@ -3201,7 +3203,7 @@
msgid "Discount"
msgstr "Sleva"
-#: ConfirmDispatch_Invoice.php:273 ConfirmDispatch_Invoice.php:277
+#: ConfirmDispatch_Invoice.php:271 ConfirmDispatch_Invoice.php:275
#: CounterSales.php:709 CounterSales.php:796 Credit_Invoice.php:278
#: Credit_Invoice.php:282 CustomerAllocations.php:332
#: CustomerAllocations.php:358 CustomerInquiry.php:197 DeliveryDetails.php:826
@@ -3214,14 +3216,17 @@
#: OffersReceived.php:98 OrderDetails.php:159 PDFCustTransListing.php:125
#: PDFOrdersInvoiced.php:386 PDFRemittanceAdvice.php:310
#: PDFSuppTransListing.php:125 RecurringSalesOrders.php:325
-#: SelectCreditItems.php:656 SelectCreditItems.php:660
-#: SelectOrderItems.php:1314 SuppContractChgs.php:98 SuppFixedAssetChgs.php:91
-#: SupplierAllocations.php:456 SupplierAllocations.php:560
-#: SupplierAllocations.php:631 SupplierCredit.php:394 SupplierCredit.php:429
-#: SupplierCredit.php:464 SupplierInquiry.php:202 SupplierInvoice.php:332
-#: SupplierInvoice.php:362 SupplierInvoice.php:395 SupplierInvoice.php:424
-#: SuppShiptChgs.php:96 SuppTransGLAnalysis.php:132
-#: Z_CheckDebtorsControl.php:157 includes/PDFQuotationPageHeader.inc:107
+#: SalesByTypePeriodInquiry.php:366 SalesByTypePeriodInquiry.php:401
+#: SalesByTypePeriodInquiry.php:436 SalesByTypePeriodInquiry.php:471
+#: SalesByTypePeriodInquiry.php:532 SelectCreditItems.php:656
+#: SelectCreditItems.php:660 SelectOrderItems.php:1314 SuppContractChgs.php:98
+#: SuppFixedAssetChgs.php:91 SupplierAllocations.php:456
+#: SupplierAllocations.php:560 SupplierAllocations.php:631
+#: SupplierCredit.php:394 SupplierCredit.php:429 SupplierCredit.php:464
+#: SupplierInquiry.php:202 SupplierInvoice.php:332 SupplierInvoice.php:362
+#: SupplierInvoice.php:395 SupplierInvoice.php:424 SuppShiptChgs.php:96
+#: SuppTransGLAnalysis.php:132 Z_CheckDebtorsControl.php:157
+#: includes/PDFQuotationPageHeader.inc:107
#: includes/PDFQuotationPortraitPageHeader.inc:106
#: includes/PO_PDFOrderPageHeader.inc:82 api/api_debtortransactions.php:364
#: api/api_debtortransactions.php:377 api/api_debtortransactions.php:503
@@ -3229,21 +3234,21 @@
msgid "Total"
msgstr "Celkem"
-#: ConfirmDispatch_Invoice.php:273 Credit_Invoice.php:278
+#: ConfirmDispatch_Invoice.php:271 Credit_Invoice.php:278
#: SelectCreditItems.php:656
msgid "Excl Tax"
msgstr "bez DPH"
-#: ConfirmDispatch_Invoice.php:274 Credit_Invoice.php:279
+#: ConfirmDispatch_Invoice.php:272 Credit_Invoice.php:279
#: SelectCreditItems.php:657 SupplierInvoice.php:233 TaxGroups.php:270
msgid "Tax Authority"
msgstr "Daňový úřad"
-#: ConfirmDispatch_Invoice.php:275
+#: ConfirmDispatch_Invoice.php:273
msgid "Tax %"
msgstr "DPH %"
-#: ConfirmDispatch_Invoice.php:276 CounterSales.php:708 Credit_Invoice.php:280
+#: ConfirmDispatch_Invoice.php:274 CounterSales.php:708 Credit_Invoice.php:280
#: Credit_Invoice.php:281 PrintCustTrans.php:391 PrintCustTrans.php:976
#: PrintCustTransPortrait.php:450 PrintCustTransPortrait.php:1023
#: SelectCreditItems.php:658 SelectCreditItems.php:659
@@ -3251,32 +3256,32 @@
msgid "Tax"
msgstr "DPH"
-#: ConfirmDispatch_Invoice.php:277 CounterSales.php:709 Credit_Invoice.php:282
+#: ConfirmDispatch_Invoice.php:275 CounterSales.php:709 Credit_Invoice.php:282
#: SelectCreditItems.php:660
msgid "Incl Tax"
msgstr "včetně DPH"
-#: ConfirmDispatch_Invoice.php:391 StockLocTransferReceive.php:481
+#: ConfirmDispatch_Invoice.php:388 StockLocTransferReceive.php:481
msgid "Enter Serial Numbers"
msgstr "Vložit sériová čísla"
-#: ConfirmDispatch_Invoice.php:393
+#: ConfirmDispatch_Invoice.php:390
msgid "Enter Batch/Roll/Lot #"
msgstr "Zadejte Dávkové / role / položka #"
-#: ConfirmDispatch_Invoice.php:428
+#: ConfirmDispatch_Invoice.php:425
msgid "There was a problem testing for a default shipper because"
msgstr "Tam byl problém testování pro přepravce, protože výchozí"
-#: ConfirmDispatch_Invoice.php:434
+#: ConfirmDispatch_Invoice.php:431
msgid "There was a problem testing for a default shipper"
msgstr "Tam byl problém testování na výchozí odesílatele"
-#: ConfirmDispatch_Invoice.php:440
+#: ConfirmDispatch_Invoice.php:437
msgid "There are no shippers defined"
msgstr "Nejsou definováni žádní dopravci"
-#: ConfirmDispatch_Invoice.php:440
+#: ConfirmDispatch_Invoice.php:437
msgid ""
"Please use the link below to set up shipping freight companies, the system "
"expects the shipping company to be selected or a default freight company to "
@@ -3286,7 +3291,7 @@
"systém očekává, že námořní společnosti, které budou vybrány, nebo výchozí "
"nákladní společnost mají být použity"
-#: ConfirmDispatch_Invoice.php:441 DeliveryDetails.php:244 Prices.php:342
+#: ConfirmDispatch_Invoice.php:438 DeliveryDetails.php:244 Prices.php:342
#: includes/InputSerialItemsExisting.php:58
#: includes/InputSerialItemsKeyed.php:139
#: includes/InputSerialItemsSequential.php:48
@@ -3294,35 +3299,35 @@
msgid "Enter"
msgstr "Vložit"
-#: ConfirmDispatch_Invoice.php:441 DeliveryDetails.php:244
+#: ConfirmDispatch_Invoice.php:438 DeliveryDetails.php:244
msgid "Amend Freight Companies"
msgstr "Mění se Nákladní Firmy"
-#: ConfirmDispatch_Invoice.php:452
+#: ConfirmDispatch_Invoice.php:449
msgid "Order Freight Cost"
msgstr "Cena za dopravu"
-#: ConfirmDispatch_Invoice.php:456
+#: ConfirmDispatch_Invoice.php:453
msgid "Recalculated Freight Cost"
msgstr "Přepočítána přepravní náklady"
-#: ConfirmDispatch_Invoice.php:466 ConfirmDispatch_Invoice.php:470
+#: ConfirmDispatch_Invoice.php:463 ConfirmDispatch_Invoice.php:467
msgid "Charge Freight Cost inc Tax"
msgstr "Účtovat přepravní náklady s DPH"
-#: ConfirmDispatch_Invoice.php:535
+#: ConfirmDispatch_Invoice.php:532
msgid "Invoice Totals"
msgstr "Faktura celkem"
-#: ConfirmDispatch_Invoice.php:565
+#: ConfirmDispatch_Invoice.php:562
msgid "There are no lines on this order with a quantity to invoice"
msgstr "Tam nejsou žádné čáry na této objednávky se množství faktury"
-#: ConfirmDispatch_Invoice.php:565
+#: ConfirmDispatch_Invoice.php:562
msgid "No further processing has been done"
msgstr "Žádné další zpracování bylo provedeno"
-#: ConfirmDispatch_Invoice.php:583 CounterSales.php:894
+#: ConfirmDispatch_Invoice.php:580 CounterSales.php:894
msgid ""
"Could not retrieve the quantity left at the location once this order is "
"invoiced (for the purposes of checking that stock will not go negative "
@@ -3331,7 +3336,7 @@
"Nepodařilo se načíst množství vlevo na místě, jakmile toto pořadí je "
"fakturováno (za účelem kontroly, zda vozidla nepůjde, protože negativní)"
-#: ConfirmDispatch_Invoice.php:588 CounterSales.php:899
+#: ConfirmDispatch_Invoice.php:585 CounterSales.php:899
msgid ""
"Invoicing the selected order would result in negative stock. The system "
"parameters are set to prohibit negative stocks from occurring. This invoice "
@@ -3341,12 +3346,12 @@
"systému jsou nastaveny zakázat negativní zásoby od nastávání. Tato faktura "
"může být vytvořena do vyprodání na ruce je opraven."
-#: ConfirmDispatch_Invoice.php:588 ConfirmDispatch_Invoice.php:611
+#: ConfirmDispatch_Invoice.php:585 ConfirmDispatch_Invoice.php:608
#: CounterSales.php:899 CounterSales.php:922 WorkOrderReceive.php:154
msgid "Negative Stock Prohibited"
msgstr "Negativní Zakázané skladem"
-#: ConfirmDispatch_Invoice.php:607 CounterSales.php:918
+#: ConfirmDispatch_Invoice.php:604 CounterSales.php:918
msgid ""
"Could not retrieve the component quantity left at the location once the "
"assembly item on this order is invoiced (for the purposes of checking that "
@@ -3356,7 +3361,7 @@
"na tomto pořadí je fakturováno (za účelem kontroly, zda vozidla nepůjde, "
"protože negativní)"
-#: ConfirmDispatch_Invoice.php:611 CounterSales.php:922
+#: ConfirmDispatch_Invoice.php:608 CounterSales.php:922
msgid ""
"Invoicing the selected order would result in negative stock for a component "
"of an assembly item on the order. The system parameters are set to prohibit "
@@ -3368,34 +3373,34 @@
"negativní zásoby od nastávání. Tato faktura může být vytvořena do vyprodání "
"na ruce je opraven."
-#: ConfirmDispatch_Invoice.php:637
+#: ConfirmDispatch_Invoice.php:634
msgid ""
"We were unable to load Area where the Sale is to from the BRANCHES table"
msgstr "Nebyli jsme schopni načíst oblast, kde Prodej je z tabulky OBORY"
-#: ConfirmDispatch_Invoice.php:637
+#: ConfirmDispatch_Invoice.php:634
msgid "Please remedy this"
msgstr "Prosím nápravě tohoto"
-#: ConfirmDispatch_Invoice.php:648 Credit_Invoice.php:485
+#: ConfirmDispatch_Invoice.php:645 Credit_Invoice.php:485
#: GoodsReceived.php:252
msgid "The company information and preferences could not be retrieved"
msgstr "Informace o společnosti a preference se nepodařilo získat"
-#: ConfirmDispatch_Invoice.php:648 Credit_Invoice.php:485
+#: ConfirmDispatch_Invoice.php:645 Credit_Invoice.php:485
#: GoodsReceived.php:252
msgid "see your system administrator"
msgstr "kontaktujte administrátora"
-#: ConfirmDispatch_Invoice.php:671
+#: ConfirmDispatch_Invoice.php:668
msgid "Number of rows returned by SQL"
msgstr "Počet řádků vrácených SQL dotazem"
-#: ConfirmDispatch_Invoice.php:672
+#: ConfirmDispatch_Invoice.php:669
msgid "Count of items in the session"
msgstr "Počet položek v relaci"
-#: ConfirmDispatch_Invoice.php:676 ConfirmDispatch_Invoice.php:695
+#: ConfirmDispatch_Invoice.php:673 ConfirmDispatch_Invoice.php:692
msgid ""
"This order has been changed or invoiced since this delivery was started to "
"be confirmed"
@@ -3403,15 +3408,15 @@
"Tento příkaz byl změněn nebo fakturovány, protože tato dodávka byla zahájena "
"bude potvrzeno"
-#: ConfirmDispatch_Invoice.php:676 GoodsReceived.php:289
+#: ConfirmDispatch_Invoice.php:673 GoodsReceived.php:289
msgid "Processing halted"
msgstr "Zpracování zastaveno"
-#: ConfirmDispatch_Invoice.php:676
+#: ConfirmDispatch_Invoice.php:673
msgid "To enter and confirm this dispatch"
msgstr "Chcete-li zadat a potvrdit tuto expedici"
-#: ConfirmDispatch_Invoice.php:676
+#: ConfirmDispatch_Invoice.php:673
msgid ""
"invoice the order must be re-selected and re-read again to update the "
"changes made by the other user"
@@ -3419,31 +3424,31 @@
"faktura příkaz musí být re-vybraný a re-číst a aktualizovat změny provedené "
"ostatními uživateli"
-#: ConfirmDispatch_Invoice.php:690
+#: ConfirmDispatch_Invoice.php:687
msgid "Orig order for"
msgstr "Orig aby"
-#: ConfirmDispatch_Invoice.php:690
+#: ConfirmDispatch_Invoice.php:687
msgid "has a quantity of"
msgstr "má množství"
-#: ConfirmDispatch_Invoice.php:691
+#: ConfirmDispatch_Invoice.php:688
msgid "and an invoiced qty of"
msgstr "a fakturované Množství"
-#: ConfirmDispatch_Invoice.php:692
+#: ConfirmDispatch_Invoice.php:689
msgid "the session shows quantity of"
msgstr "zasedání ukazuje množství"
-#: ConfirmDispatch_Invoice.php:693
+#: ConfirmDispatch_Invoice.php:690
msgid "and quantity invoice of"
msgstr "a množství fakturu"
-#: ConfirmDispatch_Invoice.php:695
+#: ConfirmDispatch_Invoice.php:692
msgid "Processing halted."
msgstr "Zpracování zastaveno."
-#: ConfirmDispatch_Invoice.php:695
+#: ConfirmDispatch_Invoice.php:692
msgid ""
"To enter and confirm this dispatch, it must be re-selected and re-read again "
"to update the changes made by the other user"
@@ -3451,33 +3456,33 @@
"Chcete-li zadat a potvrdit tuto expedici, je třeba re-vybraný a re-číst a "
"aktualizovat změny provedené ostatními uživateli"
-#: ConfirmDispatch_Invoice.php:698
+#: ConfirmDispatch_Invoice.php:695
msgid "Select a sales order for confirming deliveries and invoicing"
msgstr "Vyberte prodejní objednávky k potvrzení dodávky a fakturace"
-#: ConfirmDispatch_Invoice.php:728
+#: ConfirmDispatch_Invoice.php:725
msgid "Could not update the default shipping carrier for this branch because"
msgstr "Nemohu aktualizovat výchozí lodní dopravce pro tento obor, protože"
-#: ConfirmDispatch_Invoice.php:729
+#: ConfirmDispatch_Invoice.php:726
msgid "The SQL used to update the branch default carrier was"
msgstr "SQL používaných k aktualizaci pobočky výchozí dopravce byl"
-#: ConfirmDispatch_Invoice.php:740 ConfirmDispatch_Invoice.php:782
-#: ConfirmDispatch_Invoice.php:798 ConfirmDispatch_Invoice.php:830
-#: ConfirmDispatch_Invoice.php:853 ConfirmDispatch_Invoice.php:882
-#: ConfirmDispatch_Invoice.php:908 ConfirmDispatch_Invoice.php:945
-#: ConfirmDispatch_Invoice.php:964 ConfirmDispatch_Invoice.php:978
-#: ConfirmDispatch_Invoice.php:1018 ConfirmDispatch_Invoice.php:1028
-#: ConfirmDispatch_Invoice.php:1111 ConfirmDispatch_Invoice.php:1132
-#: ConfirmDispatch_Invoice.php:1150 ConfirmDispatch_Invoice.php:1165
-#: ConfirmDispatch_Invoice.php:1289 ConfirmDispatch_Invoice.php:1312
-#: ConfirmDispatch_Invoice.php:1339 ConfirmDispatch_Invo...
[truncated message content] |
|
From: <dai...@us...> - 2011-05-29 10:04:55
|
Revision: 4583
http://web-erp.svn.sourceforge.net/web-erp/?rev=4583&view=rev
Author: daintree
Date: 2011-05-29 10:04:48 +0000 (Sun, 29 May 2011)
Log Message:
-----------
pre 4.04.1
Modified Paths:
--------------
trunk/locale/en_US.utf8/LC_MESSAGES/messages.po
Added Paths:
-----------
trunk/build/TruncateAuditTrail.sql
Added: trunk/build/TruncateAuditTrail.sql
===================================================================
--- trunk/build/TruncateAuditTrail.sql (rev 0)
+++ trunk/build/TruncateAuditTrail.sql 2011-05-29 10:04:48 UTC (rev 4583)
@@ -0,0 +1,2 @@
+USE weberpdemo;
+TRUNCATE TABLE audittrail;
Modified: trunk/locale/en_US.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/en_US.utf8/LC_MESSAGES/messages.po 2011-05-29 09:57:07 UTC (rev 4582)
+++ trunk/locale/en_US.utf8/LC_MESSAGES/messages.po 2011-05-29 10:04:48 UTC (rev 4583)
@@ -17610,7 +17610,7 @@
#: PO_Header.php:153
#, fuzzy
msgid "The order status could not be updated because"
-msgstr "The territory could not be added or updated because"
+msgstr ""
#: PO_Header.php:227
msgid "An error occurred updating the purchase order to allow reprints"
@@ -17713,7 +17713,7 @@
#: SelectSupplier.php:246 Suppliers.php:655 Suppliers.php:839
msgid "Supplier Name"
msgstr "Vendor Name"
-
+Vendor Orde
#: PO_Header.php:595
msgid " Modify Purchase Order Number"
msgstr ""
@@ -17900,7 +17900,7 @@
#: PO_Items.php:113 PO_Items.php:118 SelectSalesOrder.php:165
#, fuzzy
msgid "Order Created by"
-msgstr "Sales Order Inquiry"
+msgstr ""
#: PO_Items.php:196 SelectSalesOrder.php:224 SpecialOrder.php:312
msgid ""
@@ -17939,14 +17939,14 @@
#: PO_Items.php:284
#, fuzzy
msgid "The purchase order could not be deleted because"
-msgstr "The Shipping cost record could not be updated because"
+msgstr ""
#: PO_Items.php:285
#, fuzzy
msgid ""
"The SQL statement used to delete the purchase order header record, that "
"failed was"
-msgstr "The SQL used to retrieve the vendor details and failed was"
+msgstr ""
#: PO_Items.php:351
msgid "One of the purchase order detail records could not be updated because"
@@ -18000,7 +18000,7 @@
#: PO_Items.php:417
#, fuzzy
msgid "The SQL used to retrieve the details of the account, but failed was"
-msgstr "The SQL used to retrieve the vendor details and failed was"
+msgstr ""
#: PO_Items.php:421
msgid ""
@@ -18079,7 +18079,7 @@
#: PO_Items.php:636
#, fuzzy
msgid " Order Summary"
-msgstr "Sales Order Inquiry"
+msgstr ""
#: PO_Items.php:641
msgid "Quantity Our Units"
@@ -18145,7 +18145,7 @@
#: PO_Items.php:733 SuppFixedAssetChgs.php:115
#, fuzzy
msgid "New Fixed Asset"
-msgstr "Sales Territory Maintenance"
+msgstr ""
#: PO_Items.php:734
msgid "Quantity to purchase"
@@ -18170,7 +18170,7 @@
#: PO_Items.php:932
#, fuzzy
msgid "Supplier/Order"
-msgstr "Vendor Order"
+msgstr "Vendor/Order"
#: PO_Items.php:933
msgid "Go to end of list"
@@ -18380,7 +18380,7 @@
#: PO_PDFPurchOrder.php:304 PO_PDFPurchOrder.php:310
#, fuzzy
msgid "Email a Purchase Order"
-msgstr "Vendor Order"
+msgstr ""
#: PO_PDFPurchOrder.php:307 PrintCustTrans.php:452
#: PrintCustTransPortrait.php:504
@@ -18402,7 +18402,7 @@
#: PO_PDFPurchOrder.php:317
#, fuzzy
msgid "Printed by"
-msgstr "Vendor Balance Listing"
+msgstr ""
#: PO_PDFPurchOrder.php:337
msgid "Print or Email the Order"
@@ -18446,7 +18446,7 @@
#: SalesInquiry.php:1130 SalesInquiry.php:1146
#, fuzzy
msgid "Customer Number"
-msgstr "Vendor Number"
+msgstr ""
#: POReport.php:495 POReport.php:737 POReport.php:738 POReport.php:1250
#: POReport.php:1422 POReport.php:1423 POReport.php:1579 SalesGraph.php:252
@@ -18458,7 +18458,7 @@
#: POReport.php:511
#, fuzzy
msgid "Header Details"
-msgstr "Credit Shipping"
+msgstr ""
#: POReport.php:513 POReport.php:1265
msgid "By"
@@ -18871,7 +18871,7 @@
#: PricesBasedOnMarkUp.php:269
#, fuzzy
msgid "There is no preferred supplier data for the item"
-msgstr "there is no purchasing data set up for this vendor"
+msgstr "There is no preferred vendor for this item"
#: PricesBasedOnMarkUp.php:269 PricesBasedOnMarkUp.php:272
#: PricesBasedOnMarkUp.php:291
@@ -19272,7 +19272,7 @@
#: PrintCustStatements.php:89 PrintCustStatements.php:431
#, fuzzy
msgid "Print Customer Account Statements"
-msgstr "Vendor Contacts"
+msgstr ""
#: PrintCustStatements.php:90
msgid "There were no Customers matching your selection of "
@@ -19662,7 +19662,7 @@
#: PurchData.php:141
#, fuzzy
msgid "This purchasing data record has been successfully deleted"
-msgstr "The shipping-method record has been deleted"
+msgstr ""
#: PurchData.php:146 PurchData.php:257 PurchData.php:276
msgid "For Stock Code"
@@ -19677,7 +19677,7 @@
#: PurchData.php:166
#, fuzzy
msgid "There is no purchasing data set up for the part selected"
-msgstr "there is no purchasing data set up for this vendor"
+msgstr "There is no purchasing data set up for this vendor"
#: PurchData.php:173
msgid "Conversion Factor"
@@ -19840,7 +19840,7 @@
#: PurchData.php:485
#, fuzzy
msgid "MinOrderQty"
-msgstr "Sales Order Inquiry"
+msgstr "Min Order Qty"
#: PurchData.php:487
#, fuzzy
@@ -20109,7 +20109,7 @@
#: includes/DefineSuppTransClass.php:72
#, fuzzy
msgid "The taxes and rates for this item could not be retrieved because"
-msgstr "The Vendor details could not be retrieved by the SQL because"
+msgstr ""
#: RecurringSalesOrdersProcess.php:576
msgid "The following SQL to insert the tax GLTrans record was used"
@@ -20159,7 +20159,7 @@
#: ReorderLevelLocation.php:56 ReorderLevelLocation.php:58
#, fuzzy
msgid "At All Locations"
-msgstr "Vendor Selection"
+msgstr ""
#: ReorderLevelLocation.php:57 ReorderLevelLocation.php:59
msgid "At Location"
@@ -20198,7 +20198,7 @@
#: ReorderLevelLocation.php:200 includes/PDFTopItemsHeader.inc:30
#, fuzzy
msgid "Order By"
-msgstr "Sales Order Inquiry"
+msgstr ""
#: ReorderLevel.php:12 ReorderLevel.php:238
msgid "Reorder Level Report"
@@ -20211,7 +20211,7 @@
#: ReorderLevel.php:59
#, fuzzy
msgid "The Reorder Level report could not be retrieved by the SQL because"
-msgstr "The Vendor details could not be retrieved by the SQL because"
+msgstr ""
#: ReorderLevel.php:146
msgid "Print Reorder Level Report"
@@ -20246,17 +20246,17 @@
#: ReprintGRN.php:18
#, fuzzy
msgid "Select a purchase order"
-msgstr "Select Vendor"
+msgstr "Select vendor order"
#: ReprintGRN.php:19
#, fuzzy
msgid "Enter a Purchase Order Number"
-msgstr "there is no purchasing data set up for this vendor"
+msgstr ""
#: ReprintGRN.php:29
#, fuzzy
msgid "You must enter a purchase order number in the box above"
-msgstr "You should enter the shipping address in the box provided"
+msgstr ""
#: ReprintGRN.php:40
msgid "This purchase order does not exist on the system. Please try again."
@@ -20265,22 +20265,22 @@
#: ReprintGRN.php:63
#, fuzzy
msgid "There are no GRNs for this purchase order that can be reprinted."
-msgstr "The Shipping cost record could not be updated because"
+msgstr ""
#: ReprintGRN.php:69
#, fuzzy
msgid "GRNs for Purchase Order No"
-msgstr "Vendor Order"
+msgstr ""
#: ReprintGRN.php:71
#, fuzzy
msgid "PO Order line"
-msgstr "Sales Order Inquiry"
+msgstr ""
#: ReprintGRN.php:72
#, fuzzy
msgid "GRN Number"
-msgstr "Vendor Number"
+msgstr ""
#: ReprintGRN.php:76 SelectWorkOrder.php:302 StockLocTransferReceive.php:433
#: WorkOrderCosting.php:85 WorkOrderReceive.php:867
@@ -20372,22 +20372,22 @@
#, fuzzy
msgid ""
"The purchase order statusand status comment could not be changed because"
-msgstr "The Shipping cost record could not be updated because"
+msgstr ""
#: ReverseGRN.php:139
#, fuzzy
msgid "The following SQL to update the purchase order header record was used"
-msgstr "The SQL used to retrieve the vendor details and failed was"
+msgstr ""
#: ReverseGRN.php:147
#, fuzzy
msgid "The GRN record could not be deleted because"
-msgstr "The Shipping cost record could not be updated because"
+msgstr ""
#: ReverseGRN.php:148
#, fuzzy
msgid "The following SQL to delete the GRN record was used"
-msgstr "The SQL used to retrieve the vendor details and failed was"
+msgstr "s"
#: ReverseGRN.php:155
msgid "The GRN record could not be updated"
@@ -20407,7 +20407,7 @@
#, fuzzy
msgid ""
"The following SQL was used to attempt the reduce the cost of the asset was:"
-msgstr "The SQL used to retrieve the vendor details and failed was"
+msgstr ""
#: ReverseGRN.php:191
msgid "Could not determine if the item exists because"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-05-29 10:04:55
|
Revision: 4583
http://web-erp.svn.sourceforge.net/web-erp/?rev=4583&view=rev
Author: daintree
Date: 2011-05-29 10:04:48 +0000 (Sun, 29 May 2011)
Log Message:
-----------
pre 4.04.1
Modified Paths:
--------------
trunk/locale/en_US.utf8/LC_MESSAGES/messages.po
Added Paths:
-----------
trunk/build/TruncateAuditTrail.sql
Added: trunk/build/TruncateAuditTrail.sql
===================================================================
--- trunk/build/TruncateAuditTrail.sql (rev 0)
+++ trunk/build/TruncateAuditTrail.sql 2011-05-29 10:04:48 UTC (rev 4583)
@@ -0,0 +1,2 @@
+USE weberpdemo;
+TRUNCATE TABLE audittrail;
Modified: trunk/locale/en_US.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/en_US.utf8/LC_MESSAGES/messages.po 2011-05-29 09:57:07 UTC (rev 4582)
+++ trunk/locale/en_US.utf8/LC_MESSAGES/messages.po 2011-05-29 10:04:48 UTC (rev 4583)
@@ -17610,7 +17610,7 @@
#: PO_Header.php:153
#, fuzzy
msgid "The order status could not be updated because"
-msgstr "The territory could not be added or updated because"
+msgstr ""
#: PO_Header.php:227
msgid "An error occurred updating the purchase order to allow reprints"
@@ -17713,7 +17713,7 @@
#: SelectSupplier.php:246 Suppliers.php:655 Suppliers.php:839
msgid "Supplier Name"
msgstr "Vendor Name"
-
+Vendor Orde
#: PO_Header.php:595
msgid " Modify Purchase Order Number"
msgstr ""
@@ -17900,7 +17900,7 @@
#: PO_Items.php:113 PO_Items.php:118 SelectSalesOrder.php:165
#, fuzzy
msgid "Order Created by"
-msgstr "Sales Order Inquiry"
+msgstr ""
#: PO_Items.php:196 SelectSalesOrder.php:224 SpecialOrder.php:312
msgid ""
@@ -17939,14 +17939,14 @@
#: PO_Items.php:284
#, fuzzy
msgid "The purchase order could not be deleted because"
-msgstr "The Shipping cost record could not be updated because"
+msgstr ""
#: PO_Items.php:285
#, fuzzy
msgid ""
"The SQL statement used to delete the purchase order header record, that "
"failed was"
-msgstr "The SQL used to retrieve the vendor details and failed was"
+msgstr ""
#: PO_Items.php:351
msgid "One of the purchase order detail records could not be updated because"
@@ -18000,7 +18000,7 @@
#: PO_Items.php:417
#, fuzzy
msgid "The SQL used to retrieve the details of the account, but failed was"
-msgstr "The SQL used to retrieve the vendor details and failed was"
+msgstr ""
#: PO_Items.php:421
msgid ""
@@ -18079,7 +18079,7 @@
#: PO_Items.php:636
#, fuzzy
msgid " Order Summary"
-msgstr "Sales Order Inquiry"
+msgstr ""
#: PO_Items.php:641
msgid "Quantity Our Units"
@@ -18145,7 +18145,7 @@
#: PO_Items.php:733 SuppFixedAssetChgs.php:115
#, fuzzy
msgid "New Fixed Asset"
-msgstr "Sales Territory Maintenance"
+msgstr ""
#: PO_Items.php:734
msgid "Quantity to purchase"
@@ -18170,7 +18170,7 @@
#: PO_Items.php:932
#, fuzzy
msgid "Supplier/Order"
-msgstr "Vendor Order"
+msgstr "Vendor/Order"
#: PO_Items.php:933
msgid "Go to end of list"
@@ -18380,7 +18380,7 @@
#: PO_PDFPurchOrder.php:304 PO_PDFPurchOrder.php:310
#, fuzzy
msgid "Email a Purchase Order"
-msgstr "Vendor Order"
+msgstr ""
#: PO_PDFPurchOrder.php:307 PrintCustTrans.php:452
#: PrintCustTransPortrait.php:504
@@ -18402,7 +18402,7 @@
#: PO_PDFPurchOrder.php:317
#, fuzzy
msgid "Printed by"
-msgstr "Vendor Balance Listing"
+msgstr ""
#: PO_PDFPurchOrder.php:337
msgid "Print or Email the Order"
@@ -18446,7 +18446,7 @@
#: SalesInquiry.php:1130 SalesInquiry.php:1146
#, fuzzy
msgid "Customer Number"
-msgstr "Vendor Number"
+msgstr ""
#: POReport.php:495 POReport.php:737 POReport.php:738 POReport.php:1250
#: POReport.php:1422 POReport.php:1423 POReport.php:1579 SalesGraph.php:252
@@ -18458,7 +18458,7 @@
#: POReport.php:511
#, fuzzy
msgid "Header Details"
-msgstr "Credit Shipping"
+msgstr ""
#: POReport.php:513 POReport.php:1265
msgid "By"
@@ -18871,7 +18871,7 @@
#: PricesBasedOnMarkUp.php:269
#, fuzzy
msgid "There is no preferred supplier data for the item"
-msgstr "there is no purchasing data set up for this vendor"
+msgstr "There is no preferred vendor for this item"
#: PricesBasedOnMarkUp.php:269 PricesBasedOnMarkUp.php:272
#: PricesBasedOnMarkUp.php:291
@@ -19272,7 +19272,7 @@
#: PrintCustStatements.php:89 PrintCustStatements.php:431
#, fuzzy
msgid "Print Customer Account Statements"
-msgstr "Vendor Contacts"
+msgstr ""
#: PrintCustStatements.php:90
msgid "There were no Customers matching your selection of "
@@ -19662,7 +19662,7 @@
#: PurchData.php:141
#, fuzzy
msgid "This purchasing data record has been successfully deleted"
-msgstr "The shipping-method record has been deleted"
+msgstr ""
#: PurchData.php:146 PurchData.php:257 PurchData.php:276
msgid "For Stock Code"
@@ -19677,7 +19677,7 @@
#: PurchData.php:166
#, fuzzy
msgid "There is no purchasing data set up for the part selected"
-msgstr "there is no purchasing data set up for this vendor"
+msgstr "There is no purchasing data set up for this vendor"
#: PurchData.php:173
msgid "Conversion Factor"
@@ -19840,7 +19840,7 @@
#: PurchData.php:485
#, fuzzy
msgid "MinOrderQty"
-msgstr "Sales Order Inquiry"
+msgstr "Min Order Qty"
#: PurchData.php:487
#, fuzzy
@@ -20109,7 +20109,7 @@
#: includes/DefineSuppTransClass.php:72
#, fuzzy
msgid "The taxes and rates for this item could not be retrieved because"
-msgstr "The Vendor details could not be retrieved by the SQL because"
+msgstr ""
#: RecurringSalesOrdersProcess.php:576
msgid "The following SQL to insert the tax GLTrans record was used"
@@ -20159,7 +20159,7 @@
#: ReorderLevelLocation.php:56 ReorderLevelLocation.php:58
#, fuzzy
msgid "At All Locations"
-msgstr "Vendor Selection"
+msgstr ""
#: ReorderLevelLocation.php:57 ReorderLevelLocation.php:59
msgid "At Location"
@@ -20198,7 +20198,7 @@
#: ReorderLevelLocation.php:200 includes/PDFTopItemsHeader.inc:30
#, fuzzy
msgid "Order By"
-msgstr "Sales Order Inquiry"
+msgstr ""
#: ReorderLevel.php:12 ReorderLevel.php:238
msgid "Reorder Level Report"
@@ -20211,7 +20211,7 @@
#: ReorderLevel.php:59
#, fuzzy
msgid "The Reorder Level report could not be retrieved by the SQL because"
-msgstr "The Vendor details could not be retrieved by the SQL because"
+msgstr ""
#: ReorderLevel.php:146
msgid "Print Reorder Level Report"
@@ -20246,17 +20246,17 @@
#: ReprintGRN.php:18
#, fuzzy
msgid "Select a purchase order"
-msgstr "Select Vendor"
+msgstr "Select vendor order"
#: ReprintGRN.php:19
#, fuzzy
msgid "Enter a Purchase Order Number"
-msgstr "there is no purchasing data set up for this vendor"
+msgstr ""
#: ReprintGRN.php:29
#, fuzzy
msgid "You must enter a purchase order number in the box above"
-msgstr "You should enter the shipping address in the box provided"
+msgstr ""
#: ReprintGRN.php:40
msgid "This purchase order does not exist on the system. Please try again."
@@ -20265,22 +20265,22 @@
#: ReprintGRN.php:63
#, fuzzy
msgid "There are no GRNs for this purchase order that can be reprinted."
-msgstr "The Shipping cost record could not be updated because"
+msgstr ""
#: ReprintGRN.php:69
#, fuzzy
msgid "GRNs for Purchase Order No"
-msgstr "Vendor Order"
+msgstr ""
#: ReprintGRN.php:71
#, fuzzy
msgid "PO Order line"
-msgstr "Sales Order Inquiry"
+msgstr ""
#: ReprintGRN.php:72
#, fuzzy
msgid "GRN Number"
-msgstr "Vendor Number"
+msgstr ""
#: ReprintGRN.php:76 SelectWorkOrder.php:302 StockLocTransferReceive.php:433
#: WorkOrderCosting.php:85 WorkOrderReceive.php:867
@@ -20372,22 +20372,22 @@
#, fuzzy
msgid ""
"The purchase order statusand status comment could not be changed because"
-msgstr "The Shipping cost record could not be updated because"
+msgstr ""
#: ReverseGRN.php:139
#, fuzzy
msgid "The following SQL to update the purchase order header record was used"
-msgstr "The SQL used to retrieve the vendor details and failed was"
+msgstr ""
#: ReverseGRN.php:147
#, fuzzy
msgid "The GRN record could not be deleted because"
-msgstr "The Shipping cost record could not be updated because"
+msgstr ""
#: ReverseGRN.php:148
#, fuzzy
msgid "The following SQL to delete the GRN record was used"
-msgstr "The SQL used to retrieve the vendor details and failed was"
+msgstr "s"
#: ReverseGRN.php:155
msgid "The GRN record could not be updated"
@@ -20407,7 +20407,7 @@
#, fuzzy
msgid ""
"The following SQL was used to attempt the reduce the cost of the asset was:"
-msgstr "The SQL used to retrieve the vendor details and failed was"
+msgstr ""
#: ReverseGRN.php:191
msgid "Could not determine if the item exists because"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-05-30 08:43:36
|
Revision: 4584
http://web-erp.svn.sourceforge.net/web-erp/?rev=4584&view=rev
Author: daintree
Date: 2011-05-30 08:43:29 +0000 (Mon, 30 May 2011)
Log Message:
-----------
bug fixes
Modified Paths:
--------------
trunk/ConfirmDispatchControlled_Invoice.php
trunk/GLAccountCSV.php
trunk/PcAssignCashToTab.php
trunk/PcExpensesTypeTab.php
trunk/PricesByCost.php
trunk/StockAdjustmentsControlled.php
trunk/StockSerialItems.php
trunk/doc/Change.log
trunk/includes/GetConfig.php
trunk/includes/InputSerialItems.php
trunk/includes/InputSerialItemsFile.php
trunk/includes/OutputSerialItems.php
Modified: trunk/ConfirmDispatchControlled_Invoice.php
===================================================================
--- trunk/ConfirmDispatchControlled_Invoice.php 2011-05-29 10:04:48 UTC (rev 4583)
+++ trunk/ConfirmDispatchControlled_Invoice.php 2011-05-30 08:43:29 UTC (rev 4584)
@@ -1,10 +1,9 @@
<?php
-/* $Revision: 1.13 $ */
+
/* $Id$*/
include('includes/DefineCartClass.php');
include('includes/DefineSerialItems.php');
-//$PageSecurity = 11;
include('includes/session.inc');
$title = _('Specify Dispatched Controlled Items');
@@ -16,9 +15,9 @@
} elseif (isset($_POST['LineNo'])){
$LineNo = (int)$_POST['LineNo'];
} else {
- echo '<div class="centre"><a href="' . $rootpath . '/ConfirmDispatch_Invoice.php?' . SID . '">'.
- _('Select a line item to invoice').'</a><br>';
- echo '<br>';
+ echo '<div class="centre"><a href="' . $rootpath . '/ConfirmDispatch_Invoice.php">'.
+ _('Select a line item to invoice').'</a><br />';
+ echo '<br />';
prnMsg( _('This page can only be opened if a line item on a sales order to be invoiced has been selected') . '. ' . _('Please do that first'),'error');
echo '</div>';
include('includes/footer.inc');
@@ -27,8 +26,8 @@
if (!isset($_SESSION['Items']) 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?' . SID . '">'. _('Select a sales order to invoice').
- '</a><br>';
+ echo '<div class="centre"><a href="' . $rootpath . '/SelectSalesOrder.php">'. _('Select a sales order to invoice').
+ '</a><br />';
prnMsg( _('This page can only be opened if a sales order and line item has been selected Please do that first'),'error');
echo '</div>';
include('includes/footer.inc');
@@ -42,8 +41,8 @@
//Make sure this item is really controlled
if ( $LineItem->Controlled != 1 ){
- echo '<div class="centre"><a href="' . $rootpath . '/ConfirmDispatch_Invoice.php?' . SID . '">'. _('Back to the Sales Order'). '</a></div>';
- echo '<br>';
+ echo '<div class="centre"><a href="' . $rootpath . '/ConfirmDispatch_Invoice.php">'. _('Back to the Sales Order'). '</a></div>';
+ echo '<br />';
prnMsg( _('The line item must be defined as controlled to require input of the batch numbers or serial numbers being sold'),'error');
include('includes/footer.inc');
exit;
@@ -54,9 +53,9 @@
********************************************/
echo '<div class="centre">';
-echo '<br><a href="'. $rootpath. '/ConfirmDispatch_Invoice.php?' . SID . '">'. _('Back to Confirmation of Dispatch') . '/' . _('Invoice'). '</a>';
+echo '<br /><a href="'. $rootpath. '/ConfirmDispatch_Invoice.php">'. _('Back to Confirmation of Dispatch') . '/' . _('Invoice'). '</a>';
-echo '<br><font size=2><b>'. _('Dispatch of up to').' '. 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 /><font size=2><b>'. _('Dispatch of up to').' '. 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>';
/** vars needed by InputSerialItem : **/
$StockID = $LineItem->StockID;
@@ -66,7 +65,7 @@
$InOutModifier=1;
$ShowExisting=false;
-include ('includes/OutputSerialItems.php');
+include ('includes/IutputSerialItems.php');
/*TotalQuantity set inside this include file from the sum of the bundles
of the item selected for dispatch */
Modified: trunk/GLAccountCSV.php
===================================================================
--- trunk/GLAccountCSV.php 2011-05-29 10:04:48 UTC (rev 4583)
+++ trunk/GLAccountCSV.php 2011-05-30 08:43:29 UTC (rev 4584)
@@ -29,31 +29,31 @@
<tr>
<td>'._('Selected Accounts') . ':</td>
<td><select name="Account[]" multiple>';
-$sql = 'SELECT accountcode, accountname FROM chartmaster ORDER BY accountcode';
+$sql = "SELECT accountcode, accountname FROM chartmaster ORDER BY accountcode";
$AccountsResult = DB_query($sql,$db);
$i=0;
while ($myrow=DB_fetch_array($AccountsResult,$db)){
if(isset($_POST['Account'][$i]) AND $myrow['accountcode'] == $_POST['Account'][$i]){
- echo '<option selected VALUE=' . $myrow['accountcode'] . '>' . $myrow['accountcode'] . ' ' . $myrow['accountname'] . '</option>';
+ echo '<option selected value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' ' . $myrow['accountname'] . '</option>';
$i++;
} else {
- echo '<option VALUE=' . $myrow['accountcode'] . '>' . $myrow['accountcode'] . ' ' . $myrow['accountname'] . '</option>';
+ echo '<option value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' ' . $myrow['accountname'] . '</option>';
}
}
echo '</select></td>';
echo '<td>'._('For Period range').':</td>
<td><select Name=Period[] multiple>';
-$sql = 'SELECT periodno, lastdate_in_period FROM periods ORDER BY periodno DESC';
+$sql = "SELECT periodno, lastdate_in_period FROM periods ORDER BY periodno DESC";
$Periods = DB_query($sql,$db);
$id=0;
while ($myrow=DB_fetch_array($Periods,$db)){
if (isset($SelectedPeriod[$id]) and $myrow['periodno'] == $SelectedPeriod[$id]){
- echo '<option selected VALUE=' . $myrow['periodno'] . '>' . _(MonthAndYearFromSQLDate($myrow['lastdate_in_period'])) . '</option>';
+ echo '<option selected value="' . $myrow['periodno'] . '">' . _(MonthAndYearFromSQLDate($myrow['lastdate_in_period'])) . '</option>';
$id++;
} else {
- echo '<option VALUE=' . $myrow['periodno'] . '>' . _(MonthAndYearFromSQLDate($myrow['lastdate_in_period'])) . '</option>';
+ echo '<option value="' . $myrow['periodno'] . '">' . _(MonthAndYearFromSQLDate($myrow['lastdate_in_period'])) . '</option>';
}
}
echo '</select></td></tr>';
@@ -61,25 +61,26 @@
//Select the tag
echo '<tr><td>' . _('Select Tag') . ':</td><td><select name="tag">';
-$SQL = 'SELECT tagref,
+$SQL = "SELECT tagref,
tagdescription
- FROM tags
- ORDER BY tagref';
+ FROM tags
+ ORDER BY tagref";
$result=DB_query($SQL,$db);
echo '<option value=0>0 - '._('All tags');
while ($myrow=DB_fetch_array($result)){
if (isset($_POST['tag']) and $_POST['tag']==$myrow['tagref']){
- echo '<option selected value=' . $myrow['tagref'] . '>' . $myrow['tagref'].' - ' .$myrow['tagdescription'] . '</option>';
+ echo '<option selected value="' . $myrow['tagref'] . '">' . $myrow['tagref'].' - ' .$myrow['tagdescription'] . '</option>';
} else {
- echo '<option value=' . $myrow['tagref'] . '>' . $myrow['tagref'].' - ' .$myrow['tagdescription'] . '</option>';
+ echo '<option value="' . $myrow['tagref'] . '">' . $myrow['tagref'].' - ' .$myrow['tagdescription'] . '</option>';
}
}
echo '</select></td></tr>';
// End select tag
-echo "</table><p>
-<div class='centre'><input type=submit name='MakeCSV' VALUE='"._('Make CSV File')."'></div></form>";
+echo '</table><p>
+ <div class="centre"><input type="submit" name="MakeCSV" value="'._('Make CSV File').'"></div>
+ </form>';
/* End of the Form rest of script is what happens if the show button is hit*/
Modified: trunk/PcAssignCashToTab.php
===================================================================
--- trunk/PcAssignCashToTab.php 2011-05-29 10:04:48 UTC (rev 4583)
+++ trunk/PcAssignCashToTab.php 2011-05-30 08:43:29 UTC (rev 4584)
@@ -198,7 +198,7 @@
}
$sql = "SELECT * FROM pcashdetails
WHERE tabcode='" . $SelectedTabs . "'
- AND date >=DATE_SUB(CURDATE(), INTERVAL , " . $Days . " DAY)
+ AND date >=DATE_SUB(CURDATE(), INTERVAL " . $Days . " DAY)
ORDER BY date, counterindex ASC";
Modified: trunk/PcExpensesTypeTab.php
===================================================================
--- trunk/PcExpensesTypeTab.php 2011-05-29 10:04:48 UTC (rev 4583)
+++ trunk/PcExpensesTypeTab.php 2011-05-30 08:43:29 UTC (rev 4584)
@@ -88,7 +88,6 @@
//run the SQL from either of the above possibilites
$result = DB_query($sql,$db);
prnMsg($msg,'success');
-
unset($_POST['SelectedExpense']);
}
@@ -96,10 +95,10 @@
$sql="DELETE FROM pctabexpenses
WHERE typetabcode='".$SelectedTab."'
AND codeexpense='".$SelectedType."'";
+
$ErrMsg = _('The Tab Type record could not be deleted because');
$result = DB_query($sql,$db,$ErrMsg);
prnMsg(_('Expense code').' '. $SelectedType .' '. _('for type of tab').' '. $SelectedTab .' '. _('has been deleted') ,'success');
- unset ($SelectedType);
unset($_GET['delete']);
}
@@ -111,7 +110,7 @@
or deletion of the records*/
echo '<form method="post" action="' . $_SERVER['PHP_SELF'] . '">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- echo '<table class=selection>'; //Main table
+ echo '<table class="selection">'; //Main table
echo '<tr><td>' . _('Select Type of Tab') . ':</td><td><select name="SelectedTab">';
@@ -148,6 +147,10 @@
if (isset($_POST['process'])OR isset($SelectedTab)) {
echo '<p><div class="centre"><a href="' . $_SERVER['PHP_SELF'] . '">' . _('Expense Codes for Type of Tab ') . ' ' .$SelectedTab. '</a></div><p>';
+ echo '<form method="post" action="' . $_SERVER['PHP_SELF'] . '">';
+ echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+
+ echo '<input type="hidden" name="SelectedTab" value="' . $SelectedTab . '">';
$sql = "SELECT pctabexpenses.codeexpense,
pcexpenses.description
@@ -179,7 +182,7 @@
printf('<td>%s</td>
<td>%s</td>
- <td><a href="%s?SelectedType=%s&delete=yes&SelectedTab=' . $_POST['SelectedTab'] . '" onclick="return confirm(\'' . _('Are you sure you wish to delete this code and the expense it may have set up?') . '\');">' . _('Delete') . '</td>
+ <td><a href="%s?SelectedType=%s&delete=yes&SelectedTab=' . $SelectedTab . '" onclick="return confirm(\'' . _('Are you sure you wish to delete this code and the expense it may have set up?') . '\');">' . _('Delete') . '</td>
</tr>',
$myrow['codeexpense'],
$myrow['description'],
@@ -193,8 +196,7 @@
if (! isset($_GET['delete'])) {
- echo '<form method="post" action="' . $_SERVER['PHP_SELF'] . '">';
- echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+
echo '<br /><table class="selection">'; //Main table
echo '<tr><td>' . _('Select Expense Code') . ':</td><td><select name="SelectedExpense">';
@@ -220,11 +222,8 @@
echo '</select></td></tr>';
-
- echo '<input type="hidden" name="SelectedTab" value="' . $SelectedTab . '">';
-
echo '</td></tr></table>'; // close main table
-
+
echo '<p><div class="centre"><input type=submit name=submit value="' . _('Accept') . '">
<input type=submit name="Cancel" value="' . _('Cancel') . '"></div>';
Modified: trunk/PricesByCost.php
===================================================================
--- trunk/PricesByCost.php 2011-05-29 10:04:48 UTC (rev 4583)
+++ trunk/PricesByCost.php 2011-05-30 08:43:29 UTC (rev 4584)
@@ -51,56 +51,73 @@
//Update Prices
$PriceCounter =0;
while ($myrow = DB_fetch_array($result)) {
-
+ /*The logic here goes like this:
+ * 1. If the price at the same start and end date already exists then do nowt!!
+ * 2. If not then check if a price with the start date of today already exists - then we should be updating it
+ * 3. If not either of the above then insert the new price
+ */
$SQLTestExists = "SELECT price FROM prices
WHERE stockid = '" . $_POST['StockID_' . $PriceCounter] . "'
AND prices.typeabbrev ='" . $_POST['SalesType'] . "'
AND prices.currabrev ='" . $_POST['CurrCode'] . "'
AND prices.debtorno ='" . $_POST['DebtorNo_' . $PriceCounter] . "'
AND prices.branchcode ='" . $_POST['BranchCode_' . $PriceCounter] . "'
- AND prices.startdate ='" . date('Y-m-d') . "'";
+ AND prices.startdate ='" . $_POST['StartDate_' . $PriceCounter] . "'
+ AND prices.enddate ='" . $_POST['EndDate_' . $PriceCounter] . "'
+ AND prices.price ='" . $_POST['Price_' . $PriceCounter] . "'";
$TestExistsResult = DB_query($SQLTestExists,$db);
- if (DB_num_rows($TestExistsResult)==1){
- //then we are updating
- $SQLUpdate = "UPDATE prices SET price = '" . $_POST['Price_' . $PriceCounter] . "'
- WHERE stockid = '" . $_POST['StockID_' . $PriceCounter] . "'
- AND prices.typeabbrev ='" . $_POST['SalesType'] . "'
- AND prices.currabrev ='" . $_POST['CurrCode'] . "'
- AND prices.debtorno ='" . $_POST['DebtorNo_' . $PriceCounter] . "'
- AND prices.branchcode ='" . $_POST['BranchCode_' . $PriceCounter] . "'
- AND prices.startdate ='" . date('Y-m-d') . "'
- AND prices.enddate ='" . $_POST['EndDate_' . $PriceCounter] . "'";
- $ResultUpdate = DB_query($SQLUpdate, $db);
- } else {
- //update the old price to have an end date of yesterday too
- $SQLUpdate = "UPDATE prices SET enddate = '" . FormatDateForSQL(DateAdd(Date($_SESSION['DefaultDateFormat']),'d',-1)) . "'
- WHERE stockid = '" . $_POST['StockID_' . $PriceCounter] . "'
- AND prices.typeabbrev ='" . $_POST['SalesType'] . "'
- AND prices.currabrev ='" . $_POST['CurrCode'] . "'
- AND prices.debtorno ='" . $_POST['DebtorNo_' . $PriceCounter] . "'
- AND prices.branchcode ='" . $_POST['BranchCode_' . $PriceCounter] . "'
- AND prices.startdate ='" . $_POST['StartDate_' . $PriceCounter] . "'
- AND prices.enddate ='" . $_POST['EndDate_' . $PriceCounter] . "'";
- $Result = DB_query($SQLUpdate, $db);
- //we need to add a new price from today
- $SQLInsert = "INSERT INTO prices ( stockid,
- price,
- typeabbrev,
- currabrev,
- debtorno,
- branchcode,
- startdate
- ) VALUES (
- '" . $_POST['StockID_' . $PriceCounter] . "',
- '" . $_POST['Price_' . $PriceCounter] . "',
- '" . $_POST['SalesType'] . "',
- '" . $_POST['CurrCode'] . "',
- '" . $_POST['DebtorNo_' . $PriceCounter] . "',
- '" . $_POST['BranchCode_' . $PriceCounter] . "',
- '" . date('Y-m-d') . "'
- )";
- $ResultInsert = DB_query($SQLInsert, $db);
-
+ if (DB_num_rows($TestExistsResult)==0){ //the price doesn't currently exist
+ //now check to see if a new price has already been created from start date of today
+
+ $SQLTestExists = "SELECT price FROM prices
+ WHERE stockid = '" . $_POST['StockID_' . $PriceCounter] . "'
+ AND prices.typeabbrev ='" . $_POST['SalesType'] . "'
+ AND prices.currabrev ='" . $_POST['CurrCode'] . "'
+ AND prices.debtorno ='" . $_POST['DebtorNo_' . $PriceCounter] . "'
+ AND prices.branchcode ='" . $_POST['BranchCode_' . $PriceCounter] . "'
+ AND prices.startdate ='" . date('Y-m-d') . "'";
+ $TestExistsResult = DB_query($SQLTestExists,$db);
+ if (DB_num_rows($TestExistsResult)==1){
+ //then we are updating
+ $SQLUpdate = "UPDATE prices SET price = '" . $_POST['Price_' . $PriceCounter] . "'
+ WHERE stockid = '" . $_POST['StockID_' . $PriceCounter] . "'
+ AND prices.typeabbrev ='" . $_POST['SalesType'] . "'
+ AND prices.currabrev ='" . $_POST['CurrCode'] . "'
+ AND prices.debtorno ='" . $_POST['DebtorNo_' . $PriceCounter] . "'
+ AND prices.branchcode ='" . $_POST['BranchCode_' . $PriceCounter] . "'
+ AND prices.startdate ='" . date('Y-m-d') . "'
+ AND prices.enddate ='" . $_POST['EndDate_' . $PriceCounter] . "'";
+ $ResultUpdate = DB_query($SQLUpdate, $db);
+ } else { //there is not a price already starting today so need to create one
+ //update the old price to have an end date of yesterday too
+ $SQLUpdate = "UPDATE prices SET enddate = '" . FormatDateForSQL(DateAdd(Date($_SESSION['DefaultDateFormat']),'d',-1)) . "'
+ WHERE stockid = '" . $_POST['StockID_' . $PriceCounter] . "'
+ AND prices.typeabbrev ='" . $_POST['SalesType'] . "'
+ AND prices.currabrev ='" . $_POST['CurrCode'] . "'
+ AND prices.debtorno ='" . $_POST['DebtorNo_' . $PriceCounter] . "'
+ AND prices.branchcode ='" . $_POST['BranchCode_' . $PriceCounter] . "'
+ AND prices.startdate ='" . $_POST['StartDate_' . $PriceCounter] . "'
+ AND prices.enddate ='" . $_POST['EndDate_' . $PriceCounter] . "'";
+ $Result = DB_query($SQLUpdate, $db);
+ //we need to add a new price from today
+ $SQLInsert = "INSERT INTO prices ( stockid,
+ price,
+ typeabbrev,
+ currabrev,
+ debtorno,
+ branchcode,
+ startdate
+ ) VALUES (
+ '" . $_POST['StockID_' . $PriceCounter] . "',
+ '" . $_POST['Price_' . $PriceCounter] . "',
+ '" . $_POST['SalesType'] . "',
+ '" . $_POST['CurrCode'] . "',
+ '" . $_POST['DebtorNo_' . $PriceCounter] . "',
+ '" . $_POST['BranchCode_' . $PriceCounter] . "',
+ '" . date('Y-m-d') . "'
+ )";
+ $ResultInsert = DB_query($SQLInsert, $db);
+ }
}
$PriceCounter++;
}//end while loop
Modified: trunk/StockAdjustmentsControlled.php
===================================================================
--- trunk/StockAdjustmentsControlled.php 2011-05-29 10:04:48 UTC (rev 4583)
+++ trunk/StockAdjustmentsControlled.php 2011-05-30 08:43:29 UTC (rev 4584)
@@ -2,8 +2,6 @@
/* $Id$*/
include('includes/DefineSerialItems.php');
include('includes/DefineStockAdjustment.php');
-
-//$PageSecurity = 11;
include('includes/session.inc');
$title = _('Adjusting Controlled Items');
@@ -13,8 +11,8 @@
if (!isset($_SESSION['Adjustment'])) {
/* This page can only be called when a stock adjustment is pending */
- echo '<div class="centre"><a href="' . $rootpath . '/StockAdjustments.php?' . SID . '&NewAdjustment=Yes">'. _('Enter A Stock Adjustment'). '</a><br>';
- prnMsg( _('This page can only be opened if a stock adjustment for a controlled item has been entered').'<br>','error');
+ echo '<div class="centre"><a href="' . $rootpath . '/StockAdjustments.php?NewAdjustment=Yes">'. _('Enter A Stock Adjustment'). '</a><br />';
+ prnMsg( _('This page can only be opened if a stock adjustment for a controlled item has been entered').'<br />','error');
echo '</div>';
include('includes/footer.inc');
exit;
@@ -30,8 +28,8 @@
//Make sure this item is really controlled
if ( $LineItem->Controlled != 1 ){
- echo '<a href="' . $rootpath . '/StockAdjustments.php?' . SID . '&NewAdjustment=Yes">'._('Enter A Stock Adjustment').'</a>';
- prnMsg('<br>'. _('Notice') . ' - ' . _('The adjusted item must be defined as controlled to require input of the batch numbers or serial numbers being adjusted'),'error');
+ echo '<a href="' . $rootpath . '/StockAdjustments.php?NewAdjustment=Yes">'._('Enter A Stock Adjustment').'</a>';
+ prnMsg('<br />'. _('Notice') . ' - ' . _('The adjusted item must be defined as controlled to require input of the batch numbers or serial numbers being adjusted'),'error');
include('includes/footer.inc');
exit;
}
@@ -39,20 +37,20 @@
/***** get the page going now... *****/
echo '<div class="centre">';
-echo '<br><a href="'.$rootpath.'/StockAdjustments.php?' . SID .'">' . _('Back to Adjustment Screen') . '</a>';
+echo '<br /><a href="'.$rootpath.'/StockAdjustments.php">' . _('Back to Adjustment Screen') . '</a>';
-echo '<br><font size=2><b>'. _('Adjustment of controlled item').' ' . $LineItem->StockID . ' - ' . $LineItem->ItemDescription ;
+echo '<br /><font size=2><b>'. _('Adjustment of controlled item').' ' . $LineItem->StockID . ' - ' . $LineItem->ItemDescription ;
/** vars needed by InputSerialItem : **/
$LocationOut = $_SESSION['Adjustment']->StockLocation;
$StockID = $LineItem->StockID;
if ($LineItem->AdjustmentType == 'ADD'){
- echo '<br>'. _('Adding Items').'...';
+ echo '<br />'. _('Adding Items').'...';
$ItemMustExist = false;
$InOutModifier = 1;
$ShowExisting = false;
} elseif ($LineItem->AdjustmentType == 'REMOVE'){
- echo '<br>'._('Removing Items').'...';
+ echo '<br />'._('Removing Items').'...';
$ItemMustExist = true;
$InOutModifier = -1;
$ShowExisting = true;
Modified: trunk/StockSerialItems.php
===================================================================
--- trunk/StockSerialItems.php 2011-05-29 10:04:48 UTC (rev 4583)
+++ trunk/StockSerialItems.php 2011-05-30 08:43:29 UTC (rev 4584)
@@ -1,8 +1,6 @@
<?php
/* $Id$*/
-
-
include('includes/session.inc');
$title = _('Stock Of Controlled Items');
include('includes/header.inc');
@@ -24,16 +22,16 @@
}
$result = DB_query("SELECT description,
- units,
- mbflag,
- decimalplaces,
- serialised,
- controlled,
- perishable
- FROM stockmaster
- WHERE stockid='".$StockID."'",
- $db,
- _('Could not retrieve the requested item because'));
+ units,
+ mbflag,
+ decimalplaces,
+ serialised,
+ controlled,
+ perishable
+ FROM stockmaster
+ WHERE stockid='".$StockID."'",
+ $db,
+ _('Could not retrieve the requested item because'));
$myrow = DB_fetch_array($result);
@@ -52,21 +50,21 @@
}
$result = DB_query("SELECT locationname
- FROM locations
- WHERE loccode='" . $_GET['Location'] . "'",
- $db,
- _('Could not retrieve the stock location of the item because'),
- _('The SQL used to lookup the location was'));
+ FROM locations
+ WHERE loccode='" . $_GET['Location'] . "'",
+ $db,
+ _('Could not retrieve the stock location of the item because'),
+ _('The SQL used to lookup the location was'));
$myrow = DB_fetch_row($result);
$sql = "SELECT serialno,
- quantity,
- expirationdate
- FROM stockserialitems
- WHERE loccode='" . $_GET['Location'] . "'
- AND stockid = '" . $StockID . "'
- AND quantity <>0";
+ quantity,
+ expirationdate
+ FROM stockserialitems
+ WHERE loccode='" . $_GET['Location'] . "'
+ AND stockid = '" . $StockID . "'
+ AND quantity <>0";
$ErrMsg = _('The serial numbers/batches held cannot be retrieved because');
@@ -135,7 +133,7 @@
$TotalQuantity += $myrow['quantity'];
if ($Serialised == 1){
- echo '<td>'.$myrow['serialno'].'/td>';
+ echo '<td>'.$myrow['serialno'].'</td>';
echo '<th></th>';
} else if ($Serialised == 0 and $Perishable==0) {
echo '<td>'.$myrow['serialno'].'</td>
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-05-29 10:04:48 UTC (rev 4583)
+++ trunk/doc/Change.log 2011-05-30 08:43:29 UTC (rev 4584)
@@ -1,5 +1,12 @@
webERP Change Log
+30/5/11 Invoicing of serial items was not happening using includes/OutputSerialItems.php script not includes/InputSerialItems.php script
+30/5/11 StockSerialItems.php closing td> tag was missing /
+30/5/11 InputSerialItemsFile.php was looking for a hard coded reports dir now used $_SESSION['reports_dir']
+30/5/11 GetConfig.php checks for existence of the decimalplaces field in currencies and inserts it before attemtpting to run the company SQL...
+30/5/11 PcExpensesTypeTab.php could not delete Expenses lost TabType value fixed
+30/5/11 PriceByCost.php now only makes a new price if the price is actually changed!!
+
29/5/11 Version 4.04.1 Release
29/5/11 PricesByCost.php made it so the existing prices had end dates set as yesterday and new prices created from today
Modified: trunk/includes/GetConfig.php
===================================================================
--- trunk/includes/GetConfig.php 2011-05-29 10:04:48 UTC (rev 4583)
+++ trunk/includes/GetConfig.php 2011-05-30 08:43:29 UTC (rev 4584)
@@ -36,7 +36,14 @@
$_SESSION['PageSecurityArray'][$myrow['script']]=$myrow['pagesecurity'];
}
-
+ /*
+ check the decimalplaces field exists in currencies - this was added in 4.0 but is required in 4.04 as it is used everywhere as the default decimal places to show on all home currency amounts
+ */
+ $result = DB_query("SELECT decimalplaces FROM currencies",$db,'','',false,false);
+ if (DB_error_no($db)!=0) { //then decimalplaces not already a field in currencies
+ $result = DB_query("ALTER TABLE `currencies`
+ ADD COLUMN `decimalplaces` tinyint(3) NOT NULL DEFAULT 2 AFTER `hundredsname`",$db);
+ }
/* Also reads all the company data set up in the company record and returns an array */
$sql= "SELECT coyname,
@@ -80,7 +87,7 @@
}
/*Now read in smtp email settings - not needed in a properly set up server environment - but helps for those who can't control their server .. I think! */
- $sql='SELECT id,
+ $sql="SELECT id,
host,
port,
heloaddress,
@@ -88,7 +95,7 @@
password,
timeout,
auth
- FROM emailsettings';
+ FROM emailsettings";
$result=DB_query($sql, $db);
$myrow=DB_fetch_array($result);
Modified: trunk/includes/InputSerialItems.php
===================================================================
--- trunk/includes/InputSerialItems.php 2011-05-29 10:04:48 UTC (rev 4583)
+++ trunk/includes/InputSerialItems.php 2011-05-30 08:43:29 UTC (rev 4584)
@@ -98,7 +98,7 @@
$tableheader .= '<tr>
<th>'. _('Serial No').'</th>
</tr>';
-} else if ($LineItem->Serialised==0 and $Perishable==1){
+} else if ($LineItem->Serialised==0 AND $Perishable==1){
$tableheader = '<tr>
<th>'. _('Batch/Roll/Bundle'). ' #</th>
<th>'. _('Quantity'). '</th>
Modified: trunk/includes/InputSerialItemsFile.php
===================================================================
--- trunk/includes/InputSerialItemsFile.php 2011-05-29 10:04:48 UTC (rev 4583)
+++ trunk/includes/InputSerialItemsFile.php 2011-05-30 08:43:29 UTC (rev 4584)
@@ -20,8 +20,8 @@
$LineNo = $_POST['LineNo'];
}
-echo '<DIV Align=Center>';
-echo '<TABLE>';
+echo '<div class="centre">';
+echo '<table>';
echo $tableheader;
$TotalQuantity = 0; /*Variable to accumulate total quantity received */
@@ -57,7 +57,7 @@
echo '<tr><td align=right><b>'. _('Total Quantity'). ': ' . number_format($TotalQuantity,$LineItem->DecimalPlaces) . '</b></td></tr>';
echo '<tr><td><hr></td></tr>';
} else {
- echo '<tr><td align=right><b>'. _('Total Quantity'). ':</B></TD><TD ALIGN=RIGHT><B>' . number_format($TotalQuantity,$LineItem->DecimalPlaces) . '</b></td></tr>';
+ echo '<tr><td align=right><b>'. _('Total Quantity'). ':</b></td><td align=right><b>' . number_format($TotalQuantity,$LineItem->DecimalPlaces) . '</b></td></tr>';
echo '<tr><td colspan=2><hr></td></tr>';
}
@@ -96,7 +96,7 @@
$LineItem->SerialItemsValid=false;
$_SESSION['CurImportFile']['Processed']=false;
$_SESSION['CurImportFile'] = $_FILES['ImportFile'];
- $_SESSION['CurImportFile']['tmp_name'] = './reports/'.$LineItem->StockID.'_'.$LineNo.'_'.uniqid(4);
+ $_SESSION['CurImportFile']['tmp_name'] = $_SESSION['reports_dir'] . '/' . $LineItem->StockID.'_'.$LineNo.'_'.uniqid(4);
if (!move_uploaded_file($_FILES['ImportFile']['tmp_name'],$_SESSION['CurImportFile']['tmp_name'])){
prnMsg(_('Error moving temporary file') . '. ' . _('Please check your configuration'),'error' );
$LineItem->SerialItemsValid=false;
Modified: trunk/includes/OutputSerialItems.php
===================================================================
--- trunk/includes/OutputSerialItems.php 2011-05-29 10:04:48 UTC (rev 4583)
+++ trunk/includes/OutputSerialItems.php 2011-05-30 08:43:29 UTC (rev 4584)
@@ -1,5 +1,5 @@
<?php
-/* $Id$*/
+/* $Id OutputSerialItems.php 4501 2011-03-03 09:13:12Z daintree $*/
/*Input Serial Items - used for inputing serial numbers or batch/roll/bundle references
for controlled items - used in:
- ConfirmDispatchControlledInvoice.php
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
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