cvsimport

Dolibarr · Sep 15, 2011 · 8efb78c · 8efb78c
2 parents ca026e7 + 9b0d3ed
commit 8efb78c
Show file tree

Hide file tree

Showing 93 changed files with 46 additions and 13,548 deletions.
diff --git a/htdocs/cashdesk/affContenu.php b/htdocs/cashdesk/affContenu.php
@@ -22,7 +22,7 @@
  *	\ingroup    cashdesk
  *	\brief      Include to show main page for cashdesk module
  */
-require ('class/Facturation.class.php');
+require_once('class/Facturation.class.php');
 
 // Si nouvelle vente, reinitialisation des donnees (destruction de l'objet et vidage de la table contenant la liste des articles)
 if ( $_GET['id'] == 'NOUV' )
@@ -40,7 +40,7 @@
 else
 {
 	// ... sinon, c'est une nouvelle vente
-	$obj_facturation = new Facturation;
+	$obj_facturation = new Facturation();
 }
 
 print '<div class="liste_articles">';

diff --git a/htdocs/cashdesk/affIndex.php b/htdocs/cashdesk/affIndex.php
@@ -27,7 +27,7 @@
 require_once(DOL_DOCUMENT_ROOT.'/cashdesk/include/environnement.php');
 
 // Test if already logged
-if ( $_SESSION['uid'] <= 0 ) 
+if ( $_SESSION['uid'] <= 0 )
 {
 	header ('Location: index.php');
 	exit;
@@ -42,19 +42,21 @@
 //header("Content-type: text/html; charset=UTF-8");
 header("Content-type: text/html; charset=".$conf->file->character_set_client);
 
+$arrayofjs=array();
+$arrayofcss=array(DOL_URL_ROOT.'/cashdesk/css/style.css');
+
+top_htmlhead($head,$langs->trans("CashDesk"),0,0,$arrayofjs,$arrayofcss);
+
+/*
 print '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">';
 
 print '<html>'."\n";
 print '<head>'."\n";
 print '<title>'.$langs->trans("CashDesk").'</title>'."\n";
 
 print '<meta name="robots" content="none" />'."\n";
-
 print '<meta name="author" content="Jeremie Ollivier - jeremie.o@laposte.net" />'."\n";
-print '<meta name="Generator" content="Kwrite, Gimp, Inkscape" />'."\n";
-
 print '<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />'."\n";
-
 print '<meta http-equiv="Content-Style-Type" content="text/css" />'."\n";
 print '<link href="'.DOL_URL_ROOT.'/cashdesk/css/style.css" rel="stylesheet" type="text/css" media="screen" />'."\n";
 
@@ -65,8 +67,9 @@
 print '<script type="text/javascript" src="include/jscalendar/calendar.js"></script>'."\n";
 print '<script type="text/javascript" src="include/jscalendar/lang/calendar-fr.js"></script>'."\n";
 print '<script type="text/javascript" src="include/jscalendar/calendar-setup.js"></script>'."\n";
+print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/lib/lib_head.js"></script>'."\n";
 print '</head>'."\n";
-
+*/
 print '<body>'."\n";
 
 if (!empty($error))