diff --git a/htdocs/cashdesk/affContenu.php b/htdocs/cashdesk/affContenu.php
index 888cbb7cf8d..914ba152bdd 100644
--- a/htdocs/cashdesk/affContenu.php
+++ b/htdocs/cashdesk/affContenu.php
@@ -24,7 +24,7 @@
* \brief Include to show main page for cashdesk module
* \version $Id$
*/
-require ('classes/Facturation.class.php');
+require ('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' )
diff --git a/htdocs/cashdesk/classes/Auth.class.php b/htdocs/cashdesk/class/Auth.class.php
similarity index 100%
rename from htdocs/cashdesk/classes/Auth.class.php
rename to htdocs/cashdesk/class/Auth.class.php
diff --git a/htdocs/cashdesk/classes/Facturation.class.php b/htdocs/cashdesk/class/Facturation.class.php
similarity index 100%
rename from htdocs/cashdesk/classes/Facturation.class.php
rename to htdocs/cashdesk/class/Facturation.class.php
diff --git a/htdocs/cashdesk/classes/Mysql.class.php b/htdocs/cashdesk/class/Mysql.class.php
similarity index 100%
rename from htdocs/cashdesk/classes/Mysql.class.php
rename to htdocs/cashdesk/class/Mysql.class.php
diff --git a/htdocs/cashdesk/classes/Sql.interface.php b/htdocs/cashdesk/class/Sql.interface.php
similarity index 100%
rename from htdocs/cashdesk/classes/Sql.interface.php
rename to htdocs/cashdesk/class/Sql.interface.php
diff --git a/htdocs/cashdesk/classes/index.php b/htdocs/cashdesk/class/index.php
similarity index 100%
rename from htdocs/cashdesk/classes/index.php
rename to htdocs/cashdesk/class/index.php
diff --git a/htdocs/cashdesk/facturation_verif.php b/htdocs/cashdesk/facturation_verif.php
index 21cdae0aa20..488accdfaa6 100644
--- a/htdocs/cashdesk/facturation_verif.php
+++ b/htdocs/cashdesk/facturation_verif.php
@@ -19,7 +19,7 @@
require ('../master.inc.php');
require ('include/environnement.php');
-require ('classes/Facturation.class.php');
+require ('class/Facturation.class.php');
$obj_facturation = unserialize ($_SESSION['serObjFacturation']);
unset ($_SESSION['serObjFacturation']);
diff --git a/htdocs/cashdesk/images/basket_delete.png b/htdocs/cashdesk/img/basket_delete.png
similarity index 100%
rename from htdocs/cashdesk/images/basket_delete.png
rename to htdocs/cashdesk/img/basket_delete.png
diff --git a/htdocs/cashdesk/images/bg_conteneur_droite.png b/htdocs/cashdesk/img/bg_conteneur_droite.png
similarity index 100%
rename from htdocs/cashdesk/images/bg_conteneur_droite.png
rename to htdocs/cashdesk/img/bg_conteneur_droite.png
diff --git a/htdocs/cashdesk/images/bg_conteneur_gauche.png b/htdocs/cashdesk/img/bg_conteneur_gauche.png
similarity index 100%
rename from htdocs/cashdesk/images/bg_conteneur_gauche.png
rename to htdocs/cashdesk/img/bg_conteneur_gauche.png
diff --git a/htdocs/cashdesk/images/bg_entete.png b/htdocs/cashdesk/img/bg_entete.png
similarity index 100%
rename from htdocs/cashdesk/images/bg_entete.png
rename to htdocs/cashdesk/img/bg_entete.png
diff --git a/htdocs/cashdesk/images/bg_menu.png b/htdocs/cashdesk/img/bg_menu.png
similarity index 100%
rename from htdocs/cashdesk/images/bg_menu.png
rename to htdocs/cashdesk/img/bg_menu.png
diff --git a/htdocs/cashdesk/images/bg_pied.png b/htdocs/cashdesk/img/bg_pied.png
similarity index 100%
rename from htdocs/cashdesk/images/bg_pied.png
rename to htdocs/cashdesk/img/bg_pied.png
diff --git a/htdocs/cashdesk/images/calendrier.png b/htdocs/cashdesk/img/calendrier.png
similarity index 100%
rename from htdocs/cashdesk/images/calendrier.png
rename to htdocs/cashdesk/img/calendrier.png
diff --git a/htdocs/cashdesk/images/decrypted.png b/htdocs/cashdesk/img/decrypted.png
similarity index 100%
rename from htdocs/cashdesk/images/decrypted.png
rename to htdocs/cashdesk/img/decrypted.png
diff --git a/htdocs/cashdesk/images/gescom.png b/htdocs/cashdesk/img/gescom.png
similarity index 100%
rename from htdocs/cashdesk/images/gescom.png
rename to htdocs/cashdesk/img/gescom.png
diff --git a/htdocs/cashdesk/images/index.php b/htdocs/cashdesk/img/index.php
similarity index 100%
rename from htdocs/cashdesk/images/index.php
rename to htdocs/cashdesk/img/index.php
diff --git a/htdocs/cashdesk/images/lock.png b/htdocs/cashdesk/img/lock.png
similarity index 100%
rename from htdocs/cashdesk/images/lock.png
rename to htdocs/cashdesk/img/lock.png
diff --git a/htdocs/cashdesk/images/login.png b/htdocs/cashdesk/img/login.png
similarity index 100%
rename from htdocs/cashdesk/images/login.png
rename to htdocs/cashdesk/img/login.png
diff --git a/htdocs/cashdesk/images/new.png b/htdocs/cashdesk/img/new.png
similarity index 100%
rename from htdocs/cashdesk/images/new.png
rename to htdocs/cashdesk/img/new.png
diff --git a/htdocs/cashdesk/index_verif.php b/htdocs/cashdesk/index_verif.php
index 00f189b7e56..e55532c169e 100644
--- a/htdocs/cashdesk/index_verif.php
+++ b/htdocs/cashdesk/index_verif.php
@@ -19,7 +19,7 @@
include('../master.inc.php');
require('include/environnement.php');
-require('classes/Auth.class.php');
+require('class/Auth.class.php');
$username = $_POST['txtUsername'];
$password = $_POST['pwdPassword'];
diff --git a/htdocs/cashdesk/style.css b/htdocs/cashdesk/style.css
index b8cb0590216..e15db1dd3ab 100644
--- a/htdocs/cashdesk/style.css
+++ b/htdocs/cashdesk/style.css
@@ -35,18 +35,18 @@ p {
}
.conteneur_img_gauche {
- background: url("images/bg_conteneur_gauche.png") top left repeat-y;
+ background: url("img/bg_conteneur_gauche.png") top left repeat-y;
}
.conteneur_img_droite {
- background: url("images/bg_conteneur_droite.png") top right repeat-y;
+ background: url("img/bg_conteneur_droite.png") top right repeat-y;
}
/* ------------------- En-tête ------------------- */
.entete {
height: 15px;
margin: 0;
- background: url('images/bg_entete.png') no-repeat left top;
+ background: url('img/bg_entete.png') no-repeat left top;
}
.entete span {
@@ -62,7 +62,7 @@ p {
font-size: 14px;
width: 735px;
height: 84px;
- background: url('images/bg_menu.png') no-repeat left top;
+ background: url('img/bg_menu.png') no-repeat left top;
}
.menu_bloc {
@@ -94,15 +94,15 @@ p {
width: 100px;
padding-left: 60px;
height: 48px;
- background: url('images/new.png') top left no-repeat;
+ background: url('img/new.png') top left no-repeat;
}
.menu_choix1 a {
- background: url('images/new.png') top left no-repeat;
+ background: url('img/new.png') top left no-repeat;
}
.menu_choix2 a {
- background: url('images/gescom.png') top left no-repeat;
+ background: url('img/gescom.png') top left no-repeat;
}
.menu_choix1 a:hover,.menu_choix2 a:hover {
@@ -162,7 +162,7 @@ p.titre {
font-size: 1.1em;
text-decoration: none;
padding-right: 25px;
- background: url('images/basket_delete.png') top right no-repeat;
+ background: url('img/basket_delete.png') top right no-repeat;
}
.cadre_article p a:hover {
@@ -200,7 +200,7 @@ p.titre {
margin: 0 auto;
padding-left: 60px;
margin-bottom: 20px;
- background: url('images/login.png') bottom left no-repeat;
+ background: url('img/login.png') bottom left no-repeat;
}
.formulaire_login table tr {
@@ -387,7 +387,7 @@ p.titre {
.pied {
clear: both;
height: 15px;
- background: url('images/bg_pied.png') no-repeat bottom left;
+ background: url('img/bg_pied.png') no-repeat bottom left;
}
/* ------------------- Paramètres communs (messages d'erreur, informations, etc...) ------------------- */
diff --git a/htdocs/cashdesk/tpl/facturation1.tpl.php b/htdocs/cashdesk/tpl/facturation1.tpl.php
index d2c1b2f1f91..324188b741f 100644
--- a/htdocs/cashdesk/tpl/facturation1.tpl.php
+++ b/htdocs/cashdesk/tpl/facturation1.tpl.php
@@ -194,7 +194,7 @@ $Id$
" onclick="javascript: verifClic('DIF');" />
trans("DateEcheance"); ?> :
-
+
diff --git a/htdocs/cashdesk/validation_ticket.php b/htdocs/cashdesk/validation_ticket.php
index 188cbf2e40f..19216dc8985 100644
--- a/htdocs/cashdesk/validation_ticket.php
+++ b/htdocs/cashdesk/validation_ticket.php
@@ -18,7 +18,7 @@
require ('../master.inc.php');
require ('include/environnement.php');
-require ('classes/Facturation.class.php');
+require ('class/Facturation.class.php');
$obj_facturation = unserialize ($_SESSION['serObjFacturation']);
unset ($_SESSION['serObjFacturation']);
diff --git a/htdocs/cashdesk/validation_verif.php b/htdocs/cashdesk/validation_verif.php
index 5a934011672..261f59e4a33 100644
--- a/htdocs/cashdesk/validation_verif.php
+++ b/htdocs/cashdesk/validation_verif.php
@@ -19,7 +19,7 @@
require ('../master.inc.php');
require (DOL_DOCUMENT_ROOT.'/cashdesk/include/environnement.php');
-require (DOL_DOCUMENT_ROOT.'/cashdesk/classes/Facturation.class.php');
+require (DOL_DOCUMENT_ROOT.'/cashdesk/class/Facturation.class.php');
require (DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php');
require (DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php');
require (DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php');