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...> - 2015-11-30 22:52:02
|
Revision: 7405
http://sourceforge.net/p/web-erp/reponame/7405
Author: exsonqu
Date: 2015-11-30 22:52:00 +0000 (Mon, 30 Nov 2015)
Log Message:
-----------
Modified Paths:
--------------
trunk/doc/Change.log
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-11-30 22:51:04 UTC (rev 7404)
+++ trunk/doc/Change.log 2015-11-30 22:52:00 UTC (rev 7405)
@@ -1,5 +1,5 @@
webERP Change Log
-
+01/12/15 Exson: Remove the wrong foreign key in suppinvstogrn. Reported by rafael.
26/11/15 Exson: Fixed the rounding error caused extra lines on WO pdf file and 2 number display without locale format in PDFWOPrint.php.
21/11/15 Gilberto Dos Santos Alves: Updated Portuguese Brazilian translation
18/11/15 AlexFigueiro: Remove the duplicate foreign key in stockrequest and stockrequestitem;
|
|
From: <ex...@us...> - 2015-11-30 22:51:06
|
Revision: 7404
http://sourceforge.net/p/web-erp/reponame/7404
Author: exsonqu
Date: 2015-11-30 22:51:04 +0000 (Mon, 30 Nov 2015)
Log Message:
-----------
01/12/15 Exson: Remove the wrong foreign key in suppinvstogrn. Reported by rafael.
Modified Paths:
--------------
trunk/sql/mysql/upgrade4.12.3-4.13.sql
Modified: trunk/sql/mysql/upgrade4.12.3-4.13.sql
===================================================================
--- trunk/sql/mysql/upgrade4.12.3-4.13.sql 2015-11-30 01:26:16 UTC (rev 7403)
+++ trunk/sql/mysql/upgrade4.12.3-4.13.sql 2015-11-30 22:51:04 UTC (rev 7404)
@@ -52,6 +52,7 @@
ALTER table stockrequest DROP FOREIGN KEY `stockrequest_ibfk_4`;
INSERT INTO `scripts` (`script`, `pagesecurity`, `description`) VALUES ('UserBankAccounts.php', '15', 'Maintains table bankaccountusers (Authorized users to work with a bank account in webERP)');
+ALTER table suppinvstogrn DROP FOREIGN KEY `suppinvstogrn_ibfk_1`;
-- Update version number:
UPDATE config SET confvalue='4.13' WHERE confname='VersionNumber';
|
|
From: <te...@us...> - 2015-11-30 01:26:19
|
Revision: 7403
http://sourceforge.net/p/web-erp/reponame/7403
Author: tehonu
Date: 2015-11-30 01:26:16 +0000 (Mon, 30 Nov 2015)
Log Message:
-----------
Remove hardcoded $PageSecurity
Modified Paths:
--------------
trunk/CustomerBalancesMovement.php
Modified: trunk/CustomerBalancesMovement.php
===================================================================
--- trunk/CustomerBalancesMovement.php 2015-11-27 00:26:56 UTC (rev 7402)
+++ trunk/CustomerBalancesMovement.php 2015-11-30 01:26:16 UTC (rev 7403)
@@ -1,8 +1,6 @@
<?php
/* $Id: CustomerBalancesMovement.php 6941 2014-10-26 23:18:08Z daintree $*/
-$PageSecurity = 1;
-
include('includes/session.inc');
$Title=_('Customer Activity and Balances');
/*To do: Info in the manual. RChacon.
|
|
From: <te...@us...> - 2015-11-27 00:26:58
|
Revision: 7402
http://sourceforge.net/p/web-erp/reponame/7402
Author: tehonu
Date: 2015-11-27 00:26:56 +0000 (Fri, 27 Nov 2015)
Log Message:
-----------
cascade deletion of bankaccountusers to aviod orphaned records in bankaccountusers table
Modified Paths:
--------------
trunk/WWW_Users.php
Modified: trunk/WWW_Users.php
===================================================================
--- trunk/WWW_Users.php 2015-11-26 07:14:50 UTC (rev 7401)
+++ trunk/WWW_Users.php 2015-11-27 00:26:56 UTC (rev 7402)
@@ -280,6 +280,10 @@
$ErrMsg = _('The GL Account - User could not be deleted because');;
$result = DB_query($sql,$ErrMsg);
+ $sql="DELETE FROM bankaccountusers WHERE userid='" . $SelectedUser . "'";
+ $ErrMsg = _('The Bank Accounts - User could not be deleted because');;
+ $result = DB_query($sql,$ErrMsg);
+
$sql="DELETE FROM www_users WHERE userid='" . $SelectedUser . "'";
$ErrMsg = _('The User could not be deleted because');;
$result = DB_query($sql,$ErrMsg);
|
|
From: <ex...@us...> - 2015-11-26 07:14:52
|
Revision: 7401
http://sourceforge.net/p/web-erp/reponame/7401
Author: exsonqu
Date: 2015-11-26 07:14:50 +0000 (Thu, 26 Nov 2015)
Log Message:
-----------
Modified Paths:
--------------
trunk/doc/Change.log
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-11-26 07:13:48 UTC (rev 7400)
+++ trunk/doc/Change.log 2015-11-26 07:14:50 UTC (rev 7401)
@@ -1,5 +1,6 @@
webERP Change Log
+26/11/15 Exson: Fixed the rounding error caused extra lines on WO pdf file and 2 number display without locale format in PDFWOPrint.php.
21/11/15 Gilberto Dos Santos Alves: Updated Portuguese Brazilian translation
18/11/15 AlexFigueiro: Remove the duplicate foreign key in stockrequest and stockrequestitem;
15/11/15 RChacon: Tidy css/*/default.css, reagrouping style for clases centre, number, page_title_text and text.
|
|
From: <ex...@us...> - 2015-11-26 07:13:51
|
Revision: 7400
http://sourceforge.net/p/web-erp/reponame/7400
Author: exsonqu
Date: 2015-11-26 07:13:48 +0000 (Thu, 26 Nov 2015)
Log Message:
-----------
26/11/15 Exson: Fixed the rounding error caused extra lines on WO pdf file and 2 number display without locale format in PDFWOPrint.php.
Modified Paths:
--------------
trunk/PDFWOPrint.php
Modified: trunk/PDFWOPrint.php
===================================================================
--- trunk/PDFWOPrint.php 2015-11-26 01:03:48 UTC (rev 7399)
+++ trunk/PDFWOPrint.php 2015-11-26 07:13:48 UTC (rev 7400)
@@ -340,7 +340,7 @@
$WOLine[$i]['issued'] = 9999999.99;
$WOLine[$i]['decimalplaces'] = 2;
}
- if ($WOLine['decimalplaces'] != NULL) {
+ if ($WOLine[$i]['decimalplaces'] != NULL) {
$DecimalPlaces = $WOLine[$i]['decimalplaces'];
}
else {
@@ -407,13 +407,15 @@
while ($ToIssue = DB_fetch_array($AvailQty)){
if ($WOLine[$i]['controlled']) {
$CurLot=$ToIssue['serialno'];
- $CurQty=$ToIssue['qty'];
+ $CurQty=locale_number_format($ToIssue['qty'],$DecimalPlaces);
}
else {
$CurLot=substr($WOHeader['locationname'] . ' ' . $ToIssue['bin'],0,34);
- $CurQty=$ToIssue['quantity'];
+ $CurQty=locale_number_format($ToIssue['quantity'],$DecimalPlaces);
}
- if ($CurQty > 0) {
+ //remove display of very small number raised due to rounding error
+ $MinalQtyAllowed = 1/pow(10,$DecimalPlaces)/10;
+ if ($CurQty > $MinalQtyAllowed) {
$LeftOvers = $pdf->addTextWrap($FormDesign->Data->Column3->x, $YPos, $FormDesign->Data->Column3->Length, $FormDesign->Data->Column3->FontSize, $CurLot, 'left');
$LeftOvers = $pdf->addTextWrap($FormDesign->Data->Column3->x, $YPos, $FormDesign->Data->Column3->Length, $FormDesign->Data->Column3->FontSize, $CurQty, 'right');
$LeftOvers = $pdf->addTextWrap($FormDesign->Data->Column5->x, $YPos, $FormDesign->Data->Column5->Length, $FormDesign->Data->Column5->FontSize, '________', 'right');
|
|
From: <te...@us...> - 2015-11-26 01:03:51
|
Revision: 7399
http://sourceforge.net/p/web-erp/reponame/7399
Author: tehonu
Date: 2015-11-26 01:03:48 +0000 (Thu, 26 Nov 2015)
Log Message:
-----------
Enforce the Petty cash tab cash limit when assigning new cash
Modified Paths:
--------------
trunk/PcAssignCashToTab.php
Modified: trunk/PcAssignCashToTab.php
===================================================================
--- trunk/PcAssignCashToTab.php 2015-11-24 08:50:28 UTC (rev 7398)
+++ trunk/PcAssignCashToTab.php 2015-11-26 01:03:48 UTC (rev 7399)
@@ -68,17 +68,28 @@
prnMsg('<br />' . _('The Amount must be input'),'error');
}
- $sqlLimit = "SELECT tablimit
- FROM pctabs
- WHERE tabcode='" . $SelectedTabs . "'";
+ $sqlLimit = "SELECT pctabs.tablimit,
+ pctabs.currency,
+ currencies.decimalplaces
+ FROM pctabs,
+ currencies
+ WHERE pctabs.currency = currencies.currabrev
+ AND pctabs.tabcode='" . $SelectedTabs . "'";
$ResultLimit = DB_query($sqlLimit);
$Limit=DB_fetch_array($ResultLimit);
- if (($_POST['CurrentAmount']+$_POST['Amount'])>$Limit['tablimit']){
- prnMsg(_('The balance after this assignment would be greater than the specified limit for this PC tab'),'warning');
+ if (($_POST['CurrentAmount'])>$Limit['tablimit']){
+ $InputError = 1;
+ prnMsg(_('Cash NOT assigned because PC tab current balance is over its cash limit of') . ' ' . locale_number_format($Limit['tablimit'],$Limit['decimalplaces']) . ' ' . $Limit['currency'],'error');
+ prnMsg(_('Report expenses before being allowed to assign more cash or ask the administrator to increase the limit'),'error');
}
+ if ($InputError !=1 AND (($_POST['CurrentAmount']+$_POST['Amount'])>$Limit['tablimit'])){
+ prnMsg(_('Cash assigned but PC tab current balance is over its cash limit of') . ' ' . locale_number_format($Limit['tablimit'],$Limit['decimalplaces']) . ' ' . $Limit['currency'],'warning');
+ prnMsg(_('Report expenses before being allowed to assign more cash or ask the administrator to increase the limit'),'warning');
+ }
+
if ($InputError !=1 AND isset($SelectedIndex) ) {
$sql = "UPDATE pcashdetails
|
|
From: <te...@us...> - 2015-11-24 08:50:30
|
Revision: 7398
http://sourceforge.net/p/web-erp/reponame/7398
Author: tehonu
Date: 2015-11-24 08:50:28 +0000 (Tue, 24 Nov 2015)
Log Message:
-----------
Added script to maintain bank accounts authorized for a given user
Modified Paths:
--------------
trunk/includes/MainMenuLinksArray.php
trunk/sql/mysql/upgrade4.12.3-4.13.sql
Added Paths:
-----------
trunk/UserBankAccounts.php
Added: trunk/UserBankAccounts.php
===================================================================
--- trunk/UserBankAccounts.php (rev 0)
+++ trunk/UserBankAccounts.php 2015-11-24 08:50:28 UTC (rev 7398)
@@ -0,0 +1,235 @@
+<?php
+
+include('includes/session.inc');
+$Title = _('Bank Account Users');;// Screen identificator.
+$ViewTopic = 'GeneralLedger';// Filename's id in ManualContents.php's TOC.
+/* To do this section in the manual.
+$BookMark = 'UserBankAccounts';// Anchor's id in the manual's html document.*/
+include('includes/header.inc');
+
+echo '<p class="page_title_text"><img src="' . $RootPath . '/css/' . $Theme . '/images/money_add.png" title="' . _('User Authorised Bank Accounts') . '" alt="" />' . ' ' . $Title . '</p>';
+
+if (isset($_POST['SelectedBankAccount'])) {
+ $SelectedBankAccount = mb_strtoupper($_POST['SelectedBankAccount']);
+} elseif (isset($_GET['SelectedBankAccount'])) {
+ $SelectedBankAccount = mb_strtoupper($_GET['SelectedBankAccount']);
+} else {
+ $SelectedBankAccount = '';
+}
+
+if (isset($_POST['SelectedUser'])) {
+ $SelectedUser = $_POST['SelectedUser'];
+} elseif (isset($_GET['SelectedUser'])) {
+ $SelectedUser = $_GET['SelectedUser'];
+}
+
+if (isset($_POST['Cancel'])) {
+ unset($SelectedUser);
+ unset($SelectedBankAccount);
+}
+
+if (isset($_POST['Process'])) {
+ if ($_POST['SelectedUser'] == '') {
+ prnMsg(_('You have not selected any User'), 'error');
+ echo '<br />';
+ unset($SelectedUser);
+ unset($_POST['SelectedUser']);
+ }
+}
+
+if (isset($_POST['submit'])) {
+
+ $InputError = 0;
+
+ if ($_POST['SelectedBankAccount'] == '') {
+ $InputError = 1;
+ prnMsg(_('You have not selected a bank account to be authorised for this user'), 'error');
+ echo '<br />';
+ unset($SelectedUser);
+ }
+
+ if ($InputError != 1) {
+
+ // First check the user is not being duplicated
+
+ $CheckSql = "SELECT count(*)
+ FROM bankaccountusers
+ WHERE accountcode= '" . $_POST['SelectedBankAccount'] . "'
+ AND userid = '" . $_POST['SelectedUser'] . "'";
+
+ $CheckResult = DB_query($CheckSql);
+ $CheckRow = DB_fetch_row($CheckResult);
+
+ if ($CheckRow[0] > 0) {
+ $InputError = 1;
+ prnMsg(_('The Bank Account') . ' ' . $_POST['SelectedBankAccount'] . ' ' . _('is already authorised for this user'), 'error');
+ } else {
+ // Add new record on submit
+ $SQL = "INSERT INTO bankaccountusers (accountcode,
+ userid)
+ VALUES ('" . $_POST['SelectedBankAccount'] . "',
+ '" . $_POST['SelectedUser'] . "')";
+
+ $msg = _('User') . ': ' . $_POST['SelectedUser'] . ' ' . _('authority to use the') . ' ' . $_POST['SelectedBankAccount'] . ' ' . _('bank account has been changed');
+ $Result = DB_query($SQL);
+ prnMsg($msg, 'success');
+ unset($_POST['SelectedBankAccount']);
+ }
+ }
+} elseif (isset($_GET['delete'])) {
+ $SQL = "DELETE FROM bankaccountusers
+ WHERE accountcode='" . $SelectedBankAccount . "'
+ AND userid='" . $SelectedUser . "'";
+
+ $ErrMsg = _('The Bank account user record could not be deleted because');
+ $Result = DB_query($SQL, $ErrMsg);
+ prnMsg(_('User') . ' ' . $SelectedUser . ' ' . _('has had their authority to use the') . ' ' . $SelectedBankAccount . ' ' . _('bank account removed'), 'success');
+ unset($_GET['delete']);
+}
+
+if (!isset($SelectedUser)) {
+
+ /* It could still be the second time the page has been run and a record has been selected for modification - SelectedBankAccount 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">
+ <tr>
+ <td>' . _('Select User') . ':</td>
+ <td><select name="SelectedUser">';
+
+ $Result = DB_query("SELECT userid,
+ realname
+ FROM www_users
+ ORDER BY userid");
+
+ echo '<option value="">' . _('Not Yet Selected') . '</option>';
+ while ($MyRow = DB_fetch_array($Result)) {
+ if (isset($SelectedUser) and $MyRow['userid'] == $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>';
+
+ echo '</table>'; // close main table
+ DB_free_result($Result);
+
+ 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($SelectedUser)) {
+ $SQLName = "SELECT realname
+ FROM www_users
+ WHERE userid='" . $SelectedUser . "'";
+ $Result = DB_query($SQLName);
+ $MyRow = DB_fetch_array($Result);
+ $SelectedUserName = $MyRow['realname'];
+
+ echo '<div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">' . _('Authorised bank accounts for') . ' ' . $SelectedUserName . '</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="SelectedUser" value="' . $SelectedUser . '" />';
+
+ $SQL = "SELECT bankaccountusers.accountcode,
+ bankaccounts.bankaccountname
+ FROM bankaccountusers INNER JOIN bankaccounts
+ ON bankaccountusers.accountcode=bankaccounts.accountcode
+ WHERE bankaccountusers.userid='" . $SelectedUser . "'
+ ORDER BY bankaccounts.bankaccountname ASC";
+
+ $Result = DB_query($SQL);
+
+ echo '<table class="selection">';
+ echo '<tr>
+ <th colspan="6"><h3>' . _('Authorised bank accounts for User') . ': ' . $SelectedUserName . '</h3></th>
+ </tr>';
+ echo '<tr>
+ <th>' . _('Code') . '</th>
+ <th>' . _('Name') . '</th>
+ </tr>';
+
+ $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;
+ }
+
+ printf('<td>%s</td>
+ <td>%s</td>
+ <td><a href="%s?SelectedBankAccount=%s&delete=yes&SelectedUser=' . $SelectedUser . '" onclick="return confirm(\'' . _('Are you sure you wish to un-authorise this bank account?') . '\');">' . _('Un-authorise') . '</a></td>
+ </tr>',
+ $MyRow['accountcode'],
+ $MyRow['bankaccountname'],
+ htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8'),
+ $MyRow['accountcode'],
+ htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8'),
+ $MyRow['accountcode']);
+ }
+ //END WHILE LIST LOOP
+ echo '</table>';
+
+ if (!isset($_GET['delete'])) {
+
+
+ echo '<table class="selection">'; //Main table
+
+ echo '<tr>
+ <td>' . _('Select Bank Account') . ':</td>
+ <td><select name="SelectedBankAccount">';
+
+ $Result = DB_query("SELECT accountcode,
+ bankaccountname
+ FROM bankaccounts
+ WHERE NOT EXISTS (SELECT bankaccountusers.accountcode
+ FROM bankaccountusers
+ WHERE bankaccountusers.userid='" . $SelectedUser . "'
+ AND bankaccountusers.accountcode=bankaccounts.accountcode)
+ ORDER BY bankaccountname");
+
+ if (!isset($_POST['SelectedBankAccount'])) {
+ echo '<option selected="selected" value="">' . _('Not Yet Selected') . '</option>';
+ }
+ while ($MyRow = DB_fetch_array($Result)) {
+ if (isset($_POST['SelectedBankAccount']) and $MyRow['accountcode'] == $_POST['SelectedBankAccount']) {
+ echo '<option selected="selected" value="';
+ } else {
+ echo '<option value="';
+ }
+ echo $MyRow['accountcode'] . '">' . $MyRow['accountcode'] . ' - ' . $MyRow['bankaccountname'] . '</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
+}
+
+include('includes/footer.inc');
+?>
Modified: trunk/includes/MainMenuLinksArray.php
===================================================================
--- trunk/includes/MainMenuLinksArray.php 2015-11-21 09:42:58 UTC (rev 7397)
+++ trunk/includes/MainMenuLinksArray.php 2015-11-24 08:50:28 UTC (rev 7398)
@@ -400,7 +400,8 @@
_('User Authorised GL Accounts Maintenance'),
_('Copy Authority GL Accounts from user A to B'),
_('Bank Accounts'),
- _('Bank Account Authorised Users'));
+ _('Bank Account Authorized Users'),
+ _('User Authorized Bank Accounts'));
$MenuItems['GL']['Maintenance']['URL'] = array( '/AccountSections.php',
'/AccountGroups.php',
@@ -411,7 +412,8 @@
'/UserGLAccounts.php',
'/GLAccountUsersCopyAuthority.php',
'/BankAccounts.php',
- '/BankAccountUsers.php');
+ '/BankAccountUsers.php',
+ '/UserBankAccounts.php');
$MenuItems['FA']['Transactions']['Caption'] = array(_('Add a new Asset'),
_('Select an Asset'),
Modified: trunk/sql/mysql/upgrade4.12.3-4.13.sql
===================================================================
--- trunk/sql/mysql/upgrade4.12.3-4.13.sql 2015-11-21 09:42:58 UTC (rev 7397)
+++ trunk/sql/mysql/upgrade4.12.3-4.13.sql 2015-11-24 08:50:28 UTC (rev 7398)
@@ -50,5 +50,8 @@
('UserGLAccounts.php', '15', 'Maintenance of GL Accounts allowed for a user');
ALTER table stockrequest DROP FOREIGN KEY `stockrequest_ibfk_3`;
ALTER table stockrequest DROP FOREIGN KEY `stockrequest_ibfk_4`;
+
+INSERT INTO `scripts` (`script`, `pagesecurity`, `description`) VALUES ('UserBankAccounts.php', '15', 'Maintains table bankaccountusers (Authorized users to work with a bank account in webERP)');
+
-- Update version number:
UPDATE config SET confvalue='4.13' WHERE confname='VersionNumber';
|
|
From: <dai...@us...> - 2015-11-21 09:43:01
|
Revision: 7397
http://sourceforge.net/p/web-erp/reponame/7397
Author: daintree
Date: 2015-11-21 09:42:58 +0000 (Sat, 21 Nov 2015)
Log Message:
-----------
Gilberto Dos Santos Alves: Updated Portuguese Brazilian translation
Modified Paths:
--------------
trunk/doc/Change.log
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.mo
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.po
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-11-18 02:59:12 UTC (rev 7396)
+++ trunk/doc/Change.log 2015-11-21 09:42:58 UTC (rev 7397)
@@ -1,20 +1,22 @@
webERP Change Log
+
+21/11/15 Gilberto Dos Santos Alves: Updated Portuguese Brazilian translation
18/11/15 AlexFigueiro: Remove the duplicate foreign key in stockrequest and stockrequestitem;
15/11/15 RChacon: Tidy css/*/default.css, reagrouping style for clases centre, number, page_title_text and text.
-15/11/15 Hazem wehbi Add new arabic locale for Syria.
+15/11/15 Hazem wehbi Add new arabic locale for Syria.
14/11/15 RChacon: In css/default/default.css, add sections to use with a cascading style sheet for a small device width, reagroup style for centre, number and text in tables.
11/11/15 Ricard: New feature GL accounts - users authority.
09/11/15 RChacon: In CustomerReceipt.php, minor changes (completes table columns, adds classes, etc.).
-05/11/15 Exson: Tidy code up following Tim's suggestion.
+05/11/15 Exson: Tidy code up following Tim's suggestion.
3/11/15 RChacon: In GLAccountInquiry.php, add ViewTopic and BookMark, fix some colspan, and add thead and column classes.
3/11/15 Exson: Tidy code up in StockClone.php.
3/11/15 Exson: Fixed typo in PriceMatrix.php.
-30/10/15 Exson: Allow user input supplier's delivery note during goods receiving and make the inquiry script for it. So users can search corresponding GRN, PO and invoice with it.
+30/10/15 Exson: Allow user input supplier's delivery note during goods receiving and make the inquiry script for it. So users can search corresponding GRN, PO and invoice with it.
29/10/15 Exson: Add gl narrative and account balance information to DailyBankTransactions.php.
28/10/15 Exson: Add bank default currency, original amount and check no data to GL account inquiry in GLAccountInquiry.php.
06/10/15 UK-Steven: Contribute email customer statements feature scripts.
06/10/15 Exson: Fixed the wrong unable to identify the selected customer warning at SelectOrderItems.php.
-23/09/2015 Tim: ADD invoice to grns mapping data in SupplierInvoice.php.
+23/09/2015 Tim: ADD invoice to grns mapping data in SupplierInvoice.php.
21/09/15 RChacon: In StockLocStatus.php, add current date and time, and format to use print.css.
21/09/15 Exson: Fix the wrong material cost updated in SupplierCredit.php. Reported by Akits.
19/9/15 Dongbak Cha:Korean translation via Google translate
Modified: trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.po 2015-11-18 02:59:12 UTC (rev 7396)
+++ trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.po 2015-11-21 09:42:58 UTC (rev 7397)
@@ -5,10 +5,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: webERP 4.12.2\n"
+"Project-Id-Version: webERP 4.12.3\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-09-14 09:07-0600\n"
-"PO-Revision-Date: 2014-01-28 14:48-0300\n"
+"PO-Revision-Date: 2015-11-16 01:13-0300\n"
"Last-Translator: gilberto dos santos alves <gs...@gm...>\n"
"Language-Team: pt-br <gs...@gm...>\n"
"Language: pt_BR\n"
@@ -16,7 +16,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: normal;\n"
-"X-Generator: Poedit 1.6.1\n"
+"X-Generator: gsavix editor 2015.11\n"
"X-Poedit-SourceCharset: utf-8\n"
#: AccountGroups.php:6 includes/MainMenuLinksArray.php:395
@@ -951,11 +951,11 @@
#: AgedControlledInventory.php:8
msgid "Aged Controlled Inventory"
-msgstr ""
+msgstr "Inventário Controlado Histórico"
#: AgedControlledInventory.php:8
msgid "as-of"
-msgstr ""
+msgstr "pos. de"
#: AgedControlledInventory.php:12 InventoryQuantities.php:155
#: InventoryValuation.php:217 Locations.php:12 MRP.php:542 MRPCalendar.php:21
@@ -973,7 +973,7 @@
#: AgedControlledInventory.php:32
msgid "The stock held could not be retrieved because"
-msgstr ""
+msgstr "Estoque alocado não pode ser recuperado porque"
#: AgedControlledInventory.php:42 MRPReschedules.php:126 MRPShortages.php:261
#: StockClone.php:53 Stocks.php:63
@@ -1043,15 +1043,15 @@
#: AgedControlledInventory.php:45
msgid "Quantity Remaining"
-msgstr ""
+msgstr "Quantidade Restante"
#: AgedControlledInventory.php:46
msgid "Inventory Value"
-msgstr ""
+msgstr "Valor Inventário"
#: AgedControlledInventory.php:48
msgid "Days Old"
-msgstr ""
+msgstr "Dias Decorridos"
#: AgedControlledInventory.php:91 ConfirmDispatch_Invoice.php:309
#: ConfirmDispatch_Invoice.php:313 CounterReturns.php:676
@@ -1416,7 +1416,7 @@
#: AnalysisHorizontalIncome.php:146 AnalysisHorizontalIncome.php:147
#: includes/MainMenuLinksArray.php:374
msgid "Horizontal Analysis of Statement of Comprehensive Income"
-msgstr ""
+msgstr "Análise Horizontal Abrangente de Receitas"
#: AnalysisHorizontalIncome.php:22 GLProfit_Loss.php:14
#: GLTagProfit_Loss.php:14 Z_UpdateChartDetailsBFwd.php:14
@@ -1430,7 +1430,7 @@
#: AnalysisHorizontalIncome.php:30
msgid "Print Horizontal Analysis of Statement of Comprehensive Income"
-msgstr ""
+msgstr "Imprimir Análise Horizontal Abrang. de Receitas"
#: AnalysisHorizontalIncome.php:34 AnalysisHorizontalPosition.php:31
msgid ""
@@ -1439,6 +1439,9 @@
"financial statement items over a period of time. It is a useful tool to "
"evaluate trend situations."
msgstr ""
+"Análise horizontal (também conhecida como trend analysis) é uma técnica "
+"análise que exibe modificações nos valores dentro de um período "
+"correspondente. Útil para analisar situações contábeis."
#: AnalysisHorizontalIncome.php:35 AnalysisHorizontalPosition.php:32
msgid ""
@@ -1447,6 +1450,10 @@
"compared with items on the statement of the base period. The changes are "
"shown both in currency (actual change) and percentage (relative change)."
msgstr ""
+"A abrangência de dois períodos é usada para análise horizontal. O período "
+"mais antigo é usado como base. Os itens mais recentes são comparados com os "
+"itens do período base. Diferenças são exibidas em ambas moedas (atual e "
+"relativa)."
#: AnalysisHorizontalIncome.php:36 AnalysisHorizontalPosition.php:33
#: GLBalanceSheet.php:29 GLProfit_Loss.php:33
@@ -1462,15 +1469,15 @@
#: AnalysisHorizontalIncome.php:43
msgid "Select period from"
-msgstr ""
+msgstr "Selec. período inicial"
#: AnalysisHorizontalIncome.php:79
msgid "Select period to"
-msgstr ""
+msgstr "Selecione perído final"
#: AnalysisHorizontalIncome.php:105 AnalysisHorizontalPosition.php:72
msgid "Detail or summary"
-msgstr ""
+msgstr "Detalhe ou Resumo"
#: AnalysisHorizontalIncome.php:106 AnalysisHorizontalPosition.php:73
#: GLBalanceSheet.php:60
@@ -1492,7 +1499,7 @@
#: AnalysisHorizontalIncome.php:112 AnalysisHorizontalPosition.php:79
msgid "Show all accounts including zero balances"
-msgstr ""
+msgstr "Exibir todas contas incluindo saldos zero"
#: AnalysisHorizontalIncome.php:113 AnalysisHorizontalPosition.php:80
#: GLBalanceSheet.php:67 GLProfit_Loss.php:116
@@ -1512,7 +1519,7 @@
#: DailyBankTransactions.php:190 GLBalanceSheet.php:718 GLProfit_Loss.php:1315
#: GLTrialBalance.php:736
msgid "Return"
-msgstr ""
+msgstr "Retornar"
#: AnalysisHorizontalIncome.php:131 GLProfit_Loss.php:147
#: GLProfit_Loss.php:576 GLTagProfit_Loss.php:155 GLTagProfit_Loss.php:479
@@ -1594,11 +1601,11 @@
#: AnalysisHorizontalIncome.php:162 AnalysisHorizontalPosition.php:125
msgid "Actual change"
-msgstr ""
+msgstr "Taxa Real"
#: AnalysisHorizontalIncome.php:163 AnalysisHorizontalPosition.php:126
msgid "Relative change"
-msgstr ""
+msgstr "Taxa Relativa"
#: AnalysisHorizontalIncome.php:170
msgid ""
@@ -1606,6 +1613,8 @@
"the net profit; a negative number indicates a variation that decreases the "
"net profit."
msgstr ""
+"Taxa real sinaliza: se positivo indica variação positiva no lucro líquido; "
+"se negativa indica queda no lucro líquido."
#: AnalysisHorizontalIncome.php:171 AnalysisHorizontalPosition.php:134
msgid ""
@@ -1613,6 +1622,8 @@
"of that account; a negative number indicates a decrease in the amount of "
"that account."
msgstr ""
+"Sinais Relativos Modificação: número positivo indica um incremento na conta "
+"contábil; número negativo indica queda na quantia da conta."
#: AnalysisHorizontalIncome.php:199 AnalysisHorizontalPosition.php:174
#: GLBalanceSheet.php:153 GLBalanceSheet.php:390 GLCodesInquiry.php:18
@@ -1646,17 +1657,17 @@
#: AnalysisHorizontalIncome.php:322
msgid "Earnings after"
-msgstr ""
+msgstr "Lucros após"
#: AnalysisHorizontalIncome.php:500
msgid "Net Profit"
-msgstr ""
+msgstr "Lucro Líquido"
#: AnalysisHorizontalIncome.php:517 AnalysisHorizontalPosition.php:366
#: DailyBankTransactions.php:184 GLBalanceSheet.php:714 GLProfit_Loss.php:1311
#: GLTrialBalance.php:732
msgid "Print This"
-msgstr ""
+msgstr "Imprimir"
#: AnalysisHorizontalIncome.php:518 AnalysisHorizontalIncome.php:519
#: AnalysisHorizontalPosition.php:367 AnalysisHorizontalPosition.php:368
@@ -1671,11 +1682,11 @@
#: AnalysisHorizontalPosition.php:109 AnalysisHorizontalPosition.php:110
#: includes/MainMenuLinksArray.php:375
msgid "Horizontal Analysis of Statement of Financial Position"
-msgstr ""
+msgstr "Análise Horizontal de Posição Financeira"
#: AnalysisHorizontalPosition.php:27
msgid "Print Horizontal Analysis of Statement of Financial Position"
-msgstr ""
+msgstr "Imprimir Análise Horizontal de Posição Financeira"
#: AnalysisHorizontalPosition.php:40 GLBalanceSheet.php:36
msgid "Select the balance date"
@@ -1692,6 +1703,8 @@
"Actual change signs: a positive number indicates a source of funds; a "
"negative number indicates an application of funds."
msgstr ""
+"Sinais modificação real: número positivo indica fonte em fundos; número "
+"negativo indica aplicação em fundos."
#: AnalysisHorizontalPosition.php:148 GLBalanceSheet.php:114
#: GLBalanceSheet.php:364
@@ -1927,11 +1940,11 @@
#: AutomaticTranslationDescriptions.php:5 includes/MainMenuLinksArray.php:561
msgid "Translate Item Descriptions"
-msgstr ""
+msgstr "Traduzir Descrição Itens"
#: AutomaticTranslationDescriptions.php:31
msgid "Description Automatic Translation for empty translations"
-msgstr ""
+msgstr "Descrição automática para traduções vazias"
#: AutomaticTranslationDescriptions.php:35 MaterialsNotUsed.php:33
#: TopItems.php:168
@@ -1977,12 +1990,12 @@
#: AutomaticTranslationDescriptions.php:39
msgid "Translated"
-msgstr ""
+msgstr "Traduzido"
#: AutomaticTranslationDescriptions.php:116
#: AutomaticTranslationDescriptions.php:117
msgid "No item description was automatically translated"
-msgstr ""
+msgstr "Nenhuma tradução de descrição de item foi feita automaticamente"
#: BOMExtendedQty.php:12 BOMExtendedQty.php:13 BOMExtendedQty.php:154
#: BOMExtendedQty.php:254
@@ -2887,7 +2900,7 @@
#: BOMs.php:702
msgid "Sequence in BOM"
-msgstr ""
+msgstr "Sequência BOM"
#: BOMs.php:736
msgid "Work Centre Added"
@@ -2971,7 +2984,7 @@
#: BankAccountUsers.php:6
msgid "Bank Account Users"
-msgstr ""
+msgstr "Usuários Conta Bancária"
#: BankAccountUsers.php:13 includes/MainMenuLinksArray.php:400
msgid "Bank Account Authorised Users"
@@ -3204,7 +3217,7 @@
#: BankAccounts.php:203
msgid "Import Format"
-msgstr ""
+msgstr "Importar Formato"
#: BankAccounts.php:204 Currencies.php:461 CustItem.php:299 CustItem.php:415
#: CustomerAllocations.php:351 CustomerReceipt.php:838
@@ -3254,19 +3267,19 @@
#: BankAccounts.php:367
msgid "Transaction Import File Format"
-msgstr ""
+msgstr "Form. Arq. de Transação para Importar"
#: BankAccounts.php:370
msgid "MT940 - Siam Comercial Bank Thailand"
-msgstr ""
+msgstr "MT940 - Banco Comercial Siam Tailândia"
#: BankAccounts.php:371
msgid "MT940 - ING Bank Netherlands"
-msgstr ""
+msgstr "MT940 - ING Banco Holanda"
#: BankAccounts.php:372
msgid "GIFTS - Bank of New Zealand"
-msgstr ""
+msgstr "GIFTS - Banco Nova Zelandia"
#: BankAccounts.php:377
msgid "Currency Of Account"
@@ -4247,15 +4260,15 @@
#: ConfirmDispatch_Invoice.php:252
msgid "Dispathed Quantity should not be more than order balanced quantity"
-msgstr ""
+msgstr "Quantidade Despachada não pode ser maior que quantidade do pedido"
#: ConfirmDispatch_Invoice.php:252
msgid "To dispatch quantity is"
-msgstr ""
+msgstr "Quantidade para despachar é"
#: ConfirmDispatch_Invoice.php:252
msgid "And the order balance is "
-msgstr ""
+msgstr "Saldo do Pedido é"
#: ConfirmDispatch_Invoice.php:279
msgid "Confirm Invoice"
@@ -7630,10 +7643,12 @@
"invoiced and that it is possible that the credit note may not already have "
"been done"
msgstr ""
+"Falha na recuperação detalhes pedido ao comparar se o pedido já foi enviado "
+"e a nota de crédito não foi feita"
#: Credit_Invoice.php:501
msgid "The credit quantity for the line for"
-msgstr ""
+msgstr "Quantidade Credora dessa linha para"
#: Credit_Invoice.php:512 SelectCreditItems.php:952
msgid ""
@@ -7809,7 +7824,7 @@
#: Currencies.php:33
msgid "Currencies"
-msgstr ""
+msgstr "Moeda"
#: Currencies.php:56
msgid "The currency already exists in the database"
@@ -7908,10 +7923,11 @@
"Cannot delete this currency because there are bank accounts that use this "
"currency"
msgstr ""
+"Não pode remover essa moeda pois existem contas bancárias utilizando a mesma"
#: Currencies.php:273
msgid "bank accounts that refer to this currency"
-msgstr ""
+msgstr "contas bancárias que usam essa moeda"
#: Currencies.php:278
msgid "The currency definition record has been deleted"
@@ -7944,7 +7960,7 @@
#: Currencies.php:310 Currencies.php:516
msgid "Show in webSHOP"
-msgstr ""
+msgstr "Exibir no webSHOP"
#: Currencies.php:312
msgid "1 / Ex Rate"
@@ -8102,7 +8118,7 @@
#: CustItem.php:6
msgid "Customer Item Data"
-msgstr ""
+msgstr "Dados Item do Cliente"
#: CustItem.php:36 Prices.php:14 PurchData.php:51 RelatedItemsUpdate.php:26
#: StockClone.php:50 StockCostUpdate.php:18 StockReorderLevel.php:17
@@ -8140,12 +8156,12 @@
#: CustItem.php:56
msgid "The customer sells an item by the tonne and we hold stock by the kg"
-msgstr ""
+msgstr "Unidad de vendas para o cliente TON e nosso estoque em KG"
#: CustItem.php:56
msgid ""
"The debtorsmaster.price must be divided by 1000 to get to our cost per kg"
-msgstr ""
+msgstr "O preço de débito deve ser dividido por 100 para nosso custo por kg"
#: CustItem.php:56 PurchData.php:84
msgid "The conversion factor to enter is 1000"
@@ -8157,27 +8173,27 @@
#: CustItem.php:72
msgid "The customer Item details could not be added to the database because"
-msgstr ""
+msgstr "Detalhes do item do cliente não pode ser adicionado ao DB porque"
#: CustItem.php:75
msgid "This customer data has been added to the database"
-msgstr ""
+msgstr "Dados desse cliente adicionado ao DB"
#: CustItem.php:85
msgid "The customer details could not be updated because"
-msgstr ""
+msgstr "Detalhes do cliente não podem ser atualizados porque"
#: CustItem.php:88
msgid "customer data has been updated"
-msgstr ""
+msgstr "dados do cliente atualizados"
#: CustItem.php:109
msgid "The customer details could not be deleted because"
-msgstr ""
+msgstr "Detalhes do cliente não podem ser movidos porque"
#: CustItem.php:111
msgid "This customer data record has been successfully deleted"
-msgstr ""
+msgstr "Dados desse cliente foram removidos com sucesso"
#: CustItem.php:120 CustItem.php:210 CustItem.php:238 PurchData.php:241
#: PurchData.php:373 PurchData.php:401 SupplierPriceList.php:395
@@ -8188,14 +8204,15 @@
msgid ""
"The customer details for the selected part could not be retrieved because"
msgstr ""
+"Detalhes do cliente para o item selecionado não podem ser recuperados porque"
#: CustItem.php:138
msgid "There is no customer data set up for the part selected"
-msgstr ""
+msgstr "Não há dados do cliente para o item selecionado"
#: CustItem.php:145
msgid "Customer Unit"
-msgstr ""
+msgstr "Unidade do cliente"
#: CustItem.php:146 PurchData.php:274 SupplierPriceList.php:536
msgid "Conversion Factor"
@@ -8203,21 +8220,23 @@
#: CustItem.php:147 SelectOrderItems.php:1640
msgid "Customer Item"
-msgstr ""
+msgstr "Item Cliente"
#: CustItem.php:148
msgid "Customer Description"
-msgstr ""
+msgstr "Descrição Cliente"
#: CustItem.php:167
#, php-format
msgid "Are you sure you wish to delete this customer data?"
-msgstr ""
+msgstr "Confirma remoção dos dados desse cliente?"
#: CustItem.php:196
msgid ""
"The customer details for the selected customer could not be retrieved because"
msgstr ""
+"Detalhes do cliente para o cliente selecionado não podem ser recuperados "
+"porque"
#: CustItem.php:205 Z_ChangeCustomerCode.php:20
msgid "The customer code"
@@ -8225,17 +8244,19 @@
#: CustItem.php:205
msgid "is not an existing customer in the database"
-msgstr ""
+msgstr "cliente não existente no DB"
#: CustItem.php:205
msgid ""
"You must enter an alternative customer code or select a customer using the "
"search facility below"
msgstr ""
+"Favor informar um código cliente alternativo ou selecionar um cliente "
+"usando a função pesquisar"
#: CustItem.php:218
msgid "Text in the customer"
-msgstr ""
+msgstr "Texto no nome do Cliente"
#: CustItem.php:218 PurchData.php:381 SellThroughSupport.php:200
#: SupplierPriceList.php:404
@@ -8244,7 +8265,7 @@
#: CustItem.php:221
msgid "Text in customer"
-msgstr ""
+msgstr "Texto no Nome do Cliente"
#: CustItem.php:221 PurchData.php:384 SellThroughSupport.php:203
#: SupplierPriceList.php:407
@@ -8253,22 +8274,24 @@
#: CustItem.php:227
msgid "Find Customers Now"
-msgstr ""
+msgstr "Pesquisar Clientes agora"
#: CustItem.php:243
msgid ""
"Customer Name keywords have been used in preference to the customer Code "
"extract entered"
msgstr ""
+"Palavras chave Nome de Cliente usada em detrimento do código do Cliente "
+"informado"
#: CustItem.php:273
msgid ""
"The cuswtomer matching the criteria entered could not be retrieved because"
-msgstr ""
+msgstr "Critério de localizar cliente informado não pode ser recuperado porque"
#: CustItem.php:274
msgid "The SQL to retrieve customer details that failed was"
-msgstr ""
+msgstr "Detalhes, do SQL que falhou, foi"
#: CustItem.php:287 OffersReceived.php:107 PurchData.php:459 Stocks.php:589
#: includes/PDFPeriodStockTransListingPageHeader.inc:47
@@ -8302,6 +8325,8 @@
"The customer purchasing details for the selected customer and item could not "
"be retrieved because"
msgstr ""
+"Detalhes de compra do cliente para o cliente selecionado não podem ser "
+"recuperados porque"
#: CustItem.php:394 PurchData.php:583
msgid "A search facility is available below if necessary"
@@ -8313,7 +8338,7 @@
#: CustItem.php:425
msgid "Customer Unit of Measure"
-msgstr ""
+msgstr "Unidade de medida do cliente"
#: CustItem.php:434 PurchData.php:639
msgid "Conversion Factor (to our UOM)"
@@ -8321,11 +8346,11 @@
#: CustItem.php:438
msgid "Customer Stock Code"
-msgstr ""
+msgstr "Código estoque cliente"
#: CustItem.php:442
msgid "Customer Stock Description"
-msgstr ""
+msgstr "Descrição Estoque do Cliente"
#: CustItem.php:455 MailingGroupMaintenance.php:250 ProductSpecs.php:163
#: ProductSpecs.php:238 PurchData.php:763 SellThroughSupport.php:481
@@ -8625,29 +8650,31 @@
#: CustomerAccount.php:6
msgid "Customer Account"
-msgstr ""
+msgstr "Conta Cliente"
#: CustomerAccount.php:14
msgid ""
"To display the account a customer must first be selected from the customer "
"selection screen"
msgstr ""
+"Para exibir a conta do cliente, primeiro selecionar na tela de seleção de "
+"cliente"
#: CustomerAccount.php:15
msgid "Select a Customer Account to Display"
-msgstr ""
+msgstr "Selecionar Conta Cliente para Exibir"
#: CustomerAccount.php:28 CustomerInquiry.php:28
msgid "Failed to retrieve sales data"
-msgstr ""
+msgstr "Falha na recuperação dados de venda"
#: CustomerAccount.php:37
msgid "There is no salesman data set for this customer"
-msgstr ""
+msgstr "Não há dados do vendedor para esse cliente"
#: CustomerAccount.php:42
msgid "You have no authority to review this customer account"
-msgstr ""
+msgstr "Seu usuário/login não tem permissão para revisar conta desse cliente"
#: CustomerAccount.php:56 PrintCustStatements.php:139
msgid ""
@@ -8675,11 +8702,11 @@
#: CustomerAccount.php:216 CustomerInquiry.php:158
msgid "Back to Customer Screen"
-msgstr ""
+msgstr "voltar para Tela Clientes"
#: CustomerAccount.php:220
msgid "Customer Statement For"
-msgstr ""
+msgstr "Dados Cliente para"
#: CustomerAccount.php:231 CustomerInquiry.php:162 CustomerReceipt.php:1022
#: SelectOrderItems.php:698 SupplierCredit.php:264 SupplierInquiry.php:123
@@ -8742,11 +8769,11 @@
#: CustomerAccount.php:275
msgid "TRANSACTIONS SETTLED SINCE"
-msgstr ""
+msgstr "Transações lançadas desde"
#: CustomerAccount.php:278
msgid "OUTSTANDING TRANSACTIONS"
-msgstr ""
+msgstr "Transações Pendentes de Conciliação"
#: CustomerAccount.php:306 CustomerInquiry.php:311 CustomerInquiry.php:357
#: CustomerInquiry.php:396 CustomerInquiry.php:432 CustomerInquiry.php:478
@@ -9018,7 +9045,7 @@
#: CustomerBalancesMovement.php:7 CustomerBalancesMovement.php:14
#: includes/MainMenuLinksArray.php:118
msgid "Customer Activity and Balances"
-msgstr ""
+msgstr "Atividade Cliente e Saldos"
#: CustomerBalancesMovement.php:40 CustomerBranches.php:787
#: SalesAnalRepts.php:20 SalesAnalRepts.php:22 SalesInquiry.php:776
@@ -9049,16 +9076,16 @@
#: CustomerBalancesMovement.php:68
msgid "Create CSV"
-msgstr ""
+msgstr "Criar CSV"
#: CustomerBalancesMovement.php:75
msgid "Show Customer Balance Movements"
-msgstr ""
+msgstr "Exibir Saldo Movimento Cliente"
#: CustomerBalancesMovement.php:118 CustomerBalancesMovement.php:124
#: CustomerBalancesMovement.php:197 includes/DatabaseTranslations.php:55
msgid "Opening Balance"
-msgstr ""
+msgstr "Saldo Abertura"
#: CustomerBalancesMovement.php:119 CustomerBalancesMovement.php:124
#: CustomerBalancesMovement.php:198 GLTransInquiry.php:50
@@ -9067,7 +9094,7 @@
#: CustomerBalancesMovement.php:203 CustomerBalancesMovement.php:211
msgid "TOTALS"
-msgstr ""
+msgstr "TOTAIS"
#: CustomerBranches.php:6
msgid "Customer Branches"
@@ -9145,6 +9172,8 @@
"Warning - Geocode Integration is enabled, but no hosts are setup. Go to "
"Geocode Setup"
msgstr ""
+"Atenção - integração Geocode habilitada, mas nenhum host configurado. Vá "
+"para Config Geocode"
#: CustomerBranches.php:134
msgid "Geocode Notice"
@@ -9250,6 +9279,7 @@
"Cannot delete this branch because it is the only branch defined for this "
"customer."
msgstr ""
+"Não pode remover essa sucursal pois é a única definida para esse cliente"
#: CustomerBranches.php:355
msgid "The branch record could not be deleted"
@@ -9558,23 +9588,23 @@
#: CustomerInquiry.php:37
msgid "There is no salesman data set for this debtor"
-msgstr ""
+msgstr "Não há dados de vendedor para esse Devedor"
#: CustomerInquiry.php:42
msgid "You have no authority to review this data"
-msgstr ""
+msgstr "Seu login não tem autoridade para revisar esses dados"
#: CustomerInquiry.php:57
msgid "The balance status should be all or zero balance or not zero balance"
-msgstr ""
+msgstr "Status do saldo deve ser tudo ou saldo zero"
#: CustomerInquiry.php:194 CustomerInquiry.php:199 CustomerInquiry.php:203
msgid "Invoices not fully allocated"
-msgstr ""
+msgstr "Pedidos não alocados totalmente"
#: CustomerInquiry.php:195 CustomerInquiry.php:200 CustomerInquiry.php:204
msgid "Invoices fully allocated"
-msgstr ""
+msgstr "Pedidos totalmente alocados"
#: CustomerInquiry.php:236 SupplierInquiry.php:194
msgid "No transactions were returned by the SQL because"
@@ -9597,12 +9627,12 @@
#: CustomerInquiry.php:328 CustomerInquiry.php:455 CustomerInquiry.php:530
#: CustomerInquiry.php:586 CustomerInquiry.php:636 SupplierInquiry.php:276
msgid "Click to view the GL entries"
-msgstr ""
+msgstr "Clique para ver lançamentos GL"
#: CustomerInquiry.php:330 CustomerInquiry.php:457 CustomerInquiry.php:532
#: CustomerInquiry.php:588 CustomerInquiry.php:638 SupplierInquiry.php:277
msgid "GL Entries"
-msgstr ""
+msgstr "Entradas GL"
#: CustomerPurchases.php:6
msgid "Customer Purchases"
@@ -9707,6 +9737,10 @@
"accounts are automatically maintained. This setting can be disabled in "
"System Configuration"
msgstr ""
+"Pagamentos envolvendo conta de controle de devedores não pode ser informada. "
+"integração para devedores contábeis (AR) está habilidado, portanto as contas "
+"são automaticamente mantidas. Essas configurações podem ser desabilitadas em "
+"Config Sistema"
#: CustomerReceipt.php:188 Payments.php:668
msgid ""
@@ -9715,12 +9749,18 @@
"enabled so control accounts are automatically maintained. This setting can "
"be disabled in System Configuration"
msgstr ""
+"Pagamentos envolvendo contas contábeis de controle de credores ou suspensão "
+"dos recebimentos não podem ser informados. Integração contábil para módulo "
+"(AP) podem ser automaticamente mantidas. Essa configuração pode ser feita em "
+"Config Sistema"
#: CustomerReceipt.php:192 Payments.php:672
msgid ""
"Payments involving the retained earnings control account cannot be entered. "
"This account is automtically maintained."
msgstr ""
+"Conta Contábil dos pagamentos envolvendo retençao de lucros não pode ser "
+"informada. Essa conta é automaticamente mantida."
#: CustomerReceipt.php:241
msgid "The company has not yet been set up properly"
@@ -9951,7 +9991,7 @@
#: CustomerReceipt.php:1037
msgid "Customer Transaction Inquiry"
-msgstr ""
+msgstr "Consulta Transações Cliente"
#: CustomerReceipt.php:1046 SelectGLAccount.php:116 SelectGLAccount.php:131
#, php-format
@@ -10311,22 +10351,24 @@
#: Customers.php:323
msgid "Cannot delete this customer because users exist that refer to it"
-msgstr ""
+msgstr "Não pode remover esse cliente pois existem usuários que o utilizam."
#: Customers.php:333
msgid ""
"Cannot delete this customer because contracts have been created that refer "
"to it"
msgstr ""
+"Não pode remover este cliente porque contratos foram criados referindo-se a "
+"ele"
#: Customers.php:334
msgid "contracts referring to this customer"
-msgstr ""
+msgstr "contratos que referem esse cliente"
#: Customers.php:348
msgid ""
"has been deleted - together with all the associated branches and contacts"
-msgstr ""
+msgstr "foi removido. junto com todas as sucursais e contatos associados"
#: Customers.php:424
msgid ""
@@ -10693,11 +10735,11 @@
#: Dashboard.php:6 Dashboard.php:10
msgid "Dashboard"
-msgstr ""
+msgstr "Painel Controle"
#: Dashboard.php:15 Dashboard.php:42
msgid "The security for Aging Debtors cannot be retrieved because"
-msgstr ""
+msgstr "A securança para Saldo de Devedores não ode ser recuperada porque."
#: Dashboard.php:16 Dashboard.php:25 Dashboard.php:34 Dashboard.php:43
#: ProductSpecs.php:78 ProductSpecs.php:282 ProductSpecs.php:317
@@ -10710,15 +10752,15 @@
#: Dashboard.php:24
msgid "The security for upcoming payments cannot be retrieved because"
-msgstr ""
+msgstr "A segurança para pagamentos não pode ser recuperada porque"
#: Dashboard.php:33
msgid "The security for G/L Accounts cannot be retrieved because"
-msgstr ""
+msgstr "A segurança para conta GL não pode ser recuperada porque"
#: Dashboard.php:49
msgid "Overdue Customer Balances"
-msgstr ""
+msgstr "Saldo do Cliente Excedido"
#: Dashboard.php:55 includes/PDFCustTransListingPageHeader.inc:50
#: includes/PDFPeriodStockTransListingPageHeader.inc:49
@@ -10755,7 +10797,7 @@
#: Dashboard.php:367
msgid "Supplier Invoices Due within 1 Month"
-msgstr ""
+msgstr "Ordem Compra Acum em 1 Mês"
#: Dashboard.php:372 PrintCustTrans.php:788 PrintCustTransPortrait.php:857
#: SalesInquiry.php:1088 SupplierInvoice.php:634
@@ -10764,7 +10806,7 @@
#: Dashboard.php:374
msgid "Amount Due"
-msgstr ""
+msgstr "Valor Acum."
#: Dashboard.php:437 SuppPaymentRun.php:111
msgid "The details of supplier invoices due could not be retrieved because"
@@ -10776,7 +10818,7 @@
#: Dashboard.php:526
msgid "Bank and Credit Card Balances"
-msgstr ""
+msgstr "Saldo Bancário e Cartão Crédito"
#: Dashboard.php:601 Dashboard.php:620 GLAccountCSV.php:189
#: GLAccountCSV.php:218 GLAccountInquiry.php:194 GLAccountInquiry.php:232
@@ -10786,7 +10828,7 @@
#: Dashboard.php:653
msgid "Outstanding Orders"
-msgstr ""
+msgstr "Ordens Pendentes"
#: Dashboard.php:656 ../webSHOP/includes/Functions.php:64
#: ../webSHOP/includes/header.php:226
@@ -12673,7 +12715,7 @@
#: FixedAssetCategories.php:316
msgid "Profit or Loss on Disposal GL Code"
-msgstr ""
+msgstr "Código GL Lucros e Perdas "
#: FixedAssetCategories.php:317
msgid ""
@@ -13984,7 +14026,7 @@
#: GLBalanceSheet.php:22
msgid "Print Statement of Financial Position"
-msgstr ""
+msgstr "Imprimir Posição Financeira ou Balancete"
#: GLBalanceSheet.php:27
msgid ""
@@ -14036,7 +14078,7 @@
#: GLBalanceSheet.php:397
msgid "Statement of Financial Position"
-msgstr ""
+msgstr "Posição Financeira Lançamentos"
#: GLBalanceSheet.php:716
msgid "Select A Different Balance Date"
@@ -14289,7 +14331,7 @@
#: GLProfit_Loss.php:25
msgid "Print Statement of Comprehensive Income"
-msgstr ""
+msgstr "Imprimir Lançamentos Entradas"
#: GLProfit_Loss.php:26
msgid "Print Profit and Loss Report"
@@ -14364,7 +14406,7 @@
#: GLProfit_Loss.php:618
msgid "Statement of Comprehensive Income"
-msgstr ""
+msgstr "Entradas de Lançamentos"
#: GLProfit_Loss.php:619 includes/MainMenuLinksArray.php:372
msgid "Profit and Loss Statement"
@@ -14504,7 +14546,7 @@
#: GLTrialBalance.php:34
msgid "Print Trial Balance"
-msgstr ""
+msgstr "Imprimir Balancete Analítico"
#: GLTrialBalance.php:55 SalesGraph.php:43
msgid "Select Period From:"
@@ -14539,7 +14581,7 @@
#: GLTrialBalance.php:440
msgid " AND for the "
-msgstr ""
+msgstr "e para "
#: GLTrialBalance.php:450 includes/PDFTrialBalancePageHeader.inc:30
msgid "Month Actual"
@@ -15023,7 +15065,7 @@
#: GoodsReceived.php:759
msgid "Print QA Labels for this Receipt"
-msgstr ""
+msgstr "Imprimir Etiq. QA desse Recebimento"
#: GoodsReceived.php:774
msgid "Modify Order Items"
@@ -15075,7 +15117,7 @@
#: HistoricalTestResults.php:5
msgid "Historical Test Results"
-msgstr ""
+msgstr "Resultados Testes Históricos"
#: HistoricalTestResults.php:26 MRPCalendar.php:47 POReport.php:88
#: POReport.php:871 SalesInquiry.php:82 SelectQASamples.php:166
@@ -15091,17 +15133,17 @@
#: HistoricalTestResults.php:51
msgid "Show Test Results For"
-msgstr ""
+msgstr "Exibir Resultado Testes para"
#: HistoricalTestResults.php:72 SelectQASamples.php:251
#: TestPlanResults.php:128
msgid "From Sample Date"
-msgstr ""
+msgstr "Data Inicial"
#: HistoricalTestResults.php:76 SelectQASamples.php:251
#: TestPlanResults.php:128
msgid "To Sample Date"
-msgstr ""
+msgstr "Data Final"
#: HistoricalTestResults.php:82 InternalStockRequest.php:301
#: MRPCreateDemands.php:282 MailingGroupMaintenance.php:145 PDFCOA.php:43
@@ -15112,23 +15154,23 @@
#: HistoricalTestResults.php:134
msgid "Historical Test Results for"
-msgstr ""
+msgstr "Testar resultados históricos para"
#: HistoricalTestResults.php:136
msgid "Sample ID:"
-msgstr ""
+msgstr "ID Amostra:"
#: HistoricalTestResults.php:136 PDFGrn.php:142 PDFStockTransfer.php:135
msgid "Lot/Serial:"
-msgstr ""
+msgstr "Lote Série:"
#: HistoricalTestResults.php:136
msgid "Identifier:"
-msgstr ""
+msgstr "Identif:"
#: HistoricalTestResults.php:136
msgid "Sample Date:"
-msgstr ""
+msgstr "Data Amostra:"
#: ImportBankTrans.php:8 ImportBankTrans.php:14 ImportBankTrans.php:15
#: ImportBankTransAnalysis.php:20 ImportBankTransAnalysis.php:34
@@ -15142,14 +15184,16 @@
"bank statement transactions. First define the file format used by your bank "
"for statement exports."
msgstr ""
+"Não há contas bancárias definidas para importar transações bancárias. "
+"Definir o formato do arquivo exportado pelo seu banco."
#: ImportBankTrans.php:38
msgid "Setup Import Format for Bank Accounts"
-msgstr ""
+msgstr "Config formato Importação Contas Bancárias"
#: ImportBankTrans.php:46
msgid "Bank Account to Import Transaction For"
-msgstr ""
+msgstr "Conta Bancária para importar transações"
#: ImportBankTrans.php:56
msgid "MT940 format Bank Statement File to import"
@@ -15164,6 +15208,8 @@
"The file size is over the maximum allowed. The maximum size allowed is 1 "
"megabyte. This file size is (bytes)"
msgstr ""
+"O tamanho excede o máximo permitido. O máximo é 1 megabyte. Esse arquivo tem "
+"(bytes)"
#: ImportBankTrans.php:71 includes/ImportBankTrans_MT940_SCB.php:30
msgid "The MT940 bank statement file cannot be imported and processed"
@@ -15799,7 +15845,7 @@
#: InternalStockRequestAuthorisation.php:107
msgid "Cancel Line"
-msgstr ""
+msgstr "Cancela Linha"
#: InternalStockRequestFulfill.php:7 InternalStockRequestFulfill.php:14
msgid "Fulfill Stock Requests"
@@ -15952,11 +15998,11 @@
#: InventoryPlanning.php:419 InventoryValuation.php:197
msgid "Category ID"
-msgstr ""
+msgstr "ID Categoria"
#: InventoryPlanning.php:430
msgid "The stock usage of this item could not be retrieved because"
-msgstr ""
+msgstr "Uso do estoque desse item não pode ser recuperado porque"
#: InventoryPlanning.php:455
msgid "Inventory Planning Reporting"
@@ -15965,7 +16011,7 @@
#: InventoryPlanning.php:467 InventoryValuation.php:226 PDFPriceList.php:293
#: StockCheck.php:262
msgid "Select Inventory Categories"
-msgstr ""
+msgstr "Selecionar Categoria Inventário"
#: InventoryPlanning.php:485 InventoryPlanningPrefSupplier.php:393
#: InventoryValuation.php:244 StockCheck.php:280
@@ -15989,7 +16035,7 @@
#: InventoryPlanning.php:504
msgid "One Month and a half MAX"
-msgstr "1 Mês e 50% MAX"
+msgstr "1 Mês e meio MAX"
#: InventoryPlanning.php:505
msgid "Two Months MAX"
@@ -16033,7 +16079,7 @@
#: InventoryPlanning.php:522
msgid "Export 24 months to CSV"
-msgstr ""
+msgstr "Exportar 24 meses para CSV"
#: InventoryPlanningPrefSupplier.php:49
msgid "Preferred Supplier Inventory Plan"
@@ -16111,7 +16157,7 @@
#: InventoryPlanningPrefSupplier.php:350
msgid "Nil"
-msgstr "***"
+msgstr "Nenhum"
#: InventoryPlanningPrefSupplier.php:383
msgid "Preferred Supplier Inventory Planning"
@@ -16226,7 +16272,7 @@
#: InventoryValuation.php:274
msgid "Output to CSV"
-msgstr ""
+msgstr "Saída para CSV"
#: Labels.php:6
msgid "Label Templates"
@@ -16238,7 +16284,7 @@
#: Labels.php:117
msgid "all measurements in PDF points"
-msgstr ""
+msgstr "todas medidas PDF em pontos"
#: Labels.php:121 PDFPrintLabel.php:272
msgid ""
@@ -16246,6 +16292,9 @@
"installation is not capable currently. You will most likely experience "
"problems with this script until the GD module is enabled."
msgstr ""
+"Módulo GD para PHP é requerido para imprimir código de barras. Sua "
+"instalação não encontrou esse módulo. Verificar pois podem haver problemas "
+"até o GD ser habilitado."
#: Labels.php:141
msgid ""
@@ -16387,49 +16436,49 @@
#: LocationUsers.php:5 includes/MainMenuLinksArray.php:532
msgid "Inventory Location Authorised Users Maintenance"
-msgstr ""
+msgstr "Manutenção Usuários Aut. Local Inventário"
#: LocationUsers.php:10
msgid "Location Authorised Users"
-msgstr ""
+msgstr "Usuários Autorizados para Local"
#: LocationUsers.php:33
msgid "You have not selected any Location"
-msgstr ""
+msgstr "Selecionar algum local"
#: LocationUsers.php:46
msgid "You have not selected an user to be authorised to use this Location"
-msgstr ""
+msgstr "Favor escolher um usuário para ser autorizado para esse local"
#: LocationUsers.php:65
msgid "is already authorised to use this location"
-msgstr ""
+msgstr "já está autorizado para esse local"
#: LocationUsers.php:77 UserLocations.php:77
msgid "authority to use the"
-msgstr ""
+msgstr "autorizado para usar"
#: LocationUsers.php:77 UserLocations.php:77
msgid "location has been changed"
-msgstr ""
+msgstr "local foi modificado"
#: LocationUsers.php:88 LocationUsers.php:98 UserLocations.php:88
#: UserLocations.php:98
msgid "The Location user record could not be deleted because"
-msgstr ""
+msgstr "O registro de usuário não pode ser removido porque"
#: LocationUsers.php:90 UserLocations.php:90
msgid "has had their authority to use the"
-msgstr ""
+msgstr "pois tem autorização para usar"
#: LocationUsers.php:90 LocationUsers.php:100 UserLocations.php:90
#: UserLocations.php:100
msgid "location removed"
-msgstr ""
+msgstr "local removido"
#: LocationUsers.php:100 UserLocations.php:100
msgid "has had their authority to update"
-msgstr ""
+msgstr "teve sua autoridade modificada"
#: LocationUsers.php:112 NoSalesItems.php:19 TopItems.php:24
#: UserLocations.php:223
@@ -16438,23 +16487,23 @@
#: LocationUsers.php:171
msgid "Authorised users for Location"
-msgstr ""
+msgstr "Usuários autorizados para Local"
#: LocationUsers.php:192
msgid "Are you sure you wish to remove Update for this user?"
-msgstr ""
+msgstr "Confirma remover usuário para o Local?"
#: LocationUsers.php:192 UserLocations.php:193
msgid "Remove Update"
-msgstr ""
+msgstr "Remoção atualizada"
#: LocationUsers.php:194
msgid "Are you sure you wish to add Update for this user?"
-msgstr ""
+msgstr "Confirma adição para esse usuário?"
#: LocationUsers.php:194 UserLocations.php:195
msgid "Add Update"
-msgstr ""
+msgstr "Adic. Atualização"
#: Locations.php:6 Locations.php:13
msgid "Location Maintenance"
@@ -16529,11 +16578,11 @@
msgid ""
"The users/locations that need user location records created cannot be "
"retrieved because"
-msgstr ""
+msgstr "Registro Usuário / Local não pode ser recuperado porque"
#: Locations.php:205
msgid "Existing users have been authorized for this location"
-msgstr ""
+msgstr "Usuários existentes foram autorizados para esse local"
#: Locations.php:278
msgid ""
@@ -16661,7 +16710,7 @@
#: Locations.php:414 Locations.php:701
msgid "Allow Invoicing"
-msgstr ""
+msgstr "Permitir Pedido"
#: Locations.php:440
#, php-format
@@ -16737,6 +16786,7 @@
#: Locations.php:638
msgid "The email address should be an email format such as ad...@we..."
msgstr ""
+"Endereço de email deve ser um email com formato válido us...@do..."
#: Locations.php:659
msgid "Default Counter Sales Customer Code"
@@ -16773,18 +16823,21 @@
#: Locations.php:682
msgid "Use for Work Order Productions?"
-msgstr ""
+msgstr "Usar Ordens de Produção?"
#: Locations.php:696
msgid ""
"Enter the GL account for this location, or leave it in blank if not needed"
msgstr ""
+"Informar contas GL para esse local ou deixar em branco se desnecessário"
#: Locations.php:700
msgid ""
"Use this parameter to indicate whether these inventory location allows or "
"denies the invoicing of its items."
msgstr ""
+"Use esse parâmetro para indicar quando local de inventário permite ou nega "
+"solicitação de itens."
#: MRP.php:6
msgid "Run MRP Calculation"
@@ -16896,7 +16949,7 @@
#: MRP.php:592
msgid "Use Reorder Level Demands"
-msgstr ""
+msgstr "Usar Ponto de Pedido"
#: MRP.php:596
msgid "Use EOQ"
@@ -16920,7 +16973,7 @@
#: MRP.php:642
msgid "Use Reorder Level Demands?"
-msgstr ""
+msgstr "Usar Nível de Pedido?"
#: MRP.php:646
msgid "Use EOQ?"
@@ -17247,7 +17300,7 @@
#: MRPPlannedPurchaseOrders.php:116
msgid ""
"The MRP planned purchase orders could not be retrieved by the SQL because"
-msgstr " "
+msgstr "SQL Ordens de compra planejamento MRP não podem ser recuperadas porque"
#: MRPPlannedPurchaseOrders.php:125
msgid "Print MRP Planned Purchase Orders Error"
@@ -17474,7 +17527,7 @@
#: MRPReport.php:283 MRPReport.php:353 MRPReport.php:423
msgid "Planned Acc"
-msgstr ""
+msgstr "Conta Planej"
#: MRPReport.php:438
msgid "Dem Type"
@@ -18468,7 +18521,7 @@
#: PDFCOA.php:27
msgid "Select Certificate of Analysis To Print"
-msgstr ""
+msgstr "Selec. Certificado de Análise para Imprimir"
#: PDFCOA.php:35 PO_Items.php:844
msgid "Enter Item"
@@ -18476,68 +18529,68 @@
#: PDFCOA.php:37
msgid "Enter Lot"
-msgstr ""
+msgstr "Informar Lote"
#: PDFCOA.php:51
msgid "Or Select Existing Lot"
-msgstr ""
+msgstr "Ou Selec. Lote Existente"
#: PDFCOA.php:64
msgid "Lot/Serial"
-msgstr ""
+msgstr "Lote / Série"
#: PDFCOA.php:81
msgid "There was a problem retrieving the Lot Information"
-msgstr ""
+msgstr "Há um problema na recuperação da informação do lote"
#: PDFCOA.php:126
msgid "Print Certificate of Analysis Error"
-msgstr ""
+msgstr "Imprimir Certif. de Análise de Erro"
#: PDFCOA.php:132
msgid "Unable to Locate Lot"
-msgstr ""
+msgstr "Não localizou o Lote"
#: PDFCOA.php:139 PDFCOA.php:157 PDFCOA.php:158 includes/PDFCOAHeader.inc:28
msgid "Certificate of Analysis"
-msgstr ""
+msgstr "Certificado de Análise"
#: PDFCOA.php:169
msgid "Physical Properties"
-msgstr ""
+msgstr "Propriedades Físicas"
#: PDFCOA.php:169 PDFCOA.php:170 PDFProdSpec.php:130 PDFProdSpec.php:131
msgid "Physical Property"
-msgstr ""
+msgstr "Propriedade Física"
#: PDFCOA.php:169 PDFCOA.php:170 PDFProdSpec.php:130 PDFProdSpec.php:131
#: TestPlanResults.php:804
msgid "Test Method"
-msgstr ""
+msgstr "Método de Teste"
#: PDFCOA.php:170 PDFProdSpec.php:131
msgid "Header"
-msgstr ""
+msgstr "Cabeçalho"
#: PDFCOA.php:170 PDFProdSpec.php:131
msgid "* Trailer"
-msgstr ""
+msgstr "* Rodapé"
#: PDFCOA.php:171 PDFProdSpec.php:132
msgid "Injection Molding Processing Guidelines"
-msgstr ""
+msgstr "Guia Processamento Injeção Moldes"
#: PDFCOA.php:171 PDFProdSpec.php:132
msgid "* Desicant type dryer required."
-msgstr ""
+msgstr "* Tipo de Secante Requerido."
#: PDFCOA.php:171 PDFProdSpec.php:132
msgid "Setting"
-msgstr ""
+msgstr "Configuração"
#: PDFCOA.php:172 PDFProdSpec.php:133
msgid "Regulatory Compliance"
-msgstr ""
+msgstr "Regulamento Acordo"
#: PDFChequeListing.php:25 PDFChequeListing.php:106 PDFChequeListing.php:115
#: PDFChequeListing.php:149 PDFCustTransListing.php:82
@@ -18882,7 +18935,7 @@
#: PDFFGLabel.php:94
msgid "FG Label"
-msgstr ""
+msgstr "FG Rótulo"
#: PDFFGLabel.php:146 PDFGrn.php:129 PDFQALabel.php:66
#: PDFStockTransfer.php:121 ReverseGRN.php:78
@@ -18896,7 +18949,7 @@
#: PDFFGLabel.php:182 PDFWOPrint.php:477
msgid "Please Process this Work order number"
-msgstr ""
+msgstr "Por favor processar essa Ordem Número"
#: PDFFGLabel.php:183 PDFWOPrint.php:259 PDFWOPrint.php:478
#: SelectWorkOrder.php:44 api/api_xml-rpc.php:2573 api/api_xml-rpc.php:2769
@@ -18910,12 +18963,12 @@
#: PDFFGLabel.php:199 PDFFGLabel.php:205 PDFWOPrint.php:494 PDFWOPrint.php:500
msgid "Email a Work Order"
-msgstr ""
+msgstr "Email Ordem de Produção"
#: PDFFGLabel.php:202 PDFWOPrint.php:258 PDFWOPrint.php:497
#: includes/DatabaseTranslations.php:49
msgid "Work Order"
-msgstr ""
+msgstr "Ordem Produção"
#: PDFFGLabel.php:202 PDFWOPrint.php:497 PO_PDFPurchOrder.php:352
#: PrintCustTrans.php:505 PrintCustTransPortrait.php:539
@@ -18928,7 +18981,7 @@
#: PDFFGLabel.php:208 PDFWOPrint.php:503
msgid "Emailing Work order"
-msgstr ""
+msgstr "Email Ordem Produção"
#: PDFFGLabel.php:208 PDFWOPrint.php:503 PO_PDFPurchOrder.php:358
#: Z_ChangeStockCode.php:169
@@ -18937,11 +18990,11 @@
#: PDFFGLabel.php:214
msgid "Label Error"
-msgstr ""
+msgstr "Erro Etiqueta"
#: PDFFGLabel.php:216
msgid "There were no labels to print"
-msgstr ""
+msgstr "Não há etiqueta para imprimir"
#: PDFGLJournal.php:28
msgid "General Ledger Journal"
@@ -19271,7 +19324,7 @@
#: PDFPriceList.php:26
msgid "Price list by inventory category"
-msgstr ""
+msgstr "Lista de preço por categoria Inventário"
#: PDFPriceList.php:38 PDFPriceList.php:340 PDFPriceList.php:389
msgid "Customer Special Prices Only"
@@ -19338,7 +19391,7 @@
#: PDFPriceList.php:285
msgid "Print a price list by inventory category"
-msgstr ""
+msgstr "Imprimir lista preço por categoria"
#: PDFPriceList.php:310 PDFPrintLabel.php:314 Z_DataExport.php:542
msgid "For Sales Type/Price List"
@@ -19382,7 +19435,7 @@
#: PDFPriceList.php:441
msgid "Prices excluding tax"
-msgstr ""
+msgstr "Preço excluindo impostos"
#: PDFPrintLabel.php:44
msgid "The Price Labels could not be retrieved by the SQL because"
@@ -19431,53 +19484,55 @@
#: PDFProdSpec.php:17
msgid "Select Product Specification To Print"
-msgstr ""
+msgstr "Selecione Especificação do Produto para Imprimir"
#: PDFProdSpec.php:25 ProductSpecs.php:94
msgid "Enter Specification Name"
-msgstr ""
+msgstr "Informar Nome da Especificação"
#: PDFProdSpec.php:39 ProductSpecs.php:108
msgid "Or Select Existing Specification"
-msgstr ""
+msgstr "ou Selecionar Especificação Existente"
#: PDFProdSpec.php:65
msgid "There was a problem retrieving the Product Specification"
-msgstr ""
+msgstr "Há um problema na recuperação especificação do produto"
#: PDFProdSpec.php:91
msgid "Print Product Specification Error"
-msgstr ""
+msgstr "Erro na impressão Especif. do Produto"
#: PDFProdSpec.php:97
msgid "Unable to Locate Specification"
-msgstr ""
+msgstr "Não foi possível localizar especificação"
#: PDFProdSpec.php:104 includes/MainMenuLinksArray.php:339
msgid "Product Specifications"
-msgstr ""
+msgstr "Especificação Produto"
#: PDFProdSpec.php:118 PDFProdSpec.php:119 ProductSpecs.php:349
msgid "Product Specification"
-msgstr ""
+msgstr "Especificação Produto"
#: PDFProdSpec.php:130
msgid "Technical Data Sheet Properties"
-msgstr ""
+msgstr "Folha Dados e Propriedades Técnicas"
#: PDFProdSpec.php:130
msgid "* Data herein is typical and not to be construed as specifications."
-msgstr ""
+msgstr "* Dados descritos são típicos e não são especificações"
#: PDFProdSpec.php:266
msgid ""
"The information provided on this datasheet should only be used as a "
"guideline. Actual lot to lot values will vary."
msgstr ""
+"A informação registrada aqui nesse formulário deve ser apenas um guia. "
+"Haverá variações em cada lote."
#: PDFQALabel.php:20
msgid "QA Label"
-msgstr ""
+msgstr "Etiqueta QA"
#: PDFQuotation.php:12 PDFQuotationPortrait.php:12
msgid "Select Quotation To Print"
@@ -19638,15 +19693,15 @@
#: PDFSalesBySalesperson.php:15 PDFWeeklyOrders.php:15
msgid "Weekly Orders"
-msgstr ""
+msgstr "Pedidos Semanais"
#: PDFSalesBySalesperson.php:17 PDFWeeklyOrders.php:17
msgid "There are no members of the Weekly Orders Recipients email group"
-msgstr ""
+msgstr "Não há membros no grupo de email Pedidos Semanais"
#: PDFSalesBySalesperson.php:64 PDFWeeklyOrders.php:60 PDFWeeklyOrders.php:197
msgid "Weekly Orders Report"
-msgstr ""
+msgstr "Relatório Pedidos Semanais"
#: PDFSalesBySalesperson.php:88 PDFWeeklyOrders.php:84 ReverseGRN.php:31
#: SalesByTypePeriodInquiry.php:356 SalesTopCustomersInquiry.php:218
@@ -19657,27 +19712,27 @@
#: PDFSalesBySalesperson.php:106 PDFWeeklyOrders.php:103
msgid "Partial"
-msgstr ""
+msgstr "Parcial"
#: PDFSalesBySalesperson.php:146
msgid "Please find the Sales By Salesperson report"
-msgstr ""
+msgstr "Por favor localizar relatório Por Vendedor"
#: PDFSalesBySalesperson.php:147
msgid "Sales By Salesperson Report"
-msgstr ""
+msgstr "Relatório por Vendedor"
#: PDFSalesBySalesperson.php:157 PDFWeeklyOrders.php:206
msgid "Print Weekly Orders"
-msgstr ""
+msgstr "Imprimir Ordens Semanais"
#: PDFSalesBySalesperson.php:159 PDFWeeklyOrders.php:208
msgid "The Weekly Orders report has been mailed"
-msgstr ""
+msgstr "Relatório Pedidos Semanais foi enviado por email"
#: PDFSalesBySalesperson.php:165 PDFWeeklyOrders.php:214
msgid "Print Weekly Orders Error"
-msgstr ""
+msgstr "Erro ao Imprimir Pedidos Semanais"
#: PDFSellThroughSupportClaim.php:6 PDFSellThroughSupportClaim.php:164
#: includes/MainMenuLinksArray.php:70
@@ -19780,7 +19835,7 @@
#: PDFStockCheckComparison.php:282
msgid "Bin:"
-msgstr ""
+msgstr "Baia:"
#: PDFStockCheckComparison.php:291
msgid "No counts entered"
@@ -19831,11 +19886,11 @@
#: PDFStockLocTransfer.php:40 PDFStockTransfer.php:45
msgid "Transfer docket to reprint Shipping Labels"
-msgstr ""
+msgstr "Transf. para reimpressão Etiquetas Envio"
#: PDFStockLocTransfer.php:46 PDFStockTransfer.php:51
msgid "Print Shipping Labels"
-msgstr ""
+msgstr "Imprimir Etiquetas Envio"
#: PDFStockLocTransfer.php:55 PDFStockLocTransfer.php:56
msgid "Inventory Location Transfer BOL"
@@ -19938,23 +19993,23 @@
#: PDFWOPrint.php:89
msgid "Select a Work Order"
-msgstr ""
+msgstr "Selec. Ordem Produção"
#: PDFWOPrint.php:92
msgid "Select a Work Order Number to Print before calling this page"
-msgstr ""
+msgstr "Selecionar Número Ordem Produção para imprimir antes dessa página."
#: PDFWOPrint.php:98 PDFWOPrint.php:187
msgid "Select Work Order"
-msgstr ""
+msgstr "Selecionar Ordem de Produção"
#: PDFWOPrint.php:108
msgid "This page must be called with a Work order number to print"
-msgstr ""
+msgstr "Essa página deve ser chamada com um número de Ordem"
#: PDFWOPrint.php:118
msgid "Print Work Order Number"
-msgstr ""
+msgstr "Imprimir Número Ordem Produção"
#: PDFWOPrint.php:122 PO_PDFPurchOrder.php:45
msgid ""
@@ -19966,18 +20021,19 @@
msgid ""
"There was a problem retrieving the Work order header details for Order Number"
msgstr ""
+"Há problema na recuperação do cabeçalho / detalhes de ordem de produção "
#: PDFWOPrint.php:178
msgid "Print Work Order Error"
-msgstr ""
+msgstr "Erro na impressão Ordem Produção"
#: PDFWOPrint.php:181
msgid "Unable to Locate Work Order Number"
-msgstr ""
+msgstr "Não localizou Ordem de Produção"
#: PDFWOPrint.php:449
msgid "Signed for: "
-msgstr ""
+msgstr "Assinado por:"
#: PDFWOPrint.php:579 PDFWOPrint.php:662 PO_PDFPurchOrder.php:388
msgid "Print or Email the Order"
@@ -19985,7 +20041,7 @@
#: PDFWOPrint.php:610
msgid "There was a problem retrieving the contact details for the location"
-msgstr ""
+msgstr "Há um problema na recuperação dos detalhes do contato para o local"
#: PDFWOPrint.php:623 PDFWOPrint.php:692 PO_PDFPurchOrder.php:429
msgid "Email to"
@@ -19993,47 +20049,47 @@
#: PDFWOPrint.php:637 SelectWorkOrder.php:332
msgid "Paperwork"
-msgstr ""
+msgstr "Ordem Produção"
#: PDFWOPrint.php:654
msgid "Label Item"
-msgstr ""
+msgstr "Etiq. Item"
#: PDFWOPrint.php:656
msgid "Label Lot"
-msgstr ""
+msgstr "Etiq. Lote "
#: PDFWOPrint.php:657
msgid "No of Full Packages"
-msgstr ""
+msgstr "Número Pacotes"
#: PDFWOPrint.php:658
msgid "Labels/Package"
-msgstr ""
+msgstr "Etiquetas Pacotes"
#: PDFWOPrint.php:659
msgid "Weight/Package"
-msgstr ""
+msgstr "Peso Pacotes"
#: PDFWOPrint.php:660
msgid "LeftOver Qty"
-msgstr ""
+msgstr "Quant. Total"
#: PDFWOPrint.php:705
msgid "Labels"
-msgstr ""
+msgstr "Etiquetas"
#: PDFWeeklyOrders.php:138
msgid "Total Order Amounts"
-msgstr ""
+msgstr "Total Pedido"
#: PDFWeeklyOrders.php:184
msgid "Monthly Invoiced Total"
-msgstr ""
+msgstr "Total Pedidos Mês"
#: PDFWeeklyOrders.php:196
msgid "Please find the weekly order report"
-msgstr ""
+msgstr "Por favor localizar relatório pedido semanal"
#: POReport.php:11 POReport.php:514 POReport.php:1296
msgid "Purchase Order Report"
@@ -21020,11 +21076,11 @@
#: PO_Items.php:1062
msgid "Failed to retrieve result count"
-msgstr ""
+msgstr "Falhou em recuperar contagem resultado"
#: PO_Items.php:1063
msgid "The SQL failed is "
-msgstr ""
+msgstr "SQL que falhou foi"
#: PO_Items.php:1124
msgid "Item Category"
@@ -21140,7 +21196,7 @@
#: PO_OrderDetails.php:160
msgid "Status Coments"
-msgstr ""
+msgstr "Comentário Status"
#: PO_OrderDetails.php:169
msgid "The line items of the purchase order could not be retrieved"
@@ -21337,7 +21393,7 @@
#: PO_SelectOSPurchOrder.php:174
msgid "Failed to retrieve location data"
-msgstr ""
+msgstr "Falhou na recuperação dados do local"
#: PO_SelectOSPurchOrder.php:226 PO_SelectPurchOrder.php:134
msgid "Order Status:"
@@ -21349,7 +21405,7 @@
#: PO_SelectOSPurchOrder.php:255
msgid "Orders Between"
-msgstr ""
+msgstr "Pedidos entre"
#: PO_SelectOSPurchOrder.php:259 PO_SelectPurchOrder.php:5
#: PO_SelectPurchOrder.php:165
@@ -22005,23 +22061,23 @@
#: PcAnalysis.php:179
msgid "Excel file for petty Cash Expenses Analysis"
-msgstr ""
+msgstr "Arquivo excel para Análise Despesas Pequeno Caixa"
#: PcAnalysis.php:192 PcAnalysis.php:202
msgid "Excel file for Petty Cash Expenses Analysis"
-msgstr ""
+msgstr "Arquivo Excel para Análise Despesas Pequeno Caixa"
#: PcAnalysis.php:207
msgid "For Petty Cash Tabs"
-msgstr ""
+msgstr "Abas para Pequeno Caixa"
#: PcAnalysis.php:215
msgid "All Tabs"
-msgstr ""
+msgstr "Todas abas"
#: PcAnalysis.php:228
msgid "Create Petty Cash Expenses Excel File"
-msgstr ""
+msgstr "Criar arquivo despesas pequeno caixa"
#: PcAssignCashToTab.php:5
msgid "Assignment of Cash to Petty Cash Tab"
@@ -22117,7 +22173,7 @@
#: PcAuthorizeExpenses.php:46 PcAuthorizeExpenses.php:49
msgid "Authorisation Of Petty Cash Expenses"
-msgstr ""
+msgstr "Autorização Despesas Pequeno Caixa"
#: PcAuthorizeExpenses.php:64
msgid "Detail Of Movement For Last "
@@ -22636,15 +22692,15 @@
#: PriceMatrix.php:6
msgid "Price break matrix Maintenance"
-msgstr ""
+msgstr "Manutenção Matrix Preços"
#: PriceMatrix.php:31
msgid "at which the price will apply is 0 or less than 0"
-msgstr ""
+msgstr "na qual o preço aplicado é zero ou menor que"
#: PriceMatrix.php:35
msgid "The price must be entered as a positive number"
-msgstr ""
+msgstr "O preço deve ser informado como um número positivo"
#: PriceMatrix.php:40 Prices.php:74 PricesBasedOnMarkUp.php:191
#: Prices_Customer.php:90
@@ -22677,23 +22733,23 @@
#: PriceMatrix.php:115
msgid "Failed to insert price data"
-msgstr ""
+msgstr "Falhou ao inserir dados do preço"
#: PriceMatrix.php:117
msgid "The price matrix record has been added"
-msgstr ""
+msgstr "Registro adicionado na matrix de preço"
#: PriceMatrix.php:139
msgid "Failed to delete price data"
-msgstr ""
+msgstr "Falha ao remover dados do preço"
#: PriceMatrix.php:141
msgid "The price matrix record has been deleted"
-msgstr ""
+msgstr "Registro da Matrix de preços foi removido"
#: PriceMatrix.php:202
msgid "You must select a stock item first before set a price maxtrix"
-msgstr ""
+msgstr "Selecionar item estoque antes de configurar a matrix de preço"
#: PriceMatrix.php:213 PriceMatrix.php:260 Prices.php:329
msgid "Price Effective From Date"
@@ -22720,6 +22776,7 @@
"The price to apply to orders where the quantity exceeds the specified "
"quantity"
msgstr ""
+"Preço para aplicar nos pedidos onde a quantidade excede quant. especificada"
#: PriceMatrix.php:263 SpecialOrder.php:630 includes/PDFLowGPPageHeader.inc:47
#: includes/PDFSellThroughSupportClaimPageHeader.inc:26
@@ -23475,11 +23532,11 @@
#: PrintCustStatements.php:421
msgid "Please make payments to our account:"
-msgstr ""
+msgstr "Favor efetuar pagamentos em nossa conta"
#: PrintCustStatements.php:422
msgid "Quoting your account reference"
-msgstr ""
+msgstr "Sua Quotação Referência"
#: PrintCustStatements.php:442
msgid "No Statements Found"
@@ -23746,59 +23803,59 @@
#: PrintWOItemSlip.php:38
msgid "The SQL to find the details of the item to produce failed"
-msgstr ""
+msgstr "SQL que falhou em encontrar detalhes do item "
#: PrintWOItemSlip.php:44 PrintWOItemSlip.php:45
msgid "WO Production Slip"
-msgstr ""
+msgstr "Ficha Ordem Produção"
#: PrintWOItemSlip.php:105
msgid "Incidences / Production Notes"
-msgstr ""
+msgstr "Anotações Produção / Incidentes"
#: PrintWOItemSlip.php:108
msgid "Components Ready By"
-msgstr ""
+msgstr "Componentes Disponíveis em"
#: PrintWOItemSlip.php:108
msgid "Item Produced By"
-msgstr ""
+msgstr "Item Produzidos por"
#: PrintWOItemSlip.php:108
msgid "Quality Control By"
-msgstr ""
+msgstr "Controle Qualidade por"
#: PrintWOItemSlip.php:118
msgid "WO Item production Slip"
-msgstr ""
+msgstr "Ficha Item da Ordem de Produção"
#: PrintWOItemSlip.php:120
msgid "There were no items with ready to produce"
-msgstr ""
+msgstr "Não há itens disponíveis para produzir"
#: PrintWOItemSlip.php:146
msgid "Work Order Item Production Slip"
-msgstr ""
+msgstr "Ficha Item Ordem de Produção"
#: PrintWOItemSlip.php:149 WOCanBeProducedNow.php:42
msgid "WO"
-msgstr ""
+msgstr "OP"
#: PrintWOItemSlip.php:167
msgid "Component Code"
-msgstr ""
+msgstr "Código Componente"
#: PrintWOItemSlip.php:168
msgid "Qty BOM"
-msgstr ""
+msgstr "Qtd BOM"
#: PrintWOItemSlip.php:170
msgid "Qty Needed"
-msgstr ""
+msgstr "Qtd Neces"
#: PrintWOItemSlip.php:172 WOCanBeProducedNow.php:51
msgid "Shrinkage"
-msgstr ""
+msgstr "Arredond"
#: PrintWOItemSlip.php:188 PrintWOItemSlip.php:199 PrintWOItemSlip.php:210
#: StockDispatch.php:279 StockDispatch.php:290 StockDispatch.php:301
@@ -23812,11 +23869,12 @@
#: ProductSpecs.php:5
msgid "Product Specifications Maintenance"
-msgstr ""
+msgstr "Especificações Manutenção Produto"
#: ProductSpecs.php:45
msgid "Enter The Item, Fixed Asset or Template to Copy this Specification to"
msgstr ""
+"Informe Item, Ativo Fixo ou Modelo para onde copiar essas especificações"
#: ProductSpecs.php:48 PurchData.php:313 TestPlanResults.php:331
#: reportwriter/languages/en_US/reports.php:137
@@ -23826,40 +23884,40 @@
#: ProductSpecs.php:76
msgid "A Product Specification has been copied to"
-msgstr ""
+msgstr "Especificação Produto copiada para "
#: ProductSpecs.php:77 ProductSpecs.php:281
msgid "The insert of the Product Specification failed because"
-msgstr ""
+msgstr "Inserção das Especificações do Produto falhou porque"
#: ProductSpecs.php:140
msgid "Product Specification for"
-msgstr ""
+msgstr "Especificação do Produto para"
#: ProductSpecs.php:165 ProductSpecs.php:386 QATests.php:244 QATests.php:392
#: TestPlanResults.php:509
msgid "Method"
-msgstr ""
+msgstr "Método"
#: ProductSpecs.php:167 ProductSpecs.php:389 ProductSpecs.php:585
#: QATests.php:285 QATests.php:396 TestPlanResults.php:511
msgid "Possible Values"
-msgstr ""
+msgstr "Valores Possíveis"
#: ProductSpecs.php:168 ProductSpecs.php:390 ProductSpecs.php:590
#: TestPlanResults.php:512 TestPlanResults.php:806
msgid "Target Value"
-msgstr ""
+msgstr "Valor Meta"
#: ProductSpecs.php:169 ProductSpecs.php:391 ProductSpecs.php:596
#: TestPlanResults.php:513
msgid "Range Min"
-msgstr ""
+msgstr "Intervervalo Min"
#: ProductSpecs.php:170 ProductSpecs.php:392 ProductSpecs.php:600
#: TestPlanResults.php:514
msgid "Range Max"
-msgstr ""
+msgstr "Intervalo Max"
#: ProductSpecs.php:196 QATests.php:260 QATests.php:262
#: StockCategories.php:589 StockCategories.php:591 StockCategories.php:635
@@ -23884,29 +23942,31 @@
#: ProductSpecs.php:209 QATests.php:280 QATests.php:282
#: TestPlanResults.php:805 reportwriter/languages/en_US/reports.php:89
msgid "Range"
-msgstr ""
+msgstr "Intervalo"
#: ProductSpecs.php:280
msgid "A Product Specification record has been added for Test ID"
-msgstr ""
+msgstr "Registro de Especificação Produto adicionado para o Teste ID"
#: ProductSpecs.php:315
msgid "Product Specification record for"
-msgstr ""
+msgstr "Registro Especificação produto para"
#: ProductSpecs.php:316
msgid "The update of the Product Specification failed because"
-msgstr ""
+msgstr "Atualização de especificação do produto falhou porque"
#: ProductSpecs.php:342
msgid ""
"Cannot delete this Product Specification because there are test results tied "
"to it"
msgstr ""
+"Não pode remover essa Especificação de produto porque há resultados testes "
+"vinculados"
#: ProductSpecs.php:346
msgid "The Product Specification could not be deleted because"
-msgstr ""
+msgstr "Especificação de Produto não pode ser removida porque"
#: ProductSpecs.php:349 QATests.php:144 SalesP...
[truncated message content] |
|
From: <te...@us...> - 2015-11-18 02:59:15
|
Revision: 7396
http://sourceforge.net/p/web-erp/reponame/7396
Author: tehonu
Date: 2015-11-18 02:59:12 +0000 (Wed, 18 Nov 2015)
Log Message:
-----------
Add change of code in glaccountusers
Modified Paths:
--------------
trunk/Z_ChangeGLAccountCode.php
Modified: trunk/Z_ChangeGLAccountCode.php
===================================================================
--- trunk/Z_ChangeGLAccountCode.php 2015-11-17 22:55:35 UTC (rev 7395)
+++ trunk/Z_ChangeGLAccountCode.php 2015-11-18 02:59:12 UTC (rev 7396)
@@ -91,6 +91,8 @@
ChangeFieldInTable("fixedassetcategories", "disposalact", $_POST['OldAccountCode'], $_POST['NewAccountCode'], $db);
ChangeFieldInTable("fixedassetcategories", "accumdepnact", $_POST['OldAccountCode'], $_POST['NewAccountCode'], $db);
+ ChangeFieldInTable("glaccountusers", "accountcode", $_POST['OldAccountCode'], $_POST['NewAccountCode'], $db);
+
ChangeFieldInTable("gltrans", "account", $_POST['OldAccountCode'], $_POST['NewAccountCode'], $db);
ChangeFieldInTable("lastcostrollup", "stockact", $_POST['OldAccountCode'], $_POST['NewAccountCode'], $db);
|
|
From: <ex...@us...> - 2015-11-17 22:55:38
|
Revision: 7395
http://sourceforge.net/p/web-erp/reponame/7395
Author: exsonqu
Date: 2015-11-17 22:55:35 +0000 (Tue, 17 Nov 2015)
Log Message:
-----------
Modified Paths:
--------------
trunk/doc/Change.log
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-11-17 22:52:34 UTC (rev 7394)
+++ trunk/doc/Change.log 2015-11-17 22:55:35 UTC (rev 7395)
@@ -1,5 +1,5 @@
webERP Change Log
-
+18/11/15 AlexFigueiro: Remove the duplicate foreign key in stockrequest and stockrequestitem;
15/11/15 RChacon: Tidy css/*/default.css, reagrouping style for clases centre, number, page_title_text and text.
15/11/15 Hazem wehbi Add new arabic locale for Syria.
14/11/15 RChacon: In css/default/default.css, add sections to use with a cascading style sheet for a small device width, reagroup style for centre, number and text in tables.
|
|
From: <ex...@us...> - 2015-11-17 22:52:37
|
Revision: 7394
http://sourceforge.net/p/web-erp/reponame/7394
Author: exsonqu
Date: 2015-11-17 22:52:34 +0000 (Tue, 17 Nov 2015)
Log Message:
-----------
18/11/15 AlexFigueiro: Remove the duplicate foreign key in stockrequest and stockrequestitem;
Modified Paths:
--------------
trunk/sql/mysql/country_sql/default.sql
trunk/sql/mysql/upgrade4.12.3-4.13.sql
Modified: trunk/sql/mysql/country_sql/default.sql
===================================================================
--- trunk/sql/mysql/country_sql/default.sql 2015-11-17 00:38:05 UTC (rev 7393)
+++ trunk/sql/mysql/country_sql/default.sql 2015-11-17 22:52:34 UTC (rev 7394)
@@ -2749,8 +2749,6 @@
KEY `departmentid` (`departmentid`),
CONSTRAINT `stockrequest_ibfk_1` FOREIGN KEY (`loccode`) REFERENCES `locations` (`loccode`),
CONSTRAINT `stockrequest_ibfk_2` FOREIGN KEY (`departmentid`) REFERENCES `departments` (`departmentid`),
- CONSTRAINT `stockrequest_ibfk_3` FOREIGN KEY (`loccode`) REFERENCES `locations` (`loccode`),
- CONSTRAINT `stockrequest_ibfk_4` FOREIGN KEY (`departmentid`) REFERENCES `departments` (`departmentid`)
) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
@@ -2774,8 +2772,6 @@
KEY `stockid` (`stockid`),
CONSTRAINT `stockrequestitems_ibfk_1` FOREIGN KEY (`dispatchid`) REFERENCES `stockrequest` (`dispatchid`),
CONSTRAINT `stockrequestitems_ibfk_2` FOREIGN KEY (`stockid`) REFERENCES `stockmaster` (`stockid`),
- CONSTRAINT `stockrequestitems_ibfk_3` FOREIGN KEY (`dispatchid`) REFERENCES `stockrequest` (`dispatchid`),
- CONSTRAINT `stockrequestitems_ibfk_4` FOREIGN KEY (`stockid`) REFERENCES `stockmaster` (`stockid`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
Modified: trunk/sql/mysql/upgrade4.12.3-4.13.sql
===================================================================
--- trunk/sql/mysql/upgrade4.12.3-4.13.sql 2015-11-17 00:38:05 UTC (rev 7393)
+++ trunk/sql/mysql/upgrade4.12.3-4.13.sql 2015-11-17 22:52:34 UTC (rev 7394)
@@ -23,7 +23,7 @@
`grns` (`grnno`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
INSERT INTO scripts VALUES('EmailCustStatements.php','3','Email customer statement to customer');
-INSERT INTO scripts VALUES('SupplierGRNAndInvoiceInquiry.php',5,'Suppliers delivery note and grn relationship inquiry');
+INSERT INTO scripts VALUES('SupplierGRNAndInvoiceInquiry.php',5,'Supplier\'s delivery note and grn relationship inquiry');
ALTER table grns ADD supplierref varchar(30) NOT NULL DEFAULT '';
CREATE TABLE IF NOT EXISTS `glaccountusers` (
@@ -48,9 +48,7 @@
INSERT INTO `scripts` (`script`, `pagesecurity`, `description`) VALUES
('GLAccountUsers.php', '15', 'Maintenance of users allowed to a GL Account'),
('UserGLAccounts.php', '15', 'Maintenance of GL Accounts allowed for a user');
-
-INSERT INTO `scripts` (`script`, `pagesecurity`, `description`) VALUES
-('GLAccountUsersCopyAuthority.php', '15', 'Copy the authority into GL Accounts from user A to user B');
-
+ALTER table stockrequest DROP FOREIGN KEY `stockrequest_ibfk_3`;
+ALTER table stockrequest DROP FOREIGN KEY `stockrequest_ibfk_4`;
-- Update version number:
UPDATE config SET confvalue='4.13' WHERE confname='VersionNumber';
|
|
From: <te...@us...> - 2015-11-17 00:38:08
|
Revision: 7393
http://sourceforge.net/p/web-erp/reponame/7393
Author: tehonu
Date: 2015-11-17 00:38:05 +0000 (Tue, 17 Nov 2015)
Log Message:
-----------
Improve comparation of OldCost and NewCost to avoid useless GL transactions
Modified Paths:
--------------
trunk/StockCostUpdate.php
trunk/Z_UpdateItemCosts.php
trunk/includes/SQL_CommonFunctions.inc
Modified: trunk/StockCostUpdate.php
===================================================================
--- trunk/StockCostUpdate.php 2015-11-16 09:15:24 UTC (rev 7392)
+++ trunk/StockCostUpdate.php 2015-11-17 00:38:05 UTC (rev 7393)
@@ -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 ($OldCost != $NewCost){
+ } elseif (abs($NewCost - $OldCost) > pow(1,-($_SESSION['StandardCostDecimalPlaces']+1))){
$Result = DB_Txn_Begin();
ItemCostUpdateGL($db, $StockID, $NewCost, $OldCost, $_POST['QOH']);
Modified: trunk/Z_UpdateItemCosts.php
===================================================================
--- trunk/Z_UpdateItemCosts.php 2015-11-16 09:15:24 UTC (rev 7392)
+++ trunk/Z_UpdateItemCosts.php 2015-11-17 00:38:05 UTC (rev 7393)
@@ -75,7 +75,10 @@
$OldCost = $OldRow['materialcost'] + $OldRow['labourcost'] + $OldRow['overheadcost'];
//dont update costs for assembly or kit-sets or ghost items!!
- if ($OldCost != $NewCost AND $OldRow['mbflag']!='K' AND $OldRow['mbflag']!='A' AND $OldRow['mbflag']!='G'){
+ if ((abs($NewCost - $OldCost) > pow(1,-($_SESSION['StandardCostDecimalPlaces']+1)))
+ AND $OldRow['mbflag']!='K'
+ AND $OldRow['mbflag']!='A'
+ AND $OldRow['mbflag']!='G'){
ItemCostUpdateGL($db, $StockID, $NewCost, $OldCost, $QOH);
Modified: trunk/includes/SQL_CommonFunctions.inc
===================================================================
--- trunk/includes/SQL_CommonFunctions.inc 2015-11-16 09:15:24 UTC (rev 7392)
+++ trunk/includes/SQL_CommonFunctions.inc 2015-11-17 00:38:05 UTC (rev 7393)
@@ -158,53 +158,54 @@
}
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)))){
- if ($_SESSION['CompanyRecord']['gllink_stock']==1 AND $QOH!=0){
+ $CostUpdateNo = GetNextTransNo(35, $db);
+ $PeriodNo = GetPeriod(date($_SESSION['DefaultDateFormat']), $db);
+ $StockGLCode = GetStockGLCode($StockID,$db);
- $CostUpdateNo = GetNextTransNo(35, $db);
- $PeriodNo = GetPeriod(date($_SESSION['DefaultDateFormat']), $db);
- $StockGLCode = GetStockGLCode($StockID,$db);
+ $ValueOfChange = $QOH * ($NewCost - $OldCost);
- $ValueOfChange = $QOH * ($NewCost - $OldCost);
+ $SQL = "INSERT INTO gltrans (type,
+ typeno,
+ trandate,
+ periodno,
+ account,
+ narrative,
+ amount)
+ VALUES ('35',
+ '" . $CostUpdateNo . "',
+ '" . Date('Y-m-d') . "',
+ '" . $PeriodNo . "',
+ '" . $StockGLCode['adjglact'] . "',
+ '" . $StockID . ' ' . _('cost was') . ' ' . $OldCost . ' ' . _('changed to') . ' ' . $NewCost . ' x ' . _('Quantity on hand of') . ' ' . $QOH . "',
+ '" . -$ValueOfChange . "')";
- $SQL = "INSERT INTO gltrans (type,
- typeno,
- trandate,
- periodno,
- account,
- narrative,
- amount)
- VALUES ('35',
- '" . $CostUpdateNo . "',
- '" . Date('Y-m-d') . "',
- '" . $PeriodNo . "',
- '" . $StockGLCode['adjglact'] . "',
- '" . $StockID . ' ' . _('cost was') . ' ' . $OldCost . ' ' . _('changed to') . ' ' . $NewCost . ' x ' . _('Quantity on hand of') . ' ' . $QOH . "',
- '" . -$ValueOfChange . "')";
+ $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The GL credit for the stock cost adjustment posting could not be inserted because');
+ $DbgMsg = _('The following SQL to insert the GLTrans record was used');
+ $Result = DB_query($SQL,$ErrMsg,$DbgMsg,true);
- $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The GL credit for the stock cost adjustment posting could not be inserted because');
- $DbgMsg = _('The following SQL to insert the GLTrans record was used');
- $Result = DB_query($SQL,$ErrMsg,$DbgMsg,true);
+ $SQL = "INSERT INTO gltrans (type,
+ typeno,
+ trandate,
+ periodno,
+ account,
+ narrative,
+ amount)
+ VALUES ('35',
+ '" . $CostUpdateNo . "',
+ '" . Date('Y-m-d') . "',
+ '" . $PeriodNo . "',
+ '" . $StockGLCode['stockact'] . "',
+ '" . $StockID . ' ' . _('cost was') . ' ' . $OldCost . ' ' . _('changed to') .' ' . $NewCost . ' x ' . _('Quantity on hand of') . ' ' . $QOH . "',
+ '" . $ValueOfChange . "')";
- $SQL = "INSERT INTO gltrans (type,
- typeno,
- trandate,
- periodno,
- account,
- narrative,
- amount)
- VALUES ('35',
- '" . $CostUpdateNo . "',
- '" . Date('Y-m-d') . "',
- '" . $PeriodNo . "',
- '" . $StockGLCode['stockact'] . "',
- '" . $StockID . ' ' . _('cost was') . ' ' . $OldCost . ' ' . _('changed to') .' ' . $NewCost . ' x ' . _('Quantity on hand of') . ' ' . $QOH . "',
- '" . $ValueOfChange . "')";
-
- $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The GL debit for stock cost adjustment posting could not be inserted because');
- $DbgMsg = _('The following SQL to insert the GLTrans record was used');
- $Result = DB_query($SQL,$ErrMsg,$DbgMsg,true);
- }
+ $ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The GL debit for stock cost adjustment posting could not be inserted because');
+ $DbgMsg = _('The following SQL to insert the GLTrans record was used');
+ $Result = DB_query($SQL,$ErrMsg,$DbgMsg,true);
+ }
}
/* Calculates the material cost of a bill of materials, given parent code*/
|
|
From: <te...@us...> - 2015-11-16 09:15:27
|
Revision: 7392
http://sourceforge.net/p/web-erp/reponame/7392
Author: tehonu
Date: 2015-11-16 09:15:24 +0000 (Mon, 16 Nov 2015)
Log Message:
-----------
New script to copy the authority in GL account - Users from one user to another
Modified Paths:
--------------
trunk/includes/MainMenuLinksArray.php
trunk/sql/mysql/upgrade4.12.3-4.13.sql
Added Paths:
-----------
trunk/GLAccountUsersCopyAuthority.php
Added: trunk/GLAccountUsersCopyAuthority.php
===================================================================
--- trunk/GLAccountUsersCopyAuthority.php (rev 0)
+++ trunk/GLAccountUsersCopyAuthority.php 2015-11-16 09:15:24 UTC (rev 7392)
@@ -0,0 +1,88 @@
+<?php
+
+include ('includes/session.inc');
+$Title = _('GLAccount - Users Authority Copy Authority');// Screen identificator.
+include('includes/header.inc');
+echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/maintenance.png" title="',// Icon image.
+ _('Copy Authority of GL Accounts from one user to another'), '" /> ',// Icon title.
+ _('Copy Authority of GL Accounts from one user to another'), '</p>';// Page title.
+
+include('includes/SQL_CommonFunctions.inc');
+
+if(isset($_POST['ProcessCopyAuthority'])) {
+
+ $InputError =0;
+
+ if($_POST['FromUserID']==$_POST['ToUserID']) {
+ prnMsg(_('User FROM must be different from user TO'),'error');
+ $InputError =1;
+ }
+
+ if($InputError ==0) {// no input errors
+ $result = DB_Txn_Begin();
+
+ echo '<br />' . _('Deleting the current authority to view / update the GL Accounts of user') . ' ' . $_POST['ToUserID'];
+ $sql = "DELETE FROM glaccountusers WHERE userid = '" . $_POST['ToUserID'] . "'";
+ $DbgMsg = _('The SQL statement that failed was');
+ $ErrMsg =_('The SQL to delete the auhority in glaccountusers record failed');
+ $result = DB_query($sql,$ErrMsg,$DbgMsg,true);
+ echo ' ... ' . _('completed');
+
+ echo '<br />' . _('Copying the authority to view / update the GL Accounts from user') . ' ' . $_POST['FromUserID'] . ' ' . _('to') . ' ' . $_POST['ToUserID'];
+ $sql = "INSERT INTO glaccountusers (userid, accountcode, canview, canupd)
+ SELECT '" . $_POST['ToUserID'] . "', accountcode, canview, canupd
+ FROM glaccountusers
+ WHERE userid = '" . $_POST['FromUserID'] . "'";
+
+ $DbgMsg = _('The SQL statement that failed was');
+ $ErrMsg =_('The SQL to insert the auhority in glaccountusers record failed');
+ $result = DB_query($sql,$ErrMsg,$DbgMsg,true);
+ echo ' ... ' . _('completed');
+ echo '<br />';
+ $result = DB_Txn_Commit();
+
+ }//only do the stuff above if $InputError==0
+}
+
+echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
+echo '<div class="centre">';
+echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+
+echo '<table>';
+echo ' <tr>
+ <td>' . _('Select User to copy the Authority FROM') . ':</td>
+ <td><select name="FromUserID">';
+$Result = DB_query("SELECT userid,
+ realname
+ FROM www_users
+ ORDER BY userid");
+
+echo '<option selected value="">' . _('Not Yet Selected') . '</option>';
+while ($MyRow = DB_fetch_array($Result)) {
+ echo '<option value="';
+ echo $MyRow['userid'] . '">' . $MyRow['userid'] . ' - ' . $MyRow['realname'] . '</option>';
+} //end while loop
+echo '</select></td></tr>';
+
+echo ' <tr>
+ <td>' . _('Select User to copy the Authority TO') . ':</td>
+ <td><select name="ToUserID">';
+$Result = DB_query("SELECT userid,
+ realname
+ FROM www_users
+ ORDER BY userid");
+
+echo '<option selected value="">' . _('Not Yet Selected') . '</option>';
+while ($MyRow = DB_fetch_array($Result)) {
+ echo '<option value="';
+ echo $MyRow['userid'] . '">' . $MyRow['userid'] . ' - ' . $MyRow['realname'] . '</option>';
+} //end while loop
+echo '</select></td></tr>';
+echo '</table>';
+echo '<input type="submit" name="ProcessCopyAuthority" value="' . _('Process Copy of Authority') . '" />
+ </div>
+ </form>';
+
+include('includes/footer.inc');
+?>
\ No newline at end of file
Modified: trunk/includes/MainMenuLinksArray.php
===================================================================
--- trunk/includes/MainMenuLinksArray.php 2015-11-16 08:14:27 UTC (rev 7391)
+++ trunk/includes/MainMenuLinksArray.php 2015-11-16 09:15:24 UTC (rev 7392)
@@ -398,6 +398,7 @@
_('GL Tags'),
_('GL Accounts Authorised Users Maintenance'),
_('User Authorised GL Accounts Maintenance'),
+ _('Copy Authority GL Accounts from user A to B'),
_('Bank Accounts'),
_('Bank Account Authorised Users'));
@@ -408,6 +409,7 @@
'/GLTags.php',
'/GLAccountUsers.php',
'/UserGLAccounts.php',
+ '/GLAccountUsersCopyAuthority.php',
'/BankAccounts.php',
'/BankAccountUsers.php');
Modified: trunk/sql/mysql/upgrade4.12.3-4.13.sql
===================================================================
--- trunk/sql/mysql/upgrade4.12.3-4.13.sql 2015-11-16 08:14:27 UTC (rev 7391)
+++ trunk/sql/mysql/upgrade4.12.3-4.13.sql 2015-11-16 09:15:24 UTC (rev 7392)
@@ -23,7 +23,7 @@
`grns` (`grnno`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
INSERT INTO scripts VALUES('EmailCustStatements.php','3','Email customer statement to customer');
-INSERT INTO scripts VALUES('SupplierGRNAndInvoiceInquiry.php',5,'Supplier\'s delivery note and grn relationship inquiry');
+INSERT INTO scripts VALUES('SupplierGRNAndInvoiceInquiry.php',5,'Suppliers delivery note and grn relationship inquiry');
ALTER table grns ADD supplierref varchar(30) NOT NULL DEFAULT '';
CREATE TABLE IF NOT EXISTS `glaccountusers` (
@@ -49,5 +49,8 @@
('GLAccountUsers.php', '15', 'Maintenance of users allowed to a GL Account'),
('UserGLAccounts.php', '15', 'Maintenance of GL Accounts allowed for a user');
+INSERT INTO `scripts` (`script`, `pagesecurity`, `description`) VALUES
+('GLAccountUsersCopyAuthority.php', '15', 'Copy the authority into GL Accounts from user A to user B');
+
-- Update version number:
UPDATE config SET confvalue='4.13' WHERE confname='VersionNumber';
|
|
From: <te...@us...> - 2015-11-16 08:14:29
|
Revision: 7391
http://sourceforge.net/p/web-erp/reponame/7391
Author: tehonu
Date: 2015-11-16 08:14:27 +0000 (Mon, 16 Nov 2015)
Log Message:
-----------
Delete glaccountusers entries in cascade when deleting a webERP user
Modified Paths:
--------------
trunk/WWW_Users.php
Modified: trunk/WWW_Users.php
===================================================================
--- trunk/WWW_Users.php 2015-11-15 18:32:41 UTC (rev 7390)
+++ trunk/WWW_Users.php 2015-11-16 08:14:27 UTC (rev 7391)
@@ -276,6 +276,10 @@
$ErrMsg = _('The Location - User could not be deleted because');;
$result = DB_query($sql,$ErrMsg);
+ $sql="DELETE FROM glaccountusers WHERE userid='" . $SelectedUser . "'";
+ $ErrMsg = _('The GL Account - User could not be deleted because');;
+ $result = DB_query($sql,$ErrMsg);
+
$sql="DELETE FROM www_users WHERE userid='" . $SelectedUser . "'";
$ErrMsg = _('The User could not be deleted because');;
$result = DB_query($sql,$ErrMsg);
|
|
From: <rc...@us...> - 2015-11-15 18:32:43
|
Revision: 7390
http://sourceforge.net/p/web-erp/reponame/7390
Author: rchacon
Date: 2015-11-15 18:32:41 +0000 (Sun, 15 Nov 2015)
Log Message:
-----------
Modified Paths:
--------------
trunk/doc/Change.log
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-11-15 18:30:29 UTC (rev 7389)
+++ trunk/doc/Change.log 2015-11-15 18:32:41 UTC (rev 7390)
@@ -1,5 +1,6 @@
webERP Change Log
+15/11/15 RChacon: Tidy css/*/default.css, reagrouping style for clases centre, number, page_title_text and text.
15/11/15 Hazem wehbi Add new arabic locale for Syria.
14/11/15 RChacon: In css/default/default.css, add sections to use with a cascading style sheet for a small device width, reagroup style for centre, number and text in tables.
11/11/15 Ricard: New feature GL accounts - users authority.
|
|
From: <rc...@us...> - 2015-11-15 18:30:31
|
Revision: 7389
http://sourceforge.net/p/web-erp/reponame/7389
Author: rchacon
Date: 2015-11-15 18:30:29 +0000 (Sun, 15 Nov 2015)
Log Message:
-----------
Tidy css/*/default.css, reagrouping style for clases centre, number, page_title_text and text.
Modified Paths:
--------------
trunk/css/aguapop/default.css
trunk/css/default/default.css
trunk/css/fluid/default.css
trunk/css/fresh/default.css
trunk/css/gel/default.css
trunk/css/professional/default.css
trunk/css/professional-rtl/default.css
trunk/css/silverwolf/default.css
trunk/css/wood/default.css
trunk/css/xenos/default.css
Modified: trunk/css/aguapop/default.css
===================================================================
--- trunk/css/aguapop/default.css 2015-11-15 00:52:21 UTC (rev 7388)
+++ trunk/css/aguapop/default.css 2015-11-15 18:30:29 UTC (rev 7389)
@@ -37,13 +37,6 @@
p{ /* some text need to be centered */
/*text-align:center;*/
}
-p.page_title_text { /* page title */
- color:black;
- font-weight:bold;
- margin:0 auto;
- padding:5px;
- text-align:center;
-}
p.good {
font-weight: bold;
color: green;
@@ -53,7 +46,6 @@
color:red;
}
-
table {
width:auto;
max-width:90%;
@@ -97,15 +89,11 @@
visibility: visible;
}
th.number {
- background-color: skyblue;
- color: white;
- font-weight: normal;
+ color: white;/* Should be black ? */
text-align: right;
}
th.text {
- background-color: skyblue;
- color: white;
- font-weight: normal;
+ color: white;/* Should be black ? */
text-align: left;
}
td {
@@ -116,9 +104,6 @@
background-color: whitesmoke;
padding:3px;
}
-td.number {
- text-align: right;
-}
div.centre {
padding:5px;
@@ -129,9 +114,6 @@
font-family: Arial, Verdana, Helvetica, sans-serif;
font-style: italic;
}
-input.number{
- text-align: right;
-}
input.image {
border-width: 0px;
background-color: transparent;
@@ -495,7 +477,22 @@
}
.centre {
text-align:center;
- /* centre class (general). */
+ /* Class selector to centre text horizontally in an element. */
}
-
-/**** END ***/
+.number {
+ text-align:right;
+ /* Class selector to horizontal align a number (right) in an element. */
+}
+.page_title_text {
+ color:black;
+ font-weight:bold;
+ margin:0 auto; /* . */
+ padding:5px;
+ text-align:center;
+ /* Class selector for page title. */
+}
+.text {
+ text-align:left;
+ /* Class selector to horizontal align a text (left) in an element. */
+}
+/* END Style for all. ********************************************************/
\ No newline at end of file
Modified: trunk/css/default/default.css
===================================================================
--- trunk/css/default/default.css 2015-11-15 00:52:21 UTC (rev 7388)
+++ trunk/css/default/default.css 2015-11-15 18:30:29 UTC (rev 7389)
@@ -27,12 +27,6 @@
vertical-align:middle;
}
-.page_title_text{
- padding:5px;
- font-weight:bold;
- color:black;
- text-align:center;
-}
p.good{
font-weight:bold;
color:green;
@@ -448,11 +442,18 @@
}
.number {
text-align:right;
- /* Class selector for horizontal alignment of a number (right) in an element. */
+ /* Class selector to horizontal align a number (right) in an element. */
}
+.page_title_text {
+ color:black;
+ font-weight:bold;
+ padding:5px;
+ text-align:center;
+ /* Class selector for page title. */
+}
.text {
text-align:left;
- /* Class selector for horizontal alignment of a text (left) in an element. */
+ /* Class selector to horizontal align a text (left) in an element. */
}
/* END Style for all. ********************************************************/
Modified: trunk/css/fluid/default.css
===================================================================
--- trunk/css/fluid/default.css 2015-11-15 00:52:21 UTC (rev 7388)
+++ trunk/css/fluid/default.css 2015-11-15 18:30:29 UTC (rev 7389)
@@ -26,11 +26,6 @@
border:none;
vertical-align:middle;
}
-.page_title_text{
- font-weight:bold;
- color:black;
- TEXT-ALIGN:center;
-}
p.good{
font-weight:bold;
color:green;
@@ -45,24 +40,12 @@
margin-bottom:5px;
}
table.selection{}
-th{ /* table heading */
- font-weight:normal;
+th { /* table heading */
background-color:#cccce5;
color:#330000;
+ font-weight:normal;
text-align:center;
}
-th.number{
- background-color:#cccce5;
- color:#330000;
- font-weight:normal;
- text-align:right;
-}
-th.text{
- background-color:#cccce5;
- color:#330000;
- font-weight:normal;
- text-align:left;
-}
th.ascending {
cursor: s-resize;
}
@@ -95,24 +78,10 @@
td.select{
background-color:#eee;
}
-td.number{
- text-align:right;
-}
-td.text{
- text-align:left;
-}
-.centre{ /* used */
- margin:0 auto;
- text-align:center;
- margin-bottom:5px;
-}
input{
font-family:Arial, Verdana, Helvetica;
}
-input.number{
- text-align:right;
-}
input.image{
border-width:0px;
background-color:transparent;
@@ -406,5 +375,20 @@
}
.centre {
text-align:center;
- /* centre class (general). */
+ /* Class selector to centre text horizontally in an element. */
}
+.number {
+ text-align:right;
+ /* Class selector to horizontal align a number (right) in an element. */
+}
+.page_title_text {
+ color:black;
+ font-weight:bold;
+ text-align:center;
+ /* Class selector for page title. */
+}
+.text {
+ text-align:left;
+ /* Class selector to horizontal align a text (left) in an element. */
+}
+/* END Style for all. ********************************************************/
\ No newline at end of file
Modified: trunk/css/fresh/default.css
===================================================================
--- trunk/css/fresh/default.css 2015-11-15 00:52:21 UTC (rev 7388)
+++ trunk/css/fresh/default.css 2015-11-15 18:30:29 UTC (rev 7389)
@@ -39,16 +39,6 @@
border:none;
vertical-align:middle;
}
-p.page_title_text {
- padding-top: 2px;
- padding-bottom: 2px;
- font-weight: bold;
- color: black;
- background-color: #C9D392;
- width: 30%;
- TEXT-ALIGN:center;
- margin: 10px auto;
-}
p.good { /***/
font-weight: bold;
color: green;
@@ -58,30 +48,18 @@
color:red;
}
table {
- background-color: #ffffff;
- margin: 0 auto;
- width:100%
+ background-color: #ffffff;
+ margin: 0 auto;
+ width:100%
}
table.selection {
}
th {
- font-weight: normal;
background-color: #777C59;
color: white;
+ font-weight: normal;
text-align: center;
}
-th.number {
- background-color: #800000;
- color: white;
- font-weight: normal;
- text-align: right;
-}
-th.text {
- background-color: #800000;
- color: white;
- font-weight: normal;
- text-align: left;
-}
th.ascending {
cursor: s-resize;
}
@@ -113,18 +91,12 @@
td.select {
background-color:#eee;
}
-td.number {
- text-align: right;
-}
div.centre { /* centering buttons / links */
margin: 0 auto;
text-align:center;
}
input {
}
-input.number{
- text-align: right;
-}
input.image {
border-width:0px;
background-color: transparent;
@@ -173,21 +145,21 @@
color: navy;
border: 0px solid navy;
}
-DIV.page_help_text {
- background: lightgrey url(images/help.png) top left no-repeat;
- border: #a52a2a 1px solid;
+div.page_help_text {
+ background:lightgrey url(images/help.png) top left no-repeat;
+ border:#A52A2A 1px solid;
+ color:black;
+ float:none;
+ font-weight:normal;
+ margin:0 auto;
+ padding-bottom:2px;
+ padding-left:10px;
padding-top:2px;
- padding-bottom: 2px;
- padding-left: 10px;
- z-index: 1;
- width: 80%;
- float: none;
- visibility: visible;
- margin: 0 auto;
- position: static;
- font-weight: normal;
- color: black;
+ position:static;
text-align:center;
+ visibility:visible;
+ width:80%;
+ z-index:1;
}
/*** calendar picker ***/
@@ -369,14 +341,10 @@
margin-bottom:10px;
}
#BodyDiv table.selection {
-background:#E0F3B1;
- border:thin outset #E0F3B1;
- padding:5px;
+ background:#E0F3B1;
+ border:thin outset #E0F3B1;
+ padding:5px;
}
-/*#BodyDiv .centre{
- margin:0 auto 10px;
- text-align:center;
-}*/
/*** BODY - MAIN MENU ***/
@@ -403,10 +371,10 @@
color:white;
}
#MainMenuDiv li a:hover{ /* link as button!!! pressed state */
+ background:#5A5F00;
+ border:thin inset #617C4F;
+ padding:3px;
text-decoration:none;
- padding:3px;
- border:thin inset #617C4F;
- background:#5A5F00;
}
#MainMenuDiv .main_menu_selected a{ /* the selected button */
border:thin inset #5A5F00;
@@ -516,7 +484,25 @@
}
.centre {
text-align:center;
- /* centre class (general). */
+ /* Class selector to centre text horizontally in an element. */
}
-
-/*** END ***/
+.number {
+ text-align:right;
+ /* Class selector to horizontal align a number (right) in an element. */
+}
+.page_title_text {
+ background-color:#C9D392;
+ color:black;
+ font-weight:bold;
+ margin:10px auto;
+ padding-bottom:2px;
+ padding-top:2px;
+ text-align:center;
+ width:30%;
+ /* Class selector for page title. */
+}
+.text {
+ text-align:left;
+ /* Class selector to horizontal align a text (left) in an element. */
+}
+/* END Style for all. ********************************************************/
Modified: trunk/css/gel/default.css
===================================================================
--- trunk/css/gel/default.css 2015-11-15 00:52:21 UTC (rev 7388)
+++ trunk/css/gel/default.css 2015-11-15 18:30:29 UTC (rev 7389)
@@ -37,13 +37,6 @@
border:none;
vertical-align:middle;
}
-.page_title_text {
- padding-top: 2px;
- padding-bottom: 2px;
- font-weight: bold;
- color: black;
- text-align:center;
-}
p.good {
font-weight: bold;
color: green;
@@ -64,28 +57,16 @@
outline-width:1px;
}
th {
- font-weight: normal;
- background-color: #ccc;
- color: #330000;
- text-align: center;
+ background-color:#ccc;
+ color:#330000;
+ font-weight:normal;
+ text-align:center;
}
-th.number {
- background-color: #ccc;
- color: #330000;
- font-weight: normal;
- text-align: right;
-}
-th.text {
- background-color: #ccc;
- color: #330000;
- font-weight: normal;
- text-align: left;
-}
th.ascending {
- cursor: s-resize;
+ cursor: s-resize;
}
th.descending {
- cursor: n-resize;
+ cursor: n-resize;
}
th:after {
content: "";
@@ -113,9 +94,6 @@
td.select {
background-color:#eee;
}
-td.number {
- text-align: right;
-}
div.centre {
margin: 0 auto;
text-align:center;
@@ -130,9 +108,6 @@
color:#000;
border: 1px 1px 1px 1px #000 solid;
}
-input.number{
- text-align: right;
-}
input.image {
border-width:0px;
background-color: transparent;
@@ -553,7 +528,22 @@
}
.centre {
text-align:center;
- /* centre class (general). */
+ /* Class selector to centre text horizontally in an element. */
}
-
-/*** END ***/
+.number {
+ text-align:right;
+ /* Class selector to horizontal align a number (right) in an element. */
+}
+.page_title_text {
+ color:black;
+ font-weight:bold;
+ padding-bottom:2px;
+ padding-top:2px;
+ text-align:center;
+ /* Class selector for page title. */
+}
+.text {
+ text-align:left;
+ /* Class selector to horizontal align a text (left) in an element. */
+}
+/* END Style for all. ********************************************************/
\ No newline at end of file
Modified: trunk/css/professional/default.css
===================================================================
--- trunk/css/professional/default.css 2015-11-15 00:52:21 UTC (rev 7388)
+++ trunk/css/professional/default.css 2015-11-15 18:30:29 UTC (rev 7389)
@@ -39,11 +39,6 @@
text-decoration:underline;
}
-.centre { /* used */
- margin: 0 auto;
- text-align:center;
-}
-
/*table detail items default format */
td {
text-align: left;
@@ -78,9 +73,6 @@
text-align:right;
cursor:pointer;
}
-td.number {
- text-align: right;
-}
.EvenTableRows {
background-color: #CCCCCC;
@@ -90,9 +82,9 @@
}
th { /* table heading */
- font-weight: normal;
background-color: #cccce5;
color: #330000;
+ font-weight: normal;
text-align: center;
}
th.ascending {
@@ -120,18 +112,6 @@
border-top: 4px solid #000;
visibility: visible;
}
-th.number {
- background-color: #cccce5;
- color: #330000;
- font-weight: normal;
- text-align: right;
-}
-th.text {
- background-color: #cccce5;
- color: #330000;
- font-weight: normal;
- text-align: left;
-}
div.error {
background-color:#fddbdb;
color: red;
@@ -160,9 +140,6 @@
e.g.: class input_button, input_column_button, input_text */
input {
}
-input.number{
- text-align: right;
-}
input.image {
border-width:0px;
background-color: transparent;
@@ -255,16 +232,7 @@
text-align:center;
}
-.page_title_text { /* used */
- font-family: Arial, Verdana, Helvetica;
- padding-top: 2px;
- padding-bottom: 2px;
- font-weight: bold;
- color: black;
- text-align:center;
-}
-
-DIV.page_help_text {
+div.page_help_text {
background: lightgrey url(images/help.png) top left no-repeat;
border: #a52a2a 1px solid;
padding-top:2px;
@@ -414,10 +382,6 @@
padding:5px;
border:thin outset #eee;
}
-/*#BodyDiv .centre{
- margin:0 auto 10px;
- text-align:center;
-}*/
/*** BODY - MAIN MENU ***/
@@ -541,7 +505,24 @@
}
.centre {
text-align:center;
- /* centre class (general). */
+ /* Class selector to centre text horizontally in an element. */
}
-
-/*** END ***/
+.number {
+ text-align:right;
+ /* Class selector to horizontal align a number (right) in an element. */
+}
+.page_title_text {
+ color:black;
+ font-family:Arial, Verdana, Helvetica;
+ font-size:120%;
+ font-weight:bold;
+ padding-bottom:2px;
+ padding-top:2px;
+ text-align:center;
+ /* Class selector for page title. */
+}
+.text {
+ text-align:left;
+ /* Class selector to horizontal align a text (left) in an element. */
+}
+/* END Style for all. ********************************************************/
\ No newline at end of file
Modified: trunk/css/professional-rtl/default.css
===================================================================
--- trunk/css/professional-rtl/default.css 2015-11-15 00:52:21 UTC (rev 7388)
+++ trunk/css/professional-rtl/default.css 2015-11-15 18:30:29 UTC (rev 7389)
@@ -41,11 +41,6 @@
text-decoration:underline;
}
-.centre { /* used */
- margin: 0 auto;
- text-align:center;
-}
-
/*table detail items default format */
td {
font-family: Arial, Verdana, Helvetica;
@@ -82,9 +77,6 @@
text-align:right;
cursor:pointer;
}
-td.number {
- text-align: right;
-}
.EvenTableRows {
background-color: #CCCCCC;
}
@@ -93,26 +85,12 @@
}
th { /* table heading */
- font-weight: normal;
- font-size: 10px;
background-color: #cccce5;
color: #330000;
- text-align: center;
-}
-th.number {
- background-color: #cccce5;
- color: #330000;
font-size: 10px;
font-weight: normal;
- text-align: right;
+ text-align: center;
}
-th.text {
- background-color: #cccce5;
- color: #330000;
- font-size: 10px;
- font-weight: normal;
- text-align: left;
-}
th.ascending {
cursor: s-resize;
}
@@ -168,9 +146,6 @@
font-family: Arial, Verdana, Helvetica;
font-size: 10px;
}
-input.number{
- text-align: right;
-}
input.image {
border-width:0px;
background-color: transparent;
@@ -268,33 +243,23 @@
TEXT-ALIGN:center;
}
-.page_title_text { /* used */
+div.page_help_text {
+ background: lightgrey url(images/help.png) top left no-repeat;
+ border: #a52a2a 1px solid;
+ color: black;
+ float: none;
font-family: Arial, Verdana, Helvetica;
- padding-top: 2px;
- padding-bottom: 2px;
- font-weight: bold;
font-size: 10px;
- color: black;
- TEXT-ALIGN:center;
-}
-
-DIV.page_help_text {
- background: lightgrey url(images/help.png) top left no-repeat;
- BORDER: #a52a2a 1px solid;
+ font-weight: normal;
+ margin: 0 auto;
+ padding-bottom: 2px;
+ padding-left: 10px;
padding-top:2px;
- padding-bottom: 2px;
- PADDING-LEFT: 10px;
- Z-INDEX: 1;
+ position: static;
+ text-align:center;
+ visibility: visible;
width: 80%;
- FLOAT: none;
- VISIBILITY: visible;
- MARGIN: 0 auto;
- POSITION: static;
- font-family: Arial, Verdana, Helvetica;
- font-weight: normal;
- font-size: 10px;
- color: black;
- TEXT-ALIGN:center;
+ z-index: 1;
}
.menu_group_item a {
@@ -435,10 +400,6 @@
padding:5px;
border:thin outset #eee;
}
-/*#BodyDiv .centre{
- margin:0 auto 10px;
- text-align:center;
-}*/
/*** BODY - MAIN MENU ***/
@@ -562,7 +523,24 @@
}
.centre {
text-align:center;
- /* centre class (general). */
+ /* Class selector to centre text horizontally in an element. */
}
-
-/*** END ***/
+.number {
+ text-align:right;/* Should be left ? */
+ /* Class selector to horizontal align a number (right) in an element. */
+}
+.page_title_text {
+ color:black;
+ font-family:Arial, Verdana, Helvetica;
+ font-size:120%;
+ font-weight:bold;
+ padding-bottom:2px;
+ padding-top:2px;
+ text-align:center;
+ /* Class selector for page title. */
+}
+.text {
+ text-align:left;/* Should be right ? */
+ /* Class selector to horizontal align a text (left) in an element. */
+}
+/* END Style for all. ********************************************************/
\ No newline at end of file
Modified: trunk/css/silverwolf/default.css
===================================================================
--- trunk/css/silverwolf/default.css 2015-11-15 00:52:21 UTC (rev 7388)
+++ trunk/css/silverwolf/default.css 2015-11-15 18:30:29 UTC (rev 7389)
@@ -47,12 +47,6 @@
font-weight:bold;
color:red;
}
-p.page_title_text{ /* page title, used in many *.php */
- background:gainsboro;
- margin:10px auto;
- padding:5px;
- text-align:center;
-}
table{
width:auto; /* automatic width */
max-width:90%;
@@ -61,29 +55,21 @@
}
table.selection{
}
-th{
- font-weight:normal;
+th {
background-color:#C3C3C3;
+ color:#300;
font-size:100%;
- color:#300;
+ font-weight:normal;
text-align:center;
vertical-align:middle;
}
th.number{
- background-color:#cccce5;
- color:#300;
- font-size:100%;
- font-weight:normal;
+ background-color:#CCCCE5; /* Should be #C3C3C3 ? */
text-align:right;
- vertical-align:middle;
}
th.text{
- background-color:#cccce5;
- color:#300;
- font-size:100%;
- font-weight:normal;
+ background-color:#CCCCE5; /* Should be #C3C3C3 ? */
text-align:left;
- vertical-align:middle;
}
th.ascending {
cursor: s-resize;
@@ -118,9 +104,6 @@
td.select{
background-color:#eee;
}
-td.number{
- text-align:right;
-}
.centre{
margin:0 auto 10px;
text-align:center;
@@ -154,9 +137,6 @@
border-right-color:gray;
border-right-style:solid;
}
-input.number{
- text-align:right;
-}
input.image{
border-width:0px;
background-color:transparent;
@@ -516,7 +496,21 @@
}
.centre {
text-align:center;
- /* centre class (general). */
+ /* Class selector to centre text horizontally in an element. */
}
-
-/*** END ***/
+.number {
+ text-align:right;
+ /* Class selector to horizontal align a number (right) in an element. */
+}
+.page_title_text {
+ background:gainsboro;
+ margin:10px auto;
+ padding:5px;
+ text-align:center;
+ /* Class selector for page title. */
+}
+.text {
+ text-align:left;
+ /* Class selector to horizontal align a text (left) in an element. */
+}
+/* END Style for all. ********************************************************/
\ No newline at end of file
Modified: trunk/css/wood/default.css
===================================================================
--- trunk/css/wood/default.css 2015-11-15 00:52:21 UTC (rev 7388)
+++ trunk/css/wood/default.css 2015-11-15 18:30:29 UTC (rev 7389)
@@ -44,13 +44,6 @@
p{
}
-p.page_title_text { /* page title */
- color:black;
- font-weight:bold;
- margin:5px auto;
- padding:5px;
- text-align:center;
-}
p.good {
font-weight: bold;
color: green;
@@ -74,24 +67,12 @@
box-shadow:none;
}
th { /* table headers */
- font-weight: normal;
- font-size:100%;
background-color: #ffd980;
color: black;
+ font-size:100%;
+ font-weight: normal;
text-align: center;
}
-th.number {
- background-color: #800000;
- color: white;
- font-weight: normal;
- text-align: right;
-}
-th.text {
- background-color: #800000;
- color: white;
- font-weight: normal;
- text-align: left;
-}
th.ascending {
cursor: s-resize;
}
@@ -123,9 +104,6 @@
td.select {
background-color:#ffb;
}
-td.number {
- text-align: right;
-}
.centre{ /* used by buttons */
text-align:center;
@@ -136,9 +114,6 @@
font-family: Arial, Verdana, Helvetica, sans-serif;
font-size:100%;
}
-input.number{
- text-align: right;
-}
input.image {
border-width:0px;
background-color: transparent;
@@ -179,28 +154,28 @@
div{ /* some input/buttons need to be centered */
}
div.error {
- background-color:#fddbdb;
- color: red;
+ background-color:#FDDBDB;
border: 1px solid red;
box-shadow:3px 3px 4px;
+ color: red;
margin:0 auto 10px;
padding:10px;
width:80%;
}
div.warn {
- background-color:#f5dbfd;
- color: maroon;
+ background-color:#F5DBFD;
border: 1px solid maroon;
box-shadow:3px 3px 4px;
+ color: maroon;
margin:0 auto 10px;
padding:10px;
width:80%;
}
div.success {
- background-color:#b9ecb4;
- color: darkgreen;
+ background-color:#B9ECB4;
border: 1px solid darkgreen;
box-shadow:3px 3px 4px;
+ color: darkgreen;
margin:0 auto 10px;
padding:10px;
width:80%;
@@ -208,49 +183,48 @@
div.info {
background-color:#C7CCF6;
border:0 solid navy;
+ box-shadow:3px 3px 4px;
color:navy;
- box-shadow:3px 3px 4px;
margin:0 auto 10px;
padding:10px;
width:80%;
}
-DIV.page_help_text {
+div.page_help_text {
background: lightgrey url(images/help.png) top left no-repeat;
- BORDER: #a52a2a 1px solid;
- padding-top:2px;
- padding-bottom: 2px;
- PADDING-LEFT: 10px;
- Z-INDEX: 1;
- FLOAT: none;
- VISIBILITY: visible;
- POSITION: static;
+ border: #A52A2A 1px solid;
+ box-shadow:3px 3px 4px;
+ color: black;
+ float: none;
font-family: Arial, Verdana, Helvetica, sans-serif;
+ font-size: 100%;
font-weight: normal;
- font-size: 100%;
- color: black;
- TEXT-ALIGN:center;
-
- box-shadow:3px 3px 4px;
margin:0 auto 10px;
padding:10px;
+ padding-bottom: 2px;
+ padding-left: 10px;
+ padding-top:2px;
+ position: static;
+ text-align:center;
+ visibility: visible;
width:80%;
+ z-index: 1;
}
-DIV.system_check { /* probably not used anywhere */
- border: #a52a2a 1px solid;
- z-index: 1;
+div.system_check { /* probably not used anywhere */
+ background: lightgray;
+ border: #A52A2A 1px solid;
+ box-shadow:3px 3px 4px;
+ color: black;
float: none;
- visibility: visible;
- position: static;
- background: lightgray;
font-family: arial, verdana, helvetica, sans-serif;
+ font-size:100%;
font-weight: normal;
- font-size:100%;
- color: black;
- text-align:left;
- box-shadow:3px 3px 4px;
margin:0 auto 10px;
padding:10px;
+ position: static;
+ text-align:left;
+ visibility: visible;
width:80%;
+ z-index: 1;
}
/* date picker */
@@ -585,7 +559,22 @@
}
.centre {
text-align:center;
- /* centre class (general). */
+ /* Class selector to centre text horizontally in an element. */
}
-
-/* END */
+.number {
+ text-align:right;
+ /* Class selector to horizontal align a number (right) in an element. */
+}
+.page_title_text {
+ color:black;
+ font-weight:bold;
+ margin:5px auto;
+ padding:5px;
+ text-align:center;
+ /* Class selector for page title. */
+}
+.text {
+ text-align:left;
+ /* Class selector to horizontal align a text (left) in an element. */
+}
+/* END Style for all. ********************************************************/
\ No newline at end of file
Modified: trunk/css/xenos/default.css
===================================================================
--- trunk/css/xenos/default.css 2015-11-15 00:52:21 UTC (rev 7388)
+++ trunk/css/xenos/default.css 2015-11-15 18:30:29 UTC (rev 7389)
@@ -33,15 +33,6 @@
border:none;
vertical-align:middle;
}
-p.page_title_text {
- padding-top:2px;
- padding-bottom:2px;
- font-size:18px;
- color:black;
- width:60%;
- text-align:center;
- margin:10px auto;
-}
p.good {
font-weight:bold;
color:green;
@@ -69,23 +60,11 @@
table.selection {
}
th {
+ border-bottom:thin solid #B3B3B3;
+ color:#2C2C2C;
font-weight:bold;
- color:#2C2C2C;
text-align:center;
- border-bottom:thin solid #B3B3B3;
}
-th.number {
- background-color:#800000;
- color:white;
- font-weight:normal;
- text-align:right;
-}
-th.text {
- background-color:#800000;
- color:white;
- font-weight:normal;
- text-align:left;
-}
th.ascending {
cursor:s-resize;
}
@@ -119,9 +98,6 @@
td.select {
background-color:#eee;
}
-td.number {
- text-align:right;
-}
td table {
background: red;
}
@@ -153,9 +129,6 @@
}
input {
}
-input.number{
- text-align:right;
-}
input.image {
border-width:0px;
background-color:transparent;
@@ -244,16 +217,16 @@
div.page_help_text {
background:lightgrey url(images/help.png) top left no-repeat;
border:thin solid #C3C3C3;
- padding:4px 10px;
- z-index:1;
- width:80%;
+ color:black;
float:none;
- visibility:visible;
+ font-weight:normal;
margin:0 auto;
+ padding:4px 10px;
position:static;
- font-weight:normal;
- color:black;
text-align:center;
+ visibility:visible;
+ width:80%;
+ z-index:1;
}
/*** Calendar picker ***/
@@ -422,14 +395,14 @@
the link!!! ***HJ***/
#QuickMenuDiv li a{
- color:white;
- font-weight:bold;
- padding:11px 24px;
- background:#686868;
- border-right:thin inset #5D5D5D;
- border-left:thin outset #737373;
+ background:#686868;
border-bottom:thin solid #7C7C7C;
- display:block;
+ border-left:thin outset #737373;
+ border-right:thin inset #5D5D5D;
+ color:white;
+ display:block;
+ font-weight:bold;
+ padding:11px 24px;
}
#QuickMenuDiv li:first-child a{
-webkit-border-radius: 0 0 0 6px;
@@ -616,10 +589,10 @@
#FooterDiv{
clear:both; /* REQUIRED */
- overflow:hidden;
- color:#999999;
- width: 98.6%;
- margin: auto;
+ color:#999999;
+ margin:auto;
+ overflow:hidden;
+ width:98.6%;
}
#FooterDiv a{
text-decoration:underline;
@@ -650,7 +623,24 @@
}
.centre {
text-align:center;
- /* centre class (general). */
+ /* Class selector to centre text horizontally in an element. */
}
-
-/*** END ***/
+.number {
+ text-align:right;
+ /* Class selector to horizontal align a number (right) in an element. */
+}
+.page_title_text {
+ color:black;
+ font-size:18px;
+ margin:10px auto;
+ padding-bottom:2px;
+ padding-top:2px;
+ text-align:center;
+ width:60%;
+ /* Class selector for page title. */
+}
+.text {
+ text-align:left;
+ /* Class selector to horizontal align a text (left) in an element. */
+}
+/* END Style for all. ********************************************************/
|
|
From: <ex...@us...> - 2015-11-15 00:52:23
|
Revision: 7388
http://sourceforge.net/p/web-erp/reponame/7388
Author: exsonqu
Date: 2015-11-15 00:52:21 +0000 (Sun, 15 Nov 2015)
Log Message:
-----------
Modified Paths:
--------------
trunk/doc/Change.log
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-11-15 00:49:45 UTC (rev 7387)
+++ trunk/doc/Change.log 2015-11-15 00:52:21 UTC (rev 7388)
@@ -1,5 +1,6 @@
webERP Change Log
+15/11/15 Hazem wehbi Add new arabic locale for Syria.
14/11/15 RChacon: In css/default/default.css, add sections to use with a cascading style sheet for a small device width, reagroup style for centre, number and text in tables.
11/11/15 Ricard: New feature GL accounts - users authority.
09/11/15 RChacon: In CustomerReceipt.php, minor changes (completes table columns, adds classes, etc.).
|
|
From: <ex...@us...> - 2015-11-15 00:49:49
|
Revision: 7387
http://sourceforge.net/p/web-erp/reponame/7387
Author: exsonqu
Date: 2015-11-15 00:49:45 +0000 (Sun, 15 Nov 2015)
Log Message:
-----------
15/11/15 Hazem wehbi Add new arabic locale for Syria.
Added Paths:
-----------
trunk/locale/ar_SY.utf8/
trunk/locale/ar_SY.utf8/LC_MESSAGES/
trunk/locale/ar_SY.utf8/LC_MESSAGES/messages.mo
trunk/locale/ar_SY.utf8/LC_MESSAGES/messages.po
Added: trunk/locale/ar_SY.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Index: trunk/locale/ar_SY.utf8/LC_MESSAGES/messages.mo
===================================================================
--- trunk/locale/ar_SY.utf8/LC_MESSAGES/messages.mo 2015-11-15 00:02:25 UTC (rev 7386)
+++ trunk/locale/ar_SY.utf8/LC_MESSAGES/messages.mo 2015-11-15 00:49:45 UTC (rev 7387)
Property changes on: trunk/locale/ar_SY.utf8/LC_MESSAGES/messages.mo
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/locale/ar_SY.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/ar_SY.utf8/LC_MESSAGES/messages.po (rev 0)
+++ trunk/locale/ar_SY.utf8/LC_MESSAGES/messages.po 2015-11-15 00:49:45 UTC (rev 7387)
@@ -0,0 +1,39282 @@
+# Arabic translation for web-erp
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the web-erp package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: web-erp\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-10-14 10:03+1200\n"
+"PO-Revision-Date: 2015-11-12 20:40+0200\n"
+"Last-Translator: JC_Chuck <Unknown>\n"
+"Language-Team: Arabic <ar...@li...>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-03-07 23:01+0000\n"
+"X-Generator: Poedit 1.7.3\n"
+"Language: ar\n"
+
+#: AccountGroups.php:7 includes/MainMenuLinksArray.php:379
+msgid "Account Groups"
+msgstr "مجموعات العضوية"
+
+#: AccountGroups.php:18
+msgid ""
+"An error occurred in retrieving the account groups of the parent account "
+"group during the check for recursion"
+msgstr ""
+"لقد حدث خطأ فى استرجاع بيانات مجموعات العضو الخاصة باعضوية الأب اثناء "
+"االتحقق من وجود استدعاء ذاتي"
+
+#: AccountGroups.php:19
+msgid ""
+"The SQL that was used to retrieve the account groups of the parent account "
+"group and that failed in the process was"
+msgstr ""
+
+#: AccountGroups.php:45
+#, fuzzy
+msgid "An error occurred in moving the account group"
+msgstr "حدث خطأ اثناء تحديث مجموعة العضو"
+
+#: AccountGroups.php:46
+#, fuzzy
+msgid "The SQL that was used to moving the account group was"
+msgstr "الطلب المستخدم لإضافة مجموعة الحسابات هي"
+
+#: AccountGroups.php:48 AccountGroups.php:309
+msgid "Review Account Groups"
+msgstr ""
+
+#: AccountGroups.php:49
+#, fuzzy
+msgid "All accounts in the account group:"
+msgstr "حدث خطأ اثناء تحديث مجموعة العضو"
+
+#: AccountGroups.php:49
+#, fuzzy
+msgid "have been changed to the account group:"
+msgstr "الطلب المستخدم لإضافة مجموعة الحسابات هي"
+
+#: AccountGroups.php:68 AccountGroups.php:105 AccountGroups.php:186
+#: AccountGroups.php:221
+msgid "The SQL that was used to retrieve the information was"
+msgstr "الطلب المستخدم لإسترجاع المعلومات كان"
+
+#: AccountGroups.php:69
+msgid "Could not check whether the group exists because"
+msgstr "لم يتم التحقق من وجود المجموعة بسبب"
+
+#: AccountGroups.php:76
+msgid "The account group name already exists in the database"
+msgstr "اسم المجموعة موجود مسبقاً"
+
+#: AccountGroups.php:82
+msgid "The account group name cannot contain the character"
+msgstr "لا يمكن وضع هذا الحرف في اسم المجموعة"
+
+#: AccountGroups.php:82 Departments.php:30 TaxCategories.php:31
+msgid "or the character"
+msgstr "او الحرف"
+
+#: AccountGroups.php:88
+msgid "The account group name must be at least one character long"
+msgstr "اسم المجموعة يجب ان يحتوي علي الأقل علي حرف واحد"
+
+#: AccountGroups.php:95
+msgid ""
+"The parent account group selected appears to result in a recursive account "
+"structure - select an alternative parent account group or make this group a "
+"top level account group"
+msgstr ""
+
+#: AccountGroups.php:106
+msgid "Could not check whether the group is recursive because"
+msgstr "لم أستطيع التخقق اذا كانت المجموعة ذاتيى الأسترجاع لأن"
+
+#: AccountGroups.php:114
+msgid ""
+"Since this account group is a child group, the sequence in the trial "
+"balance, the section in the accounts and whether or not the account group "
+"appears in the balance sheet or profit and loss account are all properties "
+"inherited from the parent account group. Any changes made to these fields "
+"will have no effect."
+msgstr ""
+
+#: AccountGroups.php:119
+msgid "The section in accounts must be an integer"
+msgstr "يجب ان يكون القسم فى الحساب عدد صحيح"
+
+#: AccountGroups.php:125
+msgid "The sequence in the trial balance must be an integer"
+msgstr "التسلسل فى الحساب التجريبى يجب ان يكون عدد صحيح"
+
+#: AccountGroups.php:131
+msgid "The sequence in the TB must be numeric and less than"
+msgstr ""
+
+#: AccountGroups.php:147
+msgid "An error occurred in updating the account group"
+msgstr "حدث خطأ اثناء تحديث مجموعة العضو"
+
+#: AccountGroups.php:148
+msgid "The SQL that was used to update the account group was"
+msgstr ""
+
+#: AccountGroups.php:150 AccountSections.php:98 PaymentMethods.php:83
+msgid "Record Updated"
+msgstr "تم التحديث"
+
+#: AccountGroups.php:166
+msgid "An error occurred in inserting the account group"
+msgstr "حدث خطأ ما اثناء اضافة المجموعة"
+
+#: AccountGroups.php:167
+msgid "The SQL that was used to insert the account group was"
+msgstr "الطلب المستخدم لإضافة مجموعة الحسابات هي"
+
+#: AccountGroups.php:168 AccountSections.php:108
+msgid "Record inserted"
+msgstr "تمت الإضافة بنجاح"
+
+#: AccountGroups.php:185
+msgid "An error occurred in retrieving the group information from chartmaster"
+msgstr ""
+
+#: AccountGroups.php:190
+msgid ""
+"Cannot delete this account group because general ledger accounts have been "
+"created using this group"
+msgstr ""
+
+#: AccountGroups.php:191 AccountGroups.php:226 AccountSections.php:130
+#: Areas.php:115 Areas.php:124 BankAccounts.php:159 CreditStatus.php:125
+#: Currencies.php:167 Currencies.php:175 Currencies.php:183
+#: CustomerBranches.php:290 CustomerBranches.php:300 CustomerBranches.php:310
+#: CustomerBranches.php:320 Customers.php:286 Customers.php:295
+#: Customers.php:303 Customers.php:311 CustomerTypes.php:147
+#: CustomerTypes.php:157 Departments.php:141 Factors.php:134
+#: FixedAssetCategories.php:134 GLAccounts.php:80 GLAccounts.php:96
+#: Locations.php:249 Locations.php:257 Locations.php:268 Locations.php:277
+#: Locations.php:286 Locations.php:295 Locations.php:304 Locations.php:313
+#: Locations.php:321 MRPDemandTypes.php:87 PaymentMethods.php:142
+#: PaymentTerms.php:146 PaymentTerms.php:153 PcExpenses.php:161
+#: SalesCategories.php:125 SalesCategories.php:132 SalesPeople.php:150
+#: SalesPeople.php:157 SalesPeople.php:163 SalesTypes.php:140
+#: SalesTypes.php:150 Shippers.php:81 Shippers.php:93 StockCategories.php:188
+#: Stocks.php:660 Stocks.php:669 Stocks.php:677 Stocks.php:685 Stocks.php:693
+#: Stocks.php:701 Suppliers.php:625 Suppliers.php:634 Suppliers.php:642
+#: SupplierTypes.php:145 TaxCategories.php:131 TaxGroups.php:132
+#: TaxGroups.php:140 TaxProvinces.php:129 UnitsOfMeasure.php:135
+#: WorkCentres.php:89 WorkCentres.php:95 WWW_Access.php:83
+msgid "There are"
+msgstr "يوجد"
+
+#: AccountGroups.php:191
+msgid "general ledger accounts that refer to this account group"
+msgstr ""
+
+#: AccountGroups.php:198 AccountGroups.php:269 AccountGroups.php:390
+msgid "Parent Group"
+msgstr ""
+
+#: AccountGroups.php:214
+msgid "Move Group"
+msgstr ""
+
+#: AccountGroups.php:220
+msgid "An error occurred in retrieving the parent group information"
+msgstr ""
+
+#: AccountGroups.php:225
+msgid ""
+"Cannot delete this account group because it is a parent account group of "
+"other account group(s)"
+msgstr ""
+
+#: AccountGroups.php:226
+msgid "account groups that have this group as its/there parent account group"
+msgstr ""
+
+#: AccountGroups.php:230
+msgid "An error occurred in deleting the account group"
+msgstr "حدث خطأ ما اثناء حذف مجموعة الحسابات"
+
+#: AccountGroups.php:231
+msgid "The SQL that was used to delete the account group was"
+msgstr ""
+
+#: AccountGroups.php:233
+msgid "group has been deleted"
+msgstr "تم حذف المجموعة"
+
+#: AccountGroups.php:258
+msgid "The sql that was used to retrieve the account group information was "
+msgstr ""
+
+#: AccountGroups.php:259
+msgid "Could not get account groups because"
+msgstr "لم يتمكن الحصول على مجموات العضو لان"
+
+#: AccountGroups.php:261 AccountSections.php:169 AddCustomerContacts.php:25
+#: AddCustomerContacts.php:27 AddCustomerNotes.php:101
+#: AddCustomerTypeNotes.php:94 AgedDebtors.php:444 AgedSuppliers.php:276
+#: Areas.php:144 AuditTrail.php:11 BankReconciliation.php:14
+#: BOMExtendedQty.php:250 BOMIndented.php:246 BOMIndentedReverse.php:235
+#: BOMInquiry.php:187 BOMListing.php:109 BOMs.php:231 BOMs.php:858
+#: COGSGLPostings.php:19 CompanyPreferences.php:155 CounterSales.php:2045
+#: CounterSales.php:2170 Credit_Invoice.php:256 CreditStatus.php:21
+#: Currencies.php:29 CustEDISetup.php:17 DailyBankTransactions.php:11
+#: DebtorsAtPeriodEnd.php:125 Departments.php:10 DiscountCategories.php:12
+#: DiscountCategories.php:136 DiscountMatrix.php:16 EDIMessageFormat.php:105
+#: FixedAssetLocations.php:9 FixedAssetRegister.php:13
+#: FixedAssetRegister.php:249 FixedAssetTransfer.php:11 FormDesigner.php:129
+#: GLBalanceSheet.php:378 GLBudgets.php:29 GLJournalInquiry.php:7
+#: GLJournal.php:247 InternalStockRequest.php:300 InventoryPlanning.php:379
+#: InventoryPlanningPrefSupplier.php:469 MRPReport.php:516 NoSalesItems.php:89
+#: OutstandingGRNs.php:163 PcAssignCashToTab.php:59 PcAssignCashToTab.php:133
+#: PcAssignCashToTab.php:149 PcAssignCashToTab.php:193 PDFPickingList.php:28
+#: PDFStockLocTransfer.php:16 PO_AuthorisationLevels.php:10 POReport.php:60
+#: POReport.php:64 POReport.php:68 PO_SelectOSPurchOrder.php:140
+#: PricesBasedOnMarkUp.php:8 Prices_Customer.php:35 Prices.php:30
+#: PurchData.php:139 PurchData.php:263 PurchData.php:287
+#: RecurringSalesOrders.php:313 SalesAnalReptCols.php:51 SalesAnalRepts.php:11
+#: SalesCategories.php:11 SalesGLPostings.php:19 SalesGraph.php:35
+#: SalesPeople.php:20 SalesTypes.php:20 SelectAsset.php:46
+#: SelectCompletedOrder.php:11 SelectContract.php:65 SelectCreditItems.php:216
+#: SelectCreditItems.php:287 SelectCustomer.php:274 SelectGLAccount.php:17
+#: SelectGLAccount.php:87 SelectOrderItems.php:594 SelectOrderItems.php:1513
+#: SelectOrderItems.php:1642 SelectProduct.php:520 SelectSalesOrder.php:563
+#: SelectSupplier.php:9 SelectSupplier.php:199 SelectWorkOrder.php:9
+#: SelectWorkOrder.php:169 ShipmentCosting.php:11 Shipments.php:17
+#: Shippers.php:123 Shippers.php:160 Shipt_Select.php:8
+#: StockLocMovements.php:14 StockLocStatus.php:28
+#: StockSerialItemResearch.php:30 SupplierPriceList.php:15
+#: SupplierPriceList.php:217 SupplierPriceList.php:387
+#: SupplierPriceList.php:391 SupplierPriceList.php:442
+#: SupplierPriceList.php:492 Suppliers.php:305 SupplierTenderCreate.php:522
+#: SupplierTenderCreate.php:628 SupplierTenders.php:322
+#: SupplierTenders.php:388 SupplierTransInquiry.php:10 TaxGroups.php:15
+#: TaxProvinces.php:11 TopItems.php:114 UnitsOfMeasure.php:10
+#: WhereUsedInquiry.php:18 WorkCentres.php:111 WorkCentres.php:162
+#: WorkOrderCosting.php:22 WorkOrderEntry.php:11 WorkOrderIssue.php:22
+#: WorkOrderReceive.php:31 WorkOrderStatus.php:58 WWW_Access.php:11
+#: WWW_Users.php:36 Z_BottomUpCosts.php:57
+msgid "Search"
+msgstr "إبحث"
+
+#: AccountGroups.php:265
+msgid "Group Name"
+msgstr "إسم المجموعة"
+
+#: AccountGroups.php:266 EDIMessageFormat.php:129 EDIMessageFormat.php:208
+msgid "Section"
+msgstr "قسم"
+
+#: AccountGroups.php:267 AccountGroups.php:446
+msgid "Sequence In TB"
+msgstr ""
+
+#: AccountGroups.php:268 AccountGroups.php:429 GLProfit_Loss.php:6
+#: GLProfit_Loss.php:126 GLProfit_Loss.php:127 GLProfit_Loss.php:178
+#: SelectGLAccount.php:40 SelectGLAccount.php:54 SelectGLAccount.php:68
+msgid "Profit and Loss"
+msgstr ""
+
+#: AccountGroups.php:285 AccountGroups.php:288 AccountGroups.php:433
+#: AccountGroups.php:435 BOMs.php:124 BOMs.php:772 BOMs.php:774
+#: CompanyPreferences.php:479 CompanyPreferences.php:481
+#: CompanyPreferences.php:494 CompanyPreferences.php:496
+#: CompanyPreferences.php:509 CompanyPreferences.php:511
+#: ContractCosting.php:198 CustomerBranches.php:414 Customers.php:602
+#: Customers.php:974 Customers.php:983 Customers.php:986
+#: DeliveryDetails.php:1090 DeliveryDetails.php:1133 DeliveryDetails.php:1136
+#: GLTransInquiry.php:69 Labels.php:491 Labels.php:493 Labels.php:518
+#: Locations.php:617 Locations.php:619 MRPCalendar.php:224 MRP.php:540
+#: MRP.php:544 MRP.php:548 MRP.php:552 PaymentMethods.php:204
+#: PaymentMethods.php:205 PaymentMethods.php:206 PaymentMethods.php:207
+#: PaymentMethods.php:273 PaymentMethods.php:280 PaymentMethods.php:287
+#: PaymentMethods.php:294 PcAuthorizeExpenses.php:246 PDFChequeListing.php:63
+#: PDFDeliveryDifferences.php:76 PDFDIFOT.php:76
+#: PO_AuthorisationLevels.php:134 PO_AuthorisationLevels.php:139
+#: PO_Header.php:792 PO_PDFPurchOrder.php:391 PO_PDFPurchOrder.php:394
+#: PurchData.php:191 PurchData.php:521 PurchData.php:524
+#: RecurringSalesOrders.php:486 RecurringSalesOrders.php:489
+#: SalesAnalReptCols.php:284 SalesAnalReptCols.php:419
+#: SalesAnalReptCols.php:422 SalesAnalRepts.php:417 SalesAnalRepts.php:420
+#: SalesAnalRepts.php:445 SalesAnalRepts.php:448 SalesAnalRepts.php:473
+#: SalesAnalRepts.php:476 SalesPeople.php:219 SalesPeople.php:356
+#: SalesPeople.php:358 SelectProduct.php:396 ShipmentCosting.php:667
+#: Stocks.php:1058 Stocks.php:1060 Stocks.php:1083 Stocks.php:1085
+#: SuppContractChgs.php:90 SystemParameters.php:404 SystemParameters.php:427
+#: SystemParameters.php:443 SystemParameters.php:508 SystemParameters.php:516
+#: SystemParameters.php:556 SystemParameters.php:636 SystemParameters.php:645
+#: SystemParameters.php:653 SystemParameters.php:671 SystemParameters.php:678
+#: SystemParameters.php:722 SystemParameters.php:818 SystemParameters.php:953
+#: SystemParameters.php:955 SystemParameters.php:965 SystemParameters.php:967
+#: SystemParameters.php:1021 SystemParameters.php:1033
+#: SystemParameters.php:1035 TaxGroups.php:311 TaxGroups.php:314
+#: TaxGroups.php:371 WWW_Users.php:493 WWW_Users.php:495 WWW_Users.php:666
+#: WWW_Users.php:668
+msgid "Yes"
+msgstr "موافق"
+
+#: AccountGroups.php:291 AccountGroups.php:438 AccountGroups.php:440
+#: BankAccounts.php:210 BankAccounts.php:379 BankAccounts.php:381
+#: BankAccounts.php:385 BankAccounts.php:393 BOMs.php:126 BOMs.php:771
+#: BOMs.php:775 CompanyPreferences.php:478 CompanyPreferences.php:482
+#: CompanyPreferences.php:493 CompanyPreferences.php:497
+#: CompanyPreferences.php:508 CompanyPreferences.php:512
+#: ContractCosting.php:196 CustomerBranches.php:414 Customers.php:601
+#: Customers.php:969 Customers.php:982 Customers.php:985
+#: DeliveryDetails.php:1091 DeliveryDetails.php:1134 DeliveryDetails.php:1137
+#: GLTransInquiry.php:86 Labels.php:490 Labels.php:494 Labels.php:519
+#: Locations.php:622 Locations.php:624 MRPCalendar.php:226 MRP.php:538
+#: MRP.php:542 MRP.php:546 MRP.php:550 NoSalesItems.php:184
+#: PaymentMethods.php:204 PaymentMethods.php:205 PaymentMethods.php:206
+#: PaymentMethods.php:207 PaymentMethods.php:274 PaymentMethods.php:281
+#: PaymentMethods.php:288 PaymentMethods.php:295 PcAuthorizeExpenses.php:244
+#: PDFChequeListing.php:62 PDFDeliveryDifferences.php:75 PDFDIFOT.php:75
+#: PO_AuthorisationLevels.php:136 PO_AuthorisationLevels.php:141
+#: PO_Header.php:791 PO_PDFPurchOrder.php:392 PO_PDFPurchOrder.php:395
+#: PurchData.php:195 PurchData.php:522 PurchData.php:525
+#: RecurringSalesOrders.php:485 RecurringSalesOrders.php:488
+#: SalesAnalReptCols.php:282 SalesAnalReptCols.php:420
+#: SalesAnalReptCols.php:423 SalesAnalRepts.php:416 SalesAnalRepts.php:419
+#: SalesAnalRepts.php:444 SalesAnalRepts.php:447 SalesAnalRepts.php:472
+#: SalesAnalRepts.php:475 SalesPeople.php:221 SalesPeople.php:361
+#: SalesPeople.php:363 SelectProduct.php:398 ShipmentCosting.php:668
+#: Stocks.php:1053 Stocks.php:1055 Stocks.php:1078 Stocks.php:1080
+#: SuppContractChgs.php:92 SystemParameters.php:405 SystemParameters.php:428
+#: SystemParameters.php:444 SystemParameters.php:509 SystemParameters.php:517
+#: SystemParameters.php:557 SystemParameters.php:637 SystemParameters.php:646
+#: SystemParameters.php:654 SystemParameters.php:672 SystemParameters.php:679
+#: SystemParameters.php:723 SystemParameters.php:819 SystemParameters.php:952
+#: SystemParameters.php:956 SystemParameters.php:964 SystemParameters.php:968
+#: SystemParameters.php:1022 SystemParameters.php:1032
+#: SystemParameters.php:1036 TaxGroups.php:312 TaxGroups.php:315
+#: TaxGroups.php:373 WWW_Users.php:492 WWW_Users.php:496 WWW_Users.php:665
+#: WWW_Users.php:669 includes/PDFLowGPPageHeader.inc:44
+#: includes/PDFTaxPageHeader.inc:35
+msgid "No"
+msgstr "ﻻ"
+
+#: AccountGroups.php:300 AccountSections.php:189 AddCustomerContacts.php:148
+#: AddCustomerNotes.php:137 AddCustomerTypeNotes.php:131 Areas.php:164
+#: BankAccounts.php:223 BOMs.php:151 COGSGLPostings.php:109
+#: COGSGLPostings.php:207 CreditStatus.php:175 Currencies.php:276
+#: CustomerBranches.php:418 Customers.php:1060 Customers.php:1094
+#: CustomerTypes.php:206 Departments.php:186 EDIMessageFormat.php:150
+#: Factors.php:334 FixedAssetCategories.php:187 FixedAssetLocations.php:107
+#: FreightCosts.php:242 GeocodeSetup.php:173 GLAccounts.php:316 GLTags.php:93
+#: InternalStockRequest.php:282 Labels.php:223 Labels.php:248
+#: Locations.php:403 MRPDemands.php:309 MRPDemandTypes.php:120
+#: PaymentMethods.php:208 PaymentTerms.php:205 PcAssignCashToTab.php:276
+#: PcClaimExpensesFromTab.php:268 PcExpenses.php:226 PcTabs.php:236
+#: PcTypeTabs.php:177 PO_AuthorisationLevels.php:151 Prices_Customer.php:278
+#: Prices.php:250 PurchData.php:208 SalesCategories.php:256
+#: SalesGLPostings.php:134 SalesGLPostings.php:247 SalesPeople.php:232
+#: SalesTypes.php:206 SecurityTokens.php:130 SelectCustomer.php:626
+#: SelectCustomer.php:644 SelectCustomer.php:673 SelectCustomer.php:690
+#: SelectCustomer.php:713 SelectCustomer.php:730 Shippers.php:144
+#: StockCategories.php:264 SupplierContacts.php:165
+#: SupplierTenderCreate.php:145 SupplierTypes.php:189
+#: SuppTransGLAnalysis.php:120 TaxAuthorities.php:174 TaxCategories.php:182
+#: TaxGroups.php:188 TaxProvinces.php:180 UnitsOfMeasure.php:185
+#: WorkCentres.php:141 WWW_Access.php:123 WWW_Users.php:332
+#: includes/InputSerialItems.php:90 includes/OutputSerialItems.php:20
+#, php-format
+msgid "Edit"
+msgstr "تحرير"
+
+#: AccountGroups.php:301
+#, fuzzy
+msgid "Are you sure you wish to delete this account group?"
+msgstr "حدث خطأ ما اثناء حذف مجموعة الحسابات"
+
+#: AccountGroups.php:301 AccountSections.php:193 AddCustomerContacts.php:149
+#: AddCustomerNotes.php:138 AddCustomerTypeNotes.php:132 Areas.php:165
+#: BankAccounts.php:224 BOMs.php:153 COGSGLPostings.php:110
+#: COGSGLPostings.php:208 ContractBOM.php:267 ContractOtherReqts.php:120
+#: CounterSales.php:833 Credit_Invoice.php:394 CreditStatus.php:176
+#: Currencies.php:279 CustomerReceipt.php:925 Customers.php:1095
+#: CustomerTypes.php:207 Departments.php:187 DiscountCategories.php:225
+#: DiscountMatrix.php:183 EDIMessageFormat.php:151
+#: FixedAssetCategories.php:188 FreightCosts.php:243 GeocodeSetup.php:174
+#: GLAccounts.php:317 GLJournal.php:426 GLTags.php:94
+#: InternalStockCategoriesByRole.php:184 InternalStockRequest.php:283
+#: Labels.php:224 Labels.php:249 Labels.php:497 Locations.php:404
+#: MRPDemands.php:310 MRPDemandTypes.php:121 PaymentMethods.php:209
+#: Payments.php:1084 PaymentTerms.php:206 PcAssignCashToTab.php:280
+#: PcClaimExpensesFromTab.php:269 PcExpenses.php:227 PcExpensesTypeTab.php:187
+#: PcTabs.php:237 PcTypeTabs.php:178 PO_AuthorisationLevels.php:153
+#: PO_Items.php:720 Prices_Customer.php:279 Prices.php:251 PurchData.php:209
+#: SalesAnalReptCols.php:299 SalesAnalRepts.php:304 SalesCategories.php:257
+#: SalesGLPostings.php:135 SalesGLPostings.php:248 SalesPeople.php:233
+#: SalesTypes.php:207 SecurityTokens.php:131 SelectCreditItems.php:771
+#: SelectCustomer.php:627 SelectCustomer.php:645 SelectCustomer.php:674
+#: SelectCustomer.php:691 SelectCustomer.php:714 SelectCustomer.php:731
+#: SelectOrderItems.php:1430 Shipments.php:440 Shippers.php:145
+#: SpecialOrder.php:667 StockCategories.php:265 StockCategories.php:587
+#: StockLocTransfer.php:332 SuppContractChgs.php:99 SuppCreditGRNs.php:112
+#: SuppFixedAssetChgs.php:87 SuppInvGRNs.php:147 SupplierContacts.php:166
+#: SupplierTenderCreate.php:401 SupplierTenderCreate.php:429
+#: SupplierTypes.php:191 SuppShiptChgs.php:90 SuppTransGLAnalysis.php:121
+#: TaxAuthorities.php:175 TaxCategories.php:183 TaxGroups.php:189
+#: TaxProvinces.php:181 UnitsOfMeasure.php:186 WorkCentres.php:142
+#: WOSerialNos.php:323 WWW_Access.php:124 WWW_Users.php:333
+#: includes/InputSerialItemsKeyed.php:58 includes/OutputSerialItems.php:99
+#, php-format
+msgid "Delete"
+msgstr "حذف"
+
+#: AccountGroups.php:329
+msgid "An error occurred in retrieving the account group information"
+msgstr ""
+
+#: AccountGroups.php:330
+msgid ""
+"The SQL that was used to retrieve the account group and that failed in the "
+"process was"
+msgstr ""
+
+#: AccountGroups.php:333
+msgid "The account group name does not exist in the database"
+msgstr ""
+
+#: AccountGroups.php:347
+#, fuzzy
+msgid "Edit Account Group Details"
+msgstr "مجموعات العضوية"
+
+#: AccountGroups.php:355 GLAccounts.php:245 GLAccounts.php:296
+#: Z_ImportGLAccountGroups.php:26
+msgid "Account Group"
+msgstr ""
+
+#: AccountGroups.php:379
+#, fuzzy
+msgid "New Account Group Details"
+msgstr "مجموعات العضوية"
+
+#: AccountGroups.php:385
+msgid "Account Group Name"
+msgstr ""
+
+#: AccountGroups.php:396 AccountGroups.php:398
+msgid "Top Level Group"
+msgstr ""
+
+#: AccountGroups.php:413
+msgid "Section In Accounts"
+msgstr ""
+
+#: AccountGroups.php:451 AccountSections.php:259 AddCustomerContacts.php:260
+#: AddCustomerNotes.php:242 AddCustomerTypeNotes.php:221 Areas.php:229
+#: BankAccounts.php:399 BOMs.php:785 COGSGLPostings.php:356
+#: CreditStatus.php:259 Currencies.php:406 CustLoginSetup.php:273
+#: Departments.php:255 DiscountMatrix.php:142 EDIMessageFormat.php:248
+#: FixedAssetCategories.php:347 FixedAssetLocations.php:157
+#: FreightCosts.php:342 GeocodeSetup.php:271 GLAccounts.php:266 Labels.php:531
+#: Locations.php:635 MRPDemands.php:424 MRPDemandTypes.php:188
+#: OffersReceived.php:57 OffersReceived.php:146 PaymentMethods.php:300
+#: PaymentTerms.php:310 PO_AuthorisationLevels.php:262 Prices_Customer.php:361
+#: SalesAnalReptCols.php:552 SalesAnalRepts.php:516 SalesGLPostings.php:419
+#: SalesPeople.php:370 Shippers.php:203 StockCategories.php:614
+#: SupplierContacts.php:284 SuppLoginSetup.php:295 TaxAuthorities.php:329
+#: TaxCategories.php:238 TaxProvinces.php:235 UnitsOfMeasure.php:241
+#: WorkCentres.php:280 WWW_Users.php:737
+msgid "Enter Information"
+msgstr "أدخل المعلومات"
+
+#: AccountSections.php:7 includes/MainMenuLinksArray.php:380
+msgid "Account Sections"
+msgstr "أعدادات العضو"
+
+#: AccountSections.php:61
+msgid "The account section already exists in the database"
+msgstr "قسم العضو موجود مسبقا فى قاعدة البيانات"
+
+#: AccountSections.php:68
+#, fuzzy
+msgid "The account section name cannot contain any illegal characters"
+msgstr "لا يمكن ان يحتوى اسم العضوية على الحرف"
+
+#: AccountSections.php:74
+msgid "The account section name must contain at least one character"
+msgstr "يجب ان يحتوى اسم العضو على الاقل حرف واحد"
+
+#: AccountSections.php:80 AccountSections.php:86
+msgid "The section number must be an integer"
+msgstr "قسم الرقم يجب ان يكون عدد صحيح"
+
+#: AccountSections.php:128
+msgid ""
+"Cannot delete this account section because general ledger accounts groups "
+"have been created using this section"
+msgstr ""
+
+#: AccountSections.php:130
+msgid "general ledger accounts groups that refer to this account section"
+msgstr ""
+
+#: AccountSections.php:142
+msgid "section has been deleted"
+msgstr ""
+
+#: AccountSections.php:167
+msgid "Could not get account group sections because"
+msgstr ""
+
+#: AccountSections.php:173 AccountSections.php:232 AccountSections.php:250
+msgid "Section Number"
+msgstr "رقم القطاع"
+
+#: AccountSections.php:174 AccountSections.php:254
+msgid "Section Description"
+msgstr "وصف القطاع"
+
+#: AccountSections.php:191
+msgid "Restricted"
+msgstr "محظور"
+
+#: AccountSections.php:202
+msgid "Review Account Sections"
+msgstr "راجع أعدادات العضوية"
+
+#: AccountSections.php:221
+msgid "Could not retrieve the requested section please try again."
+msgstr "لم أستطيع استرجاع القطاع المطلوب حاول مجددا"
+
+#: AddCustomerContacts.php:6 AddCustomerContacts.php:59 SelectCustomer.php:618
+#: SelectCustomer.php:651
+msgid "Customer Contacts"
+msgstr ""
+
+#: AddCustomerContacts.php:20 CustEDISetup.php:9 CustLoginSetup.php:21
+#: Z_CheckDebtorsControl.php:14
+msgid "Back to Customers"
+msgstr "العودة الى العملاء"
+
+#: AddCustomerContacts.php:25
+#, fuzzy
+msgid "Contacts for Customer"
+msgstr "العودة الى العملاء"
+
+#: AddCustomerContacts.php:27
+msgid "Edit contact for"
+msgstr ""
+
+#: AddCustomerContacts.php:39
+#, fuzzy
+msgid "The Contact ID must be an integer."
+msgstr "يجب ان يكون القسم فى الحساب عدد صحيح"
+
+#: AddCustomerContacts.php:42
+#, fuzzy
+msgid "The contact name must be forty characters or less long"
+msgstr "اسم المجموعة يجب ان يحتوي علي الأقل علي حرف واحد"
+
+#: AddCustomerContacts.php:45
+msgid "The contact name may not be empty"
+msgstr ""
+
+#: AddCustomerContacts.php:48
+msgid "The contact email address is not a valid email address"
+msgstr ""
+
+#: AddCustomerContacts.php:59 AddCustomerNotes.php:51
+#: AddCustomerTypeNotes.php:48 Areas.php:72 CustomerTypes.php:69
+#: DeliveryDetails.php:775 DeliveryDetails.php:792 Factors.php:105
+#: FixedAssetItems.php:246 MRPCalendar.php:176 PcAssignCashToTab.php:91
+#: PcClaimExpensesFromTab.php:82 PcExpenses.php:98 PcTabs.php:104
+#: PcTypeTabs.php:63 PO_Items.php:370 SalesAnalReptCols.php:129
+#: SalesPeople.php:97 SalesTypes.php:66 Stocks.php:515 Suppliers.php:520
+#: SupplierTypes.php:67
+msgid "has been updated"
+msgstr ""
+
+#: AddCustomerContacts.php:74
+msgid "The contact record has been added"
+msgstr ""
+
+#: AddCustomerContacts.php:103
+msgid "The contact record has been deleted"
+msgstr ""
+
+#: AddCustomerContacts.php:126 CompanyPreferences.php:226
+#: CustomerBranches.php:371 Customers.php:1047 Customers.php:1055
+#: SalesPeople.php:200 SelectCustomer.php:621 StockDispatch.php:237
+#: StockDispatch.php:248 StockDispatch.php:259 SupplierContacts.php:152
+#: SuppTransGLAnalysis.php:105 includes/InputSerialItemsFile.php:92
+#: includes/InputSerialItemsFile.php:144 includes/PDFTaxPageHeader.inc:37
+msgid "Name"
+msgstr ""
+
+#: AddCustomerContacts.php:127 AddCustomerContacts.php:223 Customers.php:1048
+#: Customers.php:1056 SelectCustomer.php:622 WWW_Access.php:107
+#: WWW_Access.php:170
+msgid "Role"
+msgstr ""
+
+#: AddCustomerContacts.php:128
+msgid "Phone no"
+msgstr ""
+
+#: AddCustomerContacts.php:129 AddCustomerContacts.php:241
+#: CustomerBranches.php:377 CustomerBranches.php:797 CustomerInquiry.php:257
+#: Customers.php:1050 Customers.php:1058 EmailCustTrans.php:15
+#: EmailCustTrans.php:64 Factors.php:246 Factors.php:297 Locations.php:587
+#: OrderDetails.php:109 PDFRemittanceAdvice.php:251 PO_PDFPurchOrder.php:378
+#: PO_PDFPurchOrder.php:381 PrintCustTrans.php:713 PrintCustTrans.php:944
+#: PrintCustTrans.php:993 PrintCustTransPortrait.php:759
+#: PrintCustTransPortrait.php:1005 PrintCustTransPortrait.php:1061
+#: SelectCustomer.php:433 SelectCustomer.php:624 SupplierContacts.php:156
+#: SupplierContacts.php:277 UserSettings.php:185 WWW_Users.php:288
+#: includes/PDFPickingListHeader.inc:25 includes/PDFStatementPageHeader.inc:67
+#: includes/PDFTransPageHeader.inc:82
+#: includes/PDFTransPageHeaderPortrait.inc:109
+#: includes/PO_PDFOrderPageHeader.inc:29
+msgid "Email"
+msgstr ""
+
+#: AddCustomerContacts.php:130 AddCustomerContacts.php:250 Customers.php:1051
+#: Customers.php:1059 PcAssignCashToTab.php:241 PcAssignCashToTab.php:372
+#: PcAuthorizeExpenses.php:95 PcClaimExpensesFromTab.php:230
+#: PcClaimExpensesFromTab.php:389 PcReportTab.php:327 SelectCustomer.php:625
+#: SystemParameters.php:342 WOSerialNos.php:294 WOSerialNos.php:300
+msgid "Notes"
+msgstr ""
+
+#: AddCustomerContacts.php:149 SupplierContacts.php:166
+#, php-format
+msgid "Are you sure you wish to delete this contact?"
+msgstr ""
+
+#: AddCustomerContacts.php:168
+msgid "Review all contacts for this Customer"
+msgstr ""
+
+#: AddCustomerContacts.php:206
+msgid "Contact Code"
+msgstr ""
+
+#: AddCustomerContacts.php:214 Factors.php:234 SupplierContacts.php:239
+msgid "Contact Name"
+msgstr ""
+
+#: AddCustomerContacts.php:232 Contracts.php:775 PDFRemittanceAdvice.php:247
+#: PO_Header.php:1000 PO_Header.php:1080 SelectCreditItems.php:241
+#: SelectCustomer.php:431 SelectOrderItems.php:631
+#: SupplierTenderCreate.php:374 includes/PDFStatementPageHeader.inc:63
+#: includes/PDFTransPageHeader.inc:81
+#: includes/PDFTransPageHeaderPortrait.inc:105
+msgid "Phone"
+msgstr ""
+
+#: AddCustomerNotes.php:6 AddCustomerNotes.php:51 SelectCustomer.php:666
+#: SelectCustomer.php:697
+msgid "Customer Notes"
+msgstr ""
+
+#: AddCustomerNotes.php:21 AddCustomerTypeNotes.php:19
+msgid "Back to Select Customer"
+msgstr ""
+
+#: AddCustomerNotes.php:34
+msgid "The contact priority must be an integer."
+msgstr ""
+
+#: AddCustomerNotes.php:37
+msgid "The contact's notes must be two hundred characters or less long"
+msgstr ""
+
+#: AddCustomerNotes.php:40
+msgid "The contact's notes may not be empty"
+msgstr ""
+
+#: AddCustomerNotes.php:64
+msgid "The contact notes record has been added"
+msgstr ""
+
+#: AddCustomerNotes.php:91
+msgid "The contact note record has been deleted"
+msgstr ""
+
+#: AddCustomerNotes.php:101
+msgid "Notes for Customer"
+msgstr ""
+
+#: AddCustomerNotes.php:117 AddCustomerNotes.php:222
+#: AddCustomerTypeNotes.php:111 AddCustomerTypeNotes.php:211
+#: BankMatching.php:272 BankReconciliation.php:209 BankReconciliation.php:286
+#: ContractCosting.php:173 CustomerAllocations.php:330
+#: CustomerAllocations.php:364 CustomerInquiry.php:200
+#: CustomerTransInquiry.php:102 GLAccountInquiry.php:155
+#: GLAccountReport.php:340 GLTransInquiry.php:42 MRPCalendar.php:219
+#: PaymentAllocations.php:66 PcAssignCashToTab.php:237
+#: PcAuthorizeExpenses.php:91 PDFRemittanceAdvice.php:308
+#: PrintCustTrans.php:821 PrintCustTransPortrait.php:873 ReverseGRN.php:392
+#: ShipmentCosting.php:538 ShipmentCosting.php:615 Shipments.php:491
+#: StockDispatch.php:239 StockDispatch.php:250 StockDispatch.php:261
+#: StockLocMovements.php:91 StockMovements.php:98
+#: StockSerialItemResearch.php:81 SupplierAllocations.php:456
+#: SupplierAllocations.php:569 SupplierAllocations.php:644
+#: SupplierInquiry.php:211 SupplierTransInquiry.php:105
+#: includes/PDFQuotationPageHeader.inc:93
+#: includes/PDFQuotationPortraitPageHeader.inc:91
+#: includes/PDFStatementPageHeader.inc:169 includes/PDFTaxPageHeader.inc:36
+#: includes/PDFTransPageHeader.inc:48
+#: includes/PDFTransPageHeaderPortrait.inc:58
+msgid "Date"
+msgstr ""
+
+#: AddCustomerNotes.php:118 AddCustomerTypeNotes.php:112 PcReportTab.php:172
+#: Stocks.php:1062 UpgradeDatabase.php:211 UpgradeDatabase.php:214
+#: UpgradeDatabase.php:217 UpgradeDatabase.php:220 UpgradeDatabase.php:223
+#: UpgradeDatabase.php:226 UpgradeDatabase.php:229 UpgradeDatabase.php:232
+#: UpgradeDatabase.php:235 Z_Upgrade_3.10-3.11.php:62
+#: Z_Upgrade_3.10-3.11.php:66 Z_Upgrade_3.10-3.11.php:70
+#: Z_Upgrade_3.10-3.11.php:74 Z_Upgrade_3.10-3.11.php:78
+#: Z_Upgrade_3.11-4.00.php:62 Z_Upgrade_3.11-4.00.php:66
+#: Z_Upgrade_3.11-4.00.php:70 Z_Upgrade_3.11-4.00.php:74
+#: Z_Upgrade_3.11-4.00.php:78
+msgid "Note"
+msgstr ""
+
+#: AddCustomerNotes.php:119 AddCustomerNotes.php:213
+msgid "WWW"
+msgstr ""
+
+#: AddCustomerNotes.php:120 AddCustomerNotes.php:231
+#: AddCustomerTypeNotes.php:114 AddCustomerTypeNotes.php:215
+msgid "Priority"
+msgstr ""
+
+#: AddCustomerNotes.php:138
+#, php-format
+msgid "Are you sure you wish to delete this customer note?"
+msgstr ""
+
+#: AddCustomerNotes.php:157
+msgid "Review all notes for this Customer"
+msgstr ""
+
+#: AddCustomerNotes.php:196 AddCustomerTypeNotes.php:189
+msgid "Note ID"
+msgstr ""
+
+#: AddCustomerNotes.php:204
+msgid "Contact Note"
+msgstr ""
+
+#: AddCustomerTypeNotes.php:5 SelectCustomer.php:706
+msgid "Customer Type (Group) Notes"
+msgstr ""
+
+#: AddCustomerTypeNotes.php:31
+msgid "The Contact priority must be an integer."
+msgstr ""
+
+#: AddCustomerTypeNotes.php:34
+#, fuzzy
+msgid "The contacts notes must be two hundred characters or less long"
+msgstr "اسم المجموعة يجب ان يحتوي علي الأقل علي حرف واحد"
+
+#: AddCustomerTypeNotes.php:37
+msgid "The contacts notes may not be empty"
+msgstr ""
+
+#: AddCustomerTypeNotes.php:48 SelectCustomer.php:737
+msgid "Customer Group Notes"
+msgstr ""
+
+#: AddCustomerTypeNotes.php:61
+msgid "The contact group notes record has been added"
+msgstr ""
+
+#: AddCustomerTypeNotes.php:84
+msgid "The contact group note record has been deleted"
+msgstr ""
+
+#: AddCustomerTypeNotes.php:94
+msgid "Notes for Customer Type"
+msgstr ""
+
+#: AddCustomerTypeNotes.php:113
+msgid "href"
+msgstr ""
+
+#: AddCustomerTypeNotes.php:150
+msgid "Review all notes for this Customer Type"
+msgstr ""
+
+#: AddCustomerTypeNotes.php:203
+msgid "Contact Group Note"
+msgstr ""
+
+#: AddCustomerTypeNotes.php:207
+msgid "Web site"
+msgstr ""
+
+#: AgedDebtors.php:14
+msgid "Aged Customer Balance Listing"
+msgstr ""
+
+#: AgedDebtors.php:15
+msgid "Aged Customer Balances"
+msgstr ""
+
+#: AgedDebtors.php:264 AgedDebtors.php:363 AgedDebtors.php:428
+msgid "Aged Customer Account Analysis"
+msgstr ""
+
+#: AgedDebtors.php:264 AgedDebtors.php:363 AgedDebtors.php:428
+#: AgedSuppliers.php:108 BOMExtendedQty.php:154 BOMIndented.php:150
+#: BOMIndentedReverse.php:140 BOMListing.php:41 BOMListing.php:52
+#: DebtorsAtPeriodEnd.php:57 DebtorsAtPeriodEnd.php:69 GLBalanceSheet.php:101
+#: GLBalanceSheet.php:140 GLProfit_Loss.php:178 GLTagProfit_Loss.php:192
+#: GLTrialBalance.php:160 InternalStockRequest.php:309
+#: InventoryPlanning.php:101 InventoryPlanning.php:176
+#: InventoryPlanning.php:211 InventoryPlanning.php:259
+#: InventoryPlanning.php:299 InventoryPlanningPrefSupplier.php:201
+#: InventoryPlanningPrefSupplier.php:269 InventoryPlanningPrefSupplier.php:303
+#: InventoryPlanningPrefSupplier.php:348 InventoryPlanningPrefSupplier.php:396
+#: InventoryQuantities.php:84 InventoryValuation.php:78
+#: MailInventoryValuation.php:114 MRPPlannedPurchaseOrders.php:114
+#: MRPPlannedWorkOrders.php:106 MRPReport.php:147 MRPReport.php:508
+#: MRPReschedules.php:45 MRPReschedules.php:57 MRPShortages.php:155
+#: MRPShortages.php:167 OutstandingGRNs.php:53 OutstandingGRNs.php:65
+#: PDFCustomerList.php:18 PDFCustomerList.php:230 PDFCustomerList.php:242
+#: PDFLowGP.php:20 PDFStockCheckComparison.php:33
+#: PDFStockCheckComparison.php:59 PDFStockCheckComparison.php:264
+#: ReorderLevel.php:60 SelectAsset.php:37 SelectProduct.php:43
+#: StockCheck.php:65 StockCheck.php:139 SupplierTenderCreate.php:635
+#: SupplierTenders.php:397 SuppPriceList.php:138
+#: includes/PDFPaymentRun_PymtFooter.php:152
+msgid "Problem Report"
+msgstr ""
+
+#: AgedDebtors.php:266 CustomerInquiry.php:85 CustomerInquiry.php:109
+#: DebtorsAtPeriodEnd.php:59
+msgid "The customer details could not be retrieved by the SQL because"
+msgstr ""
+
+#: AgedDebtors.php:267 AgedDebtors.php:366 AgedDebtors.php:431
+#: AgedSuppliers.php:111 AgedSuppliers.php:198 BOMExtendedQty.php:157
+#: BOMExtendedQty.php:238 BOMIndented.php:153 BOMIndented.php:234
+#: BOMIndentedReverse.php:144 BOMIndentedReverse.php:221 BOMListing.php:44
+#: Credit_Invoice.php:186 DebtorsAtPeriodEnd.php:60 DebtorsAtPeriodEnd.php:72
+#: FTP_RadioBeacon.php:187 GetStockImage.php:150 GLBalanceSheet.php:105
+#: GLBalanceSheet.php:143 GLBalanceSheet.php:320 GLProfit_Loss.php:181
+#: GLProfit_Loss.php:193 GLTagProfit_Loss.php:196 GLTagProfit_Loss.php:209
+#: GLTrialBalance.php:163 GLTrialBalance.php:175 InventoryPlanning.php:104
+#: InventoryPlanning.php:179 InventoryPlanning.php:214
+#: InventoryPlanning.php:262 InventoryPlanning.php:302
+#: InventoryPlanning.php:365 InventoryPlanningPrefSupplier.php:204
+#: InventoryPlanningPrefSupplier.php:272 InventoryPlanningPrefSupplier.php:306
+#: InventoryPlanningPrefSupplier.php:351 InventoryPlanningPrefSupplier.php:399
+#: InventoryPlanningPrefSupplier.php:455 InventoryQuantities.php:87
+#: InventoryQuantities.php:98 InventoryValuation.php:81
+#: InventoryValuation.php:92 MailInventoryValuation.php:117
+#: MailInventoryValuation.php:213 MRPPlannedPurchaseOrders.php:117
+#: MRPPlannedPurchaseOrders.php:128 MRPPlannedWorkOrders.php:109
+#: MRPPlannedWorkOrders.php:120 MRPPlannedWorkOrders.php:311 MRPReport.php:39
+#: MRPReport.php:50 MRPReport.php:150 MRPReschedules.php:48
+#: MRPReschedules.php:60 MRPShortages.php:158 MRPShortages.php:170
+#: OutstandingGRNs.php:56 OutstandingGRNs.php:68 PDFCustomerList.php:233
+#: PDFCustomerList.php:245 PDFGLJournal.php:100 PDFGrn.php:123 PDFLowGP.php:59
+#: PDFLowGP.php:71 PDFPriceList.php:128 PDFPrintLabel.php:46
+#: PDFQuotation.php:272 PDFQuotationPortrait.php:268
+#: PDFRemittanceAdvice.php:83 PDFStockCheckComparison.php:37
+#: PDFStockCheckComparison.php:63 PDFStockCheckComparison.php:268
+#: PO_PDFPurchOrder.php:31 PO_PDFPurchOrder.php:152
+#: PrintCustOrder_generic.php:245 PrintCustOrder.php:233 ReorderLevel.php:63
+#: ReorderLevel.php:182 SalesAnalysis_UserDefined.php:28
+#: SelectCreditItems.php:30 StockCheck.php:46 StockCheck.php:68
+#: StockCheck.php:99 StockCheck.php:142 StockCheck.php:153 StockCheck.php:195
+#: StockDispatch.php:104 StockDispatch.php:117 SupplierBalsAtPeriodEnd.php:54
+#: SupplierBalsAtPeriodEnd.php:65 SuppPaymentRun.php:112
+#: SuppPaymentRun.php:122 SuppPaymentRun.php:186 SuppPaymentRun.php:217
+#: SuppPriceList.php:142 Tax.php:63 Tax.php:168 Tax.php:277
+#: Z_DataExport.php:72 Z_DataExport.php:168 Z_DataExport.php:259
+#: Z_DataExport.php:308 Z_DataExport.php:347 Z_DataExport.php:383
+#: Z_DataExport.php:419 Z_DataExport.php:471 Z_poRebuildDefault.php:38
+#: includes/PDFPaymentRun_PymtFooter.php:59
+#: includes/PDFPaymentRun_PymtFooter.php:89
+#: includes/PDFPaymentRun_PymtFooter.php:119
+#: includes/PDFPaymentRun_PymtFooter.php:156
+#: includes/PDFPaymentRun_PymtFooter.php:187
+#: includes/PDFPaymentRun_PymtFooter.php:218
+#: includes/ConstructSQLForUserDefinedSalesReport.inc:180
+#: includes/ConstructSQLForUserDefinedSalesReport.inc:188
+#: includes/ConstructSQLForUserDefinedSalesReport.inc:340
+msgid "Back to the menu"
+msgstr ""
+
+#: AgedDebtors.php:365
+msgid "The details of outstanding transactions for customer"
+msgstr ""
+
+#: AgedDebtors.php:365 AgedSuppliers.php:197 GLAccountCSV.php:170
+#: GLAccountInquiry.php:146 GLAccountReport.php:94 PO_Items.php:432
+#: PO_Items.php:558 PO_Items.php:583 SalesAnalReptCols.php:365
+#: SpecialOrder.php:449 StockLocTransferReceive.php:370
+#: StockQuantityByDate.php:123 includes/SelectOrderItems_IntoCart.inc:55
+msgid "could not be retrieved because"
+msgstr ""
+
+#: AgedDebtors.php:368 AgedSuppliers.php:200 Areas.php:94
+#: ConfirmDispatch_Invoice.php:161 ConfirmDispatch_Invoice.php:980
+#: ConfirmDispatch_Invoice.php:994 Contracts.php:582 CounterSales.php:1383
+#: CounterSales.php:1397 Credit_Invoice.php:715 Credit_Invoice.php:736
+#: CustomerReceipt.php:545 CustomerReceipt.php:684 CustomerReceipt.php:712
+#: CustomerTransInquiry.php:93 DeliveryDetails.php:393 GLProfit_Loss.php:598
+#: GLTagProfit_Loss.php:513 Payments.php:342 PDFRemittanceAdvice.php:85
+#: PurchData.php:86 PurchData.php:104 PurchData.php:250
+#: RecurringSalesOrders.php:260 ReverseGRN.php:191 ReverseGRN.php:205
+#: ReverseGRN.php:379 SelectCreditItems.php:1417 SelectSalesOrder.php:208
+#: SelectSalesOrder.php:372 SMTPServer.php:64 StockCheck.php:224
+#: StockCostUpdate.php:78 StockCostUpdate.php:88 StockLocStatus.php:160
+#: StockMovements.php:91 StockQuantityByDate.php:97 StockReorderLevel.php:41
+#: StockStatus.php:298 StockTransfers.php:203 StockUsageGraph.php:53
+#: StockUsage.php:139 SupplierInquiry.php:78 SupplierInquiry.php:100
+#: SupplierInquiry.php:136 SupplierInquiry.php:192 SupplierPriceList.php:375
+#: SupplierTransInquiry.php:97 SuppPaymentRun.php:114 SuppPaymentRun.php:188
+#: SuppPaymentRun.php:219 WorkOrderCosting.php:429 WorkOrderReceive.php:292
+#: WOSerialNos.php:49 Z_ChangeBranchCode.php:105 Z_ChangeCustomerCode.php:91
+#: Z_ChangeSupplierCode.php:82 Z_DeleteCreditNote.php:63
+#: Z_DeleteCreditNote.php:73 Z_DeleteCreditNote.php:82 Z_DeleteInvoice.php:88
+#: Z_DeleteInvoice.php:98 Z_DeleteInvoice.php:110
+#: includes/PDFPaymentRun_PymtFooter.php:61
+#: includes/PDFPaymentRun_PymtFooter.php:91
+#: includes/PDFPaymentRun_PymtFooter.php:121
+#: includes/PDFPaymentRun_PymtFooter.php:158
+#: includes/PDFPaymentRun_PymtFooter.php:189 includes/ConnectDB_mysqli.inc:75
+#: includes/ConnectDB_mysql.inc:66
+msgid "The SQL that failed was"
+msgstr ""
+
+#: AgedDebtors.php:430
+msgid ""
+"There are no customers with balances meeting the criteria specified to list"
+msgstr ""
+
+#: AgedDebtors.php:441
+msgid "Aged Debtor Analysis"
+msgstr ""
+
+#: AgedDebtors.php:455 DebtorsAtPeriodEnd.php:138
+msgid "From Customer Code"
+msgstr ""
+
+#: AgedDebtors.php:459 DebtorsAtPeriodEnd.php:142
+msgid "To Customer Code"
+msgstr ""
+
+#: AgedDebtors.php:463 AgedSuppliers.php:295
+msgid "All balances or overdues only"
+msgstr ""
+
+#: AgedDebtors.php:465
+msgid "All customers with balances"
+msgstr ""
+
+#: AgedDebtors.php:466 AgedSuppliers.php:298
+msgid "Overdue accounts only"
+msgstr ""
+
+#: AgedDebtors.php:467
+msgid "Held accounts only"
+msgstr ""
+
+#: AgedDebtors.php:472
+msgid "Only Show Customers Of"
+msgstr ""
+
+#: AgedDebtors.php:478
+msgid "All Sales people"
+msgstr ""
+
+#: AgedDebtors.php:485
+msgid "Only show customers trading in"
+msgstr ""
+
+#: AgedDebtors.php:501
+msgid "Summary or detailed report"
+msgstr ""
+
+#: AgedDebtors.php:503 AgedSuppliers.php:320 InventoryValuation.php:262
+msgid "Summary Report"
+msgstr ""
+
+#: AgedDebtors.php:504 AgedSuppliers.php:321 InventoryValuation.php:263
+msgid "Detailed Report"
+msgstr ""
+
+#: AgedDebtors.php:511 AgedSuppliers.php:327 BOMExtendedQty.php:283
+#: BOMIndented.php:275 BOMIndentedReverse.php:254 BOMListing.php:130
+#: DebtorsAtPeriodEnd.php:164 InventoryPlanning.php:451
+#: InventoryPlanningPrefSupplier.php:519 InventoryQuantities.php:210
+#: InventoryValuation.php:269 MRPPlannedPurchaseOrders.php:282
+#: MRPPlannedWorkOrders.php:341 MRPReschedules.php:153 MRPShortages.php:303
+#: OutstandingGRNs.php:182 PDFCustomerList.php:419 PDFLowGP.php:146
+#: PDFPriceList.php:312 PDFRemittanceAdvice.php:175
+#: PDFStockCheckComparison.php:361 PrintCustTrans.php:537
+#: PrintCustTransPortrait.php:582 ReorderLevel.php:259 StockDispatch.php:407
+#: SupplierBalsAtPeriodEnd.php:160 SuppPriceList.php:263 Tax.php:352
+msgid "Print PDF"
+msgstr ""
+
+#: AgedSuppliers.php:14
+msgid "Aged Supplier Listing"
+msgstr ""
+
+#: AgedSuppliers.php:15
+msgid "Aged Suppliers"
+msgstr ""
+
+#: AgedSuppliers.php:108
+msgid "Aged Supplier Account Analysis"
+msgstr ""
+
+#: AgedSuppliers.php:110 SupplierBalsAtPeriodEnd.php:53
+msgid "The Supplier details could not be retrieved by the SQL because"
+msgstr ""
+
+#: AgedSuppliers.php:195
+msgid "Aged Supplier Account Analysis - Problem Report"
+msgstr ""
+
+#: AgedSuppliers.php:197
+msgid "The details of outstanding transactions for Supplier"
+msgstr ""
+
+#: AgedSuppliers.php:263 AgedSuppliers.php:273
+msgid "Aged Supplier Analysis"
+msgstr ""
+
+#: AgedSuppliers.php:265
+msgid "There are no results so the PDF is empty"
+msgstr ""
+
+#: AgedSuppliers.php:287 OutstandingGRNs.php:172 PDFRemittanceAdvice.php:153
+#: SupplierBalsAtPeriodEnd.php:132 SuppPaymentRun.php:265
+msgid "From Supplier Code"
+msgstr ""
+
+#: AgedSuppliers.php:291 OutstandingGRNs.php:176 PDFRemittanceAdvice.php:157
+#: SupplierBalsAtPeriodEnd.php:136 SuppPaymentRun.php:269
+msgid "To Supplier Code"
+msgstr ""
+
+#: AgedSuppliers.php:297
+msgid "All suppliers with balances"
+msgstr ""
+
+#: AgedSuppliers.php:302
+msgid "For suppliers trading in"
+msgstr ""
+
+#: AgedSuppliers.php:318 InventoryValuation.php:260
+msgid "Summary or Detailed Report"
+msgstr ""
+
+#: Areas.php:7
+msgid "Sales Area Maintenance"
+msgstr ""
+
+#: Areas.php:40
+msgid "The area code must be three characters or less long"
+msgstr ""
+
+#: Areas.php:45
+msgid "The area code entered already exists"
+msgstr ""
+
+#: Areas.php:50
+msgid "The area description must be twenty five characters or less long"
+msgstr ""
+
+#: Areas.php:55
+msgid "The area code may not be empty"
+msgstr ""
+
+#: Areas.php:60
+msgid "The area description may not be empty"
+msgstr ""
+
+#: Areas.php:72
+msgid "Area code"
+msgstr ""
+
+#: Areas.php:86
+msgid "New area code"
+msgstr ""
+
+#: Areas.php:86
+msgid "has been inserted"
+msgstr ""
+
+#: Areas.php:93
+msgid "The area could not be added or updated because"
+msgstr ""
+
+#: Areas.php:114
+msgid ""
+"Cannot delete this area because customer branches have been created using "
+"this area"
+msgstr ""
+
+#: Areas.php:115
+msgid "branches using this area code"
+msgstr ""
+
+#: Areas.php:123
+msgid ""
+"Cannot delete this area because sales analysis records exist that use this "
+"area"
+msgstr ""
+
+#: Areas.php:124
+msgid "sales analysis records referring this area code"
+msgstr ""
+
+#: Areas.php:131 Areas.php:148 Areas.php:204 Areas.php:217
+msgid "Area Code"
+msgstr ""
+
+#: Areas.php:131 CustomerTypes.php:168 Factors.php:140
+#: FixedAssetCategories.php:139 GLAccounts.php:197
+#: InternalStockCategoriesByRole.php:102 Locations.php:349 MRPDemands.php:250
+#: PcAssignCashToTab.php:138 PcClaimExpensesFromTab.php:130 PcExpenses.php:169
+#: PcExpensesTypeTab.php:101 PcTabs.php:168 PcTypeTabs.php:140
+#: SalesAnalReptCols.php:215 SalesCategories.php:136 SalesTypes.php:156
+#: StockCategories.php:205 Suppliers.php:651 SupplierTypes.php:151
+#: Z_DeleteInvoice.php:169 includes/DefineOfferClass.php:134
+msgid "has been deleted"
+msgstr ""
+
+#: Areas.php:149 Areas.php:222
+msgid "Area Name"
+msgstr ""
+
+#: Areas.php:166
+msgid "View Customers from this Area"
+msgstr ""
+
+#: Areas.php:176
+msgid "Review Areas Defined"
+msgstr ""
+
+#: AuditTrail.php:7
+msgid "Audit Trail"
+msgstr ""
+
+#: AuditTrail.php:21
+msgid "Incorrect date format used, please re-enter"
+msgstr ""
+
+#: AuditTrail.php:42 BOMIndented.php:316 BOMIndentedReverse.php:296
+#: MRPCalendar.php:264
+msgid "From Date"
+msgstr ""
+
+#: AuditTrail.php:44 BOMIndented.php:317 BOMIndentedReverse.php:297
+#: MRPCalendar.php:266
+msgid "To Date"
+msgstr ""
+
+#: AuditTrail.php:48 PO_AuthorisationLevels.php:124
+#: PO_AuthorisationLevels.php:173 PO_AuthorisationLevels.php:176
+#: UserSettings.php:113
+msgid "User ID"
+msgstr ""
+
+#: AuditTrail.php:50 AuditTrail.php:63 ContractBOM.php:300
+#: CounterSales.php:2176 CounterSales.php:2179 CustomerTransInquiry.php:32
+#: DailySalesInquiry.php:46 DailySalesInquiry.php:48 FixedAssetRegister.php:56
+#: FixedAssetRegister.php:65 InventoryQuantities.php:168
+#: InventoryQuantities.php:194 InventoryQuantities.php:196 MRP.php:597
+#: MRPReport.php:524 MRPReport.php:526 MRPReschedules.php:145
+#: NoSalesItems.php:22 NoSalesItems.php:48 NoSalesItems.php:68
+#: NoSalesItems.php:70 PDFPeriodStockTransListing.php:60 PDFPriceList.php:198
+#: PO_Items.php:1041 POReport.php:1570 ReorderLevel.php:212
+#: ReorderLevel.php:214 ReorderLevel.php:244 ReorderLevel.php:246
+#: SalesGraph.php:98 SalesGraph.php:100 SalesGraph.php:120 SalesGraph.php:122
+#: SalesGraph.php:144 SalesGraph.php:146 SalesGraph.php:180
+#: SalesInquiry.php:1079 SalesInquiry.php:1142 SelectCreditItems.php:959
+#: SelectOrderItems.php:1650 SelectOrderItems.php:1653 SelectProduct.php:528
+#: SelectProduct.php:530 StockDispatch.php:59 StockDispatch.php:355
+#: StockDispatch.php:357 StockLocStatus.php:69 StockLocStatus.php:71
+#: StockLocStatus.php:89 StockLocStatus.php:94 StockLocStatus.php:99
+#: StockLocStatus.php:104 StockQuantityByDate.php:25 SupplierPriceList.php:23
+#: SupplierPriceList.php:25 SupplierTenderCreate.php:647
+#: SupplierTenderCreate.php:649 SupplierTenders.php:409
+#: SupplierTenders.php:411 SupplierTransInquiry.php:31
+#: SystemParameters.php:984 SystemParameters.php:990 SystemParameters.php:996
+#: SystemParameters.php:1002 SystemParameters.php:1008 TopItems.php:29
+#: TopItems.php:45 TopItems.php:67 TopItems.php:69 WorkOrderEntry.php:604
+#: WorkOrderEntry.php:607 WorkOrderIssue.php:662 WorkOrderIssue.php:665
+msgid "All"
+msgstr ""
+
+#: AuditTrail.php:61
+msgid "Table "
+msgstr ""
+
+#: AuditTrail.php:77
+msgid "Containing text"
+msgstr ""
+
+#: AuditTrail.php:82 InternalStockRequest.php:589 MRPReport.php:778
+#: PO_SelectPurchOrder.php:431 SelectContract.php:180 SelectProduct.php:802
+msgid "View"
+msgstr ""
+
+#: AuditTrail.php:165
+msgid "Date/Time"
+msgstr ""
+
+#: AuditTrail.php:166 PcReportTab.php:259 includes/header.inc:59
+msgid "User"
+msgstr ""
+
+#: AuditTrail.php:167 BankReconciliation.php:210 BankReconciliation.php:287
+#: CustomerAllocations.php:362 CustomerInquiry.php:198
+#: CustomerTransInquiry.php:21 CustomerTransInquiry.php:100
+#: CustWhereAlloc.php:18 CustWhereAlloc.php:105 DailyBankTransactions.php:114
+#: GLAccountInquiry.php:153 GLAccountReport.php:338 GLJournal.php:263
+#: MRPReschedules.php:194 SalesByTypePeriodInquiry.php:336
+#: SelectCustomer.php:430 ShipmentCosting.php:536 ShipmentCosting.php:613
+#: StockCategories.php:236 StockLocMovements.php:89 StockMovements.php:96
+#: SupplierAllocations.php:454 SupplierInquiry.php:209
+#: SupplierTransInquiry.php:20 SupplierTransInquiry.php:102
+#: Z_CheckAllocationsFrom.php:32 Z_CheckAllocationsFrom.php:57
+#: Z_CheckAllocs.php:62 Z_CheckGLTransBalance.php:11
+#: includes/InputSerialItemsFile.php:94 includes/InputSerialItemsFile.php:152
+#: includes/PDFTaxPageHeader.inc:34
+msgid "Type"
+msgstr ""
+
+#: AuditTrail.php:168
+msgid "Table"
+msgstr ""
+
+#: AuditTrail.php:169 api/api_xml-rpc.php:311 api/api_xml-rpc.php:777
+#: api/api_xml-rpc.php:2187
+msgid "Field Name"
+msgstr ""
+
+#: AuditTrail.php:170 SystemParameters.php:341
+#: includes/PDFOstdgGRNsPageHeader.inc:43
+msgid "Value"
+msgstr ""
+
+#: BackupDatabase.php:7
+msgid "Backup webERP Database"
+msgstr ""
+
+#: BackupDatabase.php:20
+#, fuzzy
+msgid "Deleted"
+msgstr "حذف"
+
+#: BackupDatabase.php:23
+msgid "Unable to delete"
+msgstr ""
+
+#: BackupDatabase.php:28
+msgid "All backup files on the server have been deleted"
+msgstr ""
+
+#: BackupDatabase.php:30
+msgid "No backup files on the server were deleted"
+msgstr ""
+
+#: BackupDatabase.php:34
+msgid "Backup"
+msgstr ""
+
+#: BackupDatabase.php:43
+msgid ""
+"The backup file has now been created. You must now download this to your "
+"computer because in case the web-server has a disk failure the backup would "
+"then not on the same machine. Use the link below"
+msgstr ""
+
+#: BackupDatabase.php:43
+msgid "Download the backup file to your locale machine"
+msgstr ""
+
+#: BackupDatabase.php:44
+msgid ""
+"Once you have downloaded the database backup file to your local machine you "
+"should use the link below to delete it - backup files can consume a lot of "
+"space on your hosting account and will accumulate if not deleted - they also "
+"contain sensitive information which would otherwise be available for others "
+"to download!"
+msgstr ""
+
+#: BackupDatabase.php:47
+msgid "Delete the backup file off the server"
+msgstr ""
+
+#: BackupDatabase.php:49
+msgid ""
+"There was some problem producing a backup using mysqldump. Normally this "
+"relates to a permissions issue - the web-server user must have permission to "
+"write to the companies directory"
+msgstr ""
+
+#: BankAccounts.php:7
+msgid "Bank Accounts Maintenance"
+msgstr ""
+
+#: BankAccounts.php:12 TaxAuthorities.php:150
+msgid "Bank"
+msgstr ""
+
+#: BankAccounts.php:13
+msgid ""
+"Update Bank Account details. Account Code is for SWIFT or BSB type Bank "
+"Codes. Set Default for Invoices to Currency Default or Fallback Default to "
+"print Account details on Invoices (only one account should be set to Fall "
+"Back Default)."
+msgstr ""
+
+#: BankAccounts.php:45
+msgid "The bank account code already exists in the database"
+msgstr ""
+
+#: BankAccounts.php:51
+msgid "The bank account name must be fifty characters or less long"
+msgstr ""
+
+#: BankAccounts.php:57
+msgid "The bank account name may not be empty."
+msgstr ""
+
+#: BankAccounts.php:63
+msgid "The bank account number may not be empty."
+msgstr ""
+
+#: BankAccounts.php:69
+msgid "The bank account number must be fifty characters or less long"
+msgstr ""
+
+#: BankAccounts.php:75
+msgid "The bank address must be fifty characters or less long"
+msgstr ""
+
+#: BankAccounts.php:93
+msgid ""
+"Note that it is not possible to change the currency of the account once "
+"there are transactions against it"
+msgstr ""
+
+#: BankAccounts.php:105
+msgid "The bank account details have been updated"
+msgstr ""
+
+#: BankAccounts.php:124
+msgid "The new bank account has been entered"
+msgstr ""
+
+#: BankAccounts.php:129
+msgid "The bank account could not be inserted or modified because"
+msgstr ""
+
+#: BankAccounts.php:130
+msgid "The SQL used to insert/modify the bank account details was"
+msgstr ""
+
+#: BankAccounts.php:158
+msgid ""
+"Cannot delete this bank account because transactions have been created using "
+"this account"
+msgstr ""
+
+#: BankAccounts.php:159
+msgid "transactions with this bank account code"
+msgstr ""
+
+#: BankAccounts.php:165
+msgid "Bank account deleted"
+msgstr ""
+
+#: BankAccounts.php:185
+msgid "The bank accounts set up could not be retrieved because"
+msgstr ""
+
+#: BankAccounts.php:186
+msgid "The SQL used to retrieve the bank account details was"
+msgstr ""
+
+#: BankAccounts.php:191 GLJournal.php:292
+msgid "GL Account Code"
+msgstr ""
+
+#: BankAccounts.php:192 BankAccounts.php:328
+msgid "Bank Account Name"
+msgstr ""
+
+#: BankAccounts.php:193 BankAccounts.php:332
+msgid "Bank Account Code"
+msgstr ""
+
+#: BankAccounts.php:194 BankAccounts.php:336
+msgid "Bank Account Number"
+msgstr ""
+
+#: BankAccounts.php:195 BankAccounts.php:340
+msgid "Bank Address"
+msgstr ""
+
+#: BankAccounts.php:196 CustomerAllocations.php:333 CustomerReceipt.php:792
+#: CustomerTransInquiry.php:110 OffersReceived.php:112 PcReportTab.php:267
+#: PcTabs.php:208 PcTabs.php:351 PO_AuthorisationLevels.php:126
+#: PO_AuthorisationLevels.php:210 PO_AuthorisationLevels.php:215
+#: PO_AuthoriseMyOrders.php:115 PO_Header.php:567
+#: PO_SelectOSPurchOrder.php:489 PO_SelectPurchOrder.php:433
+#: PricesByCost.php:277 Prices.php:221 Prices.php:297 PurchData.php:171
+#: PurchData.php:357 PurchData.php:488 SelectSupplier.php:261
+#: SupplierCredit.php:263 SupplierInvoice.php:237 SupplierPriceList.php:450
+#: SupplierTenderCreate.php:585 SupplierTenders.php:126
+#: SupplierTenders.php:538 SupplierTransInquiry.php:111 SuppPriceList.php:303
+#: includes/PDFBankingSummaryPageHeader.inc:42
+#: includes/PDFDebtorBalsPageHeader.inc:33
+#: includes/PDFSupplierBalsPageHeader.inc:36
+msgid "Currency"
+msgstr ""
+
+#: BankAccounts.php:197 BankAccounts.php:366
+msgid "Default for Invoices"
+msgstr ""
+
+#: BankAccounts.php:212 BankAccounts.php:377 BankAccounts.php:383
+#: BankAccounts.php:387 BankAccounts.php:391
+msgid "Fall Back Default"
+msgstr ""
+
+#: BankAccounts.php:214 BankAccounts.php:378 BankAccounts.php:382
+#: BankAccounts.php:386 BankAccounts.php:392
+msgid "Currency Default"
+msgstr ""
+
+#: BankAccounts.php:224
+#, php-format
+msgid "Are you sure you wish to delete this bank account?"
+msgstr ""
+
+#: BankAccounts.php:248
+msgid "Show All Bank Accounts Defined"
+msgstr ""
+
+#: BankAccounts.php:284 BankAccounts.php:290
+msgid "Bank Account GL Code"
+msgstr ""
+
+#: BankAccounts.php:344
+msgid "Currency Of Account"
+msgstr ""
+
+#: BankMatching.php:6
+msgid "Bank Account Matching"
+msgstr ""
+
+#: BankMatching.php:13 PDFCustTransListing.php:41 Z_CheckDebtorsControl.php:74
+msgid "Receipts"
+msgstr ""
+
+#: BankMatching.php:15 BankMatching.php:24
+msgid "Bank Matching"
+msgstr ""
+
+#: BankMatching.php:15
+msgid "Bank Account Matching - Receipts"
+msgstr ""
+
+#: BankMatching.php:22 PaymentAllocations.php:31 PaymentMethods.php:11
+#: PDFSuppTransListing.php:41
+msgid "Payments"
+msgstr ""
+
+#: BankMatching.php:24
+msgid "Bank Account Matching - Payments"
+msgstr ""
+
+#: BankMatching.php:29
+msgid "This page must be called with a bank transaction type"
+msgstr ""
+
+#: BankMatching.php:29
+msgid "It should not be called directly"
+msgstr ""
+
+#: BankMatching.php:49
+msgid "Could not retrieve transaction information"
+msgstr ""
+
+#: BankMatching.php:56
+msgid "Could not match off this payment because"
+msgstr ""
+
+#: BankMatching.php:70
+msgid "Could not update the amount matched off this bank transaction because"
+msgstr ""
+
+#: BankMatching.php:78
+msgid "Could not unclear this bank transaction because"
+msgstr ""
+
+#: BankMatching.php:86
+msgid ""
+"Use this screen to match webERP Receipts and Payments to your Bank "
+"Statement. Check your bank statement and click the check-box when you find "
+"the matching transaction."
+msgstr ""
+
+#: BankMatching.php:96 BankReconciliation.php:105 CustomerReceipt.php:758
+#: DailyBankTransactions.php:33 Payments.php:762 PDFChequeListing.php:44
+#: TaxAuthorities.php:151 TaxAuthorities.php:318
+msgid "Bank Account"
+msgstr ""
+
+#: BankMatching.php:123
+msgid "Show"
+msgstr ""
+
+#: BankMatching.php:123 CounterSales.php:225 CreditItemsControlled.php:78
+#: FreightCosts.php:269 GoodsReceivedControlled.php:68 GoodsReceived.php:73
+#: InternalStockRequestFulfill.php:37 StockLocTransferReceive.php:424
+#: SupplierAllocations.php:435 SuppShiptChgs.php:137
+msgid "from"
+msgstr ""
+
+#: BankMatching.php:128 ConfirmDispatchControlled_Invoice.php:68
+#: EmailCustTrans.php:64 FixedAssetRegister.php:79 FTP_RadioBeacon.php:280
+#: GLAccountCSV.php:173 GLAccountReport.php:103 Payments.php:742
+#: PcReportTab.php:101 PDFChequeListing.php:115 PDFChequeListing.php:125
+#: PDFChequeListing.php:200 PDFDeliveryDifferences.php:190
+#: PDFDeliveryDifferences.php:203 PDFDeliveryDifferences.php:299
+#: PDFDIFOT.php:193 PDFDIFOT.php:206 PDFDIFOT.php:310 PDFOrdersInvoiced.php:80
+#: PDFOrdersInvoiced.php:277 PDFOrderStatus.php:85 PDFOrderStatus.php:259
+#: PDFRemittanceAdvice.php:48 PO_PDFPurchOrder.php:340
+#: PricesBasedOnMarkUp.php:215 PricesBasedOnMarkUp.php:354
+#: PrintCustStatements.php:43 PrintCustTrans.php:60 PrintCustTrans.php:63
+#: PrintCustTransPortrait.php:58 PrintCustTransPortrait.php:61
+#: SalesGraph.php:214 SalesGraph.php:243 SalesGraph.php:247
+#: StockLocTransferReceive.php:306 StockLocTransferReceive.php:424
+#: Stocks.php:269 Stocks.php:274 StockStatus.php:339 StockStatus.php:380
+#: StockTransfers.php:448 includes/PDFAgedDebtorsPageHeader.inc:18
+#: includes/PDFAgedSuppliersPageHeader.inc:17
+#: includes/PDFChequeListingPageHeader.inc:17
+#: includes/PDFDeliveryDifferencesPageHeader.inc:19
+#: includes/PDFDeliveryDifferencesPageHeader.inc:21
+#: includes/PDFDIFOTPageHeader.inc:19 includes/PDFDIFOTPageHeader.inc:21
+#: includes/PDFOrdersInvoicedPageHeader.inc:19
+#: includes/PDFOrdersInvoicedPageHeader.inc:21
+#: includes/PDFOrderStatusPageHeader.inc:19
+#: includes/PDFOrderStatusPageHeader.inc:21
+#: includes/PDFPeriodStockTransListingPageHeader.inc:20
+#: includes/PDFStockLocTransferHeader.inc:31
+msgid "to"
+msgstr ""
+
+#: BankMatching.php:132
+msgid "Choose outstanding"
+msgstr ""
+
+#: BankMatching.php:132
+msgid "only or all"
+msgstr ""
+
+#: BankMatching.php:132 BankMatching.php:136 BankMatching.php:139
+#: BankMatching.php:149 BankMatching.php:152
+msgid "in the date range"
+msgstr ""
+
+#: BankMatching.php:136 BankMatching.php:139 BankMat...
[truncated message content] |
|
From: <rc...@us...> - 2015-11-15 00:02:27
|
Revision: 7386
http://sourceforge.net/p/web-erp/reponame/7386
Author: rchacon
Date: 2015-11-15 00:02:25 +0000 (Sun, 15 Nov 2015)
Log Message:
-----------
In css/default/default.css, add sections to use with a cascading style sheet for a small device width, reagroup style for centre, number and text in tables.
Modified Paths:
--------------
trunk/css/default/default.css
trunk/doc/Change.log
Modified: trunk/css/default/default.css
===================================================================
--- trunk/css/default/default.css 2015-11-11 08:03:20 UTC (rev 7385)
+++ trunk/css/default/default.css 2015-11-15 00:02:25 UTC (rev 7386)
@@ -50,10 +50,10 @@
table.selection{
padding-bottom:5px;
}
-th{
- font-weight:normal;
+th {
background-color:#B06161;
color:white;
+ font-weight:normal;
}
th.ascending {
cursor: s-resize;
@@ -80,27 +80,9 @@
border-top: 4px solid #000;
visibility: visible;
}
-th.number{
- background-color:#B06161;
- color:white;
- font-weight:normal;
- text-align:right;
-}
-th.text{
- background-color:#B06161;
- color:white;
- font-weight:normal;
- text-align:left;
-}
td {
text-align:left;
}
-td.centre{
- text-align:center;
-}
-td.number{
- text-align:right;
-}
td.select{
background-color:#eee;
}
@@ -462,5 +444,29 @@
}
.centre {
text-align:center;
- /* centre class (general). */
+ /* Class selector to centre text horizontally in an element. */
}
+.number {
+ text-align:right;
+ /* Class selector for horizontal alignment of a number (right) in an element. */
+}
+.text {
+ text-align:left;
+ /* Class selector for horizontal alignment of a text (left) in an element. */
+}
+/* END Style for all. ********************************************************/
+
+
+/* If you want to use a cascading style sheet for a small device width, uncomment line "<meta name="viewport" content="width=device-width, initial-scale=1" />" on includes/header.inc and use the following sections. */
+
+@media only screen and (max-device-width:767px) {
+ /* Style for new browser in a device with a rendering width less than 768px. */
+}
+
+@media only screen and (min-device-width:768px) and (max-device-width:1023px) {
+ /* Style for new browser in a device with a rendering width between 768px and 1024px. */
+}
+
+@media only screen and (min-device-width:1024px) {
+ /* Style for new browser in a device with a rendering width greater than 1024px. */
+}
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-11-11 08:03:20 UTC (rev 7385)
+++ trunk/doc/Change.log 2015-11-15 00:02:25 UTC (rev 7386)
@@ -1,5 +1,7 @@
webERP Change Log
+14/11/15 RChacon: In css/default/default.css, add sections to use with a cascading style sheet for a small device width, reagroup style for centre, number and text in tables.
+11/11/15 Ricard: New feature GL accounts - users authority.
09/11/15 RChacon: In CustomerReceipt.php, minor changes (completes table columns, adds classes, etc.).
05/11/15 Exson: Tidy code up following Tim's suggestion.
3/11/15 RChacon: In GLAccountInquiry.php, add ViewTopic and BookMark, fix some colspan, and add thead and column classes.
|
|
From: <te...@us...> - 2015-11-11 08:03:24
|
Revision: 7385
http://sourceforge.net/p/web-erp/reponame/7385
Author: tehonu
Date: 2015-11-11 08:03:20 +0000 (Wed, 11 Nov 2015)
Log Message:
-----------
New feature GL accounts - users authority
Modified Paths:
--------------
trunk/AnalysisHorizontalIncome.php
trunk/AnalysisHorizontalPosition.php
trunk/CustomerReceipt.php
trunk/GLAccountCSV.php
trunk/GLAccountInquiry.php
trunk/GLAccountReport.php
trunk/GLBalanceSheet.php
trunk/GLJournal.php
trunk/GLJournalInquiry.php
trunk/GLProfit_Loss.php
trunk/GLTagProfit_Loss.php
trunk/GLTransInquiry.php
trunk/GLTrialBalance.php
trunk/PDFChequeListing.php
trunk/Payments.php
trunk/SelectGLAccount.php
trunk/WWW_Users.php
trunk/includes/MainMenuLinksArray.php
trunk/sql/mysql/upgrade4.12.3-4.13.sql
Added Paths:
-----------
trunk/GLAccountUsers.php
trunk/UserGLAccounts.php
Modified: trunk/AnalysisHorizontalIncome.php
===================================================================
--- trunk/AnalysisHorizontalIncome.php 2015-11-09 18:25:45 UTC (rev 7384)
+++ trunk/AnalysisHorizontalIncome.php 2015-11-11 08:03:20 UTC (rev 7385)
@@ -183,9 +183,10 @@
SUM(CASE WHEN chartdetails.period='" . $_POST['ToPeriod'] . "' THEN chartdetails.bfwd + chartdetails.actual ELSE 0 END) AS lastprdcfwd,
SUM(CASE WHEN chartdetails.period='" . ($_POST['FromPeriod'] - 12) . "' THEN chartdetails.bfwd ELSE 0 END) AS firstprdbfwdly,
SUM(CASE WHEN chartdetails.period='" . ($_POST['ToPeriod']-12) . "' THEN chartdetails.bfwd + chartdetails.actual ELSE 0 END) AS lastprdcfwdly
- FROM chartmaster INNER JOIN accountgroups
- ON chartmaster.group_ = accountgroups.groupname INNER JOIN chartdetails
- ON chartmaster.accountcode= chartdetails.accountcode
+ FROM chartmaster
+ INNER JOIN accountgroups ON chartmaster.group_ = accountgroups.groupname
+ INNER JOIN chartdetails ON chartmaster.accountcode= chartdetails.accountcode
+ INNER JOIN glaccountusers ON glaccountusers.accountcode=chartmaster.accountcode AND glaccountusers.userid='" . $_SESSION['UserID'] . "' AND glaccountusers.canview=1
WHERE accountgroups.pandl=1
GROUP BY accountgroups.sectioninaccounts,
accountgroups.parentgroupname,
Modified: trunk/AnalysisHorizontalPosition.php
===================================================================
--- trunk/AnalysisHorizontalPosition.php 2015-11-09 18:25:45 UTC (rev 7384)
+++ trunk/AnalysisHorizontalPosition.php 2015-11-11 08:03:20 UTC (rev 7385)
@@ -156,9 +156,10 @@
chartmaster.accountname,
Sum(CASE WHEN chartdetails.period='" . $_POST['BalancePeriodEnd'] . "' THEN chartdetails.bfwd + chartdetails.actual ELSE 0 END) AS balancecfwd,
Sum(CASE WHEN chartdetails.period='" . ($_POST['BalancePeriodEnd'] - 12) . "' THEN chartdetails.bfwd + chartdetails.actual ELSE 0 END) AS balancecfwdly
- FROM chartmaster INNER JOIN accountgroups
- ON chartmaster.group_ = accountgroups.groupname INNER JOIN chartdetails
- ON chartmaster.accountcode= chartdetails.accountcode
+ FROM chartmaster
+ INNER JOIN accountgroups ON chartmaster.group_ = accountgroups.groupname
+ INNER JOIN chartdetails ON chartmaster.accountcode= chartdetails.accountcode
+ INNER JOIN glaccountusers ON glaccountusers.accountcode=chartmaster.accountcode AND glaccountusers.userid='" . $_SESSION['UserID'] . "' AND glaccountusers.canview=1
WHERE accountgroups.pandl=0
GROUP BY accountgroups.groupname,
chartdetails.accountcode,
Modified: trunk/CustomerReceipt.php
===================================================================
--- trunk/CustomerReceipt.php 2015-11-09 18:25:45 UTC (rev 7384)
+++ trunk/CustomerReceipt.php 2015-11-11 08:03:20 UTC (rev 7385)
@@ -1100,7 +1100,11 @@
<td>' . _('GL Account') . ':</td>
<td><select tabindex="8" name="GLCode">';
- $SQL = "SELECT accountcode, accountname FROM chartmaster ORDER BY accountcode";
+ $SQL = "SELECT chartmaster.accountcode,
+ chartmaster.accountname
+ FROM chartmaster
+ INNER JOIN glaccountusers ON glaccountusers.accountcode=chartmaster.accountcode AND glaccountusers.userid='" . $_SESSION['UserID'] . "' AND glaccountusers.canupd=1
+ ORDER BY chartmaster.accountcode";
$result=DB_query($SQL);
if (DB_num_rows($result)==0){
echo '</select>' . _('No General ledger accounts have been set up yet') . ' - ' . _('receipts cannot be entered against GL accounts until the GL accounts are set up') . '</td>
Modified: trunk/GLAccountCSV.php
===================================================================
--- trunk/GLAccountCSV.php 2015-11-09 18:25:45 UTC (rev 7384)
+++ trunk/GLAccountCSV.php 2015-11-11 08:03:20 UTC (rev 7385)
@@ -34,7 +34,11 @@
<tr>
<td>' . _('Selected Accounts') . ':</td>
<td><select name="Account[]" size="12" multiple="multiple">';
-$sql = "SELECT accountcode, accountname FROM chartmaster ORDER BY accountcode";
+$sql = "SELECT chartmaster.accountcode,
+ chartmaster.accountname
+ FROM chartmaster
+ INNER JOIN glaccountusers ON glaccountusers.accountcode=chartmaster.accountcode AND glaccountusers.userid='" . $_SESSION['UserID'] . "' AND glaccountusers.canview=1
+ ORDER BY chartmaster.accountcode";
$AccountsResult = DB_query($sql);
$i=0;
while ($myrow=DB_fetch_array($AccountsResult,$db)){
Modified: trunk/GLAccountInquiry.php
===================================================================
--- trunk/GLAccountInquiry.php 2015-11-09 18:25:45 UTC (rev 7384)
+++ trunk/GLAccountInquiry.php 2015-11-11 08:03:20 UTC (rev 7385)
@@ -49,7 +49,11 @@
<td>' . _('Account').':</td>
<td><select name="Account">';
-$sql = "SELECT accountcode, accountname FROM chartmaster ORDER BY accountcode";
+$sql = "SELECT chartmaster.accountcode,
+ chartmaster.accountname
+ FROM chartmaster
+ 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){
Modified: trunk/GLAccountReport.php
===================================================================
--- trunk/GLAccountReport.php 2015-11-09 18:25:45 UTC (rev 7384)
+++ trunk/GLAccountReport.php 2015-11-11 08:03:20 UTC (rev 7385)
@@ -235,7 +235,11 @@
<tr>
<td>' . _('Selected Accounts') . ':</td>
<td><select name="Account[]" multiple="multiple">';
- $sql = "SELECT accountcode, accountname FROM chartmaster ORDER BY accountcode";
+ $sql = "SELECT chartmaster.accountcode,
+ chartmaster.accountname
+ FROM chartmaster
+ INNER JOIN glaccountusers ON glaccountusers.accountcode=chartmaster.accountcode AND glaccountusers.userid='" . $_SESSION['UserID'] . "' AND glaccountusers.canview=1
+ ORDER BY chartmaster.accountcode";
$AccountsResult = DB_query($sql);
$i=0;
while ($myrow=DB_fetch_array($AccountsResult)){
Added: trunk/GLAccountUsers.php
===================================================================
--- trunk/GLAccountUsers.php (rev 0)
+++ trunk/GLAccountUsers.php 2015-11-11 08:03:20 UTC (rev 7385)
@@ -0,0 +1,261 @@
+<?php
+/* $Id: glaccountusers.php 6806 2013-09-28 05:10:46Z daintree $*/
+
+include('includes/session.inc');
+$Title = _('GL Account Authorised Users Maintenance');
+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['SelectedUser'])) {
+ $SelectedUser = mb_strtoupper($_POST['SelectedUser']);
+} elseif (isset($_GET['SelectedUser'])) {
+ $SelectedUser = mb_strtoupper($_GET['SelectedUser']);
+} else {
+ $SelectedUser = '';
+}
+
+if (isset($_POST['SelectedGLAccount'])) {
+ $SelectedGLAccount = mb_strtoupper($_POST['SelectedGLAccount']);
+} elseif (isset($_GET['SelectedGLAccount'])) {
+ $SelectedGLAccount = mb_strtoupper($_GET['SelectedGLAccount']);
+}
+
+if (isset($_POST['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'])) {
+
+ $InputError = 0;
+
+ 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);
+ }
+
+ 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">
+ <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>';
+ while ($MyRow = DB_fetch_array($Result)) {
+ if (isset($SelectedGLAccount) and $MyRow['accountcode'] == $SelectedGLAccount) {
+ echo '<option selected="selected" value="';
+ } else {
+ echo '<option value="';
+ }
+ echo $MyRow['accountcode'] . '">' . $MyRow['accountcode'] . ' - ' . $MyRow['accountname'] . '</option>';
+
+ } //end while loop
+
+ echo '</select></td></tr>';
+
+ echo '</table>'; // close main table
+ DB_free_result($Result);
+
+ 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);
+ $MyRow = DB_fetch_array($Result);
+ $SelectedGLAccountName = $MyRow['accountname'];
+
+ 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;
+ } else {
+ echo '<tr class="OddTableRows">';
+ $k = 1;
+ }
+
+ 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>';
+ }
+
+ 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']);
+ }
+ //END WHILE LIST LOOP
+ echo '</table>';
+
+ if (!isset($_GET['delete'])) {
+
+
+ echo '<table class="selection">'; //Main table
+
+ echo '<tr>
+ <td>' . _('Select 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>';
+ }
+ while ($MyRow = DB_fetch_array($Result)) {
+ 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
+}
+
+include('includes/footer.inc');
+?>
Modified: trunk/GLBalanceSheet.php
===================================================================
--- trunk/GLBalanceSheet.php 2015-11-09 18:25:45 UTC (rev 7384)
+++ trunk/GLBalanceSheet.php 2015-11-11 08:03:20 UTC (rev 7385)
@@ -130,9 +130,10 @@
chartmaster.accountname,
Sum(CASE WHEN chartdetails.period='" . $_POST['BalancePeriodEnd'] . "' THEN chartdetails.bfwd + chartdetails.actual ELSE 0 END) AS balancecfwd,
Sum(CASE WHEN chartdetails.period='" . ($_POST['BalancePeriodEnd'] - 12) . "' THEN chartdetails.bfwd + chartdetails.actual ELSE 0 END) AS lybalancecfwd
- FROM chartmaster INNER JOIN accountgroups
- ON chartmaster.group_ = accountgroups.groupname INNER JOIN chartdetails
- ON chartmaster.accountcode= chartdetails.accountcode
+ FROM chartmaster
+ INNER JOIN accountgroups ON chartmaster.group_ = accountgroups.groupname
+ INNER JOIN chartdetails ON chartmaster.accountcode= chartdetails.accountcode
+ INNER JOIN glaccountusers ON glaccountusers.accountcode=chartmaster.accountcode AND glaccountusers.userid='" . $_SESSION['UserID'] . "' AND glaccountusers.canview=1
WHERE accountgroups.pandl=0
GROUP BY accountgroups.groupname,
chartdetails.accountcode,
@@ -372,9 +373,10 @@
chartmaster.accountname,
Sum(CASE WHEN chartdetails.period='" . $_POST['BalancePeriodEnd'] . "' THEN chartdetails.bfwd + chartdetails.actual ELSE 0 END) AS balancecfwd,
Sum(CASE WHEN chartdetails.period='" . ($_POST['BalancePeriodEnd'] - 12) . "' THEN chartdetails.bfwd + chartdetails.actual ELSE 0 END) AS lybalancecfwd
- FROM chartmaster INNER JOIN accountgroups
- ON chartmaster.group_ = accountgroups.groupname INNER JOIN chartdetails
- ON chartmaster.accountcode= chartdetails.accountcode
+ FROM chartmaster
+ INNER JOIN accountgroups ON chartmaster.group_ = accountgroups.groupname
+ INNER JOIN chartdetails ON chartmaster.accountcode= chartdetails.accountcode
+ INNER JOIN glaccountusers ON glaccountusers.accountcode=chartmaster.accountcode AND glaccountusers.userid='" . $_SESSION['UserID'] . "' AND glaccountusers.canview=1
WHERE accountgroups.pandl=0
GROUP BY accountgroups.groupname,
chartdetails.accountcode,
Modified: trunk/GLJournal.php
===================================================================
--- trunk/GLJournal.php 2015-11-09 18:25:45 UTC (rev 7384)
+++ trunk/GLJournal.php 2015-11-11 08:03:20 UTC (rev 7385)
@@ -324,10 +324,11 @@
}
echo '<td><input type="text" autofocus="autofocus" name="GLManualCode" maxlength="12" size="12" onchange="inArray(this, GLCode.options,'. "'".'The account code '."'".'+ this.value+ '."'".' doesnt exist'."'".')" value="'. $_POST['GLManualCode'] .'" /></td>';
-$sql="SELECT accountcode,
- accountname
+$sql="SELECT chartmaster.accountcode,
+ chartmaster.accountname
FROM chartmaster
- ORDER BY accountcode";
+ INNER JOIN glaccountusers ON glaccountusers.accountcode=chartmaster.accountcode AND glaccountusers.userid='" . $_SESSION['UserID'] . "' AND glaccountusers.canupd=1
+ ORDER BY chartmaster.accountcode";
$result=DB_query($sql);
echo '<td>
Modified: trunk/GLJournalInquiry.php
===================================================================
--- trunk/GLJournalInquiry.php 2015-11-09 18:25:45 UTC (rev 7384)
+++ trunk/GLJournalInquiry.php 2015-11-11 08:03:20 UTC (rev 7385)
@@ -102,10 +102,26 @@
} else {
echo '<tr><td colspan="2"></td>';
}
+
+ // if user is allowed to see the account we show it, other wise we show "OTHERS ACCOUNTS"
+ $CheckSql = "SELECT count(*)
+ FROM glaccountusers
+ WHERE accountcode= '" . $myrow['account'] . "'
+ AND userid = '" . $_SESSION['UserID'] . "'
+ AND canview = '1'";
+ $CheckResult = DB_query($CheckSql);
+ $CheckRow = DB_fetch_row($CheckResult);
- echo '<td>' . $myrow['account'] . '</td>
- <td>' . $myrow['accountname'] . '</td>
- <td>' . $myrow['narrative'] . '</td>
+ if ($CheckRow[0] > 0) {
+ echo '<td>' . $myrow['account'] . '</td>
+ <td>' . $myrow['accountname'] . '</td>';
+ }else{
+ echo '<td>' . _('Others') . '</td>
+ <td>' . _('Other GL Accounts') . '</td>';
+ }
+
+
+ echo '<td>' . $myrow['narrative'] . '</td>
<td class="number">' . locale_number_format($myrow['amount'],$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
<td class="number">' . $myrow['tag'] . ' - ' . $myrow['tagdescription'] . '</td>';
Modified: trunk/GLProfit_Loss.php
===================================================================
--- trunk/GLProfit_Loss.php 2015-11-09 18:25:45 UTC (rev 7384)
+++ trunk/GLProfit_Loss.php 2015-11-11 08:03:20 UTC (rev 7385)
@@ -166,9 +166,10 @@
Sum(CASE WHEN chartdetails.period='" . ($_POST['FromPeriod'] - 12) . "' THEN chartdetails.bfwd ELSE 0 END) AS lyfirstprdbfwd,
Sum(CASE WHEN chartdetails.period='" . ($_POST['ToPeriod']-12) . "' THEN chartdetails.bfwd + chartdetails.actual ELSE 0 END) AS lylastprdcfwd,
Sum(CASE WHEN chartdetails.period='" . $_POST['ToPeriod'] . "' THEN chartdetails.bfwdbudget + chartdetails.budget ELSE 0 END) AS lastprdbudgetcfwd
- FROM chartmaster INNER JOIN accountgroups
- ON chartmaster.group_ = accountgroups.groupname INNER JOIN chartdetails
- ON chartmaster.accountcode= chartdetails.accountcode
+ FROM chartmaster
+ INNER JOIN accountgroups ON chartmaster.group_ = accountgroups.groupname
+ INNER JOIN chartdetails ON chartmaster.accountcode= chartdetails.accountcode
+ INNER JOIN glaccountusers ON glaccountusers.accountcode=chartmaster.accountcode AND glaccountusers.userid='" . $_SESSION['UserID'] . "' AND glaccountusers.canview=1
WHERE accountgroups.pandl=1
GROUP BY accountgroups.sectioninaccounts,
accountgroups.groupname,
@@ -594,9 +595,10 @@
SUM(CASE WHEN chartdetails.period='" . ($_POST['FromPeriod'] - 12) . "' THEN chartdetails.bfwd ELSE 0 END) AS lyfirstprdbfwd,
SUM(CASE WHEN chartdetails.period='" . ($_POST['ToPeriod']-12) . "' THEN chartdetails.bfwd + chartdetails.actual ELSE 0 END) AS lylastprdcfwd,
SUM(CASE WHEN chartdetails.period='" . $_POST['ToPeriod'] . "' THEN chartdetails.bfwdbudget + chartdetails.budget ELSE 0 END) AS lastprdbudgetcfwd
- FROM chartmaster INNER JOIN accountgroups
- ON chartmaster.group_ = accountgroups.groupname INNER JOIN chartdetails
- ON chartmaster.accountcode= chartdetails.accountcode
+ FROM chartmaster
+ INNER JOIN accountgroups ON chartmaster.group_ = accountgroups.groupname
+ INNER JOIN chartdetails ON chartmaster.accountcode= chartdetails.accountcode
+ INNER JOIN glaccountusers ON glaccountusers.accountcode=chartmaster.accountcode AND glaccountusers.userid='" . $_SESSION['UserID'] . "' AND glaccountusers.canview=1
WHERE accountgroups.pandl=1
GROUP BY accountgroups.sectioninaccounts,
accountgroups.parentgroupname,
Modified: trunk/GLTagProfit_Loss.php
===================================================================
--- trunk/GLTagProfit_Loss.php 2015-11-09 18:25:45 UTC (rev 7384)
+++ trunk/GLTagProfit_Loss.php 2015-11-11 08:03:20 UTC (rev 7385)
@@ -172,9 +172,10 @@
chartmaster.accountname,
Sum(CASE WHEN (gltrans.periodno>='" . $_POST['FromPeriod'] . "' and gltrans.periodno<='" . $_POST['ToPeriod'] . "') THEN gltrans.amount ELSE 0 END) AS TotalAllPeriods,
Sum(CASE WHEN (gltrans.periodno='" . $_POST['ToPeriod'] . "') THEN gltrans.amount ELSE 0 END) AS TotalThisPeriod
- FROM chartmaster INNER JOIN accountgroups
- ON chartmaster.group_ = accountgroups.groupname INNER JOIN gltrans
- ON chartmaster.accountcode= gltrans.account
+ FROM chartmaster
+ INNER JOIN accountgroups ON chartmaster.group_ = accountgroups.groupname
+ INNER JOIN gltrans ON chartmaster.accountcode= gltrans.account
+ INNER JOIN glaccountusers ON glaccountusers.accountcode=chartmaster.accountcode AND glaccountusers.userid='" . $_SESSION['UserID'] . "' AND glaccountusers.canview=1
WHERE accountgroups.pandl=1
AND gltrans.tag='" . $_POST['tag'] . "'
GROUP BY accountgroups.sectioninaccounts,
Modified: trunk/GLTransInquiry.php
===================================================================
--- trunk/GLTransInquiry.php 2015-11-09 18:25:45 UTC (rev 7384)
+++ trunk/GLTransInquiry.php 2015-11-11 08:03:20 UTC (rev 7385)
@@ -124,8 +124,23 @@
$DetailResult = DB_query($DetailSQL);
} else {
- $URL = $RootPath . '/GLAccountInquiry.php?Account=' . $TransRow['account'];
+ // if user is allowed to see the account we show it, other wise we show "OTHERS ACCOUNTS"
+ $CheckSql = "SELECT count(*)
+ FROM glaccountusers
+ WHERE accountcode= '" . $TransRow['account'] . "'
+ AND userid = '" . $_SESSION['UserID'] . "'
+ AND canview = '1'";
+ $CheckResult = DB_query($CheckSql);
+ $CheckRow = DB_fetch_row($CheckResult);
+ if ($CheckRow[0] > 0) {
+ $AccountName = $TransRow['accountname'];
+ $URL = $RootPath . '/GLAccountInquiry.php?Account=' . $TransRow['account'];
+ }else{
+ $AccountName = _('Other GL Accounts');
+ $URL = "";
+ }
+
if( mb_strlen($TransRow['narrative'])==0 ) {
$TransRow['narrative'] = ' ';
}
@@ -137,11 +152,20 @@
echo '<tr class="EvenTableRows">';
$j++;
}
+
echo ' <td>' . MonthAndYearFromSQLDate($TransRow['lastdate_in_period']) . '</td>
- <td>' . $TranDate . '</td>
- <td><a href="' . $URL . '">' . $TransRow['accountname'] . '</a></td>
- <td>' . $TransRow['narrative'] . '</td>
- <td class="number">' . $DebitAmount . '</td>
+ <td>' . $TranDate . '</td>';
+
+ if ($URL == ""){
+ // User is not allowed to see this GL account, don't show the details
+ echo ' <td>' . $AccountName . '</td>
+ <td>' . $AccountName . '</td>';
+ }else{
+ echo ' <td><a href="' . $URL . '">' . $AccountName . '</a></td>
+ <td>' . $TransRow['narrative'] . '</td>';
+ }
+
+ echo ' <td class="number">' . $DebitAmount . '</td>
<td class="number">' . $CreditAmount . '</td>
<td>' . $Posted . '</td>
</tr>';
Modified: trunk/GLTrialBalance.php
===================================================================
--- trunk/GLTrialBalance.php 2015-11-09 18:25:45 UTC (rev 7384)
+++ trunk/GLTrialBalance.php 2015-11-11 08:03:20 UTC (rev 7385)
@@ -147,8 +147,10 @@
Sum(CASE WHEN chartdetails.period='" . $_POST['ToPeriod'] . "' THEN chartdetails.actual ELSE 0 END) AS monthactual,
Sum(CASE WHEN chartdetails.period='" . $_POST['ToPeriod'] . "' THEN chartdetails.budget ELSE 0 END) AS monthbudget,
Sum(CASE WHEN chartdetails.period='" . $_POST['ToPeriod'] . "' THEN chartdetails.bfwdbudget + chartdetails.budget ELSE 0 END) AS lastprdbudgetcfwd
- FROM chartmaster INNER JOIN accountgroups ON chartmaster.group_ = accountgroups.groupname
+ FROM chartmaster
+ INNER JOIN accountgroups ON chartmaster.group_ = accountgroups.groupname
INNER JOIN chartdetails ON chartmaster.accountcode= chartdetails.accountcode
+ INNER JOIN glaccountusers ON glaccountusers.accountcode=chartmaster.accountcode AND glaccountusers.userid='" . $_SESSION['UserID'] . "' AND glaccountusers.canview=1
GROUP BY accountgroups.groupname,
accountgroups.parentgroupname,
accountgroups.pandl,
@@ -417,8 +419,10 @@
Sum(CASE WHEN chartdetails.period='" . $_POST['ToPeriod'] . "' THEN chartdetails.actual ELSE 0 END) AS monthactual,
Sum(CASE WHEN chartdetails.period='" . $_POST['ToPeriod'] . "' THEN chartdetails.budget ELSE 0 END) AS monthbudget,
Sum(CASE WHEN chartdetails.period='" . $_POST['ToPeriod'] . "' THEN chartdetails.bfwdbudget + chartdetails.budget ELSE 0 END) AS lastprdbudgetcfwd
- FROM chartmaster INNER JOIN accountgroups ON chartmaster.group_ = accountgroups.groupname
+ FROM chartmaster
+ INNER JOIN accountgroups ON chartmaster.group_ = accountgroups.groupname
INNER JOIN chartdetails ON chartmaster.accountcode= chartdetails.accountcode
+ INNER JOIN glaccountusers ON glaccountusers.accountcode=chartmaster.accountcode AND glaccountusers.userid='" . $_SESSION['UserID'] . "' AND glaccountusers.canview=1
GROUP BY accountgroups.groupname,
accountgroups.pandl,
accountgroups.sequenceintb,
Modified: trunk/PDFChequeListing.php
===================================================================
--- trunk/PDFChequeListing.php 2015-11-09 18:25:45 UTC (rev 7384)
+++ trunk/PDFChequeListing.php 2015-11-11 08:03:20 UTC (rev 7385)
@@ -137,6 +137,7 @@
$LeftOvers = $pdf->addTextWrap($Left_Margin+65,$YPos,90,$FontSize,$myrow['ref'], 'left');
$sql = "SELECT accountname,
+ accountcode,
amount,
narrative
FROM gltrans INNER JOIN chartmaster
@@ -156,7 +157,21 @@
exit;
}
while ($GLRow=DB_fetch_array($GLTransResult)){
- $LeftOvers = $pdf->addTextWrap($Left_Margin+150,$YPos,90,$FontSize,$GLRow['accountname'], 'left');
+ // if user is allowed to see the account we show it, other wise we show "OTHERS ACCOUNTS"
+ $CheckSql = "SELECT count(*)
+ FROM glaccountusers
+ WHERE accountcode= '" . $GLRow['accountcode'] . "'
+ AND userid = '" . $_SESSION['UserID'] . "'
+ AND canview = '1'";
+ $CheckResult = DB_query($CheckSql);
+ $CheckRow = DB_fetch_row($CheckResult);
+
+ if ($CheckRow[0] > 0) {
+ $AccountName = $GLRow['accountname'];
+ }else{
+ $AccountName = _('Other GL Accounts');
+ }
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+150,$YPos,90,$FontSize,$AccountName, 'left');
$LeftOvers = $pdf->addTextWrap($Left_Margin+245,$YPos,60,$FontSize,locale_number_format($GLRow['amount'],$_SESSION['CompanyRecord']['decimalplaces']), 'right');
$LeftOvers = $pdf->addTextWrap($Left_Margin+310,$YPos,120,$FontSize,$GLRow['narrative'], 'left');
$YPos -= ($line_height);
Modified: trunk/Payments.php
===================================================================
--- trunk/Payments.php 2015-11-09 18:25:45 UTC (rev 7384)
+++ trunk/Payments.php 2015-11-11 08:03:20 UTC (rev 7385)
@@ -1013,16 +1013,18 @@
}
if (isset($_POST['GLGroup']) AND $_POST['GLGroup']!='') {
- $SQL = "SELECT accountcode,
- accountname
+ $SQL = "SELECT chartmaster.accountcode,
+ chartmaster.accountname
FROM chartmaster
- WHERE group_='".$_POST['GLGroup']."'
- ORDER BY accountcode";
+ INNER JOIN glaccountusers ON glaccountusers.accountcode=chartmaster.accountcode AND glaccountusers.userid='" . $_SESSION['UserID'] . "' AND glaccountusers.canupd=1
+ WHERE chartmaster.group_='".$_POST['GLGroup']."'
+ ORDER BY chartmaster.accountcode";
} else {
- $SQL = "SELECT accountcode,
- accountname
+ $SQL = "SELECT chartmaster.accountcode,
+ chartmaster.accountname
FROM chartmaster
- ORDER BY accountcode";
+ INNER JOIN glaccountusers ON glaccountusers.accountcode=chartmaster.accountcode AND glaccountusers.userid='" . $_SESSION['UserID'] . "' AND glaccountusers.canupd=1
+ ORDER BY chartmaster.accountcode";
}
Modified: trunk/SelectGLAccount.php
===================================================================
--- trunk/SelectGLAccount.php 2015-11-09 18:25:45 UTC (rev 7384)
+++ trunk/SelectGLAccount.php 2015-11-11 08:03:20 UTC (rev 7385)
@@ -22,8 +22,12 @@
chartmaster.group_,
CASE WHEN accountgroups.pandl!=0 THEN '" . _('Profit and Loss') . "' ELSE '" . _('Balance Sheet') ."' END AS pl
FROM chartmaster,
- accountgroups
- WHERE chartmaster.group_=accountgroups.groupname
+ accountgroups,
+ glaccountusers
+ WHERE glaccountusers.accountcode = chartmaster.accountcode
+ AND glaccountusers.userid='" . $_SESSION['UserID'] . "'
+ AND glaccountusers.canview=1
+ AND chartmaster.group_=accountgroups.groupname
ORDER BY chartmaster.accountcode";
}
elseif (mb_strlen($_POST['Keywords'])>0) {
@@ -37,9 +41,13 @@
THEN '" . _('Profit and Loss') . "'
ELSE '" . _('Balance Sheet') . "' END AS pl
FROM chartmaster,
- accountgroups
- WHERE chartmaster.group_ = accountgroups.groupname
- AND accountname " . LIKE . " '$SearchString'
+ accountgroups,
+ glaccountusers
+ WHERE glaccountusers.accountcode = chartmaster.accountcode
+ AND glaccountusers.userid='" . $_SESSION['UserID'] . "'
+ AND glaccountusers.canview=1
+ AND chartmaster.group_ = accountgroups.groupname
+ AND accountname " . LIKE . "'". $SearchString ."'
ORDER BY accountgroups.sequenceintb,
chartmaster.accountcode";
@@ -50,8 +58,12 @@
chartmaster.group_,
CASE WHEN accountgroups.pandl!=0 THEN '" . _('Profit and Loss') . "' ELSE '" . _('Balance Sheet') ."' END AS pl
FROM chartmaster,
- accountgroups
- WHERE chartmaster.group_=accountgroups.groupname
+ accountgroups,
+ glaccountusers
+ WHERE glaccountusers.accountcode = chartmaster.accountcode
+ AND glaccountusers.userid='" . $_SESSION['UserID'] . "'
+ AND glaccountusers.canview=1
+ AND chartmaster.group_=accountgroups.groupname
AND chartmaster.accountcode >= '" . $_POST['GLCode'] . "'
ORDER BY chartmaster.accountcode";
}
@@ -78,10 +90,11 @@
<td><input type="text" name="Keywords" size="20" maxlength="25" /></td>
<td><b>' . _('OR') . '</b></td>';
- $SQLAccountSelect="SELECT accountcode,
- accountname
+ $SQLAccountSelect="SELECT chartmaster.accountcode,
+ chartmaster.accountname
FROM chartmaster
- ORDER BY accountcode";
+ INNER JOIN glaccountusers ON glaccountusers.accountcode=chartmaster.accountcode AND glaccountusers.userid='" . $_SESSION['UserID'] . "' AND glaccountusers.canview=1
+ ORDER BY chartmaster.accountcode";
$ResultSelection=DB_query($SQLAccountSelect);
echo '<td><select name="GLCode">';
Added: trunk/UserGLAccounts.php
===================================================================
--- trunk/UserGLAccounts.php (rev 0)
+++ trunk/UserGLAccounts.php 2015-11-11 08:03:20 UTC (rev 7385)
@@ -0,0 +1,262 @@
+<?php
+/* $Id: glaccountusers.php 6806 2013-09-28 05:10:46Z daintree $*/
+
+include('includes/session.inc');
+$Title = _('User Authorised GL Accounts Maintenance');
+include('includes/header.inc');
+
+echo '<p class="page_title_text"><img src="' . $RootPath . '/css/' . $Theme . '/images/money_add.png" title="' . _('User Authorised GL Accounts') . '" alt="" />' . ' ' . $Title . '</p>';
+
+if (isset($_POST['SelectedGLAccount'])) {
+ $SelectedGLAccount = mb_strtoupper($_POST['SelectedGLAccount']);
+} elseif (isset($_GET['SelectedGLAccount'])) {
+ $SelectedGLAccount = mb_strtoupper($_GET['SelectedGLAccount']);
+} else {
+ $SelectedGLAccount = '';
+}
+
+if (isset($_POST['SelectedUser'])) {
+ $SelectedUser = mb_strtoupper($_POST['SelectedUser']);
+} elseif (isset($_GET['SelectedUser'])) {
+ $SelectedUser = mb_strtoupper($_GET['SelectedUser']);
+}
+
+if (isset($_POST['Cancel'])) {
+ unset($SelectedUser);
+ unset($SelectedGLAccount);
+}
+
+if (isset($_POST['Process'])) {
+ if ($_POST['SelectedUser'] == '') {
+ prnMsg(_('You have not selected any User'), 'error');
+ echo '<br />';
+ unset($SelectedUser);
+ unset($_POST['SelectedUser']);
+ }
+}
+
+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');
+ echo '<br />';
+ unset($SelectedUser);
+ }
+
+ 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 GL Account') . ' ' . $_POST['SelectedGLAccount'] . ' ' . _('is already authorised for this user'), '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['SelectedGLAccount']);
+ }
+ }
+} 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($SelectedUser)) {
+
+ /* 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*/
+ 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">
+ <tr>
+ <td>' . _('Select User') . ':</td>
+ <td><select name="SelectedUser">';
+
+ $Result = DB_query("SELECT userid,
+ realname
+ FROM www_users
+ ORDER BY userid");
+
+ echo '<option value="">' . _('Not Yet Selected') . '</option>';
+ while ($MyRow = DB_fetch_array($Result)) {
+ if (isset($SelectedUser) and $MyRow['userid'] == $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>';
+
+ echo '</table>'; // close main table
+ DB_free_result($Result);
+
+ 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($SelectedUser)) {
+ $SQLName = "SELECT realname
+ FROM www_users
+ WHERE userid='" . $SelectedUser . "'";
+ $Result = DB_query($SQLName);
+ $MyRow = DB_fetch_array($Result);
+ $SelectedUserName = $MyRow['realname'];
+
+ echo '<div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">' . _('Authorised GL Accounts for') . ' ' . $SelectedUserName . '</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="SelectedUser" value="' . $SelectedUser . '" />';
+
+ $SQL = "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";
+
+ $Result = DB_query($SQL);
+
+ echo '<table class="selection">';
+ echo '<tr>
+ <th colspan="6"><h3>' . _('Authorised GL Accounts for User') . ': ' . $SelectedUserName . '</h3></th>
+ </tr>';
+ echo '<tr>
+ <th>' . _('Code') . '</th>
+ <th>' . _('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;
+ } else {
+ echo '<tr class="OddTableRows">';
+ $k = 1;
+ }
+
+ if ($MyRow['canupd'] == 1) {
+ $ToggleText = '<td><a href="%s?SelectedGLAccount=%s&ToggleUpdate=0&SelectedUser=' . $SelectedUser . '" onclick="return confirm(\'' . _('Are you sure you wish to remove Update for this GL Account?') . '\');">' . _('Remove Update') . '</a></td>';
+ } else {
+ $ToggleText = '<td><a href="%s?SelectedGLAccount=%s&ToggleUpdate=1&SelectedUser=' . $SelectedUser . '" onclick="return confirm(\'' . _('Are you sure you wish to add Update for this GL Account?') . '\');">' . _('Add Update') . '</a></td>';
+ }
+
+ printf('<td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>' .
+ $ToggleText . '
+ <td><a href="%s?SelectedGLAccount=%s&delete=yes&SelectedUser=' . $SelectedUser . '" onclick="return confirm(\'' . _('Are you sure you wish to un-authorise this GL Account?') . '\');">' . _('Un-authorise') . '</a></td>
+ </tr>',
+ $MyRow['accountcode'],
+ $MyRow['accountname'],
+ $MyRow['canview'],
+ $MyRow['canupd'],
+ htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'),
+ $MyRow['accountcode'],
+ htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'),
+ $MyRow['accountcode']);
+ }
+ //END WHILE LIST LOOP
+ echo '</table>';
+
+ if (!isset($_GET['delete'])) {
+
+
+ echo '<table class="selection">'; //Main table
+
+ echo '<tr>
+ <td>' . _('Select GL Account') . ':</td>
+ <td><select name="SelectedGLAccount">';
+
+ $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 (!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>';
+
+ } //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
+}
+
+include('includes/footer.inc');
+?>
Modified: trunk/WWW_Users.php
===================================================================
--- trunk/WWW_Users.php 2015-11-09 18:25:45 UTC (rev 7384)
+++ trunk/WWW_Users.php 2015-11-11 08:03:20 UTC (rev 7385)
@@ -166,20 +166,6 @@
prnMsg( _('The selected user record has been updated'), 'success' );
} elseif ($InputError !=1) {
- $LocationSql = "INSERT INTO locationusers (loccode,
- userid,
- canview,
- canupd
- ) VALUES (
- '" . $_POST['DefaultLocation'] . "',
- '" . $_POST['UserID'] . "',
- 1,
- 1
- )";
- $ErrMsg = _('The default user locations could not be processed because');
- $DbgMsg = _('The SQL that was used to update the user locations and failed was');
- $Result = DB_query($LocationSql, $ErrMsg, $DbgMsg);
-
$sql = "INSERT INTO www_users (userid,
realname,
customerid,
@@ -219,6 +205,30 @@
'" . $_POST['PDFLanguage'] . "',
'" . $_POST['Department'] . "')";
prnMsg( _('A new user record has been inserted'), 'success' );
+
+ $LocationSql = "INSERT INTO locationusers (loccode,
+ userid,
+ canview,
+ canupd
+ ) VALUES (
+ '" . $_POST['DefaultLocation'] . "',
+ '" . $_POST['UserID'] . "',
+ 1,
+ 1
+ )";
+ $ErrMsg = _('The default user locations could not be processed because');
+ $DbgMsg = _('The SQL that was used to create the user locations and failed was');
+ $Result = DB_query($LocationSql, $ErrMsg, $DbgMsg);
+ prnMsg( _('User has been authorized to use and update only his / her default location'), 'success' );
+
+ $GLAccountsSql = "INSERT INTO glaccountusers (userid, accountcode, canview, canupd)
+ SELECT '" . $_POST['UserID'] . "', chartmaster.accountcode,1,1
+ FROM chartmaster; ";
+
+ $ErrMsg = _('The default user GL Accounts could not be processed because');
+ $DbgMsg = _('The SQL that was used to create the user GL Accounts and failed was');
+ $Result = DB_query($GLAccountsSql, $ErrMsg, $DbgMsg);
+ prnMsg( _('User has been authorized to use and update all GL accounts'), 'success' );
}
if ($InputError!=1){
Modified: trunk/includes/MainMenuLinksArray.php
===================================================================
--- trunk/includes/MainMenuLinksArray.php 2015-11-09 18:25:45 UTC (rev 7384)
+++ trunk/includes/MainMenuLinksArray.php 2015-11-11 08:03:20 UTC (rev 7385)
@@ -1,617 +1,621 @@
-<?php
-
-/* $Id: MainMenuLinksArray.php 6190 2013-08-12 02:12:02Z rchacon $*/
-
-/* webERP menus with Captions and URLs. */
-
-$ModuleLink = array('orders', 'AR', 'PO', 'AP', 'stock', 'manuf', 'GL', 'FA', 'PC', 'system', 'Utilities');
-$ReportList = array('orders'=>'ord',
- 'AR'=>'ar',
- 'PO'=>'prch',
- 'AP'=>'ap',
- 'stock'=>'inv',
- 'manuf'=>'man',
- 'GL'=>'gl',
- 'FA'=>'fa',
- 'PC'=>'pc',
- 'system'=>'sys',
- 'Utilities'=>'utils'
- );
-
-/*The headings showing on the tabs accross the main index used also in WWW_Users for defining what should be visible to the user */
-$ModuleList = array(_('Sales'),
- _('Receivables'),
- _('Purchases'),
- _('Payables'),
- _('Inventory'),
- _('Manufacturing'),
- _('General Ledger'),
- _('Asset Manager'),
- _('Petty Cash'),
- _('Setup'),
- _('Utilities'));
-
-$MenuItems['orders']['Transactions']['Caption'] = array(_('New Sales Order or Quotation'),
- _('Enter Counter Sales'),
- _('Enter Counter Returns'),
- _('Print Picking Lists'),
- _('Outstanding Sales Orders/Quotations'),
- _('Special Order'),
- _('Recurring Order Template'),
- _('Process Recurring Orders'));
-
-$MenuItems['orders']['Transactions']['URL'] = array('/SelectOrderItems.php?NewOrder=Yes',
- '/CounterSales.php',
- '/CounterReturns.php',
- '/PDFPickingList.php',
- '/SelectSalesOrder.php',
- '/SpecialOrder.php',
- '/SelectRecurringSalesOrder.php',
- '/RecurringSalesOrdersProcess.php');
-
-$MenuItems['orders']['Reports']['Caption'] = array( _('Sales Order Inquiry'),
- _('Print Price Lists'),
- _('Order Status Report'),
- _('Orders Invoiced Reports'),
- _('Daily Sales Inquiry'),
- _('Sales By Sales Type Inquiry'),
- _('Sales By Category Inquiry'),
- _('Sales By Category By Item Inquiry'),
- _('Sales Analysis Reports'),
- _('Sales Graphs'),
- _('Top Sellers Inquiry'),
- _('Order Delivery Differences Report'),
- _('Delivery In Full On Time (DIFOT) Report'),
- _('Sales Order Detail Or Summary Inquiries'),
- _('Top Sales Items Inquiry'),
- _('Top Customers Inquiry'),
- _('Worst Sales Items Report'),
- _('Sales With Low Gross Profit Report'),
- _('Sell Through Support Claims Report'));
-
-$MenuItems['orders']['Reports']['URL'] = array( '/SelectCompletedOrder.php',
- '/PDFPriceList.php',
- '/PDFOrderStatus.php',
- '/PDFOrdersInvoiced.php',
- '/DailySalesInquiry.php',
- '/SalesByTypePeriodInquiry.php',
- '/SalesCategoryPeriodInquiry.php',
- '/StockCategorySalesInquiry.php',
- '/SalesAnalRepts.php',
- '/SalesGraph.php',
- '/SalesTopItemsInquiry.php',
- '/PDFDeliveryDifferences.php',
- '/PDFDIFOT.php',
- '/SalesInquiry.php',
- '/TopItems.php',
- '/SalesTopCustomersInquiry.php',
- '/NoSalesItems.php',
- '/PDFLowGP.php',
- '/PDFSellThroughSupportClaim.php');
-
-$MenuItems['orders']['Maintenance']['Caption'] = array( _('Create Contract'),
- _('Select Contract'),
- _('Sell Through Support Deals'));
-
-$MenuItems['orders']['Maintenance']['URL'] = array( '/Contracts.php',
- '/SelectContract.php',
- '/SellThroughSupport.php');
-
-$MenuItems['AR']['Transactions']['Caption'] = array(_('Select Order to Invoice'),
- _('Create A Credit Note'),
- _('Enter Receipts'),
- _('Allocate Receipts or Credit Notes'));
-$MenuItems['AR']['Transactions']['URL'] = array('/SelectSalesOrder.php',
- '/SelectCreditItems.php?NewCredit=Yes',
- '/CustomerReceipt.php?NewReceipt=Yes&Type=Customer',
- '/CustomerAllocations.php');
-
-$MenuItems['AR']['Reports']['Caption'] = array( _('Where Allocated Inquiry'),
- _('Print Invoices or Credit Notes'),
- _('Print Statements'),
- _('Aged Customer Balances/Overdues Report'),
- _('Re-Print A Deposit Listing'),
- _('Debtor Balances At A Prior Month End'),
- _('Customer Listing By Area/Salesperson'),
- _('List Daily Transactions'),
- _('Customer Transaction Inquiries'),
- _('Customer Activity and Balances'));
-
-if ($_SESSION['InvoicePortraitFormat']==0){
- $PrintInvoicesOrCreditNotesScript = '/PrintCustTrans.php';
-} else {
- $PrintInvoicesOrCreditNotesScript = '/PrintCustTransPortrait.php';
-}
-
-$MenuItems['AR']['Reports']['URL'] = array( '/CustWhereAlloc.php',
- $PrintInvoicesOrCreditNotesScript,
- '/PrintCustStatements.php',
- '/AgedDebtors.php',
- '/PDFBankingSummary.php',
- '/DebtorsAtPeriodEnd.php',
- '/PDFCustomerList.php',
- '/PDFCustTransListing.php',
- '/CustomerTransInquiry.php',
- '/CustomerBalancesMovement.php' );
-
-$MenuItems['AR']['Maintenance']['Caption'] = array( _('Add Customer'),
- _('Select Customer'));
-$MenuItems['AR']['Maintenance']['URL'] = array( '/Customers.php',
- '/SelectCustomer.php');
-
-$MenuItems['AP']['Transactions']['Caption'] = array(_('Select Supplier'),
- _('Supplier Allocations'));
-$MenuItems['AP']['Transactions']['URL'] = array('/SelectSupplier.php',
- '/SupplierAllocations.php');
-
-$MenuItems['AP']['Reports']['Caption'] = array( _('Aged Supplier Report'),
- _('Payment Run Report'),
- _('Remittance Advices'),
- _('Outstanding GRNs Report'),
- _('Supplier Balances At A Prior Month End'),
- _('List Daily Transactions'),
- _('Supplier Transaction Inquiries'));
-
-$MenuItems['AP']['Reports']['URL'] = array( '/AgedSuppliers.php',
- '/SuppPaymentRun.php',
- '/PDFRemittanceAdvice.php',
- '/OutstandingGRNs.php',
- '/SupplierBalsAtPeriodEnd.php',
- '/PDFSuppTransListing.php',
- '/SupplierTransInquiry.php');
-
-$MenuItems['AP']['Maintenance']['Caption'] = array( _('Add Supplier'),
- _('Select Supplier'),
- _('Maintain Factor Companies'));
-$MenuItems['AP']['Maintenance']['URL'] = array( '/Suppliers.php',
- '/SelectSupplier.php',
- '/Factors.php');
-
-$MenuItems['PO']['Transactions']['Caption'] = array(_('New Purchase Order'),
- _('Purchase Orders'),
- _('Purchase Order Grid Entry'),
- _('Create a New Tender'),
- _('Edit Existing Tenders'),
- _('Process Tenders and Offers'),
- _('Orders to Authorise'),
- _('Shipment Entry'),
- _('Select A Shipment'));
-$MenuItems['PO']['Transactions']['URL'] = array( '/PO_Header.php?NewOrder=Yes',
- '/PO_SelectOSPurchOrder.php',
- '/PurchaseByPrefSupplier.php',
- '/SupplierTenderCreate.php?New=Yes',
- '/SupplierTenderCreate.php?Edit=Yes',
- '/OffersReceived.php',
- '/PO_AuthoriseMyOrders.php',
- '/SelectSupplier.php',
- '/Shipt_Select.php');
-
-$MenuItems['PO']['Reports']['Caption'] = array( _('Purchase Order Inquiry'),
- _('Purchase Order Detail Or Summary Inquiries'),
- _('Supplier Price List'));
-
-$MenuItems['PO']['Reports']['URL'] = array( '/PO_SelectPurchOrder.php',
- '/POReport.php',
- '/SuppPriceList.php');
-
-$MenuItems['PO']['Maintenance']['Caption'] = array(_('Maintain Supplier Price Lists'));
-
-$MenuItems['PO']['Maintenance']['URL'] = array('/SupplierPriceList.php');
-
-$MenuItems['stock']['Transactions']['Caption'] = array( _('Receive Purchase Orders'),
- _('Inventory Location Transfers'), //"Inventory Transfer - Item Dispatch"
- _('Bulk Inventory Transfer') . ' - ' . _('Dispatch'), //"Inventory Transfer - Bulk Dispatch"
- _('Bulk Inventory Transfer') . ' - ' . _('Receive'), //"Inventory Transfer - Receive"
- _('Inventory Adjustments'),
- _('Reverse Goods Received'),
- _('Enter Stock Counts'),
- _('Create a New Internal Stock Request'),
- _('Authorise Internal Stock Requests'),
- _('Fulfill Internal Stock Requests'));
-
-$MenuItems['stock']['Transactions']['URL'] = array( '/PO_SelectOSPurchOrder.php',
- '/StockTransfers.php?New=Yes',
- '/StockLocTransfer.php',
- '/StockLocTransferReceive.php',
- '/StockAdjustments.php?NewAdjustment=Yes',
- '/ReverseGRN.php',
- '/StockCounts.php',
- '/InternalStockRequest.php?New=Yes',
- '/InternalStockRequestAuthorisation.php',
- '/InternalStockRequestFulfill.php');
-
-$MenuItems['stock']['Reports']['Caption'] = array( _('Serial Item Research Tool'),
- _('Print Price Labels'),
- _('Reprint GRN'),
- _('Inventory Item Movements'),
- _('Inventory Item Status'),
- _('Inventory Item Usage'),
- _('Inventory Quantities'),
- _('Reorder Level'),
- _('Stock Dispatch'),
- _('Inventory Valuation Report'),
- _('Mail Inventory Valuation Report'),
- _('Inventory Planning Report'),
- _('Inventory Planning Based On Preferred Supplier Data'),
- _('Inventory Stock Check Sheets'),
- _('Make Inventory Quantities CSV'),
- _('Compare Counts Vs Stock Check Data'),
- _('All Inventory Movements By Location/Date'),
- _('List Inventory Status By Location/Category'),
- _('Historical Stock Quantity By Location/Category'),
- _('List Negative Stocks'),
- _('Period Stock Transaction Listing'),
- _('Stock Transfer Note'),
- _('Aged Controlled Stock Report'));
-
-$MenuItems['stock']['Reports']['URL'] = array( '/StockSerialItemResearch.php',
- '/PDFPrintLabel.php',
- '/ReprintGRN.php',
- '/StockMovements.php',
- '/StockStatus.php',
- '/StockUsage.php',
- '/InventoryQuantities.php',
- '/ReorderLevel.php',
- '/StockDispatch.php',
- '/InventoryValuation.php',
- '/MailInventoryValuation.php',
- '/InventoryPlanning.php',
- '/InventoryPlanningPrefSupplier.php',
- '/StockCheck.php',
- '/StockQties_csv.php',
- '/PDFStockCheckComparison.php',
- '/StockLocMovements.php',
- '/StockLocStatus.php',
- '/StockQuantityByDate.php',
- '/PDFStockNegatives.php',
- '/PDFPeriodStockTransListing.php',
- '/PDFStockTransfer.php',
- '/AgedControlledInventory.php');
-
-$MenuItems['stock']['Maintenance']['Caption'] = array( _('Add A New Item'),
- _('Select An Item'),
- _('Review Translated Descriptions'),
- _('Sales Category Maintenance'),
- _('Brands Maintenance'),
- _('Add or Update Prices Based On Costs'),
- _('View or Update Prices Based On Costs'),
- _('Reorder Level By Category/Location'));
-
-$MenuItems['stock']['Maintenance']['URL'] = array( '/Stocks.php',
- '/SelectProduct.php',
- '/RevisionTranslations.php',
- '/SalesCategories.php',
- '/Manufacturers.php',
- '/PricesBasedOnMarkUp.php',
- '/PricesByCost.php',
- '/ReorderLevelLocation.php');
-
-$MenuItems['manuf']['Transactions']['Caption'] = array( _('Work Order Entry'),
- _('Select A Work Order'),
- _('QA Samples and Test Results'));
-
-$MenuItems['manuf']['Transactions']['URL'] = array( '/WorkOrderEntry.php',
- '/SelectWorkOrder.php',
- '/SelectQASamples.php');
-$MenuItems['manuf']['Reports']['Caption'] = array( _('Select A Work Order'),
- _('Costed Bill Of Material Inquiry'),
- _('Where Used Inquiry'),
- _('Bill Of Material Listing'),
- _('Indented Bill Of Material Listing'),
- _('List Components Required'),
- _('List Materials Not Used Anywhere'),
- _('Indented Where Used Listing'),
- _('WO Items ready to produce'),
- _('MRP'),
- _('MRP Shortages'),
- _('MRP Suggested Purchase Orders'),
- _('MRP Suggested Work Orders'),
- _('MRP Reschedules Required'),
- _('Print Product Specification'),
- _('Print Certificate of Analysis'),
- _('Historical QA Test Results'));
-
-$MenuItems['manuf']['Reports']['URL'] = array( '/SelectWorkOrder.php',
- '/BOMInquiry.php',
- '/WhereUsedInquiry.php',
- '/BOMListing.php',
- '/BOMIndented.php',
- '/BOMExtendedQty.php',
- '/MaterialsNotUsed.php',
- '/BOMIndentedReverse.php',
- '/WOCanBeProducedNow.php',
- '/MRPReport.php',
- '/MRPShortages.php',
- '/MRPPlannedPurchaseOrders.php',
- '/MRPPlannedWorkOrders.php',
- '/MRPReschedules.php',
- '/PDFProdSpec.php',
- '/PDFCOA.php',
- '/HistoricalTestResults.php');
-
-$MenuItems['manuf']['Maintenance']['Caption'] = array( _('Work Centre'),
- _('Bills Of Material'),
- _('Copy a Bill Of Materials Between Items'),
- _('Master Schedule'),
- _('Auto Create Master Schedule')...
[truncated message content] |
|
From: <rc...@us...> - 2015-11-09 18:25:47
|
Revision: 7384
http://sourceforge.net/p/web-erp/reponame/7384
Author: rchacon
Date: 2015-11-09 18:25:45 +0000 (Mon, 09 Nov 2015)
Log Message:
-----------
In CustomerReceipt.php, minor changes (completes table columns, adds classes, etc.).
Modified Paths:
--------------
trunk/CustomerReceipt.php
trunk/doc/Change.log
Modified: trunk/CustomerReceipt.php
===================================================================
--- trunk/CustomerReceipt.php 2015-11-09 07:02:05 UTC (rev 7383)
+++ trunk/CustomerReceipt.php 2015-11-09 18:25:45 UTC (rev 7384)
@@ -264,18 +264,24 @@
$CustomerReceiptCounter=1; //Count lines of customer receipts in this batch
echo '<br />
- <p class="page_title_text">
- <img src="'.$RootPath.'/css/'.$Theme.'/images/money_add.png" title="' . _('Allocate') . '" alt="" />' . ' ' . _('Summary of Receipt Batch').'
- </p>
- <br />
+ <p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/money_add.png" title="',// Icon image.
+ _('Summary of Receipt Batch'), '" /> ',// Icon title.
+ _('Summary of Receipt Batch'), '</p>',// Page title.
+ '<br />
<table class="selection">
+ <thead>
<tr>
- <th>' . _('Batch Number') . '</th>
- <th>' . _('Date Banked') . '</th>
- <th>' . _('Customer Name') . '</th>
- <th>' . _('GL Code') . '</th>
- <th>' . _('Amount of Receipt') . '</th>
- </tr>';
+ <th>', _('Batch Number'), '</th>
+ <th>', _('Date Banked'), '</th>
+ <th>', _('Customer Name'), '</th>
+ <th class="text">', _('GL Code'), '</th>
+ <th class="number">', _('Amount of Receipt'), '</th>';
+ if($ReceiptItem->GLCode =='') {
+ echo '<th class="noprint"> </th>';
+ }
+ echo '</tr>
+ </thead><tbody>';
foreach ($_SESSION['ReceiptBatch']->Items as $ReceiptItem) {
@@ -291,14 +297,14 @@
$Result=DB_query($SQL);
$myrow=DB_fetch_array($Result);
- echo '<td>' . $_SESSION['ReceiptBatch']->BatchNo . '</td>
- <td>' . $_SESSION['ReceiptBatch']->DateBanked . '</td>
- <td>' . $ReceiptItem->CustomerName . '</td>
- <td>' . $ReceiptItem->GLCode.' - '.$myrow['accountname'] . '</td>
- <td class="number">' . locale_number_format($ReceiptItem->Amount/$_SESSION['ReceiptBatch']->ExRate/$_SESSION['ReceiptBatch']->FunctionalExRate,$_SESSION['ReceiptBatch']->CurrDecimalPlaces) . '</td>';
+ echo '<td>', $_SESSION['ReceiptBatch']->BatchNo, '</td>
+ <td>', $_SESSION['ReceiptBatch']->DateBanked, '</td>
+ <td>', $ReceiptItem->CustomerName, '</td>
+ <td class="text">', $ReceiptItem->GLCode, ' - ', $myrow['accountname'], '</td>
+ <td class="number">', locale_number_format($ReceiptItem->Amount/$_SESSION['ReceiptBatch']->ExRate/$_SESSION['ReceiptBatch']->FunctionalExRate,$_SESSION['ReceiptBatch']->CurrDecimalPlaces), '</td>';
if ($ReceiptItem->GLCode ==''){
- echo '<td><a target="_blank" href="' . $RootPath . '/PDFReceipt.php?BatchNumber=' . $_SESSION['ReceiptBatch']->BatchNo. '&ReceiptNumber='.$CustomerReceiptCounter.'">' . _('Print a Customer Receipt') . '</a></td></tr>';
+ echo '<td class="noprint"><a target="_blank" href="', $RootPath, '/PDFReceipt.php?BatchNumber=', $_SESSION['ReceiptBatch']->BatchNo, '&ReceiptNumber=', $CustomerReceiptCounter, '">', _('Print a Customer Receipt'), '</a></td></tr>';
$CustomerReceiptCounter += 1;
}
@@ -463,7 +469,7 @@
$BatchReceiptsTotal += ($ReceiptItem->Amount/$_SESSION['ReceiptBatch']->ExRate/$_SESSION['ReceiptBatch']->FunctionalExRate);
} /*end foreach $ReceiptItem */
- echo '</table>';
+ echo '</tbody></table>';
/*now enter the BankTrans entry */
@@ -576,10 +582,11 @@
echo '<br />';
prnMsg( _('Receipt batch') . ' ' . $_SESSION['ReceiptBatch']->BatchNo . ' ' . _('has been successfully entered into the database'),'success');
- echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/printer.png" title="' . _('Print') . '" alt="" />' . ' ' . '<a href="' . $RootPath . '/PDFBankingSummary.php?BatchNo=' . $_SESSION['ReceiptBatch']->BatchNo . '">' . _('Print PDF Batch Summary') . '</a></p>';
+ echo '<div class="centre noprint">',
+ '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/printer.png" title="' . _('Print') . '" alt="" />' . ' ' . '<a href="' . $RootPath . '/PDFBankingSummary.php?BatchNo=' . $_SESSION['ReceiptBatch']->BatchNo . '">' . _('Print PDF Batch Summary') . '</a></p>';
echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/allocation.png" title="' . _('Allocate') . '" alt="" />' . ' ' . '<a href="' . $RootPath . '/CustomerAllocations.php">' . _('Allocate Receipts') . '</a></p>';
- echo '<p class="page_title_text"><a href="' . $RootPath . '/CustomerReceipt.php?NewReceipt=Yes&Type=Customer">' . _('Enter Receipts') . '</a>
- </p>';
+ echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme, '/images/transactions.png" title="', _('Enter Receipts'), '" /> ', '<a href="', $RootPath, '/CustomerReceipt.php?NewReceipt=Yes&Type=Customer">', _('Enter Receipts'), '</a></p>',
+ '</div>';
unset($_SESSION['ReceiptBatch']);
include('includes/footer.inc');
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-11-09 07:02:05 UTC (rev 7383)
+++ trunk/doc/Change.log 2015-11-09 18:25:45 UTC (rev 7384)
@@ -1,5 +1,6 @@
webERP Change Log
+09/11/15 RChacon: In CustomerReceipt.php, minor changes (completes table columns, adds classes, etc.).
05/11/15 Exson: Tidy code up following Tim's suggestion.
3/11/15 RChacon: In GLAccountInquiry.php, add ViewTopic and BookMark, fix some colspan, and add thead and column classes.
3/11/15 Exson: Tidy code up in StockClone.php.
|
|
From: <dai...@us...> - 2015-11-09 07:02:07
|
Revision: 7383
http://sourceforge.net/p/web-erp/reponame/7383
Author: daintree
Date: 2015-11-09 07:02:05 +0000 (Mon, 09 Nov 2015)
Log Message:
-----------
check that gettext utilties installed before attempting to run them
Modified Paths:
--------------
trunk/Z_poEditLangModule.php
Modified: trunk/Z_poEditLangModule.php
===================================================================
--- trunk/Z_poEditLangModule.php 2015-11-05 01:07:16 UTC (rev 7382)
+++ trunk/Z_poEditLangModule.php 2015-11-09 07:02:05 UTC (rev 7383)
@@ -1,20 +1,14 @@
<?php
/* $Id$ */
-/* Steve Kitchen */
-
-/* This code is really ugly ... */
-
-//$PageSecurity = 15;
-
include ('includes/session.inc');
$Title = _('Edit Module');// _('Edit a Language File Module')
$ViewTopic = "SpecialUtilities";
$BookMark = "Z_poEditLangModule";// Anchor's id in the manual's html document.
include('includes/header.inc');
-echo '<p class="page_title_text"><img alt="" src="' . $RootPath . '/css/' . $Theme .
- '/images/maintenance.png" title="' .
- _('Edit a Language File Module') . '" />' . ' ' .
+echo '<p class="page_title_text"><img alt="" src="' . $RootPath . '/css/' . $Theme .
+ '/images/maintenance.png" title="' .
+ _('Edit a Language File Module') . '" />' . ' ' .
_('Edit a Language File Module') . '</p>';
/* Your webserver user MUST have read/write access to here, otherwise you'll be wasting your time */
@@ -31,21 +25,25 @@
if (isset($_POST['ReMergePO'])){
/*update the messages.po file with any new strings */
-
+ if (!function_exists('msgmerge')) {
+ prnMsg(_('The gettext utilities must be present on your server for these language utilities to work'),'error');
+ exit;
+ } else {
/*first rebuild the en_GB default with xgettext */
- $PathToDefault = './locale/en_GB.utf8/LC_MESSAGES/messages.po';
- $FilesToInclude = '*php includes/*.php includes/*.inc';
- $xgettextCmd = 'xgettext --no-wrap -L php -o ' . $PathToDefault . ' ' . $FilesToInclude;
+ $PathToDefault = './locale/en_GB.utf8/LC_MESSAGES/messages.po';
+ $FilesToInclude = '*php includes/*.php includes/*.inc';
+ $xgettextCmd = 'xgettext --no-wrap -L php -o ' . $PathToDefault . ' ' . $FilesToInclude;
- system($xgettextCmd);
-/*now merge the translated file with the new template to get new strings*/
+ system($xgettextCmd);
+ /*now merge the translated file with the new template to get new strings*/
- $msgMergeCmd = 'msgmerge --no-wrap --update ' . $PathToLanguage . ' ' . $PathToDefault;
+ $msgMergeCmd = 'msgmerge --no-wrap --update ' . $PathToLanguage . ' ' . $PathToDefault;
- system($msgMergeCmd);
- //$Result = rename($PathToNewLanguage, $PathToLanguage);
- exit;
+ system($msgMergeCmd);
+ //$Result = rename($PathToNewLanguage, $PathToLanguage);
+ exit;
+ }
}
if (isset($_POST['module'])) {
@@ -62,7 +60,7 @@
// save the modifications
echo '<br /><table><tr><td>';
- echo '<form method="post" action=' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?' . SID . '>';
+ echo '<form method="post" action=' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
/* write the new language file */
@@ -107,7 +105,7 @@
/* now we need to parse the resulting array into something we can show the user */
$j = 1;
-
+ $AlsoIn = array();
for ($i=17; $i<=$LangFileEntries; $i++) { /* start at line 18 to skip the header */
if (mb_substr($LangFile[$i], 0, 2) == '#:') { /* it's a module reference */
$AlsoIn[$j] .= str_replace(' ','<br />', mb_substr($LangFile[$i],3)) . '<br />';
@@ -128,14 +126,21 @@
echo '<br />';
prnMsg (_('Your existing translation file (messages.po) will be saved as messages.po.old') . '<br />', 'info', _('PLEASE NOTE'));
echo '<br />';
- echo '<form method="post" action=' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?' . SID . '>';
- echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- echo '</div';
- echo '<table>';
- echo '<tr><th align="center">' . _('Language File for') . ' "' . $_POST['language'] . '"</th></tr>';
- echo '<tr><td align="center">' . _('Module') . ' "' . $_POST['module'] . '"</td></tr>';
- echo '<tr><td></td></tr>';
- echo '<tr><td>';
+ echo '<form method="post" action=' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '>
+ <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
+ </div>
+ <table>
+ <tr>
+ <th align="center">' . _('Language File for') . ' "' . $_POST['language'] . '"</th>
+ </tr>
+ <tr>
+ <th align="center">' . _('Module') . ' "' . $_POST['module'] . '"</th>
+ </tr>
+ <tr>
+ <td></td>
+ </tr>
+ <tr>
+ <td>';
echo '<table width="100%">';
echo '<tr>';
@@ -162,7 +167,7 @@
}
- echo '</table>';
+ echo '</td></table>';
echo '</td></tr>';
echo '</table>';
|
|
From: <ex...@us...> - 2015-11-05 01:07:19
|
Revision: 7382
http://sourceforge.net/p/web-erp/reponame/7382
Author: exsonqu
Date: 2015-11-05 01:07:16 +0000 (Thu, 05 Nov 2015)
Log Message:
-----------
Modified Paths:
--------------
trunk/doc/Change.log
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-11-05 01:05:32 UTC (rev 7381)
+++ trunk/doc/Change.log 2015-11-05 01:07:16 UTC (rev 7382)
@@ -1,5 +1,6 @@
webERP Change Log
+05/11/15 Exson: Tidy code up following Tim's suggestion.
3/11/15 RChacon: In GLAccountInquiry.php, add ViewTopic and BookMark, fix some colspan, and add thead and column classes.
3/11/15 Exson: Tidy code up in StockClone.php.
3/11/15 Exson: Fixed typo in PriceMatrix.php.
|
|
From: <ex...@us...> - 2015-11-05 01:05:35
|
Revision: 7381
http://sourceforge.net/p/web-erp/reponame/7381
Author: exsonqu
Date: 2015-11-05 01:05:32 +0000 (Thu, 05 Nov 2015)
Log Message:
-----------
05/11/15 Exson: Tidy code up following Tim's suggestion.
Modified Paths:
--------------
trunk/StockClone.php
Modified: trunk/StockClone.php
===================================================================
--- trunk/StockClone.php 2015-11-03 15:30:05 UTC (rev 7380)
+++ trunk/StockClone.php 2015-11-05 01:05:32 UTC (rev 7381)
@@ -510,7 +510,7 @@
prnMsg( _('New cloned Item') .' ' . '<a href="SelectProduct.php?StockID=' . $_POST['StockID'] . '">' . $_POST['StockID'] . '</a> '. _('has been added to the database') .
'<br />' . _('We also attempted to setup item purchase data and pricing.'));
- if (!empty($NoPricingData))
+ if (isset($NoPricingData))
{
prnMsg(_('There is no pricing data to clone. Use the following link to add pricing.'));
}
|
15 messages has been excluded from this view by a project administrator.
