lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #267 from marcosgdf/trans-and-link-fixes

Browse Source 
Fixed es_ES translations and some BackToList links
This commit is contained in:
Regis Houssin 2012-07-28 09:36:28 -07:00
commit 49bacc6fda
9 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/comm/propal/contact.php
View File

@ -123,7 +123,7 @@ else if ($action == 'setaddress' && $user->rights->propale->creer)
* View * View
*/ */
llxHeader('', $langs->trans("Proposal"), "Propal"); llxHeader('',$langs->trans('Proposal'),'EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos');
$form = new Form($db); $form = new Form($db);
$formcompany= new FormCompany($db); $formcompany= new FormCompany($db);
@ -152,7 +152,7 @@ if ($id > 0 || ! empty($ref))
*/ */
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
$linkback='<a href="'.DOL_URL_ROOT.'/comm/propal/list.php?page='.$page.'&socid='.$socid.'&viewstatut='.$viewstatut.'&sortfield='.$sortfield.'&sortorder='.$sortorder.'">'.$langs->trans("BackToList").'</a>'; $linkback='<a href="'.DOL_URL_ROOT.'/comm/propal/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
// Ref // Ref
print '<tr><td width="25%">'.$langs->trans('Ref').'</td><td colspan="3">'; print '<tr><td width="25%">'.$langs->trans('Ref').'</td><td colspan="3">';

2
htdocs/comm/propal/document.php
View File

@ -136,7 +136,7 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes')
* View * View
*/ */
llxHeader(); llxHeader('',$langs->trans('Proposal'),'EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos');
$form = new Form($db); $form = new Form($db);

2
htdocs/comm/propal/info.php
View File

@ -42,7 +42,7 @@ $result = restrictedArea($user, 'propale', $id, 'propal');
* View * View
*/ */
llxHeader(); llxHeader('',$langs->trans('Proposal'),'EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos');
$propal = new Propal($db); $propal = new Propal($db);
$propal->fetch($_GET["id"]); $propal->fetch($_GET["id"]);

4
htdocs/comm/propal/note.php
View File

@ -66,7 +66,7 @@ else if ($action == 'setnote' && $user->rights->propale->creer)
/* Affichage fiche */ /* Affichage fiche */
/******************************************************************************/ /******************************************************************************/
llxHeader(); llxHeader('',$langs->trans('Proposal'),'EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos');
$form = new Form($db); $form = new Form($db);
@ -86,7 +86,7 @@ if ($id > 0 || ! empty($ref))
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
$linkback="<a href=\"".DOL_URL_ROOT.'/comm/propal/list.php'."?page=$page&socid=$socid&viewstatut=$viewstatut&sortfield=$sortfield&$sortorder\">".$langs->trans("BackToList")."</a>"; $linkback = '<a href="'.DOL_URL_ROOT.'/comm/propal/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans('BackToList').'</a>';
// Ref // Ref
print '<tr><td width="25%">'.$langs->trans('Ref').'</td><td colspan="3">'; print '<tr><td width="25%">'.$langs->trans('Ref').'</td><td colspan="3">';

2
htdocs/projet/liste.php
View File

@ -27,6 +27,8 @@
require("../main.inc.php"); require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php");
$langs->load('projects');
$title = $langs->trans("Projects"); $title = $langs->trans("Projects");
// Security check // Security check

2
htdocs/projet/note.php
View File

@ -95,7 +95,7 @@ if ($action == 'update_private' && $user->rights->projet->creer)
*/ */
$help_url="EN:Module_Projects|FR:Module_Projets|ES:M&oacute;dulo_Proyectos"; $help_url="EN:Module_Projects|FR:Module_Projets|ES:M&oacute;dulo_Proyectos";
llxHeader("",$langs->trans("Tasks"),$help_url); llxHeader("",$langs->trans("Project"),$help_url);
$form = new Form($db); $form = new Form($db);
$userstatic=new User($db); $userstatic=new User($db);

2
htdocs/projet/tasks/document.php
View File

@ -157,7 +157,7 @@ if ($id > 0 || ! empty($ref))
$form = new Form($db); $form = new Form($db);
llxHeader('',$langs->trans('Project')); llxHeader('',$langs->trans('Task'));
if ($object->id > 0) if ($object->id > 0)
{ {

2
htdocs/projet/tasks/note.php
View File

@ -101,7 +101,7 @@ else if ($action == 'setnote_private' && $user->rights->ficheinter->creer)
* View * View
*/ */
llxHeader(); llxHeader('', $langs->trans("Task"));
$form = new Form($db); $form = new Form($db);
$userstatic = new User($db); $userstatic = new User($db);

4
htdocs/projet/tasks/task.php
View File

@ -126,7 +126,9 @@ if (! empty($project_ref) && ! empty($withproject))
* View * View
*/ */
llxHeader("",$langs->trans("Task")); $langs->load('projects');
llxHeader('', $langs->trans("Task"));
$form = new Form($db); $form = new Form($db);
$formother = new FormOther($db); $formother = new FormOther($db);