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

Qual: Utilisation de $conf->monnaie au lieu de la constante MAIN_MONNAIE.

Browse Source
This commit is contained in:
Laurent Destailleur 2004-12-04 20:19:53 +00:00
parent 5c9a968296
commit 9b79d4e26e
25 changed files with 92 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/commande/fiche.php
View File

@ -495,7 +495,7 @@ else
// Ligne de 3 colonnes // Ligne de 3 colonnes
print '<tr><td>'.$langs->trans("AmountHT").'</td>'; print '<tr><td>'.$langs->trans("AmountHT").'</td>';
print '<td align="right"><b>'.price($commande->total_ht).'</b></td>'; print '<td align="right"><b>'.price($commande->total_ht).'</b></td>';
print '<td>'.MAIN_MONNAIE.'</td>'; print '<td>'.$conf->monnaie.'</td>';
print '<td rowspan="4" valign="top">'.$langs->trans("Note").' :</td></tr>'; print '<td rowspan="4" valign="top">'.$langs->trans("Note").' :</td></tr>';
print '<tr><td>Remise globale</td><td align="right">'; print '<tr><td>Remise globale</td><td align="right">';
@ -512,12 +512,12 @@ else
print '</td></tr>'; print '</td></tr>';
print '<tr><td>'.$langs->trans("VAT").'</td><td align="right">'.price($commande->total_tva).'</td>'; print '<tr><td>'.$langs->trans("VAT").'</td><td align="right">'.price($commande->total_tva).'</td>';
print '<td>'.MAIN_MONNAIE.'</td></tr>'; print '<td>'.$conf->monnaie.'</td></tr>';
print '<tr><td>'.$langs->trans("TotalTTC").'</td><td align="right">'.price($commande->total_ttc).'</td>'; print '<tr><td>'.$langs->trans("TotalTTC").'</td><td align="right">'.price($commande->total_ttc).'</td>';
print '<td>'.MAIN_MONNAIE.'</td></tr>'; print '<td>'.$conf->monnaie.'</td></tr>';
if ($commande->note) if ($commande->note)
{ {
print '<tr><td colspan="5">Note : '.nl2br($commande->note)."</td></tr>"; print '<tr><td colspan="5">'.$langs->trans("Note").' : '.nl2br($commande->note)."</td></tr>";
} }
print "</table>"; print "</table>";

4
htdocs/compta/bank/budget.php
View File

@ -128,11 +128,11 @@ else
$total = $total + (0 - $objp->amount); $total = $total + (0 - $objp->amount);
} }
$db->free(); $db->free();
print "<tr><td colspan=\"2\" align=\"right\">".$langs->trans("Total")."</td><td align=\"right\"><b>".price(abs($total))."</b></td><td>".MAIN_MONNAIE."</td></tr>"; print "<tr><td colspan=\"2\" align=\"right\">".$langs->trans("Total")."</td><td align=\"right\"><b>".price(abs($total))."</b></td><td>".$conf->monnaie."</td></tr>";
} }
else else
{ {
print $db->error(); dolibarr_print_error($db);
} }
print "</table>"; print "</table>";

2
htdocs/compta/bank/virement.php
View File

@ -71,7 +71,7 @@ if ($_POST["action"] == 'add')
$accountto=new Account($db); $accountto=new Account($db);
$accountto->fetch($_POST["account_to"]); $accountto->fetch($_POST["account_to"]);
$mesg.="<div class=\"ok\"><b>Votre virement entre <a href=\"account.php?account=".$accountfrom->id."\">".$accountfrom->label."</a> et <a href=\"account.php?account=".$accountto->id."\">".$accountto->label."</a> de ".$amount." ".MAIN_MONNAIE." a été crée.</b></div>"; $mesg.="<div class=\"ok\"><b>Votre virement entre <a href=\"account.php?account=".$accountfrom->id."\">".$accountfrom->label."</a> et <a href=\"account.php?account=".$accountto->id."\">".$accountto->label."</a> de ".$amount." ".$conf->monnaie." a été crée.</b></div>";
} }
else { else {
dolibarr_print_error($db); dolibarr_print_error($db);

14
htdocs/compta/commande.php
View File

@ -116,9 +116,9 @@ if ($_GET["id"] > 0)
} }
print "&nbsp;</td></tr>"; print "&nbsp;</td></tr>";
print '<tr><td>Montant</td>'; print '<tr><td>'.$langs->trans("Amount").'</td>';
print '<td align="right"><b>'.price($commande->total_ht).'</b></td>'; print '<td align="right"><b>'.price($commande->total_ht).'</b></td>';
print '<td>'.MAIN_MONNAIE.' HT</td>'; print '<td>'.$conf->monnaie.' HT</td>';
print '<td>Note</td></tr>'; print '<td>Note</td></tr>';
@ -128,13 +128,13 @@ if ($_GET["id"] > 0)
print '</td></tr>'; print '</td></tr>';
print '<tr><td>TVA</td><td align="right">'.price($commande->total_tva).'</td>'; print '<tr><td>'.$langs->trans("VAT").'</td><td align="right">'.price($commande->total_tva).'</td>';
print '<td>'.MAIN_MONNAIE.'</td></tr>'; print '<td>'.$conf->monnaie.'</td></tr>';
print '<tr><td>'.$langs->trans("TotalTTC").'</td><td align="right">'.price($commande->total_ttc).'</td>'; print '<tr><td>'.$langs->trans("TotalTTC").'</td><td align="right">'.price($commande->total_ttc).'</td>';
print '<td>'.MAIN_MONNAIE.'</td></tr>'; print '<td>'.$conf->monnaie.'</td></tr>';
if ($commande->note) if ($commande->note)
{ {
print '<tr><td colspan="5">Note : '.nl2br($commande->note)."</td></tr>"; print '<tr><td colspan="5">'.$langs->trans("Note").' : '.nl2br($commande->note)."</td></tr>";
} }
print "</table>"; print "</table>";
@ -288,7 +288,7 @@ if ($_GET["id"] > 0)
$total = $total + $objp->total; $total = $total + $objp->total;
$i++; $i++;
} }
print "<tr><td align=\"right\" colspan=\"4\">".$langs->trans("TotalHT").": <b>$total</b> ".MAIN_MONNAIE."</td></tr>\n"; print "<tr><td align=\"right\" colspan=\"4\">".$langs->trans("TotalHT").": <b>$total</b> ".$conf->monnaie."</td></tr>\n";
print "</table>"; print "</table>";
} }
$db->free(); $db->free();

