Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[5820] trunk
|
From: <dai...@us...> - 2013-02-24 04:28:20
|
Revision: 5820
http://sourceforge.net/p/web-erp/reponame/5820
Author: daintree
Date: 2013-02-24 04:28:04 +0000 (Sun, 24 Feb 2013)
Log Message:
-----------
Changes pre 4.10.1 release
Modified Paths:
--------------
trunk/AccountSections.php
trunk/AgedDebtors.php
trunk/BankMatching.php
trunk/BankReconciliation.php
trunk/ConfirmDispatch_Invoice.php
trunk/ContractBOM.php
trunk/ContractOtherReqts.php
trunk/Contracts.php
trunk/CustWhereAlloc.php
trunk/CustomerAllocations.php
trunk/CustomerInquiry.php
trunk/CustomerReceipt.php
trunk/CustomerTransInquiry.php
trunk/Customers.php
trunk/DailyBankTransactions.php
trunk/DebtorsAtPeriodEnd.php
trunk/FixedAssetCategories.php
trunk/FixedAssetDepreciation.php
trunk/FixedAssetItems.php
trunk/FixedAssetLocations.php
trunk/FixedAssetRegister.php
trunk/FixedAssetTransfer.php
trunk/GLAccountCSV.php
trunk/GLAccountReport.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/PDFBankingSummary.php
trunk/PDFChequeListing.php
trunk/PDFCustTransListing.php
trunk/PDFCustomerList.php
trunk/PDFSellThroughSupportClaim.php
trunk/Payments.php
trunk/PrintCustStatements.php
trunk/PrintCustTrans.php
trunk/PrintCustTransPortrait.php
trunk/ReorderLevelLocation.php
trunk/SalesGraph.php
trunk/SelectAsset.php
trunk/SelectContract.php
trunk/SelectCreditItems.php
trunk/StockLocStatus.php
trunk/StockStatus.php
trunk/StockTransferControlled.php
trunk/Stocks.php
trunk/SuppFixedAssetChgs.php
trunk/UpgradeDatabase.php
trunk/css/silverwolf/default.css
trunk/doc/Change.log
trunk/doc/Manual/ManualAPITutorial.html
trunk/doc/Manual/ManualARInquiries.html
trunk/doc/Manual/ManualARReports.html
trunk/doc/Manual/ManualARTransactions.html
trunk/doc/Manual/ManualAccountsPayable.html
trunk/doc/Manual/ManualAccountsReceivable.html
trunk/doc/Manual/ManualContracts.html
trunk/doc/Manual/ManualContributors.html
trunk/doc/Manual/ManualFixedAssets.html
trunk/doc/Manual/ManualGeneralLedger.html
trunk/doc/Manual/ManualOutline.php
trunk/flags/CRC.gif
trunk/includes/ConnectDB.inc
trunk/includes/MainMenuLinksArray.php
trunk/includes/MiscFunctions.php
trunk/install/index.php
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
Added Paths:
-----------
trunk/css/next.png
trunk/css/previous.png
trunk/includes/PDFSellThroughSupportClaimPageHeader.inc
trunk/locale/zh_TW.utf8/LC_MESSAGES/
trunk/locale/zh_TW.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_TW.utf8/LC_MESSAGES/messages.po
Removed Paths:
-------------
trunk/UploadPriceList.php
trunk/sql/mysql/upgrade4.10-4.11.sql
Modified: trunk/AccountSections.php
===================================================================
--- trunk/AccountSections.php 2013-02-22 03:49:55 UTC (rev 5819)
+++ trunk/AccountSections.php 2013-02-24 04:28:04 UTC (rev 5820)
@@ -6,6 +6,9 @@
$Title = _('Account Sections');
+$ViewTopic = 'GeneralLedger';
+$BookMark = 'AccountSections';
+
include('includes/header.inc');
// SOME TEST TO ENSURE THAT AT LEAST INCOME AND COST OF SALES ARE THERE
Modified: trunk/AgedDebtors.php
===================================================================
--- trunk/AgedDebtors.php 2013-02-22 03:49:55 UTC (rev 5819)
+++ trunk/AgedDebtors.php 2013-02-24 04:28:04 UTC (rev 5820)
@@ -439,6 +439,10 @@
} else { /*The option to print PDF was not hit */
$Title=_('Aged Debtor Analysis');
+
+ $ViewTopic = 'ARReports';
+ $BookMark = 'AgedDebtors';
+
include('includes/header.inc');
echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'</p><br />';
Modified: trunk/BankMatching.php
===================================================================
--- trunk/BankMatching.php 2013-02-22 03:49:55 UTC (rev 5819)
+++ trunk/BankMatching.php 2013-02-24 04:28:04 UTC (rev 5820)
@@ -4,6 +4,10 @@
include('includes/session.inc');
$Title = _('Bank Account Matching');
+
+$ViewTopic = 'GeneralLedger';
+$BookMark = 'BankMatching';
+
include('includes/header.inc');
if ((isset($_GET['Type']) AND $_GET['Type']=='Receipts')
Modified: trunk/BankReconciliation.php
===================================================================
--- trunk/BankReconciliation.php 2013-02-22 03:49:55 UTC (rev 5819)
+++ trunk/BankReconciliation.php 2013-02-24 04:28:04 UTC (rev 5820)
@@ -6,6 +6,9 @@
$Title = _('Bank Reconciliation');
+$ViewTopic= 'GeneralLedger';
+$BookMark = 'BankAccounts';
+
include('includes/header.inc');
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
Modified: trunk/ConfirmDispatch_Invoice.php
===================================================================
--- trunk/ConfirmDispatch_Invoice.php 2013-02-22 03:49:55 UTC (rev 5819)
+++ trunk/ConfirmDispatch_Invoice.php 2013-02-24 04:28:04 UTC (rev 5820)
@@ -8,6 +8,9 @@
include('includes/session.inc');
$Title = _('Confirm Dispatches and Invoice An Order');
+$ViewTopic= 'ARTransactions';
+$BookMark = 'ConfirmInvoice';
+
include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
include('includes/FreightCalculation.inc');
@@ -778,7 +781,8 @@
rate,
invtext,
shipvia,
- consignment )
+ consignment,
+ packages )
VALUES (
'". $InvoiceNo . "',
10,
@@ -796,7 +800,8 @@
'" . $_SESSION['CurrencyRate'] . "',
'" . $_POST['InvoiceText'] . "',
'" . $_SESSION['Items'.$identifier]->ShipVia . "',
- '" . $_POST['Consignment'] . "' )";
+ '" . $_POST['Consignment'] . "',
+ '" . $_POST['Packages'] . "')";
$ErrMsg =_('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The debtor transaction record could not be inserted because');
$DbgMsg = _('The following SQL to insert the debtor transaction record was used');
@@ -1635,7 +1640,9 @@
if (!isset($_POST['Consignment'])) {
$_POST['Consignment']='';
}
-
+ if (!isset($_POST['Packages'])) {
+ $_POST['Packages']='1';
+ }
if (!isset($_POST['InvoiceText'])) {
$_POST['InvoiceText']='';
}
@@ -1652,6 +1659,12 @@
</tr>';
$j++;
echo '<tr>
+ <td>' . _('No Of Packages in Delivery'). ':</td>
+ <td><input tabindex="'.$j.'" type="text" maxlength="6" size="6" class="number" name="Packages" value="' . $_POST['Packages'] . '" /></td>
+ </tr>';
+
+ $j++;
+ echo '<tr>
<td>'._('Action For Balance'). ':</td>
<td><select tabindex="'.$j.'" name="BOPolicy"><option selected="selected" value="BO">'._('Automatically put balance on back order').'</option><option value="CAN">'._('Cancel any quantities not delivered').'</option></select></td>
</tr>';
Modified: trunk/ContractBOM.php
===================================================================
--- trunk/ContractBOM.php 2013-02-22 03:49:55 UTC (rev 5819)
+++ trunk/ContractBOM.php 2013-02-24 04:28:04 UTC (rev 5820)
@@ -5,6 +5,7 @@
include('includes/DefineContractClass.php');
include('includes/session.inc');
+
$Title = _('Contract Bill of Materials');
$identifier=$_GET['identifier'];
@@ -17,6 +18,10 @@
header('Location:' . $RootPath . '/Contracts.php');
exit;
}
+
+$ViewTopic= 'Contracts';
+$BookMark = 'AddToContract';
+
include('includes/header.inc');
if (isset($_POST['UpdateLines']) OR isset($_POST['BackToHeader'])) {
Modified: trunk/ContractOtherReqts.php
===================================================================
--- trunk/ContractOtherReqts.php 2013-02-22 03:49:55 UTC (rev 5819)
+++ trunk/ContractOtherReqts.php 2013-02-24 04:28:04 UTC (rev 5820)
@@ -17,6 +17,10 @@
header('Location:' . $RootPath . '/Contracts.php');
exit;
}
+
+$ViewTopic= 'Contracts';
+$BookMark = 'AddToContract';
+
include('includes/header.inc');
Modified: trunk/Contracts.php
===================================================================
--- trunk/Contracts.php 2013-02-22 03:49:55 UTC (rev 5819)
+++ trunk/Contracts.php 2013-02-24 04:28:04 UTC (rev 5820)
@@ -15,6 +15,9 @@
$_POST['SelectedCustomer']=$_GET['CustomerID'];
}
+$ViewTopic= 'Contracts';
+$BookMark = 'CreateContract';
+
include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
Modified: trunk/CustWhereAlloc.php
===================================================================
--- trunk/CustWhereAlloc.php 2013-02-22 03:49:55 UTC (rev 5819)
+++ trunk/CustWhereAlloc.php 2013-02-24 04:28:04 UTC (rev 5820)
@@ -4,6 +4,10 @@
include('includes/session.inc');
$Title = _('Customer How Paid Inquiry');
+
+$ViewTopic = 'ARInquiries';
+$BookMark = 'WhereAllocated';
+
include('includes/header.inc');
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
@@ -18,24 +22,23 @@
<td>' . _('Type') . ':</td>
<td><select tabindex="1" name="TransType"> ';
-$sql = "SELECT typeid, typename FROM systypes WHERE typeid = 10 OR typeid=12";
-$resultTypes = DB_query($sql,$db);
-while ($myrow=DB_fetch_array($resultTypes)){
- if (isset($_POST['TransType'])){
- if ($myrow['typeid'] == $_POST['TransType']){
- echo '<option selected="selected" value="' . $myrow['typeid'] . '">' . $myrow['typename'] . '</option>';
- } else {
- echo '<option value="' . $myrow['typeid'] . '">' . $myrow['typename'] . '</option>';
- }
+
+ if (!isset($_POST['TransType'])){
+ $_POST['TransType']='10';
+ }
+ if ($_POST['TransType']==10){
+ echo '<option selected="selected" value="10">' . _('Invoices') . '</option>
+ <option value="12">' . _('Receipts') . '</option>';
} else {
- echo '<option value="' . $myrow['typeid'] . '">' . $myrow['typename'] . '</option>';
+ echo '<option selected="selected" value="12">' . _('Receipts') . '</option>
+ <option selected="selected" value="10">' . _('Invoices') . '</option>';
}
}
echo '</select></td>';
if (!isset($_POST['TransNo'])) {$_POST['TransNo']='';}
echo '<td>'._('Transaction Number').':</td>
- <td><input tabindex="2" type="text" name="TransNo" maxlength="10" size="10" value="'. $_POST['TransNo'] . '" /></td>
+ <td><input tabindex="2" type="text" class="number" name="TransNo" maxlength="10" size="10" value="'. $_POST['TransNo'] . '" /></td>
</tr>
</table>
<br />
Modified: trunk/CustomerAllocations.php
===================================================================
--- trunk/CustomerAllocations.php 2013-02-22 03:49:55 UTC (rev 5819)
+++ trunk/CustomerAllocations.php 2013-02-24 04:28:04 UTC (rev 5820)
@@ -12,6 +12,10 @@
include('includes/DefineCustAllocsClass.php');
include('includes/session.inc');
$Title = _('Customer Receipt') . '/' . _('Credit Note Allocations');
+
+$ViewTopic= 'ARTransactions';
+$BookMark = 'CustomerAllocations';
+
include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
Modified: trunk/CustomerInquiry.php
===================================================================
--- trunk/CustomerInquiry.php 2013-02-22 03:49:55 UTC (rev 5819)
+++ trunk/CustomerInquiry.php 2013-02-24 04:28:04 UTC (rev 5820)
@@ -6,6 +6,10 @@
include('includes/session.inc');
$Title = _('Customer Inquiry');
+
+$ViewTopic = 'ARInquiries';
+$BookMark = 'CustomerInquiry';
+
include('includes/header.inc');
// always figure out the SQL required from the inputs available
Modified: trunk/CustomerReceipt.php
===================================================================
--- trunk/CustomerReceipt.php 2013-02-22 03:49:55 UTC (rev 5819)
+++ trunk/CustomerReceipt.php 2013-02-24 04:28:04 UTC (rev 5820)
@@ -7,6 +7,15 @@
$Title = _('Receipt Entry');
+
+if ($_GET['Type']=='GL') {
+ $ViewTopic= 'GeneralLedger';
+ $BookMark = 'GLReceipts';
+} else {
+ $ViewTopic= 'ARTransactions';
+ $BookMark = 'CustomerReceipts';
+}
+
include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
Modified: trunk/CustomerTransInquiry.php
===================================================================
--- trunk/CustomerTransInquiry.php 2013-02-22 03:49:55 UTC (rev 5819)
+++ trunk/CustomerTransInquiry.php 2013-02-24 04:28:04 UTC (rev 5820)
@@ -4,6 +4,10 @@
include('includes/session.inc');
$Title = _('Customer Transactions Inquiry');
+
+$ViewTopic = 'ARInquiries';
+$BookMark = 'ARTransInquiry';
+
include('includes/header.inc');
echo '<p class="page_title_text">
Modified: trunk/Customers.php
===================================================================
--- trunk/Customers.php 2013-02-22 03:49:55 UTC (rev 5819)
+++ trunk/Customers.php 2013-02-24 04:28:04 UTC (rev 5820)
@@ -4,6 +4,14 @@
include('includes/session.inc');
+if (isset($_POST['Edit']) or isset($_GET['Edit']) or isset($_GET['DebtorNo'])) {
+ $ViewTopic = 'AccountsReceivable';
+ $BookMark = 'AmendCustomer';
+} else {
+ $ViewTopic = 'AccountsReceivable';
+ $BookMark = 'NewCustomer';
+}
+
$Title = _('Customer Maintenance');
/* webERP manual links before header.inc */
$ViewTopic= 'AccountsReceivable';
@@ -452,7 +460,7 @@
<td>' . _('Country') . ':</td>
<td><select name="Address6">';
foreach ($CountriesArray as $CountryEntry => $CountryName){
- if (isset($_POST['Address6']) AND ($_POST['Address6'] == $CountryName)){
+ if (isset($_POST['Address6']) AND (strtoupper($_POST['Address6']) == strtoupper($CountryName))){
echo '<option selected="selected" value="' . $CountryName . '">' . $CountryName .'</option>';
}elseif (!isset($_POST['Address6']) AND $CountryName == "") {
echo '<option selected="selected" value="' . $CountryName . '">' . $CountryName .'</option>';
@@ -728,7 +736,7 @@
<td>' . _('Country') . ':</td>
<td><select name="Address6">';
foreach ($CountriesArray as $CountryEntry => $CountryName){
- if (isset($_POST['Address6']) AND ($_POST['Address6'] == $CountryName)){
+ if (isset($_POST['Address6']) AND (strtoupper($_POST['Address6']) == strtoupper($CountryName))){
echo '<option selected="selected" value="' . $CountryName . '">' . $CountryName .'</option>';
}elseif (!isset($_POST['Address6']) AND $CountryName == "") {
echo '<option selected="selected" value="' . $CountryName . '">' . $CountryName .'</option>';
@@ -767,7 +775,7 @@
<td>' . _('Country') . ':</td>
<td><select name="Address6">';
foreach ($CountriesArray as $CountryEntry => $CountryName){
- if (isset($_POST['Address6']) AND ($_POST['Address6'] == $CountryName)){
+ if (isset($_POST['Address6']) AND (strtoupper($_POST['Address6']) == strtoupper($CountryName))){
echo '<option selected="selected" value="' . $CountryName . '">' . $CountryName .'</option>';
}elseif (!isset($_POST['Address6']) AND $CountryName == "") {
echo '<option selected="selected" value="' . $CountryName . '">' . $CountryName .'</option>';
@@ -934,7 +942,7 @@
$result=DB_query("SELECT currency FROM currencies WHERE currabrev='".$_POST['CurrCode']."'",$db);
$myrow=DB_fetch_array($result);
echo '<tr>
- <td>' . _('Credit Status') . ':</td>
+ <td>' . _('Customers Currency') . ':</td>
<td>' . $myrow['currency'] . '</td></tr>';
} else {
$result=DB_query("SELECT currency, currabrev FROM currencies",$db);
@@ -952,23 +960,16 @@
echo '</select></td>
</tr>';
}
- /*added lines 8/23/2007 by Morris Kelly to get po line parameter Y/N*/
+ echo '<tr>
+ <td>' . _('Require Customer PO Line on SO') . ':</td>';
if (isset($_GET['Modify'])) {
if ($_POST['CustomerPOLine']==0){
- echo '<tr>
- <td>' . _('Credit Status') . ':</td>
- <td>'._('No') . '</td>
- </tr>';
+ echo '<td>'._('No') . '</td>';
} else {
- echo '<tr>
- <td>' . _('Credit Status') . ':</td>
- <td>'._('Yes') . '</td>
- </tr>';
+ echo '<td>'._('Yes') . '</td>';
}
} else {
- echo '<tr>
- <td>' . _('Require Customer PO Line on SO') . ':</td>
- <td><select name="CustomerPOLine">';
+ echo '<td><select name="CustomerPOLine">';
if ($_POST['CustomerPOLine']==0){
echo '<option selected="selected" value="0">' . _('No') . '</option>';
echo '<option value="1">' . _('Yes') . '</option>';
@@ -976,12 +977,12 @@
echo '<option value="0">' . _('No') . '</option>';
echo '<option selected="selected" value="1">' . _('Yes') . '</option>';
}
- echo '</select></td>
- </tr>';
+ echo '</select></td>';
}
+ echo '</tr>';
if (isset($_GET['Modify'])) {
- if ($_POST['CustomerPOLine']==0){
+ if ($_POST['InvAddrBranch']==0){
echo '<tr>
<td>' . _('Invoice Addressing') . ':</td>
<td>'._('Address to HO').'</td>
Modified: trunk/DailyBankTransactions.php
===================================================================
--- trunk/DailyBankTransactions.php 2013-02-22 03:49:55 UTC (rev 5819)
+++ trunk/DailyBankTransactions.php 2013-02-24 04:28:04 UTC (rev 5820)
@@ -4,6 +4,10 @@
include ('includes/session.inc');
$Title = _('Bank Transactions Inquiry');
+
+$ViewTopic= 'GeneralLedger';
+$BookMark = 'DailyBankTransactions';
+
include('includes/header.inc');
echo '<p class="page_title_text">
Modified: trunk/DebtorsAtPeriodEnd.php
===================================================================
--- trunk/DebtorsAtPeriodEnd.php 2013-02-22 03:49:55 UTC (rev 5819)
+++ trunk/DebtorsAtPeriodEnd.php 2013-02-24 04:28:04 UTC (rev 5820)
@@ -121,6 +121,10 @@
} else { /*The option to print PDF was not hit */
$Title=_('Debtor Balances');
+
+ $ViewTopic = 'ARReports';
+ $BookMark = 'PriorMonthDebtors';
+
include('includes/header.inc');
echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/customer.png" title="' . _('Search') .
'" alt="" />' . ' ' . $Title.'</p><br />';
Modified: trunk/FixedAssetCategories.php
===================================================================
--- trunk/FixedAssetCategories.php 2013-02-22 03:49:55 UTC (rev 5819)
+++ trunk/FixedAssetCategories.php 2013-02-24 04:28:04 UTC (rev 5820)
@@ -6,6 +6,9 @@
$Title = _('Fixed Asset Category Maintenance');
+$ViewTopic = 'FixedAssets';
+$BookMark = 'AssetCategories';
+
include('includes/header.inc');
echo '<div class="centre">
Modified: trunk/FixedAssetDepreciation.php
===================================================================
--- trunk/FixedAssetDepreciation.php 2013-02-22 03:49:55 UTC (rev 5819)
+++ trunk/FixedAssetDepreciation.php 2013-02-24 04:28:04 UTC (rev 5820)
@@ -4,6 +4,9 @@
include('includes/session.inc');
$Title = _('Depreciation Journal Entry');
+$ViewTopic = 'FixedAssets';
+$BookMark = 'AssetDepreciation';
+
include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
Modified: trunk/FixedAssetItems.php
===================================================================
--- trunk/FixedAssetItems.php 2013-02-22 03:49:55 UTC (rev 5819)
+++ trunk/FixedAssetItems.php 2013-02-24 04:28:04 UTC (rev 5820)
@@ -4,6 +4,10 @@
include('includes/session.inc');
$Title = _('Fixed Assets');
+
+$ViewTopic = 'FixedAssets';
+$BookMark = 'AssetItems';
+
include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
Modified: trunk/FixedAssetLocations.php
===================================================================
--- trunk/FixedAssetLocations.php 2013-02-22 03:49:55 UTC (rev 5819)
+++ trunk/FixedAssetLocations.php 2013-02-24 04:28:04 UTC (rev 5820)
@@ -4,6 +4,10 @@
include('includes/session.inc');
$Title = _('Fixed Asset Locations');
+
+$ViewTopic = 'FixedAssets';
+$BookMark = 'AssetLocations';
+
include('includes/header.inc');
echo '<p class="page_title_text">
<img src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'
Modified: trunk/FixedAssetRegister.php
===================================================================
--- trunk/FixedAssetRegister.php 2013-02-22 03:49:55 UTC (rev 5819)
+++ trunk/FixedAssetRegister.php 2013-02-24 04:28:04 UTC (rev 5820)
@@ -245,6 +245,10 @@
</form>';
}
} else {
+
+ $ViewTopic = 'FixedAssets';
+ $BookMark = 'AssetRegister';
+
include ('includes/header.inc');
echo '<p class="page_title_text"><img src="' . $RootPath . '/css/' . $Theme . '/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title . '</p>';
Modified: trunk/FixedAssetTransfer.php
===================================================================
--- trunk/FixedAssetTransfer.php 2013-02-22 03:49:55 UTC (rev 5819)
+++ trunk/FixedAssetTransfer.php 2013-02-24 04:28:04 UTC (rev 5820)
@@ -6,6 +6,9 @@
$Title = _('Change Asset Location');
+$ViewTopic = 'FixedAssets';
+$BookMark = 'AssetTransfer';
+
include('includes/header.inc');
echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/magnifier.png" title="' . _('Search') .
Modified: trunk/GLAccountCSV.php
===================================================================
--- trunk/GLAccountCSV.php 2013-02-22 03:49:55 UTC (rev 5819)
+++ trunk/GLAccountCSV.php 2013-02-24 04:28:04 UTC (rev 5820)
@@ -5,6 +5,10 @@
include ('includes/session.inc');
$Title = _('General Ledger Account Report');
+
+$ViewTopic= 'GeneralLedger';
+$BookMark = 'GLAccountCSV';
+
include('includes/header.inc');
include('includes/GLPostings.inc');
Modified: trunk/GLAccountReport.php
===================================================================
--- trunk/GLAccountReport.php 2013-02-22 03:49:55 UTC (rev 5819)
+++ trunk/GLAccountReport.php 2013-02-24 04:28:04 UTC (rev 5820)
@@ -3,6 +3,9 @@
include ('includes/session.inc');
+$ViewTopic= 'GeneralLedger';
+$BookMark = 'GLAccountReport';
+
if (isset($_POST['Period'])){
$SelectedPeriod = $_POST['Period'];
} elseif (isset($_GET['Period'])){
Modified: trunk/GLBalanceSheet.php
===================================================================
--- trunk/GLBalanceSheet.php 2013-02-22 03:49:55 UTC (rev 5819)
+++ trunk/GLBalanceSheet.php 2013-02-24 04:28:04 UTC (rev 5820)
@@ -10,6 +10,10 @@
include('includes/SQL_CommonFunctions.inc');
include('includes/AccountSectionsDef.inc'); // This loads the $Sections variable
+
+$ViewTopic= 'GeneralLedger';
+$BookMark = 'BalanceSheet';
+
if (! isset($_POST['BalancePeriodEnd']) or isset($_POST['SelectADifferentPeriod'])){
/*Show a form to allow input of criteria for TB to show */
Modified: trunk/GLBudgets.php
===================================================================
--- trunk/GLBudgets.php 2013-02-22 03:49:55 UTC (rev 5819)
+++ trunk/GLBudgets.php 2013-02-24 04:28:04 UTC (rev 5820)
@@ -6,6 +6,9 @@
$Title = _('Create GL Budgets');
+$ViewTopic = 'GeneralLedger';
+$BookMark = 'GLBudgets';
+
include('includes/header.inc');
if (isset($_POST['SelectedAccount'])){
Modified: trunk/GLJournal.php
===================================================================
--- trunk/GLJournal.php 2013-02-22 03:49:55 UTC (rev 5819)
+++ trunk/GLJournal.php 2013-02-24 04:28:04 UTC (rev 5820)
@@ -7,6 +7,9 @@
include('includes/session.inc');
$Title = _('Journal Entry');
+$ViewTopic = 'GeneralLedger';
+$BookMark = 'GLJournals';
+
include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
Modified: trunk/GLJournalInquiry.php
===================================================================
--- trunk/GLJournalInquiry.php 2013-02-22 03:49:55 UTC (rev 5819)
+++ trunk/GLJournalInquiry.php 2013-02-24 04:28:04 UTC (rev 5820)
@@ -2,6 +2,10 @@
include ('includes/session.inc');
$Title = _('General Ledger Journal Inquiry');
+
+$ViewTopic= 'GeneralLedger';
+$BookMark = 'GLJournalInquiry';
+
include('includes/header.inc');
echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/money_add.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title.'</p>';
Modified: trunk/GLProfit_Loss.php
===================================================================
--- trunk/GLProfit_Loss.php 2013-02-22 03:49:55 UTC (rev 5819)
+++ trunk/GLProfit_Loss.php 2013-02-24 04:28:04 UTC (rev 5820)
@@ -7,6 +7,9 @@
include('includes/SQL_CommonFunctions.inc');
include('includes/AccountSectionsDef.inc'); // This loads the $Sections variable
+$ViewTopic= 'GeneralLedger';
+$BookMark = 'ProfitAndLoss';
+
if (isset($_POST['FromPeriod']) and ($_POST['FromPeriod'] > $_POST['ToPeriod'])){
prnMsg(_('The selected period from is actually after the period to') . '! ' . _('Please reselect the reporting period'),'error');
$_POST['SelectADifferentPeriod']='Select A Different Period';
Modified: trunk/GLTagProfit_Loss.php
===================================================================
--- trunk/GLTagProfit_Loss.php 2013-02-22 03:49:55 UTC (rev 5819)
+++ trunk/GLTagProfit_Loss.php 2013-02-24 04:28:04 UTC (rev 5820)
@@ -7,6 +7,8 @@
include('includes/SQL_CommonFunctions.inc');
include('includes/AccountSectionsDef.inc'); // This loads the $Sections variable
+$ViewTopic= 'GeneralLedger';
+$BookMark = 'TagReports';
if (isset($_POST['FromPeriod']) AND ($_POST['FromPeriod'] > $_POST['ToPeriod'])){
prnMsg(_('The selected period from is actually after the period to') . '! ' . _('Please reselect the reporting period'),'error');
Modified: trunk/GLTags.php
===================================================================
--- trunk/GLTags.php 2013-02-22 03:49:55 UTC (rev 5819)
+++ trunk/GLTags.php 2013-02-24 04:28:04 UTC (rev 5820)
@@ -5,6 +5,9 @@
include('includes/session.inc');
$Title = _('Maintain General Ledger Tags');
+$ViewTopic = 'GeneralLedger';
+$BookMark = 'GLTags';
+
include('includes/header.inc');
if (isset($_GET['SelectedTag'])) {
Modified: trunk/PDFBankingSummary.php
===================================================================
--- trunk/PDFBankingSummary.php 2013-02-22 03:49:55 UTC (rev 5819)
+++ trunk/PDFBankingSummary.php 2013-02-24 04:28:04 UTC (rev 5820)
@@ -11,6 +11,10 @@
if (!isset($_POST['BatchNo'])){
$Title = _('Create PDF Print Out For A Batch Of Receipts');
+
+ $ViewTopic = 'ARReports';
+ $BookMark = 'BankingSummary';
+
include ('includes/header.inc');
echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/magnifier.png" title="' .
Modified: trunk/PDFChequeListing.php
===================================================================
--- trunk/PDFChequeListing.php 2013-02-22 03:49:55 UTC (rev 5819)
+++ trunk/PDFChequeListing.php 2013-02-24 04:28:04 UTC (rev 5820)
@@ -4,6 +4,8 @@
include('includes/SQL_CommonFunctions.inc');
include ('includes/session.inc');
+$ViewTopic= 'GeneralLedger';
+$BookMark = 'ChequePaymentListing';
$InputError=0;
if (isset($_POST['FromDate']) AND !Is_Date($_POST['FromDate'])){
@@ -78,27 +80,27 @@
}
$sql = "SELECT bankaccountname,
- decimalplaces AS bankcurrdecimalplaces
- FROM bankaccounts INNER JOIN currencies
- ON bankaccounts.currcode=currencies.currabrev
- WHERE accountcode = '" .$_POST['BankAccount'] . "'";
+ decimalplaces AS bankcurrdecimalplaces
+ FROM bankaccounts INNER JOIN currencies
+ ON bankaccounts.currcode=currencies.currabrev
+ WHERE accountcode = '" .$_POST['BankAccount'] . "'";
$BankActResult = DB_query($sql,$db);
-$myrow = DB_fetch_row($BankActResult);
-$BankAccountName = $myrow[0];
-$BankCurrDecimalPlaces = $myrow[1];
+$myrow = DB_fetch_array($BankActResult);
+$BankAccountName = $myrow['bankaccountname'];
+$BankCurrDecimalPlaces = $myrow['bankcurrdecimalplaces'];
$sql= "SELECT amount,
- ref,
- transdate,
- banktranstype,
- type,
- transno
- FROM banktrans
- WHERE banktrans.bankact='" . $_POST['BankAccount'] . "'
- AND (banktrans.type=1 or banktrans.type=22)
- AND transdate >='" . FormatDateForSQL($_POST['FromDate']) . "'
- AND transdate <='" . FormatDateForSQL($_POST['ToDate']) . "'";
-
+ ref,
+ transdate,
+ banktranstype,
+ type,
+ transno
+ FROM banktrans
+ WHERE banktrans.bankact='" . $_POST['BankAccount'] . "'
+ AND (banktrans.type=1 or banktrans.type=22)
+ AND transdate >='" . FormatDateForSQL($_POST['FromDate']) . "'
+ AND transdate <='" . FormatDateForSQL($_POST['ToDate']) . "'";
+
$Result=DB_query($sql,$db,'','',false,false);
if (DB_error_no($db)!=0){
$Title = _('Payment Listing');
@@ -135,13 +137,12 @@
$LeftOvers = $pdf->addTextWrap($Left_Margin+65,$YPos,90,$FontSize,$myrow['ref'], 'left');
$sql = "SELECT accountname,
- amount,
- narrative
- FROM gltrans,
- chartmaster
- WHERE chartmaster.accountcode=gltrans.account
- AND gltrans.typeno ='" . $myrow['transno'] . "'
- AND gltrans.type='" . $myrow['type'] . "'";
+ amount,
+ narrative
+ FROM gltrans INNER JOIN chartmaster
+ ON gltrans.account=chartmaster.accountcode
+ WHERE gltrans.typeno ='" . $myrow['transno'] . "'
+ AND gltrans.type='" . $myrow['type'] . "'";
$GLTransResult = DB_query($sql,$db,'','',false,false);
if (DB_error_no($db)!=0){
Modified: trunk/PDFCustTransListing.php
===================================================================
--- trunk/PDFCustTransListing.php 2013-02-22 03:49:55 UTC (rev 5819)
+++ trunk/PDFCustTransListing.php 2013-02-24 04:28:04 UTC (rev 5820)
@@ -15,6 +15,10 @@
if (!isset($_POST['Date'])){
$Title = _('Customer Transaction Listing');
+
+ $ViewTopic = 'ARReports';
+ $BookMark = 'DailyTransactions';
+
include ('includes/header.inc');
echo '<div class="centre">
Modified: trunk/PDFCustomerList.php
===================================================================
--- trunk/PDFCustomerList.php 2013-02-22 03:49:55 UTC (rev 5819)
+++ trunk/PDFCustomerList.php 2013-02-24 04:28:04 UTC (rev 5820)
@@ -3,7 +3,9 @@
/* $Id$*/
include('includes/session.inc');
-
+$ViewTopic = 'ARReports';
+$BookMark = 'CustomerListing';
+
if (isset($_POST['PrintPDF'])){
include('includes/PDFStarter.php');
Modified: trunk/PDFSellThroughSupportClaim.php
===================================================================
--- trunk/PDFSellThroughSupportClaim.php 2013-02-22 03:49:55 UTC (rev 5819)
+++ trunk/PDFSellThroughSupportClaim.php 2013-02-24 04:28:04 UTC (rev 5820)
@@ -3,6 +3,7 @@
/* $Id: PDFSellThroughSupportClaim.php 5788 2013-01-02 03:22:38Z daintree $*/
include('includes/session.inc');
+$Title = _('Sell Through Support Claims Report');
if (isset($_POST['PrintPDF'])) {
@@ -42,20 +43,22 @@
sellthroughsupport.rebateamount
FROM stockmaster INNER JOIN stockmoves
ON stockmaster.stockid=stockmoves.stockid
- INNER JOIN sellthroughsupport
INNER JOIN systypes
ON stockmoves.type=systypes.typeid
INNER JOIN debtorsmaster
ON stockmoves.debtorno=debtorsmaster.debtorno
+ INNER JOIN purchdata
+ ON purchdata.stockid = stockmaster.stockid
INNER JOIN suppliers
+ ON suppliers.supplierid = purchdata.supplierno
+ INNER JOIN sellthroughsupport
ON sellthroughsupport.supplierno=suppliers.supplierid
- INNER JOIN purchdata
- ON purchdata.stockid = stockmaster.stockid
- AND purchdata.supplierno = sellthroughsupport.supplierno
INNER JOIN currencies
ON currencies.currabrev=suppliers.currcode
WHERE stockmoves.trandate >= '" . FormatDateForSQL($_POST['FromDate']) . "'
AND stockmoves.trandate <= '" . FormatDateForSQL($_POST['ToDate']) . "'
+ AND sellthroughsupport.effectivefrom <= stockmoves.trandate
+ AND sellthroughsupport.effectiveto >= stockmoves.trandate
AND (stockmoves.type=10 OR stockmoves.type=11)
AND (sellthroughsupport.stockid=stockmoves.stockid OR sellthroughsupport.categoryid=stockmaster.categoryid)
AND (sellthroughsupport.debtorno=stockmoves.debtorno OR sellthroughsupport.debtorno='')
@@ -76,7 +79,7 @@
exit;
}
- if (DB_num_rows($LowGPSalesResult) == 0) {
+ if (DB_num_rows($ClaimsResult) == 0) {
include('includes/header.inc');
prnMsg(_('No sell through support items retrieved'), 'warn');
@@ -88,7 +91,7 @@
exit;
}
- include ('includes/PDFSellThroughSuppPageHeader.inc');
+ include ('includes/PDFSellThroughSupportClaimPageHeader.inc');
$SupplierClaimTotal=0;
$Supplier = '';
$FontSize=8;
@@ -96,40 +99,57 @@
$YPos -=$line_height;
if ($SellThroRow['suppname']!=$Supplier){
- $FontSize = 10;
- $LeftOvers = $pdf->addTextWrap($Left_Margin+2,$YPos,30,$FontSize,$SellThroRow['suppname']);
- $YPos -=$line_height;
-
if ($SupplierClaimTotal > 0) {
$LeftOvers = $pdf->addTextWrap($Left_Margin+2,$YPos,30,$FontSize,$Supplier . ' ' . _('Total Claim:') . ' (' . $CurrCode . ')');
$LeftOvers = $pdf->addTextWrap(440,$YPos,60,$FontSize, locale_number_format($SupplierClaimTotal,$CurrDecimalPlaces), 'right');
- include('includes/PDFLowGPPageHeader.inc');
+ include('includes/PDFSellThroughClaimPageHeader.inc');
}
+ }
+ if ($SellThroRow['suppname']!=$Supplier){
+ $pdf->SetFont('helvetica', $style='B', $size=11);
+ $FontSize = 10;
+ $YPos -=$line_height;
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+2,$YPos,250,$FontSize,$SellThroRow['suppname']);
$Supplier = $SellThroRow['suppname'];
- $CurrDeciamlPlaces = $SellThroRow['currdecimalplaces'];
+ $CurrDecimalPlaces = $SellThroRow['currdecimalplaces'];
$CurrCode = $SellThroRow['currcode'];
$SupplierClaimTotal=0;
+ $pdf->SetFont('helvetica', $style='N', $size=8);
$FontSize =8;
+ $YPos -=$line_height;
}
- $LeftOvers = $pdf->addTextWrap($Left_Margin+2,$YPos,30,$FontSize,$SellThroRow['typename']);
- $LeftOvers = $pdf->addTextWrap(100,$YPos,30,$FontSize,$SellThroRow['transno']);
- $LeftOvers = $pdf->addTextWrap(130,$YPos,50,$FontSize,$SellThroRow['stockid']);
- $LeftOvers = $pdf->addTextWrap(220,$YPos,50,$FontSize,$SellThroRow['name']);
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+2,$YPos,60,$FontSize,$SellThroRow['typename'] . '-' . $SellThroRow['transno']);
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+63,$YPos,160,$FontSize,$SellThroRow['stockid']. '-' . $SellThroRow['description']);
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+223,$YPos,110,$FontSize,$SellThroRow['name']);
$DisplaySellingPrice = locale_number_format($SellThroRow['sellingprice'],$_SESSION['CompanyRecord']['decimalplaces']);
- $LeftOvers = $pdf->addTextWrap(330,$YPos,60,$FontSize,$DisplaySellingPrice,'right');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+334,$YPos,60,$FontSize,$DisplaySellingPrice,'right');
$ClaimAmount = (($SellThroRow['fxcost']*$SellThroRow['rebatepercent']) + $SellThroRow['rebateamount']) * -$SellThroRow['qty'];
- $SupplierClaimTotal += $ClaimTotal;
+ $SupplierClaimTotal += $ClaimAmount;
- $LeftOvers = $pdf->addTextWrap(380,$YPos,60,$FontSize,locale_number_format(-$SellThroRow['qty']), 'right');
- $LeftOvers = $pdf->addTextWrap(440,$YPos,60,$FontSize,locale_number_format($ClaimAmount,$CurrDecimalPlaces), 'right');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+395,$YPos,60,$FontSize,locale_number_format(-$SellThroRow['qty']), 'right');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+480,$YPos,60,$FontSize,locale_number_format($ClaimAmount,$CurrDecimalPlaces), 'right');
if ($YPos < $Bottom_Margin + $line_height){
- include('includes/PDFLowGPPageHeader.inc');
+ include('includes/PDFSellThroughSupportClaimPageHeader.inc');
}
} /*end sell through support claims while loop */
+ if ($SupplierClaimTotal > 0) {
+ $YPos -=5;
+ $pdf->line($Left_Margin+480, $YPos,$Left_Margin+480+60, $YPos);
+ $YPos -=$line_height;
+
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+2,$YPos,470,$FontSize,$Supplier . ' ' . _('Total Claim:'),'right');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+480,$YPos,60,$FontSize, locale_number_format($SupplierClaimTotal,$CurrDecimalPlaces), 'right');
+ $YPos -=5;
+
+ $pdf->line($Left_Margin+480, $YPos,$Left_Margin+480+60, $YPos);
+ $YPos -=1;
+ $pdf->line($Left_Margin+480, $YPos,$Left_Margin+480+60, $YPos);
+
+ }
$FontSize =10;
$YPos -= (2*$line_height);
Modified: trunk/Payments.php
===================================================================
--- trunk/Payments.php 2013-02-22 03:49:55 UTC (rev 5819)
+++ trunk/Payments.php 2013-02-24 04:28:04 UTC (rev 5820)
@@ -6,8 +6,15 @@
include('includes/session.inc');
$Title = _('Payment Entry');
-$ViewTopic= 'GeneralLedger';
-$BookMark = 'BankAccountPayments';
+
+if (isset($_GET['SupplierID'])) {
+ $ViewTopic = 'AccountsPayable';
+ $BookMark = 'SupplierPayments';
+} else {
+ $ViewTopic= 'GeneralLedger';
+ $BookMark = 'BankAccountPayments';
+}
+
include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
Modified: trunk/PrintCustStatements.php
===================================================================
--- trunk/PrintCustStatements.php 2013-02-22 03:49:55 UTC (rev 5819)
+++ trunk/PrintCustStatements.php 2013-02-24 04:28:04 UTC (rev 5820)
@@ -5,6 +5,9 @@
include('includes/session.inc');
include('includes/SQL_CommonFunctions.inc');
+$ViewTopic = 'ARReports';
+$BookMark = 'CustomerStatements';
+
// If this file is called from another script, we set the required POST variables from the GET
// We call this file from SelectCustomer.php when a customer is selected and we want a statement printed
Modified: trunk/PrintCustTrans.php
===================================================================
--- trunk/PrintCustTrans.php 2013-02-22 03:49:55 UTC (rev 5819)
+++ trunk/PrintCustTrans.php 2013-02-24 04:28:04 UTC (rev 5820)
@@ -4,6 +4,9 @@
include('includes/session.inc');
+$ViewTopic = 'ARReports';
+$BookMark = 'PrintInvoicesCredits';
+
if (isset($_GET['FromTransNo'])) {
$FromTransNo = trim($_GET['FromTransNo']);
} elseif (isset($_POST['FromTransNo'])) {
@@ -87,6 +90,7 @@
debtortrans.ovgst,
debtortrans.rate,
debtortrans.invtext,
+ debtortrans.packages,
debtortrans.consignment,
debtorsmaster.name,
debtorsmaster.address1,
Modified: trunk/PrintCustTransPortrait.php
===================================================================
--- trunk/PrintCustTransPortrait.php 2013-02-22 03:49:55 UTC (rev 5819)
+++ trunk/PrintCustTransPortrait.php 2013-02-24 04:28:04 UTC (rev 5820)
@@ -4,6 +4,10 @@
include('includes/session.inc');
+$ViewTopic = 'ARReports';
+$BookMark = 'PrintInvoicesCredits';
+
+
if (isset($_GET['FromTransNo'])) {
$FromTransNo = filter_number_format($_GET['FromTransNo']);
} elseif (isset($_POST['FromTransNo'])){
@@ -107,6 +111,7 @@
debtortrans.rate,
debtortrans.invtext,
debtortrans.consignment,
+ debtortrans.packages,
debtorsmaster.name,
debtorsmaster.address1,
debtorsmaster.address2,
Modified: trunk/ReorderLevelLocation.php
===================================================================
--- trunk/ReorderLevelLocation.php 2013-02-22 03:49:55 UTC (rev 5819)
+++ trunk/ReorderLevelLocation.php 2013-02-24 04:28:04 UTC (rev 5820)
@@ -16,7 +16,8 @@
if (isset($_POST['submit'])){
for ($i=1;$i<count($_POST);$i++){ //loop through the returned customers
if (isset($_POST['StockID' . $i]) AND is_numeric(filter_number_format($_POST['ReorderLevel'.$i]))){
- $SQLUpdate="UPDATE locstock SET reorderlevel = '" . filter_number_format($_POST['ReorderLevel'.$i]) . "'
+ $SQLUpdate="UPDATE locstock SET reorderlevel = '" . filter_number_format($_POST['ReorderLevel'.$i]) . "',
+ bin = '" . strtoupper($_POST['BinLocation'.$i]) . "'
WHERE loccode = '" . $_POST['StockLocation'] . "'
AND stockid = '" . $_POST['StockID' . $i] . "'";
$Result = DB_query($SQLUpdate,$db);
@@ -39,6 +40,8 @@
$sql="SELECT locstock.stockid,
description,
reorderlevel,
+ bin,
+ quantity,
decimalplaces
FROM locstock INNER JOIN stockmaster
ON locstock.stockid = stockmaster.stockid
@@ -70,6 +73,7 @@
<th>' . _('On Hand') .'<br />'._('At All Locations') . '</th>
<th>' . _('On Hand') .'<br />' ._('At Location') . '</th>
<th>' . _('Reorder Level') . '</th>
+ <th>' . _('Bin Location') . '</th>
</tr>';
$i=1;
@@ -110,21 +114,14 @@
$TotQtyResult = DB_query($SqlOH,$db);
$TotQtyRow = DB_fetch_array($TotQtyResult);
- //get On Hand in Location
- $SqlOHLoc="SELECT SUM(quantity) AS qty
- FROM locstock
- WHERE stockid='" . $myrow['stockid'] . "'
- AND locstock.loccode = '" . $_POST['StockLocation'] . "'";
- $LocQtyResult = DB_query($SqlOHLoc,$db);
- $LocQtyRow = DB_fetch_array($LocQtyResult);
-
echo $myrow['stockid'].'</td>
<td>'.$myrow['description'].'</td>
<td class="number">'.locale_number_format($SalesRow['qtyinvoiced'],$myrow['decimalplaces']).'</td>
<td class="number">'.locale_number_format($TotQtyRow['qty'],$myrow['decimalplaces']).'</td>
- <td class="number">'.locale_number_format($LocQtyRow['qty'],$myrow['decimalplaces']).'</td>
+ <td class="number">'.locale_number_format($myrow['quantity'],$myrow['decimalplaces']).'</td>
<td><input type="text" class="number" name="ReorderLevel' . $i .'" maxlength="10" size="10" value="'. locale_number_format($myrow['reorderlevel'],0) .'" />
<input type="hidden" name="StockID' . $i . '" value="' . $myrow['stockid'] . '" /></td>
+ <td><input type="text" name="BinLocation' . $i .'" maxlength="10" size="10" value="'. $myrow['bin'] .'" /></td>
</tr> ';
$i++;
} //end of looping
Modified: trunk/SalesGraph.php
===================================================================
--- trunk/SalesGraph.php 2013-02-22 03:49:55 UTC (rev 5819)
+++ trunk/SalesGraph.php 2013-02-24 04:28:04 UTC (rev 5820)
@@ -5,6 +5,10 @@
include('includes/session.inc');
include('includes/phplot/phplot.php');
$Title=_('Sales Report Graph');
+
+ $ViewTopic = 'ARInquiries';
+ $BookMark = 'SalesGraph'
+
include('includes/header.inc');
$SelectADifferentPeriod ='';
Modified: trunk/SelectAsset.php
===================================================================
--- trunk/SelectAsset.php 2013-02-22 03:49:55 UTC (rev 5819)
+++ trunk/SelectAsset.php 2013-02-24 04:28:04 UTC (rev 5820)
@@ -1,10 +1,12 @@
<?php
/* $Id: SelectAsset.php 4443 2010-12-23 15:30:30Z tim_schofield $*/
-$PricesSecurity = 9;
-
include ('includes/session.inc');
$Title = _('Select an Asset');
+
+$ViewTopic = 'FixedAssets';
+$BookMark = 'AssetSelection';
+
include ('includes/header.inc');
if (isset($_GET['AssetID'])) {
Modified: trunk/SelectContract.php
===================================================================
--- trunk/SelectContract.php 2013-02-22 03:49:55 UTC (rev 5819)
+++ trunk/SelectContract.php 2013-02-24 04:28:04 UTC (rev 5820)
@@ -4,6 +4,10 @@
include('includes/session.inc');
$Title = _('Select Contract');
+
+$ViewTopic= 'Contracts';
+$BookMark = 'SelectContract';
+
include('includes/header.inc');
echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/contract.png" title="' . _('Contracts') . '" alt="" />' . ' ' . _('Select A Contract') . '</p> ';
Modified: trunk/SelectCreditItems.php
===================================================================
--- trunk/SelectCreditItems.php 2013-02-22 03:49:55 UTC (rev 5819)
+++ trunk/SelectCreditItems.php 2013-02-24 04:28:04 UTC (rev 5820)
@@ -11,6 +11,8 @@
include('includes/session.inc');
$Title = _('Create Credit Note');
+$ViewTopic= 'ARTransactions';
+$BookMark = 'CreateCreditNote';
include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
Modified: trunk/StockLocStatus.php
===================================================================
--- trunk/StockLocStatus.php 2013-02-22 03:49:55 UTC (rev 5819)
+++ trunk/StockLocStatus.php 2013-02-24 04:28:04 UTC (rev 5820)
@@ -29,7 +29,8 @@
</p>';
echo '<table class="selection">
- <tr><td>' . _('From Stock Location') . ':</td>
+ <tr>
+ <td>' . _('From Stock Location') . ':</td>
<td><select name="StockLocation"> ';
while ($myrow=DB_fetch_array($resultStkLocs)){
if (isset($_POST['StockLocation']) AND $_POST['StockLocation']!='All'){
@@ -45,7 +46,8 @@
echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
}
}
-echo '</select></td></tr>';
+echo '</select></td>
+ </tr>';
$SQL="SELECT categoryid,
categorydescription
@@ -121,6 +123,7 @@
$sql = "SELECT locstock.stockid,
stockmaster.description,
locstock.loccode,
+ locstock.bin,
locations.locationname,
locstock.quantity,
locstock.reorderlevel,
@@ -139,6 +142,7 @@
$sql = "SELECT locstock.stockid,
stockmaster.description,
locstock.loccode,
+ locstock.bin,
locations.locationname,
locstock.quantity,
locstock.reorderlevel,
@@ -163,16 +167,17 @@
echo '<br />
<table cellpadding="5" cellspacing="4" class="selection">';
- $tableheader = '<tr>
+ $TableHeader = '<tr>
<th>' . _('StockID') . '</th>
<th>' . _('Description') . '</th>
<th>' . _('Quantity On Hand') . '</th>
+ <th>' . _('Bin Loc') . '</th>
<th>' . _('Re-Order Level') . '</th>
<th>' . _('Demand') . '</th>
<th>' . _('Available') . '</th>
<th>' . _('On Order') . '</th>
</tr>';
- echo $tableheader;
+ echo $TableHeader;
$j = 1;
$k=0; //row colour counter
@@ -241,10 +246,7 @@
ON purchorderdetails.orderno=purchorders.orderno
WHERE purchorders.intostocklocation='" . $myrow['loccode'] . "'
AND purchorderdetails.itemcode='" . $StockID . "'
- AND purchorders.status <> 'Cancelled'
- AND purchorders.status <> 'Rejected'
- AND purchorders.status <> 'Pending'
- AND purchorders.status <> 'Completed'";
+ AND purchorders.status = 'Authorised'";
$ErrMsg = _('The quantity on order for this product to be received into') . ' ' . $myrow['loccode'] . ' ' . _('cannot be retrieved because');
$QOOResult = DB_query($sql,$db,$ErrMsg);
@@ -272,6 +274,7 @@
printf('<td><a target="_blank" href="' . $RootPath . '/StockStatus.php?StockID=%s">%s</a></td>
<td>%s</td>
<td class="number">%s</td>
+ <td>%s</td>
<td class="number">%s</td>
<td class="number">%s</td>
<td class="number"><a target="_blank" href="' . $RootPath . '/SelectProduct.php?StockID=%s">%s</a></td>
@@ -281,6 +284,7 @@
mb_strtoupper($myrow['stockid']),
$myrow['description'],
locale_number_format($myrow['quantity'],$myrow['decimalplaces']),
+ $myrow['bin'],
locale_number_format($myrow['reorderlevel'],$myrow['decimalplaces']),
locale_number_format($DemandQty,$myrow['decimalplaces']),
mb_strtoupper($myrow['stockid']),
@@ -304,6 +308,7 @@
printf('<td><a target="_blank" href="' . $RootPath . '/StockStatus.php?StockID=%s">%s</a></td>
<td>%s</td>
<td class="number">%s</td>
+ <td>%s</td>
<td class="number">%s</td>
<td class="number">%s</td>
<td class="number"><a target="_blank" href="' . $RootPath . '/SelectProduct.php?StockID=%s">%s</a></td>
@@ -312,6 +317,7 @@
mb_strtoupper($myrow['stockid']),
$myrow['description'],
locale_number_format($myrow['quantity'],$myrow['decimalplaces']),
+ $myrow['bin'],
locale_number_format($myrow['reorderlevel'],$myrow['decimalplaces']),
locale_number_format($DemandQty,$myrow['decimalplaces']),
mb_strtoupper($myrow['stockid']),
Modified: trunk/StockStatus.php
===================================================================
--- trunk/StockStatus.php 2013-02-22 03:49:55 UTC (rev 5819)
+++ trunk/StockStatus.php 2013-02-24 04:28:04 UTC (rev 5820)
@@ -19,7 +19,7 @@
if (isset($_POST['UpdateBinLocations'])){
foreach ($_POST as $PostVariableName => $Bin) {
if (mb_substr($PostVariableName,0,11) == 'BinLocation') {
- $sql = "UPDATE locstock SET bin='" . $Bin . "' WHERE loccode='" . mb_substr($PostVariableName,11) . "' AND stockid='" . $StockID . "'";
+ $sql = "UPDATE locstock SET bin='" . strtoupper($Bin) . "' WHERE loccode='" . mb_substr($PostVariableName,11) . "' AND stockid='" . $StockID . "'";
$result = DB_query($sql, $db);
}
}
Modified: trunk/StockTransferControlled.php
===================================================================
--- trunk/StockTransferControlled.php 2013-02-22 03:49:55 UTC (rev 5819)
+++ trunk/StockTransferControlled.php 2013-02-24 04:28:04 UTC (rev 5820)
@@ -78,11 +78,12 @@
} else {
$LineNo=0;
}
-include ('includes/OutputSerialItems.php');
+include ('includes/InputSerialItems.php');
+
/*TotalQuantity set inside this include file from the sum of the bundles
of the item selected for adjusting */
-$LineItem->Quantity = $TransferQuantity;
+$LineItem->Quantity = $TotalQuantity;
/*Also a multi select box for adding bundles to the Transfer without keying */
Modified: trunk/Stocks.php
===================================================================
--- trunk/Stocks.php 2013-02-22 03:49:55 UTC (rev 5819)
+++ trunk/Stocks.php 2013-02-24 04:28:04 UTC (rev 5820)
@@ -20,6 +20,18 @@
$StockID = '';
}
+
+if (isset($_POST['NextItem'])){
+ $Result = DB_query("SELECT stockid FROM stockmaster WHERE stockid>'" . $StockID . "' ORDER BY stockid ASC LIMIT 1",$db);
+ $NextItemRow = DB_fetch_row($Result);
+ $StockID = $NextItemRow[0];
+}
+if (isset($_POST['PreviousItem'])){
+ $Result = DB_query("SELECT stockid FROM stockmaster WHERE stockid<'" . $StockID . "' ORDER BY stockid DESC LIMIT 1",$db);
+ $PreviousItemRow = DB_fetch_row($Result);
+ $StockID = $PreviousItemRow[0];
+}
+
if (isset($StockID) and !isset($_POST['UpdateCategories'])) {
$sql = "SELECT COUNT(stockid)
FROM stockmaster
@@ -761,6 +773,14 @@
echo '<form id="ItemForm" enctype="multipart/form-data" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
echo '<div>';
+if (isset($StockID)){
+ echo '<table width="100%">
+ <tr>
+ <td width="5%"><input style="background:url(css/previous.png);width:26px;height:43px;" type="submit" name="PreviousItem" value="" /></td>
+ <td width="90%"></td>
+ <td width="5%"><input style="background:url(css/next.png);width:26px;height:43px;" type="submit" name="NextItem" value="" /></td>
+ </tr>';
+}
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<input type="hidden" name="New" value="'.$New.'" />';
Modified: trunk/SuppFixedAssetChgs.php
===================================================================
--- trunk/SuppFixedAssetChgs.php 2013-02-22 03:49:55 UTC (rev 5819)
+++ trunk/SuppFixedAssetChgs.php 2013-02-24 04:28:04 UTC (rev 5820)
@@ -13,6 +13,9 @@
$Title = _('Fixed Asset Charges or Credits');
+$ViewTopic = 'FixedAssets';
+$BookMark = 'AssetInvoices';
+
include('includes/header.inc');
if (!isset($_SESSION['SuppTrans'])){
Modified: trunk/UpgradeDatabase.php
===================================================================
--- trunk/UpgradeDatabase.php 2013-02-22 03:49:55 UTC (rev 5819)
+++ trunk/UpgradeDatabase.php 2013-02-24 04:28:04 UTC (rev 5820)
@@ -158,6 +158,7 @@
$SQLScripts[] = './sql/mysql/upgrade4.08-4.09.sql';
case '4.09':
case '4.09.1':
+ case '4.10.0':
if (!is_writable('config.php')) {
prnMsg( _('To perform this upgrade the web server must have write access to the config.php file. Currently the web-server is reporting that it does not have appropriate permission. Please ensure config.php is writable and run the upgrade again'), 'warning');
include('includes/footer.inc');
@@ -173,7 +174,7 @@
prnMsg( _('You should now make the config.php read only for the web server.'), 'warning');
}
$SQLScripts[] = './sql/mysql/upgrade4.09-4.10.sql';
- case '4.10':
+ case '4.10.1':
break;
} //end switch
}
Deleted: trunk/UploadPriceList.php
===================================================================
--- trunk/UploadPriceList.php 2013-02-22 03:49:55 UTC (rev 5819)
+++ trunk/UploadPriceList.php 2013-02-24 04:28:04 UTC (rev 5820)
@@ -1,173 +0,0 @@
-<?php
-
-include('includes/session.inc');
-$Title = _('Import Sales Price List');
-include('includes/header.inc');
-
-$FieldHeadings = array(
- 'StockID', // 0 'STOCKID',
- 'PriceListID', // 1 'Price list id',
- 'CurrencyCode', // 2 'Currency Code',
- 'Price' // 3 'Price'
-);
-
-echo '<p class="page_title_text noPrint" ><img src="' . $RootPath . '/css/' . $Theme . '/images/maintenance.png" title="' . $Title . '" alt="' . $Title . '" />' . ' ' . $Title . '</p>';
-
-if (isset($_FILES['userfile']) and $_FILES['userfile']['name']) { //start file processing
- //check file info
- $FileName = $_FILES['userfile']['name'];
- $TempName = $_FILES['userfile']['tmp_name'];
- $FileSize = $_FILES['userfile']['size'];
- $FieldTarget = 4;
- $InputError = 0;
-
- //get file handle
- $FileHandle = fopen($TempName, 'r');
-
- //get the header row
- $HeadRow = fgetcsv($FileHandle, 10000, ",");
-
- //check for correct number of fields
- 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;
- }
-
- //test header row field name and sequence
- $head = 0;
- foreach ($HeadRow as $HeadField) {
- if ( trim(mb_strtoupper($HeadField)) != trim(mb_strtoupper($FieldHeadings[$head]))) {
- prnMsg (_('File contains incorrect headers '. mb_strtoupper($HeadField). ' != '. mb_strtoupper($FieldHeadings[$head]). '. Try downloading a new template.'),'error');
- fclose($FileHandle);
- include('includes/footer.inc');
- exit;
- }
- $head++;
- }
-
- //start database transaction
- DB_Txn_Begin($db);
-
- //loop through file rows
- $row = 1;
- 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($FileHandle);
- include('includes/footer.inc');
- exit;
- }
-
- // cleanup the data (csv files often import with empty strings and such)
- $StockID = mb_strtoupper($myrow[0]);
- foreach ($myrow as &$value) {
- $value = trim($value);
- $value = str_replace('"', '', $value);
- }
-
- //first off check that the item actually exists
- $sql = "SELECT COUNT(stockid) FROM stockmaster WHERE stockid='" . $myrow[0] . "'";
- $result = DB_query($sql,$db);
- $testrow = DB_fetch_row($result);
- if ($testrow[0] == 0) {
- $InputError = 1;
- prnMsg (_('Stock item "'. $myrow[0]. '" does not exist'),'error');
- }
- //Then check that the price list actually exists
- $sql = "SELECT COUNT(typeabbrev) FROM salestypes WHERE typeabbrev='" . $myrow[1] . "'";
- $result = DB_query($sql,$db);
- $testrow = DB_fetch_row($result);
- if ($testrow[0] == 0) {
- $InputError = 1;
- prnMsg (_('Price List "'. $myrow[1]. '" does not exist'),'error');
- }
-
- //Then check that the currency code actually exists
- $sql = "SELECT COUNT(currabrev) FROM currencies WHERE currabrev='" . $myrow[2] . "'";
- $result = DB_query($sql,$db);
- $testrow = DB_fetch_row($result);
- if ($testrow[0] == 0) {
- $InputError = 1;
- prnMsg (_('Price List "'. $myrow[2]. '" does not exist'),'error');
- }
-
- //Finally force the price to be a double
- $myrow[3] = (double)$myrow[3];
- if ($InputError !=1){
-
- //Firstly close any open prices for this item
- $sql = "UPDATE prices
- SET enddate='" . FormatDateForSQL($_POST['StartDate']) . "'
- WHERE stockid='".$myrow[0]."'
- AND enddate>NOW()
- AND typeabbrev='" . $myrow[1] . "'";
- $result = DB_query($sql,$db);
-
- //Insert the price
- $sql = "INSERT INTO prices (stockid,
- typeabbrev,
- currabrev,
- price,
- startdate
- ) VALUES (
- '" . $myrow[0] . "',
- '" . $myrow[1] . "',
- '" . $myrow[2] . "',
- '" . $myrow[3] . "',
- '" . FormatDateForSQL($_POST['StartDate']) . "'
- )";
-
- $ErrMsg = _('The price could not be added because');
- $DbgMsg = _('The SQL that was used to add the price failed was');
- $result = DB_query($sql,$db, $ErrMsg, $DbgMsg);
-
-
- }
-
- if ($InputError == 1) { //this row failed so exit loop
- break;
- }
-
- $row++;
-
- }
-
- if ($InputError == 1) { //exited loop with errors so rollback
- prnMsg(_('Failed on row '. $row. '. Batch import has been rolled back.'),'error');
- DB_Txn_Rollback($db);
- } else { //all good so commit data transaction
- DB_Txn_Commit($db);
- prnMsg( _('Batch Import of') .' ' . $FileName . ' '. _('has been completed. All transactions committed to the database.'),'success');
- }
-
- fclose($FileHandle);
-
-} else { //show file upload form
-
- echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post" class="noPrint" enctype="multipart/form-data">';
- echo '<div class="centre">';
- echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- echo '<div class="page_help_text">' .
- _('This function loads a new sales price list from a comma separated variable (csv) file.') . '<br />' .
- _('The file must contain four columns, and the first row should be the following headers:') . '<br />' .
- _('StockID,PriceListID,CurrencyCode,Price') . '<br />' .
- _('followed by rows ...
[truncated message content] |
