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

Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop

Browse Source
This commit is contained in:
Grand Philippe 2013-03-16 15:26:19 +01:00
commit dc7a57b3f7
21 changed files with 233 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/adherents/index.php
View File

@ -47,7 +47,6 @@ $subscriptionstatic=new Cotisation($db);
print_fiche_titre($langs->trans("MembersArea"));
print '<table border="0" width="100%" class="notopnoleftnoright">';
$var=True;
@ -122,7 +121,8 @@ if ($result)
}
print '<tr><td width="30%" class="notopnoleft" valign="top">';
//print '<tr><td width="30%" class="notopnoleft" valign="top">';
print '<div class="fichecenter"><div class="fichethirdleft">';
// Formulaire recherche adherent
@ -195,7 +195,9 @@ if ($conf->use_javascript_ajax)
print '</table>';
}
print '</td><td class="notopnoleftnoright" valign="top">';
//print '</td><td class="notopnoleftnoright" valign="top">';
print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
$var=true;
@ -416,8 +418,8 @@ print "<td align=\"right\">".price(price2num($numb>0?($tot/$numb):0,'MT'))."</td
print "</tr>\n";
print "</table><br>\n";
print '</td></tr>';
print '</table>';
//print '</td></tr></table>';
print '<div></div></div>';
llxFooter();

54
htdocs/admin/pdf.php
View File

