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

Uniformisation du code pour la gestion des numrotation et modules entre factures, propales, fichieinter, commandes, dons

Browse Source
This commit is contained in:
Laurent Destailleur 2005-11-11 20:11:57 +00:00
parent 0def64a811
commit 9c7ea2d111
28 changed files with 408 additions and 304 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
htdocs/comm/addpropal.php
View File

@ -28,22 +28,22 @@
*/
require("./pre.inc.php");
include_once(DOL_DOCUMENT_ROOT.'/includes/modules/propale/modules_propale.php');
if (defined("PROPALE_ADDON") && is_readable(DOL_DOCUMENT_ROOT ."/includes/modules/propale/".PROPALE_ADDON.".php"))
{
require_once(DOL_DOCUMENT_ROOT ."/includes/modules/propale/".PROPALE_ADDON.".php");
}
$langs->load("propal");
$langs->load("projects");
$langs->load("companies");
$user->getrights('propale');
$user->getrights('fichinter');
$user->getrights('commande');
$user->getrights('projet');
if (defined("PROPALE_ADDON") && is_readable(DOL_DOCUMENT_ROOT ."/includes/modules/propale/".PROPALE_ADDON.".php"))
{
require(DOL_DOCUMENT_ROOT ."/includes/modules/propale/".PROPALE_ADDON.".php");
}
llxHeader();
@ -171,7 +171,6 @@ if ($_GET["action"] == 'create')
print '<td>Modèle</td>';
print '<td>';
include_once(DOL_DOCUMENT_ROOT.'/includes/modules/propale/modules_propale.php');
$model=new ModelePDFPropales();
$liste=$model->liste_modeles($db);
$form->select_array("modelpdf",$liste,$conf->global->PROPALE_ADDON_PDF);

1
htdocs/comm/propal.php
View File

@ -29,6 +29,7 @@
*/
require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT ."/includes/modules/propale/modules_propale.php");
$user->getrights('propale');

374
htdocs/compta/dons/fiche.php
View File

