Menu
▾
▴
web-erp-svn
|
From: <dai...@us...> - 2017-01-12 09:09:28
|
Revision: 7721
http://sourceforge.net/p/web-erp/reponame/7721
Author: daintree
Date: 2017-01-12 09:09:25 +0000 (Thu, 12 Jan 2017)
Log Message:
-----------
add discount percentage to paymentmethods table
Modified Paths:
--------------
trunk/PaymentMethods.php
trunk/doc/Change.log
trunk/sql/mysql/upgrade4.13.1-4.14.sql
Modified: trunk/PaymentMethods.php
===================================================================
--- trunk/PaymentMethods.php 2017-01-11 05:50:37 UTC (rev 7720)
+++ trunk/PaymentMethods.php 2017-01-12 09:09:25 UTC (rev 7721)
@@ -47,6 +47,22 @@
$Errors[$i] = 'MethodName';
$i++;
}
+ if (!is_numeric(filter_number_format($_POST['DiscountPercent']))) {
+ $InputError = 1;
+ prnMsg( _('The discount percentage must be a number less than 1'),'error');
+ $Errors[$i] = 'DiscountPercent';
+ $i++;
+ } else if (filter_number_format($_POST['DiscountPercent'])>1) {
+ $InputError = 1;
+ prnMsg( _('The discount percentage must be a number less than 1'),'error');
+ $Errors[$i] = 'DiscountPercent';
+ $i++;
+ } else if (filter_number_format($_POST['DiscountPercent'])<0) {
+ $InputError = 1;
+ prnMsg( _('The discount percentage must be either zero or less than 1'),'error');
+ $Errors[$i] = 'DiscountPercent';
+ $i++;
+ }
if (isset($_POST['SelectedPaymentID']) AND $InputError !=1) {
/*SelectedPaymentID could also exist if submit had not been clicked this code would not run in this case cos submit is false of course see the delete code below*/
@@ -73,7 +89,8 @@
paymenttype = '" . $_POST['ForPayment'] . "',
receipttype = '" . $_POST['ForReceipt'] . "',
usepreprintedstationery = '" . $_POST['UsePrePrintedStationery']. "',
- opencashdrawer = '" . $_POST['OpenCashDrawer'] . "'
+ opencashdrawer = '" . $_POST['OpenCashDrawer'] . "',
+ percentdiscount = '" . filter_number_format($_POST['DiscountPercent']) . "'
WHERE paymentname " . LIKE . " '".$OldName."'";
} else {
@@ -97,12 +114,14 @@
paymenttype,
receipttype,
usepreprintedstationery,
- opencashdrawer)
+ opencashdrawer,
+ percentdiscount)
VALUES ('" . $_POST['MethodName'] ."',
'" . $_POST['ForPayment'] ."',
'" . $_POST['ForReceipt'] ."',
'" . $_POST['UsePrePrintedStationery'] ."',
- '" . $_POST['OpenCashDrawer'] . "')";
+ '" . $_POST['OpenCashDrawer'] . "',
+ '" . filter_number_format($_POST['DiscountPercent']) . "')";
}
$msg = _('New payment method added');
$ErrMsg = _('Could not insert the new payment method');
@@ -174,7 +193,8 @@
paymenttype,
receipttype,
usepreprintedstationery,
- opencashdrawer
+ opencashdrawer,
+ percentdiscount
FROM paymentmethods
ORDER BY paymentid";
@@ -188,6 +208,7 @@
<th class="ascending">' . _('Use For Receipts') . '</th>
<th class="ascending">' . _('Use Pre-printed Stationery') . '</th>
<th class="ascending">' . _('Open POS Cash Drawer for Sale') . '</th>
+ <th class="ascending">' . _('Payment discount') . ' %</th>
<th colspan="2"> </th>
</tr>';
@@ -207,6 +228,7 @@
<td class="centre">' . ($myrow['receipttype'] ? _('Yes') : _('No')) . '</td>
<td class="centre">' . ($myrow['usepreprintedstationery'] ? _('Yes') : _('No')) . '</td>
<td class="centre">' . ($myrow['opencashdrawer'] ? _('Yes') : _('No')) . '</td>
+ <td class="centre">' . locale_number_format($myrow['percentdiscount']*100,2) . '</td>
<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?SelectedPaymentID=' . $myrow['paymentid'] . '">' . _('Edit') . '</a></td>
<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?SelectedPaymentID=' . $myrow['paymentid'] . '&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this payment method?') . '\');">' . _('Delete') . '</a></td>
</tr>';
@@ -235,7 +257,9 @@
paymentname,
paymenttype,
receipttype,
- usepreprintedstationery
+ usepreprintedstationery,
+ opencashdrawer,
+ percentdiscount
FROM paymentmethods
WHERE paymentid='" . $SelectedPaymentID . "'";
@@ -252,6 +276,7 @@
$_POST['ForReceipt'] = $myrow['receipttype'];
$_POST['UsePrePrintedStationery'] = $myrow['usepreprintedstationery'];
$_POST['OpenCashDrawer'] = $myrow['opencashdrawer'];
+ $_POST['DiscountPercent'] = $myrow['percentdiscount'];
echo '<input type="hidden" name="SelectedPaymentID" value="' . $_POST['MethodID'] . '" />';
echo '<table class="selection">';
@@ -263,6 +288,7 @@
$_POST['ForReceipt'] = 1; // Default is use for receipts
$_POST['UsePrePrintedStationery'] = 0; // Default is use for receipts
$_POST['OpenCashDrawer'] = 0; //Default is not to open cash drawer
+ $_POST['DiscountPercent']=0;
echo '<table class="selection">';
}
echo '<tr>
@@ -297,6 +323,10 @@
<option' . ($_POST['OpenCashDrawer'] ? '' : ' selected="selected"') .' value="0">' . _('No') . '</option>
</select></td>
</tr>';
+ echo '<tr>
+ <td>' . _('Payment Discount Percent on Receipts') . ':' . '</td>
+ <td><input type="text" class="number" min="0" max="1" name="DiscountPercent" value="' . locale_number_format($_POST['DiscountPercent'],2) . '" /></td>
+ </tr>';
echo '</table>';
echo '<br /><div class="centre"><input type="submit" name="submit" value="' . _('Enter Information') . '" /></div>';
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2017-01-11 05:50:37 UTC (rev 7720)
+++ trunk/doc/Change.log 2017-01-12 09:09:25 UTC (rev 7721)
@@ -1,5 +1,6 @@
webERP Change Log
+12/1/17 Phil: Added a discount percentage field to the payment methods - to allow calculation of discount when receipts entered... still yet to code this bit
06/01/17 RChacon: Add Turn off/on the page help and the field help.
05/01/17 RChacon: In GLCashFlowsIndirect.php, fix named key in Associative array with config value. Thanks Tim.
05/01/17 RChacon: For strict Standards, removes the "&" before the variable in DB_fetch_row() and in DB_fetch_array() in ConnectDB_XXX.inc. Thanks Tim.
@@ -13,7 +14,7 @@
02/12/16 PaulT: WriteReport.inc: Fix condition needed to support PHP7, reported by Tim.
02/12/16 RChacon: fix and improve code for existent parameters in GLCashFlowsSetup.php.
02/12/16 Exson: Add location code and reference to Work Orders search result in SelectWorkOrder.php.
-02/12/16 Exson: Fixed the no users data displayed bug and copy BOM fields error bug in WWW_Users.php and CopyBOM.php. Thanks for shane's report.
+02/12/16 Exson: Fixed the no users data displayed bug and copy BOM fields error bug in WWW_Users.php and CopyBOM.php. Thanks for shane's report.
30/11/16 Exson: Fixed the bug that write off option not work without freight cost input in Credit_Invoice.php.
27/11/16 4.13.1 release
Modified: trunk/sql/mysql/upgrade4.13.1-4.14.sql
===================================================================
--- trunk/sql/mysql/upgrade4.13.1-4.14.sql 2017-01-11 05:50:37 UTC (rev 7720)
+++ trunk/sql/mysql/upgrade4.13.1-4.14.sql 2017-01-12 09:09:25 UTC (rev 7721)
@@ -4,5 +4,7 @@
-- Add new user's options:
ALTER TABLE `www_users` ADD `showpagehelp` TINYINT(1) NOT NULL DEFAULT '1' COMMENT 'Turn off/on page help' AFTER `showdashboard`, ADD `showfieldhelp` TINYINT(1) NOT NULL DEFAULT '1' COMMENT 'Turn off/on field help' AFTER `showpagehelp`;
+ALTER TABLE `paymentmethods` ADD COLUMN `percentdiscount` DOUBLE NOT NULL DEFAULT 0;
+
-- Update version number:
UPDATE config SET confvalue='4.14' WHERE confname='VersionNumber';
|
|
From: <rc...@us...> - 2017-01-12 16:41:40
|
Revision: 7724
http://sourceforge.net/p/web-erp/reponame/7724
Author: rchacon
Date: 2017-01-12 16:41:38 +0000 (Thu, 12 Jan 2017)
Log Message:
-----------
Removes the "&" before the variable $ResultIndex in ConnectDB_XXX.inc.
Modified Paths:
--------------
trunk/doc/Change.log
trunk/includes/ConnectDB_mysql.inc
trunk/includes/ConnectDB_mysqli.inc
trunk/includes/ConnectDB_postgres.inc
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2017-01-12 13:54:26 UTC (rev 7723)
+++ trunk/doc/Change.log 2017-01-12 16:41:38 UTC (rev 7724)
@@ -1,7 +1,7 @@
webERP Change Log
+12/01/17 RChacon: Removes the "&" before the variable $ResultIndex in ConnectDB_XXX.inc.
12/1/17 Phil: Added a discount percentage field to the payment methods - to allow calculation of discount when receipts entered... still yet to code this bit
-06/01/17 RChacon: Add Turn off/on the page help and the field help.
05/01/17 RChacon: In GLCashFlowsIndirect.php, fix named key in Associative array with config value. Thanks Tim.
05/01/17 RChacon: For strict Standards, removes the "&" before the variable in DB_fetch_row() and in DB_fetch_array() in ConnectDB_XXX.inc. Thanks Tim.
21/12/16 RChacon: In PurchasesReport.php, fix date comparison and title. Thanks Tim.
Modified: trunk/includes/ConnectDB_mysql.inc
===================================================================
--- trunk/includes/ConnectDB_mysql.inc 2017-01-12 13:54:26 UTC (rev 7723)
+++ trunk/includes/ConnectDB_mysql.inc 2017-01-12 16:41:38 UTC (rev 7724)
@@ -49,17 +49,13 @@
//DB wrapper functions to change only once for whole application
-function DB_query($SQL,
- $ErrorMessage='',
- $DebugMessage= '',
- $Transaction=false,
- $TrapErrors=true) {
+function DB_query($SQL, $ErrorMessage='', $DebugMessage= '', $Transaction=false, $TrapErrors=true) {
global $debug;
global $PathPrefix;
global $db;
- $result=mysql_query($SQL,$db);
+ $result = mysql_query($SQL, $db);
$_SESSION['LastInsertId'] = mysql_insert_id($db);
if($DebugMessage == '') {
@@ -112,32 +108,32 @@
function DB_fetch_row($ResultIndex) {
$RowPointer = mysql_fetch_row($ResultIndex);
- Return $RowPointer;
+ return $RowPointer;
}
-function DB_fetch_assoc(&$ResultIndex) {
+function DB_fetch_assoc($ResultIndex) {
$RowPointer = mysql_fetch_assoc($ResultIndex);
- Return $RowPointer;
+ return $RowPointer;
}
function DB_fetch_array($ResultIndex) {
$RowPointer = mysql_fetch_array($ResultIndex);
- Return $RowPointer;
+ return $RowPointer;
}
function DB_data_seek(&$ResultIndex,$Record) {
mysql_data_seek($ResultIndex,$Record);
}
-function DB_free_result(&$ResultIndex) {
+function DB_free_result($ResultIndex) {
mysql_free_result($ResultIndex);
}
-function DB_num_rows(&$ResultIndex) {
+function DB_num_rows($ResultIndex) {
return mysql_num_rows($ResultIndex);
}
-function DB_affected_rows(&$ResultIndex) {
+function DB_affected_rows($ResultIndex) {
return mysql_affected_rows($ResultIndex);
}
@@ -168,17 +164,17 @@
function DB_show_tables(&$Conn='') {
$Result = DB_query('SHOW TABLES');
- Return $Result;
+ return $Result;
}
function DB_show_fields($TableName, &$Conn='') {
$Result = DB_query("DESCRIBE $TableName");
- Return $Result;
+ return $Result;
}
function interval( $val, $Inter ) {
- global $DBType;
- return "\n".'interval ' . $val . ' '. $Inter."\n";
+ global $DBType;
+ return "\n".'interval ' . $val . ' '. $Inter."\n";
}
function DB_Maintenance() {
Modified: trunk/includes/ConnectDB_mysqli.inc
===================================================================
--- trunk/includes/ConnectDB_mysqli.inc 2017-01-12 13:54:26 UTC (rev 7723)
+++ trunk/includes/ConnectDB_mysqli.inc 2017-01-12 16:41:38 UTC (rev 7724)
@@ -27,7 +27,7 @@
printf("Connect failed: %s\n", mysqli_connect_error());
session_unset();
session_destroy();
- echo '<p>' . _('Click') . ' ' . '<a href="index.php">' . _('here') . '</a>' . ' ' ._('to try logging in again') . '</p>';
+ echo '<p>' . _('Click') . ' ' . '<a href="index.php">' . _('here') . '</a>' . ' ' ._('to try logging in again') . '</p>';
exit();
}
@@ -51,22 +51,18 @@
unset ($_SESSION['DatabaseName']);
exit;
- }
+ }
}
//DB wrapper functions to change only once for whole application
-function DB_query($SQL,
- $ErrorMessage='',
- $DebugMessage= '',
- $Transaction=false,
- $TrapErrors=true) {
+function DB_query($SQL, $ErrorMessage='', $DebugMessage= '', $Transaction=false, $TrapErrors=true) {
global $debug;
global $PathPrefix;
global $db;
- $result=mysqli_query($db, $SQL);
+ $result = mysqli_query($db, $SQL);
$_SESSION['LastInsertId'] = mysqli_insert_id($db);
@@ -120,34 +116,34 @@
function DB_fetch_row($ResultIndex) {
$RowPointer=mysqli_fetch_row($ResultIndex);
- Return $RowPointer;
+ return $RowPointer;
}
-function DB_fetch_assoc(&$ResultIndex) {
+function DB_fetch_assoc($ResultIndex) {
$RowPointer=mysqli_fetch_assoc($ResultIndex);
- Return $RowPointer;
+ return $RowPointer;
}
function DB_fetch_array($ResultIndex) {
$RowPointer = mysqli_fetch_array($ResultIndex);
- Return $RowPointer;
+ return $RowPointer;
}
function DB_data_seek(&$ResultIndex,$Record) {
mysqli_data_seek($ResultIndex,$Record);
}
-function DB_free_result(&$ResultIndex) {
- if(is_resource($ResultIndex)) {
- mysqli_free_result($ResultIndex);
- }
+function DB_free_result($ResultIndex) {
+ if(is_resource($ResultIndex)) {
+ mysqli_free_result($ResultIndex);
+ }
}
-function DB_num_rows(&$ResultIndex) {
+function DB_num_rows($ResultIndex) {
return mysqli_num_rows($ResultIndex);
}
-function DB_affected_rows(&$ResultIndex) {
+function DB_affected_rows($ResultIndex) {
global $db;
return mysqli_affected_rows($db);
@@ -182,12 +178,12 @@
function DB_show_tables($Conn='') {
global $db;
$Result = DB_query('SHOW TABLES');
- Return $Result;
+ return $Result;
}
function DB_show_fields($TableName, $Conn='') {
$Result = DB_query("DESCRIBE $TableName");
- Return $Result;
+ return $Result;
}
function interval($val, $Inter) {
Modified: trunk/includes/ConnectDB_postgres.inc
===================================================================
--- trunk/includes/ConnectDB_postgres.inc 2017-01-12 13:54:26 UTC (rev 7723)
+++ trunk/includes/ConnectDB_postgres.inc 2017-01-12 16:41:38 UTC (rev 7724)
@@ -11,14 +11,14 @@
}
if( isset( $DBUser ) && ($DBUser != "") ) {
- // if we have a user we need to use password if supplied
- $PgConnStr .= " user=".$DBUser;
- if( isset( $DBPassword ) && ($DBPassword != "") ) {
- $PgConnStr .= " password=".$DBPassword;
- }
+ // if we have a user we need to use password if supplied
+ $PgConnStr .= " user=".$DBUser;
+ if( isset( $DBPassword ) && ($DBPassword != "") ) {
+ $PgConnStr .= " password=".$DBPassword;
+ }
}
-global $db; // Make sure it IS global, regardless of our context
+global $db; // Make sure it IS global, regardless of our context
$db = pg_connect( $PgConnStr );
if( !$db ) {
@@ -61,7 +61,7 @@
$SQL = 'rollback';
$Result = DB_query($SQL);
if(DB_error_no($Conn) !=0) {
- prnMsg('<br />' . _('Error Rolling Back Transaction!!'), '', _('DB DEBUG:') );
+ prnMsg('<br />' . _('Error Rolling Back Transaction!!'), '', _('DB DEBUG:') );
}
}
if($TrapErrors) {
@@ -75,32 +75,32 @@
function DB_fetch_row($ResultIndex) {
$RowPointer=pg_fetch_row($ResultIndex);
- Return $RowPointer;
+ return $RowPointer;
}
-function DB_fetch_assoc(&$ResultIndex) {
+function DB_fetch_assoc($ResultIndex) {
$RowPointer=pg_fetch_assoc($ResultIndex);
- Return $RowPointer;
+ return $RowPointer;
}
function DB_fetch_array($ResultIndex) {
$RowPointer = pg_fetch_array($ResultIndex);
- Return $RowPointer;
+ return $RowPointer;
}
function DB_data_seek(&$ResultIndex,$Record) {
pg_result_seek($ResultIndex,$Record);
}
-function DB_free_result(&$ResultIndex) {
+function DB_free_result($ResultIndex) {
pg_free_result($ResultIndex);
}
-function DB_num_rows(&$ResultIndex) {
+function DB_num_rows($ResultIndex) {
return pg_num_rows($ResultIndex);
}
// Added by MGT
-function DB_affected_rows(&$ResultIndex) {
+function DB_affected_rows($ResultIndex) {
return pg_affected_rows($ResultIndex);
}
@@ -120,7 +120,7 @@
}
function DB_escape_string($String) {
- Return pg_escape_string(htmlspecialchars($String, ENT_COMPAT, 'ISO-8859-1'));
+ return pg_escape_string(htmlspecialchars($String, ENT_COMPAT, 'ISO-8859-1'));
}
function INTERVAL( $val, $Inter ) {
@@ -129,13 +129,13 @@
}
function DB_show_tables(&$Conn) {
$Result =DB_query("SELECT table_name FROM information_schema.tables WHERE table_schema = 'public'");
- Return $Result;
+ return $Result;
}
function DB_show_fields($TableName,&$Conn) {
$Result = DB_query("SELECT table_name FROM information_schema.tables WHERE table_schema='public' AND table_name='" . $TableName . "'");
if(DB_num_rows($Result)==1) {
$Result = DB_query("SELECT column_name FROM information_schema.columns WHERE table_name ='$TableName'");
- Return $Result;
+ return $Result;
}
}
function DB_Maintenance() {
|
|
From: <dai...@us...> - 2017-01-13 23:02:12
|
Revision: 7726
http://sourceforge.net/p/web-erp/reponame/7726
Author: daintree
Date: 2017-01-13 23:02:10 +0000 (Fri, 13 Jan 2017)
Log Message:
-----------
customer receipt can now take payment discount based on discount percentages entered against the payment methods
Modified Paths:
--------------
trunk/CustomerReceipt.php
trunk/PDFChequeListing.php
trunk/css/wood/bullet.gif
trunk/css/wood/images/ar.png
trunk/css/wood/images/company.png
trunk/css/wood/images/contract.png
trunk/css/wood/images/customer.png
trunk/css/wood/images/desk.jpg
trunk/css/wood/images/error.png
trunk/css/wood/images/folder_add.png
trunk/css/wood/images/folders.gif
trunk/css/wood/images/group_add.png
trunk/css/wood/images/help.png
trunk/css/wood/images/inquiries.png
trunk/css/wood/images/inventory.png
trunk/css/wood/images/magnifier.png
trunk/css/wood/images/maintenance.png
trunk/css/wood/images/money_add.png
trunk/css/wood/images/note_add.png
trunk/css/wood/images/pdf.png
trunk/css/wood/images/reports.gif
trunk/css/wood/images/reports.png
trunk/css/wood/images/sales.png
trunk/css/wood/images/security.png
trunk/css/wood/images/supplier.png
trunk/css/wood/images/tick.png
trunk/css/wood/images/transactions 2.png
trunk/css/wood/images/transactions.png
trunk/css/wood/images/user.png
trunk/css/wood/images/wood.jpg
trunk/includes/DefineReceiptClass.php
trunk/includes/GetPaymentMethods.php
trunk/includes/footer.inc
Modified: trunk/CustomerReceipt.php
===================================================================
--- trunk/CustomerReceipt.php 2017-01-12 16:45:37 UTC (rev 7725)
+++ trunk/CustomerReceipt.php 2017-01-13 23:02:10 UTC (rev 7726)
@@ -5,6 +5,7 @@
include('includes/DefineReceiptClass.php');
include('includes/session.inc');
+
$Title = _('Receipt Entry');
if ($_GET['Type']=='GL') {
@@ -53,10 +54,14 @@
} else {
$BankAccountEmpty=false;
}
+
$Errors = array();
+
if (!isset($_GET['Delete']) AND isset($_SESSION['ReceiptBatch' . $identifier])){
//always process a header update unless deleting an item
+ include('includes/GetPaymentMethods.php');
+
$_SESSION['ReceiptBatch' . $identifier]->Account = $_POST['BankAccount'];
/*Get the bank account currency and set that too */
@@ -177,6 +182,9 @@
if (!isset($_POST['CustomerName'])) {
$_POST['CustomerName']='';
}
+ if ($_POST['Discount']==0 AND $ReceiptTypes[$_SESSION['ReceiptBatch' . $identifier]->ReceiptType]['percentdiscount']>0){
+ $_POST['Discount'] = $_POST['Amount']*$ReceiptTypes[$_SESSION['ReceiptBatch' . $identifier]->ReceiptType]['percentdiscount'];
+ }
if ($_POST['GLCode'] == '' AND $_GET['Type']=='GL') {
prnMsg( _('No General Ledger code has been chosen') . ' - ' . _('so this GL analysis item could not be added'),'warn');
@@ -407,7 +415,7 @@
'" . (($_SESSION['ReceiptBatch' . $identifier]->ExRate * $_SESSION['ReceiptBatch' . $identifier]->FunctionalExRate)/$TrfFromBankExRate). "',
'" . $TrfFromBankExRate . "',
'" . FormatDateForSQL($_SESSION['ReceiptBatch' . $identifier]->DateBanked) . "',
- '" . $_SESSION['ReceiptBatch' . $identifier]->ReceiptType . "',
+ '" . $ReceiptTypes[$_SESSION['ReceiptBatch' . $identifier]->ReceiptType]['paymentname'] . "',
'" . -$ReceiptItem->Amount . "',
'" . $_SESSION['ReceiptBatch' . $identifier]->Currency . "'
)";
@@ -450,7 +458,7 @@
'" . FormatDateForSQL($_SESSION['ReceiptBatch' . $identifier]->DateBanked) . "',
'" . date('Y-m-d H-i-s') . "',
'" . $PeriodNo . "',
- '" . $_SESSION['ReceiptBatch' . $identifier]->ReceiptType . ' ' . $ReceiptItem->PayeeBankDetail . "',
+ '" . $ReceiptTypes[$_SESSION['ReceiptBatch' . $identifier]->ReceiptType]['paymentname'] . ' ' . $ReceiptItem->PayeeBankDetail . "',
'',
'" . ($_SESSION['ReceiptBatch' . $identifier]->FunctionalExRate*$_SESSION['ReceiptBatch' . $identifier]->ExRate) . "',
'" . -$ReceiptItem->Amount . "',
@@ -498,7 +506,7 @@
'" . $_SESSION['ReceiptBatch' . $identifier]->ExRate . "',
'" . $_SESSION['ReceiptBatch' . $identifier]->FunctionalExRate . "',
'" . FormatDateForSQL($_SESSION['ReceiptBatch' . $identifier]->DateBanked) . "',
- '" . $_SESSION['ReceiptBatch' . $identifier]->ReceiptType . "',
+ '" . $ReceiptTypes[$_SESSION['ReceiptBatch' . $identifier]->ReceiptType]['paymentname'] . "',
'" . ($BatchReceiptsTotal * $_SESSION['ReceiptBatch' . $identifier]->FunctionalExRate * $_SESSION['ReceiptBatch' . $identifier]->ExRate) . "',
'" . $_SESSION['ReceiptBatch' . $identifier]->Currency . "'
)";
@@ -785,7 +793,7 @@
/*set up the form whatever */
-echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?Type='.$_GET['Type'] . '&identifier=' . $identifier . '" method="post" id="form1">';
+echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?Type=' . $_GET['Type'] . '&identifier=' . $identifier . '" method="post" id="form1">';
echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
@@ -902,6 +910,7 @@
}
if($_SESSION['ReceiptBatch' . $identifier]->AccountCurrency != $_SESSION['CompanyRecord']['currencydefault'] AND isset($_SESSION['ReceiptBatch' . $identifier]->AccountCurrency)) {
+
if($_SESSION['ReceiptBatch' . $identifier]->FunctionalExRate==1 AND isset($SuggestedFunctionalExRate)) {
$_SESSION['ReceiptBatch' . $identifier]->FunctionalExRate = $SuggestedFunctionalExRate;
}
@@ -918,17 +927,16 @@
echo '<tr>
<td>' . _('Receipt Type') . ':</td>
- <td><select name="ReceiptType" tabindex="6">';
+ <td><select name="ReceiptType" tabindex="6" onchange="ReloadForm(form1.BatchInput)">';
-include('includes/GetPaymentMethods.php');
/* The array ReceiptTypes is defined from the setup tab of the main menu under
payment methods - the array is populated from the include file GetPaymentMethods.php */
foreach ($ReceiptTypes as $RcptType) {
- if (isset($_POST['ReceiptType']) and $_POST['ReceiptType']==$RcptType){
- echo '<option selected="selected" value="' . $RcptType . '">' . $RcptType . '</option>';
+ if (isset($_POST['ReceiptType']) AND $_POST['ReceiptType']==$RcptType['paymentid']){
+ echo '<option selected="selected" value="' . $RcptType['paymentid'] . '">' . $RcptType['paymentname'] . '</option>';
} else {
- echo '<option value="' .$RcptType . '">' . $RcptType . '</option>';
+ echo '<option value="' . $RcptType['paymentid'] . '">' . $RcptType['paymentname'] . '</option>';
}
}
echo '</select></td>
@@ -969,7 +977,7 @@
/* Now show the entries made so far */
if (!$BankAccountEmpty) {
echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/transactions.png" title="' . _('Banked') . '" alt="" />
- ' . ' ' . $_SESSION['ReceiptBatch' . $identifier]->ReceiptType . ' - ' . _('Banked into the') . " " .
+ ' . ' ' . $ReceiptTypes[$_SESSION['ReceiptBatch' . $identifier]->ReceiptType]['paymentname'] . ' - ' . _('Banked into the') . " " .
$_SESSION['ReceiptBatch' . $identifier]->BankAccountName . ' ' . _('on') . ' ' . $_SESSION['ReceiptBatch' . $identifier]->DateBanked . '</p>';
}
@@ -1064,7 +1072,11 @@
echo '<table class="selection">';
- $DisplayDiscountPercent = locale_number_format($_SESSION['CustomerRecord' . $identifier]['pymtdiscount']*100,2) . '%';
+ if ($_SESSION['CustomerRecord' . $identifier]['pymtdiscount'] > $ReceiptTypes[$_SESSION['ReceiptBatch' . $identifier]->ReceiptType]['percentdiscount']) {
+ $DisplayDiscountPercent = locale_number_format($_SESSION['CustomerRecord' . $identifier]['pymtdiscount']*100,2) . '%';
+ } else {
+ $DisplayDiscountPercent = locale_number_format($ReceiptTypes[$_SESSION['ReceiptBatch' . $identifier]->ReceiptType]['percentdiscount']*100,2) . '%';
+ }
echo '<input type="hidden" name="CustomerID" value="' . $_POST['CustomerID'] . '" />';
echo '<input type="hidden" name="CustomerName" value="' . $_SESSION['CustomerRecord' . $identifier]['name'] . '" />';
@@ -1130,6 +1142,10 @@
}
}
+
+
+
+
/*if either a customer is selected or its a GL Entry then set out
the fields for entry of receipt amt, disc, payee details, narrative */
Modified: trunk/PDFChequeListing.php
===================================================================
--- trunk/PDFChequeListing.php 2017-01-12 16:45:37 UTC (rev 7725)
+++ trunk/PDFChequeListing.php 2017-01-13 23:02:10 UTC (rev 7726)
@@ -224,7 +224,4 @@
$result = SendmailBySmtp($mail,$ChkListingRecipients);
}
}
-
-
-
?>
Modified: trunk/css/wood/bullet.gif
===================================================================
(Binary files differ)
Modified: trunk/css/wood/images/ar.png
===================================================================
(Binary files differ)
Modified: trunk/css/wood/images/company.png
===================================================================
(Binary files differ)
Modified: trunk/css/wood/images/contract.png
===================================================================
(Binary files differ)
Modified: trunk/css/wood/images/customer.png
===================================================================
(Binary files differ)
Modified: trunk/css/wood/images/desk.jpg
===================================================================
(Binary files differ)
Modified: trunk/css/wood/images/error.png
===================================================================
(Binary files differ)
Modified: trunk/css/wood/images/folder_add.png
===================================================================
(Binary files differ)
Modified: trunk/css/wood/images/folders.gif
===================================================================
(Binary files differ)
Modified: trunk/css/wood/images/group_add.png
===================================================================
(Binary files differ)
Modified: trunk/css/wood/images/help.png
===================================================================
(Binary files differ)
Modified: trunk/css/wood/images/inquiries.png
===================================================================
(Binary files differ)
Modified: trunk/css/wood/images/inventory.png
===================================================================
(Binary files differ)
Modified: trunk/css/wood/images/magnifier.png
===================================================================
(Binary files differ)
Modified: trunk/css/wood/images/maintenance.png
===================================================================
(Binary files differ)
Modified: trunk/css/wood/images/money_add.png
===================================================================
(Binary files differ)
Modified: trunk/css/wood/images/note_add.png
===================================================================
(Binary files differ)
Modified: trunk/css/wood/images/pdf.png
===================================================================
(Binary files differ)
Modified: trunk/css/wood/images/reports.gif
===================================================================
(Binary files differ)
Modified: trunk/css/wood/images/reports.png
===================================================================
(Binary files differ)
Modified: trunk/css/wood/images/sales.png
===================================================================
(Binary files differ)
Modified: trunk/css/wood/images/security.png
===================================================================
(Binary files differ)
Modified: trunk/css/wood/images/supplier.png
===================================================================
(Binary files differ)
Modified: trunk/css/wood/images/tick.png
===================================================================
(Binary files differ)
Modified: trunk/css/wood/images/transactions 2.png
===================================================================
(Binary files differ)
Modified: trunk/css/wood/images/transactions.png
===================================================================
(Binary files differ)
Modified: trunk/css/wood/images/user.png
===================================================================
(Binary files differ)
Modified: trunk/css/wood/images/wood.jpg
===================================================================
(Binary files differ)
Modified: trunk/includes/DefineReceiptClass.php
===================================================================
--- trunk/includes/DefineReceiptClass.php 2017-01-12 16:45:37 UTC (rev 7725)
+++ trunk/includes/DefineReceiptClass.php 2017-01-13 23:02:10 UTC (rev 7726)
@@ -25,6 +25,7 @@
$this->Items = array();
$this->ItemCounter=0;
$this->total=0;
+ $this->ReceiptType=array();
}
function add_to_batch($Amount, $Customer, $Discount, $Narrative, $GLCode, $PayeeBankDetail, $CustomerName, $tag){
@@ -78,4 +79,4 @@
}
}
-?>
\ No newline at end of file
+?>
Modified: trunk/includes/GetPaymentMethods.php
===================================================================
--- trunk/includes/GetPaymentMethods.php 2017-01-12 16:45:37 UTC (rev 7725)
+++ trunk/includes/GetPaymentMethods.php 2017-01-13 23:02:10 UTC (rev 7726)
@@ -4,9 +4,11 @@
$PaytTypes = array();
$ReceiptTypes = array();
-$sql = 'SELECT paymentname,
+$sql = 'SELECT paymentid,
+ paymentname,
paymenttype,
- receipttype
+ receipttype,
+ percentdiscount
FROM paymentmethods
ORDER by paymentname';
@@ -16,8 +18,8 @@
$PaytTypes[] = $PMrow['paymentname'];
}
if ($PMrow['receipttype']==1) {
- $ReceiptTypes[] = $PMrow['paymentname'];
+ $ReceiptTypes[$PMrow['paymentid']] = $PMrow;
}
}
DB_free_result($PMResult); // no longer needed
-?>
\ No newline at end of file
+?>
Modified: trunk/includes/footer.inc
===================================================================
--- trunk/includes/footer.inc 2017-01-12 16:45:37 UTC (rev 7725)
+++ trunk/includes/footer.inc 2017-01-13 23:02:10 UTC (rev 7726)
@@ -24,7 +24,7 @@
echo '</div>'; // FooterDiv
echo '</div>'; // Canvas
-echo '</body>';
-echo '</html>';
+echo '</body>
+ </html>';
-?>
\ No newline at end of file
+?>
|
|
From: <tu...@us...> - 2017-03-07 18:01:32
|
Revision: 7737
http://sourceforge.net/p/web-erp/reponame/7737
Author: turbopt
Date: 2017-03-07 18:01:30 +0000 (Tue, 07 Mar 2017)
Log Message:
-----------
(by Tim in forums) BankAccounts.php: Add quotes to variable in query.
Modified Paths:
--------------
trunk/BankAccounts.php
trunk/doc/Change.log
Modified: trunk/BankAccounts.php
===================================================================
--- trunk/BankAccounts.php 2017-02-27 20:30:00 UTC (rev 7736)
+++ trunk/BankAccounts.php 2017-03-07 18:01:30 UTC (rev 7737)
@@ -404,7 +404,7 @@
}
if (isset($SelectedBankAccount)) {
- $result = DB_query("SELECT invoice FROM bankaccounts where accountcode =" . $SelectedBankAccount );
+ $result = DB_query("SELECT invoice FROM bankaccounts where accountcode = '" . $SelectedBankAccount . "'" );
while ($myrow = DB_fetch_array($result)) {
if ($myrow['invoice']== 1) {
echo '<option selected="selected" value="1">' . _('Fall Back Default') . '</option>
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2017-02-27 20:30:00 UTC (rev 7736)
+++ trunk/doc/Change.log 2017-03-07 18:01:30 UTC (rev 7737)
@@ -1,5 +1,6 @@
webERP Change Log
+07/03/17 TurboPT: (by Tim in forums) BankAccounts.php: Add quotes to variable in query.
27/02/17 TurboPT: SpecialOrder.php add identifier to delete link; DefineSpecialOrderClass.php remove the "&" with parameter to function remove_from_order().
26/02/17 TurboPT: CopyBOM.php fixed insert SQL had duplicate digitals field
14/1/17 Phil: CustomerReceipt now calculates payment discount based on percentages entered in payment methods
|
|
From: <dai...@us...> - 2017-03-11 01:52:19
|
Revision: 7738
http://sourceforge.net/p/web-erp/reponame/7738
Author: daintree
Date: 2017-03-11 01:52:17 +0000 (Sat, 11 Mar 2017)
Log Message:
-----------
committed for Tim - not sure why he didnt commit it himself - improvment to selectorderitems.php to allow import of order line items from a CSV
Modified Paths:
--------------
trunk/SelectOrderItems.php
trunk/doc/Change.log
Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php 2017-03-07 18:01:30 UTC (rev 7737)
+++ trunk/SelectOrderItems.php 2017-03-11 01:52:17 UTC (rev 7738)
@@ -33,6 +33,35 @@
}
}
+if (isset($_POST['UploadFile'])) {
+ if (isset($_FILES['CSVFile']) and $_FILES['CSVFile']['name']) {
+ //check file info
+ $FileName = $_FILES['CSVFile']['name'];
+ $TempName = $_FILES['CSVFile']['tmp_name'];
+ $FileSize = $_FILES['CSVFile']['size'];
+ //get file handle
+ $FileHandle = fopen($TempName, 'r');
+ $Row = 0;
+ $InsertNum = 0;
+ while (($FileRow = fgetcsv($FileHandle, 10000, ",")) !== False) {
+ /* Check the stock code exists */
+ ++$Row;
+ $SQL = "SELECT stockid FROM stockmaster WHERE stockid='" . $FileRow[0] . "'";
+ $Result = DB_query($SQL);
+ if (DB_num_rows($Result) > 0) {
+ $NewItemArray[$FileRow[0]] = filter_number_format($FileRow[1]);
+ ++$InsertNum;
+ }
+ }
+ }
+ $_POST['SelectingOrderItems'] = 1;
+ if (sizeof($NewItemArray) == 0) {
+ prnMsg(_('There are no items that can be imported'), 'error');
+ } else {
+ prnMsg($InsertNum . ' ' . _('of') . ' ' . $Row . ' ' . _('rows have been added to the order'), 'info');
+ }
+}
+
if (isset($_GET['NewItem'])){
$NewItem = trim($_GET['NewItem']);
}
@@ -802,7 +831,7 @@
#Always do the stuff below if not looking for a customerid
- echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier . '" id="SelectParts" method="post">';
+ echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier . '" id="SelectParts" method="post" enctype="multipart/form-data">';
echo '<div>';
echo '<input name="FormID" type="hidden" value="' . $_SESSION['FormID'] . '" />';
@@ -1623,10 +1652,19 @@
echo '<td style="text-align:center" colspan="1"><input tabindex="6" type="submit" name="ChangeCustomer" value="' . _('Change Customer') . '" /></td>
<td style="text-align:center" colspan="1"><input tabindex="7" type="submit" name="SelectAsset" value="' . _('Fixed Asset Disposal') . '" /></td>';
}
+ echo '<tr>
+ <td colspan="10">
+ <div class="centre">
+ <h2>' . _('Or') . '</h2>
+ ' . _('Upload items from csv file') . '<input tabindex="5" type="file" name="CSVFile" />
+ <input tabindex="5" type="submit" name="UploadFile" value="' . _('Upload File') . '" />
+ </div>
+ </td>';
echo '</tr>
</table>
<br />
</div>';
+ echo '<div class="page_help_text">' . _('The csv file should have exactly 2 columns, part code and quantity.') . '</div>';
if (isset($SearchResult)) {
echo '<br />';
echo '<div class="page_help_text">' . _('Select an item by entering the quantity required. Click Order when ready.') . '</div>';
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2017-03-07 18:01:30 UTC (rev 7737)
+++ trunk/doc/Change.log 2017-03-11 01:52:17 UTC (rev 7738)
@@ -1,5 +1,7 @@
webERP Change Log
+
+11/3/17 Tim - committed by Phil: allow sales order item lines to be imported from a csv consisting of lines of item code, quantity
07/03/17 TurboPT: (by Tim in forums) BankAccounts.php: Add quotes to variable in query.
27/02/17 TurboPT: SpecialOrder.php add identifier to delete link; DefineSpecialOrderClass.php remove the "&" with parameter to function remove_from_order().
26/02/17 TurboPT: CopyBOM.php fixed insert SQL had duplicate digitals field
|
|
From: <rc...@us...> - 2017-03-19 12:46:10
|
Revision: 7739
http://sourceforge.net/p/web-erp/reponame/7739
Author: rchacon
Date: 2017-03-19 12:46:08 +0000 (Sun, 19 Mar 2017)
Log Message:
-----------
Rename AccountSectionsDef.inc to AccountSectionsDef.php
Modified Paths:
--------------
trunk/AnalysisHorizontalIncome.php
trunk/AnalysisHorizontalPosition.php
trunk/GLBalanceSheet.php
trunk/GLProfit_Loss.php
trunk/GLTagProfit_Loss.php
trunk/GLTrialBalance.php
trunk/includes/AccountSectionsDef.inc
Added Paths:
-----------
trunk/includes/AccountSectionsDef.php
Modified: trunk/AnalysisHorizontalIncome.php
===================================================================
--- trunk/AnalysisHorizontalIncome.php 2017-03-11 01:52:17 UTC (rev 7738)
+++ trunk/AnalysisHorizontalIncome.php 2017-03-19 12:46:08 UTC (rev 7739)
@@ -16,7 +16,7 @@
$ViewTopic= 'GeneralLedger';// Filename's id in ManualContents.php's TOC.
$BookMark = 'AnalysisHorizontalIncome';// Anchor's id in the manual's html document.
include('includes/SQL_CommonFunctions.inc');
-include('includes/AccountSectionsDef.inc');// This loads the $Sections variable
+include('includes/AccountSectionsDef.php');// This loads the $Sections variable
if(isset($_POST['FromPeriod']) and ($_POST['FromPeriod'] > $_POST['ToPeriod'])) {
prnMsg(_('The selected period from is actually after the period to') . '! ' . _('Please reselect the reporting period'),'error');
Modified: trunk/AnalysisHorizontalPosition.php
===================================================================
--- trunk/AnalysisHorizontalPosition.php 2017-03-11 01:52:17 UTC (rev 7738)
+++ trunk/AnalysisHorizontalPosition.php 2017-03-19 12:46:08 UTC (rev 7739)
@@ -16,7 +16,7 @@
$ViewTopic = 'GeneralLedger';// Filename's id in ManualContents.php's TOC.
$BookMark = 'AnalysisHorizontalPosition';// Anchor's id in the manual's html document.
include('includes/SQL_CommonFunctions.inc');
-include('includes/AccountSectionsDef.inc'); // This loads the $Sections variable
+include('includes/AccountSectionsDef.php'); // This loads the $Sections variable
if(! isset($_POST['BalancePeriodEnd']) or isset($_POST['SelectADifferentPeriod'])) {
Modified: trunk/GLBalanceSheet.php
===================================================================
--- trunk/GLBalanceSheet.php 2017-03-11 01:52:17 UTC (rev 7738)
+++ trunk/GLBalanceSheet.php 2017-03-19 12:46:08 UTC (rev 7739)
@@ -10,7 +10,7 @@
$ViewTopic = 'GeneralLedger';// Filename's id in ManualContents.php's TOC.
$BookMark = 'BalanceSheet';// Anchor's id in the manual's html document.
include('includes/SQL_CommonFunctions.inc');
-include('includes/AccountSectionsDef.inc'); // This loads the $Sections variable
+include('includes/AccountSectionsDef.php'); // This loads the $Sections variable
if (! isset($_POST['BalancePeriodEnd']) or isset($_POST['SelectADifferentPeriod'])){
Modified: trunk/GLProfit_Loss.php
===================================================================
--- trunk/GLProfit_Loss.php 2017-03-11 01:52:17 UTC (rev 7738)
+++ trunk/GLProfit_Loss.php 2017-03-19 12:46:08 UTC (rev 7739)
@@ -7,7 +7,7 @@
$ViewTopic= 'GeneralLedger';// Filename's id in ManualContents.php's TOC.
$BookMark = 'ProfitAndLoss';// Anchor's id in the manual's html document.
include('includes/SQL_CommonFunctions.inc');
-include('includes/AccountSectionsDef.inc'); // This loads the $Sections variable
+include('includes/AccountSectionsDef.php'); // This loads the $Sections variable
if (isset($_POST['FromPeriod']) and ($_POST['FromPeriod'] > $_POST['ToPeriod'])){
Modified: trunk/GLTagProfit_Loss.php
===================================================================
--- trunk/GLTagProfit_Loss.php 2017-03-11 01:52:17 UTC (rev 7738)
+++ trunk/GLTagProfit_Loss.php 2017-03-19 12:46:08 UTC (rev 7739)
@@ -5,7 +5,7 @@
include ('includes/session.inc');
$Title = _('Income and Expenditure by Tag');
include('includes/SQL_CommonFunctions.inc');
-include('includes/AccountSectionsDef.inc'); // This loads the $Sections variable
+include('includes/AccountSectionsDef.php'); // This loads the $Sections variable
$ViewTopic= 'GeneralLedger';
$BookMark = 'TagReports';
@@ -943,4 +943,4 @@
echo '</form>';
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/GLTrialBalance.php
===================================================================
--- trunk/GLTrialBalance.php 2017-03-11 01:52:17 UTC (rev 7738)
+++ trunk/GLTrialBalance.php 2017-03-19 12:46:08 UTC (rev 7739)
@@ -13,7 +13,7 @@
$BookMark = 'TrialBalance';// Anchor's id in the manual's html document.
include('includes/SQL_CommonFunctions.inc');
-include('includes/AccountSectionsDef.inc'); //this reads in the Accounts Sections array
+include('includes/AccountSectionsDef.php'); //this reads in the Accounts Sections array
if (isset($_POST['FromPeriod'])
Modified: trunk/includes/AccountSectionsDef.inc
===================================================================
--- trunk/includes/AccountSectionsDef.inc 2017-03-11 01:52:17 UTC (rev 7738)
+++ trunk/includes/AccountSectionsDef.inc 2017-03-19 12:46:08 UTC (rev 7739)
@@ -7,4 +7,4 @@
$Sections[$secrow['sectionid']] = $secrow['sectionname'];
}
DB_free_result($SectionResult); // no longer needed
-?>
\ No newline at end of file
+?>
Added: trunk/includes/AccountSectionsDef.php
===================================================================
--- trunk/includes/AccountSectionsDef.php (rev 0)
+++ trunk/includes/AccountSectionsDef.php 2017-03-19 12:46:08 UTC (rev 7739)
@@ -0,0 +1,10 @@
+<?php
+/* $Id: AccountSectionsDef.php 6941 2014-10-26 23:18:08Z daintree $*/
+$Sections = array();
+$sql = 'SELECT sectionid, sectionname FROM accountsection ORDER by sectionid';
+$SectionResult = DB_query($sql);
+while( $secrow = DB_fetch_array($SectionResult) ) {
+ $Sections[$secrow['sectionid']] = $secrow['sectionname'];
+}
+DB_free_result($SectionResult); // no longer needed
+?>
|
|
From: <rc...@us...> - 2017-03-19 12:52:55
|
Revision: 7740
http://sourceforge.net/p/web-erp/reponame/7740
Author: rchacon
Date: 2017-03-19 12:52:53 +0000 (Sun, 19 Mar 2017)
Log Message:
-----------
Modified Paths:
--------------
trunk/GLTrialBalance.php
trunk/doc/Change.log
Removed Paths:
-------------
trunk/includes/AccountSectionsDef.inc
Modified: trunk/GLTrialBalance.php
===================================================================
--- trunk/GLTrialBalance.php 2017-03-19 12:46:08 UTC (rev 7739)
+++ trunk/GLTrialBalance.php 2017-03-19 12:52:53 UTC (rev 7740)
@@ -13,7 +13,7 @@
$BookMark = 'TrialBalance';// Anchor's id in the manual's html document.
include('includes/SQL_CommonFunctions.inc');
-include('includes/AccountSectionsDef.php'); //this reads in the Accounts Sections array
+include('includes/AccountSectionsDef.php'); // This loads the $Sections variable
if (isset($_POST['FromPeriod'])
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2017-03-19 12:46:08 UTC (rev 7739)
+++ trunk/doc/Change.log 2017-03-19 12:52:53 UTC (rev 7740)
@@ -1,6 +1,6 @@
webERP Change Log
-
+19/3/17 RChacon: Rename AccountSectionsDef.inc to AccountSectionsDef.php.
11/3/17 Tim - committed by Phil: allow sales order item lines to be imported from a csv consisting of lines of item code, quantity
07/03/17 TurboPT: (by Tim in forums) BankAccounts.php: Add quotes to variable in query.
27/02/17 TurboPT: SpecialOrder.php add identifier to delete link; DefineSpecialOrderClass.php remove the "&" with parameter to function remove_from_order().
Deleted: trunk/includes/AccountSectionsDef.inc
===================================================================
--- trunk/includes/AccountSectionsDef.inc 2017-03-19 12:46:08 UTC (rev 7739)
+++ trunk/includes/AccountSectionsDef.inc 2017-03-19 12:52:53 UTC (rev 7740)
@@ -1,10 +0,0 @@
-<?php
-/* $Id$*/
-$Sections = array();
-$sql = 'SELECT sectionid, sectionname FROM accountsection ORDER by sectionid';
-$SectionResult = DB_query($sql);
-while( $secrow = DB_fetch_array($SectionResult) ) {
- $Sections[$secrow['sectionid']] = $secrow['sectionname'];
-}
-DB_free_result($SectionResult); // no longer needed
-?>
|
|
From: <dai...@us...> - 2017-03-28 07:02:22
|
Revision: 7743
http://sourceforge.net/p/web-erp/reponame/7743
Author: daintree
Date: 2017-03-28 07:02:20 +0000 (Tue, 28 Mar 2017)
Log Message:
-----------
Abel define $ReportList as an array in index.php
Modified Paths:
--------------
trunk/doc/Change.log
trunk/doc/Manual/ManualContributors.html
trunk/index.php
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2017-03-21 03:58:00 UTC (rev 7742)
+++ trunk/doc/Change.log 2017-03-28 07:02:20 UTC (rev 7743)
@@ -1,5 +1,6 @@
webERP Change Log
+26/3/17 Abel World: Make degine $ReportList as an array to comply with PHP 7
19/3/17 RChacon: Rename AccountSectionsDef.inc to AccountSectionsDef.php.
11/3/17 Tim - committed by Phil: allow sales order item lines to be imported from a csv consisting of lines of item code, quantity
07/03/17 TurboPT: (by Tim in forums) BankAccounts.php: Add quotes to variable in query.
Modified: trunk/doc/Manual/ManualContributors.html
===================================================================
--- trunk/doc/Manual/ManualContributors.html 2017-03-21 03:58:00 UTC (rev 7742)
+++ trunk/doc/Manual/ManualContributors.html 2017-03-28 07:02:20 UTC (rev 7743)
@@ -90,6 +90,7 @@
<p>Marcos Garcia Trejo</p>
<p>Jeff Trickett</p>
<p>Wes Wolfenbarger</p>
+ <p>Abel World</p>
<p>Mark Yeager (MRP)</p>
<p>Zhiguo Yuan</p>
</td>
Modified: trunk/index.php
===================================================================
--- trunk/index.php 2017-03-21 03:58:00 UTC (rev 7742)
+++ trunk/index.php 2017-03-28 07:02:20 UTC (rev 7743)
@@ -192,7 +192,7 @@
ORDER BY groupname,
reportname";
$Result=DB_query($sql,'','',false,true);
- $ReportList = '';
+ $ReportList = array();
while ($Temp = DB_fetch_array($Result)) {
$ReportList[] = $Temp;
}
|
|
From: <rc...@us...> - 2017-03-29 15:43:44
|
Revision: 7744
http://sourceforge.net/p/web-erp/reponame/7744
Author: rchacon
Date: 2017-03-29 15:43:41 +0000 (Wed, 29 Mar 2017)
Log Message:
-----------
In webERP manual, allow to use default pages if locale pages do not exist.
Modified Paths:
--------------
trunk/doc/Change.log
trunk/includes/header.inc
Added Paths:
-----------
trunk/ManualContents.php
Removed Paths:
-------------
trunk/doc/Manual/ManualContents.php
trunk/doc/Manual/ManualFooter.html
trunk/doc/Manual/ManualHeader.html
Added: trunk/ManualContents.php
===================================================================
--- trunk/ManualContents.php (rev 0)
+++ trunk/ManualContents.php 2017-03-29 15:43:41 UTC (rev 7744)
@@ -0,0 +1,158 @@
+<?php
+/* $Id: ManualContents.php 5450 2009-12-24 15:28:49Z icedlava $ */
+/* Shows the local manual content if available, else shows the manual content in en-GB. */
+/* This program is under the GNU General Public License, last version. */
+/* This creative work is under the CC BY-NC-SA, later version. */
+
+/*
+This table of contents allows the choice to display one section or select multiple sections to format for print.
+Selecting multiple sections is for printing.
+The outline of the Table of Contents is contained in the 'ManualOutline.php' file that can be easily translated.
+The individual topics in the manual are in straight html files that are called along with the header and foot from here.
+Each function in KwaMoja can initialise a $ViewTopic and $Bookmark variable, prior to including the header.inc file.
+This will display the specified topic and bookmark if it exists when the user clicks on the Manual link in the KwaMoja main menu.
+In this way the help can be easily broken into sections for online context-sensitive help.
+Comments beginning with Help Begin and Help End denote the beginning and end of a section that goes into the online help.
+What section is named after Help Begin: and there can be multiple sections separated with a comma.
+*/
+
+// BEGIN: Procedure division ---------------------------------------------------
+$Title = _('webERP Manual');
+// Set the language to show the manual:
+session_start();
+$Language = $_SESSION['Language'];
+if(isset($_GET['Language'])) {// Set an other language for manual.
+ $Language = $_GET['Language'];
+}
+// Set the Cascading Style Sheet for the manual:
+$ManualStyle = 'locale/' . $Language . '/Manual/style/manual.css';
+if(!file_exists($ManualStyle)) {// If locale ccs not exist, use doc/Manual/style/manual.css. Each language can have its own css.
+ $ManualStyle = 'doc/Manual/style/manual.css';
+}
+// Set the the outline of the webERP manual:
+$ManualOutline = 'locale/' . $Language . '/Manual/ManualOutline.php';
+if(!file_exists($ManualOutline)) {// If locale outline not exist, use doc/Manual/ManualOutline.php. Each language can have its own outline.
+ $ManualOutline = 'doc/Manual/ManualOutline.php';
+}
+
+
+// Begin old code ==============================================================
+ob_start();
+$PathPrefix = '../../';
+
+// Output the header part:
+$ManualHeader = 'locale/' . $Language . '/Manual/ManualHeader.html';
+if(file_exists($ManualHeader)) {// Use locale ManualHeader.html if exists. Each language can have its own page header.
+ include($ManualHeader);
+} else {// Default page header:
+ echo '<!DOCTYPE html>
+ <html>
+ <head>
+ <title>', $Title, '</title>
+ <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
+ <link rel="stylesheet" type="text/css" href="', $ManualStyle, '" />
+ </head>
+ <body lang="', str_replace('_', '-', substr($Language, 0, 5)), '">
+ <div id="pagetitle">', $Title, '</div>
+ <div class="right">
+ <a id="top"> </a><a class="minitext" href="', htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8'), '">☜ ', _('Table of Contents'), '</a><br />
+ <a class="minitext" href="#bottom">⬇ ', _('Go to Bottom'), '</a>
+ </div>';
+}
+
+include($ManualOutline);
+$_GET['Bookmark'] = isset($_GET['Bookmark']) ? $_GET['Bookmark'] : '';
+$_GET['ViewTopic'] = isset($_GET['ViewTopic']) ? $_GET['ViewTopic'] : '';
+
+//all sections of manual listed here
+
+echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post" class="noPrint">';
+
+if(((!isset($_POST['Submit'])) and (empty($_GET['ViewTopic']))) || ((isset($_POST['Submit'])) and (isset($_POST['SelectTableOfContents'])))) {
+ // if not submittws then coming into manual to look at TOC
+ // if SelectTableOfContents set then user wants it displayed
+ if(!isset($_POST['Submit'])) {
+ echo '<p>Click on a link to view a page, or<br />
+ Check boxes and click on Display Checked to view selected in one page
+ <input type="submit" name="Submit" value="Display Checked" />
+ </p>';
+ }
+ echo "<ul>\n<li style=\"list-style-type:none;\">\n<h1>";
+ if(!isset($_POST['Submit'])) {
+ echo ' <input type="checkbox" name="SelectTableOfContents">';
+ }
+ echo _('Table of Contents'), "</h1></li>\n";
+ $j = 0;
+ foreach($TOC_Array['TableOfContents'] as $Title => $SubLinks) {
+ $Name = 'Select' . $Title;
+ echo "<ul>\n";
+ if(!isset($_POST['Submit'])) {
+ echo '<li class="toc" style="list-style-type:none;"><input type="checkbox" name="' . $Name . '">' . "\n";
+ echo '<section style="margin-bottom:5px;">
+ <div class="roundedOne">
+ <input type="checkbox" value="None" id="roundedOne'.$j.'" name="' . $Name . '" />
+ <label for="roundedOne'.$j.'"></label>';
+
+ echo '<a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?ViewTopic=' . $Title . '" style="padding-left:1%";>' . $SubLinks[0] . '</a></li>' . "\n";
+
+ echo '</div>
+ </section>';
+ } else {
+ echo ' <li class="toc"><a href="#' . $Title . '">' . $SubLinks[0] . '</a></li>' . "\n";
+ }
+ if(count($SubLinks) > 1) {
+ echo '<ul>' . "\n";
+ foreach($SubLinks as $k => $SubName) {
+ if($k == 0)
+ continue;
+ echo '<li>' . $SubName . '</li>' . "\n";
+ }
+ echo '</ul>' . "\n";
+ }
+ echo '</ul>' . "\n";
+ ++$j;
+ }
+ echo '</ul>' . "\n";
+}
+echo '</form>' . "\n";
+
+if(!isset($_GET['ViewTopic'])) {
+ $_GET['ViewTopic'] = '';
+}
+
+foreach($TOC_Array['TableOfContents'] as $Name => $FullName) {
+ $PostName = 'Select' . $Name;
+ if(($_GET['ViewTopic'] == $Name) or (isset($_POST[$PostName]))) {
+ if($Name == 'APIFunctions') {
+ $Name .= '.php';
+ } else {
+ $Name .= '.html';
+ }
+ $ManualPage = 'locale/' . $Language . '/Manual/Manual' . $Name;
+ if(!file_exists($ManualPage)) {// If locale topic page not exist, use topic page in doc/Manual.
+ $ManualPage = 'doc/Manual' . $Name;
+ }
+ echo '<div id="manualpage">';
+ include($ManualPage);
+ echo '</div>';
+ }
+}
+
+// Output the footer part:
+$ManualFooter = 'locale/' . $Language . '/Manual/ManualFooter.html';
+if(file_exists($ManualFooter)) {// Use locale ManualHeader.html if exists. Each language can have its own page footer.
+ include($ManualFooter);
+} else {// Default page footer:
+ echo '<div class="right">
+ <a id="bottom"> </a><a class="minitext" href="#top">⬆ ', _('Go to Top'), '</a>
+ </div>
+ </body>
+ </html>';
+}
+
+ob_end_flush();
+// End old code ================================================================
+
+
+// END: Procedure division -----------------------------------------------------
+?>
\ No newline at end of file
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2017-03-28 07:02:20 UTC (rev 7743)
+++ trunk/doc/Change.log 2017-03-29 15:43:41 UTC (rev 7744)
@@ -1,6 +1,7 @@
webERP Change Log
-26/3/17 Abel World: Make degine $ReportList as an array to comply with PHP 7
+29/3/17 RChacon: In webERP manual, allow to use default pages if locale pages do not exist.
+26/3/17 Abel World: Make degine $ReportList as an array to comply with PHP 7.
19/3/17 RChacon: Rename AccountSectionsDef.inc to AccountSectionsDef.php.
11/3/17 Tim - committed by Phil: allow sales order item lines to be imported from a csv consisting of lines of item code, quantity
07/03/17 TurboPT: (by Tim in forums) BankAccounts.php: Add quotes to variable in query.
Deleted: trunk/doc/Manual/ManualContents.php
===================================================================
--- trunk/doc/Manual/ManualContents.php 2017-03-28 07:02:20 UTC (rev 7743)
+++ trunk/doc/Manual/ManualContents.php 2017-03-29 15:43:41 UTC (rev 7744)
@@ -1,91 +0,0 @@
-<?php
-/* $Id: ManualContents.php 5450 2009-12-24 15:28:49Z icedlava $ */
-/* This table of contents allows the choice to display one section or select multiple sections to format for print.
- Selecting multiple sections is for printing
-
- The outline of the Table of Contents is contained in the 'ManualOutline.php' file that can be easily translated.
-
- The individual topics in the manual are in straight html files that are called along with the header and foot from here.
-
- Each function in webERP can initialise a $ViewTopic and $Bookmark variable, prior to including the header.inc file.
- This will display the specified topic and bookmark if it exists when the user clicks on the Manual link in the webERP main menu.
- In this way the help can be easily broken into sections for online context-sensitive help.
- Comments beginning with Help Begin and Help End denote the beginning and end of a section that goes into the online help.
- What section is named after Help Begin: and there can be multiple sections separated with a comma.
-*/
-
-ob_start();
-$PathPrefix='../../';
-
-//include($PathPrefix.'includes/session.inc');
-include('ManualHeader.html');
-include('ManualOutline.php');
-$_GET['Bookmark'] = isset($_GET['Bookmark'])?$_GET['Bookmark']:'';
-$_GET['ViewTopic'] = isset($_GET['ViewTopic'])?$_GET['ViewTopic']:'';
-
-//all sections of manual listed here
-
-echo' <form action="'.htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8').'" method="post">';
-//echo ' <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-
-if (((!isset($_POST['Submit'])) AND (empty($_GET['ViewTopic']))) ||
- ((isset($_POST['Submit'])) AND(isset($_POST['SelectTableOfContents'])))) {
- // if not submittws then coming into manual to look at TOC
- // if SelectTableOfContents set then user wants it displayed
- if (!isset($_POST['Submit'])) {
- echo '<p>Click on a link to view a page, or<br />
- Check boxes and click on Display Checked to view selected in one page
- <input type="submit" name="Submit" value="Display Checked" />
- </p>';
- }
- echo "<ul>\n<li style=\"list-style-type:none;\">\n<h1>";
- if (!isset($_POST['Submit'])) {
- echo ' <input type="checkbox" name="SelectTableOfContents">';
- }
- echo "Table of Contents</h1></li>\n";
- foreach ($TOC_Array['TableOfContents'] as $Title => $SubLinks) {
-
- $Name = 'Select' . $Title;
- echo "<ul>\n";
- if (!isset($_POST['Submit'])) {
- echo '<li class="toc" style="list-style-type:none;"><input type="checkbox" name="' . $Name . '">'."\n";
- echo '<a href="'.htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?ViewTopic=' . $Title . '">' . $SubLinks[0] . '</a></li>' . "\n";
- } else {
- echo' <li class="toc"><a href="#'.$Title.'">' . $SubLinks[0] . '</a></li>' . "\n";
- }
- if (count($SubLinks)>1) {
- echo'<ul>'."\n";
- foreach ($SubLinks as $k=>$SubName) {
- if ($k == 0) continue;
- echo '<li>'.$SubName.'</li>'."\n";
- }
- echo '</ul>'."\n";
- }
- echo '</ul>'."\n";
- }
- echo '</ul>'."\n";
-}
-echo '</form>'."\n";
-
-if (!isset($_GET['ViewTopic'])){
- $_GET['ViewTopic'] = '';
-}
-
-foreach ($TOC_Array['TableOfContents'] as $Name=>$FullName){
- $PostName = 'Select' . $Name;
- if (($_GET['ViewTopic'] == $Name) OR (isset($_POST[$PostName]))){
-
- if ($Name=='APIFunctions') {
- $ManualPage = 'Manual' . $Name . '.php';
- } else {
- $ManualPage = 'Manual' . $Name . '.html';
- }
-
- if (file_exists($ManualPage)) {
- include($ManualPage);
- }
- }
-}
-
-include('ManualFooter.html');
-ob_end_flush();
\ No newline at end of file
Deleted: trunk/doc/Manual/ManualFooter.html
===================================================================
--- trunk/doc/Manual/ManualFooter.html 2017-03-28 07:02:20 UTC (rev 7743)
+++ trunk/doc/Manual/ManualFooter.html 2017-03-29 15:43:41 UTC (rev 7744)
@@ -1,3 +0,0 @@
-<div class="right"><a id="bottom"> </a><a class="minitext" href="#top">⬆ Go to Top</a></div>
-</body>
-</html>
\ No newline at end of file
Deleted: trunk/doc/Manual/ManualHeader.html
===================================================================
--- trunk/doc/Manual/ManualHeader.html 2017-03-28 07:02:20 UTC (rev 7743)
+++ trunk/doc/Manual/ManualHeader.html 2017-03-29 15:43:41 UTC (rev 7744)
@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
- <title>webERP Manual</title>
- <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
- <link rel="stylesheet" type="text/css" href="style/manual.css" />
-</head>
-<body>
- <div id="pagetitle">webERP Manual</div>
- <div class="right">
- <a id="top"> </a><a class="minitext" href="<?php echo htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8'); ?>">☜ Table of Contents</a>
- <br />
- <a class="minitext" href="#bottom">⬇Go to Bottom</a>
- </div>
Modified: trunk/includes/header.inc
===================================================================
--- trunk/includes/header.inc 2017-03-28 07:02:20 UTC (rev 7743)
+++ trunk/includes/header.inc 2017-03-29 15:43:41 UTC (rev 7744)
@@ -73,9 +73,7 @@
echo '<li><a href="'.$RootPath.'/SelectCustomer.php">' . _('Customers') . '</a></li>';
echo '<li><a href="'.$RootPath.'/SelectProduct.php">' . _('Items') . '</a></li>';
echo '<li><a href="'.$RootPath.'/SelectSupplier.php">' . _('Suppliers') . '</a></li>';
-
- $DefaultManualLink = '<li><a rel="external" accesskey="8" href="' . $RootPath . '/doc/Manual/ManualContents.php'. $ViewTopic . $BookMark. '">' . _('Manual') . '</a></li>';
-
+/* $DefaultManualLink = '<li><a rel="external" accesskey="8" href="' . $RootPath . '/doc/Manual/ManualContents.php'. $ViewTopic . $BookMark. '">' . _('Manual') . '</a></li>';
if (mb_substr($_SESSION['Language'],0,2) != 'en'){
if (file_exists('locale/'.$_SESSION['Language'].'/Manual/ManualContents.php')){
echo '<li><a target="_blank" href="'.$RootPath.'/locale/'.$_SESSION['Language'].'/Manual/ManualContents.php'. $ViewTopic . $BookMark. '">' . _('Manual') . '</a></li>';
@@ -84,7 +82,8 @@
}
} else {
echo $DefaultManualLink;
- }
+ }*/
+ echo '<li><a href="', $RootPath, '/ManualContents.php', $ViewTopic, $BookMark, '" rel="external" accesskey="8">', _('Manual'), '</a></li>';
}
echo '<li><a href="'.$RootPath.'/Logout.php" onclick="return confirm(\''._('Are you sure you wish to logout?').'\');">' . _('Logout') . '</a></li>';
|
|
From: <rc...@us...> - 2017-03-29 23:52:45
|
Revision: 7745
http://sourceforge.net/p/web-erp/reponame/7745
Author: rchacon
Date: 2017-03-29 23:52:43 +0000 (Wed, 29 Mar 2017)
Log Message:
-----------
Fix checkbox showing and do some improvements.
Modified Paths:
--------------
trunk/ManualContents.php
trunk/doc/Change.log
trunk/doc/Manual/style/manual.css
Modified: trunk/ManualContents.php
===================================================================
--- trunk/ManualContents.php 2017-03-29 15:43:41 UTC (rev 7744)
+++ trunk/ManualContents.php 2017-03-29 23:52:43 UTC (rev 7745)
@@ -35,10 +35,8 @@
$ManualOutline = 'doc/Manual/ManualOutline.php';
}
-
-// Begin old code ==============================================================
ob_start();
-$PathPrefix = '../../';
+/*$PathPrefix = '../../';*/
// Output the header part:
$ManualHeader = 'locale/' . $Language . '/Manual/ManualHeader.html';
@@ -65,56 +63,49 @@
$_GET['ViewTopic'] = isset($_GET['ViewTopic']) ? $_GET['ViewTopic'] : '';
//all sections of manual listed here
-
-echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post" class="noPrint">';
-
if(((!isset($_POST['Submit'])) and (empty($_GET['ViewTopic']))) || ((isset($_POST['Submit'])) and (isset($_POST['SelectTableOfContents'])))) {
+ echo '<form action="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '" method="post">';
// if not submittws then coming into manual to look at TOC
// if SelectTableOfContents set then user wants it displayed
if(!isset($_POST['Submit'])) {
- echo '<p>Click on a link to view a page, or<br />
- Check boxes and click on Display Checked to view selected in one page
- <input type="submit" name="Submit" value="Display Checked" />
- </p>';
+ echo '<p>', _('Click on a link to view a page, or check boxes and click on "Display Checked" to view selected in one page'), '</p>';
+ echo '<p><input type="submit" name="Submit" value="', _('Display Checked'), '" /></p>';
}
- echo "<ul>\n<li style=\"list-style-type:none;\">\n<h1>";
+ echo '<h1>';
if(!isset($_POST['Submit'])) {
- echo ' <input type="checkbox" name="SelectTableOfContents">';
+ echo '<input name="SelectTableOfContents" type="checkbox">';
}
- echo _('Table of Contents'), "</h1></li>\n";
+ echo _('Table of Contents'), '</h1>';
$j = 0;
foreach($TOC_Array['TableOfContents'] as $Title => $SubLinks) {
$Name = 'Select' . $Title;
- echo "<ul>\n";
+ echo '<ul>
+ <li class="toc"';
+ // List topic title:
if(!isset($_POST['Submit'])) {
- echo '<li class="toc" style="list-style-type:none;"><input type="checkbox" name="' . $Name . '">' . "\n";
- echo '<section style="margin-bottom:5px;">
- <div class="roundedOne">
- <input type="checkbox" value="None" id="roundedOne'.$j.'" name="' . $Name . '" />
- <label for="roundedOne'.$j.'"></label>';
-
- echo '<a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?ViewTopic=' . $Title . '" style="padding-left:1%";>' . $SubLinks[0] . '</a></li>' . "\n";
-
- echo '</div>
- </section>';
- } else {
- echo ' <li class="toc"><a href="#' . $Title . '">' . $SubLinks[0] . '</a></li>' . "\n";
+ echo ' style="list-style-type:none;"><input id="roundedOne', $j, '" name="', $Name, '" type="checkbox" value="None" /';
}
+ echo '>
+ <a href="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '?ViewTopic=', $Title, '">', $SubLinks[0], '</a></li>';
+ // List topic content:
if(count($SubLinks) > 1) {
- echo '<ul>' . "\n";
+ echo '<ul>';
foreach($SubLinks as $k => $SubName) {
- if($k == 0)
+ if($k == 0) {// Skip first array element $SubLinks[0].
continue;
- echo '<li>' . $SubName . '</li>' . "\n";
+ }
+ echo '<li>', $SubName, '</li>';
}
- echo '</ul>' . "\n";
+ echo '</ul>';
}
- echo '</ul>' . "\n";
+
+ echo '</ul>';
++$j;
}
- echo '</ul>' . "\n";
+ echo '</ul>',
+ '<p><input type="submit" name="Submit" value="', _('Display Checked'), '" /></p>',
+ '</form>';
}
-echo '</form>' . "\n";
if(!isset($_GET['ViewTopic'])) {
$_GET['ViewTopic'] = '';
@@ -151,8 +142,5 @@
}
ob_end_flush();
-// End old code ================================================================
-
-
// END: Procedure division -----------------------------------------------------
?>
\ No newline at end of file
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2017-03-29 15:43:41 UTC (rev 7744)
+++ trunk/doc/Change.log 2017-03-29 23:52:43 UTC (rev 7745)
@@ -1,5 +1,6 @@
webERP Change Log
+30/3/17 RChacon: In ManualContents.php, fix checkbox showing and do some improvements.
29/3/17 RChacon: In webERP manual, allow to use default pages if locale pages do not exist.
26/3/17 Abel World: Make degine $ReportList as an array to comply with PHP 7.
19/3/17 RChacon: Rename AccountSectionsDef.inc to AccountSectionsDef.php.
Modified: trunk/doc/Manual/style/manual.css
===================================================================
--- trunk/doc/Manual/style/manual.css 2017-03-29 15:43:41 UTC (rev 7744)
+++ trunk/doc/Manual/style/manual.css 2017-03-29 23:52:43 UTC (rev 7745)
@@ -1,3 +1,4 @@
+/* $Id: manual.css 7643 2016-10-07 15:28:49Z daintree $ */
/*
* manual.css used with the webERP manual
* http://web-erp.sourceforge.net
@@ -113,10 +114,10 @@
li.toc {
color:#03c;
}
-
+/*
input[type=checkbox] {
visibility:hidden;
-}
+}*/
p {
margin-left:2%;
@@ -124,4 +125,9 @@
}
pre {
font-size: 1.2em;
-}
\ No newline at end of file
+}
+
+.noprint {
+ display:none;
+ /* Remove unwanted elements. */
+}
|
|
From: <rc...@us...> - 2017-03-30 00:01:42
|
Revision: 7746
http://sourceforge.net/p/web-erp/reponame/7746
Author: rchacon
Date: 2017-03-30 00:01:39 +0000 (Thu, 30 Mar 2017)
Log Message:
-----------
Modified Paths:
--------------
trunk/ManualContents.php
trunk/doc/Manual/style/manual.css
Modified: trunk/ManualContents.php
===================================================================
--- trunk/ManualContents.php 2017-03-29 23:52:43 UTC (rev 7745)
+++ trunk/ManualContents.php 2017-03-30 00:01:39 UTC (rev 7746)
@@ -1,5 +1,5 @@
<?php
-/* $Id: ManualContents.php 5450 2009-12-24 15:28:49Z icedlava $ */
+/* $Id: ManualContents.php 7745 2017-03-29 23:52:43Z rchacon $ */
/* Shows the local manual content if available, else shows the manual content in en-GB. */
/* This program is under the GNU General Public License, last version. */
/* This creative work is under the CC BY-NC-SA, later version. */
@@ -36,7 +36,6 @@
}
ob_start();
-/*$PathPrefix = '../../';*/
// Output the header part:
$ManualHeader = 'locale/' . $Language . '/Manual/ManualHeader.html';
Modified: trunk/doc/Manual/style/manual.css
===================================================================
--- trunk/doc/Manual/style/manual.css 2017-03-29 23:52:43 UTC (rev 7745)
+++ trunk/doc/Manual/style/manual.css 2017-03-30 00:01:39 UTC (rev 7746)
@@ -1,4 +1,4 @@
-/* $Id: manual.css 7643 2016-10-07 15:28:49Z daintree $ */
+/* $Id: manual.css 7745 2017-03-29 23:52:43Z rchacon $ */
/*
* manual.css used with the webERP manual
* http://web-erp.sourceforge.net
|
|
From: <rc...@us...> - 2017-03-30 00:55:06
|
Revision: 7747
http://sourceforge.net/p/web-erp/reponame/7747
Author: rchacon
Date: 2017-03-30 00:55:03 +0000 (Thu, 30 Mar 2017)
Log Message:
-----------
Fix image's src.
Modified Paths:
--------------
trunk/ManualContents.php
trunk/doc/Manual/ManualAccountsPayable.html
trunk/doc/Manual/ManualCreditNotes.html
trunk/doc/Manual/ManualGeneralLedger.html
trunk/doc/Manual/ManualGettingStarted.html
trunk/doc/Manual/ManualInventory.html
trunk/doc/Manual/ManualMRP.html
trunk/doc/Manual/ManualMultilanguage.html
trunk/doc/Manual/ManualPurchaseOrdering.html
trunk/doc/Manual/ManualQualityAssurance.html
trunk/doc/Manual/ManualReportBuilder.html
trunk/doc/Manual/ManualSalesOrders.html
Modified: trunk/ManualContents.php
===================================================================
--- trunk/ManualContents.php 2017-03-30 00:01:39 UTC (rev 7746)
+++ trunk/ManualContents.php 2017-03-30 00:55:03 UTC (rev 7747)
@@ -120,7 +120,7 @@
}
$ManualPage = 'locale/' . $Language . '/Manual/Manual' . $Name;
if(!file_exists($ManualPage)) {// If locale topic page not exist, use topic page in doc/Manual.
- $ManualPage = 'doc/Manual' . $Name;
+ $ManualPage = 'doc/Manual/Manual' . $Name;
}
echo '<div id="manualpage">';
include($ManualPage);
@@ -142,4 +142,4 @@
ob_end_flush();
// END: Procedure division -----------------------------------------------------
-?>
\ No newline at end of file
+?>
Modified: trunk/doc/Manual/ManualAccountsPayable.html
===================================================================
--- trunk/doc/Manual/ManualAccountsPayable.html 2017-03-30 00:01:39 UTC (rev 7746)
+++ trunk/doc/Manual/ManualAccountsPayable.html 2017-03-30 00:55:03 UTC (rev 7747)
@@ -19,7 +19,7 @@
<li>Supplier payment run will create system entries to record payments for all suppliers with due amounts. Facilities allow for holding disputed invoices from being included in the payment run, but still recording costs in the general ledger.</li>
</ul>
<p>
-<img src="images/AccountsPayable.jpg"></p>
+<img src="doc/Manual/images/AccountsPayable.jpg"></p>
<!-- Help Begin: Suppliers -->
<div class="floatright"><a class="minitext" href="#top">⬆ Top</a></div>
Modified: trunk/doc/Manual/ManualCreditNotes.html
===================================================================
--- trunk/doc/Manual/ManualCreditNotes.html 2017-03-30 00:01:39 UTC (rev 7746)
+++ trunk/doc/Manual/ManualCreditNotes.html 2017-03-30 00:55:03 UTC (rev 7747)
@@ -6,16 +6,16 @@
<h3>Option 1 - Credit an Invoice</h3>
<p>From a customer inquiry select the invoice you wish to credit and click on the "credit invoice" icon (more usually used for
undo in word/excel etc)</p>
-<p><img src="images/CreditInvoiceSelectInvoice.png"></p>
+<p><img src="doc/Manual/images/CreditInvoiceSelectInvoice.png"></p>
<br />
<p>Now delete the lines you <b>DON'T</b> want to credit.....</p>
-<p><img src="images/CreditInvoiceDeleteLines.png"></p>
+<p><img src="doc/Manual/images/CreditInvoiceDeleteLines.png"></p>
<br />
<p>Now change the prices/quantities to the values you wish to credit....</p>
-<p><img src="images/CreditInvoiceDeleteLines.png"></p>
+<p><img src="doc/Manual/images/CreditInvoiceDeleteLines.png"></p>
<br />
<p>Now select the type of credit note. A credit note write off is used if you wish to write off the cost of some products which are not returned into stock. This then allows you to select a general ledger account after you click on update - say for breakages or a promo giveaway prize. The general ledger selection will only show once you clicked update selecting the "Goods Written Off" option. If you wish to reverse an overcharge, then this has no impact on the cost of sales in relation to the stock returned - no stock movement is created for a return of goods but the actual charge to sales is reduced by the amount of the credit note. A normal credit note is where the goods are "Returned to Stock".</p>
-<p><img src="images/CreateCreditNoteSelectType.png"></p>
+<p><img src="doc/Manual/images/CreateCreditNoteSelectType.png"></p>
<br />
<p>The advantage of option 1 above is that the allocation to the invoice is done automatically and items come up at the prices/discounts given on the invoice if you
have a long invoice to credit then this is a huge time-saver.</p>
@@ -22,7 +22,7 @@
<br />
<h3>Option 2 - Create Credit Note Manually</h3>
<p>1). Create the credit note manually from the main menu.</p>
-<p><img src="images/MenuCreateCreditNote.png"></p>
+<p><img src="doc/Manual/images/MenuCreateCreditNote.png"></p>
<p>Now select the customer, then you can then either enter the item code and quantity directly in the quick entry form or search for the item using the search parts facility.</p>
<p>Enter the value/quantity - and select the credit note type as per option 1 above.</p>
@@ -31,7 +31,7 @@
<h3>Allocation of Credits</h3>
<p>If you used option 2 to create the credit note then you need to now allocate the credit note to invoices again there are 2 methods</p>
<h3>Option 1:</h3>
-<p><img src="images/MenuOptionAllocateCredits.png"></p>
+<p><img src="doc/Manual/images/MenuOptionAllocateCredits.png"></p>
<p>This shows all receipts or credit notes that are outstanding to be
allocated against invoices. Select the credit note, the system then
shows all the outstanding invocies against the customer account and
@@ -38,10 +38,10 @@
you choose which invoices to allocate it to.</p>
<h3>Option 2:</h3>
<p>From the customer inquiry you can look at the transactions and click on the allocate link against any of the credits (or receipts) any existing allocation will show and these can be modified at any time</p>
-<p><img src="images/SelectCreditToAllocate.png"></p>
+<p><img src="doc/Manual/images/SelectCreditToAllocate.png"></p>
<p>In this example - because the credit note was created from the credit invoice link - the
allocation has already been done (see the balance of the transaction
is 0), but if it weren't you would just select allocation link and
choose which invoices to allocate to.</p>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: trunk/doc/Manual/ManualGeneralLedger.html
===================================================================
--- trunk/doc/Manual/ManualGeneralLedger.html 2017-03-30 00:01:39 UTC (rev 7746)
+++ trunk/doc/Manual/ManualGeneralLedger.html 2017-03-30 00:55:03 UTC (rev 7747)
@@ -2,7 +2,7 @@
<h2>Overview</h2>
-<p>The general ledger is the accounting hub that is central to the "sub" ledgers for creditors (Accounts Payable), debtors (Accounts Receivable) and stock (inventory). All entries in the sub ledgers are also represented by entries in the general ledger. It is the integration set-up that determines how entries in the sub-ledgers are reflected in the general ledger. Most activity in the general ledger will be automatically created from the activity in the sub-ledgers with receivables, payables and stock administration.</p><img src="images/GLIntegration.jpg">
+<p>The general ledger is the accounting hub that is central to the "sub" ledgers for creditors (Accounts Payable), debtors (Accounts Receivable) and stock (inventory). All entries in the sub ledgers are also represented by entries in the general ledger. It is the integration set-up that determines how entries in the sub-ledgers are reflected in the general ledger. Most activity in the general ledger will be automatically created from the activity in the sub-ledgers with receivables, payables and stock administration.</p><img src="doc/Manual/images/GLIntegration.jpg">
<p>
<p>However, there are also facilities to:</p>
@@ -91,7 +91,7 @@
<p>Bank accounts are defined from the setup tab from the link to Bank Accounts Maintenance. There is facility to enter the name of the account, the currency of the account, the bank account number and the address of the bank if required, as well as selecting the general ledger account to which it refers. There are links to edit existing bank account records and to delete them. However, once defined as referring to a particular general ledger code it is not possible to change the general ledger code of the bank account. This is because there would be entries made to this account. Similarly, if bank transactions have been created using this bank account it is not possible to delete it. The bank account transactions must be purged first (but currently no facility exists to purge bank transactions). It is not possible to change the currency of a bank account once there are transactions against it.</p>
-<p>Once all receipts and payments are matched to bank statements, the bank reconciliation statement can be printed which should show how the current general ledger balance reconciles to the bank statement for this account. The reconciliation also has an option available for bank accounts set up in other than the functional currency of the business (local currency), to post differences in exchange. The balance of the account is maintained in local currency in the general ledger and for the purposes of the bank reconciliation this is converted to the bank account currency at the exchange rate in the currencies table (see Setup -> Currency Maintenance) - this rate can be changed manually to the rate of the day and the foreign currency balance on the account will change - to correct this balance an exchange difference needs to be recorded. Having worked through the matching of receipts and payments to the bank statements - the bank statment balance can be entered to compare against the system balance - a correcting entry is then made to the GL to post the difference on exchange. The posting to the general ledger is back dated to the end of the preceeding month - since it is assumed that the reconciliation may be a few days or a week behind the current date.</p><img src="images/BankReconciliation.jpg"> <!-- Help End: BankAccounts -->
+<p>Once all receipts and payments are matched to bank statements, the bank reconciliation statement can be printed which should show how the current general ledger balance reconciles to the bank statement for this account. The reconciliation also has an option available for bank accounts set up in other than the functional currency of the business (local currency), to post differences in exchange. The balance of the account is maintained in local currency in the general ledger and for the purposes of the bank reconciliation this is converted to the bank account currency at the exchange rate in the currencies table (see Setup -> Currency Maintenance) - this rate can be changed manually to the rate of the day and the foreign currency balance on the account will change - to correct this balance an exchange difference needs to be recorded. Having worked through the matching of receipts and payments to the bank statements - the bank statment balance can be entered to compare against the system balance - a correcting entry is then made to the GL to post the difference on exchange. The posting to the general ledger is back dated to the end of the preceeding month - since it is assumed that the reconciliation may be a few days or a week behind the current date.</p><img src="doc/Manual/images/BankReconciliation.jpg"> <!-- Help End: BankAccounts -->
<!-- Help Begin: Payments -->
<div class="floatright">
@@ -462,4 +462,4 @@
<p>.</p-->
<h3><a id="GLTagsMaintenance">GL Tags (maintenance)</a></h3>
-<p>This software allows the use of accounting tags to help you track specific units within your organization. You can set up any quantity of accounting tags. In this way, you can group transactions and assign them to cost centres, profit centres, activities centres, divisions, departments, or any units for which you need to produce a statement of comprehensive income for each "<i>tag</i>". See: <a href="#GLTags">GL Tags</a>.</p>
\ No newline at end of file
+<p>This software allows the use of accounting tags to help you track specific units within your organization. You can set up any quantity of accounting tags. In this way, you can group transactions and assign them to cost centres, profit centres, activities centres, divisions, departments, or any units for which you need to produce a statement of comprehensive income for each "<i>tag</i>". See: <a href="#GLTags">GL Tags</a>.</p>
Modified: trunk/doc/Manual/ManualGettingStarted.html
===================================================================
--- trunk/doc/Manual/ManualGettingStarted.html 2017-03-30 00:01:39 UTC (rev 7746)
+++ trunk/doc/Manual/ManualGettingStarted.html 2017-03-30 00:55:03 UTC (rev 7747)
@@ -51,17 +51,17 @@
<li>Enter the URL for the new webERP directory into your web browser, and the installer welcome screen will display:</li>
<li style="list-style: none; display: inline">
- <p align="center"><img src="images/Installer_1.jpg"></p>
+ <p align="center"><img src="doc/Manual/images/Installer_1.jpg"></p>
</li>
<li>The installer welcome screen provides information on the type of messages you might receive during installation. At this page, you must also select your preferred language from the drop down selection box. Click on Next Step to go to the next phase of installation.</li>
<li style="list-style: none; display: inline">
- <p align="center"><img src="images/Installer_1a.jpg"></p>
+ <p align="center"><img src="doc/Manual/images/Installer_1a.jpg"></p>
</li>
<li>The installer checks that all the pre-requistes are met for an installation. You will note from the screen shot above that this installation does not have sufficient privileges to install webERP because the web server is unable to write to the webERP directory. <b>It is necessary to change the permissions on the directory where webERP is installed to ensure that the user that the web-server runs as is able to write a new configuration file to the web space.</b> Cpanel and Plesk have facilities to enable this change to the permissions. Any error messages displayed in red need to be resolved before the installation can proceed. Do not attempt to run the installer while red messages persist. Fix the error and then click on Check Again to restart from the prior step.</li>
<li style="list-style: none; display: inline">
- <p align="center"><img src="images/Installer_2.jpg"></p>
+ <p align="center"><img src="doc/Manual/images/Installer_2.jpg"></p>
</li>
<li>If your web server fulfills all requirements for the installation, clicking on Next Step will display the Database Settings screen. Many of the fields required will be populated correctly by default - but all entries should be reviewed to ensure that they are correct. The installer will not be able to determine the host (computer) where the mysql database server is installed and this must be entered. Help appears when you click into an input field.</li>
@@ -68,7 +68,7 @@
<li>The user name and the password to the mysql database server are also required. The mysql database user must have permission to create a database and tables. Once the required information is entered and checked, click on Next Screen to continue.</li>
<li style="list-style: none; display: inline">
- <p align="center"><img src="images/Installer_3.jpg"></p>
+ <p align="center"><img src="doc/Manual/images/Installer_3.jpg"></p>
</li>
<li>The next installer screen displays Company Settings, Options and Administrator Account settings. The name of the company entered in the installer screen will be used in the log in screen and in various reports and screens in your final webERP instsallation.</li>
@@ -369,7 +369,7 @@
<p>To change the language displayed for a specific user - the user clicks on their name as shown on every screen at the top of the page. This brings up their user settings.</p>
-<p align="center"><img src="images/UserSettings.jpg"></p>webERP looks at all the directories available under webERP/locale to see which languages are installed and provides a convenient way for users to select their preferred language. In addition to selecting the language it is also necessary to select the fonts required for pdf support in the selected language.
+<p align="center"><img src="doc/Manual/images/UserSettings.jpg"></p>webERP looks at all the directories available under webERP/locale to see which languages are installed and provides a convenient way for users to select their preferred language. In addition to selecting the language it is also necessary to select the fonts required for pdf support in the selected language.
<p>
<p>PDFs are produced in utf-8 character set which has 4 bytes for each character. Unfortunately, the CID fonts used in PDFs only have 2 bytes so there is required to be some mapping of CID characters to utf-8 fonts to make everything work. In practise all this means is that the correct language needs also to be selected for the PDF language.</p>
Modified: trunk/doc/Manual/ManualInventory.html
===================================================================
--- trunk/doc/Manual/ManualInventory.html 2017-03-30 00:01:39 UTC (rev 7746)
+++ trunk/doc/Manual/ManualInventory.html 2017-03-30 00:55:03 UTC (rev 7747)
@@ -326,7 +326,7 @@
<li>Weighted Average Costing</li>
</ul>
<p>To choose the costing mode the System Parameter must be changed from the Main Menu -> Setup tab -> System Parameters</p>
- <p><img src="images/SystemParameterCosting.jpg" alt="system parameters costing flag screen" /></p>
+ <p><img src="doc/Manual/images/SystemParameterCosting.jpg" alt="system parameters costing flag screen" /></p>
<h3>Standard Costing</h3>
<p>Standard costing is used in situations where costs do vary and a middle ground standard is adopted - variances away from the standard are reported as price variances. Standard costing is particularly relevant to importers and manufacturers where exchange rate, freight and manufacturing costs and volumes vary making each item have different costs.</p>
@@ -517,7 +517,7 @@
<p>A table of locations is maintained which contains a location code of 5 characters and the location description (up to 20 characters).</p>
<p>Inventory locations are the factories or warehouses where inventory is stored. When a sales order is created the location from which the inventory is to be picked is specified. Also, when a work order is created it is created on a specific location - in this case a manufacturing facility. Every transaction involving inventory must specify the location.</p>
<p>To create or modify inventory locations go to the Main Menu -> Setup -> Inventory Setup tab and select Inventory Location Maintenance</p>
- <p><img src="images/InventoryLocations.png" alt="Inventory Locations" /></p>
+ <p><img src="doc/Manual/images/InventoryLocations.png" alt="Inventory Locations" /></p>
<p>The description is the field used in lookups on invoicing and crediting. To keep the database as compact as possible it is the code which is stored against stock movement transactions. As many locations as required can be set up. When a new location is defined, location records for all items in the database are created. When a location is deleted, so too are all the item location records. However, a location record cannot be deleted if there are stock movements or stock held for any part in the location.</p>
<p>When creating a purchase order, the inventory location that it is required for is specified. The inventory location address and contact details defined here are used as the default addresses available for delivery of goods ordered on purchase orders.</p>
@@ -580,7 +580,7 @@
<p>With the release of 4.11.3 only users with appropriate permissions can process transactions involving a location. This requires that users are specifically given access to individual locations.</p>
<p>Normally to modifiy the users that have access to a location requires system administrator access.</p>
<p>From the Main Menu -> Inventory Setup Tab -> Inventory Location Authorised Users Maintenance</p>
- <p><img src="images/LocationUsers.jpg" alt="Inventory Authorised Users Maintenance" /></p>
+ <p><img src="doc/Manual/images/LocationUsers.jpg" alt="Inventory Authorised Users Maintenance" /></p>
<p>This screen allows you to select a location and see the users that are authorised to access and create transactions. You can add users are required.</p>
<!-- Help End: Inventory Location Authorised Users Maintenance -->
@@ -592,7 +592,7 @@
<h2><a id="InventoryAdjustments">Inventory Adjustments</a></h2>
<p>Inventory can be written on or off for individual stock items using this option. Corrections to physical stocks and deliveries of stock can be entered using this option. Adjustments can be entered by selecting the link on the SelectProduct.php page.</p>
- <p><img src="images/StockAdjustment.jpg" alt="Stock Adjustment Screen" /></p>
+ <p><img src="doc/Manual/images/StockAdjustment.jpg" alt="Stock Adjustment Screen" /></p>
<p>Ajustments can also be created directly from the main menu under transactions. Using the second link, the item code must be known and entered, there is no facility to select an item code from this page.</p>
<p>If Stock GL integration is enabled from the company preferences page (under the setup tab), then the system creates the necessary journals in the general ledger to update the stock account and the profit and loss account stock adjustment account specified in the stock category record. (see Inventory Categories above and also see General Ledger Integration later)</p>
Modified: trunk/doc/Manual/ManualMRP.html
===================================================================
--- trunk/doc/Manual/ManualMRP.html 2017-03-30 00:01:39 UTC (rev 7746)
+++ trunk/doc/Manual/ManualMRP.html 2017-03-30 00:55:03 UTC (rev 7747)
@@ -30,7 +30,7 @@
<p>To avoid situations where, based upon a part’s need (required) date minus its lead time, MRP might schedule a part for a day where the business is closed, a Manufacturing Calendar of valid dates can be created. This is done under the Setup menu – Inventory Setup - MRP Available Production Days.</p>
-<p align="center"><img src="images/MRPCalendar.jpg"></p>
+<p align="center"><img src="doc/Manual/images/MRPCalendar.jpg"></p>
<p>To initially create the calendar, enter the From Date and To Date, click on any days of the week you wish to exclude, and press the Create Calendar button. After that, you can enter individual dates in the Change Date Status field and press UPDATE to change that date’s status from valid to invalid or invalid to valid. Entering a From Date and To Date and pressing List Date Range will display all the days in the range and show “YES” if they are valid manufacturing days and “NO” if they are not. When creating the calendar, the date range should extend beyond the planning period you are using for MRP, and keep in mind that the Create Calendar button will purge any previously entered calendar.</p>
@@ -46,13 +46,13 @@
<p>The first, Master Schedule, allows for entering, editing, and deleting individual demands, and also for the listing of demands by part number or Demand Type, and the deletion by Demand Type.</p>
-<p align="center"><img src="images/MRPDemands.jpg"></p>
+<p align="center"><img src="doc/Manual/images/MRPDemands.jpg"></p>
<p>To enter a demand, type in the part number, quantity, and due date, select the Demand Type, and press the Enter Information button. Pressing the List Selection button displays multiple records. If the part number field is blank, all demands for the selected Demand Type will be displayed. If a part number is entered, all demands for that part number will be displayed. When the demands are displayed, there are buttons to press to edit or delete that particular demand. Pressing the Delete Demand Type button deletes all demands for the selected Demand Type.</p>
<p>The Master Schedule can be generated automatically using the Auto Create Master Schedule script - this generates multiple demands from sales orders based on the selection criteria entered.</p>
-<p align="center"><img src="images/MRPCreateDemands.jpg"></p>
+<p align="center"><img src="doc/Manual/images/MRPCreateDemands.jpg"></p>
<p>First, select the Demand Type for the demands that are to be created. Next, enter the selection criteria for the sales orders, which would be the inventory category, inventory location, and the date range for the sales orders. Next, enter the Start Date for Distribution, which is the due date for the first demand record that will be created, and then select the type of distribution period – weekly or monthly – and the number of periods the total quantity will be distributed over. Parts can be excluded based on their total quantity or the sales amount. A Multiplier can be used that multiplies the total quantity for each part by that number; an example of its usage would a case where you wanted to create demands for the next 18 months, but rather than just entering a date range for the previous 18 months, you entered a date range for the last 6 months and used a Multiplier of 3 so that it would use the latest sales patterns. To clarify how the whole program works, the user enters the selection criteria for the sales orders, the program finds the total quantity for each part, and then creates demand records that distribute that quantity for the type and number of periods entered. If a part had a total quantity of 12 and the number of periods selected was 12, 12 records with a quantity of 1 would be created; if the total quantity were 3, records with a quantity of 1 for the first 3 periods would be created; if the total were 15, the first 3 records would have a quantity of 2 and the last 9 would have a quantity of 1. After the demands are created, they can be edited or deleted using the Master Schedule program, selecting either by part number or Demand Type.</p>
@@ -82,7 +82,7 @@
<p>The MRP calculation is under Manufacturing -> MRP Calculation.</p>
-<p align="center"><img src="images/MRP.jpg"></p>
+<p align="center"><img src="doc/Manual/images/MRP.jpg"></p>
<p>The program displays the last time MRP was run and the parameters that were selected for that run. There are check boxes to specify if MRP Demands are used in calculating the MRP and also if the EOQ, pan size, or shrinkage factor are used. The inventory location that should be used for the quantity on hand can be selected. Days leeway can also be entered and is used to determine if a purchase order or work order should be rescheduled; if the difference between a requirement date and the due date of the purchase order or work order is within the days leeway, then the order is not shown to need rescheduling.</p>
@@ -98,6 +98,6 @@
<p>MRP produces several reports that are under Manufacturing -> Inquiries and Reports. MRP Reschedules Required shows the work orders and purchase orders that, according to the MRP, need to have adjustments made to their due dates. MRP Suggested Purchase Orders and MRP Suggested Work Orders show the orders that MRP has determined should be created to cover demands. MRP Shortages shows all of the parts that have an insufficient quantity to satisfy demand. One thing to keep in mind about this report is that if there is a shortage of a top level assembly, it shows on the report as well as the parts that make it up, so the total dollar amounts might be doubled. The inquiry simply called MRP is used to display all of the supply and demand information for a part.</p>
-<p align="center"><img src="images/MRP_Report.jpg"></p>
+<p align="center"><img src="doc/Manual/images/MRP_Report.jpg"></p>
<p>The top part of the display shows total gross requirements, open orders, planned orders, and projected quantity available in weekly buckets. The left part of the bottom section shows the source of all demand for the item, and the right part of the bottom section shows all available supply and all supply that MRP suggests should be created to cover demand. All of these reports use the tables created by MRP, so if a new purchase order or work order is created, it and any effect it might have will not show up in the reports unless the MRP is run again.</p><!-- Help End: MRP -->
Modified: trunk/doc/Manual/ManualMultilanguage.html
===================================================================
--- trunk/doc/Manual/ManualMultilanguage.html 2017-03-30 00:01:39 UTC (rev 7746)
+++ trunk/doc/Manual/ManualMultilanguage.html 2017-03-30 00:55:03 UTC (rev 7747)
@@ -2,7 +2,7 @@
<p>webERP can be translated to any language so that the entire web-interface is displayed in the language of any user. The system can display different languages for different users - all at the same time - depending on the setting of the language in the individual users' settings.</p>
<p>Each user can select their language by clicking on their user name at the top left of every screen immediately to the right of the company name. Clicking on your user name this brings up the user settings screen below:</p>
-<img src="images/UserSettings.png" alt="User Settings Screen" />
+<img src="doc/Manual/images/UserSettings.png" alt="User Settings Screen" />
<p>A dropdown box displaying all the available translations is available. Also, the character set of PDFs must also be selected from the 3 choices to create small portable pdf files using the CID fonts bundled with webERP. The preferred user display theme can also be selected from this screen.</p>
<h2>Other Language Translations</h2>
Modified: trunk/doc/Manual/ManualPurchaseOrdering.html
===================================================================
--- trunk/doc/Manual/ManualPurchaseOrdering.html 2017-03-30 00:01:39 UTC (rev 7746)
+++ trunk/doc/Manual/ManualPurchaseOrdering.html 2017-03-30 00:55:03 UTC (rev 7747)
@@ -20,7 +20,7 @@
<p>It is necessary to create purchase orders to receive stock. Stock cannot be received in without an order - except by entering a stock adjustment. The receiving of stock creates a GRN - Goods Received N...
[truncated message content] |
|
From: <rc...@us...> - 2017-04-09 20:10:25
|
Revision: 7749
http://sourceforge.net/p/web-erp/reponame/7749
Author: rchacon
Date: 2017-04-09 20:10:23 +0000 (Sun, 09 Apr 2017)
Log Message:
-----------
In UserSettings.php, add options to turn off/on page help and field help. In WWW_Users.php, improve code and documentation.
Modified Paths:
--------------
trunk/UserSettings.php
trunk/WWW_Users.php
trunk/doc/Change.log
trunk/doc/Manual/ManualGettingStarted.html
Modified: trunk/UserSettings.php
===================================================================
--- trunk/UserSettings.php 2017-04-02 13:36:01 UTC (rev 7748)
+++ trunk/UserSettings.php 2017-04-09 20:10:23 UTC (rev 7749)
@@ -18,8 +18,7 @@
_('Chinese'),
_('Free Serif'));
-
-if (isset($_POST['Modify'])) {
+if(isset($_POST['Modify'])) {
// no input errors assumed initially before we test
$InputError = 0;
@@ -64,38 +63,38 @@
SET displayrecordsmax='" . $_POST['DisplayRecordsMax'] . "',
theme='" . $_POST['Theme'] . "',
language='" . $_POST['Language'] . "',
- email='". $_POST['email'] ."',
+ email='" . $_POST['email'] . "',
+ showpagehelp='" . $_POST['ShowPageHelp'] . "',
+ showfieldhelp='" . $_POST['ShowFieldHelp'] . "',
pdflanguage='" . $_POST['PDFLanguage'] . "'
WHERE userid = '" . $_SESSION['UserID'] . "'";
-
$ErrMsg = _('The user alterations could not be processed because');
$DbgMsg = _('The SQL that was used to update the user and failed was');
-
$result = DB_query($sql, $ErrMsg, $DbgMsg);
-
prnMsg( _('The user settings have been updated') . '. ' . _('Be sure to remember your password for the next time you login'),'success');
} else {
$sql = "UPDATE www_users
- SET displayrecordsmax='" . $_POST['DisplayRecordsMax'] . "',
- theme='" . $_POST['Theme'] . "',
- language='" . $_POST['Language'] . "',
- email='". $_POST['email'] ."',
- pdflanguage='" . $_POST['PDFLanguage'] . "',
- password='" . CryptPass($_POST['Password']) . "'
- WHERE userid = '" . $_SESSION['UserID'] . "'";
-
+ SET displayrecordsmax='" . $_POST['DisplayRecordsMax'] . "',
+ theme='" . $_POST['Theme'] . "',
+ language='" . $_POST['Language'] . "',
+ email='" . $_POST['email'] ."',
+ showpagehelp='" . $_POST['ShowPageHelp'] . "',
+ showfieldhelp='" . $_POST['ShowFieldHelp'] . "',
+ pdflanguage='" . $_POST['PDFLanguage'] . "',
+ password='" . CryptPass($_POST['Password']) . "'
+ WHERE userid = '" . $_SESSION['UserID'] . "'";
$ErrMsg = _('The user alterations could not be processed because');
$DbgMsg = _('The SQL that was used to update the user and failed was');
-
$result = DB_query($sql, $ErrMsg, $DbgMsg);
-
prnMsg(_('The user settings have been updated'),'success');
}
- // update the session variables to reflect user changes on-the-fly
+ // Update the session variables to reflect user changes on-the-fly:
$_SESSION['DisplayRecordsMax'] = $_POST['DisplayRecordsMax'];
$_SESSION['Theme'] = trim($_POST['Theme']); /*already set by session.inc but for completeness */
$Theme = $_SESSION['Theme'];
$_SESSION['Language'] = trim($_POST['Language']);
+ $_SESSION['ShowPageHelp'] = $_POST['ShowPageHelp'];
+ $_SESSION['ShowFieldHelp'] = $_POST['ShowFieldHelp'];
$_SESSION['PDFLanguage'] = $_POST['PDFLanguage'];
include ('includes/LanguageSetup.php'); // After last changes in LanguageSetup.php, is it required to update?
}
@@ -106,9 +105,7 @@
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
If (!isset($_POST['DisplayRecordsMax']) OR $_POST['DisplayRecordsMax']=='') {
-
- $_POST['DisplayRecordsMax'] = $_SESSION['DefaultDisplayRecordsMax'];
-
+ $_POST['DisplayRecordsMax'] = $_SESSION['DefaultDisplayRecordsMax'];
}
echo '<table class="selection">
@@ -185,24 +182,60 @@
<tr>
<td>' . _('Email') . ':</td>';
-$sql = "SELECT email from www_users WHERE userid = '" . $_SESSION['UserID'] . "'";
+$sql = "SELECT
+ email,
+ showpagehelp,
+ showfieldhelp
+ from www_users WHERE userid = '" . $_SESSION['UserID'] . "'";
$result = DB_query($sql);
$myrow = DB_fetch_array($result);
+
if(!isset($_POST['email'])){
$_POST['email'] = $myrow['email'];
}
+$_POST['ShowPageHelp'] = $myrow['showpagehelp'];
+$_POST['ShowFieldHelp'] = $myrow['showfieldhelp'];
echo '<td><input type="email" name="email" size="40" value="' . $_POST['email'] . '" /></td>
</tr>';
+// Turn off/on page help:
+echo '<tr>
+ <td><label for="ShowPageHelp">', _('Display page help'), ':</label></td>
+ <td><select id="ShowPageHelp" name="ShowPageHelp">';
+if($_POST['ShowPageHelp']==0) {
+ echo '<option selected="selected" value="0">', _('No'), '</option>',
+ '<option value="1">', _('Yes'), '</option>';
+} else {
+ echo '<option value="0">', _('No'), '</option>',
+ '<option selected="selected" value="1">', _('Yes'), '</option>';
+}
+echo '</select>',
+ (!isset($_SESSION['ShowFieldHelp']) || $_SESSION['ShowFieldHelp'] ? _('Show page help when available') : ''), // If the parameter $_SESSION['ShowFieldHelp'] is not set OR is TRUE, shows this field help text.
+ '</td>
+ </tr>';
+// Turn off/on field help:
+echo '<tr>
+ <td><label for="ShowFieldHelp">', _('Display field help'), ':</label></td>
+ <td><select id="ShowFieldHelp" name="ShowFieldHelp">';
+if($_POST['ShowFieldHelp']==0) {
+ echo '<option selected="selected" value="0">', _('No'), '</option>',
+ '<option value="1">', _('Yes'), '</option>';
+} else {
+ echo '<option value="0">', _('No'), '</option>',
+ '<option selected="selected" value="1">', _('Yes'), '</option>';
+}
+echo '</select>',
+ (!isset($_SESSION['ShowFieldHelp']) || $_SESSION['ShowFieldHelp'] ? _('Show field help when available') : ''), // If the parameter $_SESSION['ShowFieldHelp'] is not set OR is TRUE, shows this field help text.
+ '</td>
+ </tr>';
+// PDF Language Support:
if (!isset($_POST['PDFLanguage'])){
$_POST['PDFLanguage']=$_SESSION['PDFLanguage'];
}
-
echo '<tr>
<td>' . _('PDF Language Support') . ': </td>
<td><select name="PDFLanguage">';
-
for($i=0;$i<count($PDFLanguages);$i++){
if ($_POST['PDFLanguage']==$i){
echo '<option selected="selected" value="' . $i .'">' . $PDFLanguages[$i] . '</option>';
Modified: trunk/WWW_Users.php
===================================================================
--- trunk/WWW_Users.php 2017-04-02 13:36:01 UTC (rev 7748)
+++ trunk/WWW_Users.php 2017-04-09 20:10:23 UTC (rev 7749)
@@ -46,10 +46,10 @@
_('Display Setup module'),
_('Display Utilities module'));
-$PDFLanguages = array(_('Latin Western Languages'),
- _('Eastern European Russian Japanese Korean Vietnamese Hebrew Arabic Thai'),
- _('Chinese'),
- _('Free Serif'));
+$PDFLanguages = array(_('Latin Western Languages - Times'),
+ _('Eastern European Russian Japanese Korean Hebrew Arabic Thai'),
+ _('Chinese'),
+ _('Free Serif'));
include('includes/SQL_CommonFunctions.inc');
@@ -185,47 +185,52 @@
} elseif($InputError !=1) {
- $sql = "INSERT INTO www_users (userid,
- realname,
- customerid,
- branchcode,
- supplierid,
- salesman,
- password,
- phone,
- email,
- pagesize,
- fullaccess,
- cancreatetender,
- defaultlocation,
- modulesallowed,
- displayrecordsmax,
- theme,
- language,
- pdflanguage,
- department)
- VALUES ('" . $_POST['UserID'] . "',
- '" . $_POST['RealName'] ."',
- '" . $_POST['Cust'] ."',
- '" . $_POST['BranchCode'] ."',
- '" . $_POST['SupplierID'] ."',
- '" . $_POST['Salesman'] . "',
- '" . CryptPass($_POST['Password']) ."',
- '" . $_POST['Phone'] . "',
- '" . $_POST['Email'] ."',
- '" . $_POST['PageSize'] ."',
- '" . $_POST['Access'] . "',
- '" . $_POST['CanCreateTender'] . "',
- '" . $_POST['DefaultLocation'] ."',
- '" . $ModulesAllowed . "',
- '" . $_SESSION['DefaultDisplayRecordsMax'] . "',
- '" . $_POST['Theme'] . "',
- '". $_POST['UserLanguage'] ."',
- '" . $_POST['PDFLanguage'] . "',
- '" . $_POST['Department'] . "')";
+ $sql = "INSERT INTO www_users (
+ userid,
+ realname,
+ customerid,
+ branchcode,
+ supplierid,
+ salesman,
+ password,
+ phone,
+ email,
+ pagesize,
+ fullaccess,
+ cancreatetender,
+ defaultlocation,
+ modulesallowed,
+ showdashboard,
+ showpagehelp,
+ showfieldhelp,
+ displayrecordsmax,
+ theme,
+ language,
+ pdflanguage,
+ department)
+ VALUES ('" . $_POST['UserID'] . "',
+ '" . $_POST['RealName'] ."',
+ '" . $_POST['Cust'] ."',
+ '" . $_POST['BranchCode'] ."',
+ '" . $_POST['SupplierID'] ."',
+ '" . $_POST['Salesman'] . "',
+ '" . CryptPass($_POST['Password']) ."',
+ '" . $_POST['Phone'] . "',
+ '" . $_POST['Email'] ."',
+ '" . $_POST['PageSize'] ."',
+ '" . $_POST['Access'] . "',
+ '" . $_POST['CanCreateTender'] . "',
+ '" . $_POST['DefaultLocation'] ."',
+ '" . $ModulesAllowed . "',
+ '" . $_POST['ShowDashboard'] . "',
+ '" . $_POST['ShowPageHelp'] . "',
+ '" . $_POST['ShowFieldHelp'] . "',
+ '" . $_SESSION['DefaultDisplayRecordsMax'] . "',
+ '" . $_POST['Theme'] . "',
+ '". $_POST['UserLanguage'] ."',
+ '" . $_POST['PDFLanguage'] . "',
+ '" . $_POST['Department'] . "')";
prnMsg( _('A new user record has been inserted'), 'success' );
- $_SESSION['ShowPageHelp'] = $_POST['ShowPageHelp'];
- $_SESSION['ShowFieldHelp'] = $_POST['ShowFieldHelp'];
$LocationSql = "INSERT INTO locationusers (loccode,
userid,
@@ -404,30 +409,31 @@
if(isset($SelectedUser)) {
//editing an existing User
- $sql = "SELECT userid,
- realname,
- phone,
- email,
- customerid,
- password,
- branchcode,
- supplierid,
- salesman,
- pagesize,
- fullaccess,
- cancreatetender,
- defaultlocation,
- modulesallowed,
- showdashboard,
- showpagehelp,
- showfieldhelp,
- blocked,
- theme,
- language,
- pdflanguage,
- department
- FROM www_users
- WHERE userid='" . $SelectedUser . "'";
+ $sql = "SELECT
+ userid,
+ realname,
+ phone,
+ email,
+ customerid,
+ password,
+ branchcode,
+ supplierid,
+ salesman,
+ pagesize,
+ fullaccess,
+ cancreatetender,
+ defaultlocation,
+ modulesallowed,
+ showdashboard,
+ showpagehelp,
+ showfieldhelp,
+ blocked,
+ theme,
+ language,
+ pdflanguage,
+ department
+ FROM www_users
+ WHERE userid='" . $SelectedUser . "'";
$result = DB_query($sql);
$myrow = DB_fetch_array($result);
@@ -445,12 +451,12 @@
$_POST['CanCreateTender'] = $myrow['cancreatetender'];
$_POST['DefaultLocation'] = $myrow['defaultlocation'];
$_POST['ModulesAllowed'] = $myrow['modulesallowed'];
- $_POST['Theme'] = $myrow['theme'];
- $_POST['UserLanguage'] = $myrow['language'];
$_POST['ShowDashboard'] = $myrow['showdashboard'];
$_POST['ShowPageHelp'] = $myrow['showpagehelp'];
$_POST['ShowFieldHelp'] = $myrow['showfieldhelp'];
$_POST['Blocked'] = $myrow['blocked'];
+ $_POST['Theme'] = $myrow['theme'];
+ $_POST['UserLanguage'] = $myrow['language'];
$_POST['PDFLanguage'] = $myrow['pdflanguage'];
$_POST['Department'] = $myrow['department'];
@@ -485,6 +491,9 @@
$_POST['ModulesAllowed'] .= '1';
$i++;
}
+ $_POST['ShowDashboard'] = 0;
+ $_POST['ShowPageHelp'] = 1;
+ $_POST['ShowFieldHelp'] = 1;
}
if(!isset($_POST['Password'])) {
@@ -718,45 +727,48 @@
$i++;
}// END foreach($ModuleList as $ModuleName).
+// Turn off/on dashboard after Login:
echo '<tr>
<td><label for="ShowDashboard">', _('Display Dashboard after Login'), ':</label></td>
<td><select id="ShowDashboard" name="ShowDashboard">';
if($_POST['ShowDashboard']==0) {
- echo '<option selected="selected" value="0">' . _('No') . '</option>',
+ echo '<option selected="selected" value="0">', _('No'), '</option>',
'<option value="1">', _('Yes'), '</option>';
} else {
echo '<option value="0">', _('No'), '</option>',
- '<option selected="selected" value="1">' . _('Yes') . '</option>';
+ '<option selected="selected" value="1">', _('Yes'), '</option>';
}
echo '</select></td>
</tr>';
-
// Turn off/on page help:
echo '<tr>
<td><label for="ShowPageHelp">', _('Display page help'), ':</label></td>
<td><select id="ShowPageHelp" name="ShowPageHelp">';
if($_POST['ShowPageHelp']==0) {
- echo '<option selected="selected" value="0">' . _('No') . '</option>',
+ echo '<option selected="selected" value="0">', _('No'), '</option>',
'<option value="1">', _('Yes'), '</option>';
} else {
echo '<option value="0">', _('No'), '</option>',
- '<option selected="selected" value="1">' . _('Yes') . '</option>';
+ '<option selected="selected" value="1">', _('Yes'), '</option>';
}
-echo '</select></td>
+echo '</select>',
+ (!isset($_SESSION['ShowFieldHelp']) || $_SESSION['ShowFieldHelp'] ? _('Show page help when available') : ''), // If the parameter $_SESSION['ShowFieldHelp'] is not set OR is TRUE, shows this field help text.
+ '</td>
</tr>';
-
// Turn off/on field help:
echo '<tr>
<td><label for="ShowFieldHelp">', _('Display field help'), ':</label></td>
<td><select id="ShowFieldHelp" name="ShowFieldHelp">';
if($_POST['ShowFieldHelp']==0) {
- echo '<option selected="selected" value="0">' . _('No') . '</option>',
+ echo '<option selected="selected" value="0">', _('No'), '</option>',
'<option value="1">', _('Yes'), '</option>';
} else {
echo '<option value="0">', _('No'), '</option>',
- '<option selected="selected" value="1">' . _('Yes') . '</option>';
+ '<option selected="selected" value="1">', _('Yes'), '</option>';
}
-echo '</select></td>
+echo '</select>',
+ (!isset($_SESSION['ShowFieldHelp']) || $_SESSION['ShowFieldHelp'] ? _('Show field help when available') : ''), // If the parameter $_SESSION['ShowFieldHelp'] is not set OR is TRUE, shows this field help text.
+ '</td>
</tr>';
if(!isset($_POST['PDFLanguage'])) {
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2017-04-02 13:36:01 UTC (rev 7748)
+++ trunk/doc/Change.log 2017-04-09 20:10:23 UTC (rev 7749)
@@ -1,5 +1,6 @@
webERP Change Log
+09/4/17 RChacon: In UserSettings.php, add options to turn off/on page help and field help. In WWW_Users.php, improve code and documentation.
30/3/17 RChacon: In ManualContents.php, fix checkbox showing and do some improvements.
29/3/17 RChacon: In webERP manual, allow to use default pages if locale pages do not exist.
26/3/17 Abel World: Make degine $ReportList as an array to comply with PHP 7.
Modified: trunk/doc/Manual/ManualGettingStarted.html
===================================================================
--- trunk/doc/Manual/ManualGettingStarted.html 2017-04-02 13:36:01 UTC (rev 7748)
+++ trunk/doc/Manual/ManualGettingStarted.html 2017-04-09 20:10:23 UTC (rev 7749)
@@ -369,9 +369,16 @@
<p>To change the language displayed for a specific user - the user clicks on their name as shown on every screen at the top of the page. This brings up their user settings.</p>
-<p align="center"><img src="doc/Manual/images/UserSettings.jpg"></p>webERP looks at all the directories available under webERP/locale to see which languages are installed and provides a convenient way for users to select their preferred language. In addition to selecting the language it is also necessary to select the fonts required for pdf support in the selected language.
-<p>
+<p align="center"><img src="doc/Manual/images/UserSettings.jpg"></p>
+<p>webERP looks at all the directories available under webERP/locale to see which languages are installed and provides a convenient way for users to select their preferred language. In addition to selecting the language it is also necessary to select the fonts required for pdf support in the selected language.</p>
+
+<p><b>Display Dashboard after Login.</b> Select "Yes" to show the dashboard page after Login, otherwise "No" to do not. This page shows overdue customer balances, supplier invoices due within one month, bank and credit card balances, and outstanding orders. Default: no.</p>
+
+<p><b>Display page help.</b> Select "Yes" to show the page help when available, otherwise "No" to hide it. This help is displayed at the top of the page in a box. Default: yes.</p>
+
+<p><b>Display field help.</b> Select "Yes" to show the field help when available, otherwise "No" to hide it. This help is displayed next to the input field. Default: yes.</p>
+
<p>PDFs are produced in utf-8 character set which has 4 bytes for each character. Unfortunately, the CID fonts used in PDFs only have 2 bytes so there is required to be some mapping of CID characters to utf-8 fonts to make everything work. In practise all this means is that the correct language needs also to be selected for the PDF language.</p>
<p>If you are interested in contributing a language pack to webERP - which is always very much appreciated! There are instructions for how to proceed at http://www.weberp.org/wiki/HowToTranslate</p><!-- Help End: WWW_Users -->
|
|
From: <rc...@us...> - 2017-04-13 16:34:35
|
Revision: 7751
http://sourceforge.net/p/web-erp/reponame/7751
Author: rchacon
Date: 2017-04-13 16:34:26 +0000 (Thu, 13 Apr 2017)
Log Message:
-----------
Rename includes/footer.inc, includes/header.inc and includes/session.inc to includes/footer.php, includes/header.php
and includes/session.php.
Modified Paths:
--------------
trunk/AccountGroups.php
trunk/AccountSections.php
trunk/AddCustomerContacts.php
trunk/AddCustomerNotes.php
trunk/AddCustomerTypeNotes.php
trunk/AgedControlledInventory.php
trunk/AgedDebtors.php
trunk/AgedSuppliers.php
trunk/AnalysisHorizontalIncome.php
trunk/AnalysisHorizontalPosition.php
trunk/Areas.php
trunk/AuditTrail.php
trunk/AutomaticTranslationDescriptions.php
trunk/BOMExtendedQty.php
trunk/BOMIndented.php
trunk/BOMIndentedReverse.php
trunk/BOMInquiry.php
trunk/BOMListing.php
trunk/BOMs.php
trunk/BackupDatabase.php
trunk/BankAccountUsers.php
trunk/BankAccounts.php
trunk/BankMatching.php
trunk/BankReconciliation.php
trunk/COGSGLPostings.php
trunk/CollectiveWorkOrderCost.php
trunk/CompanyPreferences.php
trunk/ConfirmDispatchControlled_Invoice.php
trunk/ConfirmDispatch_Invoice.php
trunk/ContractBOM.php
trunk/ContractCosting.php
trunk/ContractOtherReqts.php
trunk/Contracts.php
trunk/CopyBOM.php
trunk/CounterReturns.php
trunk/CounterSales.php
trunk/CreditItemsControlled.php
trunk/CreditStatus.php
trunk/Credit_Invoice.php
trunk/Currencies.php
trunk/CustEDISetup.php
trunk/CustItem.php
trunk/CustLoginSetup.php
trunk/CustWhereAlloc.php
trunk/CustomerAccount.php
trunk/CustomerAllocations.php
trunk/CustomerBalancesMovement.php
trunk/CustomerBranches.php
trunk/CustomerInquiry.php
trunk/CustomerPurchases.php
trunk/CustomerReceipt.php
trunk/CustomerTransInquiry.php
trunk/CustomerTypes.php
trunk/Customers.php
trunk/DailyBankTransactions.php
trunk/DailySalesInquiry.php
trunk/Dashboard.php
trunk/DebtorsAtPeriodEnd.php
trunk/DeliveryDetails.php
trunk/Departments.php
trunk/DiscountCategories.php
trunk/DiscountMatrix.php
trunk/EDIMessageFormat.php
trunk/EDIProcessOrders.php
trunk/EDISendInvoices.php
trunk/EDISendInvoices_Reece.php
trunk/EmailConfirmation.php
trunk/EmailCustTrans.php
trunk/ExchangeRateTrend.php
trunk/FTP_RadioBeacon.php
trunk/Factors.php
trunk/FixedAssetCategories.php
trunk/FixedAssetDepreciation.php
trunk/FixedAssetItems.php
trunk/FixedAssetLocations.php
trunk/FixedAssetRegister.php
trunk/FixedAssetTransfer.php
trunk/FormDesigner.php
trunk/FreightCosts.php
trunk/GLAccountCSV.php
trunk/GLAccountInquiry.php
trunk/GLAccountReport.php
trunk/GLAccountUsers.php
trunk/GLAccounts.php
trunk/GLBalanceSheet.php
trunk/GLBudgets.php
trunk/GLCashFlowsIndirect.php
trunk/GLCashFlowsSetup.php
trunk/GLCodesInquiry.php
trunk/GLJournal.php
trunk/GLJournalInquiry.php
trunk/GLProfit_Loss.php
trunk/GLTagProfit_Loss.php
trunk/GLTags.php
trunk/GLTransInquiry.php
trunk/GLTrialBalance.php
trunk/GLTrialBalance_csv.php
trunk/GeocodeSetup.php
trunk/GetStockImage.php
trunk/GoodsReceived.php
trunk/GoodsReceivedControlled.php
trunk/HistoricalTestResults.php
trunk/ImportBankTrans.php
trunk/ImportBankTransAnalysis.php
trunk/InternalStockCategoriesByRole.php
trunk/InternalStockRequest.php
trunk/InternalStockRequestAuthorisation.php
trunk/InternalStockRequestFulfill.php
trunk/InternalStockRequestInquiry.php
trunk/InventoryPlanning.php
trunk/InventoryPlanningPrefSupplier.php
trunk/InventoryQuantities.php
trunk/InventoryValuation.php
trunk/Labels.php
trunk/LocationUsers.php
trunk/Locations.php
trunk/Logout.php
trunk/MRP.php
trunk/MRPCalendar.php
trunk/MRPCreateDemands.php
trunk/MRPDemandTypes.php
trunk/MRPDemands.php
trunk/MRPPlannedPurchaseOrders.php
trunk/MRPPlannedWorkOrders.php
trunk/MRPReport.php
trunk/MRPReschedules.php
trunk/MRPShortages.php
trunk/MailInventoryValuation.php
trunk/MailSalesReport.php
trunk/MailSalesReport_csv.php
trunk/MailingGroupMaintenance.php
trunk/MaintenanceReminders.php
trunk/MaintenanceTasks.php
trunk/MaintenanceUserSchedule.php
trunk/ManualContents.php
trunk/Manufacturers.php
trunk/MaterialsNotUsed.php
trunk/NoSalesItems.php
trunk/OffersReceived.php
trunk/OrderDetails.php
trunk/OutstandingGRNs.php
trunk/PDFBankingSummary.php
trunk/PDFCOA.php
trunk/PDFChequeListing.php
trunk/PDFCustTransListing.php
trunk/PDFCustomerList.php
trunk/PDFDIFOT.php
trunk/PDFDeliveryDifferences.php
trunk/PDFFGLabel.php
trunk/PDFGLJournal.php
trunk/PDFGLJournalCN.php
trunk/PDFGrn.php
trunk/PDFLowGP.php
trunk/PDFOrderStatus.php
trunk/PDFOrdersInvoiced.php
trunk/PDFPeriodStockTransListing.php
trunk/PDFPickingList.php
trunk/PDFPriceList.php
trunk/PDFPrintLabel.php
trunk/PDFProdSpec.php
trunk/PDFQALabel.php
trunk/PDFQuotation.php
trunk/PDFQuotationPortrait.php
trunk/PDFReceipt.php
trunk/PDFRemittanceAdvice.php
trunk/PDFSalesBySalesperson.php
trunk/PDFSellThroughSupportClaim.php
trunk/PDFStockCheckComparison.php
trunk/PDFStockLocTransfer.php
trunk/PDFStockNegatives.php
trunk/PDFStockTransfer.php
trunk/PDFSuppTransListing.php
trunk/PDFTopItems.php
trunk/PDFWOPrint.php
trunk/PDFWeeklyOrders.php
trunk/POReport.php
trunk/PO_AuthorisationLevels.php
trunk/PO_AuthoriseMyOrders.php
trunk/PO_Header.php
trunk/PO_Items.php
trunk/PO_OrderDetails.php
trunk/PO_PDFPurchOrder.php
trunk/PO_SelectOSPurchOrder.php
trunk/PO_SelectPurchOrder.php
trunk/PageSecurity.php
trunk/PaymentAllocations.php
trunk/PaymentMethods.php
trunk/PaymentTerms.php
trunk/Payments.php
trunk/PcAnalysis.php
trunk/PcAssignCashTabToTab.php
trunk/PcAssignCashToTab.php
trunk/PcAuthorizeExpenses.php
trunk/PcClaimExpensesFromTab.php
trunk/PcExpenses.php
trunk/PcExpensesTypeTab.php
trunk/PcReportExpense.php
trunk/PcReportTab.php
trunk/PcTabExpensesList.php
trunk/PcTabs.php
trunk/PcTypeTabs.php
trunk/PeriodsInquiry.php
trunk/PriceMatrix.php
trunk/Prices.php
trunk/PricesBasedOnMarkUp.php
trunk/PricesByCost.php
trunk/Prices_Customer.php
trunk/PrintCheque.php
trunk/PrintCustOrder.php
trunk/PrintCustOrder_generic.php
trunk/PrintCustStatements.php
trunk/PrintCustTrans.php
trunk/PrintCustTransPortrait.php
trunk/PrintWOItemSlip.php
trunk/ProductSpecs.php
trunk/PurchData.php
trunk/PurchaseByPrefSupplier.php
trunk/PurchasesReport.php
trunk/QATests.php
trunk/RecurringSalesOrders.php
trunk/RecurringSalesOrdersProcess.php
trunk/RelatedItemsUpdate.php
trunk/ReorderLevel.php
trunk/ReorderLevelLocation.php
trunk/ReprintGRN.php
trunk/ReverseGRN.php
trunk/RevisionTranslations.php
trunk/SMTPServer.php
trunk/SalesAnalReptCols.php
trunk/SalesAnalRepts.php
trunk/SalesAnalysis_UserDefined.php
trunk/SalesByTypePeriodInquiry.php
trunk/SalesCategories.php
trunk/SalesCategoryPeriodInquiry.php
trunk/SalesGLPostings.php
trunk/SalesGraph.php
trunk/SalesInquiry.php
trunk/SalesPeople.php
trunk/SalesTopCustomersInquiry.php
trunk/SalesTopItemsInquiry.php
trunk/SalesTypes.php
trunk/SecurityTokens.php
trunk/SelectAsset.php
trunk/SelectCompletedOrder.php
trunk/SelectContract.php
trunk/SelectCreditItems.php
trunk/SelectCustomer.php
trunk/SelectGLAccount.php
trunk/SelectOrderItems.php
trunk/SelectProduct.php
trunk/SelectQASamples.php
trunk/SelectRecurringSalesOrder.php
trunk/SelectSalesOrder.php
trunk/SelectSupplier.php
trunk/SelectWorkOrder.php
trunk/SellThroughSupport.php
trunk/ShipmentCosting.php
trunk/Shipments.php
trunk/Shippers.php
trunk/Shipt_Select.php
trunk/ShiptsList.php
trunk/ShopParameters.php
trunk/SpecialOrder.php
trunk/StockAdjustments.php
trunk/StockAdjustmentsControlled.php
trunk/StockCategories.php
trunk/StockCategorySalesInquiry.php
trunk/StockCheck.php
trunk/StockClone.php
trunk/StockCostUpdate.php
trunk/StockCounts.php
trunk/StockDispatch.php
trunk/StockLocMovements.php
trunk/StockLocStatus.php
trunk/StockLocTransfer.php
trunk/StockLocTransferReceive.php
trunk/StockMovements.php
trunk/StockQties_csv.php
trunk/StockQuantityByDate.php
trunk/StockReorderLevel.php
trunk/StockSerialItemResearch.php
trunk/StockSerialItems.php
trunk/StockStatus.php
trunk/StockTransferControlled.php
trunk/StockTransfers.php
trunk/StockUsage.php
trunk/StockUsageGraph.php
trunk/Stocks.php
trunk/SuppContractChgs.php
trunk/SuppCreditGRNs.php
trunk/SuppFixedAssetChgs.php
trunk/SuppInvGRNs.php
trunk/SuppLoginSetup.php
trunk/SuppPaymentRun.php
trunk/SuppPriceList.php
trunk/SuppShiptChgs.php
trunk/SuppTransGLAnalysis.php
trunk/SuppWhereAlloc.php
trunk/SupplierAllocations.php
trunk/SupplierBalsAtPeriodEnd.php
trunk/SupplierContacts.php
trunk/SupplierCredit.php
trunk/SupplierGRNAndInvoiceInquiry.php
trunk/SupplierInquiry.php
trunk/SupplierInvoice.php
trunk/SupplierPriceList.php
trunk/SupplierTenderCreate.php
trunk/SupplierTenders.php
trunk/SupplierTransInquiry.php
trunk/SupplierTypes.php
trunk/Suppliers.php
trunk/SystemParameters.php
trunk/Tax.php
trunk/TaxAuthorities.php
trunk/TaxAuthorityRates.php
trunk/TaxCategories.php
trunk/TaxGroups.php
trunk/TaxProvinces.php
trunk/TestPlanResults.php
trunk/TopItems.php
trunk/UnitsOfMeasure.php
trunk/UpgradeDatabase.php
trunk/UserBankAccounts.php
trunk/UserGLAccounts.php
trunk/UserLocations.php
trunk/UserSettings.php
trunk/WOCanBeProducedNow.php
trunk/WOSerialNos.php
trunk/WWW_Access.php
trunk/WWW_Users.php
trunk/WhereUsedInquiry.php
trunk/WorkCentres.php
trunk/WorkOrderCosting.php
trunk/WorkOrderEntry.php
trunk/WorkOrderIssue.php
trunk/WorkOrderReceive.php
trunk/WorkOrderStatus.php
trunk/Z_AutoCustomerAllocations.php
trunk/Z_BottomUpCosts.php
trunk/Z_ChangeBranchCode.php
trunk/Z_ChangeCustomerCode.php
trunk/Z_ChangeGLAccountCode.php
trunk/Z_ChangeLocationCode.php
trunk/Z_ChangeStockCategory.php
trunk/Z_ChangeStockCode.php
trunk/Z_ChangeSupplierCode.php
trunk/Z_CheckAllocationsFrom.php
trunk/Z_CheckAllocs.php
trunk/Z_CheckDebtorsControl.php
trunk/Z_CheckGLTransBalance.php
trunk/Z_ClearPOBackOrders.php
trunk/Z_CreateChartDetails.php
trunk/Z_CreateCompany.php
trunk/Z_CreateCompanyTemplateFile.php
trunk/Z_CurrencyDebtorsBalances.php
trunk/Z_CurrencySuppliersBalances.php
trunk/Z_DataExport.php
trunk/Z_DeleteCreditNote.php
trunk/Z_DeleteInvoice.php
trunk/Z_DeleteOldPrices.php
trunk/Z_DeleteSalesTransActions.php
trunk/Z_DescribeTable.php
trunk/Z_ExportSalesAnalysis.php
trunk/Z_GLAccountUsersCopyAuthority.php
trunk/Z_ImportChartOfAccounts.php
trunk/Z_ImportCustbranch.php
trunk/Z_ImportDebtors.php
trunk/Z_ImportFixedAssets.php
trunk/Z_ImportGLAccountGroups.php
trunk/Z_ImportGLAccountSections.php
trunk/Z_ImportGLTransactions.php
trunk/Z_ImportPartCodes.php
trunk/Z_ImportPriceList.php
trunk/Z_ImportStocks.php
trunk/Z_ImportSuppliers.php
trunk/Z_ItemsWithoutPicture.php
trunk/Z_MakeLocUsers.php
trunk/Z_MakeNewCompany.php
trunk/Z_MakeStockLocns.php
trunk/Z_ReApplyCostToSA.php
trunk/Z_RePostGLFromPeriod.php
trunk/Z_RebuildSalesAnalysis.php
trunk/Z_ReverseSuppPaymentRun.php
trunk/Z_SalesIntegrityCheck.php
trunk/Z_UpdateChartDetailsBFwd.php
trunk/Z_UpdateItemCosts.php
trunk/Z_UpdateSalesAnalysisWithLatestCustomerData.php
trunk/Z_Upgrade3.10.php
trunk/Z_Upgrade_3.01-3.02.php
trunk/Z_Upgrade_3.04-3.05.php
trunk/Z_Upgrade_3.05-3.06.php
trunk/Z_Upgrade_3.07-3.08.php
trunk/Z_Upgrade_3.08-3.09.php
trunk/Z_Upgrade_3.09-3.10.php
trunk/Z_Upgrade_3.10-3.11.php
trunk/Z_Upgrade_3.11-4.00.php
trunk/Z_UploadForm.php
trunk/Z_UploadResult.php
trunk/Z_poAddLanguage.php
trunk/Z_poAdmin.php
trunk/Z_poEditLangHeader.php
trunk/Z_poEditLangModule.php
trunk/Z_poEditLangRemaining.php
trunk/Z_poRebuildDefault.php
trunk/doc/Change.log
trunk/doc/Manual/ManualNewScripts.html
trunk/doc/Manual/ManualOutline.php
trunk/geo_displaymap_customers.php
trunk/geo_displaymap_suppliers.php
trunk/geocode.php
trunk/geocode_genxml_customers.php
trunk/geocode_genxml_suppliers.php
trunk/includes/Add_SerialItems.php
trunk/includes/ConnectDB_mysql.inc
trunk/includes/ConnectDB_mysqli.inc
trunk/includes/ConnectDB_postgres.inc
trunk/includes/ConstructSQLForUserDefinedSalesReport.inc
trunk/includes/CurrenciesArray.php
trunk/includes/DefineImportBankTransClass.php
trunk/includes/DefineLabelClass.php
trunk/includes/DefineOfferClass.php
trunk/includes/DefineSerialItems.php
trunk/includes/DefineStockAdjustment.php
trunk/includes/DefineTenderClass.php
trunk/includes/EDIconfig.inc
trunk/includes/GLPostings.inc
trunk/includes/GLPostingsZero.inc
trunk/includes/GetPrice.inc
trunk/includes/ImportBankTrans_MT940_SCB.php
trunk/includes/InputSerialItemsExisting.php
trunk/includes/InputSerialItemsFile.php
trunk/includes/LanguageSetup.php
trunk/includes/PDFPaymentRun_PymtFooter.php
trunk/includes/PDFSalesAnalysis.inc
trunk/includes/PDFStarter.php
trunk/includes/PDFStockLocTransferHeader.inc
trunk/includes/PDFWOPageHeader.inc
trunk/includes/SQL_CommonFunctions.inc
trunk/includes/SelectOrderItems_IntoCart.inc
trunk/includes/smtp.php
trunk/index.php
trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po
trunk/locale/ar_SY.utf8/LC_MESSAGES/messages.po
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po
trunk/locale/de_DE.utf8/Manual/ManualContents.php
trunk/locale/de_DE.utf8/Manual/ManualMultilanguage.html
trunk/locale/de_DE.utf8/Manual/ManualNewScripts.html
trunk/locale/de_DE.utf8/Manual/ManualSecuritySchema.html
trunk/locale/de_DE.utf8/Manual/ManualSecuritySchemaorig.html
trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po
trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot
trunk/locale/en_US.utf8/LC_MESSAGES/messages.po
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.po
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po
trunk/locale/he_IL.utf8/LC_MESSAGES/messages.po
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.po
trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.po
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.po
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.po
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.po
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.po
trunk/locale/ko_KR.utf8/LC_MESSAGES/messages.po
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.po
trunk/locale/mr_IN.utf8/LC_MESSAGES/messages.po
trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.po
trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.po
trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.po
trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.po
trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.po
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.po
trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.po
trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.po
trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_CN.utf8/Manual/ManualAPIFunctions.php
trunk/locale/zh_CN.utf8/Manual/ManualContents.php
trunk/locale/zh_CN.utf8/Manual/ManualMultilanguage.html
trunk/locale/zh_CN.utf8/Manual/ManualNewScripts.html
trunk/locale/zh_CN.utf8/Manual/ManualSecuritySchema.html
trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_HK.utf8/Manual/ManualAPIFunctions.php
trunk/locale/zh_HK.utf8/Manual/ManualContents.php
trunk/locale/zh_HK.utf8/Manual/ManualMultilanguage.html
trunk/locale/zh_HK.utf8/Manual/ManualNewScripts.html
trunk/locale/zh_HK.utf8/Manual/ManualSecuritySchema.html
trunk/locale/zh_TW.utf8/LC_MESSAGES/messages.po
trunk/report_runner.php
trunk/reportwriter/FormMaker.php
trunk/reportwriter/ReportMaker.php
trunk/reportwriter/admin/ReportCreator.php
Added Paths:
-----------
trunk/includes/footer.php
trunk/includes/header.php
trunk/includes/session.php
Removed Paths:
-------------
trunk/includes/footer.inc
trunk/includes/header.inc
trunk/includes/session.inc
Modified: trunk/AccountGroups.php
===================================================================
--- trunk/AccountGroups.php 2017-04-12 15:50:47 UTC (rev 7750)
+++ trunk/AccountGroups.php 2017-04-13 16:34:26 UTC (rev 7751)
@@ -2,11 +2,11 @@
/* $Id$*/
/* Defines the groupings of general ledger accounts */
-include('includes/session.inc');
+include('includes/session.php');
$Title = _('Account Groups');
$ViewTopic= 'GeneralLedger';
$BookMark = 'AccountGroups';
-include('includes/header.inc');
+include('includes/header.php');
include('includes/SQL_CommonFunctions.inc');
@@ -352,7 +352,7 @@
$result = DB_query($sql,$ErrMsg,$DbgMsg);
if(DB_num_rows($result) == 0) {
prnMsg( _('The account group name does not exist in the database'),'error');
- include('includes/footer.inc');
+ include('includes/footer.php');
exit;
}
$myrow = DB_fetch_array($result);
@@ -489,5 +489,5 @@
} //end if record deleted no point displaying form to add record
-include('includes/footer.inc');
+include('includes/footer.php');
?>
Modified: trunk/AccountSections.php
===================================================================
--- trunk/AccountSections.php 2017-04-12 15:50:47 UTC (rev 7750)
+++ trunk/AccountSections.php 2017-04-13 16:34:26 UTC (rev 7751)
@@ -2,11 +2,11 @@
/* $Id$*/
/* Defines the sections in the general ledger reports */
-include('includes/session.inc');
+include('includes/session.php');
$Title = _('Account Sections');
$ViewTopic = 'GeneralLedger';
$BookMark = 'AccountSections';
-include('includes/header.inc');
+include('includes/header.php');
// SOME TEST TO ENSURE THAT AT LEAST INCOME AND COST OF SALES ARE THERE
$sql= "SELECT sectionid FROM accountsection WHERE sectionid=1";
@@ -291,5 +291,5 @@
</form>';
} //end if record deleted no point displaying form to add record
-include('includes/footer.inc');
+include('includes/footer.php');
?>
Modified: trunk/AddCustomerContacts.php
===================================================================
--- trunk/AddCustomerContacts.php 2017-04-12 15:50:47 UTC (rev 7750)
+++ trunk/AddCustomerContacts.php 2017-04-13 16:34:26 UTC (rev 7751)
@@ -2,11 +2,11 @@
/* $Id$*/
/* Adds customer contacts */
-include('includes/session.inc');
+include('includes/session.php');
$Title = _('Customer Contacts');
$ViewTopic = 'AccountsReceivable';
$BookMark = 'AddCustomerContacts';
-include('includes/header.inc');
+include('includes/header.php');
include('includes/SQL_CommonFunctions.inc');
@@ -304,5 +304,5 @@
} //end if record deleted no point displaying form to add record
-include('includes/footer.inc');
+include('includes/footer.php');
?>
\ No newline at end of file
Modified: trunk/AddCustomerNotes.php
===================================================================
--- trunk/AddCustomerNotes.php 2017-04-12 15:50:47 UTC (rev 7750)
+++ trunk/AddCustomerNotes.php 2017-04-13 16:34:26 UTC (rev 7751)
@@ -2,9 +2,9 @@
/* $Id$*/
-include('includes/session.inc');
+include('includes/session.php');
$Title = _('Customer Notes');
-include('includes/header.inc');
+include('includes/header.php');
include('includes/SQL_CommonFunctions.inc');
if (isset($_GET['Id'])){
@@ -249,5 +249,5 @@
} //end if record deleted no point displaying form to add record
-include('includes/footer.inc');
+include('includes/footer.php');
?>
\ No newline at end of file
Modified: trunk/AddCustomerTypeNotes.php
===================================================================
--- trunk/AddCustomerTypeNotes.php 2017-04-12 15:50:47 UTC (rev 7750)
+++ trunk/AddCustomerTypeNotes.php 2017-04-13 16:34:26 UTC (rev 7751)
@@ -1,9 +1,9 @@
<?php
/* $Id$*/
-include('includes/session.inc');
+include('includes/session.php');
$Title = _('Customer Type (Group) Notes');
-include('includes/header.inc');
+include('includes/header.php');
include('includes/SQL_CommonFunctions.inc');
if (isset($_GET['Id'])){
@@ -225,5 +225,5 @@
} //end if record deleted no point displaying form to add record
-include('includes/footer.inc');
+include('includes/footer.php');
?>
\ No newline at end of file
Modified: trunk/AgedControlledInventory.php
===================================================================
--- trunk/AgedControlledInventory.php 2017-04-12 15:50:47 UTC (rev 7750)
+++ trunk/AgedControlledInventory.php 2017-04-13 16:34:26 UTC (rev 7751)
@@ -2,11 +2,11 @@
/* $Id: AgedControlledInventory.php 1 2014-08-08 04:47:42Z agaluski $ */
-include('includes/session.inc');
+include('includes/session.php');
$PricesSecurity = 12;//don't show pricing info unless security token 12 available to user
$Today = time();
$Title = _('Aged Controlled Inventory') . ' ' ._('as-of') .' ' . Date(($_SESSION['DefaultDateFormat']), strtotime($UpcomingDate . ' + 0 days'));
-include('includes/header.inc');
+include('includes/header.php');
echo '<p class="page_title_text">
<img src="'.$RootPath.'/css/'.$Theme.'/images/inventory.png" title="' . _('Inventory') .
@@ -91,5 +91,5 @@
echo '<td colspan="3"><b>' . _('Total') . '</b></td><td class="number"><b>' . locale_number_format($TotalQty,2) . '</td><td class="number"><b>' . locale_number_format($TotalVal,2) . '</td><td colspan="2"></td>';
echo '</table>';
-include('includes/footer.inc');
+include('includes/footer.php');
?>
\ No newline at end of file
Modified: trunk/AgedDebtors.php
===================================================================
--- trunk/AgedDebtors.php 2017-04-12 15:50:47 UTC (rev 7750)
+++ trunk/AgedDebtors.php 2017-04-13 16:34:26 UTC (rev 7751)
@@ -2,7 +2,7 @@
/* $Id$ */
/* Lists customer account balances in detail or summary in selected currency */
-include('includes/session.inc');
+include('includes/session.php');
if(isset($_POST['PrintPDF'])
and isset($_POST['FromCriteria'])
@@ -266,13 +266,13 @@
if(DB_error_no() !=0) {
$Title = _('Aged Customer Account Analysis') . ' - ' . _('Problem Report') . '.... ';
- include('includes/header.inc');
+ include('includes/header.php');
prnMsg(_('The customer details could not be retrieved by the SQL because') . ' ' . DB_error_msg(),'error');
echo '<br /><a href="' . $RootPath . '/index.php">' . _('Back to the menu') . '</a>';
if($debug==1) {
echo '<br />' . $SQL;
}
- include('includes/footer.inc');
+ include('includes/footer.php');
exit;
}
@@ -368,13 +368,13 @@
$DetailResult = DB_query($sql,'','',False,False); /*Dont trap errors */
if(DB_error_no() !=0) {
$Title = _('Aged Customer Account Analysis') . ' - ' . _('Problem Report') . '....';
- include('includes/header.inc');
+ include('includes/header.php');
prnMsg(_('The details of outstanding transactions for customer') . ' - ' . $AgedAnalysis['debtorno'] . ' ' . _('could not be retrieved because') . ' - ' . DB_error_msg(),'error');
echo '<br /><a href="' . $RootPath . '/index.php">' . _('Back to the menu') . '</a>';
if($debug==1) {
echo '<br />' . _('The SQL that failed was') . '<br />' . $sql;
}
- include('includes/footer.inc');
+ include('includes/footer.php');
exit;
}
@@ -432,10 +432,10 @@
if($ListCount == 0) {
$Title = _('Aged Customer Account Analysis') . ' - ' . _('Problem Report') . '....';
- include('includes/header.inc');
+ include('includes/header.php');
prnMsg(_('There are no customers with balances meeting the criteria specified to list'),'info');
echo '<br /><a href="' . $RootPath . '/index.php">' . _('Back to the menu') . '</a>';
- include('includes/footer.inc');
+ include('includes/footer.php');
exit;
} else {
$pdf->OutputD($_SESSION['DatabaseName'] . '_' . 'AgedDebtors_' . date('Y-m-d') . '.pdf');
@@ -449,7 +449,7 @@
$ViewTopic = 'ARReports';
$BookMark = 'AgedDebtors';
- include('includes/header.inc');
+ include('includes/header.php');
echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title . '</p><br />';
@@ -529,6 +529,6 @@
</div>
</form>';
}
- include('includes/footer.inc');
+ include('includes/footer.php');
} /*end of else not PrintPDF */
?>
Modified: trunk/AgedSuppliers.php
===================================================================
--- trunk/AgedSuppliers.php 2017-04-12 15:50:47 UTC (rev 7750)
+++ trunk/AgedSuppliers.php 2017-04-13 16:34:26 UTC (rev 7751)
@@ -2,7 +2,7 @@
/* $Id$*/
-include('includes/session.inc');
+include('includes/session.php');
if (isset($_POST['PrintPDF'])
and isset($_POST['FromCriteria'])
@@ -106,13 +106,13 @@
if (DB_error_no() !=0) {
$Title = _('Aged Supplier Account Analysis') . ' - ' . _('Problem Report') ;
- include('includes/header.inc');
+ include('includes/header.php');
prnMsg(_('The Supplier details could not be retrieved by the SQL because') . ' ' . DB_error_msg(),'error');
echo '<br /><a href="' . $RootPath . '/index.php">' . _('Back to the menu') . '</a>';
if ($debug==1){
echo '<br />' . $SQL;
}
- include('includes/footer.inc');
+ include('includes/footer.php');
exit;
}
@@ -193,13 +193,13 @@
$DetailResult = DB_query($sql,'','',False,False); /*dont trap errors - trapped below*/
if (DB_error_no() !=0) {
$Title = _('Aged Supplier Account Analysis - Problem Report');
- include('includes/header.inc');
+ include('includes/header.php');
prnMsg(_('The details of outstanding transactions for Supplier') . ' - ' . $AgedAnalysis['supplierid'] . ' ' . _('could not be retrieved because') . ' - ' . DB_error_msg(),'error');
echo '<br /><a href="' . $RootPath . '/index.php">' . _('Back to the menu') . '</a>';
if ($debug==1){
echo '<br />' . _('The SQL that failed was') . '<br />' . $sql;
}
- include('includes/footer.inc');
+ include('includes/footer.php');
exit;
}
@@ -261,9 +261,9 @@
if ($ListCount == 0) {
$Title = _('Aged Supplier Analysis');
- include('includes/header.inc');
+ include('includes/header.php');
prnMsg(_('There are no results so the PDF is empty'));
- include('includes/footer.inc');
+ include('includes/footer.php');
} else {
$pdf->OutputD($_SESSION['DatabaseName'] . '_AggedSupliers_' . date('Y-m-d').'.pdf');
}
@@ -271,7 +271,7 @@
} else { /*The option to print PDF was not hit */
$Title = _('Aged Supplier Analysis');
- include('includes/header.inc');
+ include('includes/header.php');
echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title . '</p><br />';
@@ -329,7 +329,7 @@
</div>
</form>';
}
- include('includes/footer.inc');
+ include('includes/footer.php');
} /*end of else not PrintPDF */
?>
Modified: trunk/AnalysisHorizontalIncome.php
===================================================================
--- trunk/AnalysisHorizontalIncome.php 2017-04-12 15:50:47 UTC (rev 7750)
+++ trunk/AnalysisHorizontalIncome.php 2017-04-13 16:34:26 UTC (rev 7751)
@@ -11,7 +11,7 @@
}
}
-include ('includes/session.inc');
+include ('includes/session.php');
$Title = _('Horizontal Analysis of Statement of Comprehensive Income');// Screen identification.
$ViewTopic= 'GeneralLedger';// Filename's id in ManualContents.php's TOC.
$BookMark = 'AnalysisHorizontalIncome';// Anchor's id in the manual's html document.
@@ -23,7 +23,7 @@
$_POST['SelectADifferentPeriod']='Select A Different Period';
}
-include('includes/header.inc');
+include('includes/header.php');
if((!isset($_POST['FromPeriod']) AND !isset($_POST['ToPeriod'])) OR isset($_POST['SelectADifferentPeriod'])) {
echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
'/images/printer.png" title="', // Icon image.
@@ -129,7 +129,7 @@
if($NumberOfMonths >12) {
echo '<br />';
prnMsg(_('A period up to 12 months in duration can be specified') . ' - ' . _('the system automatically shows a comparative for the same period from the previous year') . ' - ' . _('it cannot do this if a period of more than 12 months is specified') . '. ' . _('Please select an alternative period range'),'error');
- include('includes/footer.inc');
+ include('includes/footer.php');
exit;
}
@@ -523,5 +523,5 @@
'</div>';
}
echo '</form>';
-include('includes/footer.inc');
+include('includes/footer.php');
?>
Modified: trunk/AnalysisHorizontalPosition.php
===================================================================
--- trunk/AnalysisHorizontalPosition.php 2017-04-12 15:50:47 UTC (rev 7750)
+++ trunk/AnalysisHorizontalPosition.php 2017-04-13 16:34:26 UTC (rev 7751)
@@ -11,7 +11,7 @@
}
}
-include ('includes/session.inc');
+include ('includes/session.php');
$Title = _('Horizontal Analysis of Statement of Financial Position');// Screen identification.
$ViewTopic = 'GeneralLedger';// Filename's id in Manu...
[truncated message content] |
|
From: <rc...@us...> - 2017-04-15 20:13:43
|
Revision: 7755
http://sourceforge.net/p/web-erp/reponame/7755
Author: rchacon
Date: 2017-04-15 20:13:36 +0000 (Sat, 15 Apr 2017)
Log Message:
-----------
Rebuild languages files *.pot, *.po and *.mo.
Modified Paths:
--------------
trunk/GLAccounts.php
trunk/WWW_Users.php
trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.mo
trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po
trunk/locale/ar_SY.utf8/LC_MESSAGES/messages.mo
trunk/locale/ar_SY.utf8/LC_MESSAGES/messages.po
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.mo
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po
trunk/locale/el_GR.utf8/LC_MESSAGES/messages.mo
trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po
trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot
trunk/locale/en_US.utf8/LC_MESSAGES/messages.mo
trunk/locale/en_US.utf8/LC_MESSAGES/messages.po
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.mo
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.po
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.mo
trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po
trunk/locale/he_IL.utf8/LC_MESSAGES/messages.mo
trunk/locale/he_IL.utf8/LC_MESSAGES/messages.po
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.mo
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.po
trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.mo
trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.po
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.mo
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.po
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.mo
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.po
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.mo
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.po
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.mo
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.po
trunk/locale/ko_KR.utf8/LC_MESSAGES/messages.mo
trunk/locale/ko_KR.utf8/LC_MESSAGES/messages.po
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.mo
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.po
trunk/locale/mr_IN.utf8/LC_MESSAGES/messages.po
trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.mo
trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.po
trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.mo
trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.mo
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.mo
trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.po
trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.mo
trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.po
trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.mo
trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.po
trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.mo
trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.po
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.mo
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.po
trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.mo
trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.po
trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.mo
trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.po
trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.mo
trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_TW.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_TW.utf8/LC_MESSAGES/messages.po
Modified: trunk/GLAccounts.php
===================================================================
--- trunk/GLAccounts.php 2017-04-13 17:43:45 UTC (rev 7754)
+++ trunk/GLAccounts.php 2017-04-15 20:13:36 UTC (rev 7755)
@@ -7,7 +7,7 @@
function CashFlowsActivityName($Activity) {
// Converts the cash flow activity number to an activity text.
switch($Activity) {
- case -1: return '<b>' . _('Without setting up') . '</b>';
+ case -1: return '<b>' . _('Not set up') . '</b>';
case 0: return _('No effect on cash flow');
case 1: return _('Operating activity');
case 2: return _('Investing activity');
Modified: trunk/WWW_Users.php
===================================================================
--- trunk/WWW_Users.php 2017-04-13 17:43:45 UTC (rev 7754)
+++ trunk/WWW_Users.php 2017-04-15 20:13:36 UTC (rev 7755)
@@ -729,7 +729,7 @@
// Turn off/on dashboard after Login:
echo '<tr>
- <td><label for="ShowDashboard">', _('Display Dashboard after Login'), ':</label></td>
+ <td><label for="ShowDashboard">', _('Display dashboard'), ':</label></td>
<td><select id="ShowDashboard" name="ShowDashboard">';
if($_POST['ShowDashboard']==0) {
echo '<option selected="selected" value="0">', _('No'), '</option>',
@@ -738,7 +738,9 @@
echo '<option value="0">', _('No'), '</option>',
'<option selected="selected" value="1">', _('Yes'), '</option>';
}
-echo '</select></td>
+echo '</select>',
+ (!isset($_SESSION['ShowFieldHelp']) || $_SESSION['ShowFieldHelp'] ? _('Show dashboard page after Login') : ''), // If the parameter $_SESSION['ShowFieldHelp'] is not set OR is TRUE, shows this field help text.
+ '</td>
</tr>';
// Turn off/on page help:
echo '<tr>
Modified: trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2017-04-13 17:43:45 UTC (rev 7754)
+++ trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2017-04-15 20:13:36 UTC (rev 7755)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: webERP 4.13\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-13 11:01-0600\n"
+"POT-Creation-Date: 2017-04-15 14:11-0600\n"
"PO-Revision-Date: 2013-06-01 11:19-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: Arabic <ar...@li...>\n"
@@ -355,8 +355,8 @@
#: TestPlanResults.php:928 UserGLAccounts.php:187 UserGLAccounts.php:196
#: UserSettings.php:209 UserSettings.php:212 UserSettings.php:224
#: UserSettings.php:227 WWW_Users.php:549 WWW_Users.php:551 WWW_Users.php:720
-#: WWW_Users.php:723 WWW_Users.php:736 WWW_Users.php:739 WWW_Users.php:749
-#: WWW_Users.php:752 WWW_Users.php:764 WWW_Users.php:767
+#: WWW_Users.php:723 WWW_Users.php:736 WWW_Users.php:739 WWW_Users.php:751
+#: WWW_Users.php:754 WWW_Users.php:766 WWW_Users.php:769
#: reportwriter/languages/en_US/reports.php:114
msgid "Yes"
msgstr "موافق"
@@ -426,8 +426,8 @@
#: TestPlanResults.php:927 UserGLAccounts.php:189 UserGLAccounts.php:199
#: UserSettings.php:208 UserSettings.php:211 UserSettings.php:223
#: UserSettings.php:226 WWW_Users.php:548 WWW_Users.php:552 WWW_Users.php:719
-#: WWW_Users.php:722 WWW_Users.php:735 WWW_Users.php:738 WWW_Users.php:748
-#: WWW_Users.php:751 WWW_Users.php:763 WWW_Users.php:766
+#: WWW_Users.php:722 WWW_Users.php:735 WWW_Users.php:738 WWW_Users.php:750
+#: WWW_Users.php:753 WWW_Users.php:765 WWW_Users.php:768
#: includes/PDFLowGPPageHeader.inc:44
#: reportwriter/languages/en_US/reports.php:82
msgid "No"
@@ -692,7 +692,7 @@
#: StockCategories.php:653 SupplierContacts.php:284 SuppLoginSetup.php:291
#: TaxAuthorities.php:327 TaxCategories.php:244 TaxProvinces.php:234
#: TestPlanResults.php:967 UnitsOfMeasure.php:241 WorkCentres.php:289
-#: WWW_Users.php:835
+#: WWW_Users.php:837
msgid "Enter Information"
msgstr "أدخل المعلومات"
@@ -13857,8 +13857,8 @@
msgid "Run Report"
msgstr ""
-#: GLAccounts.php:10
-msgid "Without setting up"
+#: GLAccounts.php:10 GLCashFlowsIndirect.php:15
+msgid "Not set up"
msgstr ""
#: GLAccounts.php:11 GLAccounts.php:272 GLCashFlowsIndirect.php:16
@@ -14266,10 +14266,6 @@
msgid "Could not update the chartdetails record because"
msgstr ""
-#: GLCashFlowsIndirect.php:15
-msgid "Not set up"
-msgstr ""
-
#: GLCashFlowsIndirect.php:17
msgid "Operating activities"
msgstr ""
@@ -15698,7 +15694,7 @@
msgid "View any open tenders without an offer"
msgstr ""
-#: index.php:38 WWW_Users.php:820
+#: index.php:38 WWW_Users.php:822
msgid "Account Status"
msgstr ""
@@ -37040,23 +37036,23 @@
msgid "If you leave the password boxes empty your password will not change"
msgstr ""
-#: UserSettings.php:205 WWW_Users.php:745
+#: UserSettings.php:205 WWW_Users.php:747
msgid "Display page help"
msgstr ""
-#: UserSettings.php:215 WWW_Users.php:755
+#: UserSettings.php:215 WWW_Users.php:757
msgid "Show page help when available"
msgstr ""
-#: UserSettings.php:220 WWW_Users.php:760
+#: UserSettings.php:220 WWW_Users.php:762
msgid "Display field help"
msgstr ""
-#: UserSettings.php:230 WWW_Users.php:770
+#: UserSettings.php:230 WWW_Users.php:772
msgid "Show field help when available"
msgstr ""
-#: UserSettings.php:238 WWW_Users.php:778
+#: UserSettings.php:238 WWW_Users.php:780
msgid "PDF Language Support"
msgstr ""
@@ -38447,22 +38443,26 @@
msgstr ""
#: WWW_Users.php:732
-msgid "Display Dashboard after Login"
+msgid "Display dashboard"
msgstr ""
-#: WWW_Users.php:793
+#: WWW_Users.php:742
+msgid "Show dashboard page after Login"
+msgstr ""
+
+#: WWW_Users.php:795
msgid "Allowed Department for Internal Requests"
msgstr ""
-#: WWW_Users.php:803 WWW_Users.php:805
+#: WWW_Users.php:805 WWW_Users.php:807
msgid "Any Internal Department"
msgstr ""
-#: WWW_Users.php:823 WWW_Users.php:827
+#: WWW_Users.php:825 WWW_Users.php:829
msgid "Open"
msgstr ""
-#: WWW_Users.php:824 WWW_Users.php:826
+#: WWW_Users.php:826 WWW_Users.php:828
msgid "Blocked"
msgstr ""
Modified: trunk/locale/ar_SY.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/ar_SY.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/ar_SY.utf8/LC_MESSAGES/messages.po 2017-04-13 17:43:45 UTC (rev 7754)
+++ trunk/locale/ar_SY.utf8/LC_MESSAGES/messages.po 2017-04-15 20:13:36 UTC (rev 7755)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: webERP 4.13\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-13 11:01-0600\n"
+"POT-Creation-Date: 2017-04-15 14:11-0600\n"
"PO-Revision-Date: 2015-11-12 20:40+0200\n"
"Last-Translator: JC_Chuck <Unknown>\n"
"Language-Team: Arabic <ar...@li...>\n"
@@ -358,8 +358,8 @@
#: TestPlanResults.php:928 UserGLAccounts.php:187 UserGLAccounts.php:196
#: UserSettings.php:209 UserSettings.php:212 UserSettings.php:224
#: UserSettings.php:227 WWW_Users.php:549 WWW_Users.php:551 WWW_Users.php:720
-#: WWW_Users.php:723 WWW_Users.php:736 WWW_Users.php:739 WWW_Users.php:749
-#: WWW_Users.php:752 WWW_Users.php:764 WWW_Users.php:767
+#: WWW_Users.php:723 WWW_Users.php:736 WWW_Users.php:739 WWW_Users.php:751
+#: WWW_Users.php:754 WWW_Users.php:766 WWW_Users.php:769
#: reportwriter/languages/en_US/reports.php:114
msgid "Yes"
msgstr "موافق"
@@ -429,8 +429,8 @@
#: TestPlanResults.php:927 UserGLAccounts.php:189 UserGLAccounts.php:199
#: UserSettings.php:208 UserSettings.php:211 UserSettings.php:223
#: UserSettings.php:226 WWW_Users.php:548 WWW_Users.php:552 WWW_Users.php:719
-#: WWW_Users.php:722 WWW_Users.php:735 WWW_Users.php:738 WWW_Users.php:748
-#: WWW_Users.php:751 WWW_Users.php:763 WWW_Users.php:766
+#: WWW_Users.php:722 WWW_Users.php:735 WWW_Users.php:738 WWW_Users.php:750
+#: WWW_Users.php:753 WWW_Users.php:765 WWW_Users.php:768
#: includes/PDFLowGPPageHeader.inc:44
#: reportwriter/languages/en_US/reports.php:82
msgid "No"
@@ -699,7 +699,7 @@
#: StockCategories.php:653 SupplierContacts.php:284 SuppLoginSetup.php:291
#: TaxAuthorities.php:327 TaxCategories.php:244 TaxProvinces.php:234
#: TestPlanResults.php:967 UnitsOfMeasure.php:241 WorkCentres.php:289
-#: WWW_Users.php:835
+#: WWW_Users.php:837
msgid "Enter Information"
msgstr "أدخل المعلومات"
@@ -13875,8 +13875,8 @@
msgid "Run Report"
msgstr ""
-#: GLAccounts.php:10
-msgid "Without setting up"
+#: GLAccounts.php:10 GLCashFlowsIndirect.php:15
+msgid "Not set up"
msgstr ""
#: GLAccounts.php:11 GLAccounts.php:272 GLCashFlowsIndirect.php:16
@@ -14284,10 +14284,6 @@
msgid "Could not update the chartdetails record because"
msgstr ""
-#: GLCashFlowsIndirect.php:15
-msgid "Not set up"
-msgstr ""
-
#: GLCashFlowsIndirect.php:17
msgid "Operating activities"
msgstr ""
@@ -15719,7 +15715,7 @@
msgid "View any open tenders without an offer"
msgstr ""
-#: index.php:38 WWW_Users.php:820
+#: index.php:38 WWW_Users.php:822
msgid "Account Status"
msgstr ""
@@ -37095,23 +37091,23 @@
msgid "If you leave the password boxes empty your password will not change"
msgstr ""
-#: UserSettings.php:205 WWW_Users.php:745
+#: UserSettings.php:205 WWW_Users.php:747
msgid "Display page help"
msgstr ""
-#: UserSettings.php:215 WWW_Users.php:755
+#: UserSettings.php:215 WWW_Users.php:757
msgid "Show page help when available"
msgstr ""
-#: UserSettings.php:220 WWW_Users.php:760
+#: UserSettings.php:220 WWW_Users.php:762
msgid "Display field help"
msgstr ""
-#: UserSettings.php:230 WWW_Users.php:770
+#: UserSettings.php:230 WWW_Users.php:772
msgid "Show field help when available"
msgstr ""
-#: UserSettings.php:238 WWW_Users.php:778
+#: UserSettings.php:238 WWW_Users.php:780
msgid "PDF Language Support"
msgstr ""
@@ -38504,22 +38500,26 @@
msgstr ""
#: WWW_Users.php:732
-msgid "Display Dashboard after Login"
+msgid "Display dashboard"
msgstr ""
-#: WWW_Users.php:793
+#: WWW_Users.php:742
+msgid "Show dashboard page after Login"
+msgstr ""
+
+#: WWW_Users.php:795
msgid "Allowed Department for Internal Requests"
msgstr ""
-#: WWW_Users.php:803 WWW_Users.php:805
+#: WWW_Users.php:805 WWW_Users.php:807
msgid "Any Internal Department"
msgstr ""
-#: WWW_Users.php:823 WWW_Users.php:827
+#: WWW_Users.php:825 WWW_Users.php:829
msgid "Open"
msgstr ""
-#: WWW_Users.php:824 WWW_Users.php:826
+#: WWW_Users.php:826 WWW_Users.php:828
msgid "Blocked"
msgstr ""
Modified: trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po 2017-04-13 17:43:45 UTC (rev 7754)
+++ trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po 2017-04-15 20:13:36 UTC (rev 7755)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: webERP 4.13\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-13 11:01-0600\n"
+"POT-Creation-Date: 2017-04-15 14:11-0600\n"
"PO-Revision-Date: 2013-06-01 11:20-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: Czech <cs...@li...>\n"
@@ -366,8 +366,8 @@
#: TestPlanResults.php:928 UserGLAccounts.php:187 UserGLAccounts.php:196
#: UserSettings.php:209 UserSettings.php:212 UserSettings.php:224
#: UserSettings.php:227 WWW_Users.php:549 WWW_Users.php:551 WWW_Users.php:720
-#: WWW_Users.php:723 WWW_Users.php:736 WWW_Users.php:739 WWW_Users.php:749
-#: WWW_Users.php:752 WWW_Users.php:764 WWW_Users.php:767
+#: WWW_Users.php:723 WWW_Users.php:736 WWW_Users.php:739 WWW_Users.php:751
+#: WWW_Users.php:754 WWW_Users.php:766 WWW_Users.php:769
#: reportwriter/languages/en_US/reports.php:114
msgid "Yes"
msgstr "Ano"
@@ -437,8 +437,8 @@
#: TestPlanResults.php:927 UserGLAccounts.php:189 UserGLAccounts.php:199
#: UserSettings.php:208 UserSettings.php:211 UserSettings.php:223
#: UserSettings.php:226 WWW_Users.php:548 WWW_Users.php:552 WWW_Users.php:719
-#: WWW_Users.php:722 WWW_Users.php:735 WWW_Users.php:738 WWW_Users.php:748
-#: WWW_Users.php:751 WWW_Users.php:763 WWW_Users.php:766
+#: WWW_Users.php:722 WWW_Users.php:735 WWW_Users.php:738 WWW_Users.php:750
+#: WWW_Users.php:753 WWW_Users.php:765 WWW_Users.php:768
#: includes/PDFLowGPPageHeader.inc:44
#: reportwriter/languages/en_US/reports.php:82
msgid "No"
@@ -707,7 +707,7 @@
#: StockCategories.php:653 SupplierContacts.php:284 SuppLoginSetup.php:291
#: TaxAuthorities.php:327 TaxCategories.php:244 TaxProvinces.php:234
#: TestPlanResults.php:967 UnitsOfMeasure.php:241 WorkCentres.php:289
-#: WWW_Users.php:835
+#: WWW_Users.php:837
msgid "Enter Information"
msgstr "Vložit informace"
@@ -14234,8 +14234,8 @@
msgid "Run Report"
msgstr "Spustit sestavu"
-#: GLAccounts.php:10
-msgid "Without setting up"
+#: GLAccounts.php:10 GLCashFlowsIndirect.php:15
+msgid "Not set up"
msgstr ""
#: GLAccounts.php:11 GLAccounts.php:272 GLCashFlowsIndirect.php:16
@@ -14668,10 +14668,6 @@
msgid "Could not update the chartdetails record because"
msgstr "Nepodařilo se aktualizovat chartdetails rekord, protože"
-#: GLCashFlowsIndirect.php:15
-msgid "Not set up"
-msgstr ""
-
#: GLCashFlowsIndirect.php:17
msgid "Operating activities"
msgstr ""
@@ -16143,7 +16139,7 @@
msgid "View any open tenders without an offer"
msgstr ""
-#: index.php:38 WWW_Users.php:820
+#: index.php:38 WWW_Users.php:822
msgid "Account Status"
msgstr "Stav účtu"
@@ -38247,23 +38243,23 @@
msgid "If you leave the password boxes empty your password will not change"
msgstr "Pokud ponecháte heslo prázdné pole heslo se nezmění"
-#: UserSettings.php:205 WWW_Users.php:745
+#: UserSettings.php:205 WWW_Users.php:747
msgid "Display page help"
msgstr ""
-#: UserSettings.php:215 WWW_Users.php:755
+#: UserSettings.php:215 WWW_Users.php:757
msgid "Show page help when available"
msgstr ""
-#: UserSettings.php:220 WWW_Users.php:760
+#: UserSettings.php:220 WWW_Users.php:762
msgid "Display field help"
msgstr ""
-#: UserSettings.php:230 WWW_Users.php:770
+#: UserSettings.php:230 WWW_Users.php:772
msgid "Show field help when available"
msgstr ""
-#: UserSettings.php:238 WWW_Users.php:778
+#: UserSettings.php:238 WWW_Users.php:780
msgid "PDF Language Support"
msgstr "PDF Podpora jazyků"
@@ -39745,22 +39741,26 @@
msgstr "Ne pouze přihlášení prodejce"
#: WWW_Users.php:732
-msgid "Display Dashboard after Login"
+msgid "Display dashboard"
msgstr ""
-#: WWW_Users.php:793
+#: WWW_Users.php:742
+msgid "Show dashboard page after Login"
+msgstr ""
+
+#: WWW_Users.php:795
msgid "Allowed Department for Internal Requests"
msgstr ""
-#: WWW_Users.php:803 WWW_Users.php:805
+#: WWW_Users.php:805 WWW_Users.php:807
msgid "Any Internal Department"
msgstr ""
-#: WWW_Users.php:823 WWW_Users.php:827
+#: WWW_Users.php:825 WWW_Users.php:829
msgid "Open"
msgstr "Open"
-#: WWW_Users.php:824 WWW_Users.php:826
+#: WWW_Users.php:826 WWW_Users.php:828
msgid "Blocked"
msgstr "Blokované"
Modified: trunk/locale/de_DE.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po 2017-04-13 17:43:45 UTC (rev 7754)
+++ trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po 2017-04-15 20:13:36 UTC (rev 7755)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: webERP 4.13\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-13 11:01-0600\n"
+"POT-Creation-Date: 2017-04-15 14:11-0600\n"
"PO-Revision-Date: 2015-02-24 18:41-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: Deutsch <web...@li...>\n"
@@ -368,8 +368,8 @@
#: TestPlanResults.php:928 UserGLAccounts.php:187 UserGLAccounts.php:196
#: UserSettings.php:209 UserSettings.php:212 UserSettings.php:224
#: UserSettings.php:227 WWW_Users.php:549 WWW_Users.php:551 WWW_Users.php:720
-#: WWW_Users.php:723 WWW_Users.php:736 WWW_Users.php:739 WWW_Users.php:749
-#: WWW_Users.php:752 WWW_Users.php:764 WWW_Users.php:767
+#: WWW_Users.php:723 WWW_Users.php:736 WWW_Users.php:739 WWW_Users.php:751
+#: WWW_Users.php:754 WWW_Users.php:766 WWW_Users.php:769
#: reportwriter/languages/en_US/reports.php:114
msgid "Yes"
msgstr "Ja"
@@ -439,8 +439,8 @@
#: TestPlanResults.php:927 UserGLAccounts.php:189 UserGLAccounts.php:199
#: UserSettings.php:208 UserSettings.php:211 UserSettings.php:223
#: UserSettings.php:226 WWW_Users.php:548 WWW_Users.php:552 WWW_Users.php:719
-#: WWW_Users.php:722 WWW_Users.php:735 WWW_Users.php:738 WWW_Users.php:748
-#: WWW_Users.php:751 WWW_Users.php:763 WWW_Users.php:766
+#: WWW_Users.php:722 WWW_Users.php:735 WWW_Users.php:738 WWW_Users.php:750
+#: WWW_Users.php:753 WWW_Users.php:765 WWW_Users.php:768
#: includes/PDFLowGPPageHeader.inc:44
#: reportwriter/languages/en_US/reports.php:82
msgid "No"
@@ -718,7 +718,7 @@
#: StockCategories.php:653 SupplierContacts.php:284 SuppLoginSetup.php:291
#: TaxAuthorities.php:327 TaxCategories.php:244 TaxProvinces.php:234
#: TestPlanResults.php:967 UnitsOfMeasure.php:241 WorkCentres.php:289
-#: WWW_Users.php:835
+#: WWW_Users.php:837
msgid "Enter Information"
msgstr "Speichern"
@@ -14700,9 +14700,9 @@
msgid "Run Report"
msgstr "Bericht ausführen"
-#: GLAccounts.php:10
-msgid "Without setting up"
-msgstr ""
+#: GLAccounts.php:10 GLCashFlowsIndirect.php:15
+msgid "Not set up"
+msgstr "Nicht eingerichtet"
#: GLAccounts.php:11 GLAccounts.php:272 GLCashFlowsIndirect.php:16
msgid "No effect on cash flow"
@@ -15136,10 +15136,6 @@
msgid "Could not update the chartdetails record because"
msgstr "Konnte die Kontensalden in der Datenbank nicht ändern, weil"
-#: GLCashFlowsIndirect.php:15
-msgid "Not set up"
-msgstr ""
-
#: GLCashFlowsIndirect.php:17
msgid "Operating activities"
msgstr ""
@@ -16662,7 +16658,7 @@
msgid "View any open tenders without an offer"
msgstr "Offene Ausschreibungen ohne Angebote anzeigen"
-#: index.php:38 WWW_Users.php:820
+#: index.php:38 WWW_Users.php:822
msgid "Account Status"
msgstr "Kontenanzeige"
@@ -39549,23 +39545,23 @@
msgstr ""
"Wenn sie die Passwort-Felder leer lassen, wird Ihr Passwort nicht geändert"
-#: UserSettings.php:205 WWW_Users.php:745
+#: UserSettings.php:205 WWW_Users.php:747
msgid "Display page help"
msgstr ""
-#: UserSettings.php:215 WWW_Users.php:755
+#: UserSettings.php:215 WWW_Users.php:757
msgid "Show page help when available"
msgstr ""
-#: UserSettings.php:220 WWW_Users.php:760
+#: UserSettings.php:220 WWW_Users.php:762
msgid "Display field help"
msgstr ""
-#: UserSettings.php:230 WWW_Users.php:770
+#: UserSettings.php:230 WWW_Users.php:772
msgid "Show field help when available"
msgstr ""
-#: UserSettings.php:238 WWW_Users.php:778
+#: UserSettings.php:238 WWW_Users.php:780
msgid "PDF Language Support"
msgstr "PDF-Sprachenunterstützung"
@@ -41116,22 +41112,26 @@
msgstr "Keine Beschränkung auf einen bestimmten Verkäufer"
#: WWW_Users.php:732
-msgid "Display Dashboard after Login"
+msgid "Display dashboard"
msgstr ""
-#: WWW_Users.php:793
+#: WWW_Users.php:742
+msgid "Show dashboard page after Login"
+msgstr ""
+
+#: WWW_Users.php:795
msgid "Allowed Department for Internal Requests"
msgstr "Erlaubte Abteilung für interne Bedarfe"
-#: WWW_Users.php:803 WWW_Users.php:805
+#: WWW_Users.php:805 WWW_Users.php:807
msgid "Any Internal Department"
msgstr "Jede interne Abteilung"
-#: WWW_Users.php:823 WWW_Users.php:827
+#: WWW_Users.php:825 WWW_Users.php:829
msgid "Open"
msgstr "Freigegeben"
-#: WWW_Users.php:824 WWW_Users.php:826
+#: WWW_Users.php:826 WWW_Users.php:828
msgid "Blocked"
msgstr "Gesperrt"
Modified: trunk/locale/el_GR.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po 2017-04-13 17:43:45 UTC (rev 7754)
+++ trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po 2017-04-15 20:13:36 UTC (rev 7755)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: webERP 4.13\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-13 11:01-0600\n"
+"POT-Creation-Date: 2017-04-15 14:11-0600\n"
"PO-Revision-Date: 2013-06-01 11:22-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
@@ -373,8 +373,8 @@
#: TestPlanResults.php:928 UserGLAccounts.php:187 UserGLAccounts.php:196
#: UserSettings.php:209 UserSettings.php:212 UserSettings.php:224
#: UserSettings.php:227 WWW_Users.php:549 WWW_Users.php:551 WWW_Users.php:720
-#: WWW_Users.php:723 WWW_Users.php:736 WWW_Users.php:739 WWW_Users.php:749
-#: WWW_Users.php:752 WWW_Users.php:764 WWW_Users.php:767
+#: WWW_Users.php:723 WWW_Users.php:736 WWW_Users.php:739 WWW_Users.php:751
+#: WWW_Users.php:754 WWW_Users.php:766 WWW_Users.php:769
#: reportwriter/languages/en_US/reports.php:114
msgid "Yes"
msgstr "Ναί"
@@ -444,8 +444,8 @@
#: TestPlanResults.php:927 UserGLAccounts.php:189 UserGLAccounts.php:199
#: UserSettings.php:208 UserSettings.php:211 UserSettings.php:223
#: UserSettings.php:226 WWW_Users.php:548 WWW_Users.php:552 WWW_Users.php:719
-#: WWW_Users.php:722 WWW_Users.php:735 WWW_Users.php:738 WWW_Users.php:748
-#: WWW_Users.php:751 WWW_Users.php:763 WWW_Users.php:766
+#: WWW_Users.php:722 WWW_Users.php:735 WWW_Users.php:738 WWW_Users.php:750
+#: WWW_Users.php:753 WWW_Users.php:765 WWW_Users.php:768
#: includes/PDFLowGPPageHeader.inc:44
#: reportwriter/languages/en_US/reports.php:82
msgid "No"
@@ -718,7 +718,7 @@
#: StockCategories.php:653 SupplierContacts.php:284 SuppLoginSetup.php:291
#: TaxAuthorities.php:327 TaxCategories.php:244 TaxProvinces.php:234
#: TestPlanResults.php:967 UnitsOfMeasure.php:241 WorkCentres.php:289
-#: WWW_Users.php:835
+#: WWW_Users.php:837
msgid "Enter Information"
msgstr "Καταχώρηση Πληροφοριών"
@@ -14674,8 +14674,8 @@
msgid "Run Report"
msgstr "Εκτέλεση αναφοράς"
-#: GLAccounts.php:10
-msgid "Without setting up"
+#: GLAccounts.php:10 GLCashFlowsIndirect.php:15
+msgid "Not set up"
msgstr ""
#: GLAccounts.php:11 GLAccounts.php:272 GLCashFlowsIndirect.php:16
@@ -15126,10 +15126,6 @@
msgid "Could not update the chartdetails record because"
msgstr "Δεν ήταν δυνατή η ενημέρωση της εγγραφής chartdetails επειδή"
-#: GLCashFlowsIndirect.php:15
-msgid "Not set up"
-msgstr ""
-
#: GLCashFlowsIndirect.php:17
msgid "Operating activities"
msgstr ""
@@ -16635,7 +16631,7 @@
msgid "View any open tenders without an offer"
msgstr ""
-#: index.php:38 WWW_Users.php:820
+#: index.php:38 WWW_Users.php:822
msgid "Account Status"
msgstr "Κατάσταση λογαριασμού"
@@ -39441,23 +39437,23 @@
msgstr ""
"Εάν αφήσετε τα πεδία τον κωδικό κενό τον κωδικό πρόσβασής σας δεν θα αλλάξει"
-#: UserSettings.php:205 WWW_Users.php:745
+#: UserSettings.php:205 WWW_Users.php:747
msgid "Display page help"
msgstr ""
-#: UserSettings.php:215 WWW_Users.php:755
+#: UserSettings.php:215 WWW_Users.php:757
msgid "Show page help when available"
msgstr ""
-#: UserSettings.php:220 WWW_Users.php:760
+#: UserSettings.php:220 WWW_Users.php:762
msgid "Display field help"
msgstr ""
-#: UserSettings.php:230 WWW_Users.php:770
+#: UserSettings.php:230 WWW_Users.php:772
msgid "Show field help when available"
msgstr ""
-#: UserSettings.php:238 WWW_Users.php:778
+#: UserSettings.php:238 WWW_Users.php:780
msgid "PDF Language Support"
msgstr "PDF Υποστήριξη ξένων γλωσσών"
@@ -41004,22 +41000,26 @@
msgstr "Δεν είναι ένας πωλητής μόνο η σύνδεσή"
#: WWW_Users.php:732
-msgid "Display Dashboard after Login"
+msgid "Display dashboard"
msgstr ""
-#: WWW_Users.php:793
+#: WWW_Users.php:742
+msgid "Show dashboard page after Login"
+msgstr ""
+
+#: WWW_Users.php:795
msgid "Allowed Department for Internal Requests"
msgstr ""
-#: WWW_Users.php:803 WWW_Users.php:805
+#: WWW_Users.php:805 WWW_Users.php:807
msgid "Any Internal Department"
msgstr ""
-#: WWW_Users.php:823 WWW_Users.php:827
+#: WWW_Users.php:825 WWW_Users.php:829
msgid "Open"
msgstr "Άνοιγμα"
-#: WWW_Users.php:824 WWW_Users.php:826
+#: WWW_Users.php:826 WWW_Users.php:828
msgid "Blocked"
msgstr "Αποκλεισμένοι"
Modified: trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot
===================================================================
--- trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot 2017-04-13 17:43:45 UTC (rev 7754)
+++ trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot 2017-04-15 20:13:36 UTC (rev 7755)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-13 11:01-0600\n"
+"POT-Creation-Date: 2017-04-15 14:11-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
@@ -336,8 +336,8 @@
#: TestPlanResults.php:928 UserGLAccounts.php:187 UserGLAccounts.php:196
#: UserSettings.php:209 UserSettings.php:212 UserSettings.php:224
#: UserSettings.php:227 WWW_Users.php:549 WWW_Users.php:551 WWW_Users.php:720
-#: WWW_Users.php:723 WWW_Users.php:736 WWW_Users.php:739 WWW_Users.php:749
-#: WWW_Users.php:752 WWW_Users.php:764 WWW_Users.php:767
+#: WWW_Users.php:723 WWW_Users.php:736 WWW_Users.php:739 WWW_Users.php:751
+#: WWW_Users.php:754 WWW_Users.php:766 WWW_Users.php:769
#: reportwriter/languages/en_US/reports.php:114
msgid "Yes"
msgstr ""
@@ -407,8 +407,8 @@
#: TestPlanResults.php:927 UserGLAccounts.php:189 UserGLAccounts.php:199
#: UserSettings.php:208 UserSettings.php:211 UserSettings.php:223
#: UserSettings.php:226 WWW_Users.php:548 WWW_Users.php:552 WWW_Users.php:719
-#: WWW_Users.php:722 WWW_Users.php:735 WWW_Users.php:738 WWW_Users.php:748
-#: WWW_Users.php:751 WWW_Users.php:763 WWW_Users.php:766
+#: WWW_Users.php:722 WWW_Users.php:735 WWW_Users.php:738 WWW_Users.php:750
+#: WWW_Users.php:753 WWW_Users.php:765 WWW_Users.php:768
#: includes/PDFLowGPPageHeader.inc:44
#: reportwriter/languages/en_US/reports.php:82
msgid "No"
@@ -6...
[truncated message content] |
|
From: <rc...@us...> - 2017-04-16 15:21:44
|
Revision: 7756
http://sourceforge.net/p/web-erp/reponame/7756
Author: rchacon
Date: 2017-04-16 15:21:39 +0000 (Sun, 16 Apr 2017)
Log Message:
-----------
Improve texts and translations files.
Modified Paths:
--------------
trunk/AddCustomerContacts.php
trunk/PcAnalysis.php
trunk/SupplierAllocations.php
trunk/WWW_Users.php
trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.mo
trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po
trunk/locale/ar_SY.utf8/LC_MESSAGES/messages.mo
trunk/locale/ar_SY.utf8/LC_MESSAGES/messages.po
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.mo
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po
trunk/locale/el_GR.utf8/LC_MESSAGES/messages.mo
trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po
trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot
trunk/locale/en_US.utf8/LC_MESSAGES/messages.mo
trunk/locale/en_US.utf8/LC_MESSAGES/messages.po
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.mo
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.po
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.mo
trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po
trunk/locale/he_IL.utf8/LC_MESSAGES/messages.mo
trunk/locale/he_IL.utf8/LC_MESSAGES/messages.po
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.mo
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.po
trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.mo
trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.po
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.mo
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.po
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.mo
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.po
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.mo
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.po
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.mo
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.po
trunk/locale/ko_KR.utf8/LC_MESSAGES/messages.mo
trunk/locale/ko_KR.utf8/LC_MESSAGES/messages.po
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.mo
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.po
trunk/locale/mr_IN.utf8/LC_MESSAGES/messages.po
trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.mo
trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.po
trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.mo
trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.mo
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.mo
trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.po
trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.mo
trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.po
trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.mo
trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.po
trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.mo
trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.po
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.mo
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.po
trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.mo
trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.po
trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.mo
trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.po
trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.mo
trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_TW.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_TW.utf8/LC_MESSAGES/messages.po
Modified: trunk/AddCustomerContacts.php
===================================================================
--- trunk/AddCustomerContacts.php 2017-04-15 20:13:36 UTC (rev 7755)
+++ trunk/AddCustomerContacts.php 2017-04-16 15:21:39 UTC (rev 7756)
@@ -132,7 +132,7 @@
echo '<tr>
<th class="text">', _('Name'), '</th>
<th class="text">', _('Role'), '</th>
- <th class="text">', _('Phone no'), '</th>
+ <th class="text">', _('Phone No'), '</th>
<th class="text">', _('Email'), '</th>
<th class="text">', _('Statement'), '</th>
<th class="text">', _('Notes'), '</th>
Modified: trunk/PcAnalysis.php
===================================================================
--- trunk/PcAnalysis.php 2017-04-15 20:13:36 UTC (rev 7755)
+++ trunk/PcAnalysis.php 2017-04-16 15:21:39 UTC (rev 7756)
@@ -176,7 +176,7 @@
$objWriter->save('php://output');
}else{
- $Title = _('Excel file for petty Cash Expenses Analysis');
+ $Title = _('Excel file for Petty Cash Expenses Analysis');
include('includes/header.php');
prnMsg('No data to analyse');
include('includes/footer.php');
Modified: trunk/SupplierAllocations.php
===================================================================
--- trunk/SupplierAllocations.php 2017-04-15 20:13:36 UTC (rev 7755)
+++ trunk/SupplierAllocations.php 2017-04-16 15:21:39 UTC (rev 7756)
@@ -17,17 +17,20 @@
*/
include('includes/DefineSuppAllocsClass.php');
+
include('includes/session.php');
$Title = _('Supplier Payment') . '/' . _('Credit Note Allocations');
$ViewTopic = 'ARTransactions';// Filename in ManualContents.php's TOC./* RChacon: To do ManualAPInquiries.html from ManualARInquiries.html */
-$BookMark = 'SupplierAllocations';// Anchor's id in the manual's html document.
+$BookMark = 'SupplierAllocations';
include('includes/header.php');
+echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/transactions.png" title="', // Icon image.
+ _('Supplier Allocations'), '" /> ', // Icon title.
+ _('Supplier Allocations'), '</p>';// Page title.
+
include('includes/SQL_CommonFunctions.inc');
-echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/transactions.png" title="' .
- _('Supplier Allocations') . '" alt="" />' . ' ' . _('Supplier Allocations') . '</p>';
-
if (isset($_POST['UpdateDatabase']) OR isset($_POST['RefreshAllocTotal'])) {
if (!isset($_SESSION['Alloc'])){
@@ -197,19 +200,19 @@
$_SESSION['Alloc']->TransDate = FormatDateForSQL($_SESSION['Alloc']->TransDate);
$SQL = "INSERT INTO gltrans (type,
- typeno,
- trandate,
- periodno,
- account,
- narrative,
- amount)
- VALUES ('" . $_SESSION['Alloc']->TransType . "',
- '" . $_SESSION['Alloc']->TransNo . "',
- '" . $_SESSION['Alloc']->TransDate . "',
- '" . $PeriodNo . "',
- '" . $_SESSION['CompanyRecord']['purchasesexchangediffact'] . "',
- '". _('Exch diff') . "',
- '" . $MovtInDiffOnExch . "')";
+ typeno,
+ trandate,
+ periodno,
+ account,
+ narrative,
+ amount)
+ VALUES ('" . $_SESSION['Alloc']->TransType . "',
+ '" . $_SESSION['Alloc']->TransNo . "',
+ '" . $_SESSION['Alloc']->TransDate . "',
+ '" . $PeriodNo . "',
+ '" . $_SESSION['CompanyRecord']['purchasesexchangediffact'] . "',
+ '". _('Exchange difference') . "',
+ '" . $MovtInDiffOnExch . "')";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The GL entry for the difference on exchange arising out of this allocation could not be inserted because');
$DbgMsg = _('The following SQL to insert the GLTrans record was used');
@@ -218,19 +221,19 @@
$SQL = "INSERT INTO gltrans (type,
- typeno,
- trandate,
- periodno,
- account,
- narrative,
- amount)
- VALUES ('" . $_SESSION['Alloc']->TransType . "',
- '" . $_SESSION['Alloc']->TransNo . "',
- '" . $_SESSION['Alloc']->TransDate . "',
- '" . $PeriodNo . "',
- '" . $_SESSION['CompanyRecord']['creditorsact'] . "',
- '" . _('Exch Diff') . "',
- '" . -$MovtInDiffOnExch . "')";
+ typeno,
+ trandate,
+ periodno,
+ account,
+ narrative,
+ amount)
+ VALUES ('" . $_SESSION['Alloc']->TransType . "',
+ '" . $_SESSION['Alloc']->TransNo . "',
+ '" . $_SESSION['Alloc']->TransDate . "',
+ '" . $PeriodNo . "',
+ '" . $_SESSION['CompanyRecord']['creditorsact'] . "',
+ '" . _('Exchange difference') . "',
+ '" . -$MovtInDiffOnExch . "')";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ' : ' .
_('The GL entry for the difference on exchange arising out of this allocation could not be inserted because');
Modified: trunk/WWW_Users.php
===================================================================
--- trunk/WWW_Users.php 2017-04-15 20:13:36 UTC (rev 7755)
+++ trunk/WWW_Users.php 2017-04-16 15:21:39 UTC (rev 7756)
@@ -31,8 +31,8 @@
_('Asset Manager'),
_('Petty Cash'),
_('Setup'),
- _('Utilities'));
-
+ _('Utilities')
+);
$ModuleListLabel = array(
_('Display Sales module'),
_('Display Receivables module'),
@@ -44,13 +44,15 @@
_('Display Asset Manager module'),
_('Display Petty Cash module'),
_('Display Setup module'),
- _('Display Utilities module'));
+ _('Display Utilities module')
+);
+$PDFLanguages = array(
+ _('Latin Western Languages - Times'),
+ _('Eastern European Russian Japanese Korean Hebrew Arabic Thai'),
+ _('Chinese'),
+ _('Free Serif')
+);
-$PDFLanguages = array(_('Latin Western Languages - Times'),
- _('Eastern European Russian Japanese Korean Hebrew Arabic Thai'),
- _('Chinese'),
- _('Free Serif'));
-
include('includes/SQL_CommonFunctions.inc');
// Make an array of the security roles
@@ -84,33 +86,33 @@
//first off validate inputs sensible
if(mb_strlen($_POST['UserID'])<4) {
$InputError = 1;
- prnMsg(_('The user ID entered must be at least 4 characters long'),'error');
+ prnMsg(_('The user ID entered must be at least 4 characters long'), 'error');
} elseif(ContainsIlLegalCharacters($_POST['UserID'])) {
$InputError = 1;
- prnMsg(_('User names cannot contain any of the following characters') . " - ' & + \" \\ " . _('or a space'),'error');
+ prnMsg(_('User names cannot contain any of the following characters') . " - ' & + \" \\ " . _('or a space'), 'error');
} elseif(mb_strlen($_POST['Password'])<5) {
if(!$SelectedUser) {
$InputError = 1;
- prnMsg(_('The password entered must be at least 5 characters long'),'error');
+ prnMsg(_('The password entered must be at least 5 characters long'), 'error');
}
} elseif(mb_strstr($_POST['Password'],$_POST['UserID'])!= False) {
$InputError = 1;
- prnMsg(_('The password cannot contain the user id'),'error');
+ prnMsg(_('The password cannot contain the user id'), 'error');
} elseif((mb_strlen($_POST['Cust'])>0)
AND (mb_strlen($_POST['BranchCode'])==0)) {
$InputError = 1;
- prnMsg(_('If you enter a Customer Code you must also enter a Branch Code valid for this Customer'),'error');
+ prnMsg(_('If you enter a Customer Code you must also enter a Branch Code valid for this Customer'), 'error');
} elseif($AllowDemoMode AND $_POST['UserID'] == 'admin') {
- prnMsg(_('The demonstration user called demo cannot be modified.'),'error');
+ prnMsg(_('The demonstration user called demo cannot be modified.'), 'error');
$InputError = 1;
}
if(!isset($SelectedUser)) {
/* check to ensure the user id is not already entered */
- $result = DB_query("SELECT userid FROM www_users WHERE userid='" . $_POST['UserID'] . "'");
- if(DB_num_rows($result)==1) {
+ $Result = DB_query("SELECT userid FROM www_users WHERE userid='" . $_POST['UserID'] . "'");
+ if(DB_num_rows($Result)==1) {
$InputError =1;
- prnMsg(_('The user ID') . ' ' . $_POST['UserID'] . ' ' . _('already exists and cannot be used again'),'error');
+ prnMsg(_('The user ID') . ' ' . $_POST['UserID'] . ' ' . _('already exists and cannot be used again'), 'error');
}
}
@@ -123,10 +125,10 @@
$ErrMsg = _('The check on validity of the customer code and branch failed because');
$DbgMsg = _('The SQL that was used to check the customer code and branch was');
- $result = DB_query($sql,$ErrMsg,$DbgMsg);
+ $Result = DB_query($sql, $ErrMsg, $DbgMsg);
- if(DB_num_rows($result)==0) {
- prnMsg(_('The entered Branch Code is not valid for the entered Customer Code'),'error');
+ if(DB_num_rows($Result)==0) {
+ prnMsg(_('The entered Branch Code is not valid for the entered Customer Code'), 'error');
$InputError = 1;
}
}
@@ -143,12 +145,9 @@
if(isset($SelectedUser) AND $InputError !=1) {
-/*SelectedUser could also exist if submit had not been clicked this code would not run in this case cos submit is false of course see the delete code below*/
+/*SelectedUser could also exist if submit had not been clicked this code would not run in this case cos submit is false of course see the delete code below*/
- if(!isset($_POST['Cust'])
- OR $_POST['Cust']==NULL
- OR $_POST['Cust']=='') {
-
+ if(!isset($_POST['Cust']) OR $_POST['Cust']==NULL OR $_POST['Cust']=='') {
$_POST['Cust']='';
$_POST['BranchCode']='';
}
@@ -179,7 +178,7 @@
pdflanguage='" . $_POST['PDFLanguage'] . "',
department='" . $_POST['Department'] . "'
WHERE userid = '". $SelectedUser . "'";
- prnMsg( _('The selected user record has been updated'), 'success' );
+ prnMsg(_('The selected user record has been updated'), 'success' );
$_SESSION['ShowPageHelp'] = $_POST['ShowPageHelp'];
$_SESSION['ShowFieldHelp'] = $_POST['ShowFieldHelp'];
@@ -230,7 +229,7 @@
'". $_POST['UserLanguage'] ."',
'" . $_POST['PDFLanguage'] . "',
'" . $_POST['Department'] . "')";
- prnMsg( _('A new user record has been inserted'), 'success' );
+ prnMsg(_('A new user record has been inserted'), 'success' );
$LocationSql = "INSERT INTO locationusers (loccode,
userid,
@@ -245,16 +244,16 @@
$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' );
+ 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; ";
+ 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' );
+ prnMsg(_('User has been authorized to use and update all GL accounts'), 'success' );
}
if($InputError!=1) {
@@ -261,7 +260,7 @@
//run the SQL from either of the above possibilites
$ErrMsg = _('The user alterations could not be processed because');
$DbgMsg = _('The SQL that was used to update the user and failed was');
- $result = DB_query($sql,$ErrMsg,$DbgMsg);
+ $Result = DB_query($sql, $ErrMsg, $DbgMsg);
unset($_POST['UserID']);
unset($_POST['RealName']);
@@ -293,28 +292,28 @@
if($AllowDemoMode AND $SelectedUser == 'admin') {
- prnMsg(_('The demonstration user called demo cannot be deleted'),'error');
+ prnMsg(_('The demonstration user called demo cannot be deleted'), 'error');
} else {
- $sql="SELECT userid FROM audittrail where userid='" . $SelectedUser ."'";
- $result=DB_query($sql);
- if(DB_num_rows($result)!=0) {
+ $sql = "SELECT userid FROM audittrail where userid='" . $SelectedUser ."'";
+ $Result = DB_query($sql);
+ if(DB_num_rows($Result)!=0) {
prnMsg(_('Cannot delete user as entries already exist in the audit trail'), 'warn');
} else {
- $sql="DELETE FROM locationusers WHERE userid='" . $SelectedUser . "'";
- $ErrMsg = _('The Location - User could not be deleted because');;
- $result = DB_query($sql,$ErrMsg);
+ $sql = "DELETE FROM locationusers WHERE userid='" . $SelectedUser . "'";
+ $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 glaccountusers WHERE userid='" . $SelectedUser . "'";
+ $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 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);
+ $sql = "DELETE FROM www_users WHERE userid='" . $SelectedUser . "'";
+ $ErrMsg = _('The User could not be deleted because');
+ $Result = DB_query($sql, $ErrMsg);
prnMsg(_('User Deleted'),'info');
}
unset($SelectedUser);
@@ -399,7 +398,7 @@
if(isset($SelectedUser)) {
- echo '<div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">' . _('Review Existing Users') . '</a></div><br />';
+ echo '<div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">' . _('Review Existing Users') . '</a></div><br />';
}
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
@@ -435,8 +434,8 @@
FROM www_users
WHERE userid='" . $SelectedUser . "'";
- $result = DB_query($sql);
- $myrow = DB_fetch_array($result);
+ $Result = DB_query($sql);
+ $myrow = DB_fetch_array($Result);
$_POST['UserID'] = $myrow['userid'];
$_POST['RealName'] = $myrow['realname'];
@@ -443,7 +442,7 @@
$_POST['Phone'] = $myrow['phone'];
$_POST['Email'] = $myrow['email'];
$_POST['Cust'] = $myrow['customerid'];
- $_POST['BranchCode'] = $myrow['branchcode'];
+ $_POST['BranchCode'] = $myrow['branchcode'];
$_POST['SupplierID'] = $myrow['supplierid'];
$_POST['Salesman'] = $myrow['salesman'];
$_POST['PageSize'] = $myrow['pagesize'];
@@ -466,7 +465,7 @@
echo '<table class="selection">
<tr>
- <td>' . _('User code') . ':</td>
+ <td>' . _('User Code') . ':</td>
<td>' . $_POST['UserID'] . '</td>
</tr>';
@@ -475,7 +474,7 @@
echo '<table class="selection">
<tr>
<td>' . _('User Login') . ':</td>
- <td><input pattern="(?!^([aA]{1}[dD]{1}[mM]{1}[iI]{1}[nN]{1})$)[^?+.&\\>< ]{4,}" type="text" required="required" name="UserID" size="22" maxlength="20" placeholder="'._('At least 4 characters').'" title="'._('Please input not less than 4 characters and canot be admin or contains illegal characters').'" /></td>
+ <td><input pattern="(?!^([aA]{1}[dD]{1}[mM]{1}[iI]{1}[nN]{1})$)[^?+.&\\>< ]{4,}" type="text" required="required" name="UserID" size="22" maxlength="20" placeholder="'._('At least 4 characters').'" title="'._('Please input not less than 4 characters and canot be admin or contains illegal characters').'" /></td>
</tr>';
/*set the default modules to show to all
@@ -518,7 +517,7 @@
</tr>';
echo '<tr>
<td>' . _('Telephone No') . ':</td>
- <td><input type="tel" name="Phone" pattern="[0-9+()\s-]*" value="' . $_POST['Phone'] . '" size="32" maxlength="30" /></td>
+ <td><input type="tel" name="Phone" pattern="[0-9+()\s-]*" value="' . $_POST['Phone'] . '" size="32" maxlength="30" /></td>
</tr>';
echo '<tr>
<td>' . _('Email Address') .':</td>
@@ -530,16 +529,15 @@
foreach($SecurityRoles as $SecKey => $SecVal) {
if(isset($_POST['Access']) and $SecKey == $_POST['Access']) {
- echo '<option selected="selected" value="' . $SecKey . '">' . $SecVal . '</option>';
+ echo '<option selected="selected" value="' . $SecKey . '">' . $SecVal . '</option>';
} else {
- echo '<option value="' . $SecKey . '">' . $SecVal . '</option>';
+ echo '<option value="' . $SecKey . '">' . $SecVal . '</option>';
}
}
echo '</select>';
echo '<input type="hidden" name="ID" value="'.$_SESSION['UserID'].'" /></td>
+ </tr>';
- </tr>';
-
echo '<tr>
<td>' . _('User Can Create Tenders') . ':</td>
<td><select name="CanCreateTender">';
@@ -558,13 +556,13 @@
<td><select name="DefaultLocation">';
$sql = "SELECT loccode, locationname FROM locations";
-$result = DB_query($sql);
+$Result = DB_query($sql);
-while($myrow=DB_fetch_array($result)) {
+while($myrow=DB_fetch_array($Result)) {
if(isset($_POST['DefaultLocation']) AND $myrow['loccode'] == $_POST['DefaultLocation']) {
- echo '<option selected="selected" value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
+ echo '<option selected="selected" value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
} else {
- echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
+ echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
}
}
@@ -600,13 +598,13 @@
<td><select name="Salesman">';
$sql = "SELECT salesmancode, salesmanname FROM salesman WHERE current = 1 ORDER BY salesmanname";
-$result = DB_query($sql);
+$Result = DB_query($sql);
if((isset($_POST['Salesman']) AND $_POST['Salesman']=='') OR !isset($_POST['Salesman'])) {
- echo '<option selected="selected" value="">' . _('Not a salesperson only login') . '</option>';
+ echo '<option selected="selected" value="">' . _('Not a salesperson only login') . '</option>';
} else {
echo '<option value="">' . _('Not a salesperson only login') . '</option>';
}
-while($myrow=DB_fetch_array($result)) {
+while($myrow=DB_fetch_array($Result)) {
if(isset($_POST['Salesman']) AND $myrow['salesmancode'] == $_POST['Salesman']) {
echo '<option selected="selected" value="' . $myrow['salesmancode'] . '">' . $myrow['salesmanname'] . '</option>';
@@ -624,44 +622,44 @@
<td><select name="PageSize">';
if(isset($_POST['PageSize']) AND $_POST['PageSize']=='A4') {
- echo '<option selected="selected" value="A4">' . _('A4') . '</option>';
+ echo '<option selected="selected" value="A4">' . _('A4') . '</option>';
} else {
echo '<option value="A4">' . _('A4') . '</option>';
}
if(isset($_POST['PageSize']) AND $_POST['PageSize']=='A3') {
- echo '<option selected="selected" value="A3">' . _('A3') . '</option>';
+ echo '<option selected="selected" value="A3">' . _('A3') . '</option>';
} else {
- echo '<option value="A3">' . _('A3') . '</option>';
+ echo '<option value="A3">' . _('A3') . '</option>';
}
if(isset($_POST['PageSize']) AND $_POST['PageSize']=='A3_Landscape') {
- echo '<option selected="selected" value="A3_Landscape">' . _('A3') . ' ' . _('landscape') . '</option>';
+ echo '<option selected="selected" value="A3_Landscape">' . _('A3') . ' ' . _('landscape') . '</option>';
} else {
- echo '<option value="A3_Landscape">' . _('A3') . ' ' . _('landscape') . '</option>';
+ echo '<option value="A3_Landscape">' . _('A3') . ' ' . _('landscape') . '</option>';
}
if(isset($_POST['PageSize']) AND $_POST['PageSize']=='Letter') {
- echo '<option selected="selected" value="Letter">' . _('Letter') . '</option>';
+ echo '<option selected="selected" value="Letter">' . _('Letter') . '</option>';
} else {
- echo '<option value="Letter">' . _('Letter') . '</option>';
+ echo '<option value="Letter">' . _('Letter') . '</option>';
}
if(isset($_POST['PageSize']) AND $_POST['PageSize']=='Letter_Landscape') {
- echo '<option selected="selected" value="Letter_Landscape">' . _('Letter') . ' ' . _('landscape') . '</option>';
+ echo '<option selected="selected" value="Letter_Landscape">' . _('Letter') . ' ' . _('landscape') . '</option>';
} else {
- echo '<option value="Letter_Landscape">' . _('Letter') . ' ' . _('landscape') . '</option>';
+ echo '<option value="Letter_Landscape">' . _('Letter') . ' ' . _('landscape') . '</option>';
}
if(isset($_POST['PageSize']) AND $_POST['PageSize']=='Legal') {
- echo '<option selected="selected" value="Legal">' . _('Legal') . '</option>';
+ echo '<option selected="selected" value="Legal">' . _('Legal') . '</option>';
} else {
- echo '<option value="Legal">' . _('Legal') . '</option>';
+ echo '<option value="Legal">' . _('Legal') . '</option>';
}
if(isset($_POST['PageSize']) AND $_POST['PageSize']=='Legal_Landscape') {
- echo '<option selected="selected" value="Legal_Landscape">' . _('Legal') . ' ' . _('landscape') . '</option>';
+ echo '<option selected="selected" value="Legal_Landscape">' . _('Legal') . ' ' . _('landscape') . '</option>';
} else {
- echo '<option value="Legal_Landscape">' . _('Legal') . ' ' . _('landscape') . '</option>';
+ echo '<option value="Legal_Landscape">' . _('Legal') . ' ' . _('landscape') . '</option>';
}
echo '</select></td>
@@ -679,9 +677,9 @@
if(is_dir('css/' . $ThemeName) AND $ThemeName != '.' AND $ThemeName != '..' AND $ThemeName != '.svn') {
if(isset($_POST['Theme']) AND $_POST['Theme'] == $ThemeName) {
- echo '<option selected="selected" value="' . $ThemeName . '">' . $ThemeName . '</option>';
+ echo '<option selected="selected" value="' . $ThemeName . '">' . $ThemeName . '</option>';
} else if(!isset($_POST['Theme']) AND ($Theme==$ThemeName)) {
- echo '<option selected="selected" value="' . $ThemeName . '">' . $ThemeName . '</option>';
+ echo '<option selected="selected" value="' . $ThemeName . '">' . $ThemeName . '</option>';
} else {
echo '<option value="' . $ThemeName . '">' . $ThemeName . '</option>';
}
@@ -698,11 +696,11 @@
foreach($LanguagesArray as $LanguageEntry => $LanguageName) {
if(isset($_POST['UserLanguage']) AND $_POST['UserLanguage'] == $LanguageEntry) {
- echo '<option selected="selected" value="' . $LanguageEntry . '">' . $LanguageName['LanguageName'] . '</option>';
+ echo '<option selected="selected" value="' . $LanguageEntry . '">' . $LanguageName['LanguageName'] . '</option>';
} elseif(!isset($_POST['UserLanguage']) AND $LanguageEntry == $DefaultLanguage) {
- echo '<option selected="selected" value="' . $LanguageEntry . '">' . $LanguageName['LanguageName'] . '</option>';
+ echo '<option selected="selected" value="' . $LanguageEntry . '">' . $LanguageName['LanguageName'] . '</option>';
} else {
- echo '<option value="' . $LanguageEntry . '">' . $LanguageName['LanguageName'] . '</option>';
+ echo '<option value="' . $LanguageEntry . '">' . $LanguageName['LanguageName'] . '</option>';
}
}
echo '</select></td>
@@ -727,7 +725,7 @@
$i++;
}// END foreach($ModuleList as $ModuleName).
-// Turn off/on dashboard after Login:
+// Turn off/on dashboard:
echo '<tr>
<td><label for="ShowDashboard">', _('Display dashboard'), ':</label></td>
<td><select id="ShowDashboard" name="ShowDashboard">';
@@ -739,7 +737,7 @@
'<option selected="selected" value="1">', _('Yes'), '</option>';
}
echo '</select>',
- (!isset($_SESSION['ShowFieldHelp']) || $_SESSION['ShowFieldHelp'] ? _('Show dashboard page after Login') : ''), // If the parameter $_SESSION['ShowFieldHelp'] is not set OR is TRUE, shows this field help text.
+ (!isset($_SESSION['ShowFieldHelp']) || $_SESSION['ShowFieldHelp'] ? _('Show dashboard page after login') : ''), // If the parameter $_SESSION['ShowFieldHelp'] is not set OR is TRUE, shows this field help text.
'</td>
</tr>';
// Turn off/on page help:
@@ -794,19 +792,19 @@
echo '<tr>
<td>' . _('Allowed Department for Internal Requests') . ':</td>';
-$sql="SELECT departmentid,
+$sql = "SELECT departmentid,
description
FROM departments
ORDER BY description";
-$result=DB_query($sql);
+$Result=DB_query($sql);
echo '<td><select name="Department">';
if((isset($_POST['Department']) AND $_POST['Department']=='0') OR !isset($_POST['Department'])) {
- echo '<option selected="selected" value="0">' . _('Any Internal Department') . '</option>';
+ echo '<option selected="selected" value="0">' . _('Any Internal Department') . '</option>';
} else {
echo '<option value="">' . _('Any Internal Department') . '</option>';
}
-while($myrow=DB_fetch_array($result)) {
+while($myrow=DB_fetch_array($Result)) {
if(isset($_POST['Department']) AND $myrow['departmentid'] == $_POST['Department']) {
echo '<option selected="selected" value="' . $myrow['departmentid'] . '">' . $myrow['description'] . '</option>';
} else {
@@ -836,7 +834,7 @@
<div class="centre">
<input type="submit" name="submit" value="' . _('Enter Information') . '" />
</div>
- </div>
+ </div>
</form>';
include('includes/footer.php');
Modified: trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2017-04-15 20:13:36 UTC (rev 7755)
+++ trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2017-04-16 15:21:39 UTC (rev 7756)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: webERP 4.13\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-15 14:11-0600\n"
+"POT-Creation-Date: 2017-04-16 09:16-0600\n"
"PO-Revision-Date: 2013-06-01 11:19-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: Arabic <ar...@li...>\n"
@@ -354,9 +354,9 @@
#: TestPlanResults.php:747 ...
[truncated message content] |
|
From: <rc...@us...> - 2017-04-17 14:25:22
|
Revision: 7757
http://sourceforge.net/p/web-erp/reponame/7757
Author: rchacon
Date: 2017-04-17 14:25:20 +0000 (Mon, 17 Apr 2017)
Log Message:
-----------
Improve help in manual.
Modified Paths:
--------------
trunk/AnalysisHorizontalIncome.php
trunk/doc/Manual/ManualGeneralLedger.html
Modified: trunk/AnalysisHorizontalIncome.php
===================================================================
--- trunk/AnalysisHorizontalIncome.php 2017-04-16 15:21:39 UTC (rev 7756)
+++ trunk/AnalysisHorizontalIncome.php 2017-04-17 14:25:20 UTC (rev 7757)
@@ -2,6 +2,7 @@
/* $Id: AnalysisHorizontalIncome.php 7349 2015-09-14 14:43:19Z rchacon $*/
/* Shows the horizontal analysis of the statement of comprehensive income. */
+// BEGIN: Functions division ---------------------------------------------------
function RelativeChange($selected_period, $previous_period) {
// Calculates the relative change between selected and previous periods. Uses percent with locale number format.
if($previous_period<>0) {
@@ -10,13 +11,16 @@
return _('N/A');
}
}
+// END: Functions division -----------------------------------------------------
+// BEGIN: Procedure division ---------------------------------------------------
include ('includes/session.php');
-$Title = _('Horizontal Analysis of Statement of Comprehensive Income');// Screen identification.
-$ViewTopic= 'GeneralLedger';// Filename's id in ManualContents.php's TOC.
-$BookMark = 'AnalysisHorizontalIncome';// Anchor's id in the manual's html document.
+$Title = _('Horizontal Analysis of Statement of Comprehensive Income');
+$ViewTopic= 'GeneralLedger';
+$BookMark = 'AnalysisHorizontalIncome';
+
include('includes/SQL_CommonFunctions.inc');
-include('includes/AccountSectionsDef.php');// This loads the $Sections variable
+include('includes/AccountSectionsDef.php');// This loads the $Sections variable.
if(isset($_POST['FromPeriod']) and ($_POST['FromPeriod'] > $_POST['ToPeriod'])) {
prnMsg(_('The selected period from is actually after the period to') . '! ' . _('Please reselect the reporting period'),'error');
Modified: trunk/doc/Manual/ManualGeneralLedger.html
===================================================================
--- trunk/doc/Manual/ManualGeneralLedger.html 2017-04-16 15:21:39 UTC (rev 7756)
+++ trunk/doc/Manual/ManualGeneralLedger.html 2017-04-17 14:25:20 UTC (rev 7757)
@@ -351,9 +351,11 @@
<!-- ----------------------------------------------------------------------- -->
<li>
<h3><a id="GLCashFlows">Statement of Cash Flows</a></h3>
- <p>The purpose of the statement of cash flows is to show where the company got their money from and how it was spent during the period being reported for a user selectable range of periods.</p>
<p>The statement of cash flows, also known as the successor of the old source and application of funds statement, reports how changes in balance sheet accounts and income affect cash and cash equivalents, and breaks the analysis down to operating, investing and financing activities (see <a href="ManualContents.php?
ViewTopic=GeneralLedger#GLCashFlowsSetup">GLCashFlowsSetup</a>).</p>
+ <p>The purpose of the statement of cash flows is to show where the company got their money from and how it was spent during the period being reported for a user selectable range of periods.</p>
+ <p>The statement of cash flows represents a period of time. This contrasts with the statement of financial position, which represents a single moment in time.</p>
+ <p>webERP is an "accrual" based system (not a "cash based" system). Accrual systems include items when they are invoiced to the customer, and when expenses are owed based on the supplier invoice date.</p>
<p>It can be generated using either direct method or indirect method. The main difference between them is the cash flows from operating activities, the first section of the statement of cash flows; there is no difference in the investing and financing activities sections.</p>
<h4><a id="GLCashFlowsDirect">Statement of Cash Flows using Direct Method</a></h4>
<p>The cash flows from operating activities will show lines such as cash from customers and cash paid to suppliers. "<i>Major classes of gross cash receipts and gross cash payments are disclosed</i>" (Reference: IAS 7, paragraph 18).</p>
|
|
From: <rc...@us...> - 2017-04-17 14:54:11
|
Revision: 7758
http://sourceforge.net/p/web-erp/reponame/7758
Author: rchacon
Date: 2017-04-17 14:54:04 +0000 (Mon, 17 Apr 2017)
Log Message:
-----------
Fix text to "Positive integer".
Modified Paths:
--------------
trunk/SuppFixedAssetChgs.php
trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.mo
trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po
trunk/locale/ar_SY.utf8/LC_MESSAGES/messages.mo
trunk/locale/ar_SY.utf8/LC_MESSAGES/messages.po
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.mo
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po
trunk/locale/el_GR.utf8/LC_MESSAGES/messages.mo
trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po
trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot
trunk/locale/en_US.utf8/LC_MESSAGES/messages.mo
trunk/locale/en_US.utf8/LC_MESSAGES/messages.po
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.mo
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.po
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.mo
trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po
trunk/locale/he_IL.utf8/LC_MESSAGES/messages.mo
trunk/locale/he_IL.utf8/LC_MESSAGES/messages.po
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.mo
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.po
trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.mo
trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.po
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.mo
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.po
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.mo
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.po
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.mo
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.po
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.mo
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.po
trunk/locale/ko_KR.utf8/LC_MESSAGES/messages.mo
trunk/locale/ko_KR.utf8/LC_MESSAGES/messages.po
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.mo
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.po
trunk/locale/mr_IN.utf8/LC_MESSAGES/messages.po
trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.mo
trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.po
trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.mo
trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.mo
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.mo
trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.po
trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.mo
trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.po
trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.mo
trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.po
trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.mo
trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.po
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.mo
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.po
trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.mo
trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.po
trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.mo
trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.po
trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.mo
trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_TW.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_TW.utf8/LC_MESSAGES/messages.po
Modified: trunk/SuppFixedAssetChgs.php
===================================================================
--- trunk/SuppFixedAssetChgs.php 2017-04-17 14:25:20 UTC (rev 7757)
+++ trunk/SuppFixedAssetChgs.php 2017-04-17 14:54:04 UTC (rev 7758)
@@ -1,5 +1,4 @@
<?php
-
/* $Id: SuppFixedAssetChgs.php 4473 2011-01-23 04:08:53Z daintree $ */
/*The supplier transaction uses the SuppTrans class to hold the information about the invoice
@@ -10,12 +9,9 @@
/* Session started here for password checking and authorisation level check */
include('includes/session.php');
-
$Title = _('Fixed Asset Charges or Credits');
-
$ViewTopic = 'FixedAssets';
$BookMark = 'AssetInvoices';
-
include('includes/header.php');
if (!isset($_SESSION['SuppTrans'])){
@@ -119,11 +115,11 @@
echo '<br /><table class="selection">';
echo '<tr>
- <td>' . _('Enter Asset ID') . ':</td>
- <td><input type="text" class="integer" pattern="[^-]{1,5}" name="AssetID" title="'._('The Asset ID should be positive integer').'" size="7" maxlength="6" placeholder="'._('Postive integer').'" value="' . $_POST['AssetID'] . '" /> <a href="FixedAssetItems.php" target="_blank">' . _('New Fixed Asset') . '</a></td>
- </tr>';
-echo '<tr>
- <td><b>' . _('OR') .' </b>' . _('Select from list') . ':</td>
+ <td>', _('Enter Asset ID'), ':</td>
+ <td><input class="integer" maxlength="6" name="AssetID" pattern="[^-]{1,5}" placeholder="', _('Positive integer'), '" size="7" title="', _('The Asset ID should be positive integer'), '" type="text" value="', $_POST['AssetID'], '" /> <a href="FixedAssetItems.php" target="_blank">', _('New Fixed Asset'), '</a></td>
+ </tr>
+ <tr>
+ <td><b>', _('OR'), ' </b>', _('Select from list'), ':</td>
<td><select name="AssetSelection">';
$sql = "SELECT assetid,
Modified: trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2017-04-17 14:25:20 UTC (rev 7757)
+++ trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2017-04-17 14:54:04 UTC (rev 7758)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: webERP 4.13\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-16 09:16-0600\n"
+"POT-Creation-Date: 2017-04-17 08:51-0600\n"
"PO-Revision-Date: 2013-06-01 11:19-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: Arabic <ar...@li...>\n"
@@ -159,23 +159,23 @@
#: Areas.php:115 Areas.php:124 BankAccounts.php:165 CreditStatus.php:125
#: Currencies.php:247 Currencies.php:255 Currencies.php:263 Currencies.php:273
#: CustomerBranches.php:300 CustomerBranches.php:310 CustomerBranches.php:320
-#: CustomerBranches.php:330 CustomerBranches.php:340 Customers.php:296
-#: Customers.php:305 Customers.php:313 Customers.php:324 Customers.php:334
-#: CustomerTypes.php:146 CustomerTypes.php:156 Departments.php:141
-#: Factors.php:134 FixedAssetCategories.php:137 GLAccounts.php:110
-#: GLAccounts.php:124 Locations.php:279 Locations.php:287 Locations.php:298
-#: Locations.php:307 Locations.php:316 Locations.php:325 Locations.php:334
-#: Locations.php:343 Locations.php:351 Manufacturers.php:185
-#: MRPDemandTypes.php:87 PaymentMethods.php:162 PaymentTerms.php:146
-#: PaymentTerms.php:153 PcExpenses.php:161 SalesCategories.php:147
-#: SalesCategories.php:154 SalesPeople.php:159 SalesPeople.php:166
-#: SalesPeople.php:172 SalesTypes.php:140 SalesTypes.php:150 Shippers.php:81
-#: Shippers.php:93 StockCategories.php:216 Stocks.php:767 Stocks.php:776
-#: Stocks.php:784 Stocks.php:792 Stocks.php:800 Stocks.php:808 Stocks.php:816
-#: Stocks.php:824 Suppliers.php:646 Suppliers.php:655 Suppliers.php:663
-#: SupplierTypes.php:126 TaxCategories.php:132 TaxGroups.php:135
-#: TaxGroups.php:143 TaxProvinces.php:129 UnitsOfMeasure.php:135
-#: WorkCentres.php:91 WorkCentres.php:97 WWW_Access.php:88
+#: CustomerBranches.php:330 CustomerBranches.php:340 CustomerTypes.php:146
+#: CustomerTypes.php:156 Customers.php:296 Customers.php:305 Customers.php:313
+#: Customers.php:324 Customers.php:334 Departments.php:141 Factors.php:134
+#: FixedAssetCategories.php:137 GLAccounts.php:110 GLAccounts.php:124
+#: Locations.php:279 Locations.php:287 Locations.php:298 Locations.php:307
+#: Locations.php:316 Locations.php:325 Locations.php:334 Locations.php:343
+#: Locations.php:351 MRPDemandTypes.php:87 Manufacturers.php:185
+#: PaymentMethods.php:162 PaymentTerms.php:146 PaymentTerms.php:153
+#: PcExpenses.php:161 SalesCategories.php:147 SalesCategories.php:154
+#: SalesPeople.php:159 SalesPeople.php:166 SalesPeople.php:172
+#: SalesTypes.php:140 SalesTypes.php:150 Shippers.php:81 Shippers.php:93
+#: StockCategories.php:216 Stocks.php:767 Stocks.php:776 Stocks.php:784
+#: Stocks.php:792 Stocks.php:800 Stocks.php:808 Stocks.php:816 Stocks.php:824
+#: SupplierTypes.php:126 Suppliers.php:646 Suppliers.php:655 Suppliers.php:663
+#: TaxCategories.php:132 TaxGroups.php:135 TaxGroups.php:143
+#: TaxProvinces.php:129 UnitsOfMeasure.php:135 WWW_Access.php:88
+#: WorkCentres.php:91 WorkCentres.php:97
msgid "There are"
msgstr "يوجد"
@@ -231,45 +231,46 @@
#: BOMIndented.php:249 BOMIndentedReverse.php:236 BOMInquiry.php:186
#: BOMListing.php:110 BOMs.php:285 BOMs.php:990 CollectiveWorkOrderCost.php:281
#: CompanyPreferences.php:100 CounterReturns.php:1625 CounterSales.php:2097
-#: CounterSales.php:2193 Credit_Invoice.php:286 CreditStatus.php:21
+#: CounterSales.php:2193 CreditStatus.php:21 Credit_Invoice.php:286
#: CustEDISetup.php:17 CustItem.php:120 CustItem.php:210 CustItem.php:238
#: DebtorsAtPeriodEnd.php:129 DiscountCategories.php:12
#: DiscountCategories.php:149 DiscountMatrix.php:16 EDIMessageFormat.php:105
#: FixedAssetLocations.php:13 FixedAssetRegister.php:16
#: FixedAssetRegister.php:256 FixedAssetTransfer.php:14 FormDesigner.php:185
-#: GLBudgets.php:32 GLJournalInquiry.php:11 GLJournal.php:250
-#: HistoricalTestResults.php:42 InternalStockRequestInquiry.php:167
-#: InternalStockRequest.php:316 InventoryPlanning.php:459
-#: InventoryPlanningPrefSupplier.php:386 MaintenanceTasks.php:14
-#: MaintenanceUserSchedule.php:16 MRPReport.php:543 NoSalesItems.php:91
-#: PcAssignCashTabToTab.php:76 PcAssignCashTabToTab.php:156
-#: PcAssignCashTabToTab.php:212 PcAssignCashToTab.php:59
-#: PcAssignCashToTab.php:144 PcAssignCashToTab.php:160
-#: PcAssignCashToTab.php:207 PDFPickingList.php:29 PDFStockLocTransfer.php:16
-#: PO_AuthorisationLevels.php:10 POReport.php:60 POReport.php:64
-#: POReport.php:68 PO_SelectOSPurchOrder.php:153 PriceMatrix.php:16
-#: PricesBasedOnMarkUp.php:8 Prices_Customer.php:35 Prices.php:11
-#: ProductSpecs.php:38 PurchaseByPrefSupplier.php:305 PurchData.php:241
-#: PurchData.php:373 PurchData.php:401 QATests.php:22
-#: RecurringSalesOrders.php:320 SalesAnalReptCols.php:51 SalesAnalRepts.php:14
-#: SalesCategories.php:11 SalesGLPostings.php:19 SalesGraph.php:39
-#: SalesPeople.php:28 SalesTypes.php:20 SelectAsset.php:48
-#: SelectCompletedOrder.php:11 SelectContract.php:69 SelectCreditItems.php:221
-#: SelectCreditItems.php:292 SelectCustomer.php:258 SelectGLAccount.php:86
-#: SelectOrderItems.php:588 SelectOrderItems.php:1501 SelectOrderItems.php:1601
-#: SelectProduct.php:523 SelectQASamples.php:45 SelectSalesOrder.php:545
-#: SelectSupplier.php:14 SelectSupplier.php:222 SelectWorkOrder.php:9
-#: SelectWorkOrder.php:174 SellThroughSupport.php:229 ShipmentCosting.php:11
-#: Shipments.php:17 Shippers.php:123 Shippers.php:160 Shipt_Select.php:8
+#: GLBudgets.php:32 GLJournal.php:250 GLJournalInquiry.php:11
+#: HistoricalTestResults.php:42 InternalStockRequest.php:316
+#: InternalStockRequestInquiry.php:167 InventoryPlanning.php:459
+#: InventoryPlanningPrefSupplier.php:386 MRPReport.php:543
+#: MaintenanceTasks.php:14 MaintenanceUserSchedule.php:16 NoSalesItems.php:91
+#: PDFPickingList.php:29 PDFStockLocTransfer.php:16 POReport.php:60
+#: POReport.php:64 POReport.php:68 PO_AuthorisationLevels.php:10
+#: PO_SelectOSPurchOrder.php:153 PcAssignCashTabToTab.php:76
+#: PcAssignCashTabToTab.php:156 PcAssignCashTabToTab.php:212
+#: PcAssignCashToTab.php:59 PcAssignCashToTab.php:144 PcAssignCashToTab.php:160
+#: PcAssignCashToTab.php:207 PriceMatrix.php:16 Prices.php:11
+#: PricesBasedOnMarkUp.php:8 Prices_Customer.php:35 ProductSpecs.php:38
+#: PurchData.php:241 PurchData.php:373 PurchData.php:401
+#: PurchaseByPrefSupplier.php:305 QATests.php:22 RecurringSalesOrders.php:320
+#: SalesAnalReptCols.php:51 SalesAnalRepts.php:14 SalesCategories.php:11
+#: SalesGLPostings.php:19 SalesGraph.php:39 SalesPeople.php:28
+#: SalesTypes.php:20 SelectAsset.php:48 SelectCompletedOrder.php:11
+#: SelectContract.php:69 SelectCreditItems.php:221 SelectCreditItems.php:292
+#: SelectCustomer.php:258 SelectGLAccount.php:86 SelectOrderItems.php:588
+#: SelectOrderItems.php:1501 SelectOrderItems.php:1601 SelectProduct.php:523
+#: SelectQASamples.php:45 SelectSalesOrder.php:545 SelectSupplier.php:14
+#: SelectSupplier.php:222 SelectWorkOrder.php:9 SelectWorkOrder.php:174
+#: SellThroughSupport.php:229 ShipmentCosting.php:11 Shipments.php:17
+#: Shippers.php:123 Shippers.php:160 Shipt_Select.php:8
#: StockLocMovements.php:14 StockSerialItemResearch.php:30
#: SupplierPriceList.php:14 SupplierPriceList.php:229 SupplierPriceList.php:399
-#: SupplierPriceList.php:458 SupplierPriceList.php:503 Suppliers.php:304
+#: SupplierPriceList.php:458 SupplierPriceList.php:503
#: SupplierTenderCreate.php:556 SupplierTenderCreate.php:664
#: SupplierTenders.php:322 SupplierTenders.php:388 SupplierTransInquiry.php:10
-#: TestPlanResults.php:27 TopItems.php:118 UnitsOfMeasure.php:10
-#: WhereUsedInquiry.php:18 WorkCentres.php:113 WorkOrderCosting.php:22
-#: WorkOrderIssue.php:22 WorkOrderReceive.php:34 WorkOrderStatus.php:58
-#: Z_BottomUpCosts.php:57 ../webSHOP/includes/header.php:251
+#: Suppliers.php:304 TestPlanResults.php:27 TopItems.php:118
+#: UnitsOfMeasure.php:10 WhereUsedInquiry.php:18 WorkCentres.php:113
+#: WorkOrderCosting.php:22 WorkOrderIssue.php:22 WorkOrderReceive.php:34
+#: WorkOrderStatus.php:58 Z_BottomUpCosts.php:57
+#: ../webSHOP/includes/header.php:251
msgid "Search"
msgstr "إبحث"
@@ -307,24 +308,24 @@
#: InternalStockRequestInquiry.php:438 InternalStockRequestInquiry.php:449
#: Labels.php:606 Labels.php:608 Labels.php:634 Locations.php:446
#: Locations.php:670 Locations.php:672 Locations.php:685 Locations.php:687
-#: Locations.php:703 MRPCalendar.php:224 MRP.php:554 MRP.php:558 MRP.php:562
-#: MRP.php:566 MRP.php:570 PaymentMethods.php:227 PaymentMethods.php:228
-#: PaymentMethods.php:229 PaymentMethods.php:230 PaymentMethods.php:301
-#: PaymentMethods.php:308 PaymentMethods.php:315 PaymentMethods.php:322
-#: PcAuthorizeExpenses.php:249 PDFChequeListing.php:65
-#: PDFDeliveryDifferences.php:76 PDFDIFOT.php:80 PDFWOPrint.php:602
-#: PDFWOPrint.php:606 PO_AuthorisationLevels.php:134
-#: PO_AuthorisationLevels.php:139 PO_Header.php:807 PO_PDFPurchOrder.php:413
-#: PO_PDFPurchOrder.php:416 ProductSpecs.php:188 ProductSpecs.php:409
-#: ProductSpecs.php:414 ProductSpecs.php:420 ProductSpecs.php:425
-#: ProductSpecs.php:430 ProductSpecs.php:562 ProductSpecs.php:608
-#: ProductSpecs.php:610 ProductSpecs.php:621 ProductSpecs.php:623
-#: ProductSpecs.php:634 ProductSpecs.php:636 ProductSpecs.php:647
-#: ProductSpecs.php:649 PurchData.php:296 PurchData.php:667 PurchData.php:670
-#: QATests.php:293 QATests.php:295 QATests.php:306 QATests.php:308
-#: QATests.php:319 QATests.php:321 QATests.php:332 QATests.php:334
-#: QATests.php:345 QATests.php:347 QATests.php:414 QATests.php:419
-#: QATests.php:424 QATests.php:429 QATests.php:434 RecurringSalesOrders.php:493
+#: Locations.php:703 MRP.php:554 MRP.php:558 MRP.php:562 MRP.php:566
+#: MRP.php:570 MRPCalendar.php:224 PDFChequeListing.php:65 PDFDIFOT.php:80
+#: PDFDeliveryDifferences.php:76 PDFWOPrint.php:602 PDFWOPrint.php:606
+#: PO_AuthorisationLevels.php:134 PO_AuthorisationLevels.php:139
+#: PO_Header.php:807 PO_PDFPurchOrder.php:413 PO_PDFPurchOrder.php:416
+#: PaymentMethods.php:227 PaymentMethods.php:228 PaymentMethods.php:229
+#: PaymentMethods.php:230 PaymentMethods.php:301 PaymentMethods.php:308
+#: PaymentMethods.php:315 PaymentMethods.php:322 PcAuthorizeExpenses.php:249
+#: ProductSpecs.php:188 ProductSpecs.php:409 ProductSpecs.php:414
+#: ProductSpecs.php:420 ProductSpecs.php:425 ProductSpecs.php:430
+#: ProductSpecs.php:562 ProductSpecs.php:608 ProductSpecs.php:610
+#: ProductSpecs.php:621 ProductSpecs.php:623 ProductSpecs.php:634
+#: ProductSpecs.php:636 ProductSpecs.php:647 ProductSpecs.php:649
+#: PurchData.php:296 PurchData.php:667 PurchData.php:670 QATests.php:293
+#: QATests.php:295 QATests.php:306 QATests.php:308 QATests.php:319
+#: QATests.php:321 QATests.php:332 QATests.php:334 QATests.php:345
+#: QATests.php:347 QATests.php:414 QATests.php:419 QATests.php:424
+#: QATests.php:429 QATests.php:434 RecurringSalesOrders.php:493
#: RecurringSalesOrders.php:496 SalesAnalReptCols.php:284
#: SalesAnalReptCols.php:419 SalesAnalReptCols.php:422 SalesAnalRepts.php:420
#: SalesAnalRepts.php:423 SalesAnalRepts.php:448 SalesAnalRepts.php:451
@@ -363,9 +364,9 @@
#: AccountGroups.php:312 AccountGroups.php:472 AccountGroups.php:475
#: AddCustomerContacts.php:165 AddCustomerContacts.php:274
-#: AddCustomerContacts.php:278 AddCustomerContacts.php:281 BankAccounts.php:218
-#: BankAccounts.php:412 BankAccounts.php:414 BankAccounts.php:418
-#: BankAccounts.php:426 BOMs.php:142 BOMs.php:895 BOMs.php:899
+#: AddCustomerContacts.php:278 AddCustomerContacts.php:281 BOMs.php:142
+#: BOMs.php:895 BOMs.php:899 BankAccounts.php:218 BankAccounts.php:412
+#: BankAccounts.php:414 BankAccounts.php:418 BankAccounts.php:426
#: CompanyPreferences.php:422 CompanyPreferences.php:426
#: CompanyPreferences.php:437 CompanyPreferences.php:441
#: CompanyPreferences.php:452 CompanyPreferences.php:456
@@ -378,15 +379,15 @@
#: InternalStockRequestInquiry.php:436 InternalStockRequestInquiry.php:447
#: Labels.php:605 Labels.php:609 Labels.php:635 Locations.php:446
#: Locations.php:675 Locations.php:677 Locations.php:690 Locations.php:692
-#: Locations.php:704 MRPCalendar.php:226 MRP.php:552 MRP.php:556 MRP.php:560
-#: MRP.php:564 MRP.php:568 NoSalesItems.php:191 PaymentMethods.php:227
-#: PaymentMethods.php:228 PaymentMethods.php:229 PaymentMethods.php:230
-#: PaymentMethods.php:302 PaymentMethods.php:309 PaymentMethods.php:316
-#: PaymentMethods.php:323 PcAuthorizeExpenses.php:247 PDFChequeListing.php:64
-#: PDFDeliveryDifferences.php:75 PDFDIFOT.php:79 PDFWOPrint.php:603
+#: Locations.php:704 MRP.php:552 MRP.php:556 MRP.php:560 MRP.php:564
+#: MRP.php:568 MRPCalendar.php:226 NoSalesItems.php:191 PDFChequeListing.php:64
+#: PDFDIFOT.php:79 PDFDeliveryDifferences.php:75 PDFWOPrint.php:603
#: PDFWOPrint.php:607 PO_AuthorisationLevels.php:136
#: PO_AuthorisationLevels.php:141 PO_Header.php:806 PO_PDFPurchOrder.php:414
-#: PO_PDFPurchOrder.php:417 ProductSpecs.php:191 ProductSpecs.php:411
+#: PO_PDFPurchOrder.php:417 PaymentMethods.php:227 PaymentMethods.php:228
+#: PaymentMethods.php:229 PaymentMethods.php:230 PaymentMethods.php:302
+#: PaymentMethods.php:309 PaymentMethods.php:316 PaymentMethods.php:323
+#: PcAuthorizeExpenses.php:247 ProductSpecs.php:191 ProductSpecs.php:411
#: ProductSpecs.php:417 ProductSpecs.php:422 ProductSpecs.php:427
#: ProductSpecs.php:432 ProductSpecs.php:613 ProductSpecs.php:615
#: ProductSpecs.php:626 ProductSpecs.php:628 ProductSpecs.php:639
@@ -435,32 +436,33 @@
#: AccountGroups.php:321 AccountSections.php:196 AddCustomerContacts.php:158
#: AddCustomerNotes.php:137 AddCustomerTypeNotes.php:131 Areas.php:164
-#: BankAccounts.php:243 BOMs.php:198 COGSGLPostings.php:115
+#: BOMs.php:198 BankAccounts.php:243 COGSGLPostings.php:115
#: COGSGLPostings.php:222 CreditStatus.php:175 Currencies.php:374
#: Currencies.php:391 CustItem.php:166 CustomerBranches.php:456
-#: Customers.php:1131 Customers.php:1165 CustomerTypes.php:205
+#: CustomerTypes.php:205 Customers.php:1131 Customers.php:1165
#: Departments.php:186 EDIMessageFormat.php:150 Factors.php:334
#: FixedAssetCategories.php:190 FixedAssetLocations.php:111
-#: FreightCosts.php:253 GeocodeSetup.php:173 GLAccounts.php:335 GLTags.php:96
+#: FreightCosts.php:253 GLAccounts.php:335 GLTags.php:96 GeocodeSetup.php:173
#: ImportBankTransAnalysis.php:223 InternalStockRequest.php:297 Labels.php:333
-#: Labels.php:358 Locations.php:439 MailingGroupMaintenance.php:178
-#: MaintenanceTasks.php:118 Manufacturers.php:260 MRPDemands.php:309
-#: MRPDemandTypes.php:120 PaymentMethods.php:232 PaymentTerms.php:205
-#: PcAssignCashToTab.php:291 PcClaimExpensesFromTab.php:280 PcExpenses.php:226
-#: PcTabs.php:256 PcTypeTabs.php:180 PO_AuthorisationLevels.php:151
-#: PriceMatrix.php:293 Prices_Customer.php:286 Prices.php:253
-#: ProductSpecs.php:465 PurchData.php:312 QATests.php:467
-#: SalesCategories.php:310 SalesGLPostings.php:137 SalesGLPostings.php:255
-#: SalesPeople.php:240 SalesTypes.php:206 SecurityTokens.php:116
-#: SelectCustomer.php:733 SelectCustomer.php:759 SelectCustomer.php:814
-#: SelectCustomer.php:832 SelectCustomer.php:856 SelectCustomer.php:873
-#: SelectGLAccount.php:139 SelectGLAccount.php:154 SelectQASamples.php:417
-#: SellThroughSupport.php:298 Shippers.php:144 StockCategories.php:296
-#: SupplierContacts.php:165 SupplierTenderCreate.php:157 SupplierTypes.php:170
-#: SuppTransGLAnalysis.php:126 TaxAuthorities.php:172 TaxCategories.php:184
-#: TaxGroups.php:191 TaxProvinces.php:179 UnitsOfMeasure.php:185
-#: WorkCentres.php:145 WWW_Access.php:132 WWW_Users.php:391
-#: includes/InputSerialItems.php:110 includes/OutputSerialItems.php:20
+#: Labels.php:358 Locations.php:439 MRPDemandTypes.php:120 MRPDemands.php:309
+#: MailingGroupMaintenance.php:178 MaintenanceTasks.php:118
+#: Manufacturers.php:260 PO_AuthorisationLevels.php:151 PaymentMethods.php:232
+#: PaymentTerms.php:205 PcAssignCashToTab.php:291
+#: PcClaimExpensesFromTab.php:280 PcExpenses.php:226 PcTabs.php:256
+#: PcTypeTabs.php:180 PriceMatrix.php:293 Prices.php:253
+#: Prices_Customer.php:286 ProductSpecs.php:465 PurchData.php:312
+#: QATests.php:467 SalesCategories.php:310 SalesGLPostings.php:137
+#: SalesGLPostings.php:255 SalesPeople.php:240 SalesTypes.php:206
+#: SecurityTokens.php:116 SelectCustomer.php:733 SelectCustomer.php:759
+#: SelectCustomer.php:814 SelectCustomer.php:832 SelectCustomer.php:856
+#: SelectCustomer.php:873 SelectGLAccount.php:139 SelectGLAccount.php:154
+#: SelectQASamples.php:417 SellThroughSupport.php:298 Shippers.php:144
+#: StockCategories.php:296 SuppTransGLAnalysis.php:126 SupplierContacts.php:165
+#: SupplierTenderCreate.php:157 SupplierTypes.php:170 TaxAuthorities.php:172
+#: TaxCategories.php:184 TaxGroups.php:191 TaxProvinces.php:179
+#: UnitsOfMeasure.php:185 WWW_Access.php:132 WWW_Users.php:391
+#: WorkCentres.php:145 includes/InputSerialItems.php:110
+#: includes/OutputSerialItems.php:20
#: reportwriter/languages/en_US/reports.php:143
#, php-format
msgid "Edit"
@@ -472,24 +474,24 @@
#: AccountGroups.php:322 AccountSections.php:201 AddCustomerContacts.php:159
#: AddCustomerNotes.php:138 AddCustomerTypeNotes.php:132 Areas.php:165
-#: BankAccounts.php:244 BOMs.php:200 COGSGLPostings.php:116
+#: BOMs.php:200 BankAccounts.php:244 COGSGLPostings.php:116
#: COGSGLPostings.php:223 ContractBOM.php:271 ContractOtherReqts.php:123
-#: CounterReturns.php:740 CounterSales.php:836 Credit_Invoice.php:419
-#: CreditStatus.php:176 Currencies.php:377 CustItem.php:167
-#: CustomerReceipt.php:1009 Customers.php:1166 CustomerTypes.php:206
+#: CounterReturns.php:740 CounterSales.php:836 CreditStatus.php:176
+#: Credit_Invoice.php:419 Currencies.php:377 CustItem.php:167
+#: CustomerReceipt.php:1009 CustomerTypes.php:206 Customers.php:1166
#: Departments.php:187 DiscountCategories.php:238 DiscountMatrix.php:183
#: EDIMessageFormat.php:151 FixedAssetCategories.php:191 FreightCosts.php:254
-#: GeocodeSetup.php:174 GLAccounts.php:336 GLJournal.php:431 GLTags.php:97
+#: GLAccounts.php:336 GLJournal.php:431 GLTags.php:97 GeocodeSetup.php:174
#: ImportBankTransAnalysis.php:224 InternalStockCategoriesByRole.php:184
#: InternalStockRequest.php:298 Labels.php:334 Labels.php:359 Labels.php:612
-#: Locations.php:440 MailingGroupMaintenance.php:179 MaintenanceTasks.php:119
-#: Manufacturers.php:261 MRPDemands.php:310 MRPDemandTypes.php:121
-#: PaymentMethods.php:233 Payments.php:1155 PaymentTerms.php:206
+#: Locations.php:440 MRPDemandTypes.php:121 MRPDemands.php:310
+#: MailingGroupMaintenance.php:179 MaintenanceTasks.php:119
+#: Manufacturers.php:261 PO_AuthorisationLevels.php:153 PO_Items.php:768
+#: PaymentMethods.php:233 PaymentTerms.php:206 Payments.php:1155
#: PcAssignCashToTab.php:295 PcClaimExpensesFromTab.php:281 PcExpenses.php:227
#: PcExpensesTypeTab.php:186 PcTabs.php:257 PcTypeTabs.php:181
-#: PO_AuthorisationLevels.php:153 PO_Items.php:768 PriceMatrix.php:292
-#: Prices_Customer.php:287 Prices.php:254 ProductSpecs.php:466
-#: PurchData.php:314 PurchData.php:721 QATests.php:468
+#: PriceMatrix.php:292 Prices.php:254 Prices_Customer.php:287
+#: ProductSpecs.php:466 PurchData.php:314 PurchData.php:721 QATests.php:468
#: RelatedItemsUpdate.php:161 RelatedItemsUpdate.php:176
#: SalesAnalReptCols.php:299 SalesAnalRepts.php:307 SalesCategories.php:311
#: SalesGLPostings.php:138 SalesGLPostings.php:256 SalesPeople.php:241
@@ -499,14 +501,15 @@
#: SelectOrderItems.php:1413 SelectQASamples.php:418 SellThroughSupport.php:299
#: Shipments.php:438 Shippers.php:145 SpecialOrder.php:667
#: StockCategories.php:297 StockCategories.php:626 StockLocTransfer.php:325
-#: SuppContractChgs.php:99 SuppCreditGRNs.php:117 SuppFixedAssetChgs.php:90
-#: SuppInvGRNs.php:151 SupplierContacts.php:166 SupplierTenderCreate.php:422
-#: SupplierTenderCreate.php:452 SupplierTypes.php:172 SuppShiptChgs.php:90
-#: SuppTransGLAnalysis.php:127 TaxAuthorities.php:173 TaxCategories.php:186
-#: TaxGroups.php:192 TaxProvinces.php:180 TestPlanResults.php:920
-#: UnitsOfMeasure.php:186 WorkCentres.php:146 WorkOrderEntry.php:865
-#: WOSerialNos.php:335 WWW_Access.php:133 WWW_Users.php:392
-#: includes/InputSerialItemsKeyed.php:60 includes/OutputSerialItems.php:99
+#: SuppContractChgs.php:99 SuppCreditGRNs.php:117 SuppFixedAssetChgs.php:86
+#: SuppInvGRNs.php:151 SuppShiptChgs.php:90 SuppTransGLAnalysis.php:127
+#: SupplierContacts.php:166 SupplierTenderCreate.php:422
+#: SupplierTenderCreate.php:452 SupplierTypes.php:172 TaxAuthorities.php:173
+#: TaxCategories.php:186 TaxGroups.php:192 TaxProvinces.php:180
+#: TestPlanResults.php:920 UnitsOfMeasure.php:186 WOSerialNos.php:335
+#: WWW_Access.php:133 WWW_Users.php:392 WorkCentres.php:146
+#: WorkOrderEntry.php:865 includes/InputSerialItemsKeyed.php:60
+#: includes/OutputSerialItems.php:99
#: reportwriter/languages/en_US/reports.php:141
#, php-format
msgid "Delete"
@@ -537,22 +540,21 @@
#: GLCashFlowsSetup.php:172 GLTags.php:68 GoodsReceived.php:298
#: GoodsReceived.php:304 GoodsReceived.php:311 GoodsReceived.php:819
#: ImportBankTransAnalysis.php:154 ImportBankTransAnalysis.php:185
-#: InternalStockRequestAuthorisation.php:123
-#: InternalStockRequestFulfill.php:364 InternalStockRequest.php:255
-#: LocationUsers.php:177 MRPCalendar.php:315 Payments.php:981
-#: PcAuthorizeExpenses.php:109 PcAuthorizeExpenses.php:294
-#: PO_AuthoriseMyOrders.php:142 PricesByCost.php:223 PurchData.php:758
-#: ReorderLevelLocation.php:140 RevisionTranslations.php:111
-#: SecurityTokens.php:136 SelectCreditItems.php:954 SellThroughSupport.php:476
-#: ShopParameters.php:610 SMTPServer.php:126 StockCostUpdate.php:196
+#: InternalStockRequest.php:255 InternalStockRequestAuthorisation.php:123
+#: InternalStockRequestFulfill.php:364 LocationUsers.php:177
+#: MRPCalendar.php:315 PO_AuthoriseMyOrders.php:142 Payments.php:981
+#: PcAuthorizeExpenses.php:109 PcAuthorizeExpenses.php:294 PricesByCost.php:223
+#: PurchData.php:758 ReorderLevelLocation.php:140 RevisionTranslations.php:111
+#: SMTPServer.php:126 SecurityTokens.php:136 SelectCreditItems.php:954
+#: SellThroughSupport.php:476 ShopParameters.php:610 StockCostUpdate.php:196
#: StockReorderLevel.php:111 Stocks.php:1452 SystemParameters.php:1246
-#: UserGLAccounts.php:159 UserLocations.php:178 WorkOrderEntry.php:887
-#: WOSerialNos.php:345 reportwriter/languages/en_US/reports.php:156
+#: UserGLAccounts.php:159 UserLocations.php:178 WOSerialNos.php:345
+#: WorkOrderEntry.php:887 reportwriter/languages/en_US/reports.php:156
msgid "Update"
msgstr ""
-#: AccountGroups.php:378 AccountGroups.php:418 AnalysisHorizontalIncome.php:121
-#: AnalysisHorizontalIncome.php:522 AnalysisHorizontalPosition.php:79
+#: AccountGroups.php:378 AccountGroups.php:418 AnalysisHorizontalIncome.php:125
+#: AnalysisHorizontalIncome.php:526 AnalysisHorizontalPosition.php:79
#: AnalysisHorizontalPosition.php:362 DailyBankTransactions.php:256
#: GLAccountUsers.php:253 GLBalanceSheet.php:720 GLCashFlowsIndirect.php:743
#: GLCashFlowsIndirect.php:776 GLCashFlowsSetup.php:180 GLProfit_Loss.php:1317
@@ -677,22 +679,22 @@
msgstr ""
#: AccountSections.php:285 AddCustomerContacts.php:297 AddCustomerNotes.php:242
-#: AddCustomerTypeNotes.php:221 Areas.php:229 BankAccounts.php:433 BOMs.php:916
+#: AddCustomerTypeNotes.php:221 Areas.php:229 BOMs.php:916 BankAccounts.php:433
#: COGSGLPostings.php:371 CreditStatus.php:259 Currencies.php:537
#: CustLoginSetup.php:273 Departments.php:258 DiscountMatrix.php:142
#: EDIMessageFormat.php:248 FixedAssetCategories.php:350
-#: FixedAssetLocations.php:161 FreightCosts.php:371 GeocodeSetup.php:271
-#: GLAccounts.php:285 Labels.php:647 Locations.php:716 Manufacturers.php:375
-#: MRPDemands.php:424 MRPDemandTypes.php:188 OffersReceived.php:57
-#: OffersReceived.php:146 PaymentMethods.php:332 PaymentTerms.php:310
-#: PO_AuthorisationLevels.php:264 PriceMatrix.php:236 Prices_Customer.php:369
+#: FixedAssetLocations.php:161 FreightCosts.php:371 GLAccounts.php:285
+#: GeocodeSetup.php:271 Labels.php:647 Locations.php:716 MRPDemandTypes.php:188
+#: MRPDemands.php:424 Manufacturers.php:375 OffersReceived.php:57
+#: OffersReceived.php:146 PO_AuthorisationLevels.php:264 PaymentMethods.php:332
+#: PaymentTerms.php:310 PriceMatrix.php:236 Prices_Cust...
[truncated message content] |
|
From: <dai...@us...> - 2017-05-06 23:54:51
|
Revision: 7759
http://sourceforge.net/p/web-erp/reponame/7759
Author: daintree
Date: 2017-05-06 23:54:48 +0000 (Sat, 06 May 2017)
Log Message:
-----------
Andy Couling:Fixes to SQL to get table anmes per JanB forum post
Modified Paths:
--------------
trunk/MRPPlannedPurchaseOrders.php
trunk/MRPPlannedWorkOrders.php
trunk/MRPReschedules.php
trunk/MRPShortages.php
trunk/doc/Change.log
Modified: trunk/MRPPlannedPurchaseOrders.php
===================================================================
--- trunk/MRPPlannedPurchaseOrders.php 2017-04-17 14:54:04 UTC (rev 7758)
+++ trunk/MRPPlannedPurchaseOrders.php 2017-05-06 23:54:48 UTC (rev 7759)
@@ -6,7 +6,7 @@
include('includes/session.php');
//Maybe not ANSI SQL??
-$sql="SHOW TABLES WHERE Tables_in_" . $_SESSION['DatabaseName'] . "='mrprequirements'";
+$sql = "SELECT TABLE_NAME FROM information_schema.tables WHERE TABLE_SCHEMA = '" . $_SESSION['DatabaseName'] . "' AND TABLE_NAME = 'mrprequirements'";
$result=DB_query($sql);
if (DB_num_rows($result)==0) {
Modified: trunk/MRPPlannedWorkOrders.php
===================================================================
--- trunk/MRPPlannedWorkOrders.php 2017-04-17 14:54:04 UTC (rev 7758)
+++ trunk/MRPPlannedWorkOrders.php 2017-05-06 23:54:48 UTC (rev 7759)
@@ -1,12 +1,11 @@
<?php
/* $Id$*/
-
// MRPPlannedWorkOrders.php - Report of manufactured parts that MRP has determined should have
// work orders created for them
include('includes/session.php');
-$sql="SHOW TABLES WHERE Tables_in_" . $_SESSION['DatabaseName'] . "='mrprequirements'";
+$sql = "SELECT TABLE_NAME FROM information_schema.tables WHERE TABLE_SCHEMA = '" . $_SESSION['DatabaseName'] . "' AND TABLE_NAME = 'mrprequirements'";
$result=DB_query($sql);
if (DB_num_rows($result)==0) {
$Title=_('MRP error');
Modified: trunk/MRPReschedules.php
===================================================================
--- trunk/MRPReschedules.php 2017-04-17 14:54:04 UTC (rev 7758)
+++ trunk/MRPReschedules.php 2017-05-06 23:54:48 UTC (rev 7759)
@@ -1,13 +1,11 @@
<?php
-
/*$Id$ */
-
// MRPReschedules.php - Report of purchase orders and work orders that MRP determines should be
// rescheduled.
include('includes/session.php');
-$sql="SHOW TABLES WHERE Tables_in_" . $_SESSION['DatabaseName'] . "='mrprequirements'";
+$sql = "SELECT TABLE_NAME FROM information_schema.tables WHERE TABLE_SCHEMA = '" . $_SESSION['DatabaseName'] . "' AND TABLE_NAME = 'mrprequirements'";
$result=DB_query($sql);
if (DB_num_rows($result)==0) {
$Title='MRP error';
Modified: trunk/MRPShortages.php
===================================================================
--- trunk/MRPShortages.php 2017-04-17 14:54:04 UTC (rev 7758)
+++ trunk/MRPShortages.php 2017-05-06 23:54:48 UTC (rev 7759)
@@ -1,5 +1,4 @@
<?php
-
/*$Id$ */
// MRPShortages.php - Report of parts with demand greater than supply as determined by MRP
@@ -6,7 +5,7 @@
include('includes/session.php');
//ANSI SQL???
-$sql="SHOW TABLES WHERE Tables_in_" . $_SESSION['DatabaseName'] . "='mrprequirements'";
+$sql = "SELECT TABLE_NAME FROM information_schema.tables WHERE TABLE_SCHEMA = '" . $_SESSION['DatabaseName'] . "' AND TABLE_NAME = 'mrprequirements'";
$result=DB_query($sql);
if (DB_num_rows($result)==0) {
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2017-04-17 14:54:04 UTC (rev 7758)
+++ trunk/doc/Change.log 2017-05-06 23:54:48 UTC (rev 7759)
@@ -1,5 +1,6 @@
webERP Change Log
+7/5/17 Andy Couling/Janb: Fixes to MRP scripts SQL to get table names per forum post http://www.weberp.org/forum/showthread.php?tid=2448
13/4/17 RChacon: Rename includes/footer.inc, includes/header.inc and includes/session.inc to includes/footer.php, includes/header.php and includes/session.php.
09/4/17 RChacon: In UserSettings.php, add options to turn off/on page help and field help. In WWW_Users.php, improve code and documentation.
30/3/17 RChacon: In ManualContents.php, fix checkbox showing and do some improvements.
|
|
From: <dai...@us...> - 2017-05-16 05:38:52
|
Revision: 7762
http://sourceforge.net/p/web-erp/reponame/7762
Author: daintree
Date: 2017-05-16 05:38:49 +0000 (Tue, 16 May 2017)
Log Message:
-----------
Andy Couling fix SQL in PO_Items.php
Modified Paths:
--------------
trunk/PO_Items.php
trunk/doc/Change.log
Modified: trunk/PO_Items.php
===================================================================
--- trunk/PO_Items.php 2017-05-14 23:58:40 UTC (rev 7761)
+++ trunk/PO_Items.php 2017-05-16 05:38:49 UTC (rev 7762)
@@ -735,12 +735,12 @@
$DisplayLineTotal = locale_number_format($LineTotal,$_SESSION['PO'.$identifier]->CurrDecimalPlaces);
// Note if the price is greater than 1 use 2 decimal place, if the price is a fraction of 1, use 4 decimal places
// This should help display where item-price is a fraction
- if ($POLine->Price > 1) {
+ if ($POLine->Price > 100000) {
$DisplayPrice = locale_number_format($POLine->Price,$_SESSION['PO'.$identifier]->CurrDecimalPlaces);
$SuppPrice = locale_number_format(round(($POLine->Price *$POLine->ConversionFactor),$_SESSION['PO'.$identifier]->CurrDecimalPlaces),$_SESSION['PO'.$identifier]->CurrDecimalPlaces);
} else {
- $DisplayPrice = locale_number_format($POLine->Price,4);
- $SuppPrice = locale_number_format(round(($POLine->Price *$POLine->ConversionFactor),4),4);
+ $DisplayPrice = locale_number_format($POLine->Price,5);
+ $SuppPrice = locale_number_format(round(($POLine->Price *$POLine->ConversionFactor),5),5);
}
if ($k==1){
@@ -1091,7 +1091,7 @@
$Offset = $ListPageMax;
}
- $sql = $sql . "LIMIT " . $_SESSION['DisplayRecordsMax']." OFFSET " . strval($_SESSION['DisplayRecordsMax']*$Offset);
+ $sql = $sql . " LIMIT " . $_SESSION['DisplayRecordsMax']." OFFSET " . strval($_SESSION['DisplayRecordsMax']*$Offset);
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2017-05-14 23:58:40 UTC (rev 7761)
+++ trunk/doc/Change.log 2017-05-16 05:38:49 UTC (rev 7762)
@@ -1,5 +1,6 @@
webERP Change Log
+16/5/17 Andrew Couling: SQL correction in PO_Items.php. Line 1094.
7/5/17 Andy Couling/Janb: Fixes to MRP scripts SQL to get table names per forum post http://www.weberp.org/forum/showthread.php?tid=2448
13/4/17 RChacon: Rename includes/footer.inc, includes/header.inc and includes/session.inc to includes/footer.php, includes/header.php and includes/session.php.
09/4/17 RChacon: In UserSettings.php, add options to turn off/on page help and field help. In WWW_Users.php, improve code and documentation.
|
|
From: <dai...@us...> - 2017-05-18 09:24:19
|
Revision: 7763
http://sourceforge.net/p/web-erp/reponame/7763
Author: daintree
Date: 2017-05-18 09:24:16 +0000 (Thu, 18 May 2017)
Log Message:
-----------
Ricards idea to show the suppliers currency decimal places plus 2 for the purchase price
Modified Paths:
--------------
trunk/PO_Items.php
trunk/doc/Change.log
Modified: trunk/PO_Items.php
===================================================================
--- trunk/PO_Items.php 2017-05-16 05:38:49 UTC (rev 7762)
+++ trunk/PO_Items.php 2017-05-18 09:24:16 UTC (rev 7763)
@@ -735,12 +735,12 @@
$DisplayLineTotal = locale_number_format($LineTotal,$_SESSION['PO'.$identifier]->CurrDecimalPlaces);
// Note if the price is greater than 1 use 2 decimal place, if the price is a fraction of 1, use 4 decimal places
// This should help display where item-price is a fraction
- if ($POLine->Price > 100000) {
+ if ($POLine->Price > 1) {
$DisplayPrice = locale_number_format($POLine->Price,$_SESSION['PO'.$identifier]->CurrDecimalPlaces);
$SuppPrice = locale_number_format(round(($POLine->Price *$POLine->ConversionFactor),$_SESSION['PO'.$identifier]->CurrDecimalPlaces),$_SESSION['PO'.$identifier]->CurrDecimalPlaces);
} else {
- $DisplayPrice = locale_number_format($POLine->Price,5);
- $SuppPrice = locale_number_format(round(($POLine->Price *$POLine->ConversionFactor),5),5);
+ $DisplayPrice = locale_number_format($POLine->Price,($_SESSION['PO'.$identifier]->CurrDecimalPlaces + 2));
+ $SuppPrice = locale_number_format(round(($POLine->Price *$POLine->ConversionFactor),($_SESSION['PO'.$identifier]->CurrDecimalPlaces+2)),($_SESSION['PO'.$identifier]->CurrDecimalPlaces+2));
}
if ($k==1){
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2017-05-16 05:38:49 UTC (rev 7762)
+++ trunk/doc/Change.log 2017-05-18 09:24:16 UTC (rev 7763)
@@ -1,5 +1,6 @@
webERP Change Log
+18/5/17 Phil: remove changes in Andrew's PO_Items.php script that increased dp for purchase price to 5 - for some low value currencies this would be inappropriate, better to use the currency decimal places + 2 as per Ricard's idea
16/5/17 Andrew Couling: SQL correction in PO_Items.php. Line 1094.
7/5/17 Andy Couling/Janb: Fixes to MRP scripts SQL to get table names per forum post http://www.weberp.org/forum/showthread.php?tid=2448
13/4/17 RChacon: Rename includes/footer.inc, includes/header.inc and includes/session.inc to includes/footer.php, includes/header.php and includes/session.php.
|
|
From: <ex...@us...> - 2017-06-01 01:21:11
|
Revision: 7764
http://sourceforge.net/p/web-erp/reponame/7764
Author: exsonqu
Date: 2017-06-01 01:21:09 +0000 (Thu, 01 Jun 2017)
Log Message:
-----------
1/6/17 VortecCPI fixed empty list error in GLAccounts.php, GLCashFlowsIndirect.php, GLCashFlowsSetup.php
Modified Paths:
--------------
trunk/GLAccounts.php
trunk/GLCashFlowsIndirect.php
trunk/GLCashFlowsSetup.php
Modified: trunk/GLAccounts.php
===================================================================
--- trunk/GLAccounts.php 2017-05-18 09:24:16 UTC (rev 7763)
+++ trunk/GLAccounts.php 2017-06-01 01:21:09 UTC (rev 7764)
@@ -319,7 +319,7 @@
$Result = DB_query($Sql, $ErrMsg);
$k = 1;// Row colour counter.
- foreach($Result as $MyRow) {
+ while ($MyRow = DB_fech_array($Result)) {
if($k == 1) {
echo '<tr class="OddTableRows">';
$k = 0;
Modified: trunk/GLCashFlowsIndirect.php
===================================================================
--- trunk/GLCashFlowsIndirect.php 2017-05-18 09:24:16 UTC (rev 7763)
+++ trunk/GLCashFlowsIndirect.php 2017-06-01 01:21:09 UTC (rev 7764)
@@ -76,8 +76,10 @@
$Title, '" /> ', // Icon title.
$Title, '<br />', // Page title, reporting statement.
stripslashes($_SESSION['CompanyRecord']['coyname']), '<br />'; // Page title, reporting entity.
- $PeriodFromName = DB_fetch_array(DB_query('SELECT lastdate_in_period FROM `periods` WHERE `periodno`=' . $_POST['PeriodFrom']));
- $PeriodToName = DB_fetch_array(DB_query('SELECT lastdate_in_period FROM `periods` WHERE `periodno`=' . $_POST['PeriodTo']));
+ $Result = DB_query('SELECT lastdate_in_period FROM `periods` WHERE `periodno`=' . $_POST['PeriodFrom']);
+ $PeriodFromName = DB_fetch_array($Result);
+ $Result = DB_query('SELECT lastdate_in_period FROM `periods` WHERE `periodno`=' . $_POST['PeriodTo']);
+ $PeriodToName = DB_fetch_array($Result);
echo _('From'), ' ', MonthAndYearFromSQLDate($PeriodFromName['lastdate_in_period']), ' ', _('to'), ' ', MonthAndYearFromSQLDate($PeriodToName['lastdate_in_period']), '<br />'; // Page title, reporting period.
include_once('includes/CurrenciesArray.php');// Array to retrieve currency name.
echo _('All amounts stated in'), ': ', _($CurrencyName[$_SESSION['CompanyRecord']['currencydefault']]), '</p>';// Page title, reporting presentation currency and level of rounding used.
@@ -205,7 +207,7 @@
$IdSection = -1;
// Looks for an account without setting up:
$NeedSetup = FALSE;
- foreach($Result as $MyRow) {
+ while($MyRow = DB_fetch_array($Result)) {
if($MyRow['cashflowsactivity'] == -1) {
$NeedSetup = TRUE;
echo '<tr><td colspan="8"> </td></tr>';
@@ -212,7 +214,8 @@
break;
}
}
- foreach($Result as $MyRow) {
+ DB_data_seek($Result,0);
+ while($MyRow = DB_fetch_array($Result)) {
if($IdSection <> $MyRow['cashflowsactivity']) {
// Prints section total:
echo '<tr>
@@ -290,7 +293,7 @@
GROUP BY chartdetails.accountcode
ORDER BY chartdetails.accountcode";
$Result = DB_query($Sql);
- foreach($Result as $MyRow) {
+ while($MyRow = DB_fetch_array($Result)) {
if($MyRow['ActualAmount']<>0
OR $MyRow['BudgetAmount']<>0
OR $MyRow['LastAmount']<>0 OR isset($_POST['ShowZeroBalance'])) {
@@ -351,7 +354,7 @@
GROUP BY chartdetails.accountcode
ORDER BY chartdetails.accountcode";
$Result = DB_query($Sql);
- foreach($Result as $MyRow) {
+ while($MyRow = DB_fetch_array($Result)) {
if($MyRow['ActualAmount']<>0
OR $MyRow['BudgetAmount']<>0
OR $MyRow['LastAmount']<>0 OR isset($_POST['ShowZeroBalance'])) {
@@ -403,7 +406,7 @@
ORDER BY
chartdetails.accountcode";
$Result = DB_query($Sql);
- foreach($Result as $MyRow) {
+ while($MyRow = DB_fetch_array($Result)) {
if($MyRow['ActualAmount']<>0
OR $MyRow['BudgetAmount']<>0
OR $MyRow['LastAmount']<>0 OR isset($_POST['ShowZeroBalance'])) {
@@ -467,7 +470,8 @@
INNER JOIN chartdetails ON chartmaster.accountcode=chartdetails.accountcode
INNER JOIN accountgroups ON chartmaster.group_=accountgroups.groupname
WHERE accountgroups.pandl=1";
- $MyRow1 = DB_fetch_array(DB_query($Sql));
+ $Result = DB_query($Sql);
+ $MyRow1 = DB_fetch_array($Result);
echo colDebitCredit($MyRow1['ActualProfit']),
colDebitCredit($MyRow1['LastProfit']),
'</tr>
@@ -484,7 +488,8 @@
WHERE accountgroups.pandl=0
AND chartdetails.accountcode!='" . $_SESSION['PeriodProfitAccount'] . "'
AND chartdetails.accountcode!='" . $_SESSION['RetainedEarningsAccount'] . "'";// Gets retained earnings by the complement method to include differences. The complement method: Changes(retained earnings) = -Changes(other accounts).
- $MyRow2 = DB_fetch_array(DB_query($Sql));
+ $Result = DB_query($Sql);
+ $MyRow2 = DB_fetch_array($Result);
echo colDebitCredit($MyRow2['ActualRetained'] - $MyRow1['ActualProfit']),
colDebitCredit($MyRow2['LastRetained'] - $MyRow1['LastProfit']),
'</tr><tr>',
@@ -515,7 +520,7 @@
$IdSection = -1;
// Looks for an account without setting up:
$NeedSetup = FALSE;
- foreach($Result as $MyRow) {
+ while($MyRow = DB_fetch_array($Result)) {
if($MyRow['cashflowsactivity'] == -1) {
$NeedSetup = TRUE;
echo '<tr><td colspan="8"> </td></tr>';
@@ -522,7 +527,8 @@
break;
}
}
- foreach($Result as $MyRow) {
+ DB_data_seek($Result,0);
+ while($MyRow = DB_fetch_array($Result)) {
if($IdSection <> $MyRow['cashflowsactivity']) {
// Prints section total:
echo '<tr>
@@ -590,7 +596,7 @@
GROUP BY chartdetails.accountcode
ORDER BY chartdetails.accountcode";
$Result = DB_query($Sql);
- foreach($Result as $MyRow) {
+ while($MyRow = DB_fetch_array($Result)) {
if($MyRow['ActualAmount']<>0
OR $MyRow['LastAmount']<>0 OR isset($_POST['ShowZeroBalance'])) {
if($k == 1) {
@@ -644,7 +650,7 @@
GROUP BY chartdetails.accountcode
ORDER BY chartdetails.accountcode";
$Result = DB_query($Sql);
- foreach($Result as $MyRow) {
+ while($MyRow = DB_fetch_array($Result)) {
if($MyRow['ActualAmount']<>0
OR $MyRow['LastAmount']<>0 OR isset($_POST['ShowZeroBalance'])) {
if($k == 1) {
@@ -691,7 +697,7 @@
ORDER BY
chartdetails.accountcode";
$Result = DB_query($Sql);
- foreach($Result as $MyRow) {
+ while($MyRow = DB_fetch_array($Result)) {
if($MyRow['ActualAmount']<>0
OR $MyRow['LastAmount']<>0 OR isset($_POST['ShowZeroBalance'])) {
if($k == 1) {
@@ -793,7 +799,7 @@
}
$_POST['PeriodFrom'] = GetPeriod(date($_SESSION['DefaultDateFormat'], $BeginDate), $db);
}
- foreach($Periods as $MyRow) {
+ while($MyRow = DB_fetch_array($Periods)) {
echo '<option',($MyRow['periodno'] == $_POST['PeriodFrom'] ? ' selected="selected"' : '' ), ' value="', $MyRow['periodno'], '">', MonthAndYearFromSQLDate($MyRow['lastdate_in_period']), '</option>';
}
echo '</select>',
@@ -807,7 +813,8 @@
if(!isset($_POST['PeriodTo'])) {
$_POST['PeriodTo'] = GetPeriod(date($_SESSION['DefaultDateFormat']), $db);
}
- foreach($Periods as $MyRow) {
+ DB_data_seek($Periods,0);
+ while($MyRow = DB_fetch_array($Periods)) {
echo '<option',($MyRow['periodno'] == $_POST['PeriodTo'] ? ' selected="selected"' : '' ), ' value="', $MyRow['periodno'], '">', MonthAndYearFromSQLDate($MyRow['lastdate_in_period']), '</option>';
}
echo '</select>',
Modified: trunk/GLCashFlowsSetup.php
===================================================================
--- trunk/GLCashFlowsSetup.php 2017-05-18 09:24:16 UTC (rev 7763)
+++ trunk/GLCashFlowsSetup.php 2017-06-01 01:21:09 UTC (rev 7764)
@@ -205,7 +205,7 @@
$_SESSION['PeriodProfitAccount'] = $Result['confvalue'];
}
}
-foreach($GLAccounts as $MyRow) {
+while($MyRow = DB_fetch_array($GLAccounts)) {
echo '<option', ($MyRow['accountcode'] == $_SESSION['PeriodProfitAccount'] ? ' selected="selected"' : '' ), ' value="', $MyRow['accountcode'], '">', $MyRow['accountcode'], ' - ', $MyRow['accountname'], '</option>';
}
echo '</select>',
@@ -225,7 +225,8 @@
$_SESSION['RetainedEarningsAccount'] = $Result['retainedearnings'];
}
}
-foreach($GLAccounts as $MyRow) {
+DB_data_seek($GLAccounts,0);
+while($MyRow = DB_fetch_array($GLAccounts)) {
echo '<option', ($MyRow['accountcode'] == $_SESSION['RetainedEarningsAccount'] ? ' selected="selected"' : '' ), ' value="', $MyRow['accountcode'], '">', $MyRow['accountcode'], ' - ', $MyRow['accountname'], '</option>';
}
echo '</select>',
@@ -238,4 +239,4 @@
include('includes/footer.php');
// END: Procedure division -----------------------------------------------------
-?>
\ No newline at end of file
+?>
|
|
From: <rc...@us...> - 2017-06-18 01:53:18
|
Revision: 7770
http://sourceforge.net/p/web-erp/reponame/7770
Author: rchacon
Date: 2017-06-18 01:53:16 +0000 (Sun, 18 Jun 2017)
Log Message:
-----------
It jumps to enter a GL receipt if 'Type'=='GL'.
Modified Paths:
--------------
trunk/CustomerReceipt.php
trunk/doc/Change.log
Modified: trunk/CustomerReceipt.php
===================================================================
--- trunk/CustomerReceipt.php 2017-06-18 01:16:51 UTC (rev 7769)
+++ trunk/CustomerReceipt.php 2017-06-18 01:53:16 UTC (rev 7770)
@@ -600,9 +600,14 @@
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' . $identifier]->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"><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>',
+ 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=';
+ if ($_GET['Type']=='GL') {
+ echo 'GL';
+ } else {
+ echo 'Customer';
+ }
+ echo '">', _('Enter Receipts'), '</a></p>',
'</div>';
-
unset($_SESSION['ReceiptBatch' . $identifier]);
include('includes/footer.php');
exit;
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2017-06-18 01:16:51 UTC (rev 7769)
+++ trunk/doc/Change.log 2017-06-18 01:53:16 UTC (rev 7770)
@@ -1,5 +1,6 @@
webERP Change Log
+17/06/17 RChacon: In CustomerReceipt.php, if 'Type'=='GL' it jumps to enter a GL receipt.
08/06/17 Exson: Fixed quotation and orders are mixed in searching result of SelectSalesOrder.php.
1/6/17 VortecCPI fixed empty list error in GLAccounts.php, GLCashFlowsIndirect.php, GLCashFlowsSetup.php
18/5/17 Phil: remove changes in Andrew's PO_Items.php script that increased dp for purchase price to 5 - for some low value currencies this would be inappropriate, better to use the currency decimal places + 2 as per Ricard's idea
|
|
From: <rc...@us...> - 2017-06-18 02:25:29
|
Revision: 7771
http://sourceforge.net/p/web-erp/reponame/7771
Author: rchacon
Date: 2017-06-18 02:25:26 +0000 (Sun, 18 Jun 2017)
Log Message:
-----------
Update Spanish tranlation.
Modified Paths:
--------------
trunk/CustomerReceipt.php
trunk/doc/Change.log
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
Modified: trunk/CustomerReceipt.php
===================================================================
--- trunk/CustomerReceipt.php 2017-06-18 01:53:16 UTC (rev 7770)
+++ trunk/CustomerReceipt.php 2017-06-18 02:25:26 UTC (rev 7771)
@@ -608,6 +608,7 @@
}
echo '">', _('Enter Receipts'), '</a></p>',
'</div>';
+
unset($_SESSION['ReceiptBatch' . $identifier]);
include('includes/footer.php');
exit;
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2017-06-18 01:53:16 UTC (rev 7770)
+++ trunk/doc/Change.log 2017-06-18 02:25:26 UTC (rev 7771)
@@ -1,6 +1,6 @@
webERP Change Log
-17/06/17 RChacon: In CustomerReceipt.php, if 'Type'=='GL' it jumps to enter a GL receipt.
+17/06/17 RChacon: In CustomerReceipt.php, it jumps to enter a GL receipt if 'Type'=='GL'.
08/06/17 Exson: Fixed quotation and orders are mixed in searching result of SelectSalesOrder.php.
1/6/17 VortecCPI fixed empty list error in GLAccounts.php, GLCashFlowsIndirect.php, GLCashFlowsSetup.php
18/5/17 Phil: remove changes in Andrew's PO_Items.php script that increased dp for purchase price to 5 - for some low value currencies this would be inappropriate, better to use the currency decimal places + 2 as per Ricard's idea
Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2017-06-18 01:53:16 UTC (rev 7770)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2017-06-18 02:25:26 UTC (rev 7771)
@@ -8,7 +8,7 @@
"Project-Id-Version: webERP 4.13\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-06-17 19:13-0600\n"
-"PO-Revision-Date: 2017-06-17 19:13-0600\n"
+"PO-Revision-Date: 2017-06-17 20:23-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -3558,7 +3558,7 @@
#: BOMListing.php:121
msgid "From Inventory Part Code"
-msgstr "Desde Código de Inventario"
+msgstr "Desde el código de inventario"
#: BOMListing.php:122
msgid ""
@@ -3568,7 +3568,7 @@
#: BOMListing.php:125
msgid "To Inventory Part Code"
-msgstr "A Código de Inventario"
+msgstr "Hasta el código de inventario"
#: BOMListing.php:126
msgid ""
@@ -3586,7 +3586,7 @@
#: BOMs.php:43
msgid "The component and the parent is the same"
-msgstr ""
+msgstr "El componente y el padre es el mismo"
#: BOMs.php:59
msgid ""
@@ -3695,7 +3695,7 @@
#: BOMs.php:339
msgid "The component selected is the same with the parent, it is not allowed"
-msgstr ""
+msgstr "El componente seleccionado es el mismo que el padre, no está permitido"
#: BOMs.php:366
msgid "Could not update this BOM component because"
@@ -3882,7 +3882,7 @@
#: BOMs.php:692
msgid "Print Date"
-msgstr ""
+msgstr "Fecha de impresión"
#: BOMs.php:729
msgid "Edit the details of the selected component in the fields below"
@@ -3914,11 +3914,11 @@
#: BOMs.php:797
msgid "Sequence in BOM"
-msgstr ""
+msgstr "Secuencia en la lista de materiales"
#: BOMs.php:798
msgid "Number with decimal places is acceptable"
-msgstr ""
+msgstr "Número con decimales es aceptable"
#: BOMs.php:830
msgid "Work Centre Added"
@@ -3939,6 +3939,7 @@
#: BOMs.php:859
msgid "Enter the quantity of this item required for the parent item"
msgstr ""
+"Introduzca la cantidad necesaria de este artículo para el elemento principal"
#: BOMs.php:887
msgid "Auto Issue this Component to Work Orders"
@@ -4050,11 +4051,11 @@
#: CollectiveWorkOrderCost.php:33
msgid "There are no work orders selected"
-msgstr ""
+msgstr "No hay órdenes de trabajo seleccionadas"
#: CollectiveWorkOrderCost.php:48
msgid "Failed to retrieve wo cost data"
-msgstr ""
+msgstr "No se pudo recuperar los datos del costo de la orden de trabajo"
#: CollectiveWorkOrderCost.php:52 CollectiveWorkOrderCost.php:452
#: DiscountCategories.php:222 GoodsReceived.php:121
@@ -4076,15 +4077,15 @@
#: CollectiveWorkOrderCost.php:54 WorkOrderCosting.php:133
msgid "Date Issued"
-msgstr "Fecha de Emisión"
+msgstr "Fecha de emisión"
#: CollectiveWorkOrderCost.php:55 WorkOrderCosting.php:134
msgid "Issued Qty"
-msgstr "Cantidad Emitida"
+msgstr "Cantidad emitida"
#: CollectiveWorkOrderCost.php:56 WorkOrderCosting.php:135
msgid "Issued Cost"
-msgstr "Costos Emitidos"
+msgstr "Costo emitido"
#: CollectiveWorkOrderCost.php:57 PDFFGLabel.php:202 PDFWOPrint.php:258
#: PDFWOPrint.php:499 includes/DatabaseTranslations.php:49
@@ -4093,7 +4094,7 @@
#: CollectiveWorkOrderCost.php:84
msgid "There are no data available"
-msgstr ""
+msgstr "No hay datos disponibles"
#: CollectiveWorkOrderCost.php:89
msgid "Select Other Work Orders"
@@ -4107,7 +4108,7 @@
#: PDFWOPrint.php:480 SelectWorkOrder.php:44 api/api_xml-rpc.php:2573
#: api/api_xml-rpc.php:2769 includes/PDFWOPageHeader.inc:10
msgid "Work Order Number"
-msgstr "Número de Orden de Trabajo"
+msgstr "Número de orden de trabajo"
#: CollectiveWorkOrderCost.php:191 SelectWorkOrder.php:110
msgid "No items were returned by the SQL because"
@@ -4174,11 +4175,11 @@
#: CollectiveWorkOrderCost.php:276
msgid "Start Date To"
-msgstr "Fecha inicial al"
+msgstr "Fecha inicial hasta"
#: CollectiveWorkOrderCost.php:282 SelectWorkOrder.php:175
msgid "New Work Order"
-msgstr "Nueva Orden de Trabajo"
+msgstr "Nueva orden de trabajo"
#: CollectiveWorkOrderCost.php:296 SelectWorkOrder.php:190
msgid ""
@@ -4753,7 +4754,7 @@
#: ConfirmDispatch_Invoice.php:252
msgid "To dispatch quantity is"
-msgstr ""
+msgstr "Para enviar la cantidad es"
#: ConfirmDispatch_Invoice.php:252
msgid "And the order balance is "
@@ -9572,7 +9573,7 @@
#: SalesTopCustomersInquiry.php:66 SalesTopItemsInquiry.php:67
#: StockCategorySalesInquiry.php:58 SuppPriceList.php:309
msgid "Date From"
-msgstr "Fecha Inicio"
+msgstr "Fecha desde"
#: CustomerBalancesMovement.php:62 InternalStockRequestInquiry.php:165
#: SalesByTypePeriodInquiry.php:74 SalesCategoryPeriodInquiry.php:68
@@ -9579,7 +9580,7 @@
#: SalesTopCustomersInquiry.php:70 SalesTopItemsInquiry.php:71
#: StockCategorySalesInquiry.php:62
msgid "Date To"
-msgstr "Fecha Final"
+msgstr "Fecha hasta"
#: CustomerBalancesMovement.php:66
msgid "Create CSV"
@@ -10288,7 +10289,7 @@
#: CustomerReceipt.php:289 CustomerReceipt.php:856
msgid "Date Banked"
-msgstr "Fecha del Banco"
+msgstr "Fecha del banco"
#: CustomerReceipt.php:291 CustomerReceipt.php:989
msgid "GL Code"
@@ -33130,7 +33131,7 @@
#: StockLocTransferReceive.php:423
msgid "To Location"
-msgstr ""
+msgstr "Hasta la ubicación"
#: StockLocTransferReceive.php:424
msgid "Stock code"
@@ -51609,7 +51610,7 @@
#: install/index.php:878 install/index.php:953
msgid "Next Step"
-msgstr ""
+msgstr "Siguiente paso"
#: install/index.php:884
msgid ""
@@ -51634,11 +51635,11 @@
#: install/index.php:912
msgid "Host Name"
-msgstr ""
+msgstr "Nombre del servidor"
#: install/index.php:913
msgid "Enter database host name"
-msgstr ""
+msgstr "Introduzca el nombre del servidor de la base de datos"
#: install/index.php:914
msgid "Commonly: localhost or 127.0.0.1"
@@ -51658,7 +51659,7 @@
#: install/index.php:923
msgid "Useful with shared hosting"
-msgstr ""
+msgstr "Útil con servidor compartido"
#: install/index.php:924
msgid "Optional: in the form of prefix_"
@@ -51709,7 +51710,7 @@
#: install/index.php:1029
msgid "Chart of Accounts"
-msgstr ""
+msgstr "Catálogo contable"
#: install/index.php:1047
msgid ""
@@ -52769,7 +52770,7 @@
#: reportwriter/languages/en_US/reports.php:347
msgid "This Year"
-msgstr ""
+msgstr "Este año"
#: reportwriter/languages/en_US/reports.php:348
msgid "This Year To Date"
|
|
From: <ex...@us...> - 2017-06-18 09:30:10
|
Revision: 7772
http://sourceforge.net/p/web-erp/reponame/7772
Author: exsonqu
Date: 2017-06-18 09:30:06 +0000 (Sun, 18 Jun 2017)
Log Message:
-----------
18/06/17 Giankocr created a custom theme for webERP, Exson port part of it to webERP.
Modified Paths:
--------------
trunk/SalesCategories.php
trunk/SelectProduct.php
trunk/index.php
Added Paths:
-----------
trunk/css/custom/
trunk/css/custom/bullet.gif
trunk/css/custom/css/
trunk/css/custom/css/bootstrap-theme.css
trunk/css/custom/css/bootstrap-theme.css.map
trunk/css/custom/css/bootstrap-theme.min.css
trunk/css/custom/css/bootstrap-theme.min.css.map
trunk/css/custom/css/bootstrap.css
trunk/css/custom/css/bootstrap.css.map
trunk/css/custom/css/bootstrap.min.css
trunk/css/custom/css/bootstrap.min.css.map
trunk/css/custom/css/custom.css
trunk/css/custom/default.css
trunk/css/custom/fonts/
trunk/css/custom/fonts/glyphicons-halflings-regular.eot
trunk/css/custom/fonts/glyphicons-halflings-regular.svg
trunk/css/custom/fonts/glyphicons-halflings-regular.ttf
trunk/css/custom/fonts/glyphicons-halflings-regular.woff
trunk/css/custom/fonts/glyphicons-halflings-regular.woff2
trunk/css/custom/images/
trunk/css/custom/images/Graphique-32.png
trunk/css/custom/images/allocation.gif
trunk/css/custom/images/allocation.png
trunk/css/custom/images/ar.gif
trunk/css/custom/images/ar.png
trunk/css/custom/images/back.png
trunk/css/custom/images/background.png
trunk/css/custom/images/bank.png
trunk/css/custom/images/company.gif
trunk/css/custom/images/company.png
trunk/css/custom/images/contract.png
trunk/css/custom/images/credit.png
trunk/css/custom/images/cross.png
trunk/css/custom/images/currency.png
trunk/css/custom/images/customer.png
trunk/css/custom/images/email.png
trunk/css/custom/images/error.png
trunk/css/custom/images/folder_add.png
trunk/css/custom/images/folders.gif
trunk/css/custom/images/folders.png
trunk/css/custom/images/gl.png
trunk/css/custom/images/group_add.png
trunk/css/custom/images/help.png
trunk/css/custom/images/icons.ai
trunk/css/custom/images/inquiries.png
trunk/css/custom/images/inventory.gif
trunk/css/custom/images/inventory.png
trunk/css/custom/images/login.png
trunk/css/custom/images/logo.jpg
trunk/css/custom/images/magnifier.png
trunk/css/custom/images/maintenance.gif
trunk/css/custom/images/maintenance.png
trunk/css/custom/images/menucurve.gif
trunk/css/custom/images/money_add.png
trunk/css/custom/images/money_delete.png
trunk/css/custom/images/note_add.png
trunk/css/custom/images/pdf.png
trunk/css/custom/images/preview.png
trunk/css/custom/images/previous.png
trunk/css/custom/images/printer.png
trunk/css/custom/images/reports.gif
trunk/css/custom/images/reports.png
trunk/css/custom/images/sales.png
trunk/css/custom/images/security.png
trunk/css/custom/images/stripe.png
trunk/css/custom/images/supplier.png
trunk/css/custom/images/tick.png
trunk/css/custom/images/transactions.gif
trunk/css/custom/images/transactions.png
trunk/css/custom/images/user.png
trunk/css/custom/js/
trunk/css/custom/js/bootstrap.js
trunk/css/custom/js/bootstrap.min.js
trunk/css/custom/js/custom.js
trunk/css/custom/js/npm.js
trunk/css/custom/login.css
Modified: trunk/SalesCategories.php
===================================================================
--- trunk/SalesCategories.php 2017-06-18 02:25:26 UTC (rev 7771)
+++ trunk/SalesCategories.php 2017-06-18 09:30:06 UTC (rev 7772)
@@ -36,7 +36,6 @@
if (isset($SelectedCategory) AND isset($_FILES['CategoryPicture']) AND $_FILES['CategoryPicture']['name'] !='') {
$ImgExt = pathinfo($_FILES['CategoryPicture']['name'], PATHINFO_EXTENSION);
-
$result = $_FILES['CategoryPicture']['error'];
$UploadTheFile = 'Yes'; //Assume all is well to start off with
// Stock is always capatalized so there is no confusion since "cat_" is lowercase
@@ -157,11 +156,9 @@
$result = DB_query($sql);
prnMsg(_('The sales category') . ' ' . $SelectedCategory . ' ' . _('has been deleted') .
' !','success');
-
//if( file_exists($_SESSION['part_pics_dir'] . '/SALESCAT_' . $SelectedCategory . '.jpg') ) {
// unlink($_SESSION['part_pics_dir'] . '/SALESCAT_' . $SelectedCategory . '.jpg');
//}
-
foreach ($SupportedImgExt as $ext) {
$file = $_SESSION['part_pics_dir'] . '/SALESCAT_' . $SelectedCategory . '.' . $ext;
if (file_exists ($file) ) {
@@ -282,7 +279,6 @@
echo '<tr class="OddTableRows">';
$k=1;
}
-
$SupportedImgExt = array('png','jpg','jpeg');
$imagefile = reset((glob($_SESSION['part_pics_dir'] . '/SALESCAT_' . $myrow['salescatid'] . '.{' . implode(",", $SupportedImgExt) . '}', GLOB_BRACE)));
if( extension_loaded('gd') && function_exists('gd_info') && file_exists($imagefile) ) {
@@ -297,7 +293,6 @@
} else {
$CatImgLink = _('No Image');
}
-
if ($myrow['active'] == 1){
$Active = _('Yes');
}else{
@@ -394,7 +389,6 @@
}
echo '</select></td>
</tr>';
-
// Image upload only if we have a selected category
if (isset($SelectedCategory)) {
echo '<tr>
@@ -468,7 +462,6 @@
echo '<input type="hidden" name="ParentCategory" value="' .
(isset($_POST['ParentCategory'])?($_POST['ParentCategory']):('0')) . '" /> ';
-
echo '<table class="selection">
<tr>
<th colspan="2">' . _('Add Inventory to this category') . '</th>
@@ -476,7 +469,6 @@
<tr>
<td>' . _('Select Item') . ':</td>
<td><select name="AddStockID">';
-
while( $myrow = DB_fetch_array($result) ) {
if ( !array_keys( $StockIDs, $myrow['stockid'] ) ) {
// Only if the StockID is not already selected
Modified: trunk/SelectProduct.php
===================================================================
--- trunk/SelectProduct.php 2017-06-18 02:25:26 UTC (rev 7771)
+++ trunk/SelectProduct.php 2017-06-18 09:30:06 UTC (rev 7772)
@@ -425,19 +425,19 @@
$StockImgLink = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC'.
'&StockID='.urlencode($StockID).
'&text='.
- '&width=100'.
- '&height=100'.
+ '&width=200'.
+ '&height=200'.
'" alt="" />';
} else {
$StockImgLink = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC'.
'&StockID='.urlencode($StockID).
'&text='. $StockID .
- '&width=100'.
- '&height=100'.
+ '&width=200'.
+ '&height=200'.
'" alt="" />';
}
} else if (file_exists ($imagefile)) {
- $StockImgLink = '<img src="' . $imagefile . '" height="100" width="100" />';
+ $StockImgLink = '<img src="' . $imagefile . '" height="200" width="200" />';
} else {
$StockImgLink = _('No Image');
}
@@ -828,6 +828,7 @@
$TableHeader = '<tr>
<th>' . _('Stock Status') . '</th>
<th class="ascending">' . _('Code') . '</th>
+ <th>'. _('image').'</th>
<th class="ascending">' . _('Description') . '</th>
<th>' . _('Total Qty On Hand') . '</th>
<th>' . _('Units') . '</th>
@@ -857,9 +858,21 @@
} else {
$ItemStatus ='';
}
+ $imagefile = reset((glob($_SESSION['part_pics_dir'] . '/' . $StockID . '.{' . implode(",", $SupportedImgExt) . '}', GLOB_BRACE)));
+ if (!empty($imagefile)){
+ $StockImgLink = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC'.
+ '&StockID='.urlencode($myrow['stockid']).
+ '&text='. $myrow['stockid'] .
+ '&width=100'.
+ '&height=100'.
+ '" alt="" />';
+ }else{
+ $StockImgLink = '<p>'._('No Image').'</p>';
+ }
echo '<td>' . $ItemStatus . '</td>
<td><input type="submit" name="Select" value="' . $myrow['stockid'] . '" /></td>
+ <td>'.$StockImgLink.'</td>
<td title="'. $myrow['longdescription'] . '">' . $myrow['description'] . '</td>
<td class="number">' . $qoh . '</td>
<td>' . $myrow['units'] . '</td>
Added: trunk/css/custom/bullet.gif
===================================================================
(Binary files differ)
Index: trunk/css/custom/bullet.gif
===================================================================
--- trunk/css/custom/bullet.gif 2017-06-18 02:25:26 UTC (rev 7771)
+++ trunk/css/custom/bullet.gif 2017-06-18 09:30:06 UTC (rev 7772)
Property changes on: trunk/css/custom/bullet.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/css/custom/css/bootstrap-theme.css
===================================================================
--- trunk/css/custom/css/bootstrap-theme.css (rev 0)
+++ trunk/css/custom/css/bootstrap-theme.css 2017-06-18 09:30:06 UTC (rev 7772)
@@ -0,0 +1,587 @@
+/*!
+ * Bootstrap v3.3.7 (http://getbootstrap.com)
+ * Copyright 2011-2016 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ */
+.btn-default,
+.btn-primary,
+.btn-success,
+.btn-info,
+.btn-warning,
+.btn-danger {
+ text-shadow: 0 -1px 0 rgba(0, 0, 0, .2);
+ -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 1px rgba(0, 0, 0, .075);
+ box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 1px rgba(0, 0, 0, .075);
+}
+.btn-default:active,
+.btn-primary:active,
+.btn-success:active,
+.btn-info:active,
+.btn-warning:active,
+.btn-danger:active,
+.btn-default.active,
+.btn-primary.active,
+.btn-success.active,
+.btn-info.active,
+.btn-warning.active,
+.btn-danger.active {
+ -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
+ box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
+}
+.btn-default.disabled,
+.btn-primary.disabled,
+.btn-success.disabled,
+.btn-info.disabled,
+.btn-warning.disabled,
+.btn-danger.disabled,
+.btn-default[disabled],
+.btn-primary[disabled],
+.btn-success[disabled],
+.btn-info[disabled],
+.btn-warning[disabled],
+.btn-danger[disabled],
+fieldset[disabled] .btn-default,
+fieldset[disabled] .btn-primary,
+fieldset[disabled] .btn-success,
+fieldset[disabled] .btn-info,
+fieldset[disabled] .btn-warning,
+fieldset[disabled] .btn-danger {
+ -webkit-box-shadow: none;
+ box-shadow: none;
+}
+.btn-default .badge,
+.btn-primary .badge,
+.btn-success .badge,
+.btn-info .badge,
+.btn-warning .badge,
+.btn-danger .badge {
+ text-shadow: none;
+}
+.btn:active,
+.btn.active {
+ background-image: none;
+}
+.btn-default {
+ text-shadow: 0 1px 0 #fff;
+ background-image: -webkit-linear-gradient(top, #fff 0%, #e0e0e0 100%);
+ background-image: -o-linear-gradient(top, #fff 0%, #e0e0e0 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#fff), to(#e0e0e0));
+ background-image: linear-gradient(to bottom, #fff 0%, #e0e0e0 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe0e0e0', GradientType=0);
+ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+ background-repeat: repeat-x;
+ border-color: #dbdbdb;
+ border-color: #ccc;
+}
+.btn-default:hover,
+.btn-default:focus {
+ background-color: #e0e0e0;
+ background-position: 0 -15px;
+}
+.btn-default:active,
+.btn-default.active {
+ background-color: #e0e0e0;
+ border-color: #dbdbdb;
+}
+.btn-default.disabled,
+.btn-default[disabled],
+fieldset[disabled] .btn-default,
+.btn-default.disabled:hover,
+.btn-default[disabled]:hover,
+fieldset[disabled] .btn-default:hover,
+.btn-default.disabled:focus,
+.btn-default[disabled]:focus,
+fieldset[disabled] .btn-default:focus,
+.btn-default.disabled.focus,
+.btn-default[disabled].focus,
+fieldset[disabled] .btn-default.focus,
+.btn-default.disabled:active,
+.btn-default[disabled]:active,
+fieldset[disabled] .btn-default:active,
+.btn-default.disabled.active,
+.btn-default[disabled].active,
+fieldset[disabled] .btn-default.active {
+ background-color: #e0e0e0;
+ background-image: none;
+}
+.btn-primary {
+ background-image: -webkit-linear-gradient(top, #337ab7 0%, #265a88 100%);
+ background-image: -o-linear-gradient(top, #337ab7 0%, #265a88 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#337ab7), to(#265a88));
+ background-image: linear-gradient(to bottom, #337ab7 0%, #265a88 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff265a88', GradientType=0);
+ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+ background-repeat: repeat-x;
+ border-color: #245580;
+}
+.btn-primary:hover,
+.btn-primary:focus {
+ background-color: #265a88;
+ background-position: 0 -15px;
+}
+.btn-primary:active,
+.btn-primary.active {
+ background-color: #265a88;
+ border-color: #245580;
+}
+.btn-primary.disabled,
+.btn-primary[disabled],
+fieldset[disabled] .btn-primary,
+.btn-primary.disabled:hover,
+.btn-primary[disabled]:hover,
+fieldset[disabled] .btn-primary:hover,
+.btn-primary.disabled:focus,
+.btn-primary[disabled]:focus,
+fieldset[disabled] .btn-primary:focus,
+.btn-primary.disabled.focus,
+.btn-primary[disabled].focus,
+fieldset[disabled] .btn-primary.focus,
+.btn-primary.disabled:active,
+.btn-primary[disabled]:active,
+fieldset[disabled] .btn-primary:active,
+.btn-primary.disabled.active,
+.btn-primary[disabled].active,
+fieldset[disabled] .btn-primary.active {
+ background-color: #265a88;
+ background-image: none;
+}
+.btn-success {
+ background-image: -webkit-linear-gradient(top, #5cb85c 0%, #419641 100%);
+ background-image: -o-linear-gradient(top, #5cb85c 0%, #419641 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#5cb85c), to(#419641));
+ background-image: linear-gradient(to bottom, #5cb85c 0%, #419641 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff419641', GradientType=0);
+ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+ background-repeat: repeat-x;
+ border-color: #3e8f3e;
+}
+.btn-success:hover,
+.btn-success:focus {
+ background-color: #419641;
+ background-position: 0 -15px;
+}
+.btn-success:active,
+.btn-success.active {
+ background-color: #419641;
+ border-color: #3e8f3e;
+}
+.btn-success.disabled,
+.btn-success[disabled],
+fieldset[disabled] .btn-success,
+.btn-success.disabled:hover,
+.btn-success[disabled]:hover,
+fieldset[disabled] .btn-success:hover,
+.btn-success.disabled:focus,
+.btn-success[disabled]:focus,
+fieldset[disabled] .btn-success:focus,
+.btn-success.disabled.focus,
+.btn-success[disabled].focus,
+fieldset[disabled] .btn-success.focus,
+.btn-success.disabled:active,
+.btn-success[disabled]:active,
+fieldset[disabled] .btn-success:active,
+.btn-success.disabled.active,
+.btn-success[disabled].active,
+fieldset[disabled] .btn-success.active {
+ background-color: #419641;
+ background-image: none;
+}
+.btn-info {
+ background-image: -webkit-linear-gradient(top, #5bc0de 0%, #2aabd2 100%);
+ background-image: -o-linear-gradient(top, #5bc0de 0%, #2aabd2 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#5bc0de), to(#2aabd2));
+ background-image: linear-gradient(to bottom, #5bc0de 0%, #2aabd2 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2aabd2', GradientType=0);
+ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+ background-repeat: repeat-x;
+ border-color: #28a4c9;
+}
+.btn-info:hover,
+.btn-info:focus {
+ background-color: #2aabd2;
+ background-position: 0 -15px;
+}
+.btn-info:active,
+.btn-info.active {
+ background-color: #2aabd2;
+ border-color: #28a4c9;
+}
+.btn-info.disabled,
+.btn-info[disabled],
+fieldset[disabled] .btn-info,
+.btn-info.disabled:hover,
+.btn-info[disabled]:hover,
+fieldset[disabled] .btn-info:hover,
+.btn-info.disabled:focus,
+.btn-info[disabled]:focus,
+fieldset[disabled] .btn-info:focus,
+.btn-info.disabled.focus,
+.btn-info[disabled].focus,
+fieldset[disabled] .btn-info.focus,
+.btn-info.disabled:active,
+.btn-info[disabled]:active,
+fieldset[disabled] .btn-info:active,
+.btn-info.disabled.active,
+.btn-info[disabled].active,
+fieldset[disabled] .btn-info.active {
+ background-color: #2aabd2;
+ background-image: none;
+}
+.btn-warning {
+ background-image: -webkit-linear-gradient(top, #f0ad4e 0%, #eb9316 100%);
+ background-image: -o-linear-gradient(top, #f0ad4e 0%, #eb9316 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#f0ad4e), to(#eb9316));
+ background-image: linear-gradient(to bottom, #f0ad4e 0%, #eb9316 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffeb9316', GradientType=0);
+ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+ background-repeat: repeat-x;
+ border-color: #e38d13;
+}
+.btn-warning:hover,
+.btn-warning:focus {
+ background-color: #eb9316;
+ background-position: 0 -15px;
+}
+.btn-warning:active,
+.btn-warning.active {
+ background-color: #eb9316;
+ border-color: #e38d13;
+}
+.btn-warning.disabled,
+.btn-warning[disabled],
+fieldset[disabled] .btn-warning,
+.btn-warning.disabled:hover,
+.btn-warning[disabled]:hover,
+fieldset[disabled] .btn-warning:hover,
+.btn-warning.disabled:focus,
+.btn-warning[disabled]:focus,
+fieldset[disabled] .btn-warning:focus,
+.btn-warning.disabled.focus,
+.btn-warning[disabled].focus,
+fieldset[disabled] .btn-warning.focus,
+.btn-warning.disabled:active,
+.btn-warning[disabled]:active,
+fieldset[disabled] .btn-warning:active,
+.btn-warning.disabled.active,
+.btn-warning[disabled].active,
+fieldset[disabled] .btn-warning.active {
+ background-color: #eb9316;
+ background-image: none;
+}
+.btn-danger {
+ background-image: -webkit-linear-gradient(top, #d9534f 0%, #c12e2a 100%);
+ background-image: -o-linear-gradient(top, #d9534f 0%, #c12e2a 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#d9534f), to(#c12e2a));
+ background-image: linear-gradient(to bottom, #d9534f 0%, #c12e2a 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc12e2a', GradientType=0);
+ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+ background-repeat: repeat-x;
+ border-color: #b92c28;
+}
+.btn-danger:hover,
+.btn-danger:focus {
+ background-color: #c12e2a;
+ background-position: 0 -15px;
+}
+.btn-danger:active,
+.btn-danger.active {
+ background-color: #c12e2a;
+ border-color: #b92c28;
+}
+.btn-danger.disabled,
+.btn-danger[disabled],
+fieldset[disabled] .btn-danger,
+.btn-danger.disabled:hover,
+.btn-danger[disabled]:hover,
+fieldset[disabled] .btn-danger:hover,
+.btn-danger.disabled:focus,
+.btn-danger[disabled]:focus,
+fieldset[disabled] .btn-danger:focus,
+.btn-danger.disabled.focus,
+.btn-danger[disabled].focus,
+fieldset[disabled] .btn-danger.focus,
+.btn-danger.disabled:active,
+.btn-danger[disabled]:active,
+fieldset[disabled] .btn-danger:active,
+.btn-danger.disabled.active,
+.btn-danger[disabled].active,
+fieldset[disabled] .btn-danger.active {
+ background-color: #c12e2a;
+ background-image: none;
+}
+.thumbnail,
+.img-thumbnail {
+ -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, .075);
+ box-shadow: 0 1px 2px rgba(0, 0, 0, .075);
+}
+.dropdown-menu > li > a:hover,
+.dropdown-menu > li > a:focus {
+ background-color: #e8e8e8;
+ background-image: -webkit-linear-gradient(top, #f5f5f5 0%, #e8e8e8 100%);
+ background-image: -o-linear-gradient(top, #f5f5f5 0%, #e8e8e8 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#f5f5f5), to(#e8e8e8));
+ background-image: linear-gradient(to bottom, #f5f5f5 0%, #e8e8e8 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0);
+ background-repeat: repeat-x;
+}
+.dropdown-menu > .active > a,
+.dropdown-menu > .active > a:hover,
+.dropdown-menu > .active > a:focus {
+ background-color: #2e6da4;
+ background-image: -webkit-linear-gradient(top, #337ab7 0%, #2e6da4 100%);
+ background-image: -o-linear-gradient(top, #337ab7 0%, #2e6da4 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#337ab7), to(#2e6da4));
+ background-image: linear-gradient(to bottom, #337ab7 0%, #2e6da4 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2e6da4', GradientType=0);
+ background-repeat: repeat-x;
+}
+.navbar-default {
+ background-image: -webkit-linear-gradient(top, #fff 0%, #f8f8f8 100%);
+ background-image: -o-linear-gradient(top, #fff 0%, #f8f8f8 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#fff), to(#f8f8f8));
+ background-image: linear-gradient(to bottom, #fff 0%, #f8f8f8 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff8f8f8', GradientType=0);
+ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+ background-repeat: repeat-x;
+ border-radius: 4px;
+ -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 5px rgba(0, 0, 0, .075);
+ box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 5px rgba(0, 0, 0, .075);
+}
+.navbar-default .navbar-nav > .open > a,
+.navbar-default .navbar-nav > .active > a {
+ background-image: -webkit-linear-gradient(top, #dbdbdb 0%, #e2e2e2 100%);
+ background-image: -o-linear-gradient(top, #dbdbdb 0%, #e2e2e2 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#dbdbdb), to(#e2e2e2));
+ background-image: linear-gradient(to bottom, #dbdbdb 0%, #e2e2e2 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdbdbdb', endColorstr='#ffe2e2e2', GradientType=0);
+ background-repeat: repeat-x;
+ -webkit-box-shadow: inset 0 3px 9px rgba(0, 0, 0, .075);
+ box-shadow: inset 0 3px 9px rgba(0, 0, 0, .075);
+}
+.navbar-brand,
+.navbar-nav > li > a {
+ text-shadow: 0 1px 0 rgba(255, 255, 255, .25);
+}
+.navbar-inverse {
+ background-image: -webkit-linear-gradient(top, #3c3c3c 0%, #222 100%);
+ background-image: -o-linear-gradient(top, #3c3c3c 0%, #222 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#3c3c3c), to(#222));
+ background-image: linear-gradient(to bottom, #3c3c3c 0%, #222 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff3c3c3c', endColorstr='#ff222222', GradientType=0);
+ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+ background-repeat: repeat-x;
+ border-radius: 4px;
+}
+.navbar-inverse .navbar-nav > .open > a,
+.navbar-inverse .navbar-nav > .active > a {
+ background-image: -webkit-linear-gradient(top, #080808 0%, #0f0f0f 100%);
+ background-image: -o-linear-gradient(top, #080808 0%, #0f0f0f 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#080808), to(#0f0f0f));
+ background-image: linear-gradient(to bottom, #080808 0%, #0f0f0f 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff080808', endColorstr='#ff0f0f0f', GradientType=0);
+ background-repeat: repeat-x;
+ -webkit-box-shadow: inset 0 3px 9px rgba(0, 0, 0, .25);
+ box-shadow: inset 0 3px 9px rgba(0, 0, 0, .25);
+}
+.navbar-inverse .navbar-brand,
+.navbar-inverse .navbar-nav > li > a {
+ text-shadow: 0 -1px 0 rgba(0, 0, 0, .25);
+}
+.navbar-static-top,
+.navbar-fixed-top,
+.navbar-fixed-bottom {
+ border-radius: 0;
+}
+@media (max-width: 767px) {
+ .navbar .navbar-nav .open .dropdown-menu > .active > a,
+ .navbar .navbar-nav .open .dropdown-menu > .active > a:hover,
+ .navbar .navbar-nav .open .dropdown-menu > .active > a:focus {
+ color: #fff;
+ background-image: -webkit-linear-gradient(top, #337ab7 0%, #2e6da4 100%);
+ background-image: -o-linear-gradient(top, #337ab7 0%, #2e6da4 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#337ab7), to(#2e6da4));
+ background-image: linear-gradient(to bottom, #337ab7 0%, #2e6da4 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2e6da4', GradientType=0);
+ background-repeat: repeat-x;
+ }
+}
+.alert {
+ text-shadow: 0 1px 0 rgba(255, 255, 255, .2);
+ -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .25), 0 1px 2px rgba(0, 0, 0, .05);
+ box-shadow: inset 0 1px 0 rgba(255, 255, 255, .25), 0 1px 2px rgba(0, 0, 0, .05);
+}
+.alert-success {
+ background-image: -webkit-linear-gradient(top, #dff0d8 0%, #c8e5bc 100%);
+ background-image: -o-linear-gradient(top, #dff0d8 0%, #c8e5bc 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#dff0d8), to(#c8e5bc));
+ background-image: linear-gradient(to bottom, #dff0d8 0%, #c8e5bc 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffc8e5bc', GradientType=0);
+ background-repeat: repeat-x;
+ border-color: #b2dba1;
+}
+.alert-info {
+ background-image: -webkit-linear-gradient(top, #d9edf7 0%, #b9def0 100%);
+ background-image: -o-linear-gradient(top, #d9edf7 0%, #b9def0 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#d9edf7), to(#b9def0));
+ background-image: linear-gradient(to bottom, #d9edf7 0%, #b9def0 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffb9def0', GradientType=0);
+ background-repeat: repeat-x;
+ border-color: #9acfea;
+}
+.alert-warning {
+ background-image: -webkit-linear-gradient(top, #fcf8e3 0%, #f8efc0 100%);
+ background-image: -o-linear-gradient(top, #fcf8e3 0%, #f8efc0 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#fcf8e3), to(#f8efc0));
+ background-image: linear-gradient(to bottom, #fcf8e3 0%, #f8efc0 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fff8efc0', GradientType=0);
+ background-repeat: repeat-x;
+ border-color: #f5e79e;
+}
+.alert-danger {
+ background-image: -webkit-linear-gradient(top, #f2dede 0%, #e7c3c3 100%);
+ background-image: -o-linear-gradient(top, #f2dede 0%, #e7c3c3 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#f2dede), to(#e7c3c3));
+ background-image: linear-gradient(to bottom, #f2dede 0%, #e7c3c3 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffe7c3c3', GradientType=0);
+ background-repeat: repeat-x;
+ border-color: #dca7a7;
+}
+.progress {
+ background-image: -webkit-linear-gradient(top, #ebebeb 0%, #f5f5f5 100%);
+ background-image: -o-linear-gradient(top, #ebebeb 0%, #f5f5f5 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#ebebeb), to(#f5f5f5));
+ background-image: linear-gradient(to bottom, #ebebeb 0%, #f5f5f5 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb', endColorstr='#fff5f5f5', GradientType=0);
+ background-repeat: repeat-x;
+}
+.progress-bar {
+ background-image: -webkit-linear-gradient(top, #337ab7 0%, #286090 100%);
+ background-image: -o-linear-gradient(top, #337ab7 0%, #286090 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#337ab7), to(#286090));
+ background-image: linear-gradient(to bottom, #337ab7 0%, #286090 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff286090', GradientType=0);
+ background-repeat: repeat-x;
+}
+.progress-bar-success {
+ background-image: -webkit-linear-gradient(top, #5cb85c 0%, #449d44 100%);
+ background-image: -o-linear-gradient(top, #5cb85c 0%, #449d44 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#5cb85c), to(#449d44));
+ background-image: linear-gradient(to bottom, #5cb85c 0%, #449d44 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff449d44', GradientType=0);
+ background-repeat: repeat-x;
+}
+.progress-bar-info {
+ background-image: -webkit-linear-gradient(top, #5bc0de 0%, #31b0d5 100%);
+ background-image: -o-linear-gradient(top, #5bc0de 0%, #31b0d5 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#5bc0de), to(#31b0d5));
+ background-image: linear-gradient(to bottom, #5bc0de 0%, #31b0d5 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff31b0d5', GradientType=0);
+ background-repeat: repeat-x;
+}
+.progress-bar-warning {
+ background-image: -webkit-linear-gradient(top, #f0ad4e 0%, #ec971f 100%);
+ background-image: -o-linear-gradient(top, #f0ad4e 0%, #ec971f 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#f0ad4e), to(#ec971f));
+ background-image: linear-gradient(to bottom, #f0ad4e 0%, #ec971f 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffec971f', GradientType=0);
+ background-repeat: repeat-x;
+}
+.progress-bar-danger {
+ background-image: -webkit-linear-gradient(top, #d9534f 0%, #c9302c 100%);
+ background-image: -o-linear-gradient(top, #d9534f 0%, #c9302c 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#d9534f), to(#c9302c));
+ background-image: linear-gradient(to bottom, #d9534f 0%, #c9302c 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc9302c', GradientType=0);
+ background-repeat: repeat-x;
+}
+.progress-bar-striped {
+ background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25...
[truncated message content] |
Thanks for helping keep SourceForge clean.
X