@ -68,6 +68,20 @@ if ($action == 'update')
exit;
}
if ($action == 'activate_pdfsecurity')
{
dolibarr_set_const($db, "PDF_SECURITY_ENCRYPTION", "1",'chaine',0,'',$conf->entity);
header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup");
exit;
}
else if ($action == 'disable_pdfsecurity')
{
dolibarr_del_const($db, "PDF_SECURITY_ENCRYPTION",$conf->entity);
header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup");
exit;
}
/*
* View
@ -366,31 +380,61 @@ else // Show
print_fiche_titre($langs->trans("Other"),'','').'<br>';
$var=true;
print '<table summary="more" class="noborder" width="100%">';
print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px" colspan="2">'.$langs->trans("Value").'</td></tr>';
// Hide any PDF informations
$var=!$var;
print '<tr '.$bc[$var].'><td>'.$langs->trans("HideAnyVATInformationOnPDF").'</td><td>';
print '<tr '.$bc[$var].'><td>'.$langs->trans("HideAnyVATInformationOnPDF").'</td><td colspan="2">';
print yn($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT,1);
print '</td></tr>';
// Encrypt and protect PDF
$var=!$var;
print "<tr ".$bc[$var].">";
print '<td>';
$text = $langs->trans("ProtectAndEncryptPdfFiles");
$desc = $form->textwithpicto($text,$langs->transnoentities("ProtectAndEncryptPdfFilesDesc"),1);
print $desc;
print '</td>';
print '<td width="60">';
if($conf->global->PDF_SECURITY_ENCRYPTION == 1)
{
print img_picto($langs->trans("Active"),'tick');
}
print '</td>';
print '<td align="center" width="140">';
if ($conf->global->PDF_SECURITY_ENCRYPTION == 0)
{
print '<a href="'.$_SERVER["PHP_SELF"].'?action=activate_pdfsecurity">'.$langs->trans("Activate").'</a>';
}
if($conf->global->PDF_SECURITY_ENCRYPTION == 1)
{
print '<a href="'.$_SERVER["PHP_SELF"].'?action=disable_pdfsecurity">'.$langs->trans("Disable").'</a>';
}
print "</td>";
print "</td>";
print '</tr>';
if ($conf->global->MAIN_FEATURES_LEVEL > 1)
{
//Desc
$var=!$var;
print '<tr '.$bc[$var].'><td>'.$langs->trans("HideDescOnPDF").'</td><td>';
print '<tr '.$bc[$var].'><td>'.$langs->trans("HideDescOnPDF").'</td><td colspan="2">';
print yn($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC,1);
print '</td></tr>';
//Ref
$var=!$var;
print '<tr '.$bc[$var].'><td>'.$langs->trans("HideRefOnPDF").'</td><td>';
print '<tr '.$bc[$var].'><td>'.$langs->trans("HideRefOnPDF").'</td><td colspan="2">';
print yn($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF,1);
print '</td></tr>';
//Details
$var=!$var;
print '<tr '.$bc[$var].'><td>'.$langs->trans("HideDetailsOnPDF").'</td><td>';
print '<tr '.$bc[$var].'><td>'.$langs->trans("HideDetailsOnPDF").'</td><td colspan="2">';
print yn($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS,1);
print '</td></tr>';
}

44
htdocs/admin/security.php
View File

@ -154,19 +154,6 @@ else if ($action == 'disable_encryptdbpassconf')
}
}
if ($action == 'activate_pdfsecurity')
{
dolibarr_set_const($db, "PDF_SECURITY_ENCRYPTION", "1",'chaine',0,'',$conf->entity);
header("Location: security.php");
exit;
}
else if ($action == 'disable_pdfsecurity')
{
dolibarr_del_const($db, "PDF_SECURITY_ENCRYPTION",$conf->entity);
header("Location: security.php");
exit;
}
if ($action == 'activate_MAIN_SECURITY_DISABLEFORGETPASSLINK')
{
dolibarr_set_const($db, "MAIN_SECURITY_DISABLEFORGETPASSLINK", '1','chaine',0,'',$conf->entity);
@ -364,37 +351,6 @@ print "</td>";
print "</td>";
print '</tr>';
// Encryption et protection des PDF
$var=!$var;
print "<tr ".$bc[$var].">";
print '<td colspan="3">';
$text = $langs->trans("ProtectAndEncryptPdfFiles");
$desc = $form->textwithpicto($text,$langs->transnoentities("ProtectAndEncryptPdfFilesDesc"),1);
print $desc;
print '</td>';
print '<td align="center" width="60">';
if($conf->global->PDF_SECURITY_ENCRYPTION == 1)
{
print img_picto($langs->trans("Active"),'tick');
}
print '</td>';
print '<td align="center" width="100">';
if ($conf->global->PDF_SECURITY_ENCRYPTION == 0)
{
print '<a href="security.php?action=activate_pdfsecurity">'.$langs->trans("Activate").'</a>';
}
if($conf->global->PDF_SECURITY_ENCRYPTION == 1)
{
print '<a href="security.php?action=disable_pdfsecurity">'.$langs->trans("Disable").'</a>';
}
print "</td>";
print "</td>";
print '</tr>';
// Disable link "Forget password" on logon
$var=!$var;

25
htdocs/admin/tools/listevents.php
View File

@ -1,5 +1,5 @@
<?php
/* Copyright (C) 2004-2012 Laurent Destailleur <eldy@users.sourceforge.net>
/* Copyright (C) 2004-2013 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
*
* This program is free software; you can redistribute it and/or modify
@ -111,7 +111,7 @@ if ($action == 'confirm_purge' && $confirm == 'yes' && $user->admin)
* View
*/
llxHeader();
llxHeader('',$langs->trans("Audit"));
$form=new Form($db);
@ -124,11 +124,11 @@ $sql.= " u.login";
$sql.= " FROM ".MAIN_DB_PREFIX."events as e";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid = e.fk_user";
$sql.= " WHERE e.entity = ".$conf->entity;
if ($search_code) { $usefilter++; $sql.=" AND e.type LIKE '%".$search_code."%'"; }
if ($search_ip) { $usefilter++; $sql.=" AND e.ip LIKE '%".$search_ip."%'"; }
if ($search_user) { $usefilter++; $sql.=" AND u.login LIKE '%".$search_user."%'"; }
if ($search_desc) { $usefilter++; $sql.=" AND e.description LIKE '%".$search_desc."%'"; }
if ($search_ua) { $usefilter++; $sql.=" AND e.user_agent LIKE '%".$search_ua."%'"; }
if ($search_code) { $usefilter++; $sql.=" AND e.type LIKE '%".$db->escape($search_code)."%'"; }
if ($search_ip) { $usefilter++; $sql.=" AND e.ip LIKE '%".$db->escape($search_ip)."%'"; }
if ($search_user) { $usefilter++; $sql.=" AND u.login LIKE '%".$db->escape($search_user)."%'"; }
if ($search_desc) { $usefilter++; $sql.=" AND e.description LIKE '%".$db->escape($search_desc)."%'"; }
if ($search_ua) { $usefilter++; $sql.=" AND e.user_agent LIKE '%".$db->escape($search_ua)."%'"; }
$sql.= $db->order($sortfield,$sortorder);
$sql.= $db->plimit($conf->liste_limit+1, $offset);
//print $sql;
@ -138,7 +138,14 @@ if ($result)
$num = $db->num_rows($result);
$i = 0;
print_barre_liste($langs->trans("ListOfSecurityEvents"), $page, $_SERVER["PHP_SELF"],"",$sortfield,$sortorder,'',$num,0,'setup');
$param='';
if ($search_code) $param.='&search_code='.$search_code;
if ($search_ip) $param.='&search_ip='.$search_ip;
if ($search_user) $param.='&search_user='.$search_user;
if ($search_desc) $param.='&search_desc='.$search_desc;
if ($search_ua) $param.='&search_ua='.$search_ua;
print_barre_liste($langs->trans("ListOfSecurityEvents"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, 0, 'setup');
if ($action == 'purge')
{
@ -178,7 +185,7 @@ if ($result)
print '</td>';
print '<td align="left" class="liste_titre">';
print '<input class="flat" type="text" size="10" name="search_desc" value="'.$search_desc.'">';
//print '<input class="flat" type="text" size="10" name="search_desc" value="'.$search_desc.'">';
print '</td>';
print '<td align="right" class="liste_titre">';

13
htdocs/categories/index.php
View File

@ -60,9 +60,9 @@ llxHeader('',$title,'','',0,0,$arrayofjs,$arrayofcss);
print_fiche_titre($title);
print '<table border="0" width="100%" class="notopnoleftnoright">';
print '<tr><td valign="top" width="30%" class="notopnoleft">';
//print '<table border="0" width="100%" class="notopnoleftnoright">';
//print '<tr><td valign="top" width="30%" class="notopnoleft">';
print '<div class="fichecenter"><div class="fichethirdleft">';
/*
@ -89,7 +89,9 @@ print '<td><input type="submit" class="button" value="'.$langs->trans ("Search")
print '</table></form>';
print '</td><td valign="top" width="70%">';
//print '</td><td valign="top" width="70%">';
print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
/*
@ -121,7 +123,8 @@ if ($catname || $id > 0)
}
print '</td></tr></table>';
//print '</td></tr></table>';
print '<div></div></div>';
print '<br>';

16
htdocs/comm/index.php
View File

@ -87,8 +87,9 @@ llxHeader();
print_fiche_titre($langs->trans("CustomerArea"));
print '<div class="fichecenter"><div class="fichethirdleft">';
/*
print '<table border="0" width="100%" class="notopnoleftnoright">';
print '<tr>';
if ((! empty($conf->propal->enabled) && $user->rights->propale->lire) ||
(! empty($conf->contrat->enabled) && $user->rights->contrat->lire) ||
@ -96,6 +97,7 @@ if ((! empty($conf->propal->enabled) && $user->rights->propale->lire) ||
{
print '<td valign="top" width="30%" class="notopnoleft">';
}
*/
// Recherche Propal
if (! empty($conf->propal->enabled) && $user->rights->propal->lire)
@ -256,7 +258,8 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
}
}
if ((! empty($conf->propal->enabled) && $user->rights->propale->lire) ||
/*if ((! empty($conf->propal->enabled) && $user->rights->propale->lire) ||
(! empty($conf->contrat->enabled) && $user->rights->contrat->lire) ||
(! empty($conf->commande->enabled) && $user->rights->commande->lire))
{
@ -266,8 +269,8 @@ if ((! empty($conf->propal->enabled) && $user->rights->propale->lire) ||
else
{
print '<td valign="top" width="100%" class="notopnoleftnoright">';
}
}*/
print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
$NBMAX=3;
@ -542,11 +545,10 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire)
}
print '</td></tr>';
print '</table>';
//print '</td></tr></table>';
print '<div></div></div>';
llxFooter();
$db->close();
?>

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