@ -18,7 +18,6 @@
*
* $Id$
* $Source$
*
*/
/**
@ -67,6 +66,7 @@ if ($_POST["action"] == 'update')
if ($don->update($user) > 0)
{
Header("Location: fiche.php?rowid=".$don->id);
exit;
}
}
else
@ -80,7 +80,6 @@ if ($_POST["action"] == 'add')
if ($_POST["amount"] > 0)
{
$don = new Don($db);
$don->prenom = $_POST["prenom"];
@ -102,6 +101,7 @@ if ($_POST["action"] == 'add')
if ($don->create($user) > 0)
{
Header("Location: index.php");
exit;
}
}
else
@ -116,6 +116,7 @@ if ($_GET["action"] == 'delete')
$don = new Don($db);
$don->delete($_GET["rowid"]);
Header("Location: liste.php");
exit;
}
if ($_POST["action"] == 'commentaire')
{
@ -129,6 +130,7 @@ if ($_GET["action"] == 'valid_promesse')
if ($don->valid_promesse($_GET["rowid"], $user->id))
{
Header("Location: liste.php");
exit;
}
}
if ($_GET["action"] == 'set_payed')
@ -137,6 +139,7 @@ if ($_GET["action"] == 'set_payed')
if ($don->set_paye($_GET["rowid"], $modepaiement))
{
Header("Location: liste.php");
exit;
}
}
if ($_GET["action"] == 'set_encaisse')
@ -145,9 +148,19 @@ if ($_GET["action"] == 'set_encaisse')
if ($don->set_encaisse($_GET["rowid"]))
{
Header("Location: liste.php");
exit;
}
}
/*
* Générer ou regénérer le document
*/
if ($_GET['action'] == 'build')
{
require_once(DOL_DOCUMENT_ROOT ."/includes/modules/dons/modules_don.php");
don_create($db, $_GET['rowid']);
}
llxHeader();
@ -161,56 +174,58 @@ $html=new Form($db);
/* */
/* ************************************************************************** */
if ($_GET["action"] == 'create') {
print_titre($langs->trans("AddDonation"));
print '<form action="fiche.php" method="post">';
print '<table class="border" width="100%">';
print '<input type="hidden" name="action" value="add">';
print '<tr><td>'.$langs->trans("Date").'</td><td>';
$html->select_date();
print '</td>';
print '<td rowspan="12" valign="top">'.$langs->trans("Comments").' :<br>';
print "<textarea name=\"comment\" wrap=\"soft\" cols=\"40\" rows=\"15\"></textarea></td></tr>";
print "<tr><td>".$langs->trans("PaymentMode")."</td><td>\n";
$paiement = new Paiement($db);
$paiement->select("modepaiement","CRDT");
print "</td></tr>\n";
if ($conf->projet->enabled)
{
// Si module projet actif
print "<tr><td>".$langs->trans("Project")."</td><td>";
$html->select_projects('','','',"projetid");
print "</td></tr>\n";
}
print "<tr><td>".$langs->trans("PublicDonation")."</td><td>";
$html=new Form($db);
$html->selectyesno("public",1,1);
print "</td></tr>\n";
$langs->load("companies");
print "<tr>".'<td>'.$langs->trans("Company").'</td><td><input type="text" name="societe" size="40"></td></tr>';
print "<tr>".'<td>'.$langs->trans("Firstname").'</td><td><input type="text" name="prenom" size="40"></td></tr>';
print "<tr>".'<td>'.$langs->trans("Lastname").'</td><td><input type="text" name="nom" size="40"></td></tr>';
print "<tr>".'<td>'.$langs->trans("Address").'</td><td>';
print '<textarea name="adresse" wrap="soft" cols="40" rows="3"></textarea></td></tr>';
print "<tr>".'<td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td><input type="text" name="cp" size="8"> <input type="text" name="ville" size="40"></td></tr>';
print "<tr>".'<td>'.$langs->trans("Country").'</td><td><input type="text" name="pays" size="40"></td></tr>';
print "<tr>".'<td>'.$langs->trans("EMail").'</td><td><input type="text" name="email" size="40"></td></tr>';
print "<tr>".'<td>'.$langs->trans("Amount").'</td><td><input type="text" name="amount" size="10"> '.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
print "<tr>".'<td colspan="3" align="center"><input type="submit" value="'.$langs->trans("Save").'"></td></tr>';
print "</table>\n";
print "</form>\n";
if ($_GET["action"] == 'create')
{
print_titre($langs->trans("AddDonation"));
print '<form action="fiche.php" method="post">';
print '<table class="border" width="100%">';
print '<input type="hidden" name="action" value="add">';
print '<tr><td>'.$langs->trans("Date").'</td><td>';
$html->select_date();
print '</td>';
$nbrows=11;
if ($conf->projet->enabled) $nbrows++;
print '<td rowspan="'.$nbrows.'" valign="top">'.$langs->trans("Comments").' :<br>';
print "<textarea name=\"comment\" wrap=\"soft\" cols=\"40\" rows=\"15\"></textarea></td></tr>";
print "<tr><td>".$langs->trans("PaymentMode")."</td><td>\n";
$paiement = new Paiement($db);
$paiement->select("modepaiement","CRDT");
print "</td></tr>\n";
if ($conf->projet->enabled)
{
// Si module projet actif
print "<tr><td>".$langs->trans("Project")."</td><td>";
$html->select_projects('','','',"projetid");
print "</td></tr>\n";
}
print "<tr><td>".$langs->trans("PublicDonation")."</td><td>";
$html=new Form($db);
$html->selectyesno("public",1,1);
print "</td></tr>\n";
$langs->load("companies");
print "<tr>".'<td>'.$langs->trans("Company").'</td><td><input type="text" name="societe" size="40"></td></tr>';
print "<tr>".'<td>'.$langs->trans("Firstname").'</td><td><input type="text" name="prenom" size="40"></td></tr>';
print "<tr>".'<td>'.$langs->trans("Lastname").'</td><td><input type="text" name="nom" size="40"></td></tr>';
print "<tr>".'<td>'.$langs->trans("Address").'</td><td>';
print '<textarea name="adresse" wrap="soft" cols="40" rows="3"></textarea></td></tr>';
print "<tr>".'<td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td><input type="text" name="cp" size="8"> <input type="text" name="ville" size="40"></td></tr>';
print "<tr>".'<td>'.$langs->trans("Country").'</td><td><input type="text" name="pays" size="40"></td></tr>';
print "<tr>".'<td>'.$langs->trans("EMail").'</td><td><input type="text" name="email" size="40"></td></tr>';
print "<tr>".'<td>'.$langs->trans("Amount").'</td><td><input type="text" name="amount" size="10"> '.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
print "<tr>".'<td colspan="3" align="center"><input type="submit" value="'.$langs->trans("Save").'"></td></tr>';
print "</table>\n";
print "</form>\n";
}
@ -222,83 +237,88 @@ if ($_GET["action"] == 'create') {
if ($_GET["rowid"] && $_GET["action"] == 'edit')
{
$don = new Don($db);
$don->id = $_GET["rowid"];
$don->fetch($_GET["rowid"]);
$h=0;
$head[$h][0] = DOL_URL_ROOT."/compta/dons/fiche.php?rowid=".$_GET["rowid"];
$head[$h][1] = $langs->trans("Donation");
$hselected=$h;
$h++;
dolibarr_fiche_head($head, $hselected, $langs->trans("Ref").": ".$_GET["rowid"]);
print '<form action="fiche.php" method="post">';
print '<table class="border" width="100%">';
print '<input type="hidden" name="action" value="update">';
print '<input type="hidden" name="rowid" value="'.$don->id.'">';
print "<tr>".'<td>'.$langs->trans("Date").'</td><td>';
$html->select_date($don->date);
print '</td>';
print '<td rowspan="12" valign="top">'.$langs->trans("Comments").' :<br>';
print "<textarea name=\"comment\" wrap=\"soft\" cols=\"40\" rows=\"15\">$don->commentaire</textarea></td></tr>";
if ($conf->projet->enabled)
{
print "<tr><td>".$langs->trans("Project")."</td><td><select name=\"projetid\">\n";
$sql = "SELECT rowid, libelle FROM ".MAIN_DB_PREFIX."don_projet ORDER BY rowid";
if ($db->query($sql))
$don = new Don($db);
$don->id = $_GET["rowid"];
$don->fetch($_GET["rowid"]);
$h=0;
$head[$h][0] = DOL_URL_ROOT."/compta/dons/fiche.php?rowid=".$_GET["rowid"];
$head[$h][1] = $langs->trans("Donation");
$hselected=$h;
$h++;
dolibarr_fiche_head($head, $hselected, $langs->trans("Ref").": ".$_GET["rowid"]);
print '<form action="fiche.php" method="post">';
print '<table class="border" width="100%">';
print '<input type="hidden" name="action" value="update">';
print '<input type="hidden" name="rowid" value="'.$don->id.'">';
print "<tr>".'<td>'.$langs->trans("Date").'</td><td>';
$html->select_date($don->date);
print '</td>';
$nbrows=12;
if ($conf->projet->enabled) $nbrows++;
print '<td rowspan="'.$nbrows.'" valign="top">'.$langs->trans("Comments").' :<br>';
print "<textarea name=\"comment\" wrap=\"soft\" cols=\"40\" rows=\"15\">$don->commentaire</textarea></td></tr>";
if ($conf->projet->enabled)
{
print "<tr><td>".$langs->trans("Project")."</td><td><select name=\"projetid\">\n";
$sql = "SELECT rowid, libelle FROM ".MAIN_DB_PREFIX."don_projet";
$sql.= " ORDER BY rowid";
if ($db->query($sql))
{
$num = $db->num_rows();
$i = 0;
while ($i < $num)
{
$objopt = $db->fetch_object();
print "<option value=\"$objopt->rowid\">$objopt->libelle</option>\n";
$i++;
}
$num = $db->num_rows();
$i = 0;
while ($i < $num)
{
$objopt = $db->fetch_object();
print "<option value=\"$objopt->rowid\">$objopt->libelle</option>\n";
$i++;
}
}
else
else
{
dolibarr_print_error($db);
dolibarr_print_error($db);
}
print "</select><br>";
print "</td></tr>\n";
}
print "<tr><td>".$langs->trans("PublicDonation")."</td><td>";
$html=new Form($db);
$html->selectyesno("public",1,1);
print "</td>";
print "</tr>\n";
print "</select><br>";
print "</td></tr>\n";
}
print "<tr><td>".$langs->trans("PublicDonation")."</td><td>";
$html=new Form($db);
$html->selectyesno("public",1,1);
print "</td>";
print "</tr>\n";
$langs->load("companies");
print "<tr>".'<td>'.$langs->trans("Company").'</td><td><input type="text" name="societe" size="40" value="'.$don->societe.'"></td></tr>';
print "<tr>".'<td>'.$langs->trans("Firstname").'</td><td><input type="text" name="prenom" size="40" value="'.$don->prenom.'"></td></tr>';
print "<tr>".'<td>'.$langs->trans("Lastname").'</td><td><input type="text" name="nom" size="40" value="'.$don->nom.'"></td></tr>';
print "<tr>".'<td>'.$langs->trans("Address").'</td><td>';
print '<textarea name="adresse" wrap="soft" cols="40" rows="'.ROWS_3.'">'.$don->adresse.'</textarea></td></tr>';
print "<tr>".'<td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td><input type="text" name="cp" size="8" value="'.$don->cp.'"> <input type="text" name="ville" size="40" value="'.$don->ville.'"></td></tr>';
print "<tr>".'<td>'.$langs->trans("Country").'</td><td><input type="text" name="pays" size="40" value="'.$don->pays.'"></td></tr>';
print "<tr>".'<td>'.$langs->trans("EMail").'</td><td><input type="text" name="email" size="40" value="'.$don->email.'"></td></tr>';
print "<tr>".'<td>'.$langs->trans("Amount").'</td><td><input type="text" name="amount" size="10" value="'.$don->amount.'"> '.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
print "<tr><td>".$langs->trans("PaymentMode")."</td><td>\n";
$paiement = new Paiement($db);
$paiement->select("modepaiement","CRDT");
print "</td></tr>\n";
$langs->load("companies");
print "<tr>".'<td>'.$langs->trans("Company").'</td><td><input type="text" name="societe" size="40" value="'.$don->societe.'"></td></tr>';
print "<tr>".'<td>'.$langs->trans("Firstname").'</td><td><input type="text" name="prenom" size="40" value="'.$don->prenom.'"></td></tr>';
print "<tr>".'<td>'.$langs->trans("Lastname").'</td><td><input type="text" name="nom" size="40" value="'.$don->nom.'"></td></tr>';
print "<tr>".'<td>'.$langs->trans("Address").'</td><td>';
print '<textarea name="adresse" wrap="soft" cols="40" rows="3">'.$don->adresse.'</textarea></td></tr>';
print "<tr>".'<td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td><input type="text" name="cp" size="8" value="'.$don->cp.'"> <input type="text" name="ville" size="40" value="'.$don->ville.'"></td></tr>';
print "<tr>".'<td>'.$langs->trans("Country").'</td><td><input type="text" name="pays" size="40" value="'.$don->pays.'"></td></tr>';
print "<tr>".'<td>'.$langs->trans("EMail").'</td><td><input type="text" name="email" size="40" value="'.$don->email.'"></td></tr>';
print "<tr>".'<td>'.$langs->trans("Amount").'</td><td><input type="text" name="amount" size="10" value="'.$don->amount.'"> '.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
print "<tr><td>".$langs->trans("PaymentMode")."</td><td>\n";
$paiement = new Paiement($db);
$paiement->select("modepaiement","CRDT");
print "</td></tr>\n";
print "<tr>".'<td colspan="3" align="center"><input type="submit" value="'.$langs->trans("Save").'"></td></tr>';
print "</table>\n";
print "</form>\n";
print "</div>\n";
print "<tr>".'<td>'.$langs->trans("Status").'</td><td>'.$don->getLibStatut().'</td></tr>';
print "<tr>".'<td colspan="3" align="center"><input type="submit" class="button" value="'.$langs->trans("Save").'"></td></tr>';
print "</table>\n";
print "</form>\n";
print "</div>\n";
}
@ -310,56 +330,61 @@ if ($_GET["rowid"] && $_GET["action"] == 'edit')
/* ************************************************************ */
if ($_GET["rowid"] && $_GET["action"] != 'edit')
{
$don = new Don($db);
$don->id = $_GET["rowid"];
$don->fetch($_GET["rowid"]);
$h=0;
$head[$h][0] = DOL_URL_ROOT."/compta/dons/fiche.php?rowid=".$_GET["rowid"];
$head[$h][1] = $langs->trans("Donation");
$hselected=$h;
$h++;
dolibarr_fiche_head($head, $hselected, $langs->trans("Ref").": ".$_GET["rowid"]);
print "<form action=\"fiche.php\" method=\"post\">";
print '<table class="border" width="100%">';
print "<tr><td>".$langs->trans("Date")."</td><td>";
print dolibarr_print_date($don->date,"%d %B %Y");
print "</td>";
$nbrows=12;
if ($conf->projet->enabled) $nbrows++;
print '<td rowspan="'.$nbrows.'" valign="top" width="50%">'.$langs->trans("Comments").' :<br>';
print nl2br($don->commentaire).'</td></tr>';
if ($conf->projet->enabled)
{
print "<tr>".'<td>'.$langs->trans("Project").'</td><td>'.$don->projet.'</td></tr>';
}
print "<tr><td>".$langs->trans("PublicDonation")."</td><td>";
print $yn[$don->public];
print "</td></tr>\n";
print "<tr>".'<td>'.$langs->trans("Company").'</td><td>'.$don->societe.'</td></tr>';
print "<tr>".'<td>'.$langs->trans("Firstname").'</td><td>'.$don->prenom.'</td></tr>';
print "<tr>".'<td>'.$langs->trans("Lastname").'</td><td>'.$don->nom.'</td></tr>';
print "<tr>".'<td>'.$langs->trans("Address").'</td><td>'.nl2br($don->adresse).'</td></tr>';
print "<tr>".'<td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td>'.$don->cp.' '.$don->ville.'</td></tr>';
print "<tr>".'<td>'.$langs->trans("Country").'</td><td>'.$don->pays.'</td></tr>';
print "<tr>".'<td>'.$langs->trans("EMail").'</td><td>'.$don->email.'</td></tr>';
print "<tr>".'<td>'.$langs->trans("Amount").'</td><td>'.price($don->amount).' '.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
print "<tr><td>".$langs->trans("PaymentMode")."</td><td>";
print $don->modepaiement;
print "</td></tr>\n";
$don = new Don($db);
$don->id = $_GET["rowid"];
$don->fetch($_GET["rowid"]);
print "<tr>".'<td>'.$langs->trans("Status").'</td><td>'.$don->getLibStatut().'</td></tr>';
print "</table>\n";
print "</form>\n";
print "</div>";
$h=0;
$head[$h][0] = DOL_URL_ROOT."/compta/dons/fiche.php?rowid=".$_GET["rowid"];
$head[$h][1] = $langs->trans("Donation");
$hselected=$h;
$h++;
dolibarr_fiche_head($head, $hselected, $langs->trans("Ref").": ".$_GET["rowid"]);
print "<form action=\"fiche.php\" method=\"post\">";
print '<table class="border" width="100%">';
print "<tr><td>".$langs->trans("Date")."</td><td>";
print dolibarr_print_date($don->date,"%d %B %Y");
print "</td>";
print '<td rowspan="12" valign="top" width="50%">'.$langs->trans("Comments").' :<br>';
print nl2br($don->commentaire).'</td></tr>';
if ($conf->projet->enabled) {
print "<tr>".'<td>'.$langs->trans("Project").'</td><td>'.$don->projet.'</td></tr>';
}
print "<tr><td>".$langs->trans("PublicDonation")."</td><td>";
print $yn[$don->public];
print "</td></tr>\n";
print "<tr>".'<td>'.$langs->trans("Company").'</td><td>'.$don->societe.'</td></tr>';
print "<tr>".'<td>'.$langs->trans("Firstname").'</td><td>'.$don->prenom.'</td></tr>';
print "<tr>".'<td>'.$langs->trans("Lastname").'</td><td>'.$don->nom.'</td></tr>';
print "<tr>".'<td>'.$langs->trans("Address").'</td><td>'.nl2br($don->adresse).'</td></tr>';
print "<tr>".'<td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td>'.$don->cp.' '.$don->ville.'</td></tr>';
print "<tr>".'<td>'.$langs->trans("Country").'</td><td>'.$don->pays.'</td></tr>';
print "<tr>".'<td>'.$langs->trans("EMail").'</td><td>'.$don->email.'</td></tr>';
print "<tr>".'<td>'.$langs->trans("Amount").'</td><td>'.price($don->amount).' '.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
print "<tr><td>".$langs->trans("PaymentMode")."</td><td>";
print $don->modepaiement;
print "</td></tr>\n";
print "</table>\n";
print "</form>\n";
print "</div>";
/**
* Barre d'actions
*/
@ -369,7 +394,7 @@ if ($_GET["rowid"] && $_GET["action"] != 'edit')
if ($don->statut == 0)
{
print '<a class="butAction" href="fiche.php?rowid='.$don->id.'&action=valid_promesse">'.$langs->trans("Valid").'</a>';
print '<a class="butAction" href="fiche.php?rowid='.$don->id.'&action=valid_promesse">'.$langs->trans("ValidPromess").'</a>';
}
// \todo Gérer action émettre paiement
@ -385,7 +410,7 @@ if ($_GET["rowid"] && $_GET["action"] != 'edit')
if ($don->statut == 2 || $don->statut == 3)
{
print "<a class=\"butAction\" href=\"formulaire/".DONS_FORM."?rowid=$don->id\">".$langs->trans("Form")."</a>";
print ' <a class="butAction" href="fiche.php?rowid='.$don->id.'&amp;action=build">'.$langs->trans('BuildDoc').'</a>';
}
if ($don->statut == 0)
@ -401,5 +426,6 @@ if ($_GET["rowid"] && $_GET["action"] != 'edit')
$db->close();
llxFooter("<em>Derni&egrave;re modification $Date$ r&eacute;vision $Revision$</em>");
llxFooter('$Date$ - $Revision$');
?>

24
htdocs/compta/facture.php
View File

@ -30,15 +30,7 @@
*/
require('./pre.inc.php');
$user->getrights('facture');
$user->getrights('banque');
if (!$user->rights->facture->lire)
accessforbidden();
$langs->load('bills');
require_once(DOL_DOCUMENT_ROOT ."/includes/modules/facture/modules_facture.php");
require_once(DOL_DOCUMENT_ROOT.'/facture.class.php');
require_once(DOL_DOCUMENT_ROOT.'/paiement.class.php');
require_once(DOL_DOCUMENT_ROOT.'/lib/CMailFile.class.php');
@ -47,6 +39,13 @@ if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT.'/propal.class.php'
if ($conf->contrat->enabled) require_once(DOL_DOCUMENT_ROOT.'/contrat/contrat.class.php');
if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT.'/commande/commande.class.php');
$user->getrights('facture');
$user->getrights('banque');
if (!$user->rights->facture->lire)
accessforbidden();
$langs->load('bills');
$sall=isset($_GET['sall'])?$_GET['sall']:$_POST['sall'];
if (isset($_GET['msg'])) { $msg=urldecode($_GET['msg']); }
@ -404,10 +403,7 @@ if ($_POST['action'] == 'confirm_canceled' && $_POST['confirm'] == 'yes')
{
$fac = new Facture($db);
$fac->fetch($_GET['facid']);
$result = $fac->set_canceled();
$_GET['facid'] = 0 ;
Header('Location: facture.php');
exit;
$result = $fac->set_canceled($user);
}
}
@ -552,8 +548,6 @@ if ($_POST['action'] == 'send' || $_POST['action'] == 'relance')
*/
if ($_GET['action'] == 'pdf')
{
// Generation de la facture définie dans /includes/modules/facture/modules_facture.php
// Génère également le fichier meta dans le meme répertoire (pour faciliter les recherches et indexation)
facture_pdf_create($db, $_GET['facid']);
}

200
htdocs/don.class.php
View File

@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004 Laurent Destailleur <eldy@users.sourceforge.net>
/* Copyright (C) 2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2005 Laurent Destailleur <eldy@users.sourceforge.net>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -18,7 +18,6 @@
*
* $Id$
* $Source$
*
*/
/**
@ -36,60 +35,67 @@
class Don
{
var $id;
var $db;
var $date;
var $amount;
var $prenom;
var $nom;
var $societe;
var $adresse;
var $cp;
var $ville;
var $pays;
var $email;
var $public;
var $projetid;
var $modepaiement;
var $modepaiementid;
var $commentaire;
var $statut;
var $projet;
var $errorstr;
/*
* Statut du don
* 0 : promesse non validée
* 1 : promesse validée
* 2 : don validé
* 3 : don payé
*
*/
/*
* \brief Constructeur
* \param DB handler d'accès base
* \param soc_idp id société
*/
function Don($DB, $soc_idp="")
var $id;
var $db;
var $date;
var $amount;
var $prenom;
var $nom;
var $societe;
var $adresse;
var $cp;
var $ville;
var $pays;
var $email;
var $public;
var $projetid;
var $modepaiement;
var $modepaiementid;
var $commentaire;
var $statut;
var $projet;
var $errorstr;
/**
* \brief Constructeur
* \param DB handler d'accès base
* \param soc_idp id sociét
*/
function Don($DB, $soc_idp="")
{
$this->db = $DB ;
$this->modepaiementid = 0;
global $langs;
$this->db = $DB ;
$this->modepaiementid = 0;
$langs->load("donations");
$this->labelstatut[0]=$langs->trans("DonationStatusPromessNotValidated");
$this->labelstatut[1]=$langs->trans("DonationStatusPromessValidated");
$this->labelstatut[2]=$langs->trans("DonationStatusValidated");
$this->labelstatut[3]=$langs->trans("DonationStatusPayed");
}
/*
*
*/
function print_error_list()
{
/**
* \brief Retourne le libellé du statut d'une propale (brouillon, validée, ...)
* \return string Libellé
*/
function getLibStatut()
{
return $this->labelstatut[$this->statut];
}
/*
*
*/
function print_error_list()
{
$num = sizeof($this->errorstr);
for ($i = 0 ; $i < $num ; $i++)
{
print "<li>" . $this->errorstr[$i];
}
}
}
/*
*
@ -277,53 +283,57 @@ class Don
}
}
/*
* \brief Charge l'objet don en mémoire depuis la base de donnée
* \param rowid id du don à charger
*
*/
function fetch($rowid)
{
$sql = "SELECT d.rowid, ".$this->db->pdate("d.datec")." as datec,";
$sql.= " ".$this->db->pdate("d.datedon")." as datedon,";
$sql.= " d.prenom, d.nom, d.societe, d.amount, p.libelle as projet, d.fk_statut, d.adresse, d.cp, d.ville, d.pays, d.public, d.amount, d.fk_paiement, d.note, cp.libelle, d.email, d.fk_don_projet";
$sql.= " FROM ".MAIN_DB_PREFIX."don as d, ".MAIN_DB_PREFIX."c_paiement as cp LEFT JOIN ".MAIN_DB_PREFIX."don_projet as p";
$sql.= " ON p.rowid = d.fk_don_projet WHERE cp.id = d.fk_paiement AND d.rowid = $rowid";
if ( $this->db->query( $sql) )
{
if ($this->db->num_rows())
{
$obj = $this->db->fetch_object();
$this->id = $obj->rowid;
$this->datec = $obj->datec;
$this->date = $obj->datedon;
$this->prenom = stripslashes($obj->prenom);
$this->nom = stripslashes($obj->nom);
$this->societe = stripslashes($obj->societe);
$this->statut = $obj->fk_statut;
$this->adresse = stripslashes($obj->adresse);
$this->cp = stripslashes($obj->cp);
$this->ville = stripslashes($obj->ville);
$this->email = stripslashes($obj->email);
$this->pays = stripslashes($obj->pays);
$this->projet = $obj->projet;
$this->projetid = $obj->fk_don_projet;
$this->public = $obj->public;
$this->modepaiementid = $obj->fk_paiement;
$this->modepaiement = $obj->libelle;
$this->amount = $obj->amount;
$this->commentaire = stripslashes($obj->note);
}
}
else
{
dolibarr_print_error($this->db);
}
/*
* \brief Charge l'objet don en mémoire depuis la base de donnée
* \param rowid Id du don à charger
* \return int <0 si ko, >0 si ok
*/
function fetch($rowid)
{
$sql = "SELECT d.rowid, ".$this->db->pdate("d.datec")." as datec,";
$sql.= " ".$this->db->pdate("d.datedon")." as datedon,";
$sql.= " d.prenom, d.nom, d.societe, d.amount, p.libelle as projet, d.fk_statut, d.adresse, d.cp, d.ville, d.pays, d.public, d.amount, d.fk_paiement, d.note, cp.libelle, d.email, d.fk_don_projet";
$sql.= " FROM ".MAIN_DB_PREFIX."c_paiement as cp, ".MAIN_DB_PREFIX."don as d";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."don_projet as p";
$sql.= " ON p.rowid = d.fk_don_projet";
$sql.= " WHERE cp.id = d.fk_paiement AND d.rowid = ".$rowid;
}
if ( $this->db->query( $sql) )
{
if ($this->db->num_rows())
{
$obj = $this->db->fetch_object();
$this->id = $obj->rowid;
$this->datec = $obj->datec;
$this->date = $obj->datedon;
$this->prenom = stripslashes($obj->prenom);
$this->nom = stripslashes($obj->nom);
$this->societe = stripslashes($obj->societe);
$this->statut = $obj->fk_statut;
$this->adresse = stripslashes($obj->adresse);
$this->cp = stripslashes($obj->cp);
$this->ville = stripslashes($obj->ville);
$this->email = stripslashes($obj->email);
$this->pays = stripslashes($obj->pays);
$this->projet = $obj->projet;
$this->projetid = $obj->fk_don_projet;
$this->public = $obj->public;
$this->modepaiementid = $obj->fk_paiement;
$this->modepaiement = $obj->libelle;
$this->amount = $obj->amount;
$this->commentaire = stripslashes($obj->note);
}
return 1;
}
else
{
dolibarr_print_error($this->db);
return -1;
}
}
/*
* \brief Valide une promesse de don

4
htdocs/facture.class.php
View File

@ -767,7 +767,7 @@ class Facture
dolibarr_syslog("Facture.class.php::set_canceled rowid=".$this->id);
$sql = 'UPDATE '.MAIN_DB_PREFIX.'facture';
$sql.= ' SET fk_statut=3 WHERE rowid = '.$this->id;
$resql = $this->db->query( $sql);
$resql = $this->db->query($sql);
if ($resql)
{
@ -1376,7 +1376,7 @@ class Facture
}
else
{
dolibarr_print_error($db,"modules_facture::getNextNumRef ".$obj->error);
dolibarr_print_error($db,"Facture::getNextNumRef ".$obj->error);
return "";
}
}

19
htdocs/includes/modules/commande/modules_commande.php
View File

@ -111,7 +111,24 @@ class ModeleNumRefCommandes
return $langs->trans("NoExample");
}
/** \brief Test si les numéros déjà en vigueur dans la base ne provoquent pas de
* de conflits qui empechera cette numérotation de fonctionner.
* \return boolean false si conflit, true si ok
*/
function canBeActivated()
{
return true;
}
/** \brief Renvoi prochaine valeur attribuée
* \return string Valeur
*/
function getNextValue()
{
global $langs;
return $langs->trans("NotAvailable");
}
}
?>