14
htdocs/compta/facture.php
View File

@ -884,7 +884,7 @@ else
print '<a href="'.DOL_URL_ROOT.'/compta/paiement/fiche.php?id='.$objp->rowid.'">'.img_file().'</a>'; print '<a href="'.DOL_URL_ROOT.'/compta/paiement/fiche.php?id='.$objp->rowid.'">'.img_file().'</a>';
print "&nbsp;".strftime("%d %B %Y",$objp->dp)."</td>\n"; print "&nbsp;".strftime("%d %B %Y",$objp->dp)."</td>\n";
print "<td>$objp->paiement_type $objp->num_paiement</td>\n"; print "<td>$objp->paiement_type $objp->num_paiement</td>\n";
print '<td align="right">'.price($objp->amount)."</td><td>".MAIN_MONNAIE."</td>\n"; print '<td align="right">'.price($objp->amount)."</td><td>".$conf->monnaie."</td>\n";
print "</tr>"; print "</tr>";
$totalpaye += $objp->amount; $totalpaye += $objp->amount;
$i++; $i++;
@ -892,13 +892,13 @@ else
if ($fac->paye == 0) if ($fac->paye == 0)
{ {
print "<tr><td colspan=\"2\" align=\"right\">Total déjà payé:</td><td align=\"right\"><b>".price($totalpaye)."</b></td><td>".MAIN_MONNAIE."</td></tr>\n"; print "<tr><td colspan=\"2\" align=\"right\">Total déjà payé:</td><td align=\"right\"><b>".price($totalpaye)."</b></td><td>".$conf->monnaie."</td></tr>\n";
print "<tr><td colspan=\"2\" align=\"right\">Facturé :</td><td align=\"right\" style=\"border: 1px solid;\">".price($fac->total_ttc)."</td><td>".MAIN_MONNAIE."</td></tr>\n"; print "<tr><td colspan=\"2\" align=\"right\">Facturé :</td><td align=\"right\" style=\"border: 1px solid;\">".price($fac->total_ttc)."</td><td>".MAIN_MONNAIE."</td></tr>\n";
$resteapayer = $fac->total_ttc - $totalpaye; $resteapayer = $fac->total_ttc - $totalpaye;
print "<tr><td colspan=\"2\" align=\"right\">Reste à payer :</td>"; print "<tr><td colspan=\"2\" align=\"right\">Reste à payer :</td>";
print "<td align=\"right\" style=\"border: 1px solid;\" bgcolor=\"#f0f0f0\"><b>".price($resteapayer)."</b></td><td>".MAIN_MONNAIE."</td></tr>\n"; print "<td align=\"right\" style=\"border: 1px solid;\" bgcolor=\"#f0f0f0\"><b>".price($resteapayer)."</b></td><td>".$conf->monnaie."</td></tr>\n";
} }
print "</table>"; print "</table>";
$db->free(); $db->free();
@ -916,12 +916,12 @@ else
print '<tr><td height=\"10\">'.$langs->trans("AmountHT").'</td>'; print '<tr><td height=\"10\">'.$langs->trans("AmountHT").'</td>';
print '<td align="right" colspan="2"><b>'.price($fac->total_ht).'</b></td>'; print '<td align="right" colspan="2"><b>'.price($fac->total_ht).'</b></td>';
print '<td>'.MAIN_MONNAIE.' HT</td></tr>'; print '<td>'.$conf->monnaie.' HT</td></tr>';
print '<tr><td height=\"10\">'.$langs->trans("VAT").'</td><td align="right" colspan="2">'.price($fac->total_tva).'</td>'; print '<tr><td height=\"10\">'.$langs->trans("VAT").'</td><td align="right" colspan="2">'.price($fac->total_tva).'</td>';
print '<td>'.MAIN_MONNAIE.'</td></tr>'; print '<td>'.$conf->monnaie.'</td></tr>';
print '<tr><td height=\"10\">'.$langs->trans("AmountTTC").'</td><td align="right" colspan="2">'.price($fac->total_ttc).'</td>'; print '<tr><td height=\"10\">'.$langs->trans("AmountTTC").'</td><td align="right" colspan="2">'.price($fac->total_ttc).'</td>';
print '<td>'.MAIN_MONNAIE.' TTC</td></tr>'; print '<td>'.$conf->monnaie.' TTC</td></tr>';
print '<tr><td height=\"10\">'.$langs->trans("Status").'</td><td align="left" colspan="3">'.($fac->get_libstatut()).'</td></tr>'; print '<tr><td height=\"10\">'.$langs->trans("Status").'</td><td align="left" colspan="3">'.($fac->get_libstatut()).'</td></tr>';
if ($fac->note) if ($fac->note)
{ {
@ -1452,7 +1452,7 @@ else
$total = $total + $objp->price; $total = $total + $objp->price;
$i++; $i++;
} }
print "<tr><td align=\"right\" colspan=\"3\">".$langs->trans("TotalHT").": <b>".price($total)."</b> ".MAIN_MONNAIE."</td></tr>\n"; print "<tr><td align=\"right\" colspan=\"3\">".$langs->trans("TotalHT").": <b>".price($total)."</b> ".$conf->monnaie."</td></tr>\n";
print "</table>"; print "</table>";
} }
} else { } else {

2
htdocs/compta/facture/apercu.php
View File

@ -211,7 +211,7 @@ if ($_GET["facid"] > 0)
print '<tr><td height=\"10\">'.$langs->trans("AmountHT").'</td>'; print '<tr><td height=\"10\">'.$langs->trans("AmountHT").'</td>';
print '<td align="right" colspan="2"><b>'.price($fac->total_ht).'</b></td>'; print '<td align="right" colspan="2"><b>'.price($fac->total_ht).'</b></td>';
print '<td>'.MAIN_MONNAIE.' HT</td></tr>'; print '<td>'.$conf->monnaie.' HT</td></tr>';
print "</table><br>"; print "</table><br>";

10
htdocs/compta/facture/fiche-rec.php
View File

@ -292,14 +292,14 @@ else
print "</td></tr>"; print "</td></tr>";
print '<tr><td>Montant</td>'; print '<tr><td>'.$langs->trans("Amount").'</td>';
print '<td align="right" colspan="2"><b>'.price($fac->total_ht).'</b></td>'; print '<td align="right" colspan="2"><b>'.price($fac->total_ht).'</b></td>';
print '<td>'.MAIN_MONNAIE.' HT</td></tr>'; print '<td>'.$conf->monnaie.' HT</td></tr>';
print '<tr><td>TVA</td><td align="right" colspan="2">'.price($fac->total_tva).'</td>'; print '<tr><td>'.$langs->trans("VAT").'</td><td align="right" colspan="2">'.price($fac->total_tva).'</td>';
print '<td>'.MAIN_MONNAIE.'</td></tr>'; print '<td>'.$conf->monnaie.'</td></tr>';
print '<tr><td>'.$langs->trans("TotalTTC").'</td><td align="right" colspan="2">'.price($fac->total_ttc).'</td>'; print '<tr><td>'.$langs->trans("TotalTTC").'</td><td align="right" colspan="2">'.price($fac->total_ttc).'</td>';
print '<td>'.MAIN_MONNAIE.'</td></tr>'; print '<td>'.$conf->monnaie.'</td></tr>';
if ($fac->note) if ($fac->note)
{ {
print '<tr><td colspan="5">Note : '.nl2br($fac->note)."</td></tr>"; print '<tr><td colspan="5">Note : '.nl2br($fac->note)."</td></tr>";

2
htdocs/compta/paiement/fiche.php
View File

@ -88,7 +88,7 @@ print $langs->trans("Date").' : '.strftime("%d %B %Y",$paiement->date)."<br>";
print $langs->trans("Type").' : '.$paiement->type_libelle."<br>"; print $langs->trans("Type").' : '.$paiement->type_libelle."<br>";
print $langs->trans("Amount").' : '.$paiement->montant."&nbsp;".MAIN_MONNAIE."<br>"; print $langs->trans("Amount").' : '.$paiement->montant."&nbsp;".$conf->monnaie."<br>";
print '</td></tr>'; print '</td></tr>';
print "</table>"; print "</table>";

2
htdocs/compta/propal.php
View File

@ -258,7 +258,7 @@ if ($_GET["propalid"])
$total = $total + $objp->total; $total = $total + $objp->total;
$i++; $i++;
} }
print "<tr><td align=\"right\" colspan=\"4\">".$langs->trans("TotalHT").": <b>$total</b> ".MAIN_MONNAIE."</td></tr>\n"; print "<tr><td align=\"right\" colspan=\"4\">".$langs->trans("TotalHT").": <b>$total</b> ".$conf->monnaie."</td></tr>\n";
print "</table>"; print "</table>";
$db->free(); $db->free();
} }

