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 suppli...
[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...
[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 */
+
+ ...
[truncated message content] |
|
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 = "SEL...
[truncated message content] |
|
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);
$Assem...
[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_Marg...
[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;...
[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
=================================================================...
[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=>48...
[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
-#: SalesB...
[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 Revers...
[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"...
[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...
[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