Menu
▾
▴
web-erp-svn
|
From: <dai...@us...> - 2012-11-29 09:23:28
|
Revision: 5748
http://sourceforge.net/p/web-erp/reponame/5748
Author: daintree
Date: 2012-11-29 09:23:25 +0000 (Thu, 29 Nov 2012)
Log Message:
-----------
reinstate some changes that were lost due to working on old version
Modified Paths:
--------------
trunk/doc/Manual/ManualContributors.html
trunk/install/save.php
Modified: trunk/doc/Manual/ManualContributors.html
===================================================================
--- trunk/doc/Manual/ManualContributors.html 2012-11-29 09:06:53 UTC (rev 5747)
+++ trunk/doc/Manual/ManualContributors.html 2012-11-29 09:23:25 UTC (rev 5748)
@@ -147,6 +147,8 @@
<br />
Marcos Garcia Trejo<br />
<br />
+ Jeff Trickett<br />
+ <br />
Mark Yeager (MRP)<br />
<br />
Zhiguo Yuan</td>
Modified: trunk/install/save.php
===================================================================
--- trunk/install/save.php 2012-11-29 09:06:53 UTC (rev 5747)
+++ trunk/install/save.php 2012-11-29 09:23:25 UTC (rev 5748)
@@ -236,7 +236,7 @@
// only make a new company directory structure if we are kicking off a new company
// no need to bother if just setting up the demo data
$CompanyDir = $path_to_root . '/companies/' . $_POST['database_name'];
-if (($_POST['DemoData']==false) || ($_POST['database_name'] != "weberpdemo")){ // Fix? 'Use demo data' when used in conjunction with a new company could be misunderstood. Seems to make more sense to skip the new creation data only if this is set and the name is also that of the default demo. May want to simply check for folder existence.
+if (($_POST['DemoData']==false) OR ($_POST['database_name'] != "weberpdemo")){ // Fix? 'Use demo data' when used in conjunction with a new company could be misunderstood. Seems to make more sense to skip the new creation data only if this is set and the name is also that of the default demo. May want to simply check for folder existence.
$Result = mkdir($CompanyDir);
$Result = mkdir($CompanyDir . '/part_pics');
$Result = mkdir($CompanyDir . '/EDI_Incoming_Orders');
@@ -292,7 +292,7 @@
$msg .= "\$dbpassword = '" . $_POST['database_password'] . "';\n";
$msg .= "// The timezone of the business - this allows the possibility of having;\n";
-
+$msg .= "date_default_timezone_set('" . $_POST['timezone'] . "');\n";
$msg .= "putenv('TZ=" . $_POST['timezone'] . "');\n";
$msg .= "\$AllowCompanySelectionBox = true;\n";
if ($_POST['DemoData'] ==false){
@@ -305,7 +305,7 @@
$msg .= "\$CryptFunction = 'sha1';\n";
$msg .= "\$DefaultClock = 12;\n";
-$msg .= "\$rootpath = dirname(htmlspecialchars(\$_SERVER['PHP_SELF']));\n";
+$msg .= "\$rootpath = dirname(htmlspecialchars(\$_SERVER['PHP_SELF'],ENT_QUOTES,\'UTF-8\'));\n";
$msg .= "if (isset(\$DirectoryLevelsDeep)){\n";
$msg .= " for (\$i=0;\$i<\$DirectoryLevelsDeep;\$i++){\n";
$msg .= "\$rootpath = mb_substr(\$rootpath,0, strrpos(\$rootpath,'/'));\n";
@@ -373,10 +373,11 @@
// Database created above with correct name.
if (strncasecmp($SQL, ' CREATE DATABASE ', 17)
AND strncasecmp($SQL, ' USE ', 5)){
+
$SQL = mb_substr($SQL,0,mb_strlen($SQL)-1);
$result = mysqli_query($db,$SQL);
- }
- $SQL = '';
+ }
+ $SQL = '';
}
} //end if its a valid sql line not a comment
@@ -397,5 +398,5 @@
header('Location: ' . $path_to_root . '/index.php?newDb=1');
ini_set('max_execution_time', '60');
-echo "<META HTTP-EQUIV='Refresh' CONTENT='0; URL=" . $path_to_root . '/index.php?' . SID . "'>";
+echo '<META HTTP-EQUIV="Refresh" CONTENT="0; URL=' . $path_to_root . '/index.php">';
?>
|
|
From: <tim...@us...> - 2012-12-03 22:36:33
|
Revision: 5750
http://sourceforge.net/p/web-erp/reponame/5750
Author: tim_schofield
Date: 2012-12-03 22:36:30 +0000 (Mon, 03 Dec 2012)
Log Message:
-----------
Fix incorrect usage of the initiator, and fix up all the code styling errors
Modified Paths:
--------------
trunk/PO_Header.php
trunk/PO_SelectOSPurchOrder.php
Modified: trunk/PO_Header.php
===================================================================
--- trunk/PO_Header.php 2012-12-03 21:12:54 UTC (rev 5749)
+++ trunk/PO_Header.php 2012-12-03 22:36:30 UTC (rev 5750)
@@ -8,13 +8,14 @@
if (isset($_GET['ModifyOrderNumber'])) {
$title = _('Modify Purchase Order') . ' ' . $_GET['ModifyOrderNumber'];
-} else {
+} //isset($_GET['ModifyOrderNumber'])
+else {
$title = _('Purchase Order Entry');
}
if (isset($_GET['SupplierID'])) {
- $_POST['Select']=$_GET['SupplierID'];
-}
+ $_POST['Select'] = $_GET['SupplierID'];
+} //isset($_GET['SupplierID'])
include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
@@ -28,288 +29,282 @@
*/
if (empty($_GET['identifier'])) {
- $identifier=date('U');
-} else {
- $identifier=$_GET['identifier'];
+ $identifier = date('U');
+} //empty($_GET['identifier'])
+else {
+ $identifier = $_GET['identifier'];
}
/*Page is called with NewOrder=Yes when a new order is to be entered
* the session variable that holds all the PO data $_SESSION['PO'][$identifier]
* is unset to allow all new details to be created */
-if (isset($_GET['NewOrder']) and isset($_SESSION['PO'.$identifier])){
- unset($_SESSION['PO'.$identifier]);
- $_SESSION['ExistingOrder']=0;
-}
+if (isset($_GET['NewOrder']) and isset($_SESSION['PO' . $identifier])) {
+ unset($_SESSION['PO' . $identifier]);
+ $_SESSION['ExistingOrder'] = 0;
+} //isset($_GET['NewOrder']) and isset($_SESSION['PO' . $identifier])
if (isset($_POST['Select']) AND empty($_POST['SupplierContact'])) {
$sql = "SELECT contact
FROM suppliercontacts
- WHERE supplierid='". $_POST['Select'] ."'";
-
- $SuppCoResult = DB_query($sql,$db);
- if (DB_num_rows($SuppCoResult)>0) {
+ WHERE supplierid='" . $_POST['Select'] . "'";
+
+ $SuppCoResult = DB_query($sql, $db);
+ if (DB_num_rows($SuppCoResult) > 0) {
$myrow = DB_fetch_row($SuppCoResult);
$_POST['SupplierContact'] = $myrow[0];
- } else {
- $_POST['SupplierContact']='';
+ } //DB_num_rows($SuppCoResult) > 0
+ else {
+ $_POST['SupplierContact'] = '';
}
-}
+} //isset($_POST['Select']) AND empty($_POST['SupplierContact'])
-if ((isset($_POST['UpdateStatus']) AND $_POST['UpdateStatus']!='') ) {
-
- if($_SESSION['ExistingOrder']==0){
- prnMsg( _('This is a new order. It must be created before you can change the status'), 'warn');
+if ((isset($_POST['UpdateStatus']) AND $_POST['UpdateStatus'] != '')) {
+ if ($_SESSION['ExistingOrder'] == 0) {
+ prnMsg(_('This is a new order. It must be created before you can change the status'), 'warn');
$OKToUpdateStatus = 0;
- } elseif ($_SESSION['PO'.$identifier]->Status !=$_POST['Status']) { //the old status != new status
+ } //$_SESSION['ExistingOrder'] == 0
+ elseif ($_SESSION['PO' . $identifier]->Status != $_POST['Status']) { //the old status != new status
$OKToUpdateStatus = 1;
- $AuthSQL ="SELECT authlevel
+ $AuthSQL = "SELECT authlevel
FROM purchorderauth
- WHERE userid='".$_SESSION['UserID']."'
- AND currabrev='".$_SESSION['PO'.$identifier]->CurrCode."'";
+ WHERE userid='" . $_SESSION['UserID'] . "'
+ AND currabrev='" . $_SESSION['PO' . $identifier]->CurrCode . "'";
- $AuthResult=DB_query($AuthSQL,$db);
- $myrow=DB_fetch_array($AuthResult);
- $AuthorityLevel=$myrow['authlevel'];
- $OrderTotal=$_SESSION['PO'.$identifier]->Order_Value();
-
- if ($_POST['StatusComments']!='') {
- $_POST['StatusComments'] = ' - '.$_POST['StatusComments'];
- }
- if (IsEmailAddress($_SESSION['UserEmail'])){
- $UserChangedStatus = ' <a href="mailto:' . $_SESSION['UserEmail'] . '">' . $_SESSION['UsersRealName']. '</a>';
- } else {
+ $AuthResult = DB_query($AuthSQL, $db);
+ $myrow = DB_fetch_array($AuthResult);
+ $AuthorityLevel = $myrow['authlevel'];
+ $OrderTotal = $_SESSION['PO' . $identifier]->Order_Value();
+
+ if ($_POST['StatusComments'] != '') {
+ $_POST['StatusComments'] = ' - ' . $_POST['StatusComments'];
+ } //$_POST['StatusComments'] != ''
+ if (IsEmailAddress($_SESSION['UserEmail'])) {
+ $UserChangedStatus = ' <a href="mailto:' . $_SESSION['UserEmail'] . '">' . $_SESSION['UsersRealName'] . '</a>';
+ } //IsEmailAddress($_SESSION['UserEmail'])
+ else {
$UserChangedStatus = ' ' . $_SESSION['UsersRealName'] . ' ';
}
-
+
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'],ENT_QUOTES,'UTF-8');
- $_SESSION['PO'.$identifier]->AllowPrintPO=1;
- } else {
- $OKToUpdateStatus=0;
- prnMsg( _('You do not have permission to authorise this purchase order').'.<br />'. _('This order is for').' '.
- $_SESSION['PO'.$identifier]->CurrCode.' '.$OrderTotal.'. '.
- _('You can only authorise up to').' '.$_SESSION['PO'.$identifier]->CurrCode.' '.$AuthorityLevel.'.<br />'.
- _('If you think this is a mistake please contact the systems administrator') , 'warn');
+ $_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;
+ } //$AuthorityLevel > $OrderTotal
+ else {
+ $OKToUpdateStatus = 0;
+ prnMsg(_('You do not have permission to authorise this purchase order') . '.<br />' . _('This order is for') . ' ' . $_SESSION['PO' . $identifier]->CurrCode . ' ' . $OrderTotal . '. ' . _('You can only authorise up to') . ' ' . $_SESSION['PO' . $identifier]->CurrCode . ' ' . $AuthorityLevel . '.<br />' . _('If you think this is a mistake please contact the systems administrator'), 'warn');
}
- }
+ } //$_POST['Status'] == 'Authorised'
- if ($_POST['Status'] == 'Rejected' OR $_POST['Status'] == 'Cancelled' ) {
- if(!isset($_SESSION['ExistingOrder']) OR $_SESSION['ExistingOrder']!=0) {
- /* need to check that not already dispatched or invoiced by the supplier */
- if($_SESSION['PO'.$identifier]->Any_Already_Received()==1){
- $OKToUpdateStatus =0; //not ok to update the status
- prnMsg( _('This order cannot be cancelled or rejected because some of it has already been received') . '. ' .
- _('The line item quantities may be modified to quantities more than already received') . '. ' .
- _('Prices cannot be altered for lines that have already been received') .' '.
- _('and quantities cannot be reduced below the quantity already received'),'warn');
- }
- $ShipmentExists = $_SESSION['PO'.$identifier]->Any_Lines_On_A_Shipment();
- if ($ShipmentExists != false){
+ if ($_POST['Status'] == 'Rejected' OR $_POST['Status'] == 'Cancelled') {
+ if (!isset($_SESSION['ExistingOrder']) OR $_SESSION['ExistingOrder'] != 0) {
+ /* need to check that not already dispatched or invoiced by the supplier */
+ if ($_SESSION['PO' . $identifier]->Any_Already_Received() == 1) {
$OKToUpdateStatus = 0; //not ok to update the status
- prnMsg( _('This order cannot be cancelled or rejected because there is at least one line that is allocated to a shipment') . '. ' . _('See shipment number') . ' ' . $ShipmentExists,'warn');
+ prnMsg(_('This order cannot be cancelled or rejected because some of it has already been received') . '. ' . _('The line item quantities may be modified to quantities more than already received') . '. ' . _('Prices cannot be altered for lines that have already been received') . ' ' . _('and quantities cannot be reduced below the quantity already received'), 'warn');
+ } //$_SESSION['PO' . $identifier]->Any_Already_Received() == 1
+ $ShipmentExists = $_SESSION['PO' . $identifier]->Any_Lines_On_A_Shipment();
+ if ($ShipmentExists != false) {
+ $OKToUpdateStatus = 0; //not ok to update the status
+ prnMsg(_('This order cannot be cancelled or rejected because there is at least one line that is allocated to a shipment') . '. ' . _('See shipment number') . ' ' . $ShipmentExists, 'warn');
+ } //$ShipmentExists != false
+ } //!isset($_SESSION['ExistingOrder']) OR $_SESSION['ExistingOrder'] != 0
+ 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 />' . html_entity_decode($_POST['StatusCommentsComplete'], ENT_QUOTES, 'UTF-8');
+ } //$AuthorityLevel > $OrderTotal
+ else {
+ $OKToUpdateStatus = 0;
+ prnMsg(_('You do not have permission to reject this purchase order') . '.<br />' . _('This order is for') . ' ' . $_SESSION['PO' . $identifier]->CurrCode . ' ' . $OrderTotal . '. ' . _('Your authorisation limit is set at') . ' ' . $_SESSION['PO' . $identifier]->CurrCode . ' ' . $AuthorityLevel . '.<br />' . _('If you think this is a mistake please contact the systems administrator'), 'warn');
}
- }
- 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 />' . 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').' '.
- $_SESSION['PO'.$identifier]->CurrCode.' '.$OrderTotal.'. '.
- _('Your authorisation limit is set at').' '.$_SESSION['PO'.$identifier]->CurrCode.' '.$AuthorityLevel.'.<br />'.
- _('If you think this is a mistake please contact the systems administrator') , 'warn');
- }
- }
- }
+ } //$OKToUpdateStatus == 1
+ } //$_POST['Status'] == 'Rejected' OR $_POST['Status'] == 'Cancelled'
- if ($_POST['Status'] == 'Pending' ) {
-
- if($_SESSION['PO'.$identifier]->Any_Already_Received()==1){
- $OKToUpdateStatus =0; //not OK to update status
- prnMsg( _('This order could not have the status changed back to pending because some of it has already been received. Quantities received will need to be returned to change the order back to pending.'),'warn');
- }
-
- 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 />' .html_entity_decode($_POST['StatusCommentsComplete'],ENT_QUOTES,'UTF-8');
-
- } elseif ($AuthorityLevel<$OrderTotal AND $_SESSION['UserID']!=$_SESSION['PO'.$identifier]->Initiator) {
- $OKToUpdateStatus=0;
- prnMsg( _('You do not have permission to change the status of this purchase order').'.<br />'. _('This order is for').' '. $_SESSION['PO'.$identifier]->CurrCode.' '.$OrderTotal.'. '. _('Your authorisation limit is set at').' '.$_SESSION['PO'.$identifier]->CurrCode.' '.$AuthorityLevel.'.<br />'. _('If you think this is a mistake please contact the systems administrator') , 'warn');
- }
- }
+ if ($_POST['Status'] == 'Pending') {
+ if ($_SESSION['PO' . $identifier]->Any_Already_Received() == 1) {
+ $OKToUpdateStatus = 0; //not OK to update status
+ prnMsg(_('This order could not have the status changed back to pending because some of it has already been received. Quantities received will need to be returned to change the order back to pending.'), 'warn');
+ } //$_SESSION['PO' . $identifier]->Any_Already_Received() == 1
- if ($OKToUpdateStatus==1){
-
- $_SESSION['PO'.$identifier]->Status=$_POST['Status'];
- if ($_SESSION['PO'.$identifier]->Status=='Authorised') {
- $AllowPrint=1;
- } else {
- $AllowPrint=0;
+ 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 />' . html_entity_decode($_POST['StatusCommentsComplete'], ENT_QUOTES, 'UTF-8');
+
+ } //($AuthorityLevel > $OrderTotal OR $_SESSION['UserID'] == $_SESSION['PO' . $identifier]->Initiator) AND $OKToUpdateStatus == 1
+ elseif ($AuthorityLevel < $OrderTotal AND $_SESSION['UserID'] != $_SESSION['PO' . $identifier]->Initiator) {
+ $OKToUpdateStatus = 0;
+ prnMsg(_('You do not have permission to change the status of this purchase order') . '.<br />' . _('This order is for') . ' ' . $_SESSION['PO' . $identifier]->CurrCode . ' ' . $OrderTotal . '. ' . _('Your authorisation limit is set at') . ' ' . $_SESSION['PO' . $identifier]->CurrCode . ' ' . $AuthorityLevel . '.<br />' . _('If you think this is a mistake please contact the systems administrator'), 'warn');
+ } //$AuthorityLevel < $OrderTotal AND $_SESSION['UserID'] != $_SESSION['PO' . $identifier]->Initiator
+ } //$_POST['Status'] == 'Pending'
+
+ if ($OKToUpdateStatus == 1) {
+ $_SESSION['PO' . $identifier]->Status = $_POST['Status'];
+ if ($_SESSION['PO' . $identifier]->Status == 'Authorised') {
+ $AllowPrint = 1;
+ } //$_SESSION['PO' . $identifier]->Status == 'Authorised'
+ else {
+ $AllowPrint = 0;
}
- $SQL = "UPDATE purchorders SET status='" . $_POST['Status']. "',
- stat_comment='" . $_SESSION['PO'.$identifier]->StatusComments ."',
+ $SQL = "UPDATE purchorders SET status='" . $_POST['Status'] . "',
+ stat_comment='" . $_SESSION['PO' . $identifier]->StatusComments . "',
allowprint='" . $AllowPrint . "'
- WHERE purchorders.orderno ='" . $_SESSION['ExistingOrder'] ."'";
-
+ WHERE purchorders.orderno ='" . $_SESSION['ExistingOrder'] . "'";
+
$ErrMsg = _('The order status could not be updated because');
- $UpdateResult=DB_query($SQL,$db,$ErrMsg);
- }
+ $UpdateResult = DB_query($SQL, $db, $ErrMsg);
+ } //$OKToUpdateStatus == 1
} //end if there is actually a status change the class Status != the POST['Status']
-}
+} //(isset($_POST['UpdateStatus']) AND $_POST['UpdateStatus'] != '')
-if (isset($_GET['NewOrder'])
- AND isset($_GET['StockID'])
- AND isset($_GET['SelectedSupplier'])) {
- /*
- * initialise a new order
- */
- $_SESSION['ExistingOrder']=0;
- unset($_SESSION['PO'.$identifier]);
- /* initialise new class object */
- $_SESSION['PO'.$identifier] = new PurchOrder;
- /*
- * and fill it with essential data
- */
- $_SESSION['PO'.$identifier]->AllowPrintPO = 1; /* Of course 'cos the order aint even started !!*/
- $_SESSION['PO'.$identifier]->GLLink = $_SESSION['CompanyRecord']['gllink_stock'];
- /* set the SupplierID we got */
- $_SESSION['PO'.$identifier]->SupplierID = $_GET['SelectedSupplier'];
- $_SESSION['PO'.$identifier]->DeliveryDate = date($_SESSION['DefaultDateFormat']);
- $_SESSION['PO'.$identifier]->Initiator = $_SESSION['UsersRealName'];
- $_SESSION['RequireSupplierSelection'] = 0;
- $_POST['Select'] = $_GET['SelectedSupplier'];
-
- /*
- * the item (it's item code) that should be purchased
- */
- $Purch_Item = $_GET['StockID'];
+if (isset($_GET['NewOrder']) AND isset($_GET['StockID']) AND isset($_GET['SelectedSupplier'])) {
+ /*
+ * initialise a new order
+ */
+ $_SESSION['ExistingOrder'] = 0;
+ unset($_SESSION['PO' . $identifier]);
+ /* initialise new class object */
+ $_SESSION['PO' . $identifier] = new PurchOrder;
+ /*
+ * and fill it with essential data
+ */
+ $_SESSION['PO' . $identifier]->AllowPrintPO = 1;
+ /* Of course 'cos the order aint even started !!*/
+ $_SESSION['PO' . $identifier]->GLLink = $_SESSION['CompanyRecord']['gllink_stock'];
+ /* set the SupplierID we got */
+ $_SESSION['PO' . $identifier]->SupplierID = $_GET['SelectedSupplier'];
+ $_SESSION['PO' . $identifier]->DeliveryDate = date($_SESSION['DefaultDateFormat']);
+ $_SESSION['PO' . $identifier]->Initiator = $_SESSION['UserID'];
+ $_SESSION['RequireSupplierSelection'] = 0;
+ $_POST['Select'] = $_GET['SelectedSupplier'];
-}
+ /*
+ * the item (it's item code) that should be purchased
+ */
+ $Purch_Item = $_GET['StockID'];
-if (isset($_POST['EnterLines']) OR isset($_POST['AllowRePrint'])){
-/*User hit the button to enter line items -
- * ensure session variables updated then meta refresh to PO_Items.php*/
+} //isset($_GET['NewOrder']) AND isset($_GET['StockID']) AND isset($_GET['SelectedSupplier'])
- $_SESSION['PO'.$identifier]->Location=$_POST['StkLocation'];
- $_SESSION['PO'.$identifier]->SupplierContact=$_POST['SupplierContact'];
- $_SESSION['PO'.$identifier]->DelAdd1 = $_POST['DelAdd1'];
- $_SESSION['PO'.$identifier]->DelAdd2 = $_POST['DelAdd2'];
- $_SESSION['PO'.$identifier]->DelAdd3 = $_POST['DelAdd3'];
- $_SESSION['PO'.$identifier]->DelAdd4 = $_POST['DelAdd4'];
- $_SESSION['PO'.$identifier]->DelAdd5 = $_POST['DelAdd5'];
- $_SESSION['PO'.$identifier]->DelAdd6 = $_POST['DelAdd6'];
- $_SESSION['PO'.$identifier]->SuppDelAdd1 = $_POST['SuppDelAdd1'];
- $_SESSION['PO'.$identifier]->SuppDelAdd2 = $_POST['SuppDelAdd2'];
- $_SESSION['PO'.$identifier]->SuppDelAdd3 = $_POST['SuppDelAdd3'];
- $_SESSION['PO'.$identifier]->SuppDelAdd4 = $_POST['SuppDelAdd4'];
- $_SESSION['PO'.$identifier]->SuppDelAdd5 = $_POST['SuppDelAdd5'];
- $_SESSION['PO'.$identifier]->SuppTel= $_POST['SuppTel'];
- $_SESSION['PO'.$identifier]->Initiator = $_POST['Initiator'];
- $_SESSION['PO'.$identifier]->RequisitionNo = $_POST['Requisition'];
- $_SESSION['PO'.$identifier]->Version = $_POST['Version'];
- $_SESSION['PO'.$identifier]->DeliveryDate = $_POST['DeliveryDate'];
- $_SESSION['PO'.$identifier]->Revised = $_POST['Revised'];
- $_SESSION['PO'.$identifier]->ExRate = filter_number_format($_POST['ExRate']);
- $_SESSION['PO'.$identifier]->Comments = $_POST['Comments'];
- $_SESSION['PO'.$identifier]->DeliveryBy = $_POST['DeliveryBy'];
- if (isset($_POST['StatusComments'])){
- $_SESSION['PO'.$identifier]->StatusComments = $_POST['StatusComments'];
- }
- $_SESSION['PO'.$identifier]->PaymentTerms = $_POST['PaymentTerms'];
- $_SESSION['PO'.$identifier]->Contact = $_POST['Contact'];
- $_SESSION['PO'.$identifier]->Tel = $_POST['Tel'];
- $_SESSION['PO'.$identifier]->Port = $_POST['Port'];
+if (isset($_POST['EnterLines']) OR isset($_POST['AllowRePrint'])) {
+ /*User hit the button to enter line items -
+ * ensure session variables updated then meta refresh to PO_Items.php*/
- if (isset($_POST['RePrint']) AND $_POST['RePrint']==1){
+ $_SESSION['PO' . $identifier]->Location = $_POST['StkLocation'];
+ $_SESSION['PO' . $identifier]->SupplierContact = $_POST['SupplierContact'];
+ $_SESSION['PO' . $identifier]->DelAdd1 = $_POST['DelAdd1'];
+ $_SESSION['PO' . $identifier]->DelAdd2 = $_POST['DelAdd2'];
+ $_SESSION['PO' . $identifier]->DelAdd3 = $_POST['DelAdd3'];
+ $_SESSION['PO' . $identifier]->DelAdd4 = $_POST['DelAdd4'];
+ $_SESSION['PO' . $identifier]->DelAdd5 = $_POST['DelAdd5'];
+ $_SESSION['PO' . $identifier]->DelAdd6 = $_POST['DelAdd6'];
+ $_SESSION['PO' . $identifier]->SuppDelAdd1 = $_POST['SuppDelAdd1'];
+ $_SESSION['PO' . $identifier]->SuppDelAdd2 = $_POST['SuppDelAdd2'];
+ $_SESSION['PO' . $identifier]->SuppDelAdd3 = $_POST['SuppDelAdd3'];
+ $_SESSION['PO' . $identifier]->SuppDelAdd4 = $_POST['SuppDelAdd4'];
+ $_SESSION['PO' . $identifier]->SuppDelAdd5 = $_POST['SuppDelAdd5'];
+ $_SESSION['PO' . $identifier]->SuppTel = $_POST['SuppTel'];
+ $_SESSION['PO' . $identifier]->Initiator = $_POST['Initiator'];
+ $_SESSION['PO' . $identifier]->RequisitionNo = $_POST['Requisition'];
+ $_SESSION['PO' . $identifier]->Version = $_POST['Version'];
+ $_SESSION['PO' . $identifier]->DeliveryDate = $_POST['DeliveryDate'];
+ $_SESSION['PO' . $identifier]->Revised = $_POST['Revised'];
+ $_SESSION['PO' . $identifier]->ExRate = filter_number_format($_POST['ExRate']);
+ $_SESSION['PO' . $identifier]->Comments = $_POST['Comments'];
+ $_SESSION['PO' . $identifier]->DeliveryBy = $_POST['DeliveryBy'];
+ if (isset($_POST['StatusComments'])) {
+ $_SESSION['PO' . $identifier]->StatusComments = $_POST['StatusComments'];
+ } //isset($_POST['StatusComments'])
+ $_SESSION['PO' . $identifier]->PaymentTerms = $_POST['PaymentTerms'];
+ $_SESSION['PO' . $identifier]->Contact = $_POST['Contact'];
+ $_SESSION['PO' . $identifier]->Tel = $_POST['Tel'];
+ $_SESSION['PO' . $identifier]->Port = $_POST['Port'];
- $_SESSION['PO'.$identifier]->AllowPrintPO=1;
+ if (isset($_POST['RePrint']) AND $_POST['RePrint'] == 1) {
+ $_SESSION['PO' . $identifier]->AllowPrintPO = 1;
$sql = "UPDATE purchorders
SET purchorders.allowprint='1'
- WHERE purchorders.orderno='" . $_SESSION['PO'.$identifier]->OrderNo ."'";
+ 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);
- } else {
+ $UpdateResult = DB_query($sql, $db, $ErrMsg);
+ } //isset($_POST['RePrint']) AND $_POST['RePrint'] == 1
+ else {
$_POST['RePrint'] = 0;
}
- if (!isset($_POST['AllowRePrint'])){ // user only hit update not "Enter Lines"
- echo '<meta http-equiv="Refresh" content="0; url=' . $rootpath . '/PO_Items.php?identifier='.$identifier. '">';
+ if (!isset($_POST['AllowRePrint'])) { // user only hit update not "Enter Lines"
+ echo '<meta http-equiv="Refresh" content="0; url=' . $rootpath . '/PO_Items.php?identifier=' . $identifier . '">';
echo '<p>';
- prnMsg(_('You should automatically be forwarded to the entry of the purchase order line items page') . '. ' .
- _('If this does not happen') . ' (' . _('if the browser does not support META Refresh') . ') ' .
- '<a href="' . $rootpath . '/PO_Items.php?identifier='.$identifier . '">' . _('click here') . '</a> ' . _('to continue'),'info');
+ prnMsg(_('You should automatically be forwarded to the entry of the purchase order line items page') . '. ' . _('If this does not happen') . ' (' . _('if the browser does not support META Refresh') . ') ' . '<a href="' . $rootpath . '/PO_Items.php?identifier=' . $identifier . '">' . _('click here') . '</a> ' . _('to continue'), 'info');
include('includes/footer.inc');
exit;
- }
-} /* end of if isset _POST'EnterLines' */
+ } //!isset($_POST['AllowRePrint'])
+} //isset($_POST['EnterLines']) OR isset($_POST['AllowRePrint'])
-echo '<span style="float:left"><a href="'. $rootpath . '/PO_SelectOSPurchOrder.php?identifier='.$identifier.'">'. _('Back to Purchase Orders'). '</a></span>';
+/* end of if isset _POST'EnterLines' */
+echo '<span style="float:left"><a href="' . $rootpath . '/PO_SelectOSPurchOrder.php?identifier=' . $identifier . '">' . _('Back to Purchase Orders') . '</a></span>';
+
/*The page can be called with ModifyOrderNumber=x where x is a purchase
* order number. The page then looks up the details of order x and allows
* these details to be modified */
-if (isset($_GET['ModifyOrderNumber'])){
- include ('includes/PO_ReadInOrder.inc');
-}
+if (isset($_GET['ModifyOrderNumber'])) {
+ include('includes/PO_ReadInOrder.inc');
+} //isset($_GET['ModifyOrderNumber'])
-if (!isset($_SESSION['PO'.$identifier])){
+if (!isset($_SESSION['PO' . $identifier])) {
/* It must be a new order being created
* $_SESSION['PO'.$identifier] would be set up from the order modification
* code above if a modification to an existing order. Also
* $ExistingOrder would be set to 1. The delivery check screen
* is where the details of the order are either updated or
- * inserted depending on the value of ExistingOrder
+ * inserted depending on the value of ExistingOrder
* */
- $_SESSION['ExistingOrder']=0;
- $_SESSION['PO'.$identifier] = new PurchOrder;
- $_SESSION['PO'.$identifier]->AllowPrintPO = 1; /*Of course cos the order aint even started !!*/
- $_SESSION['PO'.$identifier]->GLLink = $_SESSION['CompanyRecord']['gllink_stock'];
+ $_SESSION['ExistingOrder'] = 0;
+ $_SESSION['PO' . $identifier] = new PurchOrder;
+ $_SESSION['PO' . $identifier]->AllowPrintPO = 1;
+ /*Of course cos the order aint even started !!*/
+ $_SESSION['PO' . $identifier]->GLLink = $_SESSION['CompanyRecord']['gllink_stock'];
- if ($_SESSION['PO'.$identifier]->SupplierID=='' OR !isset($_SESSION['PO'.$identifier]->SupplierID)){
+ if ($_SESSION['PO' . $identifier]->SupplierID == '' OR !isset($_SESSION['PO' . $identifier]->SupplierID)) {
+ /* a session variable will have to maintain if a supplier
+ * has been selected for the order or not the session
+ * variable supplierID holds the supplier code already
+ * as determined from user id /password entry */
+ $_SESSION['RequireSupplierSelection'] = 1;
+ } //$_SESSION['PO' . $identifier]->SupplierID == '' OR !isset($_SESSION['PO' . $identifier]->SupplierID)
+ else {
+ $_SESSION['RequireSupplierSelection'] = 0;
+ }
-/* a session variable will have to maintain if a supplier
- * has been selected for the order or not the session
- * variable supplierID holds the supplier code already
- * as determined from user id /password entry */
- $_SESSION['RequireSupplierSelection'] = 1;
- } else {
- $_SESSION['RequireSupplierSelection'] = 0;
- }
+} //!isset($_SESSION['PO' . $identifier])
-}
-
if (isset($_POST['ChangeSupplier'])) {
-
- if ($_SESSION['PO'.$identifier]->Status == 'Pending' AND $_SESSION['UserID']==$_SESSION['PO'.$identifier]->Initiator) {
- 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 />'.html_entity_decode($_POST['StatusCommentsComplete'], ENT_QUOTES,'UTF-8');
- } else {
+ if ($_SESSION['PO' . $identifier]->Status == 'Pending' AND $_SESSION['UserID'] == $_SESSION['PO' . $identifier]->Initiator) {
+ 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 />' . html_entity_decode($_POST['StatusCommentsComplete'], ENT_QUOTES, 'UTF-8');
+ } //$_SESSION['PO' . $identifier]->Any_Already_Received() == 0
+ else {
echo '<br /><br />';
- prnMsg(_('Cannot modify the supplier of the order once some of the order has been received'),'warn');
+ prnMsg(_('Cannot modify the supplier of the order once some of the order has been received'), 'warn');
}
- }
-}
+ } //$_SESSION['PO' . $identifier]->Status == 'Pending' AND $_SESSION['UserID'] == $_SESSION['PO' . $identifier]->Initiator
+} //isset($_POST['ChangeSupplier'])
-if (isset($_POST['SearchSuppliers'])){
-
- if (mb_strlen($_POST['Keywords'])>0 AND mb_strlen($_SESSION['PO'.$identifier]->SupplierID)>0) {
- prnMsg(_('Supplier name keywords have been used in preference to the supplier code extract entered'),'warn');
- }
- if (mb_strlen($_POST['Keywords'])>0) {
+if (isset($_POST['SearchSuppliers'])) {
+ if (mb_strlen($_POST['Keywords']) > 0 AND mb_strlen($_SESSION['PO' . $identifier]->SupplierID) > 0) {
+ prnMsg(_('Supplier name keywords have been used in preference to the supplier code extract entered'), 'warn');
+ } //mb_strlen($_POST['Keywords']) > 0 AND mb_strlen($_SESSION['PO' . $identifier]->SupplierID) > 0
+ if (mb_strlen($_POST['Keywords']) > 0) {
//insert wildcard characters in spaces
- $SearchString = '%' . str_replace(' ', '%', $_POST['Keywords']) . '%';
+ $SearchString = '%' . str_replace(' ', '%', $_POST['Keywords']) . '%';
- $SQL = "SELECT suppliers.supplierid,
+ $SQL = "SELECT suppliers.supplierid,
suppliers.suppname,
suppliers.address1,
suppliers.address2,
@@ -319,11 +314,12 @@
suppliers.address6,
suppliers.currcode
FROM suppliers
- WHERE suppliers.suppname " . LIKE . " '". $SearchString ."'
+ WHERE suppliers.suppname " . LIKE . " '" . $SearchString . "'
ORDER BY suppliers.suppname";
- } elseif (mb_strlen($_POST['SuppCode'])>0){
- $SQL = "SELECT suppliers.supplierid,
+ } //mb_strlen($_POST['Keywords']) > 0
+ elseif (mb_strlen($_POST['SuppCode']) > 0) {
+ $SQL = "SELECT suppliers.supplierid,
suppliers.suppname,
suppliers.address1,
suppliers.address2,
@@ -335,8 +331,9 @@
FROM suppliers
WHERE suppliers.supplierid " . LIKE . " '%" . $_POST['SuppCode'] . "%'
ORDER BY suppliers.supplierid";
- } else {
- $SQL = "SELECT suppliers.supplierid,
+ } //mb_strlen($_POST['SuppCode']) > 0
+ else {
+ $SQL = "SELECT suppliers.supplierid,
suppliers.suppname,
suppliers.address1,
suppliers.address2,
@@ -347,53 +344,52 @@
suppliers.currcode
FROM suppliers
ORDER BY suppliers.supplierid";
- }
+ }
- $ErrMsg = _('The searched supplier records requested cannot be retrieved because');
- $result_SuppSelect = DB_query($SQL,$db,$ErrMsg);
- $SuppliersReturned=DB_num_rows($result_SuppSelect);
- if (DB_num_rows($result_SuppSelect)==1){
- $myrow=DB_fetch_array($result_SuppSelect);
- $_POST['Select'] = $myrow['supplierid'];
- } elseif (DB_num_rows($result_SuppSelect)==0){
- prnMsg( _('No supplier records contain the selected text') . ' - ' .
- _('please alter your search criteria and try again'),'info');
- }
-} /*end of if search for supplier codes/names */
+ $ErrMsg = _('The searched supplier records requested cannot be retrieved because');
+ $result_SuppSelect = DB_query($SQL, $db, $ErrMsg);
+ $SuppliersReturned = DB_num_rows($result_SuppSelect);
+ if (DB_num_rows($result_SuppSelect) == 1) {
+ $myrow = DB_fetch_array($result_SuppSelect);
+ $_POST['Select'] = $myrow['supplierid'];
+ } //DB_num_rows($result_SuppSelect) == 1
+ elseif (DB_num_rows($result_SuppSelect) == 0) {
+ prnMsg(_('No supplier records contain the selected text') . ' - ' . _('please alter your search criteria and try again'), 'info');
+ } //DB_num_rows($result_SuppSelect) == 0
+} //isset($_POST['SearchSuppliers'])
+/*end of if search for supplier codes/names */
-if((!isset($_POST['SearchSuppliers']) or $_POST['SearchSuppliers']=='' ) AND
- (isset($_SESSION['PO'.$identifier]->SupplierID) AND $_SESSION['PO'.$identifier]->SupplierID!='')){
+if ((!isset($_POST['SearchSuppliers']) or $_POST['SearchSuppliers'] == '') AND (isset($_SESSION['PO' . $identifier]->SupplierID) AND $_SESSION['PO' . $identifier]->SupplierID != '')) {
/*The session variables are set but the form variables could have been lost
* need to restore the form variables from the session */
- $_POST['SupplierID']=$_SESSION['PO'.$identifier]->SupplierID;
- $_POST['SupplierName']=$_SESSION['PO'.$identifier]->SupplierName;
- $_POST['CurrCode'] = $_SESSION['PO'.$identifier]->CurrCode;
- $_POST['ExRate'] = $_SESSION['PO'.$identifier]->ExRate;
- $_POST['PaymentTerms'] = $_SESSION['PO'.$identifier]->PaymentTerms;
- $_POST['DelAdd1']=$_SESSION['PO'.$identifier]->DelAdd1;
- $_POST['DelAdd2']=$_SESSION['PO'.$identifier]->DelAdd2;
- $_POST['DelAdd3']=$_SESSION['PO'.$identifier]->DelAdd3;
- $_POST['DelAdd4']=$_SESSION['PO'.$identifier]->DelAdd4;
- $_POST['DelAdd5']=$_SESSION['PO'.$identifier]->DelAdd5;
- $_POST['DelAdd6']=$_SESSION['PO'.$identifier]->DelAdd6;
- $_POST['SuppDelAdd1']=$_SESSION['PO'.$identifier]->SuppDelAdd1;
- $_POST['SuppDelAdd2']=$_SESSION['PO'.$identifier]->SuppDelAdd2;
- $_POST['SuppDelAdd3']=$_SESSION['PO'.$identifier]->SuppDelAdd3;
- $_POST['SuppDelAdd4']=$_SESSION['PO'.$identifier]->SuppDelAdd4;
- $_POST['SuppDelAdd5']=$_SESSION['PO'.$identifier]->SuppDelAdd5;
- $_POST['SuppDelAdd6']=$_SESSION['PO'.$identifier]->SuppDelAdd6;
- $_POST['DeliveryDate']=$_SESSION['PO'.$identifier]->DeliveryDate;
+ $_POST['SupplierID'] = $_SESSION['PO' . $identifier]->SupplierID;
+ $_POST['SupplierName'] = $_SESSION['PO' . $identifier]->SupplierName;
+ $_POST['CurrCode'] = $_SESSION['PO' . $identifier]->CurrCode;
+ $_POST['ExRate'] = $_SESSION['PO' . $identifier]->ExRate;
+ $_POST['PaymentTerms'] = $_SESSION['PO' . $identifier]->PaymentTerms;
+ $_POST['DelAdd1'] = $_SESSION['PO' . $identifier]->DelAdd1;
+ $_POST['DelAdd2'] = $_SESSION['PO' . $identifier]->DelAdd2;
+ $_POST['DelAdd3'] = $_SESSION['PO' . $identifier]->DelAdd3;
+ $_POST['DelAdd4'] = $_SESSION['PO' . $identifier]->DelAdd4;
+ $_POST['DelAdd5'] = $_SESSION['PO' . $identifier]->DelAdd5;
+ $_POST['DelAdd6'] = $_SESSION['PO' . $identifier]->DelAdd6;
+ $_POST['SuppDelAdd1'] = $_SESSION['PO' . $identifier]->SuppDelAdd1;
+ $_POST['SuppDelAdd2'] = $_SESSION['PO' . $identifier]->SuppDelAdd2;
+ $_POST['SuppDelAdd3'] = $_SESSION['PO' . $identifier]->SuppDelAdd3;
+ $_POST['SuppDelAdd4'] = $_SESSION['PO' . $identifier]->SuppDelAdd4;
+ $_POST['SuppDelAdd5'] = $_SESSION['PO' . $identifier]->SuppDelAdd5;
+ $_POST['SuppDelAdd6'] = $_SESSION['PO' . $identifier]->SuppDelAdd6;
+ $_POST['DeliveryDate'] = $_SESSION['PO' . $identifier]->DeliveryDate;
-}
+} //(!isset($_POST['SearchSuppliers']) or $_POST['SearchSuppliers'] == '') AND (isset($_SESSION['PO' . $identifier]->SupplierID) AND $_SESSION['PO' . $identifier]->SupplierID != '')
if (isset($_POST['Select'])) {
+ /* will only be true if page called from supplier selection form or item purchasing data order link
+ * or set because only one supplier record returned from a search
+ */
-/* will only be true if page called from supplier selection form or item purchasing data order link
- * or set because only one supplier record returned from a search
- */
-
$sql = "SELECT suppliers.suppname,
suppliers.currcode,
currencies.rate,
@@ -410,27 +406,26 @@
FROM suppliers INNER JOIN currencies
ON suppliers.currcode=currencies.currabrev
WHERE supplierid='" . $_POST['Select'] . "'";
-
- $ErrMsg = _('The supplier record of the supplier selected') . ': ' . $_POST['Select'] . ' ' .
- _('cannot be retrieved because');
+
+ $ErrMsg = _('The supplier record of the supplier selected') . ': ' . $_POST['Select'] . ' ' . _('cannot be retrieved because');
$DbgMsg = _('The SQL used to retrieve the supplier details and failed was');
- $result =DB_query($sql,$db,$ErrMsg,$DbgMsg);
+ $result = DB_query($sql, $db, $ErrMsg, $DbgMsg);
$myrow = DB_fetch_array($result);
- // added for suppliers lookup fields
+ // added for suppliers lookup fields
- $AuthSql="SELECT cancreate
+ $AuthSql = "SELECT cancreate
FROM purchorderauth
- WHERE userid='". $_SESSION['UserID'] . "'
- AND currabrev='". $myrow['currcode'] . "'";
-
- $AuthResult=DB_query($AuthSql,$db);
+ WHERE userid='" . $_SESSION['UserID'] . "'
+ AND currabrev='" . $myrow['currcode'] . "'";
- if (($AuthRow=DB_fetch_array($AuthResult) and $AuthRow['cancreate']==0 ) ) {
+ $AuthResult = DB_query($AuthSql, $db);
+
+ if (($AuthRow = DB_fetch_array($AuthResult) and $AuthRow['cancreate'] == 0)) {
$_POST['SupplierName'] = $myrow['suppname'];
$_POST['CurrCode'] = $myrow['currcode'];
$_POST['CurrDecimalPlaces'] = $myrow['decimalplaces'];
$_POST['ExRate'] = $myrow['rate'];
- $_POST['PaymentTerms']= $myrow['paymentterms'];
+ $_POST['PaymentTerms'] = $myrow['paymentterms'];
$_POST['SuppDelAdd1'] = $myrow['address1'];
$_POST['SuppDelAdd2'] = $myrow['address2'];
$_POST['SuppDelAdd3'] = $myrow['address3'];
@@ -440,32 +435,34 @@
$_POST['SuppTel'] = $myrow['telephone'];
$_POST['Port'] = $myrow['port'];
- $_SESSION['PO'.$identifier]->SupplierID = $_POST['Select'];
+ $_SESSION['PO' . $identifier]->SupplierID = $_POST['Select'];
$_SESSION['RequireSupplierSelection'] = 0;
- $_SESSION['PO'.$identifier]->SupplierName = $_POST['SupplierName'];
- $_SESSION['PO'.$identifier]->CurrCode = $_POST['CurrCode'];
- $_SESSION['PO'.$identifier]->CurrDecimalPlaces = $_POST['CurrDecimalPlaces'];
- $_SESSION['PO'.$identifier]->ExRate = $_POST['ExRate'];
- $_SESSION['PO'.$identifier]->PaymentTerms = $_POST['PaymentTerms'];
- $_SESSION['PO'.$identifier]->SuppDelAdd1 = $_POST['SuppDelAdd1'];
- $_SESSION['PO'.$identifier]->SuppDelAdd2 = $_POST['SuppDelAdd2'];
- $_SESSION['PO'.$identifier]->SuppDelAdd3 = $_POST['SuppDelAdd3'];
- $_SESSION['PO'.$identifier]->SuppDelAdd4 = $_POST['SuppDelAdd4'];
- $_SESSION['PO'.$identifier]->SuppDelAdd5 = $_POST['SuppDelAdd5'];
- $_SESSION['PO'.$identifier]->SuppDelAdd6 = $_POST['SuppDelAdd6'];
- $_SESSION['PO'.$identifier]->SuppTel = $_POST['SuppTel'];
- $_SESSION['PO'.$identifier]->Port = $_POST['Port'];
-
- } else {
- prnMsg( _('You do not have the authority to raise Purchase Orders for') . ' ' . $myrow['suppname'] .'. ' . _('Please Consult your system administrator for more information.') . '<br />' . _('You can setup authorisations'). ' ' . '<a href="PO_AuthorisationLevels.php">' . _('here') . '</a>', 'warn');
+ $_SESSION['PO' . $identifier]->SupplierName = $_POST['SupplierName'];
+ $_SESSION['PO' . $identifier]->CurrCode = $_POST['CurrCode'];
+ $_SESSION['PO' . $identifier]->CurrDecimalPlaces = $_POST['CurrDecimalPlaces'];
+ $_SESSION['PO' . $identifier]->ExRate = $_POST['ExRate'];
+ $_SESSION['PO' . $identifier]->PaymentTerms = $_POST['PaymentTerms'];
+ $_SESSION['PO' . $identifier]->SuppDelAdd1 = $_POST['SuppDelAdd1'];
+ $_SESSION['PO' . $identifier]->SuppDelAdd2 = $_POST['SuppDelAdd2'];
+ $_SESSION['PO' . $identifier]->SuppDelAdd3 = $_POST['SuppDelAdd3'];
+ $_SESSION['PO' . $identifier]->SuppDelAdd4 = $_POST['SuppDelAdd4'];
+ $_SESSION['PO' . $identifier]->SuppDelAdd5 = $_POST['SuppDelAdd5'];
+ $_SESSION['PO' . $identifier]->SuppDelAdd6 = $_POST['SuppDelAdd6'];
+ $_SESSION['PO' . $identifier]->SuppTel = $_POST['SuppTel'];
+ $_SESSION['PO' . $identifier]->Port = $_POST['Port'];
+
+ } //($AuthRow = DB_fetch_array($AuthResult) and $AuthRow['cancreate'] == 0)
+ else {
+ prnMsg(_('You do not have the authority to raise Purchase Orders for') . ' ' . $myrow['suppname'] . '. ' . _('Please Consult your system administrator for more information.') . '<br />' . _('You can setup authorisations') . ' ' . '<a href="PO_AuthorisationLevels.php">' . _('here') . '</a>', 'warn');
include('includes/footer.inc');
exit;
}
// end of added for suppliers lookup fields
-} else {
- $_POST['Select'] = $_SESSION['PO'.$identifier]->SupplierID;
+} //isset($_POST['Select'])
+else {
+ $_POST['Select'] = $_SESSION['PO' . $identifier]->SupplierID;
$sql = "SELECT suppliers.suppname,
suppliers.currcode,
currencies.decimalplaces,
@@ -481,22 +478,20 @@
FROM suppliers INNER JOIN currencies
ON suppliers.currcode=currencies.currabrev
WHERE supplierid='" . $_POST['Select'] . "'";
-
- $ErrMsg = _('The supplier record of the supplier selected') . ': ' . $_POST['Select'] . ' ' .
- _('cannot be retrieved because');
+
+ $ErrMsg = _('The supplier record of the supplier selected') . ': ' . $_POST['Select'] . ' ' . _('cannot be retrieved because');
$DbgMsg = _('The SQL used to retrieve the supplier details and failed was');
- $result =DB_query($sql,$db,$ErrMsg,$DbgMsg);
+ $result = DB_query($sql, $db, $ErrMsg, $DbgMsg);
$myrow = DB_fetch_array($result);
// added for suppliers lookup fields
- if (!isset($_SESSION['PO'.$identifier])) {
-
+ if (!isset($_SESSION['PO' . $identifier])) {
$_POST['SupplierName'] = $myrow['suppname'];
- $_POST['CurrCode'] = $myrow['currcode'];
+ $_POST['CurrCode'] = $myrow['currcode'];
$_POST['CurrDecimalPlaces'] = $myrow['decimalplaces'];
- $_POST['ExRate'] = $myrow['rate'];
- $_POST['PaymentTerms']= $myrow['paymentterms'];
+ $_POST['ExRate'] = $myrow['rate'];
+ $_POST['PaymentTerms'] = $myrow['paymentterms'];
$_POST['SuppDelAdd1'] = $myrow['address1'];
$_POST['SuppDelAdd2'] = $myrow['address2'];
$_POST['SuppDelAdd3'] = $myrow['address3'];
@@ -505,40 +500,36 @@
$_POST['SuppDelAdd6'] = $myrow['address6'];
$_POST['SuppTel'] = $myrow['telephone'];
$_POST['Port'] = $myrow['port'];
-
- $_SESSION['PO'.$identifier]->SupplierID = $_POST['Select'];
+
+ $_SESSION['PO' . $identifier]->SupplierID = $_POST['Select'];
$_SESSION['RequireSupplierSelection'] = 0;
- $_SESSION['PO'.$identifier]->SupplierName = $_POST['SupplierName'];
- $_SESSION['PO'.$identifier]->CurrCode = $_POST['CurrCode'];
- $_SESSION['PO'.$identifier]->CurrDecimalPlaces = $_POST['CurrDecimalPlaces'];
- $_SESSION['PO'.$identifier]->ExRate = filter_number_format($_POST['ExRate']);
- $_SESSION['PO'.$identifier]->PaymentTerms = $_POST['PaymentTerms'];
- $_SESSION['PO'.$identifier]->SuppDelAdd1 = $_POST['SuppDelAdd1'];
- $_SESSION['PO'.$identifier]->SuppDelAdd2 = $_POST['SuppDelAdd2'];
- $_SESSION['PO'.$identifier]->SuppDelAdd3 = $_POST['SuppDelAdd3'];
- $_SESSION['PO'.$identifier]->SuppDelAdd4 = $_POST['SuppDelAdd4'];
- $_SESSION['PO'.$identifier]->SuppDelAdd5 = $_POST['SuppDelAdd5'];
- $_SESSION['PO'.$identifier]->SuppDelAdd6 = $_POST['SuppDelAdd6'];
- $_SESSION['PO'.$identifier]->SuppTel = $_POST['SuppTel'];
- $_SESSION['PO'.$identifier]->Port = $_POST['Port'];
- // end of added for suppliers lookup fields
- }
+ $_SESSION['PO' . $identifier]->SupplierName = $_POST['SupplierName'];
+ $_SESSION['PO' . $identifier]->CurrCode = $_POST['CurrCode'];
+ $_SESSION['PO' . $identifier]->CurrDecimalPlaces = $_POST['CurrDecimalPlaces'];
+ $_SESSION['PO' . $identifier]->ExRate = filter_number_format($_POST['ExRate']);
+ $_SESSION['PO' . $identifier]->PaymentTerms = $_POST['PaymentTerms'];
+ $_SESSION['PO' . $identifier]->SuppDelAdd1 = $_POST['SuppDelAdd1'];
+ $_SESSION['PO' . $identifier]->SuppDelAdd2 = $_POST['SuppDelAdd2'];
+ $_SESSION['PO' . $identifier]->SuppDelAdd3 = $_POST['SuppDelAdd3'];
+ $_SESSION['PO' . $identifier]->SuppDelAdd4 = $_POST['SuppDelAdd4'];
+ $_SESSION['PO' . $identifier]->SuppDelAdd5 = $_POST['SuppDelAdd5'];
+ $_SESSION['PO' . $identifier]->SuppDelAdd6 = $_POST['SuppDelAdd6'];
+ $_SESSION['PO' . $identifier]->SuppTel = $_POST['SuppTel'];
+ $_SESSION['PO' . $identifier]->Port = $_POST['Port'];
+ // end of added for suppliers lookup fields
+ } //!isset($_SESSION['PO' . $identifier])
}
// part of step 1
-if ($_SESSION['RequireSupplierSelection'] ==1
- OR !isset($_SESSION['PO'.$identifier]->SupplierID)
- OR $_SESSION['PO'.$identifier]->SupplierID=='' ) {
-
- echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/supplier.png" title="' .
- _('Purchase Order') . '" alt="" />' . ' ' . _('Purchase Order: Select Supplier') . '</p>';
- echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier=' . $identifier . '" method="post" id="choosesupplier">';
- echo '<div>';
+if ($_SESSION['RequireSupplierSelection'] == 1 OR !isset($_SESSION['PO' . $identifier]->SupplierID) OR $_SESSION['PO' . $identifier]->SupplierID == '') {
+ echo '<p class="page_title_text"><img src="' . $rootpath . '/css/' . $theme . '/images/supplier.png" title="' . _('Purchase Order') . '" alt="" />' . ' ' . _('Purchase Order: Select Supplier') . '</p>';
+ echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?identifier=' . $identifier . '" method="post" id="choosesupplier">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- if (isset($SuppliersReturned)){
- echo '<input type="hidden" name="SuppliersReturned" value="' . $SuppliersReturned .'" />';
- }
+ if (isset($SuppliersReturned)) {
+ echo '<input type="hidden" name="SuppliersReturned" value="' . $SuppliersReturned . '" />';
+ } //isset($SuppliersReturned)
echo '<table cellpadding="3" class="selection">
<tr>
@@ -546,7 +537,7 @@
<td><input type="text" name="Keywords" size="20" maxlength="25" /></td>
<td><h3><b>' . _('OR') . '</b></h3></td>
<td>' . _('Enter text extract in the supplier code') . ':</td>
- <td><input type="text" name="SuppCode" size="15" maxlength="18" /></td>
+ <td><input type="text" name="SuppCode" size="15" maxlength="18" /></td>
</tr>
</table>
<br />
@@ -557,7 +548,6 @@
echo '<script type="text/javascript">defaultControl(document.forms[0].Keywords);</script>';
if (isset($result_SuppSelect)) {
-
echo '<br /><table cellpadding="3" class="selection">';
$tableheader = '<tr>
@@ -570,57 +560,59 @@
echo $tableheader;
$j = 1;
- $k = 0; /*row counter to determine background colour */
+ $k = 0;
+ /*row counter to determine background colour */
- while ($myrow=DB_fetch_array($result_SuppSelect)) {
-
- if ($k==1){
+ while ($myrow = DB_fetch_array($result_SuppSelect)) {
+ if ($k == 1) {
echo '<tr class="EvenTableRows">';
- $k=0;
- } else {
+ $k = 0;
+ } //$k == 1
+ else {
echo '<tr class="OddTableRows">';
$k++;
}
- echo '<td><input type="submit" style="width:100%" name="Select" value="'.$myrow['supplierid'].'" /></td>
- <td>'.$myrow['suppname'].'</td><td>';
+ echo '<td><input type="submit" style="width:100%" name="Select" value="' . $myrow['supplierid'] . '" /></td>
+ <td>' . $myrow['suppname'] . '</td><td>';
- for ($i=1; $i<=6; $i++) {
- if ($myrow['address'.$i] != '') {
- echo $myrow['address'.$i] . '<br />';
- }
- }
- echo '</td><td>'.$myrow['currcode'].'</td></tr>';
+ for ($i = 1; $i <= 6; $i++) {
+ if ($myrow['address' . $i] != '') {
+ echo $myrow['address' . $i] . '<br />';
+ } //$myrow['address' . $i] != ''
+ } //$i = 1; $i <= 6; $i++
+ echo '</td><td>' . $myrow['currcode'] . '</td></tr>';
//end of page full new headings if
- }
-//end of while loop
+ } //$myrow = DB_fetch_array($result_SuppSelect)
+ //end of while loop
echo '</table>';
- }
-//end if results to show
+ } //isset($result_SuppSelect)
+ //end if results to show
-//end if RequireSupplierSelection
-} else {
-/* everything below here only do if a supplier is selected */
+ //end if RequireSupplierSelection
+} //$_SESSION['RequireSupplierSelection'] == 1 OR !isset($_SESSION['PO' . $identifier]->SupplierID) OR $_SESSION['PO' . $identifier]->SupplierID == ''
+else {
+ /* everything below here only do if a supplier is selected */
- echo '<form id="form1" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier=' . $identifier . '" method="post">';
- echo '<div>';
+ echo '<form id="form1" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?identifier=' . $identifier . '" method="post">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<p class="page_title_text">
- <img src="'.$rootpath.'/css/'.$theme.'/images/supplier.png" title="' . _('Purchase Order') . '" alt="" />
- ' . $_SESSION['PO'.$identifier]->SupplierName . ' - ' . _('All amounts stated in') . '
- ' . $_SESSION['PO'.$identifier]->CurrCode . '</p>';
+ <img src="' . $rootpath . '/css/' . $theme . '/images/supplier.png" title="' . _('Purchase Order') . '" alt="" />
+ ' . $_SESSION['PO' . $identifier]->SupplierName . ' - ' . _('All amounts stated in') . '
+ ' . $_SESSION['PO' . $identifier]->CurrCode . '</p>';
if ($_SESSION['ExistingOrder']) {
- echo _(' Modify Purchase Order Number') . ' ' . $_SESSION['PO'.$identifier]->OrderNo;
- }
+ echo _(' Modify Purchase Order Number') . ' ' . $_SESSION['PO' . $identifier]->OrderNo;
+ } //$_SESSION['ExistingOrder']
if (isset($Purch_Item)) {
/*This is set if the user hits the link from the supplier purchasing info shown on SelectProduct.php */
- prnMsg(_('Purchase Item(s) with this code') . ': ' . $Purch_Item,'info');
+ prnMsg(_('Purchase Item(s) with this code') . ': ' . $Purch_Item, 'info');
echo '<div class="centre">';
echo '<br />
@@ -629,7 +621,7 @@
<td class="menu_group_item">';
/* the link */
- echo '<a href="'.$rootpath.'/PO_Items.php?NewItem=' . $Purch_Item . '&identifier=' . $identifier . '">' . _('Enter Line Item to this purchase order') . '</a>';
+ echo '<a href="' . $rootpath . '/PO_Items.php?NewItem=' . $Purch_Item . '&identifier=' . $identifier . '">' . _('Enter Line Item to this purchase order') . '</a>';
echo '</td>
</tr>
@@ -638,12 +630,13 @@
<br />';
if (isset($_GET['Quantity'])) {
- $Qty=$_GET['Quantity'];
- } else {
- $Qty=1;
+ $Qty = $_GET['Quantity'];
+ } //isset($_GET['Quantity'])
+ else {
+ $Qty = 1;
}
- $sql="SELECT stockmaster.controlled,
+ $sql = "SELECT stockmaster.controlled,
stockmaster.serialised,
stockmaster.description,
stockmaster.units ,
@@ -658,162 +651,148 @@
ON stockmaster.categoryid=stockcategory.categoryid
LEFT JOIN purchdata
ON stockmaster.stockid = purchdata.stockid
- WHERE stockmaster.stockid='".$Purch_Item. "'
+ WHERE stockmaster.stockid='" . $Purch_Item . "'
AND purchdata.supplierno ='" . $_GET['SelectedSupplier'] . "'";
- $result=DB_query($sql, $db);
- $PurchItemRow=DB_fetch_array($result);
+ $result = DB_query($sql, $db);
+ $PurchItemRow = DB_fetch_array($result);
if (!isset($PurchItemRow['conversionfactor'])) {
- $PurchItemRow['conversionfactor']=1;
- }
+ $PurchItemRow['conversionfactor'] = 1;
+ } //!isset($PurchItemRow['conversionfactor'])
if (!isset($PurchItemRow['leadtime'])) {
- $PurchItemRow['leadtime']=1;
- }
+ $PurchItemRow['leadtime'] = 1;
+ } //!isset($PurchItemRow['leadtime'])
- $_SESSION['PO'.$identifier]->add_to_order( 1,
- $Purch_Item,
- $PurchItemRow['serialised'],
- $PurchItemRow['controlled'],
- $Qty*$PurchItemRow['conversionfactor'],
- $PurchItemRow['description'],
- $PurchItemRow['price']/$PurchItemRow['conversionfactor'],
- $PurchItemRow['units'],
- $PurchItemRow['stockact'],
- $_SESSION['PO'.$identifier]->DeliveryDate,
- 0,
- 0,
- '',
- 0,
- 0,
- '',
- $PurchItemRow['decimalplaces'],
- $PurchItemRow['suppliersuom'],
- $PurchItemRow['conversionfactor'],
- $PurchItemRow['leadtime'],
- $PurchItemRow['suppliers_partno'] );
-
- echo '<meta http-equiv="refresh" content="0; url=' . $rootpath . '/PO_Items.php?identifier='.$identifier. '">';
- }
+ $_SESSION['PO' . $identifier]->add_to_order(1, $Purch_Item, $PurchItemRow['serialised'], $PurchItemRow['controlled'], $Qty * $PurchItemRow['conversionfactor'], $PurchItemRow['description'], $PurchItemRow['price'] / $PurchItemRow['conversionfactor'], $PurchItemRow['units'], $PurchItemRow['stockact'], $_SESSION['PO' . $identifier]->DeliveryDate, 0, 0, '', 0, 0, '', $PurchItemRow['decimalplaces'], $PurchItemRow['suppliersuom'], $PurchItemRow['conversionfactor'], $PurchItemRow['leadtime'], $PurchItemRow['suppliers_partno']);
+ echo '<meta http-equiv="refresh" content="0; url=' . $rootpath . '/PO_Items.php?identifier=' . $identifier . '">';
+ } //isset($Purch_Item)
+
/*Set up form for entry of order header stuff */
- if (!isset($_POST['LookupDeliveryAddress']) and (!isset($_POST['StkLocation']) or $_POST['StkLocation'])
- AND (isset($_SESSION['PO'.$identifier]->Location) AND $_SESSION['PO'.$identifier]->Location != '')) {
+ if (!isset($_POST['LookupDeliveryAddress']) and (!isset($_POST['StkLocation']) or $_POST['StkLocation']) AND (isset($_SESSION['PO' . $identifier]->Location) AND $_SESSION['PO' . $identifier]->Location != '')) {
/* The session variables are set but the form variables have
- * been lost --
- * need to restore the form variables from the session */
- $_POST['StkLocation']=$_SESSION['PO'.$identifier]->Location;
- $_POST['SupplierContact']=$_SESSION['PO'.$identifier]->SupplierContact;
- $_POST['DelAdd1']=$_SESSION['PO'.$identifier]->DelAdd1;
- $_POST['DelAdd2']=$_SESSION['PO'.$identifier]->DelAdd2;
- $_POST['DelAdd3']=$_SESSION['PO'.$identifier]->DelAdd3;
- $_POST['DelAdd4']=$_SESSION['PO'.$identifier]->DelAdd4;
- $_POST['DelAdd5']=$_SESSION['PO'.$identifier]->DelAdd5;
- $_POST['DelAdd6']=$_SESSION['PO'.$identifier]->DelAdd6;
- $_POST['Initiator']=$_SESSION['PO'.$identifier]->Initiator;
- $_POST['Requisition']=$_SESSION['PO'.$identifier]->RequisitionNo;
- $_POST['Version']=$_SESSION['PO'.$identifier]->Version;
- $_POST['DeliveryDate']=$_SESSION['PO'.$identifier]->DeliveryDate;
- $_POST['Revised']=$_SESSION['PO'.$identifier]->Revised;
- $_POST['ExRate']=$_SESSION['PO'.$identifier]->ExRate;
- $_POST['Comments']=$_SESSION['PO'.$identifier]->Comments;
- $_POST['DeliveryBy']=$_SESSION['PO'.$identifier]->DeliveryBy;
- $_POST['PaymentTerms']=$_SESSION['PO'.$identifier]->PaymentTerms;
- }
+ * been lost --
+ * need to restore the form variables from the session */
+ $_POST['StkLocation'] = $_SESSION['PO' . $identifier]->Location;
+ $_POST['SupplierContact'] = $_SESSION['PO' . $identifier]->SupplierContact;
+ $_POST['DelAdd1'] = $_SESSION['PO' . $identifier]->DelAdd1;
+ $_POST['DelAdd2'] = $_SESSION['PO' . $identifier]->DelAdd2;
+ $_POST['DelAdd3'] = $_SESSION['PO' . $identifier]->DelAdd3;
+ $_POST['DelAdd4'] = $_SESSION['PO' . $identifier]->DelAdd4;
+ $_POST['DelAdd5'] = $_SESSION['PO' . $identifier]->DelAdd5;
+ $_POST['DelAdd6'] = $_SESSION['PO' . $identifier]->DelAdd6;
+ $_POST['Initiator'] = $_SESSION['PO' . $identifier]->Initiator;
+ $_POST['Requisition'] = $_SESSION['PO' . $identifier]->RequisitionNo;
+ $_POST['Version'] = $_SESSION['PO' . $identifier]->Version;
+ $_POST['DeliveryDate'] = $_SESSION['PO' . $identifier]->DeliveryDate;
+ $_POST['Revised'] = $_SESSION['PO' . $identifier]->Revised;
+ $_POST['ExRate'] = $_SESSION['PO' . $identifier]->ExRate;
+ $_POST['Comments'] = $_SESSION['PO' . $identifier]->Comments;
+ $_POST['DeliveryBy'] = $_SESSION['PO' . $identifier]->DeliveryBy;
+ $_POST['PaymentTerms'] = $_SESSION['PO' . $identifier]->PaymentTerms;
+ $sql = "SELECT realname FROM www_users WHERE userid='" . $_POST['Initiator'] . "'";
+ $result = DB_query($sql, $db);
+ $myrow = DB_fetch_array($result);
+ $_POST['InitiatorName'] = $myrow['realname'];
+ } //!isset($_POST['LookupDeliveryAddress']) and (!isset($_POST['StkLocation']) or $_POST['StkLocation']) AND (isset($_SESSION['PO' . $identifier]->Location) AND $_SESSION['PO' . $identifier]->Location != '')
echo '<br /><table width="80%">
<tr>
<th><h3>' . _('Order Initiation Details') . '</h3></th>
<th><h3>' . _('Order Status') . '</h3></th>
- </tr>
+ </tr>
<tr><td style="width:50%">';
-//sub table starts
+ //sub table starts
echo '<table class="selection" width="100%">';
echo '<tr><td>' . _('PO Date') . ':</td><td>';
- if ($_SESSION['ExistingOrder']!=0){
- echo ConvertSQLDate($_SESSION['PO'.$identifier]->Orig_OrderDate);
- } else {
+ if ($_SESSION['ExistingOrder'] != 0) {
+ echo ConvertSQLDate($_SESSION['PO' . $identifier]->Orig_OrderDate);
+ } //$_SESSION['ExistingOrder'] != 0
+ else {
/* DefaultDateFormat defined in config.php */
echo Date($_SESSION['DefaultDateFormat']);
}
echo '</td></tr>';
if (isset($_GET['ModifyOrderNumber']) AND $_GET['ModifyOrderNumber'] != '') {
- $_SESSION['PO'.$identifier]->Version += 1;
- $_POST['Version'] = $_SESSION['PO'.$identifier]->Version;
- } elseif (isset($_SESSION['PO'.$identifier]->Version) AND $_SESSION['PO'.$identifier]->Version != '') {
- $_POST['Version'] = $_SESSION['PO'.$identifier]->Version;
- } else {
- $_POST['Version']='1';
+ $_SESSION['PO' . $identifier]->Version += 1;
+ $_POST['Version'] = $_SESSION['PO' . $identifier]->Version;
+ } //isset($_GET['ModifyOrderNumber']) AND $_GET['ModifyOrderNumber'] != ''
+ elseif (isset($_SESSION['PO' . $identifier]->Version) AND $_SESSION['PO' . $identifier]->Version != '') {
+ $_POST['Version'] = $_SESSION['PO' . $identifier]->Version;
+ } //isset($_SESSION['PO' . $identifier]->Version) AND $_SESSION['PO' . $identifier]->Version != ''
+ else {
+ $_POST['Version'] = '1';
}
if (!isset($_POST['DeliveryDate'])) {
- $_POST['DeliveryDate']= date($_SESSION['DefaultDateFormat']);
- }
+ $_POST['DeliveryDate'] = date($_SESSION['DefaultDateFormat']);
+ } //!isset($_POST['DeliveryDate'])
- echo '<tr><td>' . _('Version'). ' #' . ':</td>
+ echo '<tr><td>' . _('Version') . ' #' . ':</td>
<td><input type="hidden" name="Version" size="16" maxlength="15" value="' . $_POST['Version'] . '" />' . $_POST['Version'] . '</td></tr>';
echo '<tr><td>' . _('Revised') . ':</td>
- <td><input type="hidden" name="Revised" size="11" maxlength="15" value="' . date($_SESSION['DefaultDateFormat']) . '" />' . date($_SESSION['DefaultDateFormat']) . '</td></tr>';
+ <td><input type="hidden" name="Revised" size="11" maxlength="15" value="' . date($_SESSION['DefaultDateFormat']) . '" />' . date($_SESSION['DefaultDateFormat']) . '</td></tr>';
echo '<tr><td>' . _('Delivery Date') . ':</td>
- <td><input type="text" class="date" alt="' .$_SESSION['DefaultDateFormat'] .'" name="DeliveryDate" size="11" value="' . $_POST['DeliveryDate'] . '" /></td></tr>';
+ <td><input type="text" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" name="DeliveryDate" size="11" value="' . $_POST['DeliveryDate'] . '" /></td></tr>';
if (!isset($_POST['Initiator'])) {
- $_POST['Initiator'] = $_SESSION['UsersRealName'];
+ $_POST['Initiator'] = $_SESSION['UserID'];
+ $_POST['InitiatorName'] = $_SESSION['UsersRealName'];
$_POST['Requisition'] = '';
- }
+ } //!isset($_POST['Initiator'])
echo '<tr><td>' . _('Initiated By') . ':</td>
- <td><input type="hidden" name="Initiator" size="11" maxlength="10" value="' . $_POST['Initiator'] . '" />' . $_POST['Initiator'] . '</td></tr>';
+ <td><input type="hidden" name="Initiator" size="11" maxlength="10" value="' . $_POST['Initiator'] . '" />' . $_POST['InitiatorName'] . '</td></tr>';
echo '<tr><td>' . _('Requisition Ref') . ':</td>
<td><input type="text" name="Requisition" size="16" maxlength="15" value="' . $_POST['Requisition'] . '" /></td></tr>';
echo '<tr><td>' . _('Date Printed') . ':</td><td>';
- if (isset($_SESSION['PO'.$identifier]->DatePurchaseOrderPrinted)
- AND mb_strlen($_SESSION['PO'.$identifier]->DatePurchaseOrderPrinted)>6){
-
- echo ConvertSQLDate($_SESSION['PO'.$identifier]->DatePurchaseOrderPrinted);
+ if (isset($_SESSION['PO' . $identifier]->DatePurchaseOrderPrinted) AND mb_strlen($_SESSION['PO' . $identifier]->DatePurchaseOrderPrinted) > 6) {
+ echo ConvertSQLDate($_SESSION['PO' . $identifier]->DatePurchaseOrderPrinted);
$Printed = True;
- } else {
+ } //isset($_SESSION['PO' . $identifier]->DatePurchaseOrderPrinted) AND mb_strlen($_SESSION['PO' . $identifier]->DatePurchaseOrderPrinted) > 6
+ else {
$Printed = False;
- echo _('Not yet printed').'</td></tr>';
+ echo _('Not yet printed') . '</td></tr>';
}
if (isset($_POST['AllowRePrint'])) {
- $sql="UPDATE purchorders SET allowprint=1 WHERE orderno='".$_SESSION['PO'.$identifier]->OrderNo . "'";
- $result=DB_query($sql, $db);
- }
+ $sql = "UPDATE purchorders SET allowprint=1 WHERE orderno='" . $_SESSION['PO' . $identifier]->OrderNo . "'";
+ $result = DB_query($sql, $db);
+ } //isset($_POST['AllowRePrint'])
- if ($_SESSION['PO'.$identifier]->AllowPrintPO==0 AND empty($_POST['RePrint'])){
+ if ($_SESSION['PO' . $identifier]->AllowPrintPO == 0 AND empty($_POST['RePrint'])) {
echo '<tr><td>' . _('Allow Reprint') . ':</td>
<td><select name="RePrint" onchange="ReloadForm(form1.AllowRePrint)">
<option selected="selected" value="0">' . _('No') . '</option>
<option value="1">' . _('Yes') . '</option>
</select></td>';
echo '<td><input type="submit" name="AllowRePrint" value="Update" /></td></tr>';
- } elseif ($Printed) {
- echo '<tr><td colspan...
[truncated message content] |
|
From: <dai...@us...> - 2012-12-05 08:39:19
|
Revision: 5752
http://sourceforge.net/p/web-erp/reponame/5752
Author: daintree
Date: 2012-12-05 08:39:15 +0000 (Wed, 05 Dec 2012)
Log Message:
-----------
Allow auto receiving of purchase orders and populating of supplier invoice for authorised purchase orders to short circuit entry of supplier invoices
Modified Paths:
--------------
trunk/Customers.php
trunk/GoodsReceived.php
trunk/PO_Header.php
trunk/PO_Items.php
trunk/PO_PDFPurchOrder.php
trunk/PO_SelectOSPurchOrder.php
trunk/SuppFixedAssetChgs.php
trunk/SuppInvGRNs.php
trunk/SupplierInvoice.php
trunk/doc/Change.log
trunk/doc/Manual/ManualPurchaseOrdering.html
Removed Paths:
-------------
trunk/companies/companies.inf
Modified: trunk/Customers.php
===================================================================
--- trunk/Customers.php 2012-12-04 16:02:13 UTC (rev 5751)
+++ trunk/Customers.php 2012-12-05 08:39:15 UTC (rev 5752)
@@ -334,9 +334,6 @@
unset($_POST['Address4']);
unset($_POST['Address5']);
unset($_POST['Address6']);
- unset($_POST['Phone']);
- unset($_POST['Fax']);
- unset($_POST['Email']);
unset($_POST['HoldReason']);
unset($_POST['PaymentTerms']);
unset($_POST['Discount']);
@@ -440,13 +437,7 @@
echo '<tr><td>' . _('Customer Name') . ':</td>
<td><input tabindex="2" type="text" name="CustName" size="42" maxlength="40" /></td></tr>';
- echo '<tr><td>' . _('Telephone') . ':</td>
- <td><input tabindex="2" type="text" name="Phone" size="30" maxlength="40" /></td></tr>';
- echo '<tr><td>' . _('Facsimile') . ':</td>
- <td><input tabindex="2" type="text" name="Fax" size="30" maxlength="40" /></td></tr>';
- echo '<tr><td>' . _('Email Address') . ':</td>
- <td><input tabindex="2" type="text" name="Email" size="30" maxlength="40" /></td></tr>';
- echo '<tr><td>' . _('Address Line 1 (Street)') . ':</td>
+ echo '<tr><td>' . _('Address Line 1 (Street)') . ':</td>
<td><input tabindex="3" type="text" name="Address1" size="42" maxlength="40" /></td></tr>';
echo '<tr><td>' . _('Address Line 2 (Street)') . ':</td>
<td><input tabindex="4" type="text" name="Address2" size="42" maxlength="40" /></td></tr>';
Modified: trunk/GoodsReceived.php
===================================================================
--- trunk/GoodsReceived.php 2012-12-04 16:02:13 UTC (rev 5751)
+++ trunk/GoodsReceived.php 2012-12-05 08:39:15 UTC (rev 5752)
@@ -25,7 +25,7 @@
echo '<a href="'. $rootpath . '/PO_SelectOSPurchOrder.php">' . _('Back to Purchase Orders'). '</a>
<br />';
-if (isset($_GET['PONumber']) and $_GET['PONumber']<=0 and !isset($_SESSION['PO'.$identifier])) {
+if (isset($_GET['PONumber']) AND $_GET['PONumber']<=0 AND !isset($_SESSION['PO'.$identifier])) {
/* This page can only be called with a purchase order number for invoicing*/
echo '<div class="centre">
<a href= "' . $rootpath . '/PO_SelectOSPurchOrder.php">' . _('Select a purchase order to receive').'</a>
Modified: trunk/PO_Header.php
===================================================================
--- trunk/PO_Header.php 2012-12-04 16:02:13 UTC (rev 5751)
+++ trunk/PO_Header.php 2012-12-05 08:39:15 UTC (rev 5752)
@@ -8,15 +8,18 @@
if (isset($_GET['ModifyOrderNumber'])) {
$title = _('Modify Purchase Order') . ' ' . $_GET['ModifyOrderNumber'];
-} //isset($_GET['ModifyOrderNumber'])
-else {
+} else {
$title = _('Purchase Order Entry');
}
if (isset($_GET['SupplierID'])) {
$_POST['Select'] = $_GET['SupplierID'];
-} //isset($_GET['SupplierID'])
+}
+/* webERP manual links before header.inc */
+$ViewTopic= 'PurchaseOrdering';
+$BookMark = 'PurchaseOrdering';
+
include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
@@ -30,8 +33,7 @@
if (empty($_GET['identifier'])) {
$identifier = date('U');
-} //empty($_GET['identifier'])
-else {
+} else {
$identifier = $_GET['identifier'];
}
@@ -39,10 +41,10 @@
* the session variable that holds all the PO data $_SESSION['PO'][$identifier]
* is unset to allow all new details to be created */
-if (isset($_GET['NewOrder']) and isset($_SESSION['PO' . $identifier])) {
+if (isset($_GET['NewOrder']) AND isset($_SESSION['PO' . $identifier])) {
unset($_SESSION['PO' . $identifier]);
$_SESSION['ExistingOrder'] = 0;
-} //isset($_GET['NewOrder']) and isset($_SESSION['PO' . $identifier])
+}
if (isset($_POST['Select']) AND empty($_POST['SupplierContact'])) {
$sql = "SELECT contact
@@ -53,18 +55,17 @@
if (DB_num_rows($SuppCoResult) > 0) {
$myrow = DB_fetch_row($SuppCoResult);
$_POST['SupplierContact'] = $myrow[0];
- } //DB_num_rows($SuppCoResult) > 0
- else {
+ } else {
$_POST['SupplierContact'] = '';
}
-} //isset($_POST['Select']) AND empty($_POST['SupplierContact'])
+}
if ((isset($_POST['UpdateStatus']) AND $_POST['UpdateStatus'] != '')) {
+
if ($_SESSION['ExistingOrder'] == 0) {
prnMsg(_('This is a new order. It must be created before you can change the status'), 'warn');
$OKToUpdateStatus = 0;
- } //$_SESSION['ExistingOrder'] == 0
- elseif ($_SESSION['PO' . $identifier]->Status != $_POST['Status']) { //the old status != new status
+ } elseif ($_SESSION['PO' . $identifier]->Status != $_POST['Status']) { //the old status != new status
$OKToUpdateStatus = 1;
$AuthSQL = "SELECT authlevel
FROM purchorderauth
@@ -78,11 +79,10 @@
if ($_POST['StatusComments'] != '') {
$_POST['StatusComments'] = ' - ' . $_POST['StatusComments'];
- } //$_POST['StatusComments'] != ''
+ }
if (IsEmailAddress($_SESSION['UserEmail'])) {
$UserChangedStatus = ' <a href="mailto:' . $_SESSION['UserEmail'] . '">' . $_SESSION['UsersRealName'] . '</a>';
- } //IsEmailAddress($_SESSION['UserEmail'])
- else {
+ } else {
$UserChangedStatus = ' ' . $_SESSION['UsersRealName'] . ' ';
}
@@ -90,32 +90,29 @@
if ($AuthorityLevel > $OrderTotal) {
$_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;
- } //$AuthorityLevel > $OrderTotal
- else {
+ } else {
$OKToUpdateStatus = 0;
prnMsg(_('You do not have permission to authorise this purchase order') . '.<br />' . _('This order is for') . ' ' . $_SESSION['PO' . $identifier]->CurrCode . ' ' . $OrderTotal . '. ' . _('You can only authorise up to') . ' ' . $_SESSION['PO' . $identifier]->CurrCode . ' ' . $AuthorityLevel . '.<br />' . _('If you think this is a mistake please contact the systems administrator'), 'warn');
}
- } //$_POST['Status'] == 'Authorised'
+ }
-
if ($_POST['Status'] == 'Rejected' OR $_POST['Status'] == 'Cancelled') {
if (!isset($_SESSION['ExistingOrder']) OR $_SESSION['ExistingOrder'] != 0) {
/* need to check that not already dispatched or invoiced by the supplier */
if ($_SESSION['PO' . $identifier]->Any_Already_Received() == 1) {
$OKToUpdateStatus = 0; //not ok to update the status
prnMsg(_('This order cannot be cancelled or rejected because some of it has already been received') . '. ' . _('The line item quantities may be modified to quantities more than already received') . '. ' . _('Prices cannot be altered for lines that have already been received') . ' ' . _('and quantities cannot be reduced below the quantity already received'), 'warn');
- } //$_SESSION['PO' . $identifier]->Any_Already_Received() == 1
+ }
$ShipmentExists = $_SESSION['PO' . $identifier]->Any_Lines_On_A_Shipment();
if ($ShipmentExists != false) {
$OKToUpdateStatus = 0; //not ok to update the status
prnMsg(_('This order cannot be cancelled or rejected because there is at least one line that is allocated to a shipment') . '. ' . _('See shipment number') . ' ' . $ShipmentExists, 'warn');
- } //$ShipmentExists != false
+ }
} //!isset($_SESSION['ExistingOrder']) OR $_SESSION['ExistingOrder'] != 0
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 />' . html_entity_decode($_POST['StatusCommentsComplete'], ENT_QUOTES, 'UTF-8');
- } //$AuthorityLevel > $OrderTotal
- else {
+ } else {
$OKToUpdateStatus = 0;
prnMsg(_('You do not have permission to reject this purchase order') . '.<br />' . _('This order is for') . ' ' . $_SESSION['PO' . $identifier]->CurrCode . ' ' . $OrderTotal . '. ' . _('Your authorisation limit is set at') . ' ' . $_SESSION['PO' . $identifier]->CurrCode . ' ' . $AuthorityLevel . '.<br />' . _('If you think this is a mistake please contact the systems administrator'), 'warn');
}
@@ -123,16 +120,16 @@
} //$_POST['Status'] == 'Rejected' OR $_POST['Status'] == 'Cancelled'
if ($_POST['Status'] == 'Pending') {
+
if ($_SESSION['PO' . $identifier]->Any_Already_Received() == 1) {
$OKToUpdateStatus = 0; //not OK to update status
prnMsg(_('This order could not have the status changed back to pending because some of it has already been received. Quantities received will need to be returned to change the order back to pending.'), 'warn');
- } //$_SESSION['PO' . $identifier]->Any_Already_Received() == 1
+ }
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 />' . html_entity_decode($_POST['StatusCommentsComplete'], ENT_QUOTES, 'UTF-8');
- } //($AuthorityLevel > $OrderTotal OR $_SESSION['UserID'] == $_SESSION['PO' . $identifier]->Initiator) AND $OKToUpdateStatus == 1
- elseif ($AuthorityLevel < $OrderTotal AND $_SESSION['UserID'] != $_SESSION['PO' . $identifier]->Initiator) {
+ } elseif ($AuthorityLevel < $OrderTotal AND $_SESSION['UserID'] != $_SESSION['PO' . $identifier]->Initiator) {
$OKToUpdateStatus = 0;
prnMsg(_('You do not have permission to change the status of this purchase order') . '.<br />' . _('This order is for') . ' ' . $_SESSION['PO' . $identifier]->CurrCode . ' ' . $OrderTotal . '. ' . _('Your authorisation limit is set at') . ' ' . $_SESSION['PO' . $identifier]->CurrCode . ' ' . $AuthorityLevel . '.<br />' . _('If you think this is a mistake please contact the systems administrator'), 'warn');
} //$AuthorityLevel < $OrderTotal AND $_SESSION['UserID'] != $_SESSION['PO' . $identifier]->Initiator
@@ -155,7 +152,7 @@
$UpdateResult = DB_query($SQL, $db, $ErrMsg);
} //$OKToUpdateStatus == 1
} //end if there is actually a status change the class Status != the POST['Status']
-} //(isset($_POST['UpdateStatus']) AND $_POST['UpdateStatus'] != '')
+} //End if user hit Update Status
if (isset($_GET['NewOrder']) AND isset($_GET['StockID']) AND isset($_GET['SelectedSupplier'])) {
/*
@@ -183,7 +180,7 @@
*/
$Purch_Item = $_GET['StockID'];
-} //isset($_GET['NewOrder']) AND isset($_GET['StockID']) AND isset($_GET['SelectedSupplier'])
+} //End if it's a new order sent with supplier code and the item to order
if (isset($_POST['EnterLines']) OR isset($_POST['AllowRePrint'])) {
/*User hit the button to enter line items -
@@ -213,7 +210,7 @@
$_SESSION['PO' . $identifier]->DeliveryBy = $_POST['DeliveryBy'];
if (isset($_POST['StatusComments'])) {
$_SESSION['PO' . $identifier]->StatusComments = $_POST['StatusComments'];
- } //isset($_POST['StatusComments'])
+ }
$_SESSION['PO' . $identifier]->PaymentTerms = $_POST['PaymentTerms'];
$_SESSION['PO' . $identifier]->Contact = $_POST['Contact'];
$_SESSION['PO' . $identifier]->Tel = $_POST['Tel'];
@@ -228,7 +225,7 @@
$ErrMsg = _('An error occurred updating the purchase order to allow reprints') . '. ' . _('The error says');
$UpdateResult = DB_query($sql, $db, $ErrMsg);
- } //isset($_POST['RePrint']) AND $_POST['RePrint'] == 1
+ } //end if change to allow reprint
else {
$_POST['RePrint'] = 0;
}
@@ -238,7 +235,7 @@
prnMsg(_('You should automatically be forwarded to the entry of the purchase order line items page') . '. ' . _('If this does not happen') . ' (' . _('if the browser does not support META Refresh') . ') ' . '<a href="' . $rootpath . '/PO_Items.php?identifier=' . $identifier . '">' . _('click here') . '</a> ' . _('to continue'), 'info');
include('includes/footer.inc');
exit;
- } //!isset($_POST['AllowRePrint'])
+ } // end if reprint not allowed
} //isset($_POST['EnterLines']) OR isset($_POST['AllowRePrint'])
/* end of if isset _POST'EnterLines' */
@@ -275,31 +272,33 @@
* variable supplierID holds the supplier code already
* as determined from user id /password entry */
$_SESSION['RequireSupplierSelection'] = 1;
- } //$_SESSION['PO' . $identifier]->SupplierID == '' OR !isset($_SESSION['PO' . $identifier]->SupplierID)
- else {
+ } else {
$_SESSION['RequireSupplierSelection'] = 0;
}
-} //!isset($_SESSION['PO' . $identifier])
+} //end if initiating a new PO
if (isset($_POST['ChangeSupplier'])) {
if ($_SESSION['PO' . $identifier]->Status == 'Pending' AND $_SESSION['UserID'] == $_SESSION['PO' . $identifier]->Initiator) {
+
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 />' . html_entity_decode($_POST['StatusCommentsComplete'], ENT_QUOTES, 'UTF-8');
- } //$_SESSION['PO' . $identifier]->Any_Already_Received() == 0
- else {
+
+ } else {
+
echo '<br /><br />';
prnMsg(_('Cannot modify the supplier of the order once some of the order has been received'), 'warn');
}
- } //$_SESSION['PO' . $identifier]->Status == 'Pending' AND $_SESSION['UserID'] == $_SESSION['PO' . $identifier]->Initiator
-} //isset($_POST['ChangeSupplier'])
+ }
+} //user hit ChangeSupplier
if (isset($_POST['SearchSuppliers'])) {
if (mb_strlen($_POST['Keywords']) > 0 AND mb_strlen($_SESSION['PO' . $identifier]->SupplierID) > 0) {
prnMsg(_('Supplier name keywords have been used in preference to the supplier code extract entered'), 'warn');
- } //mb_strlen($_POST['Keywords']) > 0 AND mb_strlen($_SESSION['PO' . $identifier]->SupplierID) > 0
+ }
if (mb_strlen($_POST['Keywords']) > 0) {
//insert wildcard characters in spaces
$SearchString = '%' . str_replace(' ', '%', $_POST['Keywords']) . '%';
@@ -317,8 +316,8 @@
WHERE suppliers.suppname " . LIKE . " '" . $SearchString . "'
ORDER BY suppliers.suppname";
- } //mb_strlen($_POST['Keywords']) > 0
- elseif (mb_strlen($_POST['SuppCode']) > 0) {
+ } elseif (mb_strlen($_POST['SuppCode']) > 0) {
+
$SQL = "SELECT suppliers.supplierid,
suppliers.suppname,
suppliers.address1,
@@ -331,19 +330,19 @@
FROM suppliers
WHERE suppliers.supplierid " . LIKE . " '%" . $_POST['SuppCode'] . "%'
ORDER BY suppliers.supplierid";
- } //mb_strlen($_POST['SuppCode']) > 0
- else {
+ } else {
+
$SQL = "SELECT suppliers.supplierid,
- suppliers.suppname,
- suppliers.address1,
- suppliers.address2,
- suppliers.address3,
- suppliers.address4,
- suppliers.address5,
- suppliers.address6,
- suppliers.currcode
- FROM suppliers
- ORDER BY suppliers.supplierid";
+ suppliers.suppname,
+ suppliers.address1,
+ suppliers.address2,
+ suppliers.address3,
+ suppliers.address4,
+ suppliers.address5,
+ suppliers.address6,
+ suppliers.currcode
+ FROM suppliers
+ ORDER BY suppliers.supplierid";
}
$ErrMsg = _('The searched supplier records requested cannot be retrieved because');
@@ -352,15 +351,12 @@
if (DB_num_rows($result_SuppSelect) == 1) {
$myrow = DB_fetch_array($result_SuppSelect);
$_POST['Select'] = $myrow['supplierid'];
- } //DB_num_rows($result_SuppSelect) == 1
- elseif (DB_num_rows($result_SuppSelect) == 0) {
+ } elseif (DB_num_rows($result_SuppSelect) == 0) {
prnMsg(_('No supplier records contain the selected text') . ' - ' . _('please alter your search criteria and try again'), 'info');
- } //DB_num_rows($result_SuppSelect) == 0
-} //isset($_POST['SearchSuppliers'])
+ }
+} /*end of if search for supplier codes/names */
-/*end of if search for supplier codes/names */
-
if ((!isset($_POST['SearchSuppliers']) or $_POST['SearchSuppliers'] == '') AND (isset($_SESSION['PO' . $identifier]->SupplierID) AND $_SESSION['PO' . $identifier]->SupplierID != '')) {
/*The session variables are set but the form variables could have been lost
* need to restore the form variables from the session */
@@ -383,7 +379,7 @@
$_POST['SuppDelAdd6'] = $_SESSION['PO' . $identifier]->SuppDelAdd6;
$_POST['DeliveryDate'] = $_SESSION['PO' . $identifier]->DeliveryDate;
-} //(!isset($_POST['SearchSuppliers']) or $_POST['SearchSuppliers'] == '') AND (isset($_SESSION['PO' . $identifier]->SupplierID) AND $_SESSION['PO' . $identifier]->SupplierID != '')
+}
if (isset($_POST['Select'])) {
/* will only be true if page called from supplier selection form or item purchasing data order link
@@ -451,8 +447,8 @@
$_SESSION['PO' . $identifier]->SuppTel = $_POST['SuppTel'];
$_SESSION['PO' . $identifier]->Port = $_POST['Port'];
- } //($AuthRow = DB_fetch_array($AuthResult) and $AuthRow['cancreate'] == 0)
- else {
+ } else {
+
prnMsg(_('You do not have the authority to raise Purchase Orders for') . ' ' . $myrow['suppname'] . '. ' . _('Please Consult your system administrator for more information.') . '<br />' . _('You can setup authorisations') . ' ' . '<a href="PO_AuthorisationLevels.php">' . _('here') . '</a>', 'warn');
include('includes/footer.inc');
exit;
@@ -460,7 +456,9 @@
// end of added for suppliers lookup fields
-} //isset($_POST['Select'])
+} /* isset($_POST['Select']) will only be true if page called from supplier selection form or item purchasing data order link
+ * or set because only one supplier record returned from a search
+ */
else {
$_POST['Select'] = $_SESSION['PO' . $identifier]->SupplierID;
$sql = "SELECT suppliers.suppname,
@@ -518,8 +516,8 @@
$_SESSION['PO' . $identifier]->SuppTel = $_POST['SuppTel'];
$_SESSION['PO' . $identifier]->Port = $_POST['Port'];
// end of added for suppliers lookup fields
- } //!isset($_SESSION['PO' . $identifier])
-}
+ }
+} // NOT isset($_POST['Select']) - not called with supplier selection so update variables
// part of step 1
if ($_SESSION['RequireSupplierSelection'] == 1 OR !isset($_SESSION['PO' . $identifier]->SupplierID) OR $_SESSION['PO' . $identifier]->SupplierID == '') {
@@ -527,17 +525,18 @@
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?identifier=' . $identifier . '" method="post" id="choosesupplier">';
echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+
if (isset($SuppliersReturned)) {
echo '<input type="hidden" name="SuppliersReturned" value="' . $SuppliersReturned . '" />';
- } //isset($SuppliersReturned)
-
+ }
+
echo '<table cellpadding="3" class="selection">
<tr>
- <td>' . _('Enter text in the supplier name') . ':</td>
- <td><input type="text" name="Keywords" size="20" maxlength="25" /></td>
- <td><h3><b>' . _('OR') . '</b></h3></td>
- <td>' . _('Enter text extract in the supplier code') . ':</td>
- <td><input type="text" name="SuppCode" size="15" maxlength="18" /></td>
+ <td>' . _('Enter text in the supplier name') . ':</td>
+ <td><input type="text" name="Keywords" size="20" maxlength="25" /></td>
+ <td><h3><b>' . _('OR') . '</b></h3></td>
+ <td>' . _('Enter text extract in the supplier code') . ':</td>
+ <td><input type="text" name="SuppCode" size="15" maxlength="18" /></td>
</tr>
</table>
<br />
@@ -551,12 +550,12 @@
echo '<br /><table cellpadding="3" class="selection">';
$tableheader = '<tr>
- <th>' . _('Code') . '</th>
- <th>' . _('Supplier Name') . '</th>
- <th>' . _('Address') . '</th>
- <th>' . _('Currency') . '</th>
- </tr>';
-
+ <th>' . _('Code') . '</th>
+ <th>' . _('Supplier Name') . '</th>
+ <th>' . _('Address') . '</th>
+ <th>' . _('Currency') . '</th>
+ </tr>';
+
echo $tableheader;
$j = 1;
@@ -567,8 +566,7 @@
if ($k == 1) {
echo '<tr class="EvenTableRows">';
$k = 0;
- } //$k == 1
- else {
+ } else {
echo '<tr class="OddTableRows">';
$k++;
}
@@ -579,22 +577,22 @@
for ($i = 1; $i <= 6; $i++) {
if ($myrow['address' . $i] != '') {
echo $myrow['address' . $i] . '<br />';
- } //$myrow['address' . $i] != ''
- } //$i = 1; $i <= 6; $i++
- echo '</td><td>' . $myrow['currcode'] . '</td></tr>';
+ }
+ }
+ echo '</td>
+ <td>' . $myrow['currcode'] . '</td>
+ </tr>';
//end of page full new headings if
- } //$myrow = DB_fetch_array($result_SuppSelect)
- //end of while loop
+ } //end of while loop
echo '</table>';
- } //isset($result_SuppSelect)
+ }
//end if results to show
//end if RequireSupplierSelection
-} //$_SESSION['RequireSupplierSelection'] == 1 OR !isset($_SESSION['PO' . $identifier]->SupplierID) OR $_SESSION['PO' . $identifier]->SupplierID == ''
-else {
+} else {
/* everything below here only do if a supplier is selected */
echo '<form id="form1" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?identifier=' . $identifier . '" method="post">';
@@ -608,8 +606,8 @@
if ($_SESSION['ExistingOrder']) {
echo _(' Modify Purchase Order Number') . ' ' . $_SESSION['PO' . $identifier]->OrderNo;
- } //$_SESSION['ExistingOrder']
-
+ }
+
if (isset($Purch_Item)) {
/*This is set if the user hits the link from the supplier purchasing info shown on SelectProduct.php */
prnMsg(_('Purchase Item(s) with this code') . ': ' . $Purch_Item, 'info');
@@ -631,8 +629,7 @@
if (isset($_GET['Quantity'])) {
$Qty = $_GET['Quantity'];
- } //isset($_GET['Quantity'])
- else {
+ } else {
$Qty = 1;
}
@@ -658,16 +655,17 @@
if (!isset($PurchItemRow['conversionfactor'])) {
$PurchItemRow['conversionfactor'] = 1;
- } //!isset($PurchItemRow['conversionfactor'])
+ }
+
if (!isset($PurchItemRow['leadtime'])) {
$PurchItemRow['leadtime'] = 1;
- } //!isset($PurchItemRow['leadtime'])
-
+ }
+
$_SESSION['PO' . $identifier]->add_to_order(1, $Purch_Item, $PurchItemRow['serialised'], $PurchItemRow['controlled'], $Qty * $PurchItemRow['conversionfactor'], $PurchItemRow['description'], $PurchItemRow['price'] / $PurchItemRow['conversionfactor'], $PurchItemRow['units'], $PurchItemRow['stockact'], $_SESSION['PO' . $identifier]->DeliveryDate, 0, 0, '', 0, 0, '', $PurchItemRow['decimalplaces'], $PurchItemRow['suppliersuom'], $PurchItemRow['conversionfactor'], $PurchItemRow['leadtime'], $PurchItemRow['suppliers_partno']);
echo '<meta http-equiv="refresh" content="0; url=' . $rootpath . '/PO_Items.php?identifier=' . $identifier . '">';
- } //isset($Purch_Item)
-
+ }
+
/*Set up form for entry of order header stuff */
if (!isset($_POST['LookupDeliveryAddress']) and (!isset($_POST['StkLocation']) or $_POST['StkLocation']) AND (isset($_SESSION['PO' . $identifier]->Location) AND $_SESSION['PO' . $identifier]->Location != '')) {
@@ -695,8 +693,8 @@
$result = DB_query($sql, $db);
$myrow = DB_fetch_array($result);
$_POST['InitiatorName'] = $myrow['realname'];
- } //!isset($_POST['LookupDeliveryAddress']) and (!isset($_POST['StkLocation']) or $_POST['StkLocation']) AND (isset($_SESSION['PO' . $identifier]->Location) AND $_SESSION['PO' . $identifier]->Location != '')
-
+ }
+
echo '<br /><table width="80%">
<tr>
<th><h3>' . _('Order Initiation Details') . '</h3></th>
@@ -705,11 +703,12 @@
<tr><td style="width:50%">';
//sub table starts
echo '<table class="selection" width="100%">';
- echo '<tr><td>' . _('PO Date') . ':</td><td>';
+ echo '<tr>
+ <td>' . _('PO Date') . ':</td>
+ <td>';
if ($_SESSION['ExistingOrder'] != 0) {
echo ConvertSQLDate($_SESSION['PO' . $identifier]->Orig_OrderDate);
- } //$_SESSION['ExistingOrder'] != 0
- else {
+ } else {
/* DefaultDateFormat defined in config.php */
echo Date($_SESSION['DefaultDateFormat']);
}
@@ -718,43 +717,49 @@
if (isset($_GET['ModifyOrderNumber']) AND $_GET['ModifyOrderNumber'] != '') {
$_SESSION['PO' . $identifier]->Version += 1;
$_POST['Version'] = $_SESSION['PO' . $identifier]->Version;
- } //isset($_GET['ModifyOrderNumber']) AND $_GET['ModifyOrderNumber'] != ''
- elseif (isset($_SESSION['PO' . $identifier]->Version) AND $_SESSION['PO' . $identifier]->Version != '') {
+ } elseif (isset($_SESSION['PO' . $identifier]->Version) AND $_SESSION['PO' . $identifier]->Version != '') {
$_POST['Version'] = $_SESSION['PO' . $identifier]->Version;
- } //isset($_SESSION['PO' . $identifier]->Version) AND $_SESSION['PO' . $identifier]->Version != ''
- else {
+ } else {
$_POST['Version'] = '1';
}
if (!isset($_POST['DeliveryDate'])) {
$_POST['DeliveryDate'] = date($_SESSION['DefaultDateFormat']);
- } //!isset($_POST['DeliveryDate'])
+ }
+
+ echo '<tr>
+ <td>' . _('Version') . ' #' . ':</td>
+ <td><input type="hidden" name="Version" size="16" maxlength="15" value="' . $_POST['Version'] . '" />' . $_POST['Version'] . '</td>
+ </tr>
+ <tr>
+ <td>' . _('Revised') . ':</td>
+ <td><input type="hidden" name="Revised" size="11" maxlength="15" value="' . date($_SESSION['DefaultDateFormat']) . '" />' . date($_SESSION['DefaultDateFormat']) . '</td>
+ </tr>
+ <tr>
+ <td>' . _('Delivery Date') . ':</td>
+ <td><input type="text" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" name="DeliveryDate" size="11" value="' . $_POST['DeliveryDate'] . '" /></td>
+ </tr>';
- echo '<tr><td>' . _('Version') . ' #' . ':</td>
- <td><input type="hidden" name="Version" size="16" maxlength="15" value="' . $_POST['Version'] . '" />' . $_POST['Version'] . '</td></tr>';
- echo '<tr><td>' . _('Revised') . ':</td>
- <td><input type="hidden" name="Revised" size="11" maxlength="15" value="' . date($_SESSION['DefaultDateFormat']) . '" />' . date($_SESSION['DefaultDateFormat']) . '</td></tr>';
-
- echo '<tr><td>' . _('Delivery Date') . ':</td>
- <td><input type="text" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" name="DeliveryDate" size="11" value="' . $_POST['DeliveryDate'] . '" /></td></tr>';
-
if (!isset($_POST['Initiator'])) {
$_POST['Initiator'] = $_SESSION['UserID'];
$_POST['InitiatorName'] = $_SESSION['UsersRealName'];
$_POST['Requisition'] = '';
- } //!isset($_POST['Initiator'])
-
- echo '<tr><td>' . _('Initiated By') . ':</td>
- <td><input type="hidden" name="Initiator" size="11" maxlength="10" value="' . $_POST['Initiator'] . '" />' . $_POST['InitiatorName'] . '</td></tr>';
- echo '<tr><td>' . _('Requisition Ref') . ':</td>
- <td><input type="text" name="Requisition" size="16" maxlength="15" value="' . $_POST['Requisition'] . '" /></td></tr>';
-
- echo '<tr><td>' . _('Date Printed') . ':</td><td>';
+ }
+
+ echo '<tr>
+ <td>' . _('Initiated By') . ':</td>
+ <td><input type="hidden" name="Initiator" size="11" maxlength="10" value="' . $_POST['Initiator'] . '" />' . $_POST['InitiatorName'] . '</td>
+ </tr>
+ <tr>
+ <td>' . _('Requisition Ref') . ':</td>
+ <td><input type="text" name="Requisition" size="16" maxlength="15" value="' . $_POST['Requisition'] . '" /></td>
+ </tr>
+ <tr><td>' . _('Date Printed') . ':</td><td>';
+
if (isset($_SESSION['PO' . $identifier]->DatePurchaseOrderPrinted) AND mb_strlen($_SESSION['PO' . $identifier]->DatePurchaseOrderPrinted) > 6) {
echo ConvertSQLDate($_SESSION['PO' . $identifier]->DatePurchaseOrderPrinted);
$Printed = True;
- } //isset($_SESSION['PO' . $identifier]->DatePurchaseOrderPrinted) AND mb_strlen($_SESSION['PO' . $identifier]->DatePurchaseOrderPrinted) > 6
- else {
+ } else {
$Printed = False;
echo _('Not yet printed') . '</td></tr>';
}
@@ -762,18 +767,19 @@
if (isset($_POST['AllowRePrint'])) {
$sql = "UPDATE purchorders SET allowprint=1 WHERE orderno='" . $_SESSION['PO' . $identifier]->OrderNo . "'";
$result = DB_query($sql, $db);
- } //isset($_POST['AllowRePrint'])
-
+ }
+
if ($_SESSION['PO' . $identifier]->AllowPrintPO == 0 AND empty($_POST['RePrint'])) {
- echo '<tr><td>' . _('Allow Reprint') . ':</td>
+ echo '<tr>
+ <td>' . _('Allow Reprint') . ':</td>
<td><select name="RePrint" onchange="ReloadForm(form1.AllowRePrint)">
<option selected="selected" value="0">' . _('No') . '</option>
<option value="1">' . _('Yes') . '</option>
</select></td>';
echo '<td><input type="submit" name="AllowRePrint" value="Update" /></td></tr>';
- } //$_SESSION['PO' . $identifier]->AllowPrintPO == 0 AND empty($_POST['RePrint'])
- elseif ($Printed) {
- echo '<tr><td colspan="2"><a target="_blank" href="' . $rootpath . '/PO_PDFPurchOrder.php?OrderNo=' . $_SESSION['ExistingOrder'] . '&identifier=' . $identifier . '">' . _('Reprint Now') . '</a></td></tr>';
+ } elseif ($Printed) {
+ echo '<tr>
+ <td colspan="2"><a target="_blank" href="' . $rootpath . '/PO_PDFPurchOrder.php?OrderNo=' . $_SESSION['ExistingOrder'] . '&identifier=' . $identifier . '">' . _('Reprint Now') . '</a></td></tr>';
} //$Printed
echo '</table></td>';
@@ -782,14 +788,16 @@
<table class="selection" width="100%">';
if ($_SESSION['ExistingOrder'] != 0 AND $_SESSION['PO' . $identifier]->Status == 'Printed') {
- echo '<tr><td><a href="' . $rootpath . '/GoodsReceived.php?PONumber=' . $_SESSION['PO' . $identifier]->OrderNo . '&identifier=' . $identifier . '">' . _('Receive this order') . '</a></td></tr>';
- } //$_SESSION['ExistingOrder'] != 0 AND $_SESSION['PO' . $identifier]->Status == 'Printed'
+ echo '<tr><td><a href="' . $rootpath . '/GoodsReceived.php?PONumber=' . $_SESSION['PO' . $identifier]->OrderNo . '&identifier=' . $identifier . '">' . _('Receive this order') . '</a></td></tr>';
+ }
+
if ($_SESSION['PO' . $identifier]->Status == '') { //then its a new order
- echo '<tr><td><input type="hidden" name="Status" value="NewOrder" />';
- echo _('New Purchase Order') . '</td></tr>';
- } //$_SESSION['PO' . $identifier]->Status == ''
- else {
- echo '<tr><td>' . _('Status') . ' : </td>
+ echo '<tr>
+ <td><input type="hidden" name="Status" value="NewOrder" />' . _('New Purchase Order') . '</td>
+ </tr>';
+ } else {
+ echo '<tr>
+ <td>' . _('Status') . ' : </td>
<td><select name="Status" onchange="ReloadForm(form1.UpdateStatus)">';
switch ($_SESSION['PO' . $identifier]->Status) {
@@ -821,11 +829,11 @@
<option value="Authorised">' . _('Authorised') . '</option>
<option value="Pending">' . _('Pending') . '</option>';
break;
- } //$_SESSION['PO' . $identifier]->Status
-
+ }
echo '</select></td></tr>';
- echo '<tr><td>' . _('Status Comment') . ':</td>
+ echo '<tr>
+ <td>' . _('Status Comment') . ':</td>
<td><input type="text" name="StatusComments" size="50" /></td>
</tr>
<tr>
@@ -839,7 +847,7 @@
echo '</table></td></tr>';
echo '<tr>
- <th><h3>' . _('Warehouse Info') . '</h3></th>
+ <th><h3>' . _('Warehouse Info') . '</h3></th>
<!-- <th><h3>' . _('Delivery To') . '</h3></th> -->
<th><h3>' . _('Supplier Info') . '</h3></th>
</tr>
@@ -859,11 +867,10 @@
while ($LocnRow = DB_fetch_array($LocnResult)) {
if (isset($_POST['StkLocation']) AND ($_POST['StkLocation'] == $LocnRow['loccode']) OR (empty($_POST['StkLocation']) AND $LocnRow['loccode'] == $_SESSION['UserStockLocation'])) {
echo '<option selected="selected" value="' . $LocnRow['loccode'] . '">' . $LocnRow['locationname'] . '</option>';
- } //isset($_POST['StkLocation']) AND ($_POST['StkLocation'] == $LocnRow['loccode']) OR (empty($_POST['StkLocation']) AND $LocnRow['loccode'] == $_SESSION['UserStockLocation'])
- else {
+ } else {
echo '<option value="' . $LocnRow['loccode'] . '">' . $LocnRow['locationname'] . '</option>';
}
- } //$LocnRow = DB_fetch_array($LocnResult)
+ }
echo '</select>
<input type="submit" name="LookupDeliveryAddress" value="' . _('Select') . '" /></td>
@@ -899,7 +906,6 @@
$_POST['Contact'] = $LocnRow['contact'];
$_SESSION['PO' . $identifier]->Location = $_POST['StkLocation'];
- // $_SESSION['PO'.$identifier]->SupplierContact= $_POST['SupplierContact'];
$_SESSION['PO' . $identifier]->DelAdd1 = $_POST['DelAdd1'];
$_SESSION['PO' . $identifier]->DelAdd2 = $_POST['DelAdd2'];
$_SESSION['PO' . $identifier]->DelAdd3 = $_POST['DelAdd3'];
@@ -909,14 +915,14 @@
$_SESSION['PO' . $identifier]->Tel = $_POST['Tel'];
$_SESSION['PO' . $identifier]->Contact = $_POST['Contact'];
- } //DB_num_rows($LocnAddrResult) == 1
+ } //end a location record was returned
else {
/*The default location of the user is crook */
prnMsg(_('The default stock location set up for this user is not a currently defined stock location') . '. ' . _('Your system administrator needs to amend your user record'), 'error');
}
- } //!isset($_POST['StkLocation']) OR $_POST['StkLocation'] == ''
+ } //end StkLocation was not set
elseif (isset($_POST['LookupDeliveryAddress'])) {
$sql = "SELECT deladd1,
deladd2,
@@ -950,49 +956,58 @@
$_SESSION['PO' . $identifier]->DelAdd6 = $_POST['DelAdd6'];
$_SESSION['PO' . $identifier]->Tel = $_POST['Tel'];
$_SESSION['PO' . $identifier]->Contact = $_POST['Contact'];
- } //DB_num_rows($LocnAddrResult) == 1
- } //isset($_POST['LookupDeliveryAddress'])
+ } //There was a location record returned
+ } //user clicked Lookup Delivery Address
- echo '<tr><td>' . _('Delivery Contact') . ':</td>
- <td><input type="text" name="Contact" size="41" value="' . $_SESSION['PO' . $identifier]->Contact . '" /></td>
- </tr>';
- echo '<tr><td>' . _('Address') . ' 1 :</td>
- <td><input type="text" name="DelAdd1" size="41" maxlength="40" value="' . $_POST['DelAdd1'] . '" /></td>
- </tr>';
- echo '<tr><td>' . _('Address') . ' 2 :</td>
- <td><input type="text" name="DelAdd2" size="41" maxlength="40" value="' . $_POST['DelAdd2'] . '" /></td>
- </tr>';
- echo '<tr><td>' . _('Address') . ' 3 :</td>
- <td><input type="text" name="DelAdd3" size="41" maxlength="40" value="' . $_POST['DelAdd3'] . '" /></td>
- </tr>';
- echo '<tr><td>' . _('Address') . ' 4 :</td>
- <td><input type="text" name="DelAdd4" size="21" maxlength="20" value="' . $_POST['DelAdd4'] . '" /></td>
- </tr>';
- echo '<tr><td>' . _('Address') . ' 5 :</td>
- <td><input type="text" name="DelAdd5" size="16" maxlength="15" value="' . $_POST['DelAdd5'] . '" /></td>
- </tr>';
- echo '<tr><td>' . _('Address') . ' 6 :</td>
- <td><input type="text" name="DelAdd6" size="16" maxlength="15" value="' . $_POST['DelAdd6'] . '" /></td>
- </tr>';
- echo '<tr><td>' . _('Phone') . ':</td>
- <td><input type="text" name="Tel" size="31" maxlength="30" value="' . $_SESSION['PO' . $identifier]->Tel . '" /></td>
- </tr>';
+ echo '<tr>
+ <td>' . _('Delivery Contact') . ':</td>
+ <td><input type="text" name="Contact" size="41" value="' . $_SESSION['PO' . $identifier]->Contact . '" /></td>
+ </tr>
+ <tr>
+ <td>' . _('Address') . ' 1 :</td>
+ <td><input type="text" name="DelAdd1" size="41" maxlength="40" value="' . $_POST['DelAdd1'] . '" /></td>
+ </tr>
+ <tr>
+ <td>' . _('Address') . ' 2 :</td>
+ <td><input type="text" name="DelAdd2" size="41" maxlength="40" value="' . $_POST['DelAdd2'] . '" /></td>
+ </tr>
+ <tr>
+ <td>' . _('Address') . ' 3 :</td>
+ <td><input type="text" name="DelAdd3" size="41" maxlength="40" value="' . $_POST['DelAdd3'] . '" /></td>
+ </tr>
+ <tr>
+ <td>' . _('Address') . ' 4 :</td>
+ <td><input type="text" name="DelAdd4" size="21" maxlength="20" value="' . $_POST['DelAdd4'] . '" /></td>
+ </tr>
+ <tr>
+ <td>' . _('Address') . ' 5 :</td>
+ <td><input type="text" name="DelAdd5" size="16" maxlength="15" value="' . $_POST['DelAdd5'] . '" /></td>
+ </tr>
+ <tr>
+ <td>' . _('Address') . ' 6 :</td>
+ <td><input type="text" name="DelAdd6" size="16" maxlength="15" value="' . $_POST['DelAdd6'] . '" /></td>
+ </tr>
+ <tr>
+ <td>' . _('Phone') . ':</td>
+ <td><input type="text" name="Tel" size="31" maxlength="30" value="' . $_SESSION['PO' . $identifier]->Tel . '" /></td>
+ </tr>
+ <tr>
+ <td>' . _('Delivery By') . ':</td><td><select name="DeliveryBy">';
- echo '<tr><td>' . _('Delivery By') . ':</td><td><select name="DeliveryBy">';
-
$ShipperResult = DB_query("SELECT shipper_id, shippername FROM shippers", $db);
while ($ShipperRow = DB_fetch_array($ShipperResult)) {
if (isset($_POST['DeliveryBy']) and ($_POST['DeliveryBy'] == $ShipperRow['shipper_id'])) {
echo '<option selected="selected" value="' . $ShipperRow['shipper_id'] . '">' . $ShipperRow['shippername'] . '</option>';
- } //isset($_POST['DeliveryBy']) and ($_POST['DeliveryBy'] == $ShipperRow['shipper_id'])
- else {
+ } else {
echo '<option value="' . $ShipperRow['shipper_id'] . '">' . $ShipperRow['shippername'] . '</option>';
}
- } //$ShipperRow = DB_fetch_array($ShipperResult)
+ }
- echo '</select></td></tr></table>';
+ echo '</select></td>
+ </tr>
+ </table>';
/* end of sub table */
echo '</td><td>';
@@ -1007,11 +1022,10 @@
while ($SuppCoRow = DB_fetch_array($SuppCoResult)) {
if ($SuppCoRow['suppname'] == $_SESSION['PO' . $identifier]->SupplierName) {
echo '<option selected="selected" value="' . $SuppCoRow['suppname'] . '">' . $SuppCoRow['suppname'] . '</option>';
- } //$SuppCoRow['suppname'] == $_SESSION['PO' . $identifier]->SupplierName
- else {
+ } else {
echo '<option value="' . $SuppCoRow['suppname'] . '">' . $SuppCoRow['suppname'] . '</option>';
}
- } //$SuppCoRow = DB_fetch_array($SuppCoResult)
+ }
echo '</select> ';
echo '<input type="submit" name="SearchSuppliers" value="' . _('Select Now') . '" /></td>
@@ -1027,36 +1041,34 @@
while ($SuppCoRow = DB_fetch_array($SuppCoResult)) {
if ($_POST['SupplierContact'] == $SuppCoRow['contact'] OR ($_POST['SupplierContact'] == '' AND $SuppCoRow['contact'] == $_SESSION['PO' . $identifier]->SupplierContact)) {
echo '<option selected="selected" value="' . $SuppCoRow['contact'] . '">' . $SuppCoRow['contact'] . '</option>';
- } //$_POST['SupplierContact'] == $SuppCoRow['contact'] OR ($_POST['SupplierContact'] == '' AND $SuppCoRow['contact'] == $_SESSION['PO' . $identifier]->SupplierContact)
- else {
+ } else {
echo '<option value="' . $SuppCoRow['contact'] . '">' . $SuppCoRow['contact'] . '</option>';
}
- } //$SuppCoRow = DB_fetch_array($SuppCoResult)
+ }
- echo '</select> ';
- echo '</td></tr>';
-
- echo '<tr>
+ echo '</select> </td>
+ </tr>
+ <tr>
<td>' . _('Address') . ' 1 :</td>
<td><input type="text" name="SuppDelAdd1" size="41" maxlength="40" value="' . $_POST['SuppDelAdd1'] . '" /></td>
- </tr>';
- echo '<tr>
+ </tr>
+ <tr>
<td>' . _('Address') . ' 2 :</td>
<td><input type="text" name="SuppDelAdd2" size="41" maxlength="40" value="' . $_POST['SuppDelAdd2'] . '" /></td>
- </tr>';
- echo '<tr>
+ </tr>
+ <tr>
<td>' . _('Address') . ' 3 :</td>
<td><input type="text" name="SuppDelAdd3" size="41" maxlength="40" value="' . $_POST['SuppDelAdd3'] . '" /></td>
- </tr>';
- echo '<tr>
+ </tr>
+ <tr>
<td>' . _('Address') . ' 4 :</td>
<td><input type="text" name="SuppDelAdd5" size="21" maxlength="20" value="' . $_POST['SuppDelAdd5'] . '" /></td>
- </tr>';
- echo '<tr>
+ </tr>
+ <tr>
<td>' . _('Address') . ' 5 :</td>
<td><input type="text" name="SuppDelAdd4" size="41" maxlength="40" value="' . $_POST['SuppDelAdd4'] . '" /></td>
- </tr>';
- echo '<tr>
+ </tr>
+ <tr>
<td>' . _('Phone') . ':</td>
<td><input type="text" name="SuppTel" size="31" maxlength="30" value="' . $_SESSION['PO' . $identifier]->SuppTel . '" /></td>
</tr>';
@@ -1070,11 +1082,10 @@
while ($myrow = DB_fetch_array($result)) {
if ($myrow['termsindicator'] == $_SESSION['PO' . $identifier]->PaymentTerms) {
echo '<option selected="selected" value="' . $myrow['termsindicator'] . '">' . $myrow['terms'] . '</option>';
- } //$myrow['termsindicator'] == $_SESSION['PO' . $identifier]->PaymentTerms
- else {
+ } else {
echo '<option value="' . $myrow['termsindicator'] . '">' . $myrow['terms'] . '</option>';
} //end while loop
- } //$myrow = DB_fetch_array($result)
+ }
DB_data_seek($result, 0);
echo '</select></td></tr>';
@@ -1093,9 +1104,10 @@
echo '<tr><td>' . _('Exchange Rate') . ':' . '</td>
<td><input type="text" name="ExRate" value="' . locale_number_format($_POST['ExRate'], 5) . '" class="number" size="11" /></td>
</tr>';
- } //$_SESSION['PO' . $identifier]->CurrCode != $_SESSION['CompanyRecord']['currencydefault']
- else {
- echo '<tr><td><input type="hidden" name="ExRate" value="1" /></td></tr>';
+ } else {
+ echo '<tr>
+ <td><input type="hidden" name="ExRate" value="1" /></td>
+ </tr>';
}
echo '</table>';
/*end of sub table */
@@ -1107,12 +1119,15 @@
if (!isset($_POST['Comments'])) {
$_POST['Comments'] = $Default_Comments;
- } //!isset($_POST['Comments'])
+ }
- echo ':</h3></th></tr>
- <tr><td colspan="4"><textarea name="Comments" style="width:100%" rows="5" cols="200">' . $_POST['Comments'] . '</textarea>';
-
- echo '</td></tr></table><br />';
+ echo ':</h3></th>
+ </tr>
+ <tr>
+ <td colspan="4"><textarea name="Comments" style="width:100%" rows="5" cols="200">' . $_POST['Comments'] . '</textarea></td>
+ </tr>
+ </table>
+ <br />';
/* end of main table */
echo '<div class="centre">
Modified: trunk/PO_Items.php
===================================================================
--- trunk/PO_Items.php 2012-12-04 16:02:13 UTC (rev 5751)
+++ trunk/PO_Items.php 2012-12-05 08:39:15 UTC (rev 5752)
@@ -22,6 +22,9 @@
exit;
} //end if (!isset($_SESSION['PO'.$identifier]))
+/* webERP manual links before header.inc */
+$ViewTopic= 'PurchaseOrdering';
+$BookMark = 'PurchaseOrdering';
include('includes/header.inc');
if (!isset($_POST['Commit'])) {
@@ -230,8 +233,9 @@
}
} /* end of the loop round the detail line items on the order */
echo '<p />';
- prnMsg(_('Purchase Order') . ' ' . $_SESSION['PO'.$identifier]->OrderNo . ' ' . _('on') . ' ' .
- $_SESSION['PO'.$identifier]->SupplierName . ' ' . _('has been created'),'success');
+ prnMsg(_('Purchase Order') . ' ' . $_SESSION['PO'.$identifier]->OrderNo . ' ' . _('on') . ' ' . $_SESSION['PO'.$identifier]->SupplierName . ' ' . _('has been created'),'success');
+
+
} else { /*its an existing order need to update the old order info */
/*Check to see if there are any incomplete lines on the order */
$Completed = true; //assume it is completed i.e. all lines are flagged as completed
@@ -374,10 +378,15 @@
echo '<br /><div class="centre"><a target="_blank" href="'.$rootpath.'/PO_PDFPurchOrder.php?OrderNo=' . $_SESSION['PO'.$identifier]->OrderNo . '">' . _('Print Purchase Order') . '</a></div>';
}
+
} /*end of if its a new order or an existing one */
$Result = DB_Txn_Commit($db);
+ if ($_SESSION['PO'.$identifier]->Status == 'Authorised'){;
+ echo '<a href="SupplierInvoice.php?SupplierID=' . $_SESSION['PO'.$identifier]->SupplierID . '&ReceivePO=' . $_SESSION['PO'.$identifier]->OrderNo . '&DeliveryDate=' . $_SESSION['PO'.$identifier]->DeliveryDate . '">' . _('Receive and Enter Purchase Invoice') . '</a>';
+ }
+
unset($_SESSION['PO'.$identifier]); /*Clear the PO data to allow a newy to be input*/
include('includes/footer.inc');
exit;
Modified: trunk/PO_PDFPurchOrder.php
===================================================================
--- trunk/PO_PDFPurchOrder.php 2012-12-04 16:02:13 UTC (rev 5751)
+++ trunk/PO_PDFPurchOrder.php 2012-12-05 08:39:15 UTC (rev 5752)
@@ -30,13 +30,13 @@
echo '<div class="centre"><br /><br /><br />' . _('This page must be called with a purchase order number to print');
echo '<br /><a href="' . $rootpath . '/index.php">' . _('Back to the menu') . '</a></div>';
exit;
-} //!isset($_GET['OrderNo']) AND !isset($_POST['OrderNo'])
+}
if (isset($_GET['OrderNo'])) {
$OrderNo = $_GET['OrderNo'];
-} //isset($_GET['OrderNo'])
+}
elseif (isset($_POST['OrderNo'])) {
$OrderNo = $_POST['OrderNo'];
-} //isset($_POST['OrderNo'])
+}
$title = _('Print Purchase Order Number') . ' ' . $OrderNo;
if (isset($_POST['PrintOrEmail']) AND isset($_POST['EmailTo'])) {
@@ -45,16 +45,16 @@
prnMsg(_('The email address entered does not appear to be valid. No emails have been sent.'), 'warn');
include('includes/footer.inc');
exit;
- } //$_POST['PrintOrEmail'] == 'Email' AND !IsEmailAddress($_POST['EmailTo'])
-} //isset($_POST['PrintOrEmail']) AND isset($_POST['EmailTo'])
+ }
+}
$ViewingOnly = 0;
if (isset($_GET['ViewingOnly']) AND $_GET['ViewingOnly'] != '') {
$ViewingOnly = $_GET['ViewingOnly'];
-} //isset($_GET['ViewingOnly']) AND $_GET['ViewingOnly'] != ''
+}
elseif (isset($_POST['ViewingOnly']) AND $_POST['ViewingOnly'] != '') {
$ViewingOnly = $_POST['ViewingOnly'];
-} //isset($_POST['ViewingOnly']) AND $_POST['ViewingOnly'] != ''
+}
/* If we are previewing the order then we dont want to email it */
if ($OrderNo == 'Preview') { //OrderNo is set to 'Preview' when just looking at the format of the printed order
@@ -68,11 +68,11 @@
if (isset($_POST['DoIt']) AND ($_POST['PrintOrEmail'] == 'Print' OR $ViewingOnly == 1)) {
$MakePDFThenDisplayIt = True;
$MakePDFThenEmailIt = False;
-} //isset($_POST['DoIt']) AND ($_POST['PrintOrEmail'] == 'Print' OR $ViewingOnly == 1)
-elseif (isset($_POST['DoIt']) AND $_POST['PrintOrEmail'] == 'Email' AND isset($_POST['EmailTo'])) {
+} elseif (isset($_POST['DoIt']) AND $_POST['PrintOrEmail'] == 'Email' AND isset($_POST['EmailTo'])) {
$MakePDFThenEmailIt = True;
$MakePDFThenDisplayIt = False;
-} //isset($_POST['DoIt']) AND $_POST['PrintOrEmail'] == 'Email' AND isset($_POST['EmailTo'])
+}
+
if (isset($OrderNo) AND $OrderNo != '' AND $OrderNo > 0 AND $OrderNo != 'Preview') {
/*retrieve the order details from the database to print */
$ErrMsg = _('There was a problem retrieving the purchase order header details for Order Number') . ' ' . $OrderNo . ' ' . _('from the database');
@@ -127,8 +127,7 @@
</div><br /><br /><br />';
include('includes/footer.inc');
exit();
- } //DB_num_rows($result) == 0
- elseif (DB_num_rows($result) == 1) {
+ } elseif (DB_num_rows($result) == 1) {
/*There is only one order header returned (as it should be!)*/
$POHeader = DB_fetch_array($result);
@@ -138,8 +137,8 @@
prnMsg(_('Purchase orders can only be printed once they have been authorised') . '. ' . _('This order is currently at a status of') . ' ' . _($POHeader['status']), 'warn');
include('includes/footer.inc');
exit;
- } //$POHeader['status'] != 'Authorised' AND $POHeader['status'] != 'Printed'
-
+ }
+
if ($ViewingOnly == 0) {
if ($POHeader['allowprint'] == 0) {
$title = _('Purchase Order Already Printed');
@@ -147,7 +146,6 @@
echo '<p>';
prnMsg(_('Purchase Order Number') . ' ' . $OrderNo . ' ' . _('has previously been printed') . '. ' . _('It was printed on') . ' ' . ConvertSQLDate($POHeader['dateprinted']) . '<br />' . _('To re-print the order it must be modified to allow a reprint') . '<br />' . _('This check is there to ensure that duplicate purchase orders are not sent to the supplier resulting in several deliveries of the same supplies'), 'warn');
- //=HJ= fixed missing closing tags and replace table with div, for visual conformity
echo '<div class="centre">
<li><a href="' . $rootpath . '/PO_PDFPurchOrder.php?OrderNo=' . $OrderNo . '&ViewingOnly=1">' . _('Print This Order as a Copy') . '</a>
<li><a href="' . $rootpath . '/PO_Header.php?ModifyOrderNumber=' . $OrderNo . '">' . _('Modify the order to allow a real reprint') . '</a>
@@ -190,8 +188,7 @@
if (isset($MakePDFThenDisplayIt) or isset($MakePDFThenEmailIt)) {
if ($OrderNo == 'Preview') {
$FormDesign = simplexml_load_file(sys_get_temp_dir() . '/PurchaseOrder.xml');
- } //$OrderNo == 'Preview'
- else {
+ } else {
$FormDesign = simplexml_load_file($PathPrefix . 'companies/' . $_SESSION['DatabaseName'] . '/FormDesigns/PurchaseOrder.xml');
}
// Set the paper size/orintation
@@ -218,7 +215,7 @@
ON purchorderdetails.itemcode=stockmaster.stockid
WHERE orderno ='" . $OrderNo . "'";
$result = DB_query($sql, $db);
- } //$OrderNo != 'Preview'
+ }
if ($OrderNo == 'Preview' or DB_num_rows($result) > 0) {
/*Yes there are line items to start the ball rolling with a page header */
include('includes/PO_PDFOrderPageHeader.inc');
@@ -237,25 +234,23 @@
$POLine['quantityord'] = 9999.99;
$POLine['conversionfactor'] = 1;
$POLine['decimalplaces'] = 2;
- } //$OrderNo == 'Preview'
+ }
if ($POLine['decimalplaces'] != NULL) {
$DecimalPlaces = $POLine['decimalplaces'];
- } //$POLine['decimalplaces'] != NULL
+ }
else {
$DecimalPlaces = 2;
}
$DisplayQty = locale_number_format($POLine['quantityord'] / $POLine['conversionfactor'], $DecimalPlaces);
if ($_POST['ShowAmounts'] == 'Yes') {
$DisplayPrice = locale_number_format($POLine['unitprice'] * $POLine['conversionfactor'], $POHeader['currdecimalplaces']);
- } //$_POST['ShowAmounts'] == 'Yes'
- else {
+ } else {
$DisplayPrice = '----';
}
$DisplayDelDate = ConvertSQLDate($POLine['deliverydate']);
if ($_POST['ShowAmounts'] == 'Yes') {
$DisplayLineTotal = locale_number_format($POLine['unitprice'] * $POLine['quantityord'], $POHeader['currdecimalplaces']);
- } //$_POST['ShowAmounts'] == 'Yes'
- else {
+ } else {
$DisplayLineTotal = '----';
}
$Desc = $POLine['suppliers_partno'] . " " . $POLine['itemdescription'];
@@ -271,7 +266,7 @@
$PageNumber++;
$YPos = $Page_Height - $FormDesign->Data->y;
include('includes/PO_PDFOrderPageHeader.inc');
- } //$YPos - $line_height <= $Bottom_Margin
+ } //end if we reached the end of page
$LeftOvers = $pdf->addTextWrap($FormDesign->Data->Column2->x, $YPos, $FormDesign->Data->Column2->Length, $FormDesign->Data->Column2->FontSize, $LeftOvers, 'left');
} //end if need a new page headed up
$LeftOvers = $pdf->addTextWrap($FormDesign->Data->Column3->x, $YPos, $FormDesign->Data->Column3->Length, $FormDesign->Data->Column3->FontSize, $DisplayQty, 'left');
@@ -282,7 +277,7 @@
if (mb_strlen($LeftOvers) > 1) {
$LeftOvers = $pdf->addTextWrap($Left_Margin + 1 + 94, $YPos - $line_height, 270, $FontSize, $LeftOvers, 'left');
$YPos -= $line_height;
- } //mb_strlen($LeftOvers) > 1
+ }
if ($YPos - $line_height <= $Bottom_Margin) {
/* We reached the end of the page so finsih off the page and start a newy */
$PageNumber++;
@@ -303,24 +298,19 @@
include('includes/PO_PDFOrderPageHeader.inc');
} //end if need a new page headed up
if ($_POST['ShowAmounts'] == 'Yes') {
- $DisplayOrderTotal = locale_number_format($OrderTotal, $POHeader['currdecimalplaces']);
- } //$_POST['ShowAmounts'] == 'Yes'
- else {
+ $DisplayOrderTotal = locale_number_format($OrdendrTotal, $POHeader['currdecimalplaces']);
+ } else {
$DisplayOrderTotal = '----';
}
$pdf->addText($FormDesign->OrderTotalCaption->x, $Page_Height - $FormDesign->OrderTotalCaption->y, $FormDesign->OrderTotalCaption->FontSize, _('Order Total - excl tax') . ' ' . $POHeader['currcode']);
$LeftOvers = $pdf->addTextWrap($FormDesign->OrderTotal->x, $Page_Height - $FormDesign->OrderTotal->y, $FormDesign->OrderTotal->Length, $FormDesign->OrderTotal->FontSize, $DisplayOrderTotal, 'right');
- } //$OrderNo == 'Preview' or DB_num_rows($result) > 0
-
- /*end if there are order details to show on the order*/
- //} /* end of check to see that there was an order selected to print */
-
+ } /*end if there are order details to show on the order - or its a preview*/
+
$Success = 1; //assume the best and email goes - has to be set to 1 to allow update status
if ($MakePDFThenDisplayIt) {
$pdf->OutputD($_SESSION['DatabaseName'] . '_PurchaseOrder_' . $OrderNo . '_' . date('Y-m-d') . '.pdf');
$pdf->__destruct();
- } //$MakePDFThenDisplayIt
- else {
+ } else {
/* must be MakingPDF to email it */
$PdfFileName = $_SESSION['DatabaseName'] . '_PurchaseOrder_' . $OrderNo . '_' . date('Y-m-d') . '.pdf';
@@ -342,8 +332,7 @@
echo '<div class="centre"><br /><br /><br />';
prnMsg(_('Purchase Order') . ' ' . $OrderNo . ' ' . _('has been emailed to') . ' ' . $_POST['EmailTo'] . ' ' . _('as directed'), 'success');
- } //$Success == 1
- else { //email failed
+ } else { //email failed
$title = _('Email a Purchase Order');
include('includes/header.inc');
echo '<div class="centre"><br /><br /><br />';
@@ -359,9 +348,9 @@
stat_comment = '" . htmlspecialchars($StatusComment, ENT_QUOTES, 'UTF-8') . "'
WHERE purchorders.orderno = '" . $OrderNo . "'";
$result = DB_query($sql, $db);
- } //$ViewingOnly == 0 AND $Success == 1
+ }
include('includes/footer.inc');
-} //isset($MakePDFThenDisplayIt) or isset($MakePDFThenEmailIt)
+} //isset($MakePDFThenDisplayIt) OR isset($MakePDFThenEmailIt)
/* There was enough info to either print or email the purchase order */
else {
@@ -382,16 +371,15 @@
if (!isset($_POST['PrintOrEmail'])) {
$_POST['PrintOrEmail'] = 'Print';
- } //!isset($_POST['PrintOrEmail'])
+ }
if ($ViewingOnly != 0) {
echo '<option selected="selected" value="Print">' . _('Print') . '</option>';
- } //$ViewingOnly != 0
+ }
else {
if ($_POST['PrintOrEmail'] == 'Print') {
echo '<option selected="selected" value="Print">' . _('Print') . '</option>';
echo '<option value="Email">' . _('Email') . '</option>';
- } //$_POST['PrintOrEmail'] == 'Print'
- else {
+ } else {
echo '<option value="Print">' . _('Print') . '</option>';
echo '<option selected="selected" value="Email">' . _('Email') . '</option>';
}
@@ -401,12 +389,11 @@
<select name="ShowAmounts">';
if (!isset($_POST['ShowAmounts'])) {
$_POST['ShowAmounts'] = 'Yes';
- } //!isset($_POST['ShowAmounts'])
+ }
if ($_POST['ShowAmounts'] == 'Yes') {
echo '<option selected="selected" value="Yes">' . _('Yes') . '</option>';
echo '<option value="No">' . _('No') . '</option>';
- } //$_POST['ShowAmounts'] == 'Yes'
- else {
+ } else {
echo '<option value="Yes">' . _('Yes') . '</option>';
echo '<option selected="selected" value="No">' . _('No') . '</option>';
}
@@ -425,21 +412,18 @@
if (mb_strlen($ContactDetails['email']) > 2 AND mb_strpos($ContactDetails['email'], '@') > 0) {
if ($_POST['EmailTo'] == $ContactDetails['email']) {
echo '<option selected="selected" value="' . $ContactDetails['email'] . '">' . $ContactDetails['Contact'] . ' - ' . $ContactDetails['email'] . '</option>';
- } //$_POST['EmailTo'] == $ContactDetails['email']
- else {
+ } else {
echo '<option value="' . $ContactDetails['email'] . '">' . $ContactDetails['contact'] . ' - ' . $ContactDetails['email'] . '</option>';
}
- } //mb_strlen($ContactDetails['email']) > 2 AND mb_strpos($ContactDetails['email'], '@') > 0
- } //$ContactDetails = DB_fetch_array($ContactsResult)
+ }
+ }
echo '</select></td></tr></table>';
- } //DB_num_rows($ContactsResult) > 0
- else {
+ } else {
echo '</table><br />';
prnMsg(_('There are no contacts defined for the supplier of this order') . '. ' . _('You must first set up supplier contacts before emailing an order'), 'error');
echo '<br />';
}
- } //$_POST['PrintOrEmail'] == 'Email'
- else {
+ } else {
echo '</table>';
}
echo '<br />
Modified: trunk/PO_SelectOSPurchOrder.php
===================================================================
--- trunk/PO_SelectOSPurchOrder.php 2012-12-04 16:02:13 UTC (rev 5751)
+++ trunk/PO_SelectOSPurchOrder.php 2012-12-05 08:39:15 UTC (rev 5752)
@@ -13,24 +13,24 @@
if (isset($_GET['SelectedStockItem'])) {
$SelectedStockItem = trim($_GET['SelectedStockItem']);
-} //isset($_GET['SelectedStockItem'])
+}
elseif (isset($_POST['SelectedStockItem'])) {
$SelectedStockItem = trim($_POST['SelectedStockItem']);
-} //isset($_POST['SelectedStockItem'])
+}
if (isset($_GET['OrderNumber'])) {
$OrderNumber = $_GET['OrderNumber'];
-} //isset($_GET['OrderNumber'])
+}
elseif (isset($_POST['OrderNumber'])) {
$OrderNumber = $_POST['OrderNumber'];
-} //isset($_POST['OrderNumber'])
+}
if (isset($_GET['SelectedSupplier'])) {
$SelectedSupplier = trim($_GET['SelectedSupplier']);
-} //isset($_GET['SelectedSupplier'])
+}
elseif (isset($_POST['SelectedSupplier'])) {
$SelectedSupplier = trim($_POST['SelectedSupplier']);
-} //isset($_POST['SelectedSupplier'])
+}
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post">';
echo '<div>';
@@ -39,92 +39,89 @@
if (isset($_POST['ResetPart'])) {
unset($SelectedStockItem);
-} //isset($_POST['ResetPart'])
+}
if (isset($OrderNumber) AND $OrderNumber != '') {
if (!is_numeric($OrderNumber)) {
echo '<br /><b>' . _('The Order Number entered') . ' <u>' . _('MUST') . '</u> ' . _('be numeric') . '.</b><br />';
unset($OrderNumber);
- } //!is_numeric($OrderNumber)
- else {
+ } else {
echo _('Order Number') . ' - ' . $OrderNumber;
}
-} //isset($OrderNumber) AND $OrderNumber != ''
-else {
+} else {
if (isset($SelectedSupplier)) {
echo '<br />
<div class="page_help_text">' . _('For supplier') . ': ' . $SelectedSupplier . ' ' . _('and') . ' ';
echo '<input type="hidden" name="SelectedSupplier" value="' . $SelectedSupplier . '" />
</div>';
- } //isset($SelectedSupplier)
+ }
if (isset($SelectedStockItem)) {
echo '<input type="hidden" name="SelectedStockItem" value="' . $SelectedStockItem . '" />';
- } //isset($SelectedStockItem)
+ }
}
if (isset($_POST['SearchParts'])) {
if (isset($_POST['Keywords']) AND isset($_POST['StockCode'])) {
echo '<div class="page_help_text">' . _('Stock description keywords have been used in preference to the Stock code extract entered') . '.</div>';
- } //isset($_POST['Keywords']) AND isset($_POST['StockCode'])
+ }
If ($_POST['Keywords']) {
//insert wildcard characters in spaces
$SearchString = '%' . str_replace(' ', '%', $_POST['Keywords']) . '%';
$SQL = "SELECT stockmaster.stockid,
- stockmaster.description,
- SUM(locstock.quantity) AS qoh,
- stockmaster.units,
- SUM(purchorderdetails.quantityord-purchorderdetails.quantityrecd) AS qord
- FROM stockmaster INNER JOIN locstock
- ON stockmaster.stockid = locstock.stockid
- INNER JOIN purchorderdetails
- ON stockmaster.stockid=purchorderdetails.itemcode
- WHERE purchorderdetails.completed=0
- AND stockmaster.description " . LIKE . " '" . $SearchString . "'
- AND stockmaster.categoryid='" . $_POST['StockCat'] . "'
- GROUP BY stockmaster.stockid,
- stockmaster.description,
- stockmaster.units
- ORDER BY stockmaster.stockid";
+ stockmaster.description,
+ SUM(locstock.quantity) AS qoh,
+ stockmaster.units,
+ SUM(purchorderdetails.quantityord-purchorderdetails.quantityrecd) AS qord
+ FROM stockmaster INNER JOIN locstock
+ ON stockmaster.stockid = locstock.stockid
+ INNER JOIN purchorderdetails
+ ON stockmaster.stockid=purchorderdetails.itemcode
+ WHERE purchorderdetails.completed=0
+ AND stockmaster.description " . LIKE . " '" . $SearchString . "'
+ AND stockmaster.categoryid='" . $_POST['StockCat'] . "'
+ GROUP BY stockmaster.stockid,
+ stockmaster.description,
+ stockmaster.units
+ ORDER BY stockmaster.stockid";
- } //$_POST['Keywords']
- elseif ($_POST['StockCode']) {
+ } elseif ($_POST['StockCode']) {
+
$SQL = "SELECT stockmaster.stockid,
- stockmaster.description,
-...
[truncated message content] |
|
From: <dai...@us...> - 2012-12-08 01:41:40
|
Revision: 5753
http://sourceforge.net/p/web-erp/reponame/5753
Author: daintree
Date: 2012-12-08 01:41:35 +0000 (Sat, 08 Dec 2012)
Log Message:
-----------
Check users authoirty before allowing auto receiving
Modified Paths:
--------------
trunk/PO_Items.php
trunk/Payments.php
trunk/SuppPaymentRun.php
trunk/SupplierInvoice.php
trunk/doc/Change.log
trunk/includes/session.inc
Modified: trunk/PO_Items.php
===================================================================
--- trunk/PO_Items.php 2012-12-05 08:39:15 UTC (rev 5752)
+++ trunk/PO_Items.php 2012-12-08 01:41:35 UTC (rev 5753)
@@ -383,7 +383,8 @@
$Result = DB_Txn_Commit($db);
- if ($_SESSION['PO'.$identifier]->Status == 'Authorised'){;
+ /* Only show the link to auto receive the order if the user has permission to receive goods and permission to authorise and has authorised the order */
+ if ($_SESSION['PO'.$identifier]->Status == 'Authorised' AND in_array($_SESSION['PageSecurityArray']['GoodsReceived.php'], $_SESSION['AllowedPageSecurityTokens'])){
echo '<a href="SupplierInvoice.php?SupplierID=' . $_SESSION['PO'.$identifier]->SupplierID . '&ReceivePO=' . $_SESSION['PO'.$identifier]->OrderNo . '&DeliveryDate=' . $_SESSION['PO'.$identifier]->DeliveryDate . '">' . _('Receive and Enter Purchase Invoice') . '</a>';
}
Modified: trunk/Payments.php
===================================================================
--- trunk/Payments.php 2012-12-05 08:39:15 UTC (rev 5752)
+++ trunk/Payments.php 2012-12-08 01:41:35 UTC (rev 5753)
@@ -115,6 +115,9 @@
$_SESSION['PaymentDetail' . $identifier]->Currency = $myrow['currcode'];
$_POST['Currency'] = $_SESSION['PaymentDetail' . $identifier]->Currency;
}
+ if (isset($_GET['Amount']) AND is_numeric($_GET['Amount'])){
+ $_SESSION['PaymentDetail' . $identifier]->Amount = filter_number_format($_GET['Amount']);
+ }
}
}
Modified: trunk/SuppPaymentRun.php
===================================================================
--- trunk/SuppPaymentRun.php 2012-12-05 08:39:15 UTC (rev 5752)
+++ trunk/SuppPaymentRun.php 2012-12-08 01:41:35 UTC (rev 5753)
@@ -75,18 +75,18 @@
$CurrDecimalPlaces = $SuppliersToPay['currdecimalplaces'];
$sql = "SELECT suppliers.supplierid,
- suppliers.suppname,
- systypes.typename,
- paymentterms.terms,
- supptrans.suppreference,
- supptrans.trandate,
- supptrans.rate,
- supptrans.transno,
- supptrans.type,
- (supptrans.ovamount + supptrans.ovgst - supptrans.alloc) AS balance,
- (supptrans.ovamount + supptrans.ovgst ) AS trantotal,
- supptrans.diffonexch,
- supptrans.id
+ suppliers.suppname,
+ systypes.typename,
+ paymentterms.terms,
+ supptrans.suppreference,
+ supptrans.trandate,
+ supptrans.rate,
+ supptrans.transno,
+ supptrans.type,
+ (supptrans.ovamount + supptrans.ovgst - supptrans.alloc) AS balance,
+ (supptrans.ovamount + supptrans.ovgst ) AS trantotal,
+ supptrans.diffonexch,
+ supptrans.id
FROM suppliers INNER JOIN paymentterms
ON suppliers.paymentterms = paymentterms.termsindicator
INNER JOIN supptrans
@@ -96,7 +96,7 @@
WHERE supptrans.supplierno = '" . $SuppliersToPay['supplierid'] . "'
AND supptrans.ovamount + supptrans.ovgst - supptrans.alloc !=0
AND supptrans.duedate <='" . FormatDateForSQL($_POST['AmountsDueBy']) . "'
- AND supptrans.hold=0
+ AND supptrans.hold = 0
AND suppliers.currcode = '" . $_POST['Currency'] . "'
AND supptrans.supplierno >= '" . $_POST['FromCriteria'] . "'
AND supptrans.supplierno <= '" . $_POST['ToCriteria'] . "'
@@ -251,12 +251,12 @@
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<table class="selection">';
- if (!isset($_POST['FromCriteria']) or mb_strlen($_POST['FromCriteria'])<1){
+ if (!isset($_POST['FromCriteria']) OR mb_strlen($_POST['FromCriteria'])<1){
$DefaultFromCriteria = '1';
} else {
$DefaultFromCriteria = $_POST['FromCriteria'];
}
- if (!isset($_POST['ToCriteria']) or mb_strlen($_POST['ToCriteria'])<1){
+ if (!isset($_POST['ToCriteria']) OR mb_strlen($_POST['ToCriteria'])<1){
$DefaultToCriteria = 'zzzzzzz';
} else {
$DefaultToCriteria = $_POST['ToCriteria'];
@@ -365,7 +365,7 @@
echo '</select></td>
</tr>';
- if (!isset($_POST['Ref']) or !is_numeric($_POST['Ref'])){
+ if (!isset($_POST['Ref']) OR !is_numeric($_POST['Ref'])){
$DefaultRef = '1';
} else {
$DefaultRef = $_POST['Ref'];
Modified: trunk/SupplierInvoice.php
===================================================================
--- trunk/SupplierInvoice.php 2012-12-05 08:39:15 UTC (rev 5752)
+++ trunk/SupplierInvoice.php 2012-12-08 01:41:35 UTC (rev 5753)
@@ -138,384 +138,362 @@
* on the details entered in the purchase order screen.
*/
if (isset($_GET['ReceivePO']) AND $_GET['ReceivePO']!=''){
+
+ /*Need to check that the user has permission to receive goods */
- $_GET['ModifyOrderNumber'] = intval($_GET['ReceivePO']);
- include('includes/PO_ReadInOrder.inc');
-
- if ($_SESSION['PO'.$identifier]->Status == 'Authorised'){
- $Result = DB_Txn_Begin($db);
- /*Now Get the next GRN - function in SQL_CommonFunctions*/
- $GRN = GetNextTransNo(25, $db);
- if (!isset($_GET['DeliveryDate'])){
- $DeliveryDate = date($_SESSION['DefaultDateFormat']);
- } else {
- $DeliveryDate = $_GET['DeliveryDate'];
- }
- $_POST['ExRate'] = $_SESSION['SuppTrans']->ExRate;
- $_POST['TranDate'] = $DeliveryDate;
+ if (! in_array($_SESSION['PageSecurityArray']['GoodsReceived.php'], $_SESSION['AllowedPageSecurityTokens'])){
+ prnMsg(_('Your permissions do not allow receiving of goods. Automatic receiving of purchase orders is restricted to those only users who are authorised to receive goods/services'),'error');
+ } else {
+ /* The user has permission to receive goods then lets go */
+
+ $_GET['ModifyOrderNumber'] = intval($_GET['ReceivePO']);
+ include('includes/PO_ReadInOrder.inc');
- $PeriodNo = GetPeriod($DeliveryDate, $db);
-
- $OrderHasControlledItems = false; //assume the best
- foreach ($_SESSION['PO'.$identifier]->LineItems as $OrderLine) {
- //Set the quantity to receive with this auto delivery assuming all is well
- $_SESSION['PO'.$identifier]->LineItems[$OrderLine->LineNo]->ReceiveQty = $OrderLine->Quantity - $OrderLine->QtyReceived;
-
- if ($OrderLine->Controlled ==1) { // it's a controlled item - we can't deal with auto receiving controlled items!!!
- prnMsg(_('Auto receiving of controlled stock items that require serial number or batch number entry is not currently catered for. Only orders with normal non-serial numbered items can be received automatically'),'error');
- $OrderHasControlledItems = true;
+ if ($_SESSION['PO'.$identifier]->Status == 'Authorised'){
+ $Result = DB_Txn_Begin($db);
+ /*Now Get the next GRN - function in SQL_CommonFunctions*/
+ $GRN = GetNextTransNo(25, $db);
+ if (!isset($_GET['DeliveryDate'])){
+ $DeliveryDate = date($_SESSION['DefaultDateFormat']);
+ } else {
+ $DeliveryDate = $_GET['DeliveryDate'];
}
- }
- if ($OrderHasControlledItems == false){
+ $_POST['ExRate'] = $_SESSION['SuppTrans']->ExRate;
+ $_POST['TranDate'] = $DeliveryDate;
+
+ $PeriodNo = GetPeriod($DeliveryDate, $db);
+
+ $OrderHasControlledItems = false; //assume the best
foreach ($_SESSION['PO'.$identifier]->LineItems as $OrderLine) {
- $LocalCurrencyPrice = ($OrderLine->Price / $_SESSION['SuppTrans']->ExRate);
-
- if ($OrderLine->StockID!='') { //Its a stock item line
- /*Need to get the current standard cost as it is now so we can process GL jorunals later*/
- $SQL = "SELECT materialcost + labourcost + overheadcost as stdcost
- FROM stockmaster
- WHERE stockid='" . $OrderLine->StockID . "'";
- $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The standard cost of the item being received cannot be retrieved because');
- $DbgMsg = _('The following SQL to retrieve the standard cost was used');
- $Result = DB_query($SQL,$db,$ErrMsg,$DbgMsg,true);
-
- $myrow = DB_fetch_row($Result);
- $CurrentStandardCost = $myrow[0];
+ //Set the quantity to receive with this auto delivery assuming all is well
+ $_SESSION['PO'.$identifier]->LineItems[$OrderLine->LineNo]->ReceiveQty = $OrderLine->Quantity - $OrderLine->QtyReceived;
- if ($OrderLine->QtyReceived==0){ //its the first receipt against this line
- $_SESSION['PO'.$identifier]->LineItems[$OrderLine->LineNo]->StandardCost = $CurrentStandardCost;
- }
-
- /*Set the purchase order line stdcostunit = weighted average / standard cost used for all receipts of this line
- This assures that the quantity received against the purchase order line multiplied by the weighted average of standard
- costs received = the total of standard cost posted to GRN suspense*/
- $_SESSION['PO'.$identifier]->LineItems[$OrderLine->LineNo]->StandardCost = (($CurrentStandardCost * $OrderLine->ReceiveQty) + ($_SESSION['PO'.$identifier]->LineItems[$OrderLine->LineNo]->StandardCost *$OrderLine->QtyReceived)) / ($OrderLine->ReceiveQty + $OrderLine->QtyReceived);
-
- } elseif ($OrderLine->QtyReceived==0 AND $OrderLine->StockID=='') {
- /*Its a nominal item being received */
- /*Need to record the value of the order per unit in the standard cost field to ensure GRN account entries clear */
- $_SESSION['PO'.$identifier]->LineItems[$OrderLine->LineNo]->StandardCost = $LocalCurrencyPrice;
+ if ($OrderLine->Controlled ==1) { // it's a controlled item - we can't deal with auto receiving controlled items!!!
+ prnMsg(_('Auto receiving of controlled stock items that require serial number or batch number entry is not currently catered for. Only orders with normal non-serial numbered items can be received automatically'),'error');
+ $OrderHasControlledItems = true;
}
-
- if ($OrderLine->StockID=='') { /*Its a NOMINAL item line */
- $CurrentStandardCost = $_SESSION['PO'.$identifier]->LineItems[$OrderLine->LineNo]->StandardCost;
- }
-
- /*Now the SQL to do the update to the PurchOrderDetails */
-
- $SQL = "UPDATE purchorderdetails SET quantityrecd = quantityrecd + '" . $OrderLine->ReceiveQty . "',
- stdcostunit='" . $_SESSION['PO'.$identifier]->LineItems[$OrderLine->LineNo]->StandardCost . "',
- completed='" . $_SESSION['PO'.$identifier]->LineItems[$OrderLine->LineNo]->Completed . "'
- WHERE podetailitem = '" . $OrderLine->PODetailRec . "'";
-
- $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The purchase order detail record could not be updated with the quantity received because');
- $DbgMsg = _('The following SQL to update the purchase order detail record was used');
- $Result = DB_query($SQL,$db, $ErrMsg, $DbgMsg, true);
-
-
- if ($OrderLine->StockID !=''){ /*Its a stock item so use the standard cost for the journals */
- $UnitCost = $CurrentStandardCost;
- } else { /*otherwise its a nominal PO item so use the purchase cost converted to local currency */
- $UnitCost = $OrderLine->Price / $_SESSION['SuppTrans']->ExRate;
- }
-
- /*Need to insert a GRN item */
-
- $SQL = "INSERT INTO grns (grnbatch,
- podetailitem,
- itemcode,
- itemdescription,
- deliverydate,
- qtyrecd,
- supplierid,
- stdcostunit)
- VALUES ('" . $GRN . "',
- '" . $OrderLine->PODetailRec . "',
- '" . $OrderLine->StockID . "',
- '" . DB_escape_string($OrderLine->ItemDescription) . "',
- '" . FormatDateForSQL($DeliveryDate) . "',
- '" . $OrderLine->ReceiveQty . "',
- '" . $_SESSION['PO'.$identifier]->SupplierID . "',
- '" . $CurrentStandardCost . "')";
-
- $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('A GRN record could not be inserted') . '. ' . _('This receipt of goods has not been processed because');
- $DbgMsg = _('The following SQL to insert the GRN record was used');
- $Result = DB_query($SQL, $db, $ErrMsg, $DbgMsg, true);
-
- if ($OrderLine->StockID!=''){ /* if the order line is in fact a stock item */
-
- /* Update location stock records - NB a PO cannot be entered for a dummy/assembly/kit parts */
-
- /* Need to get the current location quantity will need it later for the stock movement */
- $SQL="SELECT locstock.quantity
- FROM locstock
- WHERE locstock.stockid='" . $OrderLine->StockID . "'
- AND loccode= '" . $_SESSION['PO'.$identifier]->Location . "'";
-
- $Result = DB_query($SQL, $db);
- if (DB_num_rows($Result)==1){
- $LocQtyRow = DB_fetch_row($Result);
- $QtyOnHandPrior = $LocQtyRow[0];
- } else {
- /*There must actually be some error this should never happen */
- $QtyOnHandPrior = 0;
+ }
+ if ($OrderHasControlledItems == false){
+ foreach ($_SESSION['PO'.$identifier]->LineItems as $OrderLine) {
+ $LocalCurrencyPrice = ($OrderLine->Price / $_SESSION['SuppTrans']->ExRate);
+
+ if ($OrderLine->StockID!='') { //Its a stock item line
+ /*Need to get the current standard cost as it is now so we can process GL jorunals later*/
+ $SQL = "SELECT materialcost + labourcost + overheadcost as stdcost
+ FROM stockmaster
+ WHERE stockid='" . $OrderLine->StockID . "'";
+ $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The standard cost of the item being received cannot be retrieved because');
+ $DbgMsg = _('The following SQL to retrieve the standard cost was used');
+ $Result = DB_query($SQL,$db,$ErrMsg,$DbgMsg,true);
+
+ $myrow = DB_fetch_row($Result);
+ $CurrentStandardCost = $myrow[0];
+
+ if ($OrderLine->QtyReceived==0){ //its the first receipt against this line
+ $_SESSION['PO'.$identifier]->LineItems[$OrderLine->LineNo]->StandardCost = $CurrentStandardCost;
+ }
+
+ /*Set the purchase order line stdcostunit = weighted average / standard cost used for all receipts of this line
+ This assures that the quantity received against the purchase order line multiplied by the weighted average of standard
+ costs received = the total of standard cost posted to GRN suspense*/
+ $_SESSION['PO'.$identifier]->LineItems[$OrderLine->LineNo]->StandardCost = (($CurrentStandardCost * $OrderLine->ReceiveQty) + ($_SESSION['PO'.$identifier]->LineItems[$OrderLine->LineNo]->StandardCost *$OrderLine->QtyReceived)) / ($OrderLine->ReceiveQty + $OrderLine->QtyReceived);
+
+ } elseif ($OrderLine->QtyReceived==0 AND $OrderLine->StockID=='') {
+ /*Its a nominal item being received */
+ /*Need to record the value of the order per unit in the standard cost field to ensure GRN account entries clear */
+ $_SESSION['PO'.$identifier]->LineItems[$OrderLine->LineNo]->StandardCost = $LocalCurrencyPrice;
}
-
- $SQL = "UPDATE locstock
- SET quantity = locstock.quantity + '" . $OrderLine->ReceiveQty . "'
- WHERE locstock.stockid = '" . $OrderLine->StockID . "'
- AND loccode = '" . $_SESSION['PO'.$identifier]->Location . "'";
-
- $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The location stock record could not be updated because');
- $DbgMsg = _('The following SQL to update the location stock record was used');
+
+ if ($OrderLine->StockID=='') { /*Its a NOMINAL item line */
+ $CurrentStandardCost = $_SESSION['PO'.$identifier]->LineItems[$OrderLine->LineNo]->StandardCost;
+ }
+
+ /*Now the SQL to do the update to the PurchOrderDetails */
+
+ $SQL = "UPDATE purchorderdetails SET quantityrecd = quantityrecd + '" . $OrderLine->ReceiveQty . "',
+ stdcostunit='" . $_SESSION['PO'.$identifier]->LineItems[$OrderLine->LineNo]->StandardCost . "',
+ completed='" . $_SESSION['PO'.$identifier]->LineItems[$OrderLine->LineNo]->Completed . "'
+ WHERE podetailitem = '" . $OrderLine->PODetailRec . "'";
+
+ $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The purchase order detail record could not be updated with the quantity received because');
+ $DbgMsg = _('The following SQL to update the purchase order detail record was used');
+ $Result = DB_query($SQL,$db, $ErrMsg, $DbgMsg, true);
+
+
+ if ($OrderLine->StockID !=''){ /*Its a stock item so use the standard cost for the journals */
+ $UnitCost = $CurrentStandardCost;
+ } else { /*otherwise its a nominal PO item so use the purchase cost converted to local currency */
+ $UnitCost = $OrderLine->Price / $_SESSION['SuppTrans']->ExRate;
+ }
+
+ /*Need to insert a GRN item */
+
+ $SQL = "INSERT INTO grns (grnbatch,
+ podetailitem,
+ itemcode,
+ itemdescription,
+ deliverydate,
+ qtyrecd,
+ supplierid,
+ stdcostunit)
+ VALUES ('" . $GRN . "',
+ '" . $OrderLine->PODetailRec . "',
+ '" . $OrderLine->StockID . "',
+ '" . DB_escape_string($OrderLine->ItemDescription) . "',
+ '" . FormatDateForSQL($DeliveryDate) . "',
+ '" . $OrderLine->ReceiveQty . "',
+ '" . $_SESSION['PO'.$identifier]->SupplierID . "',
+ '" . $CurrentStandardCost . "')";
+
+ $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('A GRN record could not be inserted') . '. ' . _('This receipt of goods has not been processed because');
+ $DbgMsg = _('The following SQL to insert the GRN record was used');
$Result = DB_query($SQL, $db, $ErrMsg, $DbgMsg, true);
+
+ if ($OrderLine->StockID!=''){ /* if the order line is in fact a stock item */
+
+ /* Update location stock records - NB a PO cannot be entered for a dummy/assembly/kit parts */
+
+ /* Need to get the current location quantity will need it later for the stock movement */
+ $SQL="SELECT locstock.quantity
+ FROM locstock
+ WHERE locstock.stockid='" . $OrderLine->StockID . "'
+ AND loccode= '" . $_SESSION['PO'.$identifier]->Location . "'";
+
+ $Result = DB_query($SQL, $db);
+ if (DB_num_rows($Result)==1){
+ $LocQtyRow = DB_fetch_row($Result);
+ $QtyOnHandPrior = $LocQtyRow[0];
+ } else {
+ /*There must actually be some error this should never happen */
+ $QtyOnHandPrior = 0;
+ }
+
+ $SQL = "UPDATE locstock
+ SET quantity = locstock.quantity + '" . $OrderLine->ReceiveQty . "'
+ WHERE locstock.stockid = '" . $OrderLine->StockID . "'
+ AND loccode = '" . $_SESSION['PO'.$identifier]->Location . "'";
+
+ $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The location stock record could not be updated because');
+ $DbgMsg = _('The following SQL to update the location stock record was used');
+ $Result = DB_query($SQL, $db, $ErrMsg, $DbgMsg, true);
+
+ /* Insert stock movements - with unit cost */
+
+ $SQL = "INSERT INTO stockmoves (stockid,
+ type,
+ transno,
+ loccode,
+ trandate,
+ price,
+ prd,
+ reference,
+ qty,
+ standardcost,
+ newqoh)
+ VALUES (
+ '" . $OrderLine->StockID . "',
+ 25,
+ '" . $GRN . "',
+ '" . $_SESSION['PO'.$identifier]->Location . "',
+ '" . FormatDateForSQL($DeliveryDate) . "',
+ '" . $LocalCurrencyPrice . "',
+ '" . $PeriodNo . "',
+ '" . $_SESSION['PO'.$identifier]->SupplierID . " (" . DB_escape_string($_SESSION['PO'.$identifier]->SupplierName) . ") - " .$_SESSION['PO'.$identifier]->OrderNo . "',
+ '" . $OrderLine->ReceiveQty . "',
+ '" . $_SESSION['PO'.$identifier]->LineItems[$OrderLine->LineNo]->StandardCost . "',
+ '" . ($QtyOnHandPrior + $OrderLine->ReceiveQty) . "'
+ )";
+
+ $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('stock movement records could not be inserted because');
+ $DbgMsg = _('The following SQL to insert the stock movement records was used');
+ $Result = DB_query($SQL, $db, $ErrMsg, $DbgMsg, true);
- /* Insert stock movements - with unit cost */
-
- $SQL = "INSERT INTO stockmoves (stockid,
- type,
- transno,
- loccode,
+ } /*end of its a stock item - updates to locations and insert movements*/
+
+ /* Check to see if the line item was flagged as the purchase of an asset */
+ if ($OrderLine->AssetID !='' AND $OrderLine->AssetID !='0'){ //then it is an asset
+
+ /*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);
+ 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 . "',
+ '" . FormatDateForSQL($DeliveryDate) . "',
+ '" . $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);
+
+ /*Now get the correct cost GL account from the asset category */
+ $AssetRow = DB_fetch_array($CheckAssetExistsResult);
+ /*Over-ride any GL account specified in the order with the asset category cost account */
+ $_SESSION['PO'.$identifier]->LineItems[$OrderLine->LineNo]->GLCode = $AssetRow['costact'];
+ /*Now if there are no previous additions to this asset update the date purchased */
+ if ($AssetRow['datepurchased']=='0000-00-00'){
+ /* 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='" . FormatDateForSQL($DeliveryDate) . "',
+ cost = cost + " . ($CurrentStandardCost * $OrderLine->ReceiveQty) . "
+ WHERE assetid = '" . $OrderLine->AssetID . "'";
+ } else {
+ $SQL = "UPDATE fixedassets SET cost = cost + " . ($CurrentStandardCost * $OrderLine->ReceiveQty) . "
+ 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');
+ $Result = DB_query($SQL,$db,$ErrMsg, $DbgMsg, true);
+
+ } //assetid provided doesn't exist so ignore it and treat as a normal nominal item
+ } //assetid is set so the nominal item is an asset
+
+ /* If GLLink_Stock then insert GLTrans to debit the GL Code and credit GRN Suspense account at standard cost*/
+ if ($_SESSION['PO'.$identifier]->GLLink==1 AND $OrderLine->GLCode !=0){
+ /*GLCode is set to 0 when the GLLink is not activated this covers a situation where the GLLink is now active but it wasn't when this PO was entered */
+
+ /*first the debit using the GLCode in the PO detail record entry*/
+ $SQL = "INSERT INTO gltrans (type,
+ typeno,
trandate,
- price,
- prd,
- reference,
- qty,
- standardcost,
- newqoh)
- VALUES (
- '" . $OrderLine->StockID . "',
- 25,
- '" . $GRN . "',
- '" . $_SESSION['PO'.$identifier]->Location . "',
- '" . FormatDateForSQL($DeliveryDate) . "',
- '" . $LocalCurrencyPrice . "',
- '" . $PeriodNo . "',
- '" . $_SESSION['PO'.$identifier]->SupplierID . " (" . DB_escape_string($_SESSION['PO'.$identifier]->SupplierName) . ") - " .$_SESSION['PO'.$identifier]->OrderNo . "',
- '" . $OrderLine->ReceiveQty . "',
- '" . $_SESSION['PO'.$identifier]->LineItems[$OrderLine->LineNo]->StandardCost . "',
- '" . ($QtyOnHandPrior + $OrderLine->ReceiveQty) . "'
- )";
-
- $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('stock movement records could not be inserted because');
- $DbgMsg = _('The following SQL to insert the stock movement records was used');
- $Result = DB_query($SQL, $db, $ErrMsg, $DbgMsg, true);
-
- } /*end of its a stock item - updates to locations and insert movements*/
-
- /* Check to see if the line item was flagged as the purchase of an asset */
- if ($OrderLine->AssetID !='' AND $OrderLine->AssetID !='0'){ //then it is an asset
-
- /*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);
- 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 . "',
+ periodno,
+ account,
+ narrative,
+ amount)
+ VALUES (
25,
'" . $GRN . "',
'" . FormatDateForSQL($DeliveryDate) . "',
'" . $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');
+ '" . $OrderLine->GLCode . "',
+ 'PO: " . $_SESSION['PO'.$identifier]->OrderNo . " " . $_SESSION['PO'.$identifier]->SupplierID . " - " . $OrderLine->StockID
+ . " - " . DB_escape_string($OrderLine->ItemDescription) . " x " . $OrderLine->ReceiveQty . " @ " .
+ locale_number_format($CurrentStandardCost,$_SESSION['CompanyRecord']['decimalplaces']) . "',
+ '" . $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');
$Result = DB_query($SQL,$db,$ErrMsg, $DbgMsg, true);
-
- /*Now get the correct cost GL account from the asset category */
- $AssetRow = DB_fetch_array($CheckAssetExistsResult);
- /*Over-ride any GL account specified in the order with the asset category cost account */
- $_SESSION['PO'.$identifier]->LineItems[$OrderLine->LineNo]->GLCode = $AssetRow['costact'];
- /*Now if there are no previous additions to this asset update the date purchased */
- if ($AssetRow['datepurchased']=='0000-00-00'){
- /* 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='" . FormatDateForSQL($DeliveryDate) . "',
- cost = cost + " . ($CurrentStandardCost * $OrderLine->ReceiveQty) . "
- WHERE assetid = '" . $OrderLine->AssetID . "'";
- } else {
- $SQL = "UPDATE fixedassets SET cost = cost + " . ($CurrentStandardCost * $OrderLine->ReceiveQty) . "
- 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');
- $Result = DB_query($SQL,$db,$ErrMsg, $DbgMsg, true);
-
- } //assetid provided doesn't exist so ignore it and treat as a normal nominal item
- } //assetid is set so the nominal item is an asset
+
+ /* If the CurrentStandardCost != UnitCost (the standard at the time the first delivery was booked in, and its a stock item, then the difference needs to be booked in against the purchase price variance account */
+
+ /*now the GRN suspense entry*/
+ $SQL = "INSERT INTO gltrans (type,
+ typeno,
+ trandate,
+ periodno,
+ account,
+ narrative,
+ amount)
+ VALUES (25,
+ '" . $GRN . "',
+ '" . FormatDateForSQL($DeliveryDate) . "',
+ '" . $PeriodNo . "',
+ '" . $_SESSION['CompanyRecord']['grnact'] . "',
+ '" . _('PO'.$identifier) . ': ' . $_SESSION['PO'.$identifier]->OrderNo . ' ' . $_SESSION['PO'.$identifier]->SupplierID . ' - ' . $OrderLine->StockID . ' - ' . DB_escape_string($OrderLine->ItemDescription) . ' x ' . $OrderLine->ReceiveQty . ' @ ' . locale_number_format($UnitCost,$_SESSION['CompanyRecord']['decimalplaces']) . "',
+ '" . -$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');
+ $Result = DB_query($SQL,$db, $ErrMsg, $DbgMsg,true);
+
+ } /* end of if GL and stock integrated and standard cost !=0 */
+ } /*end of OrderLine loop */
- /* If GLLink_Stock then insert GLTrans to debit the GL Code and credit GRN Suspense account at standard cost*/
- if ($_SESSION['PO'.$identifier]->GLLink==1 AND $OrderLine->GLCode !=0){
- /*GLCode is set to 0 when the GLLink is not activated this covers a situation where the GLLink is now active but it wasn't when this PO was entered */
-
- /*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 . "',
- '" . FormatDateForSQL($DeliveryDate) . "',
- '" . $PeriodNo . "',
- '" . $OrderLine->GLCode . "',
- 'PO: " . $_SESSION['PO'.$identifier]->OrderNo . " " . $_SESSION['PO'.$identifier]->SupplierID . " - " . $OrderLine->StockID
- . " - " . DB_escape_string($OrderLine->ItemDescription) . " x " . $OrderLine->ReceiveQty . " @ " .
- locale_number_format($CurrentStandardCost,$_SESSION['CompanyRecord']['decimalplaces']) . "',
- '" . $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');
- $Result = DB_query($SQL,$db,$ErrMsg, $DbgMsg, true);
-
- /* If the CurrentStandardCost != UnitCost (the standard at the time the first delivery was booked in, and its a stock item, then the difference needs to be booked in against the purchase price variance account */
-
- /*now the GRN suspense entry*/
- $SQL = "INSERT INTO gltrans (type,
- typeno,
- trandate,
- periodno,
- account,
- narrative,
- amount)
- VALUES (25,
- '" . $GRN . "',
- '" . FormatDateForSQL($DeliveryDate) . "',
- '" . $PeriodNo . "',
- '" . $_SESSION['CompanyRecord']['grnact'] . "',
- '" . _('PO'.$identifier) . ': ' . $_SESSION['PO'.$identifier]->OrderNo . ' ' . $_SESSION['PO'.$identifier]->SupplierID . ' - ' . $OrderLine->StockID . ' - ' . DB_escape_string($OrderLine->ItemDescription) . ' x ' . $OrderLine->ReceiveQty . ' @ ' . locale_number_format($UnitCost,$_SESSION['CompanyRecord']['decimalplaces']) . "',
- '" . -$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');
- $Result = DB_query($SQL,$db, $ErrMsg, $DbgMsg,true);
-
- } /* end of if GL and stock integrated and standard cost !=0 */
- } /*end of OrderLine loop */
+ $StatusComment=date($_SESSION['DefaultDateFormat']) .' - ' . _('Order Completed on entry of GRN') .'<br />' . $_SESSION['PO'.$identifier]->StatusComments;
+ $sql="UPDATE purchorders
+ SET status='Completed',
+ stat_comment='" . $StatusComment . "'
+ WHERE orderno='" . $_SESSION['PO'.$identifier]->OrderNo . "'";
+ $result=DB_query($sql,$db);
+
+ if ($_SESSION['PO'.$identifier]->GLLink==1) {
+ EnsureGLEntriesBalance(25, $GRN,$db);
+ }
- $StatusComment=date($_SESSION['DefaultDateFormat']) .' - ' . _('Order Completed on entry of GRN') .'<br />' . $_SESSION['PO'.$identifier]->StatusComments;
- $sql="UPDATE purchorders
- SET status='Completed',
- stat_comment='" . $StatusComment . "'
- WHERE orderno='" . $_SESSION['PO'.$identifier]->OrderNo . "'";
- $result=DB_query($sql,$db);
-
- if ($_SESSION['PO'.$identifier]->GLLink==1) {
- EnsureGLEntriesBalance(25, $GRN,$db);
- }
-
- $Result = DB_Txn_Commit($db);
-
- //Now add all these deliveries to this purchase invoice
-
-
- $SQL = "SELECT grnbatch,
- grnno,
- purchorderdetails.orderno,
- purchorderdetails.unitprice,
- grns.itemcode,
- grns.deliverydate,
- grns.itemdescription,
- grns.qtyrecd,
- grns.quantityinv,
- grns.stdcostunit,
- purchorderdetails.glcode,
- purchorderdetails.shiptref,
- purchorderdetails.jobref,
- purchorderdetails.podetailitem,
- purchorderdetails.assetid,
- stockmaster.decimalplaces
- FROM grns INNER JOIN purchorderdetails
- ON grns.podetailitem=purchorderdetails.podetailitem
- LEFT JOIN stockmaster ON grns.itemcode=stockmaster.stockid
- WHERE grns.supplierid ='" . $_SESSION['SuppTrans']->SupplierID . "'
- AND purchorderdetails.orderno = '" . intval($_GET['ReceivePO']) . "'
- AND grns.qtyrecd - grns.quantityinv > 0
- ORDER BY grns.grnno";
- $GRNResults = DB_query($SQL,$db);
-
- while ($myrow=DB_fetch_array($GRNResults)){
+ $Result = DB_Txn_Commit($db);
- if ($myrow['decimalplaces']==''){
- $myrow['decimalplaces']=2;
+ //Now add all these deliveries to this purchase invoice
+
+
+ $SQL = "SELECT grnbatch,
+ grnno,
+ purchorderdetails.orderno,
+ purchorderdetails.unitprice,
+ grns.itemcode,
+ grns.deliverydate,
+ grns.itemdescription,
+ grns.qtyrecd,
+ grns.quantityinv,
+ grns.stdcostunit,
+ purchorderdetails.glcode,
+ purchorderdetails.shiptref,
+ purchorderdetails.jobref,
+ purchorderdetails.podetailitem,
+ purchorderdetails.assetid,
+ stockmaster.decimalplaces
+ FROM grns INNER JOIN purchorderdetails
+ ON grns.podetailitem=purchorderdetails.podetailitem
+ LEFT JOIN stockmaster ON grns.itemcode=stockmaster.stockid
+ WHERE grns.supplierid ='" . $_SESSION['SuppTrans']->SupplierID . "'
+ AND purchorderdetails.orderno = '" . intval($_GET['ReceivePO']) . "'
+ AND grns.qtyrecd - grns.quantityinv > 0
+ ORDER BY grns.grnno";
+ $GRNResults = DB_query($SQL,$db);
+
+ while ($myrow=DB_fetch_array($GRNResults)){
+
+ if ($myrow['decimalplaces']==''){
+ $myrow['decimalplaces']=2;
+ }
+ $_SESSION['SuppTrans']->Add_GRN_To_Trans($myrow['grnno'],
+ $myrow['podetailitem'],
+ $myrow['itemcode'],
+ $myrow['itemdescription'],
+ $myrow['qtyrecd'],
+ $myrow['quantityinv'],
+ $myrow['qtyrecd'] - $myrow['quantityinv'],
+ $myrow['unitprice'],
+ $myrow['unitprice'],
+ true,
+ $myrow['stdcostunit'],
+ $myrow['shiptref'],
+ $myrow['jobref'],
+ $myrow['glcode'],
+ $myrow['orderno'],
+ $myrow['assetid'],
+ 0,
+ $myrow['decimalplaces'],
+ $myrow['grnbatch']);
}
- $_SESSION['SuppTrans']->Add_GRN_To_Trans($myrow['grnno'],
- $myrow['podetailitem'],
- $myrow['itemcode'],
- $myrow['itemdescription'],
- $myrow['qtyrecd'],
- $myrow['quantityinv'],
- $myrow['qtyrecd'] - $myrow['quantityinv'],
- $myrow['unitprice'],
- $myrow['unitprice'],
- true,
- $myrow['stdcostunit'],
- $myrow['shiptref'],
- $myrow['jobref'],
- $myrow['glcode'],
- $myrow['orderno'],
- $myrow['assetid'],
- 0,
- $myrow['decimalplaces'],
- $myrow['grnbatch']);
- }
- } //end if the order has no controlled items on it
- } //only allow auto receiving of all lines if the PO is authorised
+ } //end if the order has no controlled items on it
+ } //only allow auto receiving of all lines if the PO is authorised
+ } //only allow auto receiving if the user has permission to receive goods
} // Page called with link to receive all the items on a PO
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
/* Set the session variables to the posted data from the form if the page has called itself */
if (isset($_POST['ExRate'])){
$_SESSION['SuppTrans']->ExRate = filter_number_format($_POST['ExRate']);
@@ -1902,6 +1880,8 @@
echo '<br />
<div class="centre">
<a href="' . $rootpath . '/SupplierInvoice.php?&SupplierID=' .$_SESSION['SuppTrans']->SupplierID . '">' . _('Enter another Invoice for this Supplier') . '</a>
+ <br />
+ <a href="' . $rootpath . '/Payments.php?&SupplierID=' .$_SESSION['SuppTrans']->SupplierID . '&Amount=' . ($_SESSION['SuppTrans']->OvAmount+$TaxTotal) . '">' . _('Enter payment') . '</a>
</div>';
unset( $_SESSION['SuppTrans']->GRNs);
unset( $_SESSION['SuppTrans']->Shipts);
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-12-05 08:39:15 UTC (rev 5752)
+++ trunk/doc/Change.log 2012-12-08 01:41:35 UTC (rev 5753)
@@ -1,5 +1,7 @@
webERP Change Log
+8/12/12 Phil: Check user has authority to receive goods before allowing auto receiving
+7/12/12 Phil: SupplierInvoice.php add link to pay invoice after invoice input
5/12/12 Phil: Allow auto receiving of purchase orders and populating of purchase invoice when purchase order is authorised.
5/12/12 Tim: PO_PDFPurchOrder.php fix printing of initiator to show the full name also style changes
4/12/12 Tim: PO_Header.php style mods also initiator reinstated as the userid not the user's realname - realname displayed but not stored in db.
Modified: trunk/includes/session.inc
===================================================================
--- trunk/includes/session.inc 2012-12-05 08:39:15 UTC (rev 5752)
+++ trunk/includes/session.inc 2012-12-08 01:41:35 UTC (rev 5753)
@@ -124,13 +124,6 @@
/*User is logged in so get configuration parameters - save in session*/
include($PathPrefix . 'includes/GetConfig.php');
-/*The page security variable is now retrieved from the database in GetConfig.php and stored in the $SESSION['PageSecurityArray'] array
- * the key for the array is the script name - the script name is retrieved from the basename ($_SERVER['SCRIPT_NAME'])
- */
-if (!isset($PageSecurity)){
-//only hardcoded in the UpgradeDatabase script - so old versions that don't have the scripts.pagesecurity field do not choke
- $PageSecurity = $_SESSION['PageSecurityArray'][basename($_SERVER['SCRIPT_NAME'])];
-}
/*If the Code $Version - held in ConnectDB.inc is > than the Database VersionNumber held in config table then do upgrades */
if (strcmp($Version,$_SESSION['VersionNumber'])>0 AND (basename($_SERVER['SCRIPT_NAME'])!='UpgradeDatabase.php')) {
@@ -265,8 +258,7 @@
-// Now check that the user as logged in has access to the page being called. The $PageSecurity
-// value must be set in the script before header.inc is included. $SecurityGroups is an array of
+// Now check that the user as logged in has access to the page being called. $SecurityGroups is an array of
// arrays defining access for each group of users. These definitions can be modified by a system admin under setup
@@ -279,6 +271,15 @@
exit;
}
+/*The page security variable is now retrieved from the database in GetConfig.php and stored in the $SESSION['PageSecurityArray'] array
+ * the key for the array is the script name - the script name is retrieved from the basename ($_SERVER['SCRIPT_NAME'])
+ */
+if (!isset($PageSecurity)){
+//only hardcoded in the UpgradeDatabase script - so old versions that don't have the scripts.pagesecurity field do not choke
+ $PageSecurity = $_SESSION['PageSecurityArray'][basename($_SERVER['SCRIPT_NAME'])];
+}
+
+
if (!isset($AllowAnyone)){
if ((!in_array($PageSecurity, $_SESSION['AllowedPageSecurityTokens']) OR !isset($PageSecurity))) {
$title = _('Security Permissions Problem');
|
|
From: <dai...@us...> - 2012-12-10 08:25:48
|
Revision: 5755
http://sourceforge.net/p/web-erp/reponame/5755
Author: daintree
Date: 2012-12-10 08:25:45 +0000 (Mon, 10 Dec 2012)
Log Message:
-----------
remove hard coding of security tokens in favour of dummy script
Modified Paths:
--------------
trunk/CounterReturns.php
trunk/CounterSales.php
trunk/SelectOrderItems.php
trunk/doc/Change.log
trunk/sql/mysql/upgrade4.09-4.10.sql
Modified: trunk/CounterReturns.php
===================================================================
--- trunk/CounterReturns.php 2012-12-09 15:34:31 UTC (rev 5754)
+++ trunk/CounterReturns.php 2012-12-10 08:25:45 UTC (rev 5755)
@@ -756,11 +756,7 @@
} /* end of loop around items */
echo '<tr class="EvenTableRows">';
- if (in_array(13,$_SESSION['AllowedPageSecurityTokens'])){
- echo '<td colspan="8" class="number"><b>' . _('Total') . '</b></td>';
- } else {
- echo '<td colspan="6" class="number"><b>' . _('Total') . '</b></td>';
- }
+ echo '<td colspan="8" class="number"><b>' . _('Total') . '</b></td>';
echo '<td class="number">' . locale_number_format(($_SESSION['Items'.$identifier]->total),$_SESSION['Items'.$identifier]->CurrDecimalPlaces) . '</td>
<td class="number">' . locale_number_format($TaxTotal,$_SESSION['Items'.$identifier]->CurrDecimalPlaces) . '</td>
<td class="number">' . locale_number_format(($_SESSION['Items'.$identifier]->total+$TaxTotal),$_SESSION['Items'.$identifier]->CurrDecimalPlaces) . '</td>
Modified: trunk/CounterSales.php
===================================================================
--- trunk/CounterSales.php 2012-12-09 15:34:31 UTC (rev 5754)
+++ trunk/CounterSales.php 2012-12-10 08:25:45 UTC (rev 5755)
@@ -746,7 +746,7 @@
<th>' . _('QOH') . '</th>
<th>' . _('Unit') . '</th>
<th>' . _('Price') . '</th>';
- if (in_array(13,$_SESSION['AllowedPageSecurityTokens'])){
+ if (in_array($_SESSION['PageSecurityArray']['OrderEntryDiscountPricing'], $_SESSION['AllowedPageSecurityTokens'])){
echo '<th>' . _('Discount') . '</th>
<th>' . _('GP %') . '</th>';
}
@@ -792,7 +792,7 @@
echo '</td>
<td class="number">' . locale_number_format($OrderLine->QOHatLoc,$OrderLine->DecimalPlaces) . '</td>
<td>' . $OrderLine->Units . '</td>';
- if (in_array(13,$_SESSION['AllowedPageSecurityTokens'])){
+ if (in_array($_SESSION['PageSecurityArray']['OrderEntryDiscountPricing'], $_SESSION['AllowedPageSecurityTokens'])){
echo '<td><input class="number" type="text" name="Price_' . $OrderLine->LineNumber . '" size="16" maxlength="16" value="' . locale_number_format($OrderLine->Price,$_SESSION['Items'.$identifier]->CurrDecimalPlaces) . '" /></td>
<td><input class="number" type="text" name="Discount_' . $OrderLine->LineNumber . '" size="5" maxlength="4" value="' . locale_number_format(($OrderLine->DiscountPercent * 100),2) . '" /></td>
<td><input class="number" type="text" name="GPPercent_' . $OrderLine->LineNumber . '" size="3" maxlength="40" value="' . locale_number_format($OrderLine->GPPercent,2) . '" /></td>';
@@ -845,7 +845,7 @@
} /* end of loop around items */
echo '<tr class="EvenTableRows">';
- if (in_array(13,$_SESSION['AllowedPageSecurityTokens'])){
+ if (in_array($_SESSION['PageSecurityArray']['OrderEntryDiscountPricing'], $_SESSION['AllowedPageSecurityTokens'])){
echo '<td colspan="8" class="number"><b>' . _('Total') . '</b></td>';
} else {
echo '<td colspan="6" class="number"><b>' . _('Total') . '</b></td>';
Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php 2012-12-09 15:34:31 UTC (rev 5754)
+++ trunk/SelectOrderItems.php 2012-12-10 08:25:45 UTC (rev 5755)
@@ -278,7 +278,9 @@
$_SESSION['Items'.$identifier] = new cart;
$_SESSION['PrintedPackingSlip'] = 0; /*Of course cos the order aint even started !!*/
- if (in_array(2,$_SESSION['AllowedPageSecurityTokens'])
+
+
+ if (in_array($_SESSION['PageSecurityArray']['ConfirmDispatch_Invoice.php'], $_SESSION['AllowedPageSecurityTokens'])
AND ($_SESSION['Items'.$identifier]->DebtorNo==''
OR !isset($_SESSION['Items'.$identifier]->DebtorNo))){
@@ -300,10 +302,10 @@
}
}
-//Customer logins are not allowed to select other customers hence in_array(2,$_SESSION['AllowedPageSecurityTokens'])
+//Customer logins are not allowed to select other customers hence in_array($_SESSION['PageSecurityArray']['ConfirmDispatch_Invoice.php'], $_SESSION['AllowedPageSecurityTokens'])
if (isset($_POST['SearchCust'])
AND $_SESSION['RequireCustomerSelection']==1
- AND in_array(2,$_SESSION['AllowedPageSecurityTokens'])){
+ AND in_array($_SESSION['PageSecurityArray']['ConfirmDispatch_Invoice.php'], $_SESSION['AllowedPageSecurityTokens'])){
if (($_POST['CustKeywords']=='') AND ($_POST['CustCode']=='') AND ($_POST['CustPhone']=='')) {
$SQL = "SELECT custbranch.brname,
@@ -718,7 +720,7 @@
unset($_SESSION['Items'.$identifier]);
$_SESSION['Items'.$identifier] = new cart;
- if (in_array(2,$_SESSION['AllowedPageSecurityTokens'])){
+ if (in_array($_SESSION['PageSecurityArray']['ConfirmDispatch_Invoice.php'], $_SESSION['AllowedPageSecurityTokens'])){
$_SESSION['RequireCustomerSelection'] = 1;
} else {
$_SESSION['RequireCustomerSelection'] = 0;
@@ -1374,7 +1376,7 @@
<th>' . _('Unit') . '</th>
<th>' . _('Price') . '</th>';
- if (in_array(13,$_SESSION['AllowedPageSecurityTokens'])){
+ if (in_array($_SESSION['PageSecurityArray']['OrderEntryDiscountPricing'], $_SESSION['AllowedPageSecurityTokens'])){
echo '<th>' . _('Discount') . '</th>
<th>' . _('GP %') . '</th>';
}
@@ -1423,7 +1425,7 @@
<td class="number">' . locale_number_format($OrderLine->QOHatLoc,$OrderLine->DecimalPlaces) . '</td>
<td>' . $OrderLine->Units . '</td>';
- if (in_array(13,$_SESSION['AllowedPageSecurityTokens'])){
+ if (in_array($_SESSION['PageSecurityArray']['OrderEntryDiscountPricing'], $_SESSION['AllowedPageSecurityTokens'])){
/*OK to display with discount if it is an internal user with appropriate permissions */
echo '<td><input class="number" type="text" name="Price_' . $OrderLine->LineNumber . '" size="16" maxlength="16" value="' . locale_number_format($OrderLine->Price,$_SESSION['Items'.$identifier]->CurrDecimalPlaces) . '" /></td>
<td><input class="number" type="text" name="Discount_' . $OrderLine->LineNumber . '" size="5" maxlength="4" value="' . locale_number_format(($OrderLine->DiscountPercent * 100),2) . '" /></td>
@@ -1463,7 +1465,7 @@
} /* end of loop around items */
$DisplayTotal = locale_number_format($_SESSION['Items'.$identifier]->total,$_SESSION['Items'.$identifier]->CurrDecimalPlaces);
- if (in_array(13,$_SESSION['AllowedPageSecurityTokens'])){
+ if (in_array($_SESSION['PageSecurityArray']['OrderEntryDiscountPricing'], $_SESSION['AllowedPageSecurityTokens'])){
$ColSpanNumber = 2;
} else {
$ColSpanNumber = 1;
@@ -1695,7 +1697,7 @@
<td style="text-align:center" colspan="1"><input tabindex="4" type="submit" name="Search" value="' . _('Search Now') . '" /></td>
<td style="text-align:center" colspan="1"><input tabindex="5" type="submit" name="QuickEntry" value="' . _('Use Quick Entry') . '" /></td>';
- if (in_array(2,$_SESSION['AllowedPageSecurityTokens'])){ //not a customer entry of own order
+ if (in_array($_SESSION['PageSecurityArray']['ConfirmDispatch_Invoice.php'], $_SESSION['AllowedPageSecurityTokens'])){ //not a customer entry of own order
echo '<td style="text-align:center" colspan="1"><input tabindex="6" type="submit" name="ChangeCustomer" value="' . _('Change Customer') . '" /></td>
<td style="text-align:center" colspan="1"><input tabindex="7" type="submit" name="SelectAsset" value="' . _('Fixed Asset Disposal') . '" /></td>';
}
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-12-09 15:34:31 UTC (rev 5754)
+++ trunk/doc/Change.log 2012-12-10 08:25:45 UTC (rev 5755)
@@ -1,5 +1,6 @@
webERP Change Log
+10/12/12 Phil: Remove hard coding of security tokens in favour of new OrderEntryDiscountPricing dummy script
8/12/12 Phil: Check user has authority to receive goods before allowing auto receiving
7/12/12 Phil: SupplierInvoice.php add link to pay invoice after invoice input
5/12/12 Phil: Allow auto receiving of purchase orders and populating of purchase invoice when purchase order is authorised.
Modified: trunk/sql/mysql/upgrade4.09-4.10.sql
===================================================================
--- trunk/sql/mysql/upgrade4.09-4.10.sql 2012-12-09 15:34:31 UTC (rev 5754)
+++ trunk/sql/mysql/upgrade4.09-4.10.sql 2012-12-10 08:25:45 UTC (rev 5755)
@@ -4,6 +4,10 @@
ALTER TABLE `salesorderdetails` DROP `commissionrate`;
ALTER TABLE `salesorderdetails` DROP `commissionearned`;
INSERT INTO scripts VALUES ('CounterReturns.php','5','Allows credits and refunds from the default Counter Sale account for an inventory location');
-UPDATE config SET confvalue='4.09.1' WHERE confname='VersionNumber';
+ALTER TABLE purchorders MODIFY `initiator` VARCHAR(20);
+INSERT INTO `weberpdemo`.`scripts` (`script` , `pagesecurity` , `description`)
+VALUES ('OrderEntryDiscountPricing', '13', 'Not a script but an authority level marker - required if the user is allowed to enter discounts against a customer order'
+);
+UPDATE config SET confvalue='4.10.0' WHERE confname='VersionNumber';
-ALTER TABLE purchorders MODIFY `initiator` VARCHAR(20);
+
|
|
From: <dai...@us...> - 2012-12-12 09:03:59
|
Revision: 5757
http://sourceforge.net/p/web-erp/reponame/5757
Author: daintree
Date: 2012-12-12 09:03:56 +0000 (Wed, 12 Dec 2012)
Log Message:
-----------
Changes to Customer and Supplier login. Rework GLTransInquiry.php
Modified Paths:
--------------
trunk/GLTransInquiry.php
trunk/PO_PDFPurchOrder.php
trunk/SelectOrderItems.php
trunk/doc/Change.log
trunk/doc/Manual/ManualAPIFunctions.php
trunk/doc/Manual/ManualContents.php
trunk/doc/Manual/ManualOutline.php
trunk/includes/session.inc
trunk/index.php
Modified: trunk/GLTransInquiry.php
===================================================================
--- trunk/GLTransInquiry.php 2012-12-12 01:55:53 UTC (rev 5756)
+++ trunk/GLTransInquiry.php 2012-12-12 09:03:56 UTC (rev 5757)
@@ -67,11 +67,15 @@
$TransResult = DB_query($SQL,$db);
$Posted = _('Yes');
- $CreditTotal = $DebitTotal = 0;
+ $CreditTotal = 0;
+ $DebitTotal = 0;
$j=1;
while ( $TransRow = DB_fetch_array($TransResult) ) {
$TranDate = ConvertSQLDate($TransRow['trandate']);
$DetailResult = false;
+
+ $AccountName = $TransRow['accountname'];
+ $URL = $rootpath . '/GLAccountInquiry.php?Account=' . $TransRow['account'];
if ( $TransRow['amount'] > 0) {
$DebitAmount = locale_number_format($TransRow['amount'],$_SESSION['CompanyRecord']['decimalplaces']);
@@ -86,96 +90,54 @@
$Posted = _('No');
}
if ( $TransRow['account'] == $_SESSION['CompanyRecord']['debtorsact'] ) {
- $URL = $rootpath . '/CustomerInquiry.php?CustomerID=';
- $date = '&TransAfterDate=' . $TranDate;
-
- $DetailSQL = "SELECT debtortrans.debtorno,
- debtortrans.ovamount,
- debtortrans.ovgst,
- debtortrans.ovfreight,
- debtortrans.rate,
- debtorsmaster.name
- FROM debtortrans INNER JOIN debtorsmaster
- ON debtortrans.debtorno = debtorsmaster.debtorno
- WHERE debtortrans.type = '" . $TransRow['type'] . "'
- AND debtortrans.transno = '" . $_GET['TransNo']. "'";
- $DetailResult = DB_query($DetailSQL,$db);
+ $DetailSQL = "SELECT debtortrans.debtorno,
+ debtorsmaster.name
+ FROM debtortrans INNER JOIN debtorsmaster
+ ON debtortrans.debtorno = debtorsmaster.debtorno
+ WHERE debtortrans.type = '" . $TransRow['type'] . "'
+ AND debtortrans.transno = '" . $_GET['TransNo']. "'";
+ $DetailResult = DB_query($DetailSQL,$db);
} elseif ( $TransRow['account'] == $_SESSION['CompanyRecord']['creditorsact'] ) {
- $URL = $rootpath . '/SupplierInquiry.php?SupplierID=';
- $date = '&FromDate=' . $TranDate;
-
- $DetailSQL = "SELECT supptrans.supplierno,
- supptrans.ovamount,
- supptrans.ovgst,
- supptrans.rate,
- suppliers.suppname
- FROM supptrans INNER JOIN suppliers
- ON supptrans.supplierno = suppliers.supplierid
- WHERE supptrans.type = '" . $TransRow['type'] . "'
- AND supptrans.transno = '" . $_GET['TransNo'] . "'";
- $DetailResult = DB_query($DetailSQL,$db);
- } else {
- $URL = $rootpath . '/GLAccountInquiry.php?Account=' . $TransRow['account'];
-
- if( mb_strlen($TransRow['narrative'])==0 ) {
- $TransRow['narrative'] = ' ';
- }
-
- if ($j==1) {
- echo '<tr class="OddTableRows">';
- $j=0;
- } else {
- echo '<tr class="EvenTableRows">';
- $j++;
- }
- echo '<td>' . $TranDate . '</td>
- <td>' . MonthAndYearFromSQLDate($TransRow['lastdate_in_period']) . '</td>
- <td><a href="' . $URL . '">' . $TransRow['accountname'] . '</a></td>
- <td class="number">' . $DebitAmount . '</td>
- <td class="number">' . $CreditAmount . '</td>
- <td>' . $TransRow['narrative'] . '</td>
- <td>' . $Posted . '</td>
- </tr>';
+ $DetailSQL = "SELECT supptrans.supplierno,
+ suppliers.suppname
+ FROM supptrans INNER JOIN suppliers
+ ON supptrans.supplierno = suppliers.supplierid
+ WHERE supptrans.type = '" . $TransRow['type'] . "'
+ AND supptrans.transno = '" . $_GET['TransNo'] . "'";
+ $DetailResult = DB_query($DetailSQL,$db);
}
-
if ($DetailResult) {
- while ( $DetailRow = DB_fetch_row($DetailResult) ) {
- if ( $TransRow['amount'] > 0){
- if ($TransRow['account'] == $_SESSION['CompanyRecord']['debtorsact']) {
- $Debit = locale_number_format(($DetailRow[1] + $DetailRow[2]+ $DetailRow[3]) / $DetailRow[4],$_SESSION['CompanyRecord']['decimalplaces']);
- $Credit = ' ';
- } else {
- $Debit = locale_number_format((-$DetailRow[1] - $DetailRow[2]) / $DetailRow[3],$_SESSION['CompanyRecord']['decimalplaces']);
- $Credit = ' ';
- }
- } else {
- if ($TransRow['account'] == $_SESSION['CompanyRecord']['debtorsact']) {
- $Credit = locale_number_format(-($DetailRow[1] + $DetailRow[2] + $DetailRow[3]) / $DetailRow[4],$_SESSION['CompanyRecord']['decimalplaces']);
- $Debit = ' ';
- } else {
- $Credit = locale_number_format(($DetailRow[1] + $DetailRow[2]) / $DetailRow[3],$_SESSION['CompanyRecord']['decimalplaces']);
- $Debit = ' ';
- }
- }
-
- if ($j==1) {
- echo '<tr class="OddTableRows">';
- $j=0;
- } else {
- echo '<tr class="EvenTableRows">';
- $j++;
- }
- echo '<td>' . $TranDate . '</td>
- <td>' . MonthAndYearFromSQLDate($TransRow['lastdate_in_period']) . '</td>
- <td><a href="' . $URL . $DetailRow[0] . $date . '">' . $TransRow['accountname'] . ' - ' . $DetailRow[5] . '</a></td>
- <td class="number">' . $Debit . '</td>
- <td class="number">' . $Credit . '</td>
- <td>' . $TransRow['narrative'] . '</td>
- <td>' . $Posted . '</td>
- </tr>';
+ $DetailRow = DB_fetch_array($DetailResult);// there can be only one
+ if ($TransRow['account'] == $_SESSION['CompanyRecord']['debtorsact']) {
+ $URL = $rootpath . '/CustomerInquiry.php?CustomerID=' . $DetailRow['debtorno'] . '&TransAfterDate=' . $TranDate;
+ $AccountName .= ' ' . $DetailRow['name'];
+ } else { //its a supplier trans
+ $URL = $rootpath . '/SupplierInquiry.php?SupplierID=' . $DetailRow['supplierno'] . '&FromDate=' . $TranDate;
+ $AccountName .= ' ' . $DetailRow['suppname'];
}
DB_free_result($DetailResult);
}
+
+
+ if( mb_strlen($TransRow['narrative'])==0 ) {
+ $TransRow['narrative'] = ' ';
+ }
+
+ if ($j==1) {
+ echo '<tr class="OddTableRows">';
+ $j=0;
+ } else {
+ echo '<tr class="EvenTableRows">';
+ $j++;
+ }
+ echo '<td>' . $TranDate . '</td>
+ <td>' . MonthAndYearFromSQLDate($TransRow['lastdate_in_period']) . '</td>
+ <td><a href="' . $URL . '">' . $AccountName . '</a></td>
+ <td class="number">' . $DebitAmount . '</td>
+ <td class="number">' . $CreditAmount . '</td>
+ <td>' . $TransRow['narrative'] . '</td>
+ <td>' . $Posted . '</td>
+ </tr>';
}
DB_free_result($TransResult);
Modified: trunk/PO_PDFPurchOrder.php
===================================================================
--- trunk/PO_PDFPurchOrder.php 2012-12-12 01:55:53 UTC (rev 5756)
+++ trunk/PO_PDFPurchOrder.php 2012-12-12 09:03:56 UTC (rev 5757)
@@ -298,7 +298,7 @@
include('includes/PO_PDFOrderPageHeader.inc');
} //end if need a new page headed up
if ($_POST['ShowAmounts'] == 'Yes') {
- $DisplayOrderTotal = locale_number_format($OrdendrTotal, $POHeader['currdecimalplaces']);
+ $DisplayOrderTotal = locale_number_format($OrderTotal, $POHeader['currdecimalplaces']);
} else {
$DisplayOrderTotal = '----';
}
Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php 2012-12-12 01:55:53 UTC (rev 5756)
+++ trunk/SelectOrderItems.php 2012-12-12 09:03:56 UTC (rev 5757)
@@ -55,7 +55,7 @@
$_SESSION['ExistingOrder' .$identifier]=0;
$_SESSION['Items'.$identifier] = new cart;
- if (count($_SESSION['AllowedPageSecurityTokens'])==1){ //its a customer logon
+ if ($CustomerLogin==1){ //its a customer logon
$_SESSION['Items'.$identifier]->DebtorNo=$_SESSION['CustomerID'];
$_SESSION['RequireCustomerSelection']=0;
} else {
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-12-12 01:55:53 UTC (rev 5756)
+++ trunk/doc/Change.log 2012-12-12 09:03:56 UTC (rev 5757)
@@ -1,5 +1,8 @@
webERP Change Log
+12/12/12 Phil/RockStar: SelectOrderitems.php would not recognise Customer only logins correctly as there are two tokens in a Customer login role. and was testing to see if just one token!
+11/12/12 Phil: Made CustomerLogin and SupplierLogin more intuitive - still rely on hard coded Security Tokens though.
+11/12/12 Phil: Reworked GLTransInquiry.php produced incorrect journals
10/12/12 Phil: Remove hard coding of security tokens in favour of new OrderEntryDiscountPricing dummy script
8/12/12 Phil: Check user has authority to receive goods before allowing auto receiving
7/12/12 Phil: SupplierInvoice.php add link to pay invoice after invoice input
Modified: trunk/doc/Manual/ManualAPIFunctions.php
===================================================================
--- trunk/doc/Manual/ManualAPIFunctions.php 2012-12-12 01:55:53 UTC (rev 5756)
+++ trunk/doc/Manual/ManualAPIFunctions.php 2012-12-12 09:03:56 UTC (rev 5757)
@@ -14,7 +14,7 @@
echo '<link REL="shortcut icon" HREF="'. $rootpath.'/favicon.ico">';
echo '<link REL="icon" HREF="' . $rootpath.'/favicon.ico">';
echo '<meta http-equiv="Content-Type" content="text/html; charset=utf-8">';
-echo '<link href="'.$rootpath. '/../../css/'. $_SESSION['Theme'] .'/default.css" REL="stylesheet" TYPE="text/css">';
+//echo '<link href="'.$rootpath. '/../../css/'. $_SESSION['Theme'] .'/default.css" REL="stylesheet" type="text/css">';
echo '</head>';
echo '<body>';
Modified: trunk/doc/Manual/ManualContents.php
===================================================================
--- trunk/doc/Manual/ManualContents.php 2012-12-12 01:55:53 UTC (rev 5756)
+++ trunk/doc/Manual/ManualContents.php 2012-12-12 09:03:56 UTC (rev 5757)
@@ -67,18 +67,21 @@
}
echo '</form>'."\n";
-if (!isset($_GET['ViewTopic']))
-{
+if (!isset($_GET['ViewTopic'])){
$_GET['ViewTopic'] = '';
}
foreach ($TOC_Array['TableOfContents'] as $Name=>$FullName){
$PostName = 'Select' . $Name;
- if (($_GET['ViewTopic'] == $Name) OR (isset($_POST[$PostName])))
- {
- $ManualPage = 'Manual'.$Name.'.html';
- if (file_exists($ManualPage))
- {
+ if (($_GET['ViewTopic'] == $Name) OR (isset($_POST[$PostName]))){
+
+ if ($Name=='APIFunctions') {
+ $ManualPage = 'Manual' . $Name . '.php';
+ } else {
+ $ManualPage = 'Manual' . $Name . '.html';
+ }
+
+ if (file_exists($ManualPage)) {
include($ManualPage);
}
}
Modified: trunk/doc/Manual/ManualOutline.php
===================================================================
--- trunk/doc/Manual/ManualOutline.php 2012-12-12 01:55:53 UTC (rev 5756)
+++ trunk/doc/Manual/ManualOutline.php 2012-12-12 09:03:56 UTC (rev 5757)
@@ -6,13 +6,11 @@
$TOC_Array = array (
'TableOfContents' => array(
'Introduction' => array('Introduction',
- 'Why another accounting program?'
- ),
+ 'Why another accounting program?'),
'Requirements' => array('Requirements',
'Hardware requirements',
'Software requirements',
- 'Using webERP with a Wiki'
- ),
+ 'Using webERP with a Wiki'),
'GettingStarted' => array('Getting started',
'Prerequisites',
'Copying the PHP Scripts',
@@ -20,10 +18,8 @@
'Editing config.php',
'Logging in for the first time',
'Themes and GUI modification',
- 'Setting up users'
- ),
- 'SecuritySchema' => array('Security schema'
- ),
+ 'Setting up users'),
+ 'SecuritySchema' => array('Security schema'),
'CreatingNewSystem' => array('Creating a new system',
'Running the Demonstration database',
'Setting up a system',
@@ -36,8 +32,7 @@
'Finally'),
'SystemConventions' => array('System Conventions',
'Navigating the menu',
- 'Reporting'
- ),
+ 'Reporting'),
'Inventory' => array('Inventory (aka "Stock")',
'Overview',
'Inventory system features',
@@ -87,8 +82,7 @@
'Inventory usage inquiries',
'Inventory valuation report',
'Inventory planning report',
- 'Inventory checks'
- ),
+ 'Inventory checks'),
'AccountsReceivable'=> array('Accounts Receivable',
'Overview',
'Features',
@@ -118,8 +112,7 @@
'Default freight company',
'Postal address 1,2,3 and 4',
'Amending customer details',
- 'Shippers',
- ),
+ 'Shippers'),
'AccountsPayable' => array('Accounts Payable',
'Overview',
'Features',
@@ -132,49 +125,41 @@
'Bank particulars/reference',
'Bank account number',
'Currency',
- 'Remittance advice',
- ),
+ 'Remittance advice'),
'SalesPeople' => array('Sales People',
'Salesperson records',
'Salesperson code',
'Salesperson name, telephone and fax numbers',
- 'Salesperson commission rates and breakpoint'
- ),
+ 'Salesperson commission rates and breakpoint'),
'Currencies' => array('Currencies',
'Currency abbreviation',
'Currency name',
'Country of currency',
'Hunredths name',
- 'Exchange rates',
- ),
+ 'Exchange rates'),
'SalesTypes' => array('Sales types/price lists',
'Sales type code',
- 'Sales type description'
- ),
+ 'Sales type description'),
'PaymentTerms' => array('Payment terms',
'Payment terms code',
'Payment terms description',
- 'days before due/day in following month when due'
- ),
+ 'days before due/day in following month when due'),
'CreditStatus' => array('Credit status',
'Credit status ratings',
'Status code',
'Status description',
- 'Disallow invoices'
- ),
+ 'Disallow invoices'),
'Tax' => array('Tax',
'Tax calculations',
'Overview',
'Setting up taxes',
'Sales only within one Tax Authority example - 2 Tax levels:',
'Sales only within one Tax Authority example - 3 Tax Levels:',
- 'Sales within two Tax Authorities example - 3 tax levels:',
- ),
+ 'Sales within two Tax Authorities example - 3 tax levels:'),
'Prices' => array('Prices and Discounts',
'Pricing overview',
'Maintaining prices',
- 'Discount matrix'
- ),
+ 'Discount matrix'),
'ARTransactions' => array('Accounts Receivable Transactions',
'Invoicing an order',
'Selecting an order to invoice',
@@ -191,25 +176,21 @@
'Differences on exchange',
'Receipts processing',
'Deposits listing',
- 'Allocate credits to a customer\'s account',
- ),
+ 'Allocate credits to a customer\'s account',),
'ARInquiries' => array('Accounts receivable inquiries',
'Customer inquiries',
'Customer account inquiries',
- 'Transaction detail inquiries'
- ),
+ 'Transaction detail inquiries'),
'ARReports' => array('Accounts receivable reports',
'Customers - reporting',
'Aged customer balance listing',
'Customer statements',
'Customer transaction listing options',
- 'Printing invoices or credit notes'
- ),
+ 'Printing invoices or credit notes'),
'SalesAnalysis' => array('Sales analysis',
'Sales analysis report headers',
'Sales analysis report columns',
- 'Automating sales reports'
- ),
+ 'Automating sales reports'),
'SalesOrders' => array('Sales orders',
'Sales order functionality',
'Entry of sales orders',
@@ -220,35 +201,30 @@
'Quotations',
'Recurring orders',
'Counter sales - entering sales directly',
- 'Managing discounts by product group and customer group (Matrix)',
- ),
+ 'Managing discounts by product group and customer group (Matrix)'),
'PurchaseOrdering' => array('Purchase ordering',
'Overview',
'Purchase orders',
'Adding a new purchase order',
'Authorising purchase orders',
- 'Receiving purchase orders'
- ),
+ 'Receiving purchase orders'),
'Shipments' => array('Shipments',
'Shipment general ledger posting',
'Creating shipments',
'Shipment costings',
- 'Closing a shipment'
- ),
+ 'Closing a shipment'),
'Contracts' => array('Contract Costing',
'Contract costing overview',
'Creating a new contract',
'Selecting a contract',
- 'Charging against contracts'
- ),
+ 'Charging against contracts'),
'Manufacturing' => array('Manufacturing',
'Manufacturing overview',
'General ledger implications',
'Work order entry',
'Work order receipts',
'Work order issues',
- 'Closing work orders'
- ),
+ 'Closing work orders'),
'MRP' => array('Material requirements planning',
'MRP Overview',
'Base data required',
@@ -256,8 +232,7 @@
'Master (Production) Schedule',
'Running the MRP calculation',
'How it works',
- 'MRP Reports'
- ),
+ 'MRP Reports'),
'GeneralLedger' => array('General Ledger',
'General ledger overview',
'Account groups',
@@ -268,15 +243,13 @@
'Stock journals',
'EDI',
'EDI setup',
- 'Sending EDI Invoices'
- ),
+ 'Sending EDI Invoices'),
'FixedAssets' => array('Fixed assets',
'Fixed assets overview',
'Creating a fixed asset',
'Selecting fixed assets',
'Depreciation run',
- 'Fixed asset schedule'
- ),
+ 'Fixed asset schedule'),
'ReportBuilder' => array('SQL Report Writer',
'Report writer introduction',
'Reports administration',
@@ -287,28 +260,22 @@
'Creating a new report - Specifying database tables and links',
'Creating a new report - specifying fields to retrieve',
'Creating a new report - entering and arranging criteria',
- 'Viewing reports'
-
- ),
+ 'Viewing reports'),
'PettyCash' => array('Petty cash management system',
'Overview',
- 'Setup general parameters'
- ),
+ 'Setup general parameters'),
'Multilanguage' => array('Multilanguage',
'Introduction to multilanguage',
'Rebuild the system default language file',
'Add a new language to the system',
'Edit a language file header',
- 'Edit a language file module',
-
- ),
+ 'Edit a language file module'),
'SpecialUtilities' => array('Special utilities',
'Reapply standard costs to sales analysis',
'Change a customer code',
'Change an inventory code',
'Make stock locations',
- 'Repost general ledger from period',
- ),
+ 'Repost general ledger from period'),
'NewScripts' => array('Development - Foundations',
'Directory structure',
'session.inc',
@@ -318,10 +285,9 @@
'PDFStarter.php',
'Database abstraction - ConnectDB.inc',
'DateFunctions.inc',
- 'SQL_CommonFunctions.inc'
- ),
- 'APITutorial' => array('API Tutorial'
- ),
+ 'SQL_CommonFunctions.inc'),
+ 'APITutorial' => array('API Tutorial'),
+ 'APIFunctions' => array('API Function reference'),
'DevelopmentStructure' => array('Development Structure',
'Sales orders',
'Pricing',
@@ -336,10 +302,8 @@
'Inventory',
'Stock inquiries',
'Accounts payable',
- 'Supplier payments'
- ),
- 'Contributors' => array('Contributors - Acknowledgements'
- ),
+ 'Supplier payments'),
+ 'Contributors' => array('Contributors - Acknowledgements')
)
);
Modified: trunk/includes/session.inc
===================================================================
--- trunk/includes/session.inc 2012-12-12 01:55:53 UTC (rev 5756)
+++ trunk/includes/session.inc 2012-12-12 09:03:56 UTC (rev 5757)
@@ -301,13 +301,15 @@
}
}
-if (in_array(9,$_SESSION['AllowedPageSecurityTokens']) and $PageSecurity==0 and count($_SESSION['AllowedPageSecurityTokens'])==2){
+//$PageSecurity = 9 hard coded for supplier access Supplier access must have just 9 and 0 tokens
+if (in_array(9,$_SESSION['AllowedPageSecurityTokens']) AND $PageSecurity==0 AND count($_SESSION['AllowedPageSecurityTokens'])==2){
$SupplierLogin=1;
-} else if (in_array(1,$_SESSION['AllowedPageSecurityTokens']) and $PageSecurity==0 and count($_SESSION['AllowedPageSecurityTokens'])==2){
- $SupplierLogin=0;
}
+if (in_array(1,$_SESSION['AllowedPageSecurityTokens']) AND $PageSecurity==0 AND count($_SESSION['AllowedPageSecurityTokens'])==2){
+ $CustomerLogin = 1;
+}
-if (in_array(15, $_SESSION['AllowedPageSecurityTokens'])) { /*System administrator login */
+if (in_array($_SESSION['PageSecurityArray']['WWW_Users.php'], $_SESSION['AllowedPageSecurityTokens'])) { /*System administrator login */
$debug = 1; //allow debug messages
} else {
$debug = 0; //don't allow debug messages
Modified: trunk/index.php
===================================================================
--- trunk/index.php 2012-12-12 01:55:53 UTC (rev 5756)
+++ trunk/index.php 2012-12-12 09:03:56 UTC (rev 5757)
@@ -29,7 +29,7 @@
</table>';
include('includes/footer.inc');
exit;
-} elseif (isset($SupplierLogin) AND $SupplierLogin==0){
+} elseif (isset($CustomerLogin) AND $CustomerLogin==1){
echo '<table class="table_index">
<tr>
<td class="menu_group_item">
|
|
From: <dai...@us...> - 2012-12-15 03:01:23
|
Revision: 5759
http://sourceforge.net/p/web-erp/reponame/5759
Author: daintree
Date: 2012-12-15 03:01:20 +0000 (Sat, 15 Dec 2012)
Log Message:
-----------
Bob Thomas modified default theme font
Modified Paths:
--------------
trunk/PDFStockCheckComparison.php
trunk/SelectSupplier.php
trunk/StockAdjustments.php
trunk/css/aguapop/default.css
trunk/css/default/default.css
trunk/css/fluid/default.css
trunk/css/fresh/default.css
trunk/css/gel/default.css
trunk/css/professional/default.css
trunk/css/silverwolf/default.css
trunk/css/wood/default.css
trunk/doc/Change.log
trunk/doc/Manual/ManualAccountsPayable.html
trunk/doc/Manual/ManualContributors.html
trunk/doc/Manual/ManualInventory.html
Modified: trunk/PDFStockCheckComparison.php
===================================================================
--- trunk/PDFStockCheckComparison.php 2012-12-12 09:17:12 UTC (rev 5758)
+++ trunk/PDFStockCheckComparison.php 2012-12-15 03:01:20 UTC (rev 5759)
@@ -146,7 +146,7 @@
'" . $SQLAdjustmentDate . "',
'" . $PeriodNo . "',
'" . $StockGLCodes['adjglact'] . "',
- '" . $myrow['standardcost'] * -($StockQtyDifference) . "',
+ '" . ($myrow['standardcost'] * -($StockQtyDifference)) . "',
'" . $myrow['stockid'] . " x " . $StockQtyDifference . " @ " . $myrow['standardcost'] . " - " . _('Inventory Check') . "')";
$Result = DB_query($SQL,$db, $ErrMsg, $DbgMsg, true);
@@ -182,13 +182,13 @@
$ErrMsg = _('The Inventory Comparison data could not be retrieved because');
$DbgMsg = _('The following SQL to retrieve the Inventory Comparison data was used');
$sql = "SELECT stockcheckfreeze.stockid,
- description,
- stockmaster.categoryid,
- stockcategory.categorydescription,
- stockcheckfreeze.loccode,
- locations.locationname,
- stockcheckfreeze.qoh,
- stockmaster.decimalplaces
+ description,
+ stockmaster.categoryid,
+ stockcategory.categorydescription,
+ stockcheckfreeze.loccode,
+ locations.locationname,
+ stockcheckfreeze.qoh,
+ stockmaster.decimalplaces
FROM stockcheckfreeze INNER JOIN stockmaster
ON stockcheckfreeze.stockid=stockmaster.stockid
INNER JOIN locations
Modified: trunk/SelectSupplier.php
===================================================================
--- trunk/SelectSupplier.php 2012-12-12 09:17:12 UTC (rev 5758)
+++ trunk/SelectSupplier.php 2012-12-15 03:01:20 UTC (rev 5759)
@@ -3,6 +3,11 @@
include ('includes/session.inc');
$title = _('Search Suppliers');
+
+/* webERP manual links before header.inc */
+$ViewTopic= 'AccountsPayable';
+$BookMark = 'SelectSupplier';
+
include ('includes/header.inc');
include ('includes/SQL_CommonFunctions.inc');
if (!isset($_SESSION['SupplierID'])) {
Modified: trunk/StockAdjustments.php
===================================================================
--- trunk/StockAdjustments.php 2012-12-12 09:17:12 UTC (rev 5758)
+++ trunk/StockAdjustments.php 2012-12-15 03:01:20 UTC (rev 5759)
@@ -6,9 +6,11 @@
include('includes/DefineSerialItems.php');
include('includes/session.inc');
$title = _('Stock Adjustments');
+
/* webERP manual links before header.inc */
-$ViewTopic= "Inventory";
-$BookMark = "InventoryAdjustments";
+$ViewTopic= 'Inventory';
+$BookMark = 'InventoryAdjustments';
+
include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
@@ -39,6 +41,7 @@
$StockID = trim(mb_strtoupper($_POST['StockID']));
}
}
+
if ($NewAdjustment==true){
$_SESSION['Adjustment' . $identifier]->StockID = trim(mb_strtoupper($StockID));
@@ -61,8 +64,8 @@
$_SESSION['Adjustment' . $identifier]->Quantity=0;
}
- $_SESSION['Adjustment' . $identifier]->PartUnit=$myrow['units'];
- $_SESSION['Adjustment' . $identifier]->StandardCost=$myrow['totalcost'];
+ $_SESSION['Adjustment' . $identifier]->PartUnit = $myrow['units'];
+ $_SESSION['Adjustment' . $identifier]->StandardCost = $myrow['totalcost'];
$DecimalPlaces = $myrow['decimalplaces'];
DB_free_result($result);
@@ -115,8 +118,8 @@
</tr>';
while ($myrow = DB_fetch_row($result)) {
echo '<tr>
- <td>'.$myrow[0].'</td>
- <td>'.$myrow[1].'</td>
+ <td>' . $myrow[0] . '</td>
+ <td>' . $myrow[1] . '</td>
<td><a href="StockAdjustments.php?StockID='.$myrow[0].'&Description='.$myrow[1].'">'._('Adjust').'</a>
</tr>';
}
@@ -276,7 +279,7 @@
- $SQL = "UPDATE locstock SET quantity = quantity + '" . $_SESSION['Adjustment' . $identifier]->Quantity . "'
+ $SQL = "UPDATE locstock SET quantity = quantity + " . cval$_SESSION['Adjustment' . $identifier]->Quantity . "
WHERE stockid='" . $_SESSION['Adjustment' . $identifier]->StockID . "'
AND loccode='" . $_SESSION['Adjustment' . $identifier]->StockLocation . "'";
@@ -305,8 +308,7 @@
'" . round($_SESSION['Adjustment' . $identifier]->StandardCost * -($_SESSION['Adjustment' . $identifier]->Quantity), $_SESSION['CompanyRecord']['decimalplaces']) . "',
'" . $_SESSION['Adjustment' . $identifier]->StockID . " x " . $_SESSION['Adjustment' . $identifier]->Quantity . " @ " .
$_SESSION['Adjustment' . $identifier]->StandardCost . " " . $_SESSION['Adjustment' . $identifier]->Narrative . "',
- '" . $_SESSION['Adjustment' . $identifier]->tag . "'
- )";
+ '" . $_SESSION['Adjustment' . $identifier]->tag . "')";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The general ledger transaction entries could not be added because');
$DbgMsg = _('The following SQL to insert the GL entries was used');
Modified: trunk/css/aguapop/default.css
===================================================================
--- trunk/css/aguapop/default.css 2012-12-12 09:17:12 UTC (rev 5758)
+++ trunk/css/aguapop/default.css 2012-12-15 03:01:20 UTC (rev 5759)
@@ -9,234 +9,233 @@
*/
body {
-font-family:Arial, Verdana, Helvetica, sans-serif;
-font-size:10px;
-background: silver;
-margin:0;
-padding:0;
+ font-family:Arial, Verdana, Helvetica, sans-serif;
+ font-size:12px;
+ background: silver;
+ margin:0;
+ padding:0;
}
/* default styles */
a{
-color:blue;
-text-decoration:none;
+ color:blue;
+ text-decoration:none;
}
a:hover{
-color:red;
-text-decoration:underline;
+ color:red;
+ text-decoration:underline;
}
-a:active{
-}
+a:active{}
img{ /* icon on page title, etc */
-border:none;
-vertical-align:middle;
+ border:none;
+ vertical-align:middle;
}
p{ /* some text need to be centered */
/*text-align:center;*/
}
p.page_title_text { /* page title */
-color:black;
-font-weight:bold;
-margin:0 auto;
-padding:5px;
-text-align:center;
+ color:black;
+ font-weight:bold;
+ margin:0 auto;
+ padding:5px;
+ text-align:center;
}
p.good {
-font-weight: bold;
-color: green;
+ font-weight: bold;
+ color: green;
}
p.bad {
-font-weight: bold;
-color:red;
+ font-weight: bold;
+ color:red;
}
table {
-width:auto;
-max-width:90%;
-margin:5px auto;
-padding-bottom:5px;
+ width:auto;
+ max-width:90%;
+ margin:5px auto;
+ padding-bottom:5px;
}
table.selection {
-width:auto;
-max-width:90%;
+ width:auto;
+ max-width:90%;
/*padding-bottom:5px;*/
}
th {
-background-color:skyblue;
-color:black;
-font-weight:normal;
-padding:3px;
+ background-color:skyblue;
+ color:black;
+ font-weight:normal;
+ padding:3px;
}
th.number {
-text-align: right;
-font-weight: normal;
-background-color: skyblue;
-color: white;
+ text-align: right;
+ font-weight: normal;
+ background-color: skyblue;
+ color: white;
}
td {
-font-family: Arial, Verdana, Helvetica, sans-serif;
-text-align: left;
+ font-family: Arial, Verdana, Helvetica, sans-serif;
+ text-align: left;
}
td.select {
-background-color: whitesmoke;
-padding:3px;
+ background-color: whitesmoke;
+ padding:3px;
}
td.number {
-text-align: right;
+ text-align: right;
}
div.centre {
-padding:5px;
-text-align:center;
+ padding:5px;
+ text-align:center;
}
input { /*specifies the input field text characteristics*/
-font-family: Arial, Verdana, Helvetica, sans-serif;
-font-size: 9px;
-font-style: italic;
+ font-family: Arial, Verdana, Helvetica, sans-serif;
+ font-size: 12px;
+ font-style: italic;
}
input.number{
-text-align: right;
+ text-align: right;
}
input.image {
-border-width: 0px;
-background-color: transparent;
+ border-width: 0px;
+ background-color: transparent;
}
input:hover{
-background:#9ffffb;
+ background:#9ffffb;
}
select {
-font-family: Arial, Verdana, Helvetica, sans-serif;
-font-size: 11px;
+ font-family: Arial, Verdana, Helvetica, sans-serif;
+ font-size: 12px;
}
select:hover { /* drop down */
-background:#9ffffb;
+ background:#9ffffb;
}
textarea{
-font-family: Arial, Verdana, Helvetica, sans-serif;
-font-size: 10px;
+ font-family: Arial, Verdana, Helvetica, sans-serif;
+ font-size:12px;
}
textarea:hover{
-background:#9ffffb;
+ background:#9ffffb;
}
.EvenTableRows {
-background-color: gainsboro;
+ background-color: gainsboro;
}
.OddTableRows {
-background-color: whitesmoke;
+ background-color: whitesmoke;
}
div{ /* some input/buttons need to be centered */
}
div.error {
-background-color: mistyrose;
-width: 98%;
-margin: 5px auto;
-color: red;
-border: 1px solid red;
+ background-color: mistyrose;
+ width: 98%;
+ margin: 5px auto;
+ color: red;
+ border: 1px solid red;
}
div.warn {
-background-color: pink;
-width: 98%;
-margin: 5px auto;
-color: maroon;
-border: 1px solid maroon;
+ background-color: pink;
+ width: 98%;
+ margin: 5px auto;
+ color: maroon;
+ border: 1px solid maroon;
}
div.success {
-background-color: aquamarine;
-width: 98%;
-margin: 5px auto;
-color: green;
-border: 1px solid green;
+ background-color: aquamarine;
+ width: 98%;
+ margin: 5px auto;
+ color: green;
+ border: 1px solid green;
}
div.info {
-background-color: lightskyblue;
-width: 98%;
-margin: 5px auto;
-color:navy;
-border: 1px solid navy;
+ background-color: lightskyblue;
+ width: 98%;
+ margin: 5px auto;
+ color:navy;
+ border: 1px solid navy;
}
DIV.page_help_text {
-background: lightgrey url(images/help.png) top left no-repeat;
-border: maroon 1px solid;
-padding-top:2px;
-padding-bottom: 2px;
-z-index: 1;
-width: 80%;
-float: none;
-visibility: visible;
-margin: 0 auto;
-position: static;
-font-family: Arial, Verdana, Helvetica, sans-serif;
-font-weight: normal;
-font-size: 10px;
-color: black;
-text-align:center;
-padding-left: 24px;
-min-height:26px;
+ background: lightgrey url(images/help.png) top left no-repeat;
+ border: maroon 1px solid;
+ padding-top:2px;
+ padding-bottom: 2px;
+ z-index: 1;
+ width: 80%;
+ float: none;
+ visibility: visible;
+ margin: 0 auto;
+ position: static;
+ font-family: Arial, Verdana, Helvetica, sans-serif;
+ font-weight: normal;
+ font-size: 12px;
+ color: black;
+ text-align:center;
+ padding-left: 24px;
+ min-height:26px;
}
/* date picker */
.dpTbl {
- border: solid navy 1px;
- background:white;
+ border: solid navy 1px;
+ background:white;
}
.dpTD {
-border: 0;
-width: 20px;
-background-color: whitesmoke;
-text-align: right;
-cursor: pointer;
+ border: 0;
+ width: 20px;
+ background-color: whitesmoke;
+ text-align: right;
+ cursor: pointer;
}
.dpDayHighlight {
-border: 0;
-width: 20px;
-background-color: yellow;
-text-align: right;
-cursor: pointer;
+ border: 0;
+ width: 20px;
+ background-color: yellow;
+ text-align: right;
+ cursor: pointer;
}
.dpTDHover {
-border: 0;
-width: 20px;
-background-color: gainsboro;
-text-align: right;
-cursor: pointer;
+ border: 0;
+ width: 20px;
+ background-color: gainsboro;
+ text-align: right;
+ cursor: pointer;
}
/* Table type is used for UI tables type 1 */
.table1 {
-width:90%;
-background: whitesmoke;
-border: 1px solid darkslategray;
-margin: 0 auto;
+ width:90%;
+ background: whitesmoke;
+ border: 1px solid darkslategray;
+ margin: 0 auto;
}
.tableheader {
-font-weight: normal;
-background-color: skyblue;
-color: white;
+ font-weight: normal;
+ background-color: skyblue;
+ color: white;
}
.notavailable {
-font-weight: lighter;
-font-style: italic;
-color: gray;
+ font-weight: lighter;
+ font-style: italic;
+ color: gray;
}
.label {
-font-weight: bold;
-font-style: normal;
-font-size: 11px;
-color: black;
-background-color: gainsboro;
+ font-weight: bold;
+ font-style: normal;
+ font-size: 12px;
+ color: black;
+ background-color: gainsboro;
}
.table_index {
-background-color: aliceblue;
+ background-color: aliceblue;
}
li {
/*list-style-image: url(bullet.gif);*/
@@ -245,30 +244,30 @@
/* CANVAS */
#CanvasDiv {
-background:steelblue;
-border-radius:20px;
-box-shadow:3px 3px 4px #86C3D7 inset, -3px -3px 4px #383878 inset, 0 0 10px black;
-margin:10px;
+ background:steelblue;
+ border-radius:20px;
+ box-shadow:3px 3px 4px #86C3D7 inset, -3px -3px 4px #383878 inset, 0 0 10px black;
+ margin:10px;
}
/* HEADER */
#HeaderDiv {
-overflow:hidden;
-color:white;
-padding:5px 10px 0;
+ overflow:hidden;
+ color:white;
+ padding:5px 10px 0;
}
#HeaderDiv a{
-border-radius:10px;
-color:white;
-text-decoration:none;
-padding:3px;
+ border-radius:10px;
+ color:white;
+ text-decoration:none;
+ padding:3px;
}
#HeaderDiv a:hover{
-color:cyan;
-border-radius:10px;
-box-shadow:2px 2px 3px #86C3D7, -2px -2px 3px #383878;
-padding:3px;
+ color:cyan;
+ border-radius:10px;
+ box-shadow:2px 2px 3px #86C3D7, -2px -2px 3px #383878;
+ padding:3px;
}
#HeaderWrapDiv{
}
@@ -276,188 +275,187 @@
/* HEADER - APP INFO */
#AppInfoDiv{
-float:left; /* REQUIRED: to the left */
+ float:left; /* REQUIRED: to the left */
}
#AppInfoCompanyDiv{
-display:table-cell; /* REQUIRED: as a cell */
+ display:table-cell; /* REQUIRED: as a cell */
}
#AppInfoUserDiv{
-display:table-cell; /* REQUIRED: as a cell */
-padding-left:5px;
+ display:table-cell; /* REQUIRED: as a cell */
+ padding-left:5px;
}
#AppInfoModuleDiv{
-font-weight:bold;
-font-size:12px;
-padding:3px;
+ font-weight:bold;
+ font-size:12px;
+ padding:3px;
}
/* HEADER - QUICK MENU */
#QuickMenuDiv{
-float:right;
-margin-top:7px;
+ float:right;
+ margin-top:7px;
}
#QuickMenuDiv ul{
-list-style:none;
-float:right;
+ list-style:none;
+ float:right;
}
#QuickMenuDiv ul li{
-float: left;
-display:inline;
-margin: 0px 3px;
+ float: left;
+ display:inline;
+ margin: 0px 3px;
}
/* BODY */
#BodyDiv {
-clear:both;
-overflow:hidden;
-text-align:center; /* needed to center some buttons on SelectSupplier.php */
+ clear:both;
+ overflow:hidden;
+ text-align:center; /* needed to center some buttons on SelectSupplier.php */
}
#BodyWrapDiv{
-background:lightsteelblue;
-box-shadow:2px 2px 3px inset;
-margin:0 5px;
+ background:lightsteelblue;
+ box-shadow:2px 2px 3px inset;
+ margin:0 5px;
}
/* BODY - MAIN MENU */
#MainMenuDiv{
-float:left;
-background:steelblue;
-white-space:nowrap;
-text-align:center;
-padding-left:3px;
-padding-top:3px;
-width:11%;
+ float:left;
+ background:steelblue;
+ white-space:nowrap;
+ text-align:center;
+ padding-left:3px;
+ padding-top:3px;
+ width:11%;
}
#MainMenuDiv ul{
-margin:0;
-padding:0;
+ margin:0;
+ padding:0;
}
#MainMenuDiv li{
-list-style:none;
+ list-style:none;
}
#MainMenuDiv li a,
#MainMenuDiv li a:hover,
#MainMenuDiv .main_menu_selected a{
-display:block; /* REQUIRED */
-border-radius:10px;
-color:white;
-text-decoration:none;
-padding:3px;
-margin-bottom:5px;
+ display:block; /* REQUIRED */
+ border-radius:10px;
+ color:white;
+ text-decoration:none;
+ padding:3px;
+ margin-bottom:5px;
}
#MainMenuDiv li a:hover{
-color:cyan;
-box-shadow:2px 2px 3px #86C3D7, -2px -2px 3px #383878;
+ color:cyan;
+ box-shadow:2px 2px 3px #86C3D7, -2px -2px 3px #383878;
}
#MainMenuDiv .main_menu_selected a{ /* the selected button */
-box-shadow:2px 2px 3px #86C3D7, -2px -2px 3px #383878;
+ box-shadow:2px 2px 3px #86C3D7, -2px -2px 3px #383878;
}
/* BODY - SUB MENU */
#SubMenuDiv{
-display:table; /* display as table, sub menu will auto adjust width */
-float:right;
-overflow: hidden;
-margin-left:auto;
-margin-right:auto;
-width:88%; /* main menu is 10% */
-text-align:left;
+ display:table; /* display as table, sub menu will auto adjust width */
+ float:right;
+ overflow: hidden;
+ margin-left:auto;
+ margin-right:auto;
+ width:88%; /* main menu is 10% */
+ text-align:left;
}
#SubMenuDiv ul{
-margin:0;
-padding:0;
+ margin:0;
+ padding:0;
}
#SubMenuDiv li{
-list-style:none; /* REQUIRED: hide bullets */
+ list-style:none; /* REQUIRED: hide bullets */
}
#SubMenuDiv p{
}
#SubMenuDiv a{
-color:black;
-text-decoration:none;
+ color:black;
+ text-decoration:none;
}
#SubMenuDiv a:hover{
-color:black;
-text-decoration:underline;
+ color:black;
+ text-decoration:underline;
}
.menu_group_headers {
-background:steelblue;
-border:2px outset white;
-color:white;
-font-weight:bold;
-text-align:center;
-padding:3px;
+ background:steelblue;
+ border:2px outset white;
+ color:white;
+ font-weight:bold;
+ text-align:center;
+ padding:3px;
}
.menu_group_item {
-padding:2px;
-text-align:left;
+ padding:2px;
+ text-align:left;
}
.menu_group_item:hover{
-background:lightblue;
-text-align:left;
+ background:lightblue;
+ text-align:left;
}
.menu_group_item p { /* bullet */
-color: red; /* This is the color for bullets, I like it to be the same as the anchor color, but it's up to you */
-text-indent: -10px; /* this makes the bullet to appear as the li tag previously used */
-margin: 0 0 0 12px;
-text-align:left;
+ color: red; /* This is the color for bullets, I like it to be the same as the anchor color, but it's up to you */
+ text-indent: -10px; /* this makes the bullet to appear as the li tag previously used */
+ margin: 0 0 0 12px;
+ text-align:left;
}
.menu_group_item a{
-color:black;
-text-decoration:none;
+ color:black;
+ text-decoration:none;
}
.menu_group_item a:hover{
-color:red;
-text-decoration:none;
+ color:red;
+ text-decoration:none;
}
#TransactionsDiv,#InquiriesDiv,#MaintenanceDiv{
-background:whitesmoke;
-border:2px solid steelblue;
-display:table-cell;
+ background:whitesmoke;
+ border:2px solid steelblue;
+ display:table-cell;
}
#InquiriesDiv div{ /* to center custom report/form header */
-background:lightsteelblue;
-font-weight:bold;
-color:black;
-padding:2px;
+ background:lightsteelblue;
+ font-weight:bold;
+ color:black;
+ padding:2px;
}
/*** FOOTER ***/
#FooterDiv{
-clear:both;
-color:white;
-height:53px;
-padding:0;
+ clear:both;
+ color:white;
+ height:53px;
+ padding:0;
}
#FooterWrapDiv{
-padding:5px;
+ padding:5px;
}
#FooterLogoDiv{
-background:white;
-border:2px outset steelblue;
-border-radius:8px 8px 8px 8px;
-float:left;
-padding:3px;
+ background:white;
+ border:2px outset steelblue;
+ border-radius:8px 8px 8px 8px;
+ float:left;
+ padding:3px;
}
#FooterVersionDiv{
-float:left;
-margin-left:10px;
-margin-top:15px;
-
+ float:left;
+ margin-left:10px;
+ margin-top:15px;
}
#FooterTimeDiv{
-float:right;
-margin-top:15px;
+ float:right;
+ margin-top:15px;
}
/**** END ***/
\ No newline at end of file
Modified: trunk/css/default/default.css
===================================================================
--- trunk/css/default/default.css 2012-12-12 09:17:12 UTC (rev 5758)
+++ trunk/css/default/default.css 2012-12-15 03:01:20 UTC (rev 5759)
@@ -7,7 +7,7 @@
body{
background-color:#ccd;
font-family:Arial, Verdana, Helvetica, sans-serif;
-font-size:10px;
+font-size:10pt;
margin:0;
padding:0
}
@@ -61,8 +61,6 @@
color:white;
}
td{
-font-family:Arial, Verdana, Helvetica, sans-serif;
-font-size:10px;
text-align:left;
}
td.select{
@@ -78,7 +76,6 @@
}
input{
font-family:Arial, Verdana, Helvetica, sans-serif;
-font-size:10px;
}
input.number{
text-align:right;
@@ -91,11 +88,9 @@
}
select{
font-family:Arial, Verdana, Helvetica, sans-serif;
-font-size:10px;
}
textarea{
font-family:Arial, Verdana, Helvetica, sans-serif;
-font-size:10px;
}
textarea:hover{
}
@@ -139,7 +134,6 @@
POSITION:static;
font-family:Arial, Verdana, Helvetica, sans-serif;
font-weight:normal;
-font-size:10px;
color:black;
TEXT-ALIGN:center;
}
@@ -157,7 +151,6 @@
padding-top:1px;
padding-bottom:1px;
font-weight:normal;
-font-size:10px;
color:blac |
|
From: <dai...@us...> - 2012-12-15 04:47:33
|
Revision: 5760
http://sourceforge.net/p/web-erp/reponame/5760
Author: daintree
Date: 2012-12-15 04:47:29 +0000 (Sat, 15 Dec 2012)
Log Message:
-----------
Customer login order entry removed inappropriate fields
Modified Paths:
--------------
trunk/DeliveryDetails.php
trunk/SelectCompletedOrder.php
trunk/SelectOrderItems.php
trunk/doc/Change.log
trunk/includes/UserLogin.php
trunk/includes/session.inc
Modified: trunk/DeliveryDetails.php
===================================================================
--- trunk/DeliveryDetails.php 2012-12-15 03:01:20 UTC (rev 5759)
+++ trunk/DeliveryDetails.php 2012-12-15 04:47:29 UTC (rev 5760)
@@ -221,7 +221,7 @@
and show a link to set them up
- if shippers defined but the default shipper is bogus then use the first shipper defined
*/
- if ((isset($BestShipper) and $BestShipper=='') AND ($_POST['ShipVia']=='' || !isset($_POST['ShipVia']))){
+ if ((isset($BestShipper) AND $BestShipper=='') AND ($_POST['ShipVia']=='' OR !isset($_POST['ShipVia']))){
$sql = "SELECT shipper_id
FROM shippers
WHERE shipper_id='" . $_SESSION['Default_Shipper']."'";
@@ -1067,97 +1067,104 @@
<td><textarea name="Comments" cols="31" rows="5">' . $_SESSION['Items'.$identifier]->Comments .'</textarea></td>
</tr>';
- echo '<tr>
- <td>' . _('Sales person'). ':</td>
- <td><select name="SalesPerson">';
- $SalesPeopleResult = DB_query("SELECT salesmancode, salesmanname FROM salesman WHERE current=1",$db);
- if (!isset($_POST['SalesPerson']) AND $_SESSION['SalesmanLogin']!=NULL ){
- $_SESSION['Items'.$identifier]->SalesPerson = $_SESSION['SalesmanLogin'];
- }
+ if ($CustomerLogin == 1){
+ echo '<input type="hidden" name="SalesPerson" value="' . $_SESSION['Items'.$identifier]->SalesPerson . '" />
+ <input type="hidden" name="DeliverBlind" value="1" />
+ <input type="hidden" name="FreightCost" value="0" />
+ <input type="hidden" name="ShipVia" value="' . $_SESSION['Items'.$identifier]->ShipVia . '" />
+ <input type="hidden" name="Quotation" value="0" />';
+ } else {
+ echo '<tr>
+ <td>' . _('Sales person'). ':</td>
+ <td><select name="SalesPerson">';
+ $SalesPeopleResult = DB_query("SELECT salesmancode, salesmanname FROM salesman WHERE current=1",$db);
+ if (!isset($_POST['SalesPerson']) AND $_SESSION['SalesmanLogin']!=NULL ){
+ $_SESSION['Items'.$identifier]->SalesPerson = $_SESSION['SalesmanLogin'];
+ }
+
+ while ($SalesPersonRow = DB_fetch_array($SalesPeopleResult)){
+ if ($SalesPersonRow['salesmancode']==$_SESSION['Items'.$identifier]->SalesPerson){
+ echo '<option selected="selected" value="' . $SalesPersonRow['salesmancode'] . '">' . $SalesPersonRow['salesmanname'] . '</option>';
+ } else {
+ echo '<option value="' . $SalesPersonRow['salesmancode'] . '">' . $SalesPersonRow['salesmanname'] . '</option>';
+ }
+ }
+
+ echo '</select></td>
+ </tr>';
+
+ /* This field will control whether or not to display the company logo and
+ address on the packlist */
- while ($SalesPersonRow = DB_fetch_array($SalesPeopleResult)){
- if ($SalesPersonRow['salesmancode']==$_SESSION['Items'.$identifier]->SalesPerson){
- echo '<option selected="selected" value="' . $SalesPersonRow['salesmancode'] . '">' . $SalesPersonRow['salesmanname'] . '</option>';
+ echo '<tr><td>' . _('Packlist Type') . ':</td>
+ <td><select name="DeliverBlind">';
+
+ if ($_SESSION['Items'.$identifier]->DeliverBlind ==2){
+ echo '<option value="1">' . _('Show Company Details/Logo') . '</option>';
+ echo '<option selected="selected" value="2">' . _('Hide Company Details/Logo') . '</option>';
} else {
- echo '<option value="' . $SalesPersonRow['salesmancode'] . '">' . $SalesPersonRow['salesmanname'] . '</option>';
+ echo '<option selected="selected" value="1">' . _('Show Company Details/Logo') . '</option>';
+ echo '<option value="2">' . _('Hide Company Details/Logo') . '</option>';
}
- }
+ echo '</select></td></tr>';
- echo '</select></td>
- </tr>';
-
- /* This field will control whether or not to display the company logo and
- address on the packlist */
+ if (isset($_SESSION['PrintedPackingSlip']) AND $_SESSION['PrintedPackingSlip']==1){
+
+ echo '<tr>
+ <td>'. _('Reprint packing slip') .':</td>
+ <td><select name="ReprintPackingSlip">';
+ echo '<option value="0">' . _('Yes') . '</option>';
+ echo '<option selected="selected" value="1">' . _('No') . '</option>';
+ echo '</select> '. _('Last printed') .': ' . ConvertSQLDate($_SESSION['DatePackingSlipPrinted']) . '</td></tr>';
+ } else {
+ echo '<tr><td><input type="hidden" name="ReprintPackingSlip" value="0" /></td></tr>';
+ }
+
+ echo '<tr>
+ <td>'. _('Charge Freight Cost inc tax') .':</td>
+ <td><input type="text" class="number" size="10" maxlength="12" name="FreightCost" value="' . $_SESSION['Items'.$identifier]->FreightCost . '" /></td>';
+
+ if ($_SESSION['DoFreightCalc']==true){
+ echo '<td><input type="submit" name="Update" value="' . _('Recalc Freight Cost') . '" /></td>';
+ }
+ echo '</tr>';
+
+ if ((!isset($_POST['ShipVia']) OR $_POST['ShipVia']=='') AND isset($_SESSION['Items'.$identifier]->ShipVia)){
+ $_POST['ShipVia'] = $_SESSION['Items'.$identifier]->ShipVia;
+ }
+
+ echo '<tr>
+ <td>'. _('Freight/Shipper Method') .':</td>
+ <td><select name="ShipVia">';
+
+ $ErrMsg = _('The shipper details could not be retrieved');
+ $DbgMsg = _('SQL used to retrieve the shipper details was') . ':';
+
+ $sql = "SELECT shipper_id, shippername FROM shippers";
+ $ShipperResults = DB_query($sql,$db,$ErrMsg,$DbgMsg);
+ while ($myrow=DB_fetch_array($ShipperResults)){
+ if ($myrow['shipper_id']==$_POST['ShipVia']){
+ echo '<option selected="selected" value="' . $myrow['shipper_id'] . '">' . $myrow['shippername'] . '</option>';
+ }else {
+ echo '<option value="' . $myrow['shipper_id'] . '">' . $myrow['shippername'] . '</option>';
+ }
+ }
+
+ echo '</select></td></tr>';
+
+
+ echo '<tr><td>'. _('Quotation Only') .':</td>
+ <td><select name="Quotation">';
+ if ($_SESSION['Items'.$identifier]->Quotation==1){
+ echo '<option selected="selected" value="1">' . _('Yes') . '</option>';
+ echo '<option value="0">' . _('No') . '</option>';
+ } else {
+ echo '<option value="1">' . _('Yes') . '</option>';
+ echo '<option selected="selected" value="0">' . _('No') . '</option>';
+ }
+ echo '</select></td></tr>';
+ } //end if it is NOT a CustomerLogin
- echo '<tr><td>' . _('Packlist Type') . ':</td>
- <td><select name="DeliverBlind">';
-
- if ($_SESSION['Items'.$identifier]->DeliverBlind ==2){
- echo '<option value="1">' . _('Show Company Details/Logo') . '</option>';
- echo '<option selected="selected" value="2">' . _('Hide Company Details/Logo') . '</option>';
- } else {
- echo '<option selected="selected" value="1">' . _('Show Company Details/Logo') . '</option>';
- echo '<option value="2">' . _('Hide Company Details/Logo') . '</option>';
- }
- echo '</select></td></tr>';
-
-if (isset($_SESSION['PrintedPackingSlip']) AND $_SESSION['PrintedPackingSlip']==1){
-
- echo '<tr>
- <td>'. _('Reprint packing slip') .':</td>
- <td><select name="ReprintPackingSlip">';
- echo '<option value="0">' . _('Yes') . '</option>';
- echo '<option selected="selected" value="1">' . _('No') . '</option>';
- echo '</select> '. _('Last printed') .': ' . ConvertSQLDate($_SESSION['DatePackingSlipPrinted']) . '</td></tr>';
-} else {
- echo '<tr><td><input type="hidden" name="ReprintPackingSlip" value="0" /></td></tr>';
-}
-
-echo '<tr>
- <td>'. _('Charge Freight Cost inc tax') .':</td>
- <td><input type="text" class="number" size="10" maxlength="12" name="FreightCost" value="' . $_SESSION['Items'.$identifier]->FreightCost . '" /></td>';
-
-if ($_SESSION['DoFreightCalc']==true){
- echo '<td><input type="submit" name="Update" value="' . _('Recalc Freight Cost') . '" /></td>';
-}
-echo '</tr>';
-
-if ((!isset($_POST['ShipVia']) OR $_POST['ShipVia']=='') AND isset($_SESSION['Items'.$identifier]->ShipVia)){
- $_POST['ShipVia'] = $_SESSION['Items'.$identifier]->ShipVia;
-}
-
-echo '<tr>
- <td>'. _('Freight/Shipper Method') .':</td>
- <td><select name="ShipVia">';
-
-$ErrMsg = _('The shipper details could not be retrieved');
-$DbgMsg = _('SQL used to retrieve the shipper details was') . ':';
-
-$sql = "SELECT shipper_id, shippername FROM shippers";
-$ShipperResults = DB_query($sql,$db,$ErrMsg,$DbgMsg);
-while ($myrow=DB_fetch_array($ShipperResults)){
- if ($myrow['shipper_id']==$_POST['ShipVia']){
- echo '<option selected="selected" value="' . $myrow['shipper_id'] . '">' . $myrow['shippername'] . '</option>';
- }else {
- echo '<option value="' . $myrow['shipper_id'] . '">' . $myrow['shippername'] . '</option>';
- }
-}
-
-echo '</select></td></tr>';
-
-
-echo '<tr><td>'. _('Quotation Only') .':</td>
- <td><select name="Quotation">';
-if ($_SESSION['Items'.$identifier]->Quotation==1){
- echo '<option selected="selected" value="1">' . _('Yes') . '</option>';
- echo '<option value="0">' . _('No') . '</option>';
-} else {
- echo '<option value="1">' . _('Yes') . '</option>';
- echo '<option selected="selected" value="0">' . _('No') . '</option>';
-}
-echo '</select></td></tr>';
-
-
echo '</table>';
echo '<br /><div class="centre"><input type="submit" name="BackToLineDetails" value="' . _('Modify Order Lines') . '" /><br />';
Modified: trunk/SelectCompletedOrder.php
===================================================================
--- trunk/SelectCompletedOrder.php 2012-12-15 03:01:20 UTC (rev 5759)
+++ trunk/SelectCompletedOrder.php 2012-12-15 04:47:29 UTC (rev 5760)
@@ -44,6 +44,10 @@
$SelectedCustomer = $_POST['SelectedCustomer'];
}
+if ($CustomerLogin==1){
+ $SelectedCustomer = $_SESSION['CustomerID'];
+}
+
if (isset($SelectedStockItem) AND $SelectedStockItem==''){
unset($SelectedStockItem);
}
Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php 2012-12-15 03:01:20 UTC (rev 5759)
+++ trunk/SelectOrderItems.php 2012-12-15 04:47:29 UTC (rev 5760)
@@ -57,10 +57,14 @@
if ($CustomerLogin==1){ //its a customer logon
$_SESSION['Items'.$identifier]->DebtorNo=$_SESSION['CustomerID'];
- $_SESSION['RequireCustomerSelection']=0;
+ $_SESSION['Items'.$identifier]->BranchCode=$_SESSION['UserBranch'];
+ $SelectedCustomer = $_SESSION['CustomerID'];
+ $SelectedBranch = $_SESSION['UserBranch'];
+ $_SESSION['RequireCustomerSelection'] = 0;
} else {
$_SESSION['Items'.$identifier]->DebtorNo='';
- $_SESSION['RequireCustomerSelection']=1;
+ $_SESSION['Items'.$identifi |
|
From: <tim...@us...> - 2012-12-17 11:53:35
|
Revision: 5762
http://sourceforge.net/p/web-erp/reponame/5762
Author: tim_schofield
Date: 2012-12-17 11:53:34 +0000 (Mon, 17 Dec 2012)
Log Message:
-----------
New inquiry script to show all the items purchased by the selected customer
Modified Paths:
--------------
trunk/SelectCustomer.php
trunk/sql/mysql/upgrade4.09-4.10.sql
Added Paths:
-----------
trunk/CustomerPurchases.php
Added: trunk/CustomerPurchases.php
===================================================================
--- trunk/CustomerPurchases.php (rev 0)
+++ trunk/CustomerPurchases.php 2012-12-17 11:53:34 UTC (rev 5762)
@@ -0,0 +1,103 @@
+<?php
+
+include('includes/session.inc');
+$title = _('Customer Purchases');
+include('includes/header.inc');
+
+if (isset($_GET['DebtorNo'])) {
+ $DebtorNo = $_GET['DebtorNo'];
+} //isset($_GET['DebtorNo'])
+else if (isset($_POST['DebtorNo'])) {
+ $DebtorNo = $_POST['DebtorNo'];
+} //isset($_POST['DebtorNo'])
+else {
+ prnMsg(_('This script must be called with a customer number.'), 'notice');
+ include('includes/footer.inc');
+ exit;
+}
+
+$SQL = "SELECT debtorsmaster.name,
+ custbranch.brname
+ FROM debtorsmaster
+ INNER JOIN custbranch
+ ON debtorsmaster.debtorno=custbranch.debtorno
+ WHERE debtorsmaster.debtorno = '" . $DebtorNo . "'";
+
+$ErrMsg = _('The customer details could not be retrieved by the SQL because');
+$CustomerResult = DB_query($SQL, $db, $ErrMsg);
+$CustomerRecord = DB_fetch_array($CustomerResult);
+
+echo '<p class="page_title_text">
+ <img src="' . $rootpath . '/css/' . $theme . '/images/customer.png" title="' . _('Customer') . '" alt="" /> ' . _('Items Purchased by Customer') . ' : ' . $CustomerRecord['name'] . '
+ </p>';
+
+$SQL = "SELECT stockmoves.stockid,
+ stockmaster.description,
+ systypes.typename,
+ transno,
+ locations.locationname,
+ trandate,
+ branchcode,
+ price,
+ reference,
+ qty,
+ narrative
+ FROM stockmoves
+ INNER JOIN stockmaster
+ ON stockmaster.stockid=stockmoves.stockid
+ INNER JOIN systypes
+ ON stockmoves.type=systypes.typeid
+ INNER JOIN locations
+ ON stockmoves.loccode=locations.loccode
+ WHERE debtorno='" . $DebtorNo . "'
+ ORDER BY trandate DESC";
+$ErrMsg = _('The stock movement details could not be retrieved by the SQL because');
+$StockMovesResult = DB_query($SQL, $db, $ErrMsg);
+
+if (DB_num_rows($StockMovesResult) == 0) {
+ echo '<br />';
+ prnMsg(_('There are no items for this customer'), 'notice');
+ echo '<br />';
+} //DB_num_rows($StockMovesResult) == 0
+else {
+ echo '<table class="selection">
+ <tr>
+ <th>' . _('Transaction Date') . '</th>
+ <th>' . _('Stock ID') . '</th>
+ <th>' . _('Description') . '</th>
+ <th>' . _('Type') . '</th>
+ <th>' . _('Transaction No.') . '</th>
+ <th>' . _('From Location') . '</th>
+ <th>' . _('Branch Code') . '</th>
+ <th>' . _('Price') . '</th>
+ <th>' . _('Quantity') . '</th>
+ <th>' . _('Amount of Sale') . '</th>
+ <th>' . _('Reference') . '</th>
+ <th>' . _('Narrative') . '</th>
+ </tr>';
+
+ while ($StockMovesRow = DB_fetch_array($StockMovesResult)) {
+ echo '<tr>
+ <td>' . ConvertSQLDate($StockMovesRow['trandate']) . '</td>
+ <td>' . $StockMovesRow['stockid'] . '</td>
+ <td>' . $StockMovesRow['description'] . '</td>
+ <td>' . $StockMovesRow['typename'] . '</td>
+ <td>' . $StockMovesRow['transno'] . '</td>
+ <td>' . $StockMovesRow['locationname'] . '</td>
+ <td>' . $StockMovesRow['branchcode'] . '</td>
+ <td class="number">' . locale_number_format($StockMovesRow['price'], $_SESSION['CompanyRecord']['decimalplaces']) . '</td>
+ <td class="number">' . locale_number_format(-$StockMovesRow['qty'], $_SESSION['CompanyRecord']['decimalplaces']) . '</td>
+ <td class="number">' . locale_number_format((-$StockMovesRow['qty'] * $StockMovesRow['price']), $_SESSION['CompanyRecord']['decimalplaces']) . '</td>
+ <td>' . $StockMovesRow['reference'] . '</td>
+ <td>' . $StockMovesRow['narrative'] . '</td>
+ </tr>';
+
+ } //$StockMovesRow = DB_fetch_array($StockMovesResult)
+
+ echo '</table>';
+}
+
+echo '<br /><div class="centre"><a href="SelectCustomer.php">' . _('Return to customer screen') . '</a></div><br />';
+
+include('includes/footer.inc');
+?>
\ No newline at end of file
Modified: trunk/SelectCustomer.php
===================================================================
--- trunk/SelectCustomer.php 2012-12-15 04:56:05 UTC (rev 5761)
+++ trunk/SelectCustomer.php 2012-12-17 11:53:34 UTC (rev 5762)
@@ -2,31 +2,31 @@
/* $Id$*/
-include ('includes/session.inc');
+include('includes/session.inc');
$title = _('Search Customers');
-include ('includes/header.inc');
-include ('includes/SQL_CommonFunctions.inc');
+include('includes/header.inc');
+include('includes/SQL_CommonFunctions.inc');
if (isset($_GET['Select'])) {
$_SESSION['CustomerID'] = $_GET['Select'];
-}
+} //isset($_GET['Select'])
if (!isset($_SESSION['CustomerID'])) { //initialise if not already done
$_SESSION['CustomerID'] = '';
-}
+} //!isset($_SESSION['CustomerID'])
if (isset($_GET['Area'])) {
- $_POST['Area']=$_GET['Area'];
- $_POST['Search']='Search';
- $_POST['Keywords']='';
- $_POST['CustCode']='';
- $_POST['CustPhone']='';
- $_POST['CustAdd']='';
- $_POST['CustType']='';
-}
+ $_POST['Area'] = $_GET['Area'];
+ $_POST['Search'] = 'Search';
+ $_POST['Keywords'] = '';
+ $_POST['CustCode'] = '';
+ $_POST['CustPhone'] = '';
+ $_POST['CustAdd'] = '';
+ $_POST['CustType'] = '';
+} //isset($_GET['Area'])
echo '<p class="page_title_text"><img src="' . $rootpath . '/css/' . $theme . '/images/customer.png" title="' . _('Customer') . '" alt="" />' . ' ' . _('Customers') . '</p>';
if (!isset($_SESSION['CustomerType'])) { //initialise if not already done
$_SESSION['CustomerType'] = '';
-}
+} //!isset($_SESSION['CustomerType'])
// only run geocode if integration is turned on and customer has been selected
-if ($_SESSION['geocode_integration'] == 1 AND $_SESSION['CustomerID'] != "") {
+if ($_SESSION['geocode_integration'] == 1 and $_SESSION['CustomerID'] != "") {
$sql = "SELECT * FROM geocode_param WHERE 1";
$ErrMsg = _('An error occurred in retrieving the information');
$result = DB_query($sql, $db, $ErrMsg);
@@ -71,38 +71,28 @@
}
</script>';
echo '<body onload="load()" onunload="GUnload()">';
-}
+} //$_SESSION['geocode_integration'] == 1 and $_SESSION['CustomerID'] != ""
unset($result);
$msg = '';
if (isset($_POST['Go1']) or isset($_POST['Go2'])) {
$_POST['PageOffset'] = (isset($_POST['Go1']) ? $_POST['PageOffset1'] : $_POST['PageOffset2']);
$_POST['Go'] = '';
-}
+} //isset($_POST['Go1']) or isset($_POST['Go2'])
if (!isset($_POST['PageOffset'])) {
$_POST['PageOffset'] = 1;
-} else {
+} //!isset($_POST['PageOffset'])
+else {
if ($_POST['PageOffset'] == 0) {
$_POST['PageOffset'] = 1;
- }
+ } //$_POST['PageOffset'] == 0
}
-if (isset($_POST['Search'])
- OR isset($_POST['CSV'])
- OR isset($_POST['Go'])
- OR isset($_POST['Next'])
- OR isset($_POST['Previous'])) {
-
+if (isset($_POST['Search']) or isset($_POST['CSV']) or isset($_POST['Go']) or isset($_POST['Next']) or isset($_POST['Previous'])) {
unset($_POST['JustSelectedACustomer']);
if (isset($_POST['Search'])) {
$_POST['PageOffset'] = 1;
- }
+ } //isset($_POST['Search'])
- if (($_POST['Keywords'] == '')
- AND ($_POST['CustCode'] == '')
- AND ($_POST['CustPhone'] == '')
- AND ($_POST['CustType'] == 'ALL')
- AND ($_POST['Area'] == 'ALL')
- AND ($_POST['CustAdd'] == '')) {
-
+ if (($_POST['Keywords'] == '') and ($_POST['CustCode'] == '') and ($_POST['CustPhone'] == '') and ($_POST['CustType'] == 'ALL') and ($_POST['Area'] == 'ALL') and ($_POST['CustAdd'] == '')) {
//no criteria set then default to all customers
$SQL = "SELECT debtorsmaster.debtorno,
debtorsmaster.name,
@@ -121,7 +111,8 @@
ON debtorsmaster.debtorno = custbranch.debtorno
INNER JOIN debtortype
ON debtorsmaster.typeid = debtortype.typeid";
- } else {
+ } //($_POST['Keywords'] == '') and ($_POST['CustCode'] == '') and ($_POST['CustPhone'] == '') and ($_POST['CustType'] == 'ALL') and ($_POST['Area'] == 'ALL') and ($_POST['CustAdd'] == '')
+ else {
$SearchKeywords = mb_strtoupper(trim(str_replace(' ', '%', $_POST['Keywords'])));
$_POST['CustCode'] = mb_strtoupper(trim($_POST['CustCode']));
$_POST['CustPhone'] = trim($_POST['CustPhone']);
@@ -148,23 +139,22 @@
AND custbranch.phoneno " . LIKE . " '%" . $_POST['CustPhone'] . "%'
AND (debtorsmaster.address1 " . LIKE . " '%" . $_POST['CustAdd'] . "%'
OR debtorsmaster.address2 " . LIKE . " '%" . $_POST['CustAdd'] . "%'
- OR debtorsmaster.address3 " . LIKE . " '%" . $_POST['CustAdd'] . "%'
- OR debtorsmaster.address4 " . LIKE . " '%" . $_POST['CustAdd'] . "%')";
+ OR debtorsmaster.address3 " . LIKE . " '%" . $_POST['CustAdd'] . "%'
+ OR debtorsmaster.address4 " . LIKE . " '%" . $_POST['CustAdd'] . "%')";
- if (mb_strlen($_POST['CustType']) > 0 AND $_POST['CustType']!='ALL') {
+ if (mb_strlen($_POST['CustType']) > 0 and $_POST['CustType'] != 'ALL') {
$SQL .= " AND debtortype.typename = '" . $_POST['CustType'] . "'";
- }
- if (mb_strlen($_POST['Area']) > 0 AND $_POST['Area']!='ALL') {
+ } //mb_strlen($_POST['CustType']) > 0 and $_POST['CustType'] != 'ALL'
+ if (mb_strlen($_POST['Area']) > 0 and $_POST['Area'] != 'ALL') {
$SQL .= " AND custbranch.area = '" . $_POST['Area'] . "'";
- }
+ } //mb_strlen($_POST['Area']) > 0 and $_POST['Area'] != 'ALL'
} //one of keywords or custcode or custphone was more than a zero length string
if ($_SESSION['SalesmanLogin'] != '') {
- $SQL.= " AND custbranch.salesman='" . $_SESSION['SalesmanLogin'] . "'";
- }
- $SQL.= " ORDER BY debtorsmaster.name";
+ $SQL .= " AND custbranch.salesman='" . $_SESSION['SalesmanLogin'] . "'";
+ } //$_SESSION['SalesmanLogin'] != ''
+ $SQL .= " ORDER BY debtorsmaster.name";
$ErrMsg = _('The searched customer records requested cannot be retrieved because');
-
$result = DB_query($SQL, $db, $ErrMsg);
if (DB_num_rows($result) == 1) {
$myrow = DB_fetch_array($result);
@@ -172,37 +162,39 @@
$_SESSION['BranchCode'] = $myrow['branchcode'];
unset($result);
unset($_POST['Search']);
- } elseif (DB_num_rows($result) == 0) {
+ } //DB_num_rows($result) == 1
+ elseif (DB_num_rows($result) == 0) {
prnMsg(_('No customer records contain the selected text') . ' - ' . _('please alter your search criteria and try again'), 'info');
echo '<br />';
- }
+ } //DB_num_rows($result) == 0
} //end of if search
-if (isset($_POST['JustSelectedACustomer'])){
+if (isset($_POST['JustSelectedACustomer'])) {
/*Need to figure out the number of the form variable that the user clicked on */
- for ($i=0; $i<count($_POST); $i++){ //loop through the returned customers
- if(isset($_POST['SubmitCustomerSelection'.$i])){
+ for ($i = 0; $i < count($_POST); $i++) { //loop through the returned customers
+ if (isset($_POST['SubmitCustomerSelection' . $i])) {
break;
- }
+ } //isset($_POST['SubmitCustomerSelection' . $i])
+ } //$i = 0; $i < count($_POST); $i++
+ if ($i == count($_POST)) {
+ prnMsg(_('Unable to identify the selected customer'), 'error');
+ } //$i == count($_POST)
+ else {
+ $_SESSION['CustomerID'] = $_POST['SelectedCustomer' . $i];
+ $_SESSION['BranchCode'] = $_POST['SelectedBranch' . $i];
}
- if ($i==count($_POST)){
- prnMsg(_('Unable to identify the selected customer'),'error');
- } else {
- $_SESSION['CustomerID'] = $_POST['SelectedCustomer'.$i];
- $_SESSION['BranchCode'] = $_POST['SelectedBranch'.$i];
- }
-}
+} //isset($_POST['JustSelectedACustomer'])
-if ($_SESSION['CustomerID'] != '' AND !isset($_POST['Search']) AND !isset($_POST['CSV'])) {
- if (!isset($_SESSION['BranchCode'])){
-
+if ($_SESSION['CustomerID'] != '' and !isset($_POST['Search']) and !isset($_POST['CSV'])) {
+ if (!isset($_SESSION['BranchCode'])) {
$SQL = "SELECT debtorsmaster.name,
custbranch.phoneno
FROM debtorsmaster INNER JOIN custbranch
ON debtorsmaster.debtorno=custbranch.debtorno
WHERE custbranch.debtorno='" . $_SESSION['CustomerID'] . "'";
- } else {
+ } //!isset($_SESSION['BranchCode'])
+ else {
$SQL = "SELECT debtorsmaster.name,
custbranch.phoneno
FROM debtorsmaster INNER JOIN custbranch
@@ -213,9 +205,9 @@
$ErrMsg = _('The customer name requested cannot be retrieved because');
$result = DB_query($SQL, $db, $ErrMsg);
if ($myrow = DB_fetch_array($result)) {
- $CustomerName = htmlspecialchars($myrow['name'],ENT_QUOTES,'UTF-8',false);
+ $CustomerName = htmlspecialchars($myrow['name'], ENT_QUOTES, 'UTF-8', false);
$PhoneNo = $myrow['phoneno'];
- }
+ } //$myrow = DB_fetch_array($result)
unset($result);
echo '<p class="page_title_text"><img src="' . $rootpath . '/css/' . $theme . '/images/customer.png" title="' . _('Customer') . '" alt="" />' . ' ' . _('Customer') . ' : ' . $_SESSION['CustomerID'] . ' - ' . $CustomerName . ' - ' . $PhoneNo . _(' has been selected') . '</p>';
@@ -233,13 +225,15 @@
echo '<a href="' . $rootpath . '/Customers.php?DebtorNo=' . $_SESSION['CustomerID'] . '&Modify=No">' . _('View Customer Details') . '</a><br />';
echo '<a href="' . $rootpath . '/PrintCustStatements.php?FromCust=' . $_SESSION['CustomerID'] . '&ToCust=' . $_SESSION['CustomerID'] . '&PrintPDF=Yes">' . _('Print Customer Statement') . '</a><br />';
echo '<a href="' . $rootpath . '/SelectCompletedOrder.php?SelectedCustomer=' . $_SESSION['CustomerID'] . '">' . _('Order Inquiries') . '</a><br />';
+ echo '<a href="' . $rootpath . '/CustomerPurchases.php?DebtorNo=' . $_SESSION['CustomerID'] . '">' . _('Show purchases from this customer') . '</a><br />';
wikiLink('Customer', $_SESSION['CustomerID']);
echo '</td><td valign="top" class="select">';
echo '<a href="' . $rootpath . '/SelectSalesOrder.php?SelectedCustomer=' . $_SESSION['CustomerID'] . '">' . _('Modify Outstanding Sales Orders') . '</a><br />';
echo '<a href="' . $rootpath . '/CustomerAllocations.php?DebtorNo=' . $_SESSION['CustomerID'] . '">' . _('Allocate Receipts or Credit Notes') . '</a><br />';
- if (isset($_SESSION['CustomerID']) AND isset($_SESSION['BranchCode'])){
+ echo '<a href="' . $rootpath . '/JobCards.php?DebtorNo=' . $_SESSION['CustomerID'] . '&BranchNo=' . $_SESSION['BranchCode'] . '">' . _('Job Cards') . '</a><br />';
+ if (isset($_SESSION['CustomerID']) and isset($_SESSION['BranchCode'])) {
echo '<a href="' . $rootpath . '/CounterSales.php?DebtorNo=' . $_SESSION['CustomerID'] . '&BranchNo=' . $_SESSION['BranchCode'] . '">' . _('Create a Counter Sale for this Customer') . '</a><br />';
- }
+ } //isset($_SESSION['CustomerID']) and isset($_SESSION['BranchCode'])
echo '</td><td valign="top" class="select">';
echo '<a href="' . $rootpath . '/Customers.php?">' . _('Add a New Customer') . '</a><br />';
echo '<a href="' . $rootpath . '/Customers.php?DebtorNo=' . $_SESSION['CustomerID'] . '">' . _('Modify Customer Details') . '</a><br />';
@@ -249,7 +243,8 @@
echo '<a href="' . $rootpath . '/CustLoginSetup.php">' . _('Customer Login Configuration') . '</a>';
echo '</td>';
echo '</tr></table><br />';
-} else {
+} //$_SESSION['CustomerID'] != '' and !isset($_POST['Search']) and !isset($_POST['CSV'])
+else {
echo '<table width="90%">
<tr>
<th style="width:33%">' . _('Customer Inquiries') . '</th>
@@ -262,21 +257,22 @@
<td class="select">';
if (!isset($_SESSION['SalesmanLogin']) or $_SESSION['SalesmanLogin'] == '') {
echo '<a href="' . $rootpath . '/Customers.php?">' . _('Add a New Customer') . '</a><br />';
- }
+ } //!isset($_SESSION['SalesmanLogin']) or $_SESSION['SalesmanLogin'] == ''
echo '</td></tr></table>';
}
-echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
+echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post">';
echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-if (mb_strlen($msg)>1){
- prnMsg($msg,'info');
-}
-echo '<p class="page_title_text"><img src="' . $rootpath . '/css/' . $theme . '/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . _('Search for Customers').'</p>';
+if (mb_strlen($msg) > 1) {
+ prnMsg($msg, 'info');
+} //mb_strlen($msg) > 1
+echo '<p class="page_title_text"><img src="' . $rootpath . '/css/' . $theme . '/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . _('Search for Customers') . '</p>';
echo '<table cellpadding="3" class="selection">';
echo '<tr><td colspan="2">' . _('Enter a partial Name') . ':</td><td>';
if (isset($_POST['Keywords'])) {
echo '<input type="text" name="Keywords" value="' . $_POST['Keywords'] . '" size="20" maxlength="25" />';
-} else {
+} //isset($_POST['Keywords'])
+else {
echo '<input type="text" name="Keywords" size="20" maxlength="25" />';
}
echo '</td>
@@ -284,7 +280,8 @@
<td>';
if (isset($_POST['CustCode'])) {
echo '<input type="text" name="CustCode" value="' . $_POST['CustCode'] . '" size="15" maxlength="18" />';
-} else {
+} //isset($_POST['CustCode'])
+else {
echo '<input type="text" name="CustCode" size="15" maxlength="18" />';
}
echo '</td>
@@ -295,7 +292,8 @@
<td>';
if (isset($_POST['CustPhone'])) {
echo '<input type="text" name="CustPhone" value="' . $_POST['CustPhone'] . '" size="15" maxlength="18" />';
-} else {
+} //isset($_POST['CustPhone'])
+else {
echo '<input type="text" name="CustPhone" size="15" maxlength="18" />';
}
echo '</td>';
@@ -304,7 +302,8 @@
<td>';
if (isset($_POST['CustAdd'])) {
echo '<input type="text" name="CustAdd" value="' . $_POST['CustAdd'] . '" size="20" maxlength="25" />';
-} else {
+} //isset($_POST['CustAdd'])
+else {
echo '<input type="text" name="CustAdd" size="20" maxlength="25" />';
}
echo '</td></tr>';
@@ -320,21 +319,24 @@
$DataError = 1;
echo '<a href="CustomerTypes.php" target="_parent">' . _('Setup Types') . '</a>';
echo '<tr><td colspan="2">' . prnMsg(_('No Customer types defined'), 'error') . '</td></tr>';
- } else {
+ } //DB_num_rows($result2) == 0
+ else {
// If OK show select box with option selected
echo '<select name="CustType">
<option value="ALL">' . _('Any') . '</option>';
while ($myrow = DB_fetch_array($result2)) {
if ($_POST['CustType'] == $myrow['typename']) {
- echo '<option selected="selected" value="' . $myrow['typename'] . '">' . $myrow['typename'] . '</option>';
- } else {
- echo '<option value="' . $myrow['typename'] . '">' . $myrow['typename'] . '</option>';
+ echo '<option selected="selected" value="' . $myrow['typename'] . '">' . $myrow['typename'] . '</option>';
+ } //$_POST['CustType'] == $myrow['typename']
+ else {
+ echo '<option value="' . $myrow['typename'] . '">' . $myrow['typename'] . '</option>';
}
} //end while loop
DB_data_seek($result2, 0);
echo '</select></td>';
}
-} else {
+} //isset($_POST['CustType'])
+else {
// No option selected="selected" yet, so show Customer Type drop down list
$result2 = DB_query("SELECT typeid, typename FROM debtortype", $db);
// Error if no customer types setup
@@ -342,10 +344,11 @@
$DataError = 1;
echo '<a href="CustomerTypes.php" target="_parent">' . _('Setup Types') . '</a>';
echo '<tr><td colspan="2">' . prnMsg(_('No Customer types defined'), 'error') . '</td></tr>';
- } else {
+ } //DB_num_rows($result2) == 0
+ else {
// if OK show select box with available options to choose
echo '<select name="CustType">
- <option value="ALL">' . _('Any'). '</option>';
+ <option value="ALL">' . _('Any') . '</option>';
while ($myrow = DB_fetch_array($result2)) {
echo '<option value="' . $myrow['typename'] . '">' . $myrow['typename'] . '</option>';
} //end while loop
@@ -363,14 +366,16 @@
$DataError = 1;
echo '<a href="Areas.php" target="_parent">' . _('Setup Areas') . '</a>';
echo '<tr><td colspan="2">' . prnMsg(_('No Sales Areas defined'), 'error') . '</td></tr>';
-} else {
+} //DB_num_rows($result2) == 0
+else {
// if OK show select box with available options to choose
echo '<select name="Area">';
echo '<option value="ALL">' . _('Any') . '</option>';
while ($myrow = DB_fetch_array($result2)) {
- if (isset($_POST['Area']) and $_POST['Area']==$myrow['areacode']) {
+ if (isset($_POST['Area']) and $_POST['Area'] == $myrow['areacode']) {
echo '<option selected="selected" value="' . $myrow['areacode'] . '">' . $myrow['areadescription'] . '</option>';
- } else {
+ } //isset($_POST['Area']) and $_POST['Area'] == $myrow['areacode']
+ else {
echo '<option value="' . $myrow['areacode'] . '">' . $myrow['areadescription'] . '</option>';
}
} //end while loop
@@ -385,7 +390,7 @@
</div>';
if (isset($_SESSION['SalesmanLogin']) and $_SESSION['SalesmanLogin'] != '') {
prnMsg(_('Your account enables you to see only customers allocated to you'), 'warn', _('Note: Sales-person Login'));
-}
+} //isset($_SESSION['SalesmanLogin']) and $_SESSION['SalesmanLogin'] != ''
if (isset($result)) {
unset($_SESSION['CustomerID']);
$ListCount = DB_num_rows($result);
@@ -394,13 +399,13 @@
if (isset($_POST['Next'])) {
if ($_POST['PageOffset'] < $ListPageMax) {
$_POST['PageOffset'] = $_POST['PageOffset'] + 1;
- }
- }
+ } //$_POST['PageOffset'] < $ListPageMax
+ } //isset($_POST['Next'])
if (isset($_POST['Previous'])) {
if ($_POST['PageOffset'] > 1) {
$_POST['PageOffset'] = $_POST['PageOffset'] - 1;
- }
- }
+ } //$_POST['PageOffset'] > 1
+ } //isset($_POST['Previous'])
echo '<input type="hidden" name="PageOffset" value="' . $_POST['PageOffset'] . '" />';
if ($ListPageMax > 1) {
echo '<br /><div class="centre"> ' . $_POST['PageOffset'] . ' ' . _('of') . ' ' . $ListPageMax . ' ' . _('pages') . '. ' . _('Go to Page') . ': ';
@@ -409,17 +414,18 @@
while ($ListPage <= $ListPageMax) {
if ($ListPage == $_POST['PageOffset']) {
echo '<option value="' . $ListPage . '" selected="selected">' . $ListPage . '</option>';
- } else {
+ } //$ListPage == $_POST['PageOffset']
+ else {
echo '<option value="' . $ListPage . '">' . $ListPage . '</option>';
}
$ListPage++;
- }
+ } //$ListPage <= $ListPageMax
echo '</select>
<input type="submit" name="Go1" value="' . _('Go') . '" />
<input type="submit" name="Previous" value="' . _('Previous') . '" />
<input type="submit" name="Next" value="' . _('Next') . '" />';
echo '</div>';
- }
+ } //$ListPageMax > 1
echo '<br />
<table cellpadding="2" class="selection">';
$TableHeader = '<tr>
@@ -436,7 +442,7 @@
$j = 1;
$k = 0; //row counter to determine background colour
$RowIndex = 0;
- }
+ } //!isset($_POST['CSV'])
if (DB_num_rows($result) <> 0) {
if (isset($_POST['CSV'])) {
$FileName = $_SESSION['reports_dir'] . '/Customer_Listing_' . Date('Y-m-d') . '.csv';
@@ -444,25 +450,26 @@
$fp = fopen($FileName, 'w');
while ($myrow2 = DB_fetch_array($result)) {
fwrite($fp, $myrow2['debtorno'] . ',' . str_replace(',', '', $myrow2['name']) . ',' . str_replace(',', '', $myrow2['address1']) . ',' . str_replace(',', '', $myrow2['address2']) . ',' . str_replace(',', '', $myrow2['address3']) . ',' . str_replace(',', '', $myrow2['address4']) . ',' . str_replace(',', '', $myrow2['contactname']) . ',' . str_replace(',', '', $myrow2['typename']) . ',' . $myrow2['phoneno'] . ',' . $myrow2['faxno'] . ',' . $myrow2['email'] . "\n");
- }
- }
+ } //$myrow2 = DB_fetch_array($result)
+ } //isset($_POST['CSV'])
if (!isset($_POST['CSV'])) {
DB_data_seek($result, ($_POST['PageOffset'] - 1) * $_SESSION['DisplayRecordsMax']);
- }
- $i=0; //counter for input controls
- while (($myrow = DB_fetch_array($result)) AND ($RowIndex <> $_SESSION['DisplayRecordsMax'])) {
+ } //!isset($_POST['CSV'])
+ $i = 0; //counter for input controls
+ while (($myrow = DB_fetch_array($result)) and ($RowIndex <> $_SESSION['DisplayRecordsMax'])) {
if ($k == 1) {
echo '<tr class="EvenTableRows">';
$k = 0;
- } else {
+ } //$k == 1
+ else {
echo '<tr class="OddTableRows">';
$k = 1;
}
- echo '<td><input type="submit" name="SubmitCustomerSelection' . $i .'" value="' . htmlspecialchars($myrow['debtorno'].' '.$myrow['branchcode'],ENT_QUOTES,'UTF-8',false) . '" />
- <input type="hidden" name="SelectedCustomer' . $i . '" value="'.$myrow['debtorno'].'" />
- <input type="hidden" name="SelectedBranch' . $i . '" value="'. $myrow['branchcode'].'" /></td>
- <td>' . htmlspecialchars($myrow['name'],ENT_QUOTES,'UTF-8',false) . '</td>
- <td>' . htmlspecialchars($myrow['brname'],ENT_QUOTES,'UTF-8',false) . '</td>
+ echo '<td><input type="submit" name="SubmitCustomerSelection' . $i . '" value="' . htmlspecialchars($myrow['debtorno'] . ' ' . $myrow['branchcode'], ENT_QUOTES, 'UTF-8', false) . '" />
+ <input type="hidden" name="SelectedCustomer' . $i . '" value="' . $myrow['debtorno'] . '" />
+ <input type="hidden" name="SelectedBranch' . $i . '" value="' . $myrow['branchcode'] . '" /></td>
+ <td>' . htmlspecialchars($myrow['name'], ENT_QUOTES, 'UTF-8', false) . '</td>
+ <td>' . htmlspecialchars($myrow['brname'], ENT_QUOTES, 'UTF-8', false) . '</td>
<td>' . $myrow['contactname'] . '</td>
<td>' . $myrow['typename'] . '</td>
<td>' . $myrow['phoneno'] . '</td>
@@ -470,19 +477,19 @@
<td>' . $myrow['email'] . '</td>
</tr>';
$i++;
- $j++;//row counter
- if ($j == 11 AND ($RowIndex + 1 != $_SESSION['DisplayRecordsMax'])) {
+ $j++; //row counter
+ if ($j == 11 and ($RowIndex + 1 != $_SESSION['DisplayRecordsMax'])) {
$j = 1;
echo $TableHeader;
- }
+ } //$j == 11 and ($RowIndex + 1 != $_SESSION['DisplayRecordsMax'])
$RowIndex++;
//end of page full new headings if
- }
+ } //($myrow = DB_fetch_array($result)) and ($RowIndex <> $_SESSION['DisplayRecordsMax'])
//end of while loop
echo '</table>';
echo '<input type="hidden" name="JustSelectedACustomer" value="Yes" />';
- }
-}
+ } //DB_num_rows($result) <> 0
+} //isset($result)
//end if results to show
if (!isset($_POST['CSV'])) {
if (isset($ListPageMax) and $ListPageMax > 1) {
@@ -492,19 +499,20 @@
while ($ListPage <= $ListPageMax) {
if ($ListPage == $_POST['PageOffset']) {
echo '<option value="' . $ListPage . '" selected="selected">' . $ListPage . '</option>';
- } else {
+ } //$ListPage == $_POST['PageOffset']
+ else {
echo '<option value="' . $ListPage . '">' . $ListPage . '</option>';
}
$ListPage++;
- }
+ } //$ListPage <= $ListPageMax
echo '</select>
<input type="submit" name="Go2" value="' . _('Go') . '" />
<input type="submit" name="Previous" value="' . _('Previous') . '" />
<input type="submit" name="Next" value="' . _('Next') . '" />';
- echo '</div>';
- }
+ echo '</div>';
+ } //isset($ListPageMax) and $ListPageMax > 1
//end if results to show
-}
+} //!isset($_POST['CSV'])
echo '</div>
</form>';
// Only display the geocode map if the integration is turned on, and there is a latitude/longitude to display
@@ -513,7 +521,8 @@
echo '<br />';
if ($Lattitude == 0) {
echo '<div class="centre">' . _('Mapping is enabled, but no Mapping data to display for this Customer.') . '</div>';
- } else {
+ } //$Lattitude == 0
+ else {
echo '<tr>
<td colspan="2">
<table width="45%" cellpadding="4">
@@ -531,7 +540,7 @@
</tr>
</table>';
}
- }
+ } //$_SESSION['geocode_integration'] == 1
// Extended Customer Info only if selected in Configuration
if ($_SESSION['Extended_CustomerInfo'] == 1) {
if ($_SESSION['CustomerID'] != '') {
@@ -569,13 +578,15 @@
$row = DB_fetch_array($Total1Result);
echo '<table width="45%" cellpadding="4">';
echo '<tr><th style="width:33%" colspan="3">' . _('Customer Data') . '</th></tr>';
- echo '<tr><td valign="top" class="select">'; /* Customer Data */
+ echo '<tr><td valign="top" class="select">';
+ /* Customer Data */
if ($myrow['lastpaiddate'] == 0) {
echo _('No receipts from this customer.') . '</td>
<td class="select"></td>
<td class="select"></td>
</tr>';
- } else {
+ } //$myrow['lastpaiddate'] == 0
+ else {
echo _('Last Paid Date:') . '</td>
<td class="select"> <b>' . ConvertSQLDate($myrow['lastpaiddate']) . '</b> </td>
<td class="select">' . $myrow['lastpaiddays'] . ' ' . _('days') . '</td>
@@ -595,7 +606,8 @@
<td class="select"></td>
<td class="select"></td>
</tr>';
- } else {
+ } //$row['total'] == 0
+ else {
echo '<tr>
<td class="select">' . _('Total Spend from this Customer (inc tax):') . ' </td>
<td class="select"><b>' . locale_number_format($row['total'], $myrow['currdecimalplaces']) . '</b></td>
@@ -608,7 +620,7 @@
<td class="select"></td>
</tr>';
echo '</table>';
- }
+ } //$_SESSION['CustomerID'] != ''
// Customer Contacts
$sql = "SELECT * FROM custcontacts
WHERE debtorno='" . $_SESSION['CustomerID'] . "'
@@ -616,7 +628,7 @@
$result = DB_query($sql, $db);
if (DB_num_rows($result) <> 0) {
echo '<br /><div class="centre"><img src="' . $rootpath . '/css/' . $theme . '/images/group_add.png" title="' . _('Customer Contacts') . '" alt="" />' . ' ' . _('Customer Contacts') . '</div>';
- echo '<br /><table width="45%">';
+ echo '<br /><table width="45%">';
echo '<tr>
<th>' . _('Name') . '</th>
<th>' . _('Role') . '</th>
@@ -632,7 +644,8 @@
if ($k == 1) {
echo '<tr class="OddTableRows">';
$k = 0;
- } else {
+ } //$k == 1
+ else {
echo '<tr class="EvenTableRows">';
$k = 1;
}
@@ -646,10 +659,11 @@
</tr>';
} //END WHILE LIST LOOP
echo '</table>';
- } else {
+ } //DB_num_rows($result) <> 0
+ else {
if ($_SESSION['CustomerID'] != "") {
echo '<br /><div class="centre"><img src="' . $rootpath . '/css/' . $theme . '/images/group_add.png" title="' . _('Customer Contacts') . '" alt="" /><a href="AddCustomerContacts.php?DebtorNo=' . $_SESSION['CustomerID'] . '">' . ' ' . _('Add New Contact') . '</a></div>';
- }
+ } //$_SESSION['CustomerID'] != ""
}
// Customer Notes
$sql = "SELECT noteid,
@@ -679,7 +693,8 @@
if ($k == 1) {
echo '<tr class="OddTableRows">';
$k = 0;
- } else {
+ } //$k == 1
+ else {
echo '<tr class="EvenTableRows">';
$k = 1;
}
@@ -692,10 +707,11 @@
</tr>';
} //END WHILE LIST LOOP
echo '</table>';
- } else {
+ } //DB_num_rows($result) <> 0
+ else {
if ($_SESSION['CustomerID'] != '') {
echo '<br /><div class="centre"><img src="' . $rootpath . '/css/' . $theme . '/images/note_add.png" title="' . _('Customer Notes') . '" alt="" /><a href="AddCustomerNotes.php?DebtorNo=' . $_SESSION['CustomerID'] . '">' . ' ' . _('Add New Note for this Customer') . '</a></div>';
- }
+ } //$_SESSION['CustomerID'] != ''
}
// Custome Type Notes
$sql = "SELECT * FROM debtortypenotes
@@ -719,7 +735,8 @@
if ($k == 1) {
echo '<tr class="OddTableRows">';
$k = 0;
- } else {
+ } //$k == 1
+ else {
echo '<tr class="EvenTableRows">';
$k = 1;
}
@@ -732,13 +749,14 @@
</tr>';
} //END WHILE LIST LOOP
echo '</table>';
- } else {
+ } //DB_num_rows($result) <> 0
+ else {
if ($_SESSION['CustomerID'] != '') {
- echo '<br /><div class="centre"><img src="' . $rootpath . '/css/' . $theme . '/images/folder_add.png" title="' . _('Customer Group Notes') . '" alt="" /><a href="AddCustomerTypeNotes.php?DebtorType=' . $CustomerType . '">' . ' ' . _('Add New Group Note') . '</a></div><br />';
- }
+ echo '<br /><div class="centre"><img src="' . $rootpath . '/css/' . $theme . '/images/folder_add.png" title="' . _('Customer Group Notes') . '" alt="" /><a href="AddCustomerTypeNotes.php?DebtorType=' . $CustomerType . '">' . ' ' . _('Add New Group Note') . '</a></div><br />';
+ } //$_SESSION['CustomerID'] != ''
}
- }
-}
+ } //$_SESSION['Extended_CustomerInfo'] == 1
+} //isset($_SESSION['CustomerID']) and $_SESSION['CustomerID'] != ''
echo '<script type="text/javascript">defaultControl(document.forms[0].CustCode);</script>';
-include ('includes/footer.inc');
+include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/sql/mysql/upgrade4.09-4.10.sql
===================================================================
--- trunk/sql/mysql/upgrade4.09-4.10.sql 2012-12-15 04:56:05 UTC (rev 5761)
+++ trunk/sql/mysql/upgrade4.09-4.10.sql 2012-12-17 11:53:34 UTC (rev 5762)
@@ -10,4 +10,4 @@
);
UPDATE config SET confvalue='4.10.0' WHERE confname='VersionNumber';
-
+INSERT INTO scripts VALUES ('CustomerPurchases.php','5','Shows the purchases a customer has made.');
|
|
From: <tim...@us...> - 2012-12-18 23:00:05
|
Revision: 5765
http://sourceforge.net/p/web-erp/reponame/5765
Author: tim_schofield
Date: 2012-12-18 23:00:00 +0000 (Tue, 18 Dec 2012)
Log Message:
-----------
Remove superfluous whitesdpace from the end of lines. Originally input by Phil Daintree to inflate his contribution to project
Modified Paths:
--------------
trunk/AccountGroups.php
trunk/AccountSections.php
trunk/AddCustomerContacts.php
trunk/AddCustomerNotes.php
trunk/AddCustomerTypeNotes.php
trunk/AgedDebtors.php
trunk/AgedSuppliers.php
trunk/Areas.php
trunk/AuditTrail.php
trunk/BOMExtendedQty.php
trunk/BOMIndented.php
trunk/BOMIndentedReverse.php
trunk/BOMInquiry.php
trunk/BOMListing.php
trunk/BOMs.php
trunk/BackupDatabase.php
trunk/BankAccounts.php
trunk/BankMatching.php
trunk/BankReconciliation.php
trunk/COGSGLPostings.php
trunk/CompanyPreferences.php
trunk/ConfirmDispatchControlled_Invoice.php
trunk/ConfirmDispatch_Invoice.php
trunk/ContractBOM.php
trunk/ContractCosting.php
trunk/ContractOtherReqts.php
trunk/CopyBOM.php
trunk/CounterReturns.php
trunk/CounterSales.php
trunk/CreditStatus.php
trunk/Credit_Invoice.php
trunk/Currencies.php
trunk/CustEDISetup.php
trunk/CustLoginSetup.php
trunk/CustomerAllocations.php
trunk/CustomerBranches.php
trunk/CustomerInquiry.php
trunk/CustomerReceipt.php
trunk/CustomerTransInquiry.php
trunk/CustomerTypes.php
trunk/Customers.php
trunk/DailyBankTransactions.php
trunk/DailySalesInquiry.php
trunk/DebtorsAtPeriodEnd.php
trunk/DeliveryDetails.php
trunk/Departments.php
trunk/DiscountCategories.php
trunk/DiscountMatrix.php
trunk/EDISendInvoices.php
trunk/EDISendInvoices_Reece.php
trunk/EmailConfirmation.php
trunk/EmailCustTrans.php
trunk/ExchangeRateTrend.php
trunk/Factors.php
trunk/FixedAssetCategories.php
trunk/FixedAssetDepreciation.php
trunk/FixedAssetItems.php
trunk/FixedAssetLocations.php
trunk/FixedAssetRegister.php
trunk/FixedAssetTransfer.php
trunk/FormDesigner.php
trunk/FreightCosts.php
trunk/GLAccountCSV.php
trunk/GLAccountInquiry.php
trunk/GLAccountReport.php
trunk/GLAccounts.php
trunk/GLBalanceSheet.php
trunk/GLBudgets.php
trunk/GLCodesInquiry.php
trunk/GLJournal.php
trunk/GLProfit_Loss.php
trunk/GLTagProfit_Loss.php
trunk/GLTags.php
trunk/GLTrialBalance.php
trunk/GLTrialBalance_csv.php
trunk/GeocodeSetup.php
trunk/GetStockImage.php
trunk/GoodsReceived.php
trunk/InternalStockCategoriesByRole.php
trunk/InternalStockRequest.php
trunk/InternalStockRequestAuthorisation.php
trunk/InternalStockRequestFulfill.php
trunk/InventoryPlanning.php
trunk/InventoryPlanningPrefSupplier.php
trunk/InventoryQuantities.php
trunk/InventoryValuation.php
trunk/Locations.php
trunk/MRP.php
trunk/MRPCalendar.php
trunk/MRPCreateDemands.php
trunk/MRPDemandTypes.php
trunk/MRPDemands.php
trunk/MRPPlannedPurchaseOrders.php
trunk/MRPPlannedWorkOrders.php
trunk/MRPReport.php
trunk/MRPReschedules.php
trunk/MRPShortages.php
trunk/NoSalesItems.php
trunk/OffersReceived.php
trunk/OutstandingGRNs.php
trunk/PDFBankingSummary.php
trunk/PDFChequeListing.php
trunk/PDFCustTransListing.php
trunk/PDFCustomerList.php
trunk/PDFDIFOT.php
trunk/PDFDeliveryDifferences.php
trunk/PDFGLJournal.php
trunk/PDFGrn.php
trunk/PDFLowGP.php
trunk/PDFOrderStatus.php
trunk/PDFOrdersInvoiced.php
trunk/PDFPeriodStockTransListing.php
trunk/PDFPickingList.php
trunk/PDFPriceList.php
trunk/PDFPrintLabel.php
trunk/PDFQuotation.php
trunk/PDFQuotationPortrait.php
trunk/PDFReceipt.php
trunk/PDFRemittanceAdvice.php
trunk/PDFStockCheckComparison.php
trunk/PDFStockLocTransfer.php
trunk/PDFStockNegatives.php
trunk/PDFStockTransfer.php
trunk/PDFSuppTransListing.php
trunk/POReport.php
trunk/PO_AuthorisationLevels.php
trunk/PO_AuthoriseMyOrders.php
trunk/PO_Chk_ShiptRef_JobRef.php
trunk/PO_Header.php
trunk/PO_Items.php
trunk/PO_OrderDetails.php
trunk/PO_PDFPurchOrder.php
trunk/PO_SelectOSPurchOrder.php
trunk/PO_SelectPurchOrder.php
trunk/PageSecurity.php
trunk/PaymentMethods.php
trunk/PaymentTerms.php
trunk/Payments.php
trunk/PcAssignCashToTab.php
trunk/PcAuthorizeExpenses.php
trunk/PcClaimExpensesFromTab.php
trunk/PcExpenses.php
trunk/PcExpensesTypeTab.php
trunk/PcReportTab.php
trunk/PcTabs.php
trunk/PcTypeTabs.php
trunk/PeriodsInquiry.php
trunk/Prices.php
trunk/PricesBasedOnMarkUp.php
trunk/PricesByCost.php
trunk/Prices_Customer.php
trunk/PrintCheque.php
trunk/PrintCustOrder.php
trunk/PrintCustOrder_generic.php
trunk/PrintCustStatements.php
trunk/PrintCustTrans.php
trunk/PrintCustTransPortrait.php
trunk/PurchData.php
trunk/RecurringSalesOrders.php
trunk/ReorderLevel.php
trunk/ReorderLevelLocation.php
trunk/ReprintGRN.php
trunk/ReverseGRN.php
trunk/SMTPServer.php
trunk/SalesAnalReptCols.php
trunk/SalesAnalRepts.php
trunk/SalesByTypePeriodInquiry.php
trunk/SalesCategories.php
trunk/SalesCategoryPeriodInquiry.php
trunk/SalesGLPostings.php
trunk/SalesGraph.php
trunk/SalesInquiry.php
trunk/SalesPeople.php
trunk/SalesTopItemsInquiry.php
trunk/SalesTypes.php
trunk/SecurityTokens.php
trunk/SelectAsset.php
trunk/SelectCompletedOrder.php
trunk/SelectContract.php
trunk/SelectCreditItems.php
trunk/SelectCustomer.php
trunk/SelectGLAccount.php
trunk/SelectOrderItems.php
trunk/SelectProduct.php
trunk/SelectRecurringSalesOrder.php
trunk/SelectSalesOrder.php
trunk/SelectSupplier.php
trunk/SelectWorkOrder.php
trunk/ShipmentCosting.php
trunk/Shipments.php
trunk/Shippers.php
trunk/Shipt_Select.php
trunk/ShiptsList.php
trunk/SpecialOrder.php
trunk/StockAdjustments.php
trunk/StockAdjustmentsControlled.php
trunk/StockCategories.php
trunk/StockCheck.php
trunk/StockCostUpdate.php
trunk/StockCounts.php
trunk/StockLocMovements.php
trunk/StockLocStatus.php
trunk/StockLocTransfer.php
trunk/StockLocTransferReceive.php
trunk/StockMovements.php
trunk/StockQties_csv.php
trunk/StockQuantityByDate.php
trunk/StockReorderLevel.php
trunk/StockSerialItems.php
trunk/StockStatus.php
trunk/StockTransfers.php
trunk/StockUsage.php
trunk/Stocks.php
trunk/SuppContractChgs.php
trunk/SuppCreditGRNs.php
trunk/SuppFixedAssetChgs.php
trunk/SuppInvGRNs.php
trunk/SuppLoginSetup.php
trunk/SuppPaymentRun.php
trunk/SuppPriceList.php
trunk/SuppShiptChgs.php
trunk/SuppTransGLAnalysis.php
trunk/SupplierAllocations.php
trunk/SupplierBalsAtPeriodEnd.php
trunk/SupplierContacts.php
trunk/SupplierCredit.php
trunk/SupplierInquiry.php
trunk/SupplierInvoice.php
trunk/SupplierPriceList.php
trunk/SupplierTenderCreate.php
trunk/SupplierTenders.php
trunk/SupplierTransInquiry.php
trunk/SupplierTypes.php
trunk/Suppliers.php
trunk/SystemParameters.php
trunk/Tax.php
trunk/TaxAuthorities.php
trunk/TaxAuthorityRates.php
trunk/TaxCategories.php
trunk/TaxGroups.php
trunk/TaxProvinces.php
trunk/TopItems.php
trunk/UnitsOfMeasure.php
trunk/UpgradeDatabase.php
trunk/UserSettings.php
trunk/WOSerialNos.php
trunk/WWW_Access.php
trunk/WWW_Users.php
trunk/WhereUsedInquiry.php
trunk/WorkCentres.php
trunk/WorkOrderCosting.php
trunk/WorkOrderEntry.php
trunk/WorkOrderIssue.php
trunk/WorkOrderReceive.php
trunk/Z_BottomUpCosts.php
trunk/Z_ChangeBranchCode.php
trunk/Z_ChangeLocationCode.php
trunk/Z_ChangeStockCode.php
trunk/Z_CheckDebtorsControl.php
trunk/Z_CheckGLTransBalance.php
trunk/Z_CreateCompanyTemplateFile.php
trunk/Z_CurrencyDebtorsBalances.php
trunk/Z_CurrencySuppliersBalances.php
trunk/Z_DataExport.php
trunk/Z_DeleteCreditNote.php
trunk/Z_DeleteInvoice.php
trunk/Z_DeleteOldPrices.php
trunk/Z_DeleteSalesTransActions.php
trunk/Z_ImportChartOfAccounts.php
trunk/Z_ImportFixedAssets.php
trunk/Z_ImportGLAccountGroups.php
trunk/Z_ImportGLAccountSections.php
trunk/Z_ImportPartCodes.php
trunk/Z_ImportStocks.php
trunk/Z_MakeNewCompany.php
trunk/Z_MakeStockLocns.php
trunk/Z_RePostGLFromPeriod.php
trunk/Z_ReverseSuppPaymentRun.php
trunk/Z_UpdateChartDetailsBFwd.php
trunk/Z_Upgrade3.10.php
trunk/Z_Upgrade_3.01-3.02.php
trunk/Z_Upgrade_3.04-3.05.php
trunk/Z_Upgrade_3.05-3.06.php
trunk/Z_Upgrade_3.07-3.08.php
trunk/Z_Upgrade_3.08-3.09.php
trunk/Z_Upgrade_3.09-3.10.php
trunk/Z_Upgrade_3.10-3.11.php
trunk/Z_Upgrade_3.11-4.00.php
trunk/Z_poAdmin.php
trunk/Z_poEditLangHeader.php
trunk/Z_poEditLangModule.php
trunk/Z_poEditLangRemaining.php
trunk/Z_poRebuildDefault.php
trunk/geo_displaymap_customers.php
trunk/geocode.php
trunk/includes/Add_SerialItems.php
trunk/includes/Add_SerialItemsOut.php
trunk/includes/ConnectDB.inc
trunk/includes/ConnectDB_mysql.inc
trunk/includes/ConnectDB_mysqli.inc
trunk/includes/ConnectDB_postgres.inc
trunk/includes/ConstructSQLForUserDefinedSalesReport.inc
trunk/includes/CountriesArray.php
trunk/includes/DateFunctions.inc
trunk/includes/DefineCartClass.php
trunk/includes/DefineContractClass.php
trunk/includes/DefineJournalClass.php
trunk/includes/DefineLabelClass.php
trunk/includes/DefineOfferClass.php
trunk/includes/DefineReceiptClass.php
trunk/includes/DefineSpecialOrderClass.php
trunk/includes/DefineStockAdjustment.php
trunk/includes/DefineStockTransfers.php
trunk/includes/DefineSuppAllocsClass.php
trunk/includes/DefineSuppTransClass.php
trunk/includes/DefineTenderClass.php
trunk/includes/EDIconfig.inc
trunk/includes/FreightCalculation.inc
trunk/includes/GetConfig.php
trunk/includes/GetSalesTransGLCodes.inc
trunk/includes/InputSerialItems.php
trunk/includes/InputSerialItemsExisting.php
trunk/includes/InputSerialItemsKeyed.php
trunk/includes/InputSerialItemsSequential.php
trunk/includes/LanguageSetup.php
trunk/includes/LanguagesArray.php
trunk/includes/Login.php
trunk/includes/MiscFunctions.php
trunk/includes/OutputSerialItems.php
trunk/includes/PDFAgedDebtorsPageHeader.inc
trunk/includes/PDFDeliveryDifferencesPageHeader.inc
trunk/includes/PDFOrderPageHeader_generic.inc
trunk/includes/PDFOrderStatusPageHeader.inc
trunk/includes/PDFOrdersInvoicedPageHeader.inc
trunk/includes/PDFPaymentRun_PymtFooter.php
trunk/includes/PDFProfitAndLossPageHeader.inc
trunk/includes/PDFSalesAnalPageHeader.inc
trunk/includes/PDFSalesAnalysis.inc
trunk/includes/PDFSalesOrder_generic.inc
trunk/includes/PDFStarter.php
trunk/includes/PDFStatementPageHeader.inc
trunk/includes/PDFTopItemsHeader.inc
trunk/includes/PDFTransPageHeader.inc
trunk/includes/PDFTransPageHeaderPortrait.inc
trunk/includes/PDFTrialBalancePageHeader.inc
trunk/includes/PO_ReadInOrder.inc
trunk/includes/PO_UnsetFormVbls.php
trunk/includes/SelectOrderItems_IntoCart.inc
trunk/includes/Z_POSDataCreation.php
trunk/includes/class.pdf.php
trunk/includes/footer.inc
trunk/includes/header.inc
trunk/includes/htmlMimeMail.php
trunk/includes/session.inc
trunk/index.php
trunk/report_runner.php
Modified: trunk/AccountGroups.php
===================================================================
--- trunk/AccountGroups.php 2012-12-18 08:41:23 UTC (rev 5764)
+++ trunk/AccountGroups.php 2012-12-18 23:00:00 UTC (rev 5765)
@@ -63,7 +63,7 @@
$i=1;
$sql="SELECT count(groupname)
- FROM accountgroups
+ FROM accountgroups
WHERE groupname='".$_POST['GroupName']."'";
$DbgMsg = _('The SQL that was used to retrieve the information was');
@@ -191,7 +191,7 @@
prnMsg( _('Cannot delete this account group because general ledger accounts have been created using this group'),'warn');
echo '<br />' . _('There are') . ' ' . $myrow['groups'] . ' ' . _('general ledger accounts that refer to this account group');
echo '<br /><form method="post" id="AccountGroups" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">';
-
+
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<table class="selection">';
echo '<input type="hidden" name="OriginalAccountGroup" value="' . $_GET['SelectedAccountGroup'] . '" />';
@@ -313,7 +313,7 @@
if (!isset($_GET['delete'])) {
echo '<form method="post" id="AccountGroups" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">';
- echo '<div><br />';
+ echo '<div><br />';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (isset($_GET['SelectedAccountGroup'])) {
@@ -347,10 +347,10 @@
echo '<tr>
<th colspan="2">' . _('Edit Account Group Details') . '</th>
</tr>';
- echo '<tr>
- <td><input type="hidden" name="SelectedAccountGroup" value="' . $_GET['SelectedAccountGroup'] . '" /></td>
- <td><input type="hidden" name="GroupName" value="' . $_POST['GroupName'] . '" /></td>
- </tr>';
+ echo '<tr>
+ <td><input type="hidden" name="SelectedAccountGroup" value="' . $_GET['SelectedAccountGroup'] . '" /></td>
+ <td><input type="hidden" name="GroupName" value="' . $_POST['GroupName'] . '" /></td>
+ </tr>';
echo '<tr>
<td>' . _('Account Group') . ':' . '</td>
@@ -358,7 +358,7 @@
</tr>';
} elseif (!isset($_POST['MoveGroup'])) { //end of if $_POST['SelectedAccountGroup'] only do the else when a new record is being entered
-
+
if (!isset($_POST['SelectedAccountGroup'])){
$_POST['SelectedAccountGroup']='';
}
@@ -379,10 +379,10 @@
echo '<tr>
<th colspan="2">' . _('New Account Group Details') . '</th>
</tr>';
- echo '<tr>
- <td><input type="hidden" name="SelectedAccountGroup" value="' . $_POST['SelectedAccountGroup'] . '" /></td>
- </tr>';
echo '<tr>
+ <td><input type="hidden" name="SelectedAccountGroup" value="' . $_POST['SelectedAccountGroup'] . '" /></td>
+ </tr>';
+ echo '<tr>
<td>' . _('Account Group Name') . ':' . '</td>
<td><input tabindex="1" ' . (in_array('GroupName',$Errors) ? 'class="inputerror"' : '' ) .' type="text" name="GroupName" size="50" maxlength="50" value="' . $_POST['GroupName'] . '" /></td>
</tr>';
@@ -455,7 +455,7 @@
echo '</table><br />';
echo '<script type="text/javascript">defaultControl(document.forms[0].GroupName);</script>';
- echo '</div>';
+ echo '</div>';
echo '</form>';
} //end if record deleted no point displaying form to add record
Modified: trunk/AccountSections.php
===================================================================
--- trunk/AccountSections.php 2012-12-18 08:41:23 UTC (rev 5764)
+++ trunk/AccountSections.php 2012-12-18 23:00:00 UTC (rev 5765)
@@ -126,9 +126,9 @@
$myrow = DB_fetch_array($result);
if ($myrow['sections']>0) {
prnMsg( _('Cannot delete this account section because general ledger accounts groups have been created using this section'),'warn');
- echo '<div>';
+ echo '<div>';
echo '<br />' . _('There are') . ' ' . $myrow['sections'] . ' ' . _('general ledger accounts groups that refer to this account section');
- echo '</div>';
+ echo '</div>';
} else {
//Fetch section name
@@ -205,7 +205,7 @@
if (! isset($_GET['delete'])) {
echo '<form method="post" id="AccountSections" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">';
- echo '<div><br />';
+ echo '<div><br />';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (isset($_GET['SelectedSectionID'])) {
@@ -266,7 +266,7 @@
} else {
echo '<script type="text/javascript">defaultControl(document.AccountSections.SectionName);</script>';
}
- echo '</div>';
+ echo '</div>';
echo '</form>';
} //end if record deleted no point displaying form to add record
Modified: trunk/AddCustomerContacts.php
===================================================================
--- trunk/AddCustomerContacts.php 2012-12-18 08:41:23 UTC (rev 5764)
+++ trunk/AddCustomerContacts.php 2012-12-18 23:00:00 UTC (rev 5765)
@@ -171,7 +171,7 @@
if (!isset($_GET['delete'])) {
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?DebtorNo='.$DebtorNo.'">';
- echo '<div>';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (isset($Id)) {
@@ -253,7 +253,7 @@
} else {
echo '<td><textarea name="ContactNotes" rows="3" cols="40"></textarea></td>';
}
- echo '</tr>';
+ echo '</tr>';
echo '<tr>
<td colspan="2">
<div class="centre">
@@ -262,7 +262,7 @@
</td>
</tr>
</table>
- </div>
+ </div>
</form>';
} //end if record deleted no point displaying form to add record
Modified: trunk/AddCustomerNotes.php
===================================================================
--- trunk/AddCustomerNotes.php 2012-12-18 08:41:23 UTC (rev 5764)
+++ trunk/AddCustomerNotes.php 2012-12-18 23:00:00 UTC (rev 5765)
@@ -162,7 +162,7 @@
if (!isset($_GET['delete'])) {
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?DebtorNo=' . $DebtorNo . '">';
- echo '<div>';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (isset($Id)) {
@@ -244,7 +244,7 @@
</td>
</tr>
</table>
- </div>
+ </div>
</form>';
} //end if record deleted no point displaying form to add record
Modified: trunk/AddCustomerTypeNotes.php
===================================================================
--- trunk/AddCustomerTypeNotes.php 2012-12-18 08:41:23 UTC (rev 5764)
+++ trunk/AddCustomerTypeNotes.php 2012-12-18 23:00:00 UTC (rev 5765)
@@ -154,7 +154,7 @@
if (!isset($_GET['delete'])) {
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?DebtorType='.$DebtorType.'">';
- echo '<div>';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (isset($Id)) {
@@ -220,7 +220,7 @@
<div class="centre">
<input type="submit" name="submit" value="'. _('Enter Information').'" />
</div>
- </div>
+ </div>
</form>';
} //end if record deleted no point displaying form to add record
Modified: trunk/AgedDebtors.php
===================================================================
--- trunk/AgedDebtors.php 2012-12-18 08:41:23 UTC (rev 5764)
+++ trunk/AgedDebtors.php 2012-12-18 23:00:00 UTC (rev 5765)
@@ -448,7 +448,7 @@
/*if $FromCriteria is not set then show a form to allow input */
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post">
- <div>
+ <div>
<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
<table class="selection">
<tr>
@@ -510,8 +510,8 @@
<div class="centre">
<input tabindex="7" type="submit" name="PrintPDF" value="' . _('Print PDF') , '" />
</div>
- </div>
- </form>';
+ </div>
+ </form>';
}
include('includes/footer.inc');
} /*end of else not PrintPDF */
Modified: trunk/AgedSuppliers.php
===================================================================
--- trunk/AgedSuppliers.php 2012-12-18 08:41:23 UTC (rev 5764)
+++ trunk/AgedSuppliers.php 2012-12-18 23:00:00 UTC (rev 5765)
@@ -280,7 +280,7 @@
/*if $FromCriteria is not set then show a form to allow input */
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post">
- <div>
+ <div>
<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
<table class="selection">
<tr>
@@ -326,10 +326,10 @@
<div class="centre">
<input tabindex="6" type="submit" name="PrintPDF" value="' . _('Print PDF') . '" />
</div>
- </div>
- </form>';
+ </div>
+ </form>';
}
include('includes/footer.inc');
} /*end of else not PrintPDF */
-?>
+?>
\ No newline at end of file
Modified: trunk/Areas.php
===================================================================
--- trunk/Areas.php 2012-12-18 08:41:23 UTC (rev 5764)
+++ trunk/Areas.php 2012-12-18 23:00:00 UTC (rev 5765)
@@ -180,7 +180,7 @@
if (!isset($_GET['delete'])) {
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">';
- echo '<div><br />';
+ echo '<div><br />';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (isset($SelectedArea)) {
@@ -231,7 +231,7 @@
</td>
</tr>
</table>
- </div>
+ </div>
</form>';
} //end if record deleted no point displaying form to add record
Modified: trunk/AuditTrail.php
===================================================================
--- trunk/AuditTrail.php 2012-12-18 08:41:23 UTC (rev 5764)
+++ trunk/AuditTrail.php 2012-12-18 23:00:00 UTC (rev 5765)
@@ -117,7 +117,7 @@
$SQLString = str_replace('SET','',$SQLString);
$SQLString = str_replace('WHERE',',',$SQLString);
$SQLString = str_replace('AND',',',$SQLString);
- $FieldArray = preg_split("/[[:space:]]*([[:alnum:].]+[[:space:]]*=[[:space:]]*(?:'[^']*'|[[:digit:].]+))[[:space:]]*,/", $SQLString, 0, PREG_SPLIT_DELIM_CAPTURE|PREG_SPLIT_NO_EMPTY);
+ $FieldArray = preg_split("/[[:space:]]*([[:alnum:].]+[[:space:]]*=[[:space:]]*(?:'[^']*'|[[:digit:].]+))[[:space:]]*,/", $SQLString, 0, PREG_SPLIT_DELIM_CAPTURE|PREG_SPLIT_NO_EMPTY);
for ($i=0; $i<sizeof($FieldArray); $i++) {
$Assigment = explode('=', $FieldArray[$i]);
$_SESSION['SQLString']['fields'][$i] = $Assigment[0];
@@ -138,11 +138,11 @@
$_SESSION['SQLString']['fields'][0] = $Assigment[0];
$_SESSION['SQLString']['values'][0] = $Assigment[1];
}
-
+
if (mb_strlen($ContainingText) > 0) {
- $ContainingText = " AND querystring LIKE '%" . $ContainingText . "%' ";
+ $ContainingText = " AND querystring LIKE '%" . $ContainingText . "%' ";
}else{
- $ContainingText = "";
+ $ContainingText = "";
}
if ($_POST['SelectedUser'] == 'ALL') {
Modified: trunk/BOMExtendedQty.php
===================================================================
--- trunk/BOMExtendedQty.php 2012-12-18 08:41:23 UTC (rev 5764)
+++ trunk/BOMExtendedQty.php 2012-12-18 23:00:00 UTC (rev 5765)
@@ -14,7 +14,7 @@
$FontSize=9;
$PageNumber=1;
$line_height=12;
- PrintHeader($pdf,$YPos,$PageNumber,$Page_Height,$Top_Margin,$Left_Margin,$Page_Width,$Right_Margin);
+ PrintHeader($pdf,$YPos,$PageNumber,$Page_Height,$Top_Margin,$Left_Margin,$Page_Width,$Right_Margin);
if (!$_POST['Quantity'] or !is_numeric(filter_number_format($_POST['Quantity']))) {
$_POST['Quantity'] = 1;
@@ -250,8 +250,8 @@
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'</p><br />';
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
- <div>
- <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
+ <div>
+ <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
<table class="selection">
<tr>
<td>' . _('Part') . ':</td>
@@ -282,8 +282,8 @@
<br />
<input type="submit" name="PrintPDF" value="' . _('Print PDF') . '" />
</div>
- </div>
- </form>';
+ </div>
+ </form>';
include('includes/footer.inc');
Modified: trunk/BOMIndented.php
===================================================================
--- trunk/BOMIndented.php 2012-12-18 08:41:23 UTC (rev 5764)
+++ trunk/BOMIndented.php 2012-12-18 23:00:00 UTC (rev 5765)
@@ -11,7 +11,7 @@
include('includes/PDFStarter.php');
$pdf->addInfo('Title',_('Indented BOM Listing'));
$pdf->addInfo('Subject',_('Indented BOM Listing'));
- $FontSize=9;
+ $FontSize=9;
$PageNumber=1;
$line_height=12;
@@ -49,7 +49,7 @@
CONCAT(bom.parent,bom.component) AS sortpart
FROM bom
WHERE bom.parent ='" . $_POST['Part'] . "'
- AND bom.effectiveto >= NOW()
+ AND bom.effectiveto >= NOW()
AND bom.effectiveafter <= NOW()";
$result = DB_query($sql,$db);
@@ -76,7 +76,7 @@
bom.quantity
FROM bom
WHERE bom.parent ='" . $_POST['Part'] . "'
- AND bom.effectiveto >= NOW()
+ AND bom.effectiveto >= NOW()
AND bom.effectiveafter <= NOW()";
$result = DB_query($sql,$db);
//echo "<br />sql is $sql<br />";
@@ -132,7 +132,7 @@
CONCAT(passbom2.sortpart,bom.component) AS sortpart
FROM bom,passbom2
WHERE bom.parent = passbom2.part
- AND bom.effectiveto >= NOW()
+ AND bom.effectiveto >= NOW()
AND bom.effectiveafter <= NOW()";
$result = DB_query($sql,$db);
@@ -152,27 +152,27 @@
prnMsg( _('The Indented BOM Listing 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;
+ echo '<br />' . $sql;
}
include('includes/footer.inc');
exit;
}
- $sql = "SELECT stockmaster.stockid,
- stockmaster.description
- FROM stockmaster
- WHERE stockid = " . "'" . $_POST['Part'] . "'";
+ $sql = "SELECT stockmaster.stockid,
+ stockmaster.description
+ FROM stockmaster
+ WHERE stockid = " . "'" . $_POST['Part'] . "'";
$result = DB_query($sql,$db);
$myrow = DB_fetch_array($result,$db);
$assembly = $_POST['Part'];
$assemblydesc = $myrow['description'];
PrintHeader($pdf,$YPos,$PageNumber,$Page_Height,$Top_Margin,$Left_Margin,$Page_Width,
- $Right_Margin,$assemblydesc);
+ $Right_Margin,$assemblydesc);
- $Tot_Val=0;
- $sql = "SELECT tempbom.*,
+ $Tot_Val=0;
+ $sql = "SELECT tempbom.*,
stockmaster.description,
stockmaster.mbflag
FROM tempbom,stockmaster
@@ -184,7 +184,7 @@
$fill = false;
$pdf->SetFillColor(224,235,255);
- $ListCount = DB_num_rows($result);
+ $ListCount = DB_num_rows($result);
while ($myrow = DB_fetch_array($result,$db)){
@@ -196,7 +196,7 @@
if ($_POST['Fill'] == 'yes'){
- $fill=!$fill;
+ $fill=!$fill;
}
// Parameters for addTextWrap are defined in /includes/class.pdf.php
@@ -214,7 +214,7 @@
if ($YPos < $Bottom_Margin + $line_height){
PrintHeader($pdf,$YPos,$PageNumber,$Page_Height,$Top_Margin,$Left_Margin,$Page_Width,
- $Right_Margin,$assemblydesc);
+ $Right_Margin,$assemblydesc);
}
} /*end while loop */
@@ -224,10 +224,10 @@
if ($YPos < $Bottom_Margin + $line_height){
PrintHeader($pdf,$YPos,$PageNumber,$Page_Height,$Top_Margin,$Left_Margin,$Page_Width,
- $Right_Margin,$assemblydesc);
+ $Right_Margin,$assemblydesc);
}
- if ($ListCount == 0) {
+ if ($ListCount == 0) {
$title = _('Print Indented BOM Listing Error');
include('includes/header.inc');
prnMsg(_('There were no items for the selected assembly'),'error');
@@ -243,11 +243,11 @@
$title=_('Indented BOM Listing');
include('includes/header.inc');
- echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'</p><br />';
+ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'</p><br />';
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
- <div>
- <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
+ <div>
+ <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
<table class="selection">';
echo '<tr>
<td>' . _('Part') . ':</td>
@@ -271,11 +271,11 @@
</tr>
</table>
<div class="centre">
- <br />
+ <br />
<input type="submit" name="PrintPDF" value="' . _('Print PDF') . '" />
</div>
- </div>
- </form>';
+ </div>
+ </form>';
include('includes/footer.inc');
@@ -283,7 +283,7 @@
function PrintHeader(&$pdf,&$YPos,&$PageNumber,$Page_Height,$Top_Margin,$Left_Margin,
- $Page_Width,$Right_Margin,$assemblydesc) {
+ $Page_Width,$Right_Margin,$assemblydesc) {
$line_height=12;
/*PDF page header for Indented BOM Listing report */
Modified: trunk/BOMIndentedReverse.php
===================================================================
--- trunk/BOMIndentedReverse.php 2012-12-18 08:41:23 UTC (rev 5764)
+++ trunk/BOMIndentedReverse.php 2012-12-18 23:00:00 UTC (rev 5765)
@@ -12,7 +12,7 @@
include('includes/PDFStarter.php');
$pdf->addInfo('Title',_('Indented BOM Listing'));
$pdf->addInfo('Subject',_('Indented BOM Listing'));
- $FontSize=9;
+ $FontSize=9;
$PageNumber=1;
$line_height=12;
@@ -143,17 +143,17 @@
echo '<br />
<a href="' .$rootpath .'/index.php">' . _('Back to the menu') . '</a>';
if ($debug==1){
- echo '<br />' . $sql;
+ echo '<br />' . $sql;
}
include('includes/footer.inc');
exit;
}
- $sql = "SELECT stockmaster.stockid,
- stockmaster.description
- FROM stockmaster
- WHERE stockid = '" . $_POST['Part'] . "'";
+ $sql = "SELECT stockmaster.stockid,
+ stockmaster.description
+ FROM stockmaster
+ WHERE stockid = '" . $_POST['Part'] . "'";
$result = DB_query($sql,$db);
$myrow = DB_fetch_array($result,$db);
$Assembly = $_POST['Part'];
@@ -161,18 +161,18 @@
PrintHeader($pdf,$YPos,$PageNumber,$Page_Height,$Top_Margin,$Left_Margin,$Page_Width,$Right_Margin,$AssemblyDesc);
- $Tot_Val=0;
- $fill = false;
- $pdf->SetFillColor(224,235,255);
- $sql = "SELECT tempbom.*,
- stockmaster.description,
- stockmaster.mbflag
- FROM tempbom INNER JOIN stockmaster
- ON tempbom.parent = stockmaster.stockid
- ORDER BY sortpart";
+ $Tot_Val=0;
+ $fill = false;
+ $pdf->SetFillColor(224,235,255);
+ $sql = "SELECT tempbom.*,
+ stockmaster.description,
+ stockmaster.mbflag
+ FROM tempbom INNER JOIN stockmaster
+ ON tempbom.parent = stockmaster.stockid
+ ORDER BY sortpart";
$result = DB_query($sql,$db);
- $ListCount = DB_num_rows($result);
+ $ListCount = DB_num_rows($result);
While ($myrow = DB_fetch_array($result,$db)){
@@ -184,7 +184,7 @@
// Use to alternate between lines with transparent and painted background
if ($_POST['Fill'] == 'yes'){
- $fill=!$fill;
+ $fill=!$fill;
}
// Parameters for addTextWrap are defined in /includes/class.pdf.php
@@ -202,7 +202,7 @@
if ($YPos < $Bottom_Margin + $line_height){
PrintHeader($pdf,$YPos,$PageNumber,$Page_Height,$Top_Margin,$Left_Margin,$Page_Width,
- $Right_Margin,$AssemblyDesc);
+ $Right_Margin,$AssemblyDesc);
}
} /*end while loop */
@@ -212,7 +212,7 @@
if ($YPos < $Bottom_Margin + $line_height){
PrintHeader($pdf,$YPos,$PageNumber,$Page_Height,$Top_Margin,$Left_Margin,$Page_Width,
- $Right_Margin,$AssemblyDesc);
+ $Right_Margin,$AssemblyDesc);
}
if ($ListCount == 0) {
$title = _('Print Reverse Indented BOM Listing Error');
@@ -234,8 +234,8 @@
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' .
_('Search') . '" alt="" />' . ' ' . $title.'</p><br />';
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
- <div>
- <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
+ <div>
+ <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
<table class="selection">
<tr>
<td>' . _('Part') . ':</td>
@@ -250,11 +250,11 @@
</tr>
</table>
<div class="centre">
- <br />
+ <br />
<input type="submit" name="PrintPDF" value="' . _('Print PDF') . '" />
</div>
</div>
- </form>';
+ </form>';
include('includes/footer.inc');
@@ -262,7 +262,7 @@
function PrintHeader(&$pdf,&$YPos,&$PageNumber,$Page_Height,$Top_Margin,$Left_Margin,
- $Page_Width,$Right_Margin,$AssemblyDesc) {
+ $Page_Width,$Right_Margin,$AssemblyDesc) {
$line_height=12;
Modified: trunk/BOMInquiry.php
===================================================================
--- trunk/BOMInquiry.php 2012-12-18 08:41:23 UTC (rev 5764)
+++ trunk/BOMInquiry.php 2012-12-18 23:00:00 UTC (rev 5765)
@@ -14,7 +14,7 @@
if (!isset($_POST['StockID'])) {
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
- <div>
+ <div>
<br />
<div class="page_help_text">
'. _('Select a manufactured part') . ' (' . _('or Assembly or Kit part') . ') ' . _('to view the costed bill of materials') . '
@@ -61,9 +61,9 @@
FROM stockmaster INNER JOIN locstock
ON stockmaster.stockid = locstock.stockid
WHERE stockmaster.description " . LIKE . " '$SearchString'
- AND (stockmaster.mbflag='M'
- OR stockmaster.mbflag='K'
- OR stockmaster.mbflag='A'
+ AND (stockmaster.mbflag='M'
+ OR stockmaster.mbflag='K'
+ OR stockmaster.mbflag='A'
OR stockmaster.mbflag='G')
GROUP BY stockmaster.stockid,
stockmaster.description,
@@ -98,8 +98,8 @@
} //one of keywords or StockCode was more than a zero length string
} //end of if search
-if (isset($_POST['Search'])
- AND isset($result)
+if (isset($_POST['Search'])
+ AND isset($result)
AND !isset($SelectedParent)) {
echo '<br />
@@ -130,7 +130,7 @@
}
$tabindex=$j+4;
printf('<td><input tabindex="' .$tabindex . '" type="submit" name="StockID" value="%s" /></td>
- <td>%s</td>
+ <td>%s</td>
<td class="number">%s</td>
<td>%s</td>
</tr>',
@@ -146,23 +146,23 @@
echo '</table><br />';
}
if (!isset($_POST['StockID'])) {
- echo '</div>
- </form>';
+ echo '</div>
+ </form>';
}
if (isset($StockID) and $StockID!=""){
-
- $result = DB_query("SELECT description,
- units,
- labourcost,
- overheadcost
- FROM stockmaster
+
+ $result = DB_query("SELECT description,
+ units,
+ labourcost,
+ overheadcost
+ FROM stockmaster
WHERE stockid='" . $StockID . "'",
$db);
$myrow = DB_fetch_array($result);
$ParentLabourCost = $myrow['labourcost'];
$ParentOverheadCost = $myrow['overheadcost'];
-
+
$sql = "SELECT bom.parent,
bom.component,
stockmaster.description,
@@ -170,7 +170,7 @@
stockmaster.materialcost+ stockmaster.labourcost+stockmaster.overheadcost as standardcost,
bom.quantity,
bom.quantity * (stockmaster.materialcost+ stockmaster.labourcost+ stockmaster.overheadcost) AS componentcost
- FROM bom INNER JOIN stockmaster
+ FROM bom INNER JOIN stockmaster
ON bom.component = stockmaster.stockid
WHERE bom.parent = '" . $StockID . "'
AND bom.effectiveafter < Now()
@@ -237,7 +237,7 @@
$j++;
}
-
+
$TotalCost += $ParentLabourCost;
echo '<tr>
<td colspan="4" class="number"><b>' . _('Labour Cost') . '</b></td>
Modified: trunk/BOMListing.php
===================================================================
--- trunk/BOMListing.php 2012-12-18 08:41:23 UTC (rev 5764)
+++ trunk/BOMListing.php 2012-12-18 23:00:00 UTC (rev 5765)
@@ -17,7 +17,7 @@
$PageNumber=0;
$line_height=12;
- /*Now figure out the bills to report for the part range under review */
+ /*Now figure out the bills to report for the part range under review */
$SQL = "SELECT bom.parent,
bom.component,
stockmaster.description as compdescription,
@@ -43,7 +43,7 @@
prnMsg(_('The Bill of Material listing could not be retrieved by the SQL because'),'error');
echo '<br /><a href="' .$rootpath .'/index.php">' . _('Back to the menu') . '</a>';
if ($debug==1){
- echo '<br />' . $SQL;
+ echo '<br />' . $SQL;
}
include('includes/footer.inc');
exit;
@@ -98,10 +98,10 @@
$YPos -=$line_height;
$pdf->line($Page_Width-$Right_Margin, $YPos,$Left_Margin, $YPos);
-
- $pdf->OutputD($_SESSION['DatabaseName'] . '_BOMListing_' . date('Y-m-d').'.pdf');
- $pdf->__destruct();
+ $pdf->OutputD($_SESSION['DatabaseName'] . '_BOMListing_' . date('Y-m-d').'.pdf');
+ $pdf->__destruct();
+
} else { /*The option to print PDF was not hit */
$title=_('Bill Of Material Listing');
@@ -113,8 +113,8 @@
/*if $FromCriteria is not set then show a form to allow input */
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
- <div>
- <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
+ <div>
+ <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
<table class="selection">';
echo '<tr><td>' . _('From Inventory Part Code') . ':' . '</td>
@@ -128,8 +128,8 @@
echo '</table>
<br /><div class="centre"><input tabindex="3" type="submit" name="PrintPDF" value="' . _('Print PDF') . '" /></div>
- </div>
- </form>';
+ </div>
+ </form>';
echo '<script type="text/javascript">defaultControl(document.forms[0].FromCriteria);</script>';
}
include('includes/footer.inc');
Modified: trunk/BOMs.php
===================================================================
--- trunk/BOMs.php 2012-12-18 08:41:23 UTC (rev 5764)
+++ trunk/BOMs.php 2012-12-18 23:00:00 UTC (rev 5765)
@@ -20,7 +20,7 @@
FROM bom WHERE parent='" . $Parent. "'"
,$db);
if (DB_num_rows($c_result) > 0) {
-
+
while ($row = DB_fetch_array($c_result)) {
//echo '<br />Parent: ' . $Parent . ' Level: ' . $Level . ' row[component]: ' . $row['component'] .'<br />';
if ($Parent != $row['component']) {
@@ -85,13 +85,13 @@
locstock.quantity AS qoh,
stockmaster.decimalplaces
FROM bom INNER JOIN stockmaster
- ON bom.component=stockmaster.stockid
- INNER JOIN locations ON
- bom.loccode = locations.loccode
- INNER JOIN workcentres
+ ON bom.component=stockmaster.stockid
+ INNER JOIN locations ON
+ bom.loccode = locations.loccode
+ INNER JOIN workcentres
ON bom.workcentreadded=workcentres.code
- INNER JOIN locstock
- ON bom.loccode=locstock.loccode
+ INNER JOIN locstock
+ ON bom.loccode=locstock.loccode
AND bom.component = locstock.stockid
WHERE bom.component='".$Component."'
AND bom.parent = '".$Parent."'";
@@ -106,10 +106,10 @@
while ($myrow=DB_fetch_array($result)) {
$Level1 = str_repeat('- ',$Level-1).$Level;
- if( $myrow['mbflag']=='B'
- OR $myrow['mbflag']=='K'
+ if( $myrow['mbflag']=='B'
+ OR $myrow['mbflag']=='K'
OR $myrow['mbflag']=='D') {
-
+
$DrillText = '%s%s';
$DrillLink = '<div class="centre">'._('No lower levels').'</div>';
$DrillID='';
@@ -132,12 +132,12 @@
OR $myrow['mbflag']=='K' //kit-set
OR $myrow['mbflag']=='A' // assembly
OR $myrow['mbflag']=='G') /* ghost */ {
-
+
$QuantityOnHand = _('N/A');
} else {
$QuantityOnHand = locale_number_format($myrow['qoh'],$myrow['decimalplaces']);
- }
-
+ }
+
printf('<td>%s</td>
<td>%s</td>
<td>%s</td>
@@ -372,8 +372,8 @@
//the link to delete a selected record was clicked instead of the Submit button
- $sql="DELETE FROM bom
- WHERE parent='".$SelectedParent."'
+ $sql="DELETE FROM bom
+ WHERE parent='".$SelectedParent."'
AND component='".$SelectedComponent."'
AND loccode='".$Location."'
AND workcentreadded='".$WorkCentre."'";
@@ -382,8 +382,8 @@
$DbgMsg = _('The SQL used to delete the BOM was');
$result = DB_query($sql,$db,$ErrMsg,$DbgMsg);
- $ComponentSQL = "SELECT component
- FROM bom
+ $ComponentSQL = "SELECT component
+ FROM bom
WHERE parent='" . $SelectedParent ."'";
$ComponentResult = DB_query($ComponentSQL,$db);
$ComponentArray = DB_fetch_row($ComponentResult);
@@ -453,7 +453,7 @@
$result=DB_query($sql,$db,$ErrMsg,$DbgMsg);
$ix = 0;
if( DB_num_rows($result) > 0 ) {
- echo '<table class="selection">';
+ echo '<table class="selection">';
echo '<tr><td><div class="centre">'._('Manufactured parent items').' : ';
while ($myrow = DB_fetch_array($result)){
echo (($ix)?', ':'').'<a href="'.htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?Select='.$myrow['parent'].'">'.
@@ -461,14 +461,14 @@
$ix++;
} //end while loop
echo '</div></td></tr>';
- echo '</table>';
+ echo '</table>';
}
// Display Assembly Parent Items
- $sql = "SELECT bom.parent,
- stockmaster.description,
+ $sql = "SELECT bom.parent,
+ stockmaster.description,
stockmaster.mbflag
FROM bom INNER JOIN stockmaster
- ON bom.parent=stockmaster.stockid
+ ON bom.parent=stockmaster.stockid
WHERE bom.component='".$SelectedParent."'
AND stockmaster.mbflag='A'";
@@ -476,7 +476,7 @@
$DbgMsg = _('The SQL used to retrieve description of the parent part was');
$result=DB_query($sql,$db,$ErrMsg,$DbgMsg);
if( DB_num_rows($result) > 0 ) {
- echo '<table class="selection">';
+ echo '<table class="selection">';
echo '<tr><td><div class="centre">'._('Assembly parent items').' : ';
$ix = 0;
while ($myrow = DB_fetch_array($result)){
@@ -485,14 +485,14 @@
$ix++;
} //end while loop
echo '</div></td></tr>';
- echo '</table>';
+ echo '</table>';
}
// Display Kit Sets
- $sql = "SELECT bom.parent,
- stockmaster.description,
+ $sql = "SELECT bom.parent,
+ stockmaster.description,
stockmaster.mbflag
FROM bom INNER JOIN stockmaster
- ON bom.parent=stockmaster.stockid
+ ON bom.parent=stockmaster.stockid
WHERE bom.component='".$SelectedParent."'
AND stockmaster.mbflag='K'";
@@ -500,7 +500,7 @@
$DbgMsg = _('The SQL used to retrieve description of the parent part was');
$result=DB_query($sql,$db,$ErrMsg,$DbgMsg);
if( DB_num_rows($result) > 0 ) {
- echo '<table class="selection">';
+ echo '<table class="selection">';
echo '<tr><td><div class="centre">'._('Kit sets').' : ';
$ix = 0;
while ($myrow = DB_fetch_array($result)){
@@ -509,14 +509,14 @@
$ix++;
} //end while loop
echo '</div></td></tr>';
- echo '</table>';
+ echo '</table>';
}
// Display Phantom/Ghosts
- $sql = "SELECT bom.parent,
- stockmaster.description,
+ $sql = "SELECT bom.parent,
+ stockmaster.description,
stockmaster.mbflag
FROM bom INNER JOIN stockmaster
- ON bom.parent=stockmaster.stockid
+ ON bom.parent=stockmaster.stockid
WHERE bom.component='".$SelectedParent."'
AND stockmaster.mbflag='G'";
@@ -525,7 +525,7 @@
$result=DB_query($sql,$db,$ErrMsg,$DbgMsg);
if( DB_num_rows($result) > 0 ) {
echo '<table class="selection">';
- echo '<tr><td><div class="centre">'._('Phantom').' : ';
+ echo '<tr><td><div class="centre">'._('Phantom').' : ';
$ix = 0;
while ($myrow = DB_fetch_array($result)){
echo (($ix)?', ':'').'<a href="'.htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?Select='.$myrow['parent'].'">'.
@@ -533,7 +533,7 @@
$ix++;
} //end while loop
echo '</div></td></tr>';
- echo '</table>';
+ echo '</table>';
}
echo '<br />
<table class="selection">';
@@ -589,7 +589,7 @@
if (! isset($_GET['delete'])) {
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?Select=' . $SelectedParent .'">';
- echo '<div>';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (isset($_GET['SelectedComponent']) and $InputError !=1) {
@@ -601,7 +601,7 @@
workcentreadded,
quantity,
autoissue
- FROM bom
+ FROM bom
WHERE parent='".$SelectedParent."'
AND component='".$SelectedComponent."'";
@@ -784,7 +784,7 @@
echo '</table>
<br /><div class="centre"><input tabindex="8" type="submit" name="Submit" value="' . _('Enter Information') . '" />
</div>
- </div>
+ </div>
</form>';
} //end if record deleted no point displaying form to add record
@@ -858,9 +858,9 @@
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . $title . '</p>';
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">' .
'<div class="page_help_text">'. _('Select a manufactured part') . ' (' . _('or Assembly or Kit part') . ') ' . _('to maintain the bill of material for using the options below') . '<br />' . _('Parts must be defined in the stock item entry') . '/' . _('modification screen as manufactured') . ', ' . _('kits or assemblies to be available for construction of a bill of material') .'</div>'. '
- <div>
- <br />
- <table class="selection" cellpadding="3">
+ <div>
+ <br />
+ <table class="selection" cellpadding="3">
<tr><td>' . _('Enter text extracts in the') . ' <b>' . _('description') . '</b>:</td>
<td><input tabindex="1" type="text" name="Keywords" size="20" maxlength="25" /></td>
<td><b>' . _('OR') . '</b></td>
@@ -871,10 +871,10 @@
<br /><div class="centre"><input tabindex="3" type="submit" name="Search" value="' . _('Search Now') . '" /></div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- if (isset($_POST['Search'])
- AND isset($result)
+ if (isset($_POST['Search'])
+ AND isset($result)
AND !isset($SelectedParent)) {
-
+
echo '<br />
<table cellpadding="2" class="selection">';
$TableHeader = '<tr>
@@ -883,9 +883,9 @@
<th>' . _('On Hand') . '</th>
<th>' . _('Units') . '</th>
</tr>';
-
+
echo $TableHeader;
-
+
$j = 1;
$k=0; //row colour counter
while ($myrow=DB_fetch_array($result)) {
@@ -911,17 +911,17 @@
$myrow['description'],
$StockOnHand,
$myrow['units']);
-
+
$j++;
//end of page full new headings if
}
//end of while loop
-
+
echo '</table>';
-
+
}
//end if results to show
-
+
if (!isset($SelectedParent) or $SelectedParent=='') {
echo '<script type="text/javascript">defaultControl(document.forms[0].StockCode);</script>';
} else {
@@ -941,7 +941,7 @@
foreach($array as $key => $item) {
// Serialize the current element and create a md5 hash
$hash = md5(serialize($item));
- // If the md5 didn't come up yet, add the element to
+ // If the md5 didn't come up yet, add the element to
// arrayRewrite, otherwise drop it
if (!isset($arrayHashes[$hash])) {
// Save the current element hash
@@ -958,4 +958,4 @@
}
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/BackupDatabase.php
===================================================================
--- trunk/BackupDatabase.php 2012-12-18 08:41:23 UTC (rev 5764)
+++ trunk/BackupDatabase.php 2012-12-18 23:00:00 UTC (rev 5765)
@@ -11,11 +11,11 @@
$BackupFiles = scandir('companies/' . $_SESSION['DatabaseName'], 0);
$DeletedFiles = false;
foreach ($BackupFiles as $BackupFile){
-
+
if (mb_substr($BackupFile,0,6)=='Backup'){
-
+
$DeleteResult = unlink('companies/' . $_SESSION['DatabaseName'] . '/' . $BackupFile);
-
+
if ($DeleteResult==true){
prnMsg(_('Deleted') . ' companies/' . $_SESSION['DatabaseName'] . '/' . $BackupFile,'info');
$DeletedFiles = true;
@@ -30,15 +30,15 @@
prnMsg(_('No backup files on the server were deleted'),'info');
}
} else {
-
+
$BackupFile = $rootpath . '/companies/' . $_SESSION['DatabaseName'] .'/' . _('Backup') . '_' . Date('Y-m-d-H-i-s') . '.sql.gz';
- $Command = 'mysqldump --opt -h' . $host . ' -u' . $dbuser . ' -p' . $dbpassword . ' ' . $_SESSION['DatabaseName'] . '| gzip > ' .
+ $Command = 'mysqldump --opt -h' . $host . ' -u' . $dbuser . ' -p' . $dbpassword . ' ' . $_SESSION['DatabaseName'] . '| gzip > ' .
$_SERVER['DOCUMENT_ROOT'] . $BackupFile;
-
-
+
+
$CommandOutput = array();
exec($Command,$CommandOutput, $ReturnValue);
-
+
if ($ReturnValue ==0) {
prnMsg(_('The backup file has now been created. You must now download this to your computer because in case the web-server has a disk failure the backup would then not on the same machine. Use the link below') . '<br /><br /><a href="' . $BackupFile . '">' . _('Download the backup file to your locale machine') . '</a>','success');
prnMsg(_('Once you have downloaded the database backup file to your local machine you should use the link below to delete it - backup files can consume a lot of space on your hosting account and will accumulate if not deleted - they also contain sensitive information which would otherwise be available for others to download!'),'info');
@@ -50,7 +50,7 @@
}
}
/*
-//this could be a weighty file attachment!!
+//this could be a weighty file attachment!!
include('includes/htmlMimeMail.php');
$mail = new htmlMimeMail();
$attachment = $mail->getFile( $BackupFile);
Modified: trunk/BankAccounts.php
===================================================================
--- trunk/BankAccounts.php 2012-12-18 08:41:23 UTC (rev 5764)
+++ trunk/BankAccounts.php 2012-12-18 23:00:00 UTC (rev 5765)
@@ -318,7 +318,7 @@
$_POST['BankAccountNumber']='';
}
if (!isset($_POST['BankAccountCode'])) {
- $_POST['BankAccountCode']='';
+ $_POST['BankAccountCode']='';
}
if (!isset($_POST['BankAddress'])) {
$_POST['BankAddress']='';
Modified: trunk/BankMatching.php
===================================================================
--- trunk/BankMatching.php 2012-12-18 08:41:23 UTC (rev 5764)
+++ trunk/BankMatching.php 2012-12-18 23:00:00 UTC (rev 5765)
@@ -125,7 +125,7 @@
</tr>';
echo '<tr>
- <td>' . _('to') . ':</td>
+ <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>
</tr>';
echo '<tr>
@@ -343,4 +343,4 @@
echo '</div>';
echo '</form>';
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/BankReconciliation.php
===================================================================
--- trunk/BankReconciliation.php 2012-12-18 08:41:23 UTC (rev 5764)
+++ trunk/BankReconciliation.php 2012-12-18 23:00:00 UTC (rev 5765)
@@ -254,8 +254,8 @@
//end of while loop
echo '<tr>
- <td><br /></td>
- </tr>
+ <td><br /></td>
+ </tr>
<tr class="EvenTableRows">
<td colspan="6">' . _('Total of all unpresented cheques') . '</td>
<td class="number">' . locale_number_format($TotalUnpresentedCheques,$CurrencyRow['currdecimalplaces']) . '</td>
@@ -330,7 +330,7 @@
}
//end of while loop
echo '<tr>
- <td><br /></td>
+ <td><br /></td>
</tr>
<tr class="EvenTableRows">
<td colspan="6">' . _('Total of all uncleared deposits') . '</td>
@@ -338,7 +338,7 @@
</tr>';
$FXStatementBalance = ($Balance*$CurrencyRow['rate'] - $TotalUnpresentedCheques -$TotalUnclearedDeposits);
echo '<tr>
- <td><br /></td>
+ <td><br /></td>
</tr>
<tr class="EvenTableRows">
<td colspan="6"><b>' . _('Bank statement balance should be') . ' (' . $CurrencyRow['currcode'] . ')</b></td>
Modified: trunk/COGSGLPostings.php
===================================================================
--- trunk/COGSGLPostings.php 2012-12-18 08:41:23 UTC (rev 5764)
+++ trunk/COGSGLPostings.php 2012-12-18 23:00:00 UTC (rev 5765)
@@ -138,12 +138,12 @@
$sql = "INSERT INTO accountgroups ( groupname,
sectioninaccounts,
pandl,
- sequenceintb )
+ sequenceintb )
VALUES ('Sales',
'1',
'1',
'10')";
-
+
$result = DB_query($sql,$db);
}
$sql = "SELECT accountcode FROM chartmaster WHERE accountcode ='1'";
@@ -215,7 +215,7 @@
$myrow['id'],
htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?',
$myrow['id']);
-
+
}//END WHILE LIST LOOP
echo '</table>';
}
@@ -355,8 +355,8 @@
<div class="centre">
<input tabindex="5" type="submit" name="submit" value="' . _('Enter Information') . '" />
</div>
- </div>
+ </div>
</form>';
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/CompanyPreferences.php
===================================================================
--- trunk/CompanyPreferences.php 2012-12-18 08:41:23 UTC (rev 5764)
+++ trunk/CompanyPreferences.php 2012-12-18 23:00:00 UTC (rev 5765)
@@ -524,4 +524,4 @@
echo '</div></form>';
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/ConfirmDispatchControlled_Invoice.php
===================================================================
--- trunk/ConfirmDispatchControlled_Invoice.php 2012-12-18 08:41:23 UTC (rev 5764)
+++ trunk/ConfirmDispatchControlled_Invoice.php 2012-12-18 23:00:00 UTC (rev 5765)
@@ -19,9 +19,9 @@
}
if (isset($_GET['LineNo'])){
- $LineNo = (int)$_GET['LineNo'];
+ $LineNo = (int)$_GET['LineNo'];
} elseif (isset($_POST['LineNo'])){
- $LineNo = (int)$_POST['LineNo'];
+ $LineNo = (int)$_POST['LineNo'];
} else {
echo '<div class="centre">
<a href="' . $rootpath . '/ConfirmDispatch_Invoice.php">'. _('Select a line item to invoice').'</a>
Modified: trunk/ConfirmDispatch_Invoice.php
===================================================================
--- trunk/ConfirmDispatch_Invoice.php 2012-12-18 08:41:23 UTC (rev 5764)
+++ trunk/ConfirmDispatch_Invoice.php 2012-12-18 23:00:00 UTC (rev 5765)
@@ -116,7 +116,7 @@
$_SESSION['Items'.$identifier]->PhoneNo = $myrow['contactphone'];
$_SESSION['Items'.$identifier]->Email = $myrow['contactemail'];
$_SESSION['Items'.$identifier]->SalesPerson = $myrow['salesperson'];
-
+
$_SESSION['Items'.$identifier]->Location = $myrow['fromstkloc'];
$_SESSION['Items'.$identifier]->FreightCost = $myrow['freightcost'];
$_SESSION['Old_FreightCost'] = $myrow['freightcost'];
@@ -322,7 +322,7 @@
$_SESSION['Items'.$identifier]->totalVolume += ($LnItm->QtyDispatched * $LnItm->Volume);
$_SESSION['Items'.$identifier]->totalWeight += ($LnItm->QtyDispatched * $LnItm->Weight);
- echo $RowStarter;
+ echo $RowStarter;
echo '<td>'.$LnItm->StockID.'</td>
<td title="'. $LnItm->LongDescription . '">' .$LnItm->ItemDescription.'</td>
<td class="number">' . locale_number_format($LnItm->Quantity,$LnItm->DecimalPlaces) . '</td>
@@ -635,9 +635,9 @@
} //end of loop around items on the order for negative check
if ($NegativesFound){
- echo '</div>';
- echo '</form>';
- echo '<div class="centre">
+ echo '</div>';
+ echo '</form>';
+ echo '<div class="centre">
<input type="submit" name="Update" value="' . _('Update'). '" /></div>';
include('includes/footer.inc');
exit;
@@ -941,7 +941,7 @@
/* Need to get the current location quantity
will need it later for the stock movement */
- $SQL="SELECT locstock.quantity
+ $SQL="SELECT locstock.quantity
FROM locstock
WHERE locstock.stockid='" . $OrderLine->StockID . "'
AND loccode= '" . $_SESSION['Items'.$identifier]->Location . "'";
@@ -949,8 +949,8 @@
$Result = DB_query($SQL, $db, $ErrMsg);
if (DB_num_rows($Result)==1){
- $LocQtyRow = DB_fetch_row($Result);
- $QtyOnHandPrior = $LocQtyRow[0];
+ $LocQtyRow = DB_fetch_row($Result);
+ $QtyOnHandPrior = $LocQtyRow[0];
} else {
/* There must be some error this should never happen */
$QtyOnHandPrior = 0;
@@ -988,7 +988,7 @@
$StandardCost += ($AssParts['standard'] * $AssParts['quantity']) ;
/* Need to get the current location quantity
will need it later for the stock movement */
- $SQL="SELECT locstock.quantity
+ $SQL="SELECT locstock.quantity
FROM locstock
WHERE locstock.stockid='" . $AssParts['component'] . "'
AND loccode= '" . $_SESSION['Items'.$identifier]->Location . "'";
@@ -996,9 +996,9 @@
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('Can not retrieve assembly components location stock quantities because ');
$DbgMsg = _('The SQL that failed was');
$Result = DB_query($SQL,$db,$ErrMsg,$DbgMsg,true);
- if (DB_num_rows($Result)==1){
- $LocQtyRow = DB_fetch_row($Result);
- $QtyOnHandPrior = $LocQtyRow[0];
+ if (DB_num_rows($Result)==1){
+ $LocQtyRow = DB_fetch_row($Result);
+ $QtyOnHandPrior = $LocQtyRow[0];
} else {
/*There must be some error this should never happen */
$QtyOnHandPrior = 0;
@@ -1060,7 +1060,7 @@
$OrderLine->StandardCost=0;
}
if ($MBFlag=='B' OR $MBFlag=='M'){
- $SQL = "INSERT INTO stockmoves (stockid,
+ $SQL = "INSERT INTO stockmoves (stockid,
type,
transno,
loccode,
@@ -1091,7 +1091,7 @@
'" . ($QtyOnHandPrior - $OrderLine->QtyDispatched) . "',
'" . $OrderLine->Narrative . "' )";
} else {
- // its an assembly or dummy and assemblies/dummies always have nil stock (by definition they are made up at the time of dispatch so new qty on hand will be nil
+ // its an assembly or dummy and assemblies/dummies always have nil stock (by definition they are made up at the time of dispatch so new qty on hand will be nil
if (empty($OrderLine->StandardCost)) {
$OrderLine->StandardCost=0;
}
@@ -1157,7 +1157,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 . "'
@@ -1678,4 +1678,4 @@
echo '</form>';
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/ContractBOM.php
===================================================================
--- trunk/ContractBOM.php 2012-12-18 08:41:23 UTC (rev 5764)
+++ trunk/ContractBOM.php 2012-12-18 23:00:00 UTC (rev 5765)
@@ -399,7 +399,7 @@
}#end if SearchResults to show
echo '<hr />
- </div>
+ </div>
</form>';
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/ContractCosting.php
===================================================================
--- trunk/ContractCosting.php 2012-12-18 08:41:23 UTC (rev 5764)
+++ trunk/ContractCosting.php 2012-12-18 23:00:00 UTC (rev 5765)
@@ -51,7 +51,7 @@
$InventoryIssues[$InventoryIssuesRow['stockid']]->Units = $InventoryIssuesRow['units'];
$InventoryIssues[$InventoryIssuesRow['stockid']]->DecimalPlaces = $InventoryIssuesRow['decimalplaces'];
$InventoryIssues[$InventoryIssuesRow['stockid']]->Matched = 0;
-
+
}
echo '<p class="page_title_text">
@@ -89,7 +89,7 @@
<th>' . _('Unit Cost') . '</th>
<th>' . _('Total Cost') . '</th>
</tr>';
-
+
$ContractBOMBudget = 0;
$ContractBOMActual = 0;
foreach ($_SESSION['Contract'.$identifier]->ContractBOM as $Component) {
@@ -100,9 +100,9 @@
<td>' . $Component->UOM . '</td>
<td class="number">' . locale_...
[truncated message content] |
|
From: <dai...@us...> - 2012-12-19 06:45:08
|
Revision: 5766
http://sourceforge.net/p/web-erp/reponame/5766
Author: daintree
Date: 2012-12-19 06:45:03 +0000 (Wed, 19 Dec 2012)
Log Message:
-----------
reverse whitespace changes
Modified Paths:
--------------
trunk/AccountGroups.php
trunk/AccountSections.php
trunk/AddCustomerContacts.php
trunk/AddCustomerNotes.php
trunk/AddCustomerTypeNotes.php
trunk/AgedDebtors.php
trunk/AgedSuppliers.php
trunk/Areas.php
trunk/AuditTrail.php
trunk/BOMExtendedQty.php
trunk/BOMIndented.php
trunk/BOMIndentedReverse.php
trunk/BOMInquiry.php
trunk/BOMListing.php
trunk/BOMs.php
trunk/BackupDatabase.php
trunk/BankAccounts.php
trunk/BankMatching.php
trunk/BankReconciliation.php
trunk/COGSGLPostings.php
trunk/CompanyPreferences.php
trunk/ConfirmDispatchControlled_Invoice.php
trunk/ConfirmDispatch_Invoice.php
trunk/ContractBOM.php
trunk/ContractCosting.php
trunk/ContractOtherReqts.php
trunk/CopyBOM.php
trunk/CounterReturns.php
trunk/CounterSales.php
trunk/CreditStatus.php
trunk/Credit_Invoice.php
trunk/Currencies.php
trunk/CustEDISetup.php
trunk/CustLoginSetup.php
trunk/CustomerAllocations.php
trunk/CustomerBranches.php
trunk/CustomerInquiry.php
trunk/CustomerReceipt.php
trunk/CustomerTransInquiry.php
trunk/CustomerTypes.php
trunk/Customers.php
trunk/DailyBankTransactions.php
trunk/DailySalesInquiry.php
trunk/DebtorsAtPeriodEnd.php
trunk/DeliveryDetails.php
trunk/Departments.php
trunk/DiscountCategories.php
trunk/DiscountMatrix.php
trunk/EDISendInvoices.php
trunk/EDISendInvoices_Reece.php
trunk/EmailConfirmation.php
trunk/EmailCustTrans.php
trunk/ExchangeRateTrend.php
trunk/Factors.php
trunk/FixedAssetCategories.php
trunk/FixedAssetDepreciation.php
trunk/FixedAssetItems.php
trunk/FixedAssetLocations.php
trunk/FixedAssetRegister.php
trunk/FixedAssetTransfer.php
trunk/FormDesigner.php
trunk/FreightCosts.php
trunk/GLAccountCSV.php
trunk/GLAccountInquiry.php
trunk/GLAccountReport.php
trunk/GLAccounts.php
trunk/GLBalanceSheet.php
trunk/GLBudgets.php
trunk/GLCodesInquiry.php
trunk/GLJournal.php
trunk/GLProfit_Loss.php
trunk/GLTagProfit_Loss.php
trunk/GLTags.php
trunk/GLTrialBalance.php
trunk/GLTrialBalance_csv.php
trunk/GeocodeSetup.php
trunk/GetStockImage.php
trunk/GoodsReceived.php
trunk/InternalStockCategoriesByRole.php
trunk/InternalStockRequest.php
trunk/InternalStockRequestAuthorisation.php
trunk/InternalStockRequestFulfill.php
trunk/InventoryPlanning.php
trunk/InventoryPlanningPrefSupplier.php
trunk/InventoryQuantities.php
trunk/InventoryValuation.php
trunk/Locations.php
trunk/MRP.php
trunk/MRPCalendar.php
trunk/MRPCreateDemands.php
trunk/MRPDemandTypes.php
trunk/MRPDemands.php
trunk/MRPPlannedPurchaseOrders.php
trunk/MRPPlannedWorkOrders.php
trunk/MRPReport.php
trunk/MRPReschedules.php
trunk/MRPShortages.php
trunk/NoSalesItems.php
trunk/OffersReceived.php
trunk/OutstandingGRNs.php
trunk/PDFBankingSummary.php
trunk/PDFChequeListing.php
trunk/PDFCustTransListing.php
trunk/PDFCustomerList.php
trunk/PDFDIFOT.php
trunk/PDFDeliveryDifferences.php
trunk/PDFGLJournal.php
trunk/PDFGrn.php
trunk/PDFLowGP.php
trunk/PDFOrderStatus.php
trunk/PDFOrdersInvoiced.php
trunk/PDFPeriodStockTransListing.php
trunk/PDFPickingList.php
trunk/PDFPriceList.php
trunk/PDFPrintLabel.php
trunk/PDFQuotation.php
trunk/PDFQuotationPortrait.php
trunk/PDFReceipt.php
trunk/PDFRemittanceAdvice.php
trunk/PDFStockCheckComparison.php
trunk/PDFStockLocTransfer.php
trunk/PDFStockNegatives.php
trunk/PDFStockTransfer.php
trunk/PDFSuppTransListing.php
trunk/POReport.php
trunk/PO_AuthorisationLevels.php
trunk/PO_AuthoriseMyOrders.php
trunk/PO_Chk_ShiptRef_JobRef.php
trunk/PO_Header.php
trunk/PO_Items.php
trunk/PO_OrderDetails.php
trunk/PO_PDFPurchOrder.php
trunk/PO_SelectOSPurchOrder.php
trunk/PO_SelectPurchOrder.php
trunk/PageSecurity.php
trunk/PaymentMethods.php
trunk/PaymentTerms.php
trunk/Payments.php
trunk/PcAssignCashToTab.php
trunk/PcAuthorizeExpenses.php
trunk/PcClaimExpensesFromTab.php
trunk/PcExpenses.php
trunk/PcExpensesTypeTab.php
trunk/PcReportTab.php
trunk/PcTabs.php
trunk/PcTypeTabs.php
trunk/PeriodsInquiry.php
trunk/Prices.php
trunk/PricesBasedOnMarkUp.php
trunk/PricesByCost.php
trunk/Prices_Customer.php
trunk/PrintCheque.php
trunk/PrintCustOrder.php
trunk/PrintCustOrder_generic.php
trunk/PrintCustStatements.php
trunk/PrintCustTrans.php
trunk/PrintCustTransPortrait.php
trunk/PurchData.php
trunk/RecurringSalesOrders.php
trunk/ReorderLevel.php
trunk/ReorderLevelLocation.php
trunk/ReprintGRN.php
trunk/ReverseGRN.php
trunk/SMTPServer.php
trunk/SalesAnalReptCols.php
trunk/SalesAnalRepts.php
trunk/SalesByTypePeriodInquiry.php
trunk/SalesCategories.php
trunk/SalesCategoryPeriodInquiry.php
trunk/SalesGLPostings.php
trunk/SalesGraph.php
trunk/SalesInquiry.php
trunk/SalesPeople.php
trunk/SalesTopItemsInquiry.php
trunk/SalesTypes.php
trunk/SecurityTokens.php
trunk/SelectAsset.php
trunk/SelectCompletedOrder.php
trunk/SelectContract.php
trunk/SelectCreditItems.php
trunk/SelectCustomer.php
trunk/SelectGLAccount.php
trunk/SelectOrderItems.php
trunk/SelectProduct.php
trunk/SelectRecurringSalesOrder.php
trunk/SelectSalesOrder.php
trunk/SelectSupplier.php
trunk/SelectWorkOrder.php
trunk/ShipmentCosting.php
trunk/Shipments.php
trunk/Shippers.php
trunk/Shipt_Select.php
trunk/ShiptsList.php
trunk/SpecialOrder.php
trunk/StockAdjustments.php
trunk/StockAdjustmentsControlled.php
trunk/StockCategories.php
trunk/StockCheck.php
trunk/StockCostUpdate.php
trunk/StockCounts.php
trunk/StockLocMovements.php
trunk/StockLocStatus.php
trunk/StockLocTransfer.php
trunk/StockLocTransferReceive.php
trunk/StockMovements.php
trunk/StockQties_csv.php
trunk/StockQuantityByDate.php
trunk/StockReorderLevel.php
trunk/StockSerialItems.php
trunk/StockStatus.php
trunk/StockTransfers.php
trunk/StockUsage.php
trunk/Stocks.php
trunk/SuppContractChgs.php
trunk/SuppCreditGRNs.php
trunk/SuppFixedAssetChgs.php
trunk/SuppInvGRNs.php
trunk/SuppLoginSetup.php
trunk/SuppPaymentRun.php
trunk/SuppPriceList.php
trunk/SuppShiptChgs.php
trunk/SuppTransGLAnalysis.php
trunk/SupplierAllocations.php
trunk/SupplierBalsAtPeriodEnd.php
trunk/SupplierContacts.php
trunk/SupplierCredit.php
trunk/SupplierInquiry.php
trunk/SupplierInvoice.php
trunk/SupplierPriceList.php
trunk/SupplierTenderCreate.php
trunk/SupplierTenders.php
trunk/SupplierTransInquiry.php
trunk/SupplierTypes.php
trunk/Suppliers.php
trunk/SystemParameters.php
trunk/Tax.php
trunk/TaxAuthorities.php
trunk/TaxAuthorityRates.php
trunk/TaxCategories.php
trunk/TaxGroups.php
trunk/TaxProvinces.php
trunk/TopItems.php
trunk/UnitsOfMeasure.php
trunk/UpgradeDatabase.php
trunk/UserSettings.php
trunk/WOSerialNos.php
trunk/WWW_Access.php
trunk/WWW_Users.php
trunk/WhereUsedInquiry.php
trunk/WorkCentres.php
trunk/WorkOrderCosting.php
trunk/WorkOrderEntry.php
trunk/WorkOrderIssue.php
trunk/WorkOrderReceive.php
trunk/Z_BottomUpCosts.php
trunk/Z_ChangeBranchCode.php
trunk/Z_ChangeLocationCode.php
trunk/Z_ChangeStockCode.php
trunk/Z_CheckDebtorsControl.php
trunk/Z_CheckGLTransBalance.php
trunk/Z_CreateCompanyTemplateFile.php
trunk/Z_CurrencyDebtorsBalances.php
trunk/Z_CurrencySuppliersBalances.php
trunk/Z_DataExport.php
trunk/Z_DeleteCreditNote.php
trunk/Z_DeleteInvoice.php
trunk/Z_DeleteOldPrices.php
trunk/Z_DeleteSalesTransActions.php
trunk/Z_ImportChartOfAccounts.php
trunk/Z_ImportFixedAssets.php
trunk/Z_ImportGLAccountGroups.php
trunk/Z_ImportGLAccountSections.php
trunk/Z_ImportPartCodes.php
trunk/Z_ImportStocks.php
trunk/Z_MakeNewCompany.php
trunk/Z_MakeStockLocns.php
trunk/Z_RePostGLFromPeriod.php
trunk/Z_ReverseSuppPaymentRun.php
trunk/Z_UpdateChartDetailsBFwd.php
trunk/Z_Upgrade3.10.php
trunk/Z_Upgrade_3.01-3.02.php
trunk/Z_Upgrade_3.04-3.05.php
trunk/Z_Upgrade_3.05-3.06.php
trunk/Z_Upgrade_3.07-3.08.php
trunk/Z_Upgrade_3.08-3.09.php
trunk/Z_Upgrade_3.09-3.10.php
trunk/Z_Upgrade_3.10-3.11.php
trunk/Z_Upgrade_3.11-4.00.php
trunk/Z_poAdmin.php
trunk/Z_poEditLangHeader.php
trunk/Z_poEditLangModule.php
trunk/Z_poEditLangRemaining.php
trunk/Z_poRebuildDefault.php
trunk/geo_displaymap_customers.php
trunk/geocode.php
trunk/includes/Add_SerialItems.php
trunk/includes/Add_SerialItemsOut.php
trunk/includes/ConnectDB.inc
trunk/includes/ConnectDB_mysql.inc
trunk/includes/ConnectDB_mysqli.inc
trunk/includes/ConnectDB_postgres.inc
trunk/includes/ConstructSQLForUserDefinedSalesReport.inc
trunk/includes/CountriesArray.php
trunk/includes/DateFunctions.inc
trunk/includes/DefineCartClass.php
trunk/includes/DefineContractClass.php
trunk/includes/DefineJournalClass.php
trunk/includes/DefineLabelClass.php
trunk/includes/DefineOfferClass.php
trunk/includes/DefineReceiptClass.php
trunk/includes/DefineSpecialOrderClass.php
trunk/includes/DefineStockAdjustment.php
trunk/includes/DefineStockTransfers.php
trunk/includes/DefineSuppAllocsClass.php
trunk/includes/DefineSuppTransClass.php
trunk/includes/DefineTenderClass.php
trunk/includes/EDIconfig.inc
trunk/includes/FreightCalculation.inc
trunk/includes/GetConfig.php
trunk/includes/GetSalesTransGLCodes.inc
trunk/includes/InputSerialItems.php
trunk/includes/InputSerialItemsExisting.php
trunk/includes/InputSerialItemsKeyed.php
trunk/includes/InputSerialItemsSequential.php
trunk/includes/LanguageSetup.php
trunk/includes/LanguagesArray.php
trunk/includes/Login.php
trunk/includes/MiscFunctions.php
trunk/includes/OutputSerialItems.php
trunk/includes/PDFAgedDebtorsPageHeader.inc
trunk/includes/PDFDeliveryDifferencesPageHeader.inc
trunk/includes/PDFOrderPageHeader_generic.inc
trunk/includes/PDFOrderStatusPageHeader.inc
trunk/includes/PDFOrdersInvoicedPageHeader.inc
trunk/includes/PDFPaymentRun_PymtFooter.php
trunk/includes/PDFProfitAndLossPageHeader.inc
trunk/includes/PDFSalesAnalPageHeader.inc
trunk/includes/PDFSalesAnalysis.inc
trunk/includes/PDFSalesOrder_generic.inc
trunk/includes/PDFStarter.php
trunk/includes/PDFStatementPageHeader.inc
trunk/includes/PDFTopItemsHeader.inc
trunk/includes/PDFTransPageHeader.inc
trunk/includes/PDFTransPageHeaderPortrait.inc
trunk/includes/PDFTrialBalancePageHeader.inc
trunk/includes/PO_ReadInOrder.inc
trunk/includes/PO_UnsetFormVbls.php
trunk/includes/SelectOrderItems_IntoCart.inc
trunk/includes/Z_POSDataCreation.php
trunk/includes/class.pdf.php
trunk/includes/footer.inc
trunk/includes/header.inc
trunk/includes/htmlMimeMail.php
trunk/includes/session.inc
trunk/index.php
trunk/report_runner.php
Modified: trunk/AccountGroups.php
===================================================================
--- trunk/AccountGroups.php 2012-12-18 23:00:00 UTC (rev 5765)
+++ trunk/AccountGroups.php 2012-12-19 06:45:03 UTC (rev 5766)
@@ -63,7 +63,7 @@
$i=1;
$sql="SELECT count(groupname)
- FROM accountgroups
+ FROM accountgroups
WHERE groupname='".$_POST['GroupName']."'";
$DbgMsg = _('The SQL that was used to retrieve the information was');
@@ -191,7 +191,7 @@
prnMsg( _('Cannot delete this account group because general ledger accounts have been created using this group'),'warn');
echo '<br />' . _('There are') . ' ' . $myrow['groups'] . ' ' . _('general ledger accounts that refer to this account group');
echo '<br /><form method="post" id="AccountGroups" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">';
-
+
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<table class="selection">';
echo '<input type="hidden" name="OriginalAccountGroup" value="' . $_GET['SelectedAccountGroup'] . '" />';
@@ -313,7 +313,7 @@
if (!isset($_GET['delete'])) {
echo '<form method="post" id="AccountGroups" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">';
- echo '<div><br />';
+ echo '<div><br />';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (isset($_GET['SelectedAccountGroup'])) {
@@ -347,10 +347,10 @@
echo '<tr>
<th colspan="2">' . _('Edit Account Group Details') . '</th>
</tr>';
- echo '<tr>
- <td><input type="hidden" name="SelectedAccountGroup" value="' . $_GET['SelectedAccountGroup'] . '" /></td>
- <td><input type="hidden" name="GroupName" value="' . $_POST['GroupName'] . '" /></td>
- </tr>';
+ echo '<tr>
+ <td><input type="hidden" name="SelectedAccountGroup" value="' . $_GET['SelectedAccountGroup'] . '" /></td>
+ <td><input type="hidden" name="GroupName" value="' . $_POST['GroupName'] . '" /></td>
+ </tr>';
echo '<tr>
<td>' . _('Account Group') . ':' . '</td>
@@ -358,7 +358,7 @@
</tr>';
} elseif (!isset($_POST['MoveGroup'])) { //end of if $_POST['SelectedAccountGroup'] only do the else when a new record is being entered
-
+
if (!isset($_POST['SelectedAccountGroup'])){
$_POST['SelectedAccountGroup']='';
}
@@ -379,10 +379,10 @@
echo '<tr>
<th colspan="2">' . _('New Account Group Details') . '</th>
</tr>';
+ echo '<tr>
+ <td><input type="hidden" name="SelectedAccountGroup" value="' . $_POST['SelectedAccountGroup'] . '" /></td>
+ </tr>';
echo '<tr>
- <td><input type="hidden" name="SelectedAccountGroup" value="' . $_POST['SelectedAccountGroup'] . '" /></td>
- </tr>';
- echo '<tr>
<td>' . _('Account Group Name') . ':' . '</td>
<td><input tabindex="1" ' . (in_array('GroupName',$Errors) ? 'class="inputerror"' : '' ) .' type="text" name="GroupName" size="50" maxlength="50" value="' . $_POST['GroupName'] . '" /></td>
</tr>';
@@ -455,7 +455,7 @@
echo '</table><br />';
echo '<script type="text/javascript">defaultControl(document.forms[0].GroupName);</script>';
- echo '</div>';
+ echo '</div>';
echo '</form>';
} //end if record deleted no point displaying form to add record
Modified: trunk/AccountSections.php
===================================================================
--- trunk/AccountSections.php 2012-12-18 23:00:00 UTC (rev 5765)
+++ trunk/AccountSections.php 2012-12-19 06:45:03 UTC (rev 5766)
@@ -126,9 +126,9 @@
$myrow = DB_fetch_array($result);
if ($myrow['sections']>0) {
prnMsg( _('Cannot delete this account section because general ledger accounts groups have been created using this section'),'warn');
- echo '<div>';
+ echo '<div>';
echo '<br />' . _('There are') . ' ' . $myrow['sections'] . ' ' . _('general ledger accounts groups that refer to this account section');
- echo '</div>';
+ echo '</div>';
} else {
//Fetch section name
@@ -205,7 +205,7 @@
if (! isset($_GET['delete'])) {
echo '<form method="post" id="AccountSections" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">';
- echo '<div><br />';
+ echo '<div><br />';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (isset($_GET['SelectedSectionID'])) {
@@ -266,7 +266,7 @@
} else {
echo '<script type="text/javascript">defaultControl(document.AccountSections.SectionName);</script>';
}
- echo '</div>';
+ echo '</div>';
echo '</form>';
} //end if record deleted no point displaying form to add record
Modified: trunk/AddCustomerContacts.php
===================================================================
--- trunk/AddCustomerContacts.php 2012-12-18 23:00:00 UTC (rev 5765)
+++ trunk/AddCustomerContacts.php 2012-12-19 06:45:03 UTC (rev 5766)
@@ -171,7 +171,7 @@
if (!isset($_GET['delete'])) {
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?DebtorNo='.$DebtorNo.'">';
- echo '<div>';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (isset($Id)) {
@@ -253,7 +253,7 @@
} else {
echo '<td><textarea name="ContactNotes" rows="3" cols="40"></textarea></td>';
}
- echo '</tr>';
+ echo '</tr>';
echo '<tr>
<td colspan="2">
<div class="centre">
@@ -262,7 +262,7 @@
</td>
</tr>
</table>
- </div>
+ </div>
</form>';
} //end if record deleted no point displaying form to add record
Modified: trunk/AddCustomerNotes.php
===================================================================
--- trunk/AddCustomerNotes.php 2012-12-18 23:00:00 UTC (rev 5765)
+++ trunk/AddCustomerNotes.php 2012-12-19 06:45:03 UTC (rev 5766)
@@ -162,7 +162,7 @@
if (!isset($_GET['delete'])) {
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?DebtorNo=' . $DebtorNo . '">';
- echo '<div>';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (isset($Id)) {
@@ -244,7 +244,7 @@
</td>
</tr>
</table>
- </div>
+ </div>
</form>';
} //end if record deleted no point displaying form to add record
Modified: trunk/AddCustomerTypeNotes.php
===================================================================
--- trunk/AddCustomerTypeNotes.php 2012-12-18 23:00:00 UTC (rev 5765)
+++ trunk/AddCustomerTypeNotes.php 2012-12-19 06:45:03 UTC (rev 5766)
@@ -154,7 +154,7 @@
if (!isset($_GET['delete'])) {
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?DebtorType='.$DebtorType.'">';
- echo '<div>';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (isset($Id)) {
@@ -220,7 +220,7 @@
<div class="centre">
<input type="submit" name="submit" value="'. _('Enter Information').'" />
</div>
- </div>
+ </div>
</form>';
} //end if record deleted no point displaying form to add record
Modified: trunk/AgedDebtors.php
===================================================================
--- trunk/AgedDebtors.php 2012-12-18 23:00:00 UTC (rev 5765)
+++ trunk/AgedDebtors.php 2012-12-19 06:45:03 UTC (rev 5766)
@@ -448,7 +448,7 @@
/*if $FromCriteria is not set then show a form to allow input */
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post">
- <div>
+ <div>
<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
<table class="selection">
<tr>
@@ -510,8 +510,8 @@
<div class="centre">
<input tabindex="7" type="submit" name="PrintPDF" value="' . _('Print PDF') , '" />
</div>
- </div>
- </form>';
+ </div>
+ </form>';
}
include('includes/footer.inc');
} /*end of else not PrintPDF */
Modified: trunk/AgedSuppliers.php
===================================================================
--- trunk/AgedSuppliers.php 2012-12-18 23:00:00 UTC (rev 5765)
+++ trunk/AgedSuppliers.php 2012-12-19 06:45:03 UTC (rev 5766)
@@ -280,7 +280,7 @@
/*if $FromCriteria is not set then show a form to allow input */
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post">
- <div>
+ <div>
<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
<table class="selection">
<tr>
@@ -326,10 +326,10 @@
<div class="centre">
<input tabindex="6" type="submit" name="PrintPDF" value="' . _('Print PDF') . '" />
</div>
- </div>
- </form>';
+ </div>
+ </form>';
}
include('includes/footer.inc');
} /*end of else not PrintPDF */
-?>
\ No newline at end of file
+?>
Modified: trunk/Areas.php
===================================================================
--- trunk/Areas.php 2012-12-18 23:00:00 UTC (rev 5765)
+++ trunk/Areas.php 2012-12-19 06:45:03 UTC (rev 5766)
@@ -180,7 +180,7 @@
if (!isset($_GET['delete'])) {
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">';
- echo '<div><br />';
+ echo '<div><br />';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (isset($SelectedArea)) {
@@ -231,7 +231,7 @@
</td>
</tr>
</table>
- </div>
+ </div>
</form>';
} //end if record deleted no point displaying form to add record
Modified: trunk/AuditTrail.php
===================================================================
--- trunk/AuditTrail.php 2012-12-18 23:00:00 UTC (rev 5765)
+++ trunk/AuditTrail.php 2012-12-19 06:45:03 UTC (rev 5766)
@@ -117,7 +117,7 @@
$SQLString = str_replace('SET','',$SQLString);
$SQLString = str_replace('WHERE',',',$SQLString);
$SQLString = str_replace('AND',',',$SQLString);
- $FieldArray = preg_split("/[[:space:]]*([[:alnum:].]+[[:space:]]*=[[:space:]]*(?:'[^']*'|[[:digit:].]+))[[:space:]]*,/", $SQLString, 0, PREG_SPLIT_DELIM_CAPTURE|PREG_SPLIT_NO_EMPTY);
+ $FieldArray = preg_split("/[[:space:]]*([[:alnum:].]+[[:space:]]*=[[:space:]]*(?:'[^']*'|[[:digit:].]+))[[:space:]]*,/", $SQLString, 0, PREG_SPLIT_DELIM_CAPTURE|PREG_SPLIT_NO_EMPTY);
for ($i=0; $i<sizeof($FieldArray); $i++) {
$Assigment = explode('=', $FieldArray[$i]);
$_SESSION['SQLString']['fields'][$i] = $Assigment[0];
@@ -138,11 +138,11 @@
$_SESSION['SQLString']['fields'][0] = $Assigment[0];
$_SESSION['SQLString']['values'][0] = $Assigment[1];
}
-
+
if (mb_strlen($ContainingText) > 0) {
- $ContainingText = " AND querystring LIKE '%" . $ContainingText . "%' ";
+ $ContainingText = " AND querystring LIKE '%" . $ContainingText . "%' ";
}else{
- $ContainingText = "";
+ $ContainingText = "";
}
if ($_POST['SelectedUser'] == 'ALL') {
Modified: trunk/BOMExtendedQty.php
===================================================================
--- trunk/BOMExtendedQty.php 2012-12-18 23:00:00 UTC (rev 5765)
+++ trunk/BOMExtendedQty.php 2012-12-19 06:45:03 UTC (rev 5766)
@@ -14,7 +14,7 @@
$FontSize=9;
$PageNumber=1;
$line_height=12;
- PrintHeader($pdf,$YPos,$PageNumber,$Page_Height,$Top_Margin,$Left_Margin,$Page_Width,$Right_Margin);
+ PrintHeader($pdf,$YPos,$PageNumber,$Page_Height,$Top_Margin,$Left_Margin,$Page_Width,$Right_Margin);
if (!$_POST['Quantity'] or !is_numeric(filter_number_format($_POST['Quantity']))) {
$_POST['Quantity'] = 1;
@@ -250,8 +250,8 @@
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'</p><br />';
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
- <div>
- <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
+ <div>
+ <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
<table class="selection">
<tr>
<td>' . _('Part') . ':</td>
@@ -282,8 +282,8 @@
<br />
<input type="submit" name="PrintPDF" value="' . _('Print PDF') . '" />
</div>
- </div>
- </form>';
+ </div>
+ </form>';
include('includes/footer.inc');
Modified: trunk/BOMIndented.php
===================================================================
--- trunk/BOMIndented.php 2012-12-18 23:00:00 UTC (rev 5765)
+++ trunk/BOMIndented.php 2012-12-19 06:45:03 UTC (rev 5766)
@@ -11,7 +11,7 @@
include('includes/PDFStarter.php');
$pdf->addInfo('Title',_('Indented BOM Listing'));
$pdf->addInfo('Subject',_('Indented BOM Listing'));
- $FontSize=9;
+ $FontSize=9;
$PageNumber=1;
$line_height=12;
@@ -49,7 +49,7 @@
CONCAT(bom.parent,bom.component) AS sortpart
FROM bom
WHERE bom.parent ='" . $_POST['Part'] . "'
- AND bom.effectiveto >= NOW()
+ AND bom.effectiveto >= NOW()
AND bom.effectiveafter <= NOW()";
$result = DB_query($sql,$db);
@@ -76,7 +76,7 @@
bom.quantity
FROM bom
WHERE bom.parent ='" . $_POST['Part'] . "'
- AND bom.effectiveto >= NOW()
+ AND bom.effectiveto >= NOW()
AND bom.effectiveafter <= NOW()";
$result = DB_query($sql,$db);
//echo "<br />sql is $sql<br />";
@@ -132,7 +132,7 @@
CONCAT(passbom2.sortpart,bom.component) AS sortpart
FROM bom,passbom2
WHERE bom.parent = passbom2.part
- AND bom.effectiveto >= NOW()
+ AND bom.effectiveto >= NOW()
AND bom.effectiveafter <= NOW()";
$result = DB_query($sql,$db);
@@ -152,27 +152,27 @@
prnMsg( _('The Indented BOM Listing 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;
+ echo '<br />' . $sql;
}
include('includes/footer.inc');
exit;
}
- $sql = "SELECT stockmaster.stockid,
- stockmaster.description
- FROM stockmaster
- WHERE stockid = " . "'" . $_POST['Part'] . "'";
+ $sql = "SELECT stockmaster.stockid,
+ stockmaster.description
+ FROM stockmaster
+ WHERE stockid = " . "'" . $_POST['Part'] . "'";
$result = DB_query($sql,$db);
$myrow = DB_fetch_array($result,$db);
$assembly = $_POST['Part'];
$assemblydesc = $myrow['description'];
PrintHeader($pdf,$YPos,$PageNumber,$Page_Height,$Top_Margin,$Left_Margin,$Page_Width,
- $Right_Margin,$assemblydesc);
+ $Right_Margin,$assemblydesc);
- $Tot_Val=0;
- $sql = "SELECT tempbom.*,
+ $Tot_Val=0;
+ $sql = "SELECT tempbom.*,
stockmaster.description,
stockmaster.mbflag
FROM tempbom,stockmaster
@@ -184,7 +184,7 @@
$fill = false;
$pdf->SetFillColor(224,235,255);
- $ListCount = DB_num_rows($result);
+ $ListCount = DB_num_rows($result);
while ($myrow = DB_fetch_array($result,$db)){
@@ -196,7 +196,7 @@
if ($_POST['Fill'] == 'yes'){
- $fill=!$fill;
+ $fill=!$fill;
}
// Parameters for addTextWrap are defined in /includes/class.pdf.php
@@ -214,7 +214,7 @@
if ($YPos < $Bottom_Margin + $line_height){
PrintHeader($pdf,$YPos,$PageNumber,$Page_Height,$Top_Margin,$Left_Margin,$Page_Width,
- $Right_Margin,$assemblydesc);
+ $Right_Margin,$assemblydesc);
}
} /*end while loop */
@@ -224,10 +224,10 @@
if ($YPos < $Bottom_Margin + $line_height){
PrintHeader($pdf,$YPos,$PageNumber,$Page_Height,$Top_Margin,$Left_Margin,$Page_Width,
- $Right_Margin,$assemblydesc);
+ $Right_Margin,$assemblydesc);
}
- if ($ListCount == 0) {
+ if ($ListCount == 0) {
$title = _('Print Indented BOM Listing Error');
include('includes/header.inc');
prnMsg(_('There were no items for the selected assembly'),'error');
@@ -243,11 +243,11 @@
$title=_('Indented BOM Listing');
include('includes/header.inc');
- echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'</p><br />';
+ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'</p><br />';
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
- <div>
- <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
+ <div>
+ <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
<table class="selection">';
echo '<tr>
<td>' . _('Part') . ':</td>
@@ -271,11 +271,11 @@
</tr>
</table>
<div class="centre">
- <br />
+ <br />
<input type="submit" name="PrintPDF" value="' . _('Print PDF') . '" />
</div>
- </div>
- </form>';
+ </div>
+ </form>';
include('includes/footer.inc');
@@ -283,7 +283,7 @@
function PrintHeader(&$pdf,&$YPos,&$PageNumber,$Page_Height,$Top_Margin,$Left_Margin,
- $Page_Width,$Right_Margin,$assemblydesc) {
+ $Page_Width,$Right_Margin,$assemblydesc) {
$line_height=12;
/*PDF page header for Indented BOM Listing report */
Modified: trunk/BOMIndentedReverse.php
===================================================================
--- trunk/BOMIndentedReverse.php 2012-12-18 23:00:00 UTC (rev 5765)
+++ trunk/BOMIndentedReverse.php 2012-12-19 06:45:03 UTC (rev 5766)
@@ -12,7 +12,7 @@
include('includes/PDFStarter.php');
$pdf->addInfo('Title',_('Indented BOM Listing'));
$pdf->addInfo('Subject',_('Indented BOM Listing'));
- $FontSize=9;
+ $FontSize=9;
$PageNumber=1;
$line_height=12;
@@ -143,17 +143,17 @@
echo '<br />
<a href="' .$rootpath .'/index.php">' . _('Back to the menu') . '</a>';
if ($debug==1){
- echo '<br />' . $sql;
+ echo '<br />' . $sql;
}
include('includes/footer.inc');
exit;
}
- $sql = "SELECT stockmaster.stockid,
- stockmaster.description
- FROM stockmaster
- WHERE stockid = '" . $_POST['Part'] . "'";
+ $sql = "SELECT stockmaster.stockid,
+ stockmaster.description
+ FROM stockmaster
+ WHERE stockid = '" . $_POST['Part'] . "'";
$result = DB_query($sql,$db);
$myrow = DB_fetch_array($result,$db);
$Assembly = $_POST['Part'];
@@ -161,18 +161,18 @@
PrintHeader($pdf,$YPos,$PageNumber,$Page_Height,$Top_Margin,$Left_Margin,$Page_Width,$Right_Margin,$AssemblyDesc);
- $Tot_Val=0;
- $fill = false;
- $pdf->SetFillColor(224,235,255);
- $sql = "SELECT tempbom.*,
- stockmaster.description,
- stockmaster.mbflag
- FROM tempbom INNER JOIN stockmaster
- ON tempbom.parent = stockmaster.stockid
- ORDER BY sortpart";
+ $Tot_Val=0;
+ $fill = false;
+ $pdf->SetFillColor(224,235,255);
+ $sql = "SELECT tempbom.*,
+ stockmaster.description,
+ stockmaster.mbflag
+ FROM tempbom INNER JOIN stockmaster
+ ON tempbom.parent = stockmaster.stockid
+ ORDER BY sortpart";
$result = DB_query($sql,$db);
- $ListCount = DB_num_rows($result);
+ $ListCount = DB_num_rows($result);
While ($myrow = DB_fetch_array($result,$db)){
@@ -184,7 +184,7 @@
// Use to alternate between lines with transparent and painted background
if ($_POST['Fill'] == 'yes'){
- $fill=!$fill;
+ $fill=!$fill;
}
// Parameters for addTextWrap are defined in /includes/class.pdf.php
@@ -202,7 +202,7 @@
if ($YPos < $Bottom_Margin + $line_height){
PrintHeader($pdf,$YPos,$PageNumber,$Page_Height,$Top_Margin,$Left_Margin,$Page_Width,
- $Right_Margin,$AssemblyDesc);
+ $Right_Margin,$AssemblyDesc);
}
} /*end while loop */
@@ -212,7 +212,7 @@
if ($YPos < $Bottom_Margin + $line_height){
PrintHeader($pdf,$YPos,$PageNumber,$Page_Height,$Top_Margin,$Left_Margin,$Page_Width,
- $Right_Margin,$AssemblyDesc);
+ $Right_Margin,$AssemblyDesc);
}
if ($ListCount == 0) {
$title = _('Print Reverse Indented BOM Listing Error');
@@ -234,8 +234,8 @@
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' .
_('Search') . '" alt="" />' . ' ' . $title.'</p><br />';
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
- <div>
- <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
+ <div>
+ <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
<table class="selection">
<tr>
<td>' . _('Part') . ':</td>
@@ -250,11 +250,11 @@
</tr>
</table>
<div class="centre">
- <br />
+ <br />
<input type="submit" name="PrintPDF" value="' . _('Print PDF') . '" />
</div>
</div>
- </form>';
+ </form>';
include('includes/footer.inc');
@@ -262,7 +262,7 @@
function PrintHeader(&$pdf,&$YPos,&$PageNumber,$Page_Height,$Top_Margin,$Left_Margin,
- $Page_Width,$Right_Margin,$AssemblyDesc) {
+ $Page_Width,$Right_Margin,$AssemblyDesc) {
$line_height=12;
Modified: trunk/BOMInquiry.php
===================================================================
--- trunk/BOMInquiry.php 2012-12-18 23:00:00 UTC (rev 5765)
+++ trunk/BOMInquiry.php 2012-12-19 06:45:03 UTC (rev 5766)
@@ -14,7 +14,7 @@
if (!isset($_POST['StockID'])) {
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
- <div>
+ <div>
<br />
<div class="page_help_text">
'. _('Select a manufactured part') . ' (' . _('or Assembly or Kit part') . ') ' . _('to view the costed bill of materials') . '
@@ -61,9 +61,9 @@
FROM stockmaster INNER JOIN locstock
ON stockmaster.stockid = locstock.stockid
WHERE stockmaster.description " . LIKE . " '$SearchString'
- AND (stockmaster.mbflag='M'
- OR stockmaster.mbflag='K'
- OR stockmaster.mbflag='A'
+ AND (stockmaster.mbflag='M'
+ OR stockmaster.mbflag='K'
+ OR stockmaster.mbflag='A'
OR stockmaster.mbflag='G')
GROUP BY stockmaster.stockid,
stockmaster.description,
@@ -98,8 +98,8 @@
} //one of keywords or StockCode was more than a zero length string
} //end of if search
-if (isset($_POST['Search'])
- AND isset($result)
+if (isset($_POST['Search'])
+ AND isset($result)
AND !isset($SelectedParent)) {
echo '<br />
@@ -130,7 +130,7 @@
}
$tabindex=$j+4;
printf('<td><input tabindex="' .$tabindex . '" type="submit" name="StockID" value="%s" /></td>
- <td>%s</td>
+ <td>%s</td>
<td class="number">%s</td>
<td>%s</td>
</tr>',
@@ -146,23 +146,23 @@
echo '</table><br />';
}
if (!isset($_POST['StockID'])) {
- echo '</div>
- </form>';
+ echo '</div>
+ </form>';
}
if (isset($StockID) and $StockID!=""){
-
- $result = DB_query("SELECT description,
- units,
- labourcost,
- overheadcost
- FROM stockmaster
+
+ $result = DB_query("SELECT description,
+ units,
+ labourcost,
+ overheadcost
+ FROM stockmaster
WHERE stockid='" . $StockID . "'",
$db);
$myrow = DB_fetch_array($result);
$ParentLabourCost = $myrow['labourcost'];
$ParentOverheadCost = $myrow['overheadcost'];
-
+
$sql = "SELECT bom.parent,
bom.component,
stockmaster.description,
@@ -170,7 +170,7 @@
stockmaster.materialcost+ stockmaster.labourcost+stockmaster.overheadcost as standardcost,
bom.quantity,
bom.quantity * (stockmaster.materialcost+ stockmaster.labourcost+ stockmaster.overheadcost) AS componentcost
- FROM bom INNER JOIN stockmaster
+ FROM bom INNER JOIN stockmaster
ON bom.component = stockmaster.stockid
WHERE bom.parent = '" . $StockID . "'
AND bom.effectiveafter < Now()
@@ -237,7 +237,7 @@
$j++;
}
-
+
$TotalCost += $ParentLabourCost;
echo '<tr>
<td colspan="4" class="number"><b>' . _('Labour Cost') . '</b></td>
Modified: trunk/BOMListing.php
===================================================================
--- trunk/BOMListing.php 2012-12-18 23:00:00 UTC (rev 5765)
+++ trunk/BOMListing.php 2012-12-19 06:45:03 UTC (rev 5766)
@@ -17,7 +17,7 @@
$PageNumber=0;
$line_height=12;
- /*Now figure out the bills to report for the part range under review */
+ /*Now figure out the bills to report for the part range under review */
$SQL = "SELECT bom.parent,
bom.component,
stockmaster.description as compdescription,
@@ -43,7 +43,7 @@
prnMsg(_('The Bill of Material listing could not be retrieved by the SQL because'),'error');
echo '<br /><a href="' .$rootpath .'/index.php">' . _('Back to the menu') . '</a>';
if ($debug==1){
- echo '<br />' . $SQL;
+ echo '<br />' . $SQL;
}
include('includes/footer.inc');
exit;
@@ -98,10 +98,10 @@
$YPos -=$line_height;
$pdf->line($Page_Width-$Right_Margin, $YPos,$Left_Margin, $YPos);
+
+ $pdf->OutputD($_SESSION['DatabaseName'] . '_BOMListing_' . date('Y-m-d').'.pdf');
+ $pdf->__destruct();
- $pdf->OutputD($_SESSION['DatabaseName'] . '_BOMListing_' . date('Y-m-d').'.pdf');
- $pdf->__destruct();
-
} else { /*The option to print PDF was not hit */
$title=_('Bill Of Material Listing');
@@ -113,8 +113,8 @@
/*if $FromCriteria is not set then show a form to allow input */
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
- <div>
- <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
+ <div>
+ <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
<table class="selection">';
echo '<tr><td>' . _('From Inventory Part Code') . ':' . '</td>
@@ -128,8 +128,8 @@
echo '</table>
<br /><div class="centre"><input tabindex="3" type="submit" name="PrintPDF" value="' . _('Print PDF') . '" /></div>
- </div>
- </form>';
+ </div>
+ </form>';
echo '<script type="text/javascript">defaultControl(document.forms[0].FromCriteria);</script>';
}
include('includes/footer.inc');
Modified: trunk/BOMs.php
===================================================================
--- trunk/BOMs.php 2012-12-18 23:00:00 UTC (rev 5765)
+++ trunk/BOMs.php 2012-12-19 06:45:03 UTC (rev 5766)
@@ -20,7 +20,7 @@
FROM bom WHERE parent='" . $Parent. "'"
,$db);
if (DB_num_rows($c_result) > 0) {
-
+
while ($row = DB_fetch_array($c_result)) {
//echo '<br />Parent: ' . $Parent . ' Level: ' . $Level . ' row[component]: ' . $row['component'] .'<br />';
if ($Parent != $row['component']) {
@@ -85,13 +85,13 @@
locstock.quantity AS qoh,
stockmaster.decimalplaces
FROM bom INNER JOIN stockmaster
- ON bom.component=stockmaster.stockid
- INNER JOIN locations ON
- bom.loccode = locations.loccode
- INNER JOIN workcentres
+ ON bom.component=stockmaster.stockid
+ INNER JOIN locations ON
+ bom.loccode = locations.loccode
+ INNER JOIN workcentres
ON bom.workcentreadded=workcentres.code
- INNER JOIN locstock
- ON bom.loccode=locstock.loccode
+ INNER JOIN locstock
+ ON bom.loccode=locstock.loccode
AND bom.component = locstock.stockid
WHERE bom.component='".$Component."'
AND bom.parent = '".$Parent."'";
@@ -106,10 +106,10 @@
while ($myrow=DB_fetch_array($result)) {
$Level1 = str_repeat('- ',$Level-1).$Level;
- if( $myrow['mbflag']=='B'
- OR $myrow['mbflag']=='K'
+ if( $myrow['mbflag']=='B'
+ OR $myrow['mbflag']=='K'
OR $myrow['mbflag']=='D') {
-
+
$DrillText = '%s%s';
$DrillLink = '<div class="centre">'._('No lower levels').'</div>';
$DrillID='';
@@ -132,12 +132,12 @@
OR $myrow['mbflag']=='K' //kit-set
OR $myrow['mbflag']=='A' // assembly
OR $myrow['mbflag']=='G') /* ghost */ {
-
+
$QuantityOnHand = _('N/A');
} else {
$QuantityOnHand = locale_number_format($myrow['qoh'],$myrow['decimalplaces']);
- }
-
+ }
+
printf('<td>%s</td>
<td>%s</td>
<td>%s</td>
@@ -372,8 +372,8 @@
//the link to delete a selected record was clicked instead of the Submit button
- $sql="DELETE FROM bom
- WHERE parent='".$SelectedParent."'
+ $sql="DELETE FROM bom
+ WHERE parent='".$SelectedParent."'
AND component='".$SelectedComponent."'
AND loccode='".$Location."'
AND workcentreadded='".$WorkCentre."'";
@@ -382,8 +382,8 @@
$DbgMsg = _('The SQL used to delete the BOM was');
$result = DB_query($sql,$db,$ErrMsg,$DbgMsg);
- $ComponentSQL = "SELECT component
- FROM bom
+ $ComponentSQL = "SELECT component
+ FROM bom
WHERE parent='" . $SelectedParent ."'";
$ComponentResult = DB_query($ComponentSQL,$db);
$ComponentArray = DB_fetch_row($ComponentResult);
@@ -453,7 +453,7 @@
$result=DB_query($sql,$db,$ErrMsg,$DbgMsg);
$ix = 0;
if( DB_num_rows($result) > 0 ) {
- echo '<table class="selection">';
+ echo '<table class="selection">';
echo '<tr><td><div class="centre">'._('Manufactured parent items').' : ';
while ($myrow = DB_fetch_array($result)){
echo (($ix)?', ':'').'<a href="'.htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?Select='.$myrow['parent'].'">'.
@@ -461,14 +461,14 @@
$ix++;
} //end while loop
echo '</div></td></tr>';
- echo '</table>';
+ echo '</table>';
}
// Display Assembly Parent Items
- $sql = "SELECT bom.parent,
- stockmaster.description,
+ $sql = "SELECT bom.parent,
+ stockmaster.description,
stockmaster.mbflag
FROM bom INNER JOIN stockmaster
- ON bom.parent=stockmaster.stockid
+ ON bom.parent=stockmaster.stockid
WHERE bom.component='".$SelectedParent."'
AND stockmaster.mbflag='A'";
@@ -476,7 +476,7 @@
$DbgMsg = _('The SQL used to retrieve description of the parent part was');
$result=DB_query($sql,$db,$ErrMsg,$DbgMsg);
if( DB_num_rows($result) > 0 ) {
- echo '<table class="selection">';
+ echo '<table class="selection">';
echo '<tr><td><div class="centre">'._('Assembly parent items').' : ';
$ix = 0;
while ($myrow = DB_fetch_array($result)){
@@ -485,14 +485,14 @@
$ix++;
} //end while loop
echo '</div></td></tr>';
- echo '</table>';
+ echo '</table>';
}
// Display Kit Sets
- $sql = "SELECT bom.parent,
- stockmaster.description,
+ $sql = "SELECT bom.parent,
+ stockmaster.description,
stockmaster.mbflag
FROM bom INNER JOIN stockmaster
- ON bom.parent=stockmaster.stockid
+ ON bom.parent=stockmaster.stockid
WHERE bom.component='".$SelectedParent."'
AND stockmaster.mbflag='K'";
@@ -500,7 +500,7 @@
$DbgMsg = _('The SQL used to retrieve description of the parent part was');
$result=DB_query($sql,$db,$ErrMsg,$DbgMsg);
if( DB_num_rows($result) > 0 ) {
- echo '<table class="selection">';
+ echo '<table class="selection">';
echo '<tr><td><div class="centre">'._('Kit sets').' : ';
$ix = 0;
while ($myrow = DB_fetch_array($result)){
@@ -509,14 +509,14 @@
$ix++;
} //end while loop
echo '</div></td></tr>';
- echo '</table>';
+ echo '</table>';
}
// Display Phantom/Ghosts
- $sql = "SELECT bom.parent,
- stockmaster.description,
+ $sql = "SELECT bom.parent,
+ stockmaster.description,
stockmaster.mbflag
FROM bom INNER JOIN stockmaster
- ON bom.parent=stockmaster.stockid
+ ON bom.parent=stockmaster.stockid
WHERE bom.component='".$SelectedParent."'
AND stockmaster.mbflag='G'";
@@ -525,7 +525,7 @@
$result=DB_query($sql,$db,$ErrMsg,$DbgMsg);
if( DB_num_rows($result) > 0 ) {
echo '<table class="selection">';
- echo '<tr><td><div class="centre">'._('Phantom').' : ';
+ echo '<tr><td><div class="centre">'._('Phantom').' : ';
$ix = 0;
while ($myrow = DB_fetch_array($result)){
echo (($ix)?', ':'').'<a href="'.htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?Select='.$myrow['parent'].'">'.
@@ -533,7 +533,7 @@
$ix++;
} //end while loop
echo '</div></td></tr>';
- echo '</table>';
+ echo '</table>';
}
echo '<br />
<table class="selection">';
@@ -589,7 +589,7 @@
if (! isset($_GET['delete'])) {
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?Select=' . $SelectedParent .'">';
- echo '<div>';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (isset($_GET['SelectedComponent']) and $InputError !=1) {
@@ -601,7 +601,7 @@
workcentreadded,
quantity,
autoissue
- FROM bom
+ FROM bom
WHERE parent='".$SelectedParent."'
AND component='".$SelectedComponent."'";
@@ -784,7 +784,7 @@
echo '</table>
<br /><div class="centre"><input tabindex="8" type="submit" name="Submit" value="' . _('Enter Information') . '" />
</div>
- </div>
+ </div>
</form>';
} //end if record deleted no point displaying form to add record
@@ -858,9 +858,9 @@
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . $title . '</p>';
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">' .
'<div class="page_help_text">'. _('Select a manufactured part') . ' (' . _('or Assembly or Kit part') . ') ' . _('to maintain the bill of material for using the options below') . '<br />' . _('Parts must be defined in the stock item entry') . '/' . _('modification screen as manufactured') . ', ' . _('kits or assemblies to be available for construction of a bill of material') .'</div>'. '
- <div>
- <br />
- <table class="selection" cellpadding="3">
+ <div>
+ <br />
+ <table class="selection" cellpadding="3">
<tr><td>' . _('Enter text extracts in the') . ' <b>' . _('description') . '</b>:</td>
<td><input tabindex="1" type="text" name="Keywords" size="20" maxlength="25" /></td>
<td><b>' . _('OR') . '</b></td>
@@ -871,10 +871,10 @@
<br /><div class="centre"><input tabindex="3" type="submit" name="Search" value="' . _('Search Now') . '" /></div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- if (isset($_POST['Search'])
- AND isset($result)
+ if (isset($_POST['Search'])
+ AND isset($result)
AND !isset($SelectedParent)) {
-
+
echo '<br />
<table cellpadding="2" class="selection">';
$TableHeader = '<tr>
@@ -883,9 +883,9 @@
<th>' . _('On Hand') . '</th>
<th>' . _('Units') . '</th>
</tr>';
-
+
echo $TableHeader;
-
+
$j = 1;
$k=0; //row colour counter
while ($myrow=DB_fetch_array($result)) {
@@ -911,17 +911,17 @@
$myrow['description'],
$StockOnHand,
$myrow['units']);
-
+
$j++;
//end of page full new headings if
}
//end of while loop
-
+
echo '</table>';
-
+
}
//end if results to show
-
+
if (!isset($SelectedParent) or $SelectedParent=='') {
echo '<script type="text/javascript">defaultControl(document.forms[0].StockCode);</script>';
} else {
@@ -941,7 +941,7 @@
foreach($array as $key => $item) {
// Serialize the current element and create a md5 hash
$hash = md5(serialize($item));
- // If the md5 didn't come up yet, add the element to
+ // If the md5 didn't come up yet, add the element to
// arrayRewrite, otherwise drop it
if (!isset($arrayHashes[$hash])) {
// Save the current element hash
@@ -958,4 +958,4 @@
}
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/BackupDatabase.php
===================================================================
--- trunk/BackupDatabase.php 2012-12-18 23:00:00 UTC (rev 5765)
+++ trunk/BackupDatabase.php 2012-12-19 06:45:03 UTC (rev 5766)
@@ -11,11 +11,11 @@
$BackupFiles = scandir('companies/' . $_SESSION['DatabaseName'], 0);
$DeletedFiles = false;
foreach ($BackupFiles as $BackupFile){
-
+
if (mb_substr($BackupFile,0,6)=='Backup'){
-
+
$DeleteResult = unlink('companies/' . $_SESSION['DatabaseName'] . '/' . $BackupFile);
-
+
if ($DeleteResult==true){
prnMsg(_('Deleted') . ' companies/' . $_SESSION['DatabaseName'] . '/' . $BackupFile,'info');
$DeletedFiles = true;
@@ -30,15 +30,15 @@
prnMsg(_('No backup files on the server were deleted'),'info');
}
} else {
-
+
$BackupFile = $rootpath . '/companies/' . $_SESSION['DatabaseName'] .'/' . _('Backup') . '_' . Date('Y-m-d-H-i-s') . '.sql.gz';
- $Command = 'mysqldump --opt -h' . $host . ' -u' . $dbuser . ' -p' . $dbpassword . ' ' . $_SESSION['DatabaseName'] . '| gzip > ' .
+ $Command = 'mysqldump --opt -h' . $host . ' -u' . $dbuser . ' -p' . $dbpassword . ' ' . $_SESSION['DatabaseName'] . '| gzip > ' .
$_SERVER['DOCUMENT_ROOT'] . $BackupFile;
-
-
+
+
$CommandOutput = array();
exec($Command,$CommandOutput, $ReturnValue);
-
+
if ($ReturnValue ==0) {
prnMsg(_('The backup file has now been created. You must now download this to your computer because in case the web-server has a disk failure the backup would then not on the same machine. Use the link below') . '<br /><br /><a href="' . $BackupFile . '">' . _('Download the backup file to your locale machine') . '</a>','success');
prnMsg(_('Once you have downloaded the database backup file to your local machine you should use the link below to delete it - backup files can consume a lot of space on your hosting account and will accumulate if not deleted - they also contain sensitive information which would otherwise be available for others to download!'),'info');
@@ -50,7 +50,7 @@
}
}
/*
-//this could be a weighty file attachment!!
+//this could be a weighty file attachment!!
include('includes/htmlMimeMail.php');
$mail = new htmlMimeMail();
$attachment = $mail->getFile( $BackupFile);
Modified: trunk/BankAccounts.php
===================================================================
--- trunk/BankAccounts.php 2012-12-18 23:00:00 UTC (rev 5765)
+++ trunk/BankAccounts.php 2012-12-19 06:45:03 UTC (rev 5766)
@@ -318,7 +318,7 @@
$_POST['BankAccountNumber']='';
}
if (!isset($_POST['BankAccountCode'])) {
- $_POST['BankAccountCode']='';
+ $_POST['BankAccountCode']='';
}
if (!isset($_POST['BankAddress'])) {
$_POST['BankAddress']='';
Modified: trunk/BankMatching.php
===================================================================
--- trunk/BankMatching.php 2012-12-18 23:00:00 UTC (rev 5765)
+++ trunk/BankMatching.php 2012-12-19 06:45:03 UTC (rev 5766)
@@ -125,7 +125,7 @@
</tr>';
echo '<tr>
- <td>' . _('to') . ':</td>
+ <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>
</tr>';
echo '<tr>
@@ -343,4 +343,4 @@
echo '</div>';
echo '</form>';
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/BankReconciliation.php
===================================================================
--- trunk/BankReconciliation.php 2012-12-18 23:00:00 UTC (rev 5765)
+++ trunk/BankReconciliation.php 2012-12-19 06:45:03 UTC (rev 5766)
@@ -254,8 +254,8 @@
//end of while loop
echo '<tr>
- <td><br /></td>
- </tr>
+ <td><br /></td>
+ </tr>
<tr class="EvenTableRows">
<td colspan="6">' . _('Total of all unpresented cheques') . '</td>
<td class="number">' . locale_number_format($TotalUnpresentedCheques,$CurrencyRow['currdecimalplaces']) . '</td>
@@ -330,7 +330,7 @@
}
//end of while loop
echo '<tr>
- <td><br /></td>
+ <td><br /></td>
</tr>
<tr class="EvenTableRows">
<td colspan="6">' . _('Total of all uncleared deposits') . '</td>
@@ -338,7 +338,7 @@
</tr>';
$FXStatementBalance = ($Balance*$CurrencyRow['rate'] - $TotalUnpresentedCheques -$TotalUnclearedDeposits);
echo '<tr>
- <td><br /></td>
+ <td><br /></td>
</tr>
<tr class="EvenTableRows">
<td colspan="6"><b>' . _('Bank statement balance should be') . ' (' . $CurrencyRow['currcode'] . ')</b></td>
Modified: trunk/COGSGLPostings.php
===================================================================
--- trunk/COGSGLPostings.php 2012-12-18 23:00:00 UTC (rev 5765)
+++ trunk/COGSGLPostings.php 2012-12-19 06:45:03 UTC (rev 5766)
@@ -138,12 +138,12 @@
$sql = "INSERT INTO accountgroups ( groupname,
sectioninaccounts,
pandl,
- sequenceintb )
+ sequenceintb )
VALUES ('Sales',
'1',
'1',
'10')";
-
+
$result = DB_query($sql,$db);
}
$sql = "SELECT accountcode FROM chartmaster WHERE accountcode ='1'";
@@ -215,7 +215,7 @@
$myrow['id'],
htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?',
$myrow['id']);
-
+
}//END WHILE LIST LOOP
echo '</table>';
}
@@ -355,8 +355,8 @@
<div class="centre">
<input tabindex="5" type="submit" name="submit" value="' . _('Enter Information') . '" />
</div>
- </div>
+ </div>
</form>';
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/CompanyPreferences.php
===================================================================
--- trunk/CompanyPreferences.php 2012-12-18 23:00:00 UTC (rev 5765)
+++ trunk/CompanyPreferences.php 2012-12-19 06:45:03 UTC (rev 5766)
@@ -524,4 +524,4 @@
echo '</div></form>';
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/ConfirmDispatchControlled_Invoice.php
===================================================================
--- trunk/ConfirmDispatchControlled_Invoice.php 2012-12-18 23:00:00 UTC (rev 5765)
+++ trunk/ConfirmDispatchControlled_Invoice.php 2012-12-19 06:45:03 UTC (rev 5766)
@@ -19,9 +19,9 @@
}
if (isset($_GET['LineNo'])){
- $LineNo = (int)$_GET['LineNo'];
+ $LineNo = (int)$_GET['LineNo'];
} elseif (isset($_POST['LineNo'])){
- $LineNo = (int)$_POST['LineNo'];
+ $LineNo = (int)$_POST['LineNo'];
} else {
echo '<div class="centre">
<a href="' . $rootpath . '/ConfirmDispatch_Invoice.php">'. _('Select a line item to invoice').'</a>
Modified: trunk/ConfirmDispatch_Invoice.php
===================================================================
--- trunk/ConfirmDispatch_Invoice.php 2012-12-18 23:00:00 UTC (rev 5765)
+++ trunk/ConfirmDispatch_Invoice.php 2012-12-19 06:45:03 UTC (rev 5766)
@@ -116,7 +116,7 @@
$_SESSION['Items'.$identifier]->PhoneNo = $myrow['contactphone'];
$_SESSION['Items'.$identifier]->Email = $myrow['contactemail'];
$_SESSION['Items'.$identifier]->SalesPerson = $myrow['salesperson'];
-
+
$_SESSION['Items'.$identifier]->Location = $myrow['fromstkloc'];
$_SESSION['Items'.$identifier]->FreightCost = $myrow['freightcost'];
$_SESSION['Old_FreightCost'] = $myrow['freightcost'];
@@ -322,7 +322,7 @@
$_SESSION['Items'.$identifier]->totalVolume += ($LnItm->QtyDispatched * $LnItm->Volume);
$_SESSION['Items'.$identifier]->totalWeight += ($LnItm->QtyDispatched * $LnItm->Weight);
- echo $RowStarter;
+ echo $RowStarter;
echo '<td>'.$LnItm->StockID.'</td>
<td title="'. $LnItm->LongDescription . '">' .$LnItm->ItemDescription.'</td>
<td class="number">' . locale_number_format($LnItm->Quantity,$LnItm->DecimalPlaces) . '</td>
@@ -635,9 +635,9 @@
} //end of loop around items on the order for negative check
if ($NegativesFound){
- echo '</div>';
- echo '</form>';
- echo '<div class="centre">
+ echo '</div>';
+ echo '</form>';
+ echo '<div class="centre">
<input type="submit" name="Update" value="' . _('Update'). '" /></div>';
include('includes/footer.inc');
exit;
@@ -941,7 +941,7 @@
/* Need to get the current location quantity
will need it later for the stock movement */
- $SQL="SELECT locstock.quantity
+ $SQL="SELECT locstock.quantity
FROM locstock
WHERE locstock.stockid='" . $OrderLine->StockID . "'
AND loccode= '" . $_SESSION['Items'.$identifier]->Location . "'";
@@ -949,8 +949,8 @@
$Result = DB_query($SQL, $db, $ErrMsg);
if (DB_num_rows($Result)==1){
- $LocQtyRow = DB_fetch_row($Result);
- $QtyOnHandPrior = $LocQtyRow[0];
+ $LocQtyRow = DB_fetch_row($Result);
+ $QtyOnHandPrior = $LocQtyRow[0];
} else {
/* There must be some error this should never happen */
$QtyOnHandPrior = 0;
@@ -988,7 +988,7 @@
$StandardCost += ($AssParts['standard'] * $AssParts['quantity']) ;
/* Need to get the current location quantity
will need it later for the stock movement */
- $SQL="SELECT locstock.quantity
+ $SQL="SELECT locstock.quantity
FROM locstock
WHERE locstock.stockid='" . $AssParts['component'] . "'
AND loccode= '" . $_SESSION['Items'.$identifier]->Location . "'";
@@ -996,9 +996,9 @@
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('Can not retrieve assembly components location stock quantities because ');
$DbgMsg = _('The SQL that failed was');
$Result = DB_query($SQL,$db,$ErrMsg,$DbgMsg,true);
- if (DB_num_rows($Result)==1){
- $LocQtyRow = DB_fetch_row($Result);
- $QtyOnHandPrior = $LocQtyRow[0];
+ if (DB_num_rows($Result)==1){
+ $LocQtyRow = DB_fetch_row($Result);
+ $QtyOnHandPrior = $LocQtyRow[0];
} else {
/*There must be some error this should never happen */
$QtyOnHandPrior = 0;
@@ -1060,7 +1060,7 @@
$OrderLine->StandardCost=0;
}
if ($MBFlag=='B' OR $MBFlag=='M'){
- $SQL = "INSERT INTO stockmoves (stockid,
+ $SQL = "INSERT INTO stockmoves (stockid,
type,
transno,
loccode,
@@ -1091,7 +1091,7 @@
'" . ($QtyOnHandPrior - $OrderLine->QtyDispatched) . "',
'" . $OrderLine->Narrative . "' )";
} else {
- // its an assembly or dummy and assemblies/dummies always have nil stock (by definition they are made up at the time of dispatch so new qty on hand will be nil
+ // its an assembly or dummy and assemblies/dummies always have nil stock (by definition they are made up at the time of dispatch so new qty on hand will be nil
if (empty($OrderLine->StandardCost)) {
$OrderLine->StandardCost=0;
}
@@ -1157,7 +1157,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 . "'
@@ -1678,4 +1678,4 @@
echo '</form>';
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/ContractBOM.php
===================================================================
--- trunk/ContractBOM.php 2012-12-18 23:00:00 UTC (rev 5765)
+++ trunk/ContractBOM.php 2012-12-19 06:45:03 UTC (rev 5766)
@@ -399,7 +399,7 @@
}#end if SearchResults to show
echo '<hr />
- </div>
+ </div>
</form>';
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/ContractCosting.php
===================================================================
--- trunk/ContractCosting.php 2012-12-18 23:00:00 UTC (rev 5765)
+++ trunk/ContractCosting.php 2012-12-19 06:45:03 UTC (rev 5766)
@@ -51,7 +51,7 @@
$InventoryIssues[$InventoryIssuesRow['stockid']]->Units = $InventoryIssuesRow['units'];
$InventoryIssues[$InventoryIssuesRow['stockid']]->DecimalPlaces = $InventoryIssuesRow['decimalplaces'];
$InventoryIssues[$InventoryIssuesRow['stockid']]->Matched = 0;
-
+
}
echo '<p class="page_title_text">
@@ -89,7 +89,7 @@
<th>' . _('Unit Cost') . '</th>
<th>' . _('Total Cost') . '</th>
</tr>';
-
+
$ContractBOMBudget = 0;
$ContractBOMActual = 0;
foreach ($_SESSION['Contract'.$identifier]->ContractBOM as $Component) {
@@ -100,9 +100,9 @@
<td>' . $Component->UOM . '</td>
<td class="number">' . locale_number_format($Component->ItemCost,$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
<td class="n...
[truncated message content] |
|
From: <dai...@us...> - 2012-12-19 06:59:19
|
Revision: 5767
http://sourceforge.net/p/web-erp/reponame/5767
Author: daintree
Date: 2012-12-19 06:59:15 +0000 (Wed, 19 Dec 2012)
Log Message:
-----------
remerge translations - increase font size - redump DB
Modified Paths:
--------------
trunk/GLAccountInquiry.php
trunk/css/aguapop/default.css
trunk/css/default/default.css
trunk/css/fluid/default.css
trunk/css/fresh/default.css
trunk/css/gel/default.css
trunk/css/professional/default.css
trunk/css/silverwolf/default.css
trunk/css/wood/default.css
trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.mo
trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po
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_CA.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.09-4.10.sql
trunk/sql/mysql/weberp-demo.sql
trunk/sql/mysql/weberp-new.sql
Modified: trunk/GLAccountInquiry.php
===================================================================
--- trunk/GLAccountInquiry.php 2012-12-19 06:45:03 UTC (rev 5766)
+++ trunk/GLAccountInquiry.php 2012-12-19 06:59:15 UTC (rev 5767)
@@ -31,7 +31,11 @@
$DefaultPeriodDate = Date ('Y-m-d', Mktime(0,0,0,Date('m'),0,Date('Y')));
/*Show a form to allow input of criteria for TB to show */
-echo '<table class="selection"><tr><td>'._('Account').':</td><td><select name="Account">';
+echo '<table class="selection">
+ <tr>
+ <td>'._('Account').':</td>
+ <td><select name="Account">';
+
$sql = "SELECT accountcode, accountname FROM chartmaster ORDER BY accountcode";
$Account = DB_query($sql,$db);
while ($myrow=DB_fetch_array($Account,$db)){
@@ -41,10 +45,13 @@
echo '<option value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' ' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8', false) . '</option>';
}
}
-echo '</select></td></tr>';
+echo '</select></td>
+ </tr>';
//Select the tag
-echo '<tr><td>' . _('Select Tag') . ':</td><td><select name="tag">';
+echo '<tr>
+ <td>' . _('Select Tag') . ':</td>
+ <td><select name="tag">';
$SQL = "SELECT tagref,
tagdescription
@@ -53,6 +60,7 @@
$result=DB_query($SQL,$db);
echo '<option value="0">0 - '._('All tags') . '</option>';
+
while ($myrow=DB_fetch_array($result)){
if (isset($_POST['tag']) and $_POST['tag']==$myrow['tagref']){
echo '<option selected="selected" value="' . $myrow['tagref'] . '">' . $myrow['tagref'].' - ' .$myrow['tagdescription'] . '</option>';
@@ -60,9 +68,13 @@
echo '<option value="' . $myrow['tagref'] . '">' . $myrow['tagref'].' - ' .$myrow['tagdescription'] . '</option>';
}
}
-echo '</select></td></tr>';
+echo '</select></td>
+ </tr>';
// End select tag
-echo '<tr> <td>'._('For Period range').':</td><td><select name="Period[]" size="12" multiple="multiple">';
+echo '<tr>
+ <td>'._('For Period range').':</td>
+ <td><select name="Period[]" size="12" multiple="multiple">';
+
$sql = "SELECT periodno, lastdate_in_period FROM periods ORDER BY periodno DESC";
$Periods = DB_query($sql,$db);
$id=0;
@@ -74,10 +86,15 @@
echo '<option value="' . $myrow['periodno'] . '">' . _(MonthAndYearFromSQLDate($myrow['lastdate_in_period'])) . '</option>';
}
}
-echo '</select></td></tr></table>';
-echo '<br /><div class="centre"><input type="submit" name="Show" value="'._('Show Account Transactions').'" /></div>
- </div>
- </form>';
+echo '</select></td>
+ </tr>
+ </table>
+ <br />
+ <div class="centre">
+ <input type="submit" name="Show" value="'._('Show Account Transactions').'" />
+ </div>
+ </div>
+ </form>';
/* End of the Form rest of script is what happens if the show button is hit*/
@@ -105,38 +122,44 @@
if ($_POST['tag']==0) {
$sql= "SELECT type,
- typename,
- gltrans.typeno,
- trandate,
- narrative,
- amount,
- periodno,
- tag
- FROM gltrans, systypes
- WHERE gltrans.account = '" . $SelectedAccount . "'
- AND systypes.typeid=gltrans.type
- AND posted=1
- AND periodno>='" . $FirstPeriodSelected . "'
- AND periodno<='" . $LastPeriodSelected . "'
- ORDER BY periodno, gltrans.trandate, counterindex";
+ typename,
+ gltrans.typeno,
+ trandate,
+ narrative,
+ amount,
+ periodno,
+ gltrans.tag,
+ tagdescription
+ FROM gltrans INNER JOIN systypes
+ ON systypes.typeid=gltrans.type
+ LEFT JOIN tags
+ ON gltrans.tag = tags.tagref
+ WHERE gltrans.account = '" . $SelectedAccount . "'
+ AND posted=1
+ AND periodno>='" . $FirstPeriodSelected . "'
+ AND periodno<='" . $LastPeriodSelected . "'
+ ORDER BY periodno, gltrans.trandate, counterindex";
} else {
$sql= "SELECT type,
- typename,
- gltrans.typeno,
- trandate,
- narrative,
- amount,
- periodno,
- tag
- FROM gltrans, systypes
- WHERE gltrans.account = '" . $SelectedAccount . "'
- AND systypes.typeid=gltrans.type
- AND posted=1
- AND periodno>= '" . $FirstPeriodSelected . "'
- AND periodno<= '" . $LastPeriodSelected . "'
- AND tag='".$_POST['tag']."'
- ORDER BY periodno, gltrans.trandate, counterindex";
+ typename,
+ gltrans.typeno,
+ trandate,
+ narrative,
+ amount,
+ periodno,
+ gltrans.tag,
+ tagdescription
+ FROM gltrans INNER JOIN systypes
+ ON systypes.typeid=gltrans.type
+ LEFT JOIN tags
+ ON gltrans.tag = tags.tagref
+ WHERE gltrans.account = '" . $SelectedAccount . "'
+ AND posted=1
+ AND periodno>= '" . $FirstPeriodSelected . "'
+ AND periodno<= '" . $LastPeriodSelected . "'
+ AND tag='" . $_POST['tag'] . "'
+ ORDER BY periodno, gltrans.trandate, counterindex";
}
$namesql = "SELECT accountname FROM chartmaster WHERE accountcode='" . $SelectedAccount . "'";
@@ -146,51 +169,53 @@
$ErrMsg = _('The transactions for account') . ' ' . $SelectedAccount . ' ' . _('could not be retrieved because') ;
$TransResult = DB_query($sql,$db,$ErrMsg);
- echo '<br /><table class="selection">';
-
- echo '<tr><th colspan="8"><b>' ._('Transactions for account').' '.$SelectedAccount. ' - '. $SelectedAccountName.'</b></th></tr>';
+ echo '<br />
+ <table class="selection">
+ <tr>
+ <th colspan="8"><b>' ._('Transactions for account').' '.$SelectedAccount. ' - '. $SelectedAccountName.'</b></th>
+ </tr>';
+
$TableHeader = '<tr>
- <th>' . _('Type') . '</th>
- <th>' . _('Number') . '</th>
- <th>' . _('Date') . '</th>
- <th>' . _('Debit') . '</th>
- <th>' . _('Credit') . '</th>
- <th>' . _('Narrative') . '</th>
- <th>' . _('Balance') . '</th>
- <th>' . _('Tag') . '</th>
- </tr>';
-
+ <th>' . _('Type') . '</th>
+ <th>' . _('Number') . '</th>
+ <th>' . _('Date') . '</th>
+ <th>' . _('Debit') . '</th>
+ <th>' . _('Credit') . '</th>
+ <th>' . _('Narrative') . '</th>
+ <th>' . _('Balance') . '</th>
+ <th>' . _('Tag') . '</th>
+ </tr>';
+
echo $TableHeader;
if ($PandLAccount==True) {
$RunningTotal = 0;
} else {
// added to fix bug with Brought Forward Balance always being zero
- $sql = "SELECT bfwd,
- actual,
- period
- FROM chartdetails
- WHERE chartdetails.accountcode='" . $SelectedAccount . "'
- AND chartdetails.period='" . $FirstPeriodSelected . "'";
+ $sql = "SELECT bfwd,
+ actual,
+ period
+ FROM chartdetails
+ WHERE chartdetails.accountcode='" . $SelectedAccount . "'
+ AND chartdetails.period='" . $FirstPeriodSelected . "'";
- $ErrMsg = _('The chart details for account') . ' ' . $SelectedAccount . ' ' . _('could not be retrieved');
- $ChartDetailsResult = DB_query($sql,$db,$ErrMsg);
- $ChartDetailRow = DB_fetch_array($ChartDetailsResult);
- // --------------------
-
+ $ErrMsg = _('The chart details for account') . ' ' . $SelectedAccount . ' ' . _('could not be retrieved');
+ $ChartDetailsResult = DB_query($sql,$db,$ErrMsg);
+ $ChartDetailRow = DB_fetch_array($ChartDetailsResult);
+
$RunningTotal =$ChartDetailRow['bfwd'];
if ($RunningTotal < 0 ){ //its a credit balance b/fwd
echo '<tr style="background-color:#FDFEEF">
- <td colspan="3"><b>' . _('Brought Forward Balance') . '</b><td>
- </td></td>
- <td class="number"><b>' . locale_number_format(-$RunningTotal,$_SESSION['CompanyRecord']['decimalplaces']) . '</b></td>
- <td></td>
+ <td colspan="3"><b>' . _('Brought Forward Balance') . '</b></td>
+ <td></td>
+ <td class="number"><b>' . locale_number_format(-$RunningTotal,$_SESSION['CompanyRecord']['decimalplaces']) . '</b></td>
+ <td></td>
</tr>';
} else { //its a debit balance b/fwd
echo '<tr style="background-color:#FDFEEF">
- <td colspan="3"><b>' . _('Brought Forward Balance') . '</b></td>
- <td class="number"><b>' . locale_number_format($RunningTotal,$_SESSION['CompanyRecord']['decimalplaces']) . '</b></td>
- <td colspan="2"></td>
+ <td colspan="3"><b>' . _('Brought Forward Balance') . '</b></td>
+ <td class="number"><b>' . locale_number_format($RunningTotal,$_SESSION['CompanyRecord']['decimalplaces']) . '</b></td>
+ <td colspan="2"></td>
</tr>';
}
}
@@ -264,36 +289,31 @@
}
$FormatedTranDate = ConvertSQLDate($myrow['trandate']);
- $URL_to_TransDetail = $rootpath . '/GLTransInquiry.php?' . SID . '&TypeID=' . $myrow['type'] . '&TransNo=' . $myrow['typeno'];
+ $URL_to_TransDetail = $rootpath . '/GLTransInquiry.php?TypeID=' . $myrow['type'] . '&TransNo=' . $myrow['typeno'];
- $tagsql="SELECT tagdescription FROM tags WHERE tagref='".$myrow['tag'] . "'";
- $tagresult=DB_query($tagsql,$db);
- $tagrow = DB_fetch_array($tagresult);
- if ($tagrow['tagdescription']=='') {
- $tagrow['tagdescription']=_('None');
- }
printf('<td>%s</td>
- <td class="number"><a href="%s">%s</a></td>
- <td>%s</td>
- <td class="number">%s</td>
- <td class="number">%s</td>
- <td>%s</td>
- <td class="number"><b>%s</b></td>
- <td>%s</td>
- </tr>',
- $myrow['typename'],
- $URL_to_TransDetail,
- $myrow['typeno'],
- $FormatedTranDate,
- $DebitAmount,
- $CreditAmount,
- $myrow['narrative'],
- locale_number_format($RunningTotal,$_SESSION['CompanyRecord']['decimalplaces']),
- $tagrow['tagdescription']);
-
+ <td class="number"><a href="%s">%s</a></td>
+ <td>%s</td>
+ <td class="number">%s</td>
+ <td class="number">%s</td>
+ <td>%s</td>
+ <td class="number"><b>%s</b></td>
+ <td>%s</td>
+ </tr>',
+ $myrow['typename'],
+ $URL_to_TransDetail,
+ $myrow['typeno'],
+ $FormatedTranDate,
+ $DebitAmount,
+ $CreditAmount,
+ $myrow['narrative'],
+ locale_number_format($RunningTotal,$_SESSION['CompanyRecord']['decimalplaces']),
+ $myrow['tagdescription']);
+
}
- echo '<tr style="background-color:#FDFEEF"><td colspan="3"><b>';
+ echo '<tr style="background-color:#FDFEEF">
+ <td colspan="3"><b>';
if ($PandLAccount==True){
echo _('Total Period Movement');
} else { /*its a balance sheet account*/
@@ -311,8 +331,10 @@
-if (isset($ShowIntegrityReport) and $ShowIntegrityReport==True){
- if (!isset($IntegrityReport)) {$IntegrityReport='';}
+if (isset($ShowIntegrityReport) AND $ShowIntegrityReport==True AND $_POST['tag']=='0'){
+ if (!isset($IntegrityReport)) {
+ $IntegrityReport='';
+ }
prnMsg( _('There are differences between the sum of the transactions and the recorded movements in the ChartDetails table') . '. ' . _('A log of the account differences for the periods report shows below'),'warn');
echo '<p>'.$IntegrityReport;
}
Modified: trunk/css/aguapop/default.css
===================================================================
--- trunk/css/aguapop/default.css 2012-12-19 06:45:03 UTC (rev 5766)
+++ trunk/css/aguapop/default.css 2012-12-19 06:59:15 UTC (rev 5767)
@@ -10,7 +10,7 @@
body {
font-family:Arial, Verdana, Helvetica, sans-serif;
- font-size:12px;
+ font-size:10pt;
background: silver;
margin:0;
padding:0;
@@ -96,7 +96,6 @@
input { /*specifies the input field text characteristics*/
font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 12px;
font-style: italic;
}
input.number{
@@ -112,7 +111,6 @@
select {
font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 12px;
}
select:hover { /* drop down */
background:#9ffffb;
@@ -120,7 +118,6 @@
textarea{
font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size:12px;
}
textarea:hover{
background:#9ffffb;
@@ -176,7 +173,6 @@
position: static;
font-family: Arial, Verdana, Helvetica, sans-serif;
font-weight: normal;
- font-size: 12px;
color: black;
text-align:center;
padding-left: 24px;
@@ -230,7 +226,6 @@
.label {
font-weight: bold;
font-style: normal;
- font-size: 12px;
color: black;
background-color: gainsboro;
}
@@ -286,7 +281,6 @@
}
#AppInfoModuleDiv{
font-weight:bold;
- font-size:12px;
padding:3px;
}
Modified: trunk/css/default/default.css
===================================================================
--- trunk/css/default/default.css 2012-12-19 06:45:03 UTC (rev 5766)
+++ trunk/css/default/default.css 2012-12-19 06:59:15 UTC (rev 5767)
@@ -5,100 +5,100 @@
***/
body{
-background-color:#ccd;
-font-family:Arial, Verdana, Helvetica, sans-serif;
-font-size:10pt;
-margin:0;
-padding:0
+ background-color:#ccd;
+ font-family:Arial, Verdana, Helvetica, sans-serif;
+ font-size:10pt;
+ margin:0;
+ padding:0
}
a{
-color:blue;
-text-decoration:none;
+ color:blue;
+ text-decoration:none;
}
a:hover{
-color:blue;
-text-decoration:underline;
+ color:blue;
+ text-decoration:underline;
}
img{
-border:none;
-vertical-align:middle;
+ border:none;
+ vertical-align:middle;
}
.page_title_text{
-padding:5px;
-font-weight:bold;
-color:black;
-TEXT-ALIGN:center;
+ padding:5px;
+ font-weight:bold;
+ color:black;
+ TEXT-ALIGN:center;
}
p.good{
-font-weight:bold;
-color:green;
+ font-weight:bold;
+ color:green;
}
p.bad{
-font-weight:bold;
-color:red;
+ font-weight:bold;
+ color:red;
}
table{
-margin:0 auto;
-width:auto;
-max-width:90%;
-padding-bottom:5px;
+ margin:0 auto;
+ width:auto;
+ max-width:90%;
+ padding-bottom:5px;
}
table.selection{
-padding-bottom:5px;
+ padding-bottom:5px;
}
th{
-font-weight:normal;
-background-color:#B06161;
-color:white;
+ font-weight:normal;
+ background-color:#B06161;
+ color:white;
}
th.number{
-text-align:right;
-font-weight:normal;
-background-color:#B06161;
-color:white;
+ text-align:right;
+ font-weight:normal;
+ background-color:#B06161;
+ color:white;
}
td{
-text-align:left;
+ text-align:left;
}
td.select{
-background-color:#eee;
+ background-color:#eee;
}
td.number{
-text-align:right;
+ text-align:right;
}
div.centre{
-margin:0 auto;
-text-align:center;
-padding:5px;
+ margin:0 auto;
+ text-align:center;
+ padding:5px;
}
input{
-font-family:Arial, Verdana, Helvetica, sans-serif;
+ font-family:Arial, Verdana, Helvetica, sans-serif;
}
input.number{
-text-align:right;
+ text-align:right;
}
input.image{
-border-width:0px;
-background-color:transparent;
+ border-width:0px;
+ background-color:transparent;
}
input:hover{
}
select{
-font-family:Arial, Verdana, Helvetica, sans-serif;
+ font-family:Arial, Verdana, Helvetica, sans-serif;
}
textarea{
-font-family:Arial, Verdana, Helvetica, sans-serif;
+ font-family:Arial, Verdana, Helvetica, sans-serif;
}
textarea:hover{
}
.EvenTableRows{
-background-color:#CCCCCC;
+ background-color:#CCCCCC;
}
.OddTableRows{
-background-color:#EEEEEE;
+ background-color:#EEEEEE;
}
div.error{
background-color:#fddbdb;
@@ -116,78 +116,78 @@
border:1px solid darkgreen;
}
div.info{
-background-color:#c7ccf6;
-color:navy;
-border:1px solid navy;
+ background-color:#c7ccf6;
+ color:navy;
+ border:1px solid navy;
}
DIV.page_help_text{
-background:lightgrey url(images/help.png) top left no-repeat;
-BORDER:#a52a2a 1px solid;
-padding-top:2px;
-padding-bottom:2px;
-PADDING-LEFT:10px;
-Z-INDEX:1;
-width:80%;
-FLOAT:none;
-VISIBILITY:visible;
-MARGIN:0 auto;
-POSITION:static;
-font-family:Arial, Verdana, Helvetica, sans-serif;
-font-weight:normal;
-color:black;
-TEXT-ALIGN:center;
+ background:lightgrey url(images/help.png) top left no-repeat;
+ BORDER:#a52a2a 1px solid;
+ padding-top:2px;
+ padding-bottom:2px;
+ PADDING-LEFT:10px;
+ Z-INDEX:1;
+ width:80%;
+ FLOAT:none;
+ VISIBILITY:visible;
+ MARGIN:0 auto;
+ POSITION:static;
+ font-family:Arial, Verdana, Helvetica, sans-serif;
+ font-weight:normal;
+ color:black;
+ TEXT-ALIGN:center;
}
DIV.system_check{
-BORDER:#a52a2a 1px solid;
-PADDING-LEFT:3px;
-Z-INDEX:1;
-width:40%;
-FLOAT:none;
-VISIBILITY:visible;
-MARGIN:0 auto;
-POSITION:static;
-background:lightgray;
-font-family:Arial, Verdana, Helvetica, sans-serif;
-padding-top:1px;
-padding-bottom:1px;
-font-weight:normal;
-color:black;
-TEXT-ALIGN:left;
+ BORDER:#a52a2a 1px solid;
+ PADDING-LEFT:3px;
+ Z-INDEX:1;
+ width:40%;
+ FLOAT:none;
+ VISIBILITY:visible;
+ MARGIN:0 auto;
+ POSITION:static;
+ background:lightgray;
+ font-family:Arial, Verdana, Helvetica, sans-serif;
+ padding-top:1px;
+ padding-bottom:1px;
+ font-weight:normal;
+ color:black;
+ TEXT-ALIGN:left;
}
.dpTbl { /* date picker background */
-border:thin solid black;
-background:white;
-box-shadow: 3px 3px 4px #000; /* shadow on modern browsers */
+ border:thin solid black;
+ background:white;
+ box-shadow: 3px 3px 4px #000; /* shadow on modern browsers */
}
.dpTD{
-border:0;
-width:20px;
-background-color:#EEEEEE;
-text-align:right;
-cursor:pointer;
+ border:0;
+ width:20px;
+ background-color:#EEEEEE;
+ text-align:right;
+ cursor:pointer;
}
.dpDayHighlight{
-border:0;
-width:20px;
-background-color:yellow;
-text-align:right;
-cursor:pointer;
+ border:0;
+ width:20px;
+ background-color:yellow;
+ text-align:right;
+ cursor:pointer;
}
.dpTDHover{
-border:0;
-width:20px;
-background-color:#CCCCCC;
-text-align:right;
-cursor:pointer;
+ border:0;
+ width:20px;
+ background-color:#CCCCCC;
+ text-align:right;
+ cursor:pointer;
}
/* Table type is used for UI tables type 1 */
.table1{
-width:90%;
-background:#eee;
-border:0px 0px 2px 2px #222 solid;
-margin:0 auto;
+ width:90%;
+ background:#eee;
+ border:0px 0px 2px 2px #222 solid;
+ margin:0 auto;
}
/* Table type is used for UI tables type 2 */
/*.table2{
@@ -198,46 +198,46 @@
}*/
.tableheader{
-font-weight:normal;
-background-color:#800000;
-color:white;
+ font-weight:normal;
+ background-color:#800000;
+ color:white;
}
.notavailable{
-font-weight:lighter;
-font-style:italic;
-color:#555555;
+ font-weight:lighter;
+ font-style:italic;
+ color:#555555;
}
.label{
-font-weight:bold;
-font-style:normal;
-font-size:120%;
-color:black;
-background-color:#cccccc;
+ font-weight:bold;
+ font-style:normal;
+ font-size:120%;
+ color:black;
+ background-color:#cccccc;
}
.table_index{
-background-color:#F1FFDD;
+ background-color:#F1FFDD;
}
.header{
-background-image:url("");
-background-repeat:no-repeat;
-background-attachment:fixed;
-border:none;
-margin:0px;
-padding:0px;
+ background-image:url("");
+ background-repeat:no-repeat;
+ background-attachment:fixed;
+ border:none;
+ margin:0px;
+ padding:0px;
}
input.inputerror{
-background-color:#fddbdb;
+ background-color:#fddbdb;
}
textarea.texterror{
-background-color:#fddbdb;
+ background-color:#fddbdb;
}
select.selecterror{
-background-color:#fddbdb;
+ background-color:#fddbdb;
}
.OsRow{
-background-color:#234567;
-color:white;
+ background-color:#234567;
+ color:white;
}
/*** CANVAS ***/
@@ -249,15 +249,15 @@
/*** HEADER ***/
#HeaderDiv{
-color:white;
-/*background:#588BB6;*/
-/*overflow:hidden;*/
+ color:white;
+ /*background:#588BB6;*/
+ /*overflow:hidden;*/
}
#HeaderDiv a{
-color:white;
+ color:white;
}
#HeaderDiv a:hover{
-text-decoration:underline;
+ text-decoration:underline;
}
#HeaderWrapDiv{
}
@@ -265,156 +265,155 @@
/*** HEADER - APP INFO ***/
#AppInfoDiv{
-float:left;
-padding:0;
+ float:left;
+ padding:0;
}
#AppInfoCompanyDiv,#AppInfoUserDiv{
-display:table-cell;
+ display:table-cell;
}
#AppInfoModuleDiv{
-font-weight:bold;
-font-size:120%;
-padding:3px;
+ font-weight:bold;
+ font-size:120%;
+ padding:3px;
}
/*** HEADER - QUICK MENU ***/
#QuickMenuDiv{
-float:right;
-margin-top:2px;
+ float:right;
+ margin-top:2px;
}
#QuickMenuDiv ul{
}
#QuickMenuDiv li{
-display:inline;
-border-left:thin ridge #588BB6;
-padding:14px 12px;
+ display:inline;
+ border-left:thin ridge #588BB6;
+ padding:14px 12px;
}
/*** BODY ***/
#BodyDiv{
-clear:both;
+ clear:both;
}
#BodyWrapDiv{
-background:#CCCCCC;
-/*border:thin solid #ccc;*/
-clear:both;
+ background:#CCCCCC;
+ /*border:thin solid #ccc;*/
+ clear:both;
}
/*** BODY - MAIN MENU ***/
#MainMenuDiv{
-float:left;
-width:11%;
-border:thin solid #000;
-text-align:center;
-white-space:nowrap;
+ float:left;
+ width:11%;
+ border:thin solid #000;
+ text-align:center;
+ white-space:nowrap;
}
#MainMenuDiv ul{
-margin:0;
-padding:0;
+ margin:0;
+ padding:0;
}
#MainMenuDiv li{
-list-style:none;
+ list-style:none;
}
#MainMenuDiv li a{
-color:black;
+ color:black;
}
#MainMenuDiv li a:hover{
-color:black;
-text-decoration:underline;
+ color:black;
+ text-decoration:underline;
}
.main_menu_unselected{
-background:#8EDE8D;
-padding:2px;
+ background:#8EDE8D;
+ padding:2px;
}
.main_menu_unselected:hover{
-background:white;
+ background:white;
}
.main_menu_selected{
-background-color:white;
-padding:2px;
+ background-color:white;
+ padding:2px;
}
/*** BODY - SUB MENU ***/
#SubMenuDiv{
-display:table;
-float:right;
-overflow:hidden;
-width:88.5%;
+ display:table;
+ float:right;
+ overflow:hidden;
+ width:88.5%;
}
#SubMenuDiv ul{
-margin:0;
-padding:0;
-background:#fff;
-border:thin solid black;
-margin-left:3px;
+ margin:0;
+ padding:0;
+ background:#fff;
+ border:thin solid black;
+ margin-left:3px;
}
#SubMenuDiv li{
-list-style:none;
+ list-style:none;
}
#SubMenuDiv a{
-color:blue;
+ color:blue;
}
#SubMenuDiv a:hover{
-color:blue;
-text-decoration:underline;
+ color:blue;
+ text-decoration:underline;
}
#TransactionsDiv,
#InquiriesDiv,
#MaintenanceDiv{
-display:table-cell;
+ display:table-cell;
}
.menu_group_headers{
-text-align:center;
-color:black;
-background:#eee;
-border-bottom:thin solid black;
+ text-align:center;
+ color:black;
+ background:#eee;
+ border-bottom:thin solid black;
}
.menu_group_item{
-background-color:white;
-padding:2px;
+ background-color:white;
+ padding:2px;
}
.menu_group_item p{
-color:#00f; /* This is the color for bullets, I like it to be the same as the anchor color, but it's up to you */
-text-indent:-12px; /* this makes the bullet to appear as the li tag previously used */
-margin:0 0 0 12px; /* One thing that I didn´t like of the li was that it had no left margin applied */
+ color:#00f; /* This is the color for bullets, I like it to be the same as the anchor color, but it's up to you */
+ text-indent:-12px; /* this makes the bullet to appear as the li tag previously used */
+ margin:0 0 0 12px; /* One thing that I didn´t like of the li was that it had no left margin applied */
}
#InquiriesDiv div{ /* header for standard reports/forms, custom reports */
-border-top:thin solid black;
-border-bottom:thin solid black;
-background:#eee;
-color:black;
-padding:2px;
+ border-top:thin solid black;
+ border-bottom:thin solid black;
+ background:#eee;
+ color:black;
+ padding:2px;
}
/*** FOOTER ***/
#FooterDiv{
-clear:both;
-overflow:hidden;
-color:#CCCCCC;
-padding:3px 2px;
+ clear:both;
+ overflow:hidden;
+ color:#CCCCCC;
+ padding:3px 2px;
}
#FooterWrapDiv{
}
#FooterLogoDiv{
-background:white;
-border-radius:7px;
-float:left;
-padding:3px;
+ background:white;
+ border-radius:7px;
+ float:left;
+ padding:3px;
}
#FooterVersionDiv{
-float:left;
-margin-left:10px;
-margin-top:15px;
-
+ float:left;
+ margin-left:10px;
+ margin-top:15px;
}
#FooterTimeDiv{
-float:right;
-margin-top:15px;
+ float:right;
+ margin-top:15px;
}
Modified: trunk/css/fluid/default.css
===================================================================
--- trunk/css/fluid/default.css 2012-12-19 06:45:03 UTC (rev 5766)
+++ trunk/css/fluid/default.css 2012-12-19 06:59:15 UTC (rev 5767)
@@ -9,7 +9,7 @@
body{
font-family:Arial, Verdana, Helvetica, sans-serif;
- font-size:12px;
+ font-size:10pt;
margin:0;
padding:0;
}
@@ -46,21 +46,18 @@
table.selection{}
th{ /* table heading */
font-weight:normal;
- font-size:12px;
background-color:#cccce5;
color:#330000;
text-align:center;
}
th.number{
font-weight:normal;
- font-size:12px;
background-color:#cccce5;
color:#330000;
text-align:right;
}
td{
font-family:Arial, Verdana, Helvetica;
- font-size:12px;
text-align:left;
}
td.select{
@@ -77,7 +74,6 @@
input{
font-family:Arial, Verdana, Helvetica;
- font-size:12px;
}
input.number{
text-align:right;
@@ -94,7 +90,6 @@
}
select{
font-family:Arial, Verdana, Helvetica;
- font-size:12px;
}
select:hover{
background:lightblue;
@@ -104,7 +99,6 @@
}
textarea{ /* default style for textarre */
font-family:Arial, Verdana, Helvetica;
- font-size:12px;
}
textarea:hover{}
textarea.texterror{
@@ -153,7 +147,6 @@
padding-top:1px;
padding-bottom:1px;
font-weight:normal;
- font-size:12px;
TEXT-ALIGN:center;
}
DIV.page_help_text{
@@ -170,7 +163,6 @@
POSITION:static;
font-family:Arial, Verdana, Helvetica;
font-weight:normal;
- font-size:12px;
color:black;
TEXT-ALIGN:center;
}
@@ -220,7 +212,6 @@
.label{ /* used */
font-weight:bold;
font-style:normal;
- font-size:12px;
color:black;
background-color:#cccccc;
}
@@ -238,7 +229,6 @@
}
button{
- font-size:12px;
}
button:hover{
background:lightblue;
Modified: trunk/css/fresh/default.css
===================================================================
--- trunk/css/fresh/default.css 2012-12-19 06:45:03 UTC (rev 5766)
+++ trunk/css/fresh/default.css 2012-12-19 06:59:15 UTC (rev 5767)
@@ -19,7 +19,7 @@
body {
font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size:12px;
+ font-size:10pt;
margin:0;
padding:0;
}
@@ -39,11 +39,9 @@
vertical-align:middle;
}
p.page_title_text {
- font-family: Arial, Verdana, Helvetica, sans-serif;
padding-top: 2px;
padding-bottom: 2px;
font-weight: bold;
- font-size:12px;
color: black;
background-color: #C9D392;
width: 30%;
@@ -67,7 +65,6 @@
}
th {
font-weight: normal;
- font-size:12px;
background-color: #777C59;
color: white;
text-align: center;
@@ -79,8 +76,6 @@
color: white;
}
td {
- font-family: Arial, Verdana, Helvetica, sans-serif;;
- font-size:12px;
text-align: left;
}
td.select {
@@ -94,8 +89,6 @@
text-align:center;
}
input {
- font-family: Arial, Verdana, Helvetica, sans-serif;;
- font-size:12px;
}
input.number{
text-align: right;
@@ -111,8 +104,6 @@
font-size:12px;
}
textarea{
- font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size:12px;
}
textarea:hover{
}
@@ -145,21 +136,19 @@
}
DIV.page_help_text {
background: lightgrey url(images/help.png) top left no-repeat;
- BORDER: #a52a2a 1px solid;
+ border: #a52a2a 1px solid;
padding-top:2px;
padding-bottom: 2px;
- PADDING-LEFT: 10px;
- Z-INDEX: 1;
+ padding-left: 10px;
+ z-index: 1;
width: 80%;
- FLOAT: none;
- VISIBILITY: visible;
- MARGIN: 0 auto;
- POSITION: static;
- font-family: Arial, Verdana, Helvetica, sans-serif;
+ float: none;
+ visibility: visible;
+ margin: 0 auto;
+ position: static;
font-weight: normal;
- font-size:12px;
color: black;
- TEXT-ALIGN:center;
+ text-align:center;
}
/*** calendar picker ***/
@@ -219,7 +208,7 @@
.label {
font-weight:bold;
font-style:normal;
- font-size:12px;
+ font-size:120%;
color:black;
}
.table_index {
Modified: trunk/css/gel/default.css
===================================================================
--- trunk/css/gel/default.css 2012-12-19 06:45:03 UTC (rev 5766)
+++ trunk/css/gel/default.css 2012-12-19 06:59:15 UTC (rev 5767)
@@ -17,7 +17,7 @@
body {
font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 12px;
+ font-size: 10pt;
background-color: white;
margin:0;
padding:5px;
@@ -37,13 +37,11 @@
vertical-align:middle;
}
.page_title_text {
- font-family: Arial, Verdana, Helvetica, sans-serif;
padding-top: 2px;
padding-bottom: 2px;
font-weight: bold;
- font-size: 12px;
color: black;
- TEXT-ALIGN:center;
+ text-align:center;
}
p.good {
font-weight: bold;
@@ -67,7 +65,6 @@
th {
font-weight: normal;
background-color: #ccc;
- font-size: 12px;
color: #330000;
text-align: center;
}
@@ -75,12 +72,10 @@
text-align: right;
font-weight: normal;
background-color: #ccc;
- font-size: 12px;
color: #330000;
}
td {
font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 12px;
text-align: left;
}
td.select {
@@ -97,8 +92,6 @@
background: url(images/input.png) #eee;
color:#000;
border: 0px 0px 1px 1px #000 dashed;
- font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 12px;
}
input:hover{
background: url(images/inputh.png) #eee;
@@ -115,15 +108,11 @@
select {
background:#eee;
color:#111;
- font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 12px;
}
textarea{
background: url(images/input.png) #eee;
color:#000;
border: 0px 0px 1px 1px #000 dashed;
- font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 12px;
}
textarea:hover{
}
@@ -137,8 +126,6 @@
background: url(images/inputtxt.png) #eee;
color:#000;
border: 0px 0px 1px 1px #000 dashed;
- font-family: Verdana, Arial, Helvetica;
- font-size: 12px;
}
textarea:hover{
background: url(images/inputhtxt.png) #eee;
@@ -148,7 +135,8 @@
div.error { /*** is this used??? ***/
background-color:red;
color: white;
- font-style: italic; font-weight:bold;
+ font-style: italic;
+ font-weight:bold;
border: 3px solid red;
}
div.warn {
@@ -168,71 +156,67 @@
}
DIV.page_help_text {
background: lightgrey url(images/help.png) top left no-repeat;
- BORDER: #a52a2a 1px solid;
+ border: #a52a2a 1px solid;
padding-top:2px;
- padding-bottom: 2px;
- PADDING-LEFT: 10px;
- Z-INDEX: 1;
+ padding-bottom: 2px;
+ padding-left: 10px;
+ z-index: 1;
width: 80%;
- FLOAT: none;
- VISIBILITY: visible;
- MARGIN: 0 auto;
- POSITION: static;
- font-family: Arial, Verdana, Helvetica, sans-serif;
+ float: none;
+ visibility: visible;
+ margin: 0 auto;
+ position: static;
font-weight: normal;
- font-size: 12px;
color: black;
- TEXT-ALIGN:center;
+ text-align:center;
}
DIV.system_check { /*** is this used??? */
- BORDER: #a52a2a 1px solid;
- PADDING-LEFT: 3px;
- Z-INDEX: 1;
- width: 40%;
- FLOAT: none;
- VISIBILITY: visible;
- MARGIN: 0 auto;
- POSITION: static;
- background: lightgray;
- font-family: Arial, Verdana, Helvetica, sans-serif;
- padding-top: 1px;
- padding-bottom: 1px;
- font-weight: normal;
- font-size: 12px;
- color: black;
- TEXT-ALIGN:left;
+ border: #a52a2a 1px solid;
+ padding-left: 3px;
+ z-index: 1;
+ width: 40%;
+ float: none;
+ visibility: visible;
+ margin: 0 auto;
+ position: static;
+ background: lightgray;
+ padding-top: 1px;
+ padding-bottom: 1px;
+ font-weight: normal;
+ color: black;
+ text-align:left;
}
.dpTbl {
border: solid navy 1px;
}
.dpTD{
-border:0;
-width:20px;
-background-color:#EEEEEE;
-text-align:right;
-cursor:pointer;
+ border:0;
+ width:20px;
+ background-color:#EEEEEE;
+ text-align:right;
+ cursor:pointer;
}
.dpDayHighlight{
-border:0;
-width:20px;
-background-color:yellow;
-text-align:right;
-cursor:pointer;
+ border:0;
+ width:20px;
+ background-color:yellow;
+ text-align:right;
+ cursor:pointer;
}
.dpTDHover{
-border:0;
-width:20px;
-background-color:#CCCCCC;
-text-align:right;
-cursor:pointer;
+ border:0;
+ width:20px;
+ background-color:#CCCCCC;
+ text-align:right;
+ cursor:pointer;
}
.table1 { /*** used ***/
- width:90%;
- background: #eee;
- border: 1px solid #222;
- margin: 0 auto;
+ width:90%;
+ background: #eee;
+ border: 1px solid #222;
+ margin: 0 auto;
}
.tableheader { /* used */
font-weight: normal;
@@ -247,7 +231,7 @@
.label { /* used */
font-weight:bold;
font-style:normal;
- font-size:12px;
+ font-size:120%;
color:black;
background-color:#cccccc;
}
Modified: trunk/css/professional/default.css
===================================================================
--- trunk/css/professional/default.css 2012-12-19 06:45:03 UTC (rev 5766)
+++ trunk/css/professional/default.css 2012-12-19 06:59:15 UTC (rev 5767)
@@ -19,7 +19,7 @@
body {
font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size:12px;
+ font-size:10pt;
background-color: #ddd;
margin:0;
padding:0;
@@ -45,8 +45,6 @@
/*table detail items default format */
td {
- font-family: Arial, Verdana, Helvetica;
- font-size:12px;
text-align: left;
}
td.select {
@@ -92,14 +90,12 @@
th { /* table heading */
font-weight: normal;
- font-size:12px;
background-color: #cccce5;
color: #330000;
text-align: center;
}
th.number {
font-weight: normal;
- font-size:12px;
background-color: #cccce5;
color: #330000;
text-align: right;
@@ -132,8 +128,6 @@
which should have the same width as the column where it is located
e.g.: class input_button, input_column_button, input_text */
input {
- font-family: Arial, Verdana, Helvetica;
- font-size:12px;
}
input.number{
text-align: right;
@@ -157,7 +151,6 @@
/* for buttons ***HJ***/
button{
- font-size:12px;
}
button:hover{
background:lightblue;
@@ -166,8 +159,6 @@
/* dropdown box */
select {
- font-family: Arial, Verdana, Helvetica;
- font-size:12px;
}
select.selecterror {
background-color: #fddbdb;
@@ -194,9 +185,7 @@
padding: 0px;
}
-textarea{ /* default style for textarre */
- font-family: Arial, Verdana, Helvetica;
- font-size:12px;
+textarea{ /* default style for textarea */
}
textarea:hover{
}
@@ -217,19 +206,18 @@
background:lightgray;
color: black;
border: 1px solid black;
- PADDING-LEFT: 3px;
- Z-INDEX: 1;
+ padding-left: 3px;
+ z-index: 1;
width: 50%;
- FLOAT: none;
- VISIBILITY: visible;
- MARGIN: 0 auto;
- POSITION: static;
- font-family: Arial, Verdana, Helvetica;
+ float: none;
+ visibility: visible;
+ margin: 0 auto;
+ position: static;
+ font-family: arial, verdana, helvetica;
padding-top: 1px;
padding-bottom: 1px;
font-weight: normal;
- font-size:12px;
- TEXT-ALIGN:center;
+ text-align:center;
}
.page_title_text { /* used */
@@ -237,28 +225,25 @@
padding-top: 2px;
padding-bottom: 2px;
font-weight: bold;
- font-size:12px;
color: black;
- TEXT-ALIGN:center;
+ text-align:center;
}
DIV.page_help_text {
background: lightgrey url(images/help.png) top left no-repeat;
- BORDER: #a52a2a 1px solid;
+ border: #a52a2a 1px solid;
padding-top:2px;
padding-bottom: 2px;
- PADDING-LEFT: 10px;
- Z-INDEX: 1;
+ padding-left: 10px;
+ z-index: 1;
width: 80%;
- FLOAT: none;
- VISIBILITY: visible;
- MARGIN: 0 auto;
- POSITION: static;
- font-family: Arial, Verdana, Helvetica;
+ float: none;
+ visibility: visible;
+ margin: 0 auto;
+ position: static;
font-weight: normal;
- font-size:12px;
color: black;
- TEXT-ALIGN:center;
+ text-align:center;
}
.menu_group_item a {
@@ -268,14 +253,10 @@
text-decoration: underline;
}
-
-
textarea.texterror {
background-color: #fddbdb;
}
-
-
.tableheader {
font-weight: normal;
background-color: #cccce5;
@@ -291,7 +272,7 @@
.label { /* used */
font-weight:bold;
font-style:normal;
- font-size:12px;
+ font-size:120%;
color:black;
background-color:#cccccc;
}
Modified: trunk/css/silverwolf/default.css
===================================================================
--- trunk/css/silverwolf/default.css 2012-12-19 06:45:03 UTC (rev 5766)
+++ trunk/css/silverwolf/default.css 2012-12-19 06:59:15 UTC (rev 5767)
@@ -18,7 +18,7 @@
body{
font-family:Arial, Verdana, Helvetica, sans-serif;
- font-size:12px;
+ font-size:10pt;
background:url(images/stripe.png) white;
margin:0;
padding:5px;
@@ -48,7 +48,6 @@
}
p.page_title_text{ /* page title, used in many *.php */
background:gainsboro;
- font-size:12px;
margin:10px auto;
padding:5px;
text-align:center;
@@ -236,7 +235,7 @@
.label{ /*WorkOrderCosting.php, WorkOrderEntry.php, WorkOrderIssue.php, WorkOrderStatus.php */
font-weight:bold;
font-style:normal;
- font-size:12px;
+ font-size:120%;
color:black;
background-color:#ccc;
}
@@ -245,37 +244,36 @@
}
.header{ /* used in \includes\InputSerialItemsFile.php */
-background-image:url("");
-background-repeat:no-repeat;
-background-attachment:fixed;
-border:none;
-margin:0px;
-padding:0px;
+ background-image:url("");
+ background-repeat:no-repeat;
+ background-attachment:fixed;
+ border:none;
+ margin:0px;
+ padding:0px;
}
input.inputerror{ /* many * .php */
-background-color:#fddbdb;
+ background-color:#fddbdb;
}
textarea{
-font-family:Arial, Verdana, Helvetica, sans-serif;
-font-size:100%;
-background-color:#e3e1e1;
-border-width:1px;
-border-bottom-color:gray;
-border-bottom-style:solid;
-border-top-color:gray;
-border-top-style:solid;
-border-left-color:gray;
-border-left-style:solid;
-border-right-color:gray;
-border-right-style:solid;
+ font-size:100%;
+ background-color:#e3e1e1;
+ border-width:1px;
+ border-bottom-color:gray;
+ border-bottom-style:solid;
+ border-top-color:gray;
+ border-top-style:solid;
+ border-left-color:gray;
+ border-left-style:solid;
+ border-right-color:gray;
+ border-right-style:solid;
}
select.selecterror{ /*AccountGroups.php, BankAccounts.php, BOMs.php, Stocks.php */
-background-color:#fddbdb;
+ background-color:#fddbdb;
}
.OsRow{ /* PO_OrderDetails.php */
-background-color:#234567;
-color:white;
+ background-color:#234567;
+ color:white;
}
/*** CANVAS ***/
@@ -286,11 +284,11 @@
/*** HEADER ***/
#HeaderDiv{
-overflow:hidden; /* REQUIRED:height according to items contained */
-background:url(images/menu_bg_grey.png) repeat-x #cfcfcf;
-color:gray;
-padding:3px;
-border:thin solid lightgray;
+ overflow:hidden; /* REQUIRED:height according to items contained */
+ background:url(images/menu_bg_grey.png) repeat-x #cfcfcf;
+ color:gray;
+ padding:3px;
+ border:thin solid lightgray;
}
#HeaderWrapDiv{
}
@@ -298,23 +296,23 @@
/*** HEADER - APP INFO ***/
#AppInfoDiv{
-float:left; /* REQUIRED:to the left */
+ float:left; /* REQUIRED:to the left */
}
#AppInfoDiv img{
-vertical-align:middle; /* center image and text vertically */
+ vertical-align:middle; /* center image and text vertically */
}
#AppInfoCompanyDiv{
-display:table-cell; /* REQUIRED:as a cell */
+ display:table-cell; /* REQUIRED:as a cell */
}
#AppInfoUserDiv{
-display:table-cell; /* REQUIRED:as a cell */
+ display:table-cell; /* REQUIRED:as a cell */
}
#AppInfoUserDiv a{
-color:gray;
+ color:gray;
}
#AppInfoUserDiv a:hover{
-color:black;
-text-decoration:underline;
+ color:black;
+ text-decoration:underline;
}
#AppInfoModuleDiv{
}
@@ -322,146 +320,146 @@
/*** HEADER - QUICK MENU ***/
#QuickMenuDiv{
-float:right; /* to the right side */
-margin-top:2px;
+ float:right; /* to the right side */
+ margin-top:2px;
}
#QuickMenuDiv ul{
-list-style:none; /* hide the bullets */
+ list-style:none; /* hide the bullets */
}
#QuickMenuDiv li{
-display:inline; /* items are inline */
+ display:inline; /* items are inline */
}
/*** links as buttons!!! clicking anywhere in the button will activate
the link!!! ***HJ***/
#QuickMenuDiv li a{
-padding:9px; /* links as button */
-border:thin outset lightgray; /* un-pressed state */
+ padding:9px; /* links as button */
+ border:thin outset lightgray; /* un-pressed state */
}
#QuickMenuDiv li a:hover{
-padding:9px; /* links as button */
-border:thin inset lightgray; /* pressed state */
-text-decoration:none; /* no underline */
-color:black;
+ padding:9px; /* links as button */
+ border:thin inset lightgray; /* pressed state */
+ text-decoration:none; /* no underline */
+ color:black;
}
/*** BODY ***/
#BodyDiv{
-clear:both; /* REQUIRED */
-overflow:hidden; /* REQUIRED */
-color:black;
-background:whitesmoke;
-padding-bottom:5px;
-text-align:center;
+ clear:both; /* REQUIRED */
+ overflow:hidden; /* REQUIRED */
+ color:black;
+ background:whitesmoke;
+ padding-bottom:5px;
+ text-align:center;
}
/*** BODY - MAIN MENU ***/
#MainMenuDiv{
-float:left; /* REQUIRED:to the left side */
-white-space:nowrap; /* don't break text */
-text-align:center;
-width:12%;
-margin-top:3px;
+ float:left; /* REQUIRED:to the left side */
+ white-space:nowrap; /* don't break text */
+ text-align:center;
+ width:12%;
+ margin-top:3px;
}
#MainMenuDiv ul{
-padding:0; /* REQUIRED:remove extra gaps (ex-bullets) */
-margin:0 3px 0 0;
-border:thin outset silver;
+ padding:0; /* REQUIRED:remove extra gaps (ex-bullets) */
+ margin:0 3px 0 0;
+ border:thin outset silver;
}
#MainMenuDiv li{
-list-style:none; /* REQUIRED */
-padding:0; /* REQUIRED */
+ list-style:none; /* REQUIRED */
+ padding:0; /* REQUIRED */
}
#MainMenuDiv li a,
#MainMenuDiv li a:hover,
#MainMenuDiv li a:active,
#MainMenuDiv .main_menu_selected a,
#MainMenuDiv .main_menu_selected a:hover{ /* common styles */
-display:block; /* REQUIRED */
-padding:3px;
-border:thin outset silver;
-color:black;
-text-decoration:none;
-background:silver;
+ display:block; /* REQUIRED */
+ padding:3px;
+ border:thin outset silver;
+ color:black;
+ text-decoration:none;
+ background:silver;
}
#MainMenuDiv li a:hover{ /* link as button!!! pressed state */
-border:thin inset silver;
+ border:thin inset silver;
}
#MainMenuDiv .main_menu_selected a,#MainMenuDiv .main_menu_selected a:hover{ /* the selected button */
-border:thin inset silver;
-background:dimgray;
-color:white;
+ border:thin inset silver;
+ background:dimgray;
+ color:white;
}
/*** BODY - SUB MENU ***/
#SubMenuDiv{
-display:table;
-float:right;
-overflow:hidden;
-width:88%;
-margin-top:3px;
-text-align:left;
+ display:table;
+ float:right;
+ overflow:hidden;
+ width:88%;
+ margin-top:3px;
+ text-align:left;
}
#SubMenuDiv ul{
-list-style-type:none; /* REQUIRED:hide bullets */
-padding:0; /* REQUIRED:remove extra gaps (ex-bullets) */
-margin:0;
-background:gainsboro;
-border:thin outset gainsboro;
-margin-left:3px;
+ list-style-type:none; /* REQUIRED:hide bullets */
+ padding:0; /* REQUIRED:remove extra gaps (ex-bullets) */
+ margin:0;
+ background:gainsboro;
+ border:thin outset gainsboro;
+ margin-left:3px;
}
#SubMenuDiv li{
-list-style:none; /* REQUIRED:hide the bullets */
-padding:2px;
+ list-style:none; /* REQUIRED:hide the bullets */
+ padding:2px;
}
.menu_group_headers{
-background:silver;
-outline:thin outset silver;
-text-align:center;
-color:black;
+ background:silver;
+ outline:thin outset silver;
+ text-align:center;
+ color:black;
}
#TransactionsDiv,#InquiriesDiv,#MaintenanceDiv{
-display:table-cell;
+ display:table-cell;
}
#InquiriesDiv div{ /* default div, used for custom report header */
-background:silver;
-color:black;
-padding:2px;
+ background:silver;
+ color:black;
+ padding:2px;
}
.menu_group_item p{
-color:#00f; /* This is the color for bullets, I like it to be the same as the anchor color, but it's up to you */
-text-indent:-10px; /* this makes the bullet to appear as the li tag previously used */
-margin:0 0 0 12px; /* One thing that I didnÃÂôt like of the li was that it had no left margin applied */
+ color:#00f; /* This is the color for bullets, I like it to be the same as the anchor color, but it's up to you */
+ text-indent:-10px; /* this makes the bullet to appear as the li tag previously used */
+ margin:0 0 0 12px; /* One thing that I didnÃÂôt like of the li was that it had no left margin applied */
}
/*** FOOTER ***/
#FooterDiv{
-clear:both; /* REQUIRED */
-overflow:hidden;
-color:gray;
-background:url(images/menu_bg_grey.png) repeat-x #cfcfcf;
-border:thin solid lightgray;
+ clear:both; /* REQUIRED */
+ overflow:hidden;
+ color:gray;
+ background:url(images/menu_bg_grey.png) repeat-x #cfcfcf;
+ border:thin solid lightgray;
}
#FooterWrapDiv{
-overflow:hidden;
-padding:3px;
+ overflow:hidden;
+ padding:3px;
}
#FooterLogoDiv{
-float:left;
-background:white;
-border-radius:8px 8px 8px 8px;
-padding:3px;
-margin-left:47%; /* to the center (approx) */
+ float:left;
+ background:white;
+ border-radius:8px 8px 8px 8px;
+ padding:3px;
+ margin-left:47%; /* to the center (approx) */
}
#FooterLogoDiv img{
-vertical-align:middle;
+ vertical-align:middle;
}
#FooterVersionDiv{
clear:both; /* below the logo */
@@ -469,8 +467,8 @@
margin-left:47%; /* to the center (approx) */
}
#FooterTimeDiv{
-float:right;
-margin-top:-22px; /* go up to center */
+ float:right;
+ margin-top:-22px; /* go up to center */
}
/*** END ***/
\ No newline at end of file
Modified: trunk/css/wood/default.css
===================================================================
--- trunk/css/wood/default.css 2012-12-19 06:45:03 UTC (rev 5766)
+++ trunk/css/wood/default.css 2012-12-19 06:59:15 UTC (rev 5767)
@@ -20,7 +20,7 @@
body{
font-family:Arial, Verdana, Helvetica, sans-serif;
- font-size:12px;
+ font-size:10pt;
margin:10px;
background:url(images/desk.jpg) #631;
}
@@ -74,7 +74,7 @@
}
th { /* table headers */
font-weight: normal;
- font-size:12px;
+ font-size:100%;
background-color: #ffd980;
color: black;
text-align: center;
@@ -102,7 +102,7 @@
input { /* used for text box and buttons (buttons should have their own styles) */
font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 12px;
+ font-size:100%;
}
input.number{
text-align: right;
@@ -116,8 +116,8 @@
}
select { /* drop down */
- font-family: Arial, Verdana, Helvetica, sans-serif;;
- font-size: 12px;
+ font-family: Arial, Verdana, Helvetica, sans-serif;
+ font-size: 100%;
}
select:hover { /* drop down */
background:#fff791;
@@ -125,7 +125,7 @@
textarea{
font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 12px;
+ font-size: 100%;
}
textarea:hover{
background:#fff791;
@@ -188,7 +188,7 @@
POSITION: static;
font-family: Arial, Verdana, Helvetica, sans-serif;
font-weight: normal;
- font-size:12px;
+ font-size: 100%;
color: black;
TEXT-ALIGN:center;
@@ -198,18 +198,17 @@
width:80%;
}
DIV.system_check { /* probably not used anywhere */
- BORDER: #a52a2a 1px solid;
- Z-INDEX: 1;
- FLOAT: none;
- VISIBILITY: visible;
- POSITION: static;
+ border: #a52a2a 1px solid;
+ z-index: 1;
+ float: none;
+ visibility: visible;
+ position: static;
background: lightgray;
- font-family: Arial, Verdana, Helvetica, sans-serif;
+ font-family: arial, verdana, helvetica, sans-serif;
font-weight: normal;
- font-size:12px;
+ font-size:100%;
color: black;
- TEXT-ALIGN:left;
-
+ text-align:left;
box-shadow:3px 3px 4px;
margin:0 auto 10px;
padding:10px;
@@ -267,7 +266,7 @@
.label {
font-weight:bold;
font-style:normal;
- font-size:12px;
+ font-size:120%;
color:black;
background-color:#cccccc;
}
@@ -363,7 +362,7 @@
}
#AppInfoModuleDiv{
font-weight:bold;
- font-size:12px;
+ font-size:120%;
padding:3px;
}
Modified: trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2012-12-19 06:45:03 UTC (rev 5766)
+++ trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2012-12-19 06:59:15 UTC (rev 5767)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: web-erp\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-14 10:03+1200\n"
+"POT-Creation-Date: 2012-12-18 21:50+1300\n"
"PO-Revision-Date: 2012-01-26 10:26+0000\n"
"Last-Translator: JC_Chuck <Unknown>\n"
"Language-Team: Arabic <ar...@li...>\n"
@@ -17,11 +17,11 @@
"X-Launchpad-Export-Date: 2012-03-07 23:01+0000\n"
"X-Generator: Launchpad (build 14907)\n"
-#: AccountGroups.php:7 includes/MainMenuLinksArray.php:379
+#: AccountGroups.php:7 includes/MainMenuLinksArray.php:381
msgid "Account Groups"
msgstr "مجموعات العضوية"
-#: AccountGroups.php:18
+#: AccountGroups.php:19
msgid ""
"An error occurred in retrieving the account groups of the parent account "
"group during the check for recursion"
@@ -29,73 +29,73 @@
"لقد حدث خطأ فى استرجاع بيانات مجموعات العضو الخاصة باعضوية الأب اثناء "
"االتحقق من وجود استدعاء ذاتي"
-#: AccountGroups.php:19
+#: AccountGroups.php:20
msgid ""
"The SQL that was used to retrieve the account groups of the parent account "
"group and that failed in the process was"
msgstr ""
-#: AccountGroups.php:45
+#: AccountGroups.php:46
#, fuzzy
msgid "An error occurred in moving the account group"
msgstr "حدث خطأ اثناء تحديث مجموعة العضو"
-#: AccountGroups.php:46
+#: AccountGroups.php:47
#, fuzzy
msgid "The SQL that was used to moving the account group was"
msgstr "الطلب المستخدم لإضافة مجموعة الحسابات هي"
-#: AccountGroups.php:48 AccountGroups.php:309
+#: AccountGroups.php:49 AccountGroups.php:310
msgid "Review Account Groups"
msgstr ""
-#: AccountGroups.php:49
+#: AccountGroups.php:50
#, fuzzy
msgid "All accounts in the account group:"
msgstr "حدث خطأ اثناء تحديث مجموعة العضو"
-#: AccountGroups.php:49
+#: AccountGroups.php:50
#, fuzzy
msgid "have been changed to the account group:"
msgstr "الطلب المستخدم لإضافة مجموعة الحسابات هي"
-#: AccountGroups.php:68 AccountGroups.php:105 AccountGroups.php:186
-#: AccountGroups.php:221
+#: AccountGroups.php:69 AccountGroups.php:106 AccountGroups.php:187
+#: AccountGroups.php:222
msgid "The SQL that was used to retrieve the information was"
msgstr "الطلب المستخدم لإسترجاع المعلومات كان"
-#: AccountGroups.php:69
+#: AccountGroups.php:70
msgid "Could not check whether the group exists because"
msgstr "لم يتم التحقق من وجود المجموعة بسبب"
-#: AccountGroups.php:76
+#: AccountGroups.php:77
msgid "The account group name already exists in the database"
msgstr "اسم المجموعة موجود مسبقاً"
-#: AccountGroups.php:82
+#: AccountGroups.php:83
msgid "The account group name cannot contain the character"
msgstr "لا يمكن وضع هذا الحرف في اسم المجموعة"
-#: AccountGroups.php:82 Departments.php:30 TaxCategories.php:31
+#: AccountGroups.php:83 Departments.php:30 TaxCategories.php:31
msgid "or the character"
msgstr "او الحرف"
-#: AccountGroups.php:88
+#: AccountGroups.php:89
msgid "The account group name must be at least one character long"
msgstr "اسم المجموعة يجب ان يحتوي علي الأقل علي حرف واحد"
-#: AccountGroups.php:95
+#: AccountGroups.php:96
msgid ""
"The parent account group selected appears to result in a recursive account "
"structure - select an alternative parent account group or make this group a "
"top level account group"
msgstr ""
-#: AccountGroups.php:106
+#: AccountGroups.php:107
msgid "Could not check whether the group is recursive because"
msgstr "لم أستطيع التخقق اذا كانت المجموعة ذاتيى الأسترجاع لأن"
-#: AccountGroups.php:114
+#: AccountGroups.php:115
msgid ""
"Since this account group is a child group, the sequence in the trial "
"balance, the section in the accounts and whether or not the account group "
@@ -104,60 +104,60 @@
"will have no effect."
msgstr ""
-#: AccountGroups.php:119
+#: AccountGroups.php:120
msgid "The section in accounts must be an integer"
msgstr "يجب ان يكون القسم فى الحساب عدد صحيح"
-#: AccountGroups.php:125
+#: AccountGroups.php:126
msgid "The sequence in the trial balance must be an integer"
msgstr "التسلسل فى الحساب التجريبى يجب ان يكون عدد صحيح"
-#: AccountGroups.php:131
+#: AccountGroups.php:132
msgid "The sequence in the TB must be numeric and less than"
msgstr ""
-#: AccountGroups.php:147
+#: AccountGroups.php:148
msgid "An error occurred in updating the account group"
msgstr "حدث خطأ اثناء تحديث مجموعة العضو"
-#: AccountGroups.php:148
+#: AccountGroups.php:149
msgid "The SQL that was used to update the account group was"
msgstr ""
-#: AccountGroups.php:150 AccountSections.php:98 PaymentMethods.php:83
+#: AccountGroups.php:151 AccountSections.php:98 PaymentMethods.php:83
msgid "Record Updated"
msgstr "تم التحديث"
-#: AccountGroups.php:166
+#: AccountGroups.php:167
msgid "An error occurred in inserting the account group"
msgstr "حدث خطأ ما اثناء اضافة المجموعة"
-#: AccountGroups.php:167
+#: AccountGroups.php:168
msgid "The SQL that was used to insert the account group was"
msgstr "الطلب المستخدم لإضافة مجموعة الحسابات هي"
-#: AccountGroups.php:168 AccountSections.php:108
+#: AccountGroups.php:169 AccountSections.php:108
msgid "Record inserted"
msgstr "تمت الإضافة بنجاح"
-#: AccountGroups.php:185
+#: AccountGroups.php:186
msgid "An error occurred in retrieving the group information from chartmaster"
msgstr ""
-#: AccountGroups.php:190
+#: AccountGroups.php:191
msgid ""
"Cannot delete this account group because general ledger accounts have been "
"created using this group"
msgstr ""
-#: AccountGroups.php:191 AccountGroups.php:226 AccountSections.php:130
+#: AccountGroups.php:192 AccountGroups.php:227 AccountSections.php:130
#: Areas.php:115 Areas.php:124 BankAccounts.php:159 CreditStatus.php:125
#: Currencies.php:167 Currencies.php:175 Currencies.php:183
#: CustomerBranches.php:290 CustomerBranches.php:300 CustomerBranches.php:310
#: CustomerBranches.php:320 Customers.php:286 Customers.php:295
#: Customers.php:303 Customers.php:311 CustomerTypes.php:147
#: CustomerTypes.php:157 Departments.php:141 Factors.php:134
-#: FixedAssetCategories.php:134 GLAccounts.php:80 GLAccounts.php:96
+#: FixedAssetCategories.php:134 GLAccounts.php:83 GLAccounts.php:99
#: Locations.php:249 Locations.php:257 Locations.php:268 Locations.php:277
#: Locations.php:286 Locations.php:295 Locations.php:304 Locations.php:313
#: Locations.php:321 MRPDemandTypes.php:87 PaymentMethods.php:142
@@ -173,82 +173,83 @@
msgid "There are"
msgstr "يوجد"
-#: AccountGroups.php:191
+#: AccountGroups.php:192
msgid "general ledger accounts that refer to this account group"
msgstr ""
-#: AccountGroups.php:198 AccountGroups.php:269 AccountGroups.php:390
+#: AccountGroups.php:199 AccountGroups.php:270 AccountGroups.php:391
msgid "Parent Group"
msgstr ""
-#: AccountGroups.php:214
+#: AccountGroups.php:215
msgid "Move Group"
msgstr ""
-#: AccountGroups.php:220
+#: AccountGroups.php:221
msgid "An error occurred in retrieving the parent group information"
msgstr ""
-#: AccountGroups.php:225
+#: AccountGroups.php:226
msgid ""
"Cannot delete this account group because it is a parent account group of "
"other account group(s)"
msgstr ""
-#: AccountGroups.php:226
+#: AccountGroups.php:227
msgid "account groups that have this group as its/there parent account group"
msgstr ""
-#: AccountGroups.php:230
+#: AccountGroups.php:231
msgid "An error occurred in deleting the account group"
msgstr "حدث خطأ ما اثناء حذف مجموعة الحسابات"
-#: AccountGroups.php:231
+#: AccountGroups.php:232
msgid "The SQL that was used to delete the account group was"
msgstr ""
-#: AccountGroups.php:233
+#: AccountGroups.php:234
msgid "group has been deleted"
msgstr "تم حذف المجموعة"
-#: AccountGroups.php:258
+#: AccountGroups.php:259
msgid "The sql that was used to retrieve the account group information was "
msgstr ""
-#: AccountGroups.php:259
+#: AccountGroups.php:260
msgid "Could not get account groups because"
msgstr "لم يتمكن الحصول على مجموات العضو لان"
-#: AccountGroups.php:261 AccountSections.php:169 AddCustomerContacts.php:25
+#: AccountGroups.php:262 AccountSections.php:169 AddCustomerContacts.php:25
#: AddCustomerContacts.php:27 AddCustomerNotes.php:101
#: AddCustomerTypeNotes.php:94 AgedDebtors.php:444 AgedSuppliers.php:276
#: Areas.php:144 AuditTrail.php:11 BankReconciliation.php:14
#: BOMExtendedQty.php:250 BOMIndented.php:246 BOMIndentedReverse.php:235
#: BOMInquiry.php:187 BOMListing.php:109 BOMs.php:231 BOMs.php:858
-#: COGSGLPostings.php:19 CompanyPreferences.php:155 CounterSales.php:2045
-#: CounterSales.php:2170 Credit_Invoice.php:256 CreditStatus.php:21
-#: Currencies.php:29 CustEDISetup.php:17 DailyBankTransactions.php:11
-#: DebtorsAtPeriodEnd.php:125 Departments.php:10 DiscountCategories.php:12
-#: DiscountCategories.php:136 DiscountMatrix.php:16 EDIMessageFormat.php:105
-#: FixedAssetLocations.php:9 FixedAssetRegister.php:13
-#: FixedAssetRegister.php:249 FixedAssetTransfer.php:11 FormDesigner.php:129
-#: GLBalanceSheet.php:378 GLBudgets.php:29 GLJournalInquiry.php:7
-#: GLJournal.php:247 InternalStockRequest.php:300 InventoryPlanning.php:379
+#: COGSGLPostings.php:19 CompanyPreferences.php:155 CounterReturns.php:1610
+#: CounterSales.php:2074 CounterSales.php:2199 Credit_Invoice.php:270
+#: CreditStatus.php:21 Currencies.php:29 CustEDISetup.php:17
+#: DailyBankTransactions.php:11 DebtorsAtPeriodEnd.php:125
+#: DiscountCategories.php:12 DiscountCategories.php:136 DiscountMatrix.php:16
+#: EDIMessageFormat.php:105 FixedAssetLocations.php:9
+#: FixedAssetRegister.php:13 FixedAssetRegister.php:249
+#: FixedAssetTransfer.php:11 FormDesigner.php:129 GLBalanceSheet.php:378
+#: GLBudgets.php:29 GLJournalInquiry.php:7 GLJournal.php:247
+#: InternalStockRequest.php:300 InventoryPlanning.php:379
#: InventoryPlanningPrefSupplier.php:469 MRPReport.php:516 NoSalesItems.php:89
#: OutstandingGRNs.php:163 PcAssignCashToTab.php:59 PcAssignCashToTab.php:133
#: PcAssignCashToTab.php:149 PcAssignCashToTab.php:193 PDFPickingList.php:28
#: PDFStockLocTransfer.php:16 PO_AuthorisationLevels.php:10 POReport.php:...
[truncated message content] |
|
From: <dai...@us...> - 2012-12-20 08:38:29
|
Revision: 5768
http://sourceforge.net/p/web-erp/reponame/5768
Author: daintree
Date: 2012-12-20 08:38:22 +0000 (Thu, 20 Dec 2012)
Log Message:
-----------
removed trailing whitespace for Tim
Modified Paths:
--------------
trunk/AccountGroups.php
trunk/AuditTrail.php
trunk/BOMIndented.php
trunk/BOMInquiry.php
trunk/BOMListing.php
trunk/BOMs.php
trunk/BackupDatabase.php
trunk/COGSGLPostings.php
trunk/ConfirmDispatch_Invoice.php
trunk/ContractBOM.php
trunk/ContractCosting.php
trunk/ContractOtherReqts.php
trunk/CopyBOM.php
trunk/CounterReturns.php
trunk/CounterSales.php
trunk/Credit_Invoice.php
trunk/Currencies.php
trunk/CustWhereAlloc.php
trunk/CustomerAllocations.php
trunk/CustomerReceipt.php
trunk/CustomerTransInquiry.php
trunk/CustomerTypes.php
trunk/DailyBankTransactions.php
trunk/DailySalesInquiry.php
trunk/DebtorsAtPeriodEnd.php
trunk/DeliveryDetails.php
trunk/Departments.php
trunk/EDISendInvoices.php
trunk/EDISendInvoices_Reece.php
trunk/EmailCustTrans.php
trunk/ExchangeRateTrend.php
trunk/Factors.php
trunk/FixedAssetCategories.php
trunk/FixedAssetDepreciation.php
trunk/FixedAssetItems.php
trunk/FixedAssetTransfer.php
trunk/FreightCosts.php
trunk/GLAccountCSV.php
trunk/GLAccountInquiry.php
trunk/GLAccountReport.php
trunk/GLBalanceSheet.php
trunk/GLBudgets.php
trunk/GLJournal.php
trunk/GLProfit_Loss.php
trunk/GLTagProfit_Loss.php
trunk/GLTags.php
trunk/GLTransInquiry.php
trunk/GLTrialBalance.php
trunk/GLTrialBalance_csv.php
trunk/GeocodeSetup.php
trunk/GetStockImage.php
trunk/GoodsReceived.php
trunk/InternalStockCategoriesByRole.php
trunk/InternalStockRequest.php
trunk/InternalStockRequestAuthorisation.php
trunk/InternalStockRequestFulfill.php
trunk/InventoryQuantities.php
trunk/Locations.php
trunk/MRPDemandTypes.php
trunk/MRPDemands.php
trunk/MRPPlannedPurchaseOrders.php
trunk/MRPReport.php
trunk/MRPReschedules.php
trunk/MRPShortages.php
trunk/NoSalesItems.php
trunk/OffersReceived.php
trunk/OrderDetails.php
trunk/OutstandingGRNs.php
trunk/PDFBankingSummary.php
trunk/PDFCustomerList.php
trunk/PDFDeliveryDifferences.php
trunk/PDFGrn.php
trunk/PDFLowGP.php
trunk/PDFOrdersInvoiced.php
trunk/PDFPeriodStockTransListing.php
trunk/PDFPickingList.php
trunk/PDFRemittanceAdvice.php
trunk/PDFStockCheckComparison.php
trunk/PDFStockNegatives.php
trunk/PDFSuppTransListing.php
trunk/PDFTopItems.php
trunk/POReport.php
trunk/PO_AuthorisationLevels.php
trunk/PO_AuthoriseMyOrders.php
trunk/PO_Chk_ShiptRef_JobRef.php
trunk/PO_Header.php
trunk/PO_Items.php
trunk/PO_OrderDetails.php
trunk/PO_PDFPurchOrder.php
trunk/PO_SelectOSPurchOrder.php
trunk/PO_SelectPurchOrder.php
trunk/PageSecurity.php
trunk/PaymentMethods.php
trunk/PaymentTerms.php
trunk/Payments.php
trunk/PcAssignCashToTab.php
trunk/PcClaimExpensesFromTab.php
trunk/PcExpenses.php
trunk/PcExpensesTypeTab.php
trunk/PcTabs.php
trunk/PcTypeTabs.php
trunk/PeriodsInquiry.php
trunk/PricesByCost.php
trunk/PrintCheque.php
trunk/PrintCustOrder.php
trunk/PrintCustOrder_generic.php
trunk/PrintCustTrans.php
trunk/ReorderLevel.php
trunk/ReorderLevelLocation.php
trunk/ReprintGRN.php
trunk/SalesAnalRepts.php
trunk/SalesCategories.php
trunk/SalesCategoryPeriodInquiry.php
trunk/SalesGraph.php
trunk/SalesPeople.php
trunk/SalesTopItemsInquiry.php
trunk/SecurityTokens.php
trunk/SelectAsset.php
trunk/SelectCompletedOrder.php
trunk/SelectCreditItems.php
trunk/SelectCustomer.php
trunk/SelectOrderItems.php
trunk/SelectProduct.php
trunk/SelectRecurringSalesOrder.php
trunk/SelectSupplier.php
trunk/SelectWorkOrder.php
trunk/ShipmentCosting.php
trunk/Shipments.php
trunk/Shipt_Select.php
trunk/StockCounts.php
trunk/StockLocTransferReceive.php
trunk/StockReorderLevel.php
trunk/StockTransferControlled.php
trunk/StockUsage.php
trunk/SuppContractChgs.php
trunk/SuppCreditGRNs.php
trunk/SuppFixedAssetChgs.php
trunk/SuppInvGRNs.php
trunk/SuppPaymentRun.php
trunk/SuppPriceList.php
trunk/SuppShiptChgs.php
trunk/SuppTransGLAnalysis.php
trunk/SupplierAllocations.php
trunk/SupplierBalsAtPeriodEnd.php
trunk/SupplierCredit.php
trunk/SupplierInquiry.php
trunk/SupplierInvoice.php
trunk/SupplierPriceList.php
trunk/SupplierTenderCreate.php
trunk/SupplierTransInquiry.php
trunk/SupplierTypes.php
trunk/Tax.php
trunk/TaxAuthorityRates.php
trunk/TaxProvinces.php
trunk/TopItems.php
trunk/UnitsOfMeasure.php
trunk/UpgradeDatabase.php
trunk/UserSettings.php
trunk/WWW_Access.php
trunk/WorkCentres.php
trunk/WorkOrderCosting.php
trunk/WorkOrderIssue.php
trunk/WorkOrderReceive.php
trunk/Z_BottomUpCosts.php
trunk/Z_ChangeBranchCode.php
trunk/Z_ChangeCustomerCode.php
trunk/Z_ChangeLocationCode.php
trunk/Z_ChangeStockCategory.php
trunk/Z_ChangeStockCode.php
trunk/Z_CheckAllocationsFrom.php
trunk/Z_CheckAllocs.php
trunk/Z_CheckDebtorsControl.php
trunk/Z_CreateCompanyTemplateFile.php
trunk/Z_CurrencyDebtorsBalances.php
trunk/Z_CurrencySuppliersBalances.php
trunk/Z_DeleteCreditNote.php
trunk/Z_DeleteInvoice.php
trunk/Z_ImportFixedAssets.php
trunk/Z_MakeNewCompany.php
trunk/Z_SalesIntegrityCheck.php
trunk/Z_UpdateChartDetailsBFwd.php
trunk/api/api_branches.php
trunk/api/api_currencies.php
trunk/api/api_errorcodes.php
trunk/api/api_glaccounts.php
trunk/api/api_glgroups.php
trunk/api/api_glsections.php
trunk/api/api_holdreasons.php
trunk/api/api_locations.php
trunk/api/api_paymentterms.php
trunk/api/api_purchdata.php
trunk/api/api_salesareas.php
trunk/api/api_salesorders.php
trunk/api/api_salestypes.php
trunk/api/api_stock.php
trunk/api/api_stockcategories.php
trunk/api/api_workorders.php
trunk/doc/Manual/ManualContents.php
trunk/includes/Add_SerialItems.php
trunk/includes/Add_SerialItemsOut.php
trunk/includes/ConnectDB_mysqli.inc
trunk/includes/ConnectDB_postgres.inc
trunk/includes/ConstructSQLForUserDefinedSalesReport.inc
trunk/includes/Contract_Readin.php
trunk/includes/CountriesArray.php
trunk/includes/DateFunctions.inc
trunk/includes/DefineCartClass.php
trunk/includes/DefineContractClass.php
trunk/includes/DefineCustAllocsClass.php
trunk/includes/DefineJournalClass.php
trunk/includes/DefineLabelClass.php
trunk/includes/DefineOfferClass.php
trunk/includes/DefinePOClass.php
trunk/includes/DefinePaymentClass.php
trunk/includes/DefineShiptClass.php
trunk/includes/DefineSpecialOrderClass.php
trunk/includes/DefineSuppTransClass.php
trunk/includes/DefineTenderClass.php
trunk/includes/EDIconfig.inc
trunk/includes/FreightCalculation.inc
trunk/includes/GetConfig.php
trunk/includes/GetPaymentMethods.php
trunk/includes/GetSalesTransGLCodes.inc
trunk/includes/InputSerialItems.php
trunk/includes/InputSerialItemsExisting.php
trunk/includes/InputSerialItemsKeyed.php
trunk/includes/LanguageSetup.php
trunk/includes/LanguagesArray.php
trunk/includes/MiscFunctions.php
trunk/includes/OutputSerialItems.php
trunk/includes/PDFBalanceSheetPageHeader.inc
trunk/includes/PDFInventoryValnPageHeader.inc
trunk/includes/PDFPaymentRun_PymtFooter.php
trunk/includes/PDFProfitAndLossPageHeader.inc
trunk/includes/PDFSalesAnalysis.inc
trunk/includes/PDFStarter.php
trunk/includes/PDFTabReportHeader.inc
trunk/includes/PDFTopItemsHeader.inc
trunk/includes/PDFTransPageHeaderPortrait.inc
trunk/includes/PDFTrialBalancePageHeader.inc
trunk/includes/PO_ReadInOrder.inc
trunk/includes/RFC822.php
trunk/includes/SelectOrderItems_IntoCart.inc
trunk/includes/Z_POSDataCreation.php
trunk/includes/barcodepack/class.barcode.php
trunk/includes/barcodepack/class.code128.php
trunk/includes/barcodepack/class.ean13.php
trunk/includes/barcodepack/class.i2of5.php
trunk/includes/barcodepack/class.linearBarcode.php
trunk/includes/barcodepack/class.qrCode.php
trunk/includes/barcodepack/class.s2of5.php
trunk/includes/barcodepack/class.upc.php
trunk/includes/class.pdf.php
trunk/includes/header.inc
trunk/includes/phplot/phplot.php
trunk/includes/session.inc
trunk/install/index.php
trunk/install/save.php
trunk/install/timezone.php
trunk/locale/de_DE.utf8/Manual/ManualContents.php
trunk/reportwriter/FormMaker.php
trunk/reportwriter/ReportMaker.php
trunk/reportwriter/admin/ReportCreator.php
trunk/reportwriter/install/ReportListLinks.php
Modified: trunk/AccountGroups.php
===================================================================
--- trunk/AccountGroups.php 2012-12-19 06:59:15 UTC (rev 5767)
+++ trunk/AccountGroups.php 2012-12-20 08:38:22 UTC (rev 5768)
@@ -63,7 +63,7 @@
$i=1;
$sql="SELECT count(groupname)
- FROM accountgroups
+ FROM accountgroups
WHERE groupname='".$_POST['GroupName']."'";
$DbgMsg = _('The SQL that was used to retrieve the information was');
@@ -191,7 +191,7 @@
prnMsg( _('Cannot delete this account group because general ledger accounts have been created using this group'),'warn');
echo '<br />' . _('There are') . ' ' . $myrow['groups'] . ' ' . _('general ledger accounts that refer to this account group');
echo '<br /><form method="post" id="AccountGroups" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">';
-
+
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<table class="selection">';
echo '<input type="hidden" name="OriginalAccountGroup" value="' . $_GET['SelectedAccountGroup'] . '" />';
@@ -358,7 +358,7 @@
</tr>';
} elseif (!isset($_POST['MoveGroup'])) { //end of if $_POST['SelectedAccountGroup'] only do the else when a new record is being entered
-
+
if (!isset($_POST['SelectedAccountGroup'])){
$_POST['SelectedAccountGroup']='';
}
Modified: trunk/AuditTrail.php
===================================================================
--- trunk/AuditTrail.php 2012-12-19 06:59:15 UTC (rev 5767)
+++ trunk/AuditTrail.php 2012-12-20 08:38:22 UTC (rev 5768)
@@ -117,7 +117,7 @@
$SQLString = str_replace('SET','',$SQLString);
$SQLString = str_replace('WHERE',',',$SQLString);
$SQLString = str_replace('AND',',',$SQLString);
- $FieldArray = preg_split("/[[:space:]]*([[:alnum:].]+[[:space:]]*=[[:space:]]*(?:'[^']*'|[[:digit:].]+))[[:space:]]*,/", $SQLString, 0, PREG_SPLIT_DELIM_CAPTURE|PREG_SPLIT_NO_EMPTY);
+ $FieldArray = preg_split("/[[:space:]]*([[:alnum:].]+[[:space:]]*=[[:space:]]*(?:'[^']*'|[[:digit:].]+))[[:space:]]*,/", $SQLString, 0, PREG_SPLIT_DELIM_CAPTURE|PREG_SPLIT_NO_EMPTY);
for ($i=0; $i<sizeof($FieldArray); $i++) {
$Assigment = explode('=', $FieldArray[$i]);
$_SESSION['SQLString']['fields'][$i] = $Assigment[0];
@@ -138,7 +138,7 @@
$_SESSION['SQLString']['fields'][0] = $Assigment[0];
$_SESSION['SQLString']['values'][0] = $Assigment[1];
}
-
+
if (mb_strlen($ContainingText) > 0) {
$ContainingText = " AND querystring LIKE '%" . $ContainingText . "%' ";
}else{
Modified: trunk/BOMIndented.php
===================================================================
--- trunk/BOMIndented.php 2012-12-19 06:59:15 UTC (rev 5767)
+++ trunk/BOMIndented.php 2012-12-20 08:38:22 UTC (rev 5768)
@@ -49,7 +49,7 @@
CONCAT(bom.parent,bom.component) AS sortpart
FROM bom
WHERE bom.parent ='" . $_POST['Part'] . "'
- AND bom.effectiveto >= NOW()
+ AND bom.effectiveto >= NOW()
AND bom.effectiveafter <= NOW()";
$result = DB_query($sql,$db);
@@ -76,7 +76,7 @@
bom.quantity
FROM bom
WHERE bom.parent ='" . $_POST['Part'] . "'
- AND bom.effectiveto >= NOW()
+ AND bom.effectiveto >= NOW()
AND bom.effectiveafter <= NOW()";
$result = DB_query($sql,$db);
//echo "<br />sql is $sql<br />";
@@ -132,7 +132,7 @@
CONCAT(passbom2.sortpart,bom.component) AS sortpart
FROM bom,passbom2
WHERE bom.parent = passbom2.part
- AND bom.effectiveto >= NOW()
+ AND bom.effectiveto >= NOW()
AND bom.effectiveafter <= NOW()";
$result = DB_query($sql,$db);
@@ -184,7 +184,7 @@
$fill = false;
$pdf->SetFillColor(224,235,255);
- $ListCount = DB_num_rows($result);
+ $ListCount = DB_num_rows($result);
while ($myrow = DB_fetch_array($result,$db)){
@@ -246,7 +246,7 @@
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'</p><br />';
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
- <div>
+ <div>
<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
<table class="selection">';
echo '<tr>
Modified: trunk/BOMInquiry.php
===================================================================
--- trunk/BOMInquiry.php 2012-12-19 06:59:15 UTC (rev 5767)
+++ trunk/BOMInquiry.php 2012-12-20 08:38:22 UTC (rev 5768)
@@ -61,9 +61,9 @@
FROM stockmaster INNER JOIN locstock
ON stockmaster.stockid = locstock.stockid
WHERE stockmaster.description " . LIKE . " '$SearchString'
- AND (stockmaster.mbflag='M'
- OR stockmaster.mbflag='K'
- OR stockmaster.mbflag='A'
+ AND (stockmaster.mbflag='M'
+ OR stockmaster.mbflag='K'
+ OR stockmaster.mbflag='A'
OR stockmaster.mbflag='G')
GROUP BY stockmaster.stockid,
stockmaster.description,
@@ -98,8 +98,8 @@
} //one of keywords or StockCode was more than a zero length string
} //end of if search
-if (isset($_POST['Search'])
- AND isset($result)
+if (isset($_POST['Search'])
+ AND isset($result)
AND !isset($SelectedParent)) {
echo '<br />
@@ -151,18 +151,18 @@
}
if (isset($StockID) and $StockID!=""){
-
- $result = DB_query("SELECT description,
- units,
- labourcost,
- overheadcost
- FROM stockmaster
+
+ $result = DB_query("SELECT description,
+ units,
+ labourcost,
+ overheadcost
+ FROM stockmaster
WHERE stockid='" . $StockID . "'",
$db);
$myrow = DB_fetch_array($result);
$ParentLabourCost = $myrow['labourcost'];
$ParentOverheadCost = $myrow['overheadcost'];
-
+
$sql = "SELECT bom.parent,
bom.component,
stockmaster.description,
@@ -170,7 +170,7 @@
stockmaster.materialcost+ stockmaster.labourcost+stockmaster.overheadcost as standardcost,
bom.quantity,
bom.quantity * (stockmaster.materialcost+ stockmaster.labourcost+ stockmaster.overheadcost) AS componentcost
- FROM bom INNER JOIN stockmaster
+ FROM bom INNER JOIN stockmaster
ON bom.component = stockmaster.stockid
WHERE bom.parent = '" . $StockID . "'
AND bom.effectiveafter < Now()
@@ -237,7 +237,7 @@
$j++;
}
-
+
$TotalCost += $ParentLabourCost;
echo '<tr>
<td colspan="4" class="number"><b>' . _('Labour Cost') . '</b></td>
Modified: trunk/BOMListing.php
===================================================================
--- trunk/BOMListing.php 2012-12-19 06:59:15 UTC (rev 5767)
+++ trunk/BOMListing.php 2012-12-20 08:38:22 UTC (rev 5768)
@@ -98,9 +98,9 @@
$YPos -=$line_height;
$pdf->line($Page_Width-$Right_Margin, $YPos,$Left_Margin, $YPos);
-
+
$pdf->OutputD($_SESSION['DatabaseName'] . '_BOMListing_' . date('Y-m-d').'.pdf');
- $pdf->__destruct();
+ $pdf->__destruct();
} else { /*The option to print PDF was not hit */
Modified: trunk/BOMs.php
===================================================================
--- trunk/BOMs.php 2012-12-19 06:59:15 UTC (rev 5767)
+++ trunk/BOMs.php 2012-12-20 08:38:22 UTC (rev 5768)
@@ -20,7 +20,7 @@
FROM bom WHERE parent='" . $Parent. "'"
,$db);
if (DB_num_rows($c_result) > 0) {
-
+
while ($row = DB_fetch_array($c_result)) {
//echo '<br />Parent: ' . $Parent . ' Level: ' . $Level . ' row[component]: ' . $row['component'] .'<br />';
if ($Parent != $row['component']) {
@@ -85,13 +85,13 @@
locstock.quantity AS qoh,
stockmaster.decimalplaces
FROM bom INNER JOIN stockmaster
- ON bom.component=stockmaster.stockid
- INNER JOIN locations ON
- bom.loccode = locations.loccode
- INNER JOIN workcentres
+ ON bom.component=stockmaster.stockid
+ INNER JOIN locations ON
+ bom.loccode = locations.loccode
+ INNER JOIN workcentres
ON bom.workcentreadded=workcentres.code
- INNER JOIN locstock
- ON bom.loccode=locstock.loccode
+ INNER JOIN locstock
+ ON bom.loccode=locstock.loccode
AND bom.component = locstock.stockid
WHERE bom.component='".$Component."'
AND bom.parent = '".$Parent."'";
@@ -106,10 +106,10 @@
while ($myrow=DB_fetch_array($result)) {
$Level1 = str_repeat('- ',$Level-1).$Level;
- if( $myrow['mbflag']=='B'
- OR $myrow['mbflag']=='K'
+ if( $myrow['mbflag']=='B'
+ OR $myrow['mbflag']=='K'
OR $myrow['mbflag']=='D') {
-
+
$DrillText = '%s%s';
$DrillLink = '<div class="centre">'._('No lower levels').'</div>';
$DrillID='';
@@ -132,12 +132,12 @@
OR $myrow['mbflag']=='K' //kit-set
OR $myrow['mbflag']=='A' // assembly
OR $myrow['mbflag']=='G') /* ghost */ {
-
+
$QuantityOnHand = _('N/A');
} else {
$QuantityOnHand = locale_number_format($myrow['qoh'],$myrow['decimalplaces']);
- }
-
+ }
+
printf('<td>%s</td>
<td>%s</td>
<td>%s</td>
@@ -372,8 +372,8 @@
//the link to delete a selected record was clicked instead of the Submit button
- $sql="DELETE FROM bom
- WHERE parent='".$SelectedParent."'
+ $sql="DELETE FROM bom
+ WHERE parent='".$SelectedParent."'
AND component='".$SelectedComponent."'
AND loccode='".$Location."'
AND workcentreadded='".$WorkCentre."'";
@@ -382,8 +382,8 @@
$DbgMsg = _('The SQL used to delete the BOM was');
$result = DB_query($sql,$db,$ErrMsg,$DbgMsg);
- $ComponentSQL = "SELECT component
- FROM bom
+ $ComponentSQL = "SELECT component
+ FROM bom
WHERE parent='" . $SelectedParent ."'";
$ComponentResult = DB_query($ComponentSQL,$db);
$ComponentArray = DB_fetch_row($ComponentResult);
@@ -464,11 +464,11 @@
echo '</table>';
}
// Display Assembly Parent Items
- $sql = "SELECT bom.parent,
- stockmaster.description,
+ $sql = "SELECT bom.parent,
+ stockmaster.description,
stockmaster.mbflag
FROM bom INNER JOIN stockmaster
- ON bom.parent=stockmaster.stockid
+ ON bom.parent=stockmaster.stockid
WHERE bom.component='".$SelectedParent."'
AND stockmaster.mbflag='A'";
@@ -488,11 +488,11 @@
echo '</table>';
}
// Display Kit Sets
- $sql = "SELECT bom.parent,
- stockmaster.description,
+ $sql = "SELECT bom.parent,
+ stockmaster.description,
stockmaster.mbflag
FROM bom INNER JOIN stockmaster
- ON bom.parent=stockmaster.stockid
+ ON bom.parent=stockmaster.stockid
WHERE bom.component='".$SelectedParent."'
AND stockmaster.mbflag='K'";
@@ -512,11 +512,11 @@
echo '</table>';
}
// Display Phantom/Ghosts
- $sql = "SELECT bom.parent,
- stockmaster.description,
+ $sql = "SELECT bom.parent,
+ stockmaster.description,
stockmaster.mbflag
FROM bom INNER JOIN stockmaster
- ON bom.parent=stockmaster.stockid
+ ON bom.parent=stockmaster.stockid
WHERE bom.component='".$SelectedParent."'
AND stockmaster.mbflag='G'";
@@ -601,7 +601,7 @@
workcentreadded,
quantity,
autoissue
- FROM bom
+ FROM bom
WHERE parent='".$SelectedParent."'
AND component='".$SelectedComponent."'";
@@ -871,10 +871,10 @@
<br /><div class="centre"><input tabindex="3" type="submit" name="Search" value="' . _('Search Now') . '" /></div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- if (isset($_POST['Search'])
- AND isset($result)
+ if (isset($_POST['Search'])
+ AND isset($result)
AND !isset($SelectedParent)) {
-
+
echo '<br />
<table cellpadding="2" class="selection">';
$TableHeader = '<tr>
@@ -883,9 +883,9 @@
<th>' . _('On Hand') . '</th>
<th>' . _('Units') . '</th>
</tr>';
-
+
echo $TableHeader;
-
+
$j = 1;
$k=0; //row colour counter
while ($myrow=DB_fetch_array($result)) {
@@ -911,17 +911,17 @@
$myrow['description'],
$StockOnHand,
$myrow['units']);
-
+
$j++;
//end of page full new headings if
}
//end of while loop
-
+
echo '</table>';
-
+
}
//end if results to show
-
+
if (!isset($SelectedParent) or $SelectedParent=='') {
echo '<script type="text/javascript">defaultControl(document.forms[0].StockCode);</script>';
} else {
@@ -941,7 +941,7 @@
foreach($array as $key => $item) {
// Serialize the current element and create a md5 hash
$hash = md5(serialize($item));
- // If the md5 didn't come up yet, add the element to
+ // If the md5 didn't come up yet, add the element to
// arrayRewrite, otherwise drop it
if (!isset($arrayHashes[$hash])) {
// Save the current element hash
Modified: trunk/BackupDatabase.php
===================================================================
--- trunk/BackupDatabase.php 2012-12-19 06:59:15 UTC (rev 5767)
+++ trunk/BackupDatabase.php 2012-12-20 08:38:22 UTC (rev 5768)
@@ -11,11 +11,11 @@
$BackupFiles = scandir('companies/' . $_SESSION['DatabaseName'], 0);
$DeletedFiles = false;
foreach ($BackupFiles as $BackupFile){
-
+
if (mb_substr($BackupFile,0,6)=='Backup'){
-
+
$DeleteResult = unlink('companies/' . $_SESSION['DatabaseName'] . '/' . $BackupFile);
-
+
if ($DeleteResult==true){
prnMsg(_('Deleted') . ' companies/' . $_SESSION['DatabaseName'] . '/' . $BackupFile,'info');
$DeletedFiles = true;
@@ -30,15 +30,15 @@
prnMsg(_('No backup files on the server were deleted'),'info');
}
} else {
-
+
$BackupFile = $rootpath . '/companies/' . $_SESSION['DatabaseName'] .'/' . _('Backup') . '_' . Date('Y-m-d-H-i-s') . '.sql.gz';
- $Command = 'mysqldump --opt -h' . $host . ' -u' . $dbuser . ' -p' . $dbpassword . ' ' . $_SESSION['DatabaseName'] . '| gzip > ' .
+ $Command = 'mysqldump --opt -h' . $host . ' -u' . $dbuser . ' -p' . $dbpassword . ' ' . $_SESSION['DatabaseName'] . '| gzip > ' .
$_SERVER['DOCUMENT_ROOT'] . $BackupFile;
-
-
+
+
$CommandOutput = array();
exec($Command,$CommandOutput, $ReturnValue);
-
+
if ($ReturnValue ==0) {
prnMsg(_('The backup file has now been created. You must now download this to your computer because in case the web-server has a disk failure the backup would then not on the same machine. Use the link below') . '<br /><br /><a href="' . $BackupFile . '">' . _('Download the backup file to your locale machine') . '</a>','success');
prnMsg(_('Once you have downloaded the database backup file to your local machine you should use the link below to delete it - backup files can consume a lot of space on your hosting account and will accumulate if not deleted - they also contain sensitive information which would otherwise be available for others to download!'),'info');
@@ -50,7 +50,7 @@
}
}
/*
-//this could be a weighty file attachment!!
+//this could be a weighty file attachment!!
include('includes/htmlMimeMail.php');
$mail = new htmlMimeMail();
$attachment = $mail->getFile( $BackupFile);
Modified: trunk/COGSGLPostings.php
===================================================================
--- trunk/COGSGLPostings.php 2012-12-19 06:59:15 UTC (rev 5767)
+++ trunk/COGSGLPostings.php 2012-12-20 08:38:22 UTC (rev 5768)
@@ -138,12 +138,12 @@
$sql = "INSERT INTO accountgroups ( groupname,
sectioninaccounts,
pandl,
- sequenceintb )
+ sequenceintb )
VALUES ('Sales',
'1',
'1',
'10')";
-
+
$result = DB_query($sql,$db);
}
$sql = "SELECT accountcode FROM chartmaster WHERE accountcode ='1'";
@@ -215,7 +215,7 @@
$myrow['id'],
htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?',
$myrow['id']);
-
+
}//END WHILE LIST LOOP
echo '</table>';
}
Modified: trunk/ConfirmDispatch_Invoice.php
===================================================================
--- trunk/ConfirmDispatch_Invoice.php 2012-12-19 06:59:15 UTC (rev 5767)
+++ trunk/ConfirmDispatch_Invoice.php 2012-12-20 08:38:22 UTC (rev 5768)
@@ -116,7 +116,7 @@
$_SESSION['Items'.$identifier]->PhoneNo = $myrow['contactphone'];
$_SESSION['Items'.$identifier]->Email = $myrow['contactemail'];
$_SESSION['Items'.$identifier]->SalesPerson = $myrow['salesperson'];
-
+
$_SESSION['Items'.$identifier]->Location = $myrow['fromstkloc'];
$_SESSION['Items'.$identifier]->FreightCost = $myrow['freightcost'];
$_SESSION['Old_FreightCost'] = $myrow['freightcost'];
Modified: trunk/ContractBOM.php
===================================================================
--- trunk/ContractBOM.php 2012-12-19 06:59:15 UTC (rev 5767)
+++ trunk/ContractBOM.php 2012-12-20 08:38:22 UTC (rev 5768)
@@ -399,7 +399,7 @@
}#end if SearchResults to show
echo '<hr />
- </div>
+ </div>
</form>';
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/ContractCosting.php
===================================================================
--- trunk/ContractCosting.php 2012-12-19 06:59:15 UTC (rev 5767)
+++ trunk/ContractCosting.php 2012-12-20 08:38:22 UTC (rev 5768)
@@ -51,7 +51,7 @@
$InventoryIssues[$InventoryIssuesRow['stockid']]->Units = $InventoryIssuesRow['units'];
$InventoryIssues[$InventoryIssuesRow['stockid']]->DecimalPlaces = $InventoryIssuesRow['decimalplaces'];
$InventoryIssues[$InventoryIssuesRow['stockid']]->Matched = 0;
-
+
}
echo '<p class="page_title_text">
@@ -89,7 +89,7 @@
<th>' . _('Unit Cost') . '</th>
<th>' . _('Total Cost') . '</th>
</tr>';
-
+
$ContractBOMBudget = 0;
$ContractBOMActual = 0;
foreach ($_SESSION['Contract'.$identifier]->ContractBOM as $Component) {
@@ -100,9 +100,9 @@
<td>' . $Component->UOM . '</td>
<td class="number">' . locale_number_format($Component->ItemCost,$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
<td class="number">' . locale_number_format(($Component->ItemCost * $Component->Quantity),$_SESSION['CompanyRecord']['decimalplaces']) . '</td>';
-
+
$ContractBOMBudget += ($Component->ItemCost * $Component->Quantity);
-
+
if (isset($InventoryIssues[$Component->StockID])){
$InventoryIssues[$Component->StockID]->Matched=1;
echo '<td colspan="2" align="center">' . _('Actual usage') . '</td>
@@ -153,7 +153,7 @@
<th>' . _('Unit Cost') . '</th>
<th>' . _('Total Cost') . '</th>
</tr>';
-
+
foreach ($_SESSION['Contract'.$identifier]->ContractReqts as $Requirement) {
echo '<tr><td>' . $Requirement->Requirement . '</td>
<td class="number">' . locale_number_format($Requirement->Quantity,'Variable') . '</td>
@@ -355,7 +355,7 @@
1,
'" . ($OtherReqtsBudget+$ContractBOMBudget) . "',
'" . ($QtyOnHandPrior + 1) . "')";
-
+
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('stock movement records could not be inserted when processing the work order receipt because');
$DbgMsg = _('The following SQL to insert the stock movement records was used');
$Result = DB_query($SQL, $db, $ErrMsg, $DbgMsg, true);
Modified: trunk/ContractOtherReqts.php
===================================================================
--- trunk/ContractOtherReqts.php 2012-12-19 06:59:15 UTC (rev 5767)
+++ trunk/ContractOtherReqts.php 2012-12-20 08:38:22 UTC (rev 5768)
@@ -159,15 +159,15 @@
<td>' . _('Cost Per Unit') . ':</td>
<td><input type="text" class="number" name="CostPerUnit" size="10" maxlength="10" value="' . $_POST['CostPerUnit'] . '" /></td>
</tr>
-
+
</table>
-
+
<br />
<div class="centre">
<input type="submit" name="EnterNewRequirement" value="' . _('Enter New Contract Requirement') . '" />
</div>
</div>
</form>';
-
+
include('includes/footer.inc');
?>
Modified: trunk/CopyBOM.php
===================================================================
--- trunk/CopyBOM.php 2012-12-19 06:59:15 UTC (rev 5767)
+++ trunk/CopyBOM.php 2012-12-20 08:38:22 UTC (rev 5768)
@@ -19,7 +19,7 @@
$NewOrExisting = $_POST['NewOrExisting'];
$NewStockID = '';
$InputError = 0; //assume the best
-
+
if($NewOrExisting == 'N') {
$NewStockID = $_POST['ToStockID'];
if (mb_strlen($NewStockID)==0 OR $NewStockID==''){
@@ -104,9 +104,9 @@
FROM stockmaster
WHERE stockid='".$StockID."';";
$result = DB_query($sql, $db);
-
+
$myrow = DB_fetch_row($result);
-
+
$sql = "UPDATE stockmaster set
lastcostupdate = " . $myrow[0] . ",
actualcost = " . $myrow[1] . ",
@@ -118,7 +118,7 @@
WHERE stockid='".$NewStockID."';";
$result = DB_query($sql, $db);
}
-
+
$sql = "INSERT INTO bom
SELECT '".$NewStockID."' AS parent,
component,
@@ -131,7 +131,7 @@
FROM bom
WHERE parent='".$StockID."';";
$result = DB_query($sql, $db);
-
+
if($NewOrExisting == 'N') {
$sql = "INSERT INTO locstock
SELECT loccode,
@@ -140,14 +140,14 @@
reorderlevel
FROM locstock
WHERE stockid='".$StockID."'";
-
+
$result = DB_query($sql, $db);
}
-
+
$result = DB_Txn_Commit($db);
-
+
UpdateCost($db, $NewStockID);
-
+
header('Location: BOMs.php?Select='.$NewStockID);
ob_end_flush();
} //end if there is no input error
Modified: trunk/CounterReturns.php
===================================================================
--- trunk/CounterReturns.php 2012-12-19 06:59:15 UTC (rev 5767)
+++ trunk/CounterReturns.php 2012-12-20 08:38:22 UTC (rev 5768)
@@ -1,1840 +1,1840 @@
-<?php
-/* $Id: CounterReturns.php 4469 2011-01-15 02:28:37Z daintree $*/
-
-include('includes/DefineCartClass.php');
-
-/* Session started in session.inc for password checking and authorisation level check
-config.php is in turn included in session.inc $PageSecurity now comes from session.inc (and gets read in by GetConfig.php*/
-
-/* style="color:red" */
-
-
-include('includes/session.inc');
-
-$title = _('Counter Returns');
-
-include('includes/header.inc');
-include('includes/GetPrice.inc');
-include('includes/SQL_CommonFunctions.inc');
-include('includes/GetSalesTransGLCodes.inc');
-
-if (empty($_GET['identifier'])) {
- $identifier=date('U');
-} else {
- $identifier=$_GET['identifier'];
-}
-if (isset($_SESSION['Items'.$identifier]) AND isset($_POST['CustRef'])){
- //update the Items object variable with the data posted from the form
- $_SESSION['Items'.$identifier]->CustRef = $_POST['CustRef'];
- $_SESSION['Items'.$identifier]->Comments = $_POST['Comments'];
- $_SESSION['Items'.$identifier]->DeliverTo = $_POST['DeliverTo'];
- $_SESSION['Items'.$identifier]->PhoneNo = $_POST['PhoneNo'];
- $_SESSION['Items'.$identifier]->Email = $_POST['Email'];
- $_SESSION['Items'.$identifier]->SalesPerson = $_POST['SalesPerson'];
-}
-
-if (isset($_POST['QuickEntry'])){
- unset($_POST['PartSearch']);
-}
-
-if (isset($_POST['SelectingReturnItems'])){
- foreach ($_POST as $FormVariable => $Quantity) {
- if (mb_strpos($FormVariable,'ReturnQty')!==false) {
- $NewItemArray[$_POST['StockID' . mb_substr($FormVariable,9)]] = filter_number_format($Quantity);
- }
- }
-}
-
-if (isset($_GET['NewItem'])){
- $NewItem = trim($_GET['NewItem']);
-}
-
-if (isset($_GET['NewReturn'])){
- /*New return entry - clear any existing return details from the ReturnItems object and initiate a newy*/
- if (isset($_SESSION['Items'.$identifier])){
- unset ($_SESSION['Items'.$identifier]->LineItems);
- $_SESSION['Items'.$identifier]->ItemsOrdered=0;
- unset ($_SESSION['Items'.$identifier]);
- }
-}
-
-$AlreadyWarnedAboutCredit = true; //no point testing credit limits for a return!!
-
-if (!isset($_SESSION['Items'.$identifier])){
- /* It must be a new return being created $_SESSION['Items'.$identifier] would be set up from the
- modification code above if a modification to an existing retur. Also $ExistingOrder would be
- set to 1. */
-
- $_SESSION['ExistingOrder'. $identifier] = 0;
- $_SESSION['Items'.$identifier] = new cart;
-
- /*Get the default customer-branch combo from the user's default location record */
- $sql = "SELECT cashsalecustomer,
- cashsalebranch,
- locationname,
- taxprovinceid
- FROM locations
- WHERE loccode='" . $_SESSION['UserStockLocation'] ."'";
- $result = DB_query($sql,$db);
- if (DB_num_rows($result)==0) {
- prnMsg(_('Your user account does not have a valid default inventory location set up. Please see the system administrator to modify your user account.'),'error');
- include('includes/footer.inc');
- exit;
- } else {
- $myrow = DB_fetch_array($result); //get the only row returned
-
- if ($myrow['cashsalecustomer']=='' OR $myrow['cashsalebranch']==''){
- prnMsg(_('To use this script it is first necessary to define a cash sales customer for the location that is your default location. The default cash sale customer is defined under set up ->Inventory Locations Maintenance. The customer should be entered using the customer code and a valid branch code of the customer entered.'),'error');
- include('includes/footer.inc');
- exit;
- }
- if (isset($_GET['DebtorNo'])) {
- $_SESSION['Items'.$identifier]->DebtorNo = $_GET['DebtorNo'];
- $_SESSION['Items'.$identifier]->Branch = $_GET['BranchNo'];
- } else {
- $_SESSION['Items'.$identifier]->DebtorNo = $myrow['cashsalecustomer'];
- $_SESSION['Items'.$identifier]->Branch = $myrow['cashsalebranch'];
- }
-
- $_SESSION['Items'.$identifier]->LocationName = $myrow['locationname'];
- $_SESSION['Items'.$identifier]->Location = $_SESSION['UserStockLocation'];
- $_SESSION['Items'.$identifier]->DispatchTaxProvince = $myrow['taxprovinceid'];
-
- // Now check to ensure this account exists and set defaults */
- $sql = "SELECT debtorsmaster.name,
- holdreasons.dissallowinvoices,
- debtorsmaster.salestype,
- salestypes.sales_type,
- debtorsmaster.currcode,
- debtorsmaster.customerpoline,
- paymentterms.terms,
- currencies.decimalplaces
- FROM debtorsmaster INNER JOIN holdreasons
- ON debtorsmaster.holdreason=holdreasons.reasoncode
- INNER JOIN salestypes
- ON debtorsmaster.salestype=salestypes.typeabbrev
- INNER JOIN paymentterms
- ON debtorsmaster.paymentterms=paymentterms.termsindicator
- INNER JOIN currencies
- ON debtorsmaster.currcode=currencies.currabrev
- WHERE debtorsmaster.debtorno = '" . $_SESSION['Items'.$identifier]->DebtorNo . "'";
-
- $ErrMsg = _('The details of the customer selected') . ': ' . $_SESSION['Items'.$identifier]->DebtorNo . ' ' . _('cannot be retrieved because');
- $DbgMsg = _('The SQL used to retrieve the customer details and failed was') . ':';
- // echo $sql;
- $result =DB_query($sql,$db,$ErrMsg,$DbgMsg);
-
- $myrow = DB_fetch_array($result);
- $_SESSION['RequireCustomerSelection']=0;
- $_SESSION['Items'.$identifier]->CustomerName = $myrow['name'];
- // the sales type is the price list to be used for this sale
- $_SESSION['Items'.$identifier]->DefaultSalesType = $myrow['salestype'];
- $_SESSION['Items'.$identifier]->SalesTypeName = $myrow['sales_type'];
- $_SESSION['Items'.$identifier]->DefaultCurrency = $myrow['currcode'];
- $_SESSION['Items'.$identifier]->DefaultPOLine = $myrow['customerpoline'];
- $_SESSION['Items'.$identifier]->PaymentTerms = $myrow['terms'];
- $_SESSION['Items'.$identifier]->CurrDecimalPlaces = $myrow['decimalplaces'];
- /* now get the branch defaults from the customer branches table CustBranch. */
-
- $sql = "SELECT custbranch.brname,
- custbranch.braddress1,
- custbranch.defaultshipvia,
- custbranch.deliverblind,
- custbranch.specialinstructions,
- custbranch.estdeliverydays,
- custbranch.salesman,
- custbranch.taxgroupid,
- custbranch.defaultshipvia
- FROM custbranch
- WHERE custbranch.branchcode='" . $_SESSION['Items'.$identifier]->Branch . "'
- AND custbranch.debtorno = '" . $_SESSION['Items'.$identifier]->DebtorNo . "'";
- $ErrMsg = _('The customer branch record of the customer selected') . ': ' . $_SESSION['Items'.$identifier]->Branch . ' ' . _('cannot be retrieved because');
- $DbgMsg = _('SQL used to retrieve the branch details was') . ':';
- $result =DB_query($sql,$db,$ErrMsg,$DbgMsg);
-
- if (DB_num_rows($result)==0){
-
- prnMsg(_('The branch details for branch code') . ': ' . $_SESSION['Items'.$identifier]->Branch . ' ' . _('against customer code') . ': ' . $_SESSION['Items'.$identifier]->DebtorNo . ' ' . _('could not be retrieved') . '. ' . _('Check the set up of the customer and branch'),'error');
-
- if ($debug==1){
- echo '<br />' . _('The SQL that failed to get the branch details was') . ':<br />' . $sql;
- }
- include('includes/footer.inc');
- exit;
- }
- // add echo
- echo '<br />';
- $myrow = DB_fetch_array($result);
-
- $_SESSION['Items'.$identifier]->DeliverTo = '';
- $_SESSION['Items'.$identifier]->DelAdd1 = $myrow['braddress1'];
- $_SESSION['Items'.$identifier]->ShipVia = $myrow['defaultshipvia'];
- $_SESSION['Items'.$identifier]->DeliverBlind = $myrow['deliverblind'];
- $_SESSION['Items'.$identifier]->SpecialInstructions = $myrow['specialinstructions'];
- $_SESSION['Items'.$identifier]->DeliveryDays = $myrow['estdeliverydays'];
- $_SESSION['Items'.$identifier]->TaxGroup = $myrow['taxgroupid'];
- $_SESSION['Items'.$identifier]->TaxGroup = $myrow['taxgroupid'];
- $_SESSION['Items'.$identifier]->SalesPerson = $myrow['salesman'];
- if ($_SESSION['Items'.$identifier]->SpecialInstructions) {
- prnMsg($_SESSION['Items'.$identifier]->SpecialInstructions,'warn');
- }
- } // user does not have valid inventory location
-} // end if its a new return to be set up
-
-if (isset($_POST['CancelReturn'])) {
-
- unset($_SESSION['Items'.$identifier]->LineItems);
- $_SESSION['Items'.$identifier]->ItemsOrdered = 0;
- unset($_SESSION['Items'.$identifier]);
- $_SESSION['Items'.$identifier] = new cart;
-
- echo '<br /><br />';
- prnMsg(_('This return has been cancelled as requested'),'success');
- echo '<br /><br /><a href="' .htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">' . _('Start a new Counter Return') . '</a>';
- include('includes/footer.inc');
- exit;
-
-} else { /*Not cancelling the return */
-
- echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/inventory.png" title="' . _('Counter Return') . '" alt="" />' . ' ';
- echo '<font color="red" size="5">' . $_SESSION['Items'.$identifier]->CustomerName . '<br /> ' . _('Counter Return') . ' ' . _('to') . ' ' . $_SESSION['Items'.$identifier]->LocationName . ' ' . _('inventory') . ' (' . _('all amounts in') . ' ' . $_SESSION['Items'.$identifier]->DefaultCurrency . ')';
- echo '</font></p>';
-}
-
-if (isset($_POST['Search']) OR isset($_POST['Next']) OR isset($_POST['Prev'])){
-
- if ($_POST['Keywords']!='' AND $_POST['StockCode']=='') {
- $msg='<div class="page_help_text">' . _('Item description has been used in search') . '.</div>';
- } else if ($_POST['StockCode']!='' AND $_POST['Keywords']=='') {
- $msg='<div class="page_help_text">' . _('Item Code has been used in search') . '.</div>';
- } else if ($_POST['Keywords']=='' AND $_POST['StockCode']=='') {
- $msg='<div class="page_help_text">' . _('Stock Category has been used in search') . '.</div>';
- }
- if (isset($_POST['Keywords']) AND mb_strlen($_POST['Keywords'])>0) {
- //insert wildcard characters in spaces
- $_POST['Keywords'] = mb_strtoupper($_POST['Keywords']);
- $SearchString = '%' . str_replace(' ', '%', $_POST['Keywords']) . '%';
-
- if ($_POST['StockCat']=='All'){
- $SQL = "SELECT stockmaster.stockid,
- stockmaster.description,
- stockmaster.longdescription,
- stockmaster.units,
- stockmaster.decmimalplaces
- FROM stockmaster INNER JOIN stockcategory
- ON stockmaster.categoryid=stockcategory.categoryid
- WHERE (stockcategory.stocktype='F' OR stockcategory.stocktype='D')
- AND stockmaster.mbflag <>'G'
- AND stockmaster.controlled <> 1
- AND stockmaster.description " . LIKE . " '" . $SearchString . "'
- AND stockmaster.discontinued=0
- ORDER BY stockmaster.stockid";
- } else {
- $SQL = "SELECT stockmaster.stockid,
- stockmaster.description,
- stockmaster.longdescription,
- stockmaster.units,
- stockmaster.decimalplaces
- FROM stockmaster INNER JOIN stockcategory
- ON stockmaster.categoryid=stockcategory.categoryid
- WHERE (stockcategory.stocktype='F' OR stockcategory.stocktype='D')
- AND stockmaster.mbflag <>'G'
- AND stockmaster.controlled <> 1
- AND stockmaster.discontinued=0
- AND stockmaster.description " . LIKE . " '" . $SearchString . "'
- AND stockmaster.categoryid='" . $_POST['StockCat'] . "'
- ORDER BY stockmaster.stockid";
- }
-
- } else if (mb_strlen($_POST['StockCode'])>0){
-
- $_POST['StockCode'] = mb_strtoupper($_POST['StockCode']);
- $SearchString = '%' . $_POST['StockCode'] . '%';
-
- if ($_POST['StockCat']=='All'){
- $SQL = "SELECT stockmaster.stockid,
- stockmaster.description,
- stockmaster.longdescription,
- stockmaster.units,
- stockmaster.decimalplaces
- FROM stockmaster INNER JOIN stockcategory
- ON stockmaster.categoryid=stockcategory.categoryid
- WHERE (stockcategory.stocktype='F' OR stockcategory.stocktype='D')
- AND stockmaster.stockid " . LIKE . " '" . $SearchString . "'
- AND stockmaster.mbflag <>'G'
- AND stockmaster.controlled <> 1
- AND stockmaster.discontinued=0
- ORDER BY stockmaster.stockid";
- } else {
- $SQL = "SELECT stockmaster.stockid,
- stockmaster.description,
- stockmaster.longdescription,
- stockmaster.units,
- stockmaster.decimalplaces
- FROM stockmaster INNER JOIN stockcategory
- ON stockmaster.categoryid=stockcategory.categoryid
- AND (stockcategory.stocktype='F' OR stockcategory.stocktype='D')
- AND stockmaster.stockid " . LIKE . " '" . $SearchString . "'
- AND stockmaster.mbflag <>'G'
- AND stockmaster.controlled <> 1
- AND stockmaster.discontinued=0
- AND stockmaster.categoryid='" . $_POST['StockCat'] . "'
- ORDER BY stockmaster.stockid";
- }
-
- } else {
- if ($_POST['StockCat']=='All'){
- $SQL = "SELECT stockmaster.stockid,
- stockmaster.description,
- stockmaster.longdescription,
- stockmaster.units,
- stockmaster.decimalplaces
- FROM stockmaster INNER JOIN stockcategory
- ON stockmaster.categoryid=stockcategory.categoryid
- WHERE (stockcategory.stocktype='F' OR stockcategory.stocktype='D')
- AND stockmaster.mbflag <>'G'
- AND stockmaster.controlled <> 1
- AND stockmaster.discontinued=0
- ORDER BY stockmaster.stockid";
- } else {
- $SQL = "SELECT stockmaster.stockid,
- stockmaster.description,
- stockmaster.longdescription,
- stockmaster.units,
- stockmaster.decimalplaces
- FROM stockmaster INNER JOIN stockcategory
- ON stockmaster.categoryid=stockcategory.categoryid
- WHERE (stockcategory.stocktype='F' OR stockcategory.stocktype='D')
- AND stockmaster.mbflag <>'G'
- AND stockmaster.controlled <> 1
- AND stockmaster.discontinued=0
- AND stockmaster.categoryid='" . $_POST['StockCat'] . "'
- ORDER BY stockmaster.stockid";
- }
- }
-
- if (isset($_POST['Next'])) {
- $Offset = $_POST['NextList'];
- }
- if (isset($_POST['Prev'])) {
- $Offset = $_POST['previous'];
- }
- if (!isset($Offset) or $Offset<0) {
- $Offset=0;
- }
- $SQL = $SQL . ' LIMIT ' . $_SESSION['DefaultDisplayRecordsMax'].' OFFSET '.strval($_SESSION['DefaultDisplayRecordsMax']*$Offset);
-
- $ErrMsg = _('There is a problem selecting the part records to display because');
- $DbgMsg = _('The SQL used to get the part selection was');
- $SearchResult = DB_query($SQL,$db,$ErrMsg, $DbgMsg);
-
- if (DB_num_rows($SearchResult)==0 ){
- prnMsg (_('There are no products available meeting the criteria specified'),'info');
- }
- if (DB_num_rows($SearchResult)==1){
- $myrow=DB_fetch_array($SearchResult);
- $NewItem = $myrow['stockid'];
- DB_data_seek($SearchResult,0);
- }
- if (DB_num_rows($SearchResult)< $_SESSION['DisplayRecordsMax']){
- $Offset=0;
- }
-
-} //end of if search
-
-
-/* Always do the stuff below */
-
-echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier . '" name="SelectParts" method="post">';
-echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-
-//Get The exchange rate used for GPPercent calculations on adding or amending items
-if ($_SESSION['Items'.$identifier]->DefaultCurrency != $_SESSION['CompanyRecord']['currencydefault']){
- $ExRateResult = DB_query("SELECT rate FROM currencies WHERE currabrev='" . $_SESSION['Items'.$identifier]->DefaultCurrency . "'",$db);
- if (DB_num_rows($ExRateResult)>0){
- $ExRateRow = DB_fetch_row($ExRateResult);
- $ExRate = $ExRateRow[0];
- } else {
- $ExRate =1;
- }
-} else {
- $ExRate = 1;
-}
-
-/*Process Quick Entry */
-/* If enter is pressed on the quick entry screen, the default button may be Recalculate */
- if (isset($_POST['SelectingReturnItems'])
- OR isset($_POST['QuickEntry'])
- OR isset($_POST['Recalculate'])){
-
- /* get the item details from the database and hold them in the cart object */
-
- /*Discount can only be set later on -- after quick entry -- so default discount to 0 in the first place */
- $Discount = 0;
- $i=1;
- while ($i<=$_SESSION['QuickEntries']
- AND isset($_POST['part_' . $i])
- AND $_POST['part_' . $i]!='') {
-
- $QuickEntryCode = 'part_' . $i;
- $QuickEntryQty = 'qty_' . $i;
-
- $i++;
-
- if (isset($_POST[$QuickEntryCode])) {
- $NewItem = mb_strtoupper($_POST[$QuickEntryCode]);
- }
- if (isset($_POST[$QuickEntryQty])) {
- $NewItemQty = filter_number_format($_POST[$QuickEntryQty]);
- }
- $NewItemDue = Date($_SESSION['DefaultDateFormat']);
- $NewPOLine = 0;
-
-
- if (!isset($NewItem)){
- unset($NewItem);
- break; /* break out of the loop if nothing in the quick entry fields*/
- }
-
-
- /*Now figure out if the item is a kit set - the field MBFlag='K'*/
- $sql = "SELECT stockmaster.mbflag,
- stockmaster.controlled
- FROM stockmaster
- WHERE stockmaster.stockid='". $NewItem ."'";
-
- $ErrMsg = _('Could not determine if the part being ordered was a kitset or not because');
- $DbgMsg = _('The sql that was used to determine if the part being ordered was a kitset or not was ');
- $KitResult = DB_query($sql, $db,$ErrMsg,$DbgMsg);
-
-
- if (DB_num_rows($KitResult)==0){
- prnMsg( _('The item code') . ' ' . $NewItem . ' ' . _('could not be retrieved from the database and has not been added to the return'),'warn');
- } elseif ($myrow=DB_fetch_array($KitResult)){
- if ($myrow['mbflag']=='K'){ /*It is a kit set item */
- $sql = "SELECT bom.component,
- bom.quantity
- FROM bom
- WHERE bom.parent='" . $NewItem . "'
- AND bom.effectiveto > '" . Date('Y-m-d') . "'
- AND bom.effectiveafter < '" . Date('Y-m-d') . "'";
-
- $ErrMsg = _('Could not retrieve kitset components from the database because') . ' ';
- $KitResult = DB_query($sql,$db,$ErrMsg,$DbgMsg);
-
- $ParentQty = $NewItemQty;
- while ($KitParts = DB_fetch_array($KitResult,$db)) {
- $NewItem = $KitParts['component'];
- $NewItemQty = $KitParts['quantity'] * $ParentQty;
- $NewPOLine = 0;
- include('includes/SelectOrderItems_IntoCart.inc');
- $_SESSION['Items'.$identifier]->GetTaxes(($_SESSION['Items'.$identifier]->LineCounter - 1));
- }
-
- } else if ($myrow['mbflag']=='G'){
- prnMsg(_('Phantom assemblies cannot be returned, these items exist only as bills of materials used in other manufactured items. The following item has not been added to the return:') . ' ' . $NewItem, 'warn');
- } else if ($myrow['controlled']==1){
- prnMsg(_('The system does not currently cater for counter returns of lot controlled or serialised items'),'warn');
- } else if ($NewItemQty<=0) {
- prnMsg(_('Only items entered with a positive quantity can be added to the return'),'warn');
- } else { /*Its not a kit set item*/
- include('includes/SelectOrderItems_IntoCart.inc');
- $_SESSION['Items'.$identifier]->GetTaxes(($_SESSION['Items'.$identifier]->LineCounter - 1));
- }
- }
- }
- unset($NewItem);
- } /* end of if quick entry */
-
- /*Now do non-quick entry delete/edits/adds */
-
-if ((isset($_SESSION['Items'.$identifier])) OR isset($NewItem)) {
-
- if (isset($_GET['Delete'])){
- $_SESSION['Items'.$identifier]->remove_from_cart($_GET['Delete']); /*Don't do any DB updates*/
- }
-
- foreach ($_SESSION['Items'.$identifier]->LineItems as $ReturnItemLine) {
-
- if (isset($_POST['Quantity_' . $ReturnItemLine->LineNumber])){
-
- $Quantity = round(filter_number_format($_POST['Quantity_' . $ReturnItemLine->LineNumber]),$ReturnItemLine->DecimalPlaces);
-
- if (ABS($ReturnItemLine->Price - filter_number_format($_POST['Price_' . $ReturnItemLine->LineNumber]))>0.01){
- /*There is a new price being input for the line item */
-
- $Price = filter_number_format($_POST['Price_' . $ReturnItemLine->LineNumber]);
- $_POST['GPPercent_' . $ReturnItemLine->LineNumber] = (($Price*(1-(filter_number_format($_POST['Discount_' . $ReturnItemLine->LineNumber])/100))) - $ReturnItemLine->StandardCost*$ExRate)/($Price *(1-filter_number_format($_POST['Discount_' . $ReturnItemLine->LineNumber]))/100);
-
- } elseif (ABS($ReturnItemLine->GPPercent - filter_number_format($_POST['GPPercent_' . $ReturnItemLine->LineNumber]))>=0.01) {
- /* A GP % has been input so need to do a recalculation of the price at this new GP Percentage */
-
-
- prnMsg(_('Recalculated the price from the GP % entered - the GP % was') . ' ' . $ReturnItemLine->GPPercent . ' the new GP % is ' . filter_number_format($_POST['GPPercent_' . $ReturnItemLine->LineNumber]),'info');
-
-
- $Price = ($ReturnItemLine->StandardCost*$ExRate)/(1 -((filter_number_format($_POST['GPPercent_' . $ReturnItemLine->LineNumber]) + filter_number_format($_POST['Discount_' . $ReturnItemLine->LineNumber]))/100));
- } else {
- $Price = filter_number_format($_POST['Price_' . $ReturnItemLine->LineNumber]);
- }
- $DiscountPercentage = filter_number_format($_POST['Discount_' . $ReturnItemLine->LineNumber]);
- if ($_SESSION['AllowOrderLineItemNarrative'] == 1) {
- $Narrative = $_POST['Narrative_' . $ReturnItemLine->LineNumber];
- } else {
- $Narrative = '';
- }
-
- if (!isset($ReturnItemLine->DiscountPercent)) {
- $ReturnItemLine->DiscountPercent = 0;
- }
-
- if ($Quantity<0 or $Price <0 or $DiscountPercentage >100 or $DiscountPercentage <0){
- prnMsg(_('The item could not be updated because you are attempting to set the quantity returned to less than 0 or the price less than 0 or the discount more than 100% or less than 0%'),'warn');
- } else if ($ReturnItemLine->Quantity !=$Quantity
- OR $ReturnItemLine->Price != $Price
- OR abs($ReturnItemLine->DiscountPercent -$DiscountPercentage/100) >0.001
- OR $ReturnItemLine->Narrative != $Narrative
- OR $ReturnItemLine->ItemDue != $_POST['ItemDue_' . $ReturnItemLine->LineNumber]
- OR $ReturnItemLine->POLine != $_POST['POLine_' . $ReturnItemLine->LineNumber]) {
-
- $_SESSION['Items'.$identifier]->update_cart_item($ReturnItemLine->LineNumber,
- $Quantity,
- $Price,
- $DiscountPercentage/100,
- $Narrative,
- 'Yes', /*Update DB */
- $_POST['ItemDue_' . $ReturnItemLine->LineNumber],
- $_POST['POLine_' . $ReturnItemLine->LineNumber],
- filter_number_format($_POST['GPPercent_' . $ReturnItemLine->LineNumber]),
- $identifier);
- }
- } //page not called from itself - POST variables not set
- }
-}
-
-if (isset($_POST['Recalculate'])) {
- foreach ($_SESSION['Items'.$identifier]->LineItems as $ReturnItemLine) {
- $NewItem=$ReturnItemLine->StockID;
- $sql = "SELECT stockmaster.mbflag,
- stockmaster.controlled
- FROM stockmaster
- WHERE stockmaster.stockid='". $ReturnItemLine->StockID."'";
-
- $ErrMsg = _('Could not determine if the part being ordered was a kitset or not because');
- $DbgMsg = _('The sql that was used to determine if the part being ordered was a kitset or not was ');
- $KitResult = DB_query($sql, $db,$ErrMsg,$DbgMsg);
- if ($myrow=DB_fetch_array($KitResult)){
- if ($myrow['mbflag']=='K'){ /*It is a kit set item */
- $sql = "SELECT bom.component,
- bom.quantity
- FROM bom
- WHERE bom.parent='" . $ReturnItemLine->StockID. "'
- AND bom.effectiveto > '" . Date('Y-m-d') . "'
- AND bom.effectiveafter < '" . Date('Y-m-d') . "'";
-
- $ErrMsg = _('Could not retrieve kitset components from the database because');
- $KitResult = DB_query($sql,$db,$ErrMsg);
-
- $ParentQty = $NewItemQty;
- while ($KitParts = DB_fetch_array($KitResult,$db)){
- $NewItem = $KitParts['component'];
- $NewItemQty = $KitParts['quantity'] * $ParentQty;
- $NewPOLine = 0;
- $NewItemDue = date($_SESSION['DefaultDateFormat']);
- $_SESSION['Items'.$identifier]->GetTaxes($ReturnItemLine->LineNumber);
- }
-
- } else { /*Its not a kit set item*/
- $NewItemDue = date($_SESSION['DefaultDateFormat']);
- $NewPOLine = 0;
- $_SESSION['Items'.$identifier]->GetTaxes($ReturnItemLine->LineNumber);
- }
- }
- unset($NewItem);
- } /* end of if its a new item */
-}
-
-if (isset($NewItem)){
-/* get the item details from the database and hold them in the cart object make the quantity 1 by default then add it to the cart
-Now figure out if the item is a kit set - the field MBFlag='K'
-* controlled items and ghost/phantom items cannot be selected because the SQL to show items to select doesn't show 'em
-* */
-
- $sql = "SELECT stockmaster.mbflag,
- stockmaster.taxcatid
- FROM stockmaster
- WHERE stockmaster.stockid='". $NewItem ."'";
-
- $ErrMsg = _('Could not determine if the part being ordered was a kitset or not because');
-
- $KitResult = DB_query($sql, $db,$ErrMsg);
-
- $NewItemQty = 1; /*By Default */
- $Discount = 0; /*By default - can change later or discount category override */
-
- if ($myrow=DB_fetch_array($KitResult)){
- if ($myrow['mbflag']=='K'){ /*It is a kit set item */
- $sql = "SELECT bom.component,
- bom.quantity
- FROM bom
- WHERE bom.parent='" . $NewItem . "'
- AND bom.effectiveto > '" . Date('Y-m-d') . "'
- AND bom.effectiveafter < '" . Date('Y-m-d') . "'";
-
- $ErrMsg = _('Could not retrieve kitset components from the database because');
- $KitResult = DB_query($sql,$db,$ErrMsg);
-
- $ParentQty = $NewItemQty;
- while ($KitParts = DB_fetch_array($KitResult,$db)){
- $NewItem = $KitParts['component'];
- $NewItemQty = $KitParts['quantity'] * $ParentQty;
- $NewPOLine = 0;
- $NewItemDue = date($_SESSION['DefaultDateFormat']);
- include('includes/SelectOrderItems_IntoCart.inc');
- $_SESSION['Items'.$identifier]->GetTaxes(($_SESSION['Items'.$identifier]->LineCounter - 1));
- }
-
- } else { /*Its not a kit set item*/
- $NewItemDue = date($_SESSION['DefaultDateFormat']);
- $NewPOLine = 0;
-
- include('includes/SelectOrderItems_IntoCart.inc');
- $_SESSION['Items'.$identifier]->GetTaxes(($_SESSION['Items'.$identifier]->LineCounter - 1));
- }
-
- } /* end of if its a new item */
-
-} /*end of if its a new item */
-
-if (isset($NewItemArray) AND isset($_POST['SelectingReturnItems'])){
-/* get the item details from the database and hold them in the cart object make the quantity 1 by default then add it to the cart */
-/*Now figure out if the item is a kit set - the field MBFlag='K'*/
-
- foreach($NewItemArray as $NewItem => $NewItemQty) {
- if($NewItemQty > 0) {
- $sql = "SELECT stockmaster.mbflag
- FROM stockmaster
- WHERE stockmaster.stockid='". $NewItem ."'";
-
- $ErrMsg = _('Could not determine if the part being returned was a kitset or not because');
-
- $KitResult = DB_query($sql, $db,$ErrMsg);
-
- //$NewItemQty = 1; /*By Default */
- $Discount = 0; /*By default - can change later or discount category override */
-
- if ($myrow=DB_fetch_array($KitResult)){
- if ($myrow['mbflag']=='K'){ /*It is a kit set item */
- $sql = "SELECT bom.component,
- bom.quantity
- FROM bom
- WHERE bom.parent='" . $NewItem . "'
- AND bom.effectiveto > '" . Date('Y-m-d') . "'
- AND bom.effectiveafter < '" . Date('Y-m-d') . "'";
-
- $ErrMsg = _('Could not retrieve kitset components from the database because');
- $KitResult = DB_query($sql,$db,$ErrMsg);
-
- $ParentQty = $NewItemQty;
- while ($KitParts = DB_fetch_array($KitResult,$db)){
- $NewItem = $KitParts['component'];
- $NewItemQty = $KitParts['quantity'] * $ParentQty;
- $NewItemDue = date($_SESSION['DefaultDateFormat']);
- $NewPOLine = 0;
- include('includes/SelectOrderItems_IntoCart.inc');
- $_SESSION['Items'.$identifier]->GetTaxes(($_SESSION['Items'.$identifier]->LineCounter - 1));
- }
-
- } else { /*Its not a kit set item*/
- $NewItemDue = date($_SESSION['DefaultDateFormat']);
- $NewPOLine = 0;
- include('includes/SelectOrderItems_IntoCart.inc');
- $_SESSION['Items'.$identifier]->GetTaxes(($_SESSION['Items'.$identifier]->LineCounter - 1));
- }
- } /* end of if its a new item */
- } /*end of if its a new item */
- }
-}
-
-
-if (count($_SESSION['Items'.$identifier]->LineItems)>0){ /*only show return lines if there are any */
-/*
-// *************************************************************************
-// T H I S W H E R E T H E R E T U R N I S D I S P L A Y E D
-// *************************************************************************
-*/
-
- echo '<br />
- <table width="90%" cellpadding="2" colspan="7">
- <tr bgcolor="#800000">';
- echo '<th>' . _('Item Code') . '</th>
- <th>' . _('Item Description') . '</th>
- <th>' . _('Quantity') . '</th>
- <th>' . _('Unit') . '</th>
- <th>' . _('Price') . '</th>
- <th>' . _('Discount') . '</th>
- <th>' . _('GP %') . '</th>
- <th>' . _('Net') . '</th>
- <th>' . _('Tax') . '</th>
- <th>' . _('Total') . '<br />' . _('Incl Tax') . '</th>
- </tr>';
-
- $_SESSION['Items'.$identifier]->total = 0;
- $_SESSION['Items'.$identifier]->totalVolume = 0;
- $_SESSION['Items'.$identifier]->totalWeight = 0;
- $TaxTotals = array();
- $TaxGLCodes = array();
- $TaxTotal =0;
- $k =0; //row colour counter
- foreach ($_SESSION['Items'.$identifier]->LineItems as $ReturnItemLine) {
-
- $SubTotal = $ReturnItemLine->Quantity * $ReturnItemLine->Price * (1 - $ReturnItemLine->DiscountPercent);
- $DisplayDiscount = locale_number_format(($ReturnItemLine->DiscountPercent * 100),2);
- $QtyReturned = $ReturnItemLine->Quantity;
-
- if ($k==1){
- $RowStarter = '<tr class="OddTableRows">';
- $k=0;
- } else {
- $RowStarter = '<tr class="EvenTableRows">';
- $k=1;
- }
-
- echo $RowStarter;
- echo '<input type="hidden" name="POLine_' . $ReturnItemLine->LineNumber . '" value="" />';
- echo '<input type="hidden" name="ItemDue_' . $ReturnItemLine->LineNumber . '" value="'.$ReturnItemLine->ItemDue.'" />';
-
- echo '<td><a target="_blank" href="' . $rootpath . '/StockStatus.php?identifier='.$identifier . '&StockID=' . $ReturnItemLine->StockID . '&DebtorNo=' . $_SESSION['Items'.$identifier]->DebtorNo . '">' . $ReturnItemLine->StockID . '</a></td>
- <td title="' . $ReturnItemLine->LongDescription . '">' . $ReturnItemLine->ItemDescription . '</td>';
-
- echo '<td><input class="number" tabindex="2" type="text" name="Qu...
[truncated message content] |
|
From: <te...@us...> - 2012-12-22 13:37:30
|
Revision: 5769
http://sourceforge.net/p/web-erp/reponame/5769
Author: tehonu
Date: 2012-12-22 13:37:17 +0000 (Sat, 22 Dec 2012)
Log Message:
-----------
Pak Ricard: Added new script to show all goods received but not invoiced yet.
Modified Paths:
--------------
trunk/includes/MainMenuLinksArray.php
trunk/sql/mysql/upgrade4.09-4.10.sql
Added Paths:
-----------
trunk/GoodsReceivedNotInvoiced.php
Added: trunk/GoodsReceivedNotInvoiced.php
===================================================================
--- trunk/GoodsReceivedNotInvoiced.php (rev 0)
+++ trunk/GoodsReceivedNotInvoiced.php 2012-12-22 13:37:17 UTC (rev 5769)
@@ -0,0 +1,127 @@
+<?php
+
+/* Session started in session.inc for password checking and authorisation level check config.php is in turn included in session.inc*/
+
+include ('includes/session.inc');
+$title = _('Goods Received But Not Invoiced Yet');
+include ('includes/header.inc');
+
+$SQL = "SELECT grns.supplierid,
+ purchorderdetails.orderno,
+ grns.itemcode,
+ grns.qtyrecd,
+ grns.quantityinv,
+ purchorderdetails.unitprice,
+ suppliers.currcode,
+ currencies.rate,
+ currencies.decimalplaces
+ FROM grns, purchorderdetails, suppliers, currencies
+ WHERE grns.podetailitem=purchorderdetails.podetailitem
+ AND grns.supplierid = suppliers.supplierid
+ AND suppliers.currcode = currencies.currabrev
+ AND grns.qtyrecd - grns.quantityinv > 0
+ ORDER BY grns.supplierid, purchorderdetails.orderno, grns.itemcode";
+$result = DB_query($SQL, $db);
+
+if (DB_num_rows($result) != 0){
+ echo '<p class="page_title_text" align="center"><strong>' . _('Goods Received but not invoiced Yet') . '</strong></p>';
+
+ echo '<div class="page_help_text">'
+ . _('Shows the list of Goods Received Not Yet Invoiced, both in supplier currency and home currency.'). '<br />'
+ . _('Total in home curency should match the GL Account for Goods received not invoiced.'). '<br />'
+ . _('Any discrepancy is due (probably) to multicurrency errors and must be fixed via GL Journal.')
+ . '</div>';
+
+ echo '<div>';
+ echo '<table class="selection">';
+ $TableHeader = '<tr>
+ <th>' . _('Supplier') . '</th>
+ <th>' . _('PO#') . '</th>
+ <th>' . _('Item Code') . '</th>
+ <th>' . _('Qty Received') . '</th>
+ <th>' . _('Qty Invoiced') . '</th>
+ <th>' . _('Qty Pending') . '</th>
+ <th>' . _('Unit Price') . '</th>
+ <th>' .'' . '</th>
+ <th>' . _('Line Total') . '</th>
+ <th>' . '' . '</th>
+ <th>' . _('Line Total') . '</th>
+ <th>' . '' . '</th>
+ </tr>';
+ echo $TableHeader;
+ $k = 0; //row colour counter
+ $i = 1;
+ $TotalHomeCurrency = 0;
+ while ($myrow = DB_fetch_array($result)) {
+ if ($k == 1) {
+ echo '<tr class="EvenTableRows">';
+ $k = 0;
+ } else {
+ echo '<tr class="OddTableRows">';
+ $k = 1;
+ }
+ $QtyPending = $myrow['qtyrecd'] - $myrow['quantityinv'];
+ $TotalHomeCurrency = $TotalHomeCurrency + ($QtyPending * $myrow['unitprice'] / $myrow['rate']);
+ printf('<td>%s</td>
+ <td class="number">%s</td>
+ <td>%s</td>
+ <td class="number">%s</td>
+ <td class="number">%s</td>
+ <td class="number">%s</td>
+ <td class="number">%s</td>
+ <td>%s</td>
+ <td class="number">%s</td>
+ <td>%s</td>
+ <td class="number">%s</td>
+ <td>%s</td>
+ </tr>',
+ $myrow['supplierid'],
+ $myrow['orderno'],
+ $myrow['itemcode'],
+ $myrow['qtyrecd'],
+ $myrow['quantityinv'],
+ $QtyPending,
+ locale_number_format($myrow['unitprice'],$myrow['decimalplaces']),
+ $myrow['currcode'],
+ locale_number_format(($QtyPending * $myrow['unitprice']),$myrow['decimalplaces']),
+ $myrow['currcode'],
+ locale_number_format(($QtyPending * $myrow['unitprice'] / $myrow['rate']),$_SESSION['CompanyRecord']['decimalplaces']),
+ $_SESSION['CountryOfOperation']
+ );
+ $i++;
+ }
+ printf('<td>%s</td>
+ <td class="number">%s</td>
+ <td>%s</td>
+ <td class="number">%s</td>
+ <td class="number">%s</td>
+ <td class="number">%s</td>
+ <td class="number">%s</td>
+ <td>%s</td>
+ <td class="number">%s</td>
+ <td>%s</td>
+ <td class="number">%s</td>
+ <td>%s</td>
+ </tr>',
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ _('Total').':',
+ locale_number_format($TotalHomeCurrency,$_SESSION['CompanyRecord']['decimalplaces']),
+ $_SESSION['CountryOfOperation']
+ );
+
+ echo '</table>
+ </div>
+ </form>';
+}
+
+include ('includes/footer.inc');
+
+?>
\ No newline at end of file
Modified: trunk/includes/MainMenuLinksArray.php
===================================================================
--- trunk/includes/MainMenuLinksArray.php 2012-12-20 08:38:22 UTC (rev 5768)
+++ trunk/includes/MainMenuLinksArray.php 2012-12-22 13:37:17 UTC (rev 5769)
@@ -145,7 +145,8 @@
_('Outstanding GRNs Report'),
_('Supplier Balances At A Prior Month End'),
_('List Daily Transactions'),
- _('Supplier Transaction Inquiries')
+ _('Supplier Transaction Inquiries'),
+ _('Goods Received Not Invoiced Yet')
);
$MenuItems['AP']['Reports']['URL'] = array ('/AgedSuppliers.php',
@@ -154,7 +155,8 @@
'/OutstandingGRNs.php',
'/SupplierBalsAtPeriodEnd.php',
'/PDFSuppTransListing.php',
- '/SupplierTransInquiry.php'
+ '/SupplierTransInquiry.php',
+ '/GoodsReceivedNotInvoiced.php'
);
$MenuItems['AP']['Maintenance']['Caption'] = array (_('Add Supplier'),
Modified: trunk/sql/mysql/upgrade4.09-4.10.sql
===================================================================
--- trunk/sql/mysql/upgrade4.09-4.10.sql 2012-12-20 08:38:22 UTC (rev 5768)
+++ trunk/sql/mysql/upgrade4.09-4.10.sql 2012-12-22 13:37:17 UTC (rev 5769)
@@ -10,6 +10,5 @@
);
ALTER TABLE `gltrans` ADD INDEX ( `tag` );
INSERT INTO scripts VALUES ('CustomerPurchases.php','5','Shows the purchases a customer has made.');
+INSERT INTO scripts VALUES ('GoodsReceivedButNotInvoiced.php','15','Shows the list of Goods Received Not Yet Invoiced, both in supplier currency and home currency. Total in home curency should match the GL Account for Goods received not invoiced. Any discrepancy is due to multicurrency errors.');
UPDATE config SET confvalue='4.10.0' WHERE confname='VersionNumber';
-
-
|
|
From: <te...@us...> - 2012-12-22 15:05:00
|
Revision: 5770
http://sourceforge.net/p/web-erp/reponame/5770
Author: tehonu
Date: 2012-12-22 15:04:56 +0000 (Sat, 22 Dec 2012)
Log Message:
-----------
Pak Ricard: Added script showing list of current items without a picture in webERP
Modified Paths:
--------------
trunk/includes/MainMenuLinksArray.php
trunk/sql/mysql/upgrade4.09-4.10.sql
Added Paths:
-----------
trunk/ItemsWithoutPicture.php
Added: trunk/ItemsWithoutPicture.php
===================================================================
--- trunk/ItemsWithoutPicture.php (rev 0)
+++ trunk/ItemsWithoutPicture.php 2012-12-22 15:04:56 UTC (rev 5770)
@@ -0,0 +1,66 @@
+<?php
+
+/* Session started in session.inc for password checking and authorisation level check
+config.php is in turn included in session.inc*/
+include ('includes/session.inc');
+$title = _('List of Items without picture');
+include ('includes/header.inc');
+
+$SQL = "SELECT stockmaster.stockid,
+ stockmaster.description,
+ stockcategory.categorydescription
+ FROM stockmaster, stockcategory
+ WHERE stockmaster.categoryid = stockcategory.categoryid
+ AND stockmaster.discontinued = 0
+ AND stockcategory.stocktype != 'D'
+ ORDER BY stockcategory.categorydescription, stockmaster.stockid";
+$result = DB_query($SQL, $db);
+$PrintHeader = TRUE;
+
+if (DB_num_rows($result) != 0){
+ echo '<p class="page_title_text" align="center"><strong>' . _('Current Items without picture in webERP') . '</strong></p>';
+ echo '<div>';
+ echo '<table class="selection">';
+ $k = 0; //row colour counter
+ $i = 1;
+ while ($myrow = DB_fetch_array($result)) {
+ if(!file_exists($_SESSION['part_pics_dir'] . '/' .$myrow['stockid'].'.jpg') ) {
+ if($PrintHeader){
+ $TableHeader = '<tr>
+ <th>' . '#' . '</th>
+ <th>' . _('Category') . '</th>
+ <th>' . _('Item Code') . '</th>
+ <th>' . _('Description') . '</th>
+ </tr>';
+ echo $TableHeader;
+ $PrintHeader = FALSE;
+ }
+ if ($k == 1) {
+ echo '<tr class="EvenTableRows">';
+ $k = 0;
+ } else {
+ echo '<tr class="OddTableRows">';
+ $k = 1;
+ }
+ $CodeLink = '<a href="' . $rootpath . '/SelectProduct.php?StockID=' . $myrow['stockid'] . '">' . $myrow['stockid'] . '</a>';
+ printf('<td class="number">%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ </tr>',
+ $i,
+ $myrow['categorydescription'],
+ $CodeLink,
+ $myrow['description']
+ );
+ $i++;
+ }
+ }
+ echo '</table>
+ </div>
+ </form>';
+}
+
+include ('includes/footer.inc');
+
+?>
\ No newline at end of file
Modified: trunk/includes/MainMenuLinksArray.php
===================================================================
--- trunk/includes/MainMenuLinksArray.php 2012-12-22 13:37:17 UTC (rev 5769)
+++ trunk/includes/MainMenuLinksArray.php 2012-12-22 15:04:56 UTC (rev 5770)
@@ -562,11 +562,13 @@
$MenuItems['Utilities']['Reports']['Caption'] = array (_('Show Local Currency Total Debtor Balances'),
_('Show Local Currency Total Suppliers Balances'),
- _('Show General Transactions That Do Not Balance'));
+ _('Show General Transactions That Do Not Balance'),
+ _('List of items without picture'));
$MenuItems['Utilities']['Reports']['URL'] = array ('/Z_CurrencyDebtorsBalances.php',
'/Z_CurrencySuppliersBalances.php',
- '/Z_CheckGLTransBalance.php');
+ '/Z_CheckGLTransBalance.php',
+ '/ItemsWithoutPicture.php');
$MenuItems['Utilities']['Maintenance']['Caption'] = array (_('Maintain Language Files'),
_('Make New Company'),
Modified: trunk/sql/mysql/upgrade4.09-4.10.sql
===================================================================
--- trunk/sql/mysql/upgrade4.09-4.10.sql 2012-12-22 13:37:17 UTC (rev 5769)
+++ trunk/sql/mysql/upgrade4.09-4.10.sql 2012-12-22 15:04:56 UTC (rev 5770)
@@ -11,4 +11,5 @@
ALTER TABLE `gltrans` ADD INDEX ( `tag` );
INSERT INTO scripts VALUES ('CustomerPurchases.php','5','Shows the purchases a customer has made.');
INSERT INTO scripts VALUES ('GoodsReceivedButNotInvoiced.php','15','Shows the list of Goods Received Not Yet Invoiced, both in supplier currency and home currency. Total in home curency should match the GL Account for Goods received not invoiced. Any discrepancy is due to multicurrency errors.');
+INSERT INTO scripts VALUES ('ItemsWithoutPicture.php','15','Shows the list of curent items without picture in webERP');
UPDATE config SET confvalue='4.10.0' WHERE confname='VersionNumber';
|
|
From: <dai...@us...> - 2012-12-24 01:21:29
|
Revision: 5772
http://sourceforge.net/p/web-erp/reponame/5772
Author: daintree
Date: 2012-12-24 01:21:26 +0000 (Mon, 24 Dec 2012)
Log Message:
-----------
OutstandingGRNs.php now has show on screen option
Modified Paths:
--------------
trunk/GoodsReceivedNotInvoiced.php
trunk/OutstandingGRNs.php
trunk/Z_ImportStocks.php
trunk/doc/Change.log
Modified: trunk/GoodsReceivedNotInvoiced.php
===================================================================
--- trunk/GoodsReceivedNotInvoiced.php 2012-12-23 05:10:12 UTC (rev 5771)
+++ trunk/GoodsReceivedNotInvoiced.php 2012-12-24 01:21:26 UTC (rev 5772)
@@ -90,36 +90,23 @@
locale_number_format(($QtyPending * $myrow['unitprice']),$myrow['decimalplaces']),
$myrow['currcode'],
locale_number_format(($QtyPending * $myrow['unitprice'] / $myrow['rate']),$_SESSION['CompanyRecord']['decimalplaces']),
- $_SESSION['CountryOfOperation']
- );
- $i++;
+ $_SESSION['CompanyRecord']['currencydefault']);
+
+ if ($i==15){
+ $i=0;
+ echo $TableHeader;
+ } else {
+ $i++;
+ }
}
- printf('<td>%s</td>
- <td class="number">%s</td>
+ printf('<td colspan="10">%s</td>
<td>%s</td>
<td class="number">%s</td>
- <td class="number">%s</td>
- <td class="number">%s</td>
- <td class="number">%s</td>
<td>%s</td>
- <td class="number">%s</td>
- <td>%s</td>
- <td class="number">%s</td>
- <td>%s</td>
</tr>',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
_('Total').':',
locale_number_format($TotalHomeCurrency,$_SESSION['CompanyRecord']['decimalplaces']),
- $_SESSION['CountryOfOperation']
- );
+ $_SESSION['CompanyRecord']['currencydefault']);
echo '</table>
</div>
Modified: trunk/OutstandingGRNs.php
===================================================================
--- trunk/OutstandingGRNs.php 2012-12-23 05:10:12 UTC (rev 5771)
+++ trunk/OutstandingGRNs.php 2012-12-24 01:21:26 UTC (rev 5772)
@@ -4,24 +4,15 @@
include('includes/session.inc');
-If (isset($_POST['PrintPDF'])
- AND isset($_POST['FromCriteria'])
+if (isset($_POST['FromCriteria'])
AND mb_strlen($_POST['FromCriteria'])>=1
AND isset($_POST['ToCriteria'])
AND mb_strlen($_POST['ToCriteria'])>=1){
- include('includes/PDFStarter.php');
- $pdf->addInfo('Title',_('Outstanding GRNs Report'));
- $pdf->addInfo('Subject',_('Outstanding GRNs Valuation'));
- $FontSize=10;
- $PageNumber=1;
- $line_height=12;
- $Left_Margin=30;
+/*Now figure out the data to report for the criteria under review */
- /*Now figure out the data to report for the criteria under review */
-
$SQL = "SELECT grnno,
- orderno,
+ purchorderdetails.orderno,
grns.supplierid,
suppliers.suppname,
grns.itemcode,
@@ -31,6 +22,8 @@
grns.stdcostunit,
actprice,
unitprice,
+ suppliers.currcode,
+ currencies.rate,
currencies.decimalplaces as currdecimalplaces,
stockmaster.decimalplaces as itemdecimalplaces
FROM grns INNER JOIN purchorderdetails
@@ -54,25 +47,40 @@
include('includes/header.inc');
prnMsg(_('The outstanding GRNs valuation details 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;
}
+ * */
include('includes/footer.inc');
exit;
}
-
if (DB_num_rows($GRNsResult) == 0) {
$title = _('Outstanding GRN Valuation') . ' - ' . _('Problem Report');
include('includes/header.inc');
prnMsg(_('No outstanding GRNs valuation details retrieved'), 'warn');
echo '<br /><a href="' .$rootpath .'/index.php">' . _('Back to the menu') . '</a>';
+ /*
if ($debug==1){
echo '<br />' . $SQL;
}
+ * */
include('includes/footer.inc');
exit;
}
+}
+
+If (isset($_POST['PrintPDF']) AND DB_num_rows($GRNsResult)>0){
+
+ include('includes/PDFStarter.php');
+ $pdf->addInfo('Title',_('Outstanding GRNs Report'));
+ $pdf->addInfo('Subject',_('Outstanding GRNs Valuation'));
+ $FontSize=10;
+ $PageNumber=1;
+ $line_height=12;
+ $Left_Margin=30;
+
include ('includes/PDFOstdgGRNsPageHeader.inc');
$Tot_Val=0;
@@ -155,14 +163,98 @@
$pdf->OutputD($_SESSION['DatabaseName'] . '_OSGRNsValuation_' . date('Y-m-d').'.pdf');
$pdf->__destruct();
-} else { /*The option to print PDF was not hit */
+} elseif (isset($_POST['ShowOnScreen']) AND DB_num_rows($GRNsResult)>0) {
+ echo '<p class="page_title_text" align="center"><strong>' . _('Goods Received but not invoiced Yet') . '</strong></p>';
+
+ echo '<div class="page_help_text">' . _('Shows the list of goods received not yet invoiced, both in supplier currency and home currency. When run for all suppliers, the total in home curency should match the GL Account for Goods received not invoiced.') . '</div>';
+
+ echo '<div>';
+ echo '<table class="selection">';
+ $TableHeader = '<tr>
+ <th>' . _('Supplier') . '</th>
+ <th>' . _('PO#') . '</th>
+ <th>' . _('Item Code') . '</th>
+ <th>' . _('Qty Received') . '</th>
+ <th>' . _('Qty Invoiced') . '</th>
+ <th>' . _('Qty Pending') . '</th>
+ <th>' . _('Unit Price') . '</th>
+ <th>' .'' . '</th>
+ <th>' . _('Line Total') . '</th>
+ <th>' . '' . '</th>
+ <th>' . _('Line Total') . '</th>
+ <th>' . '' . '</th>
+ </tr>';
+ echo $TableHeader;
+ $k = 0; //row colour counter
+ $i = 1;
+ $TotalHomeCurrency = 0;
+ while ($GRNs = DB_fetch_array($GRNsResult,$db) ){
+ if ($k == 1) {
+ echo '<tr class="EvenTableRows">';
+ $k = 0;
+ } else {
+ echo '<tr class="OddTableRows">';
+ $k = 1;
+ }
+ $QtyPending = $GRNs['qtyrecd'] - $GRNs['quantityinv'];
+ $TotalHomeCurrency = $TotalHomeCurrency + ($QtyPending * $GRNs['unitprice'] / $GRNs['rate']);
+ printf('<td>%s</td>
+ <td class="number">%s</td>
+ <td>%s</td>
+ <td class="number">%s</td>
+ <td class="number">%s</td>
+ <td class="number">%s</td>
+ <td class="number">%s</td>
+ <td>%s</td>
+ <td class="number">%s</td>
+ <td>%s</td>
+ <td class="number">%s</td>
+ <td>%s</td>
+ </tr>',
+ $GRNs['supplierid'],
+ $GRNs['orderno'],
+ $GRNs['itemcode'],
+ $GRNs['qtyrecd'],
+ $GRNs['quantityinv'],
+ $QtyPending,
+ locale_number_format($GRNs['unitprice'],$GRNs['decimalplaces']),
+ $GRNs['currcode'],
+ locale_number_format(($QtyPending * $GRNs['unitprice']),$GRNs['decimalplaces']),
+ $GRNs['currcode'],
+ locale_number_format(($GRNs['qtyrecd'] - $GRNs['quantityinv'])*$GRNs['stdcostunit'],$_SESSION['CompanyRecord']['decimalplaces']),
+ $_SESSION['CompanyRecord']['currencydefault']);
+
+ if ($i==15){
+ $i=0;
+ echo $TableHeader;
+ } else {
+ $i++;
+ }
+ }
+ printf('<td colspan="10">%s</td>
+ <td>%s</td>
+ <td class="number">%s</td>
+ <td>%s</td>
+ </tr>',
+ _('Total').':',
+ locale_number_format($TotalHomeCurrency,$_SESSION['CompanyRecord']['decimalplaces']),
+ $_SESSION['CompanyRecord']['currencydefault']);
+
+ echo '</table>
+ </div>';
+
+ include('includes/footer.inc');
+
+} else { /*Neither the print PDF nor show on scrren option was hit */
+
$title=_('Outstanding GRNs Report');
include('includes/header.inc');
- echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/magnifier.png" title="' . _('Search') .
- '" alt="" />' . ' ' . $title . '</p>';
+ echo '<p class="page_title_text" align="center"><strong>' . $title . '</strong></p>';
+ echo '<div class="page_help_text">' . _('Shows the list of goods received not yet invoiced, both in supplier currency and home currency. When run for all suppliers the total in home curency should match the GL Account for Goods received not invoiced.') . '</div>';
+
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
@@ -180,6 +272,7 @@
<br />
<div class="centre">
<input type="submit" name="PrintPDF" value="' . _('Print PDF') . '" />
+ <input type="submit" name="ShowOnScreen" value="' . _('Show On Screen') . '" />
</div>
</div>
</form>';
Modified: trunk/Z_ImportStocks.php
===================================================================
--- trunk/Z_ImportStocks.php 2012-12-23 05:10:12 UTC (rev 5771)
+++ trunk/Z_ImportStocks.php 2012-12-24 01:21:26 UTC (rev 5772)
@@ -9,7 +9,7 @@
// If this script is called with the gettemplate flag, then a template file is served
// Otherwise, a file upload form is displayed
-$headers = array(
+$FieldHeadings = array(
'StockID', // 0 'STOCKID',
'Description', // 1 'DESCRIPTION',
'LongDescription', // 2 'LONGDESCRIPTION',
@@ -33,31 +33,24 @@
if (isset($_FILES['userfile']) and $_FILES['userfile']['name']) { //start file processing
//initialize
- $AllowType='text/csv';
- $fieldTarget = 18;
+ $FieldTarget = 18;
$InputError = 0;
//check file info
$FileName = $_FILES['userfile']['name'];
- $tmpName = $_FILES['userfile']['tmp_name'];
- $fileSize = $_FILES['userfile']['size'];
- $fileType = $_FILES['userfile']['type'];
- if ($fileType != $AllowType) {
- prnMsg (_('File has type '. $fileType. ', but only '. $AllowType. ' is allowed.'),'error');
- include('includes/footer.inc');
- exit;
- }
-
+ $TempName = $_FILES['userfile']['tmp_name'];
+ $FileSize = $_FILES['userfile']['size'];
+
//get file handle
- $handle = fopen($tmpName, 'r');
+ $FileHandle = fopen($TempName, 'r');
//get the header row
- $headRow = fgetcsv($handle, 10000, ",");
+ $headRow = fgetcsv($FileHandle, 10000, ",");
//check for correct number of fields
- if ( count($headRow) != count($headers) ) {
- prnMsg (_('File contains '. count($headRow). ' columns, expected '. count($headers). '. Try downloading a new template.'),'error');
- fclose($handle);
+ if ( count($headRow) != count($FieldHeadings) ) {
+ prnMsg (_('File contains '. count($headRow). ' columns, expected '. count($FieldHeadings). '. Try downloading a new template.'),'error');
+ fclose($FileHandle);
include('includes/footer.inc');
exit;
}
@@ -65,9 +58,9 @@
//test header row field name and sequence
$head = 0;
foreach ($headRow as $headField) {
- if ( mb_strtoupper($headField) != mb_strtoupper($headers[$head]) ) {
+ if ( mb_strtoupper($headField) != mb_strtoupper($FieldHeadings[$head]) ) {
prnMsg (_('File contains incorrect headers ('. mb_strtoupper($headField). ' != '. mb_strtoupper($header[$head]). '. Try downloading a new template.'),'error');
- fclose($handle);
+ fclose($FileHandle);
include('includes/footer.inc');
exit;
}
@@ -79,13 +72,13 @@
//loop through file rows
$row = 1;
- while ( ($myrow = fgetcsv($handle, 10000, ",")) !== FALSE ) {
+ while ( ($myrow = fgetcsv($FileHandle, 10000, ",")) !== FALSE ) {
//check for correct number of fields
$fieldCount = count($myrow);
- if ($fieldCount != $fieldTarget){
- prnMsg (_($fieldTarget. ' fields required, '. $fieldCount. ' fields received'),'error');
- fclose($handle);
+ if ($fieldCount != $FieldTarget){
+ prnMsg (_($FieldTarget. ' fields required, '. $fieldCount. ' fields received'),'error');
+ fclose($FileHandle);
include('includes/footer.inc');
exit;
}
@@ -276,11 +269,11 @@
prnMsg( _('Batch Import of') .' ' . $FileName . ' '. _('has been completed. All transactions committed to the database.'),'success');
}
- fclose($handle);
+ fclose($FileHandle);
} elseif ( isset($_POST['gettemplate']) || isset($_GET['gettemplate']) ) { //download an import template
- echo '<br /><br /><br />"'. implode('","',$headers). '"<br /><br /><br />';
+ echo '<br /><br /><br />"'. implode('","',$FieldHeadings). '"<br /><br /><br />';
} else { //show file upload form
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-12-23 05:10:12 UTC (rev 5771)
+++ trunk/doc/Change.log 2012-12-24 01:21:26 UTC (rev 5772)
@@ -1,5 +1,6 @@
webERP Change Log
+24/12/12 Ricard: OutstandingGRNs.php now has show on screen option
15/12/12 Phil: Customer login selection of branch option removed unecessary fields from customer order placement
15/12/12 Bob Thomas: modified default.css for the default theme to use pt based default font and other font sizes based on this
12/12/12 Phil/RockStar: SelectOrderitems.php would not recognise Customer only logins correctly as there are two tokens in a Customer login role. and was testing to see if just one token!
|
|
From: <dai...@us...> - 2012-12-24 05:01:06
|
Revision: 5775
http://sourceforge.net/p/web-erp/reponame/5775
Author: daintree
Date: 2012-12-24 05:01:04 +0000 (Mon, 24 Dec 2012)
Log Message:
-----------
manual details of variances on goods received
Modified Paths:
--------------
trunk/OutstandingGRNs.php
trunk/doc/Manual/ManualAccountsPayable.html
trunk/includes/MainMenuLinksArray.php
Removed Paths:
-------------
trunk/GoodsReceivedNotInvoiced.php
Deleted: trunk/GoodsReceivedNotInvoiced.php
===================================================================
--- trunk/GoodsReceivedNotInvoiced.php 2012-12-24 03:29:35 UTC (rev 5774)
+++ trunk/GoodsReceivedNotInvoiced.php 2012-12-24 05:01:04 UTC (rev 5775)
@@ -1,118 +0,0 @@
-<?php
-
-/* Session started in session.inc for password checking and authorisation level check config.php is in turn included in session.inc*/
-
-include ('includes/session.inc');
-$title = _('Goods Received But Not Invoiced Yet');
-include ('includes/header.inc');
-
-$SQL = "SELECT grns.supplierid,
- purchorderdetails.orderno,
- grns.itemcode,
- grns.qtyrecd,
- grns.quantityinv,
- purchorderdetails.unitprice,
- suppliers.currcode,
- currencies.rate,
- currencies.decimalplaces
- FROM grns INNER JOIN purchorderdetails
- ON grns.podetailitem=purchorderdetails.podetailitem
- INNER JOIN suppliers
- ON grns.supplierid = suppliers.supplierid
- INNER JOIN currencies
- ON suppliers.currcode = currencies.currabrev
- WHERE grns.qtyrecd - grns.quantityinv > 0
- ORDER BY grns.supplierid,
- purchorderdetails.orderno,
- grns.itemcode";
-$result = DB_query($SQL, $db);
-
-if (DB_num_rows($result) != 0){
- echo '<p class="page_title_text" align="center"><strong>' . _('Goods Received but not invoiced Yet') . '</strong></p>';
-
- echo '<div class="page_help_text">'
- . _('Shows the list of Goods Received Not Yet Invoiced, both in supplier currency and home currency.'). '<br />'
- . _('Total in home currency calculated at Purchasing Price converted at current exchange rate, not Standard cost!'). '<br />'
- . '</div>';
-
- echo '<div>';
- echo '<table class="selection">';
- $TableHeader = '<tr>
- <th>' . _('Supplier') . '</th>
- <th>' . _('PO#') . '</th>
- <th>' . _('Item Code') . '</th>
- <th>' . _('Qty Received') . '</th>
- <th>' . _('Qty Invoiced') . '</th>
- <th>' . _('Qty Pending') . '</th>
- <th>' . _('Unit Price') . '</th>
- <th>' .'' . '</th>
- <th>' . _('Line Total') . '</th>
- <th>' . '' . '</th>
- <th>' . _('Line Total') . '</th>
- <th>' . '' . '</th>
- </tr>';
- echo $TableHeader;
- $k = 0; //row colour counter
- $i = 1;
- $TotalHomeCurrency = 0;
- while ($myrow = DB_fetch_array($result)) {
- if ($k == 1) {
- echo '<tr class="EvenTableRows">';
- $k = 0;
- } else {
- echo '<tr class="OddTableRows">';
- $k = 1;
- }
- $QtyPending = $myrow['qtyrecd'] - $myrow['quantityinv'];
- $TotalHomeCurrency = $TotalHomeCurrency + ($QtyPending * $myrow['unitprice'] / $myrow['rate']);
- printf('<td>%s</td>
- <td class="number">%s</td>
- <td>%s</td>
- <td class="number">%s</td>
- <td class="number">%s</td>
- <td class="number">%s</td>
- <td class="number">%s</td>
- <td>%s</td>
- <td class="number">%s</td>
- <td>%s</td>
- <td class="number">%s</td>
- <td>%s</td>
- </tr>',
- $myrow['supplierid'],
- $myrow['orderno'],
- $myrow['itemcode'],
- $myrow['qtyrecd'],
- $myrow['quantityinv'],
- $QtyPending,
- locale_number_format($myrow['unitprice'],$myrow['decimalplaces']),
- $myrow['currcode'],
- locale_number_format(($QtyPending * $myrow['unitprice']),$myrow['decimalplaces']),
- $myrow['currcode'],
- locale_number_format(($QtyPending * $myrow['unitprice'] / $myrow['rate']),$_SESSION['CompanyRecord']['decimalplaces']),
- $_SESSION['CompanyRecord']['currencydefault']);
-
- if ($i==15){
- $i=0;
- echo $TableHeader;
- } else {
- $i++;
- }
- }
- printf('<td colspan="9">%s</td>
- <td>%s</td>
- <td class="number">%s</td>
- <td>%s</td>
- </tr>',
- '',
- _('Total').':',
- locale_number_format($TotalHomeCurrency,$_SESSION['CompanyRecord']['decimalplaces']),
- $_SESSION['CompanyRecord']['currencydefault']);
-
- echo '</table>
- </div>
- </form>';
-}
-
-include ('includes/footer.inc');
-
-?>
\ No newline at end of file
Modified: trunk/OutstandingGRNs.php
===================================================================
--- trunk/OutstandingGRNs.php 2012-12-24 03:29:35 UTC (rev 5774)
+++ trunk/OutstandingGRNs.php 2012-12-24 05:01:04 UTC (rev 5775)
@@ -232,7 +232,7 @@
$i++;
}
}
- printf('<td colspan="10">%s</td>
+ printf('<td colspan="9">%s</td>
<td>%s</td>
<td class="number">%s</td>
<td>%s</td>
Modified: trunk/doc/Manual/ManualAccountsPayable.html
===================================================================
--- trunk/doc/Manual/ManualAccountsPayable.html 2012-12-24 03:29:35 UTC (rev 5774)
+++ trunk/doc/Manual/ManualAccountsPayable.html 2012-12-24 05:01:04 UTC (rev 5775)
@@ -215,7 +215,15 @@
<li>With Shipment costing - the total amount of the charge is posted to the debit of the goods received clearing account - variances are taken up only once all shipment charges are in and the user explicity "closes" the shipment</li>
</ul>
</li>
-</ul><!-- Help End: SupplierInvoices -->
+</ul>
+<h3>Inventory Costing and GL Postings</h3>
+<p>
+The Outsanding Goods Received report shows the calculation of the cost of goods received but not yet invoiced. This calculation is done using the standard cost as it is this figure that is used for the posting to the GL at the time the goods are received. Note that the "standard cost" field is actually the weighted average cost if you are using the weighted average cost method. The standard cost should be reflective of the purchase cost in FX as converted to local currency plus all landing costs. The FX cost as converted to local currency will of course exclude any landing costs and obviously it will be different each time the currency rates of exchange are updated.</p>
+<p>
+Variances are only taken to the GL based on the comparison of the standard cost (at the time the goods were received) compared to what the purchase invoice at the rate used during the purchase invoice entry. If weighted average costing is used then actually the variance is taken to the value of inventory and the unit weighted average cost is updated to reflect the new value.</p>
+<p>
+Exchange differences subsequent i.e. when the purchase invoice is paid is taken to exchange differences and not against the cost of the items that were purchased.</p>
+<!-- Help End: SupplierInvoices -->
<!-- Help Start: SupplierPayments -->
</p>
<div class="floatright"><a class="minitext" href="#top">⬆ Top</a></div>
Modified: trunk/includes/MainMenuLinksArray.php
===================================================================
--- trunk/includes/MainMenuLinksArray.php 2012-12-24 03:29:35 UTC (rev 5774)
+++ trunk/includes/MainMenuLinksArray.php 2012-12-24 05:01:04 UTC (rev 5775)
@@ -145,8 +145,7 @@
_('Outstanding GRNs Report'),
_('Supplier Balances At A Prior Month End'),
_('List Daily Transactions'),
- _('Supplier Transaction Inquiries'),
- _('All Goods Received Not Invoiced'));
+ _('Supplier Transaction Inquiries'));
$MenuItems['AP']['Reports']['URL'] = array ('/AgedSuppliers.php',
'/SuppPaymentRun.php',
@@ -154,9 +153,7 @@
'/OutstandingGRNs.php',
'/SupplierBalsAtPeriodEnd.php',
'/PDFSuppTransListing.php',
- '/SupplierTransInquiry.php',
- '/GoodsReceivedNotInvoiced.php'
- );
+ '/SupplierTransInquiry.php');
$MenuItems['AP']['Maintenance']['Caption'] = array (_('Add Supplier'),
_('Select Supplier'),
|
|
From: <dai...@us...> - 2012-12-24 07:09:21
|
Revision: 5778
http://sourceforge.net/p/web-erp/reponame/5778
Author: daintree
Date: 2012-12-24 07:09:18 +0000 (Mon, 24 Dec 2012)
Log Message:
-----------
Added freeserif font option for tcpdf
Modified Paths:
--------------
trunk/UserSettings.php
trunk/WWW_Users.php
trunk/includes/class.pdf.php
Added Paths:
-----------
trunk/includes/tcpdf/fonts/freeserif.ctg.z
trunk/includes/tcpdf/fonts/freeserif.php
trunk/includes/tcpdf/fonts/freeserif.z
trunk/includes/tcpdf/fonts/freeserifb.ctg.z
trunk/includes/tcpdf/fonts/freeserifb.php
trunk/includes/tcpdf/fonts/freeserifb.z
trunk/includes/tcpdf/fonts/freeserifbi.ctg.z
trunk/includes/tcpdf/fonts/freeserifbi.php
trunk/includes/tcpdf/fonts/freeserifbi.z
trunk/includes/tcpdf/fonts/freeserifi.ctg.z
trunk/includes/tcpdf/fonts/freeserifi.php
trunk/includes/tcpdf/fonts/freeserifi.z
Modified: trunk/UserSettings.php
===================================================================
--- trunk/UserSettings.php 2012-12-24 06:40:14 UTC (rev 5777)
+++ trunk/UserSettings.php 2012-12-24 07:09:18 UTC (rev 5778)
@@ -9,9 +9,10 @@
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/user.png" title="' .
_('User Settings') . '" alt="" />' . ' ' . _('User Settings') . '</p>';
-$PDFLanguages = array(_('Latin Western Languages'),
+$PDFLanguages = array(_('Latin Western Languages - Times'),
_('Eastern European Russian Japanese Korean Hebrew Arabic Thai'),
- _('Chinese'));
+ _('Chinese'),
+ _('Free Serif'));
if (isset($_POST['Modify'])) {
Modified: trunk/WWW_Users.php
===================================================================
--- trunk/WWW_Users.php 2012-12-24 06:40:14 UTC (rev 5777)
+++ trunk/WWW_Users.php 2012-12-24 07:09:18 UTC (rev 5778)
@@ -24,7 +24,8 @@
$PDFLanguages = array(_('Latin Western Languages'),
_('Eastern European Russian Japanese Korean Vietnamese Hebrew Arabic Thai'),
- _('Chinese'));
+ _('Chinese'),
+ _('Free Serif'));
$title = _('User Maintenance');
/* webERP manual links before header.inc */
Modified: trunk/includes/class.pdf.php
===================================================================
--- trunk/includes/class.pdf.php 2012-12-24 06:40:14 UTC (rev 5777)
+++ trunk/includes/class.pdf.php 2012-12-24 07:09:18 UTC (rev 5778)
@@ -48,6 +48,9 @@
case 2:
$UserPdfFont = 'javiergb';
break;
+ case 3:
+ $UserPdfFont = 'freeserif';
+ break;
}
} else {
@@ -256,12 +259,11 @@
switch($Align) {
case 'right':
- $Align = 'R'; break;
+ $Align = 'R'; break;
case 'center':
- $Align = 'C'; break;
+ $Align = 'C'; break;
default:
- $Align = 'L';
-
+ $Align = 'L';
}
$this->SetFontSize($Height);
Added: trunk/includes/tcpdf/fonts/freeserif.ctg.z
===================================================================
(Binary files differ)
Index: trunk/includes/tcpdf/fonts/freeserif.ctg.z
===================================================================
--- trunk/includes/tcpdf/fonts/freeserif.ctg.z 2012-12-24 06:40:14 UTC (rev 5777)
+++ trunk/includes/tcpdf/fonts/freeserif.ctg.z 2012-12-24 07:09:18 UTC (rev 5778)
Property changes on: trunk/includes/tcpdf/fonts/freeserif.ctg.z
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/includes/tcpdf/fonts/freeserif.php
===================================================================
--- trunk/includes/tcpdf/fonts/freeserif.php (rev 0)
+++ trunk/includes/tcpdf/fonts/freeserif.php 2012-12-24 07:09:18 UTC (rev 5778)
@@ -0,0 +1,15 @@
+<?php
+// TCPDF FONT FILE DESCRIPTION
+$type='TrueTypeUnicode';
+$name='FreeSerif';
+$up=-125;
+$ut=50;
+$dw=700;
+$diff='';
+$originalsize=1687516;
+$enc='';
+$file='freeserif.z';
+$ctg='freeserif.ctg.z';
+$desc=array('Flags'=>32,'FontBBox'=>'[-879 -545 1767 934]','ItalicAngle'=>0,'Ascent'=>900,'Descent'=>-300,'Leading'=>90,'CapHeight'=>662,'XHeight'=>450,'StemV'=>70,'StemH'=>30,'AvgWidth'=>401,'MaxWidth'=>1752,'MissingWidth'=>700);
+$cw=array(0=>700,32=>250,33=>333,34=>408,35=>500,36=>500,37=>833,38=>778,39=>180,40=>333,41=>333,42=>500,43=>564,44=>250,45=>333,46=>250,47=>278,48=>500,49=>500,50=>500,51=>500,52=>500,53=>500,54=>500,55=>500,56=>500,57=>500,58=>278,59=>278,60=>564,61=>564,62=>564,63=>444,64=>921,65=>722,66=>667,67=>667,68=>722,69=>611,70=>556,71=>722,72=>722,73=>333,74=>389,75=>722,76=>611,77=>889,78=>722,79=>722,80=>556,81=>722,82=>667,83=>556,84=>611,85=>722,86=>722,87=>944,88=>722,89=>722,90=>611,91=>333,92=>296,93=>333,94=>469,95=>500,96=>333,97=>444,98=>500,99=>444,100=>500,101=>444,102=>333,103=>500,104=>500,105=>278,106=>278,107=>500,108=>278,109=>778,110=>500,111=>500,112=>500,113=>500,114=>333,115=>389,116=>278,117=>500,118=>500,119=>722,120=>500,121=>500,122=>444,123=>480,124=>200,125=>480,126=>541,160=>250,161=>333,162=>500,163=>500,164=>500,165=>500,166=>200,167=>500,168=>333,169=>793,170=>276,171=>444,172=>564,173=>333,174=>792,175=>333,176=>400,177=>564,178=>320,179=>320,180=>333,181=>500,182=>483,183=>250,184=>333,185=>320,186=>310,187=>441,188=>750,189=>750,190=>750,191=>444,192=>722,193=>722,194=>722,195=>722,196=>722,197=>722,198=>889,199=>667,200=>611,201=>611,202=>611,203=>611,204=>333,205=>333,206=>333,207=>333,208=>722,209=>722,210=>722,211=>722,212=>722,213=>722,214=>722,215=>564,216=>722,217=>722,218=>722,219=>722,220=>722,221=>722,222=>576,223=>500,224=>444,225=>444,226=>444,227=>444,228=>444,229=>444,230=>651,231=>444,232=>444,233=>444,234=>444,235=>444,236=>278,237=>278,238=>278,239=>278,240=>501,241=>500,242=>500,243=>500,244=>500,245=>500,246=>500,247=>564,248=>500,249=>500,250=>500,251=>500,252=>500,253=>500,254=>496,255=>500,256=>722,257=>444,258=>722,259=>444,260=>722,261=>444,262=>667,263=>444,264=>667,265=>444,266=>667,267=>444,268=>667,269=>444,270=>722,271=>630,272=>722,273=>500,274=>611,275=>444,276=>611,277=>444,278=>611,279=>444,280=>611,281=>444,282=>611,283=>444,284=>722,285=>500,286=>722,287=>500,288=>722,289=>500,290=>722,291=>500,292=>722,293=>500,294=>722,295=>500,296=>333,297=>278,298=>333,299=>278,300=>333,301=>278,302=>333,303=>278,304=>333,305=>278,306=>703,307=>529,308=>389,309=>278,310=>722,311=>500,312=>500,313=>611,314=>278,315=>611,316=>278,317=>611,318=>396,319=>611,320=>444,321=>611,322=>278,323=>722,324=>500,325=>722,326=>500,327=>722,328=>500,329=>556,330=>721,331=>500,332=>722,333=>500,334=>722,335=>500,336=>722,337=>500,338=>889,339=>709,340=>667,341=>333,342=>667,343=>333,344=>667,345=>333,346=>556,347=>389,348=>556,349=>389,350=>556,351=>389,352=>556,353=>389,354=>611,355=>278,356=>611,357=>415,358=>611,359=>278,360=>722,361=>500,362=>722,363=>500,364=>722,365=>500,366=>722,367=>500,368=>722,369=>500,370=>722,371=>500,372=>944,373=>722,374=>722,375=>500,376=>722,377=>611,378=>444,379=>611,380=>444,381=>611,382=>444,383=>333,384=>500,385=>777,386=>576,387=>520,388=>646,389=>520,390=>667,391=>811,392=>558,393=>722,394=>830,395=>646,396=>500,397=>534,398=>611,399=>710,400=>518,401=>629,402=>358,403=>824,404=>665,405=>729,406=>333,407=>336,408=>810,409=>500,410=>286,411=>480,412=>944,413=>798,414=>500,415=>726,416=>722,417=>540,418=>1043,419=>778,420=>667,421=>500,422=>667,423=>556,424=>389,425=>627,426=>592,427=>285,428=>626,429=>376,430=>611,431=>782,432=>544,433=>743,434=>722,435=>813,436=>657,437=>611,438=>444,439=>530,440=>556,441=>389,442=>394,443=>500,444=>615,445=>439,446=>421,447=>500,448=>190,449=>350,450=>600,451=>333,452=>1333,453=>1166,454=>944,455=>1000,456=>889,457=>556,458=>1111,459=>1000,460=>778,461=>722,462=>444,463=>333,464=>278,465=>722,466=>500,467=>722,468=>500,469=>722,470=>500,471=>722,472=>500,473=>722,474=>500,475=>722,476=>500,477=>444,478=>722,479=>444,480=>722,481=>444,482=>889,483=>651,484=>722,485=>500,486=>722,487=>500,488=>722,489=>500,490=>722,491=>500,492=>722,493=>500,494=>530,495=>389,496=>278,497=>1333,498=>1166,499=>944,500=>722,501=>500,502=>944,503=>522,504=>722,505=>500,506=>722,507=>444,508=>889,509=>651,510=>722,511=>500,512=>722,513=>444,514=>722,515=>444,516=>611,517=>444,518=>611,519=>444,520=>333,521=>278,522=>333,523=>278,524=>722,525=>500,526=>722,527=>500,528=>667,529=>333,530=>667,531=>333,532=>722,533=>500,534=>722,535=>500,536=>556,537=>389,538=>611,539=>279,540=>424,541=>455,542=>722,543=>500,544=>715,545=>588,546=>565,547=>468,548=>611,549=>444,550=>722,551=>444,552=>611,553=>444,554=>722,555=>500,556=>722,557=>500,558=>722,559=>500,560=>722,561=>500,562=>722,563=>500,564=>407,565=>597,566=>379,567=>278,568=>771,569=>760,570=>722,571=>667,572=>444,573=>611,574=>611,575=>389,576=>444,577=>444,578=>444,579=>667,580=>722,581=>722,582=>611,583=>444,584=>389,585=>278,586=>810,587=>601,588=>667,589=>333,590=>722,591=>500,592=>444,593=>500,594=>507,595=>500,596=>444,597=>444,598=>606,599=>624,600=>444,601=>444,602=>703,603=>426,604=>426,605=>662,606=>454,607=>353,608=>624,609=>500,610=>484,611=>500,612=>582,613=>500,614=>500,615=>500,616=>278,617=>306,618=>278,619=>340,620=>294,621=>364,622=>556,623=>778,624=>778,625=>778,626=>596,627=>599,628=>500,629=>491,630=>668,631=>693,632=>640,633=>336,634=>339,635=>444,636=>338,637=>339,638=>372,639=>372,640=>457,641=>456,642=>389,643=>466,644=>483,645=>466,646=>506,647=>278,648=>336,649=>512,650=>517,651=>514,652=>500,653=>722,654=>500,655=>510,656=>600,657=>444,658=>389,659=>456,660=>444,661=>444,662=>444,663=>444,664=>722,665=>468,666=>454,667=>623,668=>524,669=>354,670=>505,671=>443,672=>625,673=>444,674=>444,675=>798,676=>795,677=>805,678=>539,679=>549,680=>678,681=>722,682=>533,683=>554,684=>500,685=>500,686=>611,687=>716,688=>332,689=>333,690=>240,691=>228,692=>228,693=>299,694=>300,695=>477,696=>328,697=>250,698=>408,699=>333,700=>333,701=>333,702=>333,703=>333,704=>258,705=>258,706=>374,707=>374,708=>383,709=>383,710=>333,711=>333,712=>250,713=>333,714=>333,715=>333,716=>250,717=>333,718=>333,719=>333,720=>278,721=>278,722=>333,723=>333,724=>333,725=>333,726=>333,727=>333,728=>333,729=>333,730=>333,731=>333,732=>333,733=>382,734=>336,735=>352,736=>331,737=>187,738=>263,739=>332,740=>300,741=>460,742=>460,743=>460,744=>460,745=>460,746=>477,747=>475,748=>339,749=>333,750=>444,751=>383,752=>383,753=>294,754=>294,755=>327,756=>261,757=>437,758=>437,759=>333,760=>278,761=>175,762=>175,763=>175,764=>175,765=>337,766=>337,767=>326,768=>0,769=>0,770=>0,771=>0,772=>0,773=>0,774=>0,775=>0,776=>0,777=>0,778=>0,779=>0,780=>0,781=>0,782=>0,783=>0,784=>0,785=>0,786=>0,787=>0,788=>0,789=>0,790=>0,791=>0,792=>0,793=>0,794=>0,795=>0,796=>0,797=>0,798=>0,799=>0,800=>0,801=>0,802=>0,803=>0,804=>0,805=>0,806=>0,807=>0,808=>0,809=>0,810=>0,811=>0,812=>0,813=>0,814=>0,815=>0,816=>0,817=>0,818=>0,819=>0,820=>0,821=>0,822=>0,823=>0,824=>0,825=>0,826=>0,827=>0,828=>0,829=>0,830=>0,831=>0,832=>0,833=>0,834=>0,835=>0,836=>0,837=>0,838=>0,839=>0,840=>0,841=>0,842=>0,843=>0,844=>0,845=>0,846=>0,847=>0,848=>0,849=>0,850=>0,851=>0,852=>0,853=>0,854=>0,855=>0,856=>0,857=>0,858=>0,859=>0,860=>0,861=>0,862=>0,863=>0,864=>0,865=>0,866=>0,867=>0,868=>0,869=>0,870=>0,871=>0,872=>0,873=>0,874=>0,875=>0,876=>0,877=>0,878=>0,879=>0,880=>535,881=>433,882=>537,883=>497,884=>199,885=>199,890=>332,894=>278,900=>267,901=>333,902=>722,903=>250,904=>800,905=>902,906=>507,908=>818,910=>861,911=>871,912=>286,913=>722,914=>667,915=>586,916=>660,917=>611,918=>611,919=>722,920=>726,921=>333,922=>722,923=>722,924=>889,925=>722,926=>628,927=>722,928=>722,929=>556,931=>627,932=>611,933=>696,934=>742,935=>722,936=>808,937=>743,938=>333,939=>718,940=>583,941=>426,942=>536,943=>286,944=>514,945=>583,946=>527,947=>480,948=>534,949=>426,950=>466,951=>536,952=>534,953=>286,954=>544,955=>476,956=>536,957=>480,958=>514,959=>500,960=>587,961=>528,962=>452,963=>537,964=>420,965=>514,966=>643,967=>480,968=>693,969=>693,970=>286,971=>514,972=>500,973=>514,974=>693,976=>534,977=>587,978=>620,979=>809,980=>620,981=>640,982=>684,983=>534,984=>556,985=>500,986=>594,987=>426,988=>556,989=>445,990=>656,991=>400,992=>722,993=>570,994=>960,995=>673,996=>592,997=>522,998=>580,999=>460,1000=>500,1001=>338,1002=>842,1003=>593,1004=>564,1005=>412,1006=>634,1007=>447,1008=>534,1009=>534,1010=>485,1011=>278,1012=>726,1013=>361,1014=>361,1015=>576,1016=>542,1017=>667,1018=>889,1019=>709,1020=>534,1021=>667,1022=>1000,1023=>1000,1024=>613,1025=>613,1026=>748,1027=>570,1028=>659,1029=>487,1030=>337,1031=>337,1032=>385,1033=>943,1034=>985,1035=>827,1036=>669,1037=>723,1038=>709,1039=>723,1040=>711,1041=>576,1042=>626,1043=>570,1044=>639,1045=>613,1046=>937,1047=>580,1048=>723,1049=>723,1050=>669,1051=>684,1052=>891,1053=>723,1054=>722,1055=>723,1056=>576,1057=>659,1058=>608,1059=>709,1060=>750,1061=>714,1062=>728,1063=>682,1064=>984,1065=>988,1066=>725,1067=>863,1068=>576,1069=>659,1070=>966,1071=>648,1072=>434,1073=>495,1074=>468,1075=>388,1076=>490,1077=>436,1078=>662,1079=>406,1080=>524,1081=>524,1082=>498,1083=>490,1084=>632,1085=>524,1086=>491,1087=>524,1088=>500,1089=>424,1090=>422,1091=>471,1092=>694,1093=>482,1094=>524,1095=>506,1096=>756,1097=>756,1098=>505,1099=>626,1100=>431,1101=>432,1102=>664,1103=>492,1104=>434,1105=>434,1106=>479,1107=>388,1108=>432,1109=>347,1110=>269,1111=>278,1112=>278,1113=>677,1114=>711,1115=>514,1116=>498,1117=>524,1118=>471,1119=>524,1120=>978,1121=>664,1122=>718,1123=>506,1124=>947,1125=>647,1126=>901,1127=>635,1128=>1248,1129=>894,1130=>937,1131=>654,1132=>1278,1133=>907,1134=>516,1135=>391,1136=>870,1137=>694,1138=>726,1139=>491,1140=>780,1141=>550,1142=>780,1143=>550,1144=>1207,1145=>946,1146=>877,1147=>611,1148=>978,1149=>664,1150=>978,1151=>664,1152=>594,1153=>428,1154=>232,1155=>0,1156=>0,1157=>0,1158=>0,1159=>0,1160=>0,1161=>0,1162=>715,1163=>522,1164=>562,1165=>430,1166=>556,1167=>511,1168=>564,1169=>398,1170=>586,1171=>392,1172=>623,1173=>463,1174=>1001,1175=>688,1176=>580,1177=>401,1178=>696,1179=>517,1180=>713,1181=>532,1182=>669,1183=>498,1184=>813,1185=>572,1186=>730,1187=>524,1188=>934,1189=>652,1190=>1030,1191=>722,1192=>750,1193=>516,1194=>659,1195=>424,1196=>608,1197=>452,1198=>722,1199=>563,1200=>722,1201=>562,1202=>773,1203=>518,1204=>972,1205=>693,1206=>681,1207=>506,1208=>726,1209=>540,1210=>682,1211=>510,1212=>866,1213=>553,1214=>866,1215=>553,1216=>333,1217=>937,1218=>662,1219=>618,1220=>448,1221=>702,1222=>490,1223=>723,1224=>499,1225=>723,1226=>547,1227=>682,1228=>506,1229=>891,1230=>632,1231=>337,1232=>711,1233=>434,1234=>711,1235=>434,1236=>891,1237=>630,1238=>623,1239=>436,1240=>710,1241=>436,1242=>710,1243=>436,1244=>937,1245=>662,1246=>580,1247=>406,1248=>530,1249=>366,1250=>723,1251=>524,1252=>723,1253=>524,1254=>722,1255=>491,1256=>722,1257=>491,1258=>722,1259=>491,1260=>659,1261=>432,1262=>709,1263=>471,1264=>709,1265=>471,1266=>709,1267=>471,1268=>682,1269=>506,1270=>572,1271=>388,1272=>863,1273=>626,1274=>572,1275=>388,1276=>720,1277=>445,1278=>722,1279=>495,1280=>556,1281=>504,1282=>900,1283=>634,1284=>803,1285=>518,1286=>553,1287=>471,1288=>964,1289=>637,1290=>968,1291=>682,1292=>722,1293=>433,1294=>714,1295=>504,1296=>532,1297=>407,1298=>702,1299=>489,1300=>960,1301=>644,1302=>823,1303=>698,1304=>961,1305=>748,1306=>722,1307=>505,1308=>947,1309=>693,1310=>669,1311=>498,1312=>992,1313=>710,1314=>1029,1315=>742,1329=>794,1330=>712,1331=>782,1332=>854,1333=>711,1334=>702,1335=>707,1336=>655,1337=>777,1338=>782,1339=>710,1340=>663,1341=>830,1342=>917,1343=>672,1344=>469,1345=>666,1346=>858,1347=>685,1348=>856,1349=>618,1350=>858,1351=>709,1352=>719,1353=>714,1354=>731,1355=>702,1356=>874,1357=>719,1358=>844,1359=>519,1360=>703,1361=>608,1362=>586,1363=>750,1364=>780,1365=>714,1366=>684,1369=>120,1370=>120,1371=>269,1372=>307,1373=>241,1374=>312,1375=>300,1377=>786,1378=>506,1379=>542,1380=>541,1381=>506,1382=>503,1383=>478,1384=>499,1385=>541,1386=>539,1387=>508,1388=>289,1389=>750,1390=>540,1391=>513,1392=>508,1393=>503,1394=>531,1395=>518,1396=>500,1397=>243,1398=>473,1399=>406,1400=>499,1401=>407,1402=>793,1403=>414,1404=>463,1405=>500,1406=>516,1407=>758,1408=>504,1409=>466,1410=>288,1411=>758,1412=>510,1413=>501,1414=>562,1415=>543,1417=>278,1418=>280,1425=>0,1426=>0,1427=>0,1428=>0,1429=>0,1430=>0,1431=>418,1432=>0,1433=>0,1434=>0,1435=>0,1436=>0,1437=>0,1438=>0,1439=>0,1440=>0,1441=>0,1442=>0,1443=>0,1444=>0,1445=>0,1446=>0,1447=>0,1448=>0,1449=>0,1450=>0,1451=>0,1452=>0,1453=>0,1454=>0,1455=>0,1456=>0,1457=>0,1458=>0,1459=>0,1460=>0,1461=>0,1462=>0,1463=>0,1464=>0,1465=>0,1466=>0,1467=>0,1468=>0,1469=>0,1470=>440,1471=>0,1472=>126,1473=>0,1474=>0,1475=>418,1476=>0,1477=>0,1478=>350,1479=>0,1488=>537,1489=>537,1490=>350,1491=>537,1492=>537,1493=>350,1494=>350,1495=>537,1496=>537,1497=>350,1498=>537,1499=>537,1500=>537,1501=>537,1502=>537,1503=>350,1504=>350,1505=>537,1506=>537,1507=>537,1508=>537,1509=>537,1510=>537,1511=>537,1512=>537,1513=>537,1514=>537,1520=>537,1521=>537,1522=>537,1523=>396,1524=>396,1548=>226,1563=>250,1567=>473,1569=>350,1570=>321,1571=>249,1572=>399,1573=>249,1574=>776,1575=>249,1576=>950,1577=>424,1578=>925,1579=>924,1580=>738,1581=>748,1582=>701,1583=>397,1584=>399,1585=>328,1586=>331,1587=>951,1588=>949,1589=>949,1590=>949,1591=>557,1592=>550,1593=>625,1594=>602,1601=>801,1602=>696,1603=>757,1604=>655,1605=>549,1606=>651,1607=>424,1608=>399,1609=>776,1610=>776,1611=>0,1613=>0,1614=>0,1615=>0,1616=>0,1617=>0,1618=>0,1619=>0,1620=>0,1621=>0,1632=>297,1633=>254,1634=>427,1635=>497,1636=>440,1637=>465,1638=>466,1639=>421,1640=>459,1641=>424,1643=>212,1652=>300,1662=>926,1670=>750,1688=>338,1711=>874,1740=>776,1748=>176,1920=>450,1921=>501,1922=>582,1923=>544,1924=>482,1925=>433,1926=>448,1927=>462,1928=>474,1929=>471,1930=>469,1931=>537,1932=>499,1933=>514,1934=>471,1935=>572,1936=>880,1937=>440,1938=>476,1939=>594,1940=>469,1941=>448,1942=>441,1943=>519,1944=>573,1945=>459,1946=>447,1947=>496,1948=>541,1949=>887,1950=>883,1951=>964,1952=>558,1953=>505,1954=>471,1955=>554,1956=>459,1957=>486,1958=>36,1959=>36,1960=>43,1961=>45,1962=>43,1963=>45,1964=>45,1965=>45,1966=>45,1967=>45,1968=>0,2304=>0,2305=>0,2306=>398,2307=>398,2308=>862,2309=>862,2310=>1042,2311=>553,2312=>553,2313=>597,2314=>848,2315=>967,2316=>828,2317=>654,2318=>654,2319=>654,2320=>654,2321=>1042,2322=>1042,2323=>1042,2324=>1042,2325=>743,2326=>798,2327=>694,2328=>694,2329=>730,2330=>734,2331=>888,2332=>814,2333=>834,2334=>734,2335=>629,2336=>629,2337=>653,2338=>609,2339=>694,2340=>654,2341=>694,2342=>588,2343=>694,2344=>654,2345=>654,2346=>615,2347=>788,2348=>621,2349=>694,2350=>694,2351=>694,2352=>575,2353=>575,2354=>787,2355=>848,2356=>848,2357=>621,2358=>654,2359=>615,2360=>734,2361=>609,2364=>398,2365=>569,2366=>341,2367=>341,2368=>341,2369=>0,2370=>0,2371=>0,2372=>0,2373=>0,2374=>0,2375=>615,2376=>615,2377=>341,2378=>341,2379=>341,2380=>341,2381=>0,2382=>0,2384=>1047,2385=>0,2386=>0,2387=>0,2388=>0,2389=>0,2392=>743,2393=>798,2394=>694,2395=>814,2396=>653,2397=>609,2398=>788,2399=>694,2400=>967,2401=>828,2402=>0,2403=>0,2404=>398,2405=>478,2406=>455,2407=>420,2408=>569,2409=>509,2410=>702,2411=>629,2412=>569,2413=>702,2414=>609,2415=>609,2416=>626,2417=>398,2418=>862,2425=>814,2426=>694,2427=>654,2428=>814,2429=>569,2430=>730,2431=>621,2433=>0,2434=>300,2435=>312,2437=>594,2438=>776,2439=>469,2440=>513,2441=>535,2442=>561,2443=>604,2444=>481,2447=>580,2448=>604,2451=>540,2452=>620,2453=>570,2454=>485,2455=>484,2456=>471,2457=>457,2458=>408,2459=>452,2460=>591,2461=>551,2462=>771,2463=>414,2464=>404,2465=>522,2466=>415,2467=>450,2468=>551,2469=>477,2470=>478,2471=>449,2472=>448,2474=>535,2475=>611,2476=>443,2477=>534,2478=>492,2479=>474,2480=>442,2482=>542,2486=>507,2487=>467,2488=>523,2489=>419,2492=>0,2493=>419,2494=>202,2495=>189,2496=>202,2497=>0,2498=>0,2499=>0,2500=>0,2503=>294,2504=>289,2507=>774,2508=>825,2509=>0,2510=>356,2519=>219,2524=>523,2525=>420,2527=>469,2528=>604,2529=>481,2530=>0,2531=>0,2534=>500,2535=>437,2536=>479,2537=>507,2538=>497,2539=>500,2540=>482,2541=>503,2542=>517,2543=>481,2544=>443,2545=>443,2546=>429,2547=>383,2548=>432,2549=>478,2550=>539,2551=>158,2552=>365,2553=>280,2554=>357,2561=>0,2562=>0,2563=>385,2565=>728,2566=>884,2567=>656,2568=>656,2569=>580,2570=>580,2575=>482,2576=>728,2579=>580,2580=>728,2581=>534,2582=>518,2583=>602,2584=>674,2585=>530,2586=>502,2587=>576,2588=>476,2589=>558,2590=>501,2591=>510,2592=>540,2593=>508,2594=>512,2595=>558,2596=>468,2597=>518,2598=>488,2599=>518,2600=>522,2602=>518,2603=>490,2604=>546,2605=>500,2606=>530,2607=>654,2608=>522,2610=>710,2611=>710,2613=>498,2614=>530,2616=>530,2617=>501,2620=>286,2622=>156,2623=>174,2624=>174,2625=>0,2626=>0,2631=>0,2632=>0,2635=>0,2636=>0,2637=>0,2641=>0,2649=>534,2650=>618,2651=>492,2652=>484,2654=>506,2662=>616,2663=>480,2664=>560,2665=>480,2666=>468,2667=>492,2668=>514,2669=>538,2670=>572,2671=>560,2672=>0,2673=>0,2674=>498,2675=>596,2676=>900,2677=>0,2946=>0,2947=>616,2949=>910,2950=>1072,2951=>848,2952=>591,2953=>492,2954=>1123,2958=>602,2959=>602,2960=>691,2962=>753,2963=>753,2964=>1597,2965=>677,2969=>697,2970=>607,2972=>691,2974=>871,2975=>589,2979=>1230,2980=>688,2984=>560,2985=>911,2986=>477,2990=>625,2991=>672,2992=>452,2993=>553,2994=>651,2995=>804,2996=>645,2997=>740,2998=>767,2999=>865,3000=>870,3001=>1067,3006=>452,3007=>176,3008=>0,3009=>404,3010=>601,3014=>690,3015=>500,3016=>840,3018=>1150,3019=>1000,3020=>1488,3021=>0,3024=>753,3031=>844,3046=>500,3047=>677,3048=>829,3049=>673,3050=>793,3051=>845,3052=>861,3053=>602,3054=>910,3055=>807,3056=>553,3057=>697,3058=>906,3059=>609,3060=>853,3061=>1585,3062=>664,3063=>978,3064=>1325,3065=>845,3066=>731,3330=>417,3331=>221,3333=>1055,3334=>1195,3335=>792,3336=>1469,3337=>570,3338=>1244,3339=>676,3340=>897,3342=>1008,3343=>1008,3344=>1538,3346=>586,3347=>981,3348=>1254,3349=>776,3350=>798,3351=>691,3352=>1095,3353=>811,3354=>728,3355=>963,3356=>704,3357=>1245,3358=>1106,3359=>466,3360=>531,3361=>984,3362=>1028,3363=>1102,3364=>780,3365=>732,3366=>485,3367=>737,3368=>747,3370=>780,3371=>962,3372=>1023,3373=>500,3374=>511,3375=>792,3376=>530,3377=>512,3378=>712,3379=>556,3380=>519,3381=>716,3382=>786,3383=>921,3384=>977,3385=>978,3389=>375,3390=>403,3391=>283,3392=>323,3393=>275,3394=>258,3395=>378,3396=>378,3398=>542,3399=>478,3400=>1070,3402=>0,3403=>0,3404=>0,3405=>89,3415=>677,3424=>676,3425=>1006,3426=>0,3427=>0,3430=>559,3431=>660,3432=>674,3433=>933,3434=>671,3435=>699,3436=>704,3437=>694,3438=>678,3439=>684,3440=>981,3441=>742,3442=>1056,3443=>660,3444=>664,3445=>870,3449=>864,3450=>1137,3451=>776,3452=>534,3453=>860,3454=>780,3455=>866,3458=>254,3459=>254,3461=>616,3462=>922,3463=>908,3464=>907,3465=>626,3466=>615,3467=>763,3468=>1109,3469=>1019,3470=>1311,3471=>1050,3472=>1477,3473=>677,3474=>746,3475=>1314,3476=>741,3477=>741,3478=>1170,3482=>894,3483=>715,3484=>715,3485=>719,3486=>741,3487=>834,3488=>719,3489=>677,3490=>677,3491=>1302,3492=>1005,3493=>919,3494=>677,3495=>719,3496=>677,3497=>741,3498=>677,3499=>1123,3500=>743,3501=>779,3502=>677,3503=>444,3504=>741,3505=>921,3507=>444,3508=>677,3509=>677,3510=>715,3511=>787,3512=>719,3513=>741,3514=>719,3515=>604,3517=>763,3520=>719,3521=>715,3522=>677,3523=>719,3524=>787,3525=>763,3526=>677,3530=>0,3535=>329,3536=>319,3537=>319,3538=>0,3539=>0,3540=>0,3542=>0,3544=>329,3545=>691,3546=>1062,3547=>1333,3548=>1278,3549=>1235,3550=>1292,3551=>461,3570=>680,3571=>481,3572=>948,3585=>532,3586=>472,3587=>534,3588=>532,3589=>544,3590=>583,3591=>417,3592=>488,3593=>604,3594=>472,3595=>534,3596=>716,3597=>717,3598=>568,3599=>568,3600=>457,3601=>637,3602=>731,3603=>790,3604=>531,3605=>542,3606=>522,3607=>577,3608=>468,3609=>603,3610=>554,3611=>554,3612=>556,3613=>556,3614=>604,3615=>604,3616=>568,3617=>542,3618=>496,3619=>442,3620=>530,3621=>512,3622=>568,3623=>478,3624=>543,3625=>614,3626=>525,3627=>578,3628=>659,3629=>514,3630=>514,3631=>450,3632=>402,3633=>0,3634=>378,3635=>415,3636=>0,3637=>0,3638=>0,3639=>0,3640=>0,3641=>0,3642=>0,3647=>620,3648=>286,3649=>521,3650=>447,3651=>426,3652=>424,3653=>333,3654=>453,3655=>0,3656=>0,3657=>0,3658=>0,3659=>0,3660=>0,3661=>0,3662=>0,3663=>657,3664=>528,3665=>528,3666=>571,3667=>594,3668=>631,3669=>632,3670=>478,3671=>713,3672=>597,3673=>565,3674=>615,3675=>1381,4256=>453,4257=>448,4258=>546,4259=>619,4260=>478,4261=>481,4262=>459,4263=>707,4264=>467,4265=>471,4266=>842,4267=>464,4268=>443,4269=>707,4270=>460,4271=>465,4272=>686,4273=>440,4274=>550,4275=>561,4276=>580,4277=>467,4278=>630,4279=>466,4280=>517,4281=>456,4282=>502,4283=>464,4284=>534,4285=>440,4286=>443,4287=>522,4288=>460,4289=>463,4290=>536,4291=>455,4292=>468,4293=>449,4304=>454,4305=>452,4306=>544,4307=>629,4308=>451,4309=>452,4310=>452,4311=>702,4312=>451,4313=>452,4314=>820,4315=>451,4316=>453,4317=>695,4318=>449,4319=>448,4320=>694,4321=>501,4322=>544,4323=>518,4324=>560,4325=>450,4326=>627,4327=>452,4328=>490,4329=>452,4330=>485,4331=>452,4332=>485,4333=>443,4334=>500,4335=>582,4336=>455,4337=>451,4338=>482,4339=>414,4340=>453,4341=>418,4342=>741,4343=>452,4344=>452,4345=>544,4346=>454,4347=>410,4348=>339,4608=>583,4609=>770,4610=>560,4611=>525,4612=>525,4613=>583,4614=>758,4616=>598,4617=>787,4618=>817,4619=>583,4620=>758,4621=>612,4622=>875,4623=>817,4624=>817,4625=>1050,4626=>1050,4627=>817,4628=>1050,4629=>817,4630=>787,4631=>1021,4632=>933,4633=>1137,4634=>1067,4635=>980,4636=>1065,4637=>962,4638=>962,4639=>1097,4640=>831,4641=>1021,4642=>851,4643=>735,4644=>875,4645=>968,4646=>817,4647=>881,4648=>583,4649=>642,4650=>583,4651=>758,4652=>700,4653=>583,4654=>700,4655=>758,4656=>583,4657=>787,4658=>787,4659=>583,4660=>729,4661=>583,4662=>583,4663=>817,4664=>642,4665=>817,4666=>846,4667=>642,4668=>758,4669=>744,4670=>642,4671=>817,4672=>700,4673=>700,4674=>700,4675=>758,4676=>700,4677=>700,4678=>729,4680=>846,4682=>1079,4683=>700,4684=>700,4685=>1021,4688=>700,4689=>700,4690=>700,4691=>758,4692=>700,4693=>758,4694=>729,4696=>846,4698=>1079,4699=>700,4700=>700,4701=>1021,4704=>525,4705=>758,4706=>758,4707=>525,4708=>700,4709=>773,4710=>525,4711=>787,4712=>525,4713=>758,4714=>758,4715=>525,4716=>700,4717=>773,4718=>525,4719=>525,4720=>729,4721=>729,4722=>729,4723=>802,4724=>729,4725=>729,4726=>758,4727=>729,4728=>758,4729=>758,4730=>758,4731=>817,4732=>758,4733=>817,4734=>758,4735=>758,4736=>612,4737=>817,4738=>817,4739=>612,4740=>787,4741=>583,4742=>875,4744=>962,4746=>992,4747=>700,4748=>758,4749=>904,4752=>408,4753=>583,4754=>525,4755=>554,4756=>481,4757=>554,4758=>642,4759=>671,4760=>700,4761=>758,4762=>729,4763=>700,4764=>671,4765=>700,4766=>758,4767=>700,4768=>583,4769=>735,4770=>822,4771=>583,4772=>793,4773=>583,4774=>583,4775=>694,4776=>554,4777=>729,4778=>773,4779=>554,4780=>700,4781=>554,4782=>554,4784=>992,4786=>1021,4787=>671,4788=>787,4789=>904,4792=>729,4793=>904,4794=>948,4795=>729,4796=>875,4797=>729,4798=>729,4800=>1137,4802=>1167,4803=>758,4804=>875,4805=>1108,4808=>758,4809=>875,4810=>700,4811=>700,4812=>700,4813=>992,4814=>758,4816=>554,4817=>787,4818=>758,4819=>583,4820=>758,4821=>496,4822=>612,4824=>525,4825=>700,4826=>700,4827=>525,4828=>685,4829=>729,4830=>510,4831=>729,4832=>962,4833=>962,4834=>962,4835=>962,4836=>962,4837=>1021,4838=>962,4839=>962,4840=>467,4841=>525,4842=>671,4843=>612,4844=>612,4845=>671,4846=>671,4848=>612,4849=>875,4850=>817,4851=>642,4852=>729,4853=>729,4854=>758,4855=>817,4856=>700,4857=>758,4858=>715,4859=>700,4860=>700,4861=>787,4862=>758,4863=>700,4864=>700,4865=>758,4866=>715,4867=>700,4868=>700,4869=>787,4870=>758,4871=>700,4872=>467,4873=>671,4874=>671,4875=>612,4876=>612,4877=>583,4878=>525,4880=>846,4882=>904,4883=>554,4884=>700,4885=>817,4888=>525,4889=>729,4890=>729,4891=>612,4892=>671,4893=>583,4894=>525,4896=>817,4897=>1021,4898=>1021,4899=>817,4900=>992,4901=>758,4902=>817,4903=>1021,4904=>1079,4905=>1137,4906=>1137,4907=>1050,4908=>1312,4909=>1050,4910=>1050,4911=>1123,4912=>647,4913=>793,4914=>822,4915=>647,4916=>793,4917=>764,4918=>583,4919=>647,4920=>583,4921=>793,4922=>822,4923=>583,4924=>793,4925=>764,4926=>583,4927=>793,4928=>540,4929=>758,4930=>583,4931=>467,4932=>583,4933=>481,4934=>612,4936=>758,4937=>700,4938=>758,4939=>700,4940=>831,4941=>671,4942=>758,4943=>700,4944=>758,4945=>758,4946=>758,4947=>817,4948=>758,4949=>758,4950=>817,4951=>758,4952=>642,4953=>980,4954=>758,4961=>233,4962=>583,4963=>408,4964=>408,4965=>525,4966=>525,4967=>233,4968=>700,4969=>671,4970=>612,4971=>642,4972=>642,4973=>642,4974=>583,4975=>700,4976=>758,4977=>642,4978=>583,4979=>700,4980=>729,4981=>720,4982=>583,4983=>758,4984=>700,4985=>904,4986=>612,4987=>583,4988=>875,5024=>711,5025=>678,5026=>604,5027=>667,5028=>796,5029=>301,5030=>516,5031=>544,5032=>457,5033=>716,5034=>703,5035=>383,5036=>628,5037=>709,5038=>455,5039=>601,5040=>472,5041=>574,5042=>730,5043=>939,5044=>498,5045=>528,5046=>667,5047=>891,5048=>505,5049=>792,5050=>957,5051=>725,5052=>595,5053=>733,5054=>698,5055=>638,5056=>720,5057=>732,5058=>624,5059=>638,5060=>565,5061=>903,5062=>655,5063=>681,5064=>675,5065=>949,5066=>683,5067=>547,5068=>693,5069=>732,5070=>529,5071=>569,5072=>536,5073=>677,5074=>631,5075=>542,5076=>973,5077=>543,5078=>607,5079=>652,5080=>652,5081=>693,5082=>514,5083=>803,5084=>658,5085=>597,5086=>627,5087=>659,5088=>679,5089=>706,5090=>563,5091=>618,5092=>767,5093=>776,5094=>731,5095=>492,5096=>808,5097=>823,5098=>796,5099=>689,5100=>716,5101=>518,5102=>521,5103=>719,5104=>563,5105=>776,5106=>634,5107=>822,5108=>621,5920=>502,5921=>502,5922=>500,5923=>498,5924=>500,5925=>502,5926=>502,5927=>502,5928=>500,5929=>503,5930=>502,5931=>502,5932=>500,5933=>500,5934=>500,5935=>796,5936=>500,5937=>502,5938=>0,5939=>0,5940=>0,5941=>230,5942=>397,6480=>537,6481=>537,6482=>531,6483=>678,6484=>682,6485=>628,6486=>732,6487=>721,6488=>598,6489=>583,6490=>702,6491=>554,6492=>683,6493=>554,6494=>710,6495=>695,6496=>523,6497=>678,6498=>589,6499=>272,6500=>506,6501=>515,6502=>515,6503=>210,6504=>210,6505=>515,6506=>515,6507=>515,6508=>229,6509=>705,6512=>649,6513=>538,6514=>568,6515=>520,6516=>544,6656=>820,6657=>958,6658=>758,6659=>859,6660=>958,6661=>727,6662=>904,6663=>940,6664=>850,6665=>905,6666=>838,6667=>961,6668=>1000,6669=>880,6670=>1189,6671=>1246,6672=>1177,6673=>757,6674=>1246,6675=>1192,6676=>709,6677=>1192,6678=>1075,6679=>0,6680=>0,6681=>534,6682=>690,6683=>0,6686=>697,6687=>500,7424=>484,7425=>595,7426=>651,7427=>446,7428=>446,7429=>483,7430=>483,7431=>409,7432=>426,7433=>278,7434=>260,7435=>483,7436=>409,7437=>595,7438=>483,7439=>483,7440=>435,7441=>507,7442=>507,7443=>673,7444=>709,7445=>378,7446=>483,7447=>483,7448=>372,7449=>456,7450=>446,7451=>409,7452=>483,7453=>488,7454=>660,7455=>500,7456=>483,7457=>632,7458=>409,7459=>355,7460=>444,7461=>681,7462=>392,7463=>483,7464=>483,7465=>372,7466=>541,7467=>470,7468=>484,7469=>595,7470=>446,7471=>446,7472=>483,7473=>409,7474=>409,7475=>483,7476=>483,7477=>223,7478=>260,7479=>483,7480=>409,7481=>595,7482=>483,7483=>483,7484=>483,7485=>378,7486=>372,7487=>446,7488=>409,7489=>483,7490=>632,7491=>297,7492=>297,7493=>335,7494=>440,7495=>335,7496=>335,7497=>297,7498=>297,7499=>285,7500=>285,7501=>335,7502=>186,7503=>335,7504=>521,7505=>335,7506=>335,7507=>297,7508=>483,7509=>483,7510=>335,7511=>186,7512=>335,7513=>326,7514=>521,7515=>335,7516=>442,7517=>353,7518=>321,7519=>357,7520=>430,7521=>321,7522=>186,7523=>223,7524=>335,7525=>335,7526=>353,7527=>321,7528=>353,7529=>430,7530=>321,7531=>754,7532=>500,7533=>500,7534=>333,7535=>778,7536=>500,7537=>500,7538=>333,7539=>333,7540=>389,7541=>278,7542=>444,7543=>500,7544=>483,7545=>447,7546=>774,7547=>280,7548=>278,7549=>500,7550=>483,7551=>514,7552=>500,7553=>500,7554=>333,7555=>676,7556=>525,7557=>278,7558=>802,7559=>507,7560=>500,7561=>333,7562=>389,7563=>384,7564=>500,7565=>500,7566=>444,7567=>602,7568=>637,7569=>648,7570=>590,7571=>559,7572=>426,7573=>590,7574=>413,7575=>444,7576=>360,7577=>638,7578=>389,7579=>335,7580=>293,7581=>283,7582=>337,7583=>299,7584=>229,7585=>251,7586=>335,7587=>322,7588=>188,7589=>212,7590=>278,7591=>182,7592=>240,7593=>233,7594=>208,7595=>287,7596=>499,7597=>533,7598=>401,7599=>374,7600=>330,7601=>329,7602=>426,7603=>262,7604=>312,7605=>197,7606=>344,7607=>336,7608=>323,7609=>334,7610=>325,7611=>293,7612=>403,7613=>288,7614=>257,7615=>354,7680=>722,7681=>444,7682=>667,7683=>500,7684=>667,7685=>500,7686=>667,7687=>500,7688=>667,7689=>444,7690=>722,7691=>500,7692=>722,7693=>500,7694=>722,7695=>500,7696=>720,7697=>500,7698=>722,7699=>500,7700=>611,7701=>444,7702=>611,7703=>444,7704=>611,7705=>444,7706=>611,7707=>444,7708=>611,7709=>444,7710=>556,7711=>333,7712=>722,7713=>500,7714=>722,7715=>500,7716=>722,7717=>500,7718=>722,7719=>500,7720=>722,7721=>500,7722=>722,7723=>500,7724=>333,7725=>278,7726=>333,7727=>278,7728=>722,7729=>500,7730=>722,7731=>500,7732=>722,7733=>500,7734=>611,7735=>278,7736=>611,7737=>278,7738=>611,7739=>278,7740=>611,7741=>278,7742=>889,7743=>778,7744=>889,7745=>778,7746=>889,7747=>778,7748=>722,7749=>500,7750=>722,7751=>500,7752=>722,7753=>500,7754=>722,7755=>500,7756=>722,7757=>500,7758=>722,7759=>500,7760=>722,7761=>500,7762=>722,7763=>500,7764=>556,7765=>500,7766=>556,7767=>500,7768=>667,7769=>333,7770=>667,7771=>333,7772=>667,7773=>333,7774=>667,7775=>333,7776=>556,7777=>389,7778=>556,7779=>389,7780=>556,7781=>389,7782=>556,7783=>389,7784=>556,7785=>389,7786=>611,7787=>278,7788=>611,7789=>278,7790=>611,7791=>278,7792=>611,7793=>278,7794=>722,7795=>500,7796=>722,7797=>500,7798=>722,7799=>500,7800=>722,7801=>500,7802=>722,7803=>500,7804=>722,7805=>500,7806=>722,7807=>500,7808=>944,7809=>722,7810=>944,7811=>722,7812=>944,7813=>722,7814=>944,7815=>722,7816=>944,7817=>722,7818=>722,7819=>500,7820=>722,7821=>500,7822=>722,7823=>500,7824=>611,7825=>444,7826=>611,7827=>444,7828=>611,7829=>444,7830=>500,7831=>278,7832=>722,7833=>500,7834=>444,7835=>333,7836=>333,7837=>333,7838=>659,7839=>534,7840=>722,7841=>444,7842=>722,7843=>444,7844=>722,7845=>444,7846=>722,7847=>444,7848=>722,7849=>454,7850=>722,7851=>444,7852=>722,7853=>444,7854=>722,7855=>444,7856=>722,7857=>444,7858=>722,7859=>454,7860=>722,7861=>444,7862=>722,7863=>444,7864=>611,7865=>444,7866=>611,7867=>444,7868=>611,7869=>444,7870=>611,7871=>444,7872=>611,7873=>444,7874=>613,7875=>444,7876=>611,7877=>444,7878=>611,7879=>444,7880=>333,7881=>278,7882=>333,7883=>278,7884=>722,7885=>500,7886=>722,7887=>500,7888=>722,7889=>500,7890=>722,7891=>500,7892=>722,7893=>500,7894=>722,7895=>500,7896=>722,7897=>500,7898=>722,7899=>540,7900=>722,7901=>540,7902=>720,7903=>540,7904=>722,7905=>540,7906=>722,7907=>540,7908=>722,7909=>500,7910=>717,7911=>500,7912=>782,7913=>544,7914=>782,7915=>544,7916=>782,7917=>544,7918=>782,7919=>544,7920=>782,7921=>544,7922=>722,7923=>500,7924=>722,7925=>500,7926=>722,7927=>501,7928=>722,7929=>500,7930=>914,7931=>514,7932=>500,7933=>342,7934=>722,7935=>530,7936=>583,7937=>583,7938=>583,7939=>583,7940=>583,7941=>583,7942=>583,7943=>583,7944=>722,7945=>722,7946=>813,7947=>817,7948=>763,7949=>765,7950=>720,7951=>722,7952=>426,7953=>426,7954=>426,7955=>426,7956=>426,7957=>426,7960=>770,7961=>770,7962=>902,7963=>919,7964=>940,7965=>936,7968=>536,7969=>536,7970=>536,7971=>536,7972=>536,7973=>536,7974=>536,7975=>536,7976=>847,7977=>859,7978=>986,7979=>1010,7980=>1026,7981=>1029,7982=>918,7983=>921,7984=>286,7985=>286,7986=>302,7987=>320,7988=>300,7989=>306,7990=>312,7991=>303,7992=>475,7993=>507,7994=>617,7995=>654,7996=>655,7997=>660,7998=>551,7999=>566,8000=>500,8001=>500,8002=>500,8003=>500,8004=>500,8005=>500,8008=>816,8009=>825,8010=>969,8011=>995,8012=>938,8013=>955,8016=>514,8017=>514,8018=>514,8019=>514,8020=>514,8021=>514,8022=>514,8023=>514,8025=>818,8027=>988,8029=>989,8031=>893,8032=>693,8033=>693,8034=>693,8035=>693,8036=>693,8037=>693,8038=>693,8039=>693,8040=>836,8041=>843,8042=>1006,8043=>1024,8044=>974,8045=>986,8046=>905,8047=>896,8048=>583,8049=>583,8050=>426,8051=>426,8052=>536,8053=>536,8054=>286,8055=>286,8056=>500,8057=>500,8058=>514,8059=>514,8060=>693,8061=>693,8064=>583,8065=>583,8066=>583,8067=>583,8068=>583,8069=>583,8070=>583,8071=>583,8072=>888,8073=>889,8074=>984,8075=>991,8076=>943,8077=>948,8078=>884,8079=>886,8080=>536,8081=>536,8082=>536,8083=>536,8084=>536,8085=>536,8086=>536,8087=>536,8088=>1017,8089=>1026,8090=>1153,8091=>1179,8092=>1195,8093=>1199,8094=>1088,8095=>1088,8096=>693,8097=>693,8098=>693,8099=>693,8100=>693,8101=>693,8102=>693,8103=>693,8104=>1034,8105=>1040,8106=>1210,8107=>1229,8108=>1176,8109=>1186,8110=>1098,8111=>1090,8112=>583,8113=>583,8114=>583,8115=>583,8116=>583,8118=>583,8119=>583,8120=>722,8121=>722,8122=>722,8123=>722,8124=>889,8125=>250,8126=>332,8127=>500,8128=>500,8129=>534,8130=>536,8131=>536,8132=>536,8134=>536,8135=>536,8136=>761,8137=>800,8138=>829,8139=>893,8140=>883,8141=>500,8142=>500,8143=>500,8144=>286,8145=>286,8146=>286,8147=>286,8150=>286,8151=>286,8152=>333,8153=>333,8154=>447,8155=>537,8157=>500,8158=>500,8159=>500,8160=>514,8161=>514,8162=>514,8163=>514,8164=>528,8165=>528,8166=>514,8167=>514,8168=>696,8169=>696,8170=>816,8171=>828,8172=>721,8173=>333,8174=>333,8175=>500,8178=>693,8179=>693,8180=>693,8182=>693,8183=>693,8184=>832,8185=>899,8186=>847,8187=>852,8188=>928,8189=>500,8190=>500,8192=>500,8193=>1000,8194=>500,8195=>1000,8196=>333,8197=>250,8198=>167,8199=>500,8200=>250,8201=>200,8202=>100,8203=>0,8204=>0,8205=>0,8206=>0,8207=>0,8208=>333,8209=>333,8210=>500,8211=>500,8212=>1000,8213=>1000,8214=>293,8215=>478,8216=>250,8217=>250,8218=>250,8219=>250,8220=>444,8221=>444,8222=>444,8223=>444,8224=>500,8225=>500,8226=>350,8227=>350,8228=>620,8229=>620,8230=>1000,8231=>250,8232=>0,8233=>0,8234=>0,8235=>0,8236=>0,8237=>0,8238=>0,8239=>250,8240=>1000,8241=>1363,8242=>247,8243=>411,8244=>611,8245=>247,8246=>411,8247=>611,8248=>469,8249=>250,8250=>250,8251=>629,8252=>666,8253=>444,8254=>500,8255=>953,8256=>953,8257=>314,8258=>931,8259=>333,8260=>167,8261=>383,8262=>383,8263=>888,8264=>777,8265=>777,8266=>500,8267=>453,8268=>453,8269=>450,8270=>500,8271=>278,8272=>882,8273=>500,8274=>497,8275=>500,8276=>953,8277=>512,8278=>410,8279=>855,8280=>620,8281=>620,8282=>179,8283=>621,8284=>564,8285=>179,8286=>179,8287=>111,8288=>0,8289=>0,8290=>0,8291=>0,8292=>0,8304=>320,8305=>180,8308=>320,8309=>320,8310=>320,8311=>320,8312=>320,8313=>320,8314=>300,8315=>300,8316=>300,8317=>216,8318=>216,8319=>335,8320=>320,8321=>320,8322=>320,8323=>320,8324=>320,8325=>320,8326=>320,8327=>320,8328=>320,8329=>320,8330=>300,8331=>300,8332=>300,8333=>216,8334=>216,8336=>320,8337=>304,8338=>340,8339=>337,8340=>298,8352=>698,8353=>667,8354=>667,8355=>556,8356=>500,8357=>778,8358=>722,8359=>940,8360=>1026,8361=>813,8362=>869,8363=>512,8364=>741,8365=>722,8366=>611,8367=>1340,8368=>489,8369=>601,8370=>619,8371=>722,8372=>556,8373=>611,8374=>498,8376=>524,8400=>0,8401=>0,8402=>0,8403=>0,8404=>0,8405=>0,8406=>0,8407=>0,8408=>0,8409=>0,8410=>0,8411=>0,8412=>0,8413=>0,8414=>0,8415=>0,8416=>0,8417=>0,8418=>0,8419=>0,8420=>0,8421=>0,8422=>0,8423=>0,8424=>0,8425=>0,8426=>0,8427=>0,8428=>0,8429=>0,8430=>0,8431=>0,8432=>0,8448=>751,8449=>723,8450=>674,8451=>954,8452=>556,8453=>781,8454=>806,8455=>518,8456=>667,8457=>822,8458=>490,8459=>824,8460=>663,8461=>818,8462=>500,8463=>500,8464=>578,8465=>613,8466=>715,8467=>417,8468=>778,8469=>751,8470=>880,8471=>792,8472=>832,8473=>589,8474=>729,8475=>892,8476=>711,8477=>755,8478=>667,8479=>667,8480=>939,8481=>1156,8482=>1008,8483=>722,8484=>659,8485=>389,8486=>743,8487=>757,8488=>663,8489=>286,8490=>722,8491=>722,8492=>846,8493=>613,8494=>533,8495=>363,8496=>587,8497=>690,8498=>556,8499=>1021,8500=>387,8501=>537,8502=>537,8503=>350,8504=>537,8505=>417,8506=>906,8507=>1155,8508=>655,8510=>586,8511=>722,8513=>663,8514=>485,8515=>485,8516=>637,8522=>516,8523=>778,8525=>899,8526=>386,8528=>780,8529=>770,8530=>980,8531=>750,8532=>750,8533=>750,8534=>750,8535=>750,8536=>750,8537=>750,8538=>750,8539=>750,8540=>750,8541=>750,8542=>750,8543=>750,8544=>333,8545=>658,8546=>977,8547=>1041,8548=>722,8549=>1040,8550=>1363,8551=>1679,8552=>1051,8553=>722,8554=>1046,8555=>1366,8556=>611,8557=>667,8558=>722,8559=>889,8560=>278,8561=>536,8562=>794,8563=>734,8564=>500,8565=>758,8566=>1016,8567=>1274,8568=>754,8569=>500,8570=>764,8571=>1022,8572=>278,8573=>444,8574=>500,8575=>778,8576=>1082,8577=>722,8578=>1090,8579=>667,8580=>444,8581=>667,8582=>528,8583=>722,8584=>1093,8585=>771,8592=>964,8593=>472,8594=>964,8595=>500,8596=>964,8597=>499,8598=>964,8599=>964,8600=>964,8601=>964,8602=>964,8603=>964,8604=>1009,8605=>1009,8606=>964,8607=>500,8608=>964,8609=>499,8610=>1093,8611=>1093,8612=>1093,8613=>500,8614=>1093,8615=>500,8616=>500,8617=>964,8618=>964,8619=>964,8620=>964,8621=>1151,8622=>964,8623=>592,8624=>482,8625=>482,8626=>482,8627=>482,8628=>658,8629=>658,8630=>1069,8631=>1069,8632=>836,8633=>964,8634=>939,8635=>939,8636=>964,8637=>964,8638=>499,8639=>499,8640=>964,8641=>964,8642=>499,8643=>499,8644=>964,8645=>840,8646=>964,8647=>964,8648=>840,8649=>964,8650=>840,8651=>964,8652=>964,8653=>964,8654=>964,8655=>964,8656=>964,8657=>550,8658=>964,8659=>550,8660=>964,8661=>550,8662=>1047,8663=>1047,8664=>1047,8665=>1047,8666=>964,8667=>964,8668=>1092,8669=>1092,8670=>500,8671=>500,8672=>964,8673=>500,8674=>964,8675=>500,8676=>964,8677=>964,8678=>964,8679=>596,8680=>964,8681=>596,8682=>594,8683=>594,8684=>594,8685=>595,8686=>596,8687=>596,8688=>966,8689=>926,8690=>926,8691=>596,8692=>964,8693=>842,8694=>964,8695=>964,8696=>964,8697=>964,8698=>964,8699=>964,8700=>964,8701=>964,8702=>964,8703=>964,8704=>587,8705=>716,8706=>494,8707=>587,8708=>587,8709=>746,8710=>612,8711=>612,8712=>536,8713=>536,8714=>439,8715=>536,8716=>536,8717=>439,8718=>506,8719=>823,8720=>823,8721=>713,8722=>564,8723=>564,8724=>564,8725=>636,8726=>636,8727=>471,8728=>497,8729=>497,8730=>549,8731=>549,8732=>549,8733=>636,8734=>853,8735=>509,8736=>575,8737=>559,8738=>509,8739=>200,8740=>250,8741=>320,8742=>320,8743=>564,8744=>564,8745=>654,8746=>654,8747=>416,8748=>750,8749=>1083,8750=>722,8751=>750,8752=>1083,8753=>697,8754=>722,8755=>722,8756=>565,8757=>568,8758=>250,8759=>629,8760=>564,8761=>758,8762=>564,8763=>636,8764=>636,8765=>636,8766=>503,8767=>614,8768=>636,8769=>636,8770=>636,8771=>636,8772=>636,8773=>636,8774=>636,8775=>636,8776=>636,8777=>636,8778=>636,8779=>636,8780=>636,8781=>636,8782=>636,8783=>636,8784=>564,8785=>564,8786=>564,8787=>564,8788=>735,8789=>755,8790=>564,8791=>564,8792=>564,8793=>564,8794=>564,8795=>564,8796=>600,8797=>564,8798=>564,8799=>564,8800=>564,8801=>636,8802=>636,8803=>636,8804=>636,8805=>636,8806=>636,8807=>636,8808=>636,8809=>636,8810=>900,8811=>899,8812=>410,8813=>636,8814=>636,8815=>636,8816=>636,8817=>636,8818=>636,8819=>636,8820=>636,8821=>636,8822=>636,8823=>636,8824=>636,8825=>636,8826=>636,8827=>636,8828=>636,8829=>636,8830=>636,8831=>636,8832=>636,8833=>636,8834=>636,8835=>636,8836=>636,8837=>636,8838=>636,8839=>636,8840=>636,8841=>636,8842=>636,8843=>636,8844=>654,8845=>654,8846=>654,8847=>636,8848=>636,8849=>636,8850=>636,8851=>636,8852=>636,8853=>636,8854=>636,8855=>636,8856=>636,8857=>636,8858=>636,8859=>636,8860=>636,8861=>636,8862=>636,8863=>636,8864=>636,8865=>636,8866=>600,8867=>600,8868=>712,8869=>712,8870=>466,8871=>466,8872=>595,8873=>588,8874=>710,8875=>706,8876=>595,8877=>596,8878=>588,8879=>706,8880=>636,8881=>636,8882=>636,8883=>636,8884=>636,8885=>636,8886=>1296,8887=>1296,8888=>966,8889=>564,8890=>626,8891=>564,8892=>564,8893=>566,8894=>570,8895=>582,8896=>744,8897=>744,8898=>764,8899=>764,8900=>512,8901=>250,8902=>471,8903=>629,8904=>636,8905=>636,8906=>636,8907=>816,8908=>816,8909=>636,8910=>636,8911=>636,8912=>636,8913=>636,8914=>654,8915=>654,8916=>654,8917=>564,8918=>564,8919=>564,8920=>1215,8921=>1215,8922=>636,8923=>636,8924=>636,8925=>636,8926=>636,8927=>636,8928=>636,8929=>636,8930=>636,8931=>636,8932=>636,8933=>636,8934=>636,8935=>636,8936=>636,8937=>636,8938=>636,8939=>636,8940=>636,8941=>636,8942=>250,8943=>1000,8944=>1000,8945=>1000,8946=>601,8947=>536,8948=>464,8949=>536,8950=>536,8951=>464,8952=>536,8953=>536,8954=>601,8955=>536,8956=>464,8957=>536,8958=>464,8959=>600,8960=>780,8961=>442,8962=>794,8968=>474,8969=>474,8970=>474,8971=>474,8976=>564,8977=>503,8978=>791,8979=>791,8980=>593,8981=>560,8982=>563,8983=>563,8984=>800,8985=>564,8986=>800,8987=>632,8988=>474,8989=>474,8990=>474,8991=>474,8992=>686,8993=>686,8994=>658,8995=>658,8996=>800,8997=>800,8998=>800,8999=>800,9000=>800,9001=>329,9002=>329,9003=>800,9004=>800,9031=>777,9032=>777,9040=>777,9047=>777,9054=>777,9088=>800,9089=>800,9090=>800,9091=>800,9094=>800,9095=>800,9096=>800,9097=>800,9098=>800,9100=>800,9103=>788,9104=>788,9105=>788,9106=>788,9108=>800,9109=>800,9110=>800,9111=>800,9112=>800,9113=>800,9114=>800,9115=>384,9116=>384,9117=>384,9118=>384,9119=>384,9120=>384,9121=>388,9122=>388,9123=>388,9124=>388,9125=>388,9126=>388,9127=>494,9128=>494,9129=>494,9130=>494,9131=>494,9132=>494,9133=>494,9134=>686,9138=>1287,9139=>1287,9140=>860,9141=>861,9142=>861,9144=>889,9145=>889,9146=>889,9147=>889,9148=>889,9149=>889,9166=>800,9167=>800,9180=>896,9181=>896,9182=>903,9183=>904,9184=>910,9185=>910,9186=>761,9187=>910,9189=>942,9190=>817,9216=>800,9217=>800,9218=>800,9219=>800,9220=>800,9221=>800,9222=>800,9223=>800,9224=>800,9225=>800,9226=>800,9227=>800,9228=>800,9229=>800,9230=>800,9231=>800,9232=>800,9233=>800,9234=>800,9235=>800,9236=>800,9237=>800,9238=>800,9239=>800,9240=>800,9241=>800,9242=>800,9243=>800,9244=>800,9245=>800,9246=>800,9247=>800,9248=>800,9249=>800,9251=>500,9252=>800,9312=>788,9313=>788,9314=>788,9315=>788,9316=>788,9317=>788,9318=>788,9319=>788,9320=>788,9321=>788,9472=>889,9473=>889,9474=>889,9475=>889,9484=>889,9485=>889,9486=>889,9487=>889,9488=>889,9489=>889,9490=>889,9491=>889,9492=>889,9493=>889,9494=>889,9495=>889,9496=>889,9497=>889,9498=>889,9499=>889,9500=>889,9501=>889,9502=>889,9503=>889,9504=>889,9505=>889,9506=>889,9507=>889,9508=>889,9509=>889,9510=>889,9511=>889,9512=>889,9513=>889,9514=>889,9515=>889,9516=>889,9517=>889,9518=>889,9519=>889,9520=>889,9521=>889,9522=>889,9523=>889,9524=>889,9525=>889,9526=>889,9527=>889,9528=>889,9529=>889,9530=>889,9531=>889,9532=>889,9533=>889,9534=>889,9535=>889,9536=>889,9537=>889,9538=>889,9539=>889,9540=>889,9541=>889,9542=>889,9543=>889,9544=>889,9545=>889,9546=>889,9547=>889,9552=>889,9553=>889,9554=>889,9555=>889,9556=>889,9557=>889,9558=>889,9559=>889,9560=>889,9561=>889,9562=>889,9563=>889,9564=>889,9565=>889,9566=>889,9567=>889,9568=>889,9569=>889,9570=>889,9571=>889,9572=>889,9573=>889,9574=>889,9575=>889,9576=>889,9577=>889,9578=>889,9579=>889,9580=>889,9581=>889,9582=>889,9583=>889,9584=>889,9585=>889,9586=>889,9587=>889,9588=>889,9589=>889,9590=>889,9591=>889,9592=>889,9593=>889,9594=>889,9595=>889,9596=>600,9597=>889,9598=>600,9599=>889,9600=>761,9601=>761,9602=>761,9603=>761,9604=>761,9605=>761,9606=>761,9607=>761,9608=>761,9609=>761,9610=>761,9611=>761,9612=>761,9613=>761,9614=>761,9615=>761,9616=>761,9617=>1000,9618=>1000,9619=>1000,9620=>761,9621=>761,9622=>761,9623=>761,9624=>761,9625=>761,9626=>761,9627=>761,9628=>761,9629=>761,9630=>761,9631=>761,9632=>761,9633=>761,9634=>761,9635=>761,9636=>761,9637=>761,9638=>761,9639=>761,9640=>761,9641=>761,9642=>532,9643=>532,9644=>761,9645=>761,9646=>761,9647=>761,9648=>761,9649=>761,9650=>892,9651=>892,9652=>446,9653=>446,9654=>892,9655=>892,9656=>446,9657=>446,9658=>892,9659=>892,9660=>892,9661=>892,9662=>446,9663=>446,9664=>892,9665=>892,9666=>446,9667=>446,9668=>892,9669=>892,9670=>788,9671=>788,9672=>788,9673=>791,9674=>494,9675=>791,9676=>791,9677=>785,9678=>791,9679=>791,9680=>791,9681=>791,9682=>791,9683=>791,9684=>791,9685=>791,9686=>791,9687=>791,9688=>350,9689=>761,9690=>761,9691=>761,9692=>791,9693=>791,9694=>791,9695=>791,9696=>791,9697=>791,9698=>761,9699=>761,9700=>761,9701=>761,9702=>350,9703=>761,9704=>761,9705=>761,9706=>761,9707=>761,9708=>892,9709=>892,9710=>892,9711=>885,9712=>761,9713=>761,9714=>761,9715=>761,9716=>791,9717=>791,9718=>791,9719=>791,9720=>761,9721=>761,9722=>761,9723=>761,9724=>761,9725=>570,9726=>570,9727=>761,9728=>800,9729=>800,9730=>748,9731=>800,9732=>800,9733=>811,9734=>816,9735=>468,9736=>677,9737=>724,9738=>944,9739=>944,9740=>686,9741=>944,9742=>715,9743=>715,9744=>757,9745=>755,9746=>755,9747=>756,9748=>800,9749=>837,9750=>719,9751=>719,9752=>782,9753=>822,9754=>954,9755=>954,9756=>933,9757=>489,9758=>933,9759=>489,9760=>517,9761=>660,9762=>724,9763=>732,9764=>886,9765=>577,9766=>489,9767=>563,9768=>490,9769=>770,9770=>725,9771=>860,9772=>668,9773=>753,9774=>724,9775=>730,9776=>600,9777=>600,9778=>600,9779=>600,9780=>600,9781=>600,9782=>600,9783=>600,9784=>730,9785=>724,9786=>724,9787=>724,9788=>799,9789=>659,9790=>659,9791=>495,9792=>495,9793=>495,9794=>686,9795=>661,9796=>544,9797=>608,9798=>605,9799=>545,9800=>804,9801=>583,9802=>796,9803=>1006,9804=>825,9805=>1189,9806=>1144,9807=>1189,9808=>683,9809=>808,9810=>1146,9811=>797,9812=>758,9813=>757,9814=>758,9815=>758,9816=>758,9817=>758,9818=>758,9819=>758,9820=>758,9821=>758,9822=>758,9823=>758,9824=>770,9825=>770,9826=>770,9827=>770,9828=>770,9829=>770,9830=>770,9831=>770,9832=>895,9833=>333,9834=>513,9835=>722,9836=>722,9837=>371,9838=>377,9839=>402,9840=>642,9841=>655,9842=>869,9843=>905,9844=>905,9845=>905,9846=>905,9847=>905,9848=>905,9849=>905,9850=>905,9851=>1016,9852=>1064,9853=>1064,9854=>954,9855=>606,9856=>522,9857=>522,9858=>522,9859=>522,9860=>522,9861=>522,9862=>845,9863=>844,9864=>844,9865=>844,9866=>748,9867=>748,9868=>748,9869=>748,9870=>748,9871=>748,9872=>726,9873=>726,9874=>963,9875=>770,9876=>1038,9877=>388,9878=>997,9879=>787,9880=>508,9881=>809,9882=>1014,9883=>859,9884=>818,9885=>972,9888=>1000,9889=>546,9890=>784,9891=>786,9892=>738,9893=>542,9894=>601,9895=>700,9896=>511,9897=>861,9898=>611,9899=>611,9900=>544,9901=>782,9902=>1025,9903=>1141,9904=>1000,9905=>513,9906=>510,9907=>642,9908=>722,9909=>719,9910=>777,9911=>495,9912=>602,9913=>836,9914=>666,9915=>666,9916=>691,9920=>689,9921=>689,9922=>689,9923=>689,9985=>974,9986=>961,9987=>974,9988=>980,9990=>789,9991=>790,9992=>791,9993=>690,9996=>549,9997=>855,9998=>911,9999=>933,10000=>911,10001=>945,10002=>974,10003=>755,10004=>846,10005=>762,10006=>761,10007=>571,10008=>677,10009=>763,10010=>760,10011=>759,10012=>754,10013=>494,10014=>552,10015=>537,10016=>577,10017=>692,10018=>786,10019=>788,10020=>788,10021=>790,10022=>793,10023=>794,10025=>823,10026=>789,10027=>841,10028=>823,10029=>833,10030=>816,10031=>831,10032=>923,10033=>744,10034=>723,10035=>749,10036=>790,10037=>792,10038=>695,10039=>776,10040=>768,10041=>792,10042=>759,10043=>707,10044=>708,10045=>682,10046=>701,10047=>826,10048=>815,10049=>789,10050=>789,10051=>707,10052=>687,10053=>696,10054=>689,10055=>786,10056=>787,10057=>713,10058=>791,10059=>785,10061=>873,10063=>762,10064=>762,10065=>759,10066=>759,10070=>784,10072=>138,10073=>277,10074=>415,10075=>392,10076=>392,10077=>668,10078=>668,10081=>732,10082=>544,10083=>544,10084=>910,10085=>667,10086=>760,10087=>760,10088=>390,10089=>390,10090=>317,10091=>317,10092=>276,10093=>276,10094=>509,10095=>509,10096=>410,10097=>410,10098=>234,10099=>234,10100=>334,10101=>334,10102=>788,10103=>788,10104=>788,10105=>788,10106=>788,10107=>788,10108=>788,10109=>788,10110=>788,10111=>788,10112=>788,10113=>788,10114=>788,10115=>788,10116=>788,10117=>788,10118=>788,10119=>788,10120=>788,10121=>788,10122=>788,10123=>788,10124=>788,10125=>788,10126=>788,10127=>788,10128=>788,10129=>788,10130=>788,10131=>788,10132=>894,10136=>748,10137=>924,10138=>748,10139=>918,10140=>927,10141=>928,10142=>928,10143=>834,10144=>873,10145=>828,10146=>924,10147=>924,10148=>917,10149=>930,10150=>931,10151=>463,10152=>883,10153=>836,10154=>836,10155=>867,10156=>867,10157=>696,10158=>696,10159=>874,10161=>874,10162=>760,10163=>946,10164=>771,10165=>865,10166=>771,10167=>888,10168=>967,10169=>888,10170=>831,10171=>873,10172=>927,10173=>970,10174=>918,10214=>545,10215=>545,10216=>329,10217=>329,10218=>496,10219=>496,10224=>1000,10225=>1000,10226=>1104,10227=>1102,10228=>964,10229=>1000,10230=>1000,10231=>1000,10232=>1000,10233=>1000,10234=>1000,10235=>1000,10236=>1000,10237=>1000,10238=>1000,10239=>1392,10752=>860,10753=>860,10754=>860,10755=>766,10756=>766,10757=>756,10758=>756,10761=>745,10781=>702,10815=>722,11008=>1000,11009=>1000,11010=>1000,11011=>1000,11012=>1222,11013=>1000,11014=>1000,11015=>1000,11016=>1000,11017=>1000,11018=>1000,11019=>1000,11020=>1244,11021=>1000,11026=>770,11027=>770,11028=>770,11029=>770,11030=>770,11031=>770,11032=>770,11033=>770,11034=>770,11035=>1000,11036=>1000,11037=>283,11038=>283,11039=>846,11040=>846,11041=>799,11042=>799,11043=>807,11044=>1000,11045=>461,11046=>461,11047=>461,11048=>461,11049=>360,11050=>360,11051=>283,11052=>854,11053=>854,11054=>628,11055=>628,11088=>589,11089=>443,11090=>443,11091=>802,11092=>803,11264=>645,11265=>793,11266=>851,11267=>700,11268=>851,11269=>640,11270=>774,11271=>665,11272=>733,11273=>834,11274=>834,11275=>734,11276=>790,11277=>580,11278=>834,11279=>979,11280=>738,11281=>410,11282=>775,11283=>471,11284=>734,11285=>851,11286=>895,11287=>722,11288=>638,11289=>620,11290=>721,11291=>793,11292=>821,11293=>699,11294=>793,11295=>682,11296=>569,11297=>791,11299=>751,11300=>705,11301=>874,11302=>665,11303=>1139,11304=>1023,11305=>1238,11306=>762,11310=>759,11312=>484,11313=>595,11314=>638,11315=>525,11316=>638,11317=>480,11318=>580,11319=>499,11320=>550,11321=>625,11322=>626,11323=>550,11324=>592,11325=>435,11326=>626,11327=>734,11328=>553,11329=>308,11330=>581,11331=>353,11332=>550,11333=>638,11334=>671,11335=>542,11336=>478,11337=>465,11338=>540,11339=>594,11340=>616,11341=>524,11342=>594,11343=>512,11344=>427,11345=>589,11347=>564,11348=>529,11349=>655,11350=>499,11351=>854,11352=>767,11353=>929,11354=>571,11358=>569,11360=>611,11361=>289,11362=>627,11363=>556,11364=>667,11365=>447,11366=>303,11367=>728,11368=>500,11369=>734,11370=>511,11371=>611,11372=>444,11373=>680,11374=>889,11375=>722,11377=>651,11378=>1075,11379=>881,11380=>500,11381=>557,11382=>383,11383=>643,11384=>559,11385=>339,11386=>722,11387=>397,11388=>180,11389=>469,11392=>719,11393=>499,11394=>532,11395=>381,11396=>615,11397=>433,11398=>969,11399=>680,11400=>647,11401=>443,11402=>593,11403=>402,11404=>573,11405=>405,11406=>698,11407=>509,11408=>726,11409=>493,11410=>283,11411=>238,11412=>628,11413=>455,11414=>653,11415=>471,11416=>819,11417=>589,11418=>698,11419=>507,11420=>546,11421=>378,11422=>722,11423=>489,11424=>724,11425=>524,11426=>526,11427=>375,11428=>647,11429=>438,11430=>615,11431=>433,11432=>719,11433=>519,11434=>762,11435=>538,11436=>649,11437=>461,11438=>721,11439=>519,11440=>964,11441=>681,11456=>689,11457=>464,11464=>579,11465=>391,11466=>493,11467=>355,11492=>408,11493=>499,11494=>496,11495=>986,11496=>466,11497=>461,11498=>934,11517=>256,11518=>617,11519=>266,11744=>0,11745=>0,11746=>0,11747=>0,11748=>0,11749=>0,11750=>0,11751=>0,11752=>0,11753=>0,11754=>0,11755=>0,11756=>0,11757=>0,11758=>0,11759=>0,11760=>0,11761=>0,11762=>0,11763=>0,11764=>0,11765=>0,11766=>0,11767=>0,11768=>0,11769=>0,11770=>0,11771=>0,11772=>0,11773=>0,11774=>0,11775=>0,11799=>333,42560=>607,42561=>411,42562=>611,42563=>410,42564=>487,42565=>347,42566=>368,42567=>286,42568=>722,42569=>519,42570=>550,42571=>468,42572=>1145,42573=>775,42574=>665,42575=>548,42576=>1014,42577=>736,42578=>910,42579=>675,42580=>966,42581=>677,42582=>1042,42583=>648,42584=>722,42585=>513,42586=>932,42587=>700,42588=>1042,42589=>749,42590=>780,42591=>550,42594=>896,42595=>635,42596=>933,42597=>635,42598=>1139,42599=>777,42600=>722,42601=>500,42602=>790,42603=>560,42604=>1262,42605=>850,42606=>734,42607=>0,42608=>0,42609=>0,42610=>0,42611=>519,42620=>0,42621=>0,42622=>510,42623=>201,42624=>639,42625=>488,42626=>475,42627=>347,42628=>1160,42629=>842,42630=>1000,42631=>768,42632=>737,42633=>531,42634=>827,42635=>530,42636=>608,42637=>438,42638=>742,42639=>545,42640=>608,42641=>480,42642=>926,42643=>654,42644=>671,42645=>518,42646=>992,42647=>780,42752=>318,42753=>318,42754=>318,42755=>318,42756=>318,42757=>318,42758=>318,42759=>318,42760=>307,42761=>307,42762=>307,42763=>307,42764=>307,42765=>307,42766=>307,42767=>307,42768=>307,42769=>307,42770=>460,42771=>460,42772=>460,42773=>460,42774=>460,42775=>374,42776=>445,42777=>564,42778=>564,42779=>354,42780=>354,42781=>243,42782=>243,42783=>243,42784=>564,42785=>564,42786=>276,42787=>242,42788=>386,42789=>276,42790=>722,42791=>500,42792=>895,42793=>703,42794=>532,42795=>409,42796=>437,42797=>389,42798=>592,42799=>600,42800=>378,42801=>378,42802=>1183,42803=>708,42804=>1154,42805=>758,42806=>1089,42807=>716,42808=>902,42809=>586,42810=>902,42811=>586,42812=>912,42813=>572,42814=>667,42815=>444,42816=>722,42817=>500,42818=>722,42819=>500,42820=>722,42821=>500,42822=>713,42823=>361,42824=>611,42825=>289,42826=>750,42827=>544,42828=>918,42829=>658,42830=>1262,42831=>848,42832=>556,42833=>500,42838=>722,42839=>500,42852=>576,42853=>496,42854=>576,42855=>496,42873=>722,42874=>500,42875=>483,42876=>341,42877=>611,42878=>611,42879=>447,42880=>611,42881=>278,42882=>689,42883=>500,42884=>483,42885=>341,42886=>667,42887=>444,42888=>333,42889=>278,42890=>282,42891=>286,42892=>278,43003=>556,43004=>556,43005=>889,43006=>333,43007=>1298,64256=>589,64257=>534,64258=>530,64259=>805,64260=>799,64261=>586,64262=>677,64275=>971,64276=>969,64277=>978,64278=>971,64279=>1219,64285=>350,64286=>0,64287=>537,64288=>537,64297=>564,64298=>537,64299=>537,64300=>537,64301=>537,64302=>537,64303=>537,64304=>537,64305=>537,64306=>350,64307=>537,64308=>537,64309=>350,64310=>350,64312=>537,64313=>350,64314=>537,64315=>537,64316=>537,64318=>537,64320=>350,64321=>537,64323=>537,64324=>537,64326=>537,64327=>537,64328=>537,64329=>537,64330=>537,64331=>350,64332=>537,64333=>537,64334=>537,64335=>537,64342=>926,64343=>926,64344=>308,64345=>308,64378=>750,64379=>750,64380=>580,64381=>580,64394=>338,64395=>338,64402=>874,64403=>874,64404=>329,64405=>329,64508=>776,64509=>700,64510=>304,64511=>304,65010=>640,65020=>837,65136=>300,65140=>300,65142=>300,65144=>300,65146=>300,65148=>300,65152=>724,65153=>321,65154=>275,65155=>249,65156=>275,65157=>399,65158=>399,65159=>249,65160=>275,65161=>776,65162=>776,65163=>301,65164=>264,65165=>249,65166=>275,65167=>950,65168=>950,65169=>293,65170=>293,65171=>424,65172=>622,65173=>925,65174=>925,65175=>308,65176=>308,65177=>924,65178=>924,65179=>298,65180=>298,65181=>738,65182=>738,65183=>574,65184=>574,65185=>748,65186=>750,65187=>600,65188=>600,65189=>701,65190=>775,65191=>596,65192=>596,65193=>397,65194=>397,65195=>399,65196=>399,65197=>328,65198=>328,65199=>331,65200=>331,65201=>951,65202=>951,65203=>600,65204=>600,65205=>949,65206=>949,65207=>649,65208=>649,65209=>949,65210=>949,65211=>823,65212=>823,65213=>949,65214=>949,65215=>805,65216=>805,65217=>557,65218=>557,65219=>460,65220=>460,65221=>550,65222=>550,65223=>455,65224=>550,65225=>625,65226=>575,65227=>674,65228=>550,65229=>602,65230=>577,65231=>578,65232=>577,65233=>801,65234=>801,65235=>300,65236=>300,65237=>696,65238=>696,65239=>650,65240=>650,65241=>757,65242=>757,65243=>318,65244=>318,65245=>655,65246=>655,65247=>206,65248=>206,65249=>549,65250=>549,65251=>403,65252=>403,65253=>651,65254=>651,65255=>323,65256=>323,65257=>424,65258=>622,65259=>525,65260=>476,65261=>399,65262=>399,65263=>776,65264=>776,65265=>776,65266=>776,65267=>296,65268=>264,65269=>676,65270=>724,65271=>676,65272=>724,65273=>676,65274=>724,65275=>676,65276=>724,65279=>0,65533=>900,65535=>700);
+// --- EOF ---
Property changes on: trunk/includes/tcpdf/fonts/freeserif.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: trunk/includes/tcpdf/fonts/freeserif.z
===================================================================
(Binary files differ)
Index: trunk/includes/tcpdf/fonts/freeserif.z
===================================================================
--- trunk/includes/tcpdf/fonts/freeserif.z 2012-12-24 06:40:14 UTC (rev 5777)
+++ trunk/includes/tcpdf/fonts/freeserif.z 2012-12-24 07:09:18 UTC (rev 5778)
Property changes on: trunk/includes/tcpdf/fonts/freeserif.z
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/includes/tcpdf/fonts/freeserifb.ctg.z
===================================================================
(Binary files differ)
Index: trunk/includes/tcpdf/fonts/freeserifb.ctg.z
===================================================================
--- trunk/includes/tcpdf/fonts/freeserifb.ctg.z 2012-12-24 06:40:14 UTC (rev 5777)
+++ trunk/includes/tcpdf/fonts/freeserifb.ctg.z 2012-12-24 07:09:18 UTC (rev 5778)
Propert...
[truncated message content] |
|
From: <dai...@us...> - 2012-12-27 07:00:37
|
Revision: 5779
http://sourceforge.net/p/web-erp/reponame/5779
Author: daintree
Date: 2012-12-27 07:00:29 +0000 (Thu, 27 Dec 2012)
Log Message:
-----------
remove weberpdemo from sql and use * instead of full field specification in userlogin as sql may fail in prior versions disabling upgrade script
Modified Paths:
--------------
trunk/includes/UserLogin.php
trunk/sql/mysql/upgrade4.09-4.10.sql
Modified: trunk/includes/UserLogin.php
===================================================================
--- trunk/includes/UserLogin.php 2012-12-24 07:09:18 UTC (rev 5778)
+++ trunk/includes/UserLogin.php 2012-12-27 07:00:29 UTC (rev 5779)
@@ -36,23 +36,7 @@
if (!isset($Name) or $Name == '') {
return UL_SHOWLOGIN;
}
- $sql = "SELECT userid,
- fullaccess,
- customerid,
- branchcode,
- pagesize,
- defaultlocation,
- email,
- modulesallowed,
- realname,
- theme,
- language,
- salesman,
- cancreatetender,
- department,
- blocked,
- pdflanguage,
- displayrecordsmax
+ $sql = "SELECT *
FROM www_users
WHERE www_users.userid='" . $Name . "'
AND (www_users.password='" . CryptPass($Password) . "'
Modified: trunk/sql/mysql/upgrade4.09-4.10.sql
===================================================================
--- trunk/sql/mysql/upgrade4.09-4.10.sql 2012-12-24 07:09:18 UTC (rev 5778)
+++ trunk/sql/mysql/upgrade4.09-4.10.sql 2012-12-27 07:00:29 UTC (rev 5779)
@@ -5,7 +5,7 @@
ALTER TABLE `salesorderdetails` DROP `commissionearned`;
INSERT INTO scripts VALUES ('CounterReturns.php','5','Allows credits and refunds from the default Counter Sale account for an inventory location');
ALTER TABLE purchorders MODIFY `initiator` VARCHAR(20);
-INSERT INTO `weberpdemo`.`scripts` (`script` , `pagesecurity` , `description`)
+INSERT INTO `scripts` (`script` , `pagesecurity` , `description`)
VALUES ('OrderEntryDiscountPricing', '13', 'Not a script but an authority level marker - required if the user is allowed to enter discounts against a customer order'
);
ALTER TABLE `gltrans` ADD INDEX ( `tag` );
|
|
From: <dai...@us...> - 2012-12-28 21:57:58
|
Revision: 5781
http://sourceforge.net/p/web-erp/reponame/5781
Author: daintree
Date: 2012-12-28 21:57:55 +0000 (Fri, 28 Dec 2012)
Log Message:
-----------
trap refresh on Logout to display login dialog
Modified Paths:
--------------
trunk/doc/Change.log
trunk/includes/session.inc
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-12-27 19:42:24 UTC (rev 5780)
+++ trunk/doc/Change.log 2012-12-28 21:57:55 UTC (rev 5781)
@@ -1,5 +1,6 @@
webERP Change Log
+29/12/12 Phil: trap refresh on logout
24/12/12 Ricard: OutstandingGRNs.php now has show on screen option
15/12/12 Phil: Customer login selection of branch option removed unecessary fields from customer order placement
15/12/12 Bob Thomas: modified default.css for the default theme to use pt based default font and other font sizes based on this
Modified: trunk/includes/session.inc
===================================================================
--- trunk/includes/session.inc 2012-12-27 19:42:24 UTC (rev 5780)
+++ trunk/includes/session.inc 2012-12-28 21:57:55 UTC (rev 5781)
@@ -118,9 +118,12 @@
}
} /* only do security checks if AllowAnyone is not true */
+ elseif(basename($_SERVER['SCRIPT_NAME'])!='Logout.php'){
+ /* User nust have hit refresh on Logout page */
+ die(include($PathPrefix . 'includes/Login.php'));
+}
+
-
-
/*User is logged in so get configuration parameters - save in session*/
include($PathPrefix . 'includes/GetConfig.php');
|
|
From: <dai...@us...> - 2012-12-29 00:48:55
|
Revision: 5783
http://sourceforge.net/p/web-erp/reponame/5783
Author: daintree
Date: 2012-12-29 00:48:48 +0000 (Sat, 29 Dec 2012)
Log Message:
-----------
ProperCaseVariableNames
Modified Paths:
--------------
trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.mo
trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po
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_CA.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_CN.utf8/Manual/ManualAPIFunctions.php
trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_HK.utf8/Manual/ManualAPIFunctions.php
trunk/sql/mysql/weberp-demo.sql
trunk/sql/mysql/weberp-new.sql
Modified: trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2012-12-28 22:02:58 UTC (rev 5782)
+++ trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2012-12-29 00:48:48 UTC (rev 5783)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: web-erp\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-18 21:50+1300\n"
+"POT-Creation-Date: 2012-12-29 13:44+1300\n"
"PO-Revision-Date: 2012-01-26 10:26+0000\n"
"Last-Translator: JC_Chuck <Unknown>\n"
"Language-Team: Arabic <ar...@li...>\n"
@@ -17,7 +17,7 @@
"X-Launchpad-Export-Date: 2012-03-07 23:01+0000\n"
"X-Generator: Launchpad (build 14907)\n"
-#: AccountGroups.php:7 includes/MainMenuLinksArray.php:381
+#: AccountGroups.php:7 includes/MainMenuLinksArray.php:379
msgid "Account Groups"
msgstr "مجموعات العضوية"
@@ -225,7 +225,7 @@
#: Areas.php:144 AuditTrail.php:11 BankReconciliation.php:14
#: BOMExtendedQty.php:250 BOMIndented.php:246 BOMIndentedReverse.php:235
#: BOMInquiry.php:187 BOMListing.php:109 BOMs.php:231 BOMs.php:858
-#: COGSGLPostings.php:19 CompanyPreferences.php:155 CounterReturns.php:1610
+#: COGSGLPostings.php:19 CompanyPreferences.php:155 CounterReturns.php:1607
#: CounterSales.php:2074 CounterSales.php:2199 Credit_Invoice.php:270
#: CreditStatus.php:21 Currencies.php:29 CustEDISetup.php:17
#: DailyBankTransactions.php:11 DebtorsAtPeriodEnd.php:125
@@ -236,7 +236,7 @@
#: GLBudgets.php:29 GLJournalInquiry.php:7 GLJournal.php:247
#: InternalStockRequest.php:300 InventoryPlanning.php:379
#: InventoryPlanningPrefSupplier.php:469 MRPReport.php:516 NoSalesItems.php:89
-#: OutstandingGRNs.php:163 PcAssignCashToTab.php:59 PcAssignCashToTab.php:133
+#: PcAssignCashToTab.php:59 PcAssignCashToTab.php:133
#: PcAssignCashToTab.php:149 PcAssignCashToTab.php:193 PDFPickingList.php:28
#: PDFStockLocTransfer.php:16 PO_AuthorisationLevels.php:10 POReport.php:60
#: POReport.php:64 POReport.php:68 PO_SelectOSPurchOrder.php:142
@@ -263,7 +263,7 @@
#: WhereUsedInquiry.php:18 WorkCentres.php:111 WorkCentres.php:162
#: WorkOrderCosting.php:22 WorkOrderEntry.php:11 WorkOrderIssue.php:22
#: WorkOrderReceive.php:31 WorkOrderStatus.php:58 WWW_Access.php:11
-#: WWW_Users.php:36 Z_BottomUpCosts.php:57
+#: WWW_Users.php:37 Z_BottomUpCosts.php:57
msgid "Search"
msgstr "إبحث"
@@ -294,8 +294,7 @@
#: Customers.php:965 Customers.php:974 Customers.php:977
#: DeliveryDetails.php:1116 DeliveryDetails.php:1159 DeliveryDetails.php:1162
#: GLTransInquiry.php:69 Labels.php:491 Labels.php:493 Labels.php:518
-#: Locations.php:617 Locations.php:619 MRP_2012-10.php:540 MRP_2012-10.php:544
-#: MRP_2012-10.php:548 MRP_2012-10.php:552 MRPCalendar.php:224 MRP.php:540
+#: Locations.php:617 Locations.php:619 MRPCalendar.php:224 MRP.php:540
#: MRP.php:544 MRP.php:548 MRP.php:552 PaymentMethods.php:204
#: PaymentMethods.php:205 PaymentMethods.php:206 PaymentMethods.php:207
#: PaymentMethods.php:273 PaymentMethods.php:280 PaymentMethods.php:287
@@ -319,8 +318,8 @@
#: SystemParameters.php:965 SystemParameters.php:975 SystemParameters.php:977
#: SystemParameters.php:1031 SystemParameters.php:1043
#: SystemParameters.php:1045 TaxGroups.php:311 TaxGroups.php:314
-#: TaxGroups.php:371 WWW_Users.php:493 WWW_Users.php:495 WWW_Users.php:666
-#: WWW_Users.php:668
+#: TaxGroups.php:371 WWW_Users.php:494 WWW_Users.php:496 WWW_Users.php:667
+#: WWW_Users.php:669
msgid "Yes"
msgstr "موافق"
@@ -334,8 +333,7 @@
#: Customers.php:960 Customers.php:973 Customers.php:976
#: DeliveryDetails.php:1117 DeliveryDetails.php:1160 DeliveryDetails.php:1163
#: GLTransInquiry.php:90 Labels.php:490 Labels.php:494 Labels.php:519
-#: Locations.php:622 Locations.php:624 MRP_2012-10.php:538 MRP_2012-10.php:542
-#: MRP_2012-10.php:546 MRP_2012-10.php:550 MRPCalendar.php:226 MRP.php:538
+#: Locations.php:622 Locations.php:624 MRPCalendar.php:226 MRP.php:538
#: MRP.php:542 MRP.php:546 MRP.php:550 NoSalesItems.php:184
#: PaymentMethods.php:204 PaymentMethods.php:205 PaymentMethods.php:206
#: PaymentMethods.php:207 PaymentMethods.php:274 PaymentMethods.php:281
@@ -359,8 +357,8 @@
#: SystemParameters.php:966 SystemParameters.php:974 SystemParameters.php:978
#: SystemParameters.php:1032 SystemParameters.php:1042
#: SystemParameters.php:1046 TaxGroups.php:312 TaxGroups.php:315
-#: TaxGroups.php:373 WWW_Users.php:492 WWW_Users.php:496 WWW_Users.php:665
-#: WWW_Users.php:669 includes/PDFLowGPPageHeader.inc:44
+#: TaxGroups.php:373 WWW_Users.php:493 WWW_Users.php:497 WWW_Users.php:666
+#: WWW_Users.php:670 includes/PDFLowGPPageHeader.inc:44
#: includes/PDFTaxPageHeader.inc:35
msgid "No"
msgstr "ﻻ"
@@ -387,7 +385,7 @@
#: SupplierTenderCreate.php:145 SupplierTypes.php:189
#: SuppTransGLAnalysis.php:125 TaxAuthorities.php:174 TaxCategories.php:182
#: TaxGroups.php:188 TaxProvinces.php:180 UnitsOfMeasure.php:185
-#: WorkCentres.php:141 WWW_Access.php:123 WWW_Users.php:332
+#: WorkCentres.php:141 WWW_Access.php:123 WWW_Users.php:333
#: includes/InputSerialItems.php:102 includes/OutputSerialItems.php:20
#, php-format
msgid "Edit"
@@ -402,7 +400,7 @@
#: AddCustomerNotes.php:138 AddCustomerTypeNotes.php:132 Areas.php:165
#: BankAccounts.php:224 BOMs.php:153 COGSGLPostings.php:110
#: COGSGLPostings.php:208 ContractBOM.php:267 ContractOtherReqts.php:120
-#: CounterReturns.php:743 CounterSales.php:832 Credit_Invoice.php:408
+#: CounterReturns.php:740 CounterSales.php:832 Credit_Invoice.php:408
#: CreditStatus.php:176 Currencies.php:279 CustomerReceipt.php:927
#: Customers.php:1086 CustomerTypes.php:207 Departments.php:187
#: DiscountCategories.php:225 DiscountMatrix.php:183 EDIMessageFormat.php:151
@@ -428,7 +426,7 @@
#: SupplierTypes.php:191 SuppShiptChgs.php:90 SuppTransGLAnalysis.php:126
#: TaxAuthorities.php:175 TaxCategories.php:183 TaxGroups.php:189
#: TaxProvinces.php:181 UnitsOfMeasure.php:186 WorkCentres.php:142
-#: WOSerialNos.php:323 WWW_Access.php:124 WWW_Users.php:333
+#: WOSerialNos.php:323 WWW_Access.php:124 WWW_Users.php:334
#: includes/InputSerialItemsKeyed.php:60 includes/OutputSerialItems.php:99
#, php-format
msgid "Delete"
@@ -489,11 +487,11 @@
#: SalesPeople.php:370 Shippers.php:203 StockCategories.php:614
#: SupplierContacts.php:284 SuppLoginSetup.php:295 TaxAuthorities.php:329
#: TaxCategories.php:238 TaxProvinces.php:235 UnitsOfMeasure.php:241
-#: WorkCentres.php:280 WWW_Users.php:737
+#: WorkCentres.php:280 WWW_Users.php:738
msgid "Enter Information"
msgstr "أدخل المعلومات"
-#: AccountSections.php:7 includes/MainMenuLinksArray.php:382
+#: AccountSections.php:7 includes/MainMenuLinksArray.php:380
msgid "Account Sections"
msgstr "أعدادات العضو"
@@ -636,8 +634,8 @@
#: PrintCustTrans.php:993 PrintCustTransPortrait.php:759
#: PrintCustTransPortrait.php:1005 PrintCustTransPortrait.php:1061
#: SelectCustomer.php:427 SelectCustomer.php:619 SelectSupplier.php:278
-#: SupplierContacts.php:156 SupplierContacts.php:277 UserSettings.php:185
-#: WWW_Users.php:288 includes/PDFPickingListHeader.inc:25
+#: SupplierContacts.php:156 SupplierContacts.php:277 UserSettings.php:186
+#: WWW_Users.php:289 includes/PDFPickingListHeader.inc:25
#: includes/PDFStatementPageHeader.inc:67 includes/PDFTransPageHeader.inc:82
#: includes/PDFTransPageHeaderPortrait.inc:109
#: includes/PO_PDFOrderPageHeader.inc:29
@@ -851,7 +849,7 @@
#: MailInventoryValuation.php:114 MRPPlannedPurchaseOrders.php:114
#: MRPPlannedWorkOrders.php:106 MRPReport.php:147 MRPReport.php:508
#: MRPReschedules.php:45 MRPReschedules.php:57 MRPShortages.php:155
-#: MRPShortages.php:167 OutstandingGRNs.php:53 OutstandingGRNs.php:65
+#: MRPShortages.php:167 OutstandingGRNs.php:46 OutstandingGRNs.php:59
#: PDFCustomerList.php:18 PDFCustomerList.php:230 PDFCustomerList.php:242
#: PDFLowGP.php:20 PDFStockCheckComparison.php:33
#: PDFStockCheckComparison.php:59 PDFStockCheckComparison.php:264
@@ -889,7 +887,7 @@
#: MRPPlannedWorkOrders.php:120 MRPPlannedWorkOrders.php:311 MRPReport.php:39
#: MRPReport.php:50 MRPReport.php:150 MRPReschedules.php:48
#: MRPReschedules.php:60 MRPShortages.php:158 MRPShortages.php:170
-#: OutstandingGRNs.php:56 OutstandingGRNs.php:68 PDFCustomerList.php:233
+#: OutstandingGRNs.php:49 OutstandingGRNs.php:62 PDFCustomerList.php:233
#: PDFCustomerList.php:245 PDFGLJournal.php:100 PDFGrn.php:130 PDFLowGP.php:59
#: PDFLowGP.php:71 PDFPriceList.php:128 PDFPrintLabel.php:46
#: PDFQuotation.php:272 PDFQuotationPortrait.php:268
@@ -933,8 +931,8 @@
#: AgedDebtors.php:368 AgedSuppliers.php:200 Areas.php:94
#: ConfirmDispatch_Invoice.php:164 ConfirmDispatch_Invoice.php:983
-#: ConfirmDispatch_Invoice.php:997 Contracts.php:582 CounterReturns.php:1015
-#: CounterReturns.php:1029 CounterSales.php:1413 CounterSales.php:1427
+#: ConfirmDispatch_Invoice.php:997 Contracts.php:582 CounterReturns.php:1012
+#: CounterReturns.php:1026 CounterSales.php:1413 CounterSales.php:1427
#: Credit_Invoice.php:729 Credit_Invoice.php:750 CustomerReceipt.php:547
#: CustomerReceipt.php:686 CustomerReceipt.php:714 CustomerTransInquiry.php:93
#: DeliveryDetails.php:398 GLProfit_Loss.php:598 GLTagProfit_Loss.php:513
@@ -1026,7 +1024,7 @@
#: InventoryPlanningPrefSupplier.php:519 InventoryQuantities.php:210
#: InventoryValuation.php:269 MRPPlannedPurchaseOrders.php:282
#: MRPPlannedWorkOrders.php:341 MRPReschedules.php:153 MRPShortages.php:303
-#: OutstandingGRNs.php:182 PDFCustomerList.php:419 PDFLowGP.php:146
+#: OutstandingGRNs.php:277 PDFCustomerList.php:419 PDFLowGP.php:146
#: PDFPriceList.php:312 PDFRemittanceAdvice.php:175
#: PDFStockCheckComparison.php:361 PrintCustTrans.php:537
#: PrintCustTransPortrait.php:582 ReorderLevel.php:259 StockDispatch.php:407
@@ -1066,12 +1064,12 @@
msgid "There are no results so the PDF is empty"
msgstr ""
-#: AgedSuppliers.php:287 OutstandingGRNs.php:172 PDFRemittanceAdvice.php:153
+#: AgedSuppliers.php:287 OutstandingGRNs.php:267 PDFRemittanceAdvice.php:153
#: SupplierBalsAtPeriodEnd.php:132 SuppPaymentRun.php:265
msgid "From Supplier Code"
msgstr ""
-#: AgedSuppliers.php:291 OutstandingGRNs.php:176 PDFRemittanceAdvice.php:157
+#: AgedSuppliers.php:291 OutstandingGRNs.php:271 PDFRemittanceAdvice.php:157
#: SupplierBalsAtPeriodEnd.php:136 SuppPaymentRun.php:269
msgid "To Supplier Code"
msgstr ""
@@ -1195,17 +1193,17 @@
#: AuditTrail.php:48 PO_AuthorisationLevels.php:124
#: PO_AuthorisationLevels.php:173 PO_AuthorisationLevels.php:176
-#: UserSettings.php:113
+#: UserSettings.php:114
msgid "User ID"
msgstr ""
#: AuditTrail.php:50 AuditTrail.php:63 ContractBOM.php:300
-#: CounterReturns.php:1618 CounterReturns.php:1621 CounterSales.php:2205
+#: CounterReturns.php:1615 CounterReturns.php:1618 CounterSales.php:2205
#: CounterSales.php:2208 CustomerTransInquiry.php:32 DailySalesInquiry.php:46
#: DailySalesInquiry.php:48 FixedAssetRegister.php:56
#: FixedAssetRegister.php:65 InventoryQuantities.php:168
-#: InventoryQuantities.php:194 InventoryQuantities.php:196 MRP_2012-10.php:597
-#: MRP.php:597 MRPReport.php:524 MRPReport.php:526 MRPReschedules.php:145
+#: InventoryQuantities.php:194 InventoryQuantities.php:196 MRP.php:597
+#: MRPReport.php:524 MRPReport.php:526 MRPReschedules.php:145
#: NoSalesItems.php:22 NoSalesItems.php:48 NoSalesItems.php:68
#: NoSalesItems.php:70 PDFPeriodStockTransListing.php:60 PDFPriceList.php:198
#: PO_Items.php:1051 POReport.php:1570 ReorderLevel.php:212
@@ -1563,7 +1561,7 @@
msgstr ""
#: BankMatching.php:128 ConfirmDispatchControlled_Invoice.php:68
-#: CounterReturns.php:200 EmailCustTrans.php:64 FixedAssetRegister.php:79
+#: CounterReturns.php:197 EmailCustTrans.php:64 FixedAssetRegister.php:79
#: FTP_RadioBeacon.php:280 GLAccountCSV.php:173 GLAccountReport.php:103
#: Payments.php:746 PcReportTab.php:101 PDFChequeListing.php:115
#: PDFChequeListing.php:125 PDFChequeListing.php:200
@@ -1835,8 +1833,8 @@
#: CustomerTransInquiry.php:105 CustWhereAlloc.php:107
#: DailyBankTransactions.php:115 GLAccountReport.php:339
#: PaymentAllocations.php:64 PaymentAllocations.php:65
-#: PDFRemittanceAdvice.php:309 ShiptsList.php:37 StockCounts.php:115
-#: StockCounts.php:158 StockLocMovements.php:94 StockMovements.php:102
+#: PDFRemittanceAdvice.php:309 ShiptsList.php:37 StockCounts.php:113
+#: StockCounts.php:156 StockLocMovements.php:94 StockMovements.php:102
#: Z_CheckAllocs.php:64 includes/PDFBankingSummaryPageHeader.inc:40
#: includes/PDFCustTransListingPageHeader.inc:49
#: includes/PDFPeriodStockTransListingPageHeader.inc:48
@@ -1885,7 +1883,7 @@
"exchange rate above reflects the current value of the bank account currency"
msgstr ""
-#: BankReconciliation.php:358 CounterReturns.php:743 CounterSales.php:832
+#: BankReconciliation.php:358 CounterReturns.php:740 CounterSales.php:832
#: Customers.php:1114 SelectOrderItems.php:1456 Stocks.php:1251
#: WorkOrderCosting.php:551 WorkOrderEntry.php:590
msgid "Are You Sure?"
@@ -1916,12 +1914,12 @@
msgstr ""
#: BOMExtendedQty.php:30 BOMIndented.php:27 BOMIndentedReverse.php:26
-#: MRP_2012-10.php:27 MRPCalendar.php:86 MRP.php:27
+#: MRPCalendar.php:86 MRP.php:27
msgid "The SQL to create passbom failed with the message"
msgstr ""
#: BOMExtendedQty.php:43 BOMIndented.php:40 BOMIndentedReverse.php:39
-#: MRP_2012-10.php:34 MRP.php:34
+#: MRP.php:34
msgid "Create of tempbom failed because"
msgstr ""
@@ -1947,8 +1945,8 @@
#: BOMIndentedReverse.php:295 BOMInquiry.php:200 BOMs.php:556 BOMs.php:735
#: ContractBOM.php:238 ContractBOM.php:351 ContractCosting.php:81
#: ContractCosting.php:87 ContractCosting.php:152 ContractOtherReqts.php:95
-#: Contracts.php:987 Contracts.php:1023 CounterReturns.php:672
-#: CounterReturns.php:1682 CounterReturns.php:1809 CounterSales.php:745
+#: Contracts.php:987 Contracts.php:1023 CounterReturns.php:669
+#: CounterReturns.php:1679 CounterReturns.php:1806 CounterSales.php:745
#: CounterSales.php:2085 CounterSales.php:2272 CounterSales.php:2409
#: Credit_Invoice.php:289 CustomerPurchases.php:73 DeliveryDetails.php:852
#: DeliveryDetails.php:922 GoodsReceived.php:101 GoodsReceived.php:105
@@ -1971,7 +1969,7 @@
#: SelectOrderItems.php:1733 SelectOrderItems.php:1863 ShipmentCosting.php:149
#: ShipmentCosting.php:150 Shipments.php:401 Shipments.php:403
#: Shipments.php:404 Shipments.php:488 Shipments.php:490 SpecialOrder.php:628
-#: StockCounts.php:114 StockLocMovements.php:93 StockLocTransfer.php:307
+#: StockCounts.php:112 StockLocMovements.php:93 StockLocTransfer.php:307
#: StockMovements.php:101 StockStatus.php:343 StockUsageGraph.php:12
#: SuppCreditGRNs.php:279 SuppCreditGRNs.php:280 SupplierCredit.php:318
#: SupplierTenderCreate.php:412 SupplierTenderCreate.php:821
@@ -2134,7 +2132,7 @@
msgstr ""
#: BOMExtendedQty.php:321 BOMInquiry.php:110 BOMs.php:883
-#: CounterReturns.php:1678 CounterSales.php:2081 CounterSales.php:2268
+#: CounterReturns.php:1675 CounterSales.php:2081 CounterSales.php:2268
#: InternalStockRequest.php:625 PO_SelectOSPurchOrder.php:237
#: PO_SelectPurchOrder.php:214 ReorderLevelLocation.php:70
#: ReorderLevelLocation.php:71 SelectCompletedOrder.php:556
@@ -2203,7 +2201,7 @@
#: BOMIndented.php:312 BOMIndentedReverse.php:292 BOMInquiry.php:109
#: BOMInquiry.php:199 BOMs.php:553 BOMs.php:882 ContractBOM.php:237
-#: ContractBOM.php:348 ContractOtherReqts.php:94 CounterReturns.php:1676
+#: ContractBOM.php:348 ContractOtherReqts.php:94 CounterReturns.php:1673
#: CounterSales.php:2079 CounterSales.php:2266 CreditStatus.php:152
#: CreditStatus.php:243 CustomerPurchases.php:67 EmailConfirmation.php:218
#: EmailConfirmation.php:336 FixedAssetCategories.php:164
@@ -2238,7 +2236,7 @@
#: SupplierTenders.php:326 SupplierTenders.php:421 SupplierTenders.php:689
#: SuppPriceList.php:309 TaxAuthorities.php:147 TopItems.php:164
#: WorkCentres.php:127 WorkOrderCosting.php:98 WorkOrderCosting.php:130
-#: WorkOrderEntry.php:643 WorkOrderIssue.php:707
+#: WorkOrderEntry.php:643 WorkOrderIssue.php:707 Z_ItemsWithoutPicture.php:33
#: includes/DefineLabelClass.php:12 includes/DefineLabelClass.php:45
#: includes/PDFGrnHeader.inc:29 includes/PDFInventoryPlanPageHeader.inc:51
#: includes/PDFOstdgGRNsPageHeader.inc:38
@@ -2324,7 +2322,7 @@
msgstr ""
#: BOMInquiry.php:28 BOMs.php:866 ContractBOM.php:326 ContractBOM.php:331
-#: Contracts.php:756 Contracts.php:759 CounterReturns.php:1643
+#: Contracts.php:756 Contracts.php:759 CounterReturns.php:1640
#: CounterSales.php:2230 CustomerReceipt.php:1115 CustomerReceipt.php:1118
#: DiscountCategories.php:109 DiscountCategories.php:111
#: DiscountCategories.php:115 DiscountCategories.php:117
@@ -2358,8 +2356,8 @@
#: SalesInquiry.php:780 SalesInquiry.php:806 SalesInquiry.php:825
#: SalesInquiry.php:935 SalesInquiry.php:1093 SalesInquiry.php:1183
#: SalesInquiry.php:1201 SelectProduct.php:548 Shipt_Select.php:174
-#: StockAdjustments.php:116 StockAdjustments.php:394 StockCounts.php:113
-#: StockCounts.php:155 StockMovements.php:36 StockReorderLevel.php:47
+#: StockAdjustments.php:116 StockAdjustments.php:394 StockCounts.php:111
+#: StockCounts.php:153 StockMovements.php:36 StockReorderLevel.php:47
#: StockStatus.php:57 StockTransfers.php:49 StockTransfers.php:470
#: StockUsage.php:64 SupplierPriceList.php:47 SupplierTenderCreate.php:670
#: SupplierTenders.php:433 WorkOrderEntry.php:631 WorkOrderIssue.php:683
@@ -2368,7 +2366,7 @@
msgstr ""
#: BOMInquiry.php:35 BOMs.php:871 ContractBOM.php:336 Contracts.php:764
-#: CounterReturns.php:1647 CounterSales.php:2236 CustomerReceipt.php:1125
+#: CounterReturns.php:1644 CounterSales.php:2236 CustomerReceipt.php:1125
#: FixedAssetTransfer.php:102 InternalStockRequest.php:354 MRPDemands.php:343
#: MRPReport.php:555 PO_Header.php:544 PO_Items.php:1088 SelectAsset.php:114
#: SelectCreditItems.php:232 SelectCreditItems.php:1010 SelectCustomer.php:375
@@ -2404,7 +2402,7 @@
msgstr ""
#: BOMInquiry.php:108 BOMs.php:552 BOMs.php:881 ContractBOM.php:347
-#: CounterReturns.php:1675 CounterSales.php:2078 CounterSales.php:2265
+#: CounterReturns.php:1672 CounterSales.php:2078 CounterSales.php:2265
#: CustomerBranches.php:370 CustomerReceipt.php:1136 GLCodesInquiry.php:26
#: InternalStockRequest.php:554 InternalStockRequest.php:622 MRPDemands.php:91
#: MRPPlannedWorkOrders.php:257 MRPReport.php:748 NoSalesItems.php:186
@@ -2425,7 +2423,7 @@
msgstr ""
#: BOMInquiry.php:111 BOMs.php:884 ConfirmDispatch_Invoice.php:286
-#: ContractBOM.php:349 CounterReturns.php:1677 CounterSales.php:2080
+#: ContractBOM.php:349 CounterReturns.php:1674 CounterSales.php:2080
#: CounterSales.php:2267 Credit_Invoice.php:288 GoodsReceived.php:102
#: GoodsReceived.php:106 InternalStockRequestAuthorisation.php:89
#: InternalStockRequestFulfill.php:310 InternalStockRequest.php:557
@@ -2499,7 +2497,7 @@
msgstr ""
#: BOMListing.php:14 BOMListing.php:15 BOMListing.php:107
-#: includes/MainMenuLinksArray.php:296
+#: includes/MainMenuLinksArray.php:294
msgid "Bill Of Material Listing"
msgstr ""
@@ -2703,7 +2701,7 @@
msgid "The SQL used to retrieve description of the parent part was"
msgstr ""
-#: BOMs.php:425 ConfirmDispatch_Invoice.php:1030 CounterReturns.php:1063
+#: BOMs.php:425 ConfirmDispatch_Invoice.php:1030 CounterReturns.php:1060
#: CounterSales.php:1460 Credit_Invoice.php:785 Credit_Invoice.php:813
#: SelectCreditItems.php:1484 Stocks.php:983 Stocks.php:985
#: api/api_debtortransactions.php:753 api/api_salesorders.php:920
@@ -2747,11 +2745,10 @@
msgstr ""
#: BOMs.php:554 BOMs.php:685 Contracts.php:869 FixedAssetRegister.php:86
-#: InventoryQuantities.php:247 Locations.php:349 MRP_2012-10.php:562
-#: MRP_2012-10.php:595 MRP.php:562 MRP.php:595 NoSalesItems.php:185
-#: PDFOrdersInvoiced.php:312 PDFOrderStatus.php:281
+#: InventoryQuantities.php:247 Locations.php:349 MRP.php:562 MRP.php:595
+#: NoSalesItems.php:185 PDFOrdersInvoiced.php:312 PDFOrderStatus.php:281
#: ReorderLevelLocation.php:157 ReorderLevel.php:290 ReorderLevel.php:299
-#: StockCounts.php:156 StockReorderLevel.php:54 StockSerialItemResearch.php:80
+#: StockCounts.php:154 StockReorderLevel.php:54 StockSerialItemResearch.php:80
#: StockStatus.php:80 StockStatus.php:85 SupplierTenderCreate.php:125
#: WhereUsedInquiry.php:72 WorkCentres.php:128 WorkCentres.php:222
#: includes/PDFPeriodStockTransListingPageHeader.inc:51
@@ -2760,7 +2757,7 @@
msgid "Location"
msgstr ""
-#: BOMs.php:555 WhereUsedInquiry.php:71 includes/MainMenuLinksArray.php:321
+#: BOMs.php:555 WhereUsedInquiry.php:71 includes/MainMenuLinksArray.php:319
msgid "Work Centre"
msgstr ""
@@ -2892,7 +2889,7 @@
#: COGSGLPostings.php:191 CustomerReceipt.php:1031 GLJournal.php:384
#: GLTransInquiry.php:44 Payments.php:1066 SupplierTransInquiry.php:172
#: TaxAuthorities.php:148 TaxAuthorities.php:149
-#: includes/MainMenuLinksArray.php:379
+#: includes/MainMenuLinksArray.php:377
msgid "GL Account"
msgstr ""
@@ -2917,7 +2914,7 @@
msgid "Post to GL account"
msgstr ""
-#: CompanyPreferences.php:7 includes/MainMenuLinksArray.php:447
+#: CompanyPreferences.php:7 includes/MainMenuLinksArray.php:445
msgid "Company Preferences"
msgstr ""
@@ -3036,7 +3033,7 @@
#: CompanyPreferences.php:281 CustLoginSetup.php:162 Suppliers.php:712
#: Suppliers.php:914 SupplierTenderCreate.php:394 SuppLoginSetup.php:148
-#: WWW_Users.php:471
+#: WWW_Users.php:472
msgid "Email Address"
msgstr ""
@@ -3244,7 +3241,7 @@
#: OrderDetails.php:73 SalesAnalRepts.php:30 SalesAnalRepts.php:32
#: SalesInquiry.php:751 SalesInquiry.php:761 SalesInquiry.php:783
#: SalesInquiry.php:931 SalesInquiry.php:946 SalesInquiry.php:952
-#: SalesInquiry.php:1203 WWW_Users.php:289 WWW_Users.php:528
+#: SalesInquiry.php:1203 WWW_Users.php:290 WWW_Users.php:529
#: Z_ChangeBranchCode.php:202 includes/PDFStatementPageHeader.inc:112
#: includes/PDFTransPageHeader.inc:46
#: includes/PDFTransPageHeaderPortrait.inc:55
@@ -3267,23 +3264,24 @@
msgstr ""
#: ConfirmDispatch_Invoice.php:283 ContractBOM.php:236 ContractCosting.php:79
-#: ContractCosting.php:85 Contracts.php:985 CounterReturns.php:670
-#: CounterReturns.php:1808 CounterSales.php:743 CounterSales.php:2408
+#: ContractCosting.php:85 Contracts.php:985 CounterReturns.php:667
+#: CounterReturns.php:1805 CounterSales.php:743 CounterSales.php:2408
#: Credit_Invoice.php:285 DeliveryDetails.php:850 GoodsReceived.php:99
#: InternalStockRequest.php:260 Labels.php:465 Labels.php:467 Labels.php:509
-#: OrderDetails.php:168 PDFPrintLabel.php:65 PO_Items.php:679
-#: PO_OrderDetails.php:146 PrintCustTrans.php:859 PrintCustTrans.php:948
-#: PrintCustTrans.php:997 PrintCustTransPortrait.php:913
-#: PrintCustTransPortrait.php:1011 PrintCustTransPortrait.php:1067
-#: RecurringSalesOrders.php:329 ReorderLevelLocation.php:188 ReprintGRN.php:84
-#: ReverseGRN.php:390 SalesGraph.php:182 SelectCreditItems.php:684
-#: SelectOrderItems.php:1376 StockCostUpdate.php:125 StockLocMovements.php:88
-#: StockLocTransfer.php:306 StockLocTransferReceive.php:428
-#: StockQuantityByDate.php:107 Stocks.php:776 Stocks.php:779 Stocks.php:833
-#: Stocks.php:839 SuppCreditGRNs.php:91 SuppCreditGRNs.php:186
-#: SuppInvGRNs.php:125 SuppInvGRNs.php:306 SupplierCredit.php:316
-#: SupplierInvoice.php:664 SupplierTenders.php:122 SupplierTenders.php:530
-#: SupplierTenders.php:532 includes/PDFOrderPageHeader_generic.inc:91
+#: OrderDetails.php:168 OutstandingGRNs.php:179 PDFPrintLabel.php:65
+#: PO_Items.php:679 PO_OrderDetails.php:146 PrintCustTrans.php:859
+#: PrintCustTrans.php:948 PrintCustTrans.php:997
+#: PrintCustTransPortrait.php:913 PrintCustTransPortrait.php:1011
+#: PrintCustTransPortrait.php:1067 RecurringSalesOrders.php:329
+#: ReorderLevelLocation.php:188 ReprintGRN.php:84 ReverseGRN.php:390
+#: SalesGraph.php:182 SelectCreditItems.php:684 SelectOrderItems.php:1376
+#: StockCostUpdate.php:125 StockLocMovements.php:88 StockLocTransfer.php:306
+#: StockLocTransferReceive.php:428 StockQuantityByDate.php:107 Stocks.php:776
+#: Stocks.php:779 Stocks.php:833 Stocks.php:839 SuppCreditGRNs.php:91
+#: SuppCreditGRNs.php:186 SuppInvGRNs.php:125 SuppInvGRNs.php:306
+#: SupplierCredit.php:316 SupplierInvoice.php:664 SupplierTenders.php:122
+#: SupplierTenders.php:530 SupplierTenders.php:532
+#: Z_ItemsWithoutPicture.php:32 includes/PDFOrderPageHeader_generic.inc:91
#: includes/PDFPickingListHeader.inc:72
#: includes/PDFQuotationPageHeader.inc:102
#: includes/PDFQuotationPortraitPageHeader.inc:102
@@ -3295,7 +3293,7 @@
msgstr ""
#: ConfirmDispatch_Invoice.php:284 ContractCosting.php:80
-#: ContractCosting.php:86 Contracts.php:986 CounterReturns.php:671
+#: ContractCosting.php:86 Contracts.php:986 CounterReturns.php:668
#: CounterSales.php:744 Credit_Invoice.php:286 DeliveryDetails.php:851
#: DeliveryDetails.php:921 InternalStockRequest.php:147
#: InternalStockRequest.php:261 Labels.php:470 OrderDetails.php:169
@@ -3338,7 +3336,7 @@
msgid "This Dispatch"
msgstr ""
-#: ConfirmDispatch_Invoice.php:289 CounterReturns.php:674 CounterSales.php:748
+#: ConfirmDispatch_Invoice.php:289 CounterReturns.php:671 CounterSales.php:748
#: Credit_Invoice.php:290 CustomerPurchases.php:72 DeliveryDetails.php:854
#: DeliveryDetails.php:924 GoodsReceived.php:112 Labels.php:480 Labels.php:482
#: Labels.php:512 OffersReceived.php:110 OffersReceived.php:219
@@ -3361,7 +3359,7 @@
msgid "Price"
msgstr ""
-#: ConfirmDispatch_Invoice.php:290 CounterReturns.php:675 CounterSales.php:750
+#: ConfirmDispatch_Invoice.php:290 CounterReturns.php:672 CounterSales.php:750
#: Credit_Invoice.php:291 CustomerReceipt.php:907 DeliveryDetails.php:855
#: OrderDetails.php:173 PrintCustTrans.php:864 PrintCustTrans.php:953
#: PrintCustTrans.php:1002 PrintCustTransPortrait.php:918
@@ -3376,7 +3374,7 @@
msgstr ""
#: ConfirmDispatch_Invoice.php:291 ConfirmDispatch_Invoice.php:295
-#: CounterReturns.php:679 CounterReturns.php:759 CounterSales.php:755
+#: CounterReturns.php:676 CounterReturns.php:756 CounterSales.php:755
#: CounterSales.php:849 CounterSales.php:851 Credit_Invoice.php:292
#: Credit_Invoice.php:296 CustomerAllocations.php:331
#: CustomerAllocations.php:365 CustomerInquiry.php:205 DeliveryDetails.php:856
@@ -3386,18 +3384,19 @@
#: GLTrialBalance.php:238 GLTrialBalance.php:259 GLTrialBalance.php:355
#: GLTrialBalance.php:487 GLTrialBalance.php:507 GLTrialBalance.php:531
#: GLTrialBalance.php:643 GLTrialBalance.php:663 GLTrialBalance.php:687
-#: OffersReceived.php:111 OrderDetails.php:174 PDFCustTransListing.php:133
-#: PDFOrdersInvoiced.php:395 PDFRemittanceAdvice.php:310
-#: PDFSuppTransListing.php:131 RecurringSalesOrders.php:335
-#: SalesByTypePeriodInquiry.php:375 SalesByTypePeriodInquiry.php:410
-#: SalesByTypePeriodInquiry.php:445 SalesByTypePeriodInquiry.php:480
-#: SalesByTypePeriodInquiry.php:541 SelectCreditItems.php:691
-#: SelectCreditItems.php:695 SelectOrderItems.php:1387
-#: SuppContractChgs.php:107 SuppFixedAssetChgs.php:94
-#: SupplierAllocations.php:458 SupplierAllocations.php:570
-#: SupplierAllocations.php:645 SupplierCredit.php:407 SupplierInquiry.php:212
-#: SuppShiptChgs.php:97 SuppTransGLAnalysis.php:139
-#: Z_CheckDebtorsControl.php:149 includes/PDFQuotationPageHeader.inc:109
+#: OffersReceived.php:111 OrderDetails.php:174 OutstandingGRNs.php:243
+#: PDFCustTransListing.php:133 PDFOrdersInvoiced.php:395
+#: PDFRemittanceAdvice.php:310 PDFSuppTransListing.php:131
+#: RecurringSalesOrders.php:335 SalesByTypePeriodInquiry.php:375
+#: SalesByTypePeriodInquiry.php:410 SalesByTypePeriodInquiry.php:445
+#: SalesByTypePeriodInquiry.php:480 SalesByTypePeriodInquiry.php:541
+#: SelectCreditItems.php:691 SelectCreditItems.php:695
+#: SelectOrderItems.php:1387 SuppContractChgs.php:107
+#: SuppFixedAssetChgs.php:94 SupplierAllocations.php:458
+#: SupplierAllocations.php:570 SupplierAllocations.php:645
+#: SupplierCredit.php:407 SupplierInquiry.php:212 SuppShiptChgs.php:97
+#: SuppTransGLAnalysis.php:139 Z_CheckDebtorsControl.php:149
+#: includes/PDFQuotationPageHeader.inc:109
#: includes/PDFQuotationPortraitPageHeader.inc:109
#: includes/PO_PDFOrderPageHeader.inc:82 api/api_debtortransactions.php:1269
#: api/api_debtortransactions.php:1282 api/api_debtortransactions.php:1579
@@ -3419,7 +3418,7 @@
msgid "Tax %"
msgstr ""
-#: ConfirmDispatch_Invoice.php:294 CounterReturns.php:678 CounterSales.php:754
+#: ConfirmDispatch_Invoice.php:294 CounterReturns.php:675 CounterSales.php:754
#: Credit_Invoice.php:294 Credit_Invoice.php:295 PrintCustTrans.php:396
#: PrintCustTrans.php:1040 PrintCustTransPortrait.php:456
#: PrintCustTransPortrait.php:1110 SelectCreditItems.php:693
@@ -3427,7 +3426,7 @@
msgid "Tax"
msgstr ""
-#: ConfirmDispatch_Invoice.php:295 CounterReturns.php:679 CounterSales.php:755
+#: ConfirmDispatch_Invoice.php:295 CounterReturns.php:676 CounterSales.php:755
#: Credit_Invoice.php:296 SelectCreditItems.php:695
msgid "Incl Tax"
msgstr ""
@@ -3635,12 +3634,12 @@
#: ConfirmDispatch_Invoice.php:1602 ContractCosting.php:248
#: ContractCosting.php:266 ContractCosting.php:274 ContractCosting.php:330
#: ContractCosting.php:359 ContractCosting.php:388 ContractCosting.php:408
-#: ContractCosting.php:415 CounterReturns.php:942 CounterReturns.php:958
-#: CounterReturns.php:995 CounterReturns.php:1014 CounterReturns.php:1028
-#: CounterReturns.php:1069 CounterReturns.php:1079 CounterReturns.php:1159
-#: CounterReturns.php:1180 CounterReturns.php:1304 CounterReturns.php:1326
-#: CounterReturns.php:1351 CounterReturns.php:1372 CounterReturns.php:1398
-#: CounterReturns.php:1421 CounterSales.php:1298 CounterSales.php:1340
+#: ContractCosting.php:415 CounterReturns.php:939 CounterReturns.php:955
+#: CounterReturns.php:992 CounterReturns.php:1011 CounterReturns.php:1025
+#: CounterReturns.php:1066 CounterReturns.php:1076 CounterReturns.php:1156
+#: CounterReturns.php:1177 CounterReturns.php:1301 CounterReturns.php:1323
+#: CounterReturns.php:1348 CounterReturns.php:1369 CounterReturns.php:1395
+#: CounterReturns.php:1418 CounterSales.php:1298 CounterSales.php:1340
#: CounterSales.php:1356 CounterSales.php:1393 CounterSales.php:1412
#: CounterSales.php:1426 CounterSales.php:1466 CounterSales.php:1476
#: CounterSales.php:1558 CounterSales.php:1579 CounterSales.php:1741
@@ -3757,12 +3756,12 @@
#: ConfirmDispatch_Invoice.php:1602 ContractCosting.php:248
#: ContractCosting.php:266 ContractCosting.php:274 ContractCosting.php:330
#: ContractCosting.php:359 ContractCosting.php:388 ContractCosting.php:408
-#: ContractCosting.php:415 CounterReturns.php:942 CounterReturns.php:958
-#: CounterReturns.php:995 CounterReturns.php:1014 CounterReturns.php:1028
-#: CounterReturns.php:1069 CounterReturns.php:1079 CounterReturns.php:1159
-#: CounterReturns.php:1180 CounterReturns.php:1304 CounterReturns.php:1326
-#: CounterReturns.php:1351 CounterReturns.php:1372 CounterReturns.php:1398
-#: CounterReturns.php:1421 CounterSales.php:1298 CounterSales.php:1340
+#: ContractCosting.php:415 CounterReturns.php:939 CounterReturns.php:955
+#: CounterReturns.php:992 CounterReturns.php:1011 CounterReturns.php:1025
+#: CounterReturns.php:1066 CounterReturns.php:1076 CounterReturns.php:1156
+#: CounterReturns.php:1177 CounterReturns.php:1301 CounterReturns.php:1323
+#: CounterReturns.php:1348 CounterReturns.php:1369 CounterReturns.php:1395
+#: CounterReturns.php:1418 CounterSales.php:1298 CounterSales.php:1340
#: CounterSales.php:1356 CounterSales.php:1393 CounterSales.php:1412
#: CounterSales.php:1426 CounterSales.php:1466 CounterSales.php:1476
#: CounterSales.php:1558 CounterSales.php:1579 CounterSales.php:1741
@@ -3868,23 +3867,23 @@
msgid "The following SQL to update the sales order was used"
msgstr ""
-#: ConfirmDispatch_Invoice.php:801 CounterReturns.php:942
+#: ConfirmDispatch_Invoice.php:801 CounterReturns.php:939
#: CounterSales.php:1340 RecurringSalesOrdersProcess.php:680
msgid "The debtor transaction record could not be inserted because"
msgstr ""
-#: ConfirmDispatch_Invoice.php:802 CounterReturns.php:943
+#: ConfirmDispatch_Invoice.php:802 CounterReturns.php:940
#: CounterSales.php:1341 RecurringSalesOrdersProcess.php:681
msgid "The following SQL to insert the debtor transaction record was used"
msgstr ""
-#: ConfirmDispatch_Invoice.php:817 CounterReturns.php:958
+#: ConfirmDispatch_Invoice.php:817 CounterReturns.php:955
#: CounterSales.php:1356 Credit_Invoice.php:629
#: RecurringSalesOrdersProcess.php:694 SelectCreditItems.php:1177
msgid "The debtor transaction taxes records could not be inserted because"
msgstr ""
-#: ConfirmDispatch_Invoice.php:818 CounterReturns.php:959
+#: ConfirmDispatch_Invoice.php:818 CounterReturns.php:956
#: CounterSales.php:1357 Credit_Invoice.php:630
#: RecurringSalesOrdersProcess.php:695 SelectCreditItems.php:1178
msgid ""
@@ -3918,36 +3917,36 @@
msgid "Cannot retrieve the mbflag"
msgstr ""
-#: ConfirmDispatch_Invoice.php:948 CounterReturns.php:979
+#: ConfirmDispatch_Invoice.php:948 CounterReturns.php:976
#: CounterSales.php:1377 FixedAssetItems.php:628 SalesAnalReptCols.php:327
#: Stocks.php:1248 Suppliers.php:1028 includes/MiscFunctions.php:36
msgid "WARNING"
msgstr ""
-#: ConfirmDispatch_Invoice.php:948 CounterReturns.php:979
+#: ConfirmDispatch_Invoice.php:948 CounterReturns.php:976
#: CounterSales.php:1377
msgid "Could not retrieve current location stock"
msgstr ""
-#: ConfirmDispatch_Invoice.php:964 CounterReturns.php:995
+#: ConfirmDispatch_Invoice.php:964 CounterReturns.php:992
#: CounterSales.php:1393 Credit_Invoice.php:707 SelectCreditItems.php:1417
msgid "Location stock record could not be updated because"
msgstr ""
#: ConfirmDispatch_Invoice.php:965 ContractCosting.php:331
-#: CounterReturns.php:996 CounterSales.php:1394 Credit_Invoice.php:708
+#: CounterReturns.php:993 CounterSales.php:1394 Credit_Invoice.php:708
#: GoodsReceived.php:491 ReverseGRN.php:220 SelectCreditItems.php:1418
#: StockTransfers.php:434 StockTransfers.php:443 SupplierInvoice.php:277
#: WorkOrderIssue.php:162 WorkOrderReceive.php:340 WorkOrderReceive.php:447
msgid "The following SQL to update the location stock record was used"
msgstr ""
-#: ConfirmDispatch_Invoice.php:982 CounterReturns.php:1014
+#: ConfirmDispatch_Invoice.php:982 CounterReturns.php:1011
#: CounterSales.php:1412 Credit_Invoice.php:728 SelectCreditItems.php:1438
msgid "Could not retrieve assembly components from the database for"
msgstr ""
-#: ConfirmDispatch_Invoice.php:982 CounterReturns.php:1014
+#: ConfirmDispatch_Invoice.php:982 CounterReturns.php:1011
#: CounterSales.php:1412 Credit_Invoice.php:728 EDIMessageFormat.php:43
#: EDISendInvoices.php:105 EDISendInvoices_Reece.php:184
#: FixedAssetCategories.php:91 FixedAssetCategories.php:110
@@ -3958,7 +3957,7 @@
msgid "because"
msgstr ""
-#: ConfirmDispatch_Invoice.php:996 CounterReturns.php:1028
+#: ConfirmDispatch_Invoice.php:996 CounterReturns.php:1025
#: CounterSales.php:1426
msgid "Can not retrieve assembly components location stock quantities because "
msgstr ""
@@ -3977,12 +3976,12 @@
msgid "Order"
msgstr ""
-#: ConfirmDispatch_Invoice.php:1036 CounterReturns.php:1069
+#: ConfirmDispatch_Invoice.php:1036 CounterReturns.php:1066
#: CounterSales.php:1466 Credit_Invoice.php:819 SelectCreditItems.php:1491
msgid "Stock movement records for the assembly components of"
msgstr ""
-#: ConfirmDispatch_Invoice.php:1036 CounterReturns.php:1069
+#: ConfirmDispatch_Invoice.php:1036 CounterReturns.php:1066
#: CounterSales.php:1466 Credit_Invoice.php:819 SelectCreditItems.php:1491
#: ShipmentCosting.php:397 SupplierAllocations.php:139
#: includes/PDFPaymentRun_PymtFooter.php:57
@@ -3994,27 +3993,27 @@
msgid "could not be inserted because"
msgstr ""
-#: ConfirmDispatch_Invoice.php:1037 CounterReturns.php:1070
+#: ConfirmDispatch_Invoice.php:1037 CounterReturns.php:1067
#: CounterSales.php:1467 Credit_Invoice.php:820 SelectCreditItems.php:1492
msgid ""
"The following SQL to insert the assembly components stock movement records "
"was used"
msgstr ""
-#: ConfirmDispatch_Invoice.php:1046 CounterReturns.php:1079
+#: ConfirmDispatch_Invoice.php:1046 CounterReturns.php:1076
#: CounterSales.php:1476 Credit_Invoice.php:829 SelectCreditItems.php:1501
msgid ""
"Location stock record could not be updated for an assembly component because"
msgstr ""
-#: ConfirmDispatch_Invoice.php:1047 CounterReturns.php:1080
+#: ConfirmDispatch_Invoice.php:1047 CounterReturns.php:1077
#: CounterSales.php:1477
msgid ""
"The following SQL to update the locations stock record for the component was "
"used"
msgstr ""
-#: ConfirmDispatch_Invoice.php:1129 CounterReturns.php:1159
+#: ConfirmDispatch_Invoice.php:1129 CounterReturns.php:1156
#: CounterSales.php:1558 Credit_Invoice.php:904 Credit_Invoice.php:1002
#: Credit_Invoice.php:1042 Credit_Invoice.php:1082
#: RecurringSalesOrdersProcess.php:363 ReverseGRN.php:248
@@ -4023,7 +4022,7 @@
msgstr ""
#: ConfirmDispatch_Invoice.php:1130 ContractCosting.php:360
-#: CounterReturns.php:1160 CounterSales.php:1559 Credit_Invoice.php:905
+#: CounterReturns.php:1157 CounterSales.php:1559 Credit_Invoice.php:905
#: Credit_Invoice.php:1003 Credit_Invoice.php:1043 GoodsReceived.php:522
#: RecurringSalesOrdersProcess.php:364 ReverseGRN.php:249
#: SelectCreditItems.php:1316 SupplierInvoice.php:308 WorkOrderIssue.php:193
@@ -4031,14 +4030,14 @@
msgid "The following SQL to insert the stock movement records was used"
msgstr ""
-#: ConfirmDispatch_Invoice.php:1150 CounterReturns.php:1180
+#: ConfirmDispatch_Invoice.php:1150 CounterReturns.php:1177
#: CounterSales.php:1579 RecurringSalesOrdersProcess.php:384
msgid ""
"Taxes and rates applicable to this invoice line item could not be inserted "
"because"
msgstr ""
-#: ConfirmDispatch_Invoice.php:1151 CounterReturns.php:1181
+#: ConfirmDispatch_Invoice.php:1151 CounterReturns.php:1178
#: CounterSales.php:1580 Credit_Invoice.php:1105
#: RecurringSalesOrdersProcess.php:385 SelectCreditItems.php:1337
msgid ""
@@ -4078,31 +4077,31 @@
msgid "The following SQL to insert the serial stock movement records was used"
msgstr ""
-#: ConfirmDispatch_Invoice.php:1223 CounterReturns.php:1221
+#: ConfirmDispatch_Invoice.php:1223 CounterReturns.php:1218
#: CounterSales.php:1658 RecurringSalesOrdersProcess.php:423
#: api/api_salesorders.php:1026
msgid "The count of existing Sales analysis records could not run because"
msgstr ""
-#: ConfirmDispatch_Invoice.php:1224 CounterReturns.php:1222
+#: ConfirmDispatch_Invoice.php:1224 CounterReturns.php:1219
#: CounterSales.php:1659 Credit_Invoice.php:1133
#: RecurringSalesOrdersProcess.php:424 SelectCreditItems.php:1659
#: api/api_salesorders.php:1027
msgid "SQL to count the no of sales analysis records"
msgstr ""
-#: ConfirmDispatch_Invoice.php:1279 CounterReturns.php:1279
+#: ConfirmDispatch_Invoice.php:1279 CounterReturns.php:1276
#: CounterSales.php:1716 RecurringSalesOrdersProcess.php:482
msgid "Sales analysis record could not be added or updated because"
msgstr ""
-#: ConfirmDispatch_Invoice.php:1280 CounterReturns.php:1280
+#: ConfirmDispatch_Invoice.php:1280 CounterReturns.php:1277
#: CounterSales.php:1717 Credit_Invoice.php:1245
#: RecurringSalesOrdersProcess.php:483 SelectCreditItems.php:1769
msgid "The following SQL to insert the sales analysis record was used"
msgstr ""
-#: ConfirmDispatch_Invoice.php:1305 CounterReturns.php:1304
+#: ConfirmDispatch_Invoice.php:1305 CounterReturns.php:1301
#: CounterSales.php:1741 Credit_Invoice.php:1275
msgid "The cost of sales GL posting could not be inserted because"
msgstr ""
@@ -4112,9 +4111,9 @@
#: ConfirmDispatch_Invoice.php:1424 ConfirmDispatch_Invoice.php:1446
#: ConfirmDispatch_Invoice.php:1468 ConfirmDispatch_Invoice.php:1490
#: ConfirmDispatch_Invoice.php:1581 ConfirmDispatch_Invoice.php:1603
-#: ContractCosting.php:249 ContractCosting.php:267 CounterReturns.php:1305
-#: CounterReturns.php:1327 CounterReturns.php:1352 CounterReturns.php:1373
-#: CounterReturns.php:1422 CounterSales.php:1742 CounterSales.php:1764
+#: ContractCosting.php:249 ContractCosting.php:267 CounterReturns.php:1302
+#: CounterReturns.php:1324 CounterReturns.php:1349 CounterReturns.php:1370
+#: CounterReturns.php:1419 CounterSales.php:1742 CounterSales.php:1764
#: CounterSales.php:1789 CounterSales.php:1810 CounterSales.php:1859
#: Credit_Invoice.php:1276 Credit_Invoice.php:1316 Credit_Invoice.php:1343
#: Credit_Invoice.php:1364 Credit_Invoice.php:1393 Credit_Invoice.php:1419
@@ -4132,18 +4131,18 @@
msgid "The following SQL to insert the GLTrans record was used"
msgstr ""
-#: ConfirmDispatch_Invoice.php:1328 CounterReturns.php:1326
+#: ConfirmDispatch_Invoice.php:1328 CounterReturns.php:1323
#: CounterSales.php:1763
msgid ""
"The stock side of the cost of sales GL posting could not be inserted because"
msgstr ""
-#: ConfirmDispatch_Invoice.php:1355 CounterReturns.php:1351
+#: ConfirmDispatch_Invoice.php:1355 CounterReturns.php:1348
#: CounterSales.php:1788 RecurringSalesOrdersProcess.php:510
msgid "The sales GL posting could not be inserted because"
msgstr ""
-#: ConfirmDispatch_Invoice.php:1377 CounterReturns.php:1372
+#: ConfirmDispatch_Invoice.php:1377 CounterReturns.php:1369
#: CounterSales.php:1809 RecurringSalesOrdersProcess.php:537
msgid "The sales discount GL posting could not be inserted because"
msgstr ""
@@ -4199,12 +4198,12 @@
msgid "The following SQL to update the fixed asset record was used"
msgstr ""
-#: ConfirmDispatch_Invoice.php:1555 CounterReturns.php:1398
+#: ConfirmDispatch_Invoice.php:1555 CounterReturns.php:1395
#: CounterSales.php:1835 RecurringSalesOrdersProcess.php:604
msgid "The total debtor GL posting could not be inserted because"
msgstr ""
-#: ConfirmDispatch_Invoice.php:1556 CounterReturns.php:1399
+#: ConfirmDispatch_Invoice.php:1556 CounterReturns.php:1396
#: CounterSales.php:1836 RecurringSalesOrdersProcess.php:605
msgid ""
"The following SQL to insert the total debtors control GLTrans record was used"
@@ -4214,7 +4213,7 @@
msgid "The freight GL posting could not be inserted because"
msgstr ""
-#: ConfirmDispatch_Invoice.php:1602 CounterReturns.php:1421
+#: ConfirmDispatch_Invoice.php:1602 CounterReturns.php:1418
#: CounterSales.php:1858 Credit_Invoice.php:1444
#: RecurringSalesOrdersProcess.php:577 SelectCreditItems.php:1974
msgid "The tax GL posting could not be inserted because"
@@ -4225,14 +4224,14 @@
msgid "Invoice number"
msgstr ""
-#: ConfirmDispatch_Invoice.php:1619 CounterReturns.php:1583
+#: ConfirmDispatch_Invoice.php:1619 CounterReturns.php:1580
#: CounterSales.php:2028 RecurringSalesOrdersProcess.php:700
#: SelectCreditItems.php:1989
msgid "processed"
msgstr ""
#: ConfirmDispatch_Invoice.php:1624 ConfirmDispatch_Invoice.php:1626
-#: ContractBOM.php:294 CounterReturns.php:1588 CounterReturns.php:1590
+#: ContractBOM.php:294 CounterReturns.php:1585 CounterReturns.php:1587
#: CounterSales.php:2033 CounterSales.php:2035 CustomerReceipt.php:552
#: DeliveryDetails.php:581 DeliveryDetails.php:585 DeliveryDetails.php:803
#: DeliveryDetails.php:807 GLBalanceSheet.php:18 GLJournalInquiry.php:109
@@ -4253,13 +4252,13 @@
msgid "Print this invoice"
msgstr ""
-#: ConfirmDispatch_Invoice.php:1624 CounterReturns.php:1588
+#: ConfirmDispatch_Invoice.php:1624 CounterReturns.php:1585
#: CounterSales.php:2033 SelectSalesOrder.php:984 SystemParameters.php:480
#, php-format
msgid "Landscape"
msgstr ""
-#: ConfirmDispatch_Invoice.php:1626 CounterReturns.php:1590
+#: ConfirmDispatch_Invoice.php:1626 CounterReturns.php:1587
#: CounterSales.php:2035 SelectSalesOrder.php:984 SystemParameters.php:481
#, php-format
msgid "Portrait"
@@ -4335,7 +4334,7 @@
msgid "to continue"
msgstr ""
-#: ContractBOM.php:139 CounterReturns.php:327 CounterSales.php:348
+#: ContractBOM.php:139 CounterReturns.php:324 CounterSales.php:348
#: InternalStockRequest.php:496 PO_Items.php:1017 SelectCreditItems.php:388
#: SelectOrderItems.php:866 SupplierTenderCreate.php:799
#: SupplierTenders.php:669 WorkOrderEntry.php:181 WorkOrderIssue.php:468
@@ -4380,7 +4379,7 @@
msgid "The SQL used to retrieve the item details but failed was"
msgstr ""
-#: ContractBOM.php:204 CounterReturns.php:412 CounterSales.php:448
+#: ContractBOM.php:204 CounterReturns.php:409 CounterSales.php:448
#: PO_Items.php:648 SelectOrderItems.php:962
#: includes/SelectOrderItems_IntoCart.inc:60
#: includes/SelectOrderItems_IntoCart.inc:166
@@ -4441,7 +4440,7 @@
msgid "Enter text extracts in the description"
msgstr ""
-#: ContractBOM.php:326 CounterReturns.php:1643 CounterSales.php:2230
+#: ContractBOM.php:326 CounterReturns.php:1640 CounterSales.php:2230
#: PO_Items.php:1080 SelectCompletedOrder.php:534 SelectCreditItems.php:1003
#: SelectOrderItems.php:1693 SelectSalesOrder.php:595 SelectWorkOrder.php:197
msgid "Enter extract of the Stock Code"
@@ -4528,7 +4527,7 @@
msgstr ""
#: ContractCosting.php:82 ContractCosting.php:88 Contracts.php:988
-#: CounterReturns.php:673 CounterSales.php:747 DeliveryDetails.php:853
+#: CounterReturns.php:670 CounterSales.php:747 DeliveryDetails.php:853
#: DeliveryDetails.php:923 OrderDetails.php:171 PO_Items.php:793
#: PrintCustTrans.php:862 PrintCustTrans.php:951 PrintCustTrans.php:1000
#: PrintCustTransPortrait.php:916 PrintCustTransPortrait.php:1014
@@ -4562,11 +4561,12 @@
msgid "Budgeted Other Costs"
msgstr ""
-#: ContractCosting.php:171 OffersReceived.php:106 PO_AuthoriseMyOrders.php:59
-#: PO_SelectOSPurchOrder.php:477 PO_SelectPurchOrder.php:432 PurchData.php:166
-#: ReprintGRN.php:81 SelectProduct.php:365 SelectSupplier.php:154
-#: ShipmentCosting.php:535 ShipmentCosting.php:612 Shipt_Select.php:294
-#: ShiptsList.php:11 SuppCreditGRNs.php:281 SupplierAllocations.php:567
+#: ContractCosting.php:171 OffersReceived.php:106 OutstandingGRNs.php:177
+#: PO_AuthoriseMyOrders.php:59 PO_SelectOSPurchOrder.php:477
+#: PO_SelectPurchOrder.php:432 PurchData.php:166 ReprintGRN.php:81
+#: SelectProduct.php:365 SelectSupplier.php:154 ShipmentCosting.php:535
+#: ShipmentCosting.php:612 Shipt_Select.php:294 ShiptsList.php:11
+#: SuppCreditGRNs.php:281 SupplierAllocations.php:567
#: SupplierAllocations.php:642 SupplierCredit.php:262 SupplierInquiry.php:118
#: SupplierInvoice.php:605 SupplierTransInquiry.php:106 SuppLoginSetup.php:33
#: SuppPriceList.php:222 SuppPriceList.php:295
@@ -4965,7 +4965,7 @@
msgid "The SQL that was used to insert the contract item failed was"
msgstr ""
-#: Contracts.php:492 Stocks.php:605 Z_ImportStocks.php:245
+#: Contracts.php:492 Stocks.php:605 Z_ImportStocks.php:238
msgid "The locations for the item"
msgstr ""
@@ -4973,15 +4973,15 @@
#: SupplierCredit.php:815 SupplierCredit.php:1202 SupplierCredit.php:1256
#: SupplierCredit.php:1284 SupplierInvoice.php:1140 SupplierInvoice.php:1198
#: SupplierInvoice.php:1563 SupplierInvoice.php:1798 SupplierInvoice.php:1827
-#: Suppliers.php:573 Z_ImportStocks.php:245
+#: Suppliers.php:573 Z_ImportStocks.php:238
msgid "could not be added because"
msgstr ""
-#: Contracts.php:493 Stocks.php:606 Z_ImportStocks.php:246
+#: Contracts.php:493 Stocks.php:606 Z_ImportStocks.php:239
msgid "NB Locations records can be added by opening the utility page"
msgstr ""
-#: Contracts.php:493 Stocks.php:606 Z_ImportStocks.php:246
+#: Contracts.php:493 Stocks.php:606 Z_ImportStocks.php:239
msgid "The SQL that was used to add the location records that failed was"
msgstr ""
@@ -5047,8 +5047,8 @@
msgid "The customer record selected"
msgstr ""
-#: Contracts.php:715 CounterReturns.php:122 CounterReturns.php:151
-#: CounterReturns.php:1707 CounterSales.php:124 CounterSales.php:158
+#: Contracts.php:715 CounterReturns.php:119 CounterReturns.php:148
+#: CounterReturns.php:1704 CounterSales.php:124 CounterSales.php:158
#: CounterSales.php:2113 CounterSales.php:2298 DeliveryDetails.php:147
#: InternalStockRequest.php:663 PO_Header.php:406 PO_Header.php:480
#: SelectCreditItems.php:180 SelectOrderItems.php:405 SelectOrderItems.php:452
@@ -5061,7 +5061,7 @@
msgid "cannot be retrieved because"
msgstr ""
-#: Contracts.php:716 CounterReturns.php:123 CounterSales.php:125
+#: Contracts.php:716 CounterReturns.php:120 CounterSales.php:125
#: SelectOrderItems.php:406 SpecialOrder.php:93
msgid "The SQL used to retrieve the customer details and failed was"
msgstr ""
@@ -5167,7 +5167,7 @@
#: PricesByCost.php:244 ReorderLevelLocation.php:172 ReorderLevel.php:286
#: SalesCategoryPeriodInquiry.php:164 SalesTopItemsInquiry.php:221
#: SpecialOrder.php:697 StockDispatch.php:447 Stocks.php:888
-#: SuppPriceList.php:237 SuppPriceList.php:299
+#: SuppPriceList.php:237 SuppPriceList.php:299 Z_ItemsWithoutPicture.php:31
#: includes/PDFInventoryValnPageHeader.inc:32
#: includes/PDFInventoryValnPageHeader.inc:38
msgid "Category"
@@ -5215,7 +5215,7 @@
msgid "Required Date"
msgstr ""
-#: Contracts.php:923 CounterReturns.php:784 CounterSales.php:872
+#: Contracts.php:923 CounterReturns.php:781 CounterSales.php:872
#: DeliveryDetails.php:1062 OrderDetails.php:79 RecurringSalesOrders.php:415
msgid "Customer Reference"
msgstr ""
@@ -5350,17 +5350,17 @@
msgid "To Existing Stock ID"
msgstr ""
-#: CounterReturns.php:14
+#: CounterReturns.php:11
msgid "Counter Returns"
msgstr ""
-#: CounterReturns.php:80 CounterSales.php:82
+#: CounterReturns.php:77 CounterSales.php:82
msgid ""
"Your user account does not have a valid default inventory location set up. "
"Please see the system administrator to modify your user account."
msgstr ""
-#: CounterReturns.php:87 CounterSales.php:89
+#: CounterReturns.php:84 CounterSales.php:89
msgid ""
"To use this script it is first necessary to define a cash sales customer for "
"the location that is your default location. The default cash sale customer "
@@ -5369,163 +5369,163 @@
"customer entered."
msgstr ""
-#: CounterReturns.php:122 CounterSales.php:124 SelectOrderItems.php:405
+#: CounterReturns.php:119 CounterSales.php:124 SelectOrderItems.php:405
msgid "The details of the customer selected"
msgstr ""
-#: CounterReturns.php:151 CounterSales.php:158 DeliveryDetails.php:147
+#: CounterReturns.php:148 CounterSales.php:158 DeliveryDetails.php:147
#: SelectCreditItems.php:180 SelectOrderItems.php:452 SelectOrderItems.php:575
msgid "The customer branch record of the customer selected"
msgstr ""
-#: CounterReturns.php:152 CounterSales.php:159 DeliveryDetails.php:148
+#: CounterReturns.php:149 CounterSales.php:159 DeliveryDetails.php:148
#: SelectCreditItems.php:181 SelectOrderItems.php:453 SelectOrderItems.php:576
msgid "SQL used to retrieve the branch details was"
msgstr ""
-#: CounterReturns.php:157 CounterSales.php:164 DeliveryDetails.php:152
+#: CounterReturns.php:154 CounterSales.php:164 DeliveryDetails.php:152
#: SelectOrderItems.php:458
msgid "The branch details for branch code"
msgstr ""
-#: CounterReturns.php:157 CounterSales.php:164 DeliveryDetails.php:152
+#: CounterReturns.php:154 CounterSales.php:164 DeliveryDetails.php:152
#: SelectOrderItems.php:458
msgid "against customer code"
msgstr ""
-#: CounterReturns.php:157 CounterSales.php:164 DeliveryDetails.php:152
+#: CounterReturns.php:154 CounterSales.php:164 DeliveryDetails.php:152
#: GLAccountCSV.php:184 GLAccountCSV.php:213 GLAccountInquiry.php:202
#: GLAccountInquiry.php:240 GLAccountReport.php:115 SelectOrderItems.php:458
msgid "could not be retrieved"
msgstr ""
-#: CounterReturns.php:157 CounterSales.php:164 DeliveryDetails.php:152
+#: CounterReturns.php:154 CounterSales.php:164 DeliveryDetails.php:152
#: SelectOrderItems.php:458
msgid "Check the set up of the customer and branch"
msgstr ""
-#: CounterReturns.php:160 CounterSales.php:167 DeliveryDetails.php:155
+#: CounterReturns.php:157 CounterSales.php:167 DeliveryDetails.php:155
#: SelectOrderItems.php:461
msgid "The SQL that failed to get the branch details was"
msgstr ""
-#: CounterReturns.php:192
+#: CounterReturns.php:189
msgid "This return has been cancelled as requested"
msgstr ""
-#: CounterReturns.php:193 CounterReturns.php:1592
+#: CounterReturns.php:190 CounterReturns.php:1589
msgid "Start a new Counter Return"
msgstr ""
-#: CounterReturns.php:199 CounterReturns.php:200 CounterReturns.php:1446
-#: CounterReturns.php:1465
+#: CounterReturns.php:196 CounterReturns.php:197 CounterReturns.php:1443
+#: CounterReturns.php:1462
msgid "Counter Return"
msgstr ""
-#: CounterReturns.php:200 CounterSales.php:227
+#: CounterReturns.php:197 CounterSales.php:227
msgid "inventory"
msgstr ""
-#: CounterReturns.php:200 CounterSales.php:227
+#: CounterReturns.php:197 CounterSales.php:227
msgid "all amounts in"
msgstr ""
-#: CounterReturns.php:207 CounterSales.php:234
+#: CounterReturns.php:204 CounterSales.php:234
msgid "Item description has been used in search"
msgstr ""
-#: CounterReturns.php:209 CounterSales.php:236
+#: CounterReturns.php:206 CounterSales.php:236
msgid "Item Code has been used in search"
msgstr ""
-#: CounterReturns.php:211 CounterSales.php:238 InternalStockRequest.php:368
+#: CounterReturns.php:208 CounterSales.php:238 InternalStockRequest.php:368
#: SelectOrderItems.php:762
msgid "Stock Category has been used in search"
msgstr ""
-#: CounterReturns.php:328 CounterSales.php:349 InternalStockRequest.php:497
+#: CounterReturns.php:325 CounterSales.php:349 InternalStockRequest.php:497
#: SelectOrderItems.php:867 WorkOrderEntry.php:182 WorkOrderIssue.php:469
msgid "The SQL used to get the part selection was"
msgstr ""
-#: CounterReturns.php:332 CounterSales.php:353 InternalStockRequest.php:501
+#: CounterReturns.php:329 CounterSales.php:353 InternalStockRequest.php:501
#: SelectOrderItems.php:872 WorkOrderEntry.php:186 WorkOrderIssue.php:473
msgid "There are no products available meeting the criteria specified"
msgstr ""
-#: CounterReturns.php:406 CounterReturns.php:523 CounterReturns.php:568
+#: CounterReturns.php:403 CounterReturns.php:520 CounterReturns.php:565
#: CounterSales.php:442 CounterSales.php:557 CounterSales.php:603
#: CounterSales.php:655 SelectOrderItems.php:956 SelectOrderItems.php:1244
-#: SelectOrderItems.php:1293 StockCounts.php:56
+#: SelectOrderItems.php:1293 StockCounts.php:54
msgid ""
"Could not determine if the part being ordered was a kitset or not because"
msgstr ""
-#: CounterReturns.php:407 CounterReturns.php:524 CounterSales.php:443
-#: CounterSales.php:558 SelectOrderItems.php:957 StockCounts.php:57
+#: CounterReturns.php:404 CounterReturns.php:521 CounterSales.php:443
+#: CounterSales.php:558 SelectOrderItems.php:957 StockCounts.php:55
msgid ""
"The sql that was used to determine if the part being ordered was a kitset or "
"not was "
msgstr ""
-#: CounterReturns.php:412
+#: CounterReturns.php:409
msgid ""
"could not be retrieved from the database and has not been added to the return"
msgstr ""
-#: CounterReturns.php:422 CounterReturns.php:535 CounterReturns.php:584
-#: CounterReturns.php:635 CounterSales.php:458 CounterSales.php:569
+#: CounterReturns.php:419 CounterReturns.php:532 CounterReturns.php:581
+#: CounterReturns.php:632 CounterSales.php:458 CounterSales.php:569
#: CounterSales.php:619 CounterSales.php:671 SelectOrderItems.php:972
#: SelectOrderItems.php:1260 SelectOrderItems.php:1309
msgid "Could not retrieve kitset components from the database because"
msgstr ""
-#: CounterReturns.php:435
+#: CounterReturns.php:432
msgid ""
"Phantom assemblies cannot be returned, these items exist only as bills of "
"materials used in other manufactured items. The following item has not been "
"added to the return:"
msgstr ""
-#: CounterReturns.php:437
+#: CounterReturns.php:434
msgid ""
"The system does not currently cater for counter returns of lot controlled or "
"serialised items"
msgstr ""
-#: CounterReturns.php:439
+#: CounterReturns.php:436
msgid "Only items entered with a positive quantity can be added to the return"
msgstr ""
-#: CounterReturns.php:473 CounterSales.php:508 SelectOrderItems.php:1117
+#: CounterReturns.php:470 CounterSales.php:508 SelectOrderItems.php:1117
msgid "Recalculated the price from the GP % entered - the GP % was"
msgstr ""
-#: CounterReturns.php:492
+#: CounterReturns.php:489
msgid ""
"The item could not be updated because you are attempting to set the quantity "
"returned to less than 0 or the price less than 0 or the discount more than "
"100% or less than 0%"
msgstr ""
-#: CounterReturns.php:619
+#: CounterReturns.php:616
msgid ""
"Could not determine if the part being returned was a kitset or not because"
msgstr ""
-#: CounterReturns.php:676 CounterSales.php:751 PricesByCost.php:158
+#: CounterReturns.php:673 CounterSales.php:751 PricesByCost.php:158
#: SelectOrderItems.php:1385
msgid "GP %"
msgstr ""
-#: CounterReturns.php:677 CounterSales.php:753 PrintCustTrans.php:865
+#: CounterReturns.php:674 CounterSales.php:753...
[truncated message content] |
|
From: <dai...@us...> - 2012-12-29 04:00:57
|
Revision: 5784
http://sourceforge.net/p/web-erp/reponame/5784
Author: daintree
Date: 2012-12-29 04:00:43 +0000 (Sat, 29 Dec 2012)
Log Message:
-----------
ProperCase variable names
Modified Paths:
--------------
trunk/AccountGroups.php
trunk/AccountSections.php
trunk/AddCustomerContacts.php
trunk/AddCustomerNotes.php
trunk/AddCustomerTypeNotes.php
trunk/AgedDebtors.php
trunk/AgedSuppliers.php
trunk/Areas.php
trunk/AuditTrail.php
trunk/BOMExtendedQty.php
trunk/BOMIndented.php
trunk/BOMIndentedReverse.php
trunk/BOMInquiry.php
trunk/BOMListing.php
trunk/BOMs.php
trunk/BackupDatabase.php
trunk/BankAccounts.php
trunk/BankMatching.php
trunk/BankReconciliation.php
trunk/COGSGLPostings.php
trunk/CompanyPreferences.php
trunk/ConfirmDispatchControlled_Invoice.php
trunk/ConfirmDispatch_Invoice.php
trunk/ContractBOM.php
trunk/ContractCosting.php
trunk/ContractOtherReqts.php
trunk/Contracts.php
trunk/CopyBOM.php
trunk/CounterReturns.php
trunk/CounterSales.php
trunk/CreditItemsControlled.php
trunk/CreditStatus.php
trunk/Credit_Invoice.php
trunk/Currencies.php
trunk/CustEDISetup.php
trunk/CustLoginSetup.php
trunk/CustWhereAlloc.php
trunk/CustomerAllocations.php
trunk/CustomerBranches.php
trunk/CustomerInquiry.php
trunk/CustomerPurchases.php
trunk/CustomerReceipt.php
trunk/CustomerTransInquiry.php
trunk/CustomerTypes.php
trunk/Customers.php
trunk/DailyBankTransactions.php
trunk/DailySalesInquiry.php
trunk/DebtorsAtPeriodEnd.php
trunk/DeliveryDetails.php
trunk/Departments.php
trunk/DiscountCategories.php
trunk/DiscountMatrix.php
trunk/EDIMessageFormat.php
trunk/EDIProcessOrders.php
trunk/EmailConfirmation.php
trunk/EmailCustTrans.php
trunk/ExchangeRateTrend.php
trunk/FTP_RadioBeacon.php
trunk/Factors.php
trunk/FixedAssetCategories.php
trunk/FixedAssetDepreciation.php
trunk/FixedAssetItems.php
trunk/FixedAssetLocations.php
trunk/FixedAssetRegister.php
trunk/FixedAssetTransfer.php
trunk/FormDesigner.php
trunk/FreightCosts.php
trunk/GLAccountCSV.php
trunk/GLAccountInquiry.php
trunk/GLAccountReport.php
trunk/GLAccounts.php
trunk/GLBalanceSheet.php
trunk/GLBudgets.php
trunk/GLCodesInquiry.php
trunk/GLJournal.php
trunk/GLJournalInquiry.php
trunk/GLProfit_Loss.php
trunk/GLTagProfit_Loss.php
trunk/GLTags.php
trunk/GLTransInquiry.php
trunk/GLTrialBalance.php
trunk/GeocodeSetup.php
trunk/GetStockImage.php
trunk/GoodsReceived.php
trunk/GoodsReceivedControlled.php
trunk/InternalStockCategoriesByRole.php
trunk/InternalStockRequest.php
trunk/InternalStockRequestAuthorisation.php
trunk/InternalStockRequestFulfill.php
trunk/InventoryPlanning.php
trunk/InventoryPlanningPrefSupplier.php
trunk/InventoryQuantities.php
trunk/InventoryValuation.php
trunk/Labels.php
trunk/Locations.php
trunk/Logout.php
trunk/MRP.php
trunk/MRPCalendar.php
trunk/MRPCreateDemands.php
trunk/MRPDemandTypes.php
trunk/MRPDemands.php
trunk/MRPPlannedPurchaseOrders.php
trunk/MRPPlannedWorkOrders.php
trunk/MRPReport.php
trunk/MRPReschedules.php
trunk/MRPShortages.php
trunk/MailInventoryValuation.php
trunk/NoSalesItems.php
trunk/OffersReceived.php
trunk/OrderDetails.php
trunk/OutstandingGRNs.php
trunk/PDFBankingSummary.php
trunk/PDFChequeListing.php
trunk/PDFCustTransListing.php
trunk/PDFCustomerList.php
trunk/PDFDIFOT.php
trunk/PDFDeliveryDifferences.php
trunk/PDFGLJournal.php
trunk/PDFGrn.php
trunk/PDFLowGP.php
trunk/PDFOrderStatus.php
trunk/PDFOrdersInvoiced.php
trunk/PDFPeriodStockTransListing.php
trunk/PDFPickingList.php
trunk/PDFPriceList.php
trunk/PDFPrintLabel.php
trunk/PDFQuotation.php
trunk/PDFQuotationPortrait.php
trunk/PDFRemittanceAdvice.php
trunk/PDFStockCheckComparison.php
trunk/PDFStockLocTransfer.php
trunk/PDFStockNegatives.php
trunk/PDFStockTransfer.php
trunk/PDFSuppTransListing.php
trunk/POReport.php
trunk/PO_AuthorisationLevels.php
trunk/PO_AuthoriseMyOrders.php
trunk/PO_Header.php
trunk/PO_Items.php
trunk/PO_OrderDetails.php
trunk/PO_PDFPurchOrder.php
trunk/PO_SelectOSPurchOrder.php
trunk/PO_SelectPurchOrder.php
trunk/PageSecurity.php
trunk/PaymentAllocations.php
trunk/PaymentMethods.php
trunk/PaymentTerms.php
trunk/Payments.php
trunk/PcAssignCashToTab.php
trunk/PcAuthorizeExpenses.php
trunk/PcClaimExpensesFromTab.php
trunk/PcExpenses.php
trunk/PcExpensesTypeTab.php
trunk/PcReportTab.php
trunk/PcTabs.php
trunk/PcTypeTabs.php
trunk/PeriodsInquiry.php
trunk/Prices.php
trunk/PricesBasedOnMarkUp.php
trunk/PricesByCost.php
trunk/Prices_Customer.php
trunk/PrintCustOrder.php
trunk/PrintCustOrder_generic.php
trunk/PrintCustStatements.php
trunk/PrintCustTrans.php
trunk/PrintCustTransPortrait.php
trunk/PurchData.php
trunk/RecurringSalesOrders.php
trunk/RecurringSalesOrdersProcess.php
trunk/ReorderLevel.php
trunk/ReorderLevelLocation.php
trunk/ReprintGRN.php
trunk/ReverseGRN.php
trunk/SMTPServer.php
trunk/SalesAnalReptCols.php
trunk/SalesAnalRepts.php
trunk/SalesAnalysis_UserDefined.php
trunk/SalesByTypePeriodInquiry.php
trunk/SalesCategories.php
trunk/SalesCategoryPeriodInquiry.php
trunk/SalesGLPostings.php
trunk/SalesGraph.php
trunk/SalesInquiry.php
trunk/SalesPeople.php
trunk/SalesTopItemsInquiry.php
trunk/SalesTypes.php
trunk/SecurityTokens.php
trunk/SelectAsset.php
trunk/SelectCompletedOrder.php
trunk/SelectContract.php
trunk/SelectCreditItems.php
trunk/SelectCustomer.php
trunk/SelectGLAccount.php
trunk/SelectOrderItems.php
trunk/SelectProduct.php
trunk/SelectRecurringSalesOrder.php
trunk/SelectSalesOrder.php
trunk/SelectSupplier.php
trunk/SelectWorkOrder.php
trunk/ShipmentCosting.php
trunk/Shipments.php
trunk/Shippers.php
trunk/Shipt_Select.php
trunk/ShiptsList.php
trunk/SpecialOrder.php
trunk/StockAdjustments.php
trunk/StockAdjustmentsControlled.php
trunk/StockCategories.php
trunk/StockCheck.php
trunk/StockCostUpdate.php
trunk/StockCounts.php
trunk/StockDispatch.php
trunk/StockLocMovements.php
trunk/StockLocStatus.php
trunk/StockLocTransfer.php
trunk/StockLocTransferReceive.php
trunk/StockMovements.php
trunk/StockQties_csv.php
trunk/StockQuantityByDate.php
trunk/StockReorderLevel.php
trunk/StockSerialItemResearch.php
trunk/StockSerialItems.php
trunk/StockStatus.php
trunk/StockTransferControlled.php
trunk/StockTransfers.php
trunk/StockUsage.php
trunk/StockUsageGraph.php
trunk/Stocks.php
trunk/SuppContractChgs.php
trunk/SuppCreditGRNs.php
trunk/SuppFixedAssetChgs.php
trunk/SuppInvGRNs.php
trunk/SuppLoginSetup.php
trunk/SuppPaymentRun.php
trunk/SuppPriceList.php
trunk/SuppShiptChgs.php
trunk/SuppTransGLAnalysis.php
trunk/SupplierAllocations.php
trunk/SupplierBalsAtPeriodEnd.php
trunk/SupplierContacts.php
trunk/SupplierCredit.php
trunk/SupplierInquiry.php
trunk/SupplierInvoice.php
trunk/SupplierPriceList.php
trunk/SupplierTenderCreate.php
trunk/SupplierTenders.php
trunk/SupplierTransInquiry.php
trunk/SupplierTypes.php
trunk/Suppliers.php
trunk/SystemParameters.php
trunk/Tax.php
trunk/TaxAuthorities.php
trunk/TaxAuthorityRates.php
trunk/TaxCategories.php
trunk/TaxGroups.php
trunk/TaxProvinces.php
trunk/TopItems.php
trunk/UnitsOfMeasure.php
trunk/UpgradeDatabase.php
trunk/UserSettings.php
trunk/WOSerialNos.php
trunk/WWW_Access.php
trunk/WWW_Users.php
trunk/WhereUsedInquiry.php
trunk/WorkCentres.php
trunk/WorkOrderCosting.php
trunk/WorkOrderEntry.php
trunk/WorkOrderIssue.php
trunk/WorkOrderReceive.php
trunk/WorkOrderStatus.php
trunk/Z_BottomUpCosts.php
trunk/Z_ChangeBranchCode.php
trunk/Z_ChangeCustomerCode.php
trunk/Z_ChangeLocationCode.php
trunk/Z_ChangeStockCategory.php
trunk/Z_ChangeStockCode.php
trunk/Z_ChangeSupplierCode.php
trunk/Z_CheckAllocationsFrom.php
trunk/Z_CheckAllocs.php
trunk/Z_CheckDebtorsControl.php
trunk/Z_CheckGLTransBalance.php
trunk/Z_CreateChartDetails.php
trunk/Z_CreateCompany.php
trunk/Z_CreateCompanyTemplateFile.php
trunk/Z_CurrencyDebtorsBalances.php
trunk/Z_CurrencySuppliersBalances.php
trunk/Z_DataExport.php
trunk/Z_DeleteCreditNote.php
trunk/Z_DeleteInvoice.php
trunk/Z_DeleteOldPrices.php
trunk/Z_DeleteSalesTransActions.php
trunk/Z_DescribeTable.php
trunk/Z_ImportChartOfAccounts.php
trunk/Z_ImportFixedAssets.php
trunk/Z_ImportGLAccountGroups.php
trunk/Z_ImportGLAccountSections.php
trunk/Z_ImportPartCodes.php
trunk/Z_ImportStocks.php
trunk/Z_ItemsWithoutPicture.php
trunk/Z_MakeNewCompany.php
trunk/Z_MakeStockLocns.php
trunk/Z_ReApplyCostToSA.php
trunk/Z_RePostGLFromPeriod.php
trunk/Z_ReverseSuppPaymentRun.php
trunk/Z_SalesIntegrityCheck.php
trunk/Z_UpdateChartDetailsBFwd.php
trunk/Z_Upgrade3.10.php
trunk/Z_Upgrade_3.01-3.02.php
trunk/Z_Upgrade_3.04-3.05.php
trunk/Z_Upgrade_3.05-3.06.php
trunk/Z_Upgrade_3.07-3.08.php
trunk/Z_Upgrade_3.08-3.09.php
trunk/Z_Upgrade_3.09-3.10.php
trunk/Z_Upgrade_3.10-3.11.php
trunk/Z_Upgrade_3.11-4.00.php
trunk/Z_UploadForm.php
trunk/Z_UploadResult.php
trunk/Z_poAddLanguage.php
trunk/Z_poAdmin.php
trunk/Z_poEditLangHeader.php
trunk/Z_poEditLangModule.php
trunk/Z_poEditLangRemaining.php
trunk/Z_poRebuildDefault.php
trunk/config.distrib.php
trunk/doc/Manual/ManualAPIFunctions.php
trunk/geo_displaymap_customers.php
trunk/geo_displaymap_suppliers.php
trunk/geocode.php
trunk/geocode_genxml_customers.php
trunk/geocode_genxml_suppliers.php
trunk/includes/Add_SerialItems.php
trunk/includes/ConstructSQLForUserDefinedSalesReport.inc
trunk/includes/DefineLabelClass.php
trunk/includes/InputSerialItemsFile.php
trunk/includes/PDFPaymentRun_PymtFooter.php
trunk/includes/PDFSalesAnalysis.inc
trunk/includes/footer.inc
trunk/includes/header.inc
trunk/includes/phplot/phplot.php
trunk/includes/session.inc
trunk/includes/tcpdf/tcpdf.php
trunk/index.php
trunk/install/save.php
trunk/reportwriter/FormMaker.php
trunk/reportwriter/ReportMaker.php
trunk/reportwriter/admin/ReportCreator.php
trunk/reportwriter/install/ReportListForm.php
trunk/reportwriter/install/ReportListLinks.php
Modified: trunk/AccountGroups.php
===================================================================
--- trunk/AccountGroups.php 2012-12-29 00:48:48 UTC (rev 5783)
+++ trunk/AccountGroups.php 2012-12-29 04:00:43 UTC (rev 5784)
@@ -4,7 +4,7 @@
include('includes/session.inc');
-$title = _('Account Groups');
+$Title = _('Account Groups');
$ViewTopic= 'GeneralLedger';
$BookMark = 'AccountGroups';
@@ -259,7 +259,7 @@
$DbgMsg = _('The sql that was used to retrieve the account group information was ');
$ErrMsg = _('Could not get account groups because');
$result = DB_query($sql,$db,$ErrMsg,$DbgMsg);
- echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'<br /></p>';
+ echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'<br /></p>';
echo '<table class="selection">
<tr>
Modified: trunk/AccountSections.php
===================================================================
--- trunk/AccountSections.php 2012-12-29 00:48:48 UTC (rev 5783)
+++ trunk/AccountSections.php 2012-12-29 04:00:43 UTC (rev 5784)
@@ -4,7 +4,7 @@
include('includes/session.inc');
-$title = _('Account Sections');
+$Title = _('Account Sections');
include('includes/header.inc');
@@ -166,7 +166,7 @@
$ErrMsg = _('Could not get account group sections because');
$result = DB_query($sql,$db,$ErrMsg);
- echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'<br /></p>';
+ echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'<br /></p>';
echo '<table class="selection">
<tr>
Modified: trunk/AddCustomerContacts.php
===================================================================
--- trunk/AddCustomerContacts.php 2012-12-29 00:48:48 UTC (rev 5783)
+++ trunk/AddCustomerContacts.php 2012-12-29 04:00:43 UTC (rev 5784)
@@ -3,7 +3,7 @@
/* $Id$*/
include('includes/session.inc');
-$title = _('Customer Contacts');
+$Title = _('Customer Contacts');
include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
@@ -17,14 +17,14 @@
} elseif (isset($_GET['DebtorNo'])){
$DebtorNo = $_GET['DebtorNo'];
}
-echo '<a href="' . $rootpath . '/Customers.php?DebtorNo=' . $DebtorNo . '">' . _('Back to Customers') . '</a><br />';
+echo '<a href="' . $RootPath . '/Customers.php?DebtorNo=' . $DebtorNo . '">' . _('Back to Customers') . '</a><br />';
$SQLname="SELECT name FROM debtorsmaster WHERE debtorno='" . $DebtorNo . "'";
$Result = DB_query($SQLname,$db);
$row = DB_fetch_array($Result);
if (!isset($_GET['Id'])) {
- echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . _('Contacts for Customer') . ': <b>' . htmlspecialchars($row['name'], ENT_QUOTES, 'UTF-8') . '</b></p><br />';
+ echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . _('Contacts for Customer') . ': <b>' . htmlspecialchars($row['name'], ENT_QUOTES, 'UTF-8') . '</b></p><br />';
} else {
- echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . _('Edit contact for'). ': <b>' . htmlspecialchars($row['name'], ENT_QUOTES, 'UTF-8') . '</b></p><br />';
+ echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . _('Edit contact for'). ': <b>' . htmlspecialchars($row['name'], ENT_QUOTES, 'UTF-8') . '</b></p><br />';
}
if ( isset($_POST['submit']) ) {
Modified: trunk/AddCustomerNotes.php
===================================================================
--- trunk/AddCustomerNotes.php 2012-12-29 00:48:48 UTC (rev 5783)
+++ trunk/AddCustomerNotes.php 2012-12-29 04:00:43 UTC (rev 5784)
@@ -3,7 +3,7 @@
/* $Id$*/
include('includes/session.inc');
-$title = _('Customer Notes');
+$Title = _('Customer Notes');
include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
@@ -18,7 +18,7 @@
$DebtorNo = $_GET['DebtorNo'];
}
-echo '<a href="' . $rootpath . '/SelectCustomer.php?DebtorNo=' . $DebtorNo . '">' . _('Back to Select Customer') . '</a>
+echo '<a href="' . $RootPath . '/SelectCustomer.php?DebtorNo=' . $DebtorNo . '">' . _('Back to Select Customer') . '</a>
<br />';
if ( isset($_POST['submit']) ) {
@@ -98,7 +98,7 @@
WHERE debtorno='".$DebtorNo."'";
$Result = DB_query($SQLname,$db);
$row = DB_fetch_array($Result);
- echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . _('Notes for Customer').': <b>' .$row['name'].'</b></p>
+ echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . _('Notes for Customer').': <b>' .$row['name'].'</b></p>
<br />';
$sql = "SELECT noteid,
Modified: trunk/AddCustomerTypeNotes.php
===================================================================
--- trunk/AddCustomerTypeNotes.php 2012-12-29 00:48:48 UTC (rev 5783)
+++ trunk/AddCustomerTypeNotes.php 2012-12-29 04:00:43 UTC (rev 5784)
@@ -2,7 +2,7 @@
/* $Id$*/
include('includes/session.inc');
-$title = _('Customer Type (Group) Notes');
+$Title = _('Customer Type (Group) Notes');
include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
@@ -16,7 +16,7 @@
} elseif (isset($_GET['DebtorType'])){
$DebtorType = $_GET['DebtorType'];
}
-echo '<a href="' . $rootpath . '/SelectCustomer.php?DebtorType='.$DebtorType.'">' . _('Back to Select Customer') . '</a><br />';
+echo '<a href="' . $RootPath . '/SelectCustomer.php?DebtorType='.$DebtorType.'">' . _('Back to Select Customer') . '</a><br />';
if (isset($_POST['submit']) ) {
@@ -91,7 +91,7 @@
$SQLname="SELECT typename from debtortype where typeid='".$DebtorType."'";
$result = DB_query($SQLname,$db);
$myrow = DB_fetch_array($result);
- echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/customer.png" title="' . _('Search') . '" alt="" />' . _('Notes for Customer Type').': <b>' .$myrow['typename'].'</b></p>
+ echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/customer.png" title="' . _('Search') . '" alt="" />' . _('Notes for Customer Type').': <b>' .$myrow['typename'].'</b></p>
<br />';
$sql = "SELECT noteid,
Modified: trunk/AgedDebtors.php
===================================================================
--- trunk/AgedDebtors.php 2012-12-29 00:48:48 UTC (rev 5783)
+++ trunk/AgedDebtors.php 2012-12-29 04:00:43 UTC (rev 5784)
@@ -261,10 +261,10 @@
$CustomerResult = DB_query($SQL,$db,'','',False,False); /*dont trap errors handled below*/
if (DB_error_no($db) !=0) {
- $title = _('Aged Customer Account Analysis') . ' - ' . _('Problem Report') . '.... ';
+ $Title = _('Aged Customer Account Analysis') . ' - ' . _('Problem Report') . '.... ';
include('includes/header.inc');
prnMsg(_('The customer details 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>';
+ echo '<br /><a href="' . $RootPath . '/index.php">' . _('Back to the menu') . '</a>';
if ($debug==1){
echo '<br />' . $SQL;
}
@@ -360,10 +360,10 @@
$DetailResult = DB_query($sql,$db,'','',False,False); /*Dont trap errors */
if (DB_error_no($db) !=0) {
- $title = _('Aged Customer Account Analysis') . ' - ' . _('Problem Report') . '....';
+ $Title = _('Aged Customer Account Analysis') . ' - ' . _('Problem Report') . '....';
include('includes/header.inc');
prnMsg(_('The details of outstanding transactions for customer') . ' - ' . $AgedAnalysis['debtorno'] . ' ' . _('could not be retrieved because') . ' - ' . DB_error_msg($db),'error');
- echo '<br /><a href="' . $rootpath . '/index.php">' . _('Back to the menu') . '</a>';
+ echo '<br /><a href="' . $RootPath . '/index.php">' . _('Back to the menu') . '</a>';
if ($debug==1){
echo '<br />' . _('The SQL that failed was') . '<br />' . $sql;
}
@@ -425,10 +425,10 @@
$LeftOvers = $pdf->addTextWrap(460,$YPos,60,$FontSize,$DisplayTotOverdue2,'right');
if ($ListCount == 0) {
- $title = _('Aged Customer Account Analysis') . ' - ' . _('Problem Report') . '....';
+ $Title = _('Aged Customer Account Analysis') . ' - ' . _('Problem Report') . '....';
include('includes/header.inc');
prnMsg(_('There are no customers with balances meeting the criteria specified to list'),'info');
- echo '<br /><a href="' . $rootpath . '/index.php">' . _('Back to the menu') . '</a>';
+ echo '<br /><a href="' . $RootPath . '/index.php">' . _('Back to the menu') . '</a>';
include('includes/footer.inc');
exit;
} else {
@@ -438,10 +438,10 @@
} else { /*The option to print PDF was not hit */
- $title=_('Aged Debtor Analysis');
+ $Title=_('Aged Debtor Analysis');
include('includes/header.inc');
- echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'</p><br />';
+ echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'</p><br />';
if ((!isset($_POST['FromCriteria']) or !isset($_POST['ToCriteria']))) {
Modified: trunk/AgedSuppliers.php
===================================================================
--- trunk/AgedSuppliers.php 2012-12-29 00:48:48 UTC (rev 5783)
+++ trunk/AgedSuppliers.php 2012-12-29 04:00:43 UTC (rev 5784)
@@ -105,10 +105,10 @@
$SupplierResult = DB_query($SQL,$db,'','',False,False); /*dont trap errors */
if (DB_error_no($db) !=0) {
- $title = _('Aged Supplier Account Analysis') . ' - ' . _('Problem Report') ;
+ $Title = _('Aged Supplier Account Analysis') . ' - ' . _('Problem Report') ;
include('includes/header.inc');
prnMsg(_('The Supplier details 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>';
+ echo '<br /><a href="' . $RootPath . '/index.php">' . _('Back to the menu') . '</a>';
if ($debug==1){
echo '<br />' . $SQL;
}
@@ -192,10 +192,10 @@
$DetailResult = DB_query($sql,$db,'','',False,False); /*dont trap errors - trapped below*/
if (DB_error_no($db) !=0) {
- $title = _('Aged Supplier Account Analysis - Problem Report');
+ $Title = _('Aged Supplier Account Analysis - Problem Report');
include('includes/header.inc');
prnMsg(_('The details of outstanding transactions for Supplier') . ' - ' . $AgedAnalysis['supplierid'] . ' ' . _('could not be retrieved because') . ' - ' . DB_error_msg($db),'error');
- echo '<br /><a href="' . $rootpath . '/index.php">' . _('Back to the menu') . '</a>';
+ echo '<br /><a href="' . $RootPath . '/index.php">' . _('Back to the menu') . '</a>';
if ($debug==1){
echo '<br />' . _('The SQL that failed was') . '<br />' . $sql;
}
@@ -260,7 +260,7 @@
$pdf->line($Page_Width-$Right_Margin, $YPos ,220, $YPos);
if ($ListCount == 0) {
- $title = _('Aged Supplier Analysis');
+ $Title = _('Aged Supplier Analysis');
include('includes/header.inc');
prnMsg(_('There are no results so the PDF is empty'));
include('includes/footer.inc');
@@ -270,10 +270,10 @@
$pdf->__destruct();
} else { /*The option to print PDF was not hit */
- $title = _('Aged Supplier Analysis');
+ $Title = _('Aged Supplier Analysis');
include('includes/header.inc');
- echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'</p><br />';
+ echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'</p><br />';
if (!isset($_POST['FromCriteria']) or !isset($_POST['ToCriteria'])) {
Modified: trunk/Areas.php
===================================================================
--- trunk/Areas.php 2012-12-29 00:48:48 UTC (rev 5783)
+++ trunk/Areas.php 2012-12-29 04:00:43 UTC (rev 5784)
@@ -4,7 +4,7 @@
include('includes/session.inc');
-$title = _('Sales Area Maintenance');
+$Title = _('Sales Area Maintenance');
$ViewTopic= 'CreatingNewSystem';
$BookMark = 'Areas';
include('includes/header.inc');
@@ -141,7 +141,7 @@
FROM areas";
$result = DB_query($sql,$db);
- echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'</p><br />';
+ echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'</p><br />';
echo '<table class="selection">
<tr>
Modified: trunk/AuditTrail.php
===================================================================
--- trunk/AuditTrail.php 2012-12-29 00:48:48 UTC (rev 5783)
+++ trunk/AuditTrail.php 2012-12-29 04:00:43 UTC (rev 5784)
@@ -4,11 +4,11 @@
include('includes/session.inc');
-$title = _('Audit Trail');
+$Title = _('Audit Trail');
include('includes/header.inc');
-echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'</p>';
+echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'</p>';
if (!isset($_POST['FromDate'])){
$_POST['FromDate'] = Date($_SESSION['DefaultDateFormat'],mktime(0,0,0, Date('m')-$_SESSION['MonthsAuditTrail']));
Modified: trunk/BOMExtendedQty.php
===================================================================
--- trunk/BOMExtendedQty.php 2012-12-29 00:48:48 UTC (rev 5783)
+++ trunk/BOMExtendedQty.php 2012-12-29 04:00:43 UTC (rev 5784)
@@ -151,10 +151,10 @@
} // End of while $ComponentCounter > 0
if (DB_error_no($db) !=0) {
- $title = _('Quantity Extended BOM Listing') . ' - ' . _('Problem Report');
+ $Title = _('Quantity Extended BOM Listing') . ' - ' . _('Problem Report');
include('includes/header.inc');
prnMsg( _('The Quantiy Extended BOM Listing 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>';
+ echo '<br /><a href="' .$RootPath .'/index.php">' . _('Back to the menu') . '</a>';
if ($debug==1){
echo '<br />' . $sql;
}
@@ -232,10 +232,10 @@
PrintHeader($pdf,$YPos,$PageNumber,$Page_Height,$Top_Margin,$Left_Margin,$Page_Width,$Right_Margin);
}
if ($ListCount == 0) {
- $title = _('Print Indented BOM Listing Error');
+ $Title = _('Print Indented BOM Listing Error');
include('includes/header.inc');
prnMsg(_('There were no items for the selected assembly'),'error');
- echo '<br /><a href="' . $rootpath . '/index.php">' . _('Back to the menu') . '</a>';
+ echo '<br /><a href="' . $RootPath . '/index.php">' . _('Back to the menu') . '</a>';
include('includes/footer.inc');
exit;
} else {
@@ -245,9 +245,9 @@
} else { /*The option to print PDF was not hit so display form */
- $title=_('Quantity Extended BOM Listing');
+ $Title=_('Quantity Extended BOM Listing');
include('includes/header.inc');
- echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'</p><br />';
+ echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'</p><br />';
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
<div>
Modified: trunk/BOMIndented.php
===================================================================
--- trunk/BOMIndented.php 2012-12-29 00:48:48 UTC (rev 5783)
+++ trunk/BOMIndented.php 2012-12-29 04:00:43 UTC (rev 5784)
@@ -147,10 +147,10 @@
} // End of if $_POST['Levels']
if (DB_error_no($db) !=0) {
- $title = _('Indented BOM Listing') . ' - ' . _('Problem Report');
+ $Title = _('Indented BOM Listing') . ' - ' . _('Problem Report');
include('includes/header.inc');
prnMsg( _('The Indented BOM Listing 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>';
+ echo '<br /><a href="' .$RootPath .'/index.php">' . _('Back to the menu') . '</a>';
if ($debug==1){
echo '<br />' . $sql;
}
@@ -228,10 +228,10 @@
}
if ($ListCount == 0) {
- $title = _('Print Indented BOM Listing Error');
+ $Title = _('Print Indented BOM Listing Error');
include('includes/header.inc');
prnMsg(_('There were no items for the selected assembly'),'error');
- echo '<br /><a href="' . $rootpath . '/index.php">' . _('Back to the menu') . '</a>';
+ echo '<br /><a href="' . $RootPath . '/index.php">' . _('Back to the menu') . '</a>';
include('includes/footer.inc');
exit;
} else {
@@ -241,9 +241,9 @@
} else { /*The option to print PDF was not hit so display form */
- $title=_('Indented BOM Listing');
+ $Title=_('Indented BOM Listing');
include('includes/header.inc');
- echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'</p><br />';
+ echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'</p><br />';
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
<div>
Modified: trunk/BOMIndentedReverse.php
===================================================================
--- trunk/BOMIndentedReverse.php 2012-12-29 00:48:48 UTC (rev 5783)
+++ trunk/BOMIndentedReverse.php 2012-12-29 04:00:43 UTC (rev 5784)
@@ -137,11 +137,11 @@
} // End of while $ComponentCounter > 0
if (DB_error_no($db) !=0) {
- $title = _('Indented BOM Listing') . ' - ' . _('Problem Report');
+ $Title = _('Indented BOM Listing') . ' - ' . _('Problem Report');
include('includes/header.inc');
prnMsg( _('The Indented BOM Listing 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>';
+ <a href="' .$RootPath .'/index.php">' . _('Back to the menu') . '</a>';
if ($debug==1){
echo '<br />' . $sql;
}
@@ -215,10 +215,10 @@
$Right_Margin,$AssemblyDesc);
}
if ($ListCount == 0) {
- $title = _('Print Reverse Indented BOM Listing Error');
+ $Title = _('Print Reverse Indented BOM Listing Error');
include('includes/header.inc');
prnMsg(_('There were no items for the selected component'),'error');
- echo '<br /><a href="' . $rootpath . '/index.php">' . _('Back to the menu') . '</a>';
+ echo '<br /><a href="' . $RootPath . '/index.php">' . _('Back to the menu') . '</a>';
include('includes/footer.inc');
exit;
} else {
@@ -228,11 +228,11 @@
} else { /*The option to print PDF was not hit so display form */
- $title=_('Reverse Indented BOM Listing');
+ $Title=_('Reverse Indented BOM Listing');
include('includes/header.inc');
- echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' .
- _('Search') . '" alt="" />' . ' ' . $title.'</p><br />';
+ echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/maintenance.png" title="' .
+ _('Search') . '" alt="" />' . ' ' . $Title.'</p><br />';
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
<div>
<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
Modified: trunk/BOMInquiry.php
===================================================================
--- trunk/BOMInquiry.php 2012-12-29 00:48:48 UTC (rev 5783)
+++ trunk/BOMInquiry.php 2012-12-29 04:00:43 UTC (rev 5784)
@@ -3,7 +3,7 @@
/* $Id$*/
include('includes/session.inc');
-$title = _('Costed Bill Of Material');
+$Title = _('Costed Bill Of Material');
include('includes/header.inc');
if (isset($_GET['StockID'])){
@@ -182,9 +182,9 @@
if (DB_num_rows($BOMResult)==0){
prnMsg(_('The bill of material for this part is not set up') . ' - ' . _('there are no components defined for it'),'warn');
} else {
- echo '<a href="'.$rootpath.'/index.php">'._('Return to Main Menu').'</a>';
+ echo '<a href="'.$RootPath.'/index.php">'._('Return to Main Menu').'</a>';
echo '<p class="page_title_text">
- <img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'
+ <img src="'.$RootPath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'
</p>
<br />';
@@ -218,7 +218,7 @@
$k++;
}
- $ComponentLink = '<a href="' . $rootpath . '/SelectProduct.php?StockID=' . $myrow['component'] . '">' . $myrow['component'] . '</a>';
+ $ComponentLink = '<a href="' . $RootPath . '/SelectProduct.php?StockID=' . $myrow['component'] . '">' . $myrow['component'] . '</a>';
/* Component Code Description Quantity Std Cost Total Cost */
printf('<td>%s</td>
Modified: trunk/BOMListing.php
===================================================================
--- trunk/BOMListing.php 2012-12-29 00:48:48 UTC (rev 5783)
+++ trunk/BOMListing.php 2012-12-29 04:00:43 UTC (rev 5784)
@@ -38,10 +38,10 @@
$BOMResult = DB_query($SQL,$db,'','',false,false); //dont do error trapping inside DB_query
if (DB_error_no($db) !=0) {
- $title = _('Bill of Materials Listing') . ' - ' . _('Problem Report');
+ $Title = _('Bill of Materials Listing') . ' - ' . _('Problem Report');
include('includes/header.inc');
prnMsg(_('The Bill of Material listing could not be retrieved by the SQL because'),'error');
- echo '<br /><a href="' .$rootpath .'/index.php">' . _('Back to the menu') . '</a>';
+ echo '<br /><a href="' .$RootPath .'/index.php">' . _('Back to the menu') . '</a>';
if ($debug==1){
echo '<br />' . $SQL;
}
@@ -49,7 +49,7 @@
exit;
}
if (DB_num_rows($BOMResult)==0){
- $title = _('Bill of Materials Listing') . ' - ' . _('Problem Report');
+ $Title = _('Bill of Materials Listing') . ' - ' . _('Problem Report');
include('includes/header.inc');
prnMsg( _('The Bill of Material listing has no bills to report on'),'warn');
include('includes/footer.inc');
@@ -104,10 +104,10 @@
} else { /*The option to print PDF was not hit */
- $title=_('Bill Of Material Listing');
+ $Title=_('Bill Of Material Listing');
include('includes/header.inc');
- echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/reports.png" title="' . _('Search') .
- '" alt="" />' . ' ' . $title . '</p><br />';
+ echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/reports.png" title="' . _('Search') .
+ '" alt="" />' . ' ' . $Title . '</p><br />';
if (!isset($_POST['FromCriteria']) || !isset($_POST['ToCriteria'])) {
/*if $FromCriteria is not set then show a form to allow input */
Modified: trunk/BOMs.php
===================================================================
--- trunk/BOMs.php 2012-12-29 00:48:48 UTC (rev 5783)
+++ trunk/BOMs.php 2012-12-29 04:00:43 UTC (rev 5784)
@@ -4,7 +4,7 @@
include('includes/session.inc');
-$title = _('Multi-Level Bill Of Materials Maintenance');
+$Title = _('Multi-Level Bill Of Materials Maintenance');
include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
@@ -228,8 +228,8 @@
if (isset($Select)) { //Parent Stock Item selected so display BOM or edit Component
$SelectedParent = $Select;
unset($Select);// = NULL;
- echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') .
- '" alt="" />' . ' ' . $title.'</p><br />';
+ echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') .
+ '" alt="" />' . ' ' . $Title.'</p><br />';
if (isset($SelectedParent) AND isset($_POST['Submit'])) {
@@ -711,7 +711,7 @@
if (DB_num_rows($result)==0){
prnMsg( _('There are no work centres set up yet') . '. ' . _('Please use the link below to set up work centres') . '.','warn');
- echo '<a href="' . $rootpath . '/WorkCentres.php">' . _('Work Centre Maintenance') . '</a></td></tr></table><br />';
+ echo '<a href="' . $RootPath . '/WorkCentres.php">' . _('Work Centre Maintenance') . '</a></td></tr></table><br />';
include('includes/footer.inc');
exit;
}
@@ -855,7 +855,7 @@
if (!isset($SelectedParent)) {
- echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . $title . '</p>';
+ echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title . '</p>';
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">' .
'<div class="page_help_text">'. _('Select a manufactured part') . ' (' . _('or Assembly or Kit part') . ') ' . _('to maintain the bill of material for using the options below') . '<br />' . _('Parts must be defined in the stock item entry') . '/' . _('modification screen as manufactured') . ', ' . _('kits or assemblies to be available for construction of a bill of material') .'</div>'. '
<div>
Modified: trunk/BackupDatabase.php
===================================================================
--- trunk/BackupDatabase.php 2012-12-29 00:48:48 UTC (rev 5783)
+++ trunk/BackupDatabase.php 2012-12-29 04:00:43 UTC (rev 5784)
@@ -4,7 +4,7 @@
$PageSecurity = 15; //hard coded in case database is old and PageSecurity stuff cannot be retrieved
include('includes/session.inc');
-$title = _('Backup webERP Database');
+$Title = _('Backup webERP Database');
include('includes/header.inc');
if (isset($_GET['BackupFile'])){
@@ -31,7 +31,7 @@
}
} else {
- $BackupFile = $rootpath . '/companies/' . $_SESSION['DatabaseName'] .'/' . _('Backup') . '_' . Date('Y-m-d-H-i-s') . '.sql.gz';
+ $BackupFile = $RootPath . '/companies/' . $_SESSION['DatabaseName'] .'/' . _('Backup') . '_' . Date('Y-m-d-H-i-s') . '.sql.gz';
$Command = 'mysqldump --opt -h' . $host . ' -u' . $dbuser . ' -p' . $dbpassword . ' ' . $_SESSION['DatabaseName'] . '| gzip > ' .
$_SERVER['DOCUMENT_ROOT'] . $BackupFile;
Modified: trunk/BankAccounts.php
===================================================================
--- trunk/BankAccounts.php 2012-12-29 00:48:48 UTC (rev 5783)
+++ trunk/BankAccounts.php 2012-12-29 04:00:43 UTC (rev 5784)
@@ -4,12 +4,12 @@
include('includes/session.inc');
-$title = _('Bank Accounts Maintenance');
+$Title = _('Bank Accounts Maintenance');
$ViewTopic= 'GeneralLedger';
$BookMark = 'BankAccounts';
include('includes/header.inc');
-echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/money_add.png" title="' . _('Bank') . '" alt="" />' . ' ' . $title . '</p>';
+echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/money_add.png" title="' . _('Bank') . '" alt="" />' . ' ' . $Title . '</p>';
echo '<div class="page_help_text">' . _('Update Bank Account details. Account Code is for SWIFT or BSB type Bank Codes. Set Default for Invoices to Currency Default or Fallback Default to print Account details on Invoices (only one account should be set to Fall Back Default).') . '.</div><br />';
if (isset($_GET['SelectedBankAccount'])) {
Modified: trunk/BankMatching.php
===================================================================
--- trunk/BankMatching.php 2012-12-29 00:48:48 UTC (rev 5783)
+++ trunk/BankMatching.php 2012-12-29 04:00:43 UTC (rev 5784)
@@ -3,7 +3,7 @@
/* $Id$*/
include('includes/session.inc');
-$title = _('Bank Account Matching');
+$Title = _('Bank Account Matching');
include('includes/header.inc');
if ((isset($_GET['Type']) AND $_GET['Type']=='Receipts')
@@ -12,7 +12,7 @@
$Type = 'Receipts';
$TypeName =_('Receipts');
echo '<p class="page_title_text">
- <img src="'.$rootpath.'/css/'.$theme.'/images/money_add.png" title="' . _('Bank Matching') . '" alt="" />' . ' ' . _('Bank Account Matching - Receipts') . '
+ <img src="'.$RootPath.'/css/'.$theme.'/images/money_add.png" title="' . _('Bank Matching') . '" alt="" />' . ' ' . _('Bank Account Matching - Receipts') . '
</p>';
} elseif ((isset($_GET['Type']) AND $_GET['Type']=='Payments')
@@ -21,7 +21,7 @@
$Type = 'Payments';
$TypeName =_('Payments');
echo '<p class="page_title_text">
- <img src="'.$rootpath.'/css/'.$theme.'/images/money_delete.png" title="' . _('Bank Matching') . '" alt="" />' . ' ' . _('Bank Account Matching - Payments') . '
+ <img src="'.$RootPath.'/css/'.$theme.'/images/money_delete.png" title="' . _('Bank Matching') . '" alt="" />' . ' ' . _('Bank Account Matching - Payments') . '
</p>';
} else {
@@ -161,7 +161,7 @@
<div class="centre">
<input tabindex="6" type="submit" name="ShowTransactions" value="' . _('Show selected') . ' ' . $TypeName . '" />
<p>
- <a href="' . $rootpath . '/BankReconciliation.php?Account=' . $_POST['BankAccount'] . '">' . _('Show reconciliation') . '</a>
+ <a href="' . $RootPath . '/BankReconciliation.php?Account=' . $_POST['BankAccount'] . '">' . _('Show reconciliation') . '</a>
</p>
</div>';
Modified: trunk/BankReconciliation.php
===================================================================
--- trunk/BankReconciliation.php 2012-12-29 00:48:48 UTC (rev 5783)
+++ trunk/BankReconciliation.php 2012-12-29 04:00:43 UTC (rev 5784)
@@ -4,14 +4,14 @@
include ('includes/session.inc');
-$title = _('Bank Reconciliation');
+$Title = _('Bank Reconciliation');
include('includes/header.inc');
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
echo '<div>';
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 />';
+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'];
@@ -109,7 +109,7 @@
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') . '.';
+ <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 {
@@ -378,18 +378,18 @@
if (isset($_POST['BankAccount'])) {
echo '<div class="centre">
<p>
- <a tabindex="4" href="' . $rootpath . '/BankMatching.php?Type=Payments&Account='.$_POST['BankAccount'].'">' . _('Match off cleared payments') . '</a>
+ <a tabindex="4" href="' . $RootPath . '/BankMatching.php?Type=Payments&Account='.$_POST['BankAccount'].'">' . _('Match off cleared payments') . '</a>
</p>
<br />
- <a tabindex="5" href="' . $rootpath . '/BankMatching.php?Type=Receipts&Account='.$_POST['BankAccount'].'">' . _('Match off cleared deposits') . '</a>
+ <a tabindex="5" href="' . $RootPath . '/BankMatching.php?Type=Receipts&Account='.$_POST['BankAccount'].'">' . _('Match off cleared deposits') . '</a>
</div>';
} else {
echo '<div class="centre">
<p>
- <a tabindex="4" href="' . $rootpath . '/BankMatching.php?Type=Payments">' . _('Match off cleared payments') . '</a>
+ <a tabindex="4" href="' . $RootPath . '/BankMatching.php?Type=Payments">' . _('Match off cleared payments') . '</a>
</p>
<br />
- <a tabindex="5" href="' . $rootpath . '/BankMatching.php?Type=Receipts">' . _('Match off cleared deposits') . '</a>
+ <a tabindex="5" href="' . $RootPath . '/BankMatching.php?Type=Receipts">' . _('Match off cleared deposits') . '</a>
</div>';
}
echo '</div>';
Modified: trunk/COGSGLPostings.php
===================================================================
--- trunk/COGSGLPostings.php 2012-12-29 00:48:48 UTC (rev 5783)
+++ trunk/COGSGLPostings.php 2012-12-29 04:00:43 UTC (rev 5784)
@@ -4,7 +4,7 @@
include('includes/session.inc');
-$title = _('Cost Of Sales GL Postings Set Up');
+$Title = _('Cost Of Sales GL Postings Set Up');
$ViewTopic= 'CreatingNewSystem';
$BookMark = 'SalesGLPostings';
include('includes/header.inc');
@@ -16,7 +16,7 @@
$SelectedCOGSPostingID=$_GET['SelectedCOGSPostingID'];
}
-echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'</p><br />';
+echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'</p><br />';
if (isset($_POST['submit'])) {
Modified: trunk/CompanyPreferences.php
===================================================================
--- trunk/CompanyPreferences.php 2012-12-29 00:48:48 UTC (rev 5783)
+++ trunk/CompanyPreferences.php 2012-12-29 04:00:43 UTC (rev 5784)
@@ -4,7 +4,7 @@
include('includes/session.inc');
-$title = _('Company Preferences');
+$Title = _('Company Preferences');
/* webERP manual links before header.inc */
$ViewTopic= "CreatingNewSystem";
$BookMark = "CompanyParameters";
@@ -152,8 +152,8 @@
} /* end of if submit */
- echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') .
- '" alt="" />' . ' ' . $title.'</p>';
+ echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') .
+ '" alt="" />' . ' ' . $Title.'</p>';
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
echo '<div>';
Modified: trunk/ConfirmDispatchControlled_Invoice.php
===================================================================
--- trunk/ConfirmDispatchControlled_Invoice.php 2012-12-29 00:48:48 UTC (rev 5783)
+++ trunk/ConfirmDispatchControlled_Invoice.php 2012-12-29 04:00:43 UTC (rev 5784)
@@ -5,7 +5,7 @@
include('includes/DefineCartClass.php');
include('includes/DefineSerialItems.php');
include('includes/session.inc');
-$title = _('Specify Dispatched Controlled Items');
+$Title = _('Specify Dispatched Controlled Items');
/* Session started in header.inc for password checking and authorisation level check */
include('includes/header.inc');
@@ -24,7 +24,7 @@
$LineNo = (int)$_POST['LineNo'];
} else {
echo '<div class="centre">
- <a href="' . $rootpath . '/ConfirmDispatch_Invoice.php">'. _('Select a line item to invoice').'</a>
+ <a href="' . $RootPath . '/ConfirmDispatch_Invoice.php">'. _('Select a line item to invoice').'</a>
<br />
<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');
@@ -36,7 +36,7 @@
if (!isset($_SESSION['Items'.$identifier]) 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">'. _('Select a sales order to invoice') . '</a>
+ <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>';
@@ -51,7 +51,7 @@
//Make sure this item is really controlled
if ( $LineItem->Controlled != 1 ){
- echo '<div class="centre"><a href="' . $rootpath . '/ConfirmDispatch_Invoice.php">'. _('Back to the Sales Order'). '</a></div>';
+ 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');
@@ -63,7 +63,7 @@
********************************************/
echo '<div class="centre">';
-echo '<br /><a href="'. $rootpath. '/ConfirmDispatch_Invoice.php?identifier=' . $identifier . '">'. _('Back to Confirmation of Dispatch') . '/' . _('Invoice'). '</a>';
+echo '<br /><a href="'. $RootPath. '/ConfirmDispatch_Invoice.php?identifier=' . $identifier . '">'. _('Back to Confirmation of Dispatch') . '/' . _('Invoice'). '</a>';
echo '<br /><b>'. _('Dispatch of up to').' '. locale_number_format($LineItem->Quantity-$LineItem->QtyInv, $LineItem->DecimalPlaces). ' '. _('Controlled items').' ' . $LineItem->StockID . ' - ' . $LineItem->ItemDescription . ' '. _('on order').' ' . $_SESSION['Items'.$identifier]->OrderNo . ' '. _('to'). ' ' . $_SESSION['Items'.$identifier]->CustomerName . '</b></div>';
Modified: trunk/ConfirmDispatch_Invoice.php
===================================================================
--- trunk/ConfirmDispatch_Invoice.php 2012-12-29 00:48:48 UTC (rev 5783)
+++ trunk/ConfirmDispatch_Invoice.php 2012-12-29 04:00:43 UTC (rev 5784)
@@ -6,7 +6,7 @@
include('includes/DefineCartClass.php');
include('includes/DefineSerialItems.php');
include('includes/session.inc');
-$title = _('Confirm Dispatches and Invoice An Order');
+$Title = _('Confirm Dispatches and Invoice An Order');
include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
@@ -24,7 +24,7 @@
if (!isset($_GET['OrderNumber']) AND !isset($_SESSION['ProcessingOrder'])) {
/* This page can only be called with an order number for invoicing*/
echo '<div class="centre">
- <a href="' . $rootpath . '/SelectSalesOrder.php">' . _('Select a sales order to invoice'). '</a>
+ <a href="' . $RootPath . '/SelectSalesOrder.php">' . _('Select a sales order to invoice'). '</a>
</div>
<br />
<br />';
@@ -258,11 +258,11 @@
if ($_SESSION['Items'.$identifier]->SpecialInstructions) {
prnMsg($_SESSION['Items'.$identifier]->SpecialInstructions,'warn');
}
-echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/inventory.png" title="' . _('Confirm Invoice') .
+echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/inventory.png" title="' . _('Confirm Invoice') .
'" alt="" />' . ' ' . _('Confirm Dispatch and Invoice'). '</p>';
echo '<table class="selection">
<tr>
- <th><img src="'.$rootpath.'/css/'.$theme.'/images/customer.png" title="' . _('Customer') . '" alt="" />' . ' ' . _('Customer Code') . ' :<b> ' . $_SESSION['Items'.$identifier]->DebtorNo.'</b></th>
+ <th><img src="'.$RootPath.'/css/'.$theme.'/images/customer.png" title="' . _('Customer') . '" alt="" />' . ' ' . _('Customer Code') . ' :<b> ' . $_SESSION['Items'.$identifier]->DebtorNo.'</b></th>
<th>' . _('Customer Name') . ' :<b> ' . $_SESSION['Items'.$identifier]->CustomerName. '</b></th>
</tr>
<tr>
@@ -334,7 +334,7 @@
if (isset($_POST['ProcessInvoice'])) {
echo '<td class="number">' . locale_number_format($LnItm->QtyDispatched,$LnItm->DecimalPlaces) . '</td>';
} else {
- echo '<td class="number"><input type="hidden" name="' . $LnItm->LineNumber . '_QtyDispatched" value="' . $LnItm->QtyDispatched . '" /><a href="' . $rootpath .'/ConfirmDispatchControlled_Invoice.php?identifier=' . $identifier . '&LineNo='. $LnItm->LineNumber.'">' .locale_number_format($LnItm->QtyDispatched,$LnItm->DecimalPlaces) . '</a></td>';
+ echo '<td class="number"><input type="hidden" name="' . $LnItm->LineNumber . '_QtyDispatched" value="' . $LnItm->QtyDispatched . '" /><a href="' . $RootPath .'/ConfirmDispatchControlled_Invoice.php?identifier=' . $identifier . '&LineNo='. $LnItm->LineNumber.'">' .locale_number_format($LnItm->QtyDispatched,$LnItm->DecimalPlaces) . '</a></td>';
}
} else {
if (isset($_POST['ProcessInvoice'])) {
@@ -402,7 +402,7 @@
if ($LnItm->Controlled==1){
if (!isset($_POST['ProcessInvoice'])) {
- echo '<td><a href="' . $rootpath . '/ConfirmDispatchControlled_Invoice.php?identifier=' . $identifier . '&LineNo='. $LnItm->LineNumber.'">';
+ echo '<td><a href="' . $RootPath . '/ConfirmDispatchControlled_Invoice.php?identifier=' . $identifier . '&LineNo='. $LnItm->LineNumber.'">';
if ($LnItm->Serialised==1){
echo _('Enter Serial Numbers');
} else { /*Just batch/roll/lot control */
@@ -454,7 +454,7 @@
$BestShipper = $ShipperReturned[0];
} else {
prnMsg( _('There are no shippers defined') . '. ' . _('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 be used'),'error');
- echo '<a href="' . $rootpath . 'Shippers.php">'. _('Enter') . '/' . _('Amend Freight Companies'). '</a>';
+ echo '<a href="' . $RootPath . 'Shippers.php">'. _('Enter') . '/' . _('Amend Freight Companies'). '</a>';
}
}
}
@@ -714,7 +714,7 @@
echo '<br />';
- echo '<div class="centre"><a href="'. $rootpath . '/SelectSalesOrder.php">'. _('Select a sales order for confirming deliveries and invoicing'). '</a></div>';
+ echo '<div class="centre"><a href="'. $RootPath . '/SelectSalesOrder.php">'. _('Select a sales order for confirming deliveries and invoicing'). '</a></div>';
unset($_SESSION['Items'.$identifier]->LineItems);
unset($_SESSION['Items'.$identifier]);
@@ -1621,12 +1621,12 @@
echo '<br /><div class="centre">';
if ($_SESSION['InvoicePortraitFormat']==0){
- echo '<img src="'.$rootpath.'/css/'.$theme.'/images/printer.png" title="' . _('Print') . '" alt="" />' . ' ' . '<a target="_blank" href="'.$rootpath.'/PrintCustTrans.php?FromTransNo='.$InvoiceNo.'&InvOrCredit=Invoice&PrintPDF=True">'. _('Print this invoice'). ' (' . _('Landscape') . ')</a><br /><br />';
+ echo '<img src="'.$RootPath.'/css/'.$theme.'/images/printer.png" title="' . _('Print') . '" alt="" />' . ' ' . '<a target="_blank" href="'.$RootPath.'/PrintCustTrans.php?FromTransNo='.$InvoiceNo.'&InvOrCredit=Invoice&PrintPDF=True">'. _('Print this invoice'). ' (' . _('Landscape') . ')</a><br /><br />';
} else {
- echo '<img src="'.$rootpath.'/css/'.$theme.'/images/printer.png" title="' . _('Print') . '" alt="" />' . ' ' . '<a target="_blank" href="'.$rootpath.'/PrintCustTransPortrait.php?FromTransNo='.$InvoiceNo.'&InvOrCredit=Invoice&PrintPDF=True">'. _('Print this invoice'). ' (' . _('Portrait') . ')</a><br /><br />';
+ echo '<img src="'.$RootPath.'/css/'.$theme.'/images/printer.png" title="' . _('Print') . '" alt="" />' . ' ' . '<a target="_blank" href="'.$RootPath.'/PrintCustTransPortrait.php?FromTransNo='.$InvoiceNo.'&InvOrCredit=Invoice&PrintPDF=True">'. _('Print this invoice'). ' (' . _('Portrait') . ')</a><br /><br />';
}
- echo '<a href="'.$rootpath.'/SelectSalesOrder.php">'. _('Select another order for invoicing'). '</a><br /><br />';
- echo '<a href="'.$rootpath.'/SelectOrderItems.php?NewOrder=Yes">'._('Sales Order Entry').'</a></div><br />';
+ echo '<a href="'.$RootPath.'/SelectSalesOrder.php">'. _('Select another order for invoicing'). '</a><br /><br />';
+ echo '<a href="'.$RootPath.'/SelectOrderItems.php?NewOrder=Yes">'._('Sales Order Entry').'</a></div><br />';
/*end of process invoice */
Modified: trunk/ContractBOM.php
===================================================================
--- trunk/ContractBOM.php 2012-12-29 00:48:48 UTC (rev 5783)
+++ trunk/ContractBOM.php 2012-12-29 04:00:43 UTC (rev 5784)
@@ -5,7 +5,7 @@
include('includes/DefineContractClass.php');
include('includes/session.inc');
-$title = _('Contract Bill of Materials');
+$Title = _('Contract Bill of Materials');
$identifier=$_GET['identifier'];
@@ -14,7 +14,7 @@
*/
if (!isset($_SESSION['Contract'.$identifier])){
- header('Location:' . $rootpath . '/Contracts.php');
+ header('Location:' . $RootPath . '/Contracts.php');
exit;
}
include('includes/header.inc');
@@ -34,9 +34,9 @@
if (isset($_POST['BackToHeader'])){
- echo '<meta http-equiv="Refresh" content="0; url=' . $rootpath . '/Contracts.php?identifier='.$identifier. '" />';
+ echo '<meta http-equiv="Refresh" content="0; url=' . $RootPath . '/Contracts.php?identifier='.$identifier. '" />';
echo '<br />';
- prnMsg(_('You should automatically be forwarded to the Contract page. If this does not happen perhaps the browser does not support META Refresh') . '<a href="' . $rootpath . '/Contracts.php?identifier='.$identifier . '">' . _('click here') . '</a> ' . _('to continue'),'info');
+ prnMsg(_('You should automatically be forwarded to the Contract page. If this does not happen perhaps the browser does not support META Refresh') . '<a href="' . $RootPath . '/Contracts.php?identifier='.$identifier . '">' . _('click here') . '</a> ' . _('to continue'),'info');
include('includes/footer.inc');
exit;
}
@@ -221,7 +221,7 @@
if (count($_SESSION['Contract'.$identifier]->ContractBOM)>0){
echo '<p class="page_title_text">
- <img src="'.$rootpath.'/css/'.$theme.'/images/contract.png" title="' . _('Contract Bill of Material') . '" alt="" /> '.$_SESSION['Contract'.$identifier]->CustomerName . '
+ <img src="'.$RootPath.'/css/'.$theme.'/images/contract.png" title="' . _('Contract Bill of Material') . '" alt="" /> '.$_SESSION['Contract'.$identifier]->CustomerName . '
</p>';
echo '<table class="selection">';
@@ -291,7 +291,7 @@
$DbgMsg = _('The SQL used to retrieve the category details but failed was');
$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') .
+ <img src="'.$RootPath.'/css/'.$theme.'/images/magnifier.png" title="' . _('Print') . '" alt="" />' . ' ' . _('Search For Stock Items') .
'</p>';
echo '<table class="selection">
<tr></tr>
@@ -328,7 +328,7 @@
</tr>
<tr>
<td></td>
- <td><b>' . _('OR') . ' </b><a target="_blank" href="'.$rootpath.'/Stocks.php">' . _('Create a New Stock Item') . '</a></td>
+ <td><b>' . _('OR') . ' </b><a target="_blank" href="'.$RootPath.'/Stocks.php">' . _('Create a New Stock Item') . '</a></td>
</tr>
</table>
<br />
Modified: trunk/ContractCosting.php
===================================================================
--- trunk/ContractCosting.php 2012-12-29 00:48:48 UTC (rev 5783)
+++ trunk/ContractCosting.php 2012-12-29 04:00:43 UTC (rev 5784)
@@ -4,7 +4,7 @@
include('includes/DefineContractClass.php');
include('includes/session.inc');
-$title = _('Contract Costing');
+$Title = _('Contract Costing');
/* Session started in header.inc for password checking and authorisation level check */
include('includes/header.inc');
@@ -55,7 +55,7 @@
}
echo '<p class="page_title_text">
- <img src="'.$rootpath.'/css/'.$theme.'/images/contract.png" title="' . _('Contract') . '" alt="" />';
+ <img src="'.$RootPath.'/css/'.$theme.'/images/contract.png" title="' . _('Contract') . '" alt="" />';
if ($_SESSION['Contract'.$identifier]->Status==3){
echo _('Closed') . ' ';
} elseif ($_SESSION['Contract'.$identifier]->Status==2){
Modified: trunk/ContractOtherReqts.php
===================================================================
--- trunk/ContractOtherReqts.php 2012-12-29 00:48:48 UTC (rev 5783)
+++ trunk/ContractOtherReqts.php 2012-12-29 04:00:43 UTC (rev 5784)
@@ -5,7 +5,7 @@
include('includes/DefineContractClass.php');
include('includes/session.inc');
-$title = _('Contract Other Requirements');
+$Title = _('Contract Other Requirements');
$identifier=$_GET['identifier'];
@@ -14,7 +14,7 @@
*/
if (!isset($_SESSION['Contract'.$identifier])){
- header('Location:' . $rootpath . '/Contracts.php');
+ header('Location:' . $RootPath . '/Contracts.php');
exit;
}
include('includes/header.inc');
@@ -38,9 +38,9 @@
if (isset($_POST['BackToHeader'])){
- echo '<meta http-equiv="Refresh" content="0; url=' . $rootpath . '/Contracts.php?identifier='.$identifier. '" />';
+ echo '<meta http-equiv="Refresh" content="0; url=' . $RootPath . '/Contracts.php?identifier='.$identifier. '" />';
echo '<br />';
- prnMsg(_('You should automatically be forwarded to the Contract page. If this does not happen perhaps the browser does not support META Refresh') . '<a href="' . $ro...
[truncated message content] |
|
From: <dai...@us...> - 2012-12-29 04:47:47
|
Revision: 5785
http://sourceforge.net/p/web-erp/reponame/5785
Author: daintree
Date: 2012-12-29 04:47:42 +0000 (Sat, 29 Dec 2012)
Log Message:
-----------
logout logic rework
Modified Paths:
--------------
trunk/AccountGroups.php
trunk/AccountSections.php
trunk/AddCustomerContacts.php
trunk/AddCustomerNotes.php
trunk/AddCustomerTypeNotes.php
trunk/AgedDebtors.php
trunk/AgedSuppliers.php
trunk/Areas.php
trunk/AuditTrail.php
trunk/BOMExtendedQty.php
trunk/BOMIndented.php
trunk/BOMIndentedReverse.php
trunk/BOMInquiry.php
trunk/BOMListing.php
trunk/BOMs.php
trunk/BackupDatabase.php
trunk/BankAccounts.php
trunk/BankMatching.php
trunk/BankReconciliation.php
trunk/COGSGLPostings.php
trunk/CompanyPreferences.php
trunk/ConfirmDispatch_Invoice.php
trunk/ContractBOM.php
trunk/ContractCosting.php
trunk/ContractOtherReqts.php
trunk/Contracts.php
trunk/CopyBOM.php
trunk/CounterReturns.php
trunk/CounterSales.php
trunk/CreditStatus.php
trunk/Credit_Invoice.php
trunk/Currencies.php
trunk/CustEDISetup.php
trunk/CustLoginSetup.php
trunk/CustWhereAlloc.php
trunk/CustomerAllocations.php
trunk/CustomerBranches.php
trunk/CustomerInquiry.php
trunk/CustomerPurchases.php
trunk/CustomerReceipt.php
trunk/CustomerTransInquiry.php
trunk/CustomerTypes.php
trunk/Customers.php
trunk/DailyBankTransactions.php
trunk/DailySalesInquiry.php
trunk/DebtorsAtPeriodEnd.php
trunk/DeliveryDetails.php
trunk/Departments.php
trunk/DiscountCategories.php
trunk/DiscountMatrix.php
trunk/EDIMessageFormat.php
trunk/ExchangeRateTrend.php
trunk/Factors.php
trunk/FixedAssetCategories.php
trunk/FixedAssetItems.php
trunk/FixedAssetLocations.php
trunk/FixedAssetRegister.php
trunk/FixedAssetTransfer.php
trunk/FormDesigner.php
trunk/FreightCosts.php
trunk/GLAccountCSV.php
trunk/GLAccountInquiry.php
trunk/GLAccountReport.php
trunk/GLAccounts.php
trunk/GLBalanceSheet.php
trunk/GLBudgets.php
trunk/GLJournal.php
trunk/GLJournalInquiry.php
trunk/GLProfit_Loss.php
trunk/GLTagProfit_Loss.php
trunk/GLTags.php
trunk/GLTransInquiry.php
trunk/GLTrialBalance.php
trunk/GeocodeSetup.php
trunk/GoodsReceived.php
trunk/InternalStockCategoriesByRole.php
trunk/InternalStockRequest.php
trunk/InternalStockRequestAuthorisation.php
trunk/InternalStockRequestFulfill.php
trunk/InventoryPlanning.php
trunk/InventoryPlanningPrefSupplier.php
trunk/InventoryQuantities.php
trunk/InventoryValuation.php
trunk/Labels.php
trunk/Locations.php
trunk/Logout.php
trunk/MRP.php
trunk/MRPCalendar.php
trunk/MRPCreateDemands.php
trunk/MRPDemandTypes.php
trunk/MRPDemands.php
trunk/MRPPlannedPurchaseOrders.php
trunk/MRPPlannedWorkOrders.php
trunk/MRPReport.php
trunk/MRPReschedules.php
trunk/MRPShortages.php
trunk/NoSalesItems.php
trunk/OffersReceived.php
trunk/OrderDetails.php
trunk/PDFBankingSummary.php
trunk/PDFChequeListing.php
trunk/PDFCustTransListing.php
trunk/PDFCustomerList.php
trunk/PDFDIFOT.php
trunk/PDFDeliveryDifferences.php
trunk/PDFLowGP.php
trunk/PDFOrderStatus.php
trunk/PDFOrdersInvoiced.php
trunk/PDFPeriodStockTransListing.php
trunk/PDFPickingList.php
trunk/PDFPriceList.php
trunk/PDFPrintLabel.php
trunk/PDFRemittanceAdvice.php
trunk/PDFStockCheckComparison.php
trunk/PDFStockLocTransfer.php
trunk/PDFStockTransfer.php
trunk/PDFSuppTransListing.php
trunk/POReport.php
trunk/PO_AuthorisationLevels.php
trunk/PO_AuthoriseMyOrders.php
trunk/PO_Header.php
trunk/PO_Items.php
trunk/PO_OrderDetails.php
trunk/PO_SelectOSPurchOrder.php
trunk/PO_SelectPurchOrder.php
trunk/PageSecurity.php
trunk/PaymentAllocations.php
trunk/PaymentMethods.php
trunk/PaymentTerms.php
trunk/Payments.php
trunk/PcAssignCashToTab.php
trunk/PcAuthorizeExpenses.php
trunk/PcClaimExpensesFromTab.php
trunk/PcExpenses.php
trunk/PcExpensesTypeTab.php
trunk/PcReportTab.php
trunk/PcTabs.php
trunk/PcTypeTabs.php
trunk/PeriodsInquiry.php
trunk/Prices.php
trunk/PricesBasedOnMarkUp.php
trunk/PricesByCost.php
trunk/Prices_Customer.php
trunk/PrintCustStatements.php
trunk/PrintCustTrans.php
trunk/PrintCustTransPortrait.php
trunk/PurchData.php
trunk/RecurringSalesOrders.php
trunk/ReorderLevel.php
trunk/ReorderLevelLocation.php
trunk/ReprintGRN.php
trunk/ReverseGRN.php
trunk/SMTPServer.php
trunk/SalesAnalReptCols.php
trunk/SalesAnalRepts.php
trunk/SalesByTypePeriodInquiry.php
trunk/SalesCategories.php
trunk/SalesCategoryPeriodInquiry.php
trunk/SalesGLPostings.php
trunk/SalesGraph.php
trunk/SalesPeople.php
trunk/SalesTopItemsInquiry.php
trunk/SalesTypes.php
trunk/SecurityTokens.php
trunk/SelectAsset.php
trunk/SelectCompletedOrder.php
trunk/SelectContract.php
trunk/SelectCreditItems.php
trunk/SelectCustomer.php
trunk/SelectGLAccount.php
trunk/SelectOrderItems.php
trunk/SelectProduct.php
trunk/SelectRecurringSalesOrder.php
trunk/SelectSalesOrder.php
trunk/SelectSupplier.php
trunk/SelectWorkOrder.php
trunk/ShipmentCosting.php
trunk/Shipments.php
trunk/Shippers.php
trunk/Shipt_Select.php
trunk/ShiptsList.php
trunk/StockAdjustments.php
trunk/StockCategories.php
trunk/StockCheck.php
trunk/StockCostUpdate.php
trunk/StockCounts.php
trunk/StockDispatch.php
trunk/StockLocMovements.php
trunk/StockLocStatus.php
trunk/StockLocTransfer.php
trunk/StockLocTransferReceive.php
trunk/StockMovements.php
trunk/StockQties_csv.php
trunk/StockQuantityByDate.php
trunk/StockReorderLevel.php
trunk/StockSerialItemResearch.php
trunk/StockSerialItems.php
trunk/StockStatus.php
trunk/StockTransferControlled.php
trunk/StockTransfers.php
trunk/StockUsage.php
trunk/Stocks.php
trunk/SuppCreditGRNs.php
trunk/SuppInvGRNs.php
trunk/SuppLoginSetup.php
trunk/SuppPaymentRun.php
trunk/SuppPriceList.php
trunk/SuppTransGLAnalysis.php
trunk/SupplierAllocations.php
trunk/SupplierBalsAtPeriodEnd.php
trunk/SupplierContacts.php
trunk/SupplierCredit.php
trunk/SupplierInquiry.php
trunk/SupplierInvoice.php
trunk/SupplierPriceList.php
trunk/SupplierTenderCreate.php
trunk/SupplierTenders.php
trunk/SupplierTransInquiry.php
trunk/SupplierTypes.php
trunk/Suppliers.php
trunk/SystemParameters.php
trunk/Tax.php
trunk/TaxAuthorities.php
trunk/TaxAuthorityRates.php
trunk/TaxCategories.php
trunk/TaxGroups.php
trunk/TaxProvinces.php
trunk/TopItems.php
trunk/UnitsOfMeasure.php
trunk/UpgradeDatabase.php
trunk/UserSettings.php
trunk/WOSerialNos.php
trunk/WWW_Access.php
trunk/WWW_Users.php
trunk/WhereUsedInquiry.php
trunk/WorkCentres.php
trunk/WorkOrderCosting.php
trunk/WorkOrderEntry.php
trunk/WorkOrderIssue.php
trunk/WorkOrderReceive.php
trunk/WorkOrderStatus.php
trunk/Z_BottomUpCosts.php
trunk/Z_MakeNewCompany.php
trunk/Z_Upgrade_3.04-3.05.php
trunk/config.distrib.php
trunk/doc/Change.log
trunk/geocode.php
trunk/includes/ConnectDB.inc
trunk/includes/ConnectDB_mysql.inc
trunk/includes/ConnectDB_mysqli.inc
trunk/includes/ConnectDB_postgres.inc
trunk/includes/DefineLabelClass.php
trunk/includes/GetConfig.php
trunk/includes/Login.php
trunk/includes/header.inc
trunk/includes/session.inc
trunk/index.php
trunk/install/save.php
Modified: trunk/AccountGroups.php
===================================================================
--- trunk/AccountGroups.php 2012-12-29 04:00:43 UTC (rev 5784)
+++ trunk/AccountGroups.php 2012-12-29 04:47:42 UTC (rev 5785)
@@ -259,7 +259,7 @@
$DbgMsg = _('The sql that was used to retrieve the account group information was ');
$ErrMsg = _('Could not get account groups because');
$result = DB_query($sql,$db,$ErrMsg,$DbgMsg);
- echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'<br /></p>';
+ echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'<br /></p>';
echo '<table class="selection">
<tr>
Modified: trunk/AccountSections.php
===================================================================
--- trunk/AccountSections.php 2012-12-29 04:00:43 UTC (rev 5784)
+++ trunk/AccountSections.php 2012-12-29 04:47:42 UTC (rev 5785)
@@ -166,7 +166,7 @@
$ErrMsg = _('Could not get account group sections because');
$result = DB_query($sql,$db,$ErrMsg);
- echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'<br /></p>';
+ echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'<br /></p>';
echo '<table class="selection">
<tr>
Modified: trunk/AddCustomerContacts.php
===================================================================
--- trunk/AddCustomerContacts.php 2012-12-29 04:00:43 UTC (rev 5784)
+++ trunk/AddCustomerContacts.php 2012-12-29 04:47:42 UTC (rev 5785)
@@ -22,9 +22,9 @@
$Result = DB_query($SQLname,$db);
$row = DB_fetch_array($Result);
if (!isset($_GET['Id'])) {
- echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . _('Contacts for Customer') . ': <b>' . htmlspecialchars($row['name'], ENT_QUOTES, 'UTF-8') . '</b></p><br />';
+ echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . _('Contacts for Customer') . ': <b>' . htmlspecialchars($row['name'], ENT_QUOTES, 'UTF-8') . '</b></p><br />';
} else {
- echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . _('Edit contact for'). ': <b>' . htmlspecialchars($row['name'], ENT_QUOTES, 'UTF-8') . '</b></p><br />';
+ echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . _('Edit contact for'). ': <b>' . htmlspecialchars($row['name'], ENT_QUOTES, 'UTF-8') . '</b></p><br />';
}
if ( isset($_POST['submit']) ) {
Modified: trunk/AddCustomerNotes.php
===================================================================
--- trunk/AddCustomerNotes.php 2012-12-29 04:00:43 UTC (rev 5784)
+++ trunk/AddCustomerNotes.php 2012-12-29 04:47:42 UTC (rev 5785)
@@ -98,7 +98,7 @@
WHERE debtorno='".$DebtorNo."'";
$Result = DB_query($SQLname,$db);
$row = DB_fetch_array($Result);
- echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . _('Notes for Customer').': <b>' .$row['name'].'</b></p>
+ echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . _('Notes for Customer').': <b>' .$row['name'].'</b></p>
<br />';
$sql = "SELECT noteid,
Modified: trunk/AddCustomerTypeNotes.php
===================================================================
--- trunk/AddCustomerTypeNotes.php 2012-12-29 04:00:43 UTC (rev 5784)
+++ trunk/AddCustomerTypeNotes.php 2012-12-29 04:47:42 UTC (rev 5785)
@@ -91,7 +91,7 @@
$SQLname="SELECT typename from debtortype where typeid='".$DebtorType."'";
$result = DB_query($SQLname,$db);
$myrow = DB_fetch_array($result);
- echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/customer.png" title="' . _('Search') . '" alt="" />' . _('Notes for Customer Type').': <b>' .$myrow['typename'].'</b></p>
+ echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/customer.png" title="' . _('Search') . '" alt="" />' . _('Notes for Customer Type').': <b>' .$myrow['typename'].'</b></p>
<br />';
$sql = "SELECT noteid,
Modified: trunk/AgedDebtors.php
===================================================================
--- trunk/AgedDebtors.php 2012-12-29 04:00:43 UTC (rev 5784)
+++ trunk/AgedDebtors.php 2012-12-29 04:47:42 UTC (rev 5785)
@@ -441,7 +441,7 @@
$Title=_('Aged Debtor Analysis');
include('includes/header.inc');
- echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'</p><br />';
+ echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'</p><br />';
if ((!isset($_POST['FromCriteria']) or !isset($_POST['ToCriteria']))) {
Modified: trunk/AgedSuppliers.php
===================================================================
--- trunk/AgedSuppliers.php 2012-12-29 04:00:43 UTC (rev 5784)
+++ trunk/AgedSuppliers.php 2012-12-29 04:47:42 UTC (rev 5785)
@@ -273,7 +273,7 @@
$Title = _('Aged Supplier Analysis');
include('includes/header.inc');
- echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'</p><br />';
+ echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'</p><br />';
if (!isset($_POST['FromCriteria']) or !isset($_POST['ToCriteria'])) {
Modified: trunk/Areas.php
===================================================================
--- trunk/Areas.php 2012-12-29 04:00:43 UTC (rev 5784)
+++ trunk/Areas.php 2012-12-29 04:47:42 UTC (rev 5785)
@@ -141,7 +141,7 @@
FROM areas";
$result = DB_query($sql,$db);
- echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'</p><br />';
+ echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'</p><br />';
echo '<table class="selection">
<tr>
Modified: trunk/AuditTrail.php
===================================================================
--- trunk/AuditTrail.php 2012-12-29 04:00:43 UTC (rev 5784)
+++ trunk/AuditTrail.php 2012-12-29 04:47:42 UTC (rev 5785)
@@ -8,7 +8,7 @@
include('includes/header.inc');
-echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'</p>';
+echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'</p>';
if (!isset($_POST['FromDate'])){
$_POST['FromDate'] = Date($_SESSION['DefaultDateFormat'],mktime(0,0,0, Date('m')-$_SESSION['MonthsAuditTrail']));
Modified: trunk/BOMExtendedQty.php
===================================================================
--- trunk/BOMExtendedQty.php 2012-12-29 04:00:43 UTC (rev 5784)
+++ trunk/BOMExtendedQty.php 2012-12-29 04:47:42 UTC (rev 5785)
@@ -247,7 +247,7 @@
$Title=_('Quantity Extended BOM Listing');
include('includes/header.inc');
- echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'</p><br />';
+ echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'</p><br />';
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
<div>
Modified: trunk/BOMIndented.php
===================================================================
--- trunk/BOMIndented.php 2012-12-29 04:00:43 UTC (rev 5784)
+++ trunk/BOMIndented.php 2012-12-29 04:47:42 UTC (rev 5785)
@@ -243,7 +243,7 @@
$Title=_('Indented BOM Listing');
include('includes/header.inc');
- echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'</p><br />';
+ echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'</p><br />';
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
<div>
Modified: trunk/BOMIndentedReverse.php
===================================================================
--- trunk/BOMIndentedReverse.php 2012-12-29 04:00:43 UTC (rev 5784)
+++ trunk/BOMIndentedReverse.php 2012-12-29 04:47:42 UTC (rev 5785)
@@ -231,7 +231,7 @@
$Title=_('Reverse Indented BOM Listing');
include('includes/header.inc');
- echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/maintenance.png" title="' .
+ echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' .
_('Search') . '" alt="" />' . ' ' . $Title.'</p><br />';
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
<div>
Modified: trunk/BOMInquiry.php
===================================================================
--- trunk/BOMInquiry.php 2012-12-29 04:00:43 UTC (rev 5784)
+++ trunk/BOMInquiry.php 2012-12-29 04:47:42 UTC (rev 5785)
@@ -184,7 +184,7 @@
} else {
echo '<a href="'.$RootPath.'/index.php">'._('Return to Main Menu').'</a>';
echo '<p class="page_title_text">
- <img src="'.$RootPath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'
+ <img src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'
</p>
<br />';
Modified: trunk/BOMListing.php
===================================================================
--- trunk/BOMListing.php 2012-12-29 04:00:43 UTC (rev 5784)
+++ trunk/BOMListing.php 2012-12-29 04:47:42 UTC (rev 5785)
@@ -106,7 +106,7 @@
$Title=_('Bill Of Material Listing');
include('includes/header.inc');
- echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/reports.png" title="' . _('Search') .
+ echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/reports.png" title="' . _('Search') .
'" alt="" />' . ' ' . $Title . '</p><br />';
if (!isset($_POST['FromCriteria']) || !isset($_POST['ToCriteria'])) {
Modified: trunk/BOMs.php
===================================================================
--- trunk/BOMs.php 2012-12-29 04:00:43 UTC (rev 5784)
+++ trunk/BOMs.php 2012-12-29 04:47:42 UTC (rev 5785)
@@ -228,7 +228,7 @@
if (isset($Select)) { //Parent Stock Item selected so display BOM or edit Component
$SelectedParent = $Select;
unset($Select);// = NULL;
- echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') .
+ echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' . _('Search') .
'" alt="" />' . ' ' . $Title.'</p><br />';
if (isset($SelectedParent) AND isset($_POST['Submit'])) {
@@ -855,7 +855,7 @@
if (!isset($SelectedParent)) {
- echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title . '</p>';
+ echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title . '</p>';
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">' .
'<div class="page_help_text">'. _('Select a manufactured part') . ' (' . _('or Assembly or Kit part') . ') ' . _('to maintain the bill of material for using the options below') . '<br />' . _('Parts must be defined in the stock item entry') . '/' . _('modification screen as manufactured') . ', ' . _('kits or assemblies to be available for construction of a bill of material') .'</div>'. '
<div>
Modified: trunk/BackupDatabase.php
===================================================================
--- trunk/BackupDatabase.php 2012-12-29 04:00:43 UTC (rev 5784)
+++ trunk/BackupDatabase.php 2012-12-29 04:47:42 UTC (rev 5785)
@@ -32,7 +32,7 @@
} else {
$BackupFile = $RootPath . '/companies/' . $_SESSION['DatabaseName'] .'/' . _('Backup') . '_' . Date('Y-m-d-H-i-s') . '.sql.gz';
- $Command = 'mysqldump --opt -h' . $host . ' -u' . $dbuser . ' -p' . $dbpassword . ' ' . $_SESSION['DatabaseName'] . '| gzip > ' .
+ $Command = 'mysqldump --opt -h' . $host . ' -u' . $DBUser . ' -p' . $DBPassword . ' ' . $_SESSION['DatabaseName'] . '| gzip > ' .
$_SERVER['DOCUMENT_ROOT'] . $BackupFile;
Modified: trunk/BankAccounts.php
===================================================================
--- trunk/BankAccounts.php 2012-12-29 04:00:43 UTC (rev 5784)
+++ trunk/BankAccounts.php 2012-12-29 04:47:42 UTC (rev 5785)
@@ -9,7 +9,7 @@
$BookMark = 'BankAccounts';
include('includes/header.inc');
-echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/money_add.png" title="' . _('Bank') . '" alt="" />' . ' ' . $Title . '</p>';
+echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/money_add.png" title="' . _('Bank') . '" alt="" />' . ' ' . $Title . '</p>';
echo '<div class="page_help_text">' . _('Update Bank Account details. Account Code is for SWIFT or BSB type Bank Codes. Set Default for Invoices to Currency Default or Fallback Default to print Account details on Invoices (only one account should be set to Fall Back Default).') . '.</div><br />';
if (isset($_GET['SelectedBankAccount'])) {
Modified: trunk/BankMatching.php
===================================================================
--- trunk/BankMatching.php 2012-12-29 04:00:43 UTC (rev 5784)
+++ trunk/BankMatching.php 2012-12-29 04:47:42 UTC (rev 5785)
@@ -12,7 +12,7 @@
$Type = 'Receipts';
$TypeName =_('Receipts');
echo '<p class="page_title_text">
- <img src="'.$RootPath.'/css/'.$theme.'/images/money_add.png" title="' . _('Bank Matching') . '" alt="" />' . ' ' . _('Bank Account Matching - Receipts') . '
+ <img src="'.$RootPath.'/css/'.$Theme.'/images/money_add.png" title="' . _('Bank Matching') . '" alt="" />' . ' ' . _('Bank Account Matching - Receipts') . '
</p>';
} elseif ((isset($_GET['Type']) AND $_GET['Type']=='Payments')
@@ -21,7 +21,7 @@
$Type = 'Payments';
$TypeName =_('Payments');
echo '<p class="page_title_text">
- <img src="'.$RootPath.'/css/'.$theme.'/images/money_delete.png" title="' . _('Bank Matching') . '" alt="" />' . ' ' . _('Bank Account Matching - Payments') . '
+ <img src="'.$RootPath.'/css/'.$Theme.'/images/money_delete.png" title="' . _('Bank Matching') . '" alt="" />' . ' ' . _('Bank Account Matching - Payments') . '
</p>';
} else {
Modified: trunk/BankReconciliation.php
===================================================================
--- trunk/BankReconciliation.php 2012-12-29 04:00:43 UTC (rev 5784)
+++ trunk/BankReconciliation.php 2012-12-29 04:47:42 UTC (rev 5785)
@@ -11,7 +11,7 @@
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
echo '<div>';
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 />';
+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'];
Modified: trunk/COGSGLPostings.php
===================================================================
--- trunk/COGSGLPostings.php 2012-12-29 04:00:43 UTC (rev 5784)
+++ trunk/COGSGLPostings.php 2012-12-29 04:47:42 UTC (rev 5785)
@@ -16,7 +16,7 @@
$SelectedCOGSPostingID=$_GET['SelectedCOGSPostingID'];
}
-echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'</p><br />';
+echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'</p><br />';
if (isset($_POST['submit'])) {
Modified: trunk/CompanyPreferences.php
===================================================================
--- trunk/CompanyPreferences.php 2012-12-29 04:00:43 UTC (rev 5784)
+++ trunk/CompanyPreferences.php 2012-12-29 04:47:42 UTC (rev 5785)
@@ -152,7 +152,7 @@
} /* end of if submit */
- echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') .
+ echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' . _('Search') .
'" alt="" />' . ' ' . $Title.'</p>';
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
Modified: trunk/ConfirmDispatch_Invoice.php
===================================================================
--- trunk/ConfirmDispatch_Invoice.php 2012-12-29 04:00:43 UTC (rev 5784)
+++ trunk/ConfirmDispatch_Invoice.php 2012-12-29 04:47:42 UTC (rev 5785)
@@ -258,11 +258,11 @@
if ($_SESSION['Items'.$identifier]->SpecialInstructions) {
prnMsg($_SESSION['Items'.$identifier]->SpecialInstructions,'warn');
}
-echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/inventory.png" title="' . _('Confirm Invoice') .
+echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/inventory.png" title="' . _('Confirm Invoice') .
'" alt="" />' . ' ' . _('Confirm Dispatch and Invoice'). '</p>';
echo '<table class="selection">
<tr>
- <th><img src="'.$RootPath.'/css/'.$theme.'/images/customer.png" title="' . _('Customer') . '" alt="" />' . ' ' . _('Customer Code') . ' :<b> ' . $_SESSION['Items'.$identifier]->DebtorNo.'</b></th>
+ <th><img src="'.$RootPath.'/css/'.$Theme.'/images/customer.png" title="' . _('Customer') . '" alt="" />' . ' ' . _('Customer Code') . ' :<b> ' . $_SESSION['Items'.$identifier]->DebtorNo.'</b></th>
<th>' . _('Customer Name') . ' :<b> ' . $_SESSION['Items'.$identifier]->CustomerName. '</b></th>
</tr>
<tr>
@@ -1621,9 +1621,9 @@
echo '<br /><div class="centre">';
if ($_SESSION['InvoicePortraitFormat']==0){
- echo '<img src="'.$RootPath.'/css/'.$theme.'/images/printer.png" title="' . _('Print') . '" alt="" />' . ' ' . '<a target="_blank" href="'.$RootPath.'/PrintCustTrans.php?FromTransNo='.$InvoiceNo.'&InvOrCredit=Invoice&PrintPDF=True">'. _('Print this invoice'). ' (' . _('Landscape') . ')</a><br /><br />';
+ echo '<img src="'.$RootPath.'/css/'.$Theme.'/images/printer.png" title="' . _('Print') . '" alt="" />' . ' ' . '<a target="_blank" href="'.$RootPath.'/PrintCustTrans.php?FromTransNo='.$InvoiceNo.'&InvOrCredit=Invoice&PrintPDF=True">'. _('Print this invoice'). ' (' . _('Landscape') . ')</a><br /><br />';
} else {
- echo '<img src="'.$RootPath.'/css/'.$theme.'/images/printer.png" title="' . _('Print') . '" alt="" />' . ' ' . '<a target="_blank" href="'.$RootPath.'/PrintCustTransPortrait.php?FromTransNo='.$InvoiceNo.'&InvOrCredit=Invoice&PrintPDF=True">'. _('Print this invoice'). ' (' . _('Portrait') . ')</a><br /><br />';
+ echo '<img src="'.$RootPath.'/css/'.$Theme.'/images/printer.png" title="' . _('Print') . '" alt="" />' . ' ' . '<a target="_blank" href="'.$RootPath.'/PrintCustTransPortrait.php?FromTransNo='.$InvoiceNo.'&InvOrCredit=Invoice&PrintPDF=True">'. _('Print this invoice'). ' (' . _('Portrait') . ')</a><br /><br />';
}
echo '<a href="'.$RootPath.'/SelectSalesOrder.php">'. _('Select another order for invoicing'). '</a><br /><br />';
echo '<a href="'.$RootPath.'/SelectOrderItems.php?NewOrder=Yes">'._('Sales Order Entry').'</a></div><br />';
Modified: trunk/ContractBOM.php
===================================================================
--- trunk/ContractBOM.php 2012-12-29 04:00:43 UTC (rev 5784)
+++ trunk/ContractBOM.php 2012-12-29 04:47:42 UTC (rev 5785)
@@ -221,7 +221,7 @@
if (count($_SESSION['Contract'.$identifier]->ContractBOM)>0){
echo '<p class="page_title_text">
- <img src="'.$RootPath.'/css/'.$theme.'/images/contract.png" title="' . _('Contract Bill of Material') . '" alt="" /> '.$_SESSION['Contract'.$identifier]->CustomerName . '
+ <img src="'.$RootPath.'/css/'.$Theme.'/images/contract.png" title="' . _('Contract Bill of Material') . '" alt="" /> '.$_SESSION['Contract'.$identifier]->CustomerName . '
</p>';
echo '<table class="selection">';
@@ -291,7 +291,7 @@
$DbgMsg = _('The SQL used to retrieve the category details but failed was');
$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') .
+ <img src="'.$RootPath.'/css/'.$Theme.'/images/magnifier.png" title="' . _('Print') . '" alt="" />' . ' ' . _('Search For Stock Items') .
'</p>';
echo '<table class="selection">
<tr></tr>
Modified: trunk/ContractCosting.php
===================================================================
--- trunk/ContractCosting.php 2012-12-29 04:00:43 UTC (rev 5784)
+++ trunk/ContractCosting.php 2012-12-29 04:47:42 UTC (rev 5785)
@@ -55,7 +55,7 @@
}
echo '<p class="page_title_text">
- <img src="'.$RootPath.'/css/'.$theme.'/images/contract.png" title="' . _('Contract') . '" alt="" />';
+ <img src="'.$RootPath.'/css/'.$Theme.'/images/contract.png" title="' . _('Contract') . '" alt="" />';
if ($_SESSION['Contract'.$identifier]->Status==3){
echo _('Closed') . ' ';
} elseif ($_SESSION['Contract'.$identifier]->Status==2){
Modified: trunk/ContractOtherReqts.php
===================================================================
--- trunk/ContractOtherReqts.php 2012-12-29 04:00:43 UTC (rev 5784)
+++ trunk/ContractOtherReqts.php 2012-12-29 04:47:42 UTC (rev 5785)
@@ -78,7 +78,7 @@
echo '<form name="ContractReqtsForm" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier. '" method="post">';
echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/contract.png" title="' . _('Contract Other Requirements') . '" alt="" /> ' . _('Contract Other Requirements') . ' - ' . $_SESSION['Contract'.$identifier]->CustomerName.'</p>';
+echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/contract.png" title="' . _('Contract Other Requirements') . '" alt="" /> ' . _('Contract Other Requirements') . ' - ' . $_SESSION['Contract'.$identifier]->CustomerName.'</p>';
if (count($_SESSION['Contract'.$identifier]->ContractReqts)>0){
Modified: trunk/Contracts.php
===================================================================
--- trunk/Contracts.php 2012-12-29 04:00:43 UTC (rev 5784)
+++ trunk/Contracts.php 2012-12-29 04:47:42 UTC (rev 5785)
@@ -745,7 +745,7 @@
if (!isset($_SESSION['Contract'.$identifier]->DebtorNo)
OR $_SESSION['Contract'.$identifier]->DebtorNo=='' ) {
- echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/contract.png" title="' . _('Contract') . '" alt="" />' . ' ' . _('Contract: Select Customer') . '</p>';
+ echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/contract.png" title="' . _('Contract') . '" alt="" />' . ' ' . _('Contract: Select Customer') . '</p>';
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?identifier=' . $identifier .'" name="CustomerSelection" method="post">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
@@ -817,7 +817,7 @@
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<p class="page_title_text">
- <img src="'.$RootPath.'/css/'.$theme.'/images/contract.png" title="' . _('Contract') . '" alt="" /> ' . $_SESSION['Contract'.$identifier]->CustomerName;
+ <img src="'.$RootPath.'/css/'.$Theme.'/images/contract.png" title="' . _('Contract') . '" alt="" /> ' . $_SESSION['Contract'.$identifier]->CustomerName;
if ($_SESSION['CompanyRecord']['currencydefault'] != $_SESSION['Contract'.$identifier]->CurrCode){
echo ' - ' . _('All amounts stated in') . ' ' . $_SESSION['Contract'.$identifier]->CurrCode . '<br />';
Modified: trunk/CopyBOM.php
===================================================================
--- trunk/CopyBOM.php 2012-12-29 04:00:43 UTC (rev 5784)
+++ trunk/CopyBOM.php 2012-12-29 04:47:42 UTC (rev 5785)
@@ -153,7 +153,7 @@
} //end if there is no input error
} else {
- echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/inventory.png" title="' . _('Contract') . '" alt="" />' . ' ' . $Title . '</p>';
+ echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/inventory.png" title="' . _('Contract') . '" alt="" />' . ' ' . $Title . '</p>';
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">';
echo '<div>';
Modified: trunk/CounterReturns.php
===================================================================
--- trunk/CounterReturns.php 2012-12-29 04:00:43 UTC (rev 5784)
+++ trunk/CounterReturns.php 2012-12-29 04:47:42 UTC (rev 5785)
@@ -193,7 +193,7 @@
} else { /*Not cancelling the return */
- echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/inventory.png" title="' . _('Counter Return') . '" alt="" />' . ' ';
+ echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/inventory.png" title="' . _('Counter Return') . '" alt="" />' . ' ';
echo '<font color="red" size="5">' . $_SESSION['Items'.$identifier]->CustomerName . '<br /> ' . _('Counter Return') . ' ' . _('to') . ' ' . $_SESSION['Items'.$identifier]->LocationName . ' ' . _('inventory') . ' (' . _('all amounts in') . ' ' . $_SESSION['Items'.$identifier]->DefaultCurrency . ')';
echo '</font></p>';
}
@@ -1582,9 +1582,9 @@
echo '<br /><div class="centre">';
if ($_SESSION['InvoicePortraitFormat']==0){
- echo '<img src="'.$RootPath.'/css/'.$theme.'/images/printer.png" title="' . _('Print') . '" alt="" />' . ' ' . '<a target="_blank" href="'.$RootPath.'/PrintCustTrans.php?FromTransNo='.$CreditNoteNo.'&InvOrCredit=Credit&PrintPDF=True">'. _('Print this credit note'). ' (' . _('Landscape') . ')</a><br /><br />';
+ echo '<img src="'.$RootPath.'/css/'.$Theme.'/images/printer.png" title="' . _('Print') . '" alt="" />' . ' ' . '<a target="_blank" href="'.$RootPath.'/PrintCustTrans.php?FromTransNo='.$CreditNoteNo.'&InvOrCredit=Credit&PrintPDF=True">'. _('Print this credit note'). ' (' . _('Landscape') . ')</a><br /><br />';
} else {
- echo '<img src="'.$RootPath.'/css/'.$theme.'/images/printer.png" title="' . _('Print') . '" alt="" />' . ' ' . '<a target="_blank" href="'.$RootPath.'/PrintCustTransPortrait.php?FromTransNo='.$CreditNoteNo.'&InvOrCredit=Credit&PrintPDF=True" onClick="return window.location=\'index.php\'">'. _('Print this credit note'). ' (' . _('Portrait') . ')</a><br /><br />';
+ echo '<img src="'.$RootPath.'/css/'.$Theme.'/images/printer.png" title="' . _('Print') . '" alt="" />' . ' ' . '<a target="_blank" href="'.$RootPath.'/PrintCustTransPortrait.php?FromTransNo='.$CreditNoteNo.'&InvOrCredit=Credit&PrintPDF=True" onClick="return window.location=\'index.php\'">'. _('Print this credit note'). ' (' . _('Portrait') . ')</a><br /><br />';
}
echo '<br /><br /><a href="' .htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">' . _('Start a new Counter Return') . '</a></div>';
@@ -1604,7 +1604,7 @@
if (isset($_POST['PartSearch']) and $_POST['PartSearch']!=''){
echo '<input type="hidden" name="PartSearch" value="' . _('Yes Please') . '" />';
- echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ';
+ echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ';
echo _('Search for Items') . '</p>';
echo '<div class="page_help_text">' . _('Search for Items') . _(', Searches the database for items, you can narrow the results by selecting a stock category, or just enter a partial item description or partial item code') . '.</div><br />';
echo '<table class="selection">
Modified: trunk/CounterSales.php
===================================================================
--- trunk/CounterSales.php 2012-12-29 04:00:43 UTC (rev 5784)
+++ trunk/CounterSales.php 2012-12-29 04:47:42 UTC (rev 5785)
@@ -223,7 +223,7 @@
} else { /*Not cancelling the order */
- echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/inventory.png" title="' . _('Counter Sales') . '" alt="" />' . ' ';
+ echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/inventory.png" title="' . _('Counter Sales') . '" alt="" />' . ' ';
echo $_SESSION['Items'.$identifier]->CustomerName . ' ' . _('Counter Sale') . ' ' ._('from') . ' ' . $_SESSION['Items'.$identifier]->LocationName . ' ' . _('inventory') . ' (' . _('all amounts in') . ' ' . $_SESSION['Items'.$identifier]->DefaultCurrency . ')';
echo '</p>';
}
@@ -2030,9 +2030,9 @@
echo '<br /><div class="centre">';
if ($_SESSION['InvoicePortraitFormat']==0){
- echo '<img src="'.$RootPath.'/css/'.$theme.'/images/printer.png" title="' . _('Print') . '" alt="" />' . ' ' . '<a target="_blank" href="'.$RootPath.'/PrintCustTrans.php?FromTransNo='.$InvoiceNo.'&InvOrCredit=Invoice&PrintPDF=True">'. _('Print this invoice'). ' (' . _('Landscape') . ')</a><br /><br />';
+ echo '<img src="'.$RootPath.'/css/'.$Theme.'/images/printer.png" title="' . _('Print') . '" alt="" />' . ' ' . '<a target="_blank" href="'.$RootPath.'/PrintCustTrans.php?FromTransNo='.$InvoiceNo.'&InvOrCredit=Invoice&PrintPDF=True">'. _('Print this invoice'). ' (' . _('Landscape') . ')</a><br /><br />';
} else {
- echo '<img src="'.$RootPath.'/css/'.$theme.'/images/printer.png" title="' . _('Print') . '" alt="" />' . ' ' . '<a target="_blank" href="'.$RootPath.'/PrintCustTransPortrait.php?FromTransNo='.$InvoiceNo.'&InvOrCredit=Invoice&PrintPDF=True">'. _('Print this invoice'). ' (' . _('Portrait') . ')</a><br /><br />';
+ echo '<img src="'.$RootPath.'/css/'.$Theme.'/images/printer.png" title="' . _('Print') . '" alt="" />' . ' ' . '<a target="_blank" href="'.$RootPath.'/PrintCustTransPortrait.php?FromTransNo='.$InvoiceNo.'&InvOrCredit=Invoice&PrintPDF=True">'. _('Print this invoice'). ' (' . _('Portrait') . ')</a><br /><br />';
}
echo '<br /><br /><a href="' .htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">' . _('Start a new Counter Sale') . '</a></div>';
@@ -2071,7 +2071,7 @@
ORDER BY sales DESC
LIMIT " . $_SESSION['FrequentlyOrderedItems'];
$result2 = DB_query($SQL,$db);
- echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ';
+ echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ';
echo _('Frequently Ordered Items') . '</p><br />';
echo '<div class="page_help_text">' . _('Frequently Ordered Items') . _(', shows the most frequently ordered items in the last 6 months. You can choose from this list, or search further for other items') . '.</div><br />';
echo '<table class="table1">';
@@ -2196,7 +2196,7 @@
if (isset($msg)){
echo '<div class="page_help_text"><p><b>' . $msg . '</b></p></div>';
}
- echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ';
+ echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ';
echo _('Search for Items') . '</p>';
echo '<div class="page_help_text">' . _('Search for Items') . _(', Searches the database for items, you can narrow the results by selecting a stock category, or just enter a partial item description or partial item code') . '.</div><br />';
echo '<table class="selection"><tr><td><b>' . _('Select a Stock Category') . ': </b><select tabindex="1" name="StockCat">';
Modified: trunk/CreditStatus.php
===================================================================
--- trunk/CreditStatus.php 2012-12-29 04:00:43 UTC (rev 5784)
+++ trunk/CreditStatus.php 2012-12-29 04:47:42 UTC (rev 5785)
@@ -18,7 +18,7 @@
$Errors = array();
$InputError = 0;
echo '<p class="page_title_text">
- <img src="'.$RootPath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'
+ <img src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'
</p>
<br />';
Modified: trunk/Credit_Invoice.php
===================================================================
--- trunk/Credit_Invoice.php 2012-12-29 04:00:43 UTC (rev 5784)
+++ trunk/Credit_Invoice.php 2012-12-29 04:47:42 UTC (rev 5785)
@@ -267,7 +267,7 @@
/* Always display credit quantities
NB QtyDispatched in the LineItems array is used for the quantity to credit */
-echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/credit.gif" title="' . _('Search') . '" alt="" />' . $Title.'</p>';
+echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/credit.gif" title="' . _('Search') . '" alt="" />' . $Title.'</p>';
if (!isset($_POST['ProcessCredit'])) {
Modified: trunk/Currencies.php
===================================================================
--- trunk/Currencies.php 2012-12-29 04:00:43 UTC (rev 5784)
+++ trunk/Currencies.php 2012-12-29 04:47:42 UTC (rev 5785)
@@ -26,7 +26,7 @@
$Errors = array();
-echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/money_add.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'</p>
+echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/money_add.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'</p>
<br />';
if (isset($_POST['submit'])) {
Modified: trunk/CustEDISetup.php
===================================================================
--- trunk/CustEDISetup.php 2012-12-29 04:00:43 UTC (rev 5784)
+++ trunk/CustEDISetup.php 2012-12-29 04:47:42 UTC (rev 5785)
@@ -14,7 +14,7 @@
$Errors = array();
$i=0;
-echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/customer.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'</p><br />';
+echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/customer.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'</p><br />';
if (isset($_POST['submit'])) {
//initialise no input errors assumed initially before we test
Modified: trunk/CustLoginSetup.php
===================================================================
--- trunk/CustLoginSetup.php 2012-12-29 04:00:43 UTC (rev 5784)
+++ trunk/CustLoginSetup.php 2012-12-29 04:47:42 UTC (rev 5785)
@@ -29,7 +29,7 @@
$CustomerName=$myrow['name'];
echo '<p class="page_title_text">
- <img src="'.$RootPath.'/css/'.$theme.'/images/customer.png" title="' . _('Customer') . '" alt="" />' . ' ' . _('Customer') . ' : ' . $_SESSION['CustomerID'] . ' - ' . $CustomerName. _(' has been selected') .
+ <img src="'.$RootPath.'/css/'.$Theme.'/images/customer.png" title="' . _('Customer') . '" alt="" />' . ' ' . _('Customer') . ' : ' . $_SESSION['CustomerID'] . ' - ' . $CustomerName. _(' has been selected') .
'</p>
<br />';
Modified: trunk/CustWhereAlloc.php
===================================================================
--- trunk/CustWhereAlloc.php 2012-12-29 04:00:43 UTC (rev 5784)
+++ trunk/CustWhereAlloc.php 2012-12-29 04:47:42 UTC (rev 5785)
@@ -11,7 +11,7 @@
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="' . _('Customer Where Allocated'). '" alt="" />' . $Title . '
+ <img src="'.$RootPath.'/css/'.$Theme.'/images/money_add.png" title="' . _('Customer Where Allocated'). '" alt="" />' . $Title . '
</p>
<table class="selection">
<tr>
Modified: trunk/CustomerAllocations.php
===================================================================
--- trunk/CustomerAllocations.php 2012-12-29 04:00:43 UTC (rev 5784)
+++ trunk/CustomerAllocations.php 2012-12-29 04:47:42 UTC (rev 5785)
@@ -319,7 +319,7 @@
echo '<p class="page_title_text">
- <img src="'.$RootPath.'/css/'.$theme.'/images/transactions.png" title="' . _('Allocate Receipt') . '" alt="" />' . ' ' . _('Allocate Receipts') . '
+ <img src="'.$RootPath.'/css/'.$Theme.'/images/transactions.png" title="' . _('Allocate Receipt') . '" alt="" />' . ' ' . _('Allocate Receipts') . '
</p>';
$TableHeader = '<tr>
Modified: trunk/CustomerBranches.php
===================================================================
--- trunk/CustomerBranches.php 2012-12-29 04:00:43 UTC (rev 5784)
+++ trunk/CustomerBranches.php 2012-12-29 04:47:42 UTC (rev 5785)
@@ -363,7 +363,7 @@
$TotalEnable = 0;
$TotalDisable = 0;
if ($myrow) {
- echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/customer.png" title="' . _('Customer') . '" alt="" />
+ echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/customer.png" title="' . _('Customer') . '" alt="" />
' . ' ' . _('Branches defined for'). ' '. $DebtorNo . ' - ' . $myrow[0] . '</p>';
echo '<table class="selection">
<tr>
@@ -540,7 +540,7 @@
echo '<input type="hidden" name="SelectedBranch" value="' . $SelectedBranch . '" />';
echo '<input type="hidden" name="BranchCode" value="' . $_POST['BranchCode'] . '" />';
- echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/customer.png" title="' . _('Customer') . '" alt="" />
+ echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/customer.png" title="' . _('Customer') . '" alt="" />
' . ' ' . _('Change Details for Branch'). ' '. $SelectedBranch . '</p>';
if (isset($SelectedBranch)) {
echo '<div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?DebtorNo=' . $DebtorNo. '">' . _('Show all branches defined for'). ' '. $DebtorNo . '</a></div>';
@@ -587,7 +587,7 @@
if (!isset($_POST['BranchCode'])) {
$_POST['BranchCode']='';
}
- echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/customer.png" title="' . _('Customer') . '" alt="" />' . ' ' . _('Add a Branch').'</p>';
+ echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/customer.png" title="' . _('Customer') . '" alt="" />' . ' ' . _('Add a Branch').'</p>';
echo '<table class="selection">
<tr>
<td>'._('Branch Code'). ':</td>
Modified: trunk/CustomerInquiry.php
===================================================================
--- trunk/CustomerInquiry.php 2012-12-29 04:00:43 UTC (rev 5784)
+++ trunk/CustomerInquiry.php 2012-12-29 04:47:42 UTC (rev 5785)
@@ -123,7 +123,7 @@
}
echo '<p class="page_title_text">
- <img src="'.$RootPath.'/css/'.$theme.'/images/customer.png" title="' . _('Customer') . '" alt="" /> ' . _('Customer') . ' : ' . $CustomerRecord['name'] . ' - (' . _('All amounts stated in') . ' ' . $CustomerRecord['currency'] . ')
+ <img src="'.$RootPath.'/css/'.$Theme.'/images/customer.png" title="' . _('Customer') . '" alt="" /> ' . _('Customer') . ' : ' . $CustomerRecord['name'] . ' - (' . _('All amounts stated in') . ' ' . $CustomerRecord['currency'] . ')
<br />
<br />' . _('Terms') . ' : ' . $CustomerRecord['terms'] . '
<br />' . _('Credit Limit') . ': ' . locale_number_format($CustomerRecord['creditlimit'],0) . ' ' . _('Credit Status') . ': ' . $CustomerRecord['reasondescription'] . '
@@ -249,11 +249,11 @@
$CreditInvoiceFormatString = '<td><a href="%s/Credit_Invoice.php?InvoiceNumber=%s">' . _('Credit ') .'<img src="%s/credit.gif" title="' . _('Click to credit the invoice') . '" alt="" /></a></td>';
$PreviewInvoiceFormatString = '<td><a href="%s/PrintCustTrans.php?FromTransNo=%s&InvOrCredit=Invoice">' . _('HTML ') . '<img src="%s/preview.gif" title="' . _('Click to preview the invoice') . '" alt="" /></a></td>
- <td><a href="%s/%s?FromTransNo=%s&InvOrCredit=Invoice&PrintPDF=True">' . _('PDF ') . '<img src="%s/css/' . $theme . '/images/pdf.png" title="' . _('Click for PDF') . '" alt="" /></a></td>
+ <td><a href="%s/%s?FromTransNo=%s&InvOrCredit=Invoice&PrintPDF=True">' . _('PDF ') . '<img src="%s/css/' . $Theme . '/images/pdf.png" title="' . _('Click for PDF') . '" alt="" /></a></td>
<td><a href="%s/EmailCustTrans.php?FromTransNo=%s&InvOrCredit=Invoice">' . _('Email ') . '<img src="%s/email.gif" title="' . _('Click to email the invoice') . '" alt="" /></a></td>';
$PreviewCreditFormatString = '<td><a href="%s/PrintCustTrans.php?FromTransNo=%s&InvOrCredit=Credit">' . _('HTML ') . ' <IMG SRC="%s/preview.gif" title="' . _('Click to preview the credit note') . '" /></a></td>
- <td><a href="%s/%s?FromTransNo=%s&InvOrCredit=Credit&PrintPDF=True">' . _('PDF ') . '<img src="%s/css/' . $theme . '/images/pdf.png" title="' . _('Click for PDF') . '" alt="" /></a></td>
+ <td><a href="%s/%s?FromTransNo=%s&InvOrCredit=Credit&PrintPDF=True">' . _('PDF ') . '<img src="%s/css/' . $Theme . '/images/pdf.png" title="' . _('Click for PDF') . '" alt="" /></a></td>
<td><a href="%s/EmailCustTrans.php?FromTransNo=%s&InvOrCredit=Credit">' . _('Email') . ' <img src="%s/email.gif" title="' . _('Click to email the credit note') . '" alt="" /></a></td>';
/* assumed allowed page security token 3 allows the user to create credits for invoices */
@@ -267,7 +267,7 @@
printf($BaseFormatString . $CreditInvoiceFormatString . $PreviewInvoiceFormatString .
'<td><a href="%s/GLTransInquiry.php?TypeID=%s&TransNo=%s">' . _('View GL Entries') . '
- <img src="' .$RootPath. '/css/'.$theme.'/images/gl.png" title="' . _('View the GL Entries') . '" alt="" /></a></td>
+ <img src="' .$RootPath. '/css/'.$Theme.'/images/gl.png" title="' . _('View the GL Entries') . '" alt="" /></a></td>
</tr>',
//$BaseFormatString parameters
$myrow['typename'],
@@ -283,18 +283,18 @@
//$CreditInvoiceFormatString parameters
$RootPath,
$myrow['transno'],
- $RootPath.'/css/'.$theme.'/images',
+ $RootPath.'/css/'.$Theme.'/images',
//$PreviewInvoiceFormatString parameters
$RootPath,
$myrow['transno'],
- $RootPath.'/css/'.$theme.'/images',
+ $RootPath.'/css/'.$Theme.'/images',
$RootPath,
$PrintCustomerTransactionScript,
$myrow['transno'],
$RootPath,
$RootPath,
$myrow['transno'],
- $RootPath.'/css/'.$theme.'/images',
+ $RootPath.'/css/'.$Theme.'/images',
//Parameter for string for GL Trans Inquiries
$RootPath,
$myrow['type'],
@@ -316,18 +316,18 @@
//CreditInvoiceFormatString parameters
$RootPath,
$myrow['transno'],
- $RootPath.'/css/'.$theme.'/images',
+ $RootPath.'/css/'.$Theme.'/images',
//$PreviewInvoiceFormatString parameters
$RootPath,
$myrow['transno'],
- $RootPath.'/css/'.$theme.'/images',
+ $RootPath.'/css/'.$Theme.'/images',
$RootPath,
$PrintCustomerTransactionScript,
$myrow['transno'],
$RootPath,
$RootPath,
$myrow['transno'],
- $RootPath.'/css/'.$theme.'/images');
+ $RootPath.'/css/'.$Theme.'/images');
}
} elseif($myrow['type']==10) { /*its an invoice but not high enough priveliges to credit it */
@@ -349,21 +349,21 @@
//$PreviewInvoiceFormatString parameters
$RootPath,
$myrow['transno'],
- $RootPath.'/css/'.$theme.'/images',
+ $RootPath.'/css/'.$Theme.'/images',
$RootPath,
$PrintCustomerTransactionScript,
$myrow['transno'],
$RootPath,
$RootPath,
$myrow['transno'],
- $RootPath.'/css/'.$theme.'/images');
+ $RootPath.'/css/'.$Theme.'/images');
} elseif ($myrow['type']==11) { /*its a credit note */
if ($_SESSION['CompanyRecord']['gllink_debtors']== 1 AND in_array(8,$_SESSION['AllowedPageSecurityTokens'])){
printf($BaseFormatString .
$PreviewCreditFormatString .
- '<td><a href="%s/CustomerAllocations.php?AllocTrans=%s">' . _('Allocation') . '<img src="' .$RootPath .'/css/' . $theme .'/images/allocation.png" title="' . _('Click to allocate funds') . '" alt="" /></a></td>
- <td><a href="%s/GLTransInquiry.php?TypeID=%s&TransNo=%s">' . _('View GL Entries') . ' <a><img src="' .$RootPath.'/css/'.$theme.'/images/gl.png" title="' . _('View the GL Entries') . '" alt="" /></a></td></tr>',
+ '<td><a href="%s/CustomerAllocations.php?AllocTrans=%s">' . _('Allocation') . '<img src="' .$RootPath .'/css/' . $Theme .'/images/allocation.png" title="' . _('Click to allocate funds') . '" alt="" /></a></td>
+ <td><a href="%s/GLTransInquiry.php?TypeID=%s&TransNo=%s">' . _('View GL Entries') . ' <a><img src="' .$RootPath.'/css/'.$Theme.'/images/gl.png" title="' . _('View the GL Entries') . '" alt="" /></a></td></tr>',
//$BaseFormatString parameters
$myrow['typename'],
$myrow['transno'],
@@ -378,14 +378,14 @@
//$PreviewCreditFormatString parameters
$RootPath,
$myrow['transno'],
- $RootPath.'/css/'.$theme.'/images',
+ $RootPath.'/css/'.$Theme.'/images',
$RootPath,
$PrintCustomerTransactionScript,
$myrow['transno'],
$RootPath,
$RootPath,
$myrow['transno'],
- $RootPath.'/css/'.$theme.'/images',
+ $RootPath.'/css/'.$Theme.'/images',
// hand coded format string for Allocations and GLTrans Inquiry parameters
$RootPath,
$myrow['id'],
@@ -410,26 +410,26 @@
//$PreviewCreditFormatString parameters
$RootPath,
$myrow['transno'],
- $RootPath.'/css/'.$theme.'/images',
+ $RootPath.'/css/'.$Theme.'/images',
$RootPath,
$PrintCustomerTransactionScript,
$myrow['transno'],
$RootPath,
$RootPath,
$myrow['transno'],
- $RootPath.'/css/'.$theme.'/images',
+ $RootPath.'/css/'.$Theme.'/images',
//Parameters for hand coded string to show allocations
$RootPath,
$myrow['id'],
- $RootPath.'/css/'.$theme.'/images');
+ $RootPath.'/css/'.$Theme.'/images');
}
} elseif ($myrow['type']==12 AND $myrow['totalamount']<0) { /*its a receipt which could have an allocation*/
//If security token 8 in the allowed page security tokens then assumed ok for GL trans inquiries
if ($_SESSION['CompanyRecord']['gllink_debtors']== 1 AND in_array(8,$_SESSION['AllowedPageSecurityTokens'])){
printf($BaseFormatString .
- '<td><a href="%s/CustomerAllocations.php?AllocTrans=%s">' . _('Allocation') . '<img src="' .$RootPath . '/css/' . $theme .'/images/allocation.png" title="' . _('Click to allocate funds') . '" alt="" /></a></td>
- <td><a href="%s/GLTransInquiry.php?TypeID=%s&TransNo=%s">' . _('View GL Entries') . ' <img src="' .$RootPath . '/css/' . $theme .'/images/gl.png" title="' . _('View the GL Entries') . '" alt="" /></a></td>
+ '<td><a href="%s/CustomerAllocations.php?AllocTrans=%s">' . _('Allocation') . '<img src="' .$RootPath . '/css/' . $Theme .'/images/allocation.png" title="' . _('Click to allocate funds') . '" alt="" /></a></td>
+ <td><a href="%s/GLTransInquiry.php?TypeID=%s&TransNo=%s">' . _('View GL Entries') . ' <img src="' .$RootPath . '/css/' . $Theme .'/images/gl.png" title="' . _('View the GL Entries') . '" alt="" /></a></td>
</tr>',
$myrow['typename'],
$myrow['transno'],
@@ -448,7 +448,7 @@
$myrow['transno']);
} else { //no permission for GLTrans Inquiries
printf($BaseFormatString .
- '<td><a href="%s/CustomerAllocations.php?AllocTrans=%s">' . _('Allocation') . '<img src="' .$RootPath . '/css/' . $theme .'/images/allocation.png" title="' . _('Click to allocate funds') . '" alt="" /></a></td>
+ '<td><a href="%s/CustomerAllocations.php?AllocTrans=%s">' . _('Allocation') . '<img src="' .$RootPath . '/css/' . $Theme .'/images/allocation.png" title="' . _('Click to allocate funds') . '" alt="" /></a></td>
</tr>',
$myrow['typename'],
$myrow['transno'],
Modified: trunk/CustomerPurchases.php
===================================================================
--- trunk/CustomerPurchases.php 2012-12-29 04:00:43 UTC (rev 5784)
+++ trunk/CustomerPurchases.php 2012-12-29 04:47:42 UTC (rev 5785)
@@ -28,7 +28,7 @@
$CustomerRecord = DB_fetch_array($CustomerResult);
echo '<p class="page_title_text">
- <img src="' . $RootPath . '/css/' . $theme . '/images/customer.png" title="' . _('Customer') . '" alt="" /> ' . _('Items Purchased by Customer') . ' : ' . $CustomerRecord['name'] . '
+ <img src="' . $RootPath . '/css/' . $Theme . '/images/customer.png" title="' . _('Customer') . '" alt="" /> ' . _('Items Purchased by Customer') . ' : ' . $CustomerRecord['name'] . '
</p>';
$SQL = "SELECT stockmoves.stockid,
Modified: trunk/CustomerReceipt.php
===================================================================
--- trunk/CustomerReceipt.php 2012-12-29 04:00:43 UTC (rev 5784)
+++ trunk/CustomerReceipt.php 2012-12-29 04:47:42 UTC (rev 5785)
@@ -239,7 +239,7 @@
echo '<br />
<p class="page_title_text">
- <img src="'.$RootPath.'/css/'.$theme.'/images/money_add.png" title="' . _('Allocate') . '" alt="" />' . ' ' . _('Summary of Receipt Batch').'
+ <img src="'.$RootPath.'/css/'.$Theme.'/images/money_add.png" title="' . _('Allocate') . '" alt="" />' . ' ' . _('Summary of Receipt Batch').'
</p>
<br />';
@@ -549,8 +549,8 @@
echo '<br />';
prnMsg( _('Receipt batch') . ' ' . $_SESSION['ReceiptBatch']->BatchNo . ' ' . _('has been successfully entered into the database'),'success');
- echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/printer.png" title="' . _('Print') . '" alt="" />' . ' ' . '<a href="' . $RootPath . '/PDFBankingSummary.php?BatchNo=' . $_SESSION['ReceiptBatch']->BatchNo . '">' . _('Print PDF Batch Summary') . '</a></p>';
- echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/allocation.png" title="' . _('Allocate') . '" alt="" />' . ' ' . '<a href="' . $RootPath . '/CustomerAllocations.php">' . _('Allocate Receipts') . '</a></p>';
+ echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/printer.png" title="' . _('Print') . '" alt="" />' . ' ' . '<a href="' . $RootPath . '/PDFBankingSummary.php?BatchNo=' . $_SESSION['ReceiptBatch']->BatchNo . '">' . _('Print PDF Batch Summary') . '</a></p>';
+ echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/allocation.png" title="' . _('Allocate') . '" alt="" />' . ' ' . '<a href="' . $RootPath . '/CustomerAllocations.php">' . _('Allocate Receipts') . '</a></p>';
echo '<p class="page_title_text"><a href="' . $RootPath . '/CustomerReceipt.php?NewReceipt=Yes&Type=Customer">' . _('Enter Receipts') . '</a>
</p>';
@@ -749,9 +749,9 @@
$AccountsResults = DB_query($SQL,$db,$ErrMsg,$DbgMsg);
if (isset($_POST['GLEntry'])) {
- echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/transactions.png" title="' . _('Enter Receipt') . '" alt="" />' . ' ' . _('General Ledger Receipt Entry') . '</p>';
+ echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/t...
[truncated message content] |
|
From: <dai...@us...> - 2012-12-31 07:17:11
|
Revision: 5787
http://sourceforge.net/p/web-erp/reponame/5787
Author: daintree
Date: 2012-12-31 07:17:02 +0000 (Mon, 31 Dec 2012)
Log Message:
-----------
ProperCase variable names
Modified Paths:
--------------
trunk/doc/INSTALL.txt
trunk/doc/Manual/ManualGettingStarted.html
trunk/doc/Manual/ManualNewScripts.html
trunk/locale/de_DE.utf8/Manual/ManualGettingStarted.html
trunk/locale/de_DE.utf8/Manual/ManualNewScripts.html
trunk/locale/zh_CN.utf8/Manual/ManualGettingStarted.html
trunk/locale/zh_CN.utf8/Manual/ManualNewScripts.html
trunk/locale/zh_HK.utf8/Manual/ManualGettingStarted.html
trunk/locale/zh_HK.utf8/Manual/ManualNewScripts.html
Modified: trunk/doc/INSTALL.txt
===================================================================
--- trunk/doc/INSTALL.txt 2012-12-31 06:06:50 UTC (rev 5786)
+++ trunk/doc/INSTALL.txt 2012-12-31 07:17:02 UTC (rev 5787)
@@ -251,7 +251,7 @@
config.php contains a series of user defined variables that determine how the system behaves. Critically it contains the user and password of the database connection and the type of database server being used. There is no going forward without the system being provided with this data. It is important to ensure there are no trailing characters at the end of this file - this is a common installation pitfall since some editors add a character at the end of the file.
-The contents of the config.php file appears as follows for reference purposes. The actual file config.php under the webERP directory with all the other scripts must be edited and saved. As you can see the file is well commented, the critical items are the computer $host, the $dbType, the $dbuser and the $dbpassword - other variables can in most cases be left at their defaults. Note that the sha1 encryption requires the PHP version 4.3 or greater - if you are using a prior version of php - not recommended - you could try md5 encryption. Lines commencing with // are comments and not interpreted by PHP. (Note: In prior versions a variable $DatabaseName used to be required in config.php this is no longer required as the webERP database names available are derived from the directory names under webERP/companies/ - when you create a new database using weberp-new.sql you must also copy the directory structure for the company weberp to another directory under webERP/companies with the same name as the database created. If you are using the demo data and the webERP/sql/mysql/weberp-demo.sql script then the database is created as weberp and the company directory weberp already exists under webERP/companies)
+The contents of the config.php file appears as follows for reference purposes. The actual file config.php under the webERP directory with all the other scripts must be edited and saved. As you can see the file is well commented, the critical items are the computer $host, the $DBType, the $DBUser and the $DBPassword - other variables can in most cases be left at their defaults. Note that the sha1 encryption requires the PHP version 4.3 or greater - if you are using a prior version of php - not recommended - you could try md5 encryption. Lines commencing with // are comments and not interpreted by PHP. (Note: In prior versions a variable $DatabaseName used to be required in config.php this is no longer required as the webERP database names available are derived from the directory names under webERP/companies/ - when you create a new database using weberp-new.sql you must also copy the directory structure for the company weberp to another directory under webERP/companies with the same name as the database created. If you are using the demo data and the webERP/sql/mysql/weberp-demo.sql script then the database is created as weberp and the company directory weberp already exists under webERP/companies)
// User configurable variables
@@ -261,7 +261,7 @@
$DefaultLanguage ='en_GB.utf8';
// Whether to display the admin login and password or not
-$allow_demo_mode = True;
+$AllowDemoMode = True;
// Application version
$Version = 'XXX';
@@ -280,13 +280,13 @@
$host = 'localhost';
//The type of db server being used - now only mysql is supported
-$dbType = 'mysql';
-//$dbType = 'postgres'; /*now depreciated */
-//$dbType = 'mysql';
+$DBType = 'mysql';
+//$DBType = 'postgres'; /*now depreciated */
+//$DBType = 'mysql';
// sql user & password
-$dbuser = 'weberp_db_user';
-$dbpassword = 'weberp_db_pwd';
+$DBUser = 'weberp_db_user';
+$DBPassword = 'weberp_db_pwd';
//The maximum time that a login session can be idle before automatic logout
//time is in seconds 3600 seconds in an hour
Modified: trunk/doc/Manual/ManualGettingStarted.html
===================================================================
--- trunk/doc/Manual/ManualGettingStarted.html 2012-12-31 06:06:50 UTC (rev 5786)
+++ trunk/doc/Manual/ManualGettingStarted.html 2012-12-31 07:17:02 UTC (rev 5787)
@@ -29,7 +29,7 @@
<li>When the system is hosted on a multi-homed web server farm, the session needs a directory to be specified as a permanent directory otherwise alternative servers serving subsequent pages depending on the load at the time will not be able to find the session cookie. There is a config.php setting for $SessionSavePath which should be set appropriately for the web server host.</li>
- <li>For a reason unknown some servers are unable to obtain the correct directory automatically using the line: $rootpath = dirname(htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8')); This will be evidenced by the system's inability to find the page links for the various system options. If this happens the $rootpath variable can be set to the root path of the scripts directly.</li>
+ <li>For a reason unknown some servers are unable to obtain the correct directory automatically using the line: $RootPath = dirname(htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8')); This will be evidenced by the system's inability to find the page links for the various system options. If this happens the $RootPath variable can be set to the root path of the scripts directly.</li>
</ol>
<p>The system could be used with many other database servers but it is tested and developed on MySQL. A Postgres ConnectDB.inc is provided and there is a $dbtype setting in config.php that allows the system administrator to use a Postgres database if preferred. Postgres database dumps are also available for building a postgres webERP installation. Independent benchmarks show that MySQL is one of the fastest databases for most common database tasks. It is especially fast at initiating a connection. Due to the stateless nature of the web, a new connection is required to be established on every page. This makes MySQL particularly suitable for web based applications.</p>
@@ -189,7 +189,7 @@
//DefaultLanguage to use for the login screen and the setup of new users - the users language selection will override
$DefaultLanguage ='en_GB';
- // Whether to display the demo login and password or not on the login screen<br> $allow_demo_mode = false;
+ // Whether to display the demo login and password or not on the login screen<br> $AllowDemoMode = false;
// webERP version
$Version = '3.04';
@@ -208,12 +208,12 @@
$host = 'localhost';
//The type of db server being used - currently only postgres or mysql
- $dbType = 'mysql';
- //$dbType = 'mysqli';
+ $DBType = 'mysql';
+ //$DBType = 'mysqli';
// sql user & password
- $dbuser = 'weberp_db_user';
- $dbpassword = 'weberp_db_pwd';
+ $DBUser = 'weberp_db_user';
+ $DBPassword = 'weberp_db_pwd';
//It would probably be inappropriate to allow selection of the company in a hosted environment so this option can be turned off with this parameter
$AllowCompanySelectionBox = true;
@@ -242,16 +242,16 @@
- /*The $rootpath is used in most scripts to tell the script the installation details of the files.
+ /*The $RootPath is used in most scripts to tell the script the installation details of the files.
NOTE: In some windows installation this command doesn't work and the administrator must set this to the path of the installation manually: eg. if the files are under the web server root directory then rootpath =''; if they are under weberp then weberp is the rootpath - notice no additional slashes are necessary.
*/
- $rootpath = dirname(htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8'));
- if ($rootpath == "/" OR $rootpath == "\\") {
- $rootpath = "";
+ $RootPath = dirname(htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8'));
+ if ($RootPath == "/" OR $RootPath == "\\") {
+ $RootPath = "";
}
- //$rootpath = '/web-erp';
+ //$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 */
Modified: trunk/doc/Manual/ManualNewScripts.html
===================================================================
--- trunk/doc/Manual/ManualNewScripts.html 2012-12-31 06:06:50 UTC (rev 5786)
+++ trunk/doc/Manual/ManualNewScripts.html 2012-12-31 07:17:02 UTC (rev 5787)
@@ -66,7 +66,7 @@
<h3>header.inc</h3>
-<p>This file should be included after the variable $title has been set to the name of the page. This file relies on config.php being already loaded, so session.inc (which in turn includes config.php) must be included before header.inc. The code in this script has the following functions:</p>
+<p>This file should be included after the variable $Title has been set to the name of the page. This file relies on config.php being already loaded, so session.inc (which in turn includes config.php) must be included before header.inc. The code in this script has the following functions:</p>
<ul>
<li>Includes the javascript functions used in scripts from the file javascripts/MiscFunctions.js</li>
@@ -90,7 +90,7 @@
<h3>config.php</h3>
-<p>The variables in config.php are available to all of tcripts that have included session.inc. There are not many now most of the configuration is stored in the database using the config table. However, the variables that give the software the information to connect to the database such as datbase user, password and host, together with the database type - dbtype - in fact only mysql is supported but there are two libraries that can be used the mysqli and the old mysql functions. There are a couple of other variables including the timezone, $rootpath which is the directory where the web server holds the system files. Also the php error_reporting code.</p>
+<p>The variables in config.php are available to all of tcripts that have included session.inc. There are not many now most of the configuration is stored in the database using the config table. However, the variables that give the software the information to connect to the database such as datbase user, password and host, together with the database type - dbtype - in fact only mysql is supported but there are two libraries that can be used the mysqli and the old mysql functions. There are a couple of other variables including the timezone, $RootPath which is the directory where the web server holds the system files. Also the php error_reporting code.</p>
<p>Having started the page with session.inc and header.inc - and then finishing with footer.inc much of the work to ensure a consistent look and feel is already done.</p>
Modified: trunk/locale/de_DE.utf8/Manual/ManualGettingStarted.html
===================================================================
--- trunk/locale/de_DE.utf8/Manual/ManualGettingStarted.html 2012-12-31 06:06:50 UTC (rev 5786)
+++ trunk/locale/de_DE.utf8/Manual/ManualGettingStarted.html 2012-12-31 07:17:02 UTC (rev 5787)
@@ -25,7 +25,7 @@
<ol>
<li>Einige f\xFCr Windows deklarierte Installationen kommen mit einer Einstellung f\xFCr session.save_path = /tmp, das ist nat\xFCrlich f\xFCr ein Windows-Verzeichnis unangebracht und sollte auf C:\temp oder etwas passenderes ge\xE4ndert werden.</li>
<li>Wenn das System bei Ihrem Provider auf einer Rechnergruppe gehostet wird, muss das als ein permanentes Verzeichnis angegeben werden, andernfalls finden von Seite zu Seite wechselnde Server die Anmeldeinformationen nicht. Es gibt in der config.php eine Einstellung $SessionSavePath, diese sollte in diesen F\xE4llen entsprechend gesetzt werden.</li>
-<li>Aus unklaren Gr\xFCnden sind manche Server nicht in der Lage, \xFCber $rootpath = dirname($_SERVER['PHP_SELF']); automatisch das korrekte Verzeichnis zu ermitteln. Das \xE4u\xDFert sich darin, dass das System nicht in der Lage ist, die Seiten-Links f\xFCr die unterschiedlichen Systemfunktionen zu finden. Wenn das geschieht, kann die Variable $rootpath direkt auf den Pfad gesetzt werden, in dem die Skripte liegen.</li>
+<li>Aus unklaren Gr\xFCnden sind manche Server nicht in der Lage, \xFCber $RootPath = dirname($_SERVER['PHP_SELF']); automatisch das korrekte Verzeichnis zu ermitteln. Das \xE4u\xDFert sich darin, dass das System nicht in der Lage ist, die Seiten-Links f\xFCr die unterschiedlichen Systemfunktionen zu finden. Wenn das geschieht, kann die Variable $RootPath direkt auf den Pfad gesetzt werden, in dem die Skripte liegen.</li>
</ol>
<br /><br />
Das System k\xF6nnte mit vielen anderen Datenbankservern genutzt werden, aber es ist auf MySQL entwickelt und getestet worden. Eine ConnectDB.inc-Datei f\xFCr Postgres ist mit beigef\xFCgt und es gibt eine Einstellung in der config.php ($dbtype), die es dem Systemadministrator erlaubt, eine Postrgres-Datenbank zu verwenden, wenn ihm diese lieber ist. Unabh\xE4ngige Benchmarks zeigen, dass MySQL f\xFCr die allgemeinsten Datenbankaufgaben eines der schnellsten Systeme ist. Es ist insbesondere schnell beim Aufbau der Verbindungen, und weil es in der Natur des Web liegt, dass f\xFCr jede Seite eine neue Verbindung erstellt wird, macht das MySQL f\xFCr Web-Anwendungen besonders tauglich.
@@ -139,7 +139,7 @@
$DefaultLanguage ='en_GB';<br />
<br />
// Whether to display the demo login and password or not on the login screen<br />
-$allow_demo_mode = True;<br />
+$AllowDemoMode = True;<br />
<br />
// webERP version<br />
$Version = '3.04';<br />
@@ -158,13 +158,13 @@
$host = 'localhost';<br />
<br />
//The type of db server being used - currently only postgres or mysql<br />
-$dbType = 'mysql';<br />
-//$dbType = 'postgres';<br />
-//$dbType = 'mysql';<br />
+$DBType = 'mysql';<br />
+//$DBType = 'postgres';<br />
+//$DBType = 'mysql';<br />
<br />
// sql user & password<br />
-$dbuser = 'weberp_db_user';<br />
-$dbpassword = 'weberp_db_pwd';<br />
+$DBUser = 'weberp_db_user';<br />
+$DBPassword = 'weberp_db_pwd';<br />
<br />
//It would probably be inappropriate to allow selection of the company in a hosted environment so this option can be turned off with this parameter<br />
$AllowCompanySelectionBox = true;<br />
@@ -194,17 +194,17 @@
<br />
<br />
<br />
-/*The $rootpath is used in most scripts to tell the script the installation details of the files.<br />
+/*The $RootPath is used in most scripts to tell the script the installation details of the files.<br />
<br />
NOTE: In some windows installation this command doesn't work and the administrator must set this to the path of the installation manually:
eg. if the files are under the web server root directory then rootpath =''; if they are under weberp then weberp is the rootpath - notice no additional slashes are necessary.<br />
*/<br />
<br />
-$rootpath = dirname($_SERVER['PHP_SELF']);<br />
-if ($rootpath == "/" OR $rootpath == "\\") {<br />
- $rootpath = "";<br />
+$RootPath = dirname($_SERVER['PHP_SELF']);<br />
+if ($RootPath == "/" OR $RootPath == "\\") {<br />
+ $RootPath = "";<br />
}<br />
-//$rootpath = '/web-erp';<br />
+//$RootPath = '/web-erp';<br />
<br />
/* 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
Modified: trunk/locale/de_DE.utf8/Manual/ManualNewScripts.html
===================================================================
--- trunk/locale/de_DE.utf8/Manual/ManualNewScripts.html 2012-12-31 06:06:50 UTC (rev 5786)
+++ trunk/locale/de_DE.utf8/Manual/ManualNewScripts.html 2012-12-31 07:17:02 UTC (rev 5787)
@@ -18,7 +18,7 @@
</ul>
<font size="+1"><b>header.inc</b></font>
<br /><br />
-Diese Datei sollte eingebunden werden, nachdem die Variable $title mit dem Namen der Seite versorgt wurde. Sie setzt voraus, dass die config.php bereits geladen wurde ebenso muss die session.inc nat\xFCrlich vor der header.inc eingebunden sein. Das Programm hat die folgenden Funktionen:
+Diese Datei sollte eingebunden werden, nachdem die Variable $Title mit dem Namen der Seite versorgt wurde. Sie setzt voraus, dass die config.php bereits geladen wurde ebenso muss die session.inc nat\xFCrlich vor der header.inc eingebunden sein. Das Programm hat die folgenden Funktionen:
<br /><br />
<ul>
<li>es gibt den Seitenkopf mit dem Men\xFC (Hauptmen\xFC, Kundensuche, Materialsuche, Lieferantensuche, Handbuch, Abmelden) aus.</li>
@@ -30,7 +30,7 @@
<br /><br />
<font size="+1"><b>config.php</b></font>
<br /><br />
-Der Programmierer sollte sich selbst mit den Variablen in config.php vertraut machen, weil diese f\xFCr alle Scripte, welche die session.inc eingebunden haben, verf\xFCgbar sind. Von grundlegender Bedeutung ist $rootpath, welche das Verzeichnis beschreibt, in dem der Webserver die Systemdateien findet. Wenn Sie die Seite mit session.inc und header.inc beginnen und mit footer.inc abschlie\xDFen ist die meiste Arbeit schon getan, die ein einheitliches Aussehen sichert.
+Der Programmierer sollte sich selbst mit den Variablen in config.php vertraut machen, weil diese f\xFCr alle Scripte, welche die session.inc eingebunden haben, verf\xFCgbar sind. Von grundlegender Bedeutung ist $RootPath, welche das Verzeichnis beschreibt, in dem der Webserver die Systemdateien findet. Wenn Sie die Seite mit session.inc und header.inc beginnen und mit footer.inc abschlie\xDFen ist die meiste Arbeit schon getan, die ein einheitliches Aussehen sichert.
<br /><br />
<font size="+1"><b>PDFStarter.php</b></font>
<br /><br />
Modified: trunk/locale/zh_CN.utf8/Manual/ManualGettingStarted.html
===================================================================
--- trunk/locale/zh_CN.utf8/Manual/ManualGettingStarted.html 2012-12-31 06:06:50 UTC (rev 5786)
+++ trunk/locale/zh_CN.utf8/Manual/ManualGettingStarted.html 2012-12-31 07:17:02 UTC (rev 5787)
@@ -62,7 +62,7 @@
</SPAN></FONT></SPAN></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="zh-CN">\xB5\xB1ϵͳ\xB0\xB2װ\xD4\xDAһ\xB8\xF6\xB6\xE0\xD3û\xA7\xB5\xC4\xCD\xF8ҳ\xB7\xFE\xCE\xF1\xC6\xF7\xA3\xA8ũ\xB3\xA1\xA3\xA9\xC9\xCFʱ\xA3\xAC\xD5\xE2\xB8\xF6</SPAN></FONT></SPAN></FONT></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><SPAN LANG="en-US"><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">session</SPAN></SPAN></FONT></FONT></SPAN></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="zh-CN">\xCA\xC7\xD0\xE8Ҫָ\xB6\xA8һ\xB8\xF6\xB3\xA4\xC6ڵ\xC4·\xBE\xB6\xA3\xAC\xB7\xF1\xD4\xF2\xB5Ļ\xB0\xA3\xAC\xC6\xE4\xCB\xFB\xBF\xC9\xCC\xE6\xB4\xFA\xB7\xFE\xCE\xF1\xC6\xF7\xB7\xFE\xCE\xF1\xCCṩ\xBA\xF3\xD0\xF8\xB5\xC4ҳ\xC3\xE6\xB7\xC3\xCEʷ\xFE\xCE\xF1ʱ\xA3\xACҪ\xD2\xC0\xC0\xB5\xD5\xE2\xB8\xF6\xD4\xD8\xC8\xEBֵ\xBE\xCD\xCE\xA8\xD5ҵ\xBD</SPAN></FONT></SPAN></FONT></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><SPAN LANG="en-US"><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">session</SPAN></SPAN></FONT></FONT></SPAN></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="zh-CN">\xB5\xC4</SPAN></FONT></SPAN></FONT></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><SPAN LANG="en-US"><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">cookie</SPAN></SPAN></FONT></FONT></SPAN></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="zh-CN">\xC1ˡ\xA3\xC5\xE4\xD6\xC3\xCEļ\xFE</SPAN></FONT></SPAN></FONT></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><SPAN LANG="en-US"><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">config.php</SPAN></SPAN></FONT></FONT></SPAN></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="zh-CN">\xD6е\xC4</SPAN></FONT></SPAN></FONT></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><SPAN LANG="en-US"><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">$SessionSavePath</SPAN></SPAN></FONT></FONT></SPAN></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="zh-CN">\xD0\xE8Ҫ\xD5\xEB\xB6\xD4\xCD\xF8ҳ\xB7\xFE\xCE\xF1\xC6\xF7\xD7\xF7\xCAʵ\xB1\xC9趨\xA1\xA3</SPAN></FONT></SPAN></FONT></FONT></P>
<P STYLE="margin-left: 0.85cm; text-indent: -0.85cm; margin-top: 0.18cm; margin-bottom: 0.18cm">
<FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><SPAN LANG="en-US"><FONT SIZE=1 STYLE="font-size: 8pt"><SPAN LANG="en-US">l</SPAN></FONT><FONT SIZE=1 STYLE="font-size: 8pt"><SPAN LANG="en-US">
-</SPAN></FONT></SPAN></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="zh-CN">\xD3\xC9\xD3\xDAδ֪\xB5\xC4ԭ\xD2\xF2\xA3\xAC\xD3\xD0Щ\xB7\xFE\xCE\xF1\xC6\xF7\xA3\xAC\xD4\xDAʹ\xD3\xC3\xC8\xE7\xCF\xC2\xC5\xE4\xD6ã\xBA</SPAN></FONT></SPAN></FONT></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><SPAN LANG="en-US"><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">$rootpath=dirnam($_SERVER[</SPAN></SPAN></FONT></FONT><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff">‘</SPAN></FONT><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">PHP_SEL</SPAN></SPAN></FONT></FONT><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff">’</SPAN></FONT><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">]);,</SPAN></SPAN></FONT></FONT></SPAN></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="zh-CN">\xB2\xBB\xC4\xDC\xD7Զ\xAFȡ\xB5\xC3\xD5\xFDȷ\xB5\xC4·\xBE\xB6\xA1\xA3\xD5\xE2\xD3ɲ\xBBͬϵͳѡ\xCF\xEE\xCE\xA8\xD5ҵ\xBDҳ\xC3\xE6\xC1\xB4\xBDӶ\xF8\xB5õ\xBD֤\xC3\xF7\xA1\xA3\xC8\xE7\xB9\xFB\xB3\xF6\xCF\xD6\xC1\xCB\xD5\xE2\xD6\xD6\xC7\xE9\xBF\x{1A3B3F}\xC9\xD2\xD4ֱ\xBDӽ\xAB</SPAN></FONT></SPAN></FONT></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><SPAN LANG="en-US"><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">$rootpath</SPAN></SPAN></FONT></FONT></SPAN></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="zh-CN">\xB1\xE4\xC1\xBF\xC9\xE8\xD6\xC3Ϊ\xBDű\xBE\xB5ĸ\xF9·\xBE\xB6\xA1\xA3</SPAN></FONT></SPAN></FONT></FONT></P>
+</SPAN></FONT></SPAN></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="zh-CN">\xD3\xC9\xD3\xDAδ֪\xB5\xC4ԭ\xD2\xF2\xA3\xAC\xD3\xD0Щ\xB7\xFE\xCE\xF1\xC6\xF7\xA3\xAC\xD4\xDAʹ\xD3\xC3\xC8\xE7\xCF\xC2\xC5\xE4\xD6ã\xBA</SPAN></FONT></SPAN></FONT></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><SPAN LANG="en-US"><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">$RootPath=dirnam($_SERVER[</SPAN></SPAN></FONT></FONT><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff">‘</SPAN></FONT><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">PHP_SEL</SPAN></SPAN></FONT></FONT><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff">’</SPAN></FONT><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">]);,</SPAN></SPAN></FONT></FONT></SPAN></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="zh-CN">\xB2\xBB\xC4\xDC\xD7Զ\xAFȡ\xB5\xC3\xD5\xFDȷ\xB5\xC4·\xBE\xB6\xA1\xA3\xD5\xE2\xD3ɲ\xBBͬϵͳѡ\xCF\xEE\xCE\xA8\xD5ҵ\xBDҳ\xC3\xE6\xC1\xB4\xBDӶ\xF8\xB5õ\xBD֤\xC3\xF7\xA1\xA3\xC8\xE7\xB9\xFB\xB3\xF6\xCF\xD6\xC1\xCB\xD5\xE2\xD6\xD6\xC7\xE9\xBF\x{1A3B3F}\xC9\xD2\xD4ֱ\xBDӽ\xAB</SPAN></FONT></SPAN></FONT></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><SPAN LANG="en-US"><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">$RootPath</SPAN></SPAN></FONT></FONT></SPAN></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="zh-CN">\xB1\xE4\xC1\xBF\xC9\xE8\xD6\xC3Ϊ\xBDű\xBE\xB5ĸ\xF9·\xBE\xB6\xA1\xA3</SPAN></FONT></SPAN></FONT></FONT></P>
<P STYLE="margin-bottom: 0.42cm"><BR><BR>
</P>
<P STYLE="margin-bottom: 0.18cm"><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="zh-CN">\xB1\xBEϵͳ\xBF\xC9\xD2\xD4\xD4\xCB\xD3\xC3\xD3ںܶ\xE0\xC6\xE4\xCB\xFB\xB5\xC4\xCA\xFD\xBEݿ\xE2\xB7\xFE\xCE\xF1\xC6\xF7\xA3\xAC</SPAN></FONT></SPAN></FONT><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="zh-CN">\xB5\xAB\xCA\xC7\xCB\xFC\xCAǻ\xF9\xD3\xDA</SPAN></FONT></SPAN></FONT></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><SPAN LANG="en-US"><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">MySQL</SPAN></SPAN></FONT></FONT></SPAN></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="zh-CN">\xBF\xAA\xB7\xA2\xBAͲ\xE2\xCAԵġ\xA3ϵͳ\xB9\xDC\xC0\xEDԱ\xC8\xE7\xD3\xD0ƫ\xBAã\xAC\xBF\xC9\xD2\xD4ʹ\xD3\xC3</SPAN></FONT></SPAN></FONT></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><SPAN LANG="en-US"><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">Postgres</SPAN></SPAN></FONT></FONT></SPAN></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="zh-CN">\xCA\xFD\xBEݿ⣬\xCB\xFB\xBF\xC9\xD2\xD4ͨ\xB9\xFD\xC9\xE8\xD6\xC3</SPAN></FONT></SPAN></FONT></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><SPAN LANG="en-US"><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">config.php</SPAN></SPAN></FONT></FONT></SPAN></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="zh-CN">\xCEļ\xFE\xD6е\xC4</SPAN></FONT></SPAN></FONT></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><SPAN LANG="en-US"><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">$dbtype</SPAN></SPAN></FONT></FONT></SPAN></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="zh-CN">\xB1\xE4\xC1\xBF\xC0\xB4ʹ\xD3\xC3</SPAN></FONT></SPAN></FONT></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><SPAN LANG="en-US"><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">PostgresConnectDB.inc.</SPAN></SPAN></FONT></FONT></SPAN></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="zh-CN">\xB1\xBEϵͳ\xCCṩ\xC1\xCB</SPAN></FONT></SPAN></FONT></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><SPAN LANG="en-US"><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">PostgresDatabase</SPAN></SPAN></FONT></FONT></SPAN></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="zh-CN">\xB1\xB8\xB7\xDD</SPAN></FONT></SPAN></FONT></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><SPAN LANG="en-US"><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">,</SPAN></SPAN></FONT></FONT></SPAN></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="zh-CN">\xB9\xA9\xB0\xB2װһ\xB8\xF6</SPAN></FONT></SPAN></FONT></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><SPAN LANG="en-US"><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">PostgresWebERP</SPAN></SPAN></FONT></FONT></SPAN></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="zh-CN">ʹ\xD3á\xA3\xB6\xC0\xC1\xA2\xB5IJ\xE2\xCA\xD4\xCF\xD4ʾ</SPAN></FONT></SPAN></FONT></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><SPAN LANG="en-US"><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">MySQL</SPAN></SPAN></FONT></FONT></SPAN></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="zh-CN">\xD4\xDA\xCD\xEA\xB3ɴ\xF3\xB6\xE0\xC6\xD5ͨ\xCA\xFD\xBEݿ\xE2\xC8\xCE\xCE\xF1ʱ\xA3\xAC\xCA\xC7\xD7\xEE\xBF\xEC\xB5\xC4\xCA\xFD\xBEݿ\xE2֮һ\xA1\xA3\xCB\xFC\xD4ڽ\xA8\xC1\xA2\xC1\xAC\xBD\xD3ʱ\xD3\xC8\xC6\xE4Ѹ\xCB١\xA3\xD3\xC9\xD3\xDA\xCD\xF8ҳ\xB5\xC4\xCE\xDE״̬\xCA\xF4\xD0ԣ\xAC\xB7\xC3\xCE\xCAÿ\xB8\xF6\xD0\xC2ҳ\xC3涼Ҫ\xC7\xF3\xD6\xD8\xD0½\xA8\xC1\xA2\xC1\xAC\xBDӡ\xA3\xD5\xE2ʹ</SPAN></FONT></SPAN></FONT></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><SPAN LANG="en-US"><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">MySQL</SPAN></SPAN></FONT></FONT></SPAN></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="zh-CN">\xCCر\xF0\xCAʺ\xCF</SPAN></FONT></SPAN></FONT></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><SPAN LANG="en-US"><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">Web</SPAN></SPAN></FONT></FONT></SPAN></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="zh-CN">Ϊ\xBB\xF9\xB4\xA1\xB5ij\xCC\xD0\xF2\xA1\xA3</SPAN></FONT></SPAN></FONT></FONT></P>
@@ -224,14 +224,14 @@
<P STYLE="margin-bottom: 0.18cm"><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><SPAN LANG="en-US"><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">//</SPAN></SPAN></FONT></FONT></SPAN></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="zh-CN">\xCA\xFD\xBEݿ\xE2\xB5\xC4\xC1\xAC\xBD\xD3\xD0\xC5Ϣ</SPAN></FONT></SPAN></FONT></FONT></P>
<P STYLE="margin-bottom: 0.18cm"><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><SPAN LANG="en-US"><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">//$host</SPAN></SPAN></FONT></FONT></SPAN></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="zh-CN">\xCA\xC7\xCA\xC7\xCA\xFD\xBEݿ\xE2\xB4\xE6\xB7ŵĵ\xE7\xC4Ե\xC4</SPAN></FONT></SPAN></FONT></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><SPAN LANG="en-US"><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">ip</SPAN></SPAN></FONT></FONT></SPAN></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="zh-CN">\xB5\xD8ַ\xBB\xF2\xD5ߵ\xE7\xC4\xD4\xC3\xFB\xB3ơ\xA3</SPAN></FONT></SPAN></FONT></FONT></P>
<P STYLE="margin-bottom: 0.18cm"><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><SPAN LANG="en-US"><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">//</SPAN></SPAN></FONT></FONT></SPAN></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="zh-CN">\xBC\xD9\xC9\xE8\xCD\xF8ҳ\xB5ķ\xFE\xCE\xF1\xC6\xF7Ҳ\xCA\xC7</SPAN></FONT></SPAN></FONT></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><SPAN LANG="en-US"><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">sql</SPAN></SPAN></FONT></FONT></SPAN></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="zh-CN">\xB7\xFE\xCE\xF1\xC6\xF7</SPAN></FONT></SPAN></FONT></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><SPAN LANG="en-US"><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">$host=</SPAN></SPAN></FONT></FONT><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff">‘</SPAN></FONT><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">localhost</SPAN></SPAN></FONT></FONT><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff">’</SPAN></FONT><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">;</SPAN></SPAN></FONT></FONT></SPAN></FONT></P>
-<P STYLE="margin-bottom: 0.18cm"><FONT COLOR="#000000"><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">//Thetypeofdbserverbeingused-currentlyonlypostgresormysql$dbType='mysql';</SPAN></SPAN></FONT></FONT></FONT></P>
-<P STYLE="margin-bottom: 0.18cm"><FONT COLOR="#000000"><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">//$dbType='postgres';</SPAN></SPAN></FONT></FONT></FONT></P>
-<P STYLE="margin-bottom: 0.18cm"><FONT COLOR="#000000"><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">//$dbType='mysql';</SPAN></SPAN></FONT></FONT></FONT></P>
-<P STYLE="margin-bottom: 0.18cm"><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="zh-CN">\xCA\xFD\xBEݿ\xE2\xB7\xFE\xCE\xF1\xC6\xF7\xB5\xC4\xD6\xD6\xC0\xE0—Ŀǰֻ\xD3\xD0</SPAN></FONT></SPAN></FONT></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><SPAN LANG="en-US"><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">postgres</SPAN></SPAN></FONT></FONT></SPAN></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="zh-CN">\xBB\xF2\xD5\xDF</SPAN></FONT></SPAN></FONT></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><SPAN LANG="en-US"><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">mysql.$dbType=</SPAN></SPAN></FONT></FONT><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff">’</SPAN></FONT><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">mysql</SPAN></SPAN></FONT></FONT><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff">’</SPAN></FONT><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">;</SPAN></SPAN></FONT></FONT></SPAN></FONT></P>
-<P STYLE="margin-bottom: 0.18cm"><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><SPAN LANG="en-US"><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">//$dbType=</SPAN></SPAN></FONT></FONT><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff">’</SPAN></FONT><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">postgres</SPAN></SPAN></FONT></FONT><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff">’</SPAN></FONT><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">;</SPAN></SPAN></FONT></FONT></SPAN></FONT></P>
-<P STYLE="margin-bottom: 0.18cm"><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><SPAN LANG="en-US"><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">//$dbType=</SPAN></SPAN></FONT></FONT><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff">’</SPAN></FONT><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">mysql</SPAN></SPAN></FONT></FONT><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff">’</SPAN></FONT><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">;</SPAN></SPAN></FONT></FONT></SPAN></FONT></P>
-<P STYLE="margin-bottom: 0.18cm"><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><SPAN LANG="en-US"><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">//sqluser$password$dbuser=</SPAN></SPAN></FONT></FONT><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff">’</SPAN></FONT><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">weberp_db_user</SPAN></SPAN></FONT></FONT><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff">’</SPAN></FONT><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">;$dbpassword=</SPAN></SPAN></FONT></FONT><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff">’</SPAN></FONT><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">weberp_db_pwd</SPAN></SPAN></FONT></FONT><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff">’”</SPAN></FONT></SPAN></FONT></P>
-<P STYLE="margin-bottom: 0.18cm"><FONT COLOR="#000000"><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">//sqluser&password$dbuser='weberp_db_user';$dbpassword='weberp_db_pwd';</SPAN></SPAN></FONT></FONT></FONT></P>
+<P STYLE="margin-bottom: 0.18cm"><FONT COLOR="#000000"><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">//Thetypeofdbserverbeingused-currentlyonlypostgresormysql$DBType='mysql';</SPAN></SPAN></FONT></FONT></FONT></P>
+<P STYLE="margin-bottom: 0.18cm"><FONT COLOR="#000000"><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">//$DBType='postgres';</SPAN></SPAN></FONT></FONT></FONT></P>
+<P STYLE="margin-bottom: 0.18cm"><FONT COLOR="#000000"><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">//$DBType='mysql';</SPAN></SPAN></FONT></FONT></FONT></P>
+<P STYLE="margin-bottom: 0.18cm"><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="zh-CN">\xCA\xFD\xBEݿ\xE2\xB7\xFE\xCE\xF1\xC6\xF7\xB5\xC4\xD6\xD6\xC0\xE0—Ŀǰֻ\xD3\xD0</SPAN></FONT></SPAN></FONT></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><SPAN LANG="en-US"><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">postgres</SPAN></SPAN></FONT></FONT></SPAN></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="zh-CN">\xBB\xF2\xD5\xDF</SPAN></FONT></SPAN></FONT></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><SPAN LANG="en-US"><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">mysql.$DBType=</SPAN></SPAN></FONT></FONT><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff">’</SPAN></FONT><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">mysql</SPAN></SPAN></FONT></FONT><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff">’</SPAN></FONT><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">;</SPAN></SPAN></FONT></FONT></SPAN></FONT></P>
+<P STYLE="margin-bottom: 0.18cm"><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><SPAN LANG="en-US"><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">//$DBType=</SPAN></SPAN></FONT></FONT><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff">’</SPAN></FONT><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">postgres</SPAN></SPAN></FONT></FONT><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff">’</SPAN></FONT><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">;</SPAN></SPAN></FONT></FONT></SPAN></FONT></P>
+<P STYLE="margin-bottom: 0.18cm"><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><SPAN LANG="en-US"><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">//$DBType=</SPAN></SPAN></FONT></FONT><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff">’</SPAN></FONT><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">mysql</SPAN></SPAN></FONT></FONT><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff">’</SPAN></FONT><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">;</SPAN></SPAN></FONT></FONT></SPAN></FONT></P>
+<P STYLE="margin-bottom: 0.18cm"><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><SPAN LANG="en-US"><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">//sqluser$password$DBUser=</SPAN></SPAN></FONT></FONT><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff">’</SPAN></FONT><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">weberp_db_user</SPAN></SPAN></FONT></FONT><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff">’</SPAN></FONT><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">;$DBPassword=</SPAN></SPAN></FONT></FONT><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff">’</SPAN></FONT><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">weberp_db_pwd</SPAN></SPAN></FONT></FONT><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff">’”</SPAN></FONT></SPAN></FONT></P>
+<P STYLE="margin-bottom: 0.18cm"><FONT COLOR="#000000"><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">//sqluser&password$DBUser='weberp_db_user';$DBPassword='weberp_db_pwd';</SPAN></SPAN></FONT></FONT></FONT></P>
<P STYLE="margin-bottom: 0.42cm"><BR><BR>
</P>
<P STYLE="margin-bottom: 0.18cm"><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="zh-CN">\xD4\xDA\xD6\xF7\xBB\xFA\xCDйܵĻ\xB7\xBE\xB3\xCF£\xAC\xD4\xCA\xD0\xEDѡ\xD4\xF1\xB9\xAB˾\xBB\xF2\xD0\xED\xCADz\xBB\xBA\xCF\xCAʵģ\xAC\xD2\xF2\xB4˿\xC9\xD2\xD4ѡ\xD4\xF1\xB9ر\xD5\xD5\xE2\xB8\xF6\xB2\xCE\xCA\xFD</SPAN></FONT></SPAN></FONT></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><SPAN LANG="en-US"><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">$AllowCompanySelectionBox=true;</SPAN></SPAN></FONT></FONT></SPAN></FONT></P>
@@ -262,12 +262,12 @@
<P STYLE="margin-bottom: 0.18cm"><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><SPAN LANG="en-US"><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">//</SPAN></SPAN></FONT></FONT></SPAN></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="zh-CN">\xD3û\xA7\xC5\xE4\xD6õı\xE4\xC1\xBF\xBD\xE1\xCA\xF8</SPAN></FONT></SPAN></FONT></FONT></P>
<P STYLE="margin-bottom: 0.18cm"><BR><BR>
</P>
-<P STYLE="margin-bottom: 0.18cm"><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><SPAN LANG="en-US"><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">/*$rootpath</SPAN></SPAN></FONT></FONT></SPAN></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="zh-CN">\xD3\xC3\xD4ںܶ\xE0\xBDű\xBE\xC0\xEF\xB8\xE6\xCB\xDF\xCEļ\xFE\xB5İ\xB2װ\xB5\xC4ϸ\xBDڡ\xA3</SPAN></FONT></SPAN></FONT></FONT></P>
+<P STYLE="margin-bottom: 0.18cm"><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><SPAN LANG="en-US"><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">/*$RootPath</SPAN></SPAN></FONT></FONT></SPAN></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="zh-CN">\xD3\xC3\xD4ںܶ\xE0\xBDű\xBE\xC0\xEF\xB8\xE6\xCB\xDF\xCEļ\xFE\xB5İ\xB2װ\xB5\xC4ϸ\xBDڡ\xA3</SPAN></FONT></SPAN></FONT></FONT></P>
<P STYLE="margin-bottom: 0.18cm"><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="zh-CN">ע\xD2⣺\xD3\xD0ʱ\xB0\xB2װ\xD4\xDA</SPAN></FONT></SPAN></FONT></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><SPAN LANG="en-US"><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">windows</SPAN></SPAN></FONT></FONT></SPAN></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="zh-CN">ʱ\xA3\xAC\xD5\xE2\xB8\xF6\xC3\xFC\xC1\xC6\xF0\xD7\xF7\xD3á\xA3\xB4\xCBʱ\xA3\xACϵͳ\xB9\xDC\xC0\xEDԱ\xB1\xD8\xD0\xEB\xB0\xD1\xD5\xE2\xB8\xF6·\xBE\xB6\xBD\xF8\xD0\xD0\xCAֶ\xAF\xC9\xE8\xD6ã\xBA\xC0\xFD\xC8磺\xC8\xE7\xB9\xFB\xCEļ\xFE\xD4\xDA\xCD\xF8ҳ\xB7\xFE\xCE\xF1\xC6\xF7\xB5ĸ\xF9·\xBE\xB6\xA3\xAC\xC4\xC7ô</SPAN></FONT></SPAN></FONT></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><SPAN LANG="en-US"><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">rootpath=;</SPAN></SPAN></FONT></FONT></SPAN></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="zh-CN">\xC8\xE7\xB9\xFB\xCA\xC7\xD4\xDA</SPAN></FONT></SPAN></FONT></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><SPAN LANG="en-US"><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">weberp</SPAN></SPAN></FONT></FONT></SPAN></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="zh-CN">\xCF\xC2\xC3棬\xC4\xC7ô</SPAN></FONT></SPAN></FONT></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><SPAN LANG="en-US"><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">weberp</SPAN></SPAN></FONT></FONT></SPAN></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="zh-CN">\xBE\xCD\xCAǸ\xF9·\xBE\xB6</SPAN></FONT></SPAN></FONT></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><SPAN LANG="en-US"><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">-</SPAN></SPAN></FONT></FONT></SPAN></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="zh-CN">ע\xD2⣬\xB2\xBBҪ\xB6\xE0\xBC\xD3</SPAN></FONT></SPAN></FONT></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><SPAN LANG="en-US"><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">/.</SPAN></SPAN></FONT></FONT></SPAN></FONT></P>
<P STYLE="margin-bottom: 0.42cm"><BR><BR>
</P>
-<P STYLE="margin-bottom: 0.18cm"><FONT COLOR="#000000"><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">$rootpath=dirname(htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8'));</SPAN></SPAN></FONT></FONT></FONT></P>
-<P STYLE="margin-bottom: 0.18cm"><FONT COLOR="#000000"><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">if($rootpath=="/"OR$rootpath=="\\"){$rootpath="";}//$rootpath='/web-erp';</SPAN></SPAN></FONT></FONT></FONT></P>
+<P STYLE="margin-bottom: 0.18cm"><FONT COLOR="#000000"><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">$RootPath=dirname(htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8'));</SPAN></SPAN></FONT></FONT></FONT></P>
+<P STYLE="margin-bottom: 0.18cm"><FONT COLOR="#000000"><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">if($RootPath=="/"OR$RootPath=="\\"){$RootPath="";}//$RootPath='/web-erp';</SPAN></SPAN></FONT></FONT></FONT></P>
<P STYLE="margin-bottom: 0.18cm"><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><SPAN LANG="en-US"><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">/*</SPAN></SPAN></FONT></FONT></SPAN></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="zh-CN">\xB3\xFD\xC1\xCB</SPAN></FONT></SPAN></FONT></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><SPAN LANG="en-US"><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">E_NOTICE</SPAN></SPAN></FONT></FONT></SPAN></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="zh-CN">\xCD⣬\xB1\xA8\xB8\xE6\xCB\xF9\xD3д\xED\xCE\xF3\xA3\xAC\xD5\xE2\xB8\xF6\xCA\xC7</SPAN></FONT></SPAN></FONT></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><SPAN LANG="en-US"><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">php.ini</SPAN></SPAN></FONT></FONT></SPAN></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="zh-CN">\xB5\xC4Ĭ\xC8\xCF\xC9\xE8\xD6ã\xAC\xB5\xAB\xC7\xEBȷ\xC8\xCF\xD4\xDA\xD5\xE2\xC0\xEF\xD7\xF6\xC1\xCBǿ\xD6\xC6\xC9\xE8\xD6ã\xAC\xB4\xF2\xBF\xAA֪ͨ\xBB\xF9\xB1\xBE\xB5Ĵ\xED\xCE\xF3\xBBᵼ\xD6\xC2\xC6ƻ\xB5</SPAN></FONT></SPAN></FONT></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><SPAN LANG="en-US"><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">*/</SPAN></SPAN></FONT></FONT></SPAN></FONT></P>
<P STYLE="margin-bottom: 0.18cm"><FONT COLOR="#000000"><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">error_reporting(E_ALL&~E_NOTICE);</SPAN></SPAN></FONT></FONT></FONT></P>
<P STYLE="margin-bottom: 0.18cm"><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><SPAN LANG="en-US"><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">/*</SPAN></SPAN></FONT></FONT></SPAN></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="zh-CN">\xC7\xEBȷ\xB1\xA3û\xD3\xD0\xC6\xE4\xCB\xFB\xC8κζ\xAB\xCE\xF7\xC1ˣ\xAC\xC9\xF5\xD6\xC1\xD4ڣ\xBF</SPAN></FONT></SPAN></FONT></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><SPAN LANG="en-US"><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">></SPAN></SPAN></FONT></FONT></SPAN></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT COLOR="#000000"><SPAN STYLE="background: #ffffff"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="zh-CN">֮\xCD\xE2\xB5\xC4һ\xB8\xF6\xBFո\xF1</SPAN></FONT></SPAN></FONT></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><SPAN LANG="en-US"><FONT COLOR="#000000"><FONT SIZE=4 STYLE="font-size: 13pt"><SPAN LANG="en-US"><SPAN STYLE="background: #ffffff">*/?></SPAN></SPAN></FONT></FONT></SPAN></FONT></P>
Modified: trunk/locale/zh_CN.utf8/Manual/ManualNewScripts.html
===================================================================
--- trunk/locale/zh_CN.utf8/Manual/ManualNewScripts.html 2012-12-31 06:06:50 UTC (rev 5786)
+++ trunk/locale/zh_CN.utf8/Manual/ManualNewScripts.html 2012-12-31 07:17:02 UTC (rev 5787)
@@ -74,7 +74,7 @@
- </SPAN></FONT></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT SIZE=4>\xD5\xE2\xB8\xF6\xC9\xE8\xD6\xC3\xC1\xCB</FONT></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT SIZE=4><SPAN LANG="en-US"><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace">locale</FONT></SPAN></FONT></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT SIZE=4>\xB2\xA2\xC7Ҹ\xBA\xD4\xF0\xB4\xA6\xC0\xEDʹ\xD3\xC3</FONT></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT SIZE=4><SPAN LANG="en-US"><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace">php-gettext</FONT></SPAN></FONT></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT SIZE=4>\xA3\xAC\xC8\xE7\xB9\xFB</FONT></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT SIZE=4><SPAN LANG="en-US"><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace">web</FONT></SPAN></FONT></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT SIZE=4>\xB7\xFE\xCE\xF1\xC6\xF7\xC9\xCFû\xD3б\xBE\xB5ص\xC4</FONT></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT SIZE=4><SPAN LANG="en-US"><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace">gettext</FONT></SPAN></FONT></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT SIZE=4>\xBF\xE2\xB5Ļ\xB0\xA1\xA3</FONT></FONT></P>
</UL>
<P><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT SIZE=4><SPAN LANG="en-US"><B>header.inc</B>
-<BR></SPAN></FONT></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT SIZE=4>\xB5\xB1</FONT></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT SIZE=4><SPAN LANG="en-US"><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace">$title</FONT></SPAN></FONT></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT SIZE=4>\xB1\xBB\xC9\xE8\xD6\xC3Ϊҳ\xC3\xE6\xC3\xFB\xB3ƺ\xF3\xA3\xAC\xD0\xE8Ҫ\xD2\xFD\xD3\xC3\xD5\xE2\xB8\xF6\xCEļ\xFE\xA1\xA3\xD5\xE2\xB8\xF6\xCEļ\xFE\xD2\xC0\xC0\xB5\xD2Ѿ\xAD\xC9ϴ\xAB\xB5\xC4</FONT></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT SIZE=4><SPAN LANG="en-US"><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace">config.php</FONT></SPAN></FONT></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT SIZE=4>\xA3\xAC\xD2\xF2\xB4\xCB</FONT></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT SIZE=4><SPAN LANG="en-US"><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace">session.inc(</FONT></SPAN></FONT></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT SIZE=4>\xCB\xFC\xD2\xC0\xD0\xF2\xB0\xFC\xBA\xAC\xC1\xCB</FONT></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT SIZE=4><SPAN LANG="en-US"><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace">config.php)</FONT></SPAN></FONT></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT SIZE=4>\xB1\xD8\xD0\xEB\xD4\xDA</FONT></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT SIZE=4><SPAN LANG="en-US"><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace">header.inc</FONT></SPAN></FONT></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT SIZE=4>֮ǰ\xD2\xFD\xD3á\xA3\xD5\xE2\xB8\xF6\xBDű\xBE\xB5Ĵ\xFA\xC2\xEB\xD3\xD0\xD2\xD4\xCF\xC2\xD7\xF7\xD3ã\xBA</FONT></FONT></P>
+<BR></SPAN></FONT></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT SIZE=4>\xB5\xB1</FONT></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT SIZE=4><SPAN LANG="en-US"><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace">$Title</FONT></SPAN></FONT></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT SIZE=4>\xB1\xBB\xC9\xE8\xD6\xC3Ϊҳ\xC3\xE6\xC3\xFB\xB3ƺ\xF3\xA3\xAC\xD0\xE8Ҫ\xD2\xFD\xD3\xC3\xD5\xE2\xB8\xF6\xCEļ\xFE\xA1\xA3\xD5\xE2\xB8\xF6\xCEļ\xFE\xD2\xC0\xC0\xB5\xD2Ѿ\xAD\xC9ϴ\xAB\xB5\xC4</FONT></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT SIZE=4><SPAN LANG="en-US"><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace">config.php</FONT></SPAN></FONT></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT SIZE=4>\xA3\xAC\xD2\xF2\xB4\xCB</FONT></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT SIZE=4><SPAN LANG="en-US"><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace">session.inc(</FONT></SPAN></FONT></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT SIZE=4>\xCB\xFC\xD2\xC0\xD0\xF2\xB0\xFC\xBA\xAC\xC1\xCB</FONT></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT SIZE=4><SPAN LANG="en-US"><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace">config.php)</FONT></SPAN></FONT></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT SIZE=4>\xB1\xD8\xD0\xEB\xD4\xDA</FONT></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT SIZE=4><SPAN LANG="en-US"><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace">header.inc</FONT></SPAN></FONT></FONT><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT SIZE=4>֮ǰ\xD2\xFD\xD3á\xA3\xD5\xE2\xB8\xF6\xBDű\xBE\xB5Ĵ\xFA\xC2\xEB\xD3\xD0\xD2\xD4\xCF\xC2\xD7\xF7\xD3ã\xBA</FONT></FONT></P>
<UL>
<LI><P STYLE="margin-bottom: 0cm"><FONT FACE="\xBF\xAC\xCC\xE5_GB2312, monospace"><FONT SIZE=4>\xD2...
[truncated message content] |
|
From: <dai...@us...> - 2013-01-02 03:22:41
|
Revision: 5788
http://sourceforge.net/p/web-erp/reponame/5788
Author: daintree
Date: 2013-01-02 03:22:38 +0000 (Wed, 02 Jan 2013)
Log Message:
-----------
fix english strings per Thomas Lie
Modified Paths:
--------------
trunk/AccountGroups.php
trunk/InternalStockCategoriesByRole.php
trunk/PDFLowGP.php
trunk/UpgradeDatabase.php
trunk/WorkOrderReceive.php
trunk/Z_ImportFixedAssets.php
trunk/doc/Change.log
Modified: trunk/AccountGroups.php
===================================================================
--- trunk/AccountGroups.php 2012-12-31 07:17:02 UTC (rev 5787)
+++ trunk/AccountGroups.php 2013-01-02 03:22:38 UTC (rev 5788)
@@ -44,7 +44,7 @@
if (isset($_POST['MoveGroup'])) {
$sql="UPDATE chartmaster SET group_='" . $_POST['DestinyAccountGroup'] . "' WHERE group_='" . $_POST['OriginalAccountGroup'] . "'";
$ErrMsg = _('An error occurred in moving the account group');
- $DbgMsg = _('The SQL that was used to moving the account group was');
+ $DbgMsg = _('The SQL that was used to move the account group was');
$result = DB_query($sql,$db,$ErrMsg,$DbgMsg);
echo '<div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">' . _('Review Account Groups') . '</a></div>';
prnMsg( _('All accounts in the account group:') . ' ' . $_POST['OriginalAccountGroup'] . ' ' . _('have been changed to the account group:') . ' ' . $_POST['DestinyAccountGroup'],'success');
Modified: trunk/InternalStockCategoriesByRole.php
===================================================================
--- trunk/InternalStockCategoriesByRole.php 2012-12-31 07:17:02 UTC (rev 5787)
+++ trunk/InternalStockCategoriesByRole.php 2013-01-02 03:22:38 UTC (rev 5788)
@@ -19,9 +19,9 @@
$SelectedType='';
}
-if (!isset($_GET['delete']) and (ContainsIllegalCharacters($SelectedType) OR mb_strpos($SelectedType,' ')>0)){
+if (!isset($_GET['delete']) AND (ContainsIllegalCharacters($SelectedType) OR mb_strpos($SelectedType,' ')>0)){
$InputError = 1;
- prnMsg(_('The contain any of the following characters " \' - & or a space'),'error');
+ prnMsg(_('The contain spaces nor any of the following characters') / ': " & \' -';,'error');
}
if (isset($_POST['SelectedRole'])){
$SelectedRole = mb_strtoupper($_POST['SelectedRole']);
@@ -119,7 +119,7 @@
$result = DB_query($SQL,$db);
echo '<option value="">' . _('Not Yet Selected') . '</option>';
while ($myrow = DB_fetch_array($result)) {
- if (isset($SelectedRole) and $myrow['secroleid']==$SelectedRole) {
+ if (isset($SelectedRole) AND $myrow['secroleid']==$SelectedRole) {
echo '<option selected="selected" value="';
} else {
echo '<option value="';
Modified: trunk/PDFLowGP.php
===================================================================
--- trunk/PDFLowGP.php 2012-12-31 07:17:02 UTC (rev 5787)
+++ trunk/PDFLowGP.php 2013-01-02 03:22:38 UTC (rev 5788)
@@ -136,7 +136,7 @@
<td><input type="text" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" name="ToDate" size="10" maxlength="10" value="' . $_POST['ToDate'] . '" /></td>
</tr>';
- echo '<tr><td>' . _('Show sales with GP') . '%' . _('below') . ':</td>
+ echo '<tr><td>' . _('Show sales with GP % below') . ':</td>
<td><input type="text" class="number" name="GPMin" maxlength="3" size="3" value="' . $_POST['GPMin'] . '" /></td>
</tr>';
Modified: trunk/UpgradeDatabase.php
===================================================================
--- trunk/UpgradeDatabase.php 2012-12-31 07:17:02 UTC (rev 5787)
+++ trunk/UpgradeDatabase.php 2013-01-02 03:22:38 UTC (rev 5788)
@@ -162,7 +162,7 @@
break;
} //end switch
}
- } else { //dbType is not mysql or mysqli
+ } else { //$DBType is not mysql or mysqli
prnMsg(_('Only mysql upgrades are performed seamlessly at this time. Your database will need to be manually updated'),'info');
}
Modified: trunk/WorkOrderReceive.php
===================================================================
--- trunk/WorkOrderReceive.php 2012-12-31 07:17:02 UTC (rev 5787)
+++ trunk/WorkOrderReceive.php 2013-01-02 03:22:38 UTC (rev 5788)
@@ -373,7 +373,7 @@
$SQL = "UPDATE workorders SET
costissued = costissued+" . ($AutoIssueCompRow['qtypu'] * $QuantityReceived * $AutoIssueCompRow['cost']) ."
WHERE wo='" . $_POST['WO'] . "'";
- $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('Could not be update the work order cost for an auto-issue component because');
+ $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('Could not update the work order cost for an auto-issue component because');
$DbgMsg = _('The following SQL to update the work order cost was used');
$Result = DB_query($SQL, $db, $ErrMsg, $DbgMsg, true);
Modified: trunk/Z_ImportFixedAssets.php
===================================================================
--- trunk/Z_ImportFixedAssets.php 2012-12-31 07:17:02 UTC (rev 5787)
+++ trunk/Z_ImportFixedAssets.php 2013-01-02 03:22:38 UTC (rev 5788)
@@ -55,7 +55,7 @@
$i = 0;
foreach ($HeaderRow as $FieldName) {
if ( mb_strtoupper($FieldName) != mb_strtoupper($FieldNames[$i]) ) {
- prnMsg (_('The selected file contains fields in the incorrect order ('. mb_strtoupper($FieldName). ' != '. mb_strtoupper($FieldNames[$i]). _('. Download a template and ensuer that fields are in the same sequence as the template.')),'error');
+ prnMsg (_('The selected file contains fields in the incorrect order ('. mb_strtoupper($FieldName). ' != '. mb_strtoupper($FieldNames[$i]). '. ' ._('Download a template and ensure that fields are in the same sequence as the template.')),'error');
fclose($FileHandle);
include('includes/footer.inc');
exit;
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-12-31 07:17:02 UTC (rev 5787)
+++ trunk/doc/Change.log 2013-01-02 03:22:38 UTC (rev 5788)
@@ -1,5 +1,6 @@
webERP Change Log
+2/1/13 Thomas Lie: corrections to various strings where English was suspect!!
29/12/12 Phil: on log out destroy session and show the login form - avoiding nasty errors
29/12/12 Phil: Proper casing of $Title $RootPath $Theme $DBType $DBUser $DBPassword $AllowDemoMode variables - may make upgrade tricky!!
24/12/12 Ricard: OutstandingGRNs.php now has show on screen option
|
×
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