6
htdocs/compta/sociales/charges.php
View File

@ -127,7 +127,7 @@ if ($chid > 0)
print "<tr $bc[$var]><td>"; print "<tr $bc[$var]><td>";
print dolibarr_print_date($objp->dp)."</td>\n"; print dolibarr_print_date($objp->dp)."</td>\n";
print "<td>$objp->paiement_type $objp->num_paiement</td>\n"; print "<td>$objp->paiement_type $objp->num_paiement</td>\n";
print '<td align="right">'.price($objp->amount)."</td><td>".MAIN_MONNAIE."</td>\n"; print '<td align="right">'.price($objp->amount)."</td><td>".$conf->monnaie."</td>\n";
print "</tr>"; print "</tr>";
$totalpaye += $objp->amount; $totalpaye += $objp->amount;
$i++; $i++;
@ -135,13 +135,13 @@ if ($chid > 0)
if ($fac->paye == 0) if ($fac->paye == 0)
{ {
print "<tr><td colspan=\"2\" align=\"right\">Total payé:</td><td align=\"right\"><b>".price($totalpaye)."</b></td><td>".MAIN_MONNAIE."</td></tr>\n"; print "<tr><td colspan=\"2\" align=\"right\">Total payé:</td><td align=\"right\"><b>".price($totalpaye)."</b></td><td>".$conf->monnaie."</td></tr>\n";
print "<tr><td colspan=\"2\" align=\"right\">Réclamé :</td><td align=\"right\" bgcolor=\"#d0d0d0\">".price($cha->amount)."</td><td bgcolor=\"#d0d0d0\">".MAIN_MONNAIE."</td></tr>\n"; print "<tr><td colspan=\"2\" align=\"right\">Réclamé :</td><td align=\"right\" bgcolor=\"#d0d0d0\">".price($cha->amount)."</td><td bgcolor=\"#d0d0d0\">".MAIN_MONNAIE."</td></tr>\n";
$resteapayer = $cha->amount - $totalpaye; $resteapayer = $cha->amount - $totalpaye;
print "<tr><td colspan=\"2\" align=\"right\">Reste à payer :</td>"; print "<tr><td colspan=\"2\" align=\"right\">Reste à payer :</td>";
print "<td align=\"right\" bgcolor=\"#f0f0f0\"><b>".price($resteapayer)."</b></td><td bgcolor=\"#f0f0f0\">".MAIN_MONNAIE."</td></tr>\n"; print "<td align=\"right\" bgcolor=\"#f0f0f0\"><b>".price($resteapayer)."</b></td><td bgcolor=\"#f0f0f0\">".$conf->monnaie."</td></tr>\n";
} }
print "</table>"; print "</table>";
$db->free(); $db->free();

2
htdocs/compta/stats/cumul.php
View File

