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

Dbut ajout bon de livraison

Browse Source
This commit is contained in:
Regis Houssin 2006-05-30 10:47:10 +00:00
parent 148d696aee
commit 458ae54ade
2 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
htdocs/livraison/fiche.php
View File

@ -34,6 +34,11 @@ require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/product.class.php");
require_once(DOL_DOCUMENT_ROOT."/livraison/mods/modules_livraison.php");
if (!$conf->expedition->enabled && $conf->stock->enabled)
{
require_once(DOL_DOCUMENT_ROOT."/product/stock/entrepot.class.php");
}
$langs->load("bills");
@ -61,10 +66,15 @@ if ($_POST["action"] == 'add')
// Creation de l'objet livraison
$livraison = new Livraison($db);
$livraison->date_livraison = time();
$livraison->date_livraison = time();
$livraison->note = $_POST["note"];
$livraison->commande_id = $_POST["commande_id"];
if (!$conf->expedition->enabled && $conf->stock->enabled)
{
$expedition->entrepot_id = $_POST["entrepot_id"];
}
// On boucle sur chaque ligne de commande pour compléter objet livraison
// avec qté à livrer
$commande = new Commande($db);
@ -164,7 +174,10 @@ if ($_GET["action"] == 'create')
$author->id = $commande->user_author_id;
$author->fetch();
//$entrepot = new Entrepot($db);
if (!$conf->expedition->enabled && $conf->stock->enabled)
{
$entrepot = new Entrepot($db);
}
/*
* Commande
@ -172,7 +185,10 @@ if ($_GET["action"] == 'create')
print '<form action="fiche.php" method="post">';
print '<input type="hidden" name="action" value="add">';
print '<input type="hidden" name="commande_id" value="'.$commande->id.'">';
//print '<input type="hidden" name="entrepot_id" value="'.$_GET["entrepot_id"].'">';
if (!$conf->expedition->enabled && $conf->stock->enabled)
{
print '<input type="hidden" name="entrepot_id" value="'.$_GET["entrepot_id"].'">';
}
print '<table class="border" width="100%">';
print '<tr><td width="20%">'.$langs->trans("Customer").'</td>';
print '<td width="30%"><b><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$soc->id.'">'.$soc->nom.'</a></b></td>';
@ -188,13 +204,16 @@ if ($_GET["action"] == 'create')
print "</td></tr>\n";
print '<tr>';
/*
print '<td>'.$langs->trans("Warehouse").'</td>';
print '<td>';
$ents = $entrepot->list_array();
print '<a href="'.DOL_URL_ROOT.'/product/stock/fiche.php?id='.$_GET["entrepot_id"].'">'.img_object($langs->trans("ShowWarehouse"),'stock').' '.$ents[$_GET["entrepot_id"]].'</a>';
print '</td>';
*/
if (!$conf->expedition->enabled && $conf->stock->enabled)
{
print '<td>'.$langs->trans("Warehouse").'</td>';
print '<td>';
$ents = $entrepot->list_array();
print '<a href="'.DOL_URL_ROOT.'/product/stock/fiche.php?id='.$_GET["entrepot_id"].'">'.img_object($langs->trans("ShowWarehouse"),'stock').' '.$ents[$_GET["entrepot_id"]].'</a>';
print '</td>';
}
print "<td>".$langs->trans("Author")."</td><td>$author->fullname</td>\n";
if ($commande->note)

2
htdocs/livraison/livraison.class.php
View File

@ -341,7 +341,7 @@ class Livraison
}
}
*/
return 1;
}
else