@ -44,9 +44,9 @@ llxHeader('','EMailing',$help_url);
print_fiche_titre($langs->trans("MailingArea"));
print '<table class="notopnoleftnoright" width="100%">';
print '<tr><td valign="top" width="30%" class="notopnoleft">';
//print '<table class="notopnoleftnoright" width="100%">';
//print '<tr><td valign="top" width="30%" class="notopnoleft">';
print '<div class="fichecenter"><div class="fichethirdleft">';
// Recherche emails
@ -141,7 +141,9 @@ if (is_resource($handle))
print "</table><br>";
print '</td><td valign="top" width="70%" class="notopnoleftnoright">';
//print '</td><td valign="top" width="70%" class="notopnoleftnoright">';
print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
/*
@ -198,11 +200,8 @@ else
}
print '</td></tr>';
print '</table>';
$db->close();
//print '</td></tr></table>';
print '<div></div></div>';
if ($langs->file_exists("html/spam.html",0)) {
@ -217,4 +216,5 @@ if ($langs->file_exists("html/spam.html",0)) {
llxFooter();
$db->close();
?>

14
htdocs/comm/propal/index.php
View File

@ -54,9 +54,10 @@ llxHeader("",$langs->trans("ProspectionArea"),$help_url);
print_fiche_titre($langs->trans("ProspectionArea"));
print '<table width="100%" class="notopnoleftnoright">';
//print '<table width="100%" class="notopnoleftnoright">';
//print '<tr><td valign="top" width="30%" class="notopnoleft">';
print '<div class="fichecenter"><div class="fichethirdleft">';
print '<tr><td valign="top" width="30%" class="notopnoleft">';
/*
* Search form
@ -199,7 +200,9 @@ if (! empty($conf->propal->enabled))
}
}
print '</td><td valign="top" width="70%" class="notopnoleftnoright">';
//print '</td><td valign="top" width="70%" class="notopnoleftnoright">';
print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
$max=5;
@ -509,10 +512,11 @@ if (! empty($conf->propal->enabled))
}
*/
print '</td></tr></table>';
//print '</td></tr></table>';
print '<div></div></div>';
$db->close();
llxFooter();
$db->close();
?>