2
htdocs/includes/modules/facture/pdf_bernique.modules.php
View File

@ -29,6 +29,8 @@
\version $Revision$
*/
require_once(DOL_DOCUMENT_ROOT ."/includes/modules/facture/modules_facture.php");
/**
\class pdf_bernique

2
htdocs/includes/modules/facture/pdf_bigorneau.modules.php
View File

@ -28,6 +28,8 @@
\version $Revision$
*/
require_once(DOL_DOCUMENT_ROOT ."/includes/modules/facture/modules_facture.php");
/** \class pdf_bigorneau
\brief Classe permettant de générer les factures au modèle Bigorneau

2
htdocs/includes/modules/facture/pdf_bulot.modules.php
View File

@ -28,6 +28,8 @@
\version $Revision$
*/
require_once(DOL_DOCUMENT_ROOT ."/includes/modules/facture/modules_facture.php");
/** \class pdf_bulot
\brief Classe permettant de générer les factures au modèle Bulot

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

@ -28,6 +28,7 @@
\version $Revision$
*/
require_once(DOL_DOCUMENT_ROOT ."/includes/modules/facture/modules_facture.php");
require_once(DOL_DOCUMENT_ROOT."/product.class.php");

2
htdocs/includes/modules/facture/pdf_huitre.modules.php
View File

