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 TestPlanResults.php:864 TestPlanResults.php:924 #: 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:751 -#: WWW_Users.php:754 WWW_Users.php:766 WWW_Users.php:769 +#: UserSettings.php:227 WWW_Users.php:547 WWW_Users.php:549 WWW_Users.php:718 +#: WWW_Users.php:721 WWW_Users.php:734 WWW_Users.php:737 WWW_Users.php:749 +#: WWW_Users.php:752 WWW_Users.php:764 WWW_Users.php:767 #: reportwriter/languages/en_US/reports.php:114 msgid "Yes" msgstr "موافق" @@ -425,9 +425,9 @@ #: TestPlanResults.php:749 TestPlanResults.php:866 TestPlanResults.php:925 #: 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:750 -#: WWW_Users.php:753 WWW_Users.php:765 WWW_Users.php:768 +#: UserSettings.php:226 WWW_Users.php:546 WWW_Users.php:550 WWW_Users.php:717 +#: WWW_Users.php:720 WWW_Users.php:733 WWW_Users.php:736 WWW_Users.php:748 +#: WWW_Users.php:751 WWW_Users.php:763 WWW_Users.php:766 #: includes/PDFLowGPPageHeader.inc:44 #: reportwriter/languages/en_US/reports.php:82 msgid "No" @@ -459,7 +459,7 @@ #: 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:392 +#: WorkCentres.php:145 WWW_Access.php:132 WWW_Users.php:391 #: includes/InputSerialItems.php:110 includes/OutputSerialItems.php:20 #: reportwriter/languages/en_US/reports.php:143 #, php-format @@ -505,7 +505,7 @@ #: 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:393 +#: WOSerialNos.php:335 WWW_Access.php:133 WWW_Users.php:392 #: includes/InputSerialItemsKeyed.php:60 includes/OutputSerialItems.php:99 #: reportwriter/languages/en_US/reports.php:141 #, php-format @@ -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:837 +#: WWW_Users.php:835 msgid "Enter Information" msgstr "أدخل المعلومات" @@ -768,8 +768,9 @@ msgid "Role" msgstr "" -#: AddCustomerContacts.php:135 -msgid "Phone no" +#: AddCustomerContacts.php:135 CustomerBranches.php:413 +#: SupplierContacts.php:154 +msgid "Phone No" msgstr "" #: AddCustomerContacts.php:136 AddCustomerContacts.php:263 @@ -785,7 +786,7 @@ #: PrintCustTransPortrait.php:1034 PrintCustTransPortrait.php:1090 #: SelectCustomer.php:408 SelectCustomer.php:730 SelectSupplier.php:290 #: SupplierContacts.php:156 SupplierContacts.php:277 UserSettings.php:184 -#: WWW_Users.php:334 includes/PDFPickingListHeader.inc:25 +#: WWW_Users.php:333 includes/PDFPickingListHeader.inc:25 #: includes/PDFStatementPageHeader.inc:76 includes/PDFTransPageHeader.inc:85 #: includes/PDFTransPageHeaderPortrait.inc:113 includes/PDFWOPageHeader.inc:19 #: includes/PO_PDFOrderPageHeader.inc:29 ../webSHOP/Checkout.php:298 @@ -907,8 +908,8 @@ #: SelectCustomer.php:852 ShipmentCosting.php:538 ShipmentCosting.php:615 #: Shipments.php:489 StockDispatch.php:279 StockDispatch.php:290 #: StockDispatch.php:301 StockLocMovements.php:92 StockMovements.php:105 -#: StockSerialItemResearch.php:82 SupplierAllocations.php:455 -#: SupplierAllocations.php:569 SupplierAllocations.php:644 +#: StockSerialItemResearch.php:82 SupplierAllocations.php:458 +#: SupplierAllocations.php:572 SupplierAllocations.php:647 #: SupplierInquiry.php:204 SupplierTransInquiry.php:111 SuppWhereAlloc.php:132 #: Tax.php:408 Z_CheckGLTransBalance.php:11 #: includes/PDFQuotationPageHeader.inc:31 @@ -1132,8 +1133,8 @@ #: SalesByTypePeriodInquiry.php:465 SalesByTypePeriodInquiry.php:500 #: SalesByTypePeriodInquiry.php:561 SelectCreditItems.php:693 #: SelectCreditItems.php:697 SelectOrderItems.php:1352 SuppContractChgs.php:107 -#: SuppFixedAssetChgs.php:97 SupplierAllocations.php:457 -#: SupplierAllocations.php:570 SupplierAllocations.php:645 +#: SuppFixedAssetChgs.php:97 SupplierAllocations.php:460 +#: SupplierAllocations.php:573 SupplierAllocations.php:648 #: SupplierCredit.php:407 SupplierInquiry.php:209 SuppShiptChgs.php:97 #: SuppTransGLAnalysis.php:140 Tax.php:250 Z_CheckDebtorsControl.php:149 #: api/api_debtortransactions.php:1271 api/api_debtortransactions.php:1284 @@ -1964,7 +1965,7 @@ #: ProductSpecs.php:388 QATests.php:257 QATests.php:395 #: SalesByTypePeriodInquiry.php:356 SelectCustomer.php:405 #: ShipmentCosting.php:536 ShipmentCosting.php:613 StockLocMovements.php:90 -#: StockMovements.php:103 SupplierAllocations.php:453 SupplierInquiry.php:205 +#: StockMovements.php:103 SupplierAllocations.php:456 SupplierInquiry.php:205 #: SupplierTransInquiry.php:20 SupplierTransInquiry.php:108 #: SuppWhereAlloc.php:26 SuppWhereAlloc.php:133 Tax.php:409 #: Z_CheckAllocationsFrom.php:32 Z_CheckAllocationsFrom.php:57 @@ -2366,7 +2367,7 @@ #: PcClaimExpensesFromTab.php:427 PcExpenses.php:351 PcExpensesTypeTab.php:139 #: PcExpensesTypeTab.php:229 PcTabs.php:510 PcTypeTabs.php:254 #: SalesTypes.php:282 SecurityTokens.php:138 SelectCreditItems.php:955 -#: SupplierAllocations.php:520 UserBankAccounts.php:128 +#: SupplierAllocations.php:523 UserBankAccounts.php:128 #: UserBankAccounts.php:231 UserLocations.php:138 UserLocations.php:256 #: Z_CheckDebtorsControl.php:62 reportwriter/languages/en_US/reports.php:134 msgid "Cancel" @@ -2381,6 +2382,7 @@ msgstr "" #: BankAccountUsers.php:167 GLAccountUsers.php:150 LocationUsers.php:174 +#: WWW_Users.php:468 msgid "User Code" msgstr "" @@ -2473,7 +2475,7 @@ #: BankMatching.php:132 CounterSales.php:231 CreditItemsControlled.php:79 #: FreightCosts.php:281 GoodsReceivedControlled.php:68 GoodsReceived.php:73 #: InternalStockRequestFulfill.php:39 StockLocTransferReceive.php:537 -#: SupplierAllocations.php:434 SuppShiptChgs.php:137 +#: SupplierAllocations.php:437 SuppShiptChgs.php:137 msgid "from" msgstr "" @@ -2596,7 +2598,7 @@ msgstr "" #: BankMatching.php:280 ShipmentCosting.php:537 ShipmentCosting.php:614 -#: SupplierAllocations.php:456 +#: SupplierAllocations.php:459 msgid "Ref" msgstr "" @@ -2611,7 +2613,7 @@ #: PcReportTab.php:335 PrintCheque.php:83 PrintCheque.php:97 #: SelectCreditItems.php:696 SuppContractChgs.php:79 SuppContractChgs.php:164 #: SuppFixedAssetChgs.php:79 SuppFixedAssetChgs.php:153 -#: SupplierAllocations.php:457 SupplierCredit.php:353 SupplierCredit.php:386 +#: SupplierAllocations.php:460 SupplierCredit.php:353 SupplierCredit.php:386 #: SupplierCredit.php:422 SupplierCredit.php:462 SupplierInvoice.php:710 #: SupplierInvoice.php:751 SupplierInvoice.php:791 SupplierInvoice.php:836 #: SupplierTransInquiry.php:116 SuppShiptChgs.php:81 SuppShiptChgs.php:147 @@ -2742,8 +2744,8 @@ #: ImportBankTrans.php:491 PrintCustTrans.php:503 PrintCustTrans.php:749 #: PrintCustTransPortrait.php:538 PrintCustTransPortrait.php:770 #: PrintCustTransPortrait.php:1018 PrintCustTransPortrait.php:1073 -#: StockMovements.php:104 SupplierAllocations.php:454 -#: SupplierAllocations.php:568 SupplierAllocations.php:643 +#: StockMovements.php:104 SupplierAllocations.php:457 +#: SupplierAllocations.php:571 SupplierAllocations.php:646 #: SupplierInquiry.php:206 SupplierTransInquiry.php:109 SuppWhereAlloc.php:134 #: Tax.php:410 Z_CheckAllocs.php:63 Z_CheckGLTransBalance.php:13 #: includes/PDFQuotationPageHeader.inc:29 @@ -4275,7 +4277,7 @@ #: CompanyPreferences.php:226 CustLoginSetup.php:162 Suppliers.php:744 #: Suppliers.php:988 SupplierTenderCreate.php:415 SuppLoginSetup.php:145 -#: WWW_Users.php:524 ../webSHOP/Checkout.php:430 +#: WWW_Users.php:523 ../webSHOP/Checkout.php:430 msgid "Email Address" msgstr "" @@ -4574,7 +4576,7 @@ #: OrderDetails.php:85 SalesAnalRepts.php:30 SalesAnalRepts.php:32 #: SalesInquiry.php:771 SalesInquiry.php:781 SalesInquiry.php:803 #: SalesInquiry.php:951 SalesInquiry.php:966 SalesInquiry.php:972 -#: SalesInquiry.php:1231 WWW_Users.php:335 WWW_Users.php:584 +#: SalesInquiry.php:1231 WWW_Users.php:334 WWW_Users.php:582 #: Z_ChangeBranchCode.php:209 includes/PDFStatementPageHeader.inc:121 #: includes/PDFTransPageHeader.inc:49 #: includes/PDFTransPageHeaderPortrait.inc:59 @@ -5015,9 +5017,9 @@ #: StockTransfers.php:332 StockTransfers.php:352 StockTransfers.php:409 #: StockTransfers.php:435 StockTransfers.php:469 StockTransfers.php:487 #: StockTransfers.php:503 StockTransfers.php:515 StockTransfers.php:524 -#: SupplierAllocations.php:116 SupplierAllocations.php:138 -#: SupplierAllocations.php:156 SupplierAllocations.php:180 -#: SupplierAllocations.php:214 SupplierAllocations.php:235 +#: SupplierAllocations.php:119 SupplierAllocations.php:141 +#: SupplierAllocations.php:159 SupplierAllocations.php:183 +#: SupplierAllocations.php:217 SupplierAllocations.php:238 #: SupplierCredit.php:727 SupplierCredit.php:756 SupplierCredit.php:781 #: SupplierCredit.php:815 SupplierCredit.php:849 SupplierCredit.php:881 #: SupplierCredit.php:918 SupplierCredit.php:943 SupplierCredit.php:955 @@ -5139,10 +5141,10 @@ #: StockTransfers.php:281 StockTransfers.php:316 StockTransfers.php:332 #: StockTransfers.php:352 StockTransfers.php:409 StockTransfers.php:435 #: StockTransfers.php:469 StockTransfers.php:487 StockTransfers.php:503 -#: StockTransfers.php:515 StockTransfers.php:524 SupplierAllocations.php:116 -#: SupplierAllocations.php:138 SupplierAllocations.php:156 -#: SupplierAllocations.php:180 SupplierAllocations.php:214 -#: SupplierAllocations.php:235 SupplierCredit.php:727 SupplierCredit.php:756 +#: StockTransfers.php:515 StockTransfers.php:524 SupplierAllocations.php:119 +#: SupplierAllocations.php:141 SupplierAllocations.php:159 +#: SupplierAllocations.php:183 SupplierAllocations.php:217 +#: SupplierAllocations.php:238 SupplierCredit.php:727 SupplierCredit.php:756 #: SupplierCredit.php:781 SupplierCredit.php:815 SupplierCredit.php:849 #: SupplierCredit.php:881 SupplierCredit.php:918 SupplierCredit.php:943 #: SupplierCredit.php:955 SupplierCredit.php:991 SupplierCredit.php:1031 @@ -5309,7 +5311,7 @@ #: ConfirmDispatch_Invoice.php:1058 CounterReturns.php:1076 #: CounterSales.php:1480 Credit_Invoice.php:858 SelectCreditItems.php:1508 -#: ShipmentCosting.php:397 SupplierAllocations.php:138 +#: ShipmentCosting.php:397 SupplierAllocations.php:141 #: includes/PDFPaymentRun_PymtFooter.php:57 #: includes/PDFPaymentRun_PymtFooter.php:88 #: includes/PDFPaymentRun_PymtFooter.php:117 @@ -5448,7 +5450,7 @@ #: SelectCreditItems.php:1878 SelectCreditItems.php:1909 #: SelectCreditItems.php:1932 SelectCreditItems.php:1960 #: SelectCreditItems.php:1980 SelectCreditItems.php:2001 -#: SupplierAllocations.php:215 SupplierAllocations.php:238 +#: SupplierAllocations.php:218 SupplierAllocations.php:241 #: WorkOrderCosting.php:372 WorkOrderCosting.php:393 WorkOrderCosting.php:412 #: WorkOrderCosting.php:453 WorkOrderCosting.php:472 WorkOrderCosting.php:495 #: WorkOrderCosting.php:514 WorkOrderReceive.php:273 WorkOrderReceive.php:292 @@ -5902,8 +5904,8 @@ #: PO_SelectOSPurchOrder.php:595 PO_SelectPurchOrder.php:433 PurchData.php:271 #: ReprintGRN.php:85 SelectProduct.php:324 SelectSupplier.php:161 #: ShipmentCosting.php:535 ShipmentCosting.php:612 Shipt_Select.php:294 -#: ShiptsList.php:11 SuppCreditGRNs.php:293 SupplierAllocations.php:567 -#: SupplierAllocations.php:642 SupplierCredit.php:262 +#: ShiptsList.php:11 SuppCreditGRNs.php:293 SupplierAllocations.php:570 +#: SupplierAllocations.php:645 SupplierCredit.php:262 #: SupplierGRNAndInvoiceInquiry.php:30 SupplierInquiry.php:119 #: SupplierInquiry.php:120 SupplierInvoice.php:606 SupplierTransInquiry.php:112 #: SuppLoginSetup.php:33 SuppPriceList.php:222 SuppPriceList.php:292 @@ -8052,7 +8054,7 @@ #: CustEDISetup.php:31 CustLoginSetup.php:51 Customers.php:67 #: InternalStockCategoriesByRole.php:24 StockClone.php:164 Stocks.php:142 #: SuppLoginSetup.php:51 TaxCategories.php:32 WorkCentres.php:37 -#: WWW_Users.php:90 Z_ChangeBranchCode.php:35 Z_ImportDebtors.php:225 +#: WWW_Users.php:92 Z_ChangeBranchCode.php:35 Z_ImportDebtors.php:225 #: Z_ImportDebtors.php:299 Z_ImportStocks.php:123 msgid "or a space" msgstr "" @@ -8419,39 +8421,39 @@ msgid " has been selected" msgstr "" -#: CustLoginSetup.php:48 SuppLoginSetup.php:48 WWW_Users.php:87 +#: CustLoginSetup.php:48 SuppLoginSetup.php:48 WWW_Users.php:89 msgid "The user ID entered must be at least 4 characters long" msgstr "" -#: CustLoginSetup.php:51 SuppLoginSetup.php:51 WWW_Users.php:90 +#: CustLoginSetup.php:51 SuppLoginSetup.php:51 WWW_Users.php:92 msgid "User names cannot contain any of the following characters" msgstr "" #: CustLoginSetup.php:55 SuppLoginSetup.php:54 UserSettings.php:47 -#: WWW_Users.php:94 +#: WWW_Users.php:96 msgid "The password entered must be at least 5 characters long" msgstr "" #: CustLoginSetup.php:59 SuppLoginSetup.php:57 UserSettings.php:50 -#: WWW_Users.php:98 +#: WWW_Users.php:100 msgid "The password cannot contain the user id" msgstr "" -#: CustLoginSetup.php:62 WWW_Users.php:102 +#: CustLoginSetup.php:62 WWW_Users.php:104 msgid "" "If you enter a Customer Code you must also enter a Branch Code valid for " "this Customer" msgstr "" -#: CustLoginSetup.php:72 WWW_Users.php:124 +#: CustLoginSetup.php:72 WWW_Users.php:126 msgid "The check on validity of the customer code and branch failed because" msgstr "" -#: CustLoginSetup.php:73 WWW_Users.php:125 +#: CustLoginSetup.php:73 WWW_Users.php:127 msgid "The SQL that was used to check the customer code and branch was" msgstr "" -#: CustLoginSetup.php:77 WWW_Users.php:129 +#: CustLoginSetup.php:77 WWW_Users.php:131 msgid "The entered Branch Code is not valid for the entered Customer Code" msgstr "" @@ -8467,8 +8469,8 @@ msgid "A new customer login has been created" msgstr "" -#: CustLoginSetup.php:132 SuppLoginSetup.php:115 WWW_Users.php:331 -#: WWW_Users.php:477 +#: CustLoginSetup.php:132 SuppLoginSetup.php:115 WWW_Users.php:330 +#: WWW_Users.php:476 msgid "User Login" msgstr "" @@ -8477,7 +8479,7 @@ msgstr "" #: CustLoginSetup.php:150 SMTPServer.php:118 SuppLoginSetup.php:133 -#: WWW_Users.php:512 includes/Login.php:100 includes/Login.php:101 +#: WWW_Users.php:511 includes/Login.php:100 includes/Login.php:101 #: install/index.php:932 ../webSHOP/Checkout.php:302 #: ../webSHOP/Register.php:600 ../webSHOP/includes/header.php:239 msgid "Password" @@ -8487,8 +8489,8 @@ msgid "Enter a password for this customer login" msgstr "" -#: CustLoginSetup.php:154 SuppLoginSetup.php:137 WWW_Users.php:332 -#: WWW_Users.php:516 +#: CustLoginSetup.php:154 SuppLoginSetup.php:137 WWW_Users.php:331 +#: WWW_Users.php:515 msgid "Full Name" msgstr "" @@ -8497,7 +8499,7 @@ msgstr "" #: CustLoginSetup.php:158 Locations.php:630 SalesPeople.php:340 -#: SupplierContacts.php:265 SuppLoginSetup.php:141 WWW_Users.php:520 +#: SupplierContacts.php:265 SuppLoginSetup.php:141 WWW_Users.php:519 msgid "Telephone No" msgstr "" @@ -8506,19 +8508,19 @@ msgstr "" #: CustLoginSetup.php:167 CustomerBranches.php:600 CustomerBranches.php:637 -#: CustomerPurchases.php:85 WWW_Users.php:336 WWW_Users.php:589 +#: CustomerPurchases.php:85 WWW_Users.php:335 WWW_Users.php:587 #: Z_ImportCustbranch.php:519 api/api_xml-rpc.php:241 #: includes/PDFCustomerListPageHeader.inc:84 msgid "Branch Code" msgstr "" -#: CustLoginSetup.php:187 SuppLoginSetup.php:203 WWW_Users.php:623 +#: CustLoginSetup.php:187 SuppLoginSetup.php:203 WWW_Users.php:621 msgid "Reports Page Size" msgstr "" #: CustLoginSetup.php:191 CustLoginSetup.php:193 EmailConfirmation.php:121 #: PrintCustOrder_generic.php:118 PrintCustOrder.php:108 SuppLoginSetup.php:207 -#: SuppLoginSetup.php:209 WWW_Users.php:627 WWW_Users.php:629 +#: SuppLoginSetup.php:209 WWW_Users.php:625 WWW_Users.php:627 #: reportwriter/languages/en_US/reports.php:295 msgid "A4" msgstr "" @@ -8525,8 +8527,8 @@ #: CustLoginSetup.php:197 CustLoginSetup.php:199 CustLoginSetup.php:203 #: CustLoginSetup.php:205 SuppLoginSetup.php:213 SuppLoginSetup.php:215 -#: SuppLoginSetup.php:219 SuppLoginSetup.php:221 WWW_Users.php:633 -#: WWW_Users.php:635 WWW_Users.php:639 WWW_Users.php:641 +#: SuppLoginSetup.php:219 SuppLoginSetup.php:221 WWW_Users.php:631 +#: WWW_Users.php:633 WWW_Users.php:637 WWW_Users.php:639 #: reportwriter/languages/en_US/reports.php:294 msgid "A3" msgstr "" @@ -8536,15 +8538,15 @@ #: EmailConfirmation.php:121 PrintCustOrder_generic.php:118 #: PrintCustOrder.php:108 SuppLoginSetup.php:219 SuppLoginSetup.php:221 #: SuppLoginSetup.php:231 SuppLoginSetup.php:233 SuppLoginSetup.php:242 -#: SuppLoginSetup.php:244 WWW_Users.php:639 WWW_Users.php:641 WWW_Users.php:651 -#: WWW_Users.php:653 WWW_Users.php:662 WWW_Users.php:664 +#: SuppLoginSetup.php:244 WWW_Users.php:637 WWW_Users.php:639 WWW_Users.php:649 +#: WWW_Users.php:651 WWW_Users.php:660 WWW_Users.php:662 msgid "landscape" msgstr "" #: CustLoginSetup.php:209 CustLoginSetup.php:211 CustLoginSetup.php:215 #: CustLoginSetup.php:217 SuppLoginSetup.php:225 SuppLoginSetup.php:227 -#: SuppLoginSetup.php:231 SuppLoginSetup.php:233 WWW_Users.php:645 -#: WWW_Users.php:647 WWW_Users.php:651 WWW_Users.php:653 +#: SuppLoginSetup.php:231 SuppLoginSetup.php:233 WWW_Users.php:643 +#: WWW_Users.php:645 WWW_Users.php:649 WWW_Users.php:651 #: reportwriter/languages/en_US/reports.php:298 msgid "Letter" msgstr "" @@ -8551,20 +8553,20 @@ #: CustLoginSetup.php:221 CustLoginSetup.php:223 CustLoginSetup.php:226 #: CustLoginSetup.php:228 SuppLoginSetup.php:237 SuppLoginSetup.php:239 -#: SuppLoginSetup.php:242 SuppLoginSetup.php:244 WWW_Users.php:657 -#: WWW_Users.php:659 WWW_Users.php:662 WWW_Users.php:664 +#: SuppLoginSetup.php:242 SuppLoginSetup.php:244 WWW_Users.php:655 +#: WWW_Users.php:657 WWW_Users.php:660 WWW_Users.php:662 #: reportwriter/languages/en_US/reports.php:297 msgid "Legal" msgstr "" #: CustLoginSetup.php:234 SuppLoginSetup.php:250 UserSettings.php:145 -#: WWW_Users.php:342 WWW_Users.php:671 +#: WWW_Users.php:341 WWW_Users.php:669 msgid "Theme" msgstr "" #: CustLoginSetup.php:256 Customers.php:638 Customers.php:1021 #: Customers.php:1031 RevisionTranslations.php:60 SuppLoginSetup.php:274 -#: UserSettings.php:128 WWW_Users.php:343 WWW_Users.php:696 +#: UserSettings.php:128 WWW_Users.php:342 WWW_Users.php:694 msgid "Language" msgstr "" @@ -8739,7 +8741,7 @@ #: CustomerAccount.php:340 CustomerAccount.php:360 CustomerAllocations.php:381 #: CustomerInquiry.php:452 CustomerInquiry.php:498 CustomerInquiry.php:524 -#: CustomerInquiry.php:556 SupplierAllocations.php:459 SupplierInquiry.php:295 +#: CustomerInquiry.php:556 SupplierAllocations.php:462 SupplierInquiry.php:295 msgid "Allocation" msgstr "" @@ -8777,16 +8779,16 @@ msgid "Customer Receipt" msgstr "" -#: CustomerAllocations.php:13 SupplierAllocations.php:21 +#: CustomerAllocations.php:13 SupplierAllocations.php:22 #: Z_AutoCustomerAllocations.php:12 msgid "Credit Note Allocations" msgstr "" -#: CustomerAllocations.php:28 SupplierAllocations.php:35 +#: CustomerAllocations.php:28 SupplierAllocations.php:38 msgid "Allocations can not be processed again" msgstr "" -#: CustomerAllocations.php:29 SupplierAllocations.php:36 +#: CustomerAllocations.php:29 SupplierAllocations.php:39 msgid "" "If you hit refresh on this page after having just processed an allocation" msgstr "" @@ -8813,11 +8815,11 @@ "the" msgstr "" -#: CustomerAllocations.php:75 SupplierAllocations.php:91 +#: CustomerAllocations.php:75 SupplierAllocations.php:94 msgid "being allocated" msgstr "" -#: CustomerAllocations.php:75 CustWhereAlloc.php:184 SupplierAllocations.php:91 +#: CustomerAllocations.php:75 CustWhereAlloc.php:184 SupplierAllocations.php:94 #: SuppWhereAlloc.php:183 msgid "Total allocated" msgstr "" @@ -8863,7 +8865,7 @@ msgstr "" #: CustomerAllocations.php:344 PDFRemittanceAdvice.php:307 -#: SupplierAllocations.php:566 SupplierAllocations.php:641 +#: SupplierAllocations.php:569 SupplierAllocations.php:644 #: includes/PDFStatementPageHeader.inc:162 msgid "Trans Type" msgstr "" @@ -8872,8 +8874,8 @@ msgid "Cust No" msgstr "" -#: CustomerAllocations.php:350 SupplierAllocations.php:571 -#: SupplierAllocations.php:646 +#: CustomerAllocations.php:350 SupplierAllocations.php:574 +#: SupplierAllocations.php:649 msgid "To Alloc" msgstr "" @@ -8886,30 +8888,30 @@ msgid "Amount in customer currency" msgstr "" -#: CustomerAllocations.php:371 SupplierAllocations.php:442 +#: CustomerAllocations.php:371 SupplierAllocations.php:445 msgid "converted into local currency at an exchange rate of" msgstr "" #: CustomerAllocations.php:376 CustomerAllocations.php:377 -#: CustomerAllocations.php:378 SupplierAllocations.php:454 -#: SupplierAllocations.php:455 includes/PDFLowGPPageHeader.inc:43 +#: CustomerAllocations.php:378 SupplierAllocations.php:457 +#: SupplierAllocations.php:458 includes/PDFLowGPPageHeader.inc:43 #: includes/PDFStatementPageHeader.inc:172 msgid "Trans" msgstr "" -#: CustomerAllocations.php:380 SupplierAllocations.php:458 +#: CustomerAllocations.php:380 SupplierAllocations.php:461 msgid "Yet to" msgstr "" #: CustomerAllocations.php:380 CustomerAllocations.php:515 #: CustomerAllocations.php:563 CustomerReceipt.php:602 -#: SupplierAllocations.php:458 SupplierAllocations.php:595 -#: SupplierAllocations.php:671 +#: SupplierAllocations.php:461 SupplierAllocations.php:598 +#: SupplierAllocations.php:674 #, php-format msgid "Allocate" msgstr "" -#: CustomerAllocations.php:381 SupplierAllocations.php:459 +#: CustomerAllocations.php:381 SupplierAllocations.php:462 msgid "This" msgstr "" @@ -8933,19 +8935,19 @@ "entered here if the entire transaction is to be allocated, use the check box" msgstr "" -#: CustomerAllocations.php:435 SupplierAllocations.php:505 +#: CustomerAllocations.php:435 SupplierAllocations.php:508 msgid "Total Allocated" msgstr "" -#: CustomerAllocations.php:439 SupplierAllocations.php:518 +#: CustomerAllocations.php:439 SupplierAllocations.php:521 msgid "Recalculate Total To Allocate" msgstr "" -#: CustomerAllocations.php:442 SupplierAllocations.php:510 +#: CustomerAllocations.php:442 SupplierAllocations.php:513 msgid "Left to allocate" msgstr "" -#: CustomerAllocations.php:449 SupplierAllocations.php:519 +#: CustomerAllocations.php:449 SupplierAllocations.php:522 msgid "Process Allocations" msgstr "" @@ -8953,7 +8955,7 @@ msgid "No outstanding receipts or credits to be allocated for this customer" msgstr "" -#: CustomerAllocations.php:618 SupplierAllocations.php:688 +#: CustomerAllocations.php:618 SupplierAllocations.php:691 msgid "There are no allocations to be done" msgstr "" @@ -9212,10 +9214,6 @@ msgid "Salesman" msgstr "" -#: CustomerBranches.php:413 SupplierContacts.php:154 -msgid "Phone No" -msgstr "" - #: CustomerBranches.php:414 SupplierContacts.php:155 msgid "Fax No" msgstr "" @@ -9330,7 +9328,7 @@ msgstr "" #: CustomerBranches.php:734 CustomerBranches.php:758 DailySalesInquiry.php:40 -#: PDFSalesBySalesperson.php:90 SalesPeople.php:179 WWW_Users.php:338 +#: PDFSalesBySalesperson.php:90 SalesPeople.php:179 WWW_Users.php:337 msgid "Salesperson" msgstr "" @@ -9508,7 +9506,7 @@ msgstr "" #: CustomerInquiry.php:260 CustomerInquiry.php:261 CustomerInquiry.php:262 -#: CustomerInquiry.php:263 CustomerInquiry.php:264 SupplierAllocations.php:647 +#: CustomerInquiry.php:263 CustomerInquiry.php:264 SupplierAllocations.php:650 #: SupplierInquiry.php:212 SupplierInquiry.php:213 msgid "More Info" msgstr "" @@ -10499,7 +10497,7 @@ msgstr "" #: CustWhereAlloc.php:127 EmailCustTrans.php:65 PrintCustTrans.php:505 -#: PrintCustTransPortrait.php:540 SupplierAllocations.php:433 +#: PrintCustTransPortrait.php:540 SupplierAllocations.php:436 #: SuppWhereAlloc.php:127 msgid "number" msgstr "" @@ -11773,7 +11771,7 @@ #: EDIProcessOrders.php:275 EDIProcessOrders.php:277 #: ImportBankTransAnalysis.php:113 ImportBankTransAnalysis.php:116 -#: SupplierAllocations.php:436 +#: SupplierAllocations.php:439 msgid "dated" msgstr "" @@ -12267,7 +12265,7 @@ #: PrintCustTransPortrait.php:786 PrintCustTransPortrait.php:1032 #: PrintCustTransPortrait.php:1088 SalesPeople.php:209 SelectSupplier.php:289 #: Suppliers.php:736 Suppliers.php:980 SupplierTenderCreate.php:144 -#: WWW_Users.php:333 +#: WWW_Users.php:332 msgid "Telephone" msgstr "" @@ -15694,7 +15692,7 @@ msgid "View any open tenders without an offer" msgstr "" -#: index.php:38 WWW_Users.php:822 +#: index.php:38 WWW_Users.php:820 msgid "Account Status" msgstr "" @@ -19285,11 +19283,7 @@ msgid "Days (Or Day In Following Month)" msgstr "" -#: PcAnalysis.php:179 -msgid "Excel file for petty Cash Expenses Analysis" -msgstr "" - -#: PcAnalysis.php:192 PcAnalysis.php:202 +#: PcAnalysis.php:179 PcAnalysis.php:192 PcAnalysis.php:202 msgid "Excel file for Petty Cash Expenses Analysis" msgstr "" @@ -22443,7 +22437,7 @@ #: PO_OrderDetails.php:96 PurchasesReport.php:164 SelectProduct.php:562 #: Suppliers.php:693 Suppliers.php:934 SupplierTenderCreate.php:413 -#: WWW_Users.php:337 WWW_Users.php:594 +#: WWW_Users.php:336 WWW_Users.php:592 msgid "Supplier Code" msgstr "" @@ -32464,141 +32458,138 @@ msgid "Add to Invoice" msgstr "" -#: SupplierAllocations.php:21 +#: SupplierAllocations.php:22 msgid "Supplier Payment" msgstr "" -#: SupplierAllocations.php:29 SupplierBalsAtPeriodEnd.php:116 -#: SupplierContacts.php:21 includes/MainMenuLinksArray.php:141 +#: SupplierAllocations.php:29 SupplierAllocations.php:30 +#: SupplierBalsAtPeriodEnd.php:116 SupplierContacts.php:21 +#: includes/MainMenuLinksArray.php:141 msgid "Supplier Allocations" msgstr "" -#: SupplierAllocations.php:37 +#: SupplierAllocations.php:40 msgid "" "try to use the navigation links provided rather than the back button, to " "avoid this message in future" msgstr "" -#: SupplierAllocations.php:60 +#: SupplierAllocations.php:63 msgid "The entry for the amount to allocate was negative" msgstr "" -#: SupplierAllocations.php:60 +#: SupplierAllocations.php:63 msgid "A positive allocation amount is expected" msgstr "" -#: SupplierAllocations.php:91 +#: SupplierAllocations.php:94 msgid "" "These allocations cannot be processed because the amount allocated is more " "than the amount of the" msgstr "" -#: SupplierAllocations.php:91 +#: SupplierAllocations.php:94 msgid "and the total amount of the Credit/payment was" msgstr "" -#: SupplierAllocations.php:116 +#: SupplierAllocations.php:119 msgid "The existing allocation for" msgstr "" -#: SupplierAllocations.php:116 +#: SupplierAllocations.php:119 msgid "could not be deleted because" msgstr "" -#: SupplierAllocations.php:117 +#: SupplierAllocations.php:120 msgid "The following SQL to delete the allocation record was used" msgstr "" -#: SupplierAllocations.php:138 +#: SupplierAllocations.php:141 msgid "The supplier allocation record for" msgstr "" -#: SupplierAllocations.php:139 +#: SupplierAllocations.php:142 msgid "The following SQL to insert the allocation record was used" msgstr "" -#: SupplierAllocations.php:156 +#: SupplierAllocations.php:159 msgid "" "The debtor transaction record could not be modified for the allocation " "against it because" msgstr "" -#: SupplierAllocations.php:158 +#: SupplierAllocations.php:161 msgid "The following SQL to update the debtor transaction record was used" msgstr "" -#: SupplierAllocations.php:181 +#: SupplierAllocations.php:184 msgid "" "The supplier payment or credit note transaction could not be modified for " "the new allocation and exchange difference because" msgstr "" -#: SupplierAllocations.php:183 +#: SupplierAllocations.php:186 msgid "The following SQL to update the payment or credit note was used" msgstr "" -#: SupplierAllocations.php:211 -msgid "Exch diff" +#: SupplierAllocations.php:214 SupplierAllocations.php:235 +msgid "Exchange difference" msgstr "" -#: SupplierAllocations.php:214 SupplierAllocations.php:236 +#: SupplierAllocations.php:217 SupplierAllocations.php:239 msgid "" "The GL entry for the difference on exchange arising out of this allocation " "could not be inserted because" msgstr "" -#: SupplierAllocations.php:232 -msgid "Exch Diff" -msgstr "" - -#: SupplierAllocations.php:319 +#: SupplierAllocations.php:322 msgid "" "There was a problem retrieving the information relating the transaction " "selected" msgstr "" -#: SupplierAllocations.php:319 +#: SupplierAllocations.php:322 msgid "Allocations are unable to proceed" msgstr "" -#: SupplierAllocations.php:321 SupplierAllocations.php:360 +#: SupplierAllocations.php:324 SupplierAllocations.php:363 msgid "The SQL that was used to retrieve the transaction information was" msgstr "" -#: SupplierAllocations.php:358 +#: SupplierAllocations.php:361 msgid "" "There was a problem retrieving the transactions available to allocate to" msgstr "" -#: SupplierAllocations.php:401 +#: SupplierAllocations.php:404 msgid "" "There was a problem retrieving the previously allocated transactions for " "modification" msgstr "" -#: SupplierAllocations.php:403 +#: SupplierAllocations.php:406 msgid "" "The SQL that was used to retrieve the previously allocated transaction " "information was" msgstr "" -#: SupplierAllocations.php:432 +#: SupplierAllocations.php:435 msgid "Allocation of supplier" msgstr "" -#: SupplierAllocations.php:440 SupplierInvoice.php:865 SupplierInvoice.php:872 +#: SupplierAllocations.php:443 SupplierInvoice.php:865 SupplierInvoice.php:872 msgid "Amount in supplier currency" msgstr "" -#:... [truncated message content] |