19
htdocs/comm/prospect/index.php
View File

@ -46,9 +46,10 @@ llxHeader();
print_fiche_titre($langs->trans("ProspectionArea"));
print '<table border="0" width="100%" class="notopnoleftnoright">';
//print '<table border="0" width="100%" class="notopnoleftnoright">';
//print '<tr><td valign="top" width="30%" class="notopnoleft">';
print '<div class="fichecenter"><div class="fichethirdleft">';
print '<tr><td valign="top" width="30%" class="notopnoleft">';
if (! empty($conf->propal->enabled))
{
@ -158,17 +159,18 @@ if (! empty($conf->propal->enabled) && $user->rights->propale->lire)
}
}
//print '</td><td valign="top" width="70%" class="notopnoleftnoright">';
print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
/*
* Actions commerciales a faire
*
*/
print '</td><td valign="top" width="70%" class="notopnoleftnoright">';
if (! empty($conf->agenda->enabled)) show_array_actions_to_do(10);
/*
* Dernieres propales ouvertes
*
*/
if (! empty($conf->propal->enabled) && $user->rights->propale->lire)
{
@ -276,11 +278,10 @@ if ($resql)
}
print '</td></tr>';
print '</table>';
//print '</td></tr></table>';
print '<div></div></div>';
llxFooter();
$db->close();
?>

14
htdocs/commande/index.php
View File

