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

New: Link to wiki help

Browse Source
This commit is contained in:
Laurent Destailleur 2009-08-24 17:11:30 +00:00
parent 5b158fc84a
commit 9dba1ee3fa
5 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/comm/action/fiche.php
View File

@ -419,7 +419,8 @@ if ($_POST["action"] == 'update')
* View * View
*/ */
llxHeader(); $help_url='EN:Module_Agenda_En|FR:Module_Agenda|ES:M&omodulodulo_Agenda';
llxHeader('',$langs->trans("Agenda"),$help_url);
$html = new Form($db); $html = new Form($db);
$htmlactions = new FormActions($db); $htmlactions = new FormActions($db);

3
htdocs/comm/action/index.php
View File

@ -104,7 +104,8 @@ if ($action=='delete_action')
* View * View
*/ */
llxHeader('','','EN:Module_Agenda_En|FR:Module_Agenda|ES:M&omodulodulo_Agenda'); $help_url='EN:Module_Agenda_En|FR:Module_Agenda|ES:M&omodulodulo_Agenda';
llxHeader('',$langs->trans("Agenda"),$help_url);
$form=new Form($db); $form=new Form($db);

28
htdocs/comm/action/listactions.php
View File

@ -25,7 +25,7 @@
\brief Page liste des actions commerciales \brief Page liste des actions commerciales
\version $Id$ \version $Id$
*/ */
require_once("./pre.inc.php"); require_once("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/contact.class.php");
require_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php"); require_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php");
@ -63,12 +63,12 @@ if ($page == -1) { $page = 0 ; }
$limit = $conf->liste_limit; $limit = $conf->liste_limit;
$offset = $limit * $page ; $offset = $limit * $page ;
if (! $sortorder) if (! $sortorder)
{ {
$sortorder="ASC"; $sortorder="ASC";
if ($status == 'todo') $sortorder="DESC"; if ($status == 'todo') $sortorder="DESC";
if ($status == 'done') $sortorder="DESC"; if ($status == 'done') $sortorder="DESC";
} }
if (! $sortfield) if (! $sortfield)
{ {
$sortfield="a.percent"; $sortfield="a.percent";
if ($status == 'todo') $sortfield="a.datep"; if ($status == 'todo') $sortfield="a.datep";
@ -97,7 +97,9 @@ if (! empty($_POST["viewcal"]))
* View * View
*/ */
llxHeader(); $help_url='EN:Module_Agenda_En|FR:Module_Agenda|ES:M&omodulodulo_Agenda';
llxHeader('',$langs->trans("Agenda"),$help_url);
$form=new Form($db); $form=new Form($db);
$sql = "SELECT s.nom as societe, s.rowid as socid, s.client,"; $sql = "SELECT s.nom as societe, s.rowid as socid, s.client,";
@ -125,7 +127,7 @@ if ($_GET["type"]) $sql.= " AND c.id = ".$_GET["type"];
if ($_REQUEST["time"] == "today") $sql.= " AND date_format(a.datep, '%d%m%Y') = ".strftime("%d%m%Y",time()); if ($_REQUEST["time"] == "today") $sql.= " AND date_format(a.datep, '%d%m%Y') = ".strftime("%d%m%Y",time());
if ($status == 'done') { $sql.= " AND a.percent = 100"; } if ($status == 'done') { $sql.= " AND a.percent = 100"; }
if ($status == 'todo') { $sql.= " AND a.percent < 100"; } if ($status == 'todo') { $sql.= " AND a.percent < 100"; }
if ($filtera > 0 || $filtert > 0 || $filterd > 0) if ($filtera > 0 || $filtert > 0 || $filterd > 0)
{ {
$sql.= " AND ("; $sql.= " AND (";
if ($filtera > 0) $sql.= " a.fk_user_author = ".$filtera; if ($filtera > 0) $sql.= " a.fk_user_author = ".$filtera;
@ -143,7 +145,7 @@ if ($resql)
{ {
$actionstatic=new ActionComm($db); $actionstatic=new ActionComm($db);
$societestatic=new Societe($db); $societestatic=new Societe($db);
$num = $db->num_rows($resql); $num = $db->num_rows($resql);
$title=$langs->trans("DoneAndToDoActions"); $title=$langs->trans("DoneAndToDoActions");
@ -171,9 +173,9 @@ if ($resql)
{ {
print_barre_liste($langs->trans($title), $page, $_SERVER["PHP_SELF"], $param,$sortfield,$sortorder,'',$num); print_barre_liste($langs->trans($title), $page, $_SERVER["PHP_SELF"], $param,$sortfield,$sortorder,'',$num);
} }
//print '<br>'; //print '<br>';
if ($canedit) if ($canedit)
{ {
print '<form name="listactionsfilter" action="'.$_SERVER["PHP_SELF"].'" method="POST">'; print '<form name="listactionsfilter" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
@ -203,7 +205,7 @@ if ($resql)
print '</td><td>'; print '</td><td>';
print $form->select_users($filtert,'usertodo',1,'',!$canedit); print $form->select_users($filtert,'usertodo',1,'',!$canedit);
print '</td></tr>'; print '</td></tr>';
print '<tr>'; print '<tr>';
print '<td>'; print '<td>';
//print '<input type="checkbox" name="userdone" '.($canedit?'':'disabled="true" ').($filterd?'checked="true"':'').'> '; //print '<input type="checkbox" name="userdone" '.($canedit?'':'disabled="true" ').($filterd?'checked="true"':'').'> ';
@ -215,8 +217,8 @@ if ($resql)
print '</table>'; print '</table>';
print '</form><br>'; print '</form><br>';
} }
$i = 0; $i = 0;
print "<table class=\"noborder\" width=\"100%\">"; print "<table class=\"noborder\" width=\"100%\">";
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
@ -231,11 +233,11 @@ if ($resql)
print_liste_field_titre($langs->trans("DoneBy"),$_SERVER["PHP_SELF"],"ud.login",$param,"","",$sortfield,$sortorder); print_liste_field_titre($langs->trans("DoneBy"),$_SERVER["PHP_SELF"],"ud.login",$param,"","",$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"a.percent",$param,"",'align="right"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"a.percent",$param,"",'align="right"',$sortfield,$sortorder);
print "</tr>\n"; print "</tr>\n";
$contactstatic = new Contact($db); $contactstatic = new Contact($db);
$now=gmmktime(); $now=gmmktime();
$delay_warning=$conf->global->MAIN_DELAY_ACTIONS_TODO*24*60*60; $delay_warning=$conf->global->MAIN_DELAY_ACTIONS_TODO*24*60*60;
$var=true; $var=true;
while ($i < min($num,$limit)) while ($i < min($num,$limit))
{ {

3
htdocs/comm/mailing/fiche.php
View File

@ -471,7 +471,8 @@ if (! empty($_POST["cancel"]))
* View * View
*/ */
llxHeader('',$langs->trans("Mailing"),'EN:Module_EMailing|FR:Module_Mailing|ES:M&oacute;dulo_Mailing'); $help_url='EN:Module_EMailing|FR:Module_Mailing|ES:M&oacute;dulo_Mailing';
llxHeader('',$langs->trans("Mailing"),$help_url);
$html = new Form($db); $html = new Form($db);
$htmlother = new FormOther($db); $htmlother = new FormOther($db);

3
htdocs/comm/mailing/index.php
View File

@ -38,7 +38,8 @@ if (! $user->rights->mailing->lire || $user->societe_id > 0)
* View * View
*/ */
llxHeader('','Mailing'); $help_url='EN:Module_EMailing|FR:Module_Mailing|ES:M&oacute;dulo_Mailing';
llxHeader('','EMailing',$help_url);
print_fiche_titre($langs->trans("MailingArea")); print_fiche_titre($langs->trans("MailingArea"));