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

Doc: Mise a jour documentation

Browse Source
This commit is contained in:
Laurent Destailleur 2006-06-03 23:53:10 +00:00
parent 9895e9dde9
commit 80afe6f646
4 changed files with 29 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -13,7 +13,6 @@ English Dolibarr changelog
- Little enhancements to OSCommerce module.
- Building a PDF document for invoices works like other modules. You
can change model just before generating the PDF.
- Provide PDF generation for orders.
- Can generate documents (PDF) for customer orders. Can send them by mail.
- Can make one payment for several supplier invoices.
- Rule to suggests passwords when creating a user are in modules

4
INSTALL
View File

@ -1,4 +1,4 @@
English: See file docs/install/en_US/README.
English: See file README.
French: Voir fichier dans docs/install/fr_FR/README-FR.
French: Voir fichier README-FR.

12
htdocs/expedition/expedition.class.php
View File

@ -180,10 +180,10 @@ class Expedition
return 1;
}
}
/**
*
* Lit une expedition
*
* \brief Lit une expedition
* \param id
*/
function fetch ($id)
{
@ -192,10 +192,10 @@ class Expedition
$sql = "SELECT e.rowid, e.date_creation, e.ref, e.fk_user_author, e.fk_statut, e.fk_commande, e.fk_entrepot";
$sql.= ", ".$this->db->pdate("e.date_expedition")." as date_expedition, c.fk_adresse_livraison";
if ($conf->livraison->enabled) $sql.=", l.rowid as livraison_id";
$sql .= " FROM ".MAIN_DB_PREFIX."expedition as e";
$sql .= ", ".MAIN_DB_PREFIX."commande as c";
$sql.= " FROM ".MAIN_DB_PREFIX."commande as c";
$sql.= ", ".MAIN_DB_PREFIX."expedition as e";
if ($conf->livraison->enabled) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."livraison as l ON e.rowid = l.fk_expedition";
$sql .= " WHERE e.rowid = $id";
$sql.= " WHERE e.rowid = ".$id;
$sql.= " AND e.fk_commande = c.rowid";
$result = $this->db->query($sql) ;

16
htdocs/expedition/fiche.php
View File

@ -149,6 +149,8 @@ if ($_REQUEST['action'] == 'builddoc') // En get ou en post
*
*/
llxHeader('','Fiche expedition','ch-expedition.html',$form_search);
$html = new Form($db);
/*********************************************************************
@ -158,7 +160,6 @@ $html = new Form($db);
*********************************************************************/
if ($_GET["action"] == 'create')
{
llxHeader('','Fiche expedition','ch-expedition.html',$form_search);
print_titre($langs->trans("CreateASending"));
@ -340,8 +341,6 @@ else
$author->id = $expedition->user_author_id;
$author->fetch();
llxHeader('','Fiche expedition','ch-expedition.html',$form_search,$author);
$commande = New Commande($db);
$commande->fetch($expedition->commande_id);
@ -409,8 +408,7 @@ else
// Client
print '<tr><td width="20%">'.$langs->trans("Customer").'</td>';
print '<td width="30%">';
print '<b><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$soc->id.'">'.$soc->nom.'</a></b></td>';
print '<td width="30%">'.$soc->getNomUrl(1).'</td>';
// Auteur
print '<td width="20%">'.$langs->trans("Author").'</td><td width="30%">'.$author->fullname.'</td>';
@ -419,7 +417,7 @@ else
// Commande liée
print '<tr><td>'.$langs->trans("Order").'</td>';
print '<td><a href="'.DOL_URL_ROOT.'/expedition/commande.php?id='.$commande->id.'">'.$commande->ref."</a></td>\n";
print '<td><a href="'.DOL_URL_ROOT.'/expedition/commande.php?id='.$commande->id.'">'.img_object($langs->trans("ShowOrder"),'order').' '.$commande->ref."</a></td>\n";
print '<td>&nbsp;</td><td>&nbsp;</td></tr>';
// Date
@ -713,15 +711,11 @@ else
}
else
{
/* Expedition non trouvée */
llxHeader('','Fiche expedition','ch-expedition.html',$form_search);
print "Expedition inexistante ou accés refusé";
dolibarr_print_error($db);
}
}
else
{
/* Expedition non trouvée */
llxHeader('','Fiche expedition','ch-expedition.html',$form_search);
print "Expedition inexistante ou accés refusé";
}
}