diff --git a/htdocs/compta/prelevement/bons.php b/htdocs/compta/prelevement/bons.php index 32870cebbaa55ca13e10ea787d68582443edde2e..9d94119ca131e2e097bcbfb68b08da66e76f3143 100644 --- a/htdocs/compta/prelevement/bons.php +++ b/htdocs/compta/prelevement/bons.php @@ -96,7 +96,7 @@ if ($result) $var=!$var; print "<tr $bc[$var]><td>"; - print '<img border="0" src="./statut'.$obj->statut.'.png"></a> '; + print '<img border="0" src="./img/statut'.$obj->statut.'.png"></a> '; print '<a href="fiche.php?id='.$obj->rowid.'">'.$obj->ref."</a></td>\n"; diff --git a/htdocs/compta/prelevement/bon-prelevement.class.php b/htdocs/compta/prelevement/class/bon-prelevement.class.php similarity index 100% rename from htdocs/compta/prelevement/bon-prelevement.class.php rename to htdocs/compta/prelevement/class/bon-prelevement.class.php diff --git a/htdocs/compta/prelevement/ligne-prelevement.class.php b/htdocs/compta/prelevement/class/ligne-prelevement.class.php similarity index 100% rename from htdocs/compta/prelevement/ligne-prelevement.class.php rename to htdocs/compta/prelevement/class/ligne-prelevement.class.php diff --git a/htdocs/compta/prelevement/rejet-prelevement.class.php b/htdocs/compta/prelevement/class/rejet-prelevement.class.php similarity index 100% rename from htdocs/compta/prelevement/rejet-prelevement.class.php rename to htdocs/compta/prelevement/class/rejet-prelevement.class.php diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php index b2fcf0e64db85ac2a75bd7dc66d3b4275566700e..76e376759b0c6f34674a4f88cc2d9e4a61bf3694 100644 --- a/htdocs/compta/prelevement/factures.php +++ b/htdocs/compta/prelevement/factures.php @@ -26,7 +26,7 @@ */ require('../../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/rejet-prelevement.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/rejet-prelevement.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); $langs->load("companies"); diff --git a/htdocs/compta/prelevement/facturesrejets.php b/htdocs/compta/prelevement/facturesrejets.php index 2c64508bf1000d975a9f6bedd0fbe2a99f6421a0..d2493c977cecf8c21cc5c874f855a596db7a026a 100644 --- a/htdocs/compta/prelevement/facturesrejets.php +++ b/htdocs/compta/prelevement/facturesrejets.php @@ -21,7 +21,7 @@ */ require('../../main.inc.php'); -require_once DOL_DOCUMENT_ROOT."/compta/prelevement/rejet-prelevement.class.php"; +require_once DOL_DOCUMENT_ROOT."/compta/prelevement/class/rejet-prelevement.class.php"; require_once DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"; diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php index e8fa25f9537d134e381f33ecb3d6777dd7977560..893dec09876f57bd336166b32d7f718ecda4ca92 100644 --- a/htdocs/compta/prelevement/fiche-rejet.php +++ b/htdocs/compta/prelevement/fiche-rejet.php @@ -23,7 +23,7 @@ */ require('../../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/rejet-prelevement.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/rejet-prelevement.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); // Securite acces client @@ -125,7 +125,7 @@ if ($resql) $obj = $db->fetch_object($resql); print "<tr $bc[$var]><td>"; - print '<img border="0" src="./statut'.$obj->statut.'.png"></a> '; + print '<img border="0" src="./img/statut'.$obj->statut.'.png"></a> '; print '<a href="'.DOL_URL_ROOT.'/compta/prelevement/ligne.php?id='.$obj->rowid.'">'; print substr('000000'.$obj->rowid, -6); diff --git a/htdocs/compta/prelevement/fiche.php b/htdocs/compta/prelevement/fiche.php index dc85837a99889adf62c58258cef41d72788a8fef..102d92a48fd1ea11b8818b9ea68368342965b055 100644 --- a/htdocs/compta/prelevement/fiche.php +++ b/htdocs/compta/prelevement/fiche.php @@ -168,7 +168,7 @@ if ($_GET["id"]) print '</td></tr>'; print '<tr><td width="20%">'.$langs->trans('Status').'</td><td>'; - print '<img src="./statut'.$bon->statut.'.png"> '; + print '<img src="./img/statut'.$bon->statut.'.png"> '; print $langs->trans($lipre->statuts[$lipre->statut]).'</td></tr>'; if($bon->date_trans <> 0) diff --git a/htdocs/compta/prelevement/statut0.png b/htdocs/compta/prelevement/img/statut0.png similarity index 100% rename from htdocs/compta/prelevement/statut0.png rename to htdocs/compta/prelevement/img/statut0.png diff --git a/htdocs/compta/prelevement/statut1.png b/htdocs/compta/prelevement/img/statut1.png similarity index 100% rename from htdocs/compta/prelevement/statut1.png rename to htdocs/compta/prelevement/img/statut1.png diff --git a/htdocs/compta/prelevement/statut2.png b/htdocs/compta/prelevement/img/statut2.png similarity index 100% rename from htdocs/compta/prelevement/statut2.png rename to htdocs/compta/prelevement/img/statut2.png diff --git a/htdocs/compta/prelevement/statut3.png b/htdocs/compta/prelevement/img/statut3.png similarity index 100% rename from htdocs/compta/prelevement/statut3.png rename to htdocs/compta/prelevement/img/statut3.png diff --git a/htdocs/compta/prelevement/index.php b/htdocs/compta/prelevement/index.php index c51a869770e326e5679503da220e84b4a1cb2acd..29bfad50f7602208867df765566ef1dccc849f84 100644 --- a/htdocs/compta/prelevement/index.php +++ b/htdocs/compta/prelevement/index.php @@ -160,7 +160,7 @@ if ($result) print "<tr $bc[$var]><td>"; - print '<img border="0" src="./statut'.$obj->statut.'.png"></a> '; + print '<img border="0" src="./img/statut'.$obj->statut.'.png"></a> '; print '<a href="fiche.php?id='.$obj->rowid.'">'.$obj->ref."</a></td>\n"; diff --git a/htdocs/compta/prelevement/ligne.php b/htdocs/compta/prelevement/ligne.php index 6038e48b213f9c7e5fbc6f75827e991d6ed68eb5..fc18ec05c9180b6cfc45251f9e5666881260ee2a 100644 --- a/htdocs/compta/prelevement/ligne.php +++ b/htdocs/compta/prelevement/ligne.php @@ -26,8 +26,8 @@ */ require('../../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/ligne-prelevement.class.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/rejet-prelevement.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/ligne-prelevement.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/rejet-prelevement.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); // Security check @@ -100,7 +100,7 @@ if ($_GET["id"]) print '<a href="fiche.php?id='.$lipre->bon_rowid.'">'.$lipre->bon_ref.'</a></td></tr>'; print '<tr><td width="20%">'.$langs->trans("Amount").'</td><td>'.price($lipre->amount).'</td></tr>'; print '<tr><td width="20%">'.$langs->trans("Status").'</td><td>'; - print '<img src="./statut'.$lipre->statut.'.png"> '; + print '<img src="./img/statut'.$lipre->statut.'.png"> '; print $langs->trans($lipre->statuts[$lipre->statut]).'</td></tr>'; if ($lipre->statut == 3) diff --git a/htdocs/compta/prelevement/lignes.php b/htdocs/compta/prelevement/lignes.php index 8358324cd31a571747a413b906b1147af9774997..b20fee62e57de98549bda732fca8753564e4e421 100644 --- a/htdocs/compta/prelevement/lignes.php +++ b/htdocs/compta/prelevement/lignes.php @@ -23,7 +23,7 @@ */ require('../../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/rejet-prelevement.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/rejet-prelevement.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); // Security check @@ -152,7 +152,7 @@ if ($result) print "<tr $bc[$var]><td>"; - print '<img border="0" src="./statut'.$obj->statut.'.png"></a> '; + print '<img border="0" src="./img/statut'.$obj->statut.'.png"></a> '; print '<a href="'.DOL_URL_ROOT.'/compta/prelevement/ligne.php?id='.$obj->rowid.'">'; print substr('000000'.$obj->rowid, -6); print '</a></td>'; diff --git a/htdocs/compta/prelevement/liste.php b/htdocs/compta/prelevement/liste.php index 2fea23162013e2321bab1c78bef7dafbcd92c4f0..ef2f7588ad2525efaad6da9d837cd6f4f4f895c4 100644 --- a/htdocs/compta/prelevement/liste.php +++ b/htdocs/compta/prelevement/liste.php @@ -129,12 +129,12 @@ if ($result) print "<tr $bc[$var]><td>"; - print '<img border="0" src="./statut'.$obj->statut_ligne.'.png"></a> '; + print '<img border="0" src="./img/statut'.$obj->statut_ligne.'.png"></a> '; print '<a href="'.DOL_URL_ROOT.'/compta/prelevement/ligne.php?id='.$obj->rowid_ligne.'">'; print substr('000000'.$obj->rowid_ligne, -6); print '</a></td>'; - print '<td><img border="0" src="./statut'.$obj->statut.'.png"></a> '; + print '<td><img border="0" src="./img/statut'.$obj->statut.'.png"></a> '; print '<a href="fiche.php?id='.$obj->rowid.'">'.$obj->ref."</a></td>\n"; print '<td><a href="fiche.php?id='.$obj->rowid.'">'.$obj->nom."</a></td>\n"; diff --git a/htdocs/compta/prelevement/liste_factures.php b/htdocs/compta/prelevement/liste_factures.php index 2dfb4fda23885c373763d077e61b78de23f6d722..1171b7494a9412687c3071abe7b67e171ab05cbd 100644 --- a/htdocs/compta/prelevement/liste_factures.php +++ b/htdocs/compta/prelevement/liste_factures.php @@ -26,7 +26,7 @@ */ require('../../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/rejet-prelevement.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/rejet-prelevement.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); $langs->load("withdrawals"); @@ -124,7 +124,7 @@ if ($result) print "<tr $bc[$var]><td>"; - print '<img border="0" src="./statut'.$obj->statut_ligne.'.png"></a> '; + print '<img border="0" src="./img/statut'.$obj->statut_ligne.'.png"></a> '; print '<a href="'.DOL_URL_ROOT.'/compta/prelevement/ligne.php?id='.$obj->rowid_ligne.'">'; print substr('000000'.$obj->rowid_ligne, -6).'</a></td>'; @@ -141,7 +141,7 @@ if ($result) print '<td align="right">'.price($obj->total_ttc)."</td>\n"; print '<td align="center">'; - print '<img border="0" src="./statut'.$obj->statut.'.png"></a> '; + print '<img border="0" src="./img/statut'.$obj->statut.'.png"></a> '; print '<a href="'.DOL_URL_ROOT.'/compta/prelevement/fiche.php?id='.$obj->rowid.'">'; print $obj->ref."</a></td>\n"; diff --git a/htdocs/compta/prelevement/rejets.php b/htdocs/compta/prelevement/rejets.php index fdec085ca55bd303b328e8bd18cd84edcb7c7274..b1afab7748e76085a104867a8caeeee0d724d29d 100644 --- a/htdocs/compta/prelevement/rejets.php +++ b/htdocs/compta/prelevement/rejets.php @@ -22,7 +22,7 @@ */ require('../../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/rejet-prelevement.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/rejet-prelevement.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php"); $langs->load("withdrawals"); @@ -114,7 +114,7 @@ if ($result) $obj = $db->fetch_object($result); print "<tr $bc[$var]><td>"; - print '<img border="0" src="./statut'.$obj->statut.'.png"></a> '; + print '<img border="0" src="./img/statut'.$obj->statut.'.png"></a> '; print '<a href="'.DOL_URL_ROOT.'/compta/prelevement/ligne.php?id='.$obj->rowid.'">'; print substr('000000'.$obj->rowid, -6)."</a></td>"; diff --git a/htdocs/compta/prelevement/stats.php b/htdocs/compta/prelevement/stats.php index e606824ed1783c6a102c17657538cf2c710f271f..548ba0a368beee4a3d5ff28e6d5c832ef2691486 100644 --- a/htdocs/compta/prelevement/stats.php +++ b/htdocs/compta/prelevement/stats.php @@ -186,7 +186,7 @@ if ($db->query($sql)) $var=True; - require_once DOL_DOCUMENT_ROOT."/compta/prelevement/rejet-prelevement.class.php"; + require_once DOL_DOCUMENT_ROOT."/compta/prelevement/class/rejet-prelevement.class.php"; $Rejet = new RejetPrelevement($db, $user); while ($i < $num) diff --git a/scripts/withdrawals/prelevement.php b/scripts/withdrawals/prelevement.php index 8dc10b4bd36e10cca22540130f01e620dee3e8a9..300abe6c02588e25ed158bb19a18ce4a4e112188 100644 --- a/scripts/withdrawals/prelevement.php +++ b/scripts/withdrawals/prelevement.php @@ -38,7 +38,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') { $version='$Revision$'; require_once($path."../../htdocs/master.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/bon-prelevement.class.php"); +require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/societe/societe.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php");