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

Merge

Browse Source
This commit is contained in:
Maxime Kohlhaas 2013-07-13 11:44:25 +02:00
parent 0d1ab71b05
commit 6c79247a4b
29 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
dev/initdata/generate-commande.php Normal file → Executable file
View File

0
dev/initdata/generate-facture.php Normal file → Executable file
View File

0
dev/initdata/generate-produit.php Normal file → Executable file
View File

0
dev/initdata/generate-propale.php Normal file → Executable file
View File

0
dev/initdata/generate-societe.php Normal file → Executable file
View File

0
htdocs/admin/pdf.php Executable file → Normal file
View File

0
htdocs/admin/proxy.php Executable file → Normal file
View File

0
htdocs/admin/sms.php Executable file → Normal file
View File

13
htdocs/admin/system/perf.php
View File

@ -433,18 +433,6 @@ if ($resql)
} }
// Browser // Browser
<<<<<<< HEAD
print '<br>';
print '<strong>'.$langs->trans("Browser").'</strong>: ';
var_dump($conf->browser);
print '<br>';
// Database statistics update
print '<br>';
print '<strong>'.$langs->trans("DatabaseStatistics").'</strong>: ';
print '<br>';
=======
print '<br>'; print '<br>';
print '<strong>'.$langs->trans("Browser").'</strong>:<br>'; print '<strong>'.$langs->trans("Browser").'</strong>:<br>';
if (! in_array($conf->browser->name, array('chrome','opera','safari','firefox'))) if (! in_array($conf->browser->name, array('chrome','opera','safari','firefox')))
@ -463,7 +451,6 @@ print '<br>';
print '<strong>'.$langs->trans("DatabaseStatistics").'</strong>: '; print '<strong>'.$langs->trans("DatabaseStatistics").'</strong>: ';
print '<br>'; print '<br>';
*/ */
>>>>>>> 7485192cfbca23027d10cfdc41a33a14f332d23c
llxFooter(); llxFooter();

0
htdocs/admin/translation.php Executable file → Normal file
View File

0
htdocs/admin/workflow.php Executable file → Normal file
View File

0
htdocs/core/class/CSMSFile.class.php Executable file → Normal file
View File

0
htdocs/core/class/commondocgenerator.class.php Executable file → Normal file
View File

0
htdocs/core/class/extrafields.class.php Executable file → Normal file
View File

0
htdocs/core/class/genericobject.class.php Executable file → Normal file
View File

0
htdocs/core/class/hookmanager.class.php Executable file → Normal file
View File

0
htdocs/core/class/html.formsms.class.php Executable file → Normal file
View File

0
htdocs/core/class/rssparser.class.php Executable file → Normal file
View File

0
htdocs/core/class/smtps.class.php Executable file → Normal file
View File

0
htdocs/core/class/vcard.class.php Executable file → Normal file
View File

0
htdocs/core/triggers/interface_20_all_Logevents.class.php Executable file → Normal file
View File

0
htdocs/core/triggers/interface_20_modPaypal_PaypalWorkflow.class.php Executable file → Normal file
View File

0
htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php Executable file → Normal file
View File

0
htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php Executable file → Normal file
View File

0
htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php Executable file → Normal file
View File

0
htdocs/core/triggers/interface_50_modNotification_Notification.class.php Executable file → Normal file
View File

0
htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN Executable file → Normal file
View File

0
htdocs/filefunc.inc.php Executable file → Normal file
View File

0
htdocs/fourn/commande/index.php Executable file → Normal file
View File