@ -29,6 +29,8 @@
\version $Revision$
*/
require_once(DOL_DOCUMENT_ROOT ."/includes/modules/facture/modules_facture.php");
/**
\class pdf_huitre

1
htdocs/includes/modules/facture/pdf_oursin.modules.php
View File

@ -30,6 +30,7 @@
*/
require_once(DOL_DOCUMENT_ROOT."/product.class.php");
require_once(DOL_DOCUMENT_ROOT ."/includes/modules/facture/modules_facture.php");
/**

2
htdocs/includes/modules/facture/pdf_tourteau.modules.php
View File

@ -28,6 +28,8 @@
\version $Revision$
*/
require_once(DOL_DOCUMENT_ROOT ."/includes/modules/facture/modules_facture.php");
/** \class pdf_tourteau
\brief Classe permettant de générer les factures au modèle Tourteau

18
htdocs/includes/modules/fichinter/modules_fichinter.php
View File

@ -116,6 +116,24 @@ class ModeleNumRefFicheinter
return $langs->trans("NoExample");
}
/** \brief Test si les numéros déjà en vigueur dans la base ne provoquent pas de
* de conflits qui empechera cette numérotation de fonctionner.
* \return boolean false si conflit, true si ok
*/
function canBeActivated()
{
return true;
}
/** \brief Renvoi prochaine valeur attribuée
* \return string Valeur
*/
function getNextValue()
{
global $langs;
return $langs->trans("NotAvailable");
}
}

