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

Merge pull request #5673 from aspangaro/5.0-p5

Browse Source 
Fix: Presentation on member card
This commit is contained in:
Juanjo Menent 2016-08-31 02:09:28 +02:00 committed by GitHub
commit 612db4f66d
7 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/adherents/agenda.php
View File

@ -77,7 +77,9 @@ if ($object->id > 0)
$langs->load("companies"); $langs->load("companies");
llxHeader("",$langs->trans("Agenda"),''); $title=$langs->trans("Member") . " - " . $langs->trans("Agenda");
$helpurl="EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros";
llxHeader("",$title,$helpurl);
if (! empty($conf->notification->enabled)) $langs->load("mails"); if (! empty($conf->notification->enabled)) $langs->load("mails");
$head = member_prepare_head($object); $head = member_prepare_head($object);

3
htdocs/adherents/card.php
View File

@ -717,8 +717,9 @@ if (empty($reshook))
$form = new Form($db); $form = new Form($db);
$formcompany = new FormCompany($db); $formcompany = new FormCompany($db);
$title=$langs->trans("Member") . " - " . $langs->trans("Card");
$help_url='EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros'; $help_url='EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros';
llxHeader('',$langs->trans("Member"),$help_url); llxHeader('',$title,$help_url);
$countrynotdefined=$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')'; $countrynotdefined=$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';

4
htdocs/adherents/card_subscriptions.php
View File

@ -557,7 +557,9 @@ $form = new Form($db);
$now=dol_now(); $now=dol_now();
llxHeader('',$langs->trans("Subscriptions"),'EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros'); $title=$langs->trans("Member") . " - " . $langs->trans("Subscriptions");
$helpurl="EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros";
llxHeader("",$title,$helpurl);
if ($rowid > 0) if ($rowid > 0)
{ {

4
htdocs/adherents/document.php
View File

@ -85,7 +85,9 @@ include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php';
$form = new Form($db); $form = new Form($db);
llxHeader(); $title=$langs->trans("Member") . " - " . $langs->trans("Documents");
$helpurl="EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros";
llxHeader("",$title,$helpurl);
if ($id > 0) if ($id > 0)
{ {

4
htdocs/adherents/info.php
View File

@ -44,7 +44,9 @@ $result=restrictedArea($user,'adherent',$id);
$form = new Form($db); $form = new Form($db);
llxHeader('',$langs->trans("Member"),'EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros'); $title=$langs->trans("Member") . " - " . $langs->trans("Info");
$helpurl="EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros";
llxHeader("",$title,$helpurl);
$object = new Adherent($db); $object = new Adherent($db);
$object->fetch($id); $object->fetch($id);

5
htdocs/adherents/note.php
View File

@ -59,8 +59,9 @@ include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include,
/* /*
* View * View
*/ */
$title=$langs->trans("Member") . " - " . $langs->trans("Note");
llxHeader('',$langs->trans("Member"),'EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros'); $helpurl="EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros";
llxHeader("",$title,$helpurl);
$form = new Form($db); $form = new Form($db);

2
htdocs/core/lib/member.lib.php
View File

@ -37,7 +37,7 @@ function member_prepare_head(Adherent $object)
$head = array(); $head = array();
$head[$h][0] = DOL_URL_ROOT.'/adherents/card.php?rowid='.$object->id; $head[$h][0] = DOL_URL_ROOT.'/adherents/card.php?rowid='.$object->id;
$head[$h][1] = $langs->trans("MemberCard"); $head[$h][1] = $langs->trans("Card");
$head[$h][2] = 'general'; $head[$h][2] = 'general';
$h++; $h++;