@ -36,7 +36,7 @@ if ($user->societe_id > 0)
$socidp = $user->societe_id; $socidp = $user->societe_id;
} }
print_titre("Chiffre d'affaire cumulé (".MAIN_MONNAIE." HT)"); print_titre("Chiffre d'affaire cumulé (".$conf->monnaie." HT)");
print '<table width="100%"><tr><td valign="top">'; print '<table width="100%"><tr><td valign="top">';

2
htdocs/compta/stats/exercices.php
View File

@ -41,7 +41,7 @@ $mode='recettes';
if ($conf->compta->mode == 'CREANCES-DETTES') { $mode='creances'; } if ($conf->compta->mode == 'CREANCES-DETTES') { $mode='creances'; }
print_titre("Comparatif CA année en cours avec année précédente (".MAIN_MONNAIE." HT, ".$mode.")"); print_titre("Comparatif CA année en cours avec année précédente (".$conf->monnaie." HT, ".$mode.")");
print "<br>\n"; print "<br>\n";

2
htdocs/compta/stats/index.php
View File

@ -39,7 +39,7 @@ if ($user->societe_id > 0)
$mode='recettes'; $mode='recettes';
if ($conf->compta->mode == 'CREANCES-DETTES') { $mode='creances'; } if ($conf->compta->mode == 'CREANCES-DETTES') { $mode='creances'; }
print_titre("Chiffre d'affaire (".MAIN_MONNAIE." HT, ".$mode.")"); print_titre("Chiffre d'affaire (".$conf->monnaie." HT, ".$mode.")");
$sql = "SELECT sum(f.total) as amount , date_format(f.datef,'%Y-%m') as dm"; $sql = "SELECT sum(f.total) as amount , date_format(f.datef,'%Y-%m') as dm";
$sql .= " FROM ".MAIN_DB_PREFIX."facture as f"; $sql .= " FROM ".MAIN_DB_PREFIX."facture as f";

2
htdocs/compta/stats/prev.php
View File

@ -60,7 +60,7 @@ function pt ($db, $sql, $title) {
$total = $total + $obj->amount; $total = $total + $obj->amount;
$i++; $i++;
} }
print "<tr class=\"total\"><td colspan=\"2\" align=\"right\"><b>".$langs->trans("TotalHT").": ".price($total)."</b> ".MAIN_MONNAIE."</td></tr>"; print "<tr class=\"total\"><td colspan=\"2\" align=\"right\"><b>".$langs->trans("TotalHT").": ".price($total)."</b> ".$conf->monnaie."</td></tr>";
$db->free(); $db->free();
} }

4
htdocs/compta/tva.php
View File

@ -55,9 +55,9 @@ function pt ($db, $sql, $date) {
$i++; $i++;
} }
print "<tr><td align=\"right\">".$langs->trans("TotalHT").":</td><td align=\"right\"><b>".price($total)."</b></td><td>".MAIN_MONNAIE."</td></tr>"; print "<tr><td align=\"right\">".$langs->trans("TotalHT").":</td><td align=\"right\"><b>".price($total)."</b></td><td>".$conf->monnaie."</td></tr>";
print "</TABLE>"; print "</table>";
$db->free(); $db->free();
} }
} }

2
htdocs/compta/tva/reglement.php
View File

@ -65,7 +65,7 @@ if ($result)
$i++; $i++;
} }
print "<tr class=\"total\"><td align=\"right\">".$langs->trans("TotalHT").":</td>"; print "<tr class=\"total\"><td align=\"right\">".$langs->trans("TotalHT").":</td>";
print "<td align=\"right\"><b>".price($total)."</b></td><td>".MAIN_MONNAIE."</td></tr>"; print "<td align=\"right\"><b>".price($total)."</b></td><td>".$conf->monnaie."</td></tr>";
print "</table>"; print "</table>";
$db->free(); $db->free();

6
htdocs/fourn/commande/fiche.php
View File