14
htdocs/includes/modules/propale/modules_propale.php
View File

@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004 Laurent Destailleur <eldy@users.sourceforge.net>
/* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2005 Laurent Destailleur <eldy@users.sourceforge.net>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -19,7 +19,6 @@
*
* $Id$
* $Source$
*
*/
/**
@ -119,6 +118,15 @@ class ModeleNumRefPropales
return true;
}
/** \brief Renvoi prochaine valeur attribuée
* \return string Valeur
*/
function getNextValue()
{
global $langs;
return $langs->trans("NotAvailable");
}
}

2
htdocs/includes/modules/propale/pdf_propale_adytek.modules.php
View File

@ -27,6 +27,8 @@
\version $Revision$
*/
require_once(DOL_DOCUMENT_ROOT ."/includes/modules/propale/modules_propale.php");
/** \class pdf_propale_adytek
\brief Classe permettant de générer les propales au modèle Adytek

1
htdocs/includes/modules/propale/pdf_propale_azur.modules.php
View File

@ -28,6 +28,7 @@
\version $Revision$
*/
require_once(DOL_DOCUMENT_ROOT ."/includes/modules/propale/modules_propale.php");
require_once(DOL_DOCUMENT_ROOT."/product.class.php");

2
htdocs/includes/modules/propale/pdf_propale_bleu.modules.php
View File

