|
From: <te...@us...> - 2013-01-18 05:46:30
|
Revision: 5795
http://sourceforge.net/p/web-erp/reponame/5795
Author: tehonu
Date: 2013-01-18 05:46:22 +0000 (Fri, 18 Jan 2013)
Log Message:
-----------
Pak Ricard: New script showing raw materials not used in any BOM
Modified Paths:
--------------
trunk/includes/MainMenuLinksArray.php
trunk/sql/mysql/upgrade4.09-4.10.sql
Added Paths:
-----------
trunk/MaterialsNotUsed.php
Added: trunk/MaterialsNotUsed.php
===================================================================
--- trunk/MaterialsNotUsed.php (rev 0)
+++ trunk/MaterialsNotUsed.php 2013-01-18 05:46:22 UTC (rev 5795)
@@ -0,0 +1,86 @@
+<?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 = _('Raw Materials Not Used Anywhere');
+include ('includes/header.inc');
+
+$SQL = "SELECT stockmaster.stockid,
+ stockmaster.description,
+ stockmaster.decimalplaces,
+ (stockmaster.materialcost + stockmaster.labourcost + stockmaster.overheadcost) AS stdcost,
+ (SELECT SUM(quantity)
+ FROM locstock
+ WHERE locstock.stockid = stockmaster.stockid) AS qoh
+ FROM stockmaster,
+ stockcategory
+ WHERE stockmaster.categoryid = stockcategory.categoryid
+ AND stockcategory.stocktype = 'M'
+ AND stockmaster.discontinued = 0
+ AND NOT EXISTS(
+ SELECT *
+ FROM bom
+ WHERE bom.component = stockmaster.stockid )
+ ORDER BY stockmaster.stockid";
+$result = DB_query($SQL, $db);
+if (DB_num_rows($result) != 0){
+ $TotalValue = 0;
+ echo '<p class="page_title_text" align="center"><strong>' . _('Raw Materials Not Used in any BOM') . '</strong></p>';
+ echo '<div>';
+ echo '<table class="selection">';
+ $TableHeader = '<tr>
+ <th>' . _('#') . '</th>
+ <th>' . _('Code') . '</th>
+ <th>' . _('Description') . '</th>
+ <th>' . _('QOH') . '</th>
+ <th>' . _('Std Cost') . '</th>
+ <th>' . _('Value') . '</th>
+ </tr>';
+ echo $TableHeader;
+ $k = 0; //row colour counter
+ $i = 1;
+ while ($myrow = DB_fetch_array($result)) {
+ 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>';
+ $LineValue = $myrow['qoh'] * $myrow['stdcost'];
+ $TotalValue = $TotalValue + $LineValue;
+
+ printf('<td class="number">%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td class="number">%s</td>
+ <td class="number">%s</td>
+ <td class="number">%s</td>
+ </tr>',
+ $i,
+ $CodeLink,
+ $myrow['description'],
+ locale_number_format($myrow['qoh'],$myrow['decimalplaces']),
+ locale_number_format($myrow['stdcost'],$_SESSION['CompanyRecord']['decimalplaces']),
+ locale_number_format($LineValue,$_SESSION['CompanyRecord']['decimalplaces'])
+ );
+ $i++;
+ }
+
+ printf('<td colspan="4">%s</td>
+ <td>%s</td>
+ <td class="number">%s</td>
+ </tr>',
+ '',
+ _('Total').':',
+ locale_number_format($TotalValue,$_SESSION['CompanyRecord']['decimalplaces']));
+
+ echo '</table>
+ </div>
+ </form>';
+}
+
+include ('includes/footer.inc');
+?>
\ No newline at end of file
Modified: trunk/includes/MainMenuLinksArray.php
===================================================================
--- trunk/includes/MainMenuLinksArray.php 2013-01-17 02:11:24 UTC (rev 5794)
+++ trunk/includes/MainMenuLinksArray.php 2013-01-18 05:46:22 UTC (rev 5795)
@@ -294,6 +294,7 @@
_('Bill Of Material Listing'),
_('Indented Bill Of Material Listing'),
_('List Components Required'),
+ _('List Materials Not Used Anywhere'),
_('Indented Where Used Listing'),
_('MRP'),
_('MRP Shortages'),
@@ -308,6 +309,7 @@
'/BOMListing.php',
'/BOMIndented.php',
'/BOMExtendedQty.php',
+ '/MaterialsNotUsed.php',
'/BOMIndentedReverse.php',
'/MRPReport.php',
'/MRPShortages.php',
Modified: trunk/sql/mysql/upgrade4.09-4.10.sql
===================================================================
--- trunk/sql/mysql/upgrade4.09-4.10.sql 2013-01-17 02:11:24 UTC (rev 5794)
+++ trunk/sql/mysql/upgrade4.09-4.10.sql 2013-01-18 05:46:22 UTC (rev 5795)
@@ -12,4 +12,5 @@
INSERT INTO scripts VALUES ('CustomerPurchases.php','5','Shows the purchases a customer has made.');
INSERT INTO scripts VALUES ('GoodsReceivedNotInvoiced.php','2','Shows the list of goods received but 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 ('Z_ItemsWithoutPicture.php','15','Shows the list of curent items without picture in webERP');
+INSERT INTO scripts VALUES ('MaterialsNotUsed.php', '4', 'Lists the items from Raw Material Categories not used in any BOM (thus, not used at all)');
UPDATE config SET confvalue='4.10.0' WHERE confname='VersionNumber';
|
|
From: <dai...@us...> - 2013-01-26 22:31:40
|
Revision: 5797
http://sourceforge.net/p/web-erp/reponame/5797
Author: daintree
Date: 2013-01-26 22:31:34 +0000 (Sat, 26 Jan 2013)
Log Message:
-----------
Sell through support work
Modified Paths:
--------------
trunk/AccountGroups.php
trunk/BankMatching.php
trunk/Currencies.php
trunk/CustomerReceipt.php
trunk/DailyBankTransactions.php
trunk/InternalStockRequest.php
trunk/PO_Items.php
trunk/PurchData.php
trunk/SelectSupplier.php
trunk/StockAdjustments.php
trunk/StockLocTransferReceive.php
trunk/SystemParameters.php
trunk/UpgradeDatabase.php
trunk/UserSettings.php
trunk/WWW_Users.php
trunk/doc/Change.log
trunk/doc/LICENSE.txt
trunk/doc/Manual/ManualContributors.html
trunk/doc/Manual/ManualInventory.html
trunk/doc/Manual/ManualOutline.php
trunk/doc/README.txt
trunk/doc/UPGRADING.txt
trunk/includes/ConnectDB.inc
trunk/includes/DateFunctions.inc
trunk/includes/DefineCartClass.php
trunk/includes/DefineReceiptClass.php
trunk/includes/MainMenuLinksArray.php
trunk/includes/MiscFunctions.php
trunk/includes/PDFTransPageHeader.inc
trunk/includes/PDFTransPageHeaderPortrait.inc
trunk/includes/SelectOrderItems_IntoCart.inc
trunk/includes/session.inc
trunk/install/save.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
Modified: trunk/AccountGroups.php
===================================================================
--- trunk/AccountGroups.php 2013-01-23 19:32:03 UTC (rev 5796)
+++ trunk/AccountGroups.php 2013-01-26 22:31:34 UTC (rev 5797)
@@ -64,7 +64,7 @@
$sql="SELECT count(groupname)
FROM accountgroups
- WHERE groupname='".$_POST['GroupName']."'";
+ WHERE groupname='" . $_POST['GroupName'] . "'";
$DbgMsg = _('The SQL that was used to retrieve the information was');
$ErrMsg = _('Could not check whether the group exists because');
@@ -72,7 +72,7 @@
$result=DB_query($sql, $db,$ErrMsg,$DbgMsg);
$myrow=DB_fetch_row($result);
- if ($myrow[0]!=0 AND $_POST['SelectedAccountGroup']=='') {
+ if ($myrow[0] != 0 AND $_POST['SelectedAccountGroup'] == '') {
$InputError = 1;
prnMsg( _('The account group name already exists in the database'),'error');
$Errors[$i] = 'GroupName';
@@ -138,7 +138,27 @@
if ($_POST['SelectedAccountGroup']!='' AND $InputError !=1) {
/*SelectedAccountGroup could also exist if submit had not been clicked this code would not run in this case cos submit is false of course see the delete code below*/
+ if ($_POST['SelectedAccountGroup']!==$_POST['GroupName']) {
+ DB_IgnoreForeignKeys($db);
+
+ $sql = "UPDATE chartmaster
+ SET group_='" . $_POST['GroupName'] . "'
+ WHERE group_='" . $_POST['SelectedAccountGroup'] . "'";
+ $ErrMsg = _('An error occurred in renaming the account group');
+ $DbgMsg = _('The SQL that was used to rename the account group was');
+
+ $result = DB_query($sql, $db, $ErrMsg, $DbgMsg);
+
+ $sql = "UPDATE accountgroups
+ SET parentgroupname='" . $_POST['GroupName'] . "'
+ WHERE parentgroupname='" . $_POST['SelectedAccountGroup'] . "'";
+
+ $result = DB_query($sql, $db, $ErrMsg, $DbgMsg);
+
+ DB_ReinstateForeignKeys($db);
+ }
+
$sql = "UPDATE accountgroups SET groupname='" . $_POST['GroupName'] . "',
sectioninaccounts='" . $_POST['SectionInAccounts'] . "',
pandl='" . $_POST['PandL'] . "',
@@ -347,16 +367,8 @@
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 '<input type="hidden" name="SelectedAccountGroup" value="' . $_GET['SelectedAccountGroup'] . '" />';
- echo '<tr>
- <td>' . _('Account Group') . ':' . '</td>
- <td>' . $_POST['GroupName'] . '</td>
- </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'])){
@@ -382,12 +394,12 @@
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>';
}
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>
+ <tr>
<td>' . _('Parent Group') . ':' . '</td>
<td><select tabindex="2" ' . (in_array('ParentGroupName',$Errors) ? 'class="selecterror"' : '' ) . ' name="ParentGroupName">';
@@ -407,10 +419,9 @@
echo '<option value="'.htmlspecialchars($grouprow['groupname'], ENT_QUOTES,'UTF-8').'">' .htmlspecialchars($grouprow['groupname'], ENT_QUOTES,'UTF-8').'</option>';
}
}
- echo '</select>';
- echo '</td></tr>';
-
- echo '<tr>
+ echo '</select></td>
+ </tr>
+ <tr>
<td>' . _('Section In Accounts') . ':' . '</td>
<td><select tabindex="3" ' . (in_array('SectionInAccounts',$Errors) ? 'class="selecterror"' : '' ) . ' name="SectionInAccounts">';
@@ -423,10 +434,9 @@
echo '<option value="'.$secrow['sectionid'].'">'.$secrow['sectionname'].' ('.$secrow['sectionid'].')</option>';
}
}
- echo '</select>';
- echo '</td></tr>';
-
- echo '<tr>
+ echo '</select></td>
+ </tr>
+ <tr>
<td>' . _('Profit and Loss') . ':' . '</td>
<td><select tabindex="4" name="PandL">';
@@ -441,22 +451,21 @@
echo '<option value="0">' . _('No').'</option>';
}
- echo '</select></td></tr>';
-
- echo '<tr>
+ echo '</select></td>
+ </tr>
+ <tr>
<td>' . _('Sequence In TB') . ':' . '</td>
<td><input tabindex="5" type="text" maxlength="4" name="SequenceInTB" class="number" value="' . $_POST['SequenceInTB'] . '" /></td>
- </tr>';
-
- echo '<tr>
+ </tr>
+ <tr>
<td colspan="2"><div class="centre"><input tabindex="6" type="submit" name="submit" value="' . _('Enter Information') . '" /></div></td>
- </tr>';
+ </tr>
+ </table>
+ <br />';
- echo '</table><br />';
-
echo '<script type="text/javascript">defaultControl(document.forms[0].GroupName);</script>';
- echo '</div>';
- echo '</form>';
+ echo '</div>
+ </form>';
} //end if record deleted no point displaying form to add record
include('includes/footer.inc');
Modified: trunk/BankMatching.php
===================================================================
--- trunk/BankMatching.php 2013-01-23 19:32:03 UTC (rev 5796)
+++ trunk/BankMatching.php 2013-01-26 22:31:34 UTC (rev 5797)
@@ -159,12 +159,14 @@
echo '</table>
<br />
<div class="centre">
- <input tabindex="6" type="submit" name="ShowTransactions" value="' . _('Show selected') . ' ' . $TypeName . '" />
- <p>
- <a href="' . $RootPath . '/BankReconciliation.php?Account=' . $_POST['BankAccount'] . '">' . _('Show reconciliation') . '</a>
- </p>
- </div>';
+ <input tabindex="6" type="submit" name="ShowTransactions" value="' . _('Show selected') . ' ' . $TypeName . '" />';
+if (isset($_POST['BankAccount'])) {
+ echo '<p><a href="' . $RootPath . '/BankReconciliation.php?Account=' . $_POST['BankAccount'] . '">' . _('Show reconciliation') . '</a></p>';
+}
+
+echo '</div>';
+
$InputError=0;
if (!Is_Date($_POST['BeforeDate'])){
$InputError =1;
Modified: trunk/Currencies.php
===================================================================
--- trunk/Currencies.php 2013-01-23 19:32:03 UTC (rev 5796)
+++ trunk/Currencies.php 2013-01-26 22:31:34 UTC (rev 5797)
@@ -47,7 +47,7 @@
$result=DB_query($sql, $db);
$myrow=DB_fetch_row($result);
- if ($myrow[0]!=0 and !isset($SelectedCurrency)) {
+ if ($myrow[0]!=0 AND !isset($SelectedCurrency)) {
$InputError = 1;
prnMsg( _('The currency already exists in the database'),'error');
$Errors[$i] = 'Abbreviation';
@@ -61,7 +61,7 @@
}
if (!is_numeric(filter_number_format($_POST['ExchangeRate']))){
$InputError = 1;
- prnMsg(_('The exchange rate must be numeric'),'error');
+ prnMsg(_('The exchange rate must be numeric'),'error');
$Errors[$i] = 'ExchangeRate';
$i++;
}
@@ -300,7 +300,8 @@
}
} //END WHILE LIST LOOP
- echo '</table><br />';
+ echo '</table>
+ <br />';
} //end of ifs and buts!
@@ -373,7 +374,7 @@
if (!isset($_POST['Country'])) {
$_POST['Country']='';
}
- echo '<input ' . (in_array('Country',$Errors) ? 'class="inputerror"' : '' ) .' type="text" name="Country" size="30" maxlength="50" value="' . $_POST['Country'] . '" /></td>
+ echo '<input ' . (in_array('Country',$Errors) ? 'class="inputerror"' : '' ) . ' type="text" name="Country" size="30" maxlength="50" value="' . $_POST['Country'] . '" /></td>
</tr>
<tr>
<td>'._('Hundredths Name').':</td>
@@ -381,7 +382,7 @@
if (!isset($_POST['HundredsName'])) {
$_POST['HundredsName']='';
}
- echo '<input ' . (in_array('HundredsName',$Errors) ? 'class="inputerror"' : '' ) .' type="text" name="HundredsName" size="10" maxlength="15" value="'. $_POST['HundredsName'].'" /></td>
+ echo '<input ' . (in_array('HundredsName',$Errors) ? 'class="inputerror"' : '' ) . ' type="text" name="HundredsName" size="10" maxlength="15" value="'. $_POST['HundredsName'].'" /></td>
</tr>
<tr>
<td>'._('Decimal Places to Display').':</td>
@@ -389,7 +390,7 @@
if (!isset($_POST['DecimalPlaces'])) {
$_POST['DecimalPlaces']='';
}
- echo '<input ' . (in_array('DecimalPlaces',$Errors) ? 'class="inputerror"' : 'class="number"' ) .' type="text" name="DecimalPlaces" size="2" maxlength="2" value="'. $_POST['DecimalPlaces'].'" /></td>
+ echo '<input ' . (in_array('DecimalPlaces',$Errors) ? 'class="inputerror"' : 'class="number"' ) . ' type="text" name="DecimalPlaces" size="2" maxlength="2" value="' . $_POST['DecimalPlaces'].'" /></td>
</tr>
<tr>
<td>'._('Exchange Rate').':</td>
@@ -397,13 +398,13 @@
if (!isset($_POST['ExchangeRate'])) {
$_POST['ExchangeRate']='';
}
- echo '<input ' . (in_array('ExchangeRate',$Errors) ? 'class="inputerror"' : '' ) .' type="text" class="number" name="ExchangeRate" size="10" maxlength="10" value="'. $_POST['ExchangeRate'].'" /></td>
+ echo '<input ' . (in_array('ExchangeRate',$Errors) ? 'class="inputerror"' : '' ) .' type="text" class="number" name="ExchangeRate" size="10" maxlength="10" value="' . $_POST['ExchangeRate'] . '" /></td>
</tr>
</table>';
echo '<br />
<div class="centre">
- <input type="submit" name="submit" value="'._('Enter Information').'" />
+ <input type="submit" name="submit" value="' . _('Enter Information') . '" />
</div>
</div>
</form>';
Modified: trunk/CustomerReceipt.php
===================================================================
--- trunk/CustomerReceipt.php 2013-01-23 19:32:03 UTC (rev 5796)
+++ trunk/CustomerReceipt.php 2013-01-26 22:31:34 UTC (rev 5797)
@@ -832,7 +832,7 @@
}
if ($_SESSION['ReceiptBatch']->ExRate==1 AND isset($SuggestedExRate)){
$_SESSION['ReceiptBatch']->ExRate = $SuggestedExRate;
- }elseif($_POST['Currency'] != $_POST['PreviousCurrency'] and isset($SuggestedExRate)){//the user has changed the currency, then we should revise suggested rate
+ }elseif($_POST['Currency'] != $_POST['PreviousCurrency'] AND isset($SuggestedExRate)){//the user has changed the currency, then we should revise suggested rate
$_SESSION['ReceiptBatch']->ExRate = $SuggestedExRate;
}
echo '<tr>
Modified: trunk/DailyBankTransactions.php
===================================================================
--- trunk/DailyBankTransactions.php 2013-01-23 19:32:03 UTC (rev 5796)
+++ trunk/DailyBankTransactions.php 2013-01-26 22:31:34 UTC (rev 5797)
@@ -62,6 +62,14 @@
<td>' . _('Transactions Dated To') . ':</td>
<td><input type="text" name="ToTransDate" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" maxlength="10" size="11" onchange="isDate(this, this.value, '."'".$_SESSION['DefaultDateFormat']."'".')" value="' . date($_SESSION['DefaultDateFormat']) . '" /></td>
</tr>
+ <tr>
+ <td>' . _('Show Transactions') . '</td>
+ <td><select name="ShowType">
+ <option value="All">' . _('All') . '</option>
+ <option value="Unmatched">' . _('Unmatched') . '</option>
+ <option value="Matched">' . _('Matched') . '</option>
+ </select></td>
+ </tr>
</table>
<br />
<div class="centre">
@@ -82,6 +90,7 @@
$sql="SELECT banktrans.currcode,
banktrans.amount,
+ banktrans.amountcleared,
banktrans.functionalexrate,
banktrans.exrate,
banktrans.banktranstype,
@@ -106,7 +115,7 @@
$BankDetailRow = DB_fetch_array($BankResult);
echo '<table class="selection">
<tr>
- <th colspan="8"><h3>' . _('Account Transactions For').' '.$BankDetailRow['bankaccountname'].' '._('Between').' '.$_POST['FromTransDate'] . ' ' . _('and') . ' ' . $_POST['ToTransDate'] . '</h3></th>
+ <th colspan="9"><h3>' . _('Account Transactions For').' '.$BankDetailRow['bankaccountname'].' '._('Between').' '.$_POST['FromTransDate'] . ' ' . _('and') . ' ' . $_POST['ToTransDate'] . '</h3></th>
</tr>
<tr>
<th>' . ('Date') . '</th>
@@ -117,6 +126,7 @@
<th>'._('Running Total').' '.$BankDetailRow['currcode'].'</th>
<th>'._('Amount in').' '.$_SESSION['CompanyRecord']['currencydefault'].'</th>
<th>'._('Running Total').' '.$_SESSION['CompanyRecord']['currencydefault'].'</th>
+ <th>'._('Cleared') . '</th>
</tr>';
$AccountCurrTotal=0;
@@ -126,28 +136,37 @@
$AccountCurrTotal += $myrow['amount'];
$LocalCurrTotal += $myrow['amount']/$myrow['functionalexrate']/$myrow['exrate'];
+
+ if ($myrow['amount']==$myrow['amountcleared']) {
+ $Matched=_('Yes');
+ } else {
+ $Matched=_('No');
+ }
echo '<tr>
<td>'. ConvertSQLDate($myrow['transdate']) . '</td>
<td>'.$myrow['typename'].'</td>
<td>'.$myrow['banktranstype'].'</td>
<td>'.$myrow['ref'].'</td>
- <td class="number">'.locale_number_format($myrow['amount'],$BankDetailRow['decimalplaces']).'</td>
- <td class="number">'.locale_number_format($AccountCurrTotal,$BankDetailRow['decimalplaces']).'</td>
- <td class="number">'.locale_number_format($myrow['amount']/$myrow['functionalexrate']/$myrow['exrate'],$_SESSION['CompanyRecord']['decimalplaces']).'</td>
- <td class="number">'.locale_number_format($LocalCurrTotal,$_SESSION['CompanyRecord']['decimalplaces']).'</td>
+ <td class="number">' . locale_number_format($myrow['amount'],$BankDetailRow['decimalplaces']) . '</td>
+ <td class="number">' . locale_number_format($AccountCurrTotal,$BankDetailRow['decimalplaces']) . '</td>
+ <td class="number">' . locale_number_format($myrow['amount']/$myrow['functionalexrate']/$myrow['exrate'],$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
+ <td class="number">' . locale_number_format($LocalCurrTotal,$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
+ <td class="number">' . $Matched . '</td>
</tr>';
}
echo '</table>';
} //end if no bank trans in the range to show
- echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
- echo '<div>';
- echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- echo '<br /><div class="centre"><input type="submit" name="Return" value="' . _('Select Another Date'). '" /></div>';
- echo '</div>';
- echo '</form>';
+ echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
+ <div>
+ <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
+ <br />
+ <div class="centre">
+ <input type="submit" name="Return" value="' . _('Select Another Date'). '" />
+ </div>
+ </div>
+ </form>';
}
include('includes/footer.inc');
-
?>
\ No newline at end of file
Modified: trunk/InternalStockRequest.php
===================================================================
--- trunk/InternalStockRequest.php 2013-01-23 19:32:03 UTC (rev 5796)
+++ trunk/InternalStockRequest.php 2013-01-26 22:31:34 UTC (rev 5797)
@@ -245,7 +245,6 @@
exit;
}
-//****************MUESTRO LA TABLA CON LOS REGISTROS DE LA TRANSFERENCIA*************************************
$i = 0; //Line Item Array pointer
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post">';
echo '<div>';
@@ -383,7 +382,6 @@
WHERE stockmaster.categoryid=stockcategory.categoryid
AND stockcategory.categoryid = internalstockcatrole.categoryid
AND internalstockcatrole.secroleid= " . $_SESSION['AccessLevel'] . "
- AND (stockcategory.stocktype='F' OR stockcategory.stocktype='D')
AND stockmaster.mbflag <>'G'
AND stockmaster.description " . LIKE . " '" . $SearchString . "'
AND stockmaster.discontinued=0
@@ -399,7 +397,6 @@
WHERE stockmaster.categoryid=stockcategory.categoryid
AND stockcategory.categoryid = internalstockcatrole.categoryid
AND internalstockcatrole.secroleid= " . $_SESSION['AccessLevel'] . "
- AND (stockcategory.stocktype='F' OR stockcategory.stocktype='D')
AND stockmaster.mbflag <>'G'
AND stockmaster.discontinued=0
AND stockmaster.description " . LIKE . " '" . $SearchString . "'
@@ -423,7 +420,6 @@
WHERE stockmaster.categoryid=stockcategory.categoryid
AND stockcategory.categoryid = internalstockcatrole.categoryid
AND internalstockcatrole.secroleid= " . $_SESSION['AccessLevel'] . "
- AND (stockcategory.stocktype='F' OR stockcategory.stocktype='D')
AND stockmaster.stockid " . LIKE . " '" . $SearchString . "'
AND stockmaster.mbflag <>'G'
AND stockmaster.discontinued=0
@@ -439,7 +435,6 @@
WHERE stockmaster.categoryid=stockcategory.categoryid
AND stockcategory.categoryid = internalstockcatrole.categoryid
AND internalstockcatrole.secroleid= " . $_SESSION['AccessLevel'] . "
- AND (stockcategory.stocktype='F' OR stockcategory.stocktype='D')
AND stockmaster.stockid " . LIKE . " '" . $SearchString . "'
AND stockmaster.mbflag <>'G'
AND stockmaster.discontinued=0
@@ -459,7 +454,6 @@
WHERE stockmaster.categoryid=stockcategory.categoryid
AND stockcategory.categoryid = internalstockcatrole.categoryid
AND internalstockcatrole.secroleid= " . $_SESSION['AccessLevel'] . "
- AND (stockcategory.stocktype='F' OR stockcategory.stocktype='D')
AND stockmaster.mbflag <>'G'
AND stockmaster.discontinued=0
ORDER BY stockmaster.stockid";
@@ -474,7 +468,6 @@
WHERE stockmaster.categoryid=stockcategory.categoryid
AND stockcategory.categoryid = internalstockcatrole.categoryid
AND internalstockcatrole.secroleid= " . $_SESSION['AccessLevel'] . "
- AND (stockcategory.stocktype='F' OR stockcategory.stocktype='D')
AND stockmaster.mbflag <>'G'
AND stockmaster.discontinued=0
AND stockmaster.categoryid='" . $_POST['StockCat'] . "'
Modified: trunk/PO_Items.php
===================================================================
--- trunk/PO_Items.php 2013-01-23 19:32:03 UTC (rev 5796)
+++ trunk/PO_Items.php 2013-01-26 22:31:34 UTC (rev 5797)
@@ -20,7 +20,7 @@
if (!isset($_SESSION['PO'.$identifier])){
header('Location:' . $RootPath . '/PO_Header.php');
exit;
-} //end if (!isset($_SESSION['PO'.$identifier]))
+}
/* webERP manual links before header.inc */
$ViewTopic= 'PurchaseOrdering';
@@ -43,12 +43,12 @@
if (!is_numeric(filter_number_format($_POST['SuppQty'.$POLine->LineNo]))){
prnMsg(_('The quantity in the supplier units is expected to be numeric. Please re-enter as a number'),'error');
} else { //ok to update the PO object variables
- $_SESSION['PO'.$identifier]->LineItems[$POLine->LineNo]->Quantity=filter_number_format(round(filter_number_format($_POST['SuppQty'.$POLine->LineNo])*filter_number_format($_SESSION['PO'.$identifier]->LineItems[$POLine->LineNo]->ConversionFactor),$_SESSION['PO'.$identifier]->LineItems[$POLine->LineNo]->DecimalPlaces));
+ $_SESSION['PO'.$identifier]->LineItems[$POLine->LineNo]->Quantity = filter_number_format(round(filter_number_format($_POST['SuppQty'.$POLine->LineNo])*filter_number_format($_SESSION['PO'.$identifier]->LineItems[$POLine->LineNo]->ConversionFactor),$_SESSION['PO'.$identifier]->LineItems[$POLine->LineNo]->DecimalPlaces));
}
if (!is_numeric(filter_number_format($_POST['SuppPrice'.$POLine->LineNo]))){
prnMsg(_('The supplier price is expected to be numeric. Please re-enter as a number'),'error');
} else { //ok to update the PO object variables
- $_SESSION['PO'.$identifier]->LineItems[$POLine->LineNo]->Price=filter_number_format($_POST['SuppPrice'.$POLine->LineNo])/$_SESSION['PO'.$identifier]->LineItems[$POLine->LineNo]->ConversionFactor;
+ $_SESSION['PO'.$identifier]->LineItems[$POLine->LineNo]->Price = filter_number_format($_POST['SuppPrice'.$POLine->LineNo])/$_SESSION['PO'.$identifier]->LineItems[$POLine->LineNo]->ConversionFactor;
}
$_SESSION['PO'.$identifier]->LineItems[$POLine->LineNo]->ReqDelDate=$_POST['ReqDelDate'.$POLine->LineNo];
$_SESSION['PO'.$identifier]->LineItems[$POLine->LineNo]->ItemDescription =$_POST['ItemDescription'.$POLine->LineNo];
@@ -521,7 +521,9 @@
//Add variables $_SESSION['PO_ItemsResubmitForm' . $identifier] and $_POST['PO_ItemsResubmitFormValue'] to prevent from page refreshing effect
$_SESSION['PO_ItemsResubmitForm' . $identifier] = (empty($_SESSION['PO_ItemsResubmitForm' . $identifier]))? '1' : $_SESSION['PO_ItemsResubmitForm' . $identifier];
-if (isset($_POST['NewItem']) and !empty($_POST['PO_ItemsResubmitFormValue']) and $_SESSION['PO_ItemsResubmitForm' . $identifier] == $_POST['PO_ItemsResubmitFormValue']){ //only submit values can be processed
+if (isset($_POST['NewItem'])
+ AND !empty($_POST['PO_ItemsResubmitFormValue'])
+ AND $_SESSION['PO_ItemsResubmitForm' . $identifier] == $_POST['PO_ItemsResubmitFormValue']){ //only submit values can be processed
/* NewItem is set from the part selection list as the part code selected
* take the form entries and enter the data from the form into the PurchOrder class variable
@@ -595,7 +597,32 @@
$PurchDataResult = DB_query($sql,$db,$ErrMsg,$DbgMsg);
if (DB_num_rows($PurchDataResult)>0){ //the purchasing data is set up
$PurchRow = DB_fetch_array($PurchDataResult);
- $PurchPrice = $PurchRow['price']/$PurchRow['conversionfactor'];
+
+ /* Now to get the applicable discounts */
+ $sql = "SELECT discountpercent,
+ discountamount
+ FROM supplierdiscounts
+ WHERE supplierno= '" . $_SESSION['PO'.$identifier]->SupplierID . "'
+ AND effectivefrom <='" . Date('Y-m-d') . "'
+ AND effectiveto >='" . Date('Y-m-d') . "'
+ AND stockid = '". $ItemCode . "'";
+
+ $ItemDiscountPercent = 0;
+ $ItemDiscountAmount = 0;
+ $ErrMsg = _('Could not retrieve the supplier discounts applicable to the item');
+ $DbgMsg = _('The SQL used to retrive the supplier discounts that failed was');
+ $DiscountResult = DB_query($sql,$db,$ErrMsg,$DbgMsg);
+ while ($DiscountRow = DB_fetch_array($DiscountResult)) {
+ $ItemDiscountPercent += $DiscountRow['discountpercent'];
+ $ItemDiscountAmount += $DiscountRow['discountamount'];
+ }
+ if ($ItemDiscountPercent != 0) {
+ prnMsg(_('Taken accumulated supplier percentage discounts of') . ' ' . locale_number_format($ItemDiscountPercent*100,2) . '%','info');
+ }
+ if ($ItemDiscountAmount != 0 ){
+ prnMsg(_('Taken accumulated round sum supplier discount of') . ' ' . $_SESSION['PO'.$identifier]->CurrCode . ' ' . locale_number_format($ItemDiscountAmount,$_SESSION['PO'.$identifier]->CurrDecimalPlaces) . ' (' . _('per supplier unit') . ')','info');
+ }
+ $PurchPrice = ($PurchRow['price']*(1-$ItemDiscountPercent) - $ItemDiscountAmount)/$PurchRow['conversionfactor'];
$ConversionFactor = $PurchRow['conversionfactor'];
$SupplierDescription = $PurchRow['suppliers_partno'] .' - ';
if (mb_strlen($PurchRow['supplierdescription'])>2){
@@ -680,7 +707,7 @@
<th>' . _('Description') . '</th>
<th>' . _('Quantity Our Units') . '</th>
<th>' . _('Our Unit') .'</th>
- <th>' . _('Price Our Units') .' ('.$_SESSION['PO'.$identifier]->CurrCode. ')</th>
+ <th>' . _('Price Our Units') .' (' . $_SESSION['PO'.$identifier]->CurrCode . ')</th>
<th>' . _('Unit Conversion Factor') . '</th>
<th>' . _('Order Quantity') . '<br />' . _('Supplier Units') . '</th>
<th>' . _('Supplier Unit') . '</th>
@@ -718,7 +745,7 @@
<td class="number">' . locale_number_format($POLine->Quantity,$POLine->DecimalPlaces) . '</td>
<td>' . $POLine->Units . '</td>
<td class="number">' . $DisplayPrice . '</td>
- <td><input type="text" class="number" name="ConversionFactor' . $POLine->LineNo .'" size="8" value="' . $POLine->ConversionFactor . '" /></td>
+ <td><input type="text" class="number" name="ConversionFactor' . $POLine->LineNo .'" size="8" value="' . locale_number_format($POLine->ConversionFactor,'Variable') . '" /></td>
<td><input type="text" class="number" name="SuppQty' . $POLine->LineNo .'" size="10" value="' . locale_number_format(round($POLine->Quantity/$POLine->ConversionFactor,$POLine->DecimalPlaces),$POLine->DecimalPlaces) . '" /></td>
<td>' . $POLine->SuppliersUnit . '</td>
<td><input type="text" class="number" name="SuppPrice' . $POLine->LineNo . '" size="10" value="' . locale_number_format(round(($POLine->Price *$POLine->ConversionFactor),$_SESSION['PO'.$identifier]->CurrDecimalPlaces),$_SESSION['PO'.$identifier]->CurrDecimalPlaces) .'" /></td>
@@ -824,6 +851,7 @@
ON stockmaster.stockid=purchdata.stockid
WHERE stockmaster.mbflag<>'D'
AND stockmaster.mbflag<>'K'
+ AND stockmaster.mbflag<>'A'
AND stockmaster.mbflag<>'G'
AND stockmaster.discontinued<>1
AND purchdata.supplierno='" . $_SESSION['PO'.$identifier]->SupplierID . "'
@@ -839,6 +867,7 @@
ON stockmaster.categoryid=stockcategory.categoryid
WHERE stockmaster.mbflag<>'D'
AND stockmaster.mbflag<>'K'
+ AND stockmaster.mbflag<>'A'
AND stockmaster.mbflag<>'G'
AND stockmaster.discontinued<>1
AND sto...
[truncated message content] |
|
From: <tim...@us...> - 2013-01-27 22:43:07
|
Revision: 5800
http://sourceforge.net/p/web-erp/reponame/5800
Author: tim_schofield
Date: 2013-01-27 22:43:04 +0000 (Sun, 27 Jan 2013)
Log Message:
-----------
New scripts for sell through support functionality
Added Paths:
-----------
trunk/PDFSellThroughSupportClaim.php
trunk/SellThroughSupport.php
Added: trunk/PDFSellThroughSupportClaim.php
===================================================================
--- trunk/PDFSellThroughSupportClaim.php (rev 0)
+++ trunk/PDFSellThroughSupportClaim.php 2013-01-27 22:43:04 UTC (rev 5800)
@@ -0,0 +1,175 @@
+<?php
+
+/* $Id: PDFSellThroughSupportClaim.php 5788 2013-01-02 03:22:38Z daintree $*/
+
+include('includes/session.inc');
+
+if (isset($_POST['PrintPDF'])) {
+
+ include('includes/PDFStarter.php');
+ $pdf->addInfo('Title', _('Sell Through Support Claim'));
+ $pdf->addInfo('Subject', _('Sell Through Support Claim'));
+ $FontSize=10;
+ $PageNumber=1;
+ $line_height=12;
+
+ $Title = _('Sell Through Support Claim') . ' - ' . _('Problem Report');
+
+ if (! Is_Date($_POST['FromDate']) OR ! Is_Date($_POST['ToDate'])){
+ include('includes/header.inc');
+ prnMsg(_('The dates entered must be in the format') . ' ' . $_SESSION['DefaultDateFormat'],'error');
+ include('includes/footer.inc');
+ exit;
+ }
+
+ /*Now figure out the data to report for the category range under review */
+ $SQL = "SELECT sellthroughsupport.supplierno,
+ suppliers.suppname,
+ suppliers.currcode,
+ currencies.decimalplaces as currdecimalplaces,
+ stockmaster.stockid,
+ stockmaster.decimalplaces,
+ stockmaster.description,
+ stockmoves.transno,
+ stockmoves.trandate,
+ systypes.typename,
+ stockmoves.qty,
+ stockmoves.debtorno,
+ debtorsmaster.name,
+ stockmoves.price*(1-stockmoves.discountpercent) as sellingprice,
+ purchdata.price as fxcost,
+ sellthroughsupport.rebatepercent,
+ 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 suppliers
+ 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 (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='')
+ ORDER BY sellthroughsupport.supplierno,
+ stockmaster.stockid";
+
+ $ClaimsResult = DB_query($SQL,$db,'','',false,false);
+
+ if (DB_error_no($db) !=0) {
+
+ include('includes/header.inc');
+ prnMsg(_('The sell through support items to claim 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($LowGPSalesResult) == 0) {
+
+ include('includes/header.inc');
+ prnMsg(_('No sell through support items 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;
+ }
+
+ include ('includes/PDFSellThroughSuppPageHeader.inc');
+ $SupplierClaimTotal=0;
+ $Supplier = '';
+ $FontSize=8;
+ while ($SellThroRow = DB_fetch_array($ClaimsResult,$db)){
+
+ $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');
+ }
+ $Supplier = $SellThroRow['suppname'];
+ $CurrDeciamlPlaces = $SellThroRow['currdecimalplaces'];
+ $CurrCode = $SellThroRow['currcode'];
+ $SupplierClaimTotal=0;
+ $FontSize =8;
+ }
+ $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']);
+ $DisplaySellingPrice = locale_number_format($SellThroRow['sellingprice'],$_SESSION['CompanyRecord']['decimalplaces']);
+ $LeftOvers = $pdf->addTextWrap(330,$YPos,60,$FontSize,$DisplaySellingPrice,'right');
+ $ClaimAmount = (($SellThroRow['fxcost']*$SellThroRow['rebatepercent']) + $SellThroRow['rebateamount']) * -$SellThroRow['qty'];
+ $SupplierClaimTotal += $ClaimTotal;
+
+
+ $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');
+
+ if ($YPos < $Bottom_Margin + $line_height){
+ include('includes/PDFLowGPPageHeader.inc');
+ }
+
+ } /*end sell through support claims while loop */
+
+ $FontSize =10;
+
+ $YPos -= (2*$line_height);
+ $pdf->OutputD($_SESSION['DatabaseName'] . '_SellThroughSupportClaim_' . date('Y-m-d') . '.pdf');
+ $pdf->__destruct();
+
+} else { /*The option to print PDF was not hit */
+
+ include('includes/header.inc');
+
+ echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/transactions.png" title="' . $Title . '" alt="" />' . ' '
+ . _('Sell Through Support Claims Report') . '</p>';
+
+ if (!isset($_POST['FromDate']) OR !isset($_POST['ToDate'])) {
+
+ /*if $FromDate is not set then show a form to allow input */
+ $_POST['FromDate']=Date($_SESSION['DefaultDateFormat']);
+ $_POST['ToDate']=Date($_SESSION['DefaultDateFormat']);
+ echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
+ echo '<div>
+ <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
+ <table class="selection">
+ <tr>
+ <td>' . _('Sales Made From') . ' (' . _('in the format') . ' ' . $_SESSION['DefaultDateFormat'] . '):</td>
+ <td><input type="text" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" name="FromDate" size="10" maxlength="10" value="' . $_POST['FromDate'] . '" /></td>
+ </tr>
+ <tr>
+ <td>' . _('Sales Made To') . ' (' . _('in the format') . ' ' . $_SESSION['DefaultDateFormat'] . '):</td>
+ <td><input type="text" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" name="ToDate" size="10" maxlength="10" value="' . $_POST['ToDate'] . '" /></td>
+ </tr>
+ </table>
+ <br />
+ <div class="centre">
+ <input type="submit" name="PrintPDF" value="' . _('Create Claims Report') . '" />
+ </div>';
+ echo '</div>
+ </form>';
+ }
+ include('includes/footer.inc');
+
+} /*end of else not PrintPDF */
+
+?>
\ No newline at end of file
Added: trunk/SellThroughSupport.php
===================================================================
--- trunk/SellThroughSupport.php (rev 0)
+++ trunk/SellThroughSupport.php 2013-01-27 22:43:04 UTC (rev 5800)
@@ -0,0 +1,489 @@
+<?php
+/* $Id: SellThroughSupport.php 5785 2012-12-29 04:47:42Z daintree $*/
+
+include ('includes/session.inc');
+
+$Title = _('Sell Through Support');
+
+include ('includes/header.inc');
+
+if (isset($_GET['SupplierID']) AND $_GET['SupplierID']!='') {
+ $SupplierID = trim(mb_strtoupper($_GET['SupplierID']));
+} elseif (isset($_POST['SupplierID'])) {
+ $SupplierID = trim(mb_strtoupper($_POST['SupplierID']));
+}
+
+//if $Edit == true then we are editing an existing SellThroughSupport record
+if (isset($_GET['Edit'])) {
+ $Edit = true;
+} elseif (isset($_POST['Edit'])) {
+ $Edit = true;
+} else {
+ $Edit = false;
+}
+
+
+/*Deleting a supplier sell through support record */
+if (isset($_GET['Delete'])){
+ $Result = DB_query("DELETE FROM sellthroughsupport WHERE id='" . intval($_GET['SellSupportID']) . "'", $db);
+ prnMsg(_('Deleted the supplier sell through support record'),'success');
+}
+
+
+if ((isset($_POST['AddRecord']) OR isset($_POST['UpdateRecord'])) AND isset($SupplierID)) { /*Validate Inputs */
+ $InputError = 0; /*Start assuming the best */
+
+ if (is_numeric(filter_number_format($_POST['RebateAmount']))==false) {
+ $InputError = 1;
+ prnMsg(_('The rebate amount entered was not numeric and a number is required.'), 'error');
+ unset($_POST['RebateAmount']);
+ } elseif (filter_number_format($_POST['RebateAmount']) == 0 AND filter_number_format($_POST['RebatePercent'])==0) {
+ prnMsg(_('Both the rebate amount and the rebate percent is zero. One or the other must be a positive number?'), 'error');
+ $InputError = 1;
+
+/*
+ } elseif (mb_strlen($_POST['Narrative'])==0 OR $_POST['Narrative']==''){
+ prnMsg(_('The narrative cannot be empty.'),'error');
+ $InputError = 1;
+*/
+ } elseif (filter_number_format($_POST['RebatePercent'])>100 OR filter_number_format($_POST['RebatePercent']) < 0) {
+ prnMsg(_('The rebate percent must be greater than zero but less than 100 percent. No changes will be made to this record'),'error');
+ $InputError = 1;
+ } elseif (filter_number_format($_POST['RebateAmount']) !=0 AND filter_number_format($_POST['RebatePercent'])!=0) {
+ prnMsg(_('Both the rebate percent and rebate amount are non-zero. Only one or the other can be used.'),'error');
+ $InputError = 1;
+ } elseif (Date1GreaterThanDate2($_POST['EffectiveFrom'], $_POST['EffectiveTo'])) {
+ prnMsg(_('The effective to date is prior to the effective from date.'),'error');
+ $InputError = 1;
+ }
+
+ if ($InputError == 0 AND isset($_POST['AddRecord'])) {
+ $sql = "INSERT INTO sellthroughsupport (supplierno,
+ debtorno,
+ categoryid,
+ stockid,
+ narrative,
+ rebateamount,
+ rebatepercent,
+ effectivefrom,
+ effectiveto )
+ VALUES ('" . $SupplierID . "',
+ '" . $_POST['DebtorNo'] . "',
+ '" . $_POST['CategoryID'] . "',
+ '" . $_POST['StockID'] . "',
+ '" . $_POST['Narrative'] . "',
+ '" . filter_number_format($_POST['RebateAmount']) . "',
+ '" . filter_number_format($_POST['RebatePercent']/100) . "',
+ '" . FormatDateForSQL($_POST['EffectiveFrom']) . "',
+ '" . FormatDateForSQL($_POST['EffectiveTo']) . "')";
+
+ $ErrMsg = _('The sell through support record could not be added to the database because');
+ $DbgMsg = _('The SQL that failed was');
+ $AddResult = DB_query($sql, $db, $ErrMsg, $DbgMsg);
+ prnMsg(_('This sell through support has been added to the database'), 'success');
+ }
+ if ($InputError == 0 AND isset($_POST['UpdateRecord'])) {
+ $sql = "UPDATE sellthroughsupport SET debtorno='" . $_POST['DebtorNo'] . "',
+ categoryid='" . $_POST['CategoryID'] . "',
+ stockid='" . $_POST['StockID'] . "',
+ narrative='" . $_POST['Narrative'] . "',
+ rebateamount='" . filter_number_format($_POST['RebateAmount']) . "',
+ rebatepercent='" . filter_number_format($_POST['RebatePercent'])/100 . "',
+ effectivefrom='" . FormatDateForSQL($_POST['EffectiveFrom']) . "',
+ effectiveto='" . FormatDateForSQL($_POST['EffectiveTo']) . "'
+ WHERE id='" . $_POST['SellSupportID'] . "'";
+
+ $ErrMsg = _('The sell through support record could not be updated because');
+ $DbgMsg = _('The SQL that failed was');
+ $UpdResult = DB_query($sql, $db, $ErrMsg, $DbgMsg);
+ prnMsg(_('Sell Through Support record has been updated'), 'success');
+ $Edit = false;
+
+ }
+
+ if ($InputError == 0) {
+ /* insert took place and need to clear the form */
+ unset($_POST['StockID']);
+ unset($_POST['EffectiveFrom']);
+ unset($_POST['DebtorNo']);
+ unset($_POST['CategoryID']);
+ unset($_POST['Narrative']);
+ unset($_POST['RebatePercent']);
+ unset($_POST['RebateAmount']);
+ unset($_POST['EffectiveFrom']);
+ unset($_POST['EffectiveTo']);
+ }
+}
+
+if (isset($_POST['SearchSupplier'])) {
+ if (isset($_POST['Keywords']) AND isset($_POST['SupplierCode'])) {
+ prnMsg( _('Supplier Name keywords have been used in preference to the Supplier Code extract entered') . '.', 'info' );
+ echo '<br />';
+ }
+ if ($_POST['Keywords'] == '' AND $_POST['SupplierCode'] == '') {
+ $_POST['Keywords'] = ' ';
+ }
+ if (mb_strlen($_POST['Keywords']) > 0) {
+ //insert wildcard characters in spaces
+ $SearchString = '%' . str_replace(' ', '%', $_POST['Keywords']) . '%';
+
+ $SQL = "SELECT suppliers.supplierid,
+ suppliers.suppname,
+ suppliers.currcode,
+ suppliers.address1,
+ suppliers.address2,
+ suppliers.address3
+ FROM suppliers
+ WHERE suppliers.suppname " . LIKE . " '".$SearchString."'";
+
+ } elseif (mb_strlen($_POST['SupplierCode']) > 0) {
+ $SQL = "SELECT suppliers.supplierid,
+ suppliers.suppname,
+ suppliers.currcode,
+ suppliers.address1,
+ suppliers.address2,
+ suppliers.address3
+ FROM suppliers
+ WHERE suppliers.supplierid " . LIKE . " '%" . $_POST['SupplierCode'] . "%'";
+
+ } //one of keywords or SupplierCode was more than a zero length string
+ $ErrMsg = _('The suppliers matching the criteria entered could not be retrieved because');
+ $DbgMsg = _('The SQL to retrieve supplier details that failed was');
+ $SuppliersResult = DB_query($SQL, $db, $ErrMsg, $DbgMsg);
+
+ echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
+ <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
+ <table cellpadding="2" colspan="7" class="selection">';
+ echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+ $TableHeader = '<tr>
+ <th>' . _('Code') . '</th>
+ <th>' . _('Supplier Name') . '</th>
+ <th>' . _('Currency') . '</th>
+ <th>' . _('Address 1') . '</th>
+ <th>' . _('Address 2') . '</th>
+ <th>' . _('Address 3') . '</th>
+ </tr>';
+ echo $TableHeader;
+ $k = 0;
+ while ($myrow = DB_fetch_array($SuppliersResult)) {
+ if ($k==1){
+ echo '<tr class="EvenTableRows">';
+ $k=0;
+ } else {
+ echo '<tr class="OddTableRows">';
+ $k++;
+ }
+ printf('<td><input type="submit" name="SupplierID" value="%s" /></td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ </tr>',
+ $myrow['supplierid'],
+ $myrow['suppname'],
+ $myrow['currcode'],
+ $myrow['address1'],
+ $myrow['address2'],
+ $myrow['address3']);
+ }//end of while loop
+ echo '</table>
+ <br/>
+ </form>';
+}//end if results to show
+ elseif (!isset($SupplierID)) {
+ echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
+ <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
+ <table cellpadding="3" colspan="4" class="selection">
+ <tr>
+ <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
+ <td>' . _('Text in the Supplier') . ' <b>' . _('NAME') . '</b>:</td>
+ <td><input type="text" name="Keywords" size="20" maxlength="25" /></td>
+ <td><b>' . _('OR') . '</b></td>
+ <td>' . _('Text in Supplier') . ' <b>' . _('CODE') . '</b>:</td>
+ <td><input type="text" name="SupplierCode" size="20" maxlength="50" /></td>
+ </tr>
+ </table>
+ <br />
+ <div class="centre">
+ <input type="submit" name="SearchSupplier" value="' . _('Find Suppliers Now') . '" />
+ </div>
+ </form>';
+ include ('includes/footer.inc');
+ exit;
+}
+
+
+
+if (isset($SupplierID)) { /* Then display all the sell through support for the supplier */
+
+ /*Get the supplier details */
+ $SuppResult = DB_query("SELECT suppname,
+ currcode,
+ decimalplaces
+ FROM suppliers INNER JOIN currencies
+ ON suppliers.currcode=currencies.currabrev
+ WHERE supplierid='" . $SupplierID . "'",$db);
+ $SuppRow = DB_fetch_array($SuppResult);
+
+ echo '<p class="page_title_text"><img src="' . $RootPath . '/css/' . $Theme . '/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title . ' ' . _('For Supplier') . ' - ' . $SupplierID . ' - ' . $SuppRow['suppname'] . '</p><br />';
+}
+
+if (isset($SupplierID) AND $Edit == false) {
+
+ $sql = "SELECT id,
+ sellthroughsupport.debtorno,
+ debtorsmaster.name,
+ rebateamount,
+ rebatepercent,
+ effectivefrom,
+ effectiveto,
+ sellthroughsupport.stockid,
+ description,
+ categorydescription,
+ sellthroughsupport.categoryid,
+ narrative
+ FROM sellthroughsupport LEFT JOIN stockmaster
+ ON sellthroughsupport.stockid=stockmaster.stockid
+ LEFT JOIN stockcategory
+ ON sellthroughsupport.categoryid = stockcategory.categoryid
+ LEFT JOIN debtorsmaster
+ ON sellthroughsupport.debtorno=debtorsmaster.debtorno
+ WHERE supplierno = '" . $SupplierID . "'
+ ORDER BY sellthroughsupport.effectivefrom DESC";
+ $ErrMsg = _('The supplier sell through support deals could not be retrieved because');
+ $Result = DB_query($sql, $db, $ErrMsg);
+ if (DB_num_rows($Result)==0) {
+ prnMsg(_('There are no sell through support deals entered for this supplier'), 'info');
+ } else {
+ echo '<table cellpadding="2" class="selection">';
+ $TableHeader = '<tr>
+ <th>' . _('Item or Category') . '</th>
+ <th>' . _('Customer') . '</th>
+ <th>' . _('Rebate') . '<br />' . _('Value') . ' ' . $SuppRow['currcode'] . '</th>
+ <th>' . _('Rebate') . '<br />' . _('Percent') . '</th>
+ <th>' . _('Narrative') . '</th>
+ <th>' . _('Effective From') . '</th>
+ <th>' . _('Effective To') . '</th>
+ </tr>';
+
+ echo $TableHeader;
+ $k = 0; //row colour counter
+ while ($myrow = DB_fetch_array($Result)) {
+ if ($k == 1) {
+ echo '<tr class="EvenTableRows">';
+ $k = 0;
+ } else {
+ echo '<tr class="OddTableRows">';
+ $k++;
+ }
+ if ($myrow['categoryid']=='') {
+ $ItemDescription = $myrow['stockid'] . ' - ' . $myrow['description'];
+ } else {
+ $ItemDescription = _('Any') . ' ' . $myrow['categorydescription'];
+ }
+ if ($myrow['debtorno']==''){
+ $Customer = _('All Customers');
+ } else {
+ $Customer = $myrow['debtorno'] . ' - ' . $myrow['name'];
+ }
+
+ printf('<td>%s</td>
+ <td>%s</td>
+ <td class="number">%s</td>
+ <td class="number">%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td><a href="%s?SellSupportID=%s&SupplierID=%s&Edit=1">' . _('Edit') . '</a></td>
+ <td><a href="%s?SellSupportID=%s&Delete=1&SupplierID=%s" onclick=\'return confirm("' . _('Are you sure you wish to delete this sell through support record?') . '");\'>' . _('Delete') . '</a></td>
+ </tr>',
+ $ItemDescription,
+ $Customer,
+ locale_number_format($myrow['rebateamount'],$SuppRow['decimalplaces']),
+ locale_number_format($myrow['rebatepercent']*100,2),
+ $myrow['narrative'],
+ ConvertSQLDate($myrow['effectivefrom']),
+ ConvertSQLDate($myrow['effectiveto']),
+ htmlspecialchars($_SERVER['PHP_SELF']),
+ $myrow['id'],
+ $SupplierID,
+ htmlspecialchars($_SERVER['PHP_SELF']),
+ $myrow['id'],
+ $SupplierID);
+ } //end of while loop
+ echo '</table><br/>';
+ } // end of there are sell through support rows to show
+ echo '<br/>';
+} /* Only show the existing supplier sell through support records if one is not being edited */
+
+/*Show the input form for new supplier sell through support details */
+if (isset($SupplierID)) { //not selecting a supplier
+ if ($Edit == true) {
+ $sql = "SELECT id,
+ debtorno,
+ rebateamount,
+ rebatepercent,
+ effectivefrom,
+ effectiveto,
+ stockid,
+ categoryid,
+ narrative
+ FROM sellthroughsupport
+ WHERE id='" . floatval($_GET['SellSupportID']) . "'";
+
+ $ErrMsg = _('The supplier sell through support could not be retrieved because');
+ $EditResult = DB_query($sql, $db, $ErrMsg);
+ $myrow = DB_fetch_array($EditResult);
+ }
+
+ $SuppName = $myrow['suppname'];
+
+ echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
+ <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
+ <input type="hidden" name="SupplierID" value="' . $SupplierID . '" />
+ <table class="selection">';
+
+ if ($Edit == true) {
+ $_POST['DebtorNo'] = $myrow['debtorno'];
+ $_POST['StockID'] = $myrow['stockid'];
+ $_POST['CategoryID'] = $myrow['categoryid'];
+ $_POST['Narrative'] = $myrow['narrative'];
+ $_POST['RebatePercent'] = locale_number_format($myrow['rebatepercent']*100,2);
+ $_POST['RebateAmount'] = locale_number_format($myrow['rebateamount'],$CurrDecimalPlaces);
+ $_POST['EffectiveFrom'] = ConvertSQLDate($myrow['effectivefrom']);
+ $_POST['EffectiveTo'] = ConvertSQLDate($myrow['effectiveto']);
+
+ echo '<input type="hidden" name="SellSupportID" value="' . $myrow['id'] . '" />';
+ }
+ if (!isset($_POST['RebateAmount'])) {
+ $_POST['RebateAmount'] = 0;
+ }
+ if (!isset($_POST['RebatePercent'])) {
+ $_POST['RebatePercent'] = 0;
+ }
+ if (!isset($_POST['EffectiveFrom'])) {
+ $_POST['EffectiveFrom'] = Date($_SESSION['DefaultDateFormat']);
+ }
+ if (!isset($_POST['EffectiveTo'])) {
+ /* Default EffectiveTo to the end of the month */
+ $_POST['EffectiveTo'] = Date($_SESSION['DefaultDateFormat'], mktime(0,0,0,Date('m')+1,0,Date('y')));
+ }
+ if (!isset($_POST['DebtorNo'])){
+ $_POST['DebtorNo']='';
+ }
+ if (!isset($_POST['Narrative'])){
+ $_POST['Narrative'] ='';
+ }
+
+
+ echo '<tr>
+ <td>' . _('Support for Customer') . ':</td>
+ <td><select name="DebtorNo">';
+ if ($_POST['DebtorNo']=='') {
+ echo '<option selected="selected" value="">' . _('All Customers') . '</option>';
+ } else {
+ echo '<option value="">' . _('All Customers') . '</option>';
+ }
+
+ $CustomerResult = DB_query("SELECT debtorno, name FROM debtorsmaster",$db);
+
+ while ($CustomerRow = DB_fetch_array($CustomerResult)){
+ if ($CustomerRow['debtorno'] == $_POST['DebtorNo']){
+ echo '<option selected="selected" value="' . $CustomerRow['debtorno'] . '">' . $CustomerRow['name'] . '</option>';
+ } else {
+ echo '<option value="' . $CustomerRow['debtorno'] . '">' . $CustomerRow['name'] . '</option>';
+ }
+ }
+ echo '</select></td>
+ </tr>';
+
+ echo '<tr>
+ <td>' . _('Support Whole Category') . ':</td>
+ <td><select name="CategoryID">';
+ if ($_POST['CategoryID']=='') {
+ echo '<option selected="selected" value="">' . _('Specific Item Only') . '</option>';
+ } else {
+ echo '<option value="">' . _('Specific Item Only') . '</option>';
+ }
+
+ $CategoriesResult = DB_query("SELECT categoryid, categorydescription FROM stockcategory WHERE stocktype='F'",$db);
+
+ while ($CategoriesRow = DB_fetch_array($CategoriesResult)){
+ if ($CategoriesRow['categoryid'] == $_POST['CategoryID']){
+ echo '<option selected="selected" value="' . $CategoriesRow['categoryid'] . '">' . $CategoriesRow['categorydescription'] . '</option>';
+ } else {
+ echo '<option value="' . $CategoriesRow['categoryid'] . '">' . $CategoriesRow['categorydescription'] . '</option>';
+ }
+ }
+ echo '</select></td>
+ </tr>';
+
+ echo '<tr>
+ <td>' . _('Support Specific Item') . ':</td>
+ <td><select name="StockID">';
+ if ($_POST['StockID']=='') {
+ echo '<option selected="selected" value="">' . _('Support An Entire Category') . '</option>';
+ } else {
+ echo '<option value="">' . _('Support An Entire Category') . '</option>';
+ }
+
+
+ $SQL = "SELECT stockmaster.stockid,
+ stockmaster.description
+ FROM purchdata INNER JOIN stockmaster
+ ON purchdata.stockid=stockmaster.stockid
+ WHERE supplierno ='" . $SupplierID . "'
+ AND preferred=1";
+ $ErrMsg = _('Could not retrieve the items that the supplier provides');
+ $DbgMsg = _('The SQL that was used to get the supplier items and failed was');
+ $ItemsResult = DB_query($SQL,$db,$ErrMsg,$DbgMsg);
+
+ while ($ItemsRow = DB_fetch_array($ItemsResult)){
+ if ($ItemsRow['stockid'] == $_POST['StockID']){
+ echo '<option selected="selected" value="' . $ItemsRow['stockid'] . '">' . $ItemsRow['stockid'] . ' - ' . $ItemsRow['description'] . '</option>';
+ } else {
+ echo '<option value="' . $ItemsRow['stockid'] . '">' . $ItemsRow['stockid'] . ' - ' . $ItemsRow['description'] . '</option>';
+ }
+ }
+ echo '</select></td>
+ </tr>';
+
+ echo '<tr>
+ <td>' . _('Narrative') . ':</td>
+ <td><input type="text" name="Narrative" maxlength="20" size="21" value="' . $_POST['Narrative'] . '" /></td>
+ </tr>
+ <tr>
+ <td>' . _('Rebate value per unit') . ' (' . $SuppRow['currcode'] . '):</td>
+ <td><input type="text" class="number" name="RebateAmount" maxlength="12" size="12" value="' . $_POST['RebateAmount'] . '" /></td>
+ </tr>
+ <tr>
+ <td>' . _('Rebate Percent') . ':</td>
+ <td><input type="text" class="number" name="RebatePercent" maxlength="5" size="6" value="' . $_POST['RebatePercent'] . '" />%</td>
+ </tr>
+ <tr>
+ <td>' . _('Support Start Date') . ':</td>
+ <td><input type="text" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" name="EffectiveFrom" maxlength="10" size="11" value="' . $_POST['EffectiveFrom'] . '" /></td>
+ </tr>
+ <tr>
+ <td>' . _('Support End Date') . ':</td>
+ <td><input type="text" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" name="EffectiveTo" maxlength="10" size="11" value="' . $_POST['EffectiveTo'] . '" /></td>
+ </tr>
+ </table>
+ <br />
+ <div class="centre">';
+ if ($Edit == true) {
+ echo '<input type="submit" name="UpdateRecord" value="' . _('Update') . '" />';
+ echo '<input type="hidden" name="Edit" value="1" />';
+
+ /*end if there is a supplier sell through support record being updated */
+ } else {
+ echo '<input type="submit" name="AddRecord" value="' . _('Add') . '" />';
+ }
+
+ echo '</div>
+ </form>';
+}
+
+include ('includes/footer.inc');
+?>
|
|
From: <dai...@us...> - 2013-01-29 05:59:56
|
Revision: 5804
http://sourceforge.net/p/web-erp/reponame/5804
Author: daintree
Date: 2013-01-29 05:59:52 +0000 (Tue, 29 Jan 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/doc/Change.log
trunk/doc/Manual/ManualContributors.html
trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot
trunk/sql/mysql/weberp-demo.sql
trunk/sql/mysql/weberp-new.sql
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2013-01-29 02:45:20 UTC (rev 5803)
+++ trunk/doc/Change.log 2013-01-29 05:59:52 UTC (rev 5804)
@@ -1,5 +1,7 @@
webERP Change Log
+27/1/13 Version 4.10.0 Released
+
27/1/13 Phil: Sell Through Support scripts - allows setting up rebate for a customer/supplier/item combinations for a date range with a discount to apply. A claim report allows a listing of invoices/credits where these items have been sold accumulating the claim from the supplier. Claim report needs work.
27/1/13 Phil: Supplier discounts/promotions can now be configured against supplier purchasing data with an effective date range. Purchase orders automatically accumulate and apply the discounts on placing orders.
27/1/13 Tim/Fahad Hatib: Various minor improvements from their fork Kwamoja
Modified: trunk/doc/Manual/ManualContributors.html
===================================================================
--- trunk/doc/Manual/ManualContributors.html 2013-01-29 02:45:20 UTC (rev 5803)
+++ trunk/doc/Manual/ManualContributors.html 2013-01-29 05:59:52 UTC (rev 5804)
@@ -1,6 +1,7 @@
<a id="Contributors"><h1>Contributors - Acknowledgements</h1></a>
<p>
The following is a list of known contributors. Many of these people can usually be contacted by posting to the appropriate mailing list.
+The copyright to the code belongs to these individuals who contributed the code. Collectively this group are referred to as "weberp.org" or the "webERP Project" or the "webERP Developers".
</p>
<table width="100%">
Modified: trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot
===================================================================
--- trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot 2013-01-29 02:45:20 UTC (rev 5803)
+++ trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot 2013-01-29 05:59:52 UTC (rev 5804)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-27 11:28+1300\n"
+"POT-Creation-Date: 2013-01-27 11:37+1300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
Modified: trunk/sql/mysql/weberp-demo.sql
===================================================================
--- trunk/sql/mysql/weberp-demo.sql 2013-01-29 02:45:20 UTC (rev 5803)
+++ trunk/sql/mysql/weberp-demo.sql 2013-01-29 05:59:52 UTC (rev 5804)
@@ -3058,7 +3058,7 @@
/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
--- Dump completed on 2013-01-27 11:28:56
+-- Dump completed on 2013-01-27 11:37:33
-- MySQL dump 10.13 Distrib 5.5.24, for Linux (i686)
--
-- Host: localhost Database: weberpdemo
@@ -102036,7 +102036,7 @@
-- Dumping data for table `www_users`
--
-INSERT INTO `www_users` VALUES ('admin','f0f77a7f88e7c1e93ab4e316b4574c7843b00ea4','Demonstration user','','','','','in...@we...','MEL',8,0,'2013-01-27 11:27:13','','A4','1,1,1,1,1,1,1,1,1,1,1,',0,50,'default','en_GB.utf8',3,0);
+INSERT INTO `www_users` VALUES ('admin','f0f77a7f88e7c1e93ab4e316b4574c7843b00ea4','Demonstration user','','','','','in...@we...','MEL',8,0,'2013-01-27 11:31:44','','A4','1,1,1,1,1,1,1,1,1,1,1,',0,50,'default','en_GB.utf8',3,0);
/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
@@ -102044,5 +102044,5 @@
/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
--- Dump completed on 2013-01-27 11:28:57
+-- Dump completed on 2013-01-27 11:37:34
SET FOREIGN_KEY_CHECKS = 1;
Modified: trunk/sql/mysql/weberp-new.sql
===================================================================
--- trunk/sql/mysql/weberp-new.sql 2013-01-29 02:45:20 UTC (rev 5803)
+++ trunk/sql/mysql/weberp-new.sql 2013-01-29 05:59:52 UTC (rev 5804)
@@ -3056,7 +3056,7 @@
/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
--- Dump completed on 2013-01-27 11:28:56
+-- Dump completed on 2013-01-27 11:37:33
-- MySQL dump 10.13 Distrib 5.5.24, for Linux (i686)
--
-- Host: localhost Database: weberpdemo
@@ -79342,7 +79342,7 @@
-- Dumping data for table `www_users`
--
-INSERT INTO `www_users` VALUES ('admin','f0f77a7f88e7c1e93ab4e316b4574c7843b00ea4','Demonstration user','','','','','in...@we...','MEL',8,0,'2013-01-27 11:27:13','','A4','1,1,1,1,1,1,1,1,1,1,1,',0,50,'default','en_GB.utf8',3,0);
+INSERT INTO `www_users` VALUES ('admin','f0f77a7f88e7c1e93ab4e316b4574c7843b00ea4','Demonstration user','','','','','in...@we...','MEL',8,0,'2013-01-27 11:31:44','','A4','1,1,1,1,1,1,1,1,1,1,1,',0,50,'default','en_GB.utf8',3,0);
--
-- Dumping data for table `edi_orders_segs`
@@ -80066,7 +80066,7 @@
/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
--- Dump completed on 2013-01-27 11:28:56
+-- Dump completed on 2013-01-27 11:37:33
SET FOREIGN_KEY_CHECKS = 1;
UPDATE systypes SET typeno=0;
INSERT INTO shippers VALUES (1,'Default Shipper',0);
|
|
From: <dai...@us...> - 2013-02-01 07:51:26
|
Revision: 5807
http://sourceforge.net/p/web-erp/reponame/5807
Author: daintree
Date: 2013-02-01 07:51:23 +0000 (Fri, 01 Feb 2013)
Log Message:
-----------
fix wiki links
Modified Paths:
--------------
trunk/config.distrib.php
trunk/doc/Change.log
trunk/includes/MiscFunctions.php
Modified: trunk/config.distrib.php
===================================================================
--- trunk/config.distrib.php 2013-01-29 10:28:28 UTC (rev 5806)
+++ trunk/config.distrib.php 2013-02-01 07:51:23 UTC (rev 5807)
@@ -11,10 +11,6 @@
// Whether to display the demo login and password or not on the login screen
$AllowDemoMode = True;
-// webERP version
-
-// $Version = '3.13-rc0 UTF-8 capable';
-
// The timezone of the business - this allows the possibility of having
// the web-server on a overseas machine but record local time
// this is not necessary if you have your own server locally
@@ -58,9 +54,9 @@
//$SessionSavePath = '/tmp';
// which encryption function should be used
-//$CryptFunction = "md5"; // MD5 Hash
-$CryptFunction = "sha1"; // SHA1 Hash
-//$CryptFunction = ""; // Plain Text
+//$CryptFunction = 'md5'; // MD5 Hash
+$CryptFunction = 'sha1'; // SHA1 Hash
+//$CryptFunction = ''; // Plain Text
//Setting to 12 or 24 determines the format of the clock display at the end of all screens
$DefaultClock = 12;
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2013-01-29 10:28:28 UTC (rev 5806)
+++ trunk/doc/Change.log 2013-02-01 07:51:23 UTC (rev 5807)
@@ -1,5 +1,6 @@
webERP Change Log
+31/1/13 Phil: includes/MiscFunctions.php fix wiki links
29/1/13 Tim: Fix sql injection security hole in session.inc.
27/1/13 Version 4.10.0 Released
Modified: trunk/includes/MiscFunctions.php
===================================================================
--- trunk/includes/MiscFunctions.php 2013-01-29 10:28:28 UTC (rev 5806)
+++ trunk/includes/MiscFunctions.php 2013-02-01 07:51:23 UTC (rev 5807)
@@ -248,16 +248,14 @@
$WikiPath='../' . $_SESSION['WikiPath'] . '/';
}
if ($_SESSION['WikiApp']==_('WackoWiki')){
- echo ' ' . _('Wiki ' . $WikiType . ' Knowlege Base') . ' <' . $WikiPath .
-$WikiType . $WikiPageID . '> <br />';
+ echo '<a href="' . $WikiPath . $WikiType . $WikiPageID . '" target="_blank">' . _('Wiki ' . $WikiType . ' Knowlege Base') . ' </a> <br />';
} elseif ($_SESSION['WikiApp']==_('MediaWiki')){
- echo ' ' . _('Wiki ' . $WikiType . ' Knowlege Base') . ' <' . $WikiPath .
-'index.php/' . $WikiType . '/' . $WikiPageID . '> <br />';
+ echo '<a href="' . $WikiPath . 'index.php?title=' . $WikiPageID . '" target="_blank">' . _('Wiki ' . $WikiType . ' Knowlege Base') . '</a><br />';
} elseif ($_SESSION['WikiApp']==_('DokuWiki')){
- echo $WikiPath . '/doku.php?id=' . $WikiType . ':' . $WikiPageID . ' ' . _('Wiki ' .
-$WikiType . ' Knowlege Base') . ' <br />';
+ echo '<a href="' . $WikiPath . '/doku.php?id=' . $WikiType . ':' . $WikiPageID . '" target="_blank">' . _('Wiki ' .$WikiType . ' Knowlege Base') . '</a><br />';
}
}
+
// Lindsay debug stuff
function LogBackTrace( $dest = 0 ) {
error_log( "***BEGIN STACK BACKTRACE***", $dest );
|
|
From: <dai...@us...> - 2013-02-02 00:02:01
|
Revision: 5809
http://sourceforge.net/p/web-erp/reponame/5809
Author: daintree
Date: 2013-02-02 00:01:58 +0000 (Sat, 02 Feb 2013)
Log Message:
-----------
Fixes to wiki links and landscape invoice
Modified Paths:
--------------
trunk/PrintCustTrans.php
trunk/doc/Change.log
trunk/includes/MiscFunctions.php
trunk/includes/PDFTransPageHeader.inc
Added Paths:
-----------
trunk/doc/Manual/ManualSupplierTenders.html
Modified: trunk/PrintCustTrans.php
===================================================================
--- trunk/PrintCustTrans.php 2013-02-01 09:35:06 UTC (rev 5808)
+++ trunk/PrintCustTrans.php 2013-02-02 00:01:58 UTC (rev 5809)
@@ -464,13 +464,13 @@
include('includes/header.inc');
include ('includes/htmlMimeMail.php');
- $FileName = $_SESSION['reports_dir'] . '/' . $_SESSION['DatabaseName'] . '_' . $InvOrCredit . '_' . $_GET['FromTransNo'] . '.pdf';
+ $FileName = $_SESSION['reports_dir'] . '/' . $_SESSION['DatabaseName'] . '_' . $InvOrCredit . '_' . $FromTransNo . '.pdf';
$pdf->Output($FileName,'F');
$mail = new htmlMimeMail();
$Attachment = $mail->getFile($FileName);
- $mail->setText(_('Please find attached') . ' ' . $InvOrCredit . ' ' . $_GET['FromTransNo'] );
- $mail->SetSubject($InvOrCredit . ' ' . $_GET['FromTransNo']);
+ $mail->setText(_('Please find attached') . ' ' . $InvOrCredit . ' ' . $FromTransNo );
+ $mail->SetSubject($InvOrCredit . ' ' . $FromTransNo);
$mail->addAttachment($Attachment, $FileName, 'application/pdf');
$mail->setFrom($_SESSION['CompanyRecord']['coyname'] . ' <' . $_SESSION['CompanyRecord']['email'] . '>');
$result = $mail->send(array($_GET['Email']));
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2013-02-01 09:35:06 UTC (rev 5808)
+++ trunk/doc/Change.log 2013-02-02 00:01:58 UTC (rev 5809)
@@ -1,5 +1,6 @@
webERP Change Log
+2/1/13 Phil: Fix PDFTransPageHeader.inc landscape invoice printing
31/1/13 Tim: includes/MiscFunctions.php fix wiki links
29/1/13 Tim: Fix sql injection security hole in session.inc.
Added: trunk/doc/Manual/ManualSupplierTenders.html
===================================================================
--- trunk/doc/Manual/ManualSupplierTenders.html (rev 0)
+++ trunk/doc/Manual/ManualSupplierTenders.html 2013-02-02 00:01:58 UTC (rev 5809)
@@ -0,0 +1,46 @@
+<a id="SupplierTenders"><h1>Supplier Tendering System</h1></a>
+<h2>Overview</h2>
+<p>The tendering system enables a company to create tenders for suppliers of one or more items, to send those tenders to one or many suppliers, to enable those suppliers to login to webERP in order to submit their tenders, and enables the company to turn a tender into an order.</p>
+<p>It also allows selected suppliers to login to webERP, to create "offers", whereby the supplier offers a certain quantity of one or many items at a given price. The company can elect to turn that offer into a purchase order, or to decline the offer</p>
+<p>The system works by emails being automatically sent between suppliers and the company and so depends upon the supplier email address being filled out.</p>
+
+<h2>Creating a Tender</h2>
+<p>In order to create a tender, a user must be given permissions to create them. This is done within the user settings screen, and defaults to not allowing the user to create tenders.</p>
+<p>The create a new tender screen is accessed via the Purchases module. There are three sections to creating a tender, the header details, selecting suppliers to send the tender to, and selecting the items that we wish tenders to be submitted for.</p>
+
+<ul>
+ <li><h3>Tender Header Details</h3>
+ <p>The tender header has fields for the date when the delivery must be made, the warehouse that delivery will be needed to, and the contact details for the person dealing with the tender.</p>
+ </li>
+ <li><h3>Suppliers to be invited to tender.</h3>
+ <p>Clicking on the "Select Suppliers" button brings up a screen to search for suppliers. Only suppliers with email addresses input will show in the supplier search screen. This is because the tendering system works by sending emails to everyone involved. You can choose as many suppliers as you want to send the tender request to.</p>
+ </li>
+ <li><h3>Items to be included in the tender</h3>
+ <p>Clicking on the "Select Item Details" button brings up an item search screen. You can search for any item currently set up on KwaMoja and select any quantity to be put for tender. You can select multiple items from one screen. Any number of otems can be on the tender.</p>
+ </li>
+</ul>
+
+<h2>Editing a Tender</h2>
+<p>Once a tender has been created it can be edited in the "Edit Existing Tenders" screen accessible from the purchasing module.</p>
+<p>When you enter this screen a list of all outstanding tenders is shown and you can select which tender to edit.</p>
+
+<h2>Suppliers making an offer</h2>
+<p>When a supplier receives the email notifying them os the tender they can login using the supplier login previously created for them. This will give them an option to "View any open tenders without an offer". Choosing this option allows the supplier to see any tenders open for them to submit, and enables them to give a price, and adjust the quantities and dates if necessary. Processing the tender will then send this information by email back to the company, and updae the database with the tender submitted by the supplier.</p>
+
+<h2>Supplier Offers</h2>
+<p>Sometimes it can occur that a supplier wishes to offer a one off deal of a c ertain quantity of a product or products at a special price. The supplier can use their supplier login to webERP to send you this offer.</p>
+<p>From the supplier login screen the supplier should choose the "Create a new offer" option. This will present them with a stock item selection screen. They can select any number of items here and enter the quantity they wish to offer and the price at which they wish to offer them.</p>
+<p>This offer can have as many items on it as the supplier wishes. Once completed an email is sent to the company</p>
+<p>Existing offers can be edited by selecting the "View or Amend outstanding offers" from the menu.</p>
+
+<h2>Actioning an offer</h2>
+<p>When the company has received offers from suppliers, either as a result of a tender, or directly from the supplier, these can be actioned by selecting the "Process Tenders and Offers" option from the purchases module menu screen. This supplies a drop down list of all suppliers who have made an offer, and the offer is still outstanding. You can view a particular suppliers offer by selecting that supplier.</p>
+<p>Each line of an offer will have three possible actions against it
+<ul>
+ <li>Accept</li>
+ <li>Reject</li>
+ <li>Defer</li>
+</ul>
+If the accept option is chosen, then it gets converted into a purchase order (providing the user has the authority to create orders in that currency).</p>
+<p>Choosing the reject option will remove this offer from the system, and notify the supplier cthat the offer has been rejected.</p>
+<p>Choosing the defer option will leave that offer on the system and it will appear again the next time this option is chosen</p>
\ No newline at end of file
Modified: trunk/includes/MiscFunctions.php
===================================================================
--- trunk/includes/MiscFunctions.php 2013-02-01 09:35:06 UTC (rev 5808)
+++ trunk/includes/MiscFunctions.php 2013-02-02 00:01:58 UTC (rev 5809)
@@ -248,11 +248,11 @@
$WikiPath='../' . $_SESSION['WikiPath'] . '/';
}
if ($_SESSION['WikiApp']==_('WackoWiki')){
- echo '<a href="' . $WikiPath . $WikiType . $WikiPageID . '" target="_blank">' . _('Wiki ' . $WikiType . ' Knowlege Base') . ' </a> <br />';
+ echo '<a target="_blank" href="' . $WikiPath . $WikiType . $WikiPageID . '" target="_blank">' . _('Wiki ' . $WikiType . ' Knowledge Base') . ' </a> <br />';
} elseif ($_SESSION['WikiApp']==_('MediaWiki')){
- echo '<a href="' . $WikiPath . 'index.php?title=' . $WikiPageID . '" target="_blank">' . _('Wiki ' . $WikiType . ' Knowlege Base') . '</a><br />';
+ echo '<a target="_blank" href="' . $WikiPath . 'index.php/' . $WikiType . '/' . $WikiPageID . '">' . _('Wiki ' . $WikiType . ' Knowledge Base') . '</a><br />';
} elseif ($_SESSION['WikiApp']==_('DokuWiki')){
- echo '<a href="' . $WikiPath . '/doku.php?id=' . $WikiType . ':' . $WikiPageID . '" target="_blank">' . _('Wiki ' .$WikiType . ' Knowlege Base') . '</a><br />';
+ echo '<a target="_blank" href="' . $WikiPath . '/doku.php?id=' . $WikiType . ':' . $WikiPageID . '" target="_blank">' . _('Wiki ' . $WikiType . ' Knowledge Base') . '</a><br />';
}
}
Modified: trunk/includes/PDFTransPageHeader.inc
===================================================================
--- trunk/includes/PDFTransPageHeader.inc 2013-02-01 09:35:06 UTC (rev 5808)
+++ trunk/includes/PDFTransPageHeader.inc 2013-02-02 00:01:58 UTC (rev 5809)
@@ -92,7 +92,7 @@
$XPos +=80;
if ($myrow['invaddrbranch']==0){
- $pdf->addText($XPos, $YPos, $FontSize, html_entity_decode(myrow['name']));
+ $pdf->addText($XPos, $YPos, $FontSize, html_entity_decode($myrow['name']));
$pdf->addText($XPos, $YPos-14, $FontSize, html_entity_decode($myrow['address1']));
$pdf->addText($XPos, $YPos-28, $FontSize, html_entity_decode($myrow['address2']));
$pdf->addText($XPos, $YPos-42, $FontSize, html_entity_decode($myrow['address3']) . ' ' . html_entity_decode($myrow['address4']));
|
|
From: <dai...@us...> - 2013-02-07 07:04:40
|
Revision: 5815
http://sourceforge.net/p/web-erp/reponame/5815
Author: daintree
Date: 2013-02-07 07:04:35 +0000 (Thu, 07 Feb 2013)
Log Message:
-----------
add standard bin location
Modified Paths:
--------------
trunk/Contracts.php
trunk/Labels.php
trunk/PrintCustTrans.php
trunk/css/gel/login.css
trunk/css/wood/login.css
trunk/doc/Change.log
Modified: trunk/Contracts.php
===================================================================
--- trunk/Contracts.php 2013-02-02 16:24:54 UTC (rev 5814)
+++ trunk/Contracts.php 2013-02-07 07:04:35 UTC (rev 5815)
@@ -680,7 +680,7 @@
}
} /*one of keywords or custcode was more than a zero length string */
-if (isset($_POST['SelectedCustomer1'])) {
+if (isset($_POST['SelectedCustomer'])) {
/* will only be true if page called from customer selection form
* or set because only one customer record returned from a search
Modified: trunk/Labels.php
===================================================================
--- trunk/Labels.php 2013-02-02 16:24:54 UTC (rev 5814)
+++ trunk/Labels.php 2013-02-07 07:04:35 UTC (rev 5815)
@@ -19,6 +19,99 @@
$PaperSize['Legal']['PageHeight'] = 355.6;
$PaperSize['Legal']['PageWidth'] = 215.9;
+
+
+$LabelPaper['DPS01 *']['PageWidth'] = 210;
+$LabelPaper['DPS01 *']['PageHeight']= 297;
+$LabelPaper['DPS01 *']['Height'] = 297;
+$LabelPaper['DPS01 *']['TopMargin'] = 0;
+$LabelPaper['DPS01 *']['Width'] = 210;
+$LabelPaper['DPS01 *']['LeftMargin']= 0;
+$LabelPaper['DPS01 *']['RowHeight'] = 297;
+$LabelPaper['DPS01 *']['ColumnWidth']= 210;
+$LabelPaper['DPS01 *']['PageWidth'] = 210;
+$LabelPaper['DPS01 *']['PageHeight']= 297;
+
+/*
+
+'DPS01 *',210,297,210,297,0,0,0,0);
+'DPS02 *',210,297,210,149,0,0,0,0);
+'DPS08 *',210,297,105,71,7,7,0,0);
+'DPS10 *',210,297,105,59.6,0,0,0,0);
+'DPS16 *',210,297,105,37,0,0,0,0);
+'DPS24 *',210,297,70,36,0,0,0,0);
+'DPS30 *',210,297,70,30,0,0,0,0);
+'DPS04 *',210,297,105,149,0,0,0,0);
+'J5101 *',210,297,38,69,0,0,0,0);
+'J5102 *',210,297,63.5,38,0,0,0,0);
+'J5103 *',210,297,38,135,0,0,0,0);
+'L4730 *',210,297,17.8,10,0,0,0,0);
+'L4743 *',210,297,99.1,42.3,0,0,0,0);
+'L6008 *',210,297,25.4,10,0,0,0,0);
+'L6009 *',210,297,45.7,21.2,0,0,0,0);
+'L6011 *',210,297,63.5,29.6,0,0,0,0);
+'L6012 *',210,297,96,50.8,0,0,0,0);
+'L7102 *',210,297,192,39,0,0,0,0);
+'L7159 *',210,297,63.5,33.9,0,0,0,0);
+'L7160 *',210,297,63.5,38.1,0,0,0,0);
+'L7161 *',210,297,63.5,46.6,0,0,0,0);
+'L7162 *',210,297,99.1,34,0,0,0,0);
+'L7163 *',210,297,99.1,38.1,0,0,0,0);
+'L7164',210,297,63.5,72,0,0,0,0);
+'L7165 *',210,297,99.1,67.7,0,0,0,0);
+'L7166',210,297,99.1,93.1,0,0,0,0);
+'L7167 *',210,297,199.6,289.1,0,0,0,0);
+'L7168 *',210,297,199.6,143.5,0,0,0,0);
+'L7169 *',210,297,99.1,139,0,0,0,0);
+'L7170 *',210,297,134,11,0,0,0,0);
+'L7171 *',210,297,200,60,0,0,0,0);
+'L7172 *',210,297,100,30,0,0,0,0);
+'L7173 *',210,297,99.1,57,0,0,0,0);
+'L7409 *',210,297,57,15,0,0,0,0);
+'L7644 *',210,297,133,29.6,0,0,0,0);
+'L7651 *',210,297,38.1,21.2,0,0,0,0);
+'L7654 *',210,297,45.7,25.4,0,0,0,0);
+'L7664 *',210,297,71,70,0,0,0,0);
+'L7665 *',210,297,72,21.15,0,0,0,0);
+'L7666 *',210,297,70,52,0,0,0,0);
+'L7668 *',210,297,59,51,0,0,0,0);
+'L7670 *',210,297,65,65,0,0,0,0);
+'L7671 *',210,297,76.2,46.4,0,0,0,0);
+'L7674 *',210,297,145,17,0,0,0,0);
+'L7701 *',210,297,192,62,0,0,0,0);
+'EL1S',210,297,210,287,0,0,0,0);
+'VSL3B',210,297,191,99.48,0,0,0,0);
+'EL3 LL03NSE',210,297,210,99.48,0,0,0,0);
+'SLSQ95',210,297,95,95,0,0,0,0);
+'EL6 LL06NSE',210,297,105,99.48,0,0,0,0);
+'VSL6',210,297,70,149,0,0,0,0);
+'EL8 LL08NSE',210,297,105,74.2,0,0,0,0);
+'EL8SB',210,297,72,99,0,0,0,0);
+'EL10S',210,297,105,57,0,0,0,0);
+'EL12S',210,297,105,48,0,0,0,0);
+'EL14 LL14NSE',210,297,105,42.5,0,0,0,0);
+'EL15S',210,297,70,50,0,0,0,0);
+'SLSQ51',210,297,51,51,0,0,0,0);
+'EL15',210,297,70,59.6,0,0,0,0);
+'EL16S LL16SE',210,297,105,35,0,0,0,0);
+'EL21S LL21SE',210,297,70,38,0,0,0,0);
+'EL21',210,297,70,42.5,0,0,0,0);
+'EL24LS',210,297,70,34,0,0,0,0);
+'EL24S LL24SE',210,297,70,35,0,0,0,0);
+'EL24 LL24NSE',210,297,70,37,0,0,0,0);
+'EL27S',210,297,70,32,0,0,0,0);
+'VSL33D',210,297,53,21,0,0,0,0);
+'EL33S',210,297,70,25.4,0,0,0,0);
+'SLSQ37',210,297,37,37,0,0,0,0);
+'VSL36SB',210,297,90,12,0,0,0,0);
+'LL36',210,297,48.9,29.6,0,0,0,0);
+'VSL56SB',210,297,89,10,0,0,0,0);
+'EL56',210,297,52.5,21.3,0,0,0,0);
+'SLSQ25',210,297,25,25,0,0,0,0);
+
+*/
+
+
echo '<p class="page_title_text">
<img src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' . _('Label Template Maintenance')
. '" alt="" />' . $Title. '
@@ -46,8 +139,12 @@
}
}
}
- if (ctype_digit($_POST['VPos']) AND ctype_digit($_POST['HPos']) AND ctype_digit($_POST['FontSize'])){
+ if (ctype_digit($_POST['VPos'])
+ AND ctype_digit($_POST['HPos'])
+ AND ctype_digit($_POST['FontSize'])){
+
//insert the new label field entered
+
$result = DB_query("INSERT INTO labelfields (labelid,
fieldvalue,
vpos,
@@ -80,9 +177,12 @@
$Message = '';
if (isset($_POST['PaperSize']) AND $_POST['PaperSize']!='custom'){
+
$_POST['PageWidth'] = $PaperSize[$_POST['PaperSize']]['PageWidth'];
$_POST['PageHeight'] = $PaperSize[$_POST['PaperSize']]['PageHeight'];
+
} elseif ($_POST['PaperSize']=='custom' AND !isset($_POST['PageWidth'])){
+
$_POST['PageWidth'] = 0;
$_POST['PageHeight'] = 0;
}
@@ -136,7 +236,7 @@
$result = DB_query($sql,$db,$ErrMsg);
$Message = _('The new label template has been added to the database');
}
- //run the SQL from either of the above possibilites
+
if (isset($InputError) AND $InputError !=1) {
unset( $_POST['PaperSize']);
unset( $_POST['Description']);
@@ -155,7 +255,7 @@
} elseif (isset($_GET['delete'])) {
//the link to delete a selected record was clicked instead of the submit button
- /*Cascade deletes in TaxAuthLevels */
+ /*Cascade deletes in labelfields */
$result = DB_query("DELETE FROM labelfields WHERE labelid= '" . $SelectedLabelID . "'",$db);
$result = DB_query("DELETE FROM labels WHERE labelid= '" . $SelectedLabelID . "'",$db);
prnMsg(_('The selected label template has been deleted'),'success');
Modified: trunk/PrintCustTrans.php
===================================================================
--- trunk/PrintCustTrans.php 2013-02-02 16:24:54 UTC (rev 5814)
+++ trunk/PrintCustTrans.php 2013-02-07 07:04:35 UTC (rev 5815)
@@ -287,7 +287,7 @@
$DisplayQty=locale_number_format($myrow2['quantity'],$myrow2['decimalplaces']);
$LeftOvers = $pdf->addTextWrap($Left_Margin+3,$YPos,95,$FontSize,$myrow2['stockid']);
- $LeftOvers = $pdf->addTextWrap($Left_Margin+100,$YPos,123,$FontSize,$myrow2['description']);
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+100,$YPos,251,$FontSize,$myrow2['description']);
$LeftOvers = $pdf->addTextWrap($Left_Margin+353,$YPos,96,$FontSize,$DisplayPrice,'right');
$LeftOvers = $pdf->addTextWrap($Left_Margin+453,$YPos,95,$FontSize,$DisplayQty,'right');
$LeftOvers = $pdf->addTextWrap($Left_Margin+553,$YPos,35,$FontSize,$myrow2['units'],'centre');
Modified: trunk/css/gel/login.css
===================================================================
--- trunk/css/gel/login.css 2013-02-02 16:24:54 UTC (rev 5814)
+++ trunk/css/gel/login.css 2013-02-07 07:04:35 UTC (rev 5815)
@@ -42,6 +42,7 @@
padding:12px;
width:190px;
}
+
input.button{
background:none repeat scroll 0 0 transparent;
border:thick outset blue;
Modified: trunk/css/wood/login.css
===================================================================
--- trunk/css/wood/login.css 2013-02-02 16:24:54 UTC (rev 5814)
+++ trunk/css/wood/login.css 2013-02-07 07:04:35 UTC (rev 5815)
@@ -33,14 +33,13 @@
#login_logo {
background:url("../webERP.gif") no-repeat scroll center center #FFFFFF;
- border:medium outset gray;
- border-radius:19px 19px 19px 19px;
- height:44px;
- margin:10% auto;
- padding:12px;
- width:190px;
+border:medium outset gray;
+border-radius:19px 19px 19px 19px;
+height:44px;
+margin:10% auto;
+padding:12px;
+width:190px;
}
-
/*input{
background:none repeat scroll 0 0 transparent;
border:thick outset #FFEEBB;
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2013-02-02 16:24:54 UTC (rev 5814)
+++ trunk/doc/Change.log 2013-02-07 07:04:35 UTC (rev 5815)
@@ -1,5 +1,9 @@
webERP Change Log
+2/2/13 Version 4.10.1 Released
+
+2/2/13 Phil: Refix wiki links
+2/2/13 Phil: Fix PDFTransPageHeader.inc landscape invoice printing
2/2/13 Tim: Fixed up syntax error in InternalStockCategoriesByRole.php
1/2/13 Fahad Hatib: NewManual page for Supplier Tendering brought in from KwaMoja
2/1/13 Phil: Fix PDFTransPageHeader.inc landscape invoice printing
|
|
From: <dai...@us...> - 2013-02-07 07:54:43
|
Revision: 5816
http://sourceforge.net/p/web-erp/reponame/5816
Author: daintree
Date: 2013-02-07 07:54:41 +0000 (Thu, 07 Feb 2013)
Log Message:
-----------
add standard bin location
Modified Paths:
--------------
trunk/PrintCustOrder_generic.php
trunk/StockStatus.php
trunk/includes/PDFOrderPageHeader_generic.inc
trunk/sql/mysql/upgrade4.09-4.10.sql
Modified: trunk/PrintCustOrder_generic.php
===================================================================
--- trunk/PrintCustOrder_generic.php 2013-02-07 07:04:35 UTC (rev 5815)
+++ trunk/PrintCustOrder_generic.php 2013-02-07 07:54:41 UTC (rev 5816)
@@ -59,15 +59,15 @@
shippers.shippername,
salesorders.printedpackingslip,
salesorders.datepackingslipprinted,
- locations.locationname
- FROM salesorders,
- debtorsmaster,
- shippers,
- locations
- WHERE salesorders.debtorno=debtorsmaster.debtorno
- AND salesorders.shipvia=shippers.shipper_id
- AND salesorders.fromstkloc=locations.loccode
- AND salesorders.orderno='" . $_GET['TransNo'] . "'";
+ locations.locationname,
+ salesorders.fromstkloc
+ FROM salesorders INNER JOIN debtorsmaster
+ ON salesorders.debtorno=debtorsmaster.debtorno
+ INNER JOIN shippers
+ ON salesorders.shipvia=shippers.shipper_id
+ INNER JOIN locations
+ ON salesorders.fromstkloc=locations.loccode
+ WHERE salesorders.orderno='" . $_GET['TransNo'] . "'";
$result=DB_query($sql,$db, $ErrMsg);
@@ -155,8 +155,7 @@
$pdf->newPage();
}
/* Now ... Has the order got any line items still outstanding to be invoiced */
- $ErrMsg = _('There was a problem retrieving the order details for Order Number') . ' ' .
- $_GET['TransNo'] . ' ' . _('from the database');
+ $ErrMsg = _('There was a problem retrieving the order details for Order Number') . ' ' . $_GET['TransNo'] . ' ' . _('from the database');
$sql = "SELECT salesorderdetails.stkcode,
stockmaster.description,
@@ -165,10 +164,14 @@
salesorderdetails.unitprice,
salesorderdetails.narrative,
stockmaster.mbflag,
- stockmaster.decimalplaces
+ stockmaster.decimalplaces,
+ locstock.bin
FROM salesorderdetails INNER JOIN stockmaster
- ON salesorderdetails.stkcode=stockmaster.stockid
- WHERE salesorderdetails.orderno='" . $_GET['TransNo'] . "'";
+ ON salesorderdetails.stkcode=stockmaster.stockid
+ INNER JOIN locstock
+ ON stockmaster.stockid = locstock.stockid
+ WHERE locstock.loccode = '" . $myrow['fromstkloc'] . "'
+ AND salesorderdetails.orderno='" . $_GET['TransNo'] . "'";
$result=DB_query($sql,$db, $ErrMsg);
if (DB_num_rows($result)>0){
@@ -186,8 +189,9 @@
$LeftOvers = $pdf->addTextWrap($XPos,$YPos,127,$FontSize,$myrow2['stkcode']);
$LeftOvers = $pdf->addTextWrap(147,$YPos,255,$FontSize,$myrow2['description']);
$LeftOvers = $pdf->addTextWrap(400,$YPos,85,$FontSize,$DisplayQty,'right');
- $LeftOvers = $pdf->addTextWrap(503,$YPos,85,$FontSize,$DisplayQtySupplied,'right');
- $LeftOvers = $pdf->addTextWrap(602,$YPos,85,$FontSize,$DisplayPrevDel,'right');
+ $LeftOvers = $pdf->addTextWrap(487,$YPos,70,$FontSize,$myrow2['bin'],'left');
+ $LeftOvers = $pdf->addTextWrap(573,$YPos,85,$FontSize,$DisplayQtySupplied,'right');
+ $LeftOvers = $pdf->addTextWrap(672,$YPos,85,$FontSize,$DisplayPrevDel,'right');
if ($YPos-$line_height <= 50){
/* We reached the end of the page so finsih off the page and start a newy */
Modified: trunk/StockStatus.php
===================================================================
--- trunk/StockStatus.php 2013-02-07 07:04:35 UTC (rev 5815)
+++ trunk/StockStatus.php 2013-02-07 07:54:41 UTC (rev 5816)
@@ -16,9 +16,14 @@
$StockID = '';
}
-// This is already linked from this page
-//echo "<a href='" . $RootPath . '/SelectProduct.php?' . SID . "'>" . _('Back to Items') . '</a><br />';
-
+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 . "'";
+ $result = DB_query($sql, $db);
+ }
+ }
+}
$result = DB_query("SELECT description,
units,
mbflag,
@@ -62,6 +67,7 @@
locations.locationname,
locstock.quantity,
locstock.reorderlevel,
+ locstock.bin,
locations.managed
FROM locstock INNER JOIN locations
ON locstock.loccode=locations.loccode
@@ -76,13 +82,14 @@
<table class="selection">';
if ($Its_A_KitSet_Assembly_Or_Dummy == True){
- $tableheader = '<tr>
+ $TableHeader = '<tr>
<th>' . _('Location') . '</th>
<th>' . _('Demand') . '</th>
</tr>';
} else {
- $tableheader = '<tr>
+ $TableHeader = '<tr>
<th>' . _('Location') . '</th>
+ <th>' . _('Bin Location') . '</th>
<th>' . _('Quantity On Hand') . '</th>
<th>' . _('Re-Order Level') . '</th>
<th>' . _('Demand') . '</th>
@@ -91,7 +98,7 @@
<th>' . _('On Order') . '</th>
</tr>';
}
-echo $tableheader;
+echo $TableHeader;
$j = 1;
$k=0; //row colour counter
@@ -234,7 +241,8 @@
$Available = $myrow['quantity'] - $DemandQty;
}
- echo '<td>' . $myrow['locationname'] . '</td>';
+ echo '<td>' . $myrow['locationname'] . '</td>
+ <td><input type="text" name="BinLocation' . $myrow['loccode'] . '" value="' . $myrow['bin'] . '" maxlength="10" size="11" onchange="ReloadForm(UpdateBinLocations)"/></td>';
printf('<td class="number">%s</td>
<td class="number">%s</td>
@@ -269,7 +277,11 @@
//end of page full new headings if
}
//end of while loop
-echo '</table>';
+echo '<tr>
+ <td></td>
+ <td><input type="submit" name="UpdateBinLocations" value="' . _('Update Bins') . '" /></td>
+ </tr>
+ </table>';
if (isset($_GET['DebtorNo'])){
$DebtorNo = trim(mb_strtoupper($_GET['DebtorNo']));
@@ -334,11 +346,11 @@
}
if (isset($PriceHistory)) {
echo '<br />
- <table class="selection">';
- echo '<tr>
+ <table class="selection">
+ <tr>
<th colspan="4"><font color="navy" size="2">' . _('Pricing history for sales of') . ' ' . $StockID . ' ' . _('to') . ' ' . $DebtorNo . '</font></th>
</tr>';
- $tableheader = '<tr>
+ $TableHeader = '<tr>
<th>' . _('Date Range') . '</th>
<th>' . _('Quantity') . '</th>
<th>' . _('Price') . '</th>
@@ -352,7 +364,7 @@
$j--;
if ($j < 0 ){
$j = 11;
- echo $tableheader;
+ echo $TableHeader;
}
if ($k==1){
@@ -381,10 +393,10 @@
}
}//end of displaying price history for a debtor
-echo '<br /><a href="' . $RootPath . '/StockMovements.php?StockID=' . $StockID . '">' . _('Show Movements') . '</a>';
-echo '<br /><a href="' . $RootPath . '/StockUsage.php?StockID=' . $StockID . '">' . _('Show Usage') . '</a>';
-echo '<br /><a href="' . $RootPath . '/SelectSalesOrder.php?SelectedStockItem=' . $StockID . '">' . _('Search Outstanding Sales Orders') . '</a>';
-echo '<br /><a href="' . $RootPath . '/SelectCompletedOrder.php?SelectedStockItem=' . $StockID . '">' . _('Search Completed Sales Orders') . '</a>';
+echo '<br /><a href="' . $RootPath . '/StockMovements.php?StockID=' . $StockID . '">' . _('Show Movements') . '</a>
+ <br /><a href="' . $RootPath . '/StockUsage.php?StockID=' . $StockID . '">' . _('Show Usage') . '</a>
+ <br /><a href="' . $RootPath . '/SelectSalesOrder.php?SelectedStockItem=' . $StockID . '">' . _('Search Outstanding Sales Orders') . '</a>
+ <br /><a href="' . $RootPath . '/SelectCompletedOrder.php?SelectedStockItem=' . $StockID . '">' . _('Search Completed Sales Orders') . '</a>';
if ($Its_A_KitSet_Assembly_Or_Dummy ==False){
echo '<br /><a href="' . $RootPath . '/PO_SelectOSPurchOrder.php?SelectedStockItem=' . $StockID . '">' . _('Search Outstanding Purchase Orders') . '</a>';
}
Modified: trunk/includes/PDFOrderPageHeader_generic.inc
===================================================================
--- trunk/includes/PDFOrderPageHeader_generic.inc 2013-02-07 07:04:35 UTC (rev 5815)
+++ trunk/includes/PDFOrderPageHeader_generic.inc 2013-02-07 07:54:41 UTC (rev 5816)
@@ -91,8 +91,9 @@
$LeftOvers = $pdf->addTextWrap($XPos,$YPos,127,$FontSize, _('Item Code'),'left');
$LeftOvers = $pdf->addTextWrap(147,$YPos,255,$FontSize, _('Item Description'),'left');
$LeftOvers = $pdf->addTextWrap(400,$YPos,85,$FontSize, _('Quantity'),'right');
-$LeftOvers = $pdf->addTextWrap(503,$YPos,85,$FontSize,_('This Del'),'right');
-$LeftOvers = $pdf->addTextWrap(602,$YPos,85,$FontSize, _('Prev Dels'),'right');
+$LeftOvers = $pdf->addTextWrap(487,$YPos,70,$FontSize, _('Bin Locn'),'center');
+$LeftOvers = $pdf->addTextWrap(573,$YPos,85,$FontSize,_('This Del'),'center');
+$LeftOvers = $pdf->addTextWrap(672,$YPos,85,$FontSize, _('Prev Dels'),'center');
$YPos -= $line_height;
Modified: trunk/sql/mysql/upgrade4.09-4.10.sql
===================================================================
--- trunk/sql/mysql/upgrade4.09-4.10.sql 2013-02-07 07:04:35 UTC (rev 5815)
+++ trunk/sql/mysql/upgrade4.09-4.10.sql 2013-02-07 07:54:41 UTC (rev 5816)
@@ -55,5 +55,6 @@
INSERT INTO scripts VALUES ('MaterialsNotUsed.php', '4', 'Lists the items from Raw Material Categories not used in any BOM (thus, not used at all)');
INSERT INTO scripts VALUES ('SellThroughSupport.php', '9', 'Defines the items, period and quantum of support for which supplier has agreed to provide.');
INSERT INTO scripts VALUES ('PDFSellThroughSupportClaim.php', '9', 'Reports the sell through support claims to be made against all suppliers for a given date range.');
+ALTER TABLE `locstock` ADD `bin` VARCHAR( 10 ) NOT NULL , ADD INDEX ( `bin` );
UPDATE config SET confvalue='4.10.0' WHERE confname='VersionNumber';
|
|
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...
[truncated message content] |
|
From: <tim...@us...> - 2013-02-15 13:11:00
|
Revision: 5817
http://sourceforge.net/p/web-erp/reponame/5817
Author: tim_schofield
Date: 2013-02-15 13:10:58 +0000 (Fri, 15 Feb 2013)
Log Message:
-----------
New script to upload a sales price list from a csv file.
Modified Paths:
--------------
trunk/includes/MainMenuLinksArray.php
Added Paths:
-----------
trunk/UploadPriceList.php
trunk/sql/mysql/upgrade4.10-4.11.sql
Added: trunk/UploadPriceList.php
===================================================================
--- trunk/UploadPriceList.php (rev 0)
+++ trunk/UploadPriceList.php 2013-02-15 13:10:58 UTC (rev 5817)
@@ -0,0 +1,173 @@
+<?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 containing these four fields for each price to be uploaded.') . '<br />' .
+ _('The StockID, PriceListID, and CurrencyCode fields must have a corresponding entry in the stockmaster, salestypes, and currencies tables.') . '</div>';
+
+ echo '<br /><input type="hidden" name="MAX_FILE_SIZE" value="1000000" />' .
+ _('Prices effective from') . ': <input type="text" name="StartDate" size="10" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" value="' . date($_SESSION['DefaultDateFormat']) . '" /> ' .
+ _('Upload file') . ': <input name="userfile" type="file" />
+ <input type="submit" name="submit" value="' . _('Send File') . '" />
+ </div>
+ </form>';
+
+}
+
+include('includes/footer.inc');
+
+?>
\ No newline at end of file
Modified: trunk/includes/MainMenuLinksArray.php
===================================================================
--- trunk/includes/MainMenuLinksArray.php 2013-02-07 07:54:41 UTC (rev 5816)
+++ trunk/includes/MainMenuLinksArray.php 2013-02-15 13:10:58 UTC (rev 5817)
@@ -34,7 +34,7 @@
_('Special Order'),
_('Recurring Order Template'),
_('Process Recurring Orders'));
-
+
$MenuItems['orders']['Transactions']['URL'] = array( '/SelectOrderItems.php?NewOrder=Yes',
'/CounterSales.php',
'/CounterReturns.php',
@@ -195,7 +195,7 @@
_('Create a New Internal Stock Request'),
_('Authorise Internal Stock Requests'),
_('Fulfill Internal Stock Requests') );
-
+
$MenuItems['stock']['Transactions']['URL'] = array ('/PO_SelectOSPurchOrder.php',
'/StockLocTransfer.php',
'/StockLocTransferReceive.php',
@@ -256,18 +256,20 @@
_('Sales Category Maintenance'),
_('Add or Update Prices Based On Costs'),
_('View or Update Prices Based On Costs'),
+ _('Upload new prices from csv file'),
_('Reorder Level By Category/Location') );
-
+
$MenuItems['stock']['Maintenance']['URL'] = array ('/Stocks.php',
'/SelectProduct.php',
'/SalesCategories.php',
'/PricesBasedOnMarkUp.php',
'/PricesByCost.php',
+ '/UploadPriceList.php',
'/ReorderLevelLocation.php' );
$MenuItems['manuf']['Transactions']['Caption'] = array (_('Work Order Entry'),
_('Select A Work Order') );
-
+
$MenuItems['manuf']['Transactions']['URL'] = array ('/WorkOrderEntry.php',
'/SelectWorkOrder.php' );
Added: trunk/sql/mysql/upgrade4.10-4.11.sql
===================================================================
--- trunk/sql/mysql/upgrade4.10-4.11.sql (rev 0)
+++ trunk/sql/mysql/upgrade4.10-4.11.sql 2013-02-15 13:10:58 UTC (rev 5817)
@@ -0,0 +1,4 @@
+
+INSERT INTO scripts VALUES ('UploadPriceList.php', '15', 'Loads a new price list from a csv file');
+
+UPDATE config SET confvalue='4.10.1' WHERE confname='VersionNumber';
|
|
From: <dai...@us...> - 2013-02-25 09:25:23
|
Revision: 5824
http://sourceforge.net/p/web-erp/reponame/5824
Author: daintree
Date: 2013-02-25 09:25:12 +0000 (Mon, 25 Feb 2013)
Log Message:
-----------
change log sequence fix
Modified Paths:
--------------
trunk/doc/Change.log
trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot
trunk/sql/mysql/weberp-demo.sql
trunk/sql/mysql/weberp-new.sql
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2013-02-24 22:27:03 UTC (rev 5823)
+++ trunk/doc/Change.log 2013-02-25 09:25:12 UTC (rev 5824)
@@ -3,6 +3,8 @@
24/2/13 Tim Schofield: SalesGraph.php Fix syntax error, missing ; at end of line
24/2/13 Tim Schofield: CustWhereAlloc.php Fix syntax error, bad indenting, and an extra } entered because of it
+25/2/13 Re-released 4.10.1 without the duplicate records in reportlinks table
+
23/2/13 Version 4.10.1 Released
23/2/13 Phil: Tidy up PDFSellThroughSupportClaim.php report
Modified: trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot
===================================================================
--- trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot 2013-02-24 22:27:03 UTC (rev 5823)
+++ trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot 2013-02-25 09:25:12 UTC (rev 5824)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-24 16:58+1300\n"
+"POT-Creation-Date: 2013-02-25 21:56+1300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
Modified: trunk/sql/mysql/weberp-demo.sql
===================================================================
--- trunk/sql/mysql/weberp-demo.sql 2013-02-24 22:27:03 UTC (rev 5823)
+++ trunk/sql/mysql/weberp-demo.sql 2013-02-25 09:25:12 UTC (rev 5824)
@@ -3063,7 +3063,7 @@
/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
--- Dump completed on 2013-02-24 16:59:13
+-- Dump completed on 2013-02-25 21:56:36
-- MySQL dump 10.13 Distrib 5.5.24, for Linux (i686)
--
-- Host: localhost Database: weberpdemo
@@ -25536,151652 +25536,6 @@
INSERT INTO `reportlinks` VALUES ('stockmaster','worksorders','stockmaster.stockid=worksorders.stockid');
INSERT INTO `reportlinks` VALUES ('www_users','locations','www_users.defaultlocation=locations.loccode');
INSERT INTO `reportlinks` VALUES ('locations','www_users','locations.loccode=www_users.defaultlocation');
-INSERT INTO `reportlinks` VALUES ('accountgroups','accountsection','accountgroups.sectioninaccounts=accountsection.sectionid');
-INSERT INTO `reportlinks` VALUES ('accountsection','accountgroups','accountsection.sectionid=accountgroups.sectioninaccounts');
-INSERT INTO `reportlinks` VALUES ('bankaccounts','chartmaster','bankaccounts.accountcode=chartmaster.accountcode');
-INSERT INTO `reportlinks` VALUES ('chartmaster','bankaccounts','chartmaster.accountcode=bankaccounts.accountcode');
-INSERT INTO `reportlinks` VALUES ('banktrans','systypes','banktrans.type=systypes.typeid');
-INSERT INTO `reportlinks` VALUES ('systypes','banktrans','systypes.typeid=banktrans.type');
-INSERT INTO `reportlinks` VALUES ('banktrans','bankaccounts','banktrans.bankact=bankaccounts.accountcode');
-INSERT INTO `reportlinks` VALUES ('bankaccounts','banktrans','bankaccounts.accountcode=banktrans.bankact');
-INSERT INTO `reportlinks` VALUES ('bom','stockmaster','bom.parent=stockmaster.stockid');
-INSERT INTO `reportlinks` VALUES ('stockmaster','bom','stockmaster.stockid=bom.parent');
-INSERT INTO `reportlinks` VALUES ('bom','stockmaster','bom.component=stockmaster.stockid');
-INSERT INTO `reportlinks` VALUES ('stockmaster','bom','stockmaster.stockid=bom.component');
-INSERT INTO `reportlinks` VALUES ('bom','workcentres','bom.workcentreadded=workcentres.code');
-INSERT INTO `reportlinks` VALUES ('workcentres','bom','workcentres.code=bom.workcentreadded');
-INSERT INTO `reportlinks` VALUES ('bom','locations','bom.loccode=locations.loccode');
-INSERT INTO `reportlinks` VALUES ('locations','bom','locations.loccode=bom.loccode');
-INSERT INTO `reportlinks` VALUES ('buckets','workcentres','buckets.workcentre=workcentres.code');
-INSERT INTO `reportlinks` VALUES ('workcentres','buckets','workcentres.code=buckets.workcentre');
-INSERT INTO `reportlinks` VALUES ('chartdetails','chartmaster','chartdetails.accountcode=chartmaster.accountcode');
-INSERT INTO `reportlinks` VALUES ('chartmaster','chartdetails','chartmaster.accountcode=chartdetails.accountcode');
-INSERT INTO `reportlinks` VALUES ('chartdetails','periods','chartdetails.period=periods.periodno');
-INSERT INTO `reportlinks` VALUES ('periods','chartdetails','periods.periodno=chartdetails.period');
-INSERT INTO `reportlinks` VALUES ('chartmaster','accountgroups','chartmaster.group_=accountgroups.groupname');
-INSERT INTO `reportlinks` VALUES ('accountgroups','chartmaster','accountgroups.groupname=chartmaster.group_');
-INSERT INTO `reportlinks` VALUES ('contractbom','workcentres','contractbom.workcentreadded=workcentres.code');
-INSERT INTO `reportlinks` VALUES ('workcentres','contractbom','workcentres.code=contractbom.workcentreadded');
-INSERT INTO `reportlinks` VALUES ('contractbom','locations','contractbom.loccode=locations.loccode');
-INSERT INTO `reportlinks` VALUES ('locations','contractbom','locations.loccode=contractbom.loccode');
-INSERT INTO `reportlinks` VALUES ('contractbom','stockmaster','contractbom.component=stockmaster.stockid');
-INSERT INTO `reportlinks` VALUES ('stockmaster','contractbom','stockmaster.stockid=contractbom.component');
-INSERT INTO `reportlinks` VALUES ('contractreqts','contracts','contractreqts.contract=contracts.contractref');
-INSERT INTO `reportlinks` VALUES ('contracts','contractreqts','contracts.contractref=contractreqts.contract');
-INSERT INTO `reportlinks` VALUES ('contracts','custbranch','contracts.debtorno=custbranch.debtorno');
-INSERT INTO `reportlinks` VALUES ('custbranch','contracts','custbranch.debtorno=contracts.debtorno');
-INSERT INTO `reportlinks` VALUES ('contracts','stockcategory','contracts.branchcode=stockcategory.categoryid');
-INSERT INTO `reportlinks` VALUES ('stockcategory','contracts','stockcategory.categoryid=contracts.branchcode');
-INSERT INTO `reportlinks` VALUES ('contracts','salestypes','contracts.typeabbrev=salestypes.typeabbrev');
-INSERT INTO `reportlinks` VALUES ('salestypes','contracts','salestypes.typeabbrev=contracts.typeabbrev');
-INSERT INTO `reportlinks` VALUES ('custallocns','debtortrans','custallocns.transid_allocfrom=debtortrans.id');
-INSERT INTO `reportlinks` VALUES ('debtortrans','custallocns','debtortrans.id=custallocns.transid_allocfrom');
-INSERT INTO `reportlinks` VALUES ('custallocns','debtortrans','custallocns.transid_allocto=debtortrans.id');
-INSERT INTO `reportlinks` VALUES ('debtortrans','custallocns','debtortrans.id=custallocns.transid_allocto');
-INSERT INTO `reportlinks` VALUES ('custbranch','debtorsmaster','custbranch.debtorno=debtorsmaster.debtorno');
-INSERT INTO `reportlinks` VALUES ('debtorsmaster','custbranch','debtorsmaster.debtorno=custbranch.debtorno');
-INSERT INTO `reportlinks` VALUES ('custbranch','areas','custbranch.area=areas.areacode');
-INSERT INTO `reportlinks` VALUES ('areas','custbranch','areas.areacode=custbranch.area');
-INSERT INTO `reportlinks` VALUES ('custbranch','salesman','custbranch.salesman=salesman.salesmancode');
-INSERT INTO `reportlinks` VALUES ('salesman','custbranch','salesman.salesmancode=custbranch.salesman');
-INSERT INTO `reportlinks` VALUES ('custbranch','locations','custbranch.defaultlocation=locations.loccode');
-INSERT INTO `reportlinks` VALUES ('locations','custbranch','locations.loccode=custbranch.defaultlocation');
-INSERT INTO `reportlinks` VALUES ('custbranch','shippers','custbranch.defaultshipvia=shippers.shipper_id');
-INSERT INTO `reportlinks` VALUES ('shippers','custbranch','shippers.shipper_id=custbranch.defaultshipvia');
-INSERT INTO `reportlinks` VALUES ('debtorsmaster','holdreasons','debtorsmaster.holdreason=holdreasons.reasoncode');
-INSERT INTO `reportlinks` VALUES ('holdreasons','debtorsmaster','holdreasons.reasoncode=debtorsmaster.holdreason');
-INSERT INTO `reportlinks` VALUES ('debtorsmaster','currencies','debtorsmaster.currcode=currencies.currabrev');
-INSERT INTO `reportlinks` VALUES ('currencies','debtorsmaster','currencies.currabrev=debtorsmaster.currcode');
-INSERT INTO `reportlinks` VALUES ('debtorsmaster','paymentterms','debtorsmaster.paymentterms=paymentterms.termsindicator');
-INSERT INTO `reportlinks` VALUES ('paymentterms','debtorsmaster','paymentterms.termsindicator=debtorsmaster.paymentterms');
-INSERT INTO `reportlinks` VALUES ('debtorsmaster','salestypes','debtorsmaster.salestype=salestypes.typeabbrev');
-INSERT INTO `reportlinks` VALUES ('salestypes','debtorsmaster','salestypes.typeabbrev=debtorsmaster.salestype');
-INSERT INTO `reportlinks` VALUES ('debtortrans','custbranch','debtortrans.debtorno=custbranch.debtorno');
-INSERT INTO `reportlinks` VALUES ('custbranch','debtortrans','custbranch.debtorno=debtortrans.debtorno');
-INSERT INTO `reportlinks` VALUES ('debtortrans','systypes','debtortrans.type=systypes.typeid');
-INSERT INTO `reportlinks` VALUES ('systypes','debtortrans','systypes.typeid=debtortrans.type');
-INSERT INTO `reportlinks` VALUES ('debtortrans','periods','debtortrans.prd=periods.periodno');
-INSERT INTO `reportlinks` VALUES ('periods','debtortrans','periods.periodno=debtortrans.prd');
-INSERT INTO `reportlinks` VALUES ('debtortranstaxes','taxauthorities','debtortranstaxes.taxauthid=taxauthorities.taxid');
-INSERT INTO `reportlinks` VALUES ('taxauthorities','debtortranstaxes','taxauthorities.taxid=debtortranstaxes.taxauthid');
-INSERT INTO `reportlinks` VALUES ('debtortranstaxes','debtortrans','debtortranstaxes.debtortransid=debtortrans.id');
-INSERT INTO `reportlinks` VALUES ('debtortrans','debtortranstaxes','debtortrans.id=debtortranstaxes.debtortransid');
-INSERT INTO `reportlinks` VALUES ('discountmatrix','salestypes','discountmatrix.salestype=salestypes.typeabbrev');
-INSERT INTO `reportlinks` VALUES ('salestypes','discountmatrix','salestypes.typeabbrev=discountmatrix.salestype');
-INSERT INTO `reportlinks` VALUES ('freightcosts','locations','freightcosts.locationfrom=locations.loccode');
-INSERT INTO `reportlinks` VALUES ('locations','freightcosts','locations.loccode=freightcosts.locationfrom');
-INSERT INTO `reportlinks` VALUES ('freightcosts','shippers','freightcosts.shipperid=shippers.shipper_id');
-INSERT INTO `reportlinks` VALUES ('shippers','freightcosts','shippers.shipper_id=freightcosts.shipperid');
-INSERT INTO `reportlinks` VALUES ('gltrans','chartmaster','gltrans.account=chartmaster.accountcode');
-INSERT INTO `reportlinks` VALUES ('chartmaster','gltrans','chartmaster.accountcode=gltrans.account');
-INSERT INTO `reportlinks` VALUES ('gltrans','systypes','gltrans.type=systypes.typeid');
-INSERT INTO `reportlinks` VALUES ('systypes','gltrans','systypes.typeid=gltrans.type');
-INSERT INTO `reportlinks` VALUES ('gltrans','periods','gltrans.periodno=periods.periodno');
-INSERT INTO `reportlinks` VALUES ('periods','gltrans','periods.periodno=gltrans.periodno');
-INSERT INTO `reportlinks` VALUES ('grns','suppliers','grns.supplierid=suppliers.supplierid');
-INSERT INTO `reportlinks` VALUES ('suppliers','grns','suppliers.supplierid=grns.supplierid');
-INSERT INTO `reportlinks` VALUES ('grns','purchorderdetails','grns.podetailitem=purchorderdetails.podetailitem');
-INSERT INTO `reportlinks` VALUES ('purchorderdetails','grns','purchorderdetails.podetailitem=grns.podetailitem');
-INSERT INTO `reportlinks` VALUES ('locations','taxprovinces','locations.taxprovinceid=taxprovinces.taxprovinceid');
-INSERT INTO `reportlinks` VALUES ('taxprovinces','locations','taxprovinces.taxprovinceid=locations.taxprovinceid');
-INSERT INTO `reportlinks` VALUES ('locstock','locations','locstock.loccode=locations.loccode');
-INSERT INTO `reportlinks` VALUES ('locations','locstock','locations.loccode=locstock.loccode');
-INSERT INTO `reportlinks` VALUES ('locstock','stockmaster','locstock.stockid=stockmaster.stockid');
-INSERT INTO `reportlinks` VALUES ('stockmaster','locstock','stockmaster.stockid=locstock.stockid');
-INSERT INTO `reportlinks` VALUES ('loctransfers','locations','loctransfers.shiploc=locations.loccode');
-INSERT INTO `reportlinks` VALUES ('locations','loctransfers','locations.loccode=loctransfers.shiploc');
-INSERT INTO `reportlinks` VALUES ('loctransfers','locations','loctransfers.recloc=locations.loccode');
-INSERT INTO `reportlinks` VALUES ('locations','loctransfers','locations.loccode=loctransfers.recloc');
-INSERT INTO `reportlinks` VALUES ('loctransfers','stockmaster','loctransfers.stockid=stockmaster.stockid');
-INSERT INTO `reportlinks` VALUES ('stockmaster','loctransfers','stockmaster.stockid=loctransfers.stockid');
-INSERT INTO `reportlinks` VALUES ('orderdeliverydifferencesl','stockmaster','orderdeliverydifferenceslog.stockid=stockmaster.stockid');
-INSERT INTO `reportlinks` VALUES ('stockmaster','orderdeliverydifferencesl','stockmaster.stockid=orderdeliverydifferenceslog.stockid');
-INSERT INTO `reportlinks` VALUES ('orderdeliverydifferencesl','custbranch','orderdeliverydifferenceslog.debtorno=custbranch.debtorno');
-INSERT INTO `reportlinks` VALUES ('custbranch','orderdeliverydifferencesl','custbranch.debtorno=orderdeliverydifferenceslog.debtorno');
-INSERT INTO `reportlinks` VALUES ('orderdeliverydifferencesl','salesorders','orderdeliverydifferenceslog.branchcode=salesorders.orderno');
-INSERT INTO `reportlinks` VALUES ('salesorders','orderdeliverydifferencesl','salesorders.orderno=orderdeliverydifferenceslog.branchcode');
-INSERT INTO `reportlinks` VALUES ('prices','stockmaster','prices.stockid=stockmaster.stockid');
-INSERT INTO `reportlinks` VALUES ('stockmaster','prices','stockmaster.stockid=prices.stockid');
-INSERT INTO `reportlinks` VALUES ('prices','currencies','prices.currabrev=currencies.currabrev');
-INSERT INTO `reportlinks` VALUES ('currencies','prices','currencies.currabrev=prices.currabrev');
-INSERT INTO `reportlinks` VALUES ('prices','salestypes','prices.typeabbrev=salestypes.typeabbrev');
-INSERT INTO `reportlinks` VALUES ('salestypes','prices','salestypes.typeabbrev=prices.typeabbrev');
-INSERT INTO `reportlinks` VALUES ('purchdata','stockmaster','purchdata.stockid=stockmaster.stockid');
-INSERT INTO `reportlinks` VALUES ('stockmaster','purchdata','stockmaster.stockid=purchdata.stockid');
-INSERT INTO `reportlinks` VALUES ('purchdata','suppliers','purchdata.supplierno=suppliers.supplierid');
-INSERT INTO `reportlinks` VALUES ('suppliers','purchdata','suppliers.supplierid=purchdata.supplierno');
-INSERT INTO `reportlinks` VALUES ('purchorderdetails','purchorders','purchorderdetails.orderno=purchorders.orderno');
-INSERT INTO `reportlinks` VALUES ('purchorders','purchorderdetails','purchorders.orderno=purchorderdetails.orderno');
-INSERT INTO `reportlinks` VALUES ('purchorders','suppliers','purchorders.supplierno=suppliers.supplierid');
-INSERT INTO `reportlinks` VALUES ('suppliers','purchorders','suppliers.supplierid=purchorders.supplierno');
-INSERT INTO `reportlinks` VALUES ('purchorders','locations','purchorders.intostocklocation=locations.loccode');
-INSERT INTO `reportlinks` VALUES ('locations','purchorders','locations.loccode=purchorders.intostocklocation');
-INSERT INTO `reportlinks` VALUES ('recurringsalesorders','custbranch','recurringsalesorders.branchcode=custbranch.branchcode');
-INSERT INTO `reportlinks` VALUES ('custbranch','recurringsalesorders','custbranch.branchcode=recurringsalesorders.branchcode');
-INSERT INTO `reportlinks` VALUES ('recurrsalesorderdetails','recurringsalesorders','recurrsalesorderdetails.recurrorderno=recurringsalesorders.recurrorderno');
-INSERT INTO `reportlinks` VALUES ('recurringsalesorders','recurrsalesorderdetails','recurringsalesorders.recurrorderno=recurrsalesorderdetails.recurrorderno');
-INSERT INTO `reportlinks` VALUES ('recurrsalesorderdetails','stockmaster','recurrsalesorderdetails.stkcode=stockmaster.stockid');
-INSERT INTO `reportlinks` VALUES ('stockmaster','recurrsalesorderdetails','stockmaster.stockid=recurrsalesorderdetails.stkcode');
-INSERT INTO `reportlinks` VALUES ('reportcolumns','reportheaders','reportcolumns.reportid=reportheaders.reportid');
-INSERT INTO `reportlinks` VALUES ('reportheaders','reportcolumns','reportheaders.reportid=reportcolumns.reportid');
-INSERT INTO `reportlinks` VALUES ('salesanalysis','periods','salesanalysis.periodno=periods.periodno');
-INSERT INTO `reportlinks` VALUES ('periods','salesanalysis','periods.periodno=salesanalysis.periodno');
-INSERT INTO `reportlinks` VALUES ('salescatprod','stockmaster','salescatprod.stockid=stockmaster.stockid');
-INSERT INTO `reportlinks` VALUES ('stockmaster','salescatprod','stockmaster.stockid=salescatprod.stockid');
-INSERT INTO `reportlinks` VALUES ('salescatprod','salescat','salescatprod.salescatid=salescat.salescatid');
-INSERT INTO `reportlinks` VALUES ('salescat','salescatprod','salescat.salescatid=salescatprod.salescatid');
-INSERT INTO `reportlinks` VALUES ('salesorderdetails','salesorders','salesorderdetails.orderno=salesorders.orderno');
-INSERT INTO `reportlinks` VALUES ('salesorders','salesorderdetails','salesorders.orderno=salesorderdetails.orderno');
-INSERT INTO `reportlinks` VALUES ('salesorderdetails','stockmaster','salesorderdetails.stkcode=stockmaster.stockid');
-INSERT INTO `reportlinks` VALUES ('stockmaster','salesorderdetails','stockmaster.stockid=salesorderdetails.stkcode');
-INSERT INTO `reportlinks` VALUES ('salesorders','custbranch','salesorders.branchcode=custbranch.branchcode');
-INSERT INTO `reportlinks` VALUES ('custbranch','salesorders','custbranch.branchcode=salesorders.branchcode');
-INSERT INTO `reportlinks` VALUES ('salesorders','shippers','salesorders.debtorno=shippers.shipper_id');
-INSERT INTO `reportlinks` VALUES ('shippers','salesorders','shippers.shipper_id=salesorders.debtorno');
-INSERT INTO `reportlinks` VALUES ('salesorders','locations','salesorders.fromstkloc=locations.loccode');
-INSERT INTO `reportlinks` VALUES ('locations','salesorders','locations.loccode=salesorders.fromstkloc');
-INSERT INTO `reportlinks` VALUES ('securitygroups','securityroles','securitygroups.secroleid=securityroles.secroleid');
-INSERT INTO `reportlinks` VALUES ('securityroles','securitygroups','securityroles.secroleid=securitygroups.secroleid');
-INSERT INTO `reportlinks` VALUES ('securitygroups','securitytokens','securitygroups.tokenid=securitytokens.tokenid');
-INSERT INTO `reportlinks` VALUES ('securitytokens','securitygroups','securitytokens.tokenid=securitygroups.tokenid');
-INSERT INTO `reportlinks` VALUES ('shipmentcharges','shipments','shipmentcharges.shiptref=shipments.shiptref');
-INSERT INTO `reportlinks` VALUES ('shipments','shipmentcharges','shipments.shiptref=shipmentcharges.shiptref');
-INSERT INTO `reportlinks` VALUES ('shipmentcharges','systypes','shipmentcharges.transtype=systypes.typeid');
-INSERT INTO `reportlinks` VALUES ('systypes','shipmentcharges','systypes.typeid=shipmentcharges.transtype');
-INSERT INTO `reportlinks` VALUES ('shipments','suppliers','shipments.supplierid=suppliers.supplierid');
-INSERT INTO `reportlinks` VALUES ('suppliers','shipments','suppliers.supplierid=shipments.supplierid');
-INSERT INTO `reportlinks` VALUES ('stockcheckfreeze','stockmaster','stockcheckfreeze.stockid=stockmaster.stockid');
-INSERT INTO `reportlinks` VALUES ('stockmaster','stockcheckfreeze','stockmaster.stockid=stockcheckfreeze.stockid');
-INSERT INTO `reportlinks` VALUES ('stockcheckfreeze','locations','stockcheckfreeze.loccode=locations.loccode');
-INSERT INTO `reportlinks` VALUES ('locations','stockcheckfreeze','locations.loccode=stockcheckfreeze.loccode');
-INSERT INTO `reportlinks` VALUES ('stockcounts','stockmaster','stockcounts.stockid=stockmaster.stockid');
-INSERT INTO `reportlinks` VALUES ('stockmaster','stockcounts','stockmaster.stockid=stockcounts.stockid');
-INSERT INTO `reportlinks` VALUES ('stockcounts','locations','stockcounts.loccode=locations.loccode');
-INSERT INTO `reportlinks` VALUES ('locations','stockcounts','locations.loccode=stockcounts.loccode');
-INSERT INTO `reportlinks` VALUES ('stockmaster','stockcategory','stockmaster.categoryid=stockcategory.categoryid');
-INSERT INTO `reportlinks` VALUES ('stockcategory','stockmaster','stockcategory.categoryid=stockmaster.categoryid');
-INSERT INTO `reportlinks` VALUES ('stockmaster','taxcategories','stockmaster.taxcatid=taxcategories.taxcatid');
-INSERT INTO `reportlinks` VALUES ('taxcategories','stockmaster','taxcategories.taxcatid=stockmaster.taxcatid');
-INSERT INTO `reportlinks` VALUES ('stockmoves','stockmaster','stockmoves.stockid=stockmaster.stockid');
-INSERT INTO `reportlinks` VALUES ('stockmaster','stockmoves','stockmaster.stockid=stockmoves.stockid');
-INSERT INTO `reportlinks` VALUES ('stockmoves','systypes','stockmoves.type=systypes.typeid');
-INSERT INTO `reportlinks` VALUES ('systypes','stockmoves','systypes.typeid=stockmoves.type');
-INSERT INTO `reportlinks` VALUES ('stockmoves','locations','stockmoves.loccode=locations.loccode');
-INSERT INTO `reportlinks` VALUES ('locations','stockmoves','locations.loccode=stockmoves.loccode');
-INSERT INTO `reportlinks` VALUES ('stockmoves','periods','stockmoves.prd=periods.periodno');
-INSERT INTO `reportlinks` VALUES ('periods','stockmoves','periods.periodno=stockmoves.prd');
-INSERT INTO `reportlinks` VALUES ('stockmovestaxes','taxauthorities','stockmovestaxes.taxauthid=taxauthorities.taxid');
-INSERT INTO `reportlinks` VALUES ('taxauthorities','stockmovestaxes','taxauthorities.taxid=stockmovestaxes.taxauthid');
-INSERT INTO `reportlinks` VALUES ('stockserialitems','stockmaster','stockserialitems.stockid=stockmaster.stockid');
-INSERT INTO `reportlinks` VALUES ('stockmaster','stockserialitems','stockmaster.stockid=stockserialitems.stockid');
-INSERT INTO `reportlinks` VALUES ('stockserialitems','locations','stockserialitems.loccode=locations.loccode');
-INSERT INTO `reportlinks` VALUES ('locations','stockserialitems','locations.loccode=stockserialitems.loccode');
-INSERT INTO `reportlinks` VALUES ('stockserialmoves','stockmoves','stockserialmoves.stockmoveno=stockmoves.stkmoveno');
-INSERT INTO `reportlinks` VALUES ('stockmoves','stockserialmoves','stockmoves.stkmoveno=stockserialmoves.stockmoveno');
-INSERT INTO `reportlinks` VALUES ('stockserialmoves','stockserialitems','stockserialmoves.stockid=stockserialitems.stockid');
-INSERT INTO `reportlinks` VALUES ('stockserialitems','stockserialmoves','stockserialitems.stockid=stockserialmoves.stockid');
-INSERT INTO `reportlinks` VALUES ('suppallocs','supptrans','suppallocs.transid_allocfrom=supptrans.id');
-INSERT INTO `reportlinks` VALUES ('supptrans','suppallocs','supptrans.id=suppallocs.transid_allocfrom');
-INSERT INTO `reportlinks` VALUES ('suppallocs','supptrans','suppallocs.transid_allocto=supptrans.id');
-INSERT INTO `reportlinks` VALUES ('supptrans','suppallocs','supptrans.id=suppallocs.transid_allocto');
-INSERT INTO `reportlinks` VALUES ('suppliercontacts','suppliers','suppliercontacts.supplierid=suppliers.supplierid');
-INSERT INTO `reportlinks` VALUES ('suppliers','suppliercontacts','suppliers.supplierid=suppliercontacts.supplierid');
-INSERT INTO `reportlinks` VALUES ('suppliers','currencies','suppliers.currcode=currencies.currabrev');
-INSERT INTO `reportlinks` VALUES ('currencies','suppliers','currencies.currabrev=suppliers.currcode');
-INSERT INTO `reportlinks` VALUES ('suppliers','paymentterms','suppliers.paymentterms=paymentterms.termsindicator');
-INSERT INTO `reportlinks` VALUES ('paymentterms','suppliers','paymentterms.termsindicator=suppliers.paymentterms');
-INSERT INTO `reportlinks` VALUES ('suppliers','taxgroups','suppliers.taxgroupid=taxgroups.taxgroupid');
-INSERT INTO `reportlinks` VALUES ('taxgroups','suppliers','taxgroups.taxgroupid=suppliers.taxgroupid');
-INSERT INTO `reportlinks` VALUES ('supptrans','systypes','supptrans.type=systypes.typeid');
-INSERT INTO `reportlinks` VALUES ('systypes','supptrans','systypes.typeid=supptrans.type');
-INSERT INTO `reportlinks` VALUES ('supptrans','suppliers','supptrans.supplierno=suppliers.supplierid');
-INSERT INTO `reportlinks` VALUES ('suppliers','supptrans','suppliers.supplierid=supptrans.supplierno');
-INSERT INTO `reportlinks` VALUES ('supptranstaxes','taxauthorities','supptranstaxes.taxauthid=taxauthorities.taxid');
-INSERT INTO `reportlinks` VALUES ('taxauthorities','supptranstaxes','taxauthorities.taxid=supptranstaxes.taxauthid');
-INSERT INTO `reportlinks` VALUES ('supptranstaxes','supptrans','supptranstaxes.supptransid=supptrans.id');
-INSERT INTO `reportlinks` VALUES ('supptrans','supptranstaxes','supptrans.id=supptranstaxes.supptransid');
-INSERT INTO `reportlinks` VALUES ('taxauthorities','chartmaster','taxauthorities.taxglcode=chartmaster.accountcode');
-INSERT INTO `reportlinks` VALUES ('chartmaster','taxauthorities','chartmaster.accountcode=taxauthorities.taxglcode');
-INSERT INTO `reportlinks` VALUES ('taxauthorities','chartmaster','taxauthorities.purchtaxglaccount=chartmaster.accountcode');
-INSERT INTO `reportlinks` VALUES ('chartmaster','taxauthorities','chartmaster.accountcode=taxauthorities.purchtaxglaccount');
-INSERT INTO `reportlinks` VALUES ('taxauthrates','taxauthorities','taxauthrates.taxauthority=taxauthorities.taxid');
-INSERT INTO `reportlinks` VALUES ('taxauthorities','taxauthrates','taxauthorities.taxid=taxauthrates.taxauthority');
-INSERT INTO `reportlinks` VALUES ('taxauthrates','taxcategories','taxauthrates.taxcatid=taxcategories.taxcatid');
-INSERT INTO `reportlinks` VALUES ('taxcategories','taxauthrates','taxcategories.taxcatid=taxauthrates.taxcatid');
-INSERT INTO `reportlinks` VALUES ('taxauthrates','taxprovinces','taxauthrates.dispatchtaxprovince=taxprovinces.taxprovinceid');
-INSERT INTO `reportlinks` VALUES ('taxprovinces','taxauthrates','taxprovinces.taxprovinceid=taxauthrates.dispatchtaxprovince');
-INSERT INTO `reportlinks` VALUES ('taxgrouptaxes','taxgroups','taxgrouptaxes.taxgroupid=taxgroups.taxgroupid');
-INSERT INTO `reportlinks` VALUES ('taxgroups','taxgrouptaxes','taxgroups.taxgroupid=taxgrouptaxes.taxgroupid');
-INSERT INTO `reportlinks` VALUES ('taxgrouptaxes','taxauthorities','taxgrouptaxes.taxauthid=taxauthorities.taxid');
-INSERT INTO `reportlinks` VALUES ('taxauthorities','taxgrouptaxes','taxauthorities.taxid=taxgrouptaxes.taxauthid');
-INSERT INTO `reportlinks` VALUES ('workcentres','locations','workcentres.location=locations.loccode');
-INSERT INTO `reportlinks` VALUES ('locations','workcentres','locations.loccode=workcentres.location');
-INSERT INTO `reportlinks` VALUES ('worksorders','locations','worksorders.loccode=locations.loccode');
-INSERT INTO `reportlinks` VALUES ('locations','worksorders','locations.loccode=worksorders.loccode');
-INSERT INTO `reportlinks` VALUES ('worksorders','stockmaster','worksorders.stockid=stockmaster.stockid');
-INSERT INTO `reportlinks` VALUES ('stockmaster','worksorders','stockmaster.stockid=worksorders.stockid');
-INSERT INTO `reportlinks` VALUES ('www_users','locations','www_users.defaultlocation=locations.loccode');
-INSERT INTO `reportlinks` VALUES ('locations','www_users','locations.loccode=www_users.defaultlocation');
-INSERT INTO `reportlinks` VALUES ('accountgroups','accountsection','accountgroups.sectioninaccounts=accountsection.sectionid');
-INSERT INTO `reportlinks` VALUES ('accountsection','accountgroups','accountsection.sectionid=accountgroups.sectioninaccounts');
-INSERT INTO `reportlinks` VALUES ('bankaccounts','chartmaster','bankaccounts.accountcode=chartmaster.accountcode');
-INSERT INTO `reportlinks` VALUES ('chartmaster','bankaccounts','chartmaster.accountcode=bankaccounts.accountcode');
-INSERT INTO `reportlinks` VALUES ('banktrans','systypes','banktrans.type=systypes.typeid');
-INSERT INTO `reportlinks` VALUES ('systypes','banktrans','systypes.typeid=banktrans.type');
-INSERT INTO `reportlinks` VALUES ('banktrans','bankaccounts','banktrans.bankact=bankaccounts.accountcode');
-INSERT INTO `reportlinks` VALUES ('bankaccounts','banktrans','bankaccounts.accountcode=banktrans.bankact');
-INSERT INTO `reportlinks` VALUES ('bom','stockmaster','bom.parent=stockmaster.stockid');
-INSERT INTO `reportlinks` VALUES ('stockmaster','bom','stockmaster.stockid=bom.parent');
-INSERT INTO `reportlinks` VALUES ('bom','stockmaster','bom.component=stockmaster.stockid');
-INSERT INTO `reportlinks` VALUES ('stockmaster','bom','stockmaster.stockid=bom.component');
-INSERT INTO `reportlinks` VALUES ('bom','workcentres','bom.workcentreadded=workcentres.code');
-INSERT INTO `reportlinks` VALUES ('workcentres','bom','workcentres.code=bom.workcentreadded');
-INSERT INTO `reportlinks` VALUES ('bom','locations','bom.loccode=locations.loccode');
-INSERT INTO `reportlinks` VALUES ('locations','bom','locations.loccode=bom.loccode');
-INSERT INTO `reportlinks` VALUES ('buckets','workcentres','buckets.workcentre=workcentres.code');
-INSERT INTO `reportlinks` VALUES ('workcentres','buckets','workcentres.code=buckets.workcentre');
-INSERT INTO `reportlinks` VALUES ('chartdetails','chartmaster','chartdetails.accountcode=chartmaster.accountcode');
-INSERT INTO `reportlinks` VALUES ('chartmaster','chartdetails','chartmaster.accountcode=chartdetails.accountcode');
-INSERT INTO `reportlinks` VALUES ('chartdetails','periods','chartdetails.period=periods.periodno');
-INSERT INTO `reportlinks` VALUES ('periods','chartdetails','periods.periodno=chartdetails.period');
-INSERT INTO `reportlinks` VALUES ('chartmaster','accountgroups','chartmaster.group_=accountgroups.groupname');
-INSERT INTO `reportlinks` VALUES ('accountgroups','chartmaster','accountgroups.groupname=chartmaster.group_');
-INSERT INTO `reportlinks` VALUES ('contractbom','workcentres','contractbom.workcentreadded=workcentres.code');
-INSERT INTO `reportlinks` VALUES ('workcentres','contractbom','workcentres.code=contractbom.workcentreadded');
-INSERT INTO `reportlinks` VALUES ('contractbom','locations','contractbom.loccode=locations.loccode');
-INSERT INTO `reportlinks` VALUES ('locations','contractbom','locations.loccode=con...
[truncated message content] |
|
From: <tim...@us...> - 2013-03-06 09:18:51
|
Revision: 5825
http://sourceforge.net/p/web-erp/reponame/5825
Author: tim_schofield
Date: 2013-03-06 09:18:49 +0000 (Wed, 06 Mar 2013)
Log Message:
-----------
Tim Schofield: Only display those offers that have not past their expiry dates
Modified Paths:
--------------
trunk/OffersReceived.php
trunk/SupplierTenders.php
Modified: trunk/OffersReceived.php
===================================================================
--- trunk/OffersReceived.php 2013-02-25 09:25:12 UTC (rev 5824)
+++ trunk/OffersReceived.php 2013-03-06 09:18:49 UTC (rev 5825)
@@ -87,7 +87,7 @@
LEFT JOIN stockmaster
ON stockmaster.stockid=offers.stockid
WHERE purchorderauth.userid='" . $_SESSION['UserID'] . "'
- AND offers.expirydate>'" . date('Y-m-d') . "'
+ AND offers.expirydate>='NOW()'
AND offers.supplierid='" . $_POST['supplierid'] . "'
ORDER BY offerid";
$result=DB_query($sql, $db);
Modified: trunk/SupplierTenders.php
===================================================================
--- trunk/SupplierTenders.php 2013-02-25 09:25:12 UTC (rev 5824)
+++ trunk/SupplierTenders.php 2013-03-06 09:18:49 UTC (rev 5825)
@@ -299,7 +299,8 @@
FROM offers
INNER JOIN stockmaster
ON offers.stockid=stockmaster.stockid
- WHERE offers.supplierid='" . $_POST['SupplierID'] . "'";
+ WHERE offers.supplierid='" . $_POST['SupplierID'] . "'
+ AND offers.expirydate>=NOW()";
$result=DB_query($sql, $db);
$_SESSION['offer'.$identifier]=new Offer($_POST['SupplierID']);
$_SESSION['offer'.$identifier]->CurrCode=$Currency;
|
|
From: <dai...@us...> - 2013-03-21 07:26:02
|
Revision: 5827
http://sourceforge.net/p/web-erp/reponame/5827
Author: daintree
Date: 2013-03-21 07:25:57 +0000 (Thu, 21 Mar 2013)
Log Message:
-----------
Arwan add tag description to GL Customer Receipts
Modified Paths:
--------------
trunk/CustomerReceipt.php
trunk/doc/Change.log
trunk/includes/DefineReceiptClass.php
Modified: trunk/CustomerReceipt.php
===================================================================
--- trunk/CustomerReceipt.php 2013-03-13 08:51:23 UTC (rev 5826)
+++ trunk/CustomerReceipt.php 2013-03-21 07:25:57 UTC (rev 5827)
@@ -917,6 +917,7 @@
<th>' . _('Customer') . '</th>
<th>' . _('GL Code') . '</th>
<th>' . _('Narrative') . '</th>
+ <th>' . _('Tag') . '</th>
</tr>';
$BatchTotal = 0;
@@ -933,6 +934,7 @@
<td>' . stripslashes($ReceiptItem->CustomerName) . '</td>
<td>'.$ReceiptItem->GLCode.' - '.$myrow['accountname'].'</td>
<td>'. stripslashes($ReceiptItem->Narrative) . '</td>
+ <td>'. $ReceiptItem->TagName . '</td>
<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?Delete=' . $ReceiptItem->ID . '&Type=' . $_GET['Type']. '">' . _('Delete') . '</a></td>
</tr>';
$BatchTotal= $BatchTotal + $ReceiptItem->Amount;
@@ -1025,7 +1027,7 @@
$result=DB_query($SQL,$db);
echo '<option value="0"></option>';
while ($myrow=DB_fetch_array($result)){
- if (isset($_POST['tag']) and $_POST['tag']==$myrow['tagref']){
+ if (isset($_POST['tag']) AND$_POST['tag']==$myrow['tagref']){
echo '<option selected="selected" value="' . $myrow['tagref'] . '">' . $myrow['tagref'].' - ' .$myrow['tagdescription'] . '</option>';
} else {
echo '<option value="' . $myrow['tagref'] . '">' . $myrow['tagref'].' - ' .$myrow['tagdescription'] . '</option>';
@@ -1179,7 +1181,7 @@
} //end if results to show
}
-if (isset($_SESSION['ReceiptBatch']->Items) and count($_SESSION['ReceiptBatch']->Items) > 0){
+if (isset($_SESSION['ReceiptBatch']->Items) AND count($_SESSION['ReceiptBatch']->Items) > 0){
echo '<div class="centre">
<br/>
<input tabindex="13" type="submit" name="CommitBatch" value="' . _('Accept and Process Batch') . '" />
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2013-03-13 08:51:23 UTC (rev 5826)
+++ trunk/doc/Change.log 2013-03-21 07:25:57 UTC (rev 5827)
@@ -1,5 +1,6 @@
webERP Change Log
+21/3/13 Arwan: CustomerReceipt.php Added GL tag name for GL analysis of receipts
24/2/13 Tim Schofield: SalesGraph.php Fix syntax error, missing ; at end of line
24/2/13 Tim Schofield: CustWhereAlloc.php Fix syntax error, bad indenting, and an extra } entered because of it
Modified: trunk/includes/DefineReceiptClass.php
===================================================================
--- trunk/includes/DefineReceiptClass.php 2013-03-13 08:51:23 UTC (rev 5826)
+++ trunk/includes/DefineReceiptClass.php 2013-03-21 07:25:57 UTC (rev 5827)
@@ -56,9 +56,10 @@
Var $PayeeBankDetail;
Var $ID;
var $tag;
+ var $TagName;
- function Receipt ($Amt, $Cust, $Disc, $Narr, $id, $GLCode, $PayeeBankDetail, $CustomerName, $tag){
-
+ function Receipt ($Amt, $Cust, $Disc, $Narr, $id, $GLCode, $PayeeBankDetail, $CustomerName, $Tag){
+ global $db;
/* Constructor function to add a new Receipt object with passed params */
$this->Amount =$Amt;
$this->Customer = $Cust;
@@ -68,7 +69,12 @@
$this->GLCode = $GLCode;
$this->PayeeBankDetail=$PayeeBankDetail;
$this->ID = $id;
- $this->tag = $tag;
+ $this->tag = $Tag;
+ $result = DB_query("SELECT tagdescription FROM tags WHERE tagref='" . $Tag . "'",$db);
+ if (DB_num_rows($result)==1){
+ $TagRow = DB_fetch_array($result);
+ $this->TagName = $TagRow['tagdescription'];
+ }
}
}
|
|
From: <dai...@us...> - 2013-03-22 09:03:19
|
Revision: 5828
http://sourceforge.net/p/web-erp/reponame/5828
Author: daintree
Date: 2013-03-22 09:03:15 +0000 (Fri, 22 Mar 2013)
Log Message:
-----------
new Estonian translation Kalmer Piiskop
Modified Paths:
--------------
trunk/CustomerReceipt.php
trunk/doc/Change.log
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.mo
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.po
Modified: trunk/CustomerReceipt.php
===================================================================
--- trunk/CustomerReceipt.php 2013-03-21 07:25:57 UTC (rev 5827)
+++ trunk/CustomerReceipt.php 2013-03-22 09:03:15 UTC (rev 5828)
@@ -1027,7 +1027,7 @@
$result=DB_query($SQL,$db);
echo '<option value="0"></option>';
while ($myrow=DB_fetch_array($result)){
- if (isset($_POST['tag']) AND$_POST['tag']==$myrow['tagref']){
+ if (isset($_POST['tag']) AND $_POST['tag']==$myrow['tagref']){
echo '<option selected="selected" value="' . $myrow['tagref'] . '">' . $myrow['tagref'].' - ' .$myrow['tagdescription'] . '</option>';
} else {
echo '<option value="' . $myrow['tagref'] . '">' . $myrow['tagref'].' - ' .$myrow['tagdescription'] . '</option>';
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2013-03-21 07:25:57 UTC (rev 5827)
+++ trunk/doc/Change.log 2013-03-22 09:03:15 UTC (rev 5828)
@@ -1,5 +1,6 @@
webERP Change Log
+22/3/13 Kalmer Piiskop: Updated Estonian translation
21/3/13 Arwan: CustomerReceipt.php Added GL tag name for GL analysis of receipts
24/2/13 Tim Schofield: SalesGraph.php Fix syntax error, missing ; at end of line
24/2/13 Tim Schofield: CustWhereAlloc.php Fix syntax error, bad indenting, and an extra } entered because of it
Modified: trunk/locale/et_EE.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/et_EE.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/et_EE.utf8/LC_MESSAGES/messages.po 2013-03-21 07:25:57 UTC (rev 5827)
+++ trunk/locale/et_EE.utf8/LC_MESSAGES/messages.po 2013-03-22 09:03:15 UTC (rev 5828)
@@ -5,572 +5,936 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: 4.0.8\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-24 14:29+1300\n"
-"PO-Revision-Date: 2011-01-05 20:57+0000\n"
-"Last-Translator: Tim Schofield <Unknown>\n"
-"Language-Team: Estonian\n"
+"POT-Creation-Date: 2012-06-16 16:39+1200\n"
+"PO-Revision-Date: 2013-02-06 11:24+0300\n"
+"Last-Translator: Kalmer <kal...@ee...>\n"
+"Language-Team: Estonian <kal...@ee...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-03-31 06:24+0000\n"
"X-Generator: Launchpad (build 12696)\n"
+"X-Poedit-Language: Estonian\n"
+"X-Poedit-Country: ESTONIA\n"
-#: AccountGroups.php:7 includes/MainMenuLinksArray.php:356
+#: AccountGroups.php:7
+#: includes/MainMenuLinksArray.php:375
msgid "Account Groups"
msgstr "Kontogrupid"
-#: AccountGroups.php:19
-msgid ""
-"An error occurred in retrieving the account groups of the parent account "
-"group during the check for recursion"
+#: AccountGroups.php:17
+msgid "An error occurred in retrieving the account groups of the parent account group during the check for recursion"
msgstr "Rekursiooni ajal emagrupist kontogruppide otsimisel ilmnes viga"
-#: AccountGroups.php:20
-msgid ""
-"The SQL that was used to retrieve the account groups of the parent account "
-"group and that failed in the process was"
+#: AccountGroups.php:18
+msgid "The SQL that was used to retrieve the account groups of the parent account group and that failed in the process was"
msgstr "SQL, mis emagrupist kontogruppide otsimisel ebaõnnestus, on"
-#: AccountGroups.php:46
-#, fuzzy
-msgid "An error occurred in moving the account group"
-msgstr "Kontogrupi uuendamisel ilmnes viga"
-
-#: AccountGroups.php:47
-#, fuzzy
-msgid "The SQL that was used to move the account group was"
-msgstr "SQL, mida kasutati selle kontogrupi sisestamiseks, on"
-
-#: AccountGroups.php:49 AccountGroups.php:330
-msgid "Review Account Groups"
-msgstr "Kontogruppide ülevaade"
-
-#: AccountGroups.php:50
-#, fuzzy
-msgid "All accounts in the account group:"
-msgstr "Kontogrupi uuendamisel ilmnes viga"
-
-#: AccountGroups.php:50
-#, fuzzy
-msgid "have been changed to the account group:"
-msgstr "SQL, mida kasutati kontogrupi uuendamisel, on"
-
-#: AccountGroups.php:69 AccountGroups.php:106 AccountGroups.php:207
-#: AccountGroups.php:242
+#: AccountGroups.php:58
+#: AccountGroups.php:95
+#: AccountGroups.php:176
+#: AccountGroups.php:186
msgid "The SQL that was used to retrieve the information was"
msgstr "SQL, mida antud informatsiooni otsimisel kasutati, on"
-#: AccountGroups.php:70
+#: AccountGroups.php:59
msgid "Could not check whether the group exists because"
msgstr "Ei suutnud kontrollida, kas grupp eksisteerib, kuna"
-#: AccountGroups.php:77
+#: AccountGroups.php:66
msgid "The account group name already exists in the database"
msgstr "Kontogrupi nimi juba eksisteerib andmebaasis"
-#: AccountGroups.php:83
+#: AccountGroups.php:72
msgid "The account group name cannot contain the character"
msgstr "Kontogrupi nimes ei tohi sisalduda tähemärki"
-#: AccountGroups.php:83 Departments.php:30 TaxCategories.php:31
+#: AccountGroups.php:72
+#: Departments.php:30
+#: TaxCategories.php:31
msgid "or the character"
msgstr "või tähemärki"
-#: AccountGroups.php:89
+#: AccountGroups.php:78
msgid "The account group name must be at least one character long"
msgstr "Kontogrupi nimi peab olema vähemalt ühe tähemärgi pikkune"
+#: AccountGroups.php:85
+msgid "The parent account group selected appears to result in a recursive account structure - select an alternative parent account group or make this group a top level account group"
+msgstr "Valitud emagrupp tundub olevat rekursiivse kontostruktuuriga - vali mõni teine emagrupp või muuda see grupp kõrgeima taseme kontogrupiks"
+
#: AccountGroups.php:96
-msgid ""
-"The parent account group selected appears to result in a recursive account "
-"structure - select an alternative parent account group or make this group a "
-"top level account group"
-msgstr ""
-"Valitud emagrupp tundub olevat rekursiivse kontostruktuuriga - vali mõni "
-"teine emagrupp või muuda see grupp kõrgeima taseme kontogrupiks"
-
-#: AccountGroups.php:107
msgid "Could not check whether the group is recursive because"
msgstr "Ei suutnud kontrollida, kas grupp on rekursiivne, kuna"
-#: AccountGroups.php:115
-msgid ""
-"Since this account group is a child group, the sequence in the trial "
-"balance, the section in the accounts and whether or not the account group "
-"appears in the balance sheet or profit and loss account are all properties "
-"inherited from the parent account group. Any changes made to these fields "
-"will have no effect."
+#: AccountGroups.php:104
+msgid "Since this account group is a child group, the sequence in the trial balance, the section in the accounts and whether or not the account group appears in the balance sheet or profit and loss account are all properties inherited from the parent account group. Any changes made to these fields will have no effect."
msgstr ""
-#: AccountGroups.php:120
+#: AccountGroups.php:109
msgid "The section in accounts must be an integer"
msgstr "Jaotis peab olema täisarv"
-#: AccountGroups.php:126
+#: AccountGroups.php:115
msgid "The sequence in the trial balance must be an integer"
msgstr "Järgnevus proovibilansi all peab olema täisarv"
-#: AccountGroups.php:132
+#: AccountGroups.php:121
msgid "The sequence in the TB must be numeric and less than"
msgstr "Järgnevus proovibilansi all peab olema numbriline ja vähem kui"
-#: AccountGroups.php:148
-#, fuzzy
-msgid "An error occurred in renaming the account group"
-msgstr "Kontogrupi uuendamisel ilmnes viga"
-
-#: AccountGroups.php:149
-#, fuzzy
-msgid "The SQL that was used to rename the account group was"
-msgstr "SQL, mida kasutati kontogrupi uuendamisel, on"
-
-#: AccountGroups.php:168
+#: AccountGroups.php:137
msgid "An error occurred in updating the account group"
msgstr "Kontogrupi uuendamisel ilmnes viga"
-#: AccountGroups.php:169
+#: AccountGroups.php:138
msgid "The SQL that was used to update the account group was"
msgstr "SQL, mida kasutati kontogrupi uuendamisel, on"
-#: AccountGroups.php:171 AccountSections.php:101 PaymentMethods.php:83
+#: AccountGroups.php:140
+#: AccountSections.php:98
+#: PaymentMethods.php:83
msgid "Record Updated"
msgstr "Kirje uuendatud"
-#: AccountGroups.php:187
+#: AccountGroups.php:156
msgid "An error occurred in inserting the account group"
msgstr "Kontogrupi sisestamisel ilmnes viga"
-#: AccountGroups.php:188
+#: AccountGroups.php:157
msgid "The SQL that was used to insert the account group was"
msgstr "SQL, mida kasutati selle kontogrupi sisestamiseks, on"
-#: AccountGroups.php:189 AccountSections.php:111
+#: AccountGroups.php:158
+#: AccountSections.php:108
msgid "Record inserted"
msgstr "Kirje sisestatud"
-#: AccountGroups.php:206
+#: AccountGroups.php:175
msgid "An error occurred in retrieving the group information from chartmaster"
msgstr "Grupi info otsimisel chartmaster'ist ilmnes viga"
-#: AccountGroups.php:211
-msgid ""
-"Cannot delete this account group because general ledger accounts have been "
-"created using this group"
-msgstr ""
-"Ei saa seda kontogruppi kustutada, kuna üldised raamatupidamiskontod on "
-"loodud seda gruppi kasutades"
+#: AccountGroups.php:180
+msgid "Cannot delete this account group because general ledger accounts have been created using this group"
+msgstr "Ei saa seda kontogruppi kustutada, kuna üldised raamatupidamiskontod on loodud seda gruppi kasutades"
-#: AccountGroups.php:212 AccountGroups.php:247 AccountSections.php:133
-#: Areas.php:115 Areas.php:124 BankAccounts.php:159 CreditStatus.php:125
-#: Currencies.php:167 Currencies.php:175 Currencies.php:183
-#: CustomerBranches.php:290 CustomerBranches.php:300 CustomerBranches.php:310
-#: CustomerBranches.php:320 Customers.php:294 Customers.php:303
-#: Customers.php:311 Customers.php:319 CustomerTypes.php:147
-#: CustomerTypes.php:157 Departments.php:141 Factors.php:134
-#: FixedAssetCategories.php:137 GLAccounts.php:83 GLAccounts.php:99
-#: Locations.php:249 Locations.php:257 Locations.php:268 Locations.php:277
-#: Locations.php:286 Locations.php:295 Locations.php:304 Locations.php:313
-#: Locations.php:321 MRPDemandTypes.php:87 PaymentMethods.php:142
-#: PaymentTerms.php:146 PaymentTerms.php:153 PcExpenses.php:161
-#: SalesCategories.php:125 SalesCategories.php:132 SalesPeople.php:150
-#: SalesPeople.php:157 SalesPeople.php:163 SalesTypes.php:140
-#: SalesTypes.php:150 Shippers.php:81 Shippers.php:93 StockCategories.php:188
-#: Stocks.php:672 Stocks.php:681 Stocks.php:689 Stocks.php:697 Stocks.php:705
-#: Stocks.php:713 Suppliers.php:625 Suppliers.php:634 Suppliers.php:642
-#: SupplierTypes.php:145 TaxCategories.php:131 TaxGroups.php:132
-#: TaxGroups.php:140 TaxProvinces.php:129 UnitsOfMeasure.php:135
-#: WorkCentres.php:89 WorkCentres.php:95 WWW_Access.php:83
+#: AccountGroups.php:181
+#: AccountGroups.php:191
+#: AccountSections.php:130
+#: Areas.php:114
+#: Areas.php:123
+#: BankAccounts.php:158
+#: CreditStatus.php:125
+#: Currencies.php:166
+#: Currencies.php:174
+#: Currencies.php:182
+#: CustomerBranches.php:286
+#: CustomerBranches.php:296
+#: CustomerBranches.php:306
+#: CustomerBranches.php:316
+#: Customers.php:289
+#: Customers.php:298
+#: Customers.php:306
+#: Customers.php:314
+#: CustomerTypes.php:147
+#: CustomerTypes.php:157
+#: Departments.php:141
+#: Factors.php:134
+#: FixedAssetCategories.php:134
+#: GLAccounts.php:80
+#: GLAccounts.php:96
+#: Locations.php:237
+#: Locations.php:245
+#: Locations.php:256
+#: Locations.php:265
+#: Locations.php:274
+#: Locations.php:283
+#: Locations.php:292
+#: Locations.php:301
+#: Locations.php:309
+#: MRPDemandTypes.php:87
+#: PaymentMethods.php:142
+#: PaymentTerms.php:146
+#: PaymentTerms.php:153
+#: PcExpenses.php:158
+#: SalesCategories.php:125
+#: SalesCategories.php:132
+#: SalesPeople.php:150
+#: SalesPeople.php:157
+#: SalesPeople.php:163
+#: SalesTypes.php:140
+#: SalesTypes.php:150
+#: Shippers.php:81
+#: Shippers.php:93
+#: StockCategories.php:187
+#: Stocks.php:653
+#: Stocks.php:662
+#: Stocks.php:670
+#: Stocks.php:678
+#: Stocks.php:686
+#: Stocks.php:694
+#: Suppliers.php:612
+#: Suppliers.php:621
+#: Suppliers.php:629
+#: SupplierTypes.php:145
+#: TaxCategories.php:131
+#: TaxGroups.php:132
+#: TaxGroups.php:140
+#: TaxProvinces.php:129
+#: UnitsOfMeasure.php:135
+#: WorkCentres.php:89
+#: WorkCentres.php:95
+#: WWW_Access.php:83
msgid "There are"
msgstr "On olemas"
-#: AccountGroups.php:212
+#: AccountGroups.php:181
msgid "general ledger accounts that refer to this account group"
msgstr "üldised raamatupidamiskontod, mis viitavad sellele kontogrupile"
-#: AccountGroups.php:219 AccountGroups.php:290 AccountGroups.php:403
-msgid "Parent Group"
-msgstr "Emagrupp"
-
-#: AccountGroups.php:235
-#, fuzzy
-msgid "Move Group"
-msgstr "Kõrgeima taseme grupp"
-
-#: AccountGroups.php:241
+#: AccountGroups.php:185
msgid "An error occurred in retrieving the parent group information"
msgstr "Emagrupi info otsimisel ilmnes viga"
-#: AccountGroups.php:246
-msgid ""
-"Cannot delete this account group because it is a parent account group of "
-"other account group(s)"
-msgstr ""
-"Ei saa seda kontogruppi kustutada, kuna see on teiste kontogruppide emagrupp"
+#: AccountGroups.php:190
+msgid "Cannot delete this account group because it is a parent account group of other account group(s)"
+msgstr "Ei saa seda kontogruppi kustutada, kuna see on teiste kontogruppide emagrupp"
-#: AccountGroups.php:247
+#: AccountGroups.php:191
msgid "account groups that have this group as its/there parent account group"
msgstr "kontogrupid, kelle jaoks see grupp on nende emagrupp"
-#: AccountGroups.php:251
+#: AccountGroups.php:194
msgid "An error occurred in deleting the account group"
msgstr "Kontogrupi kustutamisel ilmnes viga"
-#: AccountGroups.php:252
+#: AccountGroups.php:195
msgid "The SQL that was used to delete the account group was"
msgstr "SQL, mida kontogrupi kustutamisel kasutati, on"
-#: AccountGroups.php:254
+#: AccountGroups.php:197
msgid "group has been deleted"
msgstr "grupp on kustutatud"
-#: AccountGroups.php:279
+#: AccountGroups.php:222
msgid "The sql that was used to retrieve the account group information was "
msgstr "SQL, mida kontogrupi info otsimiseks kasutati, on "
-#: AccountGroups.php:280
+#: AccountGroups.php:223
msgid "Could not get account groups because"
msgstr "Ei saanud kontogruppe kätte, kuna"
-#: AccountGroups.php:282 AccountSections.php:172 AddCustomerContacts.php:25
-#: AddCustomerContacts.php:27 AddCustomerNotes.php:101
-#: AddCustomerTypeNotes.php:94 AgedDebtors.php:448 AgedSuppliers.php:276
-#: Areas.php:144 AuditTrail.php:11 BankReconciliation.php:17
-#: 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:1607
-#: CounterSales.php:2074 CounterSales.php:2199 Credit_Invoice.php:270
-#: CreditStatus.php:21 Currencies.php:29 CustEDISetup.php:17
-#: DailyBankTransactions.php:15 DebtorsAtPeriodEnd.php:129
-#: DiscountCategories.php:12 DiscountCategories.php:136 DiscountMatrix.php:16
-#: EDIMessageFormat.php:105 FixedAssetLocations.php:13
-#: FixedAssetRegister.php:13 FixedAssetRegister.php:253
-#: FixedAssetTransfer.php:14 FormDesigner.php:129 GLBalanceSheet.php:382
-#: GLBudgets.php:32 GLJournalInquiry.php:11 GLJournal.php:250
-#: InternalStockRequest.php:299 InventoryPlanning.php:379
-#: InventoryPlanningPrefSupplier.php:469 MRPReport.php:516 NoSalesItems.php:89
-#: 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
-#: PricesBasedOnMarkUp.php:8 Prices_Customer.php:35 Prices.php:30
-#: PurchData.php:236 PurchData.php:368 PurchData.php:396
-#: RecurringSalesOrders.php:320 SalesAnalReptCols.php:51 SalesAnalRepts.php:14
-#: SalesCategories.php:11 SalesGLPostings.php:19 SalesGraph.php:39
-#: SalesPeople.php:20 SalesTypes.php:20 SelectAsset.php:48
-#: SelectCompletedOrder.php:11 SelectContract.php:69 SelectCreditItems.php:220
-#: SelectCreditItems.php:291 SelectCustomer.php:265 SelectGLAccount.php:17
-#: SelectGLAccount.php:87 SelectOrderItems.php:609 SelectOrderItems.php:1528
-#: SelectOrderItems.php:1657 SelectProduct.php:521 SelectSalesOrder.php:563
-#: SelectSupplier.php:14 SelectSupplier.php:213 SelectWorkOrder.php:9
-#: SelectWorkOrder.php:169 SellThroughSupport.php:229 ShipmentCosting.php:11
-#: Shipments.php:17 Shippers.php:123 Shippers.php:160 Shipt_Select.php:8
-#: StockLocMovements.php:14 StockLocStatus.php:28
-#: StockSerialItemResearch.php:30 SupplierPriceList.php:15
-#: SupplierPriceList.php:217 SupplierPriceList.php:387
-#: SupplierPriceList.php:391 SupplierPriceList.php:442
-#: SupplierPriceList.php:492 Suppliers.php:305 SupplierTenderCreate.php:522
-#: SupplierTenderCreate.php:628 SupplierTenders.php:322
-#: SupplierTenders.php:388 SupplierTransInquiry.php:10 TaxGroups.php:15
-#: TaxProvinces.php:11 TopItems.php:114 UnitsOfMeasure.php:10
-#: 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
+#: AccountGroups.php:225
+#: AccountSections.php:169
+#: AddCustomerContacts.php:25
+#: AddCustomerContacts.php:27
+#: AddCustomerNotes.php:101
+#: AddCustomerTypeNotes.php:94
+#: AgedDebtors.php:444
+#: AgedSuppliers.php:276
+#: Areas.php:143
+#: 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:18
+#: CompanyPreferences.php:153
+#: CounterSales.php:2037
+#: CounterSales.php:2163
+#: Credit_Invoice.php:255
+#: CreditStatus.php:21
+#: Currencies.php:28
+#: CustEDISetup.php:17
+#: DailyBankTransactions.php:11
+#: DebtorsAtPeriodEnd.php:125
+#: DiscountCategories.php:10
+#: DiscountCategories.php:134
+#: DiscountMatrix.php:16
+#: EDIMessageFormat.php:105
+#: FixedAssetLocations.php:9
+#: FixedAssetRegister.php:13
+#: FixedAssetRegister.php:249
+#: FixedAssetTransfer.php:32
+#: FormDesigner.php:129
+#: GLBalanceSheet.php:378
+#: GLBudgets.php:29
+#: GLJournal.php:247
+#: InternalStockRequest.php:281
+#: InventoryPlanning.php:374
+#: InventoryPlanningPrefSupplier.php:467
+#: MRPReport.php:516
+#: NoSalesItems.php:93
+#: OutstandingGRNs.php:163
+#: PcAssignCashToTab.php:56
+#: PcAssignCashToTab.php:130
+#: PcAssignCashToTab.php:146
+#: PcAssignCashToTab.php:190
+#: PDFPickingList.php:28
+#: PDFStockLocTransfer.php:16
+#: PO_AuthorisationLevels.php:10
+#: POReport.php:60
+#: POReport.php:64
+#: POReport.php:68
+#: PO_SelectOSPurchOrder.php:140
+#: PricesBasedOnMarkUp.php:8
+#: Prices_Customer.php:35
+#: Prices.php:30
+#: PurchData.php:152
+#: PurchData.php:286
+#: PurchData.php:312
+#: RecurringSalesOrders.php:309
+#: SalesAnalReptCols.php:51
+#: SalesAnalRepts.php:11
+#: SalesCategories.php:11
+#: SalesGLPostings.php:17
+#: SalesGraph.php:35
+#: SalesPeople.php:20
+#: SalesTypes.php:20
+#: SelectAsset.php:46
+#: SelectCompletedOrder.php:11
+#: SelectContract.php:65
+#: SelectCreditItems.php:216
+#: SelectCreditItems.php:287
+#: SelectCustomer.php:263
+#: SelectGLAccount.php:17
+#: SelectGLAccount.php:87
+#: SelectOrderItems.php:586
+#: SelectOrderItems.php:1498
+#: SelectOrderItems.php:1620
+#: SelectProduct.php:505
+#: SelectSalesOrder.php:534
+#: SelectSupplier.php:9
+#: SelectSupplier.php:199
+#: SelectWorkOrder.php:9
+#: SelectWorkOrder.php:152
+#: ShipmentCosting.php:11
+#: Shipments.php:17
+#: Shippers.php:123
+#: Shippers.php:160
+#: Shipt_Select.php:8
+#: StockLocMovements.php:14
+#: StockLocStatus.php:28
+#: StockSerialItemResearch.php:30
+#: SupplierPriceList.php:15
+#: SupplierPriceList.php:214
+#: SupplierPriceList.php:384
+#: SupplierPriceList.php:388
+#: SupplierPriceList.php:439
+#: SupplierPriceList.php:489
+#: Suppliers.php:302
+#: SupplierTenderCreate.php:522
+#: SupplierTenderCreate.php:628
+#: SupplierTenders.php:322
+#: SupplierTenders.php:388
+#: SupplierTransInquiry.php:10
+#: TaxGroups.php:15
+#: TaxProvinces.php:11
+#: TopItems.php:114
+#: WhereUsedInquiry.php:18
+#: WorkCentres.php:111
+#: WorkCentres.php:162
+#: WorkOrderCosting.php:13
+#: WorkOrderEntry.php:11
+#: WorkOrderIssue.php:22
+#: WorkOrderReceive.php:17
+#: WorkOrderStatus.php:42
+#: WWW_Access.php:11
+#: WWW_Users.php:33
+#: Z_BottomUpCosts.php:57
msgid "Search"
msgstr ""
-#: AccountGroups.php:286
+#: AccountGroups.php:229
msgid "Group Name"
msgstr "Grupi nimi"
-#: AccountGroups.php:287 EDIMessageFormat.php:129 EDIMessageFormat.php:208
+#: AccountGroups.php:230
+#: EDIMessageFormat.php:129
+#: EDIMessageFormat.php:208
msgid "Section"
msgstr "Jaotis"
-#: AccountGroups.php:288 AccountGroups.php:457
+#: AccountGroups.php:231
+#: AccountGroups.php:410
msgid "Sequence In TB"
msgstr "Järgnevus proovibilansis"
-#: AccountGroups.php:289 AccountGroups.php:440 GLProfit_Loss.php:6
-#: GLProfit_Loss.php:129 GLProfit_Loss.php:130 GLProfit_Loss.php:181
-#: SelectGLAccount.php:40 SelectGLAccount.php:54 SelectGLAccount.php:68
+#: AccountGroups.php:232
+#: AccountGroups.php:393
+#: GLProfit_Loss.php:6
+#: GLProfit_Loss.php:126
+#: GLProfit_Loss.php:127
+#: GLProfit_Loss.php:178
+#: SelectGLAccount.php:40
+#: SelectGLAccount.php:54
+#: SelectGLAccount.php:68
msgid "Profit and Loss"
msgstr "Kasum ja kahjum"
-#: AccountGroups.php:306 AccountGroups.php:309 AccountGroups.php:444
-#: AccountGroups.php:446 BOMs.php:124 BOMs.php:772 BOMs.php:774
-#: CompanyPreferences.php:479 CompanyPreferences.php:481
-#: CompanyPreferences.php:494 CompanyPreferences.php:496
-#: CompanyPreferences.php:509 CompanyPreferences.php:511
-#: ContractCosting.php:198 CustomerBranches.php:414 Customers.php:601
-#: Customers.php:969 Customers.php:975 Customers.php:978
-#: DailyBankTransactions.php:145 DeliveryDetails.php:1116
-#: DeliveryDetails.php:1159 DeliveryDetails.php:1162 GLTransInquiry.php:69
-#: Labels.php:591 Labels.php:593 Labels.php:618 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 PaymentMethods.php:294
-#: PcAuthorizeExpenses.php:246 PDFChequeListing.php:65
-#: PDFDeliveryDifferences.php:76 PDFDIFOT.php:76
-#: PO_AuthorisationLevels.php:134 PO_AuthorisationLevels.php:139
-#: PO_Header.php:777 PO_PDFPurchOrder.php:394 PO_PDFPurchOrder.php:397
-#: PurchData.php:291 PurchData.php:662 PurchData.php:665
-#: RecurringSalesOrders.php:493 RecurringSalesOrders.php:496
-#: SalesAnalReptCols.php:284 SalesAnalReptCols.php:419
-#: SalesAnalReptCols.php:422 SalesAnalRepts.php:420 SalesAnalRepts.php:423
-#: SalesAnalRepts.php:448 SalesAnalRepts.php:451 SalesAnalRepts.php:476
-#: SalesAnalRepts.php:479 SalesPeople.php:219 SalesPeople.php:356
-#: SalesPeople.php:358 SelectProduct.php:397 ShipmentCosting.php:667
-#: Stocks.php:1078 Stocks.php:1080 Stocks.php:1103 Stocks.php:1105
-#: SuppContractChgs.php:90 SystemParameters.php:408 SystemParameters.php:431
-#: SystemParameters.php:447 SystemParameters.php:519 SystemParameters.php:527
-#: SystemParameters.php:567 SystemParameters.php:647 SystemParameters.php:656
-#: SystemParameters.php:664 SystemParameters.php:682 SystemParameters.php:689
-#: SystemParameters.php:733 SystemParameters.php:829 SystemParameters.php:964
-#: SystemParameters.php:966 SystemParameters.php:976 SystemParameters.php:978
-#: SystemParameters.php:1032 SystemParameters.php:1044
-#: SystemParameters.php:1046 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
+#: AccountGroups.php:233
+#: AccountGroups.php:354
+msgid "Parent Group"
+msgstr "Emagrupp"
+
+#: AccountGroups.php:249
+#: AccountGroups.php:252
+#: AccountGroups.php:397
+#: AccountGroups.php:399
+#: BOMs.php:124
+#: BOMs.php:772
+#: BOMs.php:774
+#: CompanyPreferences.php:477
+#: CompanyPreferences.php:479
+#: CompanyPreferences.php:492
+#: CompanyPreferences.php:494
+#: CompanyPreferences.php:507
+#: CompanyPreferences.php:509
+#: ContractCosting.php:198
+#: CustomerBranches.php:411
+#: Customers.php:594
+#: Customers.php:947
+#: Customers.php:956
+#: Customers.php:959
+#: DeliveryDetails.php:1082
+#: DeliveryDetails.php:1125
+#: DeliveryDetails.php:1128
+#: GLTransInquiry.php:69
+#: Labels.php:491
+#: Labels.php:493
+#: Labels.php:518
+#: MRPCalendar.php:224
+#: MRP.php:529
+#: MRP.php:533
+#: MRP.php:537
+#: MRP.php:541
+#: PaymentMethods.php:204
+#: PaymentMethods.php:205
+#: PaymentMethods.php:206
+#: PaymentMethods.php:207
+#: PaymentMethods.php:273
+#: PaymentMethods.php:280
+#: PaymentMethods.php:287
+#: PaymentMethods.php:294
+#: PcAuthorizeExpenses.php:243
+#: PDFChequeListing.php:63
+#: PDFDeliveryDifferences.php:76
+#: PDFDIFOT.php:76
+#: PO_AuthorisationLevels.php:134
+#: PO_AuthorisationLevels.php:139
+#: PO_Header.php:792
+#: PO_PDFPurchOrder.php:392
+#: PO_PDFPurchOrder.php:395
+#: PurchData.php:212
+#: PurchData.php:554
+#: PurchData.php:557
+#: RecurringSalesOrders.php:482
+#: RecurringSalesOrders.php:485
+#: SalesAnalReptCols.php:284
+#: SalesAnalReptCols.php:419
+#: SalesAnalReptCols.php:422
+#: SalesAnalRepts.php:417
+#: SalesAnalRepts.php:420
+#: SalesAnalRepts.php:445
+#: SalesAnalRepts.php:448
+#: SalesAnalRepts.php:473
+#: SalesAnalRepts.php:476
+#: SalesPeople.php:219
+#: SalesPeople.php:356
+#: SalesPeople.php:358
+#: SelectProduct.php:385
+#: ShipmentCosting.php:667
+#: Stocks.php:1051
+#: Stocks.php:1053
+#: Stocks.php:1076
+#: Stocks.php:1078
+#: SuppContractChgs.php:90
+#: SystemParameters.php:401
+#: SystemParameters.php:424
+#: SystemParameters.php:440
+#: SystemParameters.php:503
+#: SystemParameters.php:511
+#: SystemParameters.php:551
+#: SystemParameters.php:631
+#: SystemParameters.php:640
+#: SystemParameters.php:648
+#: SystemParameters.php:666
+#: SystemParameters.php:673
+#: SystemParameters.php:717
+#: SystemParameters.php:813
+#: SystemParameters.php:948
+#: SystemParameters.php:950
+#: SystemParameters.php:960
+#: SystemParameters.php:962
+#: SystemParameters.php:1016
+#: SystemParameters.php:1028
+#: SystemParameters.php:1030
+#: TaxGroups.php:311
+#: TaxGroups.php:314
+#: TaxGroups.php:371
+#: WWW_Users.php:484
+#: WWW_Users.php:486
+#: WWW_Users.php:657
+#: WWW_Users.php:659
msgid "Yes"
msgstr "Jah"
-#: AccountGroups.php:312 AccountGroups.php:449 AccountGroups.php:451
-#: BankAccounts.php:210 BankAccounts.php:379 BankAccounts.php:381
-#: BankAccounts.php:385 BankAccounts.php:393 BOMs.php:126 BOMs.php:771
-#: BOMs.php:775 CompanyPreferences.php:478 CompanyPreferences.php:482
-#: CompanyPreferences.php:493 CompanyPreferences.php:497
-#: CompanyPreferences.php:508 CompanyPreferences.php:512
-#: ContractCosting.php:196 CustomerBranches.php:414 Customers.php:600
-#: Customers.php:967 Customers.php:974 Customers.php:977
-#: DailyBankTransactions.php:147 DeliveryDetails.php:1117
-#: DeliveryDetails.php:1160 DeliveryDetails.php:1163 GLTransInquiry.php:90
-#: Labels.php:590 Labels.php:594 Labels.php:619 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 PaymentMethods.php:288
-#: PaymentMethods.php:295 PcAuthorizeExpenses.php:244 PDFChequeListing.php:64
-#: PDFDeliveryDifferences.php:75 PDFDIFOT.php:75
-#: PO_AuthorisationLevels.php:136 PO_AuthorisationLevels.php:141
-#: PO_Header.php:776 PO_PDFPurchOrder.php:395 PO_PDFPurchOrder.php:398
-#: PurchData.php:294 PurchData.php:663 PurchData.php:666
-#: RecurringSalesOrders.php:492 RecurringSalesOrders.php:495
-#: SalesAnalReptCols.php:282 SalesAnalReptCols.php:420
-#: SalesAnalReptCols.php:423 SalesAnalRepts.php:419 SalesAnalRepts.php:422
-#: SalesAnalRepts.php:447 SalesAnalRepts.php:450 SalesAnalRepts.php:475
-#: SalesAnalRepts.php:478 SalesPeople.php:221 SalesPeople.php:361
-#: SalesPeople.php:363 SelectProduct.php:399 ShipmentCosting.php:668
-#: Stocks.php:1073 Stocks.php:1075 Stocks.php:1098 Stocks.php:1100
-#: SuppContractChgs.php:92 SystemParameters.php:409 SystemParameters.php:432
-#: SystemParameters.php:448 SystemParameters.php:520 SystemParameters.php:528
-#: SystemParameters.php:568 SystemParameters.php:648 SystemParameters.php:657
-#: SystemParameters.php:665 SystemParameters.php:683 SystemParameters.php:690
-#: SystemParameters.php:734 SystemParameters.php:830 SystemParameters.php:963
-#: SystemParameters.php:967 SystemParameters.php:975 SystemParameters.php:979
-#: SystemParameters.php:1033 SystemParameters.php:1043
-#: SystemParameters.php:1047 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
+#: AccountGroups.php:255
+#: AccountGroups.php:402
+#: AccountGroups.php:404
+#: BankAccounts.php:209
+#: BankAccounts.php:378
+#: BankAccounts.php:380
+#: BankAccounts.php:384
+#: BankAccounts.php:392
+#: BOMs.php:126
+#: BOMs.php:771
+#: BOMs.php:775
+#: CompanyPreferences.php:476
+#: CompanyPreferences.php:480
+#: CompanyPreferences.php:491
+#: CompanyPreferences.php:495
+#: CompanyPreferences.php:506
+#: CompanyPreferences.php:510
+#: ContractCosting.php:196
+#: CustomerBra...
[truncated message content] |
|
From: <dai...@us...> - 2013-03-31 21:17:26
|
Revision: 5832
http://sourceforge.net/p/web-erp/reponame/5832
Author: daintree
Date: 2013-03-31 21:17:23 +0000 (Sun, 31 Mar 2013)
Log Message:
-----------
Kalmer Piiskop: Correct includes/LanguagesArray.php to use correct decimal point and thousands separator
Modified Paths:
--------------
trunk/doc/Change.log
trunk/includes/LanguagesArray.php
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2013-03-31 12:41:17 UTC (rev 5831)
+++ trunk/doc/Change.log 2013-03-31 21:17:23 UTC (rev 5832)
@@ -1,5 +1,6 @@
webERP Change Log
+1/4/13 Kalmer Piiskop: Correct includes/LanguagesArray.php to use correct decimal point and thousands separator
27/3/13 Fahad Hatib: Updates to editing tenders and button to close a tender
22/3/13 Kalmer Piiskop: Updated Estonian translation
21/3/13 Arwan: CustomerReceipt.php Added GL tag name for GL analysis of receipts
Modified: trunk/includes/LanguagesArray.php
===================================================================
--- trunk/includes/LanguagesArray.php 2013-03-31 12:41:17 UTC (rev 5831)
+++ trunk/includes/LanguagesArray.php 2013-03-31 21:17:23 UTC (rev 5832)
@@ -1,165 +1,165 @@
-<?php
-$LanguagesArray = array();
-
-$LanguagesArray['en_US.utf8']['LanguageName'] = _('English US');
-$LanguagesArray['en_US.utf8']['WindowsLocale'] = 'english-us';
-$LanguagesArray['en_US.utf8']['DecimalPoint'] = '.';
-$LanguagesArray['en_US.utf8']['ThousandsSeparator'] = ',';
-
-$LanguagesArray['en_GB.utf8']['LanguageName'] = _('English British');
-$LanguagesArray['en_GB.utf8']['WindowsLocale'] = 'english-uk';
-$LanguagesArray['en_GB.utf8']['DecimalPoint'] = '.';
-$LanguagesArray['en_GB.utf8']['ThousandsSeparator'] = ',';
-
-$LanguagesArray['en_IN.utf8']['LanguageName'] = _('English India');
-$LanguagesArray['en_IN.utf8']['WindowsLocale'] = 'english-in';
-$LanguagesArray['en_IN.utf8']['DecimalPoint'] = '.';
-$LanguagesArray['en_IN.utf8']['ThousandsSeparator'] = ',';
-
-$LanguagesArray['ar_EG.utf8']['LanguageName'] = _('Arabic Eygptian');
-$LanguagesArray['ar_EG.utf8']['WindowsLocale'] = 'arabic';
-$LanguagesArray['ar_EG.utf8']['DecimalPoint'] = ',';
-$LanguagesArray['ar_EG.utf8']['ThousandsSeparator'] = ' ';
-
-$LanguagesArray['cz_CZ.utf8']['LanguageName'] = _('Czech');
-$LanguagesArray['cz_CZ.utf8']['WindowsLocale'] = 'czech';
-$LanguagesArray['cz_CZ.utf8']['DecimalPoint'] = ',';
-$LanguagesArray['cz_CZ.utf8']['ThousandsSeparator'] = ' ';
-
-$LanguagesArray['de_DE.utf8']['LanguageName'] = _('German');
-$LanguagesArray['de_DE.utf8']['WindowsLocale'] = 'german';
-$LanguagesArray['de_DE.utf8']['DecimalPoint'] = ',';
-$LanguagesArray['de_DE.utf8']['ThousandsSeparator'] = '.';
-
-$LanguagesArray['el_GR.utf8']['LanguageName'] = _('Greek');
-$LanguagesArray['el_GR.utf8']['WindowsLocale'] = 'greek';
-$LanguagesArray['el_GR.utf8']['DecimalPoint'] = ',';
-$LanguagesArray['el_GR.utf8']['ThousandsSeparator'] = '.';
-
-$LanguagesArray['es_ES.utf8']['LanguageName'] = _('Spanish');
-$LanguagesArray['es_ES.utf8']['WindowsLocale'] = 'spanish';
-$LanguagesArray['es_ES.utf8']['DecimalPoint'] = ',';
-$LanguagesArray['es_ES.utf8']['ThousandsSeparator'] = '.';
-
-$LanguagesArray['et_EE.utf8']['LanguageName'] = _('Estonian');
-$LanguagesArray['et_EE.utf8']['WindowsLocale'] = 'estonian';
-$LanguagesArray['et_EE.utf8']['DecimalPoint'] = '.';
-$LanguagesArray['et_EE.utf8']['ThousandsSeparator'] = ' ';
-
-$LanguagesArray['fa_IR.utf8']['LanguageName'] = _('Persian');
-$LanguagesArray['fa_IR.utf8']['WindowsLocale'] = 'persian';
-$LanguagesArray['fa_IR.utf8']['DecimalPoint'] = ',';
-$LanguagesArray['fa_IR.utf8']['ThousandsSeparator'] = '.';
-
-$LanguagesArray['fr_CA.utf8']['LanguageName'] = _('French-Quebec');
-$LanguagesArray['fr_CA.utf8']['WindowsLocale'] = 'french-quebec';
-$LanguagesArray['fr_CA.utf8']['DecimalPoint'] = ',';
-$LanguagesArray['fr_CA.utf8']['ThousandsSeparator'] = ' ';
-
-$LanguagesArray['fr_FR.utf8']['LanguageName'] = _('French');
-$LanguagesArray['fr_FR.utf8']['WindowsLocale'] = 'french';
-$LanguagesArray['fr_FR.utf8']['DecimalPoint'] = ',';
-$LanguagesArray['fr_FR.utf8']['ThousandsSeparator'] = ' ';
-
-$LanguagesArray['hi_IN.utf8']['LanguageName'] = _('Hindi');
-$LanguagesArray['hi_IN.utf8']['WindowsLocale'] = 'hindi';
-$LanguagesArray['hi_IN.utf8']['DecimalPoint'] = '.';
-$LanguagesArray['hi_IN.utf8']['ThousandsSeparator'] = ',';
-
-$LanguagesArray['hr_HR.utf8']['LanguageName'] = _('Hungarian');
-$LanguagesArray['hr_HR.utf8']['WindowsLocale'] = 'hungarian';
-$LanguagesArray['hr_HR.utf8']['DecimalPoint'] = ',';
-$LanguagesArray['hr_HR.utf8']['ThousandsSeparator'] = ' ';
-
-$LanguagesArray['id_ID.utf8']['LanguageName'] = _('Indonesian');
-$LanguagesArray['id_ID.utf8']['WindowsLocale'] = 'indonesian';
-$LanguagesArray['id_ID.utf8']['DecimalPoint'] = ',';
-$LanguagesArray['id_ID.utf8']['ThousandsSeparator'] = '.';
-
-$LanguagesArray['it_IT.utf8']['LanguageName'] = _('Italian');
-$LanguagesArray['it_IT.utf8']['WindowsLocale'] = 'italian';
-$LanguagesArray['it_IT.utf8']['DecimalPoint'] = ',';
-$LanguagesArray['it_IT.utf8']['ThousandsSeparator'] = '.';
-
-$LanguagesArray['ja_JP.utf8']['LanguageName'] = _('Japanese');
-$LanguagesArray['ja_JP.utf8']['WindowsLocale'] = 'japanese';
-$LanguagesArray['ja_JP.utf8']['DecimalPoint'] = '.';
-$LanguagesArray['ja_JP.utf8']['ThousandsSeparator'] = ',';
-
-$LanguagesArray['lv_LV.utf8']['LanguageName'] = _('Latvian');
-$LanguagesArray['lv_LV.utf8']['WindowsLocale'] = 'latvian';
-$LanguagesArray['lv_LV.utf8']['DecimalPoint'] = ',';
-$LanguagesArray['lv_LV.utf8']['ThousandsSeparator'] = '.';
-
-$LanguagesArray['nl_NL.utf8']['LanguageName'] = _('Dutch');
-$LanguagesArray['nl_NL.utf8']['WindowsLocale'] = 'dutch';
-$LanguagesArray['nl_NL.utf8']['DecimalPoint'] = ',';
-$LanguagesArray['nl_NL.utf8']['ThousandsSeparator'] = '.';
-
-$LanguagesArray['pl_PL.utf8']['LanguageName'] = _('Polish');
-$LanguagesArray['pl_PL.utf8']['WindowsLocale'] = 'polish';
-$LanguagesArray['pl_PL.utf8']['DecimalPoint'] = ',';
-$LanguagesArray['pl_PL.utf8']['ThousandsSeparator'] = ' ';
-
-$LanguagesArray['pt_BR.utf8']['LanguageName'] = _('Brazilian Portuguese');
-$LanguagesArray['pt_BR.utf8']['WindowsLocale'] = 'portuguese-brazil';
-$LanguagesArray['pt_BR.utf8']['DecimalPoint'] = ',';
-$LanguagesArray['pt_BR.utf8']['ThousandsSeparator'] = '.';
-
-$LanguagesArray['pt_PT.utf8']['LanguageName'] = _('Portuguese');
-$LanguagesArray['pt_PT.utf8']['WindowsLocale'] = 'portuguese';
-$LanguagesArray['pt_PT.utf8']['DecimalPoint'] = ',';
-$LanguagesArray['pt_PT.utf8']['ThousandsSeparator'] = '.';
-
-$LanguagesArray['ro_RO.utf8']['LanguageName'] = _('Romanian');
-$LanguagesArray['ro_RO.utf8']['WindowsLocale'] = 'romanian';
-$LanguagesArray['ro_RO.utf8']['DecimalPoint'] = ',';
-$LanguagesArray['ro_RO.utf8']['ThousandsSeparator'] = '.';
-
-$LanguagesArray['ru_RU.utf8']['LanguageName'] = _('Russian');
-$LanguagesArray['ru_RU.utf8']['WindowsLocale'] = 'russian';
-$LanguagesArray['ru_RU.utf8']['DecimalPoint'] = ',';
-$LanguagesArray['ru_RU.utf8']['ThousandsSeparator'] = ' ';
-
-$LanguagesArray['sq_AL.utf8']['LanguageName'] = _('Albanian');
-$LanguagesArray['sq_AL.utf8']['WindowsLocale'] = 'albanian';
-$LanguagesArray['sq_AL.utf8']['DecimalPoint'] = ',';
-$LanguagesArray['sq_AL.utf8']['ThousandsSeparator'] = ' ';
-
-$LanguagesArray['sv_SE.utf8']['LanguageName'] = _('Swedish');
-$LanguagesArray['sv_SE.utf8']['WindowsLocale'] = 'swedish';
-$LanguagesArray['sv_SE.utf8']['DecimalPoint'] = ',';
-$LanguagesArray['sv_SE.utf8']['ThousandsSeparator'] = ' ';
-
-$LanguagesArray['sw_KE.utf8']['LanguageName'] = _('Kiswahili');
-$LanguagesArray['sw_KE.utf8']['WindowsLocale'] = 'kiswahili';
-$LanguagesArray['sw_KE.utf8']['DecimalPoint'] = '.';
-$LanguagesArray['sw_KE.utf8']['ThousandsSeparator'] = ',';
-
-$LanguagesArray['tr_TR.utf8']['LanguageName'] = _('Turkish');
-$LanguagesArray['tr_TR.utf8']['WindowsLocale'] = 'turkish';
-$LanguagesArray['tr_TR.utf8']['DecimalPoint'] = '.';
-$LanguagesArray['tr_TR.utf8']['ThousandsSeparator'] = ',';
-
-$LanguagesArray['vi_VN.utf8']['LanguageName'] = _('Vietnamese');
-$LanguagesArray['vi_VN.utf8']['WindowsLocale'] = 'vietnamese';
-$LanguagesArray['vi_VN.utf8']['DecimalPoint'] = '.';
-$LanguagesArray['vi_VN.utf8']['ThousandsSeparator'] = ',';
-
-$LanguagesArray['zh_CN.utf8']['LanguageName'] = _('Chinese - Simplified');
-$LanguagesArray['zh_CN.utf8']['WindowsLocale'] = 'chinese-simplified';
-$LanguagesArray['zh_CN.utf8']['DecimalPoint'] = '.';
-$LanguagesArray['zh_CN.utf8']['ThousandsSeparator'] = ',';
-
-$LanguagesArray['zh_HK.utf8']['LanguageName'] = _('Chinese - Traditional Hongkong');
-$LanguagesArray['zh_HK.utf8']['WindowsLocale'] = 'chinese-traditional';
-$LanguagesArray['zh_HK.utf8']['DecimalPoint'] = '.';
-$LanguagesArray['zh_HK.utf8']['ThousandsSeparator'] = ',';
-
-$LanguagesArray['zh_TW.utf8']['LanguageName'] = _('Chinese - Traditional Taiwan');
-$LanguagesArray['zh_TW.utf8']['WindowsLocale'] = 'chinese-traditional';
-$LanguagesArray['zh_TW.utf8']['DecimalPoint'] = '.';
-$LanguagesArray['zh_TW.utf8']['ThousandsSeparator'] = ',';
-
-asort($LanguagesArray);
-?>
+<?php
+$LanguagesArray = array();
+
+$LanguagesArray['en_US.utf8']['LanguageName'] = _('English US');
+$LanguagesArray['en_US.utf8']['WindowsLocale'] = 'english-us';
+$LanguagesArray['en_US.utf8']['DecimalPoint'] = '.';
+$LanguagesArray['en_US.utf8']['ThousandsSeparator'] = ',';
+
+$LanguagesArray['en_GB.utf8']['LanguageName'] = _('English British');
+$LanguagesArray['en_GB.utf8']['WindowsLocale'] = 'english-uk';
+$LanguagesArray['en_GB.utf8']['DecimalPoint'] = '.';
+$LanguagesArray['en_GB.utf8']['ThousandsSeparator'] = ',';
+
+$LanguagesArray['en_IN.utf8']['LanguageName'] = _('English India');
+$LanguagesArray['en_IN.utf8']['WindowsLocale'] = 'english-in';
+$LanguagesArray['en_IN.utf8']['DecimalPoint'] = '.';
+$LanguagesArray['en_IN.utf8']['ThousandsSeparator'] = ',';
+
+$LanguagesArray['ar_EG.utf8']['LanguageName'] = _('Arabic Eygptian');
+$LanguagesArray['ar_EG.utf8']['WindowsLocale'] = 'arabic';
+$LanguagesArray['ar_EG.utf8']['DecimalPoint'] = ',';
+$LanguagesArray['ar_EG.utf8']['ThousandsSeparator'] = ' ';
+
+$LanguagesArray['cz_CZ.utf8']['LanguageName'] = _('Czech');
+$LanguagesArray['cz_CZ.utf8']['WindowsLocale'] = 'czech';
+$LanguagesArray['cz_CZ.utf8']['DecimalPoint'] = ',';
+$LanguagesArray['cz_CZ.utf8']['ThousandsSeparator'] = ' ';
+
+$LanguagesArray['de_DE.utf8']['LanguageName'] = _('German');
+$LanguagesArray['de_DE.utf8']['WindowsLocale'] = 'german';
+$LanguagesArray['de_DE.utf8']['DecimalPoint'] = ',';
+$LanguagesArray['de_DE.utf8']['ThousandsSeparator'] = '.';
+
+$LanguagesArray['el_GR.utf8']['LanguageName'] = _('Greek');
+$LanguagesArray['el_GR.utf8']['WindowsLocale'] = 'greek';
+$LanguagesArray['el_GR.utf8']['DecimalPoint'] = ',';
+$LanguagesArray['el_GR.utf8']['ThousandsSeparator'] = '.';
+
+$LanguagesArray['es_ES.utf8']['LanguageName'] = _('Spanish');
+$LanguagesArray['es_ES.utf8']['WindowsLocale'] = 'spanish';
+$LanguagesArray['es_ES.utf8']['DecimalPoint'] = ',';
+$LanguagesArray['es_ES.utf8']['ThousandsSeparator'] = '.';
+
+$LanguagesArray['et_EE.utf8']['LanguageName'] = _('Estonian');
+$LanguagesArray['et_EE.utf8']['WindowsLocale'] = 'estonian';
+$LanguagesArray['et_EE.utf8']['DecimalPoint'] = '.';
+$LanguagesArray['et_EE.utf8']['ThousandsSeparator'] = ' ';
+
+$LanguagesArray['fa_IR.utf8']['LanguageName'] = _('Persian');
+$LanguagesArray['fa_IR.utf8']['WindowsLocale'] = 'persian';
+$LanguagesArray['fa_IR.utf8']['DecimalPoint'] = ',';
+$LanguagesArray['fa_IR.utf8']['ThousandsSeparator'] = '.';
+
+$LanguagesArray['fr_CA.utf8']['LanguageName'] = _('French-Quebec');
+$LanguagesArray['fr_CA.utf8']['WindowsLocale'] = 'french-quebec';
+$LanguagesArray['fr_CA.utf8']['DecimalPoint'] = ',';
+$LanguagesArray['fr_CA.utf8']['ThousandsSeparator'] = ' ';
+
+$LanguagesArray['fr_FR.utf8']['LanguageName'] = _('French');
+$LanguagesArray['fr_FR.utf8']['WindowsLocale'] = 'french';
+$LanguagesArray['fr_FR.utf8']['DecimalPoint'] = ',';
+$LanguagesArray['fr_FR.utf8']['ThousandsSeparator'] = ' ';
+
+$LanguagesArray['hi_IN.utf8']['LanguageName'] = _('Hindi');
+$LanguagesArray['hi_IN.utf8']['WindowsLocale'] = 'hindi';
+$LanguagesArray['hi_IN.utf8']['DecimalPoint'] = '.';
+$LanguagesArray['hi_IN.utf8']['ThousandsSeparator'] = ',';
+
+$LanguagesArray['hr_HR.utf8']['LanguageName'] = _('Hungarian');
+$LanguagesArray['hr_HR.utf8']['WindowsLocale'] = 'hungarian';
+$LanguagesArray['hr_HR.utf8']['DecimalPoint'] = ',';
+$LanguagesArray['hr_HR.utf8']['ThousandsSeparator'] = ' ';
+
+$LanguagesArray['id_ID.utf8']['LanguageName'] = _('Indonesian');
+$LanguagesArray['id_ID.utf8']['WindowsLocale'] = 'indonesian';
+$LanguagesArray['id_ID.utf8']['DecimalPoint'] = ',';
+$LanguagesArray['id_ID.utf8']['ThousandsSeparator'] = '.';
+
+$LanguagesArray['it_IT.utf8']['LanguageName'] = _('Italian');
+$LanguagesArray['it_IT.utf8']['WindowsLocale'] = 'italian';
+$LanguagesArray['it_IT.utf8']['DecimalPoint'] = ',';
+$LanguagesArray['it_IT.utf8']['ThousandsSeparator'] = '.';
+
+$LanguagesArray['ja_JP.utf8']['LanguageName'] = _('Japanese');
+$LanguagesArray['ja_JP.utf8']['WindowsLocale'] = 'japanese';
+$LanguagesArray['ja_JP.utf8']['DecimalPoint'] = '.';
+$LanguagesArray['ja_JP.utf8']['ThousandsSeparator'] = ',';
+
+$LanguagesArray['lv_LV.utf8']['LanguageName'] = _('Latvian');
+$LanguagesArray['lv_LV.utf8']['WindowsLocale'] = 'latvian';
+$LanguagesArray['lv_LV.utf8']['DecimalPoint'] = ',';
+$LanguagesArray['lv_LV.utf8']['ThousandsSeparator'] = '.';
+
+$LanguagesArray['nl_NL.utf8']['LanguageName'] = _('Dutch');
+$LanguagesArray['nl_NL.utf8']['WindowsLocale'] = 'dutch';
+$LanguagesArray['nl_NL.utf8']['DecimalPoint'] = ',';
+$LanguagesArray['nl_NL.utf8']['ThousandsSeparator'] = '.';
+
+$LanguagesArray['pl_PL.utf8']['LanguageName'] = _('Polish');
+$LanguagesArray['pl_PL.utf8']['WindowsLocale'] = 'polish';
+$LanguagesArray['pl_PL.utf8']['DecimalPoint'] = ',';
+$LanguagesArray['pl_PL.utf8']['ThousandsSeparator'] = ' ';
+
+$LanguagesArray['pt_BR.utf8']['LanguageName'] = _('Brazilian Portuguese');
+$LanguagesArray['pt_BR.utf8']['WindowsLocale'] = 'portuguese-brazil';
+$LanguagesArray['pt_BR.utf8']['DecimalPoint'] = ',';
+$LanguagesArray['pt_BR.utf8']['ThousandsSeparator'] = '.';
+
+$LanguagesArray['pt_PT.utf8']['LanguageName'] = _('Portuguese');
+$LanguagesArray['pt_PT.utf8']['WindowsLocale'] = 'portuguese';
+$LanguagesArray['pt_PT.utf8']['DecimalPoint'] = ',';
+$LanguagesArray['pt_PT.utf8']['ThousandsSeparator'] = '.';
+
+$LanguagesArray['ro_RO.utf8']['LanguageName'] = _('Romanian');
+$LanguagesArray['ro_RO.utf8']['WindowsLocale'] = 'romanian';
+$LanguagesArray['ro_RO.utf8']['DecimalPoint'] = ',';
+$LanguagesArray['ro_RO.utf8']['ThousandsSeparator'] = '.';
+
+$LanguagesArray['ru_RU.utf8']['LanguageName'] = _('Russian');
+$LanguagesArray['ru_RU.utf8']['WindowsLocale'] = 'russian';
+$LanguagesArray['ru_RU.utf8']['DecimalPoint'] = ',';
+$LanguagesArray['ru_RU.utf8']['ThousandsSeparator'] = ' ';
+
+$LanguagesArray['sq_AL.utf8']['LanguageName'] = _('Albanian');
+$LanguagesArray['sq_AL.utf8']['WindowsLocale'] = 'albanian';
+$LanguagesArray['sq_AL.utf8']['DecimalPoint'] = ',';
+$LanguagesArray['sq_AL.utf8']['ThousandsSeparator'] = ' ';
+
+$LanguagesArray['sv_SE.utf8']['LanguageName'] = _('Swedish');
+$LanguagesArray['sv_SE.utf8']['WindowsLocale'] = 'swedish';
+$LanguagesArray['sv_SE.utf8']['DecimalPoint'] = ',';
+$LanguagesArray['sv_SE.utf8']['ThousandsSeparator'] = ' ';
+
+$LanguagesArray['sw_KE.utf8']['LanguageName'] = _('Kiswahili');
+$LanguagesArray['sw_KE.utf8']['WindowsLocale'] = 'kiswahili';
+$LanguagesArray['sw_KE.utf8']['DecimalPoint'] = '.';
+$LanguagesArray['sw_KE.utf8']['ThousandsSeparator'] = ',';
+
+$LanguagesArray['tr_TR.utf8']['LanguageName'] = _('Turkish');
+$LanguagesArray['tr_TR.utf8']['WindowsLocale'] = 'turkish';
+$LanguagesArray['tr_TR.utf8']['DecimalPoint'] = '.';
+$LanguagesArray['tr_TR.utf8']['ThousandsSeparator'] = ',';
+
+$LanguagesArray['vi_VN.utf8']['LanguageName'] = _('Vietnamese');
+$LanguagesArray['vi_VN.utf8']['WindowsLocale'] = 'vietnamese';
+$LanguagesArray['vi_VN.utf8']['DecimalPoint'] = '.';
+$LanguagesArray['vi_VN.utf8']['ThousandsSeparator'] = ',';
+
+$LanguagesArray['zh_CN.utf8']['LanguageName'] = _('Chinese - Simplified');
+$LanguagesArray['zh_CN.utf8']['WindowsLocale'] = 'chinese-simplified';
+$LanguagesArray['zh_CN.utf8']['DecimalPoint'] = '.';
+$LanguagesArray['zh_CN.utf8']['ThousandsSeparator'] = ',';
+
+$LanguagesArray['zh_HK.utf8']['LanguageName'] = _('Chinese - Traditional Hongkong');
+$LanguagesArray['zh_HK.utf8']['WindowsLocale'] = 'chinese-traditional';
+$LanguagesArray['zh_HK.utf8']['DecimalPoint'] = '.';
+$LanguagesArray['zh_HK.utf8']['ThousandsSeparator'] = ',';
+
+$LanguagesArray['zh_TW.utf8']['LanguageName'] = _('Chinese - Traditional Taiwan');
+$LanguagesArray['zh_TW.utf8']['WindowsLocale'] = 'chinese-traditional';
+$LanguagesArray['zh_TW.utf8']['DecimalPoint'] = '.';
+$LanguagesArray['zh_TW.utf8']['ThousandsSeparator'] = ',';
+
+asort($LanguagesArray);
+?>
|
|
From: <dai...@us...> - 2013-04-05 20:42:41
|
Revision: 5833
http://sourceforge.net/p/web-erp/reponame/5833
Author: daintree
Date: 2013-04-05 20:42:38 +0000 (Fri, 05 Apr 2013)
Log Message:
-----------
Rafael max length of description in price list
Modified Paths:
--------------
trunk/PDFPriceList.php
trunk/doc/Change.log
Modified: trunk/PDFPriceList.php
===================================================================
--- trunk/PDFPriceList.php 2013-03-31 21:17:23 UTC (rev 5832)
+++ trunk/PDFPriceList.php 2013-04-05 20:42:38 UTC (rev 5833)
@@ -211,7 +211,8 @@
}
}/*end checked file exist*/
- $Split = explode("\r\n", $PriceList['longdescription']);
+ $Split = explode("\r\n", wordwrap($PriceList['longdescription'],130,"\r\n"));
+
$FontSize2=6;
if ($YPos < ($Bottom_Margin + (count($Split)*$line_height))){
PageHeader();
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2013-03-31 21:17:23 UTC (rev 5832)
+++ trunk/doc/Change.log 2013-04-05 20:42:38 UTC (rev 5833)
@@ -1,5 +1,6 @@
webERP Change Log
+6/4/13 Rafael: PDFPriceList.php split long description to maximum of 132 characters long
1/4/13 Kalmer Piiskop: Correct includes/LanguagesArray.php to use correct decimal point and thousands separator
27/3/13 Fahad Hatib: Updates to editing tenders and button to close a tender
22/3/13 Kalmer Piiskop: Updated Estonian translation
|
|
From: <tim...@us...> - 2013-04-05 21:57:46
|
Revision: 5834
http://sourceforge.net/p/web-erp/reponame/5834
Author: tim_schofield
Date: 2013-04-05 21:57:44 +0000 (Fri, 05 Apr 2013)
Log Message:
-----------
Fix problems with ampersand and apostrophes in Supplier codes
Modified Paths:
--------------
trunk/SelectSupplier.php
trunk/Suppliers.php
Modified: trunk/SelectSupplier.php
===================================================================
--- trunk/SelectSupplier.php 2013-04-05 20:42:38 UTC (rev 5833)
+++ trunk/SelectSupplier.php 2013-04-05 21:57:44 UTC (rev 5834)
@@ -4,20 +4,20 @@
include ('includes/session.inc');
$Title = _('Search Suppliers');
-/* webERP manual links before header.inc */
+/* KwaMoja manual links before header.inc */
$ViewTopic= 'AccountsPayable';
$BookMark = 'SelectSupplier';
include ('includes/header.inc');
include ('includes/SQL_CommonFunctions.inc');
if (!isset($_SESSION['SupplierID'])) {
- echo '<p class="page_title_text"><img src="' . $RootPath . '/css/' . $Theme . '/images/supplier.png" title="' . _('Search') . '" alt="" />' . ' ' . _('Suppliers') . '</p>';
+ echo '<p class="page_title_text noPrint" ><img src="' . $RootPath . '/css/' . $Theme . '/images/supplier.png" title="' . _('Search') . '" alt="" />' . ' ' . _('Suppliers') . '</p>';
}
if (isset($_GET['SupplierID'])) {
$_SESSION['SupplierID']=$_GET['SupplierID'];
}
// only get geocode information if integration is on, and supplier has been selected
-if ($_SESSION['geocode_integration'] == 1 AND isset($_SESSION['SupplierID'])) {
+if ($_SESSION['geocode_integration'] == 1 and isset($_SESSION['SupplierID'])) {
$sql = "SELECT * FROM geocode_param WHERE 1";
$ErrMsg = _('An error occurred in retrieving the information');;
$result = DB_query($sql, $db, $ErrMsg);
@@ -82,10 +82,10 @@
OR isset($_POST['Next'])
OR isset($_POST['Previous'])) {
- if (mb_strlen($_POST['Keywords']) > 0 AND mb_strlen($_POST['SupplierCode']) > 0) {
+ if (mb_strlen($_POST['Keywords']) > 0 and mb_strlen($_POST['SupplierCode']) > 0) {
prnMsg( _('Supplier name keywords have been used in preference to the Supplier code extract entered'), 'info' );
}
- if ($_POST['Keywords'] == '' AND $_POST['SupplierCode'] == '') {
+ if ($_POST['Keywords'] == '' and $_POST['SupplierCode'] == '') {
$SQL = "SELECT supplierid,
suppname,
currcode,
@@ -151,8 +151,8 @@
$myrow = DB_fetch_row($SupplierNameResult);
$SupplierName = $myrow[0];
}
- echo '<p class="page_title_text"><img src="' . $RootPath . '/css/' . $Theme . '/images/supplier.png" title="' . _('Supplier') . '" alt="" />' . ' ' . _('Supplier') . ' : <b>' . $_SESSION['SupplierID'] . ' - ' . $SupplierName . '</b> ' . _('has been selected') . '.</p>';
- echo '<div class="page_help_text">' . _('Select a menu option to operate using this supplier.') . '</div>';
+ echo '<p class="page_title_text noPrint" ><img src="' . $RootPath . '/css/' . $Theme . '/images/supplier.png" title="' . _('Supplier') . '" alt="" />' . ' ' . _('Supplier') . ' : <b>' . stripslashes($_SESSION['SupplierID']) . ' - ' . $SupplierName . '</b> ' . _('has been selected') . '.</p>';
+ echo '<div class="page_help_text noPrint">' . _('Select a menu option to operate using this supplier.') . '</div>';
echo '<br />
<table width="90%" cellpadding="4">
<tr>
@@ -161,35 +161,34 @@
<th style="width:33%">' . _('Supplier Maintenance') . '</th>
</tr>';
echo '<tr><td valign="top" class="select">'; /* Inquiry Options */
- echo '<a href="' . $RootPath . '/SupplierInquiry.php?SupplierID=' . $_SESSION['SupplierID'] . '">' . _('Supplier Account Inquiry') . '</a>
+ echo '<a href="' . $RootPath . '/SupplierInquiry.php?SupplierID=' . urlencode(stripslashes($_SESSION['SupplierID'])) . '">' . _('Supplier Account Inquiry') . '</a>
<br />
<br />';
- echo '<br /><a href="' . $RootPath . '/PO_SelectOSPurchOrder.php?SelectedSupplier=' . $_SESSION['SupplierID'] . '">' . _('Add / Receive / View Outstanding Purchase Orders') . '</a>';
- echo '<br /><a href="' . $RootPath . '/PO_SelectPurchOrder.php?SelectedSupplier=' . $_SESSION['SupplierID'] . '">' . _('View All Purchase Orders') . '</a><br />';
- wikiLink('Supplier', $_SESSION['SupplierID']);
- echo '<br /><a href="' . $RootPath . '/ShiptsList.php?SupplierID=' . $_SESSION['SupplierID'] . '&SupplierName=' . urlencode($SupplierName) . '">' . _('List all open shipments for') .' '.$SupplierName. '</a>';
- echo '<br /><a href="' . $RootPath . '/Shipt_Select.php?SelectedSupplier=' . $_SESSION['SupplierID'] . '">' . _('Search / Modify / Close Shipments') . '</a>';
- echo '<br /><a href="' . $RootPath . '/SuppPriceList.php?SelectedSupplier=' . $_SESSION['SupplierID'] . '">' . _('Supplier Price List') . '</a>';
+ echo '<br /><a href="' . $RootPath . '/PO_SelectOSPurchOrder.php?SelectedSupplier=' . urlencode(stripslashes($_SESSION['SupplierID'])) . '">' . _('Add / Receive / View Outstanding Purchase Orders') . '</a>';
+ echo '<br /><a href="' . $RootPath . '/PO_SelectPurchOrder.php?SelectedSupplier=' . urlencode(stripslashes($_SESSION['SupplierID'])) . '">' . _('View All Purchase Orders') . '</a><br />';
+ wikiLink('Supplier', urlencode(stripslashes($_SESSION['SupplierID'])));
+ echo '<br /><a href="' . $RootPath . '/ShiptsList.php?SupplierID=' . urlencode(stripslashes($_SESSION['SupplierID'])) . '&SupplierName=' . urlencode($SupplierName) . '">' . _('List all open shipments for') .' '.$SupplierName. '</a>';
+ echo '<br /><a href="' . $RootPath . '/Shipt_Select.php?SelectedSupplier=' . urlencode(stripslashes($_SESSION['SupplierID'])) . '">' . _('Search / Modify / Close Shipments') . '</a>';
+ echo '<br /><a href="' . $RootPath . '/SuppPriceList.php?SelectedSupplier=' . urlencode(stripslashes($_SESSION['SupplierID'])) . '">' . _('Supplier Price List') . '</a>';
echo '</td><td valign="top" class="select">'; /* Supplier Transactions */
- echo '<a href="' . $RootPath . '/PO_Header.php?NewOrder=Yes&SupplierID=' . $_SESSION['SupplierID'] . '">' . _('Enter a Purchase Order for This Supplier') . '</a><br />';
- echo '<a href="' . $RootPath . '/SupplierInvoice.php?SupplierID=' . $_SESSION['SupplierID'] . '">' . _('Enter a Suppliers Invoice') . '</a><br />';
- echo '<a href="' . $RootPath . '/SupplierCredit.php?New=true&SupplierID=' . $_SESSION['SupplierID'] . '">' . _('Enter a Suppliers Credit Note') . '</a><br />';
- echo '<a href="' . $RootPath . '/Payments.php?SupplierID=' . $_SESSION['SupplierID'] . '">' . _('Enter a Payment to, or Receipt from the Supplier') . '</a><br />';
+ echo '<a href="' . $RootPath . '/PO_Header.php?NewOrder=Yes&SupplierID=' . urlencode(stripslashes($_SESSION['SupplierID'])) . '">' . _('Enter a Purchase Order for This Supplier') . '</a><br />';
+ echo '<a href="' . $RootPath . '/SupplierInvoice.php?SupplierID=' . urlencode(stripslashes($_SESSION['SupplierID'])) . '">' . _('Enter a Suppliers Invoice') . '</a><br />';
+ echo '<a href="' . $RootPath . '/SupplierCredit.php?New=true&SupplierID=' . urlencode(stripslashes($_SESSION['SupplierID'])) . '">' . _('Enter a Suppliers Credit Note') . '</a><br />';
+ echo '<a href="' . $RootPath . '/Payments.php?SupplierID=' . urlencode(stripslashes($_SESSION['SupplierID'])) . '">' . _('Enter a Payment to, or Receipt from the Supplier') . '</a><br />';
echo '<br />';
- echo '<br /><a href="' . $RootPath . '/ReverseGRN.php?SupplierID=' . $_SESSION['SupplierID'] . '">' . _('Reverse an Outstanding Goods Received Note (GRN)') . '</a>';
+ echo '<br /><a href="' . $RootPath . '/ReverseGRN.php?SupplierID=' . urlencode(stripslashes($_SESSION['SupplierID'])) . '">' . _('Reverse an Outstanding Goods Received Note (GRN)') . '</a>';
echo '</td><td valign="top" class="select">'; /* Supplier Maintenance */
echo '<a href="' . $RootPath . '/Suppliers.php">' . _('Add a New Supplier') . '</a>
- <br /><a href="' . $RootPath . '/Suppliers.php?SupplierID=' . $_SESSION['SupplierID'] . '">' . _('Modify Or Delete Supplier Details') . '</a>
- <br /><a href="' . $RootPath . '/SupplierContacts.php?SupplierID=' . $_SESSION['SupplierID'] . '">' . _('Add/Modify/Delete Supplier Contacts') . '</a>
+ <br /><a href="' . $RootPath . '/Suppliers.php?SupplierID=' . urlencode(stripslashes($_SESSION['SupplierID'])) . '">' . _('Modify Or Delete Supplier Details') . '</a>
+ <br /><a href="' . $RootPath . '/SupplierContacts.php?SupplierID=' . urlencode(stripslashes($_SESSION['SupplierID'])) . '">' . _('Add/Modify/Delete Supplier Contacts') . '</a>
<br />
- <br /><a href="' . $RootPath . '/SellThroughSupport.php?SupplierID=' . $_SESSION['SupplierID'] . '">' . _('Set Up Sell Through Support Deals') . '</a>
+ <br /><a href="' . $RootPath . '/SellThroughSupport.php?SupplierID=' . urlencode(stripslashes($_SESSION['SupplierID'])) . '">' . _('Set Up Sell Through Support Deals') . '</a>
<br /><a href="' . $RootPath . '/Shipments.php?NewShipment=Yes">' . _('Set Up A New Shipment') . '</a>
<br /><a href="' . $RootPath . '/SuppLoginSetup.php">' . _('Supplier Login Configuration') . '</a>
</td>
</tr>
</table>';
-} else {
// Supplier is not selected yet
echo '<br />';
echo '<table width="90%" cellpadding="4">
@@ -207,10 +206,10 @@
</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" class="noPrint">';
echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-echo '<p class="page_title_text"><img src="' . $RootPath . '/css/' . $Theme . '/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . _('Search for Suppliers') . '</p>
+echo '<p class="page_title_text noPrint" ><img src="' . $RootPath . '/css/' . $Theme . '/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . _('Search for Suppliers') . '</p>
<table cellpadding="3" class="selection">
<tr>
<td>' . _('Enter a partial Name') . ':</td>
@@ -232,7 +231,7 @@
echo '</td></tr>
</table>
<br /><div class="centre"><input type="submit" name="Search" value="' . _('Search Now') . '" /></div>';
-//if (isset($result) AND !isset($SingleSupplierReturned)) {
+//if (isset($result) and !isset($SingleSupplierReturned)) {
if (isset($_POST['Search'])) {
$ListCount = DB_num_rows($result);
$ListPageMax = ceil($ListCount / $_SESSION['DisplayRecordsMax']);
@@ -287,7 +286,7 @@
if (DB_num_rows($result) <> 0) {
DB_data_seek($result, ($_POST['PageOffset'] - 1) * $_SESSION['DisplayRecordsMax']);
}
- while (($myrow = DB_fetch_array($result)) AND ($RowIndex <> $_SESSION['DisplayRecordsMax'])) {
+ while (($myrow = DB_fetch_array($result)) and ($RowIndex <> $_SESSION['DisplayRecordsMax'])) {
if ($k == 1) {
echo '<tr class="EvenTableRows">';
$k = 0;
Modified: trunk/Suppliers.php
===================================================================
--- trunk/Suppliers.php 2013-04-05 20:42:38 UTC (rev 5833)
+++ trunk/Suppliers.php 2013-04-05 21:57:44 UTC (rev 5834)
@@ -5,14 +5,14 @@
include('includes/session.inc');
$Title = _('Supplier Maintenance');
-/* webERP manual links before header.inc */
+/* KwaMoja manual links before header.inc */
$ViewTopic= 'AccountsPayable';
$BookMark = 'NewSupplier';
include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
include('includes/CountriesArray.php');
-Function Is_ValidAccount ($ActNo) {
+function Is_ValidAccount ($ActNo) {
if (mb_strlen($ActNo) < 16) {
echo _('NZ account numbers must have 16 numeric characters in it');
@@ -43,7 +43,7 @@
}
break;
case '02':
- If (!(($BranchNumber >= 1 and $BranchNumber <= 999) or ($BranchNumber >= 1200 and $BranchNumber <= 1299))) {
+ if (!(($BranchNumber >= 1 and $BranchNumber <= 999) or ($BranchNumber >= 1200 and $BranchNumber <= 1299))) {
echo _('Bank Of New Zealand branches must be between 0001 and 0999 or between 1200 and 1299') . '. ' . _('The branch number used is invalid');
return False;
exit;
@@ -139,7 +139,7 @@
default:
echo _('The prefix') . ' - ' . $BankPrefix . ' ' . _('is not a valid New Zealand Bank') . '.<br />' .
- _('If you are using webERP outside New Zealand error trapping relevant to your country should be used');
+ _('if you are using KwaMoja outside New Zealand error trapping relevant to your country should be used');
return False;
exit;
@@ -216,7 +216,7 @@
if ($BankPrefix == '08'){
$CheckSum = $CheckSum + $DigitVal * 4;
} elseif ($BankPrefix == '09') {
- If (($DigitVal * 5) > 9) {
+ if (($DigitVal * 5) > 9) {
$CheckSum = $CheckSum + (int) mb_substr((string)($DigitVal * 5),0,1) + (int) mb_substr((string)($DigitVal * 5),mb_strlen((string)($DigitVal *5))-1, 1);
} else {
$CheckSum = $CheckSum + $DigitVal * 5;
@@ -260,7 +260,7 @@
case 13:
if ($BankPrefix == '09') {
- If (($DigitVal * 2) > 9) {
+ if (($DigitVal * 2) > 9) {
$CheckSum = $CheckSum + (int) mb_substr(($DigitVal * 2),0,1) + (int) mb_substr(($DigitVal * 2),mb_strlen($DigitVal * 2)-1, 1);
} else {
$CheckSum = $CheckSum + $DigitVal * 2;
@@ -291,7 +291,7 @@
}
}
-} //End Function
+} //End function
if (isset($_GET['SupplierID'])){
@@ -302,14 +302,14 @@
unset($SupplierID);
}
-echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/supplier.png" title="' . _('Search') . '" alt="" />' . ' ' . _('Suppliers') . '</p>';
+echo '<p class="page_title_text noPrint" ><img src="'.$RootPath.'/css/'.$Theme.'/images/supplier.png" title="' . _('Search') . '" alt="" />' . ' ' . _('Suppliers') . '</p>';
$InputError = 0;
if (isset($Errors)) {
unset($Errors);
}
-$Errors=Array();
+$Errors=array();
if (isset($_POST['submit'])) {
//initialise no input errors assumed initially before we test
@@ -328,8 +328,8 @@
$i++;
}
if (mb_strlen($_POST['SuppName']) > 40
- OR mb_strlen($_POST['SuppName']) == 0
- OR $_POST['SuppName'] == '') {
+ or mb_strlen($_POST['SuppName']) == 0
+ or $_POST['SuppName'] == '') {
$InputError = 1;
prnMsg(_('The supplier name must be entered and be forty characters or less long'),'error');
@@ -342,12 +342,12 @@
$Errors[$i]='ID';
$i++;
}
- if (ContainsIllegalCharacters($SupplierID)) {
- $InputError = 1;
- prnMsg(_('The supplier code cannot contain any of the illegal characters') ,'error');
- $Errors[$i]='ID';
- $i++;
- }
+// if (ContainsIllegalCharacters($SupplierID)) {
+// $InputError = 1;
+// prnMsg(_('The supplier code cannot contain any of the illegal characters') ,'error');
+// $Errors[$i]='ID';
+// $i++;
+// }
if (mb_strlen($_POST['Phone']) >25) {
$InputError = 1;
prnMsg(_('The telephone number must be 25 characters or less long'),'error');
@@ -366,7 +366,7 @@
$Errors[$i] = 'Email';
$i++;
}
- if (mb_strlen($_POST['Email'])>0 AND !IsEmailAddress($_POST['Email'])) {
+ if (mb_strlen($_POST['Email'])>0 and !IsEmailAddress($_POST['Email'])) {
$InputError = 1;
prnMsg(_('The email address is not correctly formed'),'error');
$Errors[$i] = 'Email';
@@ -411,7 +411,7 @@
define('KEY', $api_key);
// check that some sane values are setup already in geocode tables, if not skip the geocoding but add the record anyway.
if ($map_host=="") {
- echo '<div class="warn">' . _('Warning - Geocode Integration is enabled, but no hosts are setup. Go to Geocode Setup') . '</div>';
+ echo '<div class="warn">' . _('Warning - Geocode Integration is enabled, but no hosts are setup. Go to Geocode Setup') . '</div>';
} else {
$address = $_POST['Address1'] . ', ' . $_POST['Address2'] . ', ' . $_POST['Address3'] . ', ' . $_POST['Address4'] . ', ' . $_POST['Address5']. ', ' . $_POST['Address6'];
@@ -608,7 +608,7 @@
}
-} elseif (isset($_POST['delete']) AND $_POST['delete'] != '') {
+} elseif (isset($_POST['delete']) and $_POST['delete'] != '') {
//the link to delete a selected record was clicked instead of the submit button
@@ -657,10 +657,10 @@
if (!isset($SupplierID)) {
-/*If the page was called without $SupplierID passed to page then assume a new supplier is to be entered show a form with a Supplier Code field other wise the form showing the fields with the existing entries against the supplier will show for editing with only a hidden SupplierID field*/
+/*if the page was called without $SupplierID passed to page then assume a new supplier is to be entered show a form with a Supplier Code field other wise the form showing the fields with the existing entries against the supplier will show for editing with only a hidden SupplierID field*/
- echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
- echo '<div>';
+ echo '<form method="post" class="noPrint" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<input type="hidden" name="New" value="Yes" />';
@@ -692,9 +692,9 @@
<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 ($_POST['Address6'] == $CountryName)){
echo '<option selected="selected" value="' . $CountryName . '">' . $CountryName .'</option>';
- }elseif (!isset($_POST['Address6']) AND $CountryName == "") {
+ }elseif (!isset($_POST['Address6']) and $CountryName == "") {
echo '<option selected="selected" value="' . $CountryName . '">' . $CountryName .'</option>';
} else {
echo '<option value="' . $CountryName . '">' . $CountryName .'</option>';
@@ -742,7 +742,7 @@
echo '<option value="'. $myrow['termsindicator'] . '">' . $myrow['terms'] .'</option>';
} //end while loop
DB_data_seek($result, 0);
- echo '</select></td></tr>';
+ echo '</select></td></tr>';
$result=DB_query("SELECT id, coyname FROM factorcompanies", $db);
@@ -750,10 +750,10 @@
<td><select name="FactorID">';
echo '<option value="0">' . _('None') . '</option>';
while ($myrow = DB_fetch_array($result)) {
- if (isset($_POST['FactorID']) AND $_POST['FactorID'] == $myrow['id']){
- echo '<option selected="selected" value="' . $myrow['id'] . '">' . $myrow['coyname'] .'</option>';
+ if (isset($_POST['FactorID']) and $_POST['FactorID'] == $myrow['id']){
+ echo '<option selected="selected" value="' . $myrow['id'] . '">' . $myrow['coyname'] .'</option>';
} else {
- echo '<option value="' . $myrow['id'] . '">' . $myrow['coyname'] .'</option>';
+ echo '<option value="' . $myrow['id'] . '">' . $myrow['coyname'] .'</option>';
}
} //end while loop
DB_data_seek($result, 0);
@@ -806,16 +806,16 @@
echo '</select></td></tr>
</table>
<br />
- <div class="centre"><input type="submit" name="submit" value="' . _('Insert New Supplier') . '" /></div>';
+ <div class="centre"><input type="submit" name="submit" value="' . _('Insert New Supplier') . '" /></div>';
echo '</div>
- </form>';
+ </form>';
} else {
//SupplierID exists - either passed when calling the form or from the form itself
- echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
- echo '<div>';
+ echo '<form method="post" class="noPrint" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<table class="selection">';
@@ -896,9 +896,9 @@
<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 ($_POST['Address6'] == $CountryName)){
echo '<option selected="selected" value="' . $CountryName . '">' . $CountryName .'</option>';
- }elseif (!isset($_POST['Address6']) AND $CountryName == "") {
+ }elseif (!isset($_POST['Address6']) and $CountryName == "") {
echo '<option selected="selected" value="' . $CountryName . '">' . $CountryName .'</option>';
} else {
echo '<option value="' . $CountryName . '">' . $CountryName .'</option>';
@@ -947,7 +947,7 @@
}
} //end while loop
DB_data_seek($result, 0);
- echo '</select></td></tr>';
+ echo '</select></td></tr>';
$result=DB_query("SELECT id, coyname FROM factorcompanies", $db);
@@ -962,7 +962,7 @@
}
} //end while loop
DB_data_seek($result, 0);
- echo '</select></td></tr>';
+ echo '</select></td></tr>';
echo '<tr><td>' . _('Tax Reference') . ':</td>
<td><input type="text" name="TaxRef" size="21" maxlength="20" value="' . $_POST['TaxRef'] .'" /></td></tr>';
@@ -1015,9 +1015,9 @@
if (isset($_POST['New'])) {
echo '<br />
- <div class="centre">
- <input type="submit" name="submit" value="' . _('Add These New Supplier Details') . '" />
- </div>';
+ <div class="centre">
+ <input type="submit" name="submit" value="' . _('Add These New Supplier Details') . '" />
+ </div>';
} else {
echo '<br />
<div class="centre">
@@ -1030,11 +1030,11 @@
<div class="centre">
<input type="submit" name="delete" value="' . _('Delete Supplier') . '" onclick="return confirm(\'' . _('Are you sure you wish to delete this supplier?') . '\');" />';
echo '<br />
- <a href="' . $RootPath . '/SupplierContacts.php?SupplierID=' . $SupplierID . '">' . _('Review Contact Details') . '</a>
+ <a href="' . $RootPath . '/SupplierContacts.php?SupplierID=' . urlencode($SupplierID) . '">' . _('Review Contact Details') . '</a>
</div>';
}
echo '</div>
- </form>';
+ </form>';
} // end of main ifs
include('includes/footer.inc');
|
|
From: <tim...@us...> - 2013-04-06 09:28:18
|
Revision: 5836
http://sourceforge.net/p/web-erp/reponame/5836
Author: tim_schofield
Date: 2013-04-06 09:28:15 +0000 (Sat, 06 Apr 2013)
Log Message:
-----------
Remove accidental reference to KwaMoja for Phil
Modified Paths:
--------------
trunk/SelectSupplier.php
trunk/Suppliers.php
Modified: trunk/SelectSupplier.php
===================================================================
--- trunk/SelectSupplier.php 2013-04-06 00:51:34 UTC (rev 5835)
+++ trunk/SelectSupplier.php 2013-04-06 09:28:15 UTC (rev 5836)
@@ -4,7 +4,6 @@
include ('includes/session.inc');
$Title = _('Search Suppliers');
-/* KwaMoja manual links before header.inc */
$ViewTopic= 'AccountsPayable';
$BookMark = 'SelectSupplier';
Modified: trunk/Suppliers.php
===================================================================
--- trunk/Suppliers.php 2013-04-06 00:51:34 UTC (rev 5835)
+++ trunk/Suppliers.php 2013-04-06 09:28:15 UTC (rev 5836)
@@ -5,7 +5,6 @@
include('includes/session.inc');
$Title = _('Supplier Maintenance');
-/* KwaMoja manual links before header.inc */
$ViewTopic= 'AccountsPayable';
$BookMark = 'NewSupplier';
include('includes/header.inc');
@@ -756,7 +755,6 @@
echo '<option value="' . $myrow['id'] . '">' . $myrow['coyname'] .'</option>';
}
} //end while loop
- DB_data_seek($result, 0);
echo '</select></td></tr>';
echo '<tr><td>' . _('Tax Reference') . ':</td>
<td><input type="text" name="TaxRef" size="21" maxlength="20" /></td></tr>';
@@ -961,7 +959,6 @@
echo '<option value="' . $myrow['id'] . '">' . $myrow['coyname'] .'</option>';
}
} //end while loop
- DB_data_seek($result, 0);
echo '</select></td></tr>';
echo '<tr><td>' . _('Tax Reference') . ':</td>
<td><input type="text" name="TaxRef" size="21" maxlength="20" value="' . $_POST['TaxRef'] .'" /></td></tr>';
|
|
From: <dai...@us...> - 2013-04-07 00:11:58
|
Revision: 5837
http://sourceforge.net/p/web-erp/reponame/5837
Author: daintree
Date: 2013-04-07 00:11:55 +0000 (Sun, 07 Apr 2013)
Log Message:
-----------
remove code using incorrect css
Modified Paths:
--------------
trunk/SelectSupplier.php
trunk/Suppliers.php
trunk/build/make_release.sh
trunk/doc/Change.log
Modified: trunk/SelectSupplier.php
===================================================================
--- trunk/SelectSupplier.php 2013-04-06 09:28:15 UTC (rev 5836)
+++ trunk/SelectSupplier.php 2013-04-07 00:11:55 UTC (rev 5837)
@@ -4,19 +4,20 @@
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'])) {
- echo '<p class="page_title_text noPrint" ><img src="' . $RootPath . '/css/' . $Theme . '/images/supplier.png" title="' . _('Search') . '" alt="" />' . ' ' . _('Suppliers') . '</p>';
+ echo '<p class="page_title_text"><img src="' . $RootPath . '/css/' . $Theme . '/images/supplier.png" title="' . _('Search') . '" alt="" />' . ' ' . _('Suppliers') . '</p>';
}
if (isset($_GET['SupplierID'])) {
$_SESSION['SupplierID']=$_GET['SupplierID'];
}
// only get geocode information if integration is on, and supplier has been selected
-if ($_SESSION['geocode_integration'] == 1 and isset($_SESSION['SupplierID'])) {
+if ($_SESSION['geocode_integration'] == 1 AND isset($_SESSION['SupplierID'])) {
$sql = "SELECT * FROM geocode_param WHERE 1";
$ErrMsg = _('An error occurred in retrieving the information');;
$result = DB_query($sql, $db, $ErrMsg);
@@ -81,10 +82,10 @@
OR isset($_POST['Next'])
OR isset($_POST['Previous'])) {
- if (mb_strlen($_POST['Keywords']) > 0 and mb_strlen($_POST['SupplierCode']) > 0) {
+ if (mb_strlen($_POST['Keywords']) > 0 AND mb_strlen($_POST['SupplierCode']) > 0) {
prnMsg( _('Supplier name keywords have been used in preference to the Supplier code extract entered'), 'info' );
}
- if ($_POST['Keywords'] == '' and $_POST['SupplierCode'] == '') {
+ if ($_POST['Keywords'] == '' AND $_POST['SupplierCode'] == '') {
$SQL = "SELECT supplierid,
suppname,
currcode,
@@ -150,8 +151,8 @@
$myrow = DB_fetch_row($SupplierNameResult);
$SupplierName = $myrow[0];
}
- echo '<p class="page_title_text noPrint" ><img src="' . $RootPath . '/css/' . $Theme . '/images/supplier.png" title="' . _('Supplier') . '" alt="" />' . ' ' . _('Supplier') . ' : <b>' . stripslashes($_SESSION['SupplierID']) . ' - ' . $SupplierName . '</b> ' . _('has been selected') . '.</p>';
- echo '<div class="page_help_text noPrint">' . _('Select a menu option to operate using this supplier.') . '</div>';
+ echo '<p class="page_title_text"><img src="' . $RootPath . '/css/' . $Theme . '/images/supplier.png" title="' . _('Supplier') . '" alt="" />' . ' ' . _('Supplier') . ' : <b>' . $_SESSION['SupplierID'] . ' - ' . $SupplierName . '</b> ' . _('has been selected') . '.</p>';
+ echo '<div class="page_help_text">' . _('Select a menu option to operate using this supplier.') . '</div>';
echo '<br />
<table width="90%" cellpadding="4">
<tr>
@@ -160,34 +161,35 @@
<th style="width:33%">' . _('Supplier Maintenance') . '</th>
</tr>';
echo '<tr><td valign="top" class="select">'; /* Inquiry Options */
- echo '<a href="' . $RootPath . '/SupplierInquiry.php?SupplierID=' . urlencode(stripslashes($_SESSION['SupplierID'])) . '">' . _('Supplier Account Inquiry') . '</a>
+ echo '<a href="' . $RootPath . '/SupplierInquiry.php?SupplierID=' . $_SESSION['SupplierID'] . '">' . _('Supplier Account Inquiry') . '</a>
<br />
<br />';
- echo '<br /><a href="' . $RootPath . '/PO_SelectOSPurchOrder.php?SelectedSupplier=' . urlencode(stripslashes($_SESSION['SupplierID'])) . '">' . _('Add / Receive / View Outstanding Purchase Orders') . '</a>';
- echo '<br /><a href="' . $RootPath . '/PO_SelectPurchOrder.php?SelectedSupplier=' . urlencode(stripslashes($_SESSION['SupplierID'])) . '">' . _('View All Purchase Orders') . '</a><br />';
- wikiLink('Supplier', urlencode(stripslashes($_SESSION['SupplierID'])));
- echo '<br /><a href="' . $RootPath . '/ShiptsList.php?SupplierID=' . urlencode(stripslashes($_SESSION['SupplierID'])) . '&SupplierName=' . urlencode($SupplierName) . '">' . _('List all open shipments for') .' '.$SupplierName. '</a>';
- echo '<br /><a href="' . $RootPath . '/Shipt_Select.php?SelectedSupplier=' . urlencode(stripslashes($_SESSION['SupplierID'])) . '">' . _('Search / Modify / Close Shipments') . '</a>';
- echo '<br /><a href="' . $RootPath . '/SuppPriceList.php?SelectedSupplier=' . urlencode(stripslashes($_SESSION['SupplierID'])) . '">' . _('Supplier Price List') . '</a>';
+ echo '<br /><a href="' . $RootPath . '/PO_SelectOSPurchOrder.php?SelectedSupplier=' . $_SESSION['SupplierID'] . '">' . _('Add / Receive / View Outstanding Purchase Orders') . '</a>';
+ echo '<br /><a href="' . $RootPath . '/PO_SelectPurchOrder.php?SelectedSupplier=' . $_SESSION['SupplierID'] . '">' . _('View All Purchase Orders') . '</a><br />';
+ wikiLink('Supplier', $_SESSION['SupplierID']);
+ echo '<br /><a href="' . $RootPath . '/ShiptsList.php?SupplierID=' . $_SESSION['SupplierID'] . '&SupplierName=' . urlencode($SupplierName) . '">' . _('List all open shipments for') .' '.$SupplierName. '</a>';
+ echo '<br /><a href="' . $RootPath . '/Shipt_Select.php?SelectedSupplier=' . $_SESSION['SupplierID'] . '">' . _('Search / Modify / Close Shipments') . '</a>';
+ echo '<br /><a href="' . $RootPath . '/SuppPriceList.php?SelectedSupplier=' . $_SESSION['SupplierID'] . '">' . _('Supplier Price List') . '</a>';
echo '</td><td valign="top" class="select">'; /* Supplier Transactions */
- echo '<a href="' . $RootPath . '/PO_Header.php?NewOrder=Yes&SupplierID=' . urlencode(stripslashes($_SESSION['SupplierID'])) . '">' . _('Enter a Purchase Order for This Supplier') . '</a><br />';
- echo '<a href="' . $RootPath . '/SupplierInvoice.php?SupplierID=' . urlencode(stripslashes($_SESSION['SupplierID'])) . '">' . _('Enter a Suppliers Invoice') . '</a><br />';
- echo '<a href="' . $RootPath . '/SupplierCredit.php?New=true&SupplierID=' . urlencode(stripslashes($_SESSION['SupplierID'])) . '">' . _('Enter a Suppliers Credit Note') . '</a><br />';
- echo '<a href="' . $RootPath . '/Payments.php?SupplierID=' . urlencode(stripslashes($_SESSION['SupplierID'])) . '">' . _('Enter a Payment to, or Receipt from the Supplier') . '</a><br />';
+ echo '<a href="' . $RootPath . '/PO_Header.php?NewOrder=Yes&SupplierID=' . $_SESSION['SupplierID'] . '">' . _('Enter a Purchase Order for This Supplier') . '</a><br />';
+ echo '<a href="' . $RootPath . '/SupplierInvoice.php?SupplierID=' . $_SESSION['SupplierID'] . '">' . _('Enter a Suppliers Invoice') . '</a><br />';
+ echo '<a href="' . $RootPath . '/SupplierCredit.php?New=true&SupplierID=' . $_SESSION['SupplierID'] . '">' . _('Enter a Suppliers Credit Note') . '</a><br />';
+ echo '<a href="' . $RootPath . '/Payments.php?SupplierID=' . $_SESSION['SupplierID'] . '">' . _('Enter a Payment to, or Receipt from the Supplier') . '</a><br />';
echo '<br />';
- echo '<br /><a href="' . $RootPath . '/ReverseGRN.php?SupplierID=' . urlencode(stripslashes($_SESSION['SupplierID'])) . '">' . _('Reverse an Outstanding Goods Received Note (GRN)') . '</a>';
+ echo '<br /><a href="' . $RootPath . '/ReverseGRN.php?SupplierID=' . $_SESSION['SupplierID'] . '">' . _('Reverse an Outstanding Goods Received Note (GRN)') . '</a>';
echo '</td><td valign="top" class="select">'; /* Supplier Maintenance */
echo '<a href="' . $RootPath . '/Suppliers.php">' . _('Add a New Supplier') . '</a>
- <br /><a href="' . $RootPath . '/Suppliers.php?SupplierID=' . urlencode(stripslashes($_SESSION['SupplierID'])) . '">' . _('Modify Or Delete Supplier Details') . '</a>
- <br /><a href="' . $RootPath . '/SupplierContacts.php?SupplierID=' . urlencode(stripslashes($_SESSION['SupplierID'])) . '">' . _('Add/Modify/Delete Supplier Contacts') . '</a>
+ <br /><a href="' . $RootPath . '/Suppliers.php?SupplierID=' . $_SESSION['SupplierID'] . '">' . _('Modify Or Delete Supplier Details') . '</a>
+ <br /><a href="' . $RootPath . '/SupplierContacts.php?SupplierID=' . $_SESSION['SupplierID'] . '">' . _('Add/Modify/Delete Supplier Contacts') . '</a>
<br />
- <br /><a href="' . $RootPath . '/SellThroughSupport.php?SupplierID=' . urlencode(stripslashes($_SESSION['SupplierID'])) . '">' . _('Set Up Sell Through Support Deals') . '</a>
+ <br /><a href="' . $RootPath . '/SellThroughSupport.php?SupplierID=' . $_SESSION['SupplierID'] . '">' . _('Set Up Sell Through Support Deals') . '</a>
<br /><a href="' . $RootPath . '/Shipments.php?NewShipment=Yes">' . _('Set Up A New Shipment') . '</a>
<br /><a href="' . $RootPath . '/SuppLoginSetup.php">' . _('Supplier Login Configuration') . '</a>
</td>
</tr>
</table>';
+} else {
// Supplier is not selected yet
echo '<br />';
echo '<table width="90%" cellpadding="4">
@@ -205,10 +207,10 @@
</tr>
</table>';
}
-echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post" class="noPrint">';
+echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-echo '<p class="page_title_text noPrint" ><img src="' . $RootPath . '/css/' . $Theme . '/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . _('Search for Suppliers') . '</p>
+echo '<p class="page_title_text"><img src="' . $RootPath . '/css/' . $Theme . '/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . _('Search for Suppliers') . '</p>
<table cellpadding="3" class="selection">
<tr>
<td>' . _('Enter a partial Name') . ':</td>
@@ -230,7 +232,7 @@
echo '</td></tr>
</table>
<br /><div class="centre"><input type="submit" name="Search" value="' . _('Search Now') . '" /></div>';
-//if (isset($result) and !isset($SingleSupplierReturned)) {
+//if (isset($result) AND !isset($SingleSupplierReturned)) {
if (isset($_POST['Search'])) {
$ListCount = DB_num_rows($result);
$ListPageMax = ceil($ListCount / $_SESSION['DisplayRecordsMax']);
@@ -285,7 +287,7 @@
if (DB_num_rows($result) <> 0) {
DB_data_seek($result, ($_POST['PageOffset'] - 1) * $_SESSION['DisplayRecordsMax']);
}
- while (($myrow = DB_fetch_array($result)) and ($RowIndex <> $_SESSION['DisplayRecordsMax'])) {
+ while (($myrow = DB_fetch_array($result)) AND ($RowIndex <> $_SESSION['DisplayRecordsMax'])) {
if ($k == 1) {
echo '<tr class="EvenTableRows">';
$k = 0;
Modified: trunk/Suppliers.php
===================================================================
--- trunk/Suppliers.php 2013-04-06 09:28:15 UTC (rev 5836)
+++ trunk/Suppliers.php 2013-04-07 00:11:55 UTC (rev 5837)
@@ -5,13 +5,14 @@
include('includes/session.inc');
$Title = _('Supplier Maintenance');
+/* webERP manual links before header.inc */
$ViewTopic= 'AccountsPayable';
$BookMark = 'NewSupplier';
include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
include('includes/CountriesArray.php');
-function Is_ValidAccount ($ActNo) {
+Function Is_ValidAccount ($ActNo) {
if (mb_strlen($ActNo) < 16) {
echo _('NZ account numbers must have 16 numeric characters in it');
@@ -42,7 +43,7 @@
}
break;
case '02':
- if (!(($BranchNumber >= 1 and $BranchNumber <= 999) or ($BranchNumber >= 1200 and $BranchNumber <= 1299))) {
+ If (!(($BranchNumber >= 1 and $BranchNumber <= 999) or ($BranchNumber >= 1200 and $BranchNumber <= 1299))) {
echo _('Bank Of New Zealand branches must be between 0001 and 0999 or between 1200 and 1299') . '. ' . _('The branch number used is invalid');
return False;
exit;
@@ -138,7 +139,7 @@
default:
echo _('The prefix') . ' - ' . $BankPrefix . ' ' . _('is not a valid New Zealand Bank') . '.<br />' .
- _('if you are using KwaMoja outside New Zealand error trapping relevant to your country should be used');
+ _('If you are using webERP outside New Zealand error trapping relevant to your country should be used');
return False;
exit;
@@ -215,7 +216,7 @@
if ($BankPrefix == '08'){
$CheckSum = $CheckSum + $DigitVal * 4;
} elseif ($BankPrefix == '09') {
- if (($DigitVal * 5) > 9) {
+ If (($DigitVal * 5) > 9) {
$CheckSum = $CheckSum + (int) mb_substr((string)($DigitVal * 5),0,1) + (int) mb_substr((string)($DigitVal * 5),mb_strlen((string)($DigitVal *5))-1, 1);
} else {
$CheckSum = $CheckSum + $DigitVal * 5;
@@ -259,7 +260,7 @@
case 13:
if ($BankPrefix == '09') {
- if (($DigitVal * 2) > 9) {
+ If (($DigitVal * 2) > 9) {
$CheckSum = $CheckSum + (int) mb_substr(($DigitVal * 2),0,1) + (int) mb_substr(($DigitVal * 2),mb_strlen($DigitVal * 2)-1, 1);
} else {
$CheckSum = $CheckSum + $DigitVal * 2;
@@ -290,7 +291,7 @@
}
}
-} //End function
+} //End Function
if (isset($_GET['SupplierID'])){
@@ -301,14 +302,14 @@
unset($SupplierID);
}
-echo '<p class="page_title_text noPrint" ><img src="'.$RootPath.'/css/'.$Theme.'/images/supplier.png" title="' . _('Search') . '" alt="" />' . ' ' . _('Suppliers') . '</p>';
+echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/supplier.png" title="' . _('Search') . '" alt="" />' . ' ' . _('Suppliers') . '</p>';
$InputError = 0;
if (isset($Errors)) {
unset($Errors);
}
-$Errors=array();
+$Errors=Array();
if (isset($_POST['submit'])) {
//initialise no input errors assumed initially before we test
@@ -327,8 +328,8 @@
$i++;
}
if (mb_strlen($_POST['SuppName']) > 40
- or mb_strlen($_POST['SuppName']) == 0
- or $_POST['SuppName'] == '') {
+ OR mb_strlen($_POST['SuppName']) == 0
+ OR $_POST['SuppName'] == '') {
$InputError = 1;
prnMsg(_('The supplier name must be entered and be forty characters or less long'),'error');
@@ -341,12 +342,12 @@
$Errors[$i]='ID';
$i++;
}
-// if (ContainsIllegalCharacters($SupplierID)) {
-// $InputError = 1;
-// prnMsg(_('The supplier code cannot contain any of the illegal characters') ,'error');
-// $Errors[$i]='ID';
-// $i++;
-// }
+ if (ContainsIllegalCharacters($SupplierID)) {
+ $InputError = 1;
+ prnMsg(_('The supplier code cannot contain any of the illegal characters') ,'error');
+ $Errors[$i]='ID';
+ $i++;
+ }
if (mb_strlen($_POST['Phone']) >25) {
$InputError = 1;
prnMsg(_('The telephone number must be 25 characters or less long'),'error');
@@ -365,7 +366,7 @@
$Errors[$i] = 'Email';
$i++;
}
- if (mb_strlen($_POST['Email'])>0 and !IsEmailAddress($_POST['Email'])) {
+ if (mb_strlen($_POST['Email'])>0 AND !IsEmailAddress($_POST['Email'])) {
$InputError = 1;
prnMsg(_('The email address is not correctly formed'),'error');
$Errors[$i] = 'Email';
@@ -410,7 +411,7 @@
define('KEY', $api_key);
// check that some sane values are setup already in geocode tables, if not skip the geocoding but add the record anyway.
if ($map_host=="") {
- echo '<div class="warn">' . _('Warning - Geocode Integration is enabled, but no hosts are setup. Go to Geocode Setup') . '</div>';
+ echo '<div class="warn">' . _('Warning - Geocode Integration is enabled, but no hosts are setup. Go to Geocode Setup') . '</div>';
} else {
$address = $_POST['Address1'] . ', ' . $_POST['Address2'] . ', ' . $_POST['Address3'] . ', ' . $_POST['Address4'] . ', ' . $_POST['Address5']. ', ' . $_POST['Address6'];
@@ -607,7 +608,7 @@
}
-} elseif (isset($_POST['delete']) and $_POST['delete'] != '') {
+} elseif (isset($_POST['delete']) AND $_POST['delete'] != '') {
//the link to delete a selected record was clicked instead of the submit button
@@ -656,10 +657,10 @@
if (!isset($SupplierID)) {
-/*if the page was called without $SupplierID passed to page then assume a new supplier is to be entered show a form with a Supplier Code field other wise the form showing the fields with the existing entries against the supplier will show for editing with only a hidden SupplierID field*/
+/*If the page was called without $SupplierID passed to page then assume a new supplier is to be entered show a form with a Supplier Code field other wise the form showing the fields with the existing entries against the supplier will show for editing with only a hidden SupplierID field*/
- echo '<form method="post" class="noPrint" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
- echo '<div>';
+ 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 '<input type="hidden" name="New" value="Yes" />';
@@ -691,9 +692,9 @@
<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 ($_POST['Address6'] == $CountryName)){
echo '<option selected="selected" value="' . $CountryName . '">' . $CountryName .'</option>';
- }elseif (!isset($_POST['Address6']) and $CountryName == "") {
+ }elseif (!isset($_POST['Address6']) AND $CountryName == "") {
echo '<option selected="selected" value="' . $CountryName . '">' . $CountryName .'</option>';
} else {
echo '<option value="' . $CountryName . '">' . $CountryName .'</option>';
@@ -741,7 +742,7 @@
echo '<option value="'. $myrow['termsindicator'] . '">' . $myrow['terms'] .'</option>';
} //end while loop
DB_data_seek($result, 0);
- echo '</select></td></tr>';
+ echo '</select></td></tr>';
$result=DB_query("SELECT id, coyname FROM factorcompanies", $db);
@@ -749,12 +750,13 @@
<td><select name="FactorID">';
echo '<option value="0">' . _('None') . '</option>';
while ($myrow = DB_fetch_array($result)) {
- if (isset($_POST['FactorID']) and $_POST['FactorID'] == $myrow['id']){
- echo '<option selected="selected" value="' . $myrow['id'] . '">' . $myrow['coyname'] .'</option>';
+ if (isset($_POST['FactorID']) AND $_POST['FactorID'] == $myrow['id']){
+ echo '<option selected="selected" value="' . $myrow['id'] . '">' . $myrow['coyname'] .'</option>';
} else {
- echo '<option value="' . $myrow['id'] . '">' . $myrow['coyname'] .'</option>';
+ echo '<option value="' . $myrow['id'] . '">' . $myrow['coyname'] .'</option>';
}
} //end while loop
+ DB_data_seek($result, 0);
echo '</select></td></tr>';
echo '<tr><td>' . _('Tax Reference') . ':</td>
<td><input type="text" name="TaxRef" size="21" maxlength="20" /></td></tr>';
@@ -804,16 +806,16 @@
echo '</select></td></tr>
</table>
<br />
- <div class="centre"><input type="submit" name="submit" value="' . _('Insert New Supplier') . '" /></div>';
+ <div class="centre"><input type="submit" name="submit" value="' . _('Insert New Supplier') . '" /></div>';
echo '</div>
- </form>';
+ </form>';
} else {
//SupplierID exists - either passed when calling the form or from the form itself
- echo '<form method="post" class="noPrint" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
- echo '<div>';
+ 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 '<table class="selection">';
@@ -894,9 +896,9 @@
<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 ($_POST['Address6'] == $CountryName)){
echo '<option selected="selected" value="' . $CountryName . '">' . $CountryName .'</option>';
- }elseif (!isset($_POST['Address6']) and $CountryName == "") {
+ }elseif (!isset($_POST['Address6']) AND $CountryName == "") {
echo '<option selected="selected" value="' . $CountryName . '">' . $CountryName .'</option>';
} else {
echo '<option value="' . $CountryName . '">' . $CountryName .'</option>';
@@ -945,7 +947,7 @@
}
} //end while loop
DB_data_seek($result, 0);
- echo '</select></td></tr>';
+ echo '</select></td></tr>';
$result=DB_query("SELECT id, coyname FROM factorcompanies", $db);
@@ -959,7 +961,8 @@
echo '<option value="' . $myrow['id'] . '">' . $myrow['coyname'] .'</option>';
}
} //end while loop
- echo '</select></td></tr>';
+ DB_data_seek($result, 0);
+ echo '</select></td></tr>';
echo '<tr><td>' . _('Tax Reference') . ':</td>
<td><input type="text" name="TaxRef" size="21" maxlength="20" value="' . $_POST['TaxRef'] .'" /></td></tr>';
@@ -1012,9 +1015,9 @@
if (isset($_POST['New'])) {
echo '<br />
- <div class="centre">
- <input type="submit" name="submit" value="' . _('Add These New Supplier Details') . '" />
- </div>';
+ <div class="centre">
+ <input type="submit" name="submit" value="' . _('Add These New Supplier Details') . '" />
+ </div>';
} else {
echo '<br />
<div class="centre">
@@ -1027,11 +1030,11 @@
<div class="centre">
<input type="submit" name="delete" value="' . _('Delete Supplier') . '" onclick="return confirm(\'' . _('Are you sure you wish to delete this supplier?') . '\');" />';
echo '<br />
- <a href="' . $RootPath . '/SupplierContacts.php?SupplierID=' . urlencode($SupplierID) . '">' . _('Review Contact Details') . '</a>
+ <a href="' . $RootPath . '/SupplierContacts.php?SupplierID=' . $SupplierID . '">' . _('Review Contact Details') . '</a>
</div>';
}
echo '</div>
- </form>';
+ </form>';
} // end of main ifs
include('includes/footer.inc');
Modified: trunk/build/make_release.sh
===================================================================
--- trunk/build/make_release.sh 2013-04-06 09:28:15 UTC (rev 5836)
+++ trunk/build/make_release.sh 2013-04-07 00:11:55 UTC (rev 5837)
@@ -133,4 +133,4 @@
cd ..
-zip -r $OUTPUT_DIR/webERP webERP -x \*.svn* \*/config.php \*.ecoder*
+zip -r $OUTPUT_DIR/webERP webERP -x \*.svn* \*/config.php
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2013-04-06 09:28:15 UTC (rev 5836)
+++ trunk/doc/Change.log 2013-04-07 00:11:55 UTC (rev 5837)
@@ -1,6 +1,5 @@
webERP Change Log
-6/4/13 Tim Schofield: Fix up issues preventing ampersands and apostrophes in supplier codes
6/4/13 Rafael: PDFPriceList.php split long description to maximum of 132 characters long
1/4/13 Kalmer Piiskop: Correct includes/LanguagesArray.php to use correct decimal point and thousands separator
27/3/13 Fahad Hatib: Updates to editing tenders and button to close a tender
@@ -8,7 +7,7 @@
21/3/13 Arwan: CustomerReceipt.php Added GL tag name for GL analysis of receipts
6/3/13 Tim Schofield: Only display those offers that have not gone past their expiry dates
-25/2/13 Re-released 4.10.1 without the duplicate records in reportlinks table and other errors caused by svn not being updated till after release
+25/2/13 Re-released 4.10.1 without the duplicate records in reportlinks table
24/2/13 Tim Schofield: SalesGraph.php Fix syntax error, missing ; at end of line
24/2/13 Tim Schofield: CustWhereAlloc.php Fix syntax error, bad indenting, and an extra } entered because of it
|
|
From: <dai...@us...> - 2013-04-14 05:07:48
|
Revision: 5841
http://sourceforge.net/p/web-erp/reponame/5841
Author: daintree
Date: 2013-04-14 05:07:45 +0000 (Sun, 14 Apr 2013)
Log Message:
-----------
Tims fix for utility payment run reversal script
Modified Paths:
--------------
trunk/Stocks.php
trunk/SupplierTenderCreate.php
trunk/Z_ChangeStockCode.php
trunk/Z_ReverseSuppPaymentRun.php
Modified: trunk/Stocks.php
===================================================================
--- trunk/Stocks.php 2013-04-09 09:36:06 UTC (rev 5840)
+++ trunk/Stocks.php 2013-04-14 05:07:45 UTC (rev 5841)
@@ -711,6 +711,15 @@
$CancelDelete = 1;
prnMsg( _('Cannot delete this item because there is currently some stock on hand'),'warn');
echo '<br />' . _('There are') . ' ' . $myrow[0] . ' ' . _('on hand for this part');
+ } else {
+ $sql = "SELECT COUNT(*) FROM offers WHERE stockid='".$StockID."' GROUP BY stockid";
+ $result = DB_query($sql,$db);
+ $myrow = DB_fetch_row($result);
+ if ($myrow[0]!=0) {
+ $CancelDelete = 1;
+ prnMsg( _('Cannot delete this item because there are offers for this item'),'warn');
+ echo '<br />' . _('There are') . ' ' . $myrow[0] . ' ' . _('offers from suppliers for this part');
+ }
}
}
}
Modified: trunk/SupplierTenderCreate.php
===================================================================
--- trunk/SupplierTenderCreate.php 2013-04-09 09:36:06 UTC (rev 5840)
+++ trunk/SupplierTenderCreate.php 2013-04-14 05:07:45 UTC (rev 5841)
@@ -127,7 +127,7 @@
telephone
FROM tenders
WHERE closed=0
- AND requiredbydate > CURRENT_DATE";
+ AND requiredbydate > '" . Date('Y-m-d') . "'";
$result=DB_query($sql, $db);
echo '<table class="selection">';
echo '<tr>
Modified: trunk/Z_ChangeStockCode.php
===================================================================
--- trunk/Z_ChangeStockCode.php 2013-04-09 09:36:06 UTC (rev 5840)
+++ trunk/Z_ChangeStockCode.php 2013-04-14 05:07:45 UTC (rev 5841)
@@ -248,15 +248,12 @@
echo ' ... ' . _('completed');
echo '<br />' . _('Changing any image files');
- if (file_exists($_SESSION['part_pics_dir'] . '/' .$_POST['OldStockID'].'.jpg')) {
- if (rename($_SESSION['part_pics_dir'] . '/' .$_POST['OldStockID'].'.jpg',
- $_SESSION['part_pics_dir'] . '/' .$_POST['NewStockID'].'.jpg')) {
- echo ' ... ' . _('completed');
- } else {
- echo ' ... ' . _('failed');
- }
+
+ if (rename($_SESSION['part_pics_dir'] . '/' .$_POST['OldStockID'].'.jpg',
+ $_SESSION['part_pics_dir'] . '/' .$_POST['NewStockID'].'.jpg')) {
+ echo ' ... ' . _('completed');
} else {
- echo ' ... ' . _('completed');
+ echo ' ... ' . _('failed');
}
echo '<br />' . _('Changing the item properties table records') . ' - ' . _('parents');
@@ -303,8 +300,12 @@
$result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
echo ' ... ' . _('completed');
-
-
+ echo '<br />' . _('Changing offers table');
+ $sql = "UPDATE offers SET stockid='" . $_POST['NewStockID'] . "' WHERE stockid='" . $_POST['OldStockID'] . "'";
+ $ErrMsg = _('The SQL to update the offer records failed');
+ $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
+ echo ' ... ' . _('completed');
+
DB_ReinstateForeignKeys($db);
$result = DB_Txn_Commit($db);
Modified: trunk/Z_ReverseSuppPaymentRun.php
===================================================================
--- trunk/Z_ReverseSuppPaymentRun.php 2013-04-09 09:36:06 UTC (rev 5840)
+++ trunk/Z_ReverseSuppPaymentRun.php 2013-04-14 05:07:45 UTC (rev 5841)
@@ -31,15 +31,6 @@
while ($Payment = DB_fetch_array($Result)){
prnMsg(_('Deleting payment number') . ' ' . $Payment['transno'] . ' ' . _('to supplier code') . ' ' . $Payment['supplierno'] . ' ' . _('for an amount of') . ' ' . $Payment['ovamount'],'info');
- $SQL = "DELETE FROM supptrans
- WHERE type=22
- AND transno='" . $Payment['transno'] . "'
- AND trandate='" . $SQLTranDate . "'";
-
- $DelResult = DB_query($SQL,$db);
- prnMsg(_('Deleted the SuppTran record'),'success');
-
-
$SQL = "SELECT supptrans.transno,
supptrans.type,
suppallocs.amt
@@ -52,9 +43,9 @@
$SQL= "UPDATE supptrans SET settled=0,
alloc=alloc-" . $Alloc['amt'] . ",
- diffonexch = diffonexch - ((" . $Alloc['Amt'] . "/rate ) - " . $Alloc['amt']/$Payment['rate'] . ")
- WHERE supptrans.type='" . $Alloc['type'] . "'
- AND transno='" . $Alloc['transno'] . "'";
+ diffonexch = diffonexch - ((" . $Alloc['amt'] . "/rate ) - " . $Alloc['amt']/$Payment['rate'] . ")
+ WHERE supptrans.type='" . $Alloc['type'] . "'
+ AND transno='" . $Alloc['transno'] . "'";
$ErrMsg =_('The update to the suppliers charges that were settled by the payment failed because');
$UpdResult = DB_query($SQL,$db,$ErrMsg);
@@ -66,6 +57,15 @@
$DelResult = DB_query($SQL,$db);
prnMsg(' ... ' . _('deleted the SuppAllocs records'),'info');
+ $SQL = "DELETE FROM supptrans
+ WHERE type=22
+ AND transno='" . $Payment['transno'] . "'
+ AND trandate='" . $SQLTranDate . "'";
+
+ $DelResult = DB_query($SQL,$db);
+ prnMsg(_('Deleted the SuppTran record'),'success');
+
+
$SQL= "DELETE FROM gltrans WHERE typeno='" . $Payment['transno'] . "' AND type=22";
$DelResult = DB_query($SQL,$db);
prnMsg(' .... ' . _('the GLTrans records (if any)'),'info');
@@ -78,8 +78,6 @@
prnMsg(' .... ' . _('and the BankTrans record'),'info');
}
-
-
}
|
|
From: <dai...@us...> - 2013-04-16 08:36:27
|
Revision: 5844
http://sourceforge.net/p/web-erp/reponame/5844
Author: daintree
Date: 2013-04-16 08:36:23 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
Ricard: audit purge outside DB Maintenance
Modified Paths:
--------------
trunk/Z_ChangeStockCode.php
trunk/doc/Change.log
trunk/includes/session.inc
Modified: trunk/Z_ChangeStockCode.php
===================================================================
--- trunk/Z_ChangeStockCode.php 2013-04-16 03:44:52 UTC (rev 5843)
+++ trunk/Z_ChangeStockCode.php 2013-04-16 08:36:23 UTC (rev 5844)
@@ -248,12 +248,15 @@
echo ' ... ' . _('completed');
echo '<br />' . _('Changing any image files');
-
- if (rename($_SESSION['part_pics_dir'] . '/' .$_POST['OldStockID'].'.jpg',
- $_SESSION['part_pics_dir'] . '/' .$_POST['NewStockID'].'.jpg')) {
- echo ' ... ' . _('completed');
+ if (file_exists($_SESSION['part_pics_dir'] . '/' .$_POST['OldStockID'].'.jpg')){
+ if (rename($_SESSION['part_pics_dir'] . '/' .$_POST['OldStockID'].'.jpg',
+ $_SESSION['part_pics_dir'] . '/' .$_POST['NewStockID'].'.jpg')) {
+ echo ' ... ' . _('completed');
+ } else {
+ echo ' ... ' . _('failed');
+ }
} else {
- echo ' ... ' . _('failed');
+ echo ' .... ' . _('no image to rename');
}
echo '<br />' . _('Changing the item properties table records') . ' - ' . _('parents');
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2013-04-16 03:44:52 UTC (rev 5843)
+++ trunk/doc/Change.log 2013-04-16 08:36:23 UTC (rev 5844)
@@ -1,4 +1,6 @@
webERP Change Log
+
+16/4/13 Ricard: Audit trail was not being purged if DB Maintenance was turned off and it should be pruned daily.
16/04/13 Thumb: Fixed the bug of Y-m-d date format error in MiscFunctions.js (this date type is missing) which will display wrong date in Work Order.
6/4/13 Rafael: PDFPriceList.php split long description to maximum of 132 characters long
1/4/13 Kalmer Piiskop: Correct includes/LanguagesArray.php to use correct decimal point and thousands separator
Modified: trunk/includes/session.inc
===================================================================
--- trunk/includes/session.inc 2013-04-16 03:44:52 UTC (rev 5843)
+++ trunk/includes/session.inc 2013-04-16 08:36:23 UTC (rev 5844)
@@ -146,18 +146,17 @@
/*Do the DB maintenance routing for the DB_type selected */
DB_Maintenance($db);
- //purge the audit trail if necessary
- if (isset($_SESSION['MonthsAuditTrail'])){
- $sql = "DELETE FROM audittrail
- WHERE transactiondate <= '" . Date('Y-m-d', mktime(0,0,0, Date('m')-$_SESSION['MonthsAuditTrail'])) . "'";
- $ErrMsg = _('There was a problem deleting expired audit-trail history');
- $result = DB_query($sql,$db);
- }
$_SESSION['DB_Maintenance_LastRun'] = Date('Y-m-d');
}
}
}
-
+//purge the audit trail if necessary
+if (isset($_SESSION['MonthsAuditTrail'])){
+ $sql = "DELETE FROM audittrail
+ WHERE transactiondate <= '" . Date('Y-m-d', mktime(0,0,0, Date('m')-$_SESSION['MonthsAuditTrail'])) . "'";
+ $ErrMsg = _('There was a problem deleting expired audit-trail history');
+ $result = DB_query($sql,$db);
+}
/*Check to see if currency rates need to be updated */
if (isset($_SESSION['UpdateCurrencyRatesDaily'])){
|
|
From: <dai...@us...> - 2013-04-18 06:18:35
|
Revision: 5846
http://sourceforge.net/p/web-erp/reponame/5846
Author: daintree
Date: 2013-04-18 06:18:30 +0000 (Thu, 18 Apr 2013)
Log Message:
-----------
Tim: Credit_Invoice.php missing $identifier in link
Modified Paths:
--------------
trunk/Credit_Invoice.php
trunk/doc/Change.log
Modified: trunk/Credit_Invoice.php
===================================================================
--- trunk/Credit_Invoice.php 2013-04-17 10:02:47 UTC (rev 5845)
+++ trunk/Credit_Invoice.php 2013-04-18 06:18:30 UTC (rev 5846)
@@ -405,7 +405,7 @@
echo '<td class="number">' . $DisplayTaxAmount . '</td>
<td class="number">' . $DisplayGrossLineTotal . '</td>
- <td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?Delete=' . $LnItm->LineNumber . '" onclick="return confirm(\'' . _('Are you sure you wish to delete this item from the credit?') . '\');">' . _('Delete') . '</a></td>
+ <td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier=' . $identifier . '&Delete=' . $LnItm->LineNumber . '" onclick="return confirm(\'' . _('Are you sure you wish to delete this item from the credit?') . '\');">' . _('Delete') . '</a></td>
</tr>';
echo '<tr ' . $RowStarter . '>
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2013-04-17 10:02:47 UTC (rev 5845)
+++ trunk/doc/Change.log 2013-04-18 06:18:30 UTC (rev 5846)
@@ -1,5 +1,6 @@
webERP Change Log
+18/4/13 Tim: Credit_Invoice.php missing $identifier in link causing details of credit note to be lost
16/4/13 Ricard: Audit trail was not being purged if DB Maintenance was turned off and it should be pruned daily.
16/04/13 Thumb: Fixed the bug of Y-m-d date format error in MiscFunctions.js (this date type is missing) which will display wrong date in Work Order.
6/4/13 Rafael: PDFPriceList.php split long description to maximum of 132 characters long
|
|
From: <dai...@us...> - 2013-04-19 11:33:12
|
Revision: 5847
http://sourceforge.net/p/web-erp/reponame/5847
Author: daintree
Date: 2013-04-19 11:33:08 +0000 (Fri, 19 Apr 2013)
Log Message:
-----------
BOMExtendedQty missing purchase orders as reported by Bob Thoma s
Modified Paths:
--------------
trunk/BOMExtendedQty.php
trunk/Stocks.php
trunk/Z_ChangeStockCode.php
trunk/doc/Change.log
Modified: trunk/BOMExtendedQty.php
===================================================================
--- trunk/BOMExtendedQty.php 2013-04-18 06:18:30 UTC (rev 5846)
+++ trunk/BOMExtendedQty.php 2013-04-19 11:33:08 UTC (rev 5847)
@@ -53,8 +53,8 @@
CONCAT(bom.parent,bom.component) AS sortpart
FROM bom
WHERE bom.parent ='" . $_POST['Part'] . "'
- AND bom.effectiveto >= NOW()
- AND bom.effectiveafter <= NOW()";
+ AND bom.effectiveto >= '" . date('Y-m-d') . "'
+ AND bom.effectiveafter <= '" . date('Y-m-d') . "'";
$result = DB_query($sql,$db);
$LevelCounter = 2;
@@ -80,8 +80,8 @@
(" . filter_number_format($_POST['Quantity']) . " * bom.quantity) as extendedqpa
FROM bom
WHERE bom.parent ='" . $_POST['Part'] . "'
- AND bom.effectiveto >= NOW()
- AND bom.effectiveafter <= NOW()";
+ AND bom.effectiveto >= '" . date('Y-m-d') . "'
+ AND bom.effectiveafter <= '" . date('Y-m-d') . "'";
$result = DB_query($sql,$db);
//echo "<br />sql is $sql<br />";
// This while routine finds the other levels as long as $ComponentCounter - the
@@ -112,8 +112,8 @@
(bom.quantity * passbom.extendedqpa)
FROM bom,passbom
WHERE bom.parent = passbom.part
- AND bom.effectiveto >= NOW()
- AND bom.effectiveafter <= NOW()";
+ AND bom.effectiveto >= '" . date('Y-m-d') . "'
+ AND bom.effectiveafter <= '" . date('Y-m-d') . "'";
$result = DB_query($sql,$db);
$result = DB_query("DROP TABLE IF EXISTS passbom2",$db);
@@ -134,8 +134,8 @@
FROM bom
INNER JOIN passbom2
ON bom.parent = passbom2.part
- WHERE bom.effectiveto >= NOW()
- AND bom.effectiveafter <= NOW()";
+ WHERE bom.effectiveto >= '" . date('Y-m-d') . "'
+ AND bom.effectiveafter <= '" . date('Y-m-d') . "'";
$result = DB_query($sql,$db);
$sql = "SELECT COUNT(bom.parent) AS components
@@ -177,9 +177,11 @@
GROUP BY locstock.stockid) AS qoh,
(SELECT
SUM(purchorderdetails.quantityord - purchorderdetails.quantityrecd) as netqty
- FROM purchorderdetails
+ FROM purchorderdetails INNER JOIN purchorders
+ ON purchorderdetails.orderno=purchorders.orderno
WHERE purchorderdetails.itemcode = tempbom.component
- AND completed = 0
+ AND purchorderdetails.completed = 0
+ AND (purchorders.status = 'Authorised' OR purchorders.status='Printed')
GROUP BY purchorderdetails.itemcode) AS poqty,
(SELECT
SUM(woitems.qtyreqd - woitems.qtyrecd) as netwoqty
Modified: trunk/Stocks.php
===================================================================
--- trunk/Stocks.php 2013-04-18 06:18:30 UTC (rev 5846)
+++ trunk/Stocks.php 2013-04-19 11:33:08 UTC (rev 5847)
@@ -719,8 +719,17 @@
$CancelDelete = 1;
prnMsg( _('Cannot delete this item because there are offers for this item'),'warn');
echo '<br />' . _('There are') . ' ' . $myrow[0] . ' ' . _('offers from suppliers for this part');
+ } else {
+ $sql = "SELECT COUNT(*) FROM tenderitems WHERE stockid='".$StockID."' GROUP BY stockid";
+ $result = DB_query($sql,$db);
+ $myrow = DB_fetch_row($result);
+ if ($myrow[0]!=0) {
+ $CancelDelete = 1;
+ prnMsg( _('Cannot delete this item because there are tenders for this item'),'warn');
+ echo '<br />' . _('There are') . ' ' . $myrow[0] . ' ' . _('tenders from suppliers for this part');
+ }
}
- }
+ }
}
}
}
Modified: trunk/Z_ChangeStockCode.php
===================================================================
--- trunk/Z_ChangeStockCode.php 2013-04-18 06:18:30 UTC (rev 5846)
+++ trunk/Z_ChangeStockCode.php 2013-04-19 11:33:08 UTC (rev 5847)
@@ -308,7 +308,14 @@
$ErrMsg = _('The SQL to update the offer records failed');
$result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
echo ' ... ' . _('completed');
-
+
+
+ echo '<br />' . _('Changing tender items table');
+ $sql = "UPDATE tenderitems SET stockid='" . $_POST['NewStockID'] . "' WHERE stockid='" . $_POST['OldStockID'] . "'";
+ $ErrMsg = _('The SQL to update the tender records failed');
+ $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
+ echo ' ... ' . _('completed');
+
DB_ReinstateForeignKeys($db);
$result = DB_Txn_Commit($db);
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2013-04-18 06:18:30 UTC (rev 5846)
+++ trunk/doc/Change.log 2013-04-19 11:33:08 UTC (rev 5847)
@@ -1,5 +1,6 @@
webERP Change Log
+19/4/13 Phil: Reported by Bob Thomas - BOMExtendedQty.php was missing purchase orders with status='Authorised' or Printed
18/4/13 Tim: Credit_Invoice.php missing $identifier in link causing details of credit note to be lost
16/4/13 Ricard: Audit trail was not being purged if DB Maintenance was turned off and it should be pruned daily.
16/04/13 Thumb: Fixed the bug of Y-m-d date format error in MiscFunctions.js (this date type is missing) which will display wrong date in Work Order.
|
|
From: <dai...@us...> - 2013-04-25 04:35:56
|
Revision: 5849
http://sourceforge.net/p/web-erp/reponame/5849
Author: daintree
Date: 2013-04-25 04:35:54 +0000 (Thu, 25 Apr 2013)
Log Message:
-----------
Rework GLPostings.inc
Modified Paths:
--------------
trunk/doc/Change.log
trunk/includes/GLPostings.inc
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2013-04-24 09:35:10 UTC (rev 5848)
+++ trunk/doc/Change.log 2013-04-25 04:35:54 UTC (rev 5849)
@@ -1,5 +1,6 @@
webERP Change Log
+25/4/13 Phil: Rework includes/GLPostings.inc to avoid incorrect b/fwd balances on posting back to a period which did not previously exist.
19/4/13 Phil: Reported by Bob Thomas - BOMExtendedQty.php was missing purchase orders with status='Authorised' or Printed
18/4/13 Tim: Credit_Invoice.php missing $identifier in link causing details of credit note to be lost
16/4/13 Ricard: Audit trail was not being purged if DB Maintenance was turned off and it should be pruned daily.
Modified: trunk/includes/GLPostings.inc
===================================================================
--- trunk/includes/GLPostings.inc 2013-04-24 09:35:10 UTC (rev 5848)
+++ trunk/includes/GLPostings.inc 2013-04-25 04:35:54 UTC (rev 5849)
@@ -19,11 +19,7 @@
Notes:
-ChartDetail records should already exist - they are created when a new period is created or when a new GL account is created for all periods in the periods table
-
-NEED to have a function that checks the TB of a period actually balances.
-NEED to have a function that reposts from a given period having first checked the b/fwd balances balance!
-
+ChartDetail records should already exist - they are created (from includes/DateFunctions.in GetPeriod) when a new period is created or when a new GL account is created for all periods in the periods table. However, we may need to create new ones if the user posts back to a period before periods are currently set up - which is not actually possible with the config parameter ProhibitGLPostingsBefore set (However, is a problem when it is not set)
*/
@@ -33,9 +29,10 @@
if (is_null($FirstPeriodRow[0])){
//There are no periods defined
+ $InsertFirstPeriodResult = DB_query("INSERT INTO periods VALUES (-1,'" . Date('Y-m-d',mktime(0,0,0,Date('m')-1,0,Date('Y'))) . "')",$db,_('Could not insert first period'));
$InsertFirstPeriodResult = DB_query("INSERT INTO periods VALUES (0,'" . Date('Y-m-d',mktime(0,0,0,Date('m')+1,0,Date('Y'))) . "')",$db,_('Could not insert first period'));
$InsertFirstPeriodResult = DB_query("INSERT INTO periods VALUES (1,'" . Date('Y-m-d',mktime(0,0,0,Date('m')+2,0,Date('Y'))) . "')",$db,_('Could not insert second period'));
- $CreateFrom=0;
+ $CreateFrom=-1;
}
$LastPeriodResult = DB_query("SELECT MAX(periodno) FROM periods",$db);
@@ -44,16 +41,12 @@
$CreateTo = $LastPeriodRow[0];
-
-
/*First off see if there are in fact any chartdetails */
-$ChartDetailsResult = DB_query("SELECT * FROM chartdetails",$db);
$sql = "SELECT chartmaster.accountcode, MIN(periods.periodno) AS startperiod
FROM (chartmaster CROSS JOIN periods)
LEFT JOIN chartdetails ON chartmaster.accountcode = chartdetails.accountcode
AND periods.periodno = chartdetails.period
-
WHERE (periods.periodno BETWEEN '" . $CreateFrom . "' AND '" . $CreateTo . "')
AND chartdetails.actual IS NULL
GROUP BY chartmaster.accountcode";
@@ -80,42 +73,38 @@
/*All the ChartDetail records should have been created now and be available to accept postings */
for ( $CurrPeriod = $CreateFrom; $CurrPeriod <= $CreateTo; $CurrPeriod++ ) {
+ //get all the unposted transactions for the first and successive periods ordered by account
+ $sql = "SELECT counterindex,
+ periodno,
+ account,
+ amount
+ FROM gltrans
+ WHERE posted=0
+ AND periodno='" . $CurrPeriod . "'
+ ORDER BY account";
- $sql = "SELECT counterindex,
- periodno,
- account,
- amount
- FROM gltrans
- WHERE posted=0
- AND periodno='" . $CurrPeriod . "'
- ORDER BY account";
-
$UnpostedTransResult = DB_query($sql, $db);
$TransStart = DB_Txn_Begin($db);
- $CurrentAccount=0;
+ $CurrentAccount='0';
$TotalAmount=0;
- while ($UnpostedTrans=DB_fetch_array($UnpostedTransResult)){
- if($CurrentAccount != $UnpostedTrans['account']) {
- if($CurrentAccount != 0) {
- $sql = "UPDATE chartdetails SET actual = actual + " . $TotalAmount . "
- WHERE accountcode = '" . $CurrentAccount . "'
- AND period= '" . $CurrPeriod . "'";
- $PostPrd = DB_query($sql,$db);
- /*Update the BFwd for all following ChartDetail records */
- $sql = "UPDATE chartdetails SET bfwd = bfwd + " . $TotalAmount . "
- WHERE accountcode = '" . $CurrentAccount . "'
- AND period > '" . $CurrPeriod . "'";
- $PostBFwds = DB_query($sql,$db);
- }
+ while ($UnpostedTrans=DB_fetch_array($UnpostedTransResult)) {
+ if($CurrentAccount != $UnpostedTrans['account'] AND $CurrentAccount!='0') {
+ $sql = "UPDATE chartdetails SET actual = actual + " . $TotalAmount . "
+ WHERE accountcode = '" . $CurrentAccount . "'
+ AND period= '" . $CurrPeriod . "'";
+ $PostPrd = DB_query($sql,$db);
+ /*Update the BFwd for all following ChartDetail records */
+ $sql = "UPDATE chartdetails SET bfwd = bfwd + " . $TotalAmount . "
+ WHERE accountcode = '" . $CurrentAccount . "'
+ AND period > '" . $CurrPeriod . "'";
+ $PostBFwds = DB_query($sql,$db);
$TotalAmount = 0;
- $CurrentAccount = $UnpostedTrans['account'];
}
+ $CurrentAccount = $UnpostedTrans['account'];
$TotalAmount += $UnpostedTrans['amount'];
- }
- $sql = "UPDATE gltrans SET posted = 1 WHERE periodno = '" . $CurrPeriod . "' AND posted=0";
- $Posted = DB_query($sql,$db);
- // There will be one chartdetail update outstanding if we processed anything
+ }
+ // There will be one account still to post after the loop
if($CurrentAccount != 0) {
$sql = "UPDATE chartdetails SET actual = actual + " . $TotalAmount . "
WHERE accountcode = '" . $CurrentAccount . "'
@@ -127,49 +116,11 @@
AND period > '" . $CurrPeriod . "'";
$PostBFwds = DB_query($sql,$db);
}
+
+ $sql = "UPDATE gltrans SET posted = 1 WHERE periodno = '" . $CurrPeriod . "' AND posted=0";
+ $Posted = DB_query($sql,$db);
+
$TransCommit = DB_Txn_Commit($db);
}
-
-if (DB_num_rows($ChartDetailsNotSetUpResult)>0){
-
- While ($AccountRow = DB_fetch_array($ChartDetailsNotSetUpResult)){
-
- /*Now run through each of the new chartdetail records created for each account and update them with the B/Fwd and B/Fwd budget no updates would be required where there were previously no chart details set up */
-
-
- $sql = "SELECT actual,
- bfwd,
- budget,
- bfwdbudget,
- period
- FROM chartdetails
- WHERE period >='" . intval($AccountRow['startperiod']-1) . "'
- AND accountcode='" . $AccountRow['accountcode'] . "'
- ORDER BY period";
- $ChartDetails = DB_query($sql,$db);
-
- DB_Txn_Begin($db);
- $myrow = DB_fetch_array($ChartDetails);
-
- $BFwd = $myrow['bfwd'];
- $BFwdBudget = $myrow['bfwdbudget'];
-
- while ($myrow = DB_fetch_array($ChartDetails)){
- if ($myrow['period'] < $CreateTo) {
- $BFwd +=$myrow['actual'];
- $BFwdBudget += $myrow['budget'];
- $sql = "UPDATE chartdetails SET bfwd ='" . $BFwd . "',
- bfwdbudget ='" . $BFwdBudget . "'
- WHERE accountcode = '" . $AccountRow['accountcode'] . "'
- AND period ='" . intval($myrow['period']+1) . "'";
-
- $UpdChartDetails = DB_query($sql,$db, '', '', '', false);
- }
- }
-
- DB_Txn_Commit($db);
- }
-}
-
?>
\ No newline at end of file
|
|
From: <dai...@us...> - 2013-04-25 10:43:52
|
Revision: 5850
http://sourceforge.net/p/web-erp/reponame/5850
Author: daintree
Date: 2013-04-25 10:43:48 +0000 (Thu, 25 Apr 2013)
Log Message:
-----------
Bug fixes BOMs allowed serialised/controlled items to be serialised - now fixed. Contracts.php selection of customer fixed. WorkOrderIssue now only shows controlled items with a quantity in stock
Modified Paths:
--------------
trunk/BOMs.php
trunk/Contracts.php
trunk/WorkOrderIssue.php
trunk/doc/Change.log
Modified: trunk/BOMs.php
===================================================================
--- trunk/BOMs.php 2013-04-25 04:35:54 UTC (rev 5849)
+++ trunk/BOMs.php 2013-04-25 10:43:48 UTC (rev 5850)
@@ -307,7 +307,7 @@
} elseif ($InputError !=1 AND ! isset($SelectedComponent) AND isset($SelectedParent)) {
- /*Selected component is null cos no item selected on first time round so must be adding a record must be Submitting new entries in the new component form */
+ /*Selected component is null cos no item selected on first time round so must be adding a record must be Submitting new entries in the new component form */
//need to check not recursive BOM component of itself!
@@ -524,16 +524,17 @@
$DbgMsg = _('The SQL used to retrieve description of the parent part was');
$result=DB_query($sql,$db,$ErrMsg,$DbgMsg);
if( DB_num_rows($result) > 0 ) {
- echo '<table class="selection">';
- echo '<tr><td><div class="centre">'._('Phantom').' : ';
+ echo '<table class="selection">
+ <tr>
+ <td><div class="centre">'._('Phantom').' : ';
$ix = 0;
while ($myrow = DB_fetch_array($result)){
- echo (($ix)?', ':'').'<a href="'.htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?Select='.$myrow['parent'].'">'.
- $myrow['description'].' ('.$myrow['parent'].')</a>';
+ echo (($ix)?', ':'').'<a href="'.htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?Select='.$myrow['parent'].'">'. $myrow['description'].' ('.$myrow['parent'].')</a>';
$ix++;
} //end while loop
- echo '</div></td></tr>';
- echo '</table>';
+ echo '</div></td>
+ </tr>
+ </table>';
}
echo '<br />
<table class="selection">';
@@ -592,7 +593,7 @@
echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- if (isset($_GET['SelectedComponent']) and $InputError !=1) {
+ if (isset($_GET['SelectedComponent']) AND $InputError !=1) {
//editing a selected component from the link to the line item
$sql = "SELECT loccode,
@@ -626,6 +627,7 @@
echo '<tr>
<td>' . _('Component') . ':</td>
<td><b>' . $SelectedComponent . '</b></td>
+ <input type="hidden" name="Component" value="' . $SelectedComponent . '" />
</tr>';
} else { //end of if $SelectedComponent
@@ -690,7 +692,7 @@
$result = DB_query($sql,$db);
while ($myrow = DB_fetch_array($result)) {
- if (isset($_POST['LocCode']) and $myrow['loccode']==$_POST['LocCode']) {
+ if (isset($_POST['LocCode']) AND $myrow['loccode']==$_POST['LocCode']) {
echo '<option selected="selected" value="';
} else {
echo '<option value="';
@@ -719,7 +721,7 @@
echo '<select tabindex="3" name="WorkCentreAdded">';
while ($myrow = DB_fetch_array($result)) {
- if (isset($_POST['WorkCentreAdded']) and $myrow['code']==$_POST['WorkCentreAdded']) {
+ if (isset($_POST['WorkCentreAdded']) AND $myrow['code']==$_POST['WorkCentreAdded']) {
echo '<option selected="selected" value="';
} else {
echo '<option value="';
Modified: trunk/Contracts.php
===================================================================
--- trunk/Contracts.php 2013-04-25 04:35:54 UTC (rev 5849)
+++ trunk/Contracts.php 2013-04-25 10:43:48 UTC (rev 5850)
@@ -15,6 +15,13 @@
$_POST['SelectedCustomer']=$_GET['CustomerID'];
}
+foreach ($_POST as $FormVariableName=>$FormVariableValue) {
+ if (mb_substr($FormVariableName, 0, 6)=='Submit') {
+ $Index = mb_substr($FormVariableName, 6);
+ $_POST['SelectedCustomer']=$_POST['SelectedCustomer'.$Index];
+ $_POST['SelectedBranch']=$_POST['SelectedBranch'.$Index];
+ }
+}
$ViewTopic= 'Contracts';
$BookMark = 'CreateContract';
@@ -689,13 +696,6 @@
* or set because only one customer record returned from a search
* so parse the $Select string into debtorno and branch code */
- foreach ($_POST as $key => $value) {
- if (mb_substr($key, 0, 6)=='Submit') {
- $Index=mb_substr($key, 6, 1);
- $_POST['SelectedCustomer']=$_POST['SelectedCustomer'.$Index];
- $_POST['SelectedBranch']=$_POST['SelectedBranch'.$Index];
- }
- }
$_SESSION['Contract'.$identifier]->DebtorNo = $_POST['SelectedCustomer'];
$_SESSION['Contract'.$identifier]->BranchCode = $_POST['SelectedBranch'];
Modified: trunk/WorkOrderIssue.php
===================================================================
--- trunk/WorkOrderIssue.php 2013-04-25 04:35:54 UTC (rev 5849)
+++ trunk/WorkOrderIssue.php 2013-04-25 10:43:48 UTC (rev 5850)
@@ -792,7 +792,8 @@
$SerialNoResult = DB_query("SELECT serialno
FROM stockserialitems
WHERE stockid='" . $_POST['IssueItem'] . "'
- AND loccode='" . $_POST['FromLocation'] . "'",
+ AND loccode='" . $_POST['FromLocation'] . "'
+ AND quantity > 0",
$db,_('Could not retrieve the serial numbers available at the location specified because'));
if (DB_num_rows($SerialNoResult)==0){
echo '<tr>
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2013-04-25 04:35:54 UTC (rev 5849)
+++ trunk/doc/Change.log 2013-04-25 10:43:48 UTC (rev 5850)
@@ -1,5 +1,8 @@
webERP Change Log
+25/4/13 Tim: Selecting customer in Contracts form was not working - fixed
+25/4/13 Bob Thomas: WorkOrderIssue.php was not showing the serialised items with a quantity that could be issued was showing them all in error
+25/4/13 Phil: BOMs.php fixed error that allowed auto issue to be flagged on serialised items
25/4/13 Phil: Rework includes/GLPostings.inc to avoid incorrect b/fwd balances on posting back to a period which did not previously exist.
19/4/13 Phil: Reported by Bob Thomas - BOMExtendedQty.php was missing purchase orders with status='Authorised' or Printed
18/4/13 Tim: Credit_Invoice.php missing $identifier in link causing details of credit note to be lost
|