Menu
▾
▴
web-erp-svn — SVN commits
This list is closed, nobody may subscribe to it.
| 2011 |
Jan
(14) |
Feb
(42) |
Mar
(56) |
Apr
(60) |
May
(54) |
Jun
(48) |
Jul
(74) |
Aug
(52) |
Sep
(68) |
Oct
(64) |
Nov
(42) |
Dec
(62) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2012 |
Jan
(142) |
Feb
(270) |
Mar
(374) |
Apr
(230) |
May
(214) |
Jun
(116) |
Jul
(234) |
Aug
(66) |
Sep
(120) |
Oct
(16) |
Nov
(17) |
Dec
(41) |
| 2013 |
Jan
(19) |
Feb
(18) |
Mar
(8) |
Apr
(40) |
May
(121) |
Jun
(42) |
Jul
(127) |
Aug
(145) |
Sep
(27) |
Oct
(38) |
Nov
(83) |
Dec
(61) |
| 2014 |
Jan
(33) |
Feb
(35) |
Mar
(59) |
Apr
(41) |
May
(38) |
Jun
(45) |
Jul
(17) |
Aug
(58) |
Sep
(46) |
Oct
(51) |
Nov
(55) |
Dec
(36) |
| 2015 |
Jan
(57) |
Feb
(67) |
Mar
(70) |
Apr
(34) |
May
(32) |
Jun
(11) |
Jul
(3) |
Aug
(17) |
Sep
(16) |
Oct
(13) |
Nov
(30) |
Dec
(30) |
| 2016 |
Jan
(17) |
Feb
(12) |
Mar
(17) |
Apr
(20) |
May
(47) |
Jun
(15) |
Jul
(13) |
Aug
(30) |
Sep
(32) |
Oct
(20) |
Nov
(32) |
Dec
(24) |
| 2017 |
Jan
(16) |
Feb
|
Mar
(11) |
Apr
(11) |
May
(5) |
Jun
(42) |
Jul
(9) |
Aug
(10) |
Sep
(14) |
Oct
(15) |
Nov
(2) |
Dec
(29) |
| 2018 |
Jan
(28) |
Feb
(49) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ex...@us...> - 2016-02-01 13:28:46
|
Revision: 7455
http://sourceforge.net/p/web-erp/reponame/7455
Author: exsonqu
Date: 2016-02-01 13:28:43 +0000 (Mon, 01 Feb 2016)
Log Message:
-----------
Modified Paths:
--------------
trunk/doc/Change.log
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-02-01 13:28:07 UTC (rev 7454)
+++ trunk/doc/Change.log 2016-02-01 13:28:43 UTC (rev 7455)
@@ -1,5 +1,6 @@
webERP Change Log
+1/2/15 Exson: Make GL Posting really transaction in GLPostings.inc.
30/01/16 Exson: Fix the bug to print invoice instead of credit note when a credit note requested in CustomerInquiry.php reported by daveparrish.
14/01/16 Exson: Add Supplier transaction allocation inquiry in SuppWhereAlloc.php and add a link to in SupplierInquiry.php.
14/01/16 Exson: Add credit note allocation option for CustWhereAlloc.php and add a link to it in CustomerInquiry.php and make the allocation printable by print.css.
|
|
From: <ex...@us...> - 2016-02-01 13:28:09
|
Revision: 7454
http://sourceforge.net/p/web-erp/reponame/7454
Author: exsonqu
Date: 2016-02-01 13:28:07 +0000 (Mon, 01 Feb 2016)
Log Message:
-----------
1/2/15 Exson: Make GL Posting really transaction in GLPostings.inc.
Modified Paths:
--------------
trunk/includes/GLPostings.inc
Modified: trunk/includes/GLPostings.inc
===================================================================
--- trunk/includes/GLPostings.inc 2016-02-01 13:18:28 UTC (rev 7453)
+++ trunk/includes/GLPostings.inc 2016-02-01 13:28:07 UTC (rev 7454)
@@ -93,12 +93,14 @@
$sql = "UPDATE chartdetails SET actual = actual + " . $TotalAmount . "
WHERE accountcode = '" . $CurrentAccount . "'
AND period= '" . $CurrPeriod . "'";
- $PostPrd = DB_query($sql);
+ $ErrMsg = _('Failed to update actual amount in chartdetails table');
+ $PostPrd = DB_query($sql,$ErrMsg,'',true);
/*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);
+ $ErrMsg = _('Failed to update bfwd amount in chartdetails table');
+ $PostBFwds = DB_query($sql,$ErrMsg,'',true);
$TotalAmount = 0;
}
$CurrentAccount = $UnpostedTrans['account'];
@@ -109,18 +111,21 @@
$sql = "UPDATE chartdetails SET actual = actual + " . $TotalAmount . "
WHERE accountcode = '" . $CurrentAccount . "'
AND period= '" . $CurrPeriod . "'";
- $PostPrd = DB_query($sql);
+ $ErrMsg = _('Failed to update actual amount in chartdetails table');
+ $PostPrd = DB_query($sql,$ErrMsg,'',true);
/*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);
+ $ErrMsg = _('Failed to update actual amount in chartdetails table');
+ $PostBFwds = DB_query($sql,$ErrMsg,'',true);
}
$sql = "UPDATE gltrans SET posted = 1 WHERE periodno = '" . $CurrPeriod . "' AND posted=0";
- $Posted = DB_query($sql);
+ $ErrMsg = _('Failed to update gltrans table');
+ $Posted = DB_query($sql,$ErrMsg,'',true);
$TransCommit = DB_Txn_Commit();
}
-?>
\ No newline at end of file
+?>
|
|
From: <rc...@us...> - 2016-02-01 13:18:31
|
Revision: 7453
http://sourceforge.net/p/web-erp/reponame/7453
Author: rchacon
Date: 2016-02-01 13:18:28 +0000 (Mon, 01 Feb 2016)
Log Message:
-----------
Update Spanish translation.
Modified Paths:
--------------
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2016-01-30 05:32:02 UTC (rev 7452)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2016-02-01 13:18:28 UTC (rev 7453)
@@ -8,7 +8,7 @@
"Project-Id-Version: webERP 4.12.2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-12-29 12:33-0600\n"
-"PO-Revision-Date: 2015-12-27 20:50-0600\n"
+"PO-Revision-Date: 2016-01-20 11:40-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -4028,11 +4028,11 @@
#: CollectiveWorkOrderCost.php:266
msgid "Start Date From"
-msgstr ""
+msgstr "Fecha inicial desde"
#: CollectiveWorkOrderCost.php:268
msgid "Start Date To"
-msgstr ""
+msgstr "Fecha inial al"
#: CollectiveWorkOrderCost.php:274 SelectWorkOrder.php:175
msgid "New Work Order"
@@ -9178,7 +9178,7 @@
#: CustomerAccount.php:220
msgid "Customer Statement For"
-msgstr ""
+msgstr "Estado de cuenta para"
#: CustomerAccount.php:231 CustomerInquiry.php:162 CustomerReceipt.php:1029
#: SelectOrderItems.php:698 SupplierCredit.php:264 SupplierInquiry.php:123
@@ -9241,11 +9241,11 @@
#: CustomerAccount.php:275
msgid "TRANSACTIONS SETTLED SINCE"
-msgstr ""
+msgstr "Operaciones liquidadas desde"
#: CustomerAccount.php:278
msgid "OUTSTANDING TRANSACTIONS"
-msgstr ""
+msgstr "Transacciones pendientes al"
#: CustomerAccount.php:306 CustomerInquiry.php:311 CustomerInquiry.php:357
#: CustomerInquiry.php:396 CustomerInquiry.php:432 CustomerInquiry.php:478
@@ -24371,7 +24371,7 @@
#: PrintCustStatements.php:46
msgid "Statements from"
-msgstr "Estados de las cuentas desde"
+msgstr "Estados de cuenta desde"
#: PrintCustStatements.php:72
msgid "There was a problem settling the old transactions."
@@ -41151,7 +41151,7 @@
#: Z_CheckDebtorsControl.php:38
msgid "Start Period:"
-msgstr "Hata Período:"
+msgstr "Período inicial:"
#: Z_CheckDebtorsControl.php:41
msgid "End Period:"
@@ -47063,15 +47063,15 @@
#: includes/PDFStatementPageHeader.inc:14
msgid "Statement"
-msgstr "Estado de Cuenta"
+msgstr "Estado de cuenta"
#: includes/PDFStatementPageHeader.inc:17
msgid "as of"
-msgstr "como"
+msgstr "al"
#: includes/PDFStatementPageHeader.inc:29
msgid "Statement dated"
-msgstr "Estado de Cuenta fechado"
+msgstr "Estado de cuenta fechado"
#: includes/PDFStatementPageHeader.inc:75
msgid "Please send with remittance to"
@@ -51519,7 +51519,7 @@
#: reportwriter/languages/en_US/reports.php:228
msgid "Start Position (Upper Left Corner in mm)"
-msgstr ""
+msgstr "Posición inicial (esquina superior izquierda en mm)"
#: reportwriter/languages/en_US/reports.php:229
msgid "Table Name"
@@ -52356,7 +52356,7 @@
#: ../webSHOP/CreditCardPayPalPro.php:287
msgid "State"
-msgstr ""
+msgstr "Estado"
#: ../webSHOP/CreditCardPayPalPro.php:288
msgid "The state of the card holder"
|
|
From: <ex...@us...> - 2016-01-30 05:32:04
|
Revision: 7452
http://sourceforge.net/p/web-erp/reponame/7452
Author: exsonqu
Date: 2016-01-30 05:32:02 +0000 (Sat, 30 Jan 2016)
Log Message:
-----------
Modified Paths:
--------------
trunk/doc/Change.log
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-01-30 05:31:22 UTC (rev 7451)
+++ trunk/doc/Change.log 2016-01-30 05:32:02 UTC (rev 7452)
@@ -1,5 +1,6 @@
webERP Change Log
+30/01/16 Exson: Fix the bug to print invoice instead of credit note when a credit note requested in CustomerInquiry.php reported by daveparrish.
14/01/16 Exson: Add Supplier transaction allocation inquiry in SuppWhereAlloc.php and add a link to in SupplierInquiry.php.
14/01/16 Exson: Add credit note allocation option for CustWhereAlloc.php and add a link to it in CustomerInquiry.php and make the allocation printable by print.css.
13/01/16 Exson: Add remark to BOM items and make the BOM printable via the new print.css created by Rafael.
|
|
From: <ex...@us...> - 2016-01-30 05:31:24
|
Revision: 7451
http://sourceforge.net/p/web-erp/reponame/7451
Author: exsonqu
Date: 2016-01-30 05:31:22 +0000 (Sat, 30 Jan 2016)
Log Message:
-----------
30/01/16 Exson: Fix the bug to print invoice instead of credit note when a credit note requested in CustomerInquiry.php reported by daveparrish.
Modified Paths:
--------------
trunk/CustomerInquiry.php
Modified: trunk/CustomerInquiry.php
===================================================================
--- trunk/CustomerInquiry.php 2016-01-14 10:09:36 UTC (rev 7450)
+++ trunk/CustomerInquiry.php 2016-01-30 05:31:22 UTC (rev 7451)
@@ -429,13 +429,13 @@
<td class="number">', locale_number_format($MyRow['allocated'], $CustomerRecord['decimalplaces']), '</td>
<td class="number">', locale_number_format($MyRow['totalamount'] - $MyRow['allocated'], $CustomerRecord['decimalplaces']), '</td>
<td class="noprint">
- <a href="', $RootPath, '/PrintCustTrans.php?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Invoice" title="', _('Click to preview the invoice'), '">
+ <a href="', $RootPath, '/PrintCustTrans.php?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Credit" title="', _('Click to preview the credit note'), '">
<img alt="" src="', $RootPath, '/css/', $Theme, '/images/preview.png" /> ',
_('HTML'), '
</a>
</td>
<td class="noprint">
- <a href="', $RootPath, '/', $PrintCustomerTransactionScript, '?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Invoice&PrintPDF=True" title="', _('Click for PDF'), '">
+ <a href="', $RootPath, '/', $PrintCustomerTransactionScript, '?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Credit&PrintPDF=True" title="', _('Click for PDF'), '">
<img alt="" src="', $RootPath, '/css/', $Theme, '/images/pdf.png" /> ',
_('PDF'), '
</a>
@@ -475,13 +475,13 @@
<td class="number">', locale_number_format($MyRow['allocated'], $CustomerRecord['decimalplaces']), '</td>
<td class="number">', locale_number_format($MyRow['totalamount'] - $MyRow['allocated'], $CustomerRecord['decimalplaces']), '</td>
<td class="noprint">
- <a href="', $RootPath, '/PrintCustTrans.php?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Invoice" title="', _('Click to preview the invoice'), '">
+ <a href="', $RootPath, '/PrintCustTrans.php?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Credit" title="', _('Click to preview the credit note'), '">
<img alt="" src="', $RootPath, '/css/', $Theme, '/images/preview.png" /> ',
_('HTML'), '
</a>
</td>
<td class="noprint">
- <a href="', $RootPath, '/', $PrintCustomerTransactionScript, '?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Invoice&PrintPDF=True" title="', _('Click for PDF'), '">
+ <a href="', $RootPath, '/', $PrintCustomerTransactionScript, '?FromTransNo=', $MyRow['transno'], '&InvOrCredit=Credit&PrintPDF=True" title="', _('Click for PDF'), '">
<img alt="" src="', $RootPath, '/css/', $Theme, '/images/pdf.png" /> ',
_('PDF'), '
</a>
|
|
From: <ex...@us...> - 2016-01-14 10:09:38
|
Revision: 7450
http://sourceforge.net/p/web-erp/reponame/7450
Author: exsonqu
Date: 2016-01-14 10:09:36 +0000 (Thu, 14 Jan 2016)
Log Message:
-----------
Modified Paths:
--------------
trunk/doc/Change.log
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-01-14 10:08:51 UTC (rev 7449)
+++ trunk/doc/Change.log 2016-01-14 10:09:36 UTC (rev 7450)
@@ -1,5 +1,6 @@
webERP Change Log
+14/01/16 Exson: Add Supplier transaction allocation inquiry in SuppWhereAlloc.php and add a link to in SupplierInquiry.php.
14/01/16 Exson: Add credit note allocation option for CustWhereAlloc.php and add a link to it in CustomerInquiry.php and make the allocation printable by print.css.
13/01/16 Exson: Add remark to BOM items and make the BOM printable via the new print.css created by Rafael.
13/1/16 Phil: Fixed bug in creating customer credit notes manually - blank taxes were being added that caused the SQL to commit the transaction to fail with foreign key constraint to tax authorities
|
|
From: <ex...@us...> - 2016-01-14 10:08:53
|
Revision: 7449
http://sourceforge.net/p/web-erp/reponame/7449
Author: exsonqu
Date: 2016-01-14 10:08:51 +0000 (Thu, 14 Jan 2016)
Log Message:
-----------
14/01/16 Exson: Add Supplier transaction allocation inquiry in SuppWhereAlloc.php and add a link to in SupplierInquiry.php.
Modified Paths:
--------------
trunk/SupplierInquiry.php
trunk/includes/MainMenuLinksArray.php
trunk/sql/mysql/upgrade4.12.3-4.13.sql
Added Paths:
-----------
trunk/SuppWhereAlloc.php
Added: trunk/SuppWhereAlloc.php
===================================================================
--- trunk/SuppWhereAlloc.php (rev 0)
+++ trunk/SuppWhereAlloc.php 2016-01-14 10:08:51 UTC (rev 7449)
@@ -0,0 +1,200 @@
+<?php
+
+include('includes/session.inc');
+$Title = _('Supplier How Paid Inquiry');
+
+$ViewTopic = 'APInquiries';
+$BookMark = 'WhereAllocated';
+
+include('includes/header.inc');
+if (isset($_GET['TransNo']) AND isset($_GET['TransType'])) {
+ $_POST['TransNo'] = (int)$_GET['TransNo'];
+ $_POST['TransType'] = (int)$_GET['TransType'];
+ $_POST['ShowResults'] = true;
+}
+
+echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
+ <div>
+ <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
+ <p class="page_title_text noprint">
+ <img src="'.$RootPath.'/css/'.$Theme.'/images/money_add.png" title="' . _('Supplier Where Allocated'). '" alt="" />' . $Title . '
+ </p>
+ <table class="selection noprint">
+ <tr>
+ <td>' . _('Type') . ':</td>
+ <td><select tabindex="1" name="TransType"> ';
+
+if (!isset($_POST['TransType'])){
+ $_POST['TransType']='20';
+}
+if ($_POST['TransType']==20){
+ echo '<option selected="selected" value="20">' . _('Purchase Invoice') . '</option>
+ <option value="22">' . _('Payment') . '</option>
+ <option value="21">' . _('Debit Note') . '</option>';
+} elseif ($_POST['TransType'] == 22) {
+ echo '<option selected="selected" value="22">' . _('Payment') . '</option>
+ <option value="20">' . _('Purchase Invoice') . '</option>
+ <option value="21">' . _('Debit Note') . '</option>';
+} elseif ($_POST['TransType'] == 21) {
+ echo '<option selected="selected" value="21">' . _('Debit Note') . '</option>
+ <option value="20">' . _('Purchase Invoice') . '</option>
+ <option value="22">' . _('Payment') . '</option>';
+}
+
+echo '</select></td>';
+
+if (!isset($_POST['TransNo'])) {$_POST['TransNo']='';}
+echo '<td>' . _('Transaction Number').':</td>
+ <td><input tabindex="2" type="text" class="number" name="TransNo" required="required" maxlength="20" size="20" value="'. $_POST['TransNo'] . '" /></td>
+ </tr>
+ </table>
+ <br />
+ <div class="centre noprint">
+ <input tabindex="3" type="submit" name="ShowResults" value="' . _('Show How Allocated') . '" />
+ </div>';
+
+if (isset($_POST['ShowResults']) AND $_POST['TransNo']==''){
+ echo '<br />';
+ prnMsg(_('The transaction number to be queried must be entered first'),'warn');
+}
+
+if (isset($_POST['ShowResults']) AND $_POST['TransNo']!=''){
+
+
+/*First off get the DebtorTransID of the transaction (invoice normally) selected */
+ $sql = "SELECT supptrans.id,
+ ovamount+ovgst AS totamt,
+ currencies.decimalplaces AS currdecimalplaces,
+ suppliers.currcode
+ FROM supptrans INNER JOIN suppliers
+ ON supptrans.supplierno=suppliers.supplierid
+ INNER JOIN currencies
+ ON suppliers.currcode=currencies.currabrev
+ WHERE type='" . $_POST['TransType'] . "'
+ AND transno = '" . $_POST['TransNo']."'";
+
+ if ($_SESSION['SalesmanLogin'] != '') {
+ $sql .= " AND supptrans.salesperson='" . $_SESSION['SalesmanLogin'] . "'";
+ }
+ $result = DB_query($sql);
+
+ if (DB_num_rows($result)==1){
+ $myrow = DB_fetch_array($result);
+ $AllocToID = $myrow['id'];
+ $CurrCode = $myrow['currcode'];
+ $CurrDecimalPlaces = $myrow['currdecimalplaces'];
+ $sql = "SELECT type,
+ transno,
+ trandate,
+ supptrans.supplierno,
+ suppreference,
+ supptrans.rate,
+ ovamount+ovgst as totalamt,
+ suppallocs.amt
+ FROM supptrans
+ INNER JOIN suppallocs ";
+ if ($_POST['TransType']==22 OR $_POST['TransType'] == 21){
+
+ $TitleInfo = ($_POST['TransType'] == 22)?_('Payment'):_('Debit Note');
+ $sql .= "ON supptrans.id = suppallocs.transid_allocto
+ WHERE suppallocs.transid_allocfrom = '" . $AllocToID . "'";
+ } else {
+ $TitleInfo = _('invoice');
+ $sql .= "ON supptrans.id = suppallocs.transid_allocfrom
+ WHERE suppallocs.transid_allocto = '" . $AllocToID . "'";
+ }
+ $sql .= " ORDER BY transno ";
+
+ $ErrMsg = _('The customer transactions for the selected criteria could not be retrieved because');
+ $TransResult = DB_query($sql, $ErrMsg);
+
+ if (DB_num_rows($TransResult)==0){
+
+ if ($myrow['totamt']>0 AND ($_POST['TransType']==22 OR $_POST['TransType'] == 21)){
+ prnMsg(_('This transaction was a receipt of funds and there can be no allocations of receipts or credits to a receipt. This inquiry is meant to be used to see how a payment which is entered as a negative receipt is settled against credit notes or receipts'),'info');
+ } else {
+ prnMsg(_('There are no allocations made against this transaction'),'info');
+ }
+ } else {
+ $Printer = true;
+ echo '<br />
+ <div id="Report">
+ <table class="selection">';
+
+ echo '<tr>
+ <th colspan="6">
+ <div class="centre">
+ <b>' . _('Allocations made against') . ' ' . $TitleInfo . ' ' . _('number') . ' ' . $_POST['TransNo'] . '<br />' . _('Transaction Total').': '. locale_number_format($myrow['totamt'],$CurrDecimalPlaces) . ' ' . $CurrCode . '</b>
+ </div>
+ </th>
+ </tr>';
+
+ $TableHeader = '<tr>
+ <th>' . _('Type') . '</th>
+ <th>' . _('Number') . '</th>
+ <th>' . _('Reference') . '</th>
+ <th>' . _('Ex Rate') . '</th>
+ <th>' . _('Amount') . '</th>
+ <th>' . _('Alloc') . '</th>
+ </tr>';
+ echo $TableHeader;
+
+ $RowCounter = 1;
+ $k = 0; //row colour counter
+ $AllocsTotal = 0;
+
+ while ($myrow=DB_fetch_array($TransResult)) {
+ if ($k==1){
+ echo '<tr class="EvenTableRows">';
+ $k=0;
+ } else {
+ echo '<tr class="OddTableRows">';
+ $k++;
+ }
+
+ if ($myrow['type']==21){
+ $TransType = _('Debit Note');
+ } elseif ($myrow['type'] == 20){
+ $TransType = _('Purchase Invoice');
+ } else {
+ $TransType = _('Payment');
+ }
+ echo '<td>' . $TransType . '</td>
+ <td>' . $myrow['transno'] . '</td>
+ <td>' . $myrow['suppreference'] . '</td>
+ <td>' . $myrow['rate'] . '</td>
+ <td class="number">' . locale_number_format($myrow['totalamt'],$CurrDecimalPlaces) . '</td>
+ <td class="number">' . locale_number_format($myrow['amt'],$CurrDecimalPlaces) . '</td>
+ </tr>';
+
+ $RowCounter++;
+ If ($RowCounter == 22){
+ $RowCounter=1;
+ echo $TableHeader;
+ }
+ //end of page full new headings if
+ $AllocsTotal +=$myrow['amt'];
+ }
+ //end of while loop
+ echo '<tr>
+ <td colspan="5" class="number">' . _('Total allocated') . '</td>
+ <td class="number">' . locale_number_format($AllocsTotal,$CurrDecimalPlaces) . '</td>
+ </tr>
+ </table>
+ </div>';
+ } // end if there are allocations against the transaction
+ } //got the ID of the transaction to find allocations for
+}
+echo '</div>';
+echo '</form>';
+if (isset($Printer)) {
+ echo '<div class="centre noprint">
+ <button onclick="javascript:window.print()" type="button"><img alt="" src="' . $RootPath . '/css/' . $Theme .
+ '/images/printer.png" /> ' .
+ _('Print This') . '
+ </button>
+ </div>';// "Print This" button.
+}
+include('includes/footer.inc');
+
+?>
Modified: trunk/SupplierInquiry.php
===================================================================
--- trunk/SupplierInquiry.php 2016-01-14 08:19:54 UTC (rev 7448)
+++ trunk/SupplierInquiry.php 2016-01-14 10:08:51 UTC (rev 7449)
@@ -255,7 +255,7 @@
$BaseTD8 = '<td>' . ConvertSQLDate($myrow['trandate']) . '</td>
<td>' . _($myrow['typename']) . '</td>
- <td class="number">' . $myrow['transno'] . '</td>
+ <td class="number"><a href="' . $RootPath . '/SuppWhereAlloc.php?TransType=' . $myrow['type'] . '&TransNo=' . $myrow['transno'] . '">' . $myrow['transno'] . '</a></td>
<td>' . $myrow['suppreference'] . '</td>
<td>' . $myrow['transtext'] . '</td>
<td class="number">' . locale_number_format($myrow['totalamount'],$SupplierRecord['currdecimalplaces']) . '</td>
@@ -315,7 +315,7 @@
echo $BaseTD8 . '
<td class="noprint"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES,'UTF-8') . '/PaymentAllocations.php?SuppID=' .
$myrow['type'] . '&InvID=' . $myrow['transno'] . '">' . _('View Payments') . '</a></td>
- <td class="noprint"><a href="' . $HoldValue . '?HoldType=' . $_POST['TransAfterDate'] . '&HoldTrans=' . $HoldValue . '&HoldStatus=' .
+ <td class="noprint"><a href="' .htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES,'UTF-8') . '?HoldType=' . $_POST['TransAfterDate'] . '&HoldTrans=' . $HoldValue . '&HoldStatus=' .
$RootPath . '&FromDate='. $myrow['supplierno'] . '">' . $myrow['suppreference'] . '</a></td></tr>';
}
}
@@ -341,4 +341,4 @@
echo '</tbody></table>';
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/includes/MainMenuLinksArray.php
===================================================================
--- trunk/includes/MainMenuLinksArray.php 2016-01-14 08:19:54 UTC (rev 7448)
+++ trunk/includes/MainMenuLinksArray.php 2016-01-14 10:08:51 UTC (rev 7449)
@@ -144,7 +144,8 @@
$MenuItems['AP']['Transactions']['URL'] = array('/SelectSupplier.php',
'/SupplierAllocations.php');
-$MenuItems['AP']['Reports']['Caption'] = array( _('Aged Supplier Report'),
+$MenuItems['AP']['Reports']['Caption'] = array( _('Where Allocated Inquiry.php'),
+ _('Aged Supplier Report'),
_('Payment Run Report'),
_('Remittance Advices'),
_('Outstanding GRNs Report'),
@@ -152,7 +153,8 @@
_('List Daily Transactions'),
_('Supplier Transaction Inquiries'));
-$MenuItems['AP']['Reports']['URL'] = array( '/AgedSuppliers.php',
+$MenuItems['AP']['Reports']['URL'] = array( '/SuppWhereAlloc.php',
+ '/AgedSuppliers.php',
'/SuppPaymentRun.php',
'/PDFRemittanceAdvice.php',
'/OutstandingGRNs.php',
Modified: trunk/sql/mysql/upgrade4.12.3-4.13.sql
===================================================================
--- trunk/sql/mysql/upgrade4.12.3-4.13.sql 2016-01-14 08:19:54 UTC (rev 7448)
+++ trunk/sql/mysql/upgrade4.12.3-4.13.sql 2016-01-14 10:08:51 UTC (rev 7449)
@@ -50,6 +50,7 @@
ALTER table stockrequest DROP FOREIGN KEY `stockrequest_ibfk_4`;
INSERT INTO scripts VALUES('CollectiveWorkOrderCost.php',2,'Multiple work orders cost review');
ALTER table BOM ADD remark varchar(500) NOT NULL DEFAULT '';
+INSERT INTO scripts VALUES ('SuppWhereAlloc.php',3,'Suppliers Where allocated');
-- Update version number:
|
|
From: <ex...@us...> - 2016-01-14 08:19:57
|
Revision: 7448
http://sourceforge.net/p/web-erp/reponame/7448
Author: exsonqu
Date: 2016-01-14 08:19:54 +0000 (Thu, 14 Jan 2016)
Log Message:
-----------
Modified Paths:
--------------
trunk/doc/Change.log
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-01-14 08:19:19 UTC (rev 7447)
+++ trunk/doc/Change.log 2016-01-14 08:19:54 UTC (rev 7448)
@@ -1,5 +1,6 @@
webERP Change Log
+14/01/16 Exson: Add credit note allocation option for CustWhereAlloc.php and add a link to it in CustomerInquiry.php and make the allocation printable by print.css.
13/01/16 Exson: Add remark to BOM items and make the BOM printable via the new print.css created by Rafael.
13/1/16 Phil: Fixed bug in creating customer credit notes manually - blank taxes were being added that caused the SQL to commit the transaction to fail with foreign key constraint to tax authorities
13/01/16 Exson: Fixed the variables non-refresh bugs in GLAccountInquiry.php. Reported by Richard.
|
|
From: <ex...@us...> - 2016-01-14 08:19:22
|
Revision: 7447
http://sourceforge.net/p/web-erp/reponame/7447
Author: exsonqu
Date: 2016-01-14 08:19:19 +0000 (Thu, 14 Jan 2016)
Log Message:
-----------
14/01/16 Exson: Add credit note allocation option for CustWhereAlloc.php and add a link to it in CustomerInquiry.php and make the allocation printable by print.css.
Modified Paths:
--------------
trunk/CustWhereAlloc.php
trunk/CustomerInquiry.php
Modified: trunk/CustWhereAlloc.php
===================================================================
--- trunk/CustWhereAlloc.php 2016-01-13 08:20:05 UTC (rev 7446)
+++ trunk/CustWhereAlloc.php 2016-01-14 08:19:19 UTC (rev 7447)
@@ -9,14 +9,19 @@
$BookMark = 'WhereAllocated';
include('includes/header.inc');
+if (isset($_GET['TransNo']) AND isset($_GET['TransType'])) {
+ $_POST['TransNo'] = (int)$_GET['TransNo'];
+ $_POST['TransType'] = (int)$_GET['TransType'];
+ $_POST['ShowResults'] = true;
+}
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
<div>
<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
- <p class="page_title_text">
+ <p class="page_title_text noprint">
<img src="'.$RootPath.'/css/'.$Theme.'/images/money_add.png" title="' . _('Customer Where Allocated'). '" alt="" />' . $Title . '
</p>
- <table class="selection">
+ <table class="selection noprint">
<tr>
<td>' . _('Type') . ':</td>
<td><select tabindex="1" name="TransType"> ';
@@ -25,11 +30,17 @@
$_POST['TransType']='10';
}
if ($_POST['TransType']==10){
- echo '<option selected="selected" value="10">' . _('Invoices') . '</option>
- <option value="12">' . _('Negative Receipts (Payments)') . '</option>';
-} else {
- echo '<option selected="selected" value="12">' . _('Negative Receipts (Payments)') . '</option>
- <option selected="selected" value="10">' . _('Invoices') . '</option>';
+ echo '<option selected="selected" value="10">' . _('Invoice') . '</option>
+ <option value="12">' . _('Receipt') . '</option>
+ <option value="11">' . _('Credit Note') . '</option>';
+} elseif ($_POST['TransType'] == 12) {
+ echo '<option selected="selected" value="12">' . _('Receipt') . '</option>
+ <option value="10">' . _('Invoice') . '</option>
+ <option value="11">' . _('Credit Note') . '</option>';
+} elseif ($_POST['TransType'] == 11) {
+ echo '<option selected="selected" value="11">' . _('Credit Note') . '</option>
+ <option value="10">' . _('Invoice') . '</option>
+ <option value="12">' . _('Receipt') . '</option>';
}
echo '</select></td>';
@@ -40,7 +51,7 @@
</tr>
</table>
<br />
- <div class="centre">
+ <div class="centre noprint">
<input tabindex="3" type="submit" name="ShowResults" value="' . _('Show How Allocated') . '" />
</div>';
@@ -63,7 +74,10 @@
ON debtorsmaster.currcode=currencies.currabrev
WHERE type='" . $_POST['TransType'] . "'
AND transno = '" . $_POST['TransNo']."'";
-
+
+ if ($_SESSION['SalesmanLogin'] != '') {
+ $sql .= " AND debtortrans.salesperson='" . $_SESSION['SalesmanLogin'] . "'";
+ }
$result = DB_query($sql );
if (DB_num_rows($result)==1){
@@ -71,7 +85,6 @@
$AllocToID = $myrow['id'];
$CurrCode = $myrow['currcode'];
$CurrDecimalPlaces = $myrow['currdecimalplaces'];
-
$sql = "SELECT type,
transno,
trandate,
@@ -81,28 +94,39 @@
ovamount+ovgst+ovfreight+ovdiscount as totalamt,
custallocns.amt
FROM debtortrans
- INNER JOIN custallocns
- ON debtortrans.id=custallocns.transid_allocfrom
- WHERE custallocns.transid_allocto='". $AllocToID."'";
+ INNER JOIN custallocns ";
+ if ($_POST['TransType']==12 OR $_POST['TransType'] == 11){
+ $TitleInfo = ($_POST['TransType'] == 12)?_('Receipt'):_('Credit Note');
+ $sql .= "ON debtortrans.id = custallocns.transid_allocto
+ WHERE custallocns.transid_allocfrom = '" . $AllocToID . "'";
+ } else {
+ $TitleInfo = _('invoice');
+ $sql .= "ON debtortrans.id = custallocns.transid_allocfrom
+ WHERE custallocns.transid_allocto = '" . $AllocToID . "'";
+ }
+ $sql .= " ORDER BY transno ";
+
$ErrMsg = _('The customer transactions for the selected criteria could not be retrieved because');
$TransResult = DB_query($sql, $ErrMsg);
if (DB_num_rows($TransResult)==0){
-
- if ($myrow['totamt']<0 AND $_POST['TransType']==12){
+
+ if ($myrow['totamt']<0 AND ($_POST['TransType']==12 OR $_POST['TransType'] == 11)){
prnMsg(_('This transaction was a receipt of funds and there can be no allocations of receipts or credits to a receipt. This inquiry is meant to be used to see how a payment which is entered as a negative receipt is settled against credit notes or receipts'),'info');
} else {
prnMsg(_('There are no allocations made against this transaction'),'info');
}
} else {
+ $Printer = true;
echo '<br />
+ <div id="Report">
<table class="selection">';
echo '<tr>
<th colspan="6">
<div class="centre">
- <b>' . _('Allocations made against invoice number') . ' ' . $_POST['TransNo'] . '<br />' . _('Transaction Total').': '. locale_number_format($myrow['totamt'],$CurrDecimalPlaces) . ' ' . $CurrCode . '</b>
+ <b>' . _('Allocations made against') . ' ' . $TitleInfo . ' ' . _('number') . ' ' . $_POST['TransNo'] . '<br />' . _('Transaction Total').': '. locale_number_format($myrow['totamt'],$CurrDecimalPlaces) . ' ' . $CurrCode . '</b>
</div>
</th>
</tr>';
@@ -132,6 +156,8 @@
if ($myrow['type']==11){
$TransType = _('Credit Note');
+ } elseif ($myrow['type'] == 10){
+ $TransType = _('Invoice');
} else {
$TransType = _('Receipt');
}
@@ -156,12 +182,21 @@
<td colspan="5" class="number">' . _('Total allocated') . '</td>
<td class="number">' . locale_number_format($AllocsTotal,$CurrDecimalPlaces) . '</td>
</tr>
- </table>';
+ </table>
+ </div>';
} // end if there are allocations against the transaction
} //got the ID of the transaction to find allocations for
}
echo '</div>';
echo '</form>';
+if (isset($Printer)) {
+ echo '<div class="centre noprint">
+ <button onclick="javascript:window.print()" type="button"><img alt="" src="' . $RootPath . '/css/' . $Theme .
+ '/images/printer.png" /> ' .
+ _('Print This') . '
+ </button>
+ </div>';// "Print This" button.
+}
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/CustomerInquiry.php
===================================================================
--- trunk/CustomerInquiry.php 2016-01-13 08:20:05 UTC (rev 7446)
+++ trunk/CustomerInquiry.php 2016-01-14 08:19:19 UTC (rev 7447)
@@ -292,7 +292,7 @@
* - User can view GL transactions
*/
echo '<td>', _($MyRow['typename']), '</td>
- <td>', $MyRow['transno'], '</td>
+ <td><a href="' . $RootPath . '/CustWhereAlloc.php?TransType=' . $MyRow['type'] . '&TransNo=' . $MyRow['transno'] . '" target="_blank">' . $MyRow['transno'] . '</a></td>
<td>', ConvertSQLDate($MyRow['trandate']), '</td>
<td>', $MyRow['branchcode'], '</td>
<td>', $MyRow['reference'], '</td>
@@ -338,7 +338,7 @@
* - User cannot view GL transactions
*/
echo '<td>', _($MyRow['typename']), '</td>
- <td>', $MyRow['transno'], '</td>
+ <td><a href="' . $RootPath . '/CustWhereAlloc.php?TransType=' . $MyRow['type'] . '&TransNo=' . $MyRow['transno'] . '">' . $MyRow['transno'] . '</a></td>
<td>', ConvertSQLDate($MyRow['trandate']), '</td>
<td>', $MyRow['branchcode'], '</td>
<td>', $MyRow['reference'], '</td>
@@ -419,7 +419,7 @@
*/
if ($_SESSION['CompanyRecord']['gllink_debtors'] == 1 and in_array($_SESSION['PageSecurityArray']['GLTransInquiry.php'], $_SESSION['AllowedPageSecurityTokens'])) {
echo '<td>', _($MyRow['typename']), '</td>
- <td>', $MyRow['transno'], '</td>
+ <td><a href="' . $RootPath . '/CustWhereAlloc.php?TransType=' . $MyRow['type'] . '&TransNo=' . $MyRow['transno'] . '">' . $MyRow['transno'] . '</a></td>
<td>', ConvertSQLDate($MyRow['trandate']), '</td>
<td>', $MyRow['branchcode'], '</td>
<td>', $MyRow['reference'], '</td>
@@ -465,7 +465,7 @@
* - User cannot view GL transactions
*/
echo '<td>', _($MyRow['typename']), '</td>
- <td>', $MyRow['transno'], '</td>
+ <td><a href="' . $RootPath . '/CustWhereAlloc.php?TransType=' . $MyRow['type'] . '&TransNo=' . $MyRow['transno'] . '">' . $MyRow['transno'] . '</a></td>
<td>', ConvertSQLDate($MyRow['trandate']), '</td>
<td>', $MyRow['branchcode'], '</td>
<td>', $MyRow['reference'], '</td>
@@ -508,7 +508,7 @@
*/
if ($_SESSION['CompanyRecord']['gllink_debtors'] == 1 and in_array($_SESSION['PageSecurityArray']['GLTransInquiry.php'], $_SESSION['AllowedPageSecurityTokens'])) {
echo '<td>', _($MyRow['typename']), '</td>
- <td>', $MyRow['transno'], '</td>
+ <td><a href="' . $RootPath . '/CustWhereAlloc.php?TransType=' . $MyRow['type'] . '&TransNo=' . $MyRow['transno'] . '">' . $MyRow['transno'] . '</a></td>
<td>', ConvertSQLDate($MyRow['trandate']), '</td>
<td>', $MyRow['branchcode'], '</td>
<td>', $MyRow['reference'], '</td>
@@ -669,4 +669,4 @@
echo '</tbody></table>';
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
|
|
From: <ex...@us...> - 2016-01-13 08:20:07
|
Revision: 7446
http://sourceforge.net/p/web-erp/reponame/7446
Author: exsonqu
Date: 2016-01-13 08:20:05 +0000 (Wed, 13 Jan 2016)
Log Message:
-----------
Modified Paths:
--------------
trunk/doc/Change.log
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-01-13 08:17:47 UTC (rev 7445)
+++ trunk/doc/Change.log 2016-01-13 08:20:05 UTC (rev 7446)
@@ -1,5 +1,6 @@
webERP Change Log
+13/01/16 Exson: Add remark to BOM items and make the BOM printable via the new print.css created by Rafael.
13/1/16 Phil: Fixed bug in creating customer credit notes manually - blank taxes were being added that caused the SQL to commit the transaction to fail with foreign key constraint to tax authorities
13/01/16 Exson: Fixed the variables non-refresh bugs in GLAccountInquiry.php. Reported by Richard.
11/01/16 Exson: Fixed the bug of bank account original amount data error. Reported by Tim, Richard and make this data only available for bank account.
|
|
From: <ex...@us...> - 2016-01-13 08:17:50
|
Revision: 7445
http://sourceforge.net/p/web-erp/reponame/7445
Author: exsonqu
Date: 2016-01-13 08:17:47 +0000 (Wed, 13 Jan 2016)
Log Message:
-----------
13/01/16 Exson: Add remark to BOM items and make the BOM printable via the new print.css created by Rafael.
Modified Paths:
--------------
trunk/BOMs.php
trunk/sql/mysql/upgrade4.12.3-4.13.sql
Modified: trunk/BOMs.php
===================================================================
--- trunk/BOMs.php 2016-01-13 07:32:36 UTC (rev 7444)
+++ trunk/BOMs.php 2016-01-13 08:17:47 UTC (rev 7445)
@@ -84,6 +84,7 @@
bom.effectiveto,
stockmaster.mbflag,
bom.autoissue,
+ bom.remark,
stockmaster.controlled,
locstock.quantity AS qoh,
stockmaster.decimalplaces
@@ -141,22 +142,24 @@
} else {
$QuantityOnHand = locale_number_format($myrow['qoh'],$myrow['decimalplaces']);
}
+ $TextIndent= $Level . 'em';
- printf('<td>%s</td>
+ printf('<td class="number" style="text-align:left;text-indent:' . $textindent . ';" >%s</td>
+ <td class="number">%s</td>
<td>%s</td>
<td>%s</td>
<td>%s</td>
<td>%s</td>
- <td>%s</td>
<td class="number">%s</td>
<td>%s</td>
<td>%s</td>
<td>%s</td>
<td>%s</td>
- <td class="number">%s</td>
- <td><a href="%s&Select=%s&SelectedComponent=%s">' . _('Edit') . '</a></td>
- <td>' . $DrillText . '</td>
- <td><a href="%s&Select=%s&SelectedComponent=%s&delete=1&ReSelect=%s&Location=%s&WorkCentre=%s" onclick="return confirm(\'' . _('Are you sure you wish to delete this component from the bill of material?') . '\');">' . _('Delete') . '</a></td>
+ <td class="number noprint">%s</td>
+ <td class="noprint"><a href="%s&Select=%s&SelectedComponent=%s">' . _('Edit') . '</a></td>
+ <td class="noprint">' . $DrillText . '</td>
+ <td class="noprint"><a href="%s&Select=%s&SelectedComponent=%s&delete=1&ReSelect=%s&Location=%s&WorkCentre=%s" onclick="return confirm(\'' . _('Are you sure you wish to delete this component from the bill of material?') . '\');">' . _('Delete') . '</a></td>
+ </tr><tr><td colspan="11" style="text-indent:' . $TextIndent . ';">%s</td>
</tr>',
$Level1,
$myrow['sequence'],
@@ -180,7 +183,9 @@
$myrow['component'],
$UltimateParent,
$myrow['loccode'],
- $myrow['workcentrecode']);
+ $myrow['workcentrecode'],
+ $myrow['remark']
+ );
} //END WHILE LIST LOOP
} //end of function DisplayBOMItems
@@ -236,7 +241,7 @@
if (isset($Select)) { //Parent Stock Item selected so display BOM or edit Component
$SelectedParent = $Select;
unset($Select);// = NULL;
- echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' . _('Search') .
+ echo '<p class="page_title_text noprint"><img src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' . _('Search') .
'" alt="" />' . ' ' . $Title . '</p><br />';
if (isset($SelectedParent) AND isset($_POST['Submit'])) {
@@ -303,7 +308,8 @@
effectiveafter='" . $EffectiveAfterSQL . "',
effectiveto='" . $EffectiveToSQL . "',
quantity= '" . filter_number_format($_POST['Quantity']) . "',
- autoissue='" . $_POST['AutoIssue'] . "'
+ autoissue='" . $_POST['AutoIssue'] . "',
+ remark='" . $_POST['Remark'] . "'
WHERE bom.parent='" . $SelectedParent . "'
AND bom.component='" . $SelectedComponent . "'";
@@ -345,7 +351,8 @@
quantity,
effectiveafter,
effectiveto,
- autoissue)
+ autoissue,
+ remark)
VALUES ('" . $_POST['Sequence'] . "',
'".$SelectedParent."',
'" . $_POST['Component'] . "',
@@ -354,7 +361,8 @@
" . filter_number_format($_POST['Quantity']) . ",
'" . $EffectiveAfterSQL . "',
'" . $EffectiveToSQL . "',
- " . $_POST['AutoIssue'] . ")";
+ " . $_POST['AutoIssue'] . ",
+ '" . $_POST['Remark'] . "')";
$ErrMsg = _('Could not insert the BOM component because');
$DbgMsg = _('The SQL used to insert the component was');
@@ -449,7 +457,7 @@
break;
}
- echo '<br /><div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">' . _('Select a Different BOM') . '</a></div><br />';
+ echo '<br /><div class="centre noprint"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">' . _('Select a Different BOM') . '</a></div><br />';
// Display Manufatured Parent Items
$sql = "SELECT bom.parent,
stockmaster.description,
@@ -464,7 +472,7 @@
$result=DB_query($sql,$ErrMsg,$DbgMsg);
$ix = 0;
if( DB_num_rows($result) > 0 ) {
- echo '<table class="selection">';
+ echo '<table class="selection noprint">';
echo '<tr><td><div class="centre">' . _('Manufactured parent items').' : ';
while ($myrow = DB_fetch_array($result)){
echo (($ix)?', ':'') . '<a href="'.htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?Select='.$myrow['parent'].'">' .
@@ -553,6 +561,7 @@
echo '<tr>
<th colspan="13"><div class="centre"><b>' . $SelectedParent .' - ' . $myrow[0] . ' ('. $MBdesc. ') </b></div></th>
</tr>';
+ echo '</table><div id="Report"><table class="selection">';
$BOMTree = array();
//BOMTree is a 2 dimensional array with three elements for each item in the array - Level, Parent, Component
@@ -572,7 +581,7 @@
<th>' . _('Effective After') . '</th>
<th>' . _('Effective To') . '</th>
<th>' . _('Auto Issue') . '</th>
- <th>' . _('Qty On Hand') . '</th>
+ <th class="noprint">' . _('Qty On Hand') . '</th>
</tr>';
echo $TableHeader;
if(count($BOMTree) == 0) {
@@ -598,7 +607,7 @@
DisplayBOMItems($UltimateParent, $Parent, $Component, $Level, $db);
}
}
- echo '</table>
+ echo '</table></div>
<br />';
/* We do want to show the new component entry form in any case - it is a lot of work to get back to it otherwise if we need to add */
@@ -615,7 +624,8 @@
effectiveto,
workcentreadded,
quantity,
- autoissue
+ autoissue,
+ remark
FROM bom
INNER JOIN locationusers ON locationusers.loccode=bom.loccode AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canupd=1
WHERE parent='".$SelectedParent."'
@@ -631,12 +641,13 @@
$_POST['WorkCentreAdded'] = $myrow['workcentreadded'];
$_POST['Quantity'] = locale_number_format($myrow['quantity'],'Variable');
$_POST['AutoIssue'] = $myrow['autoissue'];
+ $_POST['Remark'] = $myrow['remark'];
prnMsg(_('Edit the details of the selected component in the fields below') . '. <br />' . _('Click on the Enter Information button to update the component details'),'info');
echo '<br />
<input type="hidden" name="SelectedParent" value="' . $SelectedParent . '" />';
echo '<input type="hidden" name="SelectedComponent" value="' . $SelectedComponent . '" />';
- echo '<table class="selection">';
+ echo '<table class="selection noprint">';
echo '<tr>
<th colspan="13"><div class="centre"><b>' . ('Edit Component Details') . '</b></div></th>
</tr>';
@@ -648,10 +659,11 @@
} else { //end of if $SelectedComponent
$_POST['Sequence'] = 0;
+ $_POST['Remark'] = '';
echo '<input type="hidden" name="SelectedParent" value="' . $SelectedParent . '" />';
/* echo "Enter the details of a new component in the fields below. <br />Click on 'Enter Information' to add the new component, once all fields are completed.";
*/
- echo '<table class="selection">';
+ echo '<table class="selection noprint">';
echo '<tr>
<th colspan="13"><div class="centre"><b>' . _('New Component Details') . '</b></div></th>
</tr>';
@@ -702,7 +714,6 @@
<td>' . _('Sequence in BOM') . ':</td>
<td><input type="text" class="integer" required="required" size="5" name="Sequence" value="' . $_POST['Sequence'] . '" /></td>
</tr>';
-
echo '<tr>
<td>' . _('Location') . ': </td>
<td><select tabindex="2" name="LocCode">';
@@ -811,11 +822,18 @@
} else {
echo '<input type="hidden" name="AutoIssue" value="0" />';
}
+
+ echo '<tr><td>' . _('Remark') . '</td>
+ <td><textarea rows="3" col="20" name="Remark" >' . $_POST['Remark'] . '</textarea></td>
+ </tr>';
echo '</table>
<br />
- <div class="centre">
+ <div class="centre noprint">
<input tabindex="8" type="submit" name="Submit" value="' . _('Enter Information') . '" />
+ <button onclick="javascript:window.print()" type="button"><img alt="" src="' . $RootPath . '/css/' . $Theme .
+ '/images/printer.png" /> ' .
+ _('Print This') . '</button>
</div>
</div>
</form>';
@@ -936,7 +954,7 @@
$tab = $j+3;
printf('<td><input tabindex="' . $tab . '" type="submit" name="Select" value="%s" /></td>
<td>%s</td>
- <td class="number">%s</td>
+ <td class="number noprint">%s</td>
<td>%s</td>
</tr>',
$myrow['stockid'],
@@ -985,4 +1003,4 @@
}
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/sql/mysql/upgrade4.12.3-4.13.sql
===================================================================
--- trunk/sql/mysql/upgrade4.12.3-4.13.sql 2016-01-13 07:32:36 UTC (rev 7444)
+++ trunk/sql/mysql/upgrade4.12.3-4.13.sql 2016-01-13 08:17:47 UTC (rev 7445)
@@ -49,6 +49,7 @@
ALTER table stockrequest DROP FOREIGN KEY `stockrequest_ibfk_3`;
ALTER table stockrequest DROP FOREIGN KEY `stockrequest_ibfk_4`;
INSERT INTO scripts VALUES('CollectiveWorkOrderCost.php',2,'Multiple work orders cost review');
+ALTER table BOM ADD remark varchar(500) NOT NULL DEFAULT '';
-- Update version number:
|
|
From: <dai...@us...> - 2016-01-13 07:32:38
|
Revision: 7444
http://sourceforge.net/p/web-erp/reponame/7444
Author: daintree
Date: 2016-01-13 07:32:36 +0000 (Wed, 13 Jan 2016)
Log Message:
-----------
Fixed bug in creating customer credit notes manually - blank taxes were being added that caused the SQL to commit the transaction to fail with foreign key constraint to tax authorities
Modified Paths:
--------------
trunk/SelectCreditItems.php
trunk/TaxGroups.php
trunk/doc/Change.log
trunk/includes/DefineCartClass.php
Modified: trunk/SelectCreditItems.php
===================================================================
--- trunk/SelectCreditItems.php 2016-01-13 03:03:24 UTC (rev 7443)
+++ trunk/SelectCreditItems.php 2016-01-13 07:32:36 UTC (rev 7444)
@@ -407,9 +407,9 @@
/*Always do the stuff below if not looking for a customerid
Set up the form for the credit note display and entry*/
- echo '<form id="MainForm" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier . '" method="post">';
- echo '<div>';
- echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+ echo '<form id="MainForm" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier . '" method="post">
+ <div>
+ <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
/*Process Quick Entry */
@@ -569,9 +569,9 @@
$DiscountPercentage = filter_number_format($_POST['Discount_' . $LineItem->LineNumber]);
- foreach ($LineItem->Taxes as $TaxLine) {
- if (isset($_POST[$LineItem->LineNumber . $TaxLine->TaxCalculationOrder . '_TaxRate'])){
- $_SESSION['CreditItems'.$identifier]->LineItems[$LineItem->LineNumber]->Taxes[$TaxLine->TaxCalculationOrder]->TaxRate = filter_number_format($_POST[$LineItem->LineNumber . $TaxLine->TaxCalculationOrder . '_TaxRate'])/100;
+ foreach ($LineItem->Taxes as $TaxKey=>$TaxLine) {
+ if (is_numeric(filter_number_format($_POST[$LineItem->LineNumber . $TaxLine->TaxCalculationOrder . '_TaxRate']))){
+ $_SESSION['CreditItems'.$identifier]->LineItems[$LineItem->LineNumber]->Taxes[$TaxKey]->TaxRate = filter_number_format($_POST[$LineItem->LineNumber . $TaxKey . '_TaxRate'])/100;
}
}
}
@@ -593,9 +593,9 @@
}
- foreach ($_SESSION['CreditItems'.$identifier]->FreightTaxes as $FreightTaxLine) {
- if (isset($_POST['FreightTaxRate' . $FreightTaxLine->TaxCalculationOrder])){
- $_SESSION['CreditItems'.$identifier]->FreightTaxes[$FreightTaxLine->TaxCalculationOrder]->TaxRate = filter_number_format($_POST['FreightTaxRate' . $FreightTaxLine->TaxCalculationOrder])/100;
+ foreach ($_SESSION['CreditItems'.$identifier]->FreightTaxes as $FreightTaxKey=>$FreightTaxLine) {
+ if (is_numeric(filter_number_format($_POST['FreightTaxRate' . $FreightTaxLine->TaxCalculationOrder]))){
+ $_SESSION['CreditItems'.$identifier]->FreightTaxes[$FreightTaxKey]->TaxRate = filter_number_format($_POST['FreightTaxRate' . $FreightTaxKey])/100;
}
}
@@ -737,13 +737,9 @@
/*Need to list the taxes applicable to this line */
echo '<td>';
- $i=0;
foreach ($_SESSION['CreditItems'.$identifier]->LineItems[$LineItem->LineNumber]->Taxes AS $Tax) {
- if ($i>0){
- echo '<br />';
- }
+ echo '<br />';
echo $Tax->TaxAuthDescription;
- $i++;
}
echo '</td>';
echo '<td>';
@@ -751,11 +747,12 @@
$i=0; // initialise the number of taxes iterated through
$TaxLineTotal =0; //initialise tax total for the line
- foreach ($LineItem->Taxes AS $Tax) {
+ foreach ($LineItem->Taxes AS $TaxKey=>$Tax) {
+
if ($i>0){
echo '<br />';
}
- echo '<input type="text" class="number" name="' . $LineItem->LineNumber . $Tax->TaxCalculationOrder . '_TaxRate" maxlength="4" size="4" value="' . locale_number_format($Tax->TaxRate*100,'Variable') . '" />';
+ echo '<input type="text" class="number" name="' . $LineItem->LineNumber . $TaxKey . '_TaxRate" maxlength="4" size="4" value="' . locale_number_format($Tax->TaxRate*100,'Variable') . '" />';
$i++;
if ($Tax->TaxOnTax ==1){
$TaxTotals[$Tax->TaxAuthID] += ($Tax->TaxRate * ($LineTotal + $TaxLineTotal));
Modified: trunk/TaxGroups.php
===================================================================
--- trunk/TaxGroups.php 2016-01-13 03:03:24 UTC (rev 7443)
+++ trunk/TaxGroups.php 2016-01-13 07:32:36 UTC (rev 7444)
@@ -59,6 +59,7 @@
} elseif(isset($SelectedGroup) ) {
$TaxAuthority = $_GET['TaxAuthority'];
if( isset($_GET['add']) ) { // adding a tax authority to a tax group
+
$sql = "INSERT INTO taxgrouptaxes ( taxgroupid,
taxauthid,
calculationorder)
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-01-13 03:03:24 UTC (rev 7443)
+++ trunk/doc/Change.log 2016-01-13 07:32:36 UTC (rev 7444)
@@ -1,6 +1,8 @@
webERP Change Log
-13/01/16 Exson: Fixed the variables non-refresh bugs in GLAccountInquiry.php. Reported by Richard.
-11/01/16 Exson: Fixed the bug of bank account original amount data error. Reported by Tim, Richard and make this data only available for bank account.
+
+13/1/16 Phil: Fixed bug in creating customer credit notes manually - blank taxes were being added that caused the SQL to commit the transaction to fail with foreign key constraint to tax authorities
+13/01/16 Exson: Fixed the variables non-refresh bugs in GLAccountInquiry.php. Reported by Richard.
+11/01/16 Exson: Fixed the bug of bank account original amount data error. Reported by Tim, Richard and make this data only available for bank account.
01/07/16 Exson: Fixed the lot control items negative not allowed problem and fix the data storage caused precision error which make material issuing is impossible under some situation in WorkOrderIssue.php.
29/12/15 RChacon: On GLAccountUsers.php: Fix script name; add $ViewTopic and $BookMark; improve $SelectedGLAccount validation; improve page_title_text; improve select GL account; regroup modify access permission code (improve logic); add classes to table elements; translate database "0" and "1" to human "No" and "Yes"; simplify and tide code; modify prnMsg from multiple part sentence to one part sentence (better to translate when language use a different grammar structure from English); add "Print This", "Select A Different GL account" and "Return" buttons. Add info to ManualGeneralLedger.html.
28/12/15 Exson: Fixed the bug that discount not modified for items whose discount is null in discount matrix in SelectOrderItems.php.
Modified: trunk/includes/DefineCartClass.php
===================================================================
--- trunk/includes/DefineCartClass.php 2016-01-13 03:03:24 UTC (rev 7443)
+++ trunk/includes/DefineCartClass.php 2016-01-13 07:32:36 UTC (rev 7444)
@@ -314,11 +314,11 @@
while ($myrow = DB_fetch_array($GetTaxRatesResult)){
$this->LineItems[$LineNumber]->Taxes[$i] = new Tax($myrow['taxcalculationorder'],
- $myrow['taxauthid'],
- $myrow['description'],
- $myrow['taxrate'],
- $myrow['taxontax'],
- $myrow['taxglcode']);
+ $myrow['taxauthid'],
+ $myrow['description'],
+ $myrow['taxrate'],
+ $myrow['taxontax'],
+ $myrow['taxglcode']);
$i++;
}
} //end method GetExistingTaxes
@@ -353,13 +353,12 @@
} else {
$i=1;
while ($myrow = DB_fetch_array($GetTaxRatesResult)){
-
$this->LineItems[$LineNumber]->Taxes[$i] = new Tax($myrow['calculationorder'],
- $myrow['taxauthid'],
- $myrow['description'],
- $myrow['taxrate'],
- $myrow['taxontax'],
- $myrow['taxglcode']);
+ $myrow['taxauthid'],
+ $myrow['description'],
+ $myrow['taxrate'],
+ $myrow['taxontax'],
+ $myrow['taxglcode']);
$i++;
} //end loop around different taxes
} //end if there are some taxes defined
@@ -403,11 +402,11 @@
while ($myrow = DB_fetch_array($GetTaxRatesResult)){
$this->FreightTaxes[$i] = new Tax($myrow['calculationorder'],
- $myrow['taxauthid'],
- $myrow['description'],
- $myrow['taxrate'],
- $myrow['taxontax'],
- $myrow['taxglcode']);
+ $myrow['taxauthid'],
+ $myrow['description'],
+ $myrow['taxrate'],
+ $myrow['taxontax'],
+ $myrow['taxglcode']);
$i++;
}
} //end method GetFreightTaxes()
@@ -545,4 +544,4 @@
}
}
-?>
+?>
\ No newline at end of file
|
|
From: <te...@us...> - 2016-01-13 03:03:26
|
Revision: 7443
http://sourceforge.net/p/web-erp/reponame/7443
Author: tehonu
Date: 2016-01-13 03:03:24 +0000 (Wed, 13 Jan 2016)
Log Message:
-----------
Correction of Type = 2, to prevent error in GLAccountInquiry modification.
Modified Paths:
--------------
trunk/PcAuthorizeExpenses.php
Modified: trunk/PcAuthorizeExpenses.php
===================================================================
--- trunk/PcAuthorizeExpenses.php 2016-01-13 02:41:12 UTC (rev 7442)
+++ trunk/PcAuthorizeExpenses.php 2016-01-13 03:03:24 UTC (rev 7443)
@@ -211,7 +211,7 @@
amount,
currcode)
VALUES ('". $ReceiptTransNo . "',
- 1,
+ 2,
'" . $AccountFrom . "',
'" . $Narrative . "',
1,
|
|
From: <ex...@us...> - 2016-01-13 02:41:14
|
Revision: 7442
http://sourceforge.net/p/web-erp/reponame/7442
Author: exsonqu
Date: 2016-01-13 02:41:12 +0000 (Wed, 13 Jan 2016)
Log Message:
-----------
Modified Paths:
--------------
trunk/doc/Change.log
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-01-13 02:38:17 UTC (rev 7441)
+++ trunk/doc/Change.log 2016-01-13 02:41:12 UTC (rev 7442)
@@ -1,5 +1,5 @@
webERP Change Log
-
+13/01/16 Exson: Fixed the variables non-refresh bugs in GLAccountInquiry.php. Reported by Richard.
11/01/16 Exson: Fixed the bug of bank account original amount data error. Reported by Tim, Richard and make this data only available for bank account.
01/07/16 Exson: Fixed the lot control items negative not allowed problem and fix the data storage caused precision error which make material issuing is impossible under some situation in WorkOrderIssue.php.
29/12/15 RChacon: On GLAccountUsers.php: Fix script name; add $ViewTopic and $BookMark; improve $SelectedGLAccount validation; improve page_title_text; improve select GL account; regroup modify access permission code (improve logic); add classes to table elements; translate database "0" and "1" to human "No" and "Yes"; simplify and tide code; modify prnMsg from multiple part sentence to one part sentence (better to translate when language use a different grammar structure from English); add "Print This", "Select A Different GL account" and "Return" buttons. Add info to ManualGeneralLedger.html.
|
|
From: <ex...@us...> - 2016-01-13 02:38:20
|
Revision: 7441
http://sourceforge.net/p/web-erp/reponame/7441
Author: exsonqu
Date: 2016-01-13 02:38:17 +0000 (Wed, 13 Jan 2016)
Log Message:
-----------
13/01/16 Exson: Fixed the variables non-refresh bugs in GLAccountInquiry.php. Reported by Richard.
Modified Paths:
--------------
trunk/GLAccountInquiry.php
Modified: trunk/GLAccountInquiry.php
===================================================================
--- trunk/GLAccountInquiry.php 2016-01-11 10:36:19 UTC (rev 7440)
+++ trunk/GLAccountInquiry.php 2016-01-13 02:38:17 UTC (rev 7441)
@@ -282,6 +282,9 @@
echo '<tr class="OddTableRows">';
$k++;
}
+ $BankRef = '';
+ $OrgAmt = '';
+ $Currency = '';
if ($myrow['type'] == 12 OR $myrow['type'] == 22 OR $myrow['type'] == 2 OR $myrow['type'] == 1) {
$banksql = "SELECT ref,currcode,amount FROM banktrans
WHERE type='" .$myrow['type']."' AND transno='" . $myrow['typeno'] . "' AND bankact='" . $SelectedAccount . "'";
@@ -293,11 +296,7 @@
$OrgAmt = $bankrow['amount'];
$Currency = $bankrow['currcode'];
}
- } else {
- $BankRef = '';
- $OrgAmt = '';
- $Currency = '';
- }
+ }
$RunningTotal += $myrow['amount'];
$PeriodTotal += $myrow['amount'];
|
|
From: <ex...@us...> - 2016-01-11 10:36:21
|
Revision: 7440
http://sourceforge.net/p/web-erp/reponame/7440
Author: exsonqu
Date: 2016-01-11 10:36:19 +0000 (Mon, 11 Jan 2016)
Log Message:
-----------
Modified Paths:
--------------
trunk/doc/Change.log
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-01-11 10:35:24 UTC (rev 7439)
+++ trunk/doc/Change.log 2016-01-11 10:36:19 UTC (rev 7440)
@@ -1,5 +1,6 @@
webERP Change Log
+11/01/16 Exson: Fixed the bug of bank account original amount data error. Reported by Tim, Richard and make this data only available for bank account.
01/07/16 Exson: Fixed the lot control items negative not allowed problem and fix the data storage caused precision error which make material issuing is impossible under some situation in WorkOrderIssue.php.
29/12/15 RChacon: On GLAccountUsers.php: Fix script name; add $ViewTopic and $BookMark; improve $SelectedGLAccount validation; improve page_title_text; improve select GL account; regroup modify access permission code (improve logic); add classes to table elements; translate database "0" and "1" to human "No" and "Yes"; simplify and tide code; modify prnMsg from multiple part sentence to one part sentence (better to translate when language use a different grammar structure from English); add "Print This", "Select A Different GL account" and "Return" buttons. Add info to ManualGeneralLedger.html.
28/12/15 Exson: Fixed the bug that discount not modified for items whose discount is null in discount matrix in SelectOrderItems.php.
|
|
From: <ex...@us...> - 2016-01-11 10:35:27
|
Revision: 7439
http://sourceforge.net/p/web-erp/reponame/7439
Author: exsonqu
Date: 2016-01-11 10:35:24 +0000 (Mon, 11 Jan 2016)
Log Message:
-----------
11/01/16 Exson: Fixed the bug of bank account original amount data error. Reported by Tim, Richard and make this data only available for bank account.
Modified Paths:
--------------
trunk/GLAccountInquiry.php
Modified: trunk/GLAccountInquiry.php
===================================================================
--- trunk/GLAccountInquiry.php 2016-01-07 10:17:30 UTC (rev 7438)
+++ trunk/GLAccountInquiry.php 2016-01-11 10:35:24 UTC (rev 7439)
@@ -50,13 +50,18 @@
<td><select name="Account">';
$sql = "SELECT chartmaster.accountcode,
+ bankaccounts.accountcode AS bankact,
chartmaster.accountname
- FROM chartmaster
+ FROM chartmaster LEFT JOIN bankaccounts
+ ON chartmaster.accountcode=bankaccounts.accountcode
INNER JOIN glaccountusers ON glaccountusers.accountcode=chartmaster.accountcode AND glaccountusers.userid='" . $_SESSION['UserID'] . "' AND glaccountusers.canview=1
ORDER BY chartmaster.accountcode";
$Account = DB_query($sql);
while ($myrow=DB_fetch_array($Account,$db)){
if($myrow['accountcode'] == $SelectedAccount){
+ if (!is_null($myrow['bankact'])) {
+ $BankAccount = true;
+ }
echo '<option selected="selected" value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' ' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8', false) . '</option>';
} else {
echo '<option value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' ' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8', false) . '</option>';
@@ -166,7 +171,11 @@
$SelectedAccountName=$namerow['accountname'];
$ErrMsg = _('The transactions for account') . ' ' . $SelectedAccount . ' ' . _('could not be retrieved because') ;
$TransResult = DB_query($sql,$ErrMsg);
+ $BankAccountInfo = isset($BankAccount)?'<th>' . _('Org Currency') . '</th>
+ <th>' . _('Amount in Org Currency') . '</th>
+ <th>' . _('Bank Ref') .'</th>':'';
+
echo '<br />
<table class="selection">
<thead>
@@ -178,10 +187,8 @@
<th class="number">', _('Number'), '</th>
<th class="centre">', ('Date'), '</th>
<th class="number">', _('Debit'), '</th>
- <th class="number">', _('Credit'), '</th>
- <th class="text">', _('Org Currency'), '</th>
- <th class="number">', _('Amount in Org Currency'), '</th>
- <th class="text">', _('Bank Reference'), '</th>
+ <th class="number">', _('Credit'), '</th>' .
+ $BankAccountInfo .'
<th class="text">', _('Narrative'), '</th>
<th class="number">', _('Balance'), '</th>
<th class="text">', _('Tag'), '</th>
@@ -276,7 +283,8 @@
$k++;
}
if ($myrow['type'] == 12 OR $myrow['type'] == 22 OR $myrow['type'] == 2 OR $myrow['type'] == 1) {
- $banksql = "SELECT ref,currcode,amount FROM banktrans WHERE type='" .$myrow['type']."' and transno='" . $myrow['typeno'] . "'";
+ $banksql = "SELECT ref,currcode,amount FROM banktrans
+ WHERE type='" .$myrow['type']."' AND transno='" . $myrow['typeno'] . "' AND bankact='" . $SelectedAccount . "'";
$ErrMsg = _('Failed to retrieve bank data');
$bankresult = DB_query($banksql,$ErrMsg);
if (DB_num_rows($bankresult)>0) {
@@ -304,8 +312,8 @@
$FormatedTranDate = ConvertSQLDate($myrow['trandate']);
$URL_to_TransDetail = $RootPath . '/GLTransInquiry.php?TypeID=' . $myrow['type'] . '&TransNo=' . $myrow['typeno'];
-
- printf('<td class="text">%s</td>
+ if (isset($BankAccount)) {
+ printf('<td class="text">%s</td>
<td class="number"><a href="%s">%s</a></td>
<td class="centre">%s</td>
<td class="number">%s</td>
@@ -329,7 +337,28 @@
$myrow['narrative'],
locale_number_format($RunningTotal,$_SESSION['CompanyRecord']['decimalplaces']),
$myrow['tagdescription']
- );
+ );
+ } else {
+ printf('<td class="text">%s</td>
+ <td class="number"><a href="%s">%s</a></td>
+ <td class="centre">%s</td>
+ <td class="number">%s</td>
+ <td class="number">%s</td>
+ <td class="text">%s</td>
+ <td class="number">%s</td>
+ <td class="text">%s</td>
+ </tr>',
+ _($myrow['typename']),
+ $URL_to_TransDetail,
+ $myrow['typeno'],
+ $FormatedTranDate,
+ $DebitAmount,
+ $CreditAmount,
+ $myrow['narrative'],
+ locale_number_format($RunningTotal,$_SESSION['CompanyRecord']['decimalplaces']),
+ $myrow['tagdescription']
+ );
+ }
}
|
|
From: <ex...@us...> - 2016-01-07 10:17:32
|
Revision: 7438
http://sourceforge.net/p/web-erp/reponame/7438
Author: exsonqu
Date: 2016-01-07 10:17:30 +0000 (Thu, 07 Jan 2016)
Log Message:
-----------
Modified Paths:
--------------
trunk/doc/Change.log
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2016-01-07 10:15:33 UTC (rev 7437)
+++ trunk/doc/Change.log 2016-01-07 10:17:30 UTC (rev 7438)
@@ -1,5 +1,6 @@
webERP Change Log
+01/07/16 Exson: Fixed the lot control items negative not allowed problem and fix the data storage caused precision error which make material issuing is impossible under some situation in WorkOrderIssue.php.
29/12/15 RChacon: On GLAccountUsers.php: Fix script name; add $ViewTopic and $BookMark; improve $SelectedGLAccount validation; improve page_title_text; improve select GL account; regroup modify access permission code (improve logic); add classes to table elements; translate database "0" and "1" to human "No" and "Yes"; simplify and tide code; modify prnMsg from multiple part sentence to one part sentence (better to translate when language use a different grammar structure from English); add "Print This", "Select A Different GL account" and "Return" buttons. Add info to ManualGeneralLedger.html.
28/12/15 Exson: Fixed the bug that discount not modified for items whose discount is null in discount matrix in SelectOrderItems.php.
27/12/15 RChacon: On UserGLAccounts.php: Fix script name; add $ViewTopic and $BookMark; improve $SelectedUser validation; improve page_title_text; improve select user; regroup modify access permission code (improve logic); add classes to table elements; translate database "0" and "1" to human "No" and "Yes"; simplify and tide code; modify prnMsg from multiple part sentence to one part sentence (better to translate when language use a different grammar structure from English); add "Print This", "Select A Different User" and "Return" buttons. Add info to ManualGeneralLedger.html.
|
|
From: <ex...@us...> - 2016-01-07 10:15:36
|
Revision: 7437
http://sourceforge.net/p/web-erp/reponame/7437
Author: exsonqu
Date: 2016-01-07 10:15:33 +0000 (Thu, 07 Jan 2016)
Log Message:
-----------
01/07/16 Exson: Fixed the lot control items negative not allowed problem and fix the data storage caused precision error which make material issuing is impossible under some situation in WorkOrderIssue.php.
Modified Paths:
--------------
trunk/WorkOrderIssue.php
Modified: trunk/WorkOrderIssue.php
===================================================================
--- trunk/WorkOrderIssue.php 2016-01-04 00:16:55 UTC (rev 7436)
+++ trunk/WorkOrderIssue.php 2016-01-07 10:15:33 UTC (rev 7437)
@@ -76,20 +76,43 @@
prnMsg(_('The work order is closed - no more materials or components can be issued to it.'),'error');
$InputError=true;
}
+ //Need to get the current standard cost for the item being issued
+ $SQL = "SELECT materialcost+labourcost+overheadcost AS cost,
+ controlled,
+ serialised,
+ decimalplaces,
+ mbflag
+ FROM stockmaster
+ WHERE stockid='" .$_POST['IssueItem'] . "'";
+ $Result = DB_query($SQL);
+ $IssueItemRow = DB_fetch_array($Result);
+ //now lets get the decimalplaces needed
+ if ($IssueItemRow['decimalplaces'] <=4) {
+ $VarianceAllowed = 0.0001;
+ } else {
+ $VarianceAllowed = pow(10,-$IssueItemRow['decimalplaces']);
+ }
+
$QuantityIssued =0;
if (isset($_POST['SerialNos']) AND is_array($_POST['SerialNos'])){ //then we are issuing a serialised item
$QuantityIssued = count($_POST['SerialNos']); // the total quantity issued as 1 per serial no
} elseif (isset($_POST['Qty'])){ //then its a plain non-controlled item
$QuantityIssued = filter_number_format($_POST['Qty']);
} else { //it must be a batch/lot controlled item
- for ($i=0;$i<15;$i++){
- if (mb_strlen($_POST['Qty'.$i])>0){
+ if (!isset($_POST['LotCounter']) OR !is_numeric($_POST['LotCounter'])) {
+ $InputError = true;
+ prnMsg(_('The line counter is not set up or not numeric, please ask administrator for help'),'error');
+ include('include/footer.inc');
+ exit;
+ }
+ for ($i=0;$i<$_POST['LotCounter'];$i++){
+ if (mb_strlen($_POST['Qty'.$i])>0 AND $_POST['Qty'.$i] != 0){
if (!is_numeric(filter_number_format($_POST['Qty'.$i]))){
$InputError=1;
} else {
$QuantityIssued += filter_number_format($_POST['Qty'.$i]);
- if ($_SESSION['ProhibitNegativeStock']==1 and $_POST['BatchRef'.$i] > "") {
+ if ($_SESSION['ProhibitNegativeStock']==1 AND $_POST['BatchRef'.$i] > "" AND $_POST['Qty' . $i]>0) {
$SQL = "SELECT quantity from stockserialitems WHERE (stockid= '" . $_POST['IssueItem'] . "')
AND (loccode = '" . $_POST['FromLocation'] . "')
AND (serialno = '" . $_POST['BatchRef'.$i] . "')";
@@ -101,7 +124,7 @@
}
else {
$CheckLotRow = DB_fetch_row($Result);
- if ($CheckLotRow[0]<$_POST['Qty'.$i]){
+ if (($_POST['Qty'.$i]-$CheckLotRow[0])>$VarianceAllowed){
$InputError = true;
prnMsg(_('This issue cannot be processed because the system parameter is set to prohibit negative stock and this issue would result in this batch going into negative. Please correct the stock first before attempting another issue'),'error');
}
@@ -113,16 +136,8 @@
}//end for the 15 fields available for batch/lot entry
}//end batch/lot controlled item
- //Need to get the current standard cost for the item being issued
- $SQL = "SELECT materialcost+labourcost+overheadcost AS cost,
- controlled,
- serialised,
- mbflag
- FROM stockmaster
- WHERE stockid='" .$_POST['IssueItem'] . "'";
- $Result = DB_query($SQL);
- $IssueItemRow = DB_fetch_array($Result);
+
if ($IssueItemRow['cost']==0){
prnMsg(_('The item being issued has a zero cost. The issue will still be processed '),'warn');
}
@@ -136,7 +151,7 @@
AND loccode ='" . $_POST['FromLocation'] . "'";
$CheckNegResult = DB_query($SQL);
$CheckNegRow = DB_fetch_row($CheckNegResult);
- if ($CheckNegRow[0]<$QuantityIssued){
+ if (($QuantityIssued-$CheckNegRow[0])>$VarianceAllowed){
$InputError = true;
prnMsg(_('This issue cannot be processed because the system parameter is set to prohibit negative stock and this issue would result in stock going into negative. Please correct the stock first before attempting another issue'),'error');
}
@@ -167,6 +182,9 @@
if (DB_num_rows($Result)==1){
$LocQtyRow = DB_fetch_row($Result);
$NewQtyOnHand = ($LocQtyRow[0] - $QuantityIssued);
+ if ($NewQtyOnHand < $VarianceAllowed) {
+ $NewQtyOnHand = 0;
+ }
} else {
/*There must actually be some error this should never happen */
$NewQtyOnHand = 0;
@@ -254,7 +272,7 @@
} //end for all of the potential serialised entries in the multi select box
} else { //the item is just batch/lot controlled not serialised
/*the form for entry of batch controlled items is only 15 possible fields */
- for($i=0;$i<15;$i++){
+ for($i=0;$i<$_POST['LotCounter'];$i++){
/* We need to add the StockSerialItem record and
The StockSerialMoves as well */
//need to test if the batch/lot exists first already
@@ -269,12 +287,16 @@
$Result = DB_query($SQL, $ErrMsg, $DbgMsg, true);
$AlreadyExistsRow = DB_fetch_row($Result);
- if ($AlreadyExistsRow[0]>0){
- $SQL = "UPDATE stockserialitems SET quantity = quantity - " . $_POST['Qty' . $i] . "
+ if ($AlreadyExistsRow[0]>0 AND $_POST['Qty'.$i] != 0){
+ $SQL = "UPDATE stockserialitems SET quantity = CASE
+ WHEN abs(quantity -" . $_POST['Qty' . $i] . ")<" . $VarianceAllowed . "
+ THEN 0
+ ELSE quantity - " . $_POST['Qty' . $i] . "
+ END
WHERE stockid='" . $_POST['IssueItem'] . "'
AND loccode = '" . $_POST['FromLocation'] . "'
AND serialno = '" . $_POST['BatchRef' .$i] . "'";
- } else {
+ } elseif ($_POST['Qty'.$i] != 0) {
$SQL = "INSERT INTO stockserialitems (stockid,
loccode,
serialno,
@@ -294,7 +316,8 @@
/** end of handle stockserialitems records */
/** now insert the serial stock movement **/
- $SQL = "INSERT INTO stockserialmoves (stockmoveno,
+ if ($_POST['Qty'.$i]!=0) {
+ $SQL = "INSERT INTO stockserialmoves (stockmoveno,
stockid,
serialno,
moveqty)
@@ -302,9 +325,10 @@
'" . $_POST['IssueItem'] . "',
'" . $_POST['BatchRef'.$i] . "',
'" . filter_number_format($_POST['Qty'.$i])*-1 . "')";
- $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The serial stock movement record could not be inserted because');
- $DbgMsg = _('The following SQL to insert the serial stock movement records was used');
- $Result = DB_query($SQL, $ErrMsg, $DbgMsg, true);
+ $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The serial stock movement record could not be inserted because');
+ $DbgMsg = _('The following SQL to insert the serial stock movement records was used');
+ $Result = DB_query($SQL, $ErrMsg, $DbgMsg, true);
+ }
}//non blank BundleRef
} //end for all 15 of the potential batch/lot fields received
} //end of the batch controlled stuff
@@ -382,7 +406,7 @@
unset($_POST['FromLocation']);
unset($_POST['Process']);
unset($_POST['SerialNos']);
- for ($i=0;$i<15;$i++){
+ for ($i=0;$i<$_POST['LotCounter'];$i++){
unset($_POST['BatchRef'.$i]);
unset($_POST['Qty'.$i]);
}
@@ -878,10 +902,40 @@
echo '<tr>
<th colspan="2">' . _('Batch/Lots Issued') . '</th>
</tr>';
- for ($i=0;$i<15;$i++){
+ $LotNoSQL = "SELECT serialno,quantity
+ FROM stockserialitems
+ WHERE stockid='" . $_POST['IssueItem'] . "'
+ AND loccode='" . $_POST['FromLocation'] . "'
+ AND quantity > 0";
+ $ErrMsg = _('Failed to retrieve lot No');
+ $LotResult = DB_query($LotNoSQL,$ErrMsg);
+ if (DB_num_rows($LotResult)>0) {
+ $i = 0;
+ while($LotRow = DB_fetch_array($LotResult)) {
+ echo '<tr>
+ <td><input type="text" name="BatchRef' . $i .'" title="' . _('Enter a batch/roll reference being used with this work order') . '" value="' . $LotRow['serialno'] . '" /></td>
+ <td><input class="number" title="' . _('Enter the quantity of this batch/roll to issue to the work order') . '" name="Qty' . $i .'" placeholder="' . $LotRow['quantity'] . '" /></td>
+ </tr>';
+ $i++;
+ }
+ echo '<input type="hidden" name="LotCounter" value="' . $i . '" />';
+ } else {
echo '<tr>
- <td><input type="text" name="BatchRef' . $i .'" title="' . _('Enter a batch/roll reference being used with this work order') . '" /></td>
- <td><input class="number" title="' . _('Enter the quantity of this batch/roll to issue to the work order') . '" name="Qty' . $i .'" value="0" /></td></tr>';
+ <td>' . _('There are no serial numbers at this location to issue') . '</td>
+ </tr>';
+ echo '<tr>
+ <td colspan="2"><div class="centre"><input type="submit" name="Retry" value="' . _('Reselect Location or Issued Item') . '" /></td>
+ </tr>';
+ $i=0;
+ echo '<tr>
+ <td colspan="4">' . _('You may need to receive (input negative quantity) some items whose serial no has never existed by following') . '</td>
+ </tr>';
+ echo '<tr>
+ <td colspan="2">' . _('Lot No') .': <input type="text" name="BatchRef' . $i .'" title="' . _('Enter a batch/roll reference being used with this work order') . '" value="" />
+ <td colspan="2">' . _('Quantity') . ': <input class="number" title="' . _('Enter the quantity of this batch/roll to issue to the work order') . '" name="Qty' . $i .'" /></td>
+ </tr>';
+ $i++;
+ echo '<input type="hidden" name="LotCounter" value="' . $i . '" />';
}
echo '<input type="hidden" name="IssueItem" value="' . $_POST['IssueItem'] . '" />';
echo '<tr>
|
|
From: <te...@us...> - 2016-01-04 00:16:57
|
Revision: 7436
http://sourceforge.net/p/web-erp/reponame/7436
Author: tehonu
Date: 2016-01-04 00:16:55 +0000 (Mon, 04 Jan 2016)
Log Message:
-----------
Changed pow(1, to pow(10, everywhere as: pow(1,X) = 1 for any X. Made no sense.
Modified Paths:
--------------
trunk/StockCostUpdate.php
trunk/Z_UpdateItemCosts.php
trunk/includes/SQL_CommonFunctions.inc
Modified: trunk/StockCostUpdate.php
===================================================================
--- trunk/StockCostUpdate.php 2015-12-29 18:39:08 UTC (rev 7435)
+++ trunk/StockCostUpdate.php 2016-01-04 00:16:55 UTC (rev 7436)
@@ -62,7 +62,7 @@
$myrow = DB_fetch_row($result);
if (DB_num_rows($result)==0) {
prnMsg (_('The entered item code does not exist'),'error',_('Non-existent Item'));
- } elseif (abs($NewCost - $OldCost) > pow(1,-($_SESSION['StandardCostDecimalPlaces']+1))){
+ } elseif (abs($NewCost - $OldCost) > pow(10,-($_SESSION['StandardCostDecimalPlaces']+1))){
$Result = DB_Txn_Begin();
ItemCostUpdateGL($db, $StockID, $NewCost, $OldCost, $_POST['QOH']);
Modified: trunk/Z_UpdateItemCosts.php
===================================================================
--- trunk/Z_UpdateItemCosts.php 2015-12-29 18:39:08 UTC (rev 7435)
+++ trunk/Z_UpdateItemCosts.php 2016-01-04 00:16:55 UTC (rev 7436)
@@ -75,7 +75,7 @@
$OldCost = $OldRow['materialcost'] + $OldRow['labourcost'] + $OldRow['overheadcost'];
//dont update costs for assembly or kit-sets or ghost items!!
- if ((abs($NewCost - $OldCost) > pow(1,-($_SESSION['StandardCostDecimalPlaces']+1)))
+ if ((abs($NewCost - $OldCost) > pow(10,-($_SESSION['StandardCostDecimalPlaces']+1)))
AND $OldRow['mbflag']!='K'
AND $OldRow['mbflag']!='A'
AND $OldRow['mbflag']!='G'){
Modified: trunk/includes/SQL_CommonFunctions.inc
===================================================================
--- trunk/includes/SQL_CommonFunctions.inc 2015-12-29 18:39:08 UTC (rev 7435)
+++ trunk/includes/SQL_CommonFunctions.inc 2016-01-04 00:16:55 UTC (rev 7436)
@@ -160,7 +160,7 @@
function ItemCostUpdateGL($db, $StockID, $NewCost, $OldCost, $QOH) {
if ($_SESSION['CompanyRecord']['gllink_stock']==1
AND $QOH!=0
- AND (abs($NewCost - $OldCost) > pow(1,-($_SESSION['StandardCostDecimalPlaces']+1)))){
+ AND (abs($NewCost - $OldCost) > pow(10,-($_SESSION['StandardCostDecimalPlaces']+1)))){
$CostUpdateNo = GetNextTransNo(35, $db);
$PeriodNo = GetPeriod(date($_SESSION['DefaultDateFormat']), $db);
|
|
From: <rc...@us...> - 2015-12-29 18:39:13
|
Revision: 7435
http://sourceforge.net/p/web-erp/reponame/7435
Author: rchacon
Date: 2015-12-29 18:39:08 +0000 (Tue, 29 Dec 2015)
Log Message:
-----------
Rebuild languages files *.pot, *.po and *.mo.
Modified Paths:
--------------
trunk/UserGLAccounts.php
trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.mo
trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po
trunk/locale/ar_SY.utf8/LC_MESSAGES/messages.mo
trunk/locale/ar_SY.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.mo
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/ko_KR.utf8/LC_MESSAGES/messages.mo
trunk/locale/ko_KR.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/mr_IN.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/locale/zh_TW.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_TW.utf8/LC_MESSAGES/messages.po
Modified: trunk/UserGLAccounts.php
===================================================================
--- trunk/UserGLAccounts.php 2015-12-29 18:09:02 UTC (rev 7434)
+++ trunk/UserGLAccounts.php 2015-12-29 18:39:08 UTC (rev 7435)
@@ -18,15 +18,14 @@
unset($SelectedUser);
}
-if(isset($_POST['SelectedGLAccount'])) {
+if(isset($_POST['SelectedGLAccount']) and $_POST['SelectedGLAccount']<>'') {//If POST not empty:
$SelectedGLAccount = mb_strtoupper($_POST['SelectedGLAccount']);
-} elseif(isset($_GET['SelectedGLAccount'])) {
+} elseif(isset($_GET['SelectedGLAccount']) and $_GET['SelectedGLAccount']<>'') {//If GET not empty:
$SelectedGLAccount = mb_strtoupper($_GET['SelectedGLAccount']);
-} else {
- $SelectedGLAccount = '';/*// Unset empty SelectedGLAccount:
+} else {// Unset empty SelectedGLAccount:
unset($_GET['SelectedGLAccount']);
unset($_POST['SelectedGLAccount']);
- unset($SelectedGLAccount);*/
+ unset($SelectedGLAccount);
}
if(isset($_GET['Cancel']) or isset($_POST['Cancel'])) {
@@ -34,6 +33,7 @@
unset($SelectedGLAccount);
}
+
if(!isset($SelectedUser)) {// If is NOT set a user for GL accounts.
echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
'/images/gl.png" title="',// Icon image.
@@ -72,7 +72,7 @@
DB_free_result($Result);
echo '<div class="centre noprint">',// Form buttons:
- '<button name="Process" type="submit" value="Accept"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '<button name="Process" type="submit" value="Submit"><img alt="" src="', $RootPath, '/css/', $Theme,
'/images/user.png" /> ', _('Accept'), '</button> '; // "Accept" button.
} else {// If is set a user for GL accounts ($SelectedUser).
@@ -89,14 +89,14 @@
// BEGIN: Needs $SelectedUser, $SelectedGLAccount:
if(isset($_POST['submit'])) {
- if(!isset('SelectedGLAccount')) {
+ if(!isset($SelectedGLAccount)) {
prnMsg(_('You have not selected an GL Account to be authorised for this user'), 'error');
} else {
// First check the user is not being duplicated
$CheckResult = DB_query("
SELECT count(*)
FROM glaccountusers
- WHERE accountcode= '" . $_POST['SelectedGLAccount'] . "'
+ WHERE accountcode= '" . $SelectedGLAccount . "'
AND userid = '" . $SelectedUser . "'");
$CheckRow = DB_fetch_row($CheckResult);
if($CheckRow[0] > 0) {
Modified: trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2015-12-29 18:09:02 UTC (rev 7434)
+++ trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2015-12-29 18:39:08 UTC (rev 7435)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: webERP 4.12.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-14 09:07-0600\n"
+"POT-Creation-Date: 2015-12-29 12:33-0600\n"
"PO-Revision-Date: 2013-06-01 11:19-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: Arabic <ar...@li...>\n"
@@ -18,7 +18,7 @@
"X-Generator: Poedit 1.5.4\n"
"X-Launchpad-Export-Date: 2012-03-07 23:01+0000\n"
-#: AccountGroups.php:6 includes/MainMenuLinksArray.php:395
+#: AccountGroups.php:6 includes/MainMenuLinksArray.php:397
msgid "Account Groups"
msgstr "مجموعات العضوية"
@@ -230,48 +230,49 @@
#: AgedSuppliers.php:276 Areas.php:144 AuditTrail.php:11
#: BOMExtendedQty.php:256 BOMIndented.php:249 BOMIndentedReverse.php:236
#: BOMInquiry.php:186 BOMListing.php:110 BOMs.php:239 BOMs.php:890
-#: COGSGLPostings.php:19 CompanyPreferences.php:102 CounterReturns.php:1629
-#: CounterSales.php:2097 CounterSales.php:2193 CreditStatus.php:21
-#: Credit_Invoice.php:276 CustEDISetup.php:17 CustItem.php:120
-#: CustItem.php:210 CustItem.php:238 DebtorsAtPeriodEnd.php:129
-#: DiscountCategories.php:12 DiscountCategories.php:149 DiscountMatrix.php:16
-#: EDIMessageFormat.php:105 FixedAssetLocations.php:13
-#: FixedAssetRegister.php:16 FixedAssetRegister.php:256
-#: FixedAssetTransfer.php:14 FormDesigner.php:185 GLBudgets.php:32
-#: GLJournal.php:250 GLJournalInquiry.php:11 HistoricalTestResults.php:42
-#: InternalStockRequest.php:311 InventoryPlanning.php:459
-#: InventoryPlanningPrefSupplier.php:386 MRPReport.php:544
-#: MaintenanceTasks.php:14 MaintenanceUserSchedule.php:16 NoSalesItems.php:91
-#: PDFPickingList.php:29 PDFStockLocTransfer.php:16 POReport.php:60
-#: POReport.php:64 POReport.php:68 PO_AuthorisationLevels.php:10
-#: PO_SelectOSPurchOrder.php:153 PcAssignCashToTab.php:59
-#: PcAssignCashToTab.php:133 PcAssignCashToTab.php:149
-#: PcAssignCashToTab.php:193 PriceMatrix.php:16 Prices.php:11
-#: PricesBasedOnMarkUp.php:8 Prices_Customer.php:35 ProductSpecs.php:38
-#: PurchData.php:241 PurchData.php:373 PurchData.php:401
+#: COGSGLPostings.php:19 CollectiveWorkOrderCost.php:7
+#: CollectiveWorkOrderCost.php:273 CompanyPreferences.php:102
+#: CounterReturns.php:1629 CounterSales.php:2097 CounterSales.php:2193
+#: CreditStatus.php:21 Credit_Invoice.php:276 CustEDISetup.php:17
+#: CustItem.php:120 CustItem.php:210 CustItem.php:238
+#: DebtorsAtPeriodEnd.php:129 DiscountCategories.php:12
+#: DiscountCategories.php:149 DiscountMatrix.php:16 EDIMessageFormat.php:105
+#: FixedAssetLocations.php:13 FixedAssetRegister.php:16
+#: FixedAssetRegister.php:256 FixedAssetTransfer.php:14 FormDesigner.php:185
+#: GLBudgets.php:32 GLJournal.php:250 GLJournalInquiry.php:11
+#: HistoricalTestResults.php:42 InternalStockRequest.php:311
+#: InventoryPlanning.php:459 InventoryPlanningPrefSupplier.php:386
+#: MRPReport.php:544 MaintenanceTasks.php:14 MaintenanceUserSchedule.php:16
+#: NoSalesItems.php:91 PDFPickingList.php:29 PDFStockLocTransfer.php:16
+#: POReport.php:60 POReport.php:64 POReport.php:68
+#: PO_AuthorisationLevels.php:10 PO_SelectOSPurchOrder.php:153
+#: PcAssignCashToTab.php:59 PcAssignCashToTab.php:144
+#: PcAssignCashToTab.php:160 PcAssignCashToTab.php:204 PriceMatrix.php:16
+#: Prices.php:11 PricesBasedOnMarkUp.php:8 Prices_Customer.php:35
+#: ProductSpecs.php:38 PurchData.php:241 PurchData.php:373 PurchData.php:401
#: PurchaseByPrefSupplier.php:305 QATests.php:22 RecurringSalesOrders.php:320
#: RelatedItemsUpdate.php:24 SalesAnalReptCols.php:51 SalesAnalRepts.php:14
#: SalesCategories.php:11 SalesGLPostings.php:19 SalesGraph.php:40
#: SalesPeople.php:28 SalesTypes.php:20 SelectAsset.php:48
#: SelectCompletedOrder.php:11 SelectContract.php:69 SelectCreditItems.php:220
-#: SelectCreditItems.php:291 SelectCustomer.php:266 SelectGLAccount.php:65
-#: SelectOrderItems.php:559 SelectOrderItems.php:1467
-#: SelectOrderItems.php:1567 SelectProduct.php:502 SelectQASamples.php:45
-#: SelectSalesOrder.php:512 SelectSupplier.php:14 SelectSupplier.php:220
+#: SelectCreditItems.php:291 SelectCustomer.php:267 SelectGLAccount.php:77
+#: SelectOrderItems.php:559 SelectOrderItems.php:1469
+#: SelectOrderItems.php:1569 SelectProduct.php:518 SelectQASamples.php:45
+#: SelectSalesOrder.php:512 SelectSupplier.php:14 SelectSupplier.php:222
#: SelectWorkOrder.php:9 SelectWorkOrder.php:174 SellThroughSupport.php:229
#: ShipmentCosting.php:11 Shipments.php:17 Shippers.php:123 Shippers.php:160
-#: Shipt_Select.php:8 StockLocMovements.php:14 StockLocStatus.php:29
-#: StockSerialItemResearch.php:30 SupplierPriceList.php:14
-#: SupplierPriceList.php:224 SupplierPriceList.php:394
-#: SupplierPriceList.php:398 SupplierPriceList.php:449
-#: SupplierPriceList.php:499 SupplierTenderCreate.php:556
-#: SupplierTenderCreate.php:664 SupplierTenders.php:322
-#: SupplierTenders.php:388 SupplierTransInquiry.php:10 Suppliers.php:304
-#: TestPlanResults.php:27 TopItems.php:118 UnitsOfMeasure.php:10
-#: WWW_Users.php:34 WhereUsedInquiry.php:18 WorkCentres.php:111
-#: WorkCentres.php:163 WorkOrderCosting.php:22 WorkOrderEntry.php:11
-#: WorkOrderIssue.php:22 WorkOrderReceive.php:34 WorkOrderStatus.php:58
-#: Z_BottomUpCosts.php:57 ../webSHOP/includes/header.php:251
+#: Shipt_Select.php:8 StockLocMovements.php:14 StockSerialItemResearch.php:30
+#: SupplierPriceList.php:14 SupplierPriceList.php:224
+#: SupplierPriceList.php:394 SupplierPriceList.php:398
+#: SupplierPriceList.php:449 SupplierPriceList.php:499
+#: SupplierTenderCreate.php:556 SupplierTenderCreate.php:664
+#: SupplierTenders.php:322 SupplierTenders.php:388 SupplierTransInquiry.php:10
+#: Suppliers.php:304 TestPlanResults.php:27 TopItems.php:118
+#: UnitsOfMeasure.php:10 WWW_Users.php:34 WhereUsedInquiry.php:18
+#: WorkCentres.php:111 WorkCentres.php:163 WorkOrderCosting.php:22
+#: WorkOrderEntry.php:11 WorkOrderIssue.php:22 WorkOrderReceive.php:34
+#: WorkOrderStatus.php:58 Z_BottomUpCosts.php:57
+#: ../webSHOP/includes/header.php:251
msgid "Search"
msgstr "إبحث"
@@ -288,8 +289,8 @@
msgstr ""
#: AccountGroups.php:289 AccountGroups.php:441 GLProfit_Loss.php:6
-#: GLProfit_Loss.php:135 GLProfit_Loss.php:136 GLProfit_Loss.php:187
-#: SelectGLAccount.php:23 SelectGLAccount.php:37 SelectGLAccount.php:51
+#: GLProfit_Loss.php:135 GLProfit_Loss.php:136 GLProfit_Loss.php:188
+#: SelectGLAccount.php:23 SelectGLAccount.php:41 SelectGLAccount.php:59
msgid "Profit and Loss"
msgstr ""
@@ -301,48 +302,49 @@
#: ContractCosting.php:202 Currencies.php:342 Currencies.php:520
#: Currencies.php:522 CustomerBranches.php:452 Customers.php:659
#: Customers.php:1049 Customers.php:1055 Customers.php:1058
-#: DailyBankTransactions.php:156 DeliveryDetails.php:1158
+#: DailyBankTransactions.php:212 DeliveryDetails.php:1158
#: DeliveryDetails.php:1199 DeliveryDetails.php:1202 FormDesigner.php:101
-#: GLTransInquiry.php:74 Labels.php:601 Labels.php:603 Labels.php:628
-#: Locations.php:446 Locations.php:670 Locations.php:672 Locations.php:685
-#: Locations.php:687 Locations.php:703 MRP.php:554 MRP.php:558 MRP.php:562
-#: MRP.php:566 MRP.php:570 MRPCalendar.php:224 PDFChequeListing.php:65
-#: PDFDIFOT.php:80 PDFDeliveryDifferences.php:76 PDFWOPrint.php:600
-#: PDFWOPrint.php:604 PO_AuthorisationLevels.php:134
-#: PO_AuthorisationLevels.php:139 PO_Header.php:807 PO_PDFPurchOrder.php:413
-#: PO_PDFPurchOrder.php:416 PaymentMethods.php:206 PaymentMethods.php:207
-#: PaymentMethods.php:208 PaymentMethods.php:209 PaymentMethods.php:275
-#: PaymentMethods.php:282 PaymentMethods.php:289 PaymentMethods.php:296
-#: PcAuthorizeExpenses.php:248 ProductSpecs.php:188 ProductSpecs.php:409
-#: ProductSpecs.php:414 ProductSpecs.php:420 ProductSpecs.php:425
-#: ProductSpecs.php:430 ProductSpecs.php:562 ProductSpecs.php:608
-#: ProductSpecs.php:610 ProductSpecs.php:621 ProductSpecs.php:623
-#: ProductSpecs.php:634 ProductSpecs.php:636 ProductSpecs.php:647
-#: ProductSpecs.php:649 PurchData.php:296 PurchData.php:667 PurchData.php:670
-#: QATests.php:293 QATests.php:295 QATests.php:306 QATests.php:308
-#: QATests.php:319 QATests.php:321 QATests.php:332 QATests.php:334
-#: QATests.php:345 QATests.php:347 QATests.php:414 QATests.php:419
-#: QATests.php:424 QATests.php:429 QATests.php:434
-#: 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 SalesCategories.php:264 SalesCategories.php:351
-#: SalesCategories.php:355 SalesPeople.php:227 SalesPeople.php:367
-#: SalesPeople.php:369 SelectProduct.php:229 SelectProduct.php:354
-#: SelectQASamples.php:424 SelectQASamples.php:518 SelectQASamples.php:520
-#: SelectQASamples.php:574 SelectQASamples.php:576 SelectQASamples.php:588
-#: SelectQASamples.php:590 ShipmentCosting.php:667 ShopParameters.php:289
-#: ShopParameters.php:293 ShopParameters.php:337 ShopParameters.php:341
-#: ShopParameters.php:391 ShopParameters.php:395 ShopParameters.php:413
-#: ShopParameters.php:417 ShopParameters.php:495 ShopParameters.php:499
-#: StockClone.php:922 StockClone.php:924 StockClone.php:947 StockClone.php:949
-#: Stocks.php:1256 Stocks.php:1258 Stocks.php:1281 Stocks.php:1283
-#: SuppContractChgs.php:90 SystemParameters.php:479 SystemParameters.php:502
-#: SystemParameters.php:543 SystemParameters.php:624 SystemParameters.php:632
-#: SystemParameters.php:672 SystemParameters.php:763 SystemParameters.php:772
-#: SystemParameters.php:780 SystemParameters.php:798 SystemParameters.php:805
-#: SystemParameters.php:849 SystemParameters.php:945 SystemParameters.php:1088
+#: GLAccountUsers.php:181 GLAccountUsers.php:190 GLTransInquiry.php:74
+#: Labels.php:606 Labels.php:608 Labels.php:634 Locations.php:446
+#: Locations.php:670 Locations.php:672 Locations.php:685 Locations.php:687
+#: Locations.php:703 MRP.php:554 MRP.php:558 MRP.php:562 MRP.php:566
+#: MRP.php:570 MRPCalendar.php:224 PDFChequeListing.php:65 PDFDIFOT.php:80
+#: PDFDeliveryDifferences.php:76 PDFWOPrint.php:602 PDFWOPrint.php:606
+#: PO_AuthorisationLevels.php:134 PO_AuthorisationLevels.php:139
+#: PO_Header.php:807 PO_PDFPurchOrder.php:413 PO_PDFPurchOrder.php:416
+#: PaymentMethods.php:206 PaymentMethods.php:207 PaymentMethods.php:208
+#: PaymentMethods.php:209 PaymentMethods.php:275 PaymentMethods.php:282
+#: PaymentMethods.php:289 PaymentMethods.php:296 PcAuthorizeExpenses.php:248
+#: ProductSpecs.php:188 ProductSpecs.php:409 ProductSpecs.php:414
+#: ProductSpecs.php:420 ProductSpecs.php:425 ProductSpecs.php:430
+#: ProductSpecs.php:562 ProductSpecs.php:608 ProductSpecs.php:610
+#: ProductSpecs.php:621 ProductSpecs.php:623 ProductSpecs.php:634
+#: ProductSpecs.php:636 ProductSpecs.php:647 ProductSpecs.php:649
+#: PurchData.php:296 PurchData.php:667 PurchData.php:670 QATests.php:293
+#: QATests.php:295 QATests.php:306 QATests.php:308 QATests.php:319
+#: QATests.php:321 QATests.php:332 QATests.php:334 QATests.php:345
+#: QATests.php:347 QATests.php:414 QATests.php:419 QATests.php:424
+#: QATests.php:429 QATests.php:434 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 SalesCategories.php:264
+#: SalesCategories.php:351 SalesCategories.php:355 SalesPeople.php:227
+#: SalesPeople.php:367 SalesPeople.php:369 SelectProduct.php:227
+#: SelectProduct.php:365 SelectQASamples.php:424 SelectQASamples.php:518
+#: SelectQASamples.php:520 SelectQASamples.php:574 SelectQASamples.php:576
+#: SelectQASamples.php:588 SelectQASamples.php:590 ShipmentCosting.php:667
+#: ShopParameters.php:289 ShopParameters.php:293 ShopParameters.php:337
+#: ShopParameters.php:341 ShopParameters.php:391 ShopParameters.php:395
+#: ShopParameters.php:413 ShopParameters.php:417 ShopParameters.php:495
+#: ShopParameters.php:499 StockClone.php:922 StockClone.php:924
+#: StockClone.php:947 StockClone.php:949 Stocks.php:1256 Stocks.php:1258
+#: Stocks.php:1281 Stocks.php:1283 SuppContractChgs.php:90
+#: SystemParameters.php:479 SystemParameters.php:502 SystemParameters.php:543
+#: SystemParameters.php:624 SystemParameters.php:632 SystemParameters.php:672
+#: SystemParameters.php:763 SystemParameters.php:772 SystemParameters.php:780
+#: SystemParameters.php:798 SystemParameters.php:805 SystemParameters.php:849
+#: SystemParameters.php:945 SystemParameters.php:1088
#: SystemParameters.php:1090 SystemParameters.php:1100
#: SystemParameters.php:1102 SystemParameters.php:1156
#: SystemParameters.php:1168 SystemParameters.php:1170
@@ -350,9 +352,10 @@
#: SystemParameters.php:1232 SystemParameters.php:1234 TaxGroups.php:310
#: TaxGroups.php:313 TaxGroups.php:364 TestPlanResults.php:304
#: TestPlanResults.php:532 TestPlanResults.php:747 TestPlanResults.php:864
-#: TestPlanResults.php:924 TestPlanResults.php:928 WWW_Users.php:516
-#: WWW_Users.php:518 WWW_Users.php:689 WWW_Users.php:691 WWW_Users.php:704
-#: WWW_Users.php:706 reportwriter/languages/en_US/reports.php:114
+#: TestPlanResults.php:924 TestPlanResults.php:928 UserGLAccounts.php:187
+#: UserGLAccounts.php:196 WWW_Users.php:534 WWW_Users.php:536
+#: WWW_Users.php:707 WWW_Users.php:709 WWW_Users.php:722 WWW_Users.php:724
+#: reportwriter/languages/en_US/reports.php:114
msgid "Yes"
msgstr "موافق"
@@ -365,14 +368,15 @@
#: ContractCosting.php:200 Currencies.php:344 Currencies.php:525
#: Currencies.php:527 CustomerBranches.php:452 Customers.php:658
#: Customers.php:1047 Customers.php:1054 Customers.php:1057
-#: DailyBankTransactions.php:158 DeliveryDetails.php:1159
+#: DailyBankTransactions.php:214 DeliveryDetails.php:1159
#: DeliveryDetails.php:1200 DeliveryDetails.php:1203 FormDesigner.php:99
-#: GLTransInquiry.php:93 Labels.php:600 Labels.php:604 Labels.php:629
-#: Locations.php:446 Locations.php:675 Locations.php:677 Locations.php:690
-#: Locations.php:692 Locations.php:704 MRP.php:552 MRP.php:556 MRP.php:560
-#: MRP.php:564 MRP.php:568 MRPCalendar.php:226 NoSalesItems.php:191
+#: GLAccountUsers.php:183 GLAccountUsers.php:193 GLTransInquiry.php:93
+#: Labels.php:605 Labels.php:609 Labels.php:635 Locations.php:446
+#: Locations.php:675 Locations.php:677 Locations.php:690 Locations.php:692
+#: Locations.php:704 MRP.php:552 MRP.php:556 MRP.php:560 MRP.php:564
+#: MRP.php:568 MRPCalendar.php:226 NoSalesItems.php:191
#: PDFChequeListing.php:64 PDFDIFOT.php:79 PDFDeliveryDifferences.php:75
-#: PDFWOPrint.php:601 PDFWOPrint.php:605 PO_AuthorisationLevels.php:136
+#: PDFWOPrint.php:603 PDFWOPrint.php:607 PO_AuthorisationLevels.php:136
#: PO_AuthorisationLevels.php:141 PO_Header.php:806 PO_PDFPurchOrder.php:414
#: PO_PDFPurchOrder.php:417 PaymentMethods.php:206 PaymentMethods.php:207
#: PaymentMethods.php:208 PaymentMethods.php:209 PaymentMethods.php:276
@@ -392,8 +396,8 @@
#: SalesAnalRepts.php:422 SalesAnalRepts.php:447 SalesAnalRepts.php:450
#: SalesAnalRepts.php:475 SalesAnalRepts.php:478 SalesCategories.php:266
#: SalesCategories.php:352 SalesCategories.php:354 SalesPeople.php:229
-#: SalesPeople.php:372 SalesPeople.php:374 SelectProduct.php:231
-#: SelectProduct.php:356 SelectQASamples.php:426 SelectQASamples.php:523
+#: SalesPeople.php:372 SalesPeople.php:374 SelectProduct.php:229
+#: SelectProduct.php:367 SelectQASamples.php:426 SelectQASamples.php:523
#: SelectQASamples.php:525 SelectQASamples.php:579 SelectQASamples.php:581
#: SelectQASamples.php:593 SelectQASamples.php:595 ShipmentCosting.php:668
#: ShopParameters.php:290 ShopParameters.php:292 ShopParameters.php:338
@@ -414,9 +418,10 @@
#: SystemParameters.php:1231 SystemParameters.php:1235 TaxGroups.php:311
#: TaxGroups.php:314 TaxGroups.php:366 TestPlanResults.php:306
#: TestPlanResults.php:535 TestPlanResults.php:749 TestPlanResults.php:866
-#: TestPlanResults.php:925 TestPlanResults.php:927 WWW_Users.php:515
-#: WWW_Users.php:519 WWW_Users.php:688 WWW_Users.php:692 WWW_Users.php:703
-#: WWW_Users.php:707 includes/PDFLowGPPageHeader.inc:44
+#: TestPlanResults.php:925 TestPlanResults.php:927 UserGLAccounts.php:189
+#: UserGLAccounts.php:199 WWW_Users.php:533 WWW_Users.php:537
+#: WWW_Users.php:706 WWW_Users.php:710 WWW_Users.php:721 WWW_Users.php:725
+#: includes/PDFLowGPPageHeader.inc:44
#: reportwriter/languages/en_US/reports.php:82
msgid "No"
msgstr "ﻻ"
@@ -434,21 +439,21 @@
#: Labels.php:358 Locations.php:439 MRPDemandTypes.php:120 MRPDemands.php:309
#: MailingGroupMaintenance.php:178 MaintenanceTasks.php:118
#: Manufacturers.php:217 PO_AuthorisationLevels.php:151 PaymentMethods.php:210
-#: PaymentTerms.php:205 PcAssignCashToTab.php:277
+#: PaymentTerms.php:205 PcAssignCashToTab.php:288
#: PcClaimExpensesFromTab.php:276 PcExpenses.php:226 PcTabs.php:236
-#: PcTypeTabs.php:180 PriceMatrix.php:287 Prices.php:253
+#: PcTypeTabs.php:180 PriceMatrix.php:293 Prices.php:253
#: Prices_Customer.php:286 ProductSpecs.php:465 PurchData.php:312
#: QATests.php:467 SalesCategories.php:272 SalesGLPostings.php:137
#: SalesGLPostings.php:255 SalesPeople.php:240 SalesTypes.php:206
-#: SecurityTokens.php:130 SelectCustomer.php:615 SelectCustomer.php:634
-#: SelectCustomer.php:664 SelectCustomer.php:682 SelectCustomer.php:706
-#: SelectCustomer.php:723 SelectGLAccount.php:117 SelectGLAccount.php:132
+#: SecurityTokens.php:130 SelectCustomer.php:616 SelectCustomer.php:635
+#: SelectCustomer.php:665 SelectCustomer.php:683 SelectCustomer.php:707
+#: SelectCustomer.php:724 SelectGLAccount.php:130 SelectGLAccount.php:145
#: SelectQASamples.php:417 SellThroughSupport.php:298 Shippers.php:144
#: StockCategories.php:296 SuppTransGLAnalysis.php:125
#: SupplierContacts.php:165 SupplierTenderCreate.php:157 SupplierTypes.php:170
#: TaxAuthorities.php:172 TaxCategories.php:184 TaxGroups.php:190
#: TaxProvinces.php:179 UnitsOfMeasure.php:185 WWW_Access.php:132
-#: WWW_Users.php:350 WorkCentres.php:142 includes/InputSerialItems.php:110
+#: WWW_Users.php:368 WorkCentres.php:142 includes/InputSerialItems.php:110
#: includes/OutputSerialItems.php:20
#: reportwriter/languages/en_US/reports.php:143
#, php-format
@@ -465,37 +470,37 @@
#: COGSGLPostings.php:220 ContractBOM.php:272 ContractOtherReqts.php:124
#: CounterReturns.php:740 CounterSales.php:836 CreditStatus.php:176
#: Credit_Invoice.php:409 Currencies.php:377 CustItem.php:167
-#: CustomerReceipt.php:987 CustomerTypes.php:206 Customers.php:1166
+#: CustomerReceipt.php:994 CustomerTypes.php:206 Customers.php:1166
#: Departments.php:187 DiscountCategories.php:238 DiscountMatrix.php:183
#: EDIMessageFormat.php:151 FixedAssetCategories.php:191 FreightCosts.php:254
-#: GLAccounts.php:318 GLJournal.php:430 GLTags.php:97 GeocodeSetup.php:174
+#: GLAccounts.php:318 GLJournal.php:431 GLTags.php:97 GeocodeSetup.php:174
#: ImportBankTransAnalysis.php:224 InternalStockCategoriesByRole.php:184
-#: InternalStockRequest.php:294 Labels.php:334 Labels.php:359 Labels.php:607
+#: InternalStockRequest.php:294 Labels.php:334 Labels.php:359 Labels.php:612
#: Locations.php:440 MRPDemandTypes.php:121 MRPDemands.php:310
#: MailingGroupMaintenance.php:179 MaintenanceTasks.php:119
#: Manufacturers.php:218 PO_AuthorisationLevels.php:153 PO_Items.php:768
-#: PaymentMethods.php:211 PaymentTerms.php:206 Payments.php:1112
-#: PcAssignCashToTab.php:281 PcClaimExpensesFromTab.php:277 PcExpenses.php:227
+#: PaymentMethods.php:211 PaymentTerms.php:206 Payments.php:1114
+#: PcAssignCashToTab.php:292 PcClaimExpensesFromTab.php:277 PcExpenses.php:227
#: PcExpensesTypeTab.php:187 PcTabs.php:237 PcTypeTabs.php:181
-#: PriceMatrix.php:286 Prices.php:254 Prices_Customer.php:287
+#: PriceMatrix.php:292 Prices.php:254 Prices_Customer.php:287
#: ProductSpecs.php:466 PurchData.php:314 PurchData.php:721 QATests.php:468
#: RelatedItemsUpdate.php:155 RelatedItemsUpdate.php:170
#: SalesAnalReptCols.php:299 SalesAnalRepts.php:307 SalesCategories.php:273
#: SalesGLPostings.php:138 SalesGLPostings.php:256 SalesPeople.php:241
#: SalesTypes.php:207 SecurityTokens.php:131 SelectCreditItems.php:778
-#: SelectCustomer.php:616 SelectCustomer.php:635 SelectCustomer.php:665
-#: SelectCustomer.php:683 SelectCustomer.php:707 SelectCustomer.php:724
-#: SelectOrderItems.php:1379 SelectQASamples.php:418
+#: SelectCustomer.php:617 SelectCustomer.php:636 SelectCustomer.php:666
+#: SelectCustomer.php:684 SelectCustomer.php:708 SelectCustomer.php:725
+#: SelectOrderItems.php:1381 SelectQASamples.php:418
#: SellThroughSupport.php:299 Shipments.php:438 Shippers.php:145
#: SpecialOrder.php:667 StockCategories.php:297 StockCategories.php:626
#: StockLocTransfer.php:325 SuppContractChgs.php:99 SuppCreditGRNs.php:117
-#: SuppFixedAssetChgs.php:90 SuppInvGRNs.php:147 SuppShiptChgs.php:90
+#: SuppFixedAssetChgs.php:90 SuppInvGRNs.php:150 SuppShiptChgs.php:90
#: SuppTransGLAnalysis.php:126 SupplierContacts.php:166
#: SupplierTenderCreate.php:422 SupplierTenderCreate.php:452
#: SupplierTypes.php:172 TaxAuthorities.php:173 TaxCategories.php:186
#: TaxGroups.php:191 TaxProvinces.php:180 TestPlanResults.php:920
#: UnitsOfMeasure.php:186 WOSerialNos.php:335 WWW_Access.php:133
-#: WWW_Users.php:351 WorkCentres.php:143 includes/InputSerialItemsKeyed.php:60
+#: WWW_Users.php:369 WorkCentres.php:143 includes/InputSerialItemsKeyed.php:60
#: includes/OutputSerialItems.php:99
#: reportwriter/languages/en_US/reports.php:141
#, php-format
@@ -566,22 +571,22 @@
#: CreditStatus.php:259 Currencies.php:537 CustLoginSetup.php:273
#: Departments.php:258 DiscountMatrix.php:142 EDIMessageFormat.php:248
#: FixedAssetCategories.php:350 FixedAssetLocations.php:161
-#: FreightCosts.php:371 GLAccounts.php:265 GeocodeSetup.php:271 Labels.php:641
+#: FreightCosts.php:371 GLAccounts.php:265 GeocodeSetup.php:271 Labels.php:647
#: Locations.php:716 MRPDemandTypes.php:188 MRPDemands.php:424
#: Manufacturers.php:312 OffersReceived.php:57 OffersReceived.php:146
#: PO_AuthorisationLevels.php:264 PaymentMethods.php:302 PaymentTerms.php:310
-#: PriceMatrix.php:230 Prices_Customer.php:369 ProductSpecs.php:661
+#: PriceMatrix.php:236 Prices_Customer.php:369 ProductSpecs.php:661
#: QATests.php:359 SalesAnalReptCols.php:552 SalesAnalRepts.php:519
#: SalesGLPostings.php:427 SalesPeople.php:381 SelectQASamples.php:531
#: SelectQASamples.php:601 Shippers.php:203 StockCategories.php:653
#: SuppLoginSetup.php:291 SupplierContacts.php:284 TaxAuthorities.php:327
#: TaxCategories.php:244 TaxProvinces.php:234 TestPlanResults.php:967
-#: UnitsOfMeasure.php:241 WWW_Users.php:774 WorkCentres.php:283
+#: UnitsOfMeasure.php:241 WWW_Users.php:792 WorkCentres.php:283
msgid "Enter Information"
msgstr "أدخل المعلومات"
#: AccountSections.php:6 AccountSections.php:172 AccountSections.php:173
-#: includes/MainMenuLinksArray.php:394
+#: includes/MainMenuLinksArray.php:396
msgid "Account Sections"
msgstr "أعدادات العضو"
@@ -639,8 +644,8 @@
msgid "Could not retrieve the requested section please try again."
msgstr "لم أستطيع استرجاع القطاع المطلوب حاول مجددا"
-#: AddCustomerContacts.php:6 AddCustomerContacts.php:59 SelectCustomer.php:607
-#: SelectCustomer.php:642
+#: AddCustomerContacts.php:6 AddCustomerContacts.php:59 SelectCustomer.php:608
+#: SelectCustomer.php:643
msgid "Customer Contacts"
msgstr ""
@@ -677,7 +682,7 @@
#: AddCustomerTypeNotes.php:48 Areas.php:72 CustomerTypes.php:68
#: DeliveryDetails.php:809 DeliveryDetails.php:826 Factors.php:105
#: FixedAssetItems.php:250 MRPCalendar.php:176 PO_Items.php:380
-#: PcAssignCashToTab.php:91 PcClaimExpensesFromTab.php:82 PcExpenses.php:98
+#: PcAssignCashToTab.php:102 PcClaimExpensesFromTab.php:82 PcExpenses.php:98
#: PcTabs.php:104 PcTypeTabs.php:63 ProductSpecs.php:315 QATests.php:76
#: SalesAnalReptCols.php:129 SalesPeople.php:105 SalesTypes.php:66
#: SelectQASamples.php:85 Stocks.php:589 SupplierTypes.php:68
@@ -698,15 +703,16 @@
#: ImportBankTransAnalysis.php:207 PrintWOItemSlip.php:184
#: PrintWOItemSlip.php:195 PrintWOItemSlip.php:206 ProductSpecs.php:164
#: ProductSpecs.php:385 QATests.php:391 SalesPeople.php:208
-#: SelectCustomer.php:610 StockDispatch.php:275 StockDispatch.php:286
+#: SelectCustomer.php:611 StockDispatch.php:275 StockDispatch.php:286
#: StockDispatch.php:297 SuppTransGLAnalysis.php:108 SupplierContacts.php:152
-#: Tax.php:411 TestPlanResults.php:508 UserLocations.php:176
+#: Tax.php:411 TestPlanResults.php:508 UserBankAccounts.php:161
+#: UserGLAccounts.php:157 UserLocations.php:176
#: includes/InputSerialItemsFile.php:92 includes/InputSerialItemsFile.php:144
msgid "Name"
msgstr ""
#: AddCustomerContacts.php:127 AddCustomerContacts.php:223 Customers.php:1119
-#: Customers.php:1127 SelectCustomer.php:611 WWW_Access.php:113
+#: Customers.php:1127 SelectCustomer.php:612 WWW_Access.php:113
#: WWW_Access.php:179
msgid "Role"
msgstr ""
@@ -721,13 +727,13 @@
#: CustomerInquiry.php:409 CustomerInquiry.php:444 CustomerInquiry.php:490
#: Customers.php:1121 Customers.php:1129 EmailCustTrans.php:16
#: EmailCustTrans.php:65 Factors.php:246 Factors.php:297 Locations.php:639
-#: OrderDetails.php:115 PDFRemittanceAdvice.php:251 PDFWOPrint.php:591
-#: PDFWOPrint.php:594 PDFWOPrint.php:674 PDFWOPrint.php:677
+#: OrderDetails.php:115 PDFRemittanceAdvice.php:251 PDFWOPrint.php:593
+#: PDFWOPrint.php:596 PDFWOPrint.php:676 PDFWOPrint.php:679
#: PO_PDFPurchOrder.php:400 PO_PDFPurchOrder.php:403 PrintCustTrans.php:740
#: PrintCustTransPortrait.php:793 PrintCustTransPortrait.php:1039
-#: PrintCustTransPortrait.php:1095 SelectCustomer.php:428
-#: SelectCustomer.php:613 SelectSupplier.php:288 SupplierContacts.php:156
-#: SupplierContacts.php:277 UserSettings.php:184 WWW_Users.php:304
+#: PrintCustTransPortrait.php:1095 SelectCustomer.php:429
+#: SelectCustomer.php:614 SelectSupplier.php:290 SupplierContacts.php:156
+#: SupplierContacts.php:277 UserSettings.php:184 WWW_Users.php:322
#: includes/PDFPickingListHeader.inc:25 includes/PDFStatementPageHeader.inc:67
#: includes/PDFTransPageHeader.inc:85
#: includes/PDFTransPageHeaderPortrait.inc:114 includes/PDFWOPageHeader.inc:19
@@ -739,10 +745,10 @@
#: AddCustomerContacts.php:130 AddCustomerContacts.php:250
#: AnalysisHorizontalIncome.php:169 AnalysisHorizontalPosition.php:132
#: Customers.php:1122 Customers.php:1130 PDFQuotation.php:252
-#: PDFQuotationPortrait.php:249 PcAssignCashToTab.php:242
-#: PcAssignCashToTab.php:380 PcAuthorizeExpenses.php:97
+#: PDFQuotationPortrait.php:249 PcAssignCashToTab.php:253
+#: PcAssignCashToTab.php:391 PcAuthorizeExpenses.php:97
#: PcClaimExpensesFromTab.php:238 PcClaimExpensesFromTab.php:405
-#: PcReportTab.php:333 SelectCustomer.php:614 ShopParameters.php:198
+#: PcReportTab.php:333 SelectCustomer.php:615 ShopParameters.php:198
#: SystemParameters.php:411 WOSerialNos.php:306 WOSerialNos.php:312
msgid "Notes"
msgstr ""
@@ -766,8 +772,8 @@
msgstr ""
#: AddCustomerContacts.php:232 Contracts.php:781 PDFRemittanceAdvice.php:247
-#: PO_Header.php:1025 PO_Header.php:1110 SelectCreditItems.php:245
-#: SelectCustomer.php:426 SelectOrderItems.php:597
+#: PO_Header.php:1026 PO_Header.php:1111 SelectCreditItems.php:245
+#: SelectCustomer.php:427 SelectOrderItems.php:597
#: SupplierTenderCreate.php:395 includes/PDFStatementPageHeader.inc:63
#: includes/PDFTransPageHeader.inc:84
#: includes/PDFTransPageHeaderPortrait.inc:110 ../webSHOP/Checkout.php:389
@@ -775,8 +781,8 @@
msgid "Phone"
msgstr ""
-#: AddCustomerNotes.php:6 AddCustomerNotes.php:51 SelectCustomer.php:657
-#: SelectCustomer.php:690
+#: AddCustomerNotes.php:6 AddCustomerNotes.php:51 SelectCustomer.php:658
+#: SelectCustomer.php:691
msgid "Customer Notes"
msgstr ""
@@ -814,20 +820,19 @@
#: BankReconciliation.php:212 BankReconciliation.php:289
#: ContractCosting.php:177 CustomerAccount.php:252 CustomerAllocations.php:348
#: CustomerAllocations.php:378 CustomerInquiry.php:251
-#: CustomerTransInquiry.php:100 GLAccountInquiry.php:173
-#: GLAccountReport.php:343 GLTransInquiry.php:47 GoodsReceived.php:109
-#: MRPCalendar.php:219 PDFRemittanceAdvice.php:308 PDFWOPrint.php:448
-#: PaymentAllocations.php:66 PcAssignCashToTab.php:238
+#: CustomerTransInquiry.php:100 GLAccountReport.php:347 GLTransInquiry.php:47
+#: GoodsReceived.php:130 MRPCalendar.php:219 PDFRemittanceAdvice.php:308
+#: PDFWOPrint.php:450 PaymentAllocations.php:66 PcAssignCashToTab.php:249
#: PcAuthorizeExpenses.php:93 PrintCustTrans.php:822
#: PrintCustTransPortrait.php:907 PrintWOItemSlip.php:186
-#: PrintWOItemSlip.php:197 PrintWOItemSlip.php:208 ReverseGRN.php:398
-#: SelectCustomer.php:660 SelectCustomer.php:702 ShipmentCosting.php:538
+#: PrintWOItemSlip.php:197 PrintWOItemSlip.php:208 ReverseGRN.php:401
+#: SelectCustomer.php:661 SelectCustomer.php:703 ShipmentCosting.php:538
#: ShipmentCosting.php:615 Shipments.php:489 StockDispatch.php:277
#: StockDispatch.php:288 StockDispatch.php:299 StockLocMovements.php:92
#: StockMovements.php:105 StockSerialItemResearch.php:82
#: SupplierAllocations.php:456 SupplierAllocations.php:569
#: SupplierAllocations.php:644 SupplierInquiry.php:210
-#: SupplierTransInquiry.php:105 Tax.php:408
+#: SupplierTransInquiry.php:111 Tax.php:408
#: includes/PDFQuotationPageHeader.inc:23
#: includes/PDFQuotationPortraitPageHeader.inc:80
#: includes/PDFStatementPageHeader.inc:169 includes/PDFTransPageHeader.inc:51
@@ -837,7 +842,7 @@
msgstr ""
#: AddCustomerNotes.php:118 AddCustomerTypeNotes.php:112 PcReportTab.php:180
-#: SelectCustomer.php:661 SelectCustomer.php:703 StockClone.php:926
+#: SelectCustomer.php:662 SelectCustomer.php:704 StockClone.php:926
#: Stocks.php:1260 UpgradeDatabase.php:244 UpgradeDatabase.php:247
#: UpgradeDatabase.php:250 UpgradeDatabase.php:253 UpgradeDatabase.php:256
#: UpgradeDatabase.php:259 UpgradeDatabase.php:262 UpgradeDatabase.php:265
@@ -856,7 +861,7 @@
#: AddCustomerNotes.php:120 AddCustomerNotes.php:231
#: AddCustomerTypeNotes.php:114 AddCustomerTypeNotes.php:215
-#: SelectCustomer.php:663 SelectCustomer.php:705
+#: SelectCustomer.php:664 SelectCustomer.php:706
msgid "Priority"
msgstr ""
@@ -877,7 +882,7 @@
msgid "Contact Note"
msgstr ""
-#: AddCustomerTypeNotes.php:5 SelectCustomer.php:699
+#: AddCustomerTypeNotes.php:5 SelectCustomer.php:700
msgid "Customer Type (Group) Notes"
msgstr ""
@@ -893,7 +898,7 @@
msgid "The contacts notes may not be empty"
msgstr ""
-#: AddCustomerTypeNotes.php:48 SelectCustomer.php:731
+#: AddCustomerTypeNotes.php:48 SelectCustomer.php:732
msgid "Customer Group Notes"
msgstr ""
@@ -935,7 +940,7 @@
#: AgedControlledInventory.php:12 InventoryQuantities.php:155
#: InventoryValuation.php:217 Locations.php:12 MRP.php:542 MRPCalendar.php:21
-#: MRPCreateDemands.php:197 MRPDemandTypes.php:17 MRPDemands.php:27
+#: MRPCreateDemands.php:193 MRPDemandTypes.php:17 MRPDemands.php:27
#: MRPPlannedPurchaseOrders.php:265 MRPPlannedWorkOrders.php:247
#: MRPPlannedWorkOrders.php:321 PricesByCost.php:8 ReorderLevel.php:194
#: ReorderLevelLocation.php:12 SelectProduct.php:89 StockDispatch.php:319
@@ -959,15 +964,16 @@
#: AgedControlledInventory.php:43 AutomaticTranslationDescriptions.php:37
#: BOMIndented.php:315 BOMIndentedReverse.php:293 BOMInquiry.php:109
-#: BOMInquiry.php:198 BOMs.php:567 BOMs.php:914 ContractBOM.php:242
-#: ContractBOM.php:354 ContractOtherReqts.php:98 CounterReturns.php:1692
-#: CounterSales.php:2102 CounterSales.php:2256 CreditStatus.php:152
-#: CreditStatus.php:243 CustomerPurchases.php:81 EmailConfirmation.php:219
+#: BOMInquiry.php:198 BOMs.php:567 BOMs.php:914 CollectiveWorkOrderCost.php:45
+#: CollectiveWorkOrderCost.php:317 ContractBOM.php:242 ContractBOM.php:354
+#: ContractOtherReqts.php:98 CounterReturns.php:1692 CounterSales.php:2102
+#: CounterSales.php:2256 CreditStatus.php:152 CreditStatus.php:243
+#: CustomerPurchases.php:81 EmailConfirmation.php:219
#: EmailConfirmation.php:349 FixedAssetCategories.php:167
#: FixedAssetDepreciation.php:91 FixedAssetRegister.php:87
#: FixedAssetRegister.php:388 FixedAssetTransfer.php:60
#: FixedAssetTransfer.php:162 GLTags.php:63 GLTags.php:82
-#: GLTransInquiry.php:49 GoodsReceived.php:101
+#: GLTransInquiry.php:49 GoodsReceived.php:122
#: InternalStockCategoriesByRole.php:168 InternalStockRequest.php:345
#: InternalStockRequest.php:559 InternalStockRequest.php:629
#: InventoryPlanning.php:419 InventoryQuantities.php:246
@@ -982,18 +988,18 @@
#: PaymentTerms.php:182 PcExpenses.php:190 PcExpenses.php:296
#: PcExpensesTypeTab.php:171 PcReportTab.php:178 PcTypeTabs.php:164
#: PricesByCost.php:153 RelatedItemsUpdate.php:154 ReorderLevel.php:298
-#: ReorderLevelLocation.php:73 ReverseGRN.php:397 SalesCategories.php:509
+#: ReorderLevelLocation.php:73 ReverseGRN.php:400 SalesCategories.php:509
#: SecurityTokens.php:94 SecurityTokens.php:103 SecurityTokens.php:120
#: SelectAsset.php:264 SelectCompletedOrder.php:505 SelectContract.php:147
-#: SelectCreditItems.php:1021 SelectOrderItems.php:1477
-#: SelectOrderItems.php:1639 SelectProduct.php:522 SelectProduct.php:748
+#: SelectCreditItems.php:1021 SelectOrderItems.php:1479
+#: SelectOrderItems.php:1641 SelectProduct.php:538 SelectProduct.php:826
#: SelectQASamples.php:299 SelectQASamples.php:397 SelectSalesOrder.php:560
-#: SelectWorkOrder.php:219 Shipt_Select.php:191 StockClone.php:680
-#: StockCounts.php:142 StockDispatch.php:504 StockLocStatus.php:173
+#: SelectWorkOrder.php:219 Shipt_Select.php:191 StockClone.php:679
+#: StockCounts.php:142 StockDispatch.php:504 StockLocStatus.php:176
#: StockQuantityByDate.php:109 Stocks.php:1013 SuppCreditGRNs.php:92
-#: SuppCreditGRNs.php:192 SuppFixedAssetChgs.php:78 SuppInvGRNs.php:120
-#: SuppInvGRNs.php:258 SuppPriceList.php:309 SupplierCredit.php:317
-#: SupplierCredit.php:385 SupplierInvoice.php:666 SupplierInvoice.php:746
+#: SuppCreditGRNs.php:192 SuppFixedAssetChgs.php:78 SuppInvGRNs.php:122
+#: SuppInvGRNs.php:264 SuppPriceList.php:309 SupplierCredit.php:317
+#: SupplierCredit.php:385 SupplierInvoice.php:668 SupplierInvoice.php:750
#: SupplierPriceList.php:39 SupplierPriceList.php:271
#: SupplierPriceList.php:533 SupplierTenderCreate.php:434
#: SupplierTenderCreate.php:695 SupplierTenderCreate.php:853
@@ -1001,7 +1007,7 @@
#: TestPlanResults.php:177 TestPlanResults.php:280 TopItems.php:170
#: WorkCentres.php:128 WorkOrderCosting.php:98 WorkOrderCosting.php:130
#: WorkOrderEntry.php:735 WorkOrderIssue.php:761 Z_ItemsWithoutPicture.php:33
-#: api/api_xml-rpc.php:3489 includes/PDFGrnHeader.inc:29
+#: api/api_xml-rpc.php:3489 includes/PDFGrnHeader.inc:30
#: includes/PDFInventoryPlanPageHeader.inc:51
#: includes/PDFOstdgGRNsPageHeader.inc:38
#: includes/PDFStockLocTransferHeader.inc:65
@@ -1035,12 +1041,12 @@
#: CounterSales.php:855 Credit_Invoice.php:298 Credit_Invoice.php:302
#: CustomerAllocations.php:349 CustomerAllocations.php:379
#: CustomerInquiry.php:256 DeliveryDetails.php:884 DeliveryDetails.php:953
-#: GLBalanceSheet.php:195 GLBalanceSheet.php:207 GLBalanceSheet.php:297
-#: GLBalanceSheet.php:306 GLBudgets.php:213 GLJournal.php:435
-#: GLTransInquiry.php:195 GLTrialBalance.php:223 GLTrialBalance.php:243
-#: GLTrialBalance.php:264 GLTrialBalance.php:360 GLTrialBalance.php:491
-#: GLTrialBalance.php:511 GLTrialBalance.php:535 GLTrialBalance.php:647
-#: GLTrialBalance.php:667 GLTrialBalance.php:691 InventoryValuation.php:197
+#: GLBalanceSheet.php:196 GLBalanceSheet.php:208 GLBalanceSheet.php:298
+#: GLBalanceSheet.php:307 GLBudgets.php:213 GLJournal.php:436
+#: GLTransInquiry.php:219 GLTrialBalance.php:225 GLTrialBalance.php:245
+#: GLTrialBalance.php:266 GLTrialBalance.php:362 GLTrialBalance.php:495
+#: GLTrialBalance.php:515 GLTrialBalance.php:539 GLTrialBalance.php:651
+#: GLTrialBalance.php:671 GLTrialBalance.php:695 InventoryValuation.php:197
#: MaterialsNotUsed.php:77 OffersReceived.php:111 OrderDetails.php:177
#: OutstandingGRNs.php:246 PDFCustTransListing.php:137
#: PDFOrdersInvoiced.php:379 PDFRemittanceAdvice.php:310
@@ -1048,7 +1054,7 @@
#: SalesByTypePeriodInquiry.php:395 SalesByTypePeriodInquiry.php:430
#: SalesByTypePeriodInquiry.php:465 SalesByTypePeriodInquiry.php:500
#: SalesByTypePeriodInquiry.php:561 SelectCreditItems.php:692
-#: SelectCreditItems.php:696 SelectOrderItems.php:1317
+#: SelectCreditItems.php:696 SelectOrderItems.php:1319
#: SuppContractChgs.php:107 SuppFixedAssetChgs.php:97 SuppShiptChgs.php:97
#: SuppTransGLAnalysis.php:139 SupplierAllocations.php:458
#: SupplierAllocations.php:570 SupplierAllocations.php:645
@@ -1081,8 +1087,8 @@
#: AgedSuppliers.php:108 BOMExtendedQty.php:154 BOMIndented.php:153
#: BOMIndentedReverse.php:140 BOMListing.php:42 BOMListing.php:53
#: DebtorsAtPeriodEnd.php:57 DebtorsAtPeriodEnd.php:69 GLBalanceSheet.php:112
-#: GLBalanceSheet.php:151 GLProfit_Loss.php:187 GLTagProfit_Loss.php:194
-#: GLTrialBalance.php:165 InternalStockRequest.php:320
+#: GLBalanceSheet.php:152 GLProfit_Loss.php:188 GLTagProfit_Loss.php:195
+#: GLTrialBalance.php:167 InternalStockRequest.php:320
#: InventoryPlanning.php:99 InventoryPlanning.php:176
#: InventoryPlanning.php:213 InventoryPlanning.php:262
#: InventoryPlanningPrefSupplier.php:183 InventoryPlanningPrefSupplier.php:241
@@ -1119,10 +1125,10 @@
#: BOMIndentedReverse.php:144 BOMIndentedReverse.php:222 BOMListing.php:45
#: Credit_Invoice.php:201 Dashboard.php:146 Dashboard.php:257
#: Dashboard.php:438 DebtorsAtPeriodEnd.php:60 DebtorsAtPeriodEnd.php:72
-#: FTP_RadioBeacon.php:187 GLBalanceSheet.php:116 GLBalanceSheet.php:154
-#: GLBalanceSheet.php:333 GLProfit_Loss.php:190 GLProfit_Loss.php:202
-#: GLTagProfit_Loss.php:198 GLTagProfit_Loss.php:211 GLTrialBalance.php:168
-#: GLTrialBalance.php:180 GetStockImage.php:150 InventoryPlanning.php:102
+#: FTP_RadioBeacon.php:187 GLBalanceSheet.php:116 GLBalanceSheet.php:155
+#: GLBalanceSheet.php:334 GLProfit_Loss.php:191 GLProfit_Loss.php:203
+#: GLTagProfit_Loss.php:199 GLTagProfit_Loss.php:212 GLTrialBalance.php:170
+#: GLTrialBalance.php:182 GetStockImage.php:150 InventoryPlanning.php:102
#: InventoryPlanning.php:179 InventoryPlanning.php:216
#: InventoryPlanning.php:265 InventoryPlanning.php:340
#: InventoryPlanningPrefSupplier.php:186 InventoryPlanningPrefSupplier.php:244
@@ -1138,8 +1144,8 @@
#: MailInventoryValuation.php:243 MailInventoryValuation.php:251
#: OutstandingGRNs.php:49 OutstandingGRNs.php:62 PDFCustomerList.php:235
#: PDFCustomerList.php:247 PDFFGLabel.php:217 PDFGLJournal.php:100
-#: PDFGrn.php:176 PDFLowGP.php:59 PDFLowGP.php:71 PDFPriceList.php:147
-#: PDFPrintLabel.php:45 PDFQALabel.php:116 PDFQuotation.php:276
+#: PDFGrn.php:180 PDFLowGP.php:59 PDFLowGP.php:71 PDFPriceList.php:147
+#: PDFPrintLabel.php:42 PDFQALabel.php:116 PDFQuotation.php:276
#: PDFQuotationPortrait.php:268 PDFRemittanceAdvice.php:83
#: PDFSalesBySalesperson.php:160 PDFSalesBySalesperson.php:168
#: PDFSellThroughSupportClaim.php:74 PDFSellThroughSupportClaim.php:86
@@ -1177,7 +1183,7 @@
msgstr ""
#: AgedDebtors.php:371 AgedSuppliers.php:197 Dashboard.php:256
-#: GLAccountCSV.php:175 GLAccountInquiry.php:161 GLAccountReport.php:97
+#: GLAccountCSV.php:179 GLAccountInquiry.php:167 GLAccountReport.php:97
#: PO_Items.php:451 PO_Items.php:580 PO_Items.php:605
#: PurchaseByPrefSupplier.php:29 PurchaseByPrefSupplier.php:54
#: SalesAnalReptCols.php:365 SpecialOrder.php:448
@@ -1186,35 +1192,35 @@
msgid "could not be retrieved because"
msgstr ""
-#: AgedDebtors.php:374 AgedSuppliers.php:200 AnalysisHorizontalIncome.php:199
+#: AgedDebtors.php:374 AgedSuppliers.php:200 AnalysisHorizontalIncome.php:200
#: Areas.php:94 ConfirmDispatch_Invoice.php:172
#: ConfirmDispatch_Invoice.php:1005 ConfirmDispatch_Invoice.php:1019
#: Contracts.php:592 CounterReturns.php:1024 CounterReturns.php:1038
#: CounterSales.php:1425 CounterSales.php:1439 Credit_Invoice.php:754
#: Credit_Invoice.php:775 CustItem.php:73 CustItem.php:86 CustItem.php:197
-#: CustomerReceipt.php:574 CustomerReceipt.php:726 CustomerReceipt.php:754
+#: CustomerReceipt.php:580 CustomerReceipt.php:733 CustomerReceipt.php:761
#: CustomerTransInquiry.php:91 Dashboard.php:259 Dashboard.php:440
-#: DeliveryDetails.php:412 GLProfit_Loss.php:611 GLTagProfit_Loss.php:515
+#: DeliveryDetails.php:412 GLProfit_Loss.php:613 GLTagProfit_Loss.php:516
#: PDFRemittanceAdvice.php:85 Payments.php:361 PurchData.php:114
#: PurchData.php:132 PurchData.php:360 RecurringSalesOrders.php:267
-#: ReverseGRN.php:192 ReverseGRN.php:206 ReverseGRN.php:385 SMTPServer.php:66
+#: ReverseGRN.php:193 ReverseGRN.php:207 ReverseGRN.php:387 SMTPServer.php:66
#: SelectCreditItems.php:1447 SelectSalesOrder.php:209
#: SelectSalesOrder.php:375 SellThroughSupport.php:81
#: SellThroughSupport.php:97 StockCheck.php:217 StockClone.php:430
#: StockClone.php:504 StockCostUpdate.php:78 StockCostUpdate.php:88
-#: StockLocStatus.php:165 StockLocTransferReceive.php:215
+#: StockLocStatus.php:167 StockLocTransferReceive.php:215
#: StockLocTransferReceive.php:368 StockMovements.php:98
#: StockQuantityByDate.php:98 StockReorderLevel.php:45 StockStatus.php:285
#: StockTransfers.php:202 StockTransfers.php:232 StockTransfers.php:387
#: StockUsage.php:142 StockUsageGraph.php:55 SuppPaymentRun.php:114
#: SuppPaymentRun.php:188 SuppPaymentRun.php:219 SupplierInquiry.php:79
#: SupplierInquiry.php:101 SupplierInquiry.php:139 SupplierInquiry.php:195
-#: SupplierPriceList.php:382 SupplierTransInquiry.php:97 WOSerialNos.php:49
+#: SupplierPriceList.php:382 SupplierTransInquiry.php:103 WOSerialNos.php:49
#: WorkOrderCosting.php:427 WorkOrderReceive.php:305
#: Z_ChangeBranchCode.php:112 Z_ChangeCustomerCode.php:97
#: Z_ChangeSupplierCode.php:88 Z_DeleteCreditNote.php:63
#: Z_DeleteCreditNote.php:73 Z_DeleteCreditNote.php:82 Z_DeleteInvoice.php:88
-#: Z_DeleteInvoice.php:98 Z_DeleteInvoice.php:110 Z_UpdateItemCosts.php:90
+#: Z_DeleteInvoice.php:98 Z_DeleteInvoice.php:110 Z_UpdateItemCosts.php:93
#: includes/ConnectDB_mysql.inc:66 includes/ConnectDB_mysqli.inc:74
#: includes/PDFPaymentRun_PymtFooter.php:61
#: includes/PDFPaymentRun_PymtFooter.php:91
@@ -1371,10 +1377,10 @@
#: AnalysisHorizontalIncome.php:10 AnalysisHorizontalPosition.php:10
#: BOMs.php:126 BOMs.php:132 BOMs.php:140 BOMs.php:932 BankAccounts.php:369
-#: InternalStockRequest.php:579 PO_SelectOSPurchOrder.php:621
+#: InternalStockRequest.php:579 PO_SelectOSPurchOrder.php:627
#: PaymentTerms.php:190 PaymentTerms.php:196 SalesAnalReptCols.php:285
-#: SelectProduct.php:135 SelectProduct.php:185 SelectProduct.php:246
-#: SelectProduct.php:247 SelectProduct.php:768
+#: SelectProduct.php:135 SelectProduct.php:184 SelectProduct.php:244
+#: SelectProduct.php:245 SelectProduct.php:846
#: StockCategorySalesInquiry.php:154 StockCategorySalesInquiry.php:188
#: StockCategorySalesInquiry.php:189 StockCategorySalesInquiry.php:194
#: StockCategorySalesInquiry.php:217 StockCategorySalesInquiry.php:230
@@ -1384,7 +1390,7 @@
#: AnalysisHorizontalIncome.php:15 AnalysisHorizontalIncome.php:31
#: AnalysisHorizontalIncome.php:146 AnalysisHorizontalIncome.php:147
-#: includes/MainMenuLinksArray.php:374
+#: includes/MainMenuLinksArray.php:376
msgid "Horizontal Analysis of Statement of Comprehensive Income"
msgstr ""
@@ -1473,49 +1479,49 @@
msgid "Show on Screen (HTML)"
msgstr ""
-#: AnalysisHorizontalIncome.php:121 AnalysisHorizontalIncome.php:521
-#: AnalysisHorizontalPosition.php:88 AnalysisHorizontalPosition.php:370
-#: DailyBankTransactions.php:190 GLBalanceSheet.php:718 GLProfit_Loss.php:1315
-#: GLTrialBalance.php:736
+#: AnalysisHorizontalIncome.php:121 AnalysisHorizontalIncome.php:522
+#: AnalysisHorizontalPosition.php:88 AnalysisHorizontalPosition.php:371
+#: DailyBankTransactions.php:255 GLAccountUsers.php:253 GLBalanceSheet.php:720
+#: GLProfit_Loss.php:1317 GLTrialBalance.php:740 UserGLAccounts.php:259
msgid "Return"
msgstr ""
#: AnalysisHorizontalIncome.php:131 GLProfit_Loss.php:147
-#: GLProfit_Loss.php:576 GLTagProfit_Loss.php:155 GLTagProfit_Loss.php:479
+#: GLProfit_Loss.php:577 GLTagProfit_Loss.php:155 GLTagProfit_Loss.php:480
msgid "A period up to 12 months in duration can be specified"
msgstr ""
#: AnalysisHorizontalIncome.php:131 GLProfit_Loss.php:147
-#: GLProfit_Loss.php:576 GLTagProfit_Loss.php:155 GLTagProfit_Loss.php:479
+#: GLProfit_Loss.php:577 GLTagProfit_Loss.php:155 GLTagProfit_Loss.php:480
msgid ""
"the system automatically shows a comparative for the same period from the "
"previous year"
msgstr ""
#: AnalysisHorizontalIncome.php:131 GLProfit_Loss.php:147
-#: GLProfit_Loss.php:576 GLTagProfit_Loss.php:155 GLTagProfit_Loss.php:479
+#: GLProfit_Loss.php:577 GLTagProfit_Loss.php:155 GLTagProfit_Loss.php:480
msgid "it cannot do this if a period of more than 12 months is specified"
msgstr ""
#: AnalysisHorizontalIncome.php:131 GLProfit_Loss.php:147
-#: GLProfit_Loss.php:576 GLTagProfit_Loss.php:155 GLTagProfit_Loss.php:479
+#: GLProfit_Loss.php:577 GLTagProfit_Loss.php:155 GLTagProfit_Loss.php:480
msgid "Please select an alternative period range"
msgstr ""
-#: AnalysisHorizontalIncome.php:149 FreightCosts.php:76 GLProfit_Loss.php:622
+#: AnalysisHorizontalIncome.php:149 FreightCosts.php:76 GLProfit_Loss.php:624
#: MRPReport.php:446 SalesGraph.php:229 SalesGraph.php:237
msgid "For"
msgstr ""
-#: AnalysisHorizontalIncome.php:149 GLProfit_Loss.php:622
-#: GLTagProfit_Loss.php:529 GLTrialBalance.php:440 Tax.php:25
+#: AnalysisHorizontalIncome.php:149 GLProfit_Loss.php:624
+#: GLTagProfit_Loss.php:530 GLTrialBalance.php:444 Tax.php:25
#: includes/PDFTaxPageHeader.inc:31
msgid "months to"
msgstr ""
#: AnalysisHorizontalIncome.php:150 AnalysisHorizontalPosition.php:113
#: Contracts.php:829 CustomerAccount.php:230 CustomerInquiry.php:162
-#: CustomerReceipt.php:1022 GLBalanceSheet.php:402 GLProfit_Loss.php:624
+#: CustomerReceipt.php:1029 GLBalanceSheet.php:404 GLProfit_Loss.php:626
#: PDFRemittanceAdvice.php:275 PO_Header.php:609 PrintCustTrans.php:776
#: PrintCustTransPortrait.php:933 SupplierInquiry.php:121
#: includes/PDFQuotationPageHeader.inc:88
@@ -1527,10 +1533,10 @@
msgstr ""
#: AnalysisHorizontalIncome.php:155 AnalysisHorizontalPosition.php:118
-#: GLAccountInquiry.php:47 GLAccounts.php:196 GLBalanceSheet.php:408
-#: GLProfit_Loss.php:633 GLTagProfit_Loss.php:536 GLTrialBalance.php:448
+#: GLAccountInquiry.php:49 GLAccounts.php:196 GLBalanceSheet.php:410
+#: GLProfit_Loss.php:635 GLTagProfit_Loss.php:537 GLTrialBalance.php:452
#: ImportBankTransAnalysis.php:206 PrintCustTransPortrait.php:96
-#: SuppTransGLAnalysis.php:107 SupplierCredit.php:458 SupplierInvoice.php:828
+#: SuppTransGLAnalysis.php:107 SupplierCredit.php:458 SupplierInvoice.php:832
#: includes/PDFProfitAndLossPageHeader.inc:31
#: includes/PDFTagProfitAndLossPageHeader.inc:33
#: includes/PDFTrialBalancePageHeader.inc:28
@@ -1539,9 +1545,9 @@
#: AnalysisHorizontalIncome.php:156 AnalysisHorizontalPosition.php:119
#: Dashboard.php:533 GLAccounts.php:242 GLAccounts.php:295
-#: GLBalanceSheet.php:409 GLCodesInquiry.php:27 GLProfit_Loss.php:634
-#: GLTagProfit_Loss.php:537 GLTrialBalance.php:449 SelectGLAccount.php:113
-#: SupplierCredit.php:459 SupplierInvoice.php:829
+#: GLBalanceSheet.php:411 GLCodesInquiry.php:27 GLProfit_Loss.php:636
+#: GLTagProfit_Loss.php:538 GLTrialBalance.php:453 SelectGLAccount.php:126
+#: SupplierCredit.php:459 SupplierInvoice.php:833
#: Z_CreateCompanyTemplateFile.php:237
#: includes/PDFProfitAndLossPageHeader.inc:32
#: includes/PDFTagProfitAndLossPageHeader.inc:34
@@ -1550,8 +1556,8 @@
msgstr ""
#: AnalysisHorizontalIncome.php:161 AnalysisHorizontalPosition.php:124
-#: GLBalanceSheet.php:411 GLBalanceSheet.php:417 GLProfit_Loss.php:637
-#: GLProfit_Loss.php:644 includes/PDFBalanceSheetPageHeader.inc:30
+#: GLBalanceSheet.php:413 GLBalanceSheet.php:419 GLProfit_Loss.php:639
+#: GLProfit_Loss.php:646 includes/PDFBalanceSheetPageHeader.inc:30
#: includes/PDFProfitAndLossPageHeader.inc:35
#: includes/PDFTagProfitAndLossPageHeader.inc:37
msgid "Last Year"
@@ -1579,62 +1585,62 @@
"that account."
msgstr ""
-#: AnalysisHorizontalIncome.php:199 AnalysisHorizontalPosition.php:174
-#: GLBalanceSheet.php:153 GLBalanceSheet.php:390 GLCodesInquiry.php:18
-#: GLProfit_Loss.php:189 GLProfit_Loss.php:611 GLTagProfit_Loss.php:196
-#: GLTagProfit_Loss.php:515 GLTrialBalance.php:167 GLTrialBalance.php:434
+#: AnalysisHorizontalIncome.php:200 AnalysisHorizontalPosition.php:175
+#: GLBalanceSheet.php:154 GLBalanceSheet.php:392 GLCodesInquiry.php:18
+#: GLProfit_Loss.php:190 GLProfit_Loss.php:613 GLTagProfit_Loss.php:197
+#: GLTagProfit_Loss.php:516 GLTrialBalance.php:169 GLTrialBalance.php:438
msgid "No general ledger accounts were returned by the SQL because"
msgstr ""
-#: AnalysisHorizontalIncome.php:230 AnalysisHorizontalIncome.php:251
-#: AnalysisHorizontalIncome.php:406 AnalysisHorizontalIncome.php:437
-#: GLProfit_Loss.php:240 GLProfit_Loss.php:269 GLProfit_Loss.php:437
-#: GLProfit_Loss.php:466 GLProfit_Loss.php:682 GLProfit_Loss.php:728
-#: GLProfit_Loss.php:1041 GLProfit_Loss.php:1086 GLTagProfit_Loss.php:239
-#: GLTagProfit_Loss.php:264 GLTagProfit_Loss.php:384 GLTagProfit_Loss.php:407
-#: GLTagProfit_Loss.php:579 GLTagProfit_Loss.php:613 GLTagProfit_Loss.php:798
-#: GLTagProfit_Loss.php:824
+#: AnalysisHorizontalIncome.php:231 AnalysisHorizontalIncome.php:252
+#: AnalysisHorizontalIncome.php:407 AnalysisHorizontalIncome.php:438
+#: GLProfit_Loss.php:241 GLProfit_Loss.php:270 GLProfit_Loss.php:438
+#: GLProfit_Loss.php:467 GLProfit_Loss.php:684 GLProfit_Loss.php:730
+#: GLProfit_Loss.php:1043 GLProfit_Loss.php:1088 GLTagProfit_Loss.php:240
+#: GLTagProfit_Loss.php:265 GLTagProfit_Loss.php:385 GLTagProfit_Loss.php:408
+#: GLTagProfit_Loss.php:580 GLTagProfit_Loss.php:614 GLTagProfit_Loss.php:799
+#: GLTagProfit_Loss.php:825
msgid "total"
msgstr ""
-#: AnalysisHorizontalIncome.php:311 AnalysisHorizontalIncome.php:480
-#: Contracts.php:937 GLProfit_Loss.php:323 GLProfit_Loss.php:516
-#: GLProfit_Loss.php:829 GLProfit_Loss.php:1186 GLTagProfit_Loss.php:309
-#: GLTagProfit_Loss.php:447 GLTagProfit_Loss.php:684 GLTagProfit_Loss.php:883
+#: AnalysisHorizontalIncome.php:312 AnalysisHorizontalIncome.php:481
+#: Contracts.php:937 GLProfit_Loss.php:324 GLProfit_Loss.php:517
+#: GLProfit_Loss.php:831 GLProfit_Loss.php:1188 GLTagProfit_Loss.php:310
+#: GLTagProfit_Loss.php:448 GLTagProfit_Loss.php:685 GLTagProfit_Loss.php:884
#: PDFPriceList.php:431 SalesAnalReptCols.php:31 SalesAnalReptCols.php:33
#: SalesByTypePeriodInquiry.php:362 SalesCategoryPeriodInquiry.php:169
#: SalesGraph.php:196 SalesGraph.php:215 SalesGraph.php:278
-#: SelectProduct.php:180
+#: SelectProduct.php:179
#, php-format
msgid "Gross Profit"
msgstr ""
-#: AnalysisHorizontalIncome.php:322
+#: AnalysisHorizontalIncome.php:323
msgid "Earnings after"
msgstr ""
-#: AnalysisHorizontalIncome.php:500
+#: AnalysisHorizontalIncome.php:501
msgid "Net Profit"
msgstr ""
-#: AnalysisHorizontalIncome.php:517 AnalysisHorizontalPosition.php:366
-#: DailyBankTransactions.php:184 GLBalanceSheet.php:714 GLProfit_Loss.php:1311
-#: GLTrialBalance.php:732
+#: AnalysisHorizontalIncome.php:518 AnalysisHorizontalPosition.php:367
+#: DailyBankTransactions.php:249 GLAccountUsers.php:248 GLBalanceSheet.php:716
+#: GLProfit_Loss.php:1313 GLTrialBalance.php:736 UserGLAccounts.php:254
msgid "Print This"
msgstr ""
-#: AnalysisHorizontalIncome.php:518 AnalysisHorizontalIncome.php:519
-#: AnalysisHorizontalPosition.php:367 AnalysisHorizontalPosition.php:368
-#: DailyBankTransactions.php:185 GLBalanceSheet.php:715 GLProfit_Loss.php:1312
-#: GLProfit_Loss.php:1313 GLTagProfit_Loss.php:938 GLTrialBalance.php:24
-#: GLTrialBalance.php:733 GLTrialBalance.php:734 SalesGraph.php:20
+#: AnalysisHorizontalIncome.php:519 AnalysisHorizontalIncome.php:520
+#: AnalysisHorizontalPosition.php:368 AnalysisHorizontalPosition.php:369
+#: DailyBankTransactions.php:250 GLBalanceSheet.php:717 GLProfit_Loss.php:1314
+#: GLProfit_Loss.php:1315 GLTagProfit_Loss.php:939 GLTrialBalance.php:24
+#: GLTrialBalance.php:737 GLTrialBalance.php:738 SalesGraph.php:20
#: SalesGraph.php:29 SalesGraph.php:34
msgid "Select A Different Period"
msgstr ""
#: AnalysisHorizontalPosition.php:15 AnalysisHorizontalPosition.php:28
#: AnalysisHorizontalPosition.php:109 AnalysisHorizontalPosition.php:110
-#: includes/MainMenuLinksArray.php:375
+#: includes/MainMenuLinksArray.php:377
msgid "Horizontal Analysis of Statement of Financial Position"
msgstr ""
@@ -1646,7 +1652,7 @@
msgid "Select the balance date"
msgstr ""
-#: AnalysisHorizontalPosition.php:112 GLBalanceSheet.php:401
+#: AnalysisHorizontalPosition.php:112 GLBalanceSheet.php:403
#: includes/PDFDebtorBalsPageHeader.inc:17
#: includes/PDFSupplierBalsPageHeader.inc:17
msgid "as at"
@@ -1659,14 +1665,14 @@
msgstr ""
#: AnalysisHorizontalPosition.php:148 GLBalanceSheet.php:114
-#: GLBalanceSheet.php:364
+#: GLBalanceSheet.php:365
msgid ""
"The accumulated profits brought forward could not be calculated by the SQL "
"because"
msgstr ""
-#: AnalysisHorizontalPosition.php:350 GLBalanceSheet.php:325
-#: GLBalanceSheet.php:694
+#: AnalysisHorizontalPosition.php:351 GLBalanceSheet.php:326
+#: GLBalanceSheet.php:696
#, php-format
msgid "Check Total"
msgstr ""
@@ -1738,7 +1744,7 @@
#: Areas.php:131 CustomerTypes.php:167 Factors.php:140
#: FixedAssetCategories.php:142 GLAccounts.php:196
#: InternalStockCategoriesByRole.php:102 Locations.php:380 MRPDemands.php:250
-#: Manufacturers.php:163 PcAssignCashToTab.php:138
+#: Manufacturers.php:163 PcAssignCashToTab.php:149
#: PcClaimExpensesFromTab.php:130 PcExpenses.php:169 PcExpensesTypeTab.php:101
#: PcTabs.php:168 PcTypeTabs.php:143 SalesAnalReptCols.php:215
#: SalesCategories.php:139 SalesTypes.php:156 StockCategories.php:233
@@ -1791,13 +1797,15 @@
msgid "User ID"
msgstr ""
-#: AuditTrai...
[truncated message content] |
|
From: <rc...@us...> - 2015-12-29 18:09:05
|
Revision: 7434
http://sourceforge.net/p/web-erp/reponame/7434
Author: rchacon
Date: 2015-12-29 18:09:02 +0000 (Tue, 29 Dec 2015)
Log Message:
-----------
Modified Paths:
--------------
trunk/doc/Change.log
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-12-29 18:06:35 UTC (rev 7433)
+++ trunk/doc/Change.log 2015-12-29 18:09:02 UTC (rev 7434)
@@ -1,5 +1,6 @@
webERP Change Log
+29/12/15 RChacon: On GLAccountUsers.php: Fix script name; add $ViewTopic and $BookMark; improve $SelectedGLAccount validation; improve page_title_text; improve select GL account; regroup modify access permission code (improve logic); add classes to table elements; translate database "0" and "1" to human "No" and "Yes"; simplify and tide code; modify prnMsg from multiple part sentence to one part sentence (better to translate when language use a different grammar structure from English); add "Print This", "Select A Different GL account" and "Return" buttons. Add info to ManualGeneralLedger.html.
28/12/15 Exson: Fixed the bug that discount not modified for items whose discount is null in discount matrix in SelectOrderItems.php.
27/12/15 RChacon: On UserGLAccounts.php: Fix script name; add $ViewTopic and $BookMark; improve $SelectedUser validation; improve page_title_text; improve select user; regroup modify access permission code (improve logic); add classes to table elements; translate database "0" and "1" to human "No" and "Yes"; simplify and tide code; modify prnMsg from multiple part sentence to one part sentence (better to translate when language use a different grammar structure from English); add "Print This", "Select A Different User" and "Return" buttons. Add info to ManualGeneralLedger.html.
26/12/2015 Exson: Add items not received information on outstanding po inquiry screen in PO_SelectOSPurchOrder.php.
|
|
From: <rc...@us...> - 2015-12-29 18:06:38
|
Revision: 7433
http://sourceforge.net/p/web-erp/reponame/7433
Author: rchacon
Date: 2015-12-29 18:06:35 +0000 (Tue, 29 Dec 2015)
Log Message:
-----------
On GLAccountUsers.php: Fix script name; add $ViewTopic and $BookMark; improve $SelectedGLAccount validation; improve page_title_text; improve select GL account; regroup modify access permission code (improve logic); add classes to table elements; translate database "0" and "1" to human "No" and "Yes"; simplify and tide code; modify prnMsg from multiple part sentence to one part sentence (better to translate when language use a different grammar structure from English); add "Print This", "Select A Different GL account" and "Return" buttons. Add info to ManualGeneralLedger.html.
Modified Paths:
--------------
trunk/GLAccountUsers.php
trunk/UserGLAccounts.php
trunk/doc/Manual/ManualGeneralLedger.html
Modified: trunk/GLAccountUsers.php
===================================================================
--- trunk/GLAccountUsers.php 2015-12-28 03:50:00 UTC (rev 7432)
+++ trunk/GLAccountUsers.php 2015-12-29 18:06:35 UTC (rev 7433)
@@ -1,261 +1,258 @@
<?php
-/* $Id: glaccountusers.php 6806 2013-09-28 05:10:46Z daintree $*/
+/* $Id: GLAccountUsers.php 7385 2015-11-11 05:10:46Z tehonu $*/
+/* Maintenance of GL Accounts allowed for a user. */
include('includes/session.inc');
-$Title = _('GL Account Authorised Users Maintenance');
+$Title = _('GL Account Authorised Users');
+$ViewTopic = 'GeneralLedger';
+$BookMark = 'GLAccountUsers';
include('includes/header.inc');
-echo '<p class="page_title_text"><img src="' . $RootPath . '/css/' . $Theme . '/images/money_add.png" title="' . _('GL Account Authorised Users') . '" alt="" />' . ' ' . $Title . '</p>';
+if(isset($_POST['SelectedGLAccount']) and $_POST['SelectedGLAccount']<>'') {//If POST not empty:
+ $SelectedGLAccount = mb_strtoupper($_POST['SelectedGLAccount']);
+} elseif(isset($_GET['SelectedGLAccount']) and $_GET['SelectedGLAccount']<>'') {//If GET not empty:
+ $SelectedGLAccount = mb_strtoupper($_GET['SelectedGLAccount']);
+} else {// Unset empty SelectedGLAccount:
+ unset($_GET['SelectedGLAccount']);
+ unset($_POST['SelectedGLAccount']);
+ unset($SelectedGLAccount);
+}
-if (isset($_POST['SelectedUser'])) {
+if(isset($_POST['SelectedUser']) and $_POST['SelectedUser']<>'') {//If POST not empty:
$SelectedUser = mb_strtoupper($_POST['SelectedUser']);
-} elseif (isset($_GET['SelectedUser'])) {
+} elseif(isset($_GET['SelectedUser']) and $_GET['SelectedGLAccount']<>'') {//If GET not empty:
$SelectedUser = mb_strtoupper($_GET['SelectedUser']);
-} else {
- $SelectedUser = '';
+} else {// Unset empty SelectedUser:
+ unset($_GET['SelectedUser']);
+ unset($_POST['SelectedUser']);
+ unset($SelectedUser);
}
-if (isset($_POST['SelectedGLAccount'])) {
- $SelectedGLAccount = mb_strtoupper($_POST['SelectedGLAccount']);
-} elseif (isset($_GET['SelectedGLAccount'])) {
- $SelectedGLAccount = mb_strtoupper($_GET['SelectedGLAccount']);
-}
-
-if (isset($_POST['Cancel'])) {
+if(isset($_POST['Cancel']) or isset($_GET['Cancel'] )) {
unset($SelectedGLAccount);
unset($SelectedUser);
}
-if (isset($_POST['Process'])) {
- if ($_POST['SelectedGLAccount'] == '') {
- prnMsg(_('You have not selected any GL Account'), 'error');
- echo '<br />';
- unset($SelectedGLAccount);
- unset($_POST['SelectedGLAccount']);
- }
-}
-if (isset($_POST['submit'])) {
+if(!isset($SelectedGLAccount)) {// If is NOT set a GL account for users.
- $InputError = 0;
+ /* It could still be the second time the page has been run and a record has been selected for modification - SelectedUser will exist because it was sent with the new call. If its the first time the page has been displayed with no parameters then none of the above are true. These will call the same page again and allow update/input or deletion of the records*/
- if ($_POST['SelectedUser'] == '') {
- $InputError = 1;
- prnMsg(_('You have not selected an user to be authorised to use this GL Account'), 'error');
- echo '<br />';
- unset($SelectedGLAccount);
+ echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/gl.png" title="',// Icon image.
+ _('GL Account Authorised Users'), '" /> ',// Icon title.
+ _('GL Account Authorised Users'), '</p>';// Page title.
+ if(isset($_POST['Process'])) {
+ prnMsg(_('You have not selected any GL Account'), 'error');
}
-
- if ($InputError != 1) {
-
- // First check the user is not being duplicated
-
- $CheckSql = "SELECT count(*)
- FROM glaccountusers
- WHERE accountcode= '" . $_POST['SelectedGLAccount'] . "'
- AND userid = '" . $_POST['SelectedUser'] . "'";
-
- $CheckResult = DB_query($CheckSql);
- $CheckRow = DB_fetch_row($CheckResult);
-
- if ($CheckRow[0] > 0) {
- $InputError = 1;
- prnMsg(_('The user') . ' ' . $_POST['SelectedUser'] . ' ' . _('is already authorised to use this GL Account'), 'error');
- } else {
- // Add new record on submit
- $SQL = "INSERT INTO glaccountusers (accountcode,
- userid,
- canview,
- canupd)
- VALUES ('" . $_POST['SelectedGLAccount'] . "',
- '" . $_POST['SelectedUser'] . "',
- '1',
- '1')";
-
- $msg = _('User') . ': ' . $_POST['SelectedUser'] . ' ' . _('authority to use the') . ' ' . $_POST['SelectedGLAccount'] . ' ' . _('GL Account has been changed');
- $Result = DB_query($SQL);
- prnMsg($msg, 'success');
- unset($_POST['SelectedUser']);
- }
- }
-} elseif (isset($_GET['delete'])) {
- $SQL = "DELETE FROM glaccountusers
- WHERE accountcode='" . $SelectedGLAccount . "'
- AND userid='" . $SelectedUser . "'";
-
- $ErrMsg = _('The GL Account user record could not be deleted because');
- $Result = DB_query($SQL, $ErrMsg);
- prnMsg(_('User') . ' ' . $SelectedUser . ' ' . _('has had their authority to use the') . ' ' . $SelectedGLAccount . ' ' . _('GL Account removed'), 'success');
- unset($_GET['delete']);
-} elseif (isset($_GET['ToggleUpdate'])) {
- $SQL = "UPDATE glaccountusers
- SET canupd='" . $_GET['ToggleUpdate'] . "'
- WHERE accountcode='" . $SelectedGLAccount . "'
- AND userid='" . $SelectedUser . "'";
-
- $ErrMsg = _('The GL Account user record could not be deleted because');
- $Result = DB_query($SQL, $ErrMsg);
- prnMsg(_('User') . ' ' . $SelectedUser . ' ' . _('has had their authority to update') . ' ' . $SelectedGLAccount . ' ' . _('GL Account removed'), 'success');
- unset($_GET['ToggleUpdate']);
-}
-
-if (!isset($SelectedGLAccount)) {
-
- /* It could still be the second time the page has been run and a record has been selected for modification - SelectedUser will exist because it was sent with the new call. If its the first time the page has been displayed with no parameters
- then none of the above are true. These will call the same page again and allow update/input or deletion of the records*/
- echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">';
- echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
- <table class="selection">
+ echo '<form action="', htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8'), '" method="post">',
+ '<input name="FormID" type="hidden" value="', $_SESSION['FormID'], '" />',
+ '<table class="selection">
<tr>
- <td>' . _('Select GL Account') . ':</td>
- <td><select name="SelectedGLAccount">';
-
- $Result = DB_query("SELECT accountcode,
- accountname
- FROM chartmaster
- ORDER BY accountcode");
-
- echo '<option value="">' . _('Not Yet Selected') . '</option>';
+ <td>', _('Select GL Account'), ':</td>
+ <td><select name="SelectedGLAccount" onchange="this.form.submit()">',// Submit when the value of the select is changed.
+ '<option value="">', _('Not Yet Selected'), '</option>';
+ $Result = DB_query("
+ SELECT
+ accountcode,
+ accountname
+ FROM chartmaster
+ ORDER BY accountcode");
while ($MyRow = DB_fetch_array($Result)) {
- if (isset($SelectedGLAccount) and $MyRow['accountcode'] == $SelectedGLAccount) {
- echo '<option selected="selected" value="';
- } else {
- echo '<option value="';
+ echo '<option ';
+ if(isset($SelectedGLAccount) and $MyRow['accountcode'] == $SelectedGLAccount) {
+ echo 'selected="selected" ';
}
- echo $MyRow['accountcode'] . '">' . $MyRow['accountcode'] . ' - ' . $MyRow['accountname'] . '</option>';
-
- } //end while loop
-
- echo '</select></td></tr>';
-
- echo '</table>'; // close main table
+ echo 'value="', $MyRow['accountcode'] . '">' . $MyRow['accountcode'] . ' - ' . $MyRow['accountname'] . '</option>';
+ }// End while loop.
+ echo '</select></td>
+ </tr>
+ </table>';//Close Select_GL_Account table.
DB_free_result($Result);
+ echo '<div class="centre noprint">',// Form buttons:
+ '<button name="Process" type="submit" value="Submit"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/gl.png" /> ', _('Accept'), '</button> '; // "Accept" button.
- echo '<div class="centre">
- <input type="submit" name="Process" value="' . _('Accept') . '" />
- <input type="submit" name="Cancel" value="' . _('Cancel') . '" />
- </div>';
-
- echo '</form>';
-
-}
-
-//end of ifs and buts!
-if (isset($_POST['process']) or isset($SelectedGLAccount)) {
- $SQLName = "SELECT accountname
- FROM chartmaster
- WHERE accountcode='" . $SelectedGLAccount . "'";
- $Result = DB_query($SQLName);
+} else {// If is set a GL account for users ($SelectedGLAccount).
+ $Result = DB_query("
+ SELECT accountname
+ FROM chartmaster
+ WHERE accountcode='" . $SelectedGLAccount . "'");
$MyRow = DB_fetch_array($Result);
$SelectedGLAccountName = $MyRow['accountname'];
+ echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/gl.png" title="',// Icon image.
+ _('GL Account Authorised Users'), '" /> ',// Icon title.
+ _('Authorised Users for'), ' ', $SelectedGLAccountName, '</p>';// Page title.
- echo '<div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">' . _('Authorised users for') . ' ' . $SelectedGLAccountName . ' ' . _('GL Account') . '</a></div>
- <form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">
- <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
- <input type="hidden" name="SelectedGLAccount" value="' . $SelectedGLAccount . '" />';
-
- $SQL = "SELECT glaccountusers.userid,
- canview,
- canupd,
- www_users.realname
- FROM glaccountusers INNER JOIN www_users
- ON glaccountusers.userid=www_users.userid
- WHERE glaccountusers.accountcode='" . $SelectedGLAccount . "'
- ORDER BY glaccountusers.userid ASC";
-
- $Result = DB_query($SQL);
-
- echo '<table class="selection">';
- echo '<tr>
- <th colspan="6"><h3>' . _('Authorised users for GL Acccount') . ': ' . $SelectedGLAccountName . '</h3></th>
- </tr>';
- echo '<tr>
- <th>' . _('User Code') . '</th>
- <th>' . _('User Name') . '</th>
- <th>' . _('View') . '</th>
- <th>' . _('Update') . '</th>
- </tr>';
-
- $k = 0; //row colour counter
-
- while ($MyRow = DB_fetch_array($Result)) {
- if ($k == 1) {
- echo '<tr class="EvenTableRows">';
- $k = 0;
+ // BEGIN: Needs $SelectedGLAccount, $SelectedUser.
+ if(isset($_POST['submit'])) {
+ if(!isset($SelectedUser)) {
+ prnMsg(_('You have not selected an user to be authorised to use this GL Account'), 'error');
} else {
- echo '<tr class="OddTableRows">';
- $k = 1;
- }
+ // First check the user is not being duplicated
+ $CheckResult = DB_query("
+ SELECT count(*)
+ FROM glaccountusers
+ WHERE accountcode= '" . $SelectedGLAccount . "'
+ AND userid = '" . $SelectedUser . "'");
+ $CheckRow = DB_fetch_row($CheckResult);
- if ($MyRow['canupd'] == 1) {
- $ToggleText = '<td><a href="%s?SelectedUser=%s&ToggleUpdate=0&SelectedGLAccount=' . $SelectedGLAccount . '" onclick="return confirm(\'' . _('Are you sure you wish to remove Update for this user?') . '\');">' . _('Remove Update') . '</a></td>';
- } else {
- $ToggleText = '<td><a href="%s?SelectedUser=%s&ToggleUpdate=1&SelectedGLAccount=' . $SelectedGLAccount . '" onclick="return confirm(\'' . _('Are you sure you wish to add Update for this user?') . '\');">' . _('Add Update') . '</a></td>';
+ if($CheckRow[0] > 0) {
+ prnMsg(_('The user') . ' ' . $SelectedUser . ' ' . _('is already authorised to use this GL Account'), 'error');
+ } else {
+ // Add new record on submit
+ $SQL = "INSERT INTO glaccountusers (
+ accountcode,
+ userid,
+ canview,
+ canupd
+ ) VALUES ('" .
+ $SelectedGLAccount . "','" .
+ $SelectedUser . "',
+ '1',
+ '1')";
+ $ErrMsg = _('An access permission for a user could not be added');
+ if(DB_query($SQL, $ErrMsg)) {
+ prnMsg(_('An access permission for a user was added') . '. ' . _('GL Account') . ': ' . $SelectedGLAccount . '. ' . _('User') . ': ' . $SelectedUser . '.', 'success');
+ unset($_GET['SelectedUser']);
+ unset($_POST['SelectedUser']);
+ }
+ }
}
-
- printf('<td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>' .
- $ToggleText . '
- <td><a href="%s?SelectedUser=%s&delete=yes&SelectedGLAccount=' . $SelectedGLAccount . '" onclick="return confirm(\'' . _('Are you sure you wish to un-authorise this user?') . '\');">' . _('Un-authorise') . '</a></td>
- </tr>',
- $MyRow['userid'],
- $MyRow['realname'],
- $MyRow['canview'],
- $MyRow['canupd'],
- htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'),
- $MyRow['userid'],
- htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'),
- $MyRow['userid']);
+ } elseif(isset($_GET['delete'])) {
+ $SQL = "DELETE FROM glaccountusers
+ WHERE accountcode='" . $SelectedGLAccount . "'
+ AND userid='" . $SelectedUser . "'";
+ $ErrMsg = _('An access permission for a user could not be removed');
+ if(DB_query($SQL, $ErrMsg)) {
+ prnMsg(_('An access permission for a user was removed') . '. ' . _('GL Account') . ': ' . $SelectedGLAccount . '. ' . _('User') . ': ' . $SelectedUser . '.', 'success');
+ unset($_GET['delete']);
+ unset($_POST['delete']);
+ }
+ } elseif(isset($_GET['ToggleUpdate'])) {
+ $SQL = "UPDATE glaccountusers
+ SET canupd='" . $_GET['ToggleUpdate'] . "'
+ WHERE accountcode='" . $SelectedGLAccount . "'
+ AND userid='" . $SelectedUser . "'";
+ $ErrMsg = _('An access permission to update a GL account could not be modified');
+ if(DB_query($SQL, $ErrMsg)) {
+ prnMsg(_('An access permission to update a GL account was modified') . '. ' . _('GL Account') . ': ' . $SelectedGLAccount . '. ' . _('User') . ': ' . $SelectedUser . '.', 'success');
+ unset($_GET['ToggleUpdate']);
+ unset($_POST['ToggleUpdate']);
+ }
}
- //END WHILE LIST LOOP
- echo '</table>';
+ // END: Needs $SelectedGLAccount, $SelectedUser.
- if (!isset($_GET['delete'])) {
+ echo '<table class="selection">
+ <thead>
+ <tr>
+ <th class="text">', _('User Code'), '</th>
+ <th class="text">', _('User Name'), '</th>
+ <th class="centre">', _('View'), '</th>
+ <th class="centre">', _('Update'), '</th>
+ <th class="noprint" colspan="2"> </th>
+ </tr>
+ </thead><tbody>';
+ $Result = DB_query("
+ SELECT
+ glaccountusers.userid,
+ canview,
+ canupd,
+ www_users.realname
+ FROM glaccountusers INNER JOIN www_users
+ ON glaccountusers.userid=www_users.userid
+ WHERE glaccountusers.accountcode='" . $SelectedGLAccount . "'
+ ORDER BY glaccountusers.userid ASC");
+ if(DB_num_rows($Result)>0) {// If the GL account has access permissions for one or more users:
+ $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 = 1;
+ }
+ echo '<td class="text">', $MyRow['userid'], '</td>
+ <td class="text">', $MyRow['realname'], '</td>
+ <td class="centre">';
+ if($MyRow['canview'] == 1) {
+ echo _('Yes');
+ } else {
+ echo _('No');
+ }
+ echo '</td>
+ <td class="centre">';
-
- echo '<table class="selection">'; //Main table
-
- echo '<tr>
- <td>' . _('Select User') . ':</td>
+ $ScriptName = htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8');
+ if($MyRow['canupd'] == 1) {
+ echo _('Yes'), '</td>',
+ '<td class="noprint"><a href="', $ScriptName, '?SelectedGLAccount=', $SelectedGLAccount, '&SelectedUser=', $MyRow['userid'], '&ToggleUpdate=0" onclick="return confirm(\'', _('Are you sure you wish to remove Update for this user?'), '\');">', _('Remove Update');
+ } else {
+ echo _('No'), '</td>',
+ '<td class="noprint"><a href="', $ScriptName, '?SelectedGLAccount=', $SelectedGLAccount, '&SelectedUser=', $MyRow['userid'], '&ToggleUpdate=1" onclick="return confirm(\'', _('Are you sure you wish to add Update for this user?'), '\');">', _('Add Update');
+ }
+ echo '</a></td>',
+ '<td class="noprint"><a href="', $ScriptName, '?SelectedGLAccount=', $SelectedGLAccount, '&SelectedUser=', $MyRow['userid'], '&delete=yes" onclick="return confirm(\'', _('Are you sure you wish to un-authorise this user?'), '\');">', _('Un-authorise'), '</a></td>',
+ '</tr>';
+ }// End while list loop.
+ } else {// If the GL account does not have access permissions for users:
+ echo '<tr><td class="centre" colspan="6">', _('GL account does not have access permissions for users'), '</td></tr>';
+ }
+ echo '</tbody></table>',
+ '<br />',
+ '<form action="', htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8'), '" method="post">',
+ '<input name="FormID" type="hidden" value="', $_SESSION['FormID'], '" />',
+ '<input name="SelectedGLAccount" type="hidden" value="', $SelectedGLAccount, '" />',
+ '<br />
+ <table class="selection noprint">
+ <tr>
+ <td>';
+ $Result = DB_query("
+ SELECT
+ userid,
+ realname
+ FROM www_users
+ WHERE NOT EXISTS (SELECT glaccountusers.userid
+ FROM glaccountusers
+ WHERE glaccountusers.accountcode='" . $SelectedGLAccount . "'
+ AND glaccountusers.userid=www_users.userid)
+ ORDER BY userid");
+ if(DB_num_rows($Result)>0) {// If the GL account does not have access permissions for one or more users:
+ echo _('Add access permissions to a user'), ':</td>
<td><select name="SelectedUser">';
-
- $Result = DB_query("SELECT userid,
- realname
- FROM www_users
- WHERE NOT EXISTS (SELECT glaccountusers.userid
- FROM glaccountusers
- WHERE glaccountusers.accountcode='" . $SelectedGLAccount . "'
- AND glaccountusers.userid=www_users.userid)");
-
- if (!isset($_POST['SelectedUser'])) {
- echo '<option selected="selected" value="">' . _('Not Yet Selected') . '</option>';
+ if(!isset($_POST['SelectedUser'])) {
+ echo '<option selected="selected" value="">', _('Not Yet Selected'), '</option>';
}
while ($MyRow = DB_fetch_array($Result)) {
- if (isset($_POST['SelectedUser']) and $MyRow['userid'] == $_POST['SelectedUser']) {
+ if(isset($_POST['SelectedUser']) and $MyRow['userid'] == $_POST['SelectedUser']) {
echo '<option selected="selected" value="';
} else {
echo '<option value="';
}
- echo $MyRow['userid'] . '">' . $MyRow['userid'] . ' - ' . $MyRow['realname'] . '</option>';
-
- } //end while loop
-
- echo '</select>
- </td>
- </tr>
- </table>'; // close main table
- DB_free_result($Result);
-
- echo '<div class="centre">
- <input type="submit" name="submit" value="' . _('Accept') . '" />
- <input type="submit" name="Cancel" value="' . _('Cancel') . '" />
- </div>
- </form>';
-
- } // end if user wish to delete
+ echo $MyRow['userid'], '">', $MyRow['userid'], ' - ', $MyRow['realname'], '</option>';
+ }
+ echo '</select></td>
+ <td><input type="submit" name="submit" value="Accept" />';
+ } else {// If the GL account has access permissions for all users:
+ echo _('GL account has access permissions for all users');
+ }
+ echo '</td>
+ </tr>
+ </table>';
+ DB_free_result($Result);
+ echo '<br>', // Form buttons:
+ '<div class="centre noprint">',
+ '<button onclick="javascript:window.print()" type="button"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/printer.png" /> ', _('Print This'), '</button>', // "Print This" button.
+ '<button formaction="GLAccountUsers.php?Cancel" type="submit"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/gl.png" /> ', _('Select A Different GL account'), '</button>'; // "Select A Different GL account" button.
}
+echo '<button formaction="index.php?Application=GL" type="submit" value="Submit"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/previous.png" /> ', _('Return'), '</button>', // "Return" button.
+ '</div>
+ </form>';
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/UserGLAccounts.php
===================================================================
--- trunk/UserGLAccounts.php 2015-12-28 03:50:00 UTC (rev 7432)
+++ trunk/UserGLAccounts.php 2015-12-29 18:06:35 UTC (rev 7433)
@@ -1,260 +1,264 @@
-<?php
-/* $Id: UserGLAccounts.php 7427 2015-12-27 19:59:10Z rchacon $*/
-/* Maintenance of GL Accounts allowed for a user. */
-
-include('includes/session.inc');
-$Title = _('User Authorised GL Accounts');
-$ViewTopic = 'GeneralLedger';
-$BookMark = 'UserGLAccounts';
-include('includes/header.inc');
-
-if(isset($_POST['SelectedUser']) and $_POST['SelectedUser']<>'') {//If POST not empty:
- $SelectedUser = mb_strtoupper($_POST['SelectedUser']);
-} elseif(isset($_GET['SelectedUser']) and $_GET['SelectedUser']<>'') {//If GET not empty:
- $SelectedUser = mb_strtoupper($_GET['SelectedUser']);
-} else {// Unset empty SelectedUser:
- unset($_GET['SelectedUser']);
- unset($_POST['SelectedUser']);
- unset($SelectedUser);
-}
-
-if(isset($_POST['SelectedGLAccount'])) {
- $SelectedGLAccount = mb_strtoupper($_POST['SelectedGLAccount']);
-} elseif(isset($_GET['SelectedGLAccount'])) {
- $SelectedGLAccount = mb_strtoupper($_GET['SelectedGLAccount']);
-} else {
- $SelectedGLAccount = '';
-/* unset($SelectedGLAccount);*/
-}
-
-if(isset($_GET['Cancel']) or isset($_POST['Cancel'])) {
- unset($SelectedUser);
- unset($SelectedGLAccount);
-}
-
-if(!isset($SelectedUser)) {// If is NOT set a user for GL accounts.
- echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
- '/images/gl.png" title="',// Icon image.
- _('User Authorised GL Accounts'), '" /> ',// Icon title.
- _('User Authorised GL Accounts'), '</p>';// Page title.
-
- /* It could still be the second time the page has been run and a record has been selected for modification - SelectedGLAccount will exist because it was sent with the new call. If its the first time the page has been displayed with no parameters then none of the above are true. These will call the same page again and allow update/input or deletion of the records.*/
-
- if(isset($_POST['Process'])) {
- prnMsg(_('You have not selected any user'), 'error');
- }
- echo '<form action="', htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8'), '" method="post">',
- '<input name="FormID" type="hidden" value="', $_SESSION['FormID'], '" />',
- '<table class="selection">
- <tr>
- <td>', _('Select User'), ':</td>
- <td><select name="SelectedUser" onchange="this.form.submit()">',// Submit when the value of the select is changed.
- '<option value="">', _('Not Yet Selected'), '</option>';
- $Result = DB_query("
- SELECT
- userid,
- realname
- FROM www_users
- ORDER BY userid");
- while ($MyRow = DB_fetch_array($Result)) {
- echo '<option ';
- if(isset($SelectedUser) and $MyRow['userid'] == $SelectedUser) {
- echo 'selected="selected" ';
- }
- echo 'value="', $MyRow['userid'], '">', $MyRow['userid'], ' - ', $MyRow['realname'], '</option>';
- }// End while loop.
- echo '</select></td>
- </tr>
- </table>';//Close Select_User table.
-
- DB_free_result($Result);
-
- echo '<div class="centre noprint">',// Form buttons:
- '<button name="Process" type="submit" value="Accept"><img alt="" src="', $RootPath, '/css/', $Theme,
- '/images/user.png" /> ', _('Accept'), '</button> '; // "Accept" button.
-
-} else {// If is set a user for GL accounts ($SelectedUser).
- $Result = DB_query("
- SELECT realname
- FROM www_users
- WHERE userid='" . $SelectedUser . "'");
- $MyRow = DB_fetch_array($Result);
- $SelectedUserName = $MyRow['realname'];
- echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
- '/images/gl.png" title="',// Icon image.
- _('User Authorised GL Accounts'), '" /> ',// Icon title.
- _('Authorised GL Accounts for'), ' ', $SelectedUserName, '</p>';// Page title.
-
-// BEGIN: Needs $SelectedUser, $SelectedGLAccount:
- if (isset($_POST['submit'])) {
- $InputError = 0;
- if ($_POST['SelectedGLAccount'] == '') {
- $InputError = 1;
- prnMsg(_('You have not selected an GL Account to be authorised for this user'), 'error');
- unset($SelectedGLAccount);
- }
- if ($InputError != 1) {
- // First check the user is not being duplicated
- $CheckResult = DB_query("
- SELECT count(*)
- FROM glaccountusers
- WHERE accountcode= '" . $_POST['SelectedGLAccount'] . "'
- AND userid = '" . $SelectedUser . "'");
- $CheckRow = DB_fetch_row($CheckResult);
- if ($CheckRow[0] > 0) {
- $InputError = 1;
- prnMsg(_('The GL Account') . ' ' . $SelectedGLAccount . ' ' . _('is already authorised for this user'), 'error');
- } else {
- // Add new record on submit
- $SQL = "INSERT INTO glaccountusers (accountcode,
- userid,
- canview,
- canupd)
- VALUES ('" . $SelectedGLAccount . "',
- '" . $SelectedUser . "',
- '1',
- '1')";
- $Result = DB_query($SQL);
- prnMsg(_('An access permission to a GL account was added') . '. ' . _('User') . ': ' . $SelectedUser . '. ' . _('GL Account') . ': ' . $SelectedGLAccount . '.', 'success');
- unset($_POST['SelectedGLAccount']);
- }
- }
- } elseif(isset($_GET['delete']) or isset($_POST['delete'])) {
- $SQL = "DELETE FROM glaccountusers
- WHERE accountcode='" . $SelectedGLAccount . "'
- AND userid='" . $SelectedUser . "'";
- $ErrMsg = _('The GL Account user record could not be deleted because');
- $Result = DB_query($SQL, $ErrMsg);
- prnMsg(_('An access permission to a GL account was removed') . '. ' . _('User') . ': ' . $SelectedUser . '. ' . _('GL Account') . ': ' . $SelectedGLAccount . '.', 'success');
- unset($_GET['delete']);
- unset($_POST['delete']);
- } elseif(isset($_GET['ToggleUpdate']) or isset($_POST['ToggleUpdate'])) {// Can update (write) GL accounts flag.
- if(isset($_GET['ToggleUpdate']) and $_GET['ToggleUpdate']<>'') {//If GET not empty.
- $ToggleUpdate = $_GET['ToggleUpdate'];
- } elseif(isset($_POST['ToggleUpdate']) and $_POST['ToggleUpdate']<>'') {//If POST not empty.
- $ToggleUpdate = $_POST['ToggleUpdate'];
- }
- $SQL = "UPDATE glaccountusers
- SET canupd='" . $ToggleUpdate . "'
- WHERE accountcode='" . $SelectedGLAccount . "'
- AND userid='" . $SelectedUser . "'";
- $ErrMsg = _('The GL Account user record could not be updated because');
- $Result = DB_query($SQL, $ErrMsg);
- prnMsg(_('The access permission to update a GL account was modified') . '. ' . _('User') . ': ' . $SelectedUser . '. ' . _('GL Account') . ': ' . $SelectedGLAccount . '.', 'success');
- unset($_GET['ToggleUpdate']);
- unset($_POST['ToggleUpdate']);
- }
-// END: Needs $SelectedUser, $SelectedGLAccount.
-
- echo '<table class="selection">
- <thead>
- <tr>
- <th class="text">', _('Code'), '</th>
- <th class="text">', _('Name'), '</th>
- <th class="centre">', _('View'), '</th>
- <th class="centre">', _('Update'), '</th>
- <th class="noprint" colspan="2"> </th>
- </tr>
- </thead><tbody>';
- $Result = DB_query("
- SELECT
- glaccountusers.accountcode,
- canview,
- canupd,
- chartmaster.accountname
- FROM glaccountusers INNER JOIN chartmaster
- ON glaccountusers.accountcode=chartmaster.accountcode
- WHERE glaccountusers.userid='" . $SelectedUser . "'
- ORDER BY chartmaster.accountcode ASC");
- if(DB_num_rows($Result)>0) {// If the user has access permissions to one or more GL accounts:
- $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 = 1;
- }
- echo '<td class="text">', $MyRow['accountcode'], '</td>
- <td class="text">', $MyRow['accountname'], '</td>
- <td class="centre">';
- if($MyRow['canview'] == 1) {
- echo _('Yes');
- } else {
- echo _('No');
- }
- echo '</td>
- <td class="centre">';
-
- $ScriptName = htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8');
- if($MyRow['canupd'] == 1) {
- echo _('Yes'), '</td>',
- '<td class="noprint"><a href="', $ScriptName, '?SelectedUser=', $SelectedUser, '&SelectedGLAccount=', $MyRow['accountcode'], '&ToggleUpdate=0" onclick="return confirm(\'', _('Are you sure you wish to remove Update for this GL Account?'), '\');">', _('Remove Update');
- } else {
- echo _('No'), '</td>',
- '<td class="noprint"><a href="', $ScriptName, '?SelectedUser=', $SelectedUser, '&SelectedGLAccount=', $MyRow['accountcode'], '&ToggleUpdate=1" onclick="return confirm(\'', _('Are you sure you wish to add Update for this GL Account?'), '\');">', _('Add Update');
- }
- echo '</a></td>',
- '<td class="noprint"><a href="', $ScriptName, '?SelectedUser=', $SelectedUser, '&SelectedGLAccount=', $MyRow['accountcode'], '&delete=yes" onclick="return confirm(\'', _('Are you sure you wish to un-authorise this GL Account?'), '\');">', _('Un-authorise'), '</a></td>',
- '</tr>';
- }// End while list loop.
- } else {// If the user does not have access permissions to GL accounts:
- echo '<tr><td class="centre" colspan="6">', _('User does not have access permissions to GL accounts'), '</td></tr>';
- }
- echo '</tbody></table>',
- '<br />',
- '<form action="', htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8'), '" method="post">',
- '<input name="FormID" type="hidden" value="', $_SESSION['FormID'], '" />',
- '<input name="SelectedUser" type="hidden" value="', $SelectedUser, '" />',
- '<br />
- <table class="selection noprint">
- <tr>
- <td>';
- $Result = DB_query("
- SELECT
- accountcode,
- accountname
- FROM chartmaster
- WHERE NOT EXISTS (SELECT glaccountusers.accountcode
- FROM glaccountusers
- WHERE glaccountusers.userid='" . $SelectedUser . "'
- AND glaccountusers.accountcode=chartmaster.accountcode)
- ORDER BY accountcode");
- if(DB_num_rows($Result)>0) {// If the user does not have access permissions to one or more GL accounts:
- echo _('Add access permissions to a GL account'), ':</td>
- <td><select name="SelectedGLAccount">';
- if(!isset($_POST['SelectedGLAccount'])) {
- echo '<option selected="selected" value="">', _('Not Yet Selected'), '</option>';
- }
- while ($MyRow = DB_fetch_array($Result)) {
- if(isset($_POST['SelectedGLAccount']) and $MyRow['accountcode'] == $_POST['SelectedGLAccount']) {
- echo '<option selected="selected" value="';
- } else {
- echo '<option value="';
- }
- echo $MyRow['accountcode'], '">', $MyRow['accountcode'], ' - ', $MyRow['accountname'], '</option>';
- }
- echo '</select></td>
- <td><input type="submit" name="submit" value="Accept" />';
- } else {// If the user has access permissions to all GL accounts:
- echo _('User has access permissions to all GL accounts');
- }
- echo '</td>
- </tr>
- </table>';
- DB_free_result($Result);
- echo '<br>', // Form buttons:
- '<div class="centre noprint">',
- '<button onclick="javascript:window.print()" type="button"><img alt="" src="', $RootPath, '/css/', $Theme,
- '/images/printer.png" /> ', _('Print This'), '</button>', // "Print This" button.
- '<button formaction="UserGLAccounts.php?Cancel" type="submit"><img alt="" src="', $RootPath, '/css/', $Theme,
- '/images/user.png" /> ', _('Select A Different User'), '</button>'; // "Select A Different User" button.
-}
-echo '<button formaction="index.php?Application=GL" type="submit"><img alt="" src="', $RootPath, '/css/', $Theme,
- '/images/previous.png" /> ', _('Return'), '</button>', // "Return" button.
- '</div>
- </form>';
-
-include('includes/footer.inc');
-?>
+<?php
+/* $Id: UserGLAccounts.php 7427 2015-12-27 19:59:10Z rchacon $*/
+/* Maintenance of GL Accounts allowed for a user. */
+
+include('includes/session.inc');
+$Title = _('User Authorised GL Accounts');
+$ViewTopic = 'GeneralLedger';
+$BookMark = 'UserGLAccounts';
+include('includes/header.inc');
+
+if(isset($_POST['SelectedUser']) and $_POST['SelectedUser']<>'') {//If POST not empty:
+ $SelectedUser = mb_strtoupper($_POST['SelectedUser']);
+} elseif(isset($_GET['SelectedUser']) and $_GET['SelectedUser']<>'') {//If GET not empty:
+ $SelectedUser = mb_strtoupper($_GET['SelectedUser']);
+} else {// Unset empty SelectedUser:
+ unset($_GET['SelectedUser']);
+ unset($_POST['SelectedUser']);
+ unset($SelectedUser);
+}
+
+if(isset($_POST['SelectedGLAccount'])) {
+ $SelectedGLAccount = mb_strtoupper($_POST['SelectedGLAccount']);
+} elseif(isset($_GET['SelectedGLAccount'])) {
+ $SelectedGLAccount = mb_strtoupper($_GET['SelectedGLAccount']);
+} else {
+ $SelectedGLAccount = '';/*// Unset empty SelectedGLAccount:
+ unset($_GET['SelectedGLAccount']);
+ unset($_POST['SelectedGLAccount']);
+ unset($SelectedGLAccount);*/
+}
+
+if(isset($_GET['Cancel']) or isset($_POST['Cancel'])) {
+ unset($SelectedUser);
+ unset($SelectedGLAccount);
+}
+
+if(!isset($SelectedUser)) {// If is NOT set a user for GL accounts.
+ echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/gl.png" title="',// Icon image.
+ _('User Authorised GL Accounts'), '" /> ',// Icon title.
+ _('User Authorised GL Accounts'), '</p>';// Page title.
+
+ /* It could still be the second time the page has been run and a record has been selected for modification - SelectedGLAccount will exist because it was sent with the new call. If its the first time the page has been displayed with no parameters then none of the above are true. These will call the same page again and allow update/input or deletion of the records.*/
+
+ if(isset($_POST['Process'])) {
+ prnMsg(_('You have not selected any user'), 'error');
+ }
+ echo '<form action="', htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8'), '" method="post">',
+ '<input name="FormID" type="hidden" value="', $_SESSION['FormID'], '" />',
+ '<table class="selection">
+ <tr>
+ <td>', _('Select User'), ':</td>
+ <td><select name="SelectedUser" onchange="this.form.submit()">',// Submit when the value of the select is changed.
+ '<option value="">', _('Not Yet Selected'), '</option>';
+ $Result = DB_query("
+ SELECT
+ userid,
+ realname
+ FROM www_users
+ ORDER BY userid");
+ while ($MyRow = DB_fetch_array($Result)) {
+ echo '<option ';
+ if(isset($SelectedUser) and $MyRow['userid'] == $SelectedUser) {
+ echo 'selected="selected" ';
+ }
+ echo 'value="', $MyRow['userid'], '">', $MyRow['userid'], ' - ', $MyRow['realname'], '</option>';
+ }// End while loop.
+ echo '</select></td>
+ </tr>
+ </table>';//Close Select_User table.
+
+ DB_free_result($Result);
+
+ echo '<div class="centre noprint">',// Form buttons:
+ '<button name="Process" type="submit" value="Accept"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/user.png" /> ', _('Accept'), '</button> '; // "Accept" button.
+
+} else {// If is set a user for GL accounts ($SelectedUser).
+ $Result = DB_query("
+ SELECT realname
+ FROM www_users
+ WHERE userid='" . $SelectedUser . "'");
+ $MyRow = DB_fetch_array($Result);
+ $SelectedUserName = $MyRow['realname'];
+ echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/gl.png" title="',// Icon image.
+ _('User Authorised GL Accounts'), '" /> ',// Icon title.
+ _('Authorised GL Accounts for'), ' ', $SelectedUserName, '</p>';// Page title.
+
+ // BEGIN: Needs $SelectedUser, $SelectedGLAccount:
+ if(isset($_POST['submit'])) {
+ if(!isset('SelectedGLAccount')) {
+ prnMsg(_('You have not selected an GL Account to be authorised for this user'), 'error');
+ } else {
+ // First check the user is not being duplicated
+ $CheckResult = DB_query("
+ SELECT count(*)
+ FROM glaccountusers
+ WHERE accountcode= '" . $_POST['SelectedGLAccount'] . "'
+ AND userid = '" . $SelectedUser . "'");
+ $CheckRow = DB_fetch_row($CheckResult);
+ if($CheckRow[0] > 0) {
+ prnMsg(_('The GL Account') . ' ' . $SelectedGLAccount . ' ' . _('is already authorised for this user'), 'error');
+ } else {
+ // Add new record on submit
+ $SQL = "INSERT INTO glaccountusers (
+ accountcode,
+ userid,
+ canview,
+ canupd
+ ) VALUES ('" .
+ $SelectedGLAccount . "','" .
+ $SelectedUser . "',
+ '1',
+ '1')";
+ $ErrMsg = _('An access permission to a GL account could not be added');
+ if(DB_query($SQL, $ErrMsg)) {
+ prnMsg(_('An access permission to a GL account was added') . '. ' . _('User') . ': ' . $SelectedUser . '. ' . _('GL Account') . ': ' . $SelectedGLAccount . '.', 'success');
+ unset($_GET['SelectedGLAccount']);
+ unset($_POST['SelectedGLAccount']);
+ }
+ }
+ }
+ } elseif(isset($_GET['delete']) or isset($_POST['delete'])) {
+ $SQL = "DELETE FROM glaccountusers
+ WHERE accountcode='" . $SelectedGLAccount . "'
+ AND userid='" . $SelectedUser . "'";
+ $ErrMsg = _('An access permission to a GL account could not be removed');
+ if(DB_query($SQL, $ErrMsg)) {
+ prnMsg(_('An access permission to a GL account was removed') . '. ' . _('User') . ': ' . $SelectedUser . '. ' . _('GL Account') . ': ' . $SelectedGLAccount . '.', 'success');
+ unset($_GET['delete']);
+ unset($_POST['delete']);
+ }
+ } elseif(isset($_GET['ToggleUpdate']) or isset($_POST['ToggleUpdate'])) {// Can update (write) GL accounts flag.
+ if(isset($_GET['ToggleUpdate']) and $_GET['ToggleUpdate']<>'') {//If GET not empty.
+ $ToggleUpdate = $_GET['ToggleUpdate'];
+ } elseif(isset($_POST['ToggleUpdate']) and $_POST['ToggleUpdate']<>'') {//If POST not empty.
+ $ToggleUpdate = $_POST['ToggleUpdate'];
+ }
+ $SQL = "UPDATE glaccountusers
+ SET canupd='" . $ToggleUpdate . "'
+ WHERE accountcode='" . $SelectedGLAccount . "'
+ AND userid='" . $SelectedUser . "'";
+ $ErrMsg = _('An access permission to update a GL account could not be modified');
+ if(DB_query($SQL, $ErrMsg)) {
+ prnMsg(_('An access permission to update a GL account was modified') . '. ' . _('User') . ': ' . $SelectedUser . '. ' . _('GL Account') . ': ' . $SelectedGLAccount . '.', 'success');
+ unset($_GET['ToggleUpdate']);
+ unset($_POST['ToggleUpdate']);
+ }
+ }
+// END: Needs $SelectedUser, $SelectedGLAccount.
+
+ echo '<table class="selection">
+ <thead>
+ <tr>
+ <th class="text">', _('Code'), '</th>
+ <th class="text">', _('Name'), '</th>
+ <th class="centre">', _('View'), '</th>
+ <th class="centre">', _('Update'), '</th>
+ <th class="noprint" colspan="2"> </th>
+ </tr>
+ </thead><tbody>';
+ $Result = DB_query("
+ SELECT
+ glaccountusers.accountcode,
+ canview,
+ canupd,
+ chartmaster.accountname
+ FROM glaccountusers INNER JOIN chartmaster
+ ON glaccountusers.accountcode=chartmaster.accountcode
+ WHERE glaccountusers.userid='" . $SelectedUser . "'
+ ORDER BY chartmaster.accountcode ASC");
+ if(DB_num_rows($Result)>0) {// If the user has access permissions to one or more GL accounts:
+ $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 = 1;
+ }
+ echo '<td class="text">', $MyRow['accountcode'], '</td>
+ <td class="text">', $MyRow['accountname'], '</td>
+ <td class="centre">';
+ if($MyRow['canview'] == 1) {
+ echo _('Yes');
+ } else {
+ echo _('No');
+ }
+ echo '</td>
+ <td class="centre">';
+
+ $ScriptName = htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8');
+ if($MyRow['canupd'] == 1) {
+ echo _('Yes'), '</td>',
+ '<td class="noprint"><a href="', $ScriptName, '?SelectedUser=', $SelectedUser, '&SelectedGLAccount=', $MyRow['accountcode'], '&ToggleUpdate=0" onclick="return confirm(\'', _('Are you sure you wish to remove Update for this GL Account?'), '\');">', _('Remove Update');
+ } else {
+ echo _('No'), '</td>',
+ '<td class="noprint"><a href="', $ScriptName, '?SelectedUser=', $SelectedUser, '&SelectedGLAccount=', $MyRow['accountcode'], '&ToggleUpdate=1" onclick="return confirm(\'', _('Are you sure you wish to add Update for this GL Account?'), '\');">', _('Add Update');
+ }
+ echo '</a></td>',
+ '<td class="noprint"><a href="', $ScriptName, '?SelectedUser=', $SelectedUser, '&SelectedGLAccount=', $MyRow['accountcode'], '&delete=yes" onclick="return confirm(\'', _('Are you sure you wish to un-authorise this GL Account?'), '\');">', _('Un-authorise'), '</a></td>',
+ '</tr>';
+ }// End while list loop.
+ } else {// If the user does not have access permissions to GL accounts:
+ echo '<tr><td class="centre" colspan="6">', _('User does not have access permissions to GL accounts'), '</td></tr>';
+ }
+ echo '</tbody></table>',
+ '<br />',
+ '<form action="', htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8'), '" method="post">',
+ '<input name="FormID" type="hidden" value="', $_SESSION['FormID'], '" />',
+ '<input name="SelectedUser" type="hidden" value="', $SelectedUser, '" />',
+ '<br />
+ <table class="selection noprint">
+ <tr>
+ <td>';
+ $Result = DB_query("
+ SELECT
+ accountcode,
+ accountname
+ FROM chartmaster
+ WHERE NOT EXISTS (SELECT glaccountusers.accountcode
+ FROM glaccountusers
+ WHERE glaccountusers.userid='" . $SelectedUser . "'
+ AND glaccountusers.accountcode=chartmaster.accountcode)
+ ORDER BY accountcode");
+ if(DB_num_rows($Result)>0) {// If the user does not have access permissions to one or more GL accounts:
+ echo _('Add access permissions to a GL account'), ':</td>
+ <td><select name="SelectedGLAccount">';
+ if(!isset($_POST['SelectedGLAccount'])) {
+ echo '<option selected="selected" value="">', _('Not Yet Selected'), '</option>';
+ }
+ while ($MyRow = DB_fetch_array($Result)) {
+ if(isset($_POST['SelectedGLAccount']) and $MyRow['accountcode'] == $_POST['SelectedGLAccount']) {
+ echo '<option selected="selected" value="';
+ } else {
+ echo '<option value="';
+ }
+ echo $MyRow['accountcode'], '">', $MyRow['accountcode'], ' - ', $MyRow['accountname'], '</option>';
+ }
+ echo '</select></td>
+ <td><input type="submit" name="submit" value="Accept" />';
+ } else {// If the user has access permissions to all GL accounts:
+ echo _('User has access permissions to all GL accounts');
+ }
+ echo '</td>
+ </tr>
+ </table>';
+ DB_free_result($Result);
+ echo '<br>', // Form buttons:
+ '<div class="centre noprint">',
+ '<button onclick="javascript:window.print()" type="button"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/printer.png" /> ', _('Print This'), '</button>', // "Print This" button.
+ '<button formaction="UserGLAccounts.php?Cancel" type="submit"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/user.png" /> ', _('Select A Different User'), '</button>'; // "Select A Different User" button.
+}
+echo '<button formaction="index.php?Application=GL" type="submit"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/previous.png" /> ', _('Return'), '</button>', // "Return" button.
+ '</div>
+ </form>';
+
+include('includes/footer.inc');
+?>
Modified: trunk/doc/Manual/ManualGeneralLedger.html
===================================================================
--- trunk/doc/Manual/ManualGeneralLedger.html 2015-12-28 03:50:00 UTC (rev 7432)
+++ trunk/doc/Manual/ManualGeneralLedger.html 2015-12-29 18:06:35 UTC (rev 7433)
@@ -406,15 +406,20 @@
<div class="floatright"><a class="minitext" href="#top">⬆ Top</a></div>
<h2>Maintenance</h2>
-<!--h3><a id="GLAccountUsers">GL Accounts Authorised Users</a></h3>
-<p>.</p-->
+<h3><a id="GLAccountUsers">GL Accounts Authorised Users</a></h3>
+<p>This software has methods to assign permissions or access rights to specific users and groups of users. The system controls the ability of the users to view or make changes to the contents of the GL accounts.</p>
+<p>With this script, you can change a specific GL account access permissions for users:</p>
+<ul>
+<li>You can add or remove the read permission for each user that grants or denies his ability to view that GL account.</li>
+<li>You can add or remove the write permission for each user that grants or denies the ability to update that GL account.</li>
+</ul>
<h3><a id="UserGLAccounts">User Authorised GL Accounts</a></h3>
<p>This software has methods to assign permissions or access rights to specific users and groups of users. The system controls the ability of the users to view or make changes to the contents of the GL accounts.</p>
<p>With this script, you can change a specific user access permissions to GL accounts:</p>
<ul>
-<li>You can add or remove the read permission for each GL account that grants or denies the ability of a user to view it.</li>
-<li>You can add or remove the write permission for each GL account that grants or denies the ability of a user to update it.</li>
+<li>You can add or remove the read permission for each GL account that grants or denies the ability of that user to view it.</li>
+<li>You can add or remove the write permission for each GL account that grants or denies the ability of that user to update it.</li>
</ul>
<!--h3><a id="BankAccounts.php">Bank Accounts</a></h3>
|
|
From: <ex...@us...> - 2015-12-28 03:50:02
|
Revision: 7432
http://sourceforge.net/p/web-erp/reponame/7432
Author: exsonqu
Date: 2015-12-28 03:50:00 +0000 (Mon, 28 Dec 2015)
Log Message:
-----------
Modified Paths:
--------------
trunk/doc/Change.log
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-12-28 03:47:44 UTC (rev 7431)
+++ trunk/doc/Change.log 2015-12-28 03:50:00 UTC (rev 7432)
@@ -1,5 +1,6 @@
webERP Change Log
+28/12/15 Exson: Fixed the bug that discount not modified for items whose discount is null in discount matrix in SelectOrderItems.php.
27/12/15 RChacon: On UserGLAccounts.php: Fix script name; add $ViewTopic and $BookMark; improve $SelectedUser validation; improve page_title_text; improve select user; regroup modify access permission code (improve logic); add classes to table elements; translate database "0" and "1" to human "No" and "Yes"; simplify and tide code; modify prnMsg from multiple part sentence to one part sentence (better to translate when language use a different grammar structure from English); add "Print This", "Select A Different User" and "Return" buttons. Add info to ManualGeneralLedger.html.
26/12/2015 Exson: Add items not received information on outstanding po inquiry screen in PO_SelectOSPurchOrder.php.
24/12/15 Exson: Add supplier no as a option for supplier transaction inquiry in SupplierTransInquiry.php.
|
|
From: <ex...@us...> - 2015-12-28 03:47:46
|
Revision: 7431
http://sourceforge.net/p/web-erp/reponame/7431
Author: exsonqu
Date: 2015-12-28 03:47:44 +0000 (Mon, 28 Dec 2015)
Log Message:
-----------
28/12/15 Exson: Fixed the bug that discount not modified for items whose discount is null in discount matrix in SelectOrderItems.php.
Modified Paths:
--------------
trunk/SelectOrderItems.php
Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php 2015-12-28 02:56:23 UTC (rev 7430)
+++ trunk/SelectOrderItems.php 2015-12-28 03:47:44 UTC (rev 7431)
@@ -1131,7 +1131,7 @@
} else {
$DiscountMatrixRate = $myrow[0];
}
- if ($myrow[0]!=0){ /* need to update the lines affected */
+ if ($DiscountMatrixRate!=0){ /* need to update the lines affected */
foreach ($_SESSION['Items'.$identifier]->LineItems as $OrderLine_2) {
if ($OrderLine_2->DiscCat==$OrderLine->DiscCat){
$_SESSION['Items'.$identifier]->LineItems[$OrderLine_2->LineNumber]->DiscountPercent = $DiscountMatrixRate;
@@ -1270,9 +1270,11 @@
} else {
$DiscountMatrixRate = $myrow[0];
}
- foreach ($_SESSION['Items'.$identifier]->LineItems as $StkItems_2) {
- if ($StkItems_2->DiscCat==$OrderLine->DiscCat){
- $_SESSION['Items'.$identifier]->LineItems[$StkItems_2->LineNumber]->DiscountPercent = $DiscountMatrixRate;
+ if ($DiscountMatrixRate != 0) {
+ foreach ($_SESSION['Items'.$identifier]->LineItems as $StkItems_2) {
+ if ($StkItems_2->DiscCat==$OrderLine->DiscCat){
+ $_SESSION['Items'.$identifier]->LineItems[$StkItems_2->LineNumber]->DiscountPercent = $DiscountMatrixRate;
+ }
}
}
}
|
15 messages has been excluded from this view by a project administrator.