@ -27,6 +27,8 @@
\version $Revision$
*/
require_once(DOL_DOCUMENT_ROOT ."/includes/modules/propale/modules_propale.php");
/** \class pdf_propale_bleu
\brief Classe permettant de générer les propales au modèle Bleu

2
htdocs/includes/modules/propale/pdf_propale_jaune.modules.php
View File

@ -27,6 +27,8 @@
\version $Revision$
*/
require_once(DOL_DOCUMENT_ROOT ."/includes/modules/propale/modules_propale.php");
/** \class pdf_propale_jaune
\brief Classe permettant de générer les propales au modèle Jaune

2
htdocs/includes/modules/propale/pdf_propale_rouge.modules.php
View File

@ -28,6 +28,8 @@
\version $Revision$
*/
require_once(DOL_DOCUMENT_ROOT ."/includes/modules/propale/modules_propale.php");
/**
\class pdf_propale_rouge

2
htdocs/includes/modules/propale/pdf_propale_vert.modules.php
View File

@ -28,6 +28,8 @@
\version $Revision$
*/
require_once(DOL_DOCUMENT_ROOT ."/includes/modules/propale/modules_propale.php");
/** \class pdf_propale_vert
\brief Classe permettant de générer les propales au modèle Vert

2
htdocs/langs/en_US/bills.lang
View File

@ -32,8 +32,6 @@ Send=Send
SendRemind=Send reminder
DoPaiement=Do payment
DoPayment=Do payment
BuildPDF=Build PDF
RebuildPDF=Rebuild PDF
VAT=VAT
VATRate=VAT Rate
Amount=Amount

4
htdocs/langs/en_US/main.lang
View File

@ -285,6 +285,10 @@ Internals=Internal
Externals=External
Warning=Warning
Warnings=Warnings
BuildPDF=Build PDF
RebuildPDF=Rebuild PDF
BuildDoc=Build Doc
RebuildDoc=Rebuild Doc
# Countries
CountryFR=France
CountryBE=Belgium

2
htdocs/langs/fr_BE/bills.lang
View File

@ -7,8 +7,6 @@ CreateBill=Cr
Send=Envoyer
SendRemind=Envoyer un rappel
DoPaiement=Emettre un paiement
BuildPDF=Générer le PDF
RebuildPDF=Regénérer le PDF
VAT=TVA
VATRate=Taux TVA
Amount=Montant

2
htdocs/langs/fr_FR/bills.lang
View File

@ -32,8 +32,6 @@ Send=Envoyer
SendRemind=Envoyer rappel
DoPaiement=Émettre paiement
DoPayment=Émettre paiement
BuildPDF=Générer le PDF
RebuildPDF=Regénérer le PDF
VAT=TVA
VATRate=Taux TVA
Amount=Montant

4
htdocs/langs/fr_FR/main.lang
View File

@ -285,6 +285,10 @@ Internals=Internes
Externals=Externes
Warning=Alerte
Warnings=Alertes
BuildPDF=Générer le PDF
RebuildPDF=Regénérer le PDF
BuildDoc=Générer le doc
RebuildDoc=Regénérer le doc
# Countries
CountryFR=France
CountryBE=Belgique

10
htdocs/master.inc.php
View File

@ -287,12 +287,18 @@ $conf->webcal->db->pass=defined('PHPWEBCALENDAR_PASS')?PHPWEBCALENDAR_PASS:'';
$conf->webcal->db->name=defined('PHPWEBCALENDAR_DBNAME')?PHPWEBCALENDAR_DBNAME:'';
$conf->facture->enabled=defined("MAIN_MODULE_FACTURE")?MAIN_MODULE_FACTURE:0;
if ($conf->facture->enabled) require_once(DOL_DOCUMENT_ROOT ."/includes/modules/facture/modules_facture.php");
// \todo Ajouter la ligne
// require_once(DOL_DOCUMENT_ROOT ."/includes/modules/facture/modules_facture.php");
// dans le fichier facturation-emission.php du module telephonie afin de pouvoir
// supprimer celles qui suivent.
if (defined("MAIN_MODULE_TELEPHONIE") && MAIN_MODULE_TELEPHONIE)
{
require_once(DOL_DOCUMENT_ROOT ."/includes/modules/facture/modules_facture.php");
}
$conf->facture->dir_output=DOL_DATA_ROOT."/facture";
$conf->facture->dir_images=DOL_DATA_ROOT."/facture/images";
if (defined('FAC_OUTPUTDIR') && FAC_OUTPUTDIR) { $conf->facture->dir_output=FAC_OUTPUTDIR; } # Pour passer outre le rep par d?faut
$conf->propal->enabled=defined("MAIN_MODULE_PROPALE")?MAIN_MODULE_PROPALE:0;
if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT ."/includes/modules/propale/modules_propale.php");
if (!defined("PROPALE_NEW_FORM_NB_PRODUCT")) define("PROPALE_NEW_FORM_NB_PRODUCT", 4);
$conf->propal->dir_output=DOL_DATA_ROOT."/propale";
$conf->propal->dir_images=DOL_DATA_ROOT."/propale/images";