@ -55,9 +55,10 @@ llxHeader("",$langs->trans("Orders"),$help_url);
print_fiche_titre($langs->trans("OrdersArea"));
print '<table width="100%" class="notopnoleftnoright">';
//print '<table width="100%" class="notopnoleftnoright">';
//print '<tr><td valign="top" width="30%" class="notopnoleft">';
print '<div class="fichecenter"><div class="fichethirdleft">';
print '<tr><td valign="top" width="30%" class="notopnoleft">';
/*
* Search form
@ -204,7 +205,9 @@ if (! empty($conf->commande->enabled))
}
}
print '</td><td valign="top" width="70%" class="notopnoleftnoright">';
//print '</td><td valign="top" width="70%" class="notopnoleftnoright">';
print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
$max=5;
@ -421,10 +424,11 @@ if (! empty($conf->commande->enabled))
}
print '</td></tr></table>';
//print '</td></tr></table>';
print '<div></div></div>';
$db->close();
llxFooter();
$db->close();
?>

19
htdocs/compta/index.php
View File

@ -104,10 +104,9 @@ llxHeader("",$langs->trans("AccountancyTreasuryArea"));
print_fiche_titre($langs->trans("AccountancyTreasuryArea"));
print '<table border="0" width="100%" class="notopnoleftnoright">';
print '<tr>';
print '<td valign="top" width="30%" class="notopnoleft">';
//print '<table border="0" width="100%" class="notopnoleftnoright">';
//print '<tr><td valign="top" width="30%" class="notopnoleft">';
print '<div class="fichecenter"><div class="fichethirdleft">';
$max=3;
@ -323,8 +322,10 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture-
}
}
print '</td>';
print '<td valign="top" width="70%" class="notopnoleftnoright">';
//print '</td><td valign="top" width="70%" class="notopnoleftnoright">';
print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
// Last modified customer invoices
if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
@ -1031,12 +1032,10 @@ if ($resql)
print "</table><br>";
}
print '</td></tr>';
print '</table>';
//print '</td></tr></table>';
print '<div></div></div>';
llxFooter();
$db->close();
?>

16
htdocs/compta/paiement/cheque/index.php
View File

@ -46,9 +46,9 @@ llxHeader('',$langs->trans("ChequesArea"));
print_fiche_titre($langs->trans("ChequesArea"));
print '<table border="0" width="100%" class="notopnoleftnoright">';
print '<tr><td valign="top" width="30%" class="notopnoleft">';
//print '<table border="0" width="100%" class="notopnoleftnoright">';
//print '<tr><td valign="top" width="30%" class="notopnoleft">';
print '<div class="fichecenter"><div class="fichethirdleft">';
$sql = "SELECT count(b.rowid)";
$sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
@ -86,7 +86,8 @@ else
}
print '</td><td valign="top" width="70%" class="notopnoleftnoright">';
//print '</td><td valign="top" width="70%" class="notopnoleftnoright">';
print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
$sql = "SELECT bc.rowid, bc.date_bordereau as db, bc.amount, bc.number as ref";
@ -143,10 +144,11 @@ else
dol_print_error($db);
}
print "</td></tr>\n";
print "</table>\n";
$db->close();
//print "</td></tr></table>\n";
print '<div></div></div>';
llxFooter();
$db->close();
?>

13
htdocs/compta/prelevement/index.php
View File

@ -61,9 +61,10 @@ if (prelevement_check_config() < 0)
print_fiche_titre($langs->trans("CustomersStandingOrdersArea"));
print '<table border="0" width="100%" class="notopnoleftnoright">';
//print '<table border="0" width="100%" class="notopnoleftnoright">';
//print '<tr><td valign="top" width="30%" class="notopnoleft">';
print '<div class="fichecenter"><div class="fichethirdleft">';
print '<tr><td valign="top" width="30%" class="notopnoleft">';
$thirdpartystatic=new Societe($db);
$invoicestatic=new Facture($db);
@ -85,8 +86,9 @@ print '<td align="right">';
print price($bprev->SommeAPrelever());
print '</td></tr></table><br>';
print '</td><td valign="top" width="70%">';
//print '</td><td valign="top" width="70%">';
print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
/*
@ -218,7 +220,10 @@ else
}
print '</td></tr></table>';
//print '</td></tr></table>';
print '<div></div></div>';
llxFooter();
$db->close();
?>

22
htdocs/compta/ventilation/index.php
View File

@ -32,14 +32,14 @@ llxHeader('','Compta - Ventilation');
print_fiche_titre("Ventilation Comptable");
print '<table border="0" width="100%" class="notopnoleftnoright">';
print '<tr><td valign="top" width="30%" class="notopnoleft">';
//print '<table border="0" width="100%" class="notopnoleftnoright">';
//print '<tr><td valign="top" width="30%" class="notopnoleft">';
print '<div class="fichecenter"><div class="fichethirdleft">';
$sql = "SELECT count(*) FROM ".MAIN_DB_PREFIX."facturedet as fd";
$sql.= " , ".MAIN_DB_PREFIX."facture as f";
$sql.= " WHERE fd.fk_code_ventilation = 0";
$sql.= " AND f.rowid = fd.fk_facture AND f.fk_statut = 1;";
$sql.= " AND f.rowid = fd.fk_facture AND f.fk_statut = 1";
$result = $db->query($sql);
if ($result)
@ -56,14 +56,17 @@ print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Lines").'</tr>';
print '<tr class="liste_titre"><td>'.$langs->trans("Type").'</td><td align="right">'.$langs->trans("Nb").'</td></tr>';
$var=!$var;
print "<tr $bc[$var]>".'<td>'.$langs->trans("Invoices").'</td><td align="right">'.$nbfac.'</td></tr>';
print "<tr ".$bc[$var].">".'<td>'.$langs->trans("Invoices").'</td><td align="right">'.$nbfac.'</td></tr>';
$var=!$var;
print "</table>\n";
print '</td><td valign="top" width="70%" class="notopnoleftnoright">';
//print '</td><td valign="top" width="70%" class="notopnoleftnoright">';
print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td>Type</td><td align="center">'.$langs->trans("NbOfLines").'</td><td align="center">'.$langs->trans("AccountNumber").'</td><td align="center">'.$langs->trans("TransID").'</td></tr>';
print '<tr class="liste_titre"><td>'.$langs->trans("Type").'</td><td align="center">'.$langs->trans("NbOfLines").'</td><td align="center">'.$langs->trans("AccountNumber").'</td><td align="center">'.$langs->trans("TransID").'</td></tr>';
$sql = "SELECT count(*), ccg.intitule, ccg.rowid,ccg.numero FROM ".MAIN_DB_PREFIX."facturedet as fd";
$sql.= " ,".MAIN_DB_PREFIX."compta_compte_generaux as ccg";
@ -90,8 +93,11 @@ if ($resql)
}
print "</table>\n";
print '</td></tr></table>';
//print '</td></tr></table>';
print '<div></div></div>';
llxFooter();
$db->close();
?>

2
htdocs/ecm/index.php
View File

@ -393,9 +393,11 @@ if (!empty($conf->global->ECM_AUTO_TREE_ENABLED)) {
}
print_fiche_titre($langs->trans("ECMArea").' - '.$langs->trans("ECMFileManager"));
print '<div class="hideonsmartphone">';
print $langs->trans("ECMAreaDesc")."<br>";
print $langs->trans("ECMAreaDesc2")."<br>";
print "<br>\n";
print '</div>';
// Confirm remove file (for non javascript users)
if ($action == 'delete' && empty($conf->use_javascript_ajax))

17
htdocs/expedition/index.php
View File

@ -43,8 +43,11 @@ llxHeader('',$langs->trans("Sendings"),$helpurl);
print_fiche_titre($langs->trans("SendingsArea"));
print '<table class="notopnoleftnoright" width="100%">';
print '<tr><td valign="top" width="30%" class="notopnoleft">';
//print '<table class="notopnoleftnoright" width="100%">';
//print '<tr><td valign="top" width="30%" class="notopnoleft">';
print '<div class="fichecenter"><div class="fichethirdleft">';
$var=false;
print '<table class="noborder nohover" width="100%">';
@ -159,10 +162,8 @@ if ($resql)
}
/*
*
*/
print '</td><td valign="top" width="70%">';
//print '</td><td valign="top" width="70%">';
print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
/*
@ -272,7 +273,9 @@ if ($resql)
}
else dol_print_error($db);
print '</td></tr></table>';
//print '</td></tr></table>';
print '<div></div></div>';
llxFooter();

20
htdocs/fourn/index.php
View File

@ -50,8 +50,11 @@ llxHeader("",$langs->trans("SuppliersArea"));
print_fiche_titre($langs->trans("SuppliersArea"));
print '<table border="0" width="100%" class="notopnoleftnoright">';
print '<tr><td valign="top" width="30%" class="notopnoleft">';
//print '<table border="0" width="100%" class="notopnoleftnoright">';
//print '<tr><td valign="top" width="30%" class="notopnoleft">';
print '<div class="fichecenter"><div class="fichethirdleft">';
// Orders
$commande = new CommandeFournisseur($db);
@ -221,8 +224,10 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture-
}
}
print "</td>\n";
print '<td valign="top" width="70%" class="notopnoleftnoright">';
//print '</td><td valign="top" width="70%" class="notopnoleftnoright">';
print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
/*
* List last modified supliers
@ -314,10 +319,11 @@ if (count($companystatic->SupplierCategories))
print "<br>\n";
}
print "</td></tr>\n";
print "</table>\n";
$db->close();
//print "</td></tr></table>\n";
print '<div></div></div>';
llxFooter();
$db->close();
?>

14
htdocs/product/index.php
View File

@ -66,9 +66,11 @@ llxHeader("",$langs->trans("ProductsAndServices"),$helpurl);
print_fiche_titre($transAreaType);
print '<table border="0" width="100%" class="notopnoleftnoright">';
print '<tr><td valign="top" width="30%" class="notopnoleft">';
//print '<table border="0" width="100%" class="notopnoleftnoright">';
//print '<tr><td valign="top" width="30%" class="notopnoleft">';
print '<div class="fichecenter"><div class="fichethirdleft">';
/*
* Zone recherche produit/service
@ -156,7 +158,10 @@ print $total;
print '</td></tr>';
print '</table>';
print '</td><td valign="top" width="70%" class="notopnoleftnoright">';
//print '</td><td valign="top" width="70%" class="notopnoleftnoright">';
print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
/*
* Last modified products
@ -253,7 +258,8 @@ else
dol_print_error($db);
}
print '</td></tr></table>';
//print '</td></tr></table>';
print '<div></div></div>';
llxFooter();

16
htdocs/product/stock/index.php
View File

@ -42,8 +42,11 @@ llxHeader("",$langs->trans("Stocks"),$help_url);
print_fiche_titre($langs->trans("StocksArea"));
print '<table border="0" width="100%" class="notopnoleftnoright">';
print '<tr><td valign="top" width="30%" class="notopnoleft">';
//print '<table border="0" width="100%" class="notopnoleftnoright">';
//print '<tr><td valign="top" width="30%" class="notopnoleft">';
print '<div class="fichecenter"><div class="fichethirdleft">';
/*
* Zone recherche entrepot
@ -101,7 +104,10 @@ else
dol_print_error($db);
}
print '</td><td valign="top" width="70%" class="notopnoleftnoright">';
//print '</td><td valign="top" width="70%" class="notopnoleftnoright">';
print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
// Last movements
$max=10;
@ -157,10 +163,10 @@ if ($resql)
print "</table>";
}
print '</td></tr></table>';
//print '</td></tr></table>';
print '<div></div></div>';
llxFooter();
$db->close();
?>

15
htdocs/societe/index.php
View File

@ -48,9 +48,11 @@ llxHeader("",$langs->trans("ThirdParties"),$helpurl);
print_fiche_titre($transAreaType);
print '<table border="0" width="100%" class="notopnoleftnoright">';
print '<tr><td valign="top" width="30%" class="notopnoleft">';
//print '<table border="0" width="100%" class="notopnoleftnoright">';
//print '<tr><td valign="top" width="30%" class="notopnoleft">';
print '<div class="fichecenter"><div class="fichethirdleft">';
/*
* Search area
@ -148,7 +150,10 @@ print $total;
print '</td></tr>';
print '</table>';
print '</td><td valign="top" width="70%" class="notopnoleftnoright">';
//print '</td><td valign="top" width="70%" class="notopnoleftnoright">';
print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
/*
* Last third parties modified
@ -243,10 +248,10 @@ else
dol_print_error($db);
}
print '</td></tr></table>';
//print '</td></tr></table>';
print '<div></div></div>';
llxFooter();
$db->close();
?>

18
htdocs/user/home.php
View File

@ -56,9 +56,10 @@ llxHeader();
print_fiche_titre($langs->trans("MenuUsersAndGroups"));
print '<table border="0" width="100%" class="notopnoleftnoright">';
//print '<table border="0" width="100%" class="notopnoleftnoright">';
//print '<tr><td valign="top" width="30%" class="notopnoleft">';
print '<div class="fichecenter"><div class="fichethirdleft">';
print '<tr><td valign="top" width="30%" class="notopnoleft">';
// Search User
$var=false;
@ -87,7 +88,9 @@ if ($canreadperms)
print '</form>';
}
print '</td><td valign="top" width="70%" class="notopnoleftnoright">';
//print '</td><td valign="top" width="70%" class="notopnoleftnoright">';
print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
/*
@ -250,11 +253,10 @@ if ($canreadperms)
}
}
print '</td></tr>';
print '</table>';
$db->close();
//print '</td></tr></table>';
print '<div></div></div>';
llxFooter();
$db->close();
?>