Merge remote-tracking branch 'origin/3.7' into develop

Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/index.php
	htdocs/projet/class/project.class.php
	test/phpunit/BankAccountTest.php
This commit is contained in:
Laurent Destailleur
2015-02-23 14:59:24 +01:00
66 changed files with 730 additions and 471 deletions

View File

@@ -8,8 +8,10 @@ SharedProject=Everybody
PrivateProject=Contacts of project
MyProjectsDesc=This view is limited to projects you are a contact for (whatever is the type).
ProjectsPublicDesc=This view presents all projects you are allowed to read.
ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything).
MyTasksDesc=This view is limited to projects or tasks you are a contact for (whatever is the type).
OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
ProjectsArea=Projects area