[Web-erp-svn] SF.net SVN: web-erp:[5007] trunk

[<dai...@us...>]

Revision: 5007
          http://web-erp.svn.sourceforge.net/web-erp/?rev=5007&view=rev
Author:   daintree
Date:     2012-03-04 09:43:21 +0000 (Sun, 04 Mar 2012)
Log Message:
-----------
James Dupin various language improvements. Fix DeliveryDetails merge errors

Modified Paths:
--------------
    trunk/BankAccounts.php
    trunk/DeliveryDetails.php
    trunk/WWW_Users.php
    trunk/includes/MainMenuLinksArray.php

Modified: trunk/BankAccounts.php
===================================================================
--- trunk/BankAccounts.php	2012-03-03 21:32:10 UTC (rev 5006)
+++ trunk/BankAccounts.php	2012-03-04 09:43:21 UTC (rev 5007)
@@ -9,7 +9,7 @@
 include('includes/header.inc');
 
 echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/money_add.png" title="' . _('Bank') . '" alt="" />' . ' ' . $title . '</p>';
-echo '<div class="page_help_text">' . _('Update Bank Account details.  Account Code is for SWIFT or BSB type Bank Codes.  Set Default for Invoices to "Currency Default"  of "Fallback Default" to print Account details on Invoices (only one account should be set to "Fall Back Default").') . '.</div><br />';
+echo '<div class="page_help_text">' . _('Update Bank Account details.  Account Code is for SWIFT or BSB type Bank Codes.  Set Default for Invoices to Currency Default  or Fallback Default to print Account details on Invoices (only one account should be set to Fall Back Default).') . '.</div><br />';
 
 if (isset($_GET['SelectedBankAccount'])) {
 	$SelectedBankAccount=$_GET['SelectedBankAccount'];

Modified: trunk/DeliveryDetails.php
===================================================================
--- trunk/DeliveryDetails.php	2012-03-03 21:32:10 UTC (rev 5006)
+++ trunk/DeliveryDetails.php	2012-03-04 09:43:21 UTC (rev 5007)
@@ -652,14 +652,10 @@
 											SELECT contractref,
 													stockid,
 													workcentreadded,
-												'" . $_SESSION['Items'.$identifier]->Location ."',
-												'" . Date('Y-m-d') . "',
-<<<<<<< .mine
-												'2037-12-31',
-												quantity
-=======
-												'2099-12-31'
->>>>>>> .r4665
+													'" . $_SESSION['Items'.$identifier]->Location ."',
+													'" . Date('Y-m-d') . "',
+													'2099-12-31',
+													quantity
 											FROM contractbom
 											WHERE contractref='" . $ContractRow['contractref'] . "'",$db,$ErrMsg,$DbgMsg);
 

Modified: trunk/WWW_Users.php
===================================================================
--- trunk/WWW_Users.php	2012-03-03 21:32:10 UTC (rev 5006)
+++ trunk/WWW_Users.php	2012-03-04 09:43:21 UTC (rev 5007)
@@ -649,7 +649,7 @@
 foreach($ModuleList as $ModuleName){
 
 	echo '<tr>
-			<td>' . _('Display') . ' ' . $ModuleName . ' ' . _('options') . ': </td>
+			<td>' . _('Display') . ' ' . $ModuleName . ' ' . _('module') . ': </td>
 			<td><select name="Module_' . $i . '">';
 	if ($ModulesAllowed[$i]==0){
 		echo '<option selected="selected" value="0">' . _('No') . '</option>';

Modified: trunk/includes/MainMenuLinksArray.php
===================================================================
--- trunk/includes/MainMenuLinksArray.php	2012-03-03 21:32:10 UTC (rev 5006)
+++ trunk/includes/MainMenuLinksArray.php	2012-03-04 09:43:21 UTC (rev 5007)
@@ -440,7 +440,7 @@
 														_('Configuration Settings'),
 														_('User Maintenance'),
 														_('Maintain Security Tokens'),
-														_('Role Permissions'),
+														_('Access Permissions Maintenance'),
 														_('Page Security Settings'),
 														_('Bank Accounts'),
 														_('Currency Maintenance'),

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.