@ -320,15 +320,15 @@ if ($id > 0)
// Ligne de 3 colonnes // Ligne de 3 colonnes
print '<tr><td>'.$langs->trans("AmountHT").'</td>'; print '<tr><td>'.$langs->trans("AmountHT").'</td>';
print '<td align="right"><b>'.price($commande->total_ht).'</b></td>'; print '<td align="right"><b>'.price($commande->total_ht).'</b></td>';
print '<td>'.MAIN_MONNAIE.'</td>'; print '<td>'.$conf->monnaie.'</td>';
print '<td rowspan="4" valign="top">'.$langs->trans("Note").' :</td></tr>'; print '<td rowspan="4" valign="top">'.$langs->trans("Note").' :</td></tr>';
print '<tr><td>'.$langs->trans("VAT").'</td><td align="right">'.price($commande->total_tva).'</td>'; print '<tr><td>'.$langs->trans("VAT").'</td><td align="right">'.price($commande->total_tva).'</td>';
print '<td>'.MAIN_MONNAIE.'</td></tr>'; print '<td>'.$conf->monnaie.'</td></tr>';
print '<tr><td>'.$langs->trans("TotalTTC").'</td><td align="right">'.price($commande->total_ttc).'</td>'; print '<tr><td>'.$langs->trans("TotalTTC").'</td><td align="right">'.price($commande->total_ttc).'</td>';
print '<td>'.MAIN_MONNAIE.'</td></tr>'; print '<td>'.$conf->monnaie.'</td></tr>';
if ($commande->note) if ($commande->note)
{ {
print '<tr><td colspan="3">Note : '.nl2br($commande->note)."</td></tr>"; print '<tr><td colspan="3">Note : '.nl2br($commande->note)."</td></tr>";

6
htdocs/fourn/facture/fiche.php
View File

@ -469,7 +469,7 @@ else
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
print "<td>".strftime("%d %B %Y",$objp->dp)."</td>\n"; print "<td>".strftime("%d %B %Y",$objp->dp)."</td>\n";
print "<td>$objp->paiement_type $objp->num_paiement</td>\n"; print "<td>$objp->paiement_type $objp->num_paiement</td>\n";
print "<td align=\"right\">".price($objp->amount)."</td><td>".MAIN_MONNAIE."</td>\n"; print "<td align=\"right\">".price($objp->amount)."</td><td>".$conf->monnaie."</td>\n";
if ($fac->statut == 1 && $fac->paye == 0 && $user->societe_id == 0) if ($fac->statut == 1 && $fac->paye == 0 && $user->societe_id == 0)
{ {
@ -483,14 +483,14 @@ else
$total = $total + $objp->amount; $total = $total + $objp->amount;
$i++; $i++;
} }
print "<tr $bc[1]><td colspan=\"2\" align=\"right\">Total :</td><td align=\"right\"><b>".price($total)."</b></td><td$tdsup>".MAIN_MONNAIE."</td></tr>\n"; print "<tr $bc[1]><td colspan=\"2\" align=\"right\">Total :</td><td align=\"right\"><b>".price($total)."</b></td><td$tdsup>".$conf->monnaie."</td></tr>\n";
if ($fac->statut > 0) if ($fac->statut > 0)
{ {
$resteapayer = abs($fac->total_ttc - $total); $resteapayer = abs($fac->total_ttc - $total);
print "<tr $bc[1]><td colspan=\"2\" align=\"right\">Reste à payer :</td>"; print "<tr $bc[1]><td colspan=\"2\" align=\"right\">Reste à payer :</td>";
print '<td align="right"><b>'.price($resteapayer)."</b></td><td$tdsup>".MAIN_MONNAIE."</td>"; print '<td align="right"><b>'.price($resteapayer)."</b></td><td$tdsup>".$conf->monnaie."</td>";
print "</tr>\n"; print "</tr>\n";
} }

4
htdocs/includes/modules/facture/pdf_crabe.modules.php
View File

@ -623,7 +623,7 @@ class pdf_crabe extends ModelePDFFactures
*/ */
function _pagefoot(&$pdf, $fac) function _pagefoot(&$pdf, $fac)
{ {
global $langs; global $langs, $conf;
$langs->load("main"); $langs->load("main");
$langs->load("bills"); $langs->load("bills");
$langs->load("companies"); $langs->load("companies");
@ -633,7 +633,7 @@ class pdf_crabe extends ModelePDFFactures
if (MAIN_INFO_CAPITAL) { if (MAIN_INFO_CAPITAL) {
$pdf->SetY(-$footy); $pdf->SetY(-$footy);
$pdf->MultiCell(190, 3,"SARL au Capital de " . MAIN_INFO_CAPITAL." ".MAIN_MONNAIE." - " . MAIN_INFO_RCS." - Identifiant professionnel: " . MAIN_INFO_SIREN , 0, 'C'); $pdf->MultiCell(190, 3,"SARL au Capital de " . MAIN_INFO_CAPITAL." ".$conf->monnaie." - " . MAIN_INFO_RCS." - Identifiant professionnel: " . MAIN_INFO_SIREN , 0, 'C');
$footy-=3; $footy-=3;
} }

2
htdocs/lolix/societe/fiche.php
View File

@ -81,7 +81,7 @@ if ($_GET["action"] == 'edit')
print '<td>Siret</td><td><input type="text" name="siret" size="15" maxlength="14" value="'.$soc->siret.'"></td></tr>'; print '<td>Siret</td><td><input type="text" name="siret" size="15" maxlength="14" value="'.$soc->siret.'"></td></tr>';
print '<tr><td>Ape</td><td><input type="text" name="ape" size="5" maxlength="4" value="'.$soc->ape.'"></td>'; print '<tr><td>Ape</td><td><input type="text" name="ape" size="5" maxlength="4" value="'.$soc->ape.'"></td>';
print '<td>Capital</td><td><input type="text" name="capital" size="10" value="'.$soc->capital.'"> '.MAIN_MONNAIE.'</td></tr>'; print '<td>Capital</td><td><input type="text" name="capital" size="10" value="'.$soc->capital.'"> '.$conf->monnaie.'</td></tr>';
print '<tr><td>Forme juridique</td><td colspan="3">'; print '<tr><td>Forme juridique</td><td colspan="3">';

74
htdocs/master.inc.php
View File

@ -33,6 +33,7 @@
define('DOL_VERSION','1.2.0-DEV'); define('DOL_VERSION','1.2.0-DEV');
define_syslog_variables(); define_syslog_variables();
clearstatcache();
ini_set('mbstring.func_overload','0'); ini_set('mbstring.func_overload','0');
@ -50,8 +51,7 @@ else
if (! isset($dolibarr_main_db_type)) if (! isset($dolibarr_main_db_type))
{ {
$dolibarr_main_db_type='mysql'; $dolibarr_main_db_type='mysql'; // Pour compatibilité avec anciennes configs, si non défini, on prend 'mysql'
//exit('Erreur la variale $dolibarr_main_db_type n\'est pas définie dans le fichier de configuration');
} }
define('DOL_DOCUMENT_ROOT', $dolibarr_main_document_root); define('DOL_DOCUMENT_ROOT', $dolibarr_main_document_root);
@ -73,10 +73,11 @@ if ($pos == '/')
define('DOL_URL_ROOT', $pos); define('DOL_URL_ROOT', $pos);
//define('DOL_URL_ROOT', $dolibarr_main_url_root); //define('DOL_URL_ROOT', $dolibarr_main_url_root);
require (DOL_DOCUMENT_ROOT."/conf/conf.class.php");
/* /*
* Doit figurer aprés l'inclusion de conf.class.php pour overider certaines variables, à terme conf.class.php devra etre un fichier qui ne sera pas modifié par l'utilisateur * Initialisation de l'objet $conf
*/ */
require_once(DOL_DOCUMENT_ROOT."/conf/conf.class.php");
$conf = new Conf(); $conf = new Conf();
if (!strlen(getenv("LLX_DBNAME"))) if (!strlen(getenv("LLX_DBNAME")))
{ {
@ -86,41 +87,32 @@ if (!strlen(getenv("LLX_DBNAME")))
$conf->db->pass = $dolibarr_main_db_pass; $conf->db->pass = $dolibarr_main_db_pass;
$conf->db->type = $dolibarr_main_db_type; $conf->db->type = $dolibarr_main_db_type;
} }
if (! $conf->db->type) { $conf->db->type = 'mysql'; } // Pour compatibilité avec anciennes configs, si non défini, on prend 'mysql'
define('MAIN_DB_PREFIX','llx_'); // A terme cette constante sera définie dans $conf
/*
// Si type non défini (pour compatibilité avec ancienne install), on * Chargement des includes principaux
// travail avec mysql */
if (! $conf->db->type) { $conf->db->type = 'mysql'; } require_once(DOL_DOCUMENT_ROOT ."/lib/".$conf->db->type.".lib.php");
require_once(DOL_DOCUMENT_ROOT ."/user.class.php");
require_once(DOL_DOCUMENT_ROOT ."/lib/functions.inc.php");
// A terme cette constante sera définie dans la base require_once(DOL_DOCUMENT_ROOT ."/html.form.class.php");
define('MAIN_DB_PREFIX','llx_'); require_once(DOL_DOCUMENT_ROOT ."/menu.class.php");
require_once(DOL_DOCUMENT_ROOT ."/boxes.php");
require (DOL_DOCUMENT_ROOT ."/lib/".$conf->db->type.".lib.php"); require_once(DOL_DOCUMENT_ROOT ."/notify.class.php");
require (DOL_DOCUMENT_ROOT ."/lib/functions.inc.php"); require_once(DOL_DOCUMENT_ROOT ."/address.class.php");
require (DOL_DOCUMENT_ROOT ."/html.form.class.php");
require (DOL_DOCUMENT_ROOT ."/user.class.php");
$db = new DoliDb(); $db = new DoliDb();
$user = new User($db); $user = new User($db);
clearstatcache(); // \todo mettre ces includes uniquement sur les éléments qui manipulent du PDF
require_once(DOL_DOCUMENT_ROOT ."/includes/fpdf/fpdf152/fpdf.php");
require (DOL_DOCUMENT_ROOT ."/product.class.php");
require (DOL_DOCUMENT_ROOT ."/menu.class.php");
require (DOL_DOCUMENT_ROOT ."/societe.class.php");
require (DOL_DOCUMENT_ROOT ."/boxes.php");
require (DOL_DOCUMENT_ROOT ."/address.class.php");
require (DOL_DOCUMENT_ROOT ."/notify.class.php");
require (DOL_DOCUMENT_ROOT ."/includes/fpdf/fpdf152/fpdf.php");
define('FPDF_FONTPATH',DOL_DOCUMENT_ROOT .'/includes/fpdf/fpdf152/font/'); define('FPDF_FONTPATH',DOL_DOCUMENT_ROOT .'/includes/fpdf/fpdf152/font/');
/* /*
* Definition de toutes les Constantes globales d'environnement * Definition de toutes les Constantes globales d'environnement
*
*/ */
$sql = "SELECT name, value FROM ".MAIN_DB_PREFIX."const"; $sql = "SELECT name, value FROM ".MAIN_DB_PREFIX."const";
$result = $db->query($sql); $result = $db->query($sql);
@ -152,9 +144,8 @@ if (strlen($conf->langage) <= 3) {
$conf->langage = strtolower($conf->langage)."_".strtoupper($conf->langage); $conf->langage = strtolower($conf->langage)."_".strtoupper($conf->langage);
} }
setlocale(LC_ALL, $conf->langage); setlocale(LC_ALL, $conf->langage);
//setlocale(LC_TIME, $conf->language);
require (DOL_DOCUMENT_ROOT ."/translate.class.php"); require_once(DOL_DOCUMENT_ROOT ."/translate.class.php");
$langs = new Translate(DOL_DOCUMENT_ROOT ."/langs", $conf->langage); $langs = new Translate(DOL_DOCUMENT_ROOT ."/langs", $conf->langage);
@ -184,6 +175,7 @@ if (defined("MAIN_MODULE_EXPEDITION"))
if (defined("MAIN_MODULE_SOCIETE")) if (defined("MAIN_MODULE_SOCIETE"))
{ {
$conf->societe->enabled=MAIN_MODULE_SOCIETE; $conf->societe->enabled=MAIN_MODULE_SOCIETE;
require_once(DOL_DOCUMENT_ROOT ."/societe.class.php");
} }
if (defined("MAIN_MODULE_COMMERCIAL")) if (defined("MAIN_MODULE_COMMERCIAL"))
{ {
@ -212,7 +204,7 @@ if (defined("MAIN_MODULE_FOURNISSEUR"))
if (defined("MAIN_MODULE_FICHEINTER")) if (defined("MAIN_MODULE_FICHEINTER"))
{ {
$conf->fichinter->enabled=MAIN_MODULE_FICHEINTER; $conf->fichinter->enabled=MAIN_MODULE_FICHEINTER;
require (DOL_DOCUMENT_ROOT ."/includes/modules/fichinter/modules_fichinter.php"); require_once(DOL_DOCUMENT_ROOT ."/includes/modules/fichinter/modules_fichinter.php");
} }
if (defined("MAIN_MODULE_ADHERENT")) if (defined("MAIN_MODULE_ADHERENT"))
{ {
@ -224,6 +216,7 @@ if (defined("MAIN_MODULE_PRODUIT"))
$conf->produit->dir_ouput=DOL_DATA_ROOT."/documents/produit"; $conf->produit->dir_ouput=DOL_DATA_ROOT."/documents/produit";
$conf->produit->dir_images=DOL_DOCUMENT_ROOT."/images/produit"; $conf->produit->dir_images=DOL_DOCUMENT_ROOT."/images/produit";
$conf->produit->url_images=DOL_URL_ROOT."/images/produit"; $conf->produit->url_images=DOL_URL_ROOT."/images/produit";
require_once(DOL_DOCUMENT_ROOT ."/product.class.php");
} }
if (defined("MAIN_MODULE_SERVICE")) if (defined("MAIN_MODULE_SERVICE"))
{ {
@ -231,6 +224,7 @@ if (defined("MAIN_MODULE_SERVICE"))
$conf->service->dir_ouput=DOL_DATA_ROOT."/documents/produit"; $conf->service->dir_ouput=DOL_DATA_ROOT."/documents/produit";
$conf->service->dir_images=DOL_DOCUMENT_ROOT."/images/produit"; $conf->service->dir_images=DOL_DOCUMENT_ROOT."/images/produit";
$conf->service->url_images=DOL_URL_ROOT."/images/produit"; $conf->service->url_images=DOL_URL_ROOT."/images/produit";
require_once(DOL_DOCUMENT_ROOT ."/product.class.php");
} }
if (defined("MAIN_MODULE_STOCK")) if (defined("MAIN_MODULE_STOCK"))
{ {
@ -280,7 +274,7 @@ if (defined("MAIN_MODULE_WEBCALENDAR"))
if (defined("MAIN_MODULE_FACTURE")) if (defined("MAIN_MODULE_FACTURE"))
{ {
$conf->facture->enabled=MAIN_MODULE_FACTURE; $conf->facture->enabled=MAIN_MODULE_FACTURE;
require (DOL_DOCUMENT_ROOT ."/includes/modules/facture/modules_facture.php"); require_once(DOL_DOCUMENT_ROOT ."/includes/modules/facture/modules_facture.php");
$conf->facture->dir_ouput=DOL_DATA_ROOT."/documents/facture"; $conf->facture->dir_ouput=DOL_DATA_ROOT."/documents/facture";
$conf->facture->dir_images=DOL_DOCUMENT_ROOT."/images/facture"; $conf->facture->dir_images=DOL_DOCUMENT_ROOT."/images/facture";
$conf->facture->url_images=DOL_URL_ROOT."/images/facture"; $conf->facture->url_images=DOL_URL_ROOT."/images/facture";
@ -288,12 +282,12 @@ if (defined("MAIN_MODULE_FACTURE"))
if (defined("MAIN_MODULE_PROPALE")) if (defined("MAIN_MODULE_PROPALE"))
{ {
$conf->propal->enabled=MAIN_MODULE_PROPALE; $conf->propal->enabled=MAIN_MODULE_PROPALE;
require (DOL_DOCUMENT_ROOT ."/includes/modules/propale/modules_propale.php"); require_once(DOL_DOCUMENT_ROOT ."/includes/modules/propale/modules_propale.php");
$conf->propale->dir_ouput=DOL_DATA_ROOT."/documents/propale"; $conf->propale->dir_ouput=DOL_DATA_ROOT."/documents/propale";
$conf->propale->dir_images=DOL_DOCUMENT_ROOT."/images/propale"; $conf->propale->dir_images=DOL_DOCUMENT_ROOT."/images/propale";
$conf->propale->url_images=DOL_URL_ROOT."/images/propale"; $conf->propale->url_images=DOL_URL_ROOT."/images/propale";
// \todo a virer car remplacé par $conf->propale->dir_ouput // \todo modifier le code des propales pour utiliser $conf->propale->dir_ouput au lieu de la constante
if (! defined("PROPALE_OUTPUTDIR")) if (! defined("PROPALE_OUTPUTDIR"))
{ {
define('PROPALE_OUTPUTDIR', DOL_DOCUMENT_ROOT . "/document/propale"); define('PROPALE_OUTPUTDIR', DOL_DOCUMENT_ROOT . "/document/propale");
@ -314,21 +308,19 @@ if (defined("MAIN_MODULE_PROPALE"))
/* /*
* Modification de quelques variable de conf en fonction des Constantes * Modification de quelques variable de conf en fonction des Constantes
*/ */
if (defined("MAIN_MONNAIE")) { if (defined("MAIN_MONNAIE")) {
$conf->monnaie=MAIN_MONNAIE; $conf->monnaie=MAIN_MONNAIE;
} }
else { else {
$conf->monnaie='euros'; $conf->monnaie='euros';
define("MAIN_MONNAIE",'euros'); // TODO Virer cette ligne et remplacer dans le code le MAIN_MONNAIE par $conf->monnaie
} }
/* /*
* Option du module Compta: Defini le mode de calcul du CA * Option du module Compta: Defini le mode de calcul du CA
*/ */
$conf->compta->mode = 'RECETTES-DEPENSES'; // Par défaut $conf->compta->mode = 'RECETTES-DEPENSES'; // Par défaut
if (defined("COMPTA_MODE")) { if (defined("COMPTA_MODE")) {
$conf->compta->mode = RECETTES-DEPENSES; // Peut etre 'CREANCES-DETTES' pour un CA en creances-dettes $conf->compta->mode = RECETTES-DEPENSES; // Peut etre 'CREANCES-DETTES' pour un CA en creances-dettes
} }
/* \todo Ajouter une option Gestion de la TVA dans le module compta qui permet de désactiver la fonction TVA /* \todo Ajouter une option Gestion de la TVA dans le module compta qui permet de désactiver la fonction TVA
@ -341,10 +333,10 @@ $conf->compta->tva=1;
* Option du module Facture * Option du module Facture
*/ */
if (defined("FACTURE_TVAOPTION") && FACTURE_TVAOPTION == 'franchise') { if (defined("FACTURE_TVAOPTION") && FACTURE_TVAOPTION == 'franchise') {
$conf->defaulttx='0'; # Taux par défaut des factures clients $conf->defaulttx='0'; // Taux par défaut des factures clients
} }
else { else {
$conf->defaulttx=''; # Pas de taux par défaut des factures clients, le premier sera pris $conf->defaulttx=''; // Pas de taux par défaut des factures clients, le premier sera pris
} }
/* /*

2
htdocs/projet/commandes.php
View File

@ -111,7 +111,7 @@ if (sizeof($commandes)>0 && is_array($commandes))
print '<tr><td>'.$i.' commandes</td><td>&nbsp;</td>'; print '<tr><td>'.$i.' commandes</td><td>&nbsp;</td>';
print '<td align="right">'.$langs->trans("TotalHT").': '.price($total).'</td>'; print '<td align="right">'.$langs->trans("TotalHT").': '.price($total).'</td>';
print '<td align="right">'.MAIN_MONNAIE.'</td></tr>'; print '<td align="right">'.$conf->monnaie.'</td></tr>';
print "</table>"; print "</table>";
} }

12
htdocs/projet/facture.php
View File

@ -108,18 +108,18 @@ print '</table><br>';
$facture->fetch($factures[$i]); $facture->fetch($factures[$i]);
$var=!$var; $var=!$var;
print "<TR $bc[$var]>"; print "<tr $bc[$var]>";
print "<TD><a href=\"../compta/facture.php?facid=$facture->id\">$facture->ref</a></TD>\n"; print "<td><a href=\"../compta/facture.php?facid=$facture->id\">$facture->ref</a></td>\n";
print '<td>'.strftime("%d %B %Y",$facture->date).'</td>'; print '<td>'.strftime("%d %B %Y",$facture->date).'</td>';
print '<TD align="right">'.price($facture->total_ht).'</td><td>&nbsp;</td></tr>'; print '<td align="right">'.price($facture->total_ht).'</td><td>&nbsp;</td></tr>';
$total = $total + $facture->total_ht; $total = $total + $facture->total_ht;
} }
print '<tr><td>'.$i.' factures</td><td>&nbsp;</td>'; print '<tr><td>'.$i.' factures</td><td>&nbsp;</td>';
print '<td align="right">Total : '.price($total).'</td>'; print '<td align="right">'.$langs->trans("Total").' : '.price($total).'</td>';
print '<td align="left">'.MAIN_MONNAIE.' HT</td></tr>'; print '<td align="left">'.$conf->monnaie.' HT</td></tr>';
print "</TABLE>"; print "</table>";
} }
$db->close(); $db->close();

2
htdocs/projet/propal.php
View File

@ -109,7 +109,7 @@ if (sizeof($propales)>0 && is_array($propales))
print '<tr><td>'.$i.' propales</td><td>&nbsp;</td>'; print '<tr><td>'.$i.' propales</td><td>&nbsp;</td>';
print '<td align="right">Total : '.price($total).'</td>'; print '<td align="right">Total : '.price($total).'</td>';
print '<td align="left">'.MAIN_MONNAIE.' HT</td></tr></table>'; print '<td align="left">'.$conf->monnaie.' HT</td></tr></table>';
} }
$db->close(); $db->close();

6
htdocs/soc.php
View File

@ -150,7 +150,7 @@ if ($_GET["action"] == 'create')
print '<td>'.$langs->trans('ProfIdSiret').'</td><td><input type="text" name="siret" size="15" maxlength="14" value="'.$soc->siret.'"></td></tr>'; print '<td>'.$langs->trans('ProfIdSiret').'</td><td><input type="text" name="siret" size="15" maxlength="14" value="'.$soc->siret.'"></td></tr>';
print '<tr><td>'.$langs->trans('ProfIdApe').'</td><td><input type="text" name="ape" size="5" maxlength="4" value="'.$soc->ape.'"></td>'; print '<tr><td>'.$langs->trans('ProfIdApe').'</td><td><input type="text" name="ape" size="5" maxlength="4" value="'.$soc->ape.'"></td>';
print '<td>Capital</td><td><input type="text" name="capital" size="10" value="'.$soc->capital.'"> '.MAIN_MONNAIE.'</td></tr>'; print '<td>Capital</td><td><input type="text" name="capital" size="10" value="'.$soc->capital.'"> '.$conf->monnaie.'</td></tr>';
print '<tr><td>Forme juridique</td><td colspan="3">'; print '<tr><td>Forme juridique</td><td colspan="3">';
$form->select_forme_juridique($soc->forme_juridique_code); $form->select_forme_juridique($soc->forme_juridique_code);
@ -242,7 +242,7 @@ elseif ($_GET["action"] == 'edit')
print '<td>'.$langs->trans('ProfIdSiret').'</td><td><input type="text" name="siret" size="15" maxlength="14" value="'.$soc->siret.'"></td></tr>'; print '<td>'.$langs->trans('ProfIdSiret').'</td><td><input type="text" name="siret" size="15" maxlength="14" value="'.$soc->siret.'"></td></tr>';
print '<tr><td>'.$langs->trans('ProfIdApe').'</td><td><input type="text" name="ape" size="5" maxlength="4" value="'.$soc->ape.'"></td>'; print '<tr><td>'.$langs->trans('ProfIdApe').'</td><td><input type="text" name="ape" size="5" maxlength="4" value="'.$soc->ape.'"></td>';
print '<td>Capital</td><td><input type="text" name="capital" size="10" value="'.$soc->capital.'"> '.MAIN_MONNAIE.'</td></tr>'; print '<td>Capital</td><td><input type="text" name="capital" size="10" value="'.$soc->capital.'"> '.$conf->monnaie.'</td></tr>';
print '<tr><td>Forme juridique</td><td colspan="3">'; print '<tr><td>Forme juridique</td><td colspan="3">';
$form->select_forme_juridique($soc->forme_juridique_code); $form->select_forme_juridique($soc->forme_juridique_code);
@ -359,7 +359,7 @@ else
print '<td>'.$langs->trans('ProfIdSiret').'</td><td>'.$soc->siret.'</td></tr>'; print '<td>'.$langs->trans('ProfIdSiret').'</td><td>'.$soc->siret.'</td></tr>';
print '<tr><td>'.$langs->trans('ProfIdApe').'</td><td>'.$soc->ape.'</td>'; print '<tr><td>'.$langs->trans('ProfIdApe').'</td><td>'.$soc->ape.'</td>';
print '<td>Capital</td><td>'.$soc->capital.' '.MAIN_MONNAIE.'</td></tr>'; print '<td>Capital</td><td>'.$soc->capital.' '.$conf->monnaie.'</td></tr>';
print '<tr><td>Forme juridique</td><td colspan="3">'.$soc->forme_juridique.'</td></tr>'; print '<tr><td>Forme juridique</td><td colspan="3">'.$soc->forme_juridique.'</td></tr>';
print '<tr><td>Effectif</td><td colspan="3">'.$soc->effectif.'</td></tr>'; print '<tr><td>Effectif</td><td colspan="3">'.$soc->effectif.